Merge SP2A.220405.004 to aosp-master - DO NOT MERGE

Merged-In: I2a97159d0de32a6262bbace7bb82b09897447bdb
Merged-In: I58aad30729443e148da154a0d1125a6e8cb8c9d3
Change-Id: I593218f8417ab99d88c16705eef2cef705e0fcf7
diff --git a/Android.bp b/Android.bp
index dce25d7..3cf1034 100644
--- a/Android.bp
+++ b/Android.bp
@@ -64,6 +64,7 @@
         "androidx.lifecycle_lifecycle-extensions",
         "guava",
         "jsr305",
+        "net-utils-framework-common",
         "settings-contextual-card-protos-lite",
         "settings-log-bridge-protos-lite",
         "contextualcards",
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index c84132f..a2d8049 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -25,6 +25,7 @@
     <uses-permission android:name="android.permission.HARDWARE_TEST" />
     <uses-permission android:name="android.permission.CALL_PHONE" />
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
+    <uses-permission android:name="android.permission.QUERY_AUDIO_STATE" />
     <uses-permission android:name="android.permission.MASTER_CLEAR" />
     <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH" />
     <uses-permission android:name="android.permission.ACCESS_DOWNLOAD_MANAGER" />
@@ -419,6 +420,19 @@
                 android:value="true" />
         </activity>
 
+        <activity android:name=".Settings$AdaptiveBrightnessActivity"
+            android:label="@string/auto_brightness_title"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.settings.ADAPTIVE_BRIGHTNESS_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.display.AutoBrightnessSettings"/>
+            <meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY"
+                android:value="@string/menu_key_display"/>
+        </activity>
+
         <activity
             android:name="Settings$ConfigureWifiSettingsActivity"
             android:label="@string/wifi_configure_settings_preference_title"
@@ -661,15 +675,27 @@
             </intent-filter>
         </activity>
 
+        <activity
+            android:name=".network.TetherProvisioningCarrierDialogActivity"
+            android:exported="true"
+            android:permission="android.permission.TETHER_PRIVILEGED"
+            android:excludeFromRecents="true"
+            android:theme="@*android:style/Theme.DeviceDefault.Settings.Dialog.NoActionBar">
+            <intent-filter android:priority="1">
+                <action android:name="android.settings.TETHER_UNSUPPORTED_CARRIER_UI" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
         <activity android:name=".network.telephony.ToggleSubscriptionDialogActivity"
                   android:exported="false"
                   android:permission="android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS"
-                  android:theme="@*android:style/Theme.DeviceDefault.Dialog.Alert.DayNight" />
+                  android:theme="@style/Theme.AlertDialog.SimConfirmDialog"/>
 
         <activity android:name=".network.telephony.DeleteEuiccSubscriptionDialogActivity"
                   android:exported="false"
                   android:permission="android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS"
-                  android:theme="@*android:style/Theme.DeviceDefault.Dialog.Alert.DayNight" />
+                  android:theme="@style/Theme.AlertDialog.SimConfirmDialog"/>
 
         <activity
             android:name="Settings$TetherSettingsActivity"
@@ -2595,6 +2621,7 @@
             android:exported="true">
             <intent-filter>
                 <action android:name="android.bluetooth.device.action.PAIRING_REQUEST" />
+                <action android:name="android.bluetooth.action.CSIS_SET_MEMBER_AVAILABLE"/>
             </intent-filter>
         </receiver>
 
@@ -2807,25 +2834,6 @@
                        android:value="@string/menu_key_accounts"/>
         </activity>
 
-        <activity android:name=".CryptKeeper"
-                  androidprv:systemUserOnly="true"
-                  android:immersive="true"
-                  android:launchMode="singleTop"
-                  android:excludeFromRecents="true"
-                  android:theme="@style/Theme.CryptKeeper"
-                  android:configChanges="mnc|mcc|keyboard|keyboardHidden|uiMode"
-                  android:windowSoftInputMode="adjustResize"
-                  android:screenOrientation="nosensor"
-                  android:taskAffinity="com.android.settings.CryptKeeper"
-                  android:exported="true"
-                  android:process=":CryptKeeper">
-            <intent-filter android:priority="10">
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.HOME" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
-
         <!-- Triggered when user-selected home app isn't encryption aware -->
         <activity android:name=".FallbackHome"
                   android:excludeFromRecents="true"
@@ -2841,32 +2849,6 @@
             </intent-filter>
         </activity>
 
-        <activity android:name=".CryptKeeper$FadeToBlack"
-            android:immersive="true"
-            android:launchMode="singleTop"
-            android:theme="@style/CryptKeeperBlankTheme"
-        />
-
-        <activity android:name=".CryptKeeperConfirm$Blank"
-            android:immersive="true"
-            android:launchMode="singleTop"
-            android:theme="@style/CryptKeeperBlankTheme"
-        />
-
-        <!-- Pseudo-activity used to provide an intent-filter entry point to encryption settings -->
-        <activity android:name="Settings$CryptKeeperSettingsActivity"
-                android:exported="true"
-                android:label="@string/crypt_keeper_encrypt_title">
-            <intent-filter android:priority="1">
-                <action android:name="android.app.action.START_ENCRYPTION" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.security.CryptKeeperSettings" />
-            <meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY"
-                       android:value="@string/menu_key_security"/>
-        </activity>
-
         <activity
             android:name="Settings$DataUsageSummaryActivity"
             android:label="@string/data_usage_summary_title"
@@ -3388,7 +3370,7 @@
 
         <activity
             android:name=".sim.SimDialogActivity"
-            android:theme="@style/Theme.AlertDialog"
+            android:theme="@style/Theme.AlertDialog.SimConfirmDialog"
             android:label="@string/sim_settings_title"
             android:launchMode="singleTop"
             android:exported="true"
@@ -4220,14 +4202,14 @@
             android:exported="false"
             android:permission="android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS"
             android:launchMode="singleInstance"
-            android:theme="@*android:style/Theme.DeviceDefault.Dialog.Alert.DayNight" />
+            android:theme="@style/Theme.AlertDialog.SimConfirmDialog"/>
 
         <activity
             android:name=".sim.DsdsDialogActivity"
             android:exported="false"
             android:permission="android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS"
             android:launchMode="singleInstance"
-            android:theme="@*android:style/Theme.DeviceDefault.Dialog.Alert.DayNight" />
+            android:theme="@style/Theme.AlertDialog.SimConfirmDialog"/>
 
         <service android:name=".sim.SimNotificationService"
                  android:permission="android.permission.BIND_JOB_SERVICE" />
diff --git a/color-check-baseline.xml b/color-check-baseline.xml
index 2907416..26aeba3 100644
--- a/color-check-baseline.xml
+++ b/color-check-baseline.xml
@@ -85,22 +85,6 @@
         priority="4"
         summary="Using hardcoded color"
         explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
-        errorLine1="    &lt;color name=&quot;crypt_keeper_clock_background&quot;>#ff9a9a9a&lt;/color>"
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res/values/colors.xml"
-            line="20"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="HardCodedColor"
-        severity="Error"
-        message="Avoid using hardcoded color"
-        category="Correctness"
-        priority="4"
-        summary="Using hardcoded color"
-        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
         errorLine1="    &lt;color name=&quot;homepage_accessibility_background&quot;>#783BE5&lt;/color>"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
@@ -117,22 +101,6 @@
         priority="4"
         summary="Using hardcoded color"
         explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
-        errorLine1="    &lt;color name=&quot;crypt_keeper_clock_foreground&quot;>#ff666666&lt;/color>"
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res/values/colors.xml"
-            line="21"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="HardCodedColor"
-        severity="Error"
-        message="Avoid using hardcoded color"
-        category="Correctness"
-        priority="4"
-        summary="Using hardcoded color"
-        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
         errorLine1="    &lt;color name=&quot;homepage_support_background&quot;>#3F5FBD&lt;/color>"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
@@ -149,38 +117,6 @@
         priority="4"
         summary="Using hardcoded color"
         explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
-        errorLine1="    &lt;color name=&quot;crypt_keeper_clock_am_pm&quot;>#ff9a9a9a&lt;/color>"
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res/values/colors.xml"
-            line="22"
-            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;crypt_keeper_password_background&quot;>#70606060&lt;/color>"
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res/values/colors.xml"
-            line="23"
-            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;divider_color&quot;>#20ffffff&lt;/color>"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
@@ -2149,86 +2085,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:textColor=&quot;#FFFFFF&quot;"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res/layout/crypt_keeper_emergency_button.xml"
-            line="35"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="HardCodedColor"
-        severity="Error"
-        message="Avoid using hardcoded color"
-        category="Correctness"
-        priority="4"
-        summary="Using hardcoded color"
-        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
-        errorLine1="        android:background=&quot;@color/crypt_keeper_password_background&quot;>"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res/layout/crypt_keeper_password_entry.xml"
-            line="34"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="HardCodedColor"
-        severity="Error"
-        message="Avoid using hardcoded color"
-        category="Correctness"
-        priority="4"
-        summary="Using hardcoded color"
-        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
-        errorLine1="       android:background=&quot;@color/lock_pattern_background&quot; />"
-        errorLine2="       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res/layout/crypt_keeper_pattern_field.xml"
-            line="27"
-            column="8"/>
-    </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/crypt_keeper_password_background&quot;>"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res/layout/crypt_keeper_pin_entry.xml"
-            line="34"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="HardCodedColor"
-        severity="Error"
-        message="Avoid using hardcoded color"
-        category="Correctness"
-        priority="4"
-        summary="Using hardcoded color"
-        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
-        errorLine1="        android:textColor=&quot;#B3FFFFFF&quot;"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res/layout/crypt_keeper_status.xml"
-            line="55"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="HardCodedColor"
-        severity="Error"
-        message="Avoid using hardcoded color"
-        category="Correctness"
-        priority="4"
-        summary="Using hardcoded color"
-        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
         errorLine1="    android:tint=&quot;@color/face_enroll_icon_color&quot;>"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
diff --git a/res/drawable-hdpi/encroid_progress.png b/res/drawable-hdpi/encroid_progress.png
deleted file mode 100644
index f4fb961..0000000
--- a/res/drawable-hdpi/encroid_progress.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/encroid_waiting.png b/res/drawable-hdpi/encroid_waiting.png
deleted file mode 100644
index 1143cb7..0000000
--- a/res/drawable-hdpi/encroid_waiting.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/encroid_progress.png b/res/drawable-mdpi/encroid_progress.png
deleted file mode 100644
index e832c2a..0000000
--- a/res/drawable-mdpi/encroid_progress.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/encroid_waiting.png b/res/drawable-mdpi/encroid_waiting.png
deleted file mode 100644
index a9ac2f7..0000000
--- a/res/drawable-mdpi/encroid_waiting.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/encroid_progress.png b/res/drawable-xhdpi/encroid_progress.png
deleted file mode 100644
index ed9d10f..0000000
--- a/res/drawable-xhdpi/encroid_progress.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/encroid_waiting.png b/res/drawable-xhdpi/encroid_waiting.png
deleted file mode 100644
index aea5d57..0000000
--- a/res/drawable-xhdpi/encroid_waiting.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/sim_confirm_dialog_btn_outline.xml b/res/drawable/sim_confirm_dialog_btn_outline.xml
new file mode 100644
index 0000000..5722f8c
--- /dev/null
+++ b/res/drawable/sim_confirm_dialog_btn_outline.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2021 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<inset xmlns:android="http://schemas.android.com/apk/res/android"
+       xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
+       android:insetTop="16dp"
+       android:insetBottom="24dp">
+    <ripple android:color="?android:attr/colorControlHighlight">
+        <item android:id="@android:id/mask">
+            <shape android:shape="rectangle">
+                <solid android:color="@android:color/white"/>
+                <corners android:radius="24dp"/>
+            </shape>
+        </item>
+        <item>
+            <shape android:shape="rectangle">
+                <corners android:radius="24dp"/>
+                <solid android:color="@android:color/transparent"/>
+                <stroke android:color="?androidprv:attr/colorAccentPrimaryVariant"
+                        android:width="1dp" />
+                <padding android:left="16dp"
+                         android:top="8dp"
+                         android:right="16dp"
+                         android:bottom="8dp"/>
+            </shape>
+        </item>
+    </ripple>
+</inset>
diff --git a/res/drawable/sim_confirm_dialog_rounded_bg.xml b/res/drawable/sim_confirm_dialog_rounded_bg.xml
new file mode 100644
index 0000000..ab7e392
--- /dev/null
+++ b/res/drawable/sim_confirm_dialog_rounded_bg.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<inset xmlns:android="http://schemas.android.com/apk/res/android"
+    android:insetLeft="24dp"
+    android:insetRight="24dp">
+    <shape xmlns:android="http://schemas.android.com/apk/res/android"
+           android:shape="rectangle">
+        <solid android:color="@color/settingslib_state_on_color"/>
+        <corners
+            android:bottomLeftRadius="8dp"
+            android:topLeftRadius="8dp"
+            android:bottomRightRadius="8dp"
+            android:topRightRadius="8dp"
+            />
+    </shape>
+</inset>
diff --git a/res/layout-land/crypt_keeper_progress.xml b/res/layout-land/crypt_keeper_progress.xml
deleted file mode 100644
index 7c182cb..0000000
--- a/res/layout-land/crypt_keeper_progress.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 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="match_parent"
-    android:layout_height="match_parent"
-    android:padding="16dip"
-    android:orientation="vertical"
->
-
-    <TextView
-        android:id="@+id/title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:minHeight="48dip"
-        android:layout_alignParentStart="true"
-        android:layout_centerVertical="true"
-        android:textSize="30dip"
-        android:textColor="@color/title_color"
-        android:text="@string/crypt_keeper_setup_title"
-        android:gravity="bottom"
-    />
-
-    <!-- Divider -->
-    <RelativeLayout
-        android:id="@+id/top_divider"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-    >
-        <ProgressBar
-            android:id="@+id/progress_bar"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            style="?android:attr/progressBarStyleHorizontal"
-        />
-    </RelativeLayout>
-
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="0dip"
-        android:layout_weight="1"
-        android:orientation="horizontal"
-    >
-        <TextView
-            android:id="@+id/status"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-        />
-
-        <ImageView
-            android:id="@+id/encroid"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:src="@drawable/encroid_waiting"
-            android:contentDescription="@null"
-        />
-
-        <Button
-            android:id="@+id/factory_reset"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_margin="32dip"
-            android:text="@string/main_clear_button_text"
-            android:visibility="gone"
-        />
-    </LinearLayout>
-
-</LinearLayout>
-
diff --git a/res/layout-sw600dp/crypt_keeper_pattern_entry.xml b/res/layout-sw600dp/crypt_keeper_pattern_entry.xml
deleted file mode 100644
index 3937008..0000000
--- a/res/layout-sw600dp/crypt_keeper_pattern_entry.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License")
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:layout_marginTop="@dimen/crypt_keeper_pattern_top_margin">
-
-    <include layout="@layout/crypt_keeper_status" />
-
-    <LinearLayout
-        android:layout_width="@dimen/crypt_keeper_pattern_size"
-        android:layout_height="@dimen/crypt_keeper_pattern_size"
-        android:orientation="horizontal"
-        android:layout_gravity="center_horizontal"
-        android:layout_marginTop="@dimen/crypt_keeper_pattern_separator">
-
-        <include layout="@layout/crypt_keeper_pattern_field" />
-
-    </LinearLayout>
-
-    <include layout="@layout/crypt_keeper_emergency_button" />
-
-</LinearLayout>
diff --git a/res/layout-sw600dp/crypt_keeper_progress.xml b/res/layout-sw600dp/crypt_keeper_progress.xml
deleted file mode 100644
index 025d895..0000000
--- a/res/layout-sw600dp/crypt_keeper_progress.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
-  -->
-
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
->
-    <RelativeLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:padding="64dip"
-    >
-        <ImageView
-            android:id="@+id/encroid"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentEnd="true"
-            android:layout_alignParentBottom="true"
-            android:paddingEnd="65dip"
-            android:src="@drawable/encroid_waiting"
-            android:contentDescription="@null"
-        />
-
-        <TextView
-            android:id="@+id/title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:minHeight="48dip"
-            android:layout_alignParentTop="true"
-            android:layout_alignParentStart="true"
-            android:layout_marginStart="16dip"
-            android:layout_marginEnd="16dip"
-            android:textSize="30dip"
-            android:textColor="@color/title_color"
-            android:text="@string/crypt_keeper_setup_title"
-            android:gravity="bottom"
-        />
-
-        <!-- Divider -->
-        <RelativeLayout
-            android:id="@+id/top_divider"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/title"
-        >
-            <ProgressBar
-                android:id="@+id/progress_bar"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                style="?android:attr/progressBarStyleHorizontal"
-            />
-        </RelativeLayout>
-
-        <TextView
-            android:id="@+id/status"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/top_divider"
-            android:paddingTop="21dip"
-            android:layout_marginStart="16dip"
-            android:layout_marginEnd="16dip"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-        />
-
-        <!-- Divider -->
-        <RelativeLayout
-            android:id="@+id/bottom_divider"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_above="@+id/factory_reset"
-            android:visibility="gone"
-        >
-            <ProgressBar
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                style="?android:attr/progressBarStyleHorizontal"
-            />
-        </RelativeLayout>
-
-        <Button
-            android:id="@+id/factory_reset"
-            android:layout_width="208dip"
-            android:layout_height="48dip"
-            android:layout_alignParentEnd="true"
-            android:layout_alignParentBottom="true"
-            android:layout_marginBottom="80dip"
-            android:layout_marginEnd="16dip"
-            android:text="@string/main_clear_button_text"
-            android:visibility="gone"
-        />
-
-    </RelativeLayout>
-</FrameLayout>
diff --git a/res/layout/app_preferred_settings.xml b/res/layout/app_preferred_settings.xml
index b3343f5..126b9d8 100644
--- a/res/layout/app_preferred_settings.xml
+++ b/res/layout/app_preferred_settings.xml
@@ -18,7 +18,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingStart="@dimen/preference_no_icon_padding_start"
+    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
     android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
     android:paddingBottom="5dip"
     android:orientation="vertical">
diff --git a/res/layout/battery_saver_schedule_percentage_seekbar.xml b/res/layout/battery_saver_schedule_percentage_seekbar.xml
deleted file mode 100644
index 7862822..0000000
--- a/res/layout/battery_saver_schedule_percentage_seekbar.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2021 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Layout used by BatterySaverScheduleSeekBarController for the seekbar widget. -->
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginVertical="6dp"
-    android:gravity="center_vertical"
-    android:orientation="vertical"
-    android:minHeight="?android:attr/listPreferredItemHeight"
-    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
-
-  <TextView
-      android:id="@android:id/title"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:ellipsize="marquee"
-      android:layout_marginStart="18dp"
-      android:singleLine="true"
-      android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead"
-      android:textColor="?android:attr/textColorPrimary" />
-
-  <com.android.settings.widget.DefaultIndicatorSeekBar
-      android:id="@*android:id/seekbar"
-      style="@android:style/Widget.Material.SeekBar.Discrete"
-      android:layout_width="match_parent"
-      android:layout_height="48dp"
-      android:layout_marginStart="18dp"
-      android:layout_marginEnd="9dp" />
-
-</LinearLayout>
diff --git a/res/layout/bluetooth_pin_confirm.xml b/res/layout/bluetooth_pin_confirm.xml
index 4891275..28ad1f6 100644
--- a/res/layout/bluetooth_pin_confirm.xml
+++ b/res/layout/bluetooth_pin_confirm.xml
@@ -65,6 +65,18 @@
             android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead"
             android:visibility="gone" />
 
+        <TextView
+            android:id="@+id/pairing_group_message"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/bluetooth_dialog_padding"
+            android:layout_marginEnd="@dimen/bluetooth_dialog_padding"
+            android:layout_marginBottom="@dimen/bluetooth_dialog_padding"
+            android:gravity="center_vertical"
+            android:text="@string/bluetooth_paring_group_msg"
+            android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
+            android:visibility="gone" />
+
         <CheckBox
             android:id="@+id/phonebook_sharing_message_confirm_pin"
             android:layout_width="wrap_content"
diff --git a/res/layout/confirm_convert_fbe.xml b/res/layout/confirm_convert_fbe.xml
deleted file mode 100644
index 537c368..0000000
--- a/res/layout/confirm_convert_fbe.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical"
-            android:layout_marginBottom="12dp" >
-
-        <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
-                android:layout_marginEnd="12dp"
-                android:layout_marginTop="12dp"
-                android:textSize="18sp"
-                android:text="@string/confirm_convert_to_fbe_warning" />
-
-        <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="fill_parent"
-                android:layout_gravity="center"
-                android:orientation="horizontal">
-            <Button
-                    android:id="@+id/button_confirm_convert_fbe"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="bottom"
-                    android:layout_marginBottom="12dp"
-                    android:text="@string/button_confirm_convert_fbe" />
-        </LinearLayout>
-
-</LinearLayout>
diff --git a/res/layout/convert_fbe.xml b/res/layout/convert_fbe.xml
deleted file mode 100644
index d1e0cea..0000000
--- a/res/layout/convert_fbe.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical"
-            android:layout_marginBottom="12dp" >
-
-        <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/preference_no_icon_padding_start"
-                android:layout_marginEnd="12dp"
-                android:layout_marginTop="12dp"
-                android:textSize="18sp"
-                android:text="@string/convert_to_fbe_warning" />
-
-        <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="fill_parent"
-                android:layout_gravity="center"
-                android:orientation="horizontal">
-            <Button
-                    android:id="@+id/button_convert_fbe"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="bottom"
-                    android:layout_marginBottom="12dp"
-                    android:text="@string/button_convert_fbe" />
-        </LinearLayout>
-
-</LinearLayout>
diff --git a/res/layout/crypt_keeper_blank.xml b/res/layout/crypt_keeper_blank.xml
deleted file mode 100644
index 2cd9c91..0000000
--- a/res/layout/crypt_keeper_blank.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 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="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:gravity="center_vertical"
->
-
-    <ImageView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:src="@drawable/encroid_progress"
-        android:contentDescription="@null"
-    />
-
-</LinearLayout>
diff --git a/res/layout/crypt_keeper_confirm.xml b/res/layout/crypt_keeper_confirm.xml
deleted file mode 100644
index 1b64909..0000000
--- a/res/layout/crypt_keeper_confirm.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012 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="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    >
-
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="0dip"
-        android:layout_marginStart="16dp"
-        android:layout_marginEnd="16dp"
-        android:layout_marginTop="16dp"
-        android:layout_weight="1"
-    >
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="8dip"
-            android:layout_marginBottom="16dip"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:text="@string/crypt_keeper_final_desc"
-        />
-    </ScrollView>
-
-    <Button android:id="@+id/execute_encrypt"
-        android:layout_gravity="center_horizontal"
-        android:layout_marginTop="16dip"
-        android:layout_marginBottom="16dip"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/crypt_keeper_button_text"
-        android:gravity="center" />
-        
-</LinearLayout>
diff --git a/res/layout/crypt_keeper_emergency_button.xml b/res/layout/crypt_keeper_emergency_button.xml
deleted file mode 100644
index 6efcf5a..0000000
--- a/res/layout/crypt_keeper_emergency_button.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License")
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- Emergency call button.
-     Text is set by CryptKeeper.updateEmergencyCallButtonState() -->
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="0dp"
-    android:layout_weight="1"
-    android:orientation="vertical">
-    <Button
-        android:id="@+id/emergencyCallButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:textSize="14sp"
-        android:fontFamily="sans-serif"
-        android:textColor="#FFFFFF"
-        style="?android:attr/borderlessButtonStyle" />
-
-</LinearLayout>
diff --git a/res/layout/crypt_keeper_password_entry.xml b/res/layout/crypt_keeper_password_entry.xml
deleted file mode 100644
index a7fecba..0000000
--- a/res/layout/crypt_keeper_password_entry.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License")
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:layout_marginTop="@dimen/crypt_keeper_password_top_margin">
-
-    <include layout="@layout/crypt_keeper_status" />
-
-    <LinearLayout
-        android:layout_width="@dimen/crypt_keeper_password_width"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:layout_marginTop="16dip"
-        android:layout_gravity="center_horizontal"
-        android:background="@color/crypt_keeper_password_background">
-
-        <include layout="@layout/crypt_keeper_password_field" />
-
-    </LinearLayout>
-
-    <include layout="@layout/crypt_keeper_emergency_button" />
-
-</LinearLayout>
diff --git a/res/layout/crypt_keeper_password_field.xml b/res/layout/crypt_keeper_password_field.xml
deleted file mode 100644
index 849c365..0000000
--- a/res/layout/crypt_keeper_password_field.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License")
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- Contents of the password entry field for CryptKeeper. Comes with an IME
-     switcher, if necessary. Assumed to be in a horizontal LinearLayout. -->
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <!-- Note that crypt_keeper_pin_field.xml also has ImeAwareEditText with the same ID. -->
-    <ImeAwareEditText android:id="@+id/passwordEntry"
-        android:layout_height="wrap_content"
-        android:layout_width="0dip"
-        android:layout_weight="1"
-        android:inputType="textPassword"
-        android:imeOptions="flagForceAscii"
-        android:textSize="16sp"
-        android:padding="10sp"
-        android:maxLength="500"
-        style="@style/TextAppearance.CryptKeeper_PasswordEntry" />
-
-   <include layout="@layout/crypt_keeper_switch_input_method" />
-
-</merge>
diff --git a/res/layout/crypt_keeper_pattern_entry.xml b/res/layout/crypt_keeper_pattern_entry.xml
deleted file mode 100644
index 00d3d6e..0000000
--- a/res/layout/crypt_keeper_pattern_entry.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License")
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:layout_marginTop="@dimen/crypt_keeper_pattern_top_margin">
-
-    <include layout="@layout/crypt_keeper_status" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/crypt_keeper_pattern_margin"
-        android:layout_marginEnd="@dimen/crypt_keeper_pattern_margin"
-        android:orientation="horizontal">
-
-        <include layout="@layout/crypt_keeper_pattern_field" />
-
-    </LinearLayout>
-
-    <include layout="@layout/crypt_keeper_emergency_button" />
-
-</LinearLayout>
diff --git a/res/layout/crypt_keeper_pattern_field.xml b/res/layout/crypt_keeper_pattern_field.xml
deleted file mode 100644
index e12f77b..0000000
--- a/res/layout/crypt_keeper_pattern_field.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License")
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- Contents of the password entry field for CryptKeeper. Comes with an IME
-     switcher, if necessary. Assumed to be in a horizontal LinearLayout. -->
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
-
-   <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
-       android:layout_width="match_parent"
-       android:layout_height="match_parent"
-       android:background="@color/lock_pattern_background" />
-
-   <include layout="@layout/crypt_keeper_switch_input_method" />
-
-</merge>
diff --git a/res/layout/crypt_keeper_pin_entry.xml b/res/layout/crypt_keeper_pin_entry.xml
deleted file mode 100644
index 3926ab0..0000000
--- a/res/layout/crypt_keeper_pin_entry.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License")
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:layout_marginTop="@dimen/crypt_keeper_password_top_margin">
-
-    <include layout="@layout/crypt_keeper_status" />
-
-    <LinearLayout
-        android:layout_width="@dimen/crypt_keeper_password_width"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="16dip"
-        android:orientation="horizontal"
-        android:layout_gravity="center_horizontal"
-        android:background="@color/crypt_keeper_password_background">
-
-        <include layout="@layout/crypt_keeper_pin_field" />
-
-    </LinearLayout>
-
-    <include layout="@layout/crypt_keeper_emergency_button" />
-
-</LinearLayout>
diff --git a/res/layout/crypt_keeper_pin_field.xml b/res/layout/crypt_keeper_pin_field.xml
deleted file mode 100644
index d39d14d..0000000
--- a/res/layout/crypt_keeper_pin_field.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License")
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- Contents of the password entry field for CryptKeeper. Comes with an IME
-     switcher, if necessary. Assumed to be in a horizontal LinearLayout. -->
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <!-- Note that crypt_keeper_password_field.xml also has ImeAwareEditText with the same ID. -->
-    <ImeAwareEditText android:id="@+id/passwordEntry"
-        android:layout_height="wrap_content"
-        android:layout_width="0dip"
-        android:layout_weight="1"
-        android:inputType="numberPassword"
-        android:textSize="28sp"
-        android:padding="4sp"
-        android:maxLength="500"
-        style="@style/TextAppearance.CryptKeeper_PasswordEntry" />
-
-   <include layout="@layout/crypt_keeper_switch_input_method" />
-
-</merge>
diff --git a/res/layout/crypt_keeper_progress.xml b/res/layout/crypt_keeper_progress.xml
deleted file mode 100644
index 16cc7a1..0000000
--- a/res/layout/crypt_keeper_progress.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 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="match_parent"
-    android:layout_height="match_parent"
-    android:padding="16dip"
-    android:orientation="vertical"
->
-
-    <TextView
-        android:id="@+id/title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:minHeight="48dip"
-        android:layout_alignParentStart="true"
-        android:layout_centerVertical="true"
-        android:textSize="30dip"
-        android:textColor="@color/title_color"
-        android:text="@string/crypt_keeper_setup_title"
-        android:gravity="bottom"
-    />
-
-    <!-- Divider -->
-    <RelativeLayout
-        android:id="@+id/top_divider"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-    >
-        <ProgressBar
-            android:id="@+id/progress_bar"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            style="?android:attr/progressBarStyleHorizontal"
-        />
-    </RelativeLayout>
-
-
-    <TextView
-        android:id="@+id/status"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-    />
-
-    <ImageView
-        android:id="@+id/encroid"
-        android:layout_width="wrap_content"
-        android:layout_height="0dip"
-        android:layout_weight="1"
-        android:layout_gravity="bottom|end"
-        android:src="@drawable/encroid_waiting"
-        android:contentDescription="@null"
-    />
-
-    <Button
-        android:id="@+id/factory_reset"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_margin="32dip"
-        android:layout_gravity="center"
-        android:text="@string/main_clear_button_text"
-        android:visibility="gone"
-    />
-
-</LinearLayout>
diff --git a/res/layout/crypt_keeper_settings.xml b/res/layout/crypt_keeper_settings.xml
deleted file mode 100644
index 6b33e00..0000000
--- a/res/layout/crypt_keeper_settings.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 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="match_parent"
-    android:layout_height="match_parent"
-    android:paddingStart="@dimen/preference_no_icon_padding_start"
-    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-    android:orientation="vertical">
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="0dip"
-        android:layout_marginTop="16dp"
-        android:layout_weight="1">
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dip"
-                android:layout_marginBottom="16dip"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:text="@string/crypt_keeper_desc" />
-            <TextView
-                android:id="@+id/warning_low_charge"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dip"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:textStyle="bold"
-                android:text="@string/crypt_keeper_low_charge_text"
-                android:visibility="gone" />
-            <TextView
-                android:id="@+id/warning_unplugged"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dip"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:textStyle="bold"
-                android:text="@string/crypt_keeper_unplugged_text"
-                android:visibility="gone" />
-        </LinearLayout>
-    </ScrollView>
-    <Button
-        android:id="@+id/initiate_encrypt"
-        style="@style/ActionPrimaryButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="end"
-        android:text="@string/crypt_keeper_button_text" />
-</LinearLayout>
diff --git a/res/layout/crypt_keeper_status.xml b/res/layout/crypt_keeper_status.xml
deleted file mode 100644
index bddff1a..0000000
--- a/res/layout/crypt_keeper_status.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License")
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- Status to show on the left side of lock screen -->
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_gravity="center_horizontal">
-
-    <!-- We need android:gravity="center_horizontal" to make multi line
-    status strings look good -->
-    <TextView
-        android:id="@+id/status"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="8dip"
-        android:layout_marginEnd="8dip"
-        android:textSize="16sp"
-        android:fontFamily="sans-serif"
-        android:textColor="@android:color/white"
-        android:text="@string/enter_password"
-        android:layout_gravity="center_horizontal"
-        android:gravity="center_horizontal" />
-
-    <TextView
-        android:id="@+id/owner_info"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="10dip"
-        android:layout_marginStart="8dip"
-        android:layout_marginEnd="8dip"
-        android:singleLine="true"
-        android:ellipsize="marquee"
-        android:marqueeRepeatLimit ="marquee_forever"
-        android:textSize="16sp"
-        android:fontFamily="sans-serif"
-        android:textColor="#B3FFFFFF"
-        android:gravity="center_horizontal" />
-
-</LinearLayout>
diff --git a/res/layout/crypt_keeper_switch_input_method.xml b/res/layout/crypt_keeper_switch_input_method.xml
deleted file mode 100644
index 3fae593..0000000
--- a/res/layout/crypt_keeper_switch_input_method.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License")
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<ImageView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/switch_ime_button"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:src="@*android:drawable/ic_lockscreen_ime"
-    android:clickable="true"
-    android:contentDescription="@string/crypt_keeper_switch_input_method"
-    android:padding="@dimen/crypt_keeper_edit_text_ime_padding"
-    android:layout_gravity="center"
-    android:background="?android:attr/selectableItemBackground"
-    android:visibility="gone" />
diff --git a/res/layout/dialog_sim_status.xml b/res/layout/dialog_sim_status.xml
index 27d12a8..c169e58 100644
--- a/res/layout/dialog_sim_status.xml
+++ b/res/layout/dialog_sim_status.xml
@@ -166,6 +166,7 @@
             android:id="@+id/esim_id_value"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:textIsSelectable="true"
             android:text="@string/device_info_not_available"/>
 
         <TextView
diff --git a/res/layout/enable_accessibility_service_dialog_content.xml b/res/layout/enable_accessibility_service_dialog_content.xml
index 6b3220b..3fe932c 100644
--- a/res/layout/enable_accessibility_service_dialog_content.xml
+++ b/res/layout/enable_accessibility_service_dialog_content.xml
@@ -43,14 +43,6 @@
                 style="@style/AccessibilityDialogTitle" />
 
             <TextView
-                android:id="@+id/encryption_warning"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:padding="10dip"
-                android:textAlignment="viewStart"
-                android:textAppearance="?android:attr/textAppearanceMedium"/>
-
-            <TextView
                 android:id="@+id/permissionDialog_description"
                 android:text="@string/accessibility_service_warning_description"
                 style="@style/AccessibilityDialogDescription" />
diff --git a/res/layout/le_audio_bt_entity_header.xml b/res/layout/le_audio_bt_entity_header.xml
new file mode 100644
index 0000000..6e2a1e8
--- /dev/null
+++ b/res/layout/le_audio_bt_entity_header.xml
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2022 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:id="@+id/entity_header"
+    style="@style/EntityHeader"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_centerHorizontal="true"
+    android:gravity="center_horizontal"
+    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/entity_header_title"
+        style="@style/TextAppearance.EntityHeaderTitle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:singleLine="false"
+        android:ellipsize="marquee"
+        android:textDirection="locale"/>
+
+    <TextView
+        android:id="@+id/entity_header_summary"
+        style="@style/TextAppearance.EntityHeaderSummary"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="4dp"
+        android:singleLine="false"
+        android:ellipsize="marquee"
+        android:textDirection="locale"/>
+
+    <ImageView
+        android:id="@+id/entity_header_icon"
+        android:layout_width="72dp"
+        android:layout_height="72dp"
+        android:layout_marginTop="24dp"
+        android:scaleType="fitCenter"
+        android:antialias="true"/>
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/le_bluetooth_battery_start_margin"
+            android:orientation="vertical">
+            <TextView
+                android:id="@+id/bt_battery_case_title"
+                style="@style/TextAppearance.EntityHeaderTitle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/le_bluetooth_battery_top_margin"
+                android:gravity="start|center_vertical"
+                android:ellipsize="end"
+                android:textDirection="locale"
+                android:text="@string/bluetooth_middle_name"
+                android:textSize="@dimen/advanced_bluetooth_header_title_text_size"
+                android:visibility="gone"/>
+            <TextView
+                android:id="@+id/bt_battery_left_title"
+                style="@style/TextAppearance.EntityHeaderTitle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/le_bluetooth_battery_top_margin"
+                android:gravity="start|center_vertical"
+                android:ellipsize="end"
+                android:textDirection="locale"
+                android:text="@string/bluetooth_left_name"
+                android:textSize="@dimen/advanced_bluetooth_header_title_text_size"/>
+            <TextView
+                android:id="@+id/bt_battery_right_title"
+                style="@style/TextAppearance.EntityHeaderTitle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/le_bluetooth_battery_top_margin"
+                android:gravity="start|center_vertical"
+                android:ellipsize="end"
+                android:textDirection="locale"
+                android:text="@string/bluetooth_right_name"
+                android:textSize="@dimen/advanced_bluetooth_header_title_text_size"/>
+        </LinearLayout>
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/le_bluetooth_summary_start_margin"
+            android:orientation="vertical">
+            <TextView
+                android:id="@+id/bt_battery_case_summary"
+                style="@style/TextAppearance.EntityHeaderSummary"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/le_bluetooth_battery_top_margin"
+                android:padding="@dimen/le_bluetooth_summary_padding"
+                android:drawablePadding="@dimen/le_bluetooth_summary_drawable_padding"
+                android:visibility="gone"/>
+            <TextView
+                android:id="@+id/bt_battery_left_summary"
+                style="@style/TextAppearance.EntityHeaderSummary"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/le_bluetooth_battery_top_margin"
+                android:padding="@dimen/le_bluetooth_summary_padding"
+                android:drawablePadding="@dimen/le_bluetooth_summary_drawable_padding"/>
+            <TextView
+                android:id="@+id/bt_battery_right_summary"
+                style="@style/TextAppearance.EntityHeaderSummary"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/le_bluetooth_battery_top_margin"
+                android:padding="@dimen/le_bluetooth_summary_padding"
+                android:drawablePadding="@dimen/le_bluetooth_summary_drawable_padding"/>
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>
diff --git a/res/layout/profile_select_tablayout.xml b/res/layout/profile_select_tablayout.xml
deleted file mode 100644
index 3e83bb9..0000000
--- a/res/layout/profile_select_tablayout.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<!--
-  Copyright (C) 2019 The Android Open Source Project
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:theme="@style/Theme.MaterialComponents.DayNight"
-    android:clipToPadding="true"
-    android:clipChildren="true"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <com.google.android.material.tabs.TabLayout
-        android:background="@android:color/transparent"
-        android:id="@+id/tabs"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:tabMaxWidth="0dp"
-        app:tabGravity="fill"
-        app:tabMode="fixed"
-        app:tabIndicatorColor="@*android:color/accent_device_default"
-        app:tabSelectedTextColor="@*android:color/accent_device_default"
-        app:tabTextColor="?android:attr/textColorSecondary" />
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="?android:attr/listDivider"/>
-
-    <androidx.viewpager.widget.ViewPager
-        android:id="@+id/view_pager"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-    </androidx.viewpager.widget.ViewPager>
-</LinearLayout>
diff --git a/res/layout/select_account_list_item.xml b/res/layout/select_account_list_item.xml
index 3587e55..716adff 100644
--- a/res/layout/select_account_list_item.xml
+++ b/res/layout/select_account_list_item.xml
@@ -16,42 +16,26 @@
 
 <!-- Layout of a single item for displaying sim cards. -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="horizontal"
+    android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?android:attr/selectableItemBackground" >
-
-    <ImageView android:id="@+id/icon"
-        android:layout_width="48dp"
-        android:layout_height="48dp"
-        android:scaleType="center" />
-
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:orientation="vertical"
-        android:layout_marginStart="15dip"
-        android:layout_marginEnd="6dip"
-        android:layout_marginTop="6dip"
-        android:layout_marginBottom="6dip"
+    android:minHeight="?attr/listPreferredItemHeightSmall"
+    android:background="@drawable/sim_confirm_dialog_rounded_bg"
+    android:gravity="center">
+    <TextView android:id="@+id/title"
+        android:textAppearance="@style/TextAppearance.SimConfirmDialogList"
+        android:gravity="start|center_vertical"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_width="0dp"
-        android:layout_weight="1" >
-        <TextView android:id="@+id/title"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:gravity="start|center_vertical"
-            android:layout_marginLeft="8dp"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:singleLine="true"
-            android:ellipsize="marquee"
-            android:fadingEdge="horizontal" />
-        <TextView android:id="@+id/summary"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:gravity="start|center_vertical"
-            android:layout_marginLeft="8dp"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/title"
-            android:textColor="?android:attr/textColorSecondary"
-            android:layout_alignStart="@id/title" />
-    </LinearLayout>
+        android:singleLine="true"
+        android:ellipsize="marquee"
+        android:fadingEdge="horizontal" />
+    <TextView android:id="@+id/summary"
+        android:textAppearance="@style/TextAppearance.SimConfirmDialogList.Summary"
+        android:gravity="start|center_vertical"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/title"
+        android:textColor="?android:attr/textColorSecondary"
+        android:layout_alignStart="@id/title" />
 </LinearLayout>
diff --git a/res/layout/sim_confirm_dialog_item_multiple_enabled_profiles_supported.xml b/res/layout/sim_confirm_dialog_item_multiple_enabled_profiles_supported.xml
new file mode 100644
index 0000000..003cdbf
--- /dev/null
+++ b/res/layout/sim_confirm_dialog_item_multiple_enabled_profiles_supported.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/title"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="?attr/listPreferredItemHeightSmall"
+    style="?attr/materialAlertDialogBodyTextStyle"
+    android:gravity="center"
+    android:paddingTop="?attr/listPreferredItemPaddingStart"
+    android:paddingBottom="?attr/listPreferredItemPaddingEnd"
+    android:paddingLeft="?attr/listPreferredItemPaddingLeft"
+    android:paddingRight="?attr/listPreferredItemPaddingRight"
+    android:background="@drawable/sim_confirm_dialog_rounded_bg"
+    android:textAppearance="@style/TextAppearance.SimConfirmDialogList"
+    />
diff --git a/res/layout/sim_confirm_dialog_multiple_enabled_profiles_supported.xml b/res/layout/sim_confirm_dialog_multiple_enabled_profiles_supported.xml
new file mode 100644
index 0000000..610bf3d
--- /dev/null
+++ b/res/layout/sim_confirm_dialog_multiple_enabled_profiles_supported.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+        <TextView
+            android:id="@+id/msg"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingEnd="24dp"
+            android:paddingTop="16dp"
+            android:paddingStart="24dp"
+            android:gravity="center"
+            android:textAppearance="@style/TextAppearance.DialogMessage"/>
+        <ListView
+            android:id="@+id/carrier_list"
+            android:layout_gravity="center"
+            android:paddingTop="16dp"
+            android:dividerHeight="1dp"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"/>
+
+        <LinearLayout
+            android:id="@+id/info_outline_layout"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="start|top"
+            android:orientation="horizontal"
+            android:paddingEnd="24dp"
+            android:paddingTop="16dp"
+            android:paddingStart="24dp"
+            android:layout_marginBottom="16dp"
+            android:baselineAligned="true">
+                <ImageView
+                    android:src="@drawable/ic_info_outline_24dp"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:tint="?android:attr/textColorTertiary"/>
+                <TextView
+                    android:id="@+id/info_outline"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:paddingLeft="16dp"
+                    android:text="@string/sim_action_switch_sub_dialog_info_outline_for_turning_off"
+                    android:textColor="?android:attr/textColorSecondary"
+                    android:textAppearance="@style/TextAppearance.DialogMessage"/>
+        </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/sim_confirm_dialog_title_multiple_enabled_profiles_supported.xml b/res/layout/sim_confirm_dialog_title_multiple_enabled_profiles_supported.xml
new file mode 100644
index 0000000..f43303f
--- /dev/null
+++ b/res/layout/sim_confirm_dialog_title_multiple_enabled_profiles_supported.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/title"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingEnd="24dp"
+    android:paddingTop="16dp"
+    android:paddingLeft="24dp"
+    android:gravity="center"
+    style="?android:attr/textAppearanceLarge"/>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 6a85581..fa2ebd0 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -142,10 +142,11 @@
     <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"Laat jou toestel toe om met Bluetooth-toestelle in die omtrek te kommunikeer"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"Laat jou foon toe om met Bluetooth-toestelle in die omtrek te kommunikeer"</string>
     <string name="bluetooth_disable_a2dp_hw_offload" msgid="5942913792817797541">"Deaktiveer Bluetooth-A2DP-hardeware-aflaai"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="8610420176339657720">"Herbegin toestel?"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8333029144800835996">"Jy moet jou toestel herbegin om dié instelling te verander."</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="3488695418187553566">"Herbegin"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="4930826928585464191">"Kanselleer"</string>
+    <string name="bluetooth_disable_le_audio_hw_offload" msgid="3966022676505972908">"Deaktiveer Bluetooth LE AUDIO-hardewareoordrag"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_title" msgid="6001142380445276918">"Herbegin toestel?"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_message" msgid="1524373895333698779">"Jy moet jou toestel herbegin om hierdie instelling te verander."</string>
+    <string name="bluetooth_disable_hw_offload_dialog_confirm" msgid="5594859658551707592">"Herbegin"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel" msgid="3663690305043973720">"Kanselleer"</string>
     <string name="connected_device_media_device_title" msgid="3783388247594566734">"Mediatoestelle"</string>
     <string name="connected_device_call_device_title" msgid="88732390601723608">"Oproeptoestelle"</string>
     <string name="connected_device_other_device_title" msgid="4652120430615729193">"Ander toestelle"</string>
@@ -309,9 +310,9 @@
     <string name="security_settings_title" msgid="6710768415432791970">"Sekuriteit"</string>
     <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"Enkripsie en eiebewyse"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"Foon is geënkripteer"</string>
-    <string name="decryption_settings_summary" product="default" msgid="1742645256103613503">"Foon is nie geënkripteer nie"</string>
+    <string name="not_encrypted_summary" product="default" msgid="2251945842585788254">"Foon is nie geënkripteer nie"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"Toestel is geënkripteer"</string>
-    <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"Toestel is nie geënkripteer nie"</string>
+    <string name="not_encrypted_summary" product="tablet" msgid="2374263654698719382">"Toestel is nie geënkripteer nie"</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"Sluitskerm"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"Wat om te wys"</string>
     <string name="security_settings_summary" msgid="1627059516127354233">"Stel my ligging, ontsluit skerm, sluit SIM-kaart, eiebewys sluit"</string>
@@ -568,37 +569,10 @@
     <string name="fingerprint_last_delete_message" msgid="7860374760549404410">"Jy sal nie jou vingerafdruk kan gebruik om jou foon te ontsluit of in programme te verifieer dis jy nie."</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="4104208067277655068">"Jy sal nie jou vingerafdruk kan gebruik om jou werkprofiel te ontsluit, aankope te magtig of by werkprogramme aan te meld nie."</string>
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"Ja, verwyder"</string>
-    <string name="crypt_keeper_settings_title" msgid="4938812137822100044">"Enkripsie"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"Enkripteer tablet"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"Enkripteer foon"</string>
-    <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"Geënkripteer"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"Jy kan jou rekeninge, instellings, afgelaaide programme en hul data, media en ander lêers enkripteer. As aanvaar word dat jy \'n skermslot opgestel het (dit is \'n patroon of numeriese PIN of wagwoord), sal jy nadat jy jou tablet geënkripteer het, die skerm moet ontsluit om die tablet te dekripteer elke keer as jy dit aanskakel. Die enigste ander manier om dit te dekripteer, is om \'n fabriekdataterugstelling te doen wat al jou data sal uitvee.\n\nEnkriptering duur \'n uur of langer. Jy moet met \'n gelaaide battery begin en jou tablet regdeur die proses ingeprop hou. As jy dit onderbreek, sal jy sommige of al jou data verloor."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"Jy kan jou rekeninge, instellings, afgelaaide programme en hul data, media en ander lêers enkripteer. As aanvaar word dat jy \'n skermslot opgestel het (dit is \'n patroon of numeriese PIN of wagwoord), sal jy nadat jy jou foon geënkripteer het, die skerm moet ontsluit om die foon te dekripteer elke keer as jy dit aanskakel. Die enigste ander manier om dit te dekripteer, is om \'n fabriekdataterugstelling te doen wat al jou data sal uitvee.\n\nEnkriptering duur \'n uur of langer. Jy moet met \'n gelaaide battery begin en jou foon regdeur die proses ingeprop hou. As jy dit onderbreek, sal jy sommige of al jou data verloor."</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"Enkripteer tablet"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"Enkripteer foon"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"Laai jou battery en probeer weer."</string>
-    <string name="crypt_keeper_unplugged_text" msgid="2709721134148651329">"Prop jou laaier in en probeer weer."</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="1847280235529858357">"Geen skermslot-PIN of -wagwoord nie"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="7210616262954236042">"Jy moet \'n PIN of wagwoord vir die skermslot stel, voordat jy met enkripsie kan begin."</string>
-    <string name="crypt_keeper_confirm_title" msgid="8600000209722452230">"Enkripteer?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="3270587498436152259">"Die enkripsiehandeling is onomkeerbaar en as jy dit onderbreek, sal jy data verloor. Enkripsie neem \'n uur of langer en in daardie tyd sal die tablet \'n paar keer herbegin."</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="3040428543349852419">"Die enkripsiehandeling is onomkeerbaar en as jy dit onderbreek, sal jy data verloor. Enkripsie neem \'n uur of langer en in daardie tyd sal die foon \'n paar keer herbegin."</string>
-    <string name="crypt_keeper_setup_title" msgid="3339725741305796680">"Enkripteer"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="4417016995091289019">"Wag asseblief terwyl jou tablet geënkripteer word. <xliff:g id="PERCENT">^1</xliff:g>% voltooi."</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="7902355422499500352">"Wag asseblief terwyl jou foon geënkripteer word. <xliff:g id="PERCENT">^1</xliff:g>% voltooi."</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="8348188415839917821">"Wag terwyl jou tablet geënkripteer word. Oorblywende tyd: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="8556105766597855198">"Wag terwyl jou foon geënkripteer word. Oorblywende tyd: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="3832496715430327682">"Om jou tablet te ontsluit, skakel dit af en dan aan."</string>
-    <string name="crypt_keeper_force_power_cycle" product="default" msgid="5070346039522135361">"Om jou foon te ontsluit, skakel dit af en dan aan."</string>
-    <string name="crypt_keeper_warn_wipe" msgid="8104921337301750394">"Waarskuwing: Jou toestel sal uitgevee word na nog <xliff:g id="COUNT">^1</xliff:g> mislukte pogings om ontsluit te word!"</string>
-    <string name="crypt_keeper_enter_password" msgid="1274917431075529732">"Voer jou wagwoord in"</string>
-    <string name="crypt_keeper_failed_title" msgid="8173654570682244149">"Enkripsie onsuksesvol"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"Enkripsie is onderbreek en kan nie voltooi word nie. Gevolglik is die data op jou tablet nie langer toeganklik nie. \n\n Om gebruik van jou tablet te hervat, moet jy \'n fabriekterugstelling doen. As jy jou tablet opstel na die terugstelling, sal jy \'n geleentheid kry om enige inligting te herstel wat na jou Google-rekening gerugsteun was."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"Enkripsie is onderbreek en kan nie voltooi word nie. Gevolglik is die data op jou selfoon nie langer toeganklik nie. \n\nOm gebruik van jou selfoon te hervat, moet jy \'n fabriekterugstelling doen. As jy jou foon na die terugstelling weer opstel, sal jy \'n geleentheid kry om enige inligting te herstel wat na jou Google-rekening gerugsteun was."</string>
-    <string name="crypt_keeper_data_corrupt_title" msgid="5920153462176846037">"Dekripsie onsuksesvol"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"Die wagwoord wat jy ingevoer het, is korrek, maar ongelukkig is jou data korrup. \n\nJy moet \'n fabriekterugstelling doen om die tablet weer te kan gebruik. Wanneer jy jou tablet na die terugstelling opstel, sal jy die geleentheid hê om enige data te herwin wat in jou Google-rekening gerugsteun is."</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"Die wagwoord wat jy ingevoer het, is korrek, maar ongelukkig is jou data korrup. \n\nJy moet \'n fabriekterugstelling doen om die foon weer te kan gebruik. Wanneer jy jou foon na die terugstelling opstel, sal jy die geleentheid hê om enige data te herwin wat in jou Google-rekening gerugsteun is."</string>
-    <string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"Wissel invoermetode"</string>
+    <string name="encryption_settings_title" msgid="2848716008695618360">"Enkripsie"</string>
+    <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"Enkripteer tablet"</string>
+    <string name="encrypt_title" product="default" msgid="7337365190988321100">"Enkripteer foon"</string>
+    <string name="encrypted_summary" msgid="545623487587251207">"Geënkripteer"</string>
     <string name="suggested_lock_settings_title" msgid="7836065447159730217">"Beveilig jou foon"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"Stel skermslot om tablet te beskerm"</string>
     <string name="suggested_lock_settings_summary" product="device" msgid="8479766049078378225">"Stel skermslot om toestel te beskerm"</string>
@@ -817,6 +791,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Jy sal hierdie PIN dalk op die ander toestel ook moet invoer."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Jy sal hierdie sleutel dalk op die ander toestel ook moet invoer."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Om saam te bind met:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;maak seker dit wys hierdie geheimsleutel:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Bevestig om met die gekoördineerde stel saam te bind"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"Van:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Bind met hierdie toestel saam?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Om saam te bind met:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Voer daarop in:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, druk dan Return of Enter."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Laat toegang tot jou kontakte en oproepgeskiedenis toe"</string>
@@ -850,6 +825,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Kon nie koppel nie. Probeer weer."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Toestelbesonderhede"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Toestel se Bluetooth-adres: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Toestel se Bluetooth-adres:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Vergeet toestel?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Verwyder assosiasie"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Ontkoppel program?"</string>
@@ -881,6 +857,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Onthou instellings"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Maks. gekoppelde Bluetooth-oudiotoestelle"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Kies maksimum aantal gekoppelde Bluetooth-oudiotoestelle"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"NFC-stapelontfoutingloglêer"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Verhoog NFC-stapelloglêervlak"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Saai uit"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"weerspieël"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Aktiveer draadlose skermdeling"</string>
@@ -1188,6 +1166,8 @@
     <string name="wifi_hotspot_maximize_compatibility_dual_ap_summary" msgid="3579549223159056533">"Help ander toestelle om hierdie warmkol te kry. Verhoog batterygebruik."</string>
     <string name="wifi_tether_starting" msgid="8879874184033857814">"Skakel tans Wi-Fi-warmkol aan..."</string>
     <string name="wifi_tether_stopping" msgid="4416492968019409188">"Skakel tans Wi-Fi-warmkol af..."</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_title" msgid="3089432578433978073">"Verbinding is nie beskikbaar nie"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_content" msgid="5920421547607921112">"Kontak jou diensverskaffer vir besonderhede"</string>
     <string name="wifi_tether_enabled_subtext" msgid="5085002421099821056">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> is aktief"</string>
     <string name="wifi_tether_failed_subtext" msgid="437190628041885500">"Fout met draagbare Wi-Fi-warmkol"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7072559431286459122">"Stel Wi-Fi-warmkol op"</string>
@@ -2534,11 +2514,6 @@
     <string name="enable_service_title" msgid="7231533866953706788">"Gee <xliff:g id="SERVICE">%1$s</xliff:g> volle beheer oor jou toestel?"</string>
     <string name="capabilities_list_title" msgid="1225853611983394386">"<xliff:g id="SERVICE">%1$s</xliff:g> moet:"</string>
     <string name="touch_filtered_warning" msgid="4225815157460318241">"Instellings kan nie jou antwoord verifieer nie omdat \'n program \'n toestemmingversoek verberg."</string>
-    <string name="enable_service_encryption_warning" msgid="931082737770453755">"As jy <xliff:g id="SERVICE">%1$s</xliff:g> aanskakel, sal jou toestel nie jou skermslot gebruik om data-enkripsie te verbeter nie."</string>
-    <string name="secure_lock_encryption_warning" msgid="669152607190123579">"Omdat jy \'n toeganklikheiddiens aangeskakel het, sal jou toestel nie jou skermslot gebruik om data-enkripsie te verbeter nie."</string>
-    <string name="enable_service_pattern_reason" msgid="6832846117817938536">"Jy moet jou patroon bevestig, want as <xliff:g id="SERVICE">%1$s</xliff:g> aangeskakel is, beïnvloed dit datakodering."</string>
-    <string name="enable_service_pin_reason" msgid="6040417014360237703">"Jy moet jou PIN bevestig, want as <xliff:g id="SERVICE">%1$s</xliff:g> aangeskakel is, beïnvloed dit datakodering."</string>
-    <string name="enable_service_password_reason" msgid="6962544350351734238">"Jy moet jou wagwoord bevestig, want as <xliff:g id="SERVICE">%1$s</xliff:g> aangeskakel is, beïnvloed dit datakodering."</string>
     <string name="accessibility_service_warning" msgid="6779187188736432618">"<xliff:g id="SERVICE">%1$s</xliff:g> versoek tans volle beheer van hierdie toestel. Die diens kan die skerm lees en namens gebruikers met toeganklikheidsbehoeftes optree. Hierdie vlak van beheer is nie vir die meeste programme toepaslik nie."</string>
     <string name="accessibility_service_warning_description" msgid="6573203795976134751">"Volle beheer is gepas vir programme wat jou help met toeganklikheidsbehoeftes, maar nie vir die meeste programme nie."</string>
     <string name="accessibility_service_screen_control_title" msgid="324795030658109870">"Bekyk en beheer skerm"</string>
@@ -3103,14 +3078,6 @@
     <string name="remove_account_failed" msgid="3709502163548900644">"Hierdie verandering word nie deur jou administrateur toegelaat nie"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"Kan nie handmatig sinkroniseer nie"</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"Sinkronisering vir hierdie item is tans gedeaktiveer. Om hierdie instelling te verander, skakel agtergronddata en outomatiese sinkronisering tydelik aan."</string>
-    <string name="enter_password" msgid="6327051330258595331">"Voer jou wagwoord in om Android te begin"</string>
-    <string name="enter_pin" msgid="1029287617551232681">"Voer jou PIN in om Android te begin"</string>
-    <string name="enter_pattern" msgid="1747316785866742960">"Teken jou patroon om Android te begin"</string>
-    <string name="cryptkeeper_wrong_pattern" msgid="340747269176120242">"Verkeerde patroon"</string>
-    <string name="cryptkeeper_wrong_password" msgid="7295607881887114486">"Verkeerde wagwoord"</string>
-    <string name="cryptkeeper_wrong_pin" msgid="2347961593970714201">"Verkeerde PIN"</string>
-    <string name="checking_decryption" msgid="6111642972615688237">"Kontroleer tans …"</string>
-    <string name="starting_android" msgid="6694154070215356186">"Begin tans Android …"</string>
     <string name="delete" msgid="8330605554706263775">"Vee uit"</string>
     <string name="misc_files" msgid="6598066985800749585">"Diverse lêers"</string>
     <string name="misc_files_selected_count" msgid="5597802791672749532">"het <xliff:g id="NUMBER">%1$d</xliff:g> gekies uit <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -3206,8 +3173,6 @@
     <string name="data_usage_metered_yes" msgid="4262598072030135223">"Beperk"</string>
     <string name="data_usage_metered_no" msgid="1685828958417926268">"Nie beperk nie"</string>
     <string name="data_usage_disclaimer" msgid="3271450299386176770">"Diensverskaffer se datarekeninge kan van jou toestel verskil."</string>
-    <string name="cryptkeeper_emergency_call" msgid="8369322820475703306">"Noodoproep"</string>
-    <string name="cryptkeeper_return_to_call" msgid="3857250752781151232">"Keer terug na oproep"</string>
     <string name="vpn_name" msgid="3806456074909253262">"Naam"</string>
     <string name="vpn_type" msgid="5533202873260826663">"Tipe"</string>
     <string name="vpn_server" msgid="2908816134941973935">"Bedieneradres"</string>
@@ -4764,8 +4729,6 @@
       <item quantity="one">1 program kan onbeperkte data gebruik</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"Sien meer"</string>
-    <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"Regtig gebruikerdata skoonmaak en na lêerenkripsie oorskakel?"</string>
-    <string name="button_confirm_convert_fbe" msgid="339648921918438106">"Maak skoon en skakel om"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"Stel ShortcutManager se koersbeperking terug"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"ShortcutManager se koersbeperking is teruggestel"</string>
     <string name="notification_suggestion_title" msgid="6309263655965785411">"Beheer inligting op sluitskerm"</string>
@@ -4834,7 +4797,7 @@
     <string name="swipe_up_to_switch_apps_summary" msgid="1415457307836359560">"Swiep op op die tuisknoppie om programme te wissel. Swiep weer op om alle programme te sien. Tik op die terugknoppie om terug te gaan."</string>
     <string name="swipe_up_to_switch_apps_suggestion_title" msgid="5754081720589900007">"Probeer die nuwe Tuisknoppie"</string>
     <string name="swipe_up_to_switch_apps_suggestion_summary" msgid="8885866570559435110">"Skakel die nuwe gebaar aan om programme te wissel"</string>
-    <string name="emergency_settings_preference_title" msgid="6183455153241187148">"Veiligheid &amp; noodgeval"</string>
+    <string name="emergency_settings_preference_title" msgid="6183455153241187148">"Veiligheid en noodgeval"</string>
     <string name="emergency_dashboard_summary" msgid="401033951074039302">"Nood-SOS, mediese inligting, waarskuwings"</string>
     <string name="edge_to_edge_navigation_title" msgid="714427081306043819">"Gebaarnavigasie"</string>
     <string name="edge_to_edge_navigation_summary" msgid="8497033810637690561">"Swiep op van die onderkant van die skerm af om na die tuisskerm toe te gaan. Swiep op van die onderkant af, hou, en los dan om programme te wissel. Swiep van óf die linker- óf die regterrand af om terug te gaan."</string>
@@ -5292,6 +5255,7 @@
     <string name="sim_action_yes" msgid="8076556020131395515">"Ja"</string>
     <string name="sim_action_reboot" msgid="3508948833333441538">"Herbegin"</string>
     <string name="sim_action_no_thanks" msgid="435717748384544195">"Nee, dankie"</string>
+    <string name="sim_action_cancel" msgid="2668099867029610910">"Kanselleer"</string>
     <string name="sim_switch_button" msgid="1405772571706095387">"Skakel oor"</string>
     <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Kan nie SIM aktiveer nie"</string>
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Verwyder die SIM en voeg dit weer in. Herbegin jou toestel as die probleem voortduur."</string>
@@ -5444,6 +5408,10 @@
     <string name="cached_apps_freezer" msgid="1057519579761550350">"Skort uitvoering van gekaste programme op"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"Laat skermoorleggers op Instellings toe"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Laat programme wat oor ander programme kan wys toe om Instellings-skerms te oorlê"</string>
+    <!-- no translation found for allow_mock_modem (3832264806530479214) -->
+    <skip />
+    <!-- no translation found for allow_mock_modem_summary (9097416612748005374) -->
+    <skip />
     <string name="media_controls_title" msgid="403271085636252597">"Media"</string>
     <string name="media_controls_resume_title" msgid="855076860336652370">"Speld mediaspeler vas"</string>
     <string name="media_controls_resume_description" msgid="3163482266454802097">"Mediaspeler bly oop in Kitsinstellings om terugspeel vinnig te hervat"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 0156dfe..cf2d31d 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -142,10 +142,11 @@
     <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"ከአቅራቢያ ካሉ የብሉቱዝ መሣሪያዎች ጋር መልዕክት ለመለዋወጥ እንዲችል የእርስዎን መሣሪያ ይፍቀዱለት"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"ከአቅራቢያ ካሉ የብሉቱዝ መሣሪያዎች ጋር መልዕክት ለመለዋወጥ እንዲችል የእርስዎን ስልክ ይፍቀዱለት"</string>
     <string name="bluetooth_disable_a2dp_hw_offload" msgid="5942913792817797541">"የብሉቱዝ A2DP ሃርድዌር ማራገፍን አሰናክል"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="8610420176339657720">"መሣሪያ ዳግም ይጀምር?"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8333029144800835996">"ይህን ቅንብር ለመለወጥ የእርስዎን መሣሪያ ዳግም ማስጀመር ያስፈልግዎታል።"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="3488695418187553566">"ዳግም ጀምር"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="4930826928585464191">"ይቅር"</string>
+    <string name="bluetooth_disable_le_audio_hw_offload" msgid="3966022676505972908">"የብሉቱዝ LE AUDIO ሃርድዌር ማራገፍን ያሰናክሉ።"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_title" msgid="6001142380445276918">"መሣሪያ ዳግም ይጀምር?"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_message" msgid="1524373895333698779">"ይህን ቅንብር ለመለወጥ የእርስዎን መሣሪያ ዳግም ማስጀመር ይኖርብዎታል።"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_confirm" msgid="5594859658551707592">"ዳግም ጀምር"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel" msgid="3663690305043973720">"ይቅር"</string>
     <string name="connected_device_media_device_title" msgid="3783388247594566734">"የማህደረ መረጃ መሣሪያዎች"</string>
     <string name="connected_device_call_device_title" msgid="88732390601723608">"ወደ መሣሪያዎች ደውል"</string>
     <string name="connected_device_other_device_title" msgid="4652120430615729193">"ሌሎች መሣሪያዎች"</string>
@@ -309,9 +310,9 @@
     <string name="security_settings_title" msgid="6710768415432791970">"ደህንነት"</string>
     <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"ምስጠራ እና ምስክርነቶች"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"ስልክ ተመስጥሯል"</string>
-    <string name="decryption_settings_summary" product="default" msgid="1742645256103613503">"ስልክ አልተመሰጠረም"</string>
+    <string name="not_encrypted_summary" product="default" msgid="2251945842585788254">"ስልክ አልተመሰጠረም"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"መሣሪያ ተመሣጥሯል"</string>
-    <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"መሣሪያ አልተመሰጠረም"</string>
+    <string name="not_encrypted_summary" product="tablet" msgid="2374263654698719382">"መሣሪያ አልተመሰጠረም"</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"ማያ ገጽ ቁልፍ"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"ምን እንደሚታይ"</string>
     <string name="security_settings_summary" msgid="1627059516127354233">"የእኔን ስፍራ፣ማያ ክፈት፣SIM ካርድ ሽንጉር፣ መረጃ ማከማቻ ሽንጉር አዘጋጅ።"</string>
@@ -568,37 +569,10 @@
     <string name="fingerprint_last_delete_message" msgid="7860374760549404410">"ስልክዎን ለመክፈት ወይም በመተግበሪያዎች ውስጥ እርስዎ መሆንዎን ለማረጋገጥ የጣት አሻራዎን መጠቀም አይችሉም።"</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="4104208067277655068">"የጣት አሻራዎን ተጠቅመው የስራ መገለጫዎን መክፈት፣ ግዢዎችን ማጽደቅ ወይም ወደ የስራ መተግበሪያዎች መግባት አይችሉም።"</string>
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"አዎ፣ አስወግድ"</string>
-    <string name="crypt_keeper_settings_title" msgid="4938812137822100044">"ማመስጠሪያ"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"ጡባዊ አመስጥር"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"ስልክ አመስጥር"</string>
-    <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"ተመስጥሯል"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"የእርስዎን መለያዎች፣ ቅንብሮች፣ የወረዱ መተግበሪያዎች እና ውሂባቸው፣ ማህደረመረጃቸው እና ሌሎች ፋይሎቻቸውን ማመስጠር ይችላሉ። ጡባዊዎን ካመሰጠሩት በኋላ የማያ ገጽ ቁልፍ እንዳዋቀሩ ታሳቢ በማድረግ (ማለትም ስርዓተ-ጥለት፣ ቁጥራዊ ፒን ወይም የይለፍ ቃል) ጡባዊዎን ባበሩት ቁጥር ጡባዊውን ለመፍታት ማያ ገጹን መክፈት ይኖርብዎታል። የሚፈቱበት ሌላኛው ብቻ መንገድ የፋብሪካ ዳግም ማስጀመር ነው፣ ሁሉንም ውሂብዎን በመደምሰስ።\n\nማመስጠር አንድ ሰዓት ወይም ከዚያ በላይ ይወስዳል። በሙሉ ባትሪ መጀመር አለብዎት፣ እና ሂደቱ እስኪያልቅ ድረስ ጡባዊዎ መሰካት አለበት። ካቋረጡት አንዳንድ ወይም ሁሉም ውሂብዎን ያጣሉ።"</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"የእርስዎን መለያዎች፣ ቅንብሮች፣ የወረዱ መተግበሪያዎች እና ውሂባቸው፣ ማህደረመረጃቸው እና ሌሎች ፋይሎቻቸውን ማመስጠር ይችላሉ። ስልክዎን ካመሰጠሩት በኋላ የማያ ገጽ ቁልፍ እንዳዋቀሩ ታሳቢ በማድረግ (ማለትም ስርዓተ-ጥለት፣ ቁጥራዊ ፒን ወይም የይለፍ ቃል) ስልክዎን ባበሩት ቁጥር ስልኩን ለመፍታት ማያ ገጹን መክፈት ይኖርብዎታል። የሚፈቱበት ሌላኛው ብቻ መንገድ የፋብሪካ ዳግም ማስጀመር ነው፣ ሁሉንም ውሂብዎን በመደምሰስ።\n\nማመስጠር አንድ ሰዓት ወይም ከዚያ በላይ ይወስዳል። በሙሉ ባትሪ መጀመር አለብዎት፣ እና ሂደቱ እስኪያልቅ ድረስ ስልክዎ መሰካት አለበት። ካቋረጡት አንዳንድ ወይም ሁሉም ውሂብዎን ያጣሉ።"</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"ጡባዊ አመስጥር"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"ስልክ አመስጥር"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"እባክዎ ባትሪዎን ኃይል ይሙላ እና እንደገና ይሞክሩ።"</string>
-    <string name="crypt_keeper_unplugged_text" msgid="2709721134148651329">"እባክዎ የኃይል መሙያዎን ይሰኩ እና እንደገና ይሞክሩ።"</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="1847280235529858357">"ምንም የማያቆልፍ ፒን  ወይም ይለፍቃል የለም"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="7210616262954236042">"ምስጠራ ከመጀመርህ በፊት የማያ ቆልፍ ፒን  ወይም ይለፍቃል ማዘጋጀት አለብህ።"</string>
-    <string name="crypt_keeper_confirm_title" msgid="8600000209722452230">"ይመስጠር?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="3270587498436152259">"የምስጠራ ክንውኑ የማይመለስ ነው እና ካቋረጡት፤ ውሂብ ያጣሉ።ምስጠራ 1 ሰዓት ወይም ከዛ የበለጠ ይወስዳል፤ በዛ ጊዜ ስልኩ ለብዙ ጊዜያቶች በድጋሚ ይነሳል።"</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="3040428543349852419">"የምስጠራ ክንውኑ የማይመለስ ነው እና ካቋረጡት፤ ውሂብ ያጣሉ።ምስጠራ 1 ሰዓት ወይም ከዛ የበለጠ ይወስዳል፤ በዛ ጊዜ ስልኩ ለብዙ ጊዜያቶች በድጋሚ ይነሳል።"</string>
-    <string name="crypt_keeper_setup_title" msgid="3339725741305796680">"ማመስጠሪያ"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="4417016995091289019">"እባክህ ጡባዊህ እስኪመሳጠር ድረስ ጠብቅ።<xliff:g id="PERCENT">^1</xliff:g> ተጠናቋል።"</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="7902355422499500352">"እባክህ  ስልክህ እስኪመሳጠር ድረስ ጠብቅ። <xliff:g id="PERCENT">^1</xliff:g>% ተጠናቋል።"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="8348188415839917821">"ጡባዊዎ እስኪመሰጠር ድረስ ይጠብቁ። ቀሪ ጊዜ፦ <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="8556105766597855198">"ስልክዎ እስኪመሰጠር ድረስ ይጠብቁ። ቀሪ ጊዜ፦ <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="3832496715430327682">"ጡባዊዎን ለማስከፈት ያጥፉትና ከዚያ ያብሩት።"</string>
-    <string name="crypt_keeper_force_power_cycle" product="default" msgid="5070346039522135361">"ስልክዎን ለማስከፈት ያጥፉትና ከዚያ ያብሩት።"</string>
-    <string name="crypt_keeper_warn_wipe" msgid="8104921337301750394">"ማስጠንቀቂያ፦ መሳሪያዎ ከ<xliff:g id="COUNT">^1</xliff:g> ተጨማሪ የመክፈት ሙከራዎች በኋላ ይጠረጋል!"</string>
-    <string name="crypt_keeper_enter_password" msgid="1274917431075529732">"የይለፍቃልህን ተይብ"</string>
-    <string name="crypt_keeper_failed_title" msgid="8173654570682244149">"ምስጠራ ስኬታማ አልነበረም"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"ማመስጠር ተቆራርጧል እና መጨረስ አይችልም። በመሆኑም፣ በጡባዊዎ ላይ ያለውን ውሂብ እስከነጭራሹ መድረስ አይቻልም። \n\n ጡባዊህን በመጠቀም ለመቀጠል፣ የፋብሪካ ዳግም አስጀምር ማከናወን አለብህ። ጡባዊህን ዳግም ካስጀመርክ በኋላ ስታዘጋጅ፣ ወደ Google መለያህ አስጠብቀህ የነበረውን ውሂብ እነበረበት ለመመለስ እድሉን ታገኛለህ።"</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"ማመስጠር ተቆራርጧል እና መጨረስ አይችልም። በመሆኑም፣ በስልክዎ ላይ ያለውን ውሂብ እስከነጭራሹ መድረስ አይቻልም። \n\n ስልክዎን በመጠቀም ለመቀጠል፣ የፋብሪካ ዳግም አስጀምር ማከናወን አለብዎት። ስልክዎን ዳግም ካስጀመሩ በኋላ ሲያዘጋጁ፣ ወደ Google መለያዎ አስጠብቀው የነበረውን ውሂብ እነበረበት ለመመለስ እድሉን ያገኛሉ።"</string>
-    <string name="crypt_keeper_data_corrupt_title" msgid="5920153462176846037">"መፍታት አልተሳካም"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"ያስገቡት የይለፍ ቃል ትክክል ነው፣ ይሁንና ውሂብዎ የተበላሸ ነው። \n\nጡባዊዎን መጠቀሙን ለመቀጠል የፋብሪካ ዳግም ማስጀመር ማከናወን ያስፈልግዎታል። ከዳግም ማስጀመሩ በኋላ ጡባዊዎን ሲያዋቅሩት በGoogle መለያዎ ላይ ምትኬ የተቀመጠለት ማንኛውም ውሂብ ወደነበረበት የመመለስ አጋጣሚ ይኖርዎታል።"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"ያስገቡት የይለፍ ቃል ትክክል ነው፣ ይሁንና ውሂብዎ የተበላሸ ነው። \n\nስልክዎን መጠቀሙን ለመቀጠል የፋብሪካ ዳግም ማስጀመር ማከናወን ያስፈልግዎታል። ከዳግም ማስጀመሩ በኋላ ስልክዎን ሲያዋቅሩት በGoogle መለያዎ ላይ ምትኬ የተቀመጠለት ማንኛውም ውሂብ ወደነበረበት የመመለስ አጋጣሚ ይኖርዎታል።"</string>
-    <string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"የግቤት ስልት ቀይር"</string>
+    <string name="encryption_settings_title" msgid="2848716008695618360">"ምስጠራ"</string>
+    <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"ጡባዊ አመስጥር"</string>
+    <string name="encrypt_title" product="default" msgid="7337365190988321100">"ስልክ አመስጥር"</string>
+    <string name="encrypted_summary" msgid="545623487587251207">"ተመሥጥሯል"</string>
     <string name="suggested_lock_settings_title" msgid="7836065447159730217">"የስልክዎን ደህንነት ይጠብቁ"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"ጡባዊን ለመጠበቅ የማያ ገጽ ቁልፍን ያቀናብሩ"</string>
     <string name="suggested_lock_settings_summary" product="device" msgid="8479766049078378225">"መሣሪያን ለመጠበቅ የማያ ገጽ ቁልፍን ያቀናብሩ"</string>
@@ -817,6 +791,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"ይህን ፒን  በሌላ መሣሪያ ላይማስገባት ሊያስፈልግህ ይችላል።"</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"ይህን የይለፍ ቁልፍ በሌላ መሣሪያ ላይማስገባት ሊያስፈልግህ ይችላል።"</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"ከ:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;ጋር ለማገናኘት ይህን የይለፍ ቁልፍ ማሳየቱን አረጋግጥ፡&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"ከተባባሪ ስብስቡ ጋር ለመጣመር ያረጋግጡ"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"ከ:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;ከዚህ መሣሪያ ጋር ይጣመር?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"ከ:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> ጋር ለማጣመር ላዩ ላይ ተይብበት:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g> ከዚያም ተመለስ ወይም አስገባ ተጫን::"</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"የእርስዎን የእውቂያዎች እና የጥሪ ታሪክ መዳረሻ ይፍቀዱ"</string>
@@ -850,6 +825,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"ማገናኘት አልተቻለም። እንደገና ይሞክሩ።"</string>
     <string name="device_details_title" msgid="1155622417516195481">"የመሣሪያ ዝርዝሮች"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"የመሣሪያ የብሉቱዝ አድራሻ፦ <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"የመሣሪያ የብሉቱዝ አድራሻ፦\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"መሣሪያ ይረሳ?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"ጉድኝትን አስወግድ"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"የመተግበሪያ ግንኙነት ይቋረጥ?"</string>
@@ -881,6 +857,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"ቅንብሮች አስታውስ"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"ከፍተኛው የተገናኙ የብሉቱዝ ኦዲዮ መሣሪያዎች ብዛት"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"ከፍተኛው የተገናኙ የብሉቱዝ ኦዲዮ መሣሪያዎች ብዛትን ይምረጡ"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"የኤንኤፍሲ ቁልል የስህተት አርም ምዝግብ ማስታወሻ"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"የኤንኤፍሲ ቁልል የምዝግብ ማስታወሻ ደረጃን ይጨምሩ"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Cast"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"መስታወት"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"ገመድ-አልባ ማሳየትን ያንቁ"</string>
@@ -1188,6 +1166,8 @@
     <string name="wifi_hotspot_maximize_compatibility_dual_ap_summary" msgid="3579549223159056533">"ሌሎች መሣሪያዎች ይህን የመገናኛ ነጥብ እንዲያገኙ ያግዛቸዋል። የባትሪ አጠቃቀምን ይጨምራል።"</string>
     <string name="wifi_tether_starting" msgid="8879874184033857814">"የመገናኛ ነጥብን በማብራት ላይ…"</string>
     <string name="wifi_tether_stopping" msgid="4416492968019409188">"የመገናኛ ነጥብን በማጥፋት ላይ…"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_title" msgid="3089432578433978073">"እንደ ሞደም መሰካት አይገኝም"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_content" msgid="5920421547607921112">"ለዝርዝሮች አገልግሎት አቅራቢዎን ያነጋግሩ"</string>
     <string name="wifi_tether_enabled_subtext" msgid="5085002421099821056">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> ገቢር ነው"</string>
     <string name="wifi_tether_failed_subtext" msgid="437190628041885500">"የተንቀሳቃሽ የWi-Fi መገናኛ ነጥብ ስህተት"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7072559431286459122">"የWi-Fi መገናኛ ነጥብ ያዋቅሩ"</string>
@@ -2534,11 +2514,6 @@
     <string name="enable_service_title" msgid="7231533866953706788">"<xliff:g id="SERVICE">%1$s</xliff:g> ሙሉ የመሣሪያዎ ቁጥጥር እንዲኖረው ይፈቀድለት?"</string>
     <string name="capabilities_list_title" msgid="1225853611983394386">"<xliff:g id="SERVICE">%1$s</xliff:g> ይህን ማድረግ አለበት፦"</string>
     <string name="touch_filtered_warning" msgid="4225815157460318241">"አንድ መተግበሪያ የፍቃድ ጥያቄ እያገደ ስለሆነ ቅንብሮች ጥያቄዎን ማረጋገጥ አይችሉም።"</string>
-    <string name="enable_service_encryption_warning" msgid="931082737770453755">"<xliff:g id="SERVICE">%1$s</xliff:g>ን ካበሩት፣ መሳሪያዎ የውሂብ ምስጠራን ለማላቅ የማያ ገጽ መቆለፊያዎን አይጠቀምም።"</string>
-    <string name="secure_lock_encryption_warning" msgid="669152607190123579">"አንድ የተደራሽነት አገልግሎትን ስላበሩ፣ መሳሪያዎ የውሂብ ምስጠራን ለማላቅ የማያ ገጽ መቆለፊያዎን አይጠቀምም።"</string>
-    <string name="enable_service_pattern_reason" msgid="6832846117817938536">"<xliff:g id="SERVICE">%1$s</xliff:g>ን ማብራት የውሂብ ምስጠራ ላይ ተጽዕኖ ስለሚያሳርፍ፣ የእርስዎን ስርዓተ-ጥለት ማረጋገጥ ያስፈልግዎታል።"</string>
-    <string name="enable_service_pin_reason" msgid="6040417014360237703">"<xliff:g id="SERVICE">%1$s</xliff:g>ን ማብራት የውሂብ ምስጠራ ላይ ተጽዕኖ ስለሚያሳርፍ፣ የእርስዎን ፒን ማረጋገጥ ያስፈልግዎታል።"</string>
-    <string name="enable_service_password_reason" msgid="6962544350351734238">"<xliff:g id="SERVICE">%1$s</xliff:g>ን ማብራት የውሂብ ምስጠራ ላይ ተጽዕኖ ስለሚያሳርፍ፣ የእርስዎን የይለፍ ቃል ማረጋገጥ ያስፈልግዎታል።"</string>
     <string name="accessibility_service_warning" msgid="6779187188736432618">"<xliff:g id="SERVICE">%1$s</xliff:g> ሙሉ የዚህ መሣሪያ ቁጥጥር እየጠየቀ ነው። አገልግሎቱ የተደራሽነት ፍላጎቶች ያላቸውን ተጠቃሚዎች ወክሎ ማያ ገጹን ማንበብ እና ለእነሱ መስራት ይችላል። ይህ የቁጥጥር ደረጃ ለአብዛኛዎቹ መተግበሪያዎች አግባብ አይደለም።"</string>
     <string name="accessibility_service_warning_description" msgid="6573203795976134751">"ሙሉ ቁጥጥር ከተደራሽነት ፍላጎቶች ጋር እርስዎን ለሚያግዝዎት መተግበሪያዎች ተገቢ ነው ሆኖም ግን ለአብዛኛዎቹ መተግበሪያዎች አይሆንም።"</string>
     <string name="accessibility_service_screen_control_title" msgid="324795030658109870">"ማያ ገጽን ይመልከቱ እና ይቆጣጠሩ"</string>
@@ -3103,14 +3078,6 @@
     <string name="remove_account_failed" msgid="3709502163548900644">"ይህ ለውጥ በአስተዳዳሪዎ አይፈቀድም"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"በእጅ ማመሳሰል አልተቻለም"</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"አመሳስል ለእዚህ ንጥል በአሁን ጊዜ ቦዝኗል።ምርጫህን ለመለወጥ፣ ለጊዜው የዳራ ውሂብ እና ራስ ሰር ማመሳሰያ አብራ።"</string>
-    <string name="enter_password" msgid="6327051330258595331">"Androidን ለመጀመር የይለፍ ቃልዎን ያስገቡ"</string>
-    <string name="enter_pin" msgid="1029287617551232681">"Androidን ለመጀመር ፒንዎን ያስገቡ"</string>
-    <string name="enter_pattern" msgid="1747316785866742960">"Androidን ለመጀመር ስርዓተ-ጥለትዎን ይሳሉ"</string>
-    <string name="cryptkeeper_wrong_pattern" msgid="340747269176120242">"የተሳሳተ ስርዓተ ጥለት"</string>
-    <string name="cryptkeeper_wrong_password" msgid="7295607881887114486">"የተሳሳተ ይለፍ ቃል"</string>
-    <string name="cryptkeeper_wrong_pin" msgid="2347961593970714201">"የተሳሳተ ፒን"</string>
-    <string name="checking_decryption" msgid="6111642972615688237">"በማረጋገጥ ላይ…"</string>
-    <string name="starting_android" msgid="6694154070215356186">"Androidን በማስጀመር ላይ..."</string>
     <string name="delete" msgid="8330605554706263775">"ሰርዝ"</string>
     <string name="misc_files" msgid="6598066985800749585">"ልዩ ልዩ"</string>
     <string name="misc_files_selected_count" msgid="5597802791672749532">"ከ<xliff:g id="NUMBER">%1$d</xliff:g><xliff:g id="TOTAL">%2$d</xliff:g> ምረጥ"</string>
@@ -3206,8 +3173,6 @@
     <string name="data_usage_metered_yes" msgid="4262598072030135223">"የሚለካ"</string>
     <string name="data_usage_metered_no" msgid="1685828958417926268">"የማይለካ"</string>
     <string name="data_usage_disclaimer" msgid="3271450299386176770">"የአገልግሎት አቅራቢ ውሂብ አቆጣጠር ከየመሣሪያዎ ሊለይ ይችላል።"</string>
-    <string name="cryptkeeper_emergency_call" msgid="8369322820475703306">"የአደጋ ጊዜ ጥሪ"</string>
-    <string name="cryptkeeper_return_to_call" msgid="3857250752781151232">"ወደ ስልክ ጥሪ ተመለስ"</string>
     <string name="vpn_name" msgid="3806456074909253262">"ስም"</string>
     <string name="vpn_type" msgid="5533202873260826663">"አይነት"</string>
     <string name="vpn_server" msgid="2908816134941973935">"የአገልጋይ አድራሻ"</string>
@@ -4764,8 +4729,6 @@
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> መተግበሪያዎች ያልተገደበ ውሂብ ሊጠቀሙ ይችላሉ</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"ተጨማሪ ይመልከቱ"</string>
-    <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"የምር የተጠቃሚ ውሂብ ይጠረግ እና ወደ የፋይል ምሥጠራ ይለወጥ?"</string>
-    <string name="button_confirm_convert_fbe" msgid="339648921918438106">"ጥረግ እና ለውጥ"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"የShortcutManager ደረጃ-ገዳቢ ዳግም ይጀመር?"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"ShortcutManager ፍጥነት-መገደብ ዳግም እንዲጀምር ተደርጓል"</string>
     <string name="notification_suggestion_title" msgid="6309263655965785411">"በማያ ገጽ መቆለፊያ ላይ የቁጥጥር መረጃ"</string>
@@ -5292,6 +5255,7 @@
     <string name="sim_action_yes" msgid="8076556020131395515">"አዎ"</string>
     <string name="sim_action_reboot" msgid="3508948833333441538">"ዳግም አስነሳ"</string>
     <string name="sim_action_no_thanks" msgid="435717748384544195">"አይ፣ አመሰግናለሁ"</string>
+    <string name="sim_action_cancel" msgid="2668099867029610910">"ይቅር"</string>
     <string name="sim_switch_button" msgid="1405772571706095387">"ማብሪያ/ማጥፊያ"</string>
     <string name="dsds_activation_failure_title" msgid="4467364110584914794">"ሲምን ማግበር አልተቻለም"</string>
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"ሲሙን ያስወጡትና እንደገና ያስገቡት። ችግሩ ከቀጠለ መሣሪያዎን ዳግም ያስነሱት።"</string>
@@ -5444,6 +5408,10 @@
     <string name="cached_apps_freezer" msgid="1057519579761550350">"ለተሸጎጡ መተግበሪያዎች አፈጻጸምን አግድ"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"በቅንብሮች ላይ የማያ ገጽ ተደራቢዎችን ይፍቀዱ"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"የቅንብሮች ማያ ገጾችን ለመደራረብ በሌሎች መተግበሪያዎች ላይ የሚያሳዩ መተግበሪያዎችን ይፍቀዱ"</string>
+    <!-- no translation found for allow_mock_modem (3832264806530479214) -->
+    <skip />
+    <!-- no translation found for allow_mock_modem_summary (9097416612748005374) -->
+    <skip />
     <string name="media_controls_title" msgid="403271085636252597">"ሚዲያ"</string>
     <string name="media_controls_resume_title" msgid="855076860336652370">"ሚዲያ ማጫወቻ ይሰኩ"</string>
     <string name="media_controls_resume_description" msgid="3163482266454802097">"መልሶ ማጫዎትን በፍጥነት ካቆሙበት ለመቀጠል ሚዲያ ማጫወቻን በፈጣን ቅንብሮች ውስጥ ክፍት ሆኖ ይቆያል"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 4b271e4..f5d2b04 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -146,10 +146,11 @@
     <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"السماح لجهازك بالاتصال بأجهزة بلوتوث المجاورة"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"السماح لهاتفك بالاتصال بأجهزة بلوتوث المجاورة"</string>
     <string name="bluetooth_disable_a2dp_hw_offload" msgid="5942913792817797541">"‏إيقاف نقل بيانات أجهزة بلوتوث A2DP"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="8610420176339657720">"إعادة تشغيل الجهاز؟"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8333029144800835996">"يجب إعادة تشغيل جهازك لتغيير هذا الإعداد."</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="3488695418187553566">"إعادة تشغيل"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="4930826928585464191">"إلغاء"</string>
+    <string name="bluetooth_disable_le_audio_hw_offload" msgid="3966022676505972908">"‏إيقاف نقل بيانات جهاز Bluetooth LE AUDIO"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_title" msgid="6001142380445276918">"هل تريد إعادة تشغيل الجهاز؟"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_message" msgid="1524373895333698779">"يجب إعادة تشغيل جهازك لتغيير هذه الإعدادات."</string>
+    <string name="bluetooth_disable_hw_offload_dialog_confirm" msgid="5594859658551707592">"إعادة التشغيل"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel" msgid="3663690305043973720">"إلغاء"</string>
     <string name="connected_device_media_device_title" msgid="3783388247594566734">"أجهزة الوسائط"</string>
     <string name="connected_device_call_device_title" msgid="88732390601723608">"أجهزة الاتصال"</string>
     <string name="connected_device_other_device_title" msgid="4652120430615729193">"أجهزة أخرى"</string>
@@ -273,7 +274,7 @@
     <string name="date_time_set_timezone_title" msgid="790404320569600222">"المنطقة الزمنية"</string>
     <string name="date_time_set_timezone" msgid="2915125337941495746">"اختيار المنطقة الزمنية"</string>
     <string name="date_time_set_date_title" msgid="7624166157167528407">"التاريخ"</string>
-    <string name="date_time_search_region" msgid="1364133854952610919">"منطقة البحث"</string>
+    <string name="date_time_search_region" msgid="1364133854952610919">"البحث عن منطقة"</string>
     <string name="date_time_select_region" msgid="5449345333305056072">"المنطقة"</string>
     <string name="date_time_select_fixed_offset_time_zones" msgid="594848300882055361">"‏اختيار فارق الوقت عن UTC"</string>
     <string name="zone_change_to_from_dst" msgid="686451769985774294">"يبدأ <xliff:g id="TIME_TYPE">%1$s</xliff:g> بحلول <xliff:g id="TRANSITION_DATE">%2$s</xliff:g>."</string>
@@ -294,7 +295,7 @@
     <string name="show_owner_info_on_lockscreen_label" msgid="197365342192696406">"إظهار معلومات المالك في شاشة القفل"</string>
     <string name="owner_info_settings_title" msgid="3555626140700093017">"إضافة نص على شاشة القفل"</string>
     <string name="security_enable_widgets_title" msgid="676199714313423099">"تفعيل الأدوات"</string>
-    <string name="security_enable_widgets_disabled_summary" msgid="5191637768484254146">"تم إيقاف الإعداد بواسطة المشرف"</string>
+    <string name="security_enable_widgets_disabled_summary" msgid="5191637768484254146">"أوقف المشرف هذا الإعداد"</string>
     <string name="trust_lost_locks_screen_title" msgid="4231232144565291276">"قفل الشاشة عند فقدان الثقة"</string>
     <string name="trust_lost_locks_screen_summary" msgid="718374221849537361">"في حال تفعيل الميزة، سيتم قفل الجهاز عندما يفقد الوكيل المعتمد الأخير الثقة."</string>
     <string name="owner_info_settings_summary" msgid="347238313388083297">"بدون"</string>
@@ -321,9 +322,9 @@
     <string name="security_settings_title" msgid="6710768415432791970">"الأمان"</string>
     <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"التشفير وبيانات الاعتماد"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"تم ترميز الهاتف"</string>
-    <string name="decryption_settings_summary" product="default" msgid="1742645256103613503">"الهاتف ليس مشفّرًا."</string>
+    <string name="not_encrypted_summary" product="default" msgid="2251945842585788254">"الهاتف ليس مشفّرًا."</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"تم ترميز الجهاز"</string>
-    <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"الجهاز ليس مشفرًا."</string>
+    <string name="not_encrypted_summary" product="tablet" msgid="2374263654698719382">"الجهاز ليس مشفرًا."</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"شاشة القفل"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"ما يتم عرضه"</string>
     <string name="security_settings_summary" msgid="1627059516127354233">"‏تعيين موقعي، فتح قفل الشاشة، تأمين شريحة SIM، تأمين تخزين الاعتماد"</string>
@@ -496,7 +497,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"حذف"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"المس زر الاستشعار"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"ضع إصبعك على زر الاستشعار ثمّ ارفعه بعد اهتزاز الجهاز"</string>
-    <string name="security_settings_udfps_enroll_start_message" msgid="5032954588171487566">"ثبِّت بصمة إصبعك على جهاز الاستشعار تمامًا حتى يتم اهتزاز الجهاز."</string>
+    <string name="security_settings_udfps_enroll_start_message" msgid="5032954588171487566">"ثبِّت بصمة إصبعك على جهاز الاستشعار إلى أن يهتزّ الجهاز."</string>
     <string name="security_settings_fingerprint_enroll_udfps_title" msgid="6665610134560896895">"انقر مع الاستمرار على مستشعر بصمات الإصبع"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"ارفع إصبعك ثم المس زر الاستشعار مرة أخرى"</string>
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"مرة أخرى"</string>
@@ -504,7 +505,7 @@
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"استمر في وضع إصبعك ورفعه لإضافة الأجزاء المختلفة لبصمة الإصبع"</string>
     <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"انقر مع الاستمرار في كل مرة يتحرك فيها رمز بصمة الإصبع. يساعد هذا على التقاط قدر أكبر من بصمة إصبعك."</string>
     <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"ضع طرف إصبعك على المستشعر."</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="6137605344819152477">"في النهاية، استخدِم حواف إصبعك."</string>
+    <string name="security_settings_udfps_enroll_edge_title" msgid="6137605344819152477">"وأخيرًا، استخدِم حواف إصبعك."</string>
     <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"ضع جانب بصمة الإصبع على المستشعر واضغط مع الاستمرار ثم بدِّل إلى الجانب الآخر."</string>
     <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"يساعد هذا على التقاط قدر أكبر من بصمة إصبعك."</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"تسجيل بصمة الإصبع <xliff:g id="PERCENTAGE">%d</xliff:g> في المئة."</string>
@@ -584,37 +585,10 @@
     <string name="fingerprint_last_delete_message" msgid="7860374760549404410">"لن تتمكّن من استخدام بصمة إصبعك لفتح قفل هاتفك أو إثبات هويتك في التطبيقات."</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="4104208067277655068">"لن تتمكّن من استخدام بصمة إصبعك لفتح قفل الملف الشخصي للعمل أو السماح بعمليات الشراء أو تسجيل الدخول إلى تطبيقات العمل."</string>
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"نعم، إزالة"</string>
-    <string name="crypt_keeper_settings_title" msgid="4938812137822100044">"التشفير"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"ترميز الجهاز اللوحي"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"ترميز الهاتف"</string>
-    <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"مشفّر"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"يمكنك ترميز حساباتك وإعداداتك والتطبيقات التي تم تنزيلها وبياناتها والوسائط والملفات الأخرى. وبعد ترميز جهازك اللوحي، بافتراض أنك قد أعددت قفل الشاشة (باستخدام نقش أو رقم تعريف شخصي أو كلمة مرور)، يجب فتح قفل الشاشة لفك ترميز الجهاز اللوحي في كل مرة تشغله فيها. والوسيلة الأخرى الوحيدة لفك ترميز الجهاز هي إجراء إعادة الضبط على الإعدادات الأصلية، ومحو كل بياناتك.\n\nيستغرق الترميز ساعة أو أكثر. ويجب البدء ببطارية مشحونة وتوصيل الجهاز اللوحي بالشاحن أثناء عملية الترميز. فإذا أوقفت العملية، ستفقد بعض أو كل بياناتك"</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"يمكنك ترميز حساباتك وإعداداتك والتطبيقات التي تم تنزيلها وبياناتها والوسائط والملفات الأخرى. وبعد ترميز هاتفك، وبافتراض أنك قد أعددت قفل الشاشة (عبر النقش أو رقم التعريف الشخصي أو كلمة المرور)، يجب فتح قفل الشاشة لفك ترميز الهاتف في كل مرة تشغله فيها. الطريقة الوحيدة الأخرى لفك ترميز الجهاز هي إجراء إعادة الضبط على الإعدادات الأصلية، ومحو كل بياناتك.\n\nيستغرق الترميز ساعة أو أكثر. يجب البدء ببطارية مشحونة وتوصيل الهاتف بالشاحن أثناء عملية الترميز. فإذا أوقفت هذه العملية، ستفقد بعض أو كل البيانات."</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"ترميز الجهاز اللوحي"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"ترميز الهاتف"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"اشحن البطارية وأعد المحاولة."</string>
-    <string name="crypt_keeper_unplugged_text" msgid="2709721134148651329">"صل الشاحن وأعد المحاولة."</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="1847280235529858357">"‏ليس هناك رقم تعريف شخصي (PIN) أو كلمة مرور لقفل الشاشة"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="7210616262954236042">"يجب تعيين رقم تعريف شخصي أو كلمة مرور لقفل الشاشة قبل أن تتمكن من بدء عملية التشفير."</string>
-    <string name="crypt_keeper_confirm_title" msgid="8600000209722452230">"التشفير؟"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="3270587498436152259">"لا يمكن التراجع عن عملية التشفير، وفي حالة مقاطعتها، ستفقد البيانات. تستغرق عملية التشفير ساعة أو أكثر، وسيتم خلالها إعادة تشغيل الجهاز اللوحي عدة مرات."</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="3040428543349852419">"لا يمكن التراجع عن عملية التشفير، وفي حالة مقاطعتها، ستفقد البيانات. تستغرق عملية التشفير ساعة أو أكثر، وسيتم خلالها إعادة تشغيل الهاتف عدة مرات."</string>
-    <string name="crypt_keeper_setup_title" msgid="3339725741305796680">"التشفير"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="4417016995091289019">"انتظر حتى يتم ترميز الجهاز اللوحي. اكتمل <xliff:g id="PERCENT">^1</xliff:g>%."</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="7902355422499500352">"انتظر حتى يتم ترميز هاتفك. اكتمل <xliff:g id="PERCENT">^1</xliff:g>%."</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="8348188415839917821">"انتظر بينما يتم ترميز جهازك اللوحي. الوقت المتبقي: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="8556105766597855198">"انتظر بينما يتم ترميز هاتفك. الوقت المتبقي: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="3832496715430327682">"لإلغاء تأمين الجهاز اللوحي، يمكنك إيقافه وتشغيله مرة أخرى."</string>
-    <string name="crypt_keeper_force_power_cycle" product="default" msgid="5070346039522135361">"لإلغاء تأمين الهاتف، يمكنك إيقافه وتشغيله مرة أخرى."</string>
-    <string name="crypt_keeper_warn_wipe" msgid="8104921337301750394">"تحذير: سيتم محو محتوى جهازك بعد فشل <xliff:g id="COUNT">^1</xliff:g> من المحاولات الأخرى لفتح القفل!"</string>
-    <string name="crypt_keeper_enter_password" msgid="1274917431075529732">"اكتب كلمة المرور"</string>
-    <string name="crypt_keeper_failed_title" msgid="8173654570682244149">"لم يتم التشفير بنجاح"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"‏تمت مقاطعة التشفير ويتعذر الاستكمال. ونتيجة لذلك، لن تتمكن بعد الآن من الدخول إلى البيانات على جهازك اللوحي. \n\nلاستئناف استخدام الجهاز اللوحي، يلزمك إجراء إعادة الضبط على الإعدادات الأصلية. وعند إعداد الجهاز اللوحي بعد إعادة الضبط، ستكون لديك فرصة استعادة أي بيانات تم نسخها احتياطيًا إلى حساب Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"‏تمت مقاطعة التشفير ويتعذر الاستكمال. ونتيجة لذلك، لن تتمكن بعد الآن من الدخول إلى البيانات على هاتفك. \n\nلاستئناف استخدام الهاتف، يجب إجراء إعادة الضبط على الإعدادات الأصلية. وعند إعداد الهاتف بعد إعادة الضبط، ستكون لديك فرصة استعادة أي بيانات تم نسخها احتياطيًا إلى حساب Google."</string>
-    <string name="crypt_keeper_data_corrupt_title" msgid="5920153462176846037">"لم ينجح إلغاء التشفير"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"‏كلمة المرور التي أدخلتها صحيحة، ولكن للأسف بياناتك تالفة. \n\nلاستئناف استخدام جهازك اللوحي، يلزمك إجراء إعادة الضبط على الإعدادات الأصلية. عند إعداد الجهاز اللوحي بعد إعادة الضبط، ستكون لديك فرصة لاستعادة أي بيانات تم نسخها احتياطيًا في حسابك على Google."</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"‏كلمة المرور التي أدخلتها صحيحة، ولكن للأسف بياناتك تالفة. \n\nلاستئناف استخدام هاتفك، يلزمك إجراء إعادة الضبط على الإعدادات الأصلية. عند إعداد الهاتف بعد إعادة الضبط، ستكون لديك فرصة لاستعادة أي بيانات تم نسخها احتياطيًا في حسابك على Google."</string>
-    <string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"تبديل أسلوب الإدخال"</string>
+    <string name="encryption_settings_title" msgid="2848716008695618360">"التشفير"</string>
+    <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"تشفير الجهاز اللوحي"</string>
+    <string name="encrypt_title" product="default" msgid="7337365190988321100">"تشفير الهاتف"</string>
+    <string name="encrypted_summary" msgid="545623487587251207">"مشفّر"</string>
     <string name="suggested_lock_settings_title" msgid="7836065447159730217">"تأمين هاتفك"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"ضبط قفل شاشة لحماية الجهاز اللوحي"</string>
     <string name="suggested_lock_settings_summary" product="device" msgid="8479766049078378225">"ضبط قفل شاشة لحماية الجهاز"</string>
@@ -885,6 +859,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"‏قد يلزم أيضًا كتابة رمز PIN هذا على الجهاز الآخر."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"قد يلزم أيضًا كتابة مفتاح المرور هذا على الجهاز الآخر."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"‏للاقتران مع:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;تأكد من أنه يعرض مفتاح المرور هذا:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"تأكيد الاقتران بمجموعة الأجهزة المنظمة"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"‏من:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;الاقتران مع هذا الجهاز؟"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"‏للإقران مع:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>اكتب عليه:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, ثم اضغط على Return أو Enter."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"السماح بالوصول إلى جهات الاتصال وسجلّ المكالمات"</string>
@@ -918,6 +893,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"تعذر الاتصال. يُرجى إعادة المحاولة."</string>
     <string name="device_details_title" msgid="1155622417516195481">"تفاصيل الجهاز"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"عنوان البلوتوث للجهاز: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"عنوان البلوتوث للجهاز:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"هل تريد إلغاء إقران الجهاز؟"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"إزالة الربط"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"هل تريد إلغاء ربط التطبيق؟"</string>
@@ -949,6 +925,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"تذكّر الإعدادات"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"الحد الأقصى لعدد الأجهزة الصوتية المتّصلة باستخدام البلوتوث"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"اختيار الحد الأقصى لعدد الأجهزة الصوتية المتّصلة باستخدام البلوتوث"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"‏سجلّ تصحيح أخطاء حزمة الاتصال القصير المدى (NFC)"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"‏زيادة مستوى التسجيل لحزمة الاتصال القصير المدى (NFC)"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"البث"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"انعكاس"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"تفعيل عرض شاشة لاسلكي"</string>
@@ -984,8 +962,8 @@
     <string name="nfc_quick_toggle_summary" product="default" msgid="1460871052409162980">"‏السماح بتبادل البيانات عند لمس الهاتف لجهاز من خلال تقنية \"الاتصالات القريبة المدى\" (NFC)"</string>
     <string name="nfc_disclaimer_title" msgid="3696580694485048039">"‏تفعيل NFC"</string>
     <string name="nfc_disclaimer_content" msgid="8256675597551036207">"‏يتم من خلال تقنية الاتصال بالحقل القريب (NFC) تبادل البيانات بين هذا الجهاز والأجهزة أو الأهداف المجاورة الأخرى، مثل محطات الدفع وبرامج قراءة الوصول والعلامات أو الإعلانات التفاعلية."</string>
-    <string name="nfc_secure_settings_title" msgid="4906958426927741485">"‏يجب فتح قفل الجهاز لاستخدام تقنية الاتصالات القريبة المدى (NFC)"</string>
-    <string name="nfc_secure_toggle_summary" product="default" msgid="407654335737959071">"‏السماح باستخدام الاتصالات القريبة المدى (NFC) عندما تكون الشاشة مفتوحة فقط"</string>
+    <string name="nfc_secure_settings_title" msgid="4906958426927741485">"‏يجب فتح قفل الجهاز لاستخدام تقنية الاتصال القصير المدى (NFC)"</string>
+    <string name="nfc_secure_toggle_summary" product="default" msgid="407654335737959071">"‏السماح باستخدام الاتصال القصير المدى (NFC) عندما تكون الشاشة مفتوحة فقط."</string>
     <string name="android_beam_settings_title" msgid="2797963824490671295">"‏شعاع Android"</string>
     <string name="android_beam_on_summary" msgid="6067720758437490896">"‏جاهز لنقل محتوى التطبيق عبر الاتصالات القريبة المدى (NFC)"</string>
     <string name="android_beam_off_summary" msgid="5693961375631325042">"إيقاف"</string>
@@ -1268,6 +1246,8 @@
     <string name="wifi_hotspot_maximize_compatibility_dual_ap_summary" msgid="3579549223159056533">"يساعد هذا الخيار الأجهزة الأخرى في العثور على نقطة الاتصال هذه. ويؤدي إلى زيادة استخدام البطارية."</string>
     <string name="wifi_tether_starting" msgid="8879874184033857814">"جارٍ تفعيل نقطة الاتصال…"</string>
     <string name="wifi_tether_stopping" msgid="4416492968019409188">"جارٍ إيقاف نقطة الاتصال…"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_title" msgid="3089432578433978073">"التوصيل غير متاح"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_content" msgid="5920421547607921112">"تواصَل مع مشغّل شبكة الجوّال للاطّلاع على التفاصيل."</string>
     <string name="wifi_tether_enabled_subtext" msgid="5085002421099821056">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> نشطة"</string>
     <string name="wifi_tether_failed_subtext" msgid="437190628041885500">"‏خطأ في نقطة اتصال Wi-Fi المحمولة"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7072559431286459122">"‏إعداد نقطة اتصال Wi-Fi"</string>
@@ -2413,7 +2393,7 @@
     <string name="accessibility_tutorial_dialog_title_button" msgid="4681164949716215131">"استخدام زر أدوات تسهيل الاستخدام في الفتح"</string>
     <string name="accessibility_tutorial_dialog_title_volume" msgid="494810949830845234">"اضغط مع الاستمرار على مفتاحَي مستوى الصوت للفتح"</string>
     <string name="accessibility_tutorial_dialog_title_triple" msgid="7089562919284464400">"انقر على الشاشة ثلاث مرات لفتحها."</string>
-    <string name="accessibility_tutorial_dialog_title_gesture" msgid="4965810097646659332">"الفتح بحركة واحدة"</string>
+    <string name="accessibility_tutorial_dialog_title_gesture" msgid="4965810097646659332">"استخدام إيماءة للفتح"</string>
     <string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="6800684770875867559">"استخدام إيماءة تسهيل الاستخدام"</string>
     <string name="accessibility_tutorial_dialog_message_button" msgid="7002398857479782303">"لاستخدام هذه الميزة، انقر على زر أدوات تمكين الوصول <xliff:g id="ACCESSIBILITY_ICON">%s</xliff:g> في أسفل الشاشة.\n\nللتبديل بين الميزات، انقر مع الاستمرار على زر أدوات تمكين الوصول."</string>
     <string name="accessibility_tutorial_dialog_message_floating_button" msgid="2551777208185138391">"لاستخدام هذه الميزة، انقر على زر أدوات تسهيل الاستخدام في شاشتك."</string>
@@ -2546,7 +2526,7 @@
     </plurals>
     <string name="accessibility_audio_adjustment_title" msgid="1332113739136802997">"تعديل الصوت"</string>
     <string name="accessibility_summary_shortcut_enabled" msgid="4030427268146752644">"الاختصار مفعَّل"</string>
-    <string name="accessibility_summary_shortcut_disabled" msgid="564005462092499068">"غير مفعَّل"</string>
+    <string name="accessibility_summary_shortcut_disabled" msgid="564005462092499068">"غير مفعَّلة"</string>
     <string name="accessibility_summary_state_enabled" msgid="1065431632216039369">"مفعّل"</string>
     <string name="accessibility_summary_state_disabled" msgid="9173234532752799694">"غير مفعّل"</string>
     <string name="accessibility_summary_state_stopped" msgid="2343602489802623424">"الخدمة لا تعمل. انقر للحصول على المعلومات."</string>
@@ -2650,11 +2630,6 @@
     <string name="enable_service_title" msgid="7231533866953706788">"هل تسمح لخدمة <xliff:g id="SERVICE">%1$s</xliff:g> بإمكانية التحكم الكامل في جهازك؟"</string>
     <string name="capabilities_list_title" msgid="1225853611983394386">"خدمة <xliff:g id="SERVICE">%1$s</xliff:g> تحتاج إلى:"</string>
     <string name="touch_filtered_warning" msgid="4225815157460318241">"نظرًا لأن هناك تطبيقًا يحجب طلب الإذن، لا تستطيع الإعدادات التحقق من ردك."</string>
-    <string name="enable_service_encryption_warning" msgid="931082737770453755">"في حالة تفعيل <xliff:g id="SERVICE">%1$s</xliff:g>، لن يستخدم جهازك ميزة قفل الشاشة لتحسين ترميز البيانات."</string>
-    <string name="secure_lock_encryption_warning" msgid="669152607190123579">"لن يستخدم جهازك ميزة قفل الشاشة لتحسين ترميز البيانات، وذلك لأنك فعّلت إحدى الخدمات المعنية بسهولة الاستخدام."</string>
-    <string name="enable_service_pattern_reason" msgid="6832846117817938536">"نظرًا لأن تشغيل <xliff:g id="SERVICE">%1$s</xliff:g> يؤثر في ترميز البيانات، يجب تأكيد النقش."</string>
-    <string name="enable_service_pin_reason" msgid="6040417014360237703">"نظرًا لأن تشغيل <xliff:g id="SERVICE">%1$s</xliff:g> يؤثر في ترميز البيانات، يجب تأكيد رقم التعريف الشخصي."</string>
-    <string name="enable_service_password_reason" msgid="6962544350351734238">"نظرًا لأن تشغيل <xliff:g id="SERVICE">%1$s</xliff:g> يؤثر في ترميز البيانات، يجب تأكيد كلمة المرور."</string>
     <string name="accessibility_service_warning" msgid="6779187188736432618">"تطلب خدمة <xliff:g id="SERVICE">%1$s</xliff:g> الحصول على تحكم كامل في هذا الجهاز. ويمكن للخدمة قراءة الشاشة والتصرف بالنيابة عن المستخدمين ذوي الاحتياجات المتعلقة بإمكانية الوصول. ولا يناسب هذا المستوى من التحكم معظم التطبيقات."</string>
     <string name="accessibility_service_warning_description" msgid="6573203795976134751">"إنّ التحكّم الكامل ليس ملائمًا لمعظم التطبيقات، باستثناء التطبيقات المعنية بسهولة الاستخدام."</string>
     <string name="accessibility_service_screen_control_title" msgid="324795030658109870">"قراءة محتوى الشاشة والتحكم به"</string>
@@ -3263,14 +3238,6 @@
     <string name="remove_account_failed" msgid="3709502163548900644">"لا يسمح المشرف بإجراء هذا التغيير"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"لا يمكن المزامنة يدويًا"</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"مزامنة هذا العنصر غير مفعّلة في الوقت الحالي. لتغيير هذا الإعداد، فعِّل بشكل مؤقت بيانات الخلفية والمزامنة التلقائية."</string>
-    <string name="enter_password" msgid="6327051330258595331">"‏لبدء تشغيل Android، أدخل كلمة المرور"</string>
-    <string name="enter_pin" msgid="1029287617551232681">"‏لبدء تشغيل Android، أدخل رقم التعريف الشخصي"</string>
-    <string name="enter_pattern" msgid="1747316785866742960">"‏لبدء تشغيل Android، ارسم النقش"</string>
-    <string name="cryptkeeper_wrong_pattern" msgid="340747269176120242">"النقش غير صحيح"</string>
-    <string name="cryptkeeper_wrong_password" msgid="7295607881887114486">"كلمة مرور خاطئة"</string>
-    <string name="cryptkeeper_wrong_pin" msgid="2347961593970714201">"رقم تعريف شخصي خاطئ"</string>
-    <string name="checking_decryption" msgid="6111642972615688237">"جارٍ التحقق…"</string>
-    <string name="starting_android" msgid="6694154070215356186">"‏جارٍ تشغيل Android…"</string>
     <string name="delete" msgid="8330605554706263775">"حذف"</string>
     <string name="misc_files" msgid="6598066985800749585">"ملفات متنوعة"</string>
     <string name="misc_files_selected_count" msgid="5597802791672749532">"تم اختيار <xliff:g id="NUMBER">%1$d</xliff:g> من إجمالي <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -3335,7 +3302,7 @@
     <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="6387714350903085918">"‏سيتم نسخ أي تغييرات تجريها على حساباتك على الويب إلى جهازك اللوحي تلقائيًا.\n\nويمكن أن تنسخ بعض الحسابات أيضًا أي تغييرات تجريها على الجهاز اللوحي إلى الويب تلقائيًا. يعمل حساب Google بهذه الطريقة."</string>
     <string name="data_usage_auto_sync_on_dialog" product="default" msgid="6457107552266187107">"‏أي تغييرات تجريها على حساباتك على الويب سيتم نسخها إلى هاتفك تلقائيًا.\n\nوقد تعمل بعض الحسابات أيضًا على نسخ التغييرات التي تجريها على الهاتف إلى الويب تلقائيًا، فهذه هي طريقة عمل حساب Google."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="1783917145440587470">"هل تريد إيقاف مزامنة البيانات تلقائيًا؟"</string>
-    <string name="data_usage_auto_sync_off_dialog" msgid="6523112583569674837">"لن يغيّر هذا الإجراء عملية الحفاظ على استخدامات البيانات والبطارية، ولكن ستحتاج إلى مزامنة كل حساب يدويًا لجمع المعلومات الحديثة ولن تتلقّى إشعارات عند إتمام التحديثات."</string>
+    <string name="data_usage_auto_sync_off_dialog" msgid="6523112583569674837">"سيؤدي ذلك إلى توفير استخدام البيانات والبطارية، ولكن ستحتاج إلى مزامنة كل حساب يدويًا لجمع المعلومات الحديثة ولن تتلقّى إشعارات عند إتمام التحديثات."</string>
     <string name="data_usage_cycle_editor_title" msgid="2019035830921480941">"تاريخ إعادة ضبط دورة الاستخدام"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="1026234456777365545">"اليوم من كل شهر:"</string>
     <string name="data_usage_cycle_editor_positive" msgid="6110165528024717527">"ضبط"</string>
@@ -3366,8 +3333,6 @@
     <string name="data_usage_metered_yes" msgid="4262598072030135223">"تفرض تكلفة استخدام"</string>
     <string name="data_usage_metered_no" msgid="1685828958417926268">"بدون قياس"</string>
     <string name="data_usage_disclaimer" msgid="3271450299386176770">"قد تختلف طريقة احتساب بيانات مشغّل شبكة الجوّال عن طريقة الاحتساب على جهازك."</string>
-    <string name="cryptkeeper_emergency_call" msgid="8369322820475703306">"الاتصال بالطوارئ"</string>
-    <string name="cryptkeeper_return_to_call" msgid="3857250752781151232">"العودة إلى المكالمة"</string>
     <string name="vpn_name" msgid="3806456074909253262">"الاسم"</string>
     <string name="vpn_type" msgid="5533202873260826663">"النوع"</string>
     <string name="vpn_server" msgid="2908816134941973935">"عنوان الخادم"</string>
@@ -3996,7 +3961,7 @@
     <string name="bubble_app_setting_all" msgid="312524752846978277">"إظهار فقاعات محادثات لكل المحادثات"</string>
     <string name="bubble_app_setting_selected" msgid="4324386074198040675">"إظهار فقاعات المحادثات للمحادثات المحدَّدة"</string>
     <string name="bubble_app_setting_none" msgid="8643594711863996418">"عدم السماح بأي فقاعات"</string>
-    <string name="bubble_app_setting_selected_conversation_title" msgid="3060958976857529933">"محادثات"</string>
+    <string name="bubble_app_setting_selected_conversation_title" msgid="3060958976857529933">"المحادثات"</string>
     <string name="bubble_app_setting_excluded_conversation_title" msgid="324818960338773945">"إظهار فقاعات المحادثات لكل المحادثات إلا"</string>
     <string name="bubble_app_setting_unbubble_conversation" msgid="1769789500566080427">"إيقاف فقاعات المحادثات لهذه المحادثة"</string>
     <string name="bubble_app_setting_bubble_conversation" msgid="1461981680982964285">"تفعيل فقاعات المحادثات لهذه المحادثة"</string>
@@ -4043,7 +4008,7 @@
     <string name="notification_importance_title" msgid="1545158655988342703">"السُلوك"</string>
     <string name="notification_importance_unspecified" msgid="1543165530748339700">"السماح بالصوت"</string>
     <string name="notification_importance_blocked" msgid="4933285639639899394">"عدم عرض الإشعارات"</string>
-    <string name="conversations_category_title" msgid="5586541340846847798">"محادثات"</string>
+    <string name="conversations_category_title" msgid="5586541340846847798">"المحادثات"</string>
     <string name="conversation_category_title" msgid="6777135786004214149">"المحادثة"</string>
     <string name="conversation_section_switch_title" msgid="3332885377659473775">"قسم المحادثات"</string>
     <string name="conversation_section_switch_summary" msgid="6123587625929439674">"السماح للتطبيق باستخدام قسم المحادثات"</string>
@@ -5064,8 +5029,6 @@
       <item quantity="one">يمكن لتطبيق واحد استخدام البيانات بدون قيود.</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"الاطّلاع على المزيد"</string>
-    <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"هل تريد فعلًا مسح بيانات المستخدم والتحويل إلى ترميز الملفات؟"</string>
-    <string name="button_confirm_convert_fbe" msgid="339648921918438106">"مسح وتحويل"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"‏إعادة ضبط تقييد المعدّل في ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"‏تمت إعادة ضبط تقييد المعدّل في ShortcutManager."</string>
     <string name="notification_suggestion_title" msgid="6309263655965785411">"التحكم في المعلومات على شاشة القفل"</string>
@@ -5361,7 +5324,7 @@
     <string name="storage_volume_total" msgid="7102720999351050601">"مساحة التخزين المستخدمة من أصل <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
     <string name="storage_percent_full" msgid="7211888326013020857">"مستخدمة"</string>
     <string name="storage_usage_summary" msgid="4591121727356723463">"تم استخدام <xliff:g id="NUMBER">%1$s</xliff:g> <xliff:g id="UNIT">%2$s</xliff:g>."</string>
-    <string name="storage_total_summary" msgid="7163360249534964272">"المجموع: <xliff:g id="NUMBER">%1$s</xliff:g> <xliff:g id="UNIT">%2$s</xliff:g>"</string>
+    <string name="storage_total_summary" msgid="7163360249534964272">"الإجماليّ: <xliff:g id="NUMBER">%1$s</xliff:g> <xliff:g id="UNIT">%2$s</xliff:g>"</string>
     <string name="clear_instant_app_data" msgid="5951258323364386357">"محو التطبيق"</string>
     <string name="clear_instant_app_confirmation" msgid="3964731334459209482">"هل تريد إزالة هذا التطبيق الفوري؟"</string>
     <string name="launch_instant_app" msgid="8503927414339606561">"فتح"</string>
@@ -5640,6 +5603,7 @@
     <string name="sim_action_yes" msgid="8076556020131395515">"نعم"</string>
     <string name="sim_action_reboot" msgid="3508948833333441538">"إعادة التشغيل"</string>
     <string name="sim_action_no_thanks" msgid="435717748384544195">"لا، شكرًا"</string>
+    <string name="sim_action_cancel" msgid="2668099867029610910">"إلغاء"</string>
     <string name="sim_switch_button" msgid="1405772571706095387">"تبديل"</string>
     <string name="dsds_activation_failure_title" msgid="4467364110584914794">"‏يتعذّر تفعيل شريحة SIM"</string>
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"‏يجب إزالة شريحة SIM ثم إدخالها مرة أخرى. إذا استمرت المشكلة، عليك إعادة تشغيل الجهاز."</string>
@@ -5791,7 +5755,7 @@
     <string name="rtt_settings_no_visible" msgid="7440356831140948382"></string>
     <string name="rtt_settings_visible_during_call" msgid="7866181103286073700"></string>
     <string name="rtt_settings_always_visible" msgid="2364173070088756238"></string>
-    <string name="media_output_panel_stop_casting_button" msgid="6094875883164119035">"إيقاف الإرسال"</string>
+    <string name="media_output_panel_stop_casting_button" msgid="6094875883164119035">"إيقاف البث"</string>
     <string name="volte_5G_limited_title" msgid="5908052268836750629">"‏هل تريد إيقاف VoLTE؟"</string>
     <string name="volte_5G_limited_text" msgid="7150583768725182345">"‏سيؤدي هذا أيضًا إلى إيقاف اتصال الجيل الخامس (5G).\nلا يمكنك استخدام الإنترنت أثناء إجراء مكالمة صوتية، وقد لا تعمل بعض التطبيقات أيضًا."</string>
     <string name="no_5g_in_dsds_text" product="default" msgid="772747677303920132">"‏عندما تستخدم شريحتَي SIM، سيقتصر عمل هذا الهاتف على الجيل الرابع. "<annotation id="url">"مزيد من المعلومات"</annotation></string>
@@ -5800,6 +5764,10 @@
     <string name="cached_apps_freezer" msgid="1057519579761550350">"تعليق التنفيذ للتطبيقات المخزَّنة مؤقتًا"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"السماح بالظهور فوق المحتوى على الشاشة في \"الإعدادات\""</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"السماح للتطبيقات التي يمكن عرضها على التطبيقات الأخرى بالظهور فوق المحتوى على شاشات \"الإعدادات\""</string>
+    <!-- no translation found for allow_mock_modem (3832264806530479214) -->
+    <skip />
+    <!-- no translation found for allow_mock_modem_summary (9097416612748005374) -->
+    <skip />
     <string name="media_controls_title" msgid="403271085636252597">"الوسائط"</string>
     <string name="media_controls_resume_title" msgid="855076860336652370">"تثبيت مشغّل الوسائط"</string>
     <string name="media_controls_resume_description" msgid="3163482266454802097">"لاستئناف التشغيل بسرعة، يظل مشغّل الوسائط مفتوحًا في \"الإعدادات السريعة\"."</string>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index b2dcc83..3283d44 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -142,10 +142,11 @@
     <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"আপোনাৰ ডিভাইচটোক নিকটৱৰ্তী ব্লুটুথ ডিভাইচৰ সৈতে যোগাযোগ কৰিবলৈ অনুমতি দিয়ক"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"আপোনাৰ ফ\'নটোক নিকটৱৰ্তী ব্লুটুথ ডিভাইচৰ সৈতে যোগাযোগ কৰিবলৈ অনুমতি দিয়ক"</string>
     <string name="bluetooth_disable_a2dp_hw_offload" msgid="5942913792817797541">"ব্লুটুথ A2DP হাৰ্ডৱেৰ অফল\'ড অক্ষম কৰক"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="8610420176339657720">"ডিভাইচটো ৰিষ্টার্ট কৰেনে?"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8333029144800835996">"আপুনি এই ছেটিঙটো সলনি কৰিবলৈ ডিভাইচটো ৰিষ্টার্ট কৰিব লাগিব।"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="3488695418187553566">"ৰিষ্টাৰ্ট কৰক"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="4930826928585464191">"বাতিল কৰক"</string>
+    <string name="bluetooth_disable_le_audio_hw_offload" msgid="3966022676505972908">"ব্লুটুথ LE AUDIO হাৰ্ডৱেৰ অফল’ড অক্ষম কৰক"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_title" msgid="6001142380445276918">"ডিভাইচটো ৰিষ্টাৰ্ট কৰেনে?"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_message" msgid="1524373895333698779">"আপুনি এই ছেটিংটো সলনি কৰিবলৈ ডিভাইচটো ৰিষ্টাৰ্ট কৰিব লাগিব।"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_confirm" msgid="5594859658551707592">"ৰিষ্টাৰ্ট কৰক"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel" msgid="3663690305043973720">"বাতিল কৰক"</string>
     <string name="connected_device_media_device_title" msgid="3783388247594566734">"মিডিয়া ডিভাইচসমূহ"</string>
     <string name="connected_device_call_device_title" msgid="88732390601723608">"কল ডিভাইচসমূহ"</string>
     <string name="connected_device_other_device_title" msgid="4652120430615729193">"অন্য ডিভাইচসমূহ"</string>
@@ -309,9 +310,9 @@
     <string name="security_settings_title" msgid="6710768415432791970">"সুৰক্ষা"</string>
     <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"এনক্ৰিপশ্বন আৰু ক্ৰেডেনশ্বিয়েলসমূহ"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"ফ\'ন এনক্ৰিপ্ট কৰা হ’ল"</string>
-    <string name="decryption_settings_summary" product="default" msgid="1742645256103613503">"ফ\'ন এনক্ৰিপ্ট কৰা নহ\'ল"</string>
+    <string name="not_encrypted_summary" product="default" msgid="2251945842585788254">"ফ’ন এনক্ৰিপ্ট কৰা নহ’ল"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"ডিভাইচ এনক্ৰিপ্ট কৰা হ’ল"</string>
-    <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"ডিভাইচ এনক্ৰিপ্ট কৰা নহ\'ল"</string>
+    <string name="not_encrypted_summary" product="tablet" msgid="2374263654698719382">"ডিভাইচ এনক্ৰিপ্ট কৰা নহ’ল"</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"লক স্ক্ৰীন"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"কি কি দেখুওৱাব লাগে"</string>
     <string name="security_settings_summary" msgid="1627059516127354233">"মোৰ অৱস্থান, স্ক্ৰীন আনলক, ছিম কাৰ্ডৰ লক, ক্ৰিডেনশ্বিয়েল ষ্ট\'ৰেজৰ লক ছেট কৰক"</string>
@@ -473,7 +474,7 @@
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"ফিংগাৰপ্ৰিণ্টটো আপোনাৰ ফোনৰ পিছফালে আছে। আপোনাৰ তৰ্জনী আঙুলি ব্যৱহাৰ কৰক।"</string>
     <string name="security_settings_udfps_enroll_find_sensor_message" msgid="8383106460819519961">"ফিংগাৰপ্ৰিণ্ট ছেন্সৰটো আপোনাৰ স্ক্ৰীনত আছে। আপুনি পৰৱৰ্তী স্ক্ৰীনখনত নিজৰ ফিংগাৰপ্ৰিণ্ট কেপচাৰ কৰিব।"</string>
     <string name="security_settings_udfps_enroll_find_sensor_start_button" msgid="3172268783620336357">"আৰম্ভ কৰক"</string>
-    <string name="security_settings_udfps_enroll_a11y" msgid="1899453114050362235">"ছেন্সৰটো বিচাৰিবলৈ আপোনাৰ আঙুলিটো স্ক্ৰীনখনৰ চাৰিওফালে ঘূৰাওক। ফিংগাৰপ্ৰিণ্ট ছেন্সটোৰ স্পৰ্শ কৰি ধৰি ৰাখক।"</string>
+    <string name="security_settings_udfps_enroll_a11y" msgid="1899453114050362235">"ছেন্সৰটো বিচাৰিবলৈ আপোনাৰ আঙুলিটো স্ক্ৰীনখনৰ চাৰিওফালে ঘূৰাওক। ফিংগাৰপ্ৰিণ্ট ছেন্সৰটোত স্পৰ্শ কৰি ধৰি ৰাখক।"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"ডিভাইচ আৰু ফিংগাৰপ্ৰিণ্ট ছেন্সৰ অৱস্থানৰ সৈতে চিত্ৰণ"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"নাম"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"ঠিক"</string>
@@ -481,7 +482,7 @@
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"ছেন্সৰটো স্পৰ্শ কৰক"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"আপোনাৰ আঙুলিটো ছেন্সৰটোত ৰাখক আৰু এটা কম্পন অনুভৱ কৰাৰ পিছত আঁতৰাওক"</string>
     <string name="security_settings_udfps_enroll_start_message" msgid="5032954588171487566">"আপুনি এটা কম্পন অনুভৱ নকৰালৈকে নিজৰ আঙুলিৰ সমান অংশটো ছেন্সৰটোত ৰাখক"</string>
-    <string name="security_settings_fingerprint_enroll_udfps_title" msgid="6665610134560896895">"ফিংগাৰপ্ৰিণ্ট ছেন্সটোৰ স্পৰ্শ কৰি ধৰি ৰাখক"</string>
+    <string name="security_settings_fingerprint_enroll_udfps_title" msgid="6665610134560896895">"ফিংগাৰপ্ৰিণ্ট ছেন্সৰটোত স্পৰ্শ কৰি ধৰি ৰাখক"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"ওপৰলৈ উঠাওক, তাৰ পিছত পুনৰ স্পৰ্শ কৰক"</string>
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"আৰু এবাৰ"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"ফিংগাৰপ্ৰিণ্টৰ চিহ্নটো অনুসৰণ কৰক"</string>
@@ -494,7 +495,7 @@
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"ফিংগাৰপ্ৰিণ্ট <xliff:g id="PERCENTAGE">%d</xliff:g> শতাংশ পঞ্জীয়ন কৰা হ\'ল"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"ফিংগাৰপ্ৰিণ্ট যোগ কৰা হ’ল"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="3469254005423998143">"এতিয়া আপুনি নিজৰ ফ’নটো আনলক কৰিবলৈ অথবা এপত ছাইন ইন কৰাৰ দৰে কাৰ্য কৰোঁতে এইয়া আপুনিয়েই বুলি সত্যাপন কৰিবলৈ নিজৰ ফিংগাৰপ্ৰিণ্ট ব্যৱহাৰ কৰিব পাৰে"</string>
-    <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"এইটো পিছত কৰিব"</string>
+    <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="lock_screen_pin_skip_message" product="tablet" msgid="4938798234214623521">"এটা পিনে টেবলেটটো হেৰালে অথবা চুৰি হ’লে সেইটো সুৰক্ষিত কৰে"</string>
@@ -568,37 +569,10 @@
     <string name="fingerprint_last_delete_message" msgid="7860374760549404410">"আপোনাৰ নিজৰ ফ’নটো আনলক কৰিবলৈ অথবা এপত এইয়া আপুনিয়েই বুলি সত্যাপন কৰিবলৈ আপুনি নিজৰ ফিংগাৰপ্ৰিণ্ট ব্যৱহাৰ কৰিব নোৱাৰিব।"</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="4104208067277655068">"আপুনি নিজৰ কৰ্মস্থানৰ প্ৰ’ফাইল আনলক কৰিবলৈ, ক্ৰয়ৰ অনুমোদন জনাবলৈ অথবা কৰ্মস্থানৰ এপত ছাইন ইন কৰিবলৈ নিজৰ ফিংগাৰপ্ৰিণ্ট ব্যৱহাৰ কৰিব নোৱাৰিব।"</string>
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"হয়, আঁতৰাওক"</string>
-    <string name="crypt_keeper_settings_title" msgid="4938812137822100044">"এনক্ৰিপশ্বন"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"টে\'বলেট এনক্ৰিপ্ট কৰক"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"ফ\'ন এনক্ৰিপ্ট কৰক"</string>
-    <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"এনক্ৰিপ্ট কৰা হ’ল"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"আপুনি আপোনাৰ একাউণ্ট, ছেটিং, ডাউনল’ড হোৱা এপ্‌সমূহ আৰু সেইসমূহৰ ডেটা, মিডিয়া আৰু অন্যান্য ফাইলসমূহ এনক্ৰিপ্ট কৰিব পাৰে। আপুনি আপোনাৰ টেবলেটটো এনক্ৰিপ্ট কৰাৰ পাছত, যদি আপুনি ইতিমধ্যে এটা স্ক্ৰীন লক (সেইটো এটা আৰ্হি বা সাংখ্যিক পিন বা পাছৱৰ্ড হ’ব পাৰে) ছেট কৰি থৈছে বুলি ধৰি লোৱা হয়, তেন্তে আপুনি প্ৰতিবাৰতে আপোনাৰ টেবলেটটোৰ পাৱাৰ অন কৰোঁতে ডিক্ৰিপ্ট কৰিবলৈ স্ক্ৰীনখন আনলক কৰিব লাগিব। ডিক্ৰিপ্ট কৰাৰ অন্য একমাত্ৰ উপায়টো হৈছে ফেক্টৰী ডেটা ৰিছেট কৰা, যিয়ে আপোনাৰ আটাইখিনি ডেটা মচি পেলাব।\n\nএনক্ৰিপশ্বন কৰোঁতে এঘণ্টা বা তাতকৈ বেছি সময় ল’ব। আপুনি সম্পূৰ্ণ চ্চাৰ্জ থকা বেটাৰীৰ সৈতে আৰম্ভ কৰিব লাগিব আৰু গোটেই প্ৰক্ৰিয়াটো চলি থাকোঁতে আপোনাৰ টেবলেটটো প্লাগত সুমুৱাই ৰাখিব লাগিব। আপুনি এই প্ৰক্ৰিয়াটোত ব্যাঘাত জন্মালে, আপুনি আপোনাৰ কিছু বা আটাইখিনি ডেটা হেৰুৱাব"</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"আপুনি আপোনাৰ একাউণ্ট, ছেটিং, ডাউনল’ড কৰা এপ্‌সমূহ আৰু ইয়াৰ ডেটা, মিডিয়া আৰু অন্য ফাইলসমূহ এনক্ৰিপ্ট কৰিব পাৰে। আপুনি আপোনাৰ ফ’ন এনক্ৰিপ্ট কৰাৰ পাছত, ধৰি লওক আপুনি ইতিমধ্যে এটা স্ক্ৰীন লক নিৰ্ধাৰণ কৰি থৈছে (সেইটো এটা আৰ্হি বা সাংখ্যিকীয় পিন বা পাছৱৰ্ড হ’ব পাৰে), তেন্তে আপুনি ফ’নটো প্ৰতিবাৰে পাৱাৰ অন কৰাৰ পাছত ডিক্ৰিপ্ট কৰিবলৈ স্ক্ৰীন আনলক কৰিব লাগিব। ডিক্ৰিপ্ট কৰাৰ অন্য একমাত্ৰ উপায়টো হ’ল ফেক্টৰী ডেটা ৰিছেট, যাৰ দ্বাৰা আপোনাৰ আটাইখিনি ডেটা মচা যাব।\n\nএনক্ৰিপশ্বন কৰোঁতে এঘণ্টা বা তাতকৈ অধিক সময় লাগিব পাৰে। আপুনি এটা সম্পূৰ্ণকৈ চাৰ্জ হৈ থকা বেটাৰীৰে আৰম্ভ কৰিব লাগিব আৰু আপোনাৰ ফ’নটো সমগ্ৰ প্ৰক্ৰিয়াটো চলি থকাৰ সময়ত প্লাগ ইন হৈ থাকিব লাগিব। আপুনি যদি মাজতে ব্যাঘাত জন্মায়, তেন্তে কিছু বা আটাইখিনি ডেটা হেৰুৱাব পাৰে।"</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"টে\'বলেট এনক্ৰিপ্ট কৰক"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"ফ\'ন এনক্ৰিপ্ট কৰক"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"আপোনাৰ বেটাৰী চাৰ্জ কৰি পুনৰ চেষ্টা কৰক৷"</string>
-    <string name="crypt_keeper_unplugged_text" msgid="2709721134148651329">"চ্চাৰ্জাৰটো প্লাগ কৰক আৰু আকৌ চেষ্টা কৰক।"</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="1847280235529858357">"কোনো লক স্ক্ৰীন পিন বা পাছৱৰ্ড নাই"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="7210616262954236042">"আপুনি এনক্ৰিপশ্বন আৰম্ভ কৰাৰ আগতে লক স্ক্ৰীন পিন বা পাছৱৰ্ড ছেট কৰিব লাগিব।"</string>
-    <string name="crypt_keeper_confirm_title" msgid="8600000209722452230">"এনক্ৰিপ্ট কৰে নে?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="3270587498436152259">"এনক্ৰিপশ্বন প্ৰক্ৰিয়াটো অপৰিবৰ্তনশীল আৰু আপুনি যদি মাজতে ব্যাঘাত জন্মাই, তেন্তে ডেটা হেৰুৱাব। এনক্ৰিপশ্বন কৰোঁতে এঘণ্টাতকৈ অধিক সময় লাগিব পাৰে - এই সময়চোৱাত টে\'বলেটটো কেইবাবাৰো ৰিষ্টাৰ্ট হ\'ব।"</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="3040428543349852419">"এনক্ৰিপশ্বন প্ৰক্ৰিয়াটো অপৰিবৰ্তনশীল আৰু আপুনি যদি মাজতে ব্যাঘাত জন্মাই, তেন্তে ডেটা হেৰুৱাব। এনক্ৰিপশ্বন কৰোতে এঘণ্টাতকৈ অধিক সময় লাগিব পাৰে - এই সময়চোৱাত ফ\'নটো কেইবাবাৰো ৰিষ্টাৰ্ট হ\'ব।"</string>
-    <string name="crypt_keeper_setup_title" msgid="3339725741305796680">"এনক্ৰিপ্ট কৰি থকা হৈছে"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="4417016995091289019">"টে\'বলেটটোৰ এনক্ৰিপশ্বন সম্পূৰ্ণ হোৱালৈ অপেক্ষা কৰক। <xliff:g id="PERCENT">^1</xliff:g>% সম্পূৰ্ণ হৈছে।"</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="7902355422499500352">"আপোনাৰ ফ\'নটোৰ এনক্ৰিপশ্বন সম্পূৰ্ণ হোৱালৈ অপেক্ষা কৰক। <xliff:g id="PERCENT">^1</xliff:g>% সম্পূৰ্ণ হৈছে।"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="8348188415839917821">"আপোনাৰ টে\'বলেটটোৰ এনক্ৰিপশ্বন সম্পূৰ্ণ হোৱালৈ অপেক্ষা কৰক৷ বাকী থকা সময়: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="8556105766597855198">"ফ\'নটোৰ এনক্ৰিপশ্বন সম্পূৰ্ণ হোৱালৈ অপেক্ষা কৰক। বাকী থকা সময়: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="3832496715430327682">"আপোনাৰ টে\'বলেটটো আনলক কৰিবলৈ ইয়াক অফ কৰি অন কৰক।"</string>
-    <string name="crypt_keeper_force_power_cycle" product="default" msgid="5070346039522135361">"আপোনাৰ ফ\'নটো আনলক কৰিবলৈ ইয়াক অফ কৰি অন কৰক।"</string>
-    <string name="crypt_keeper_warn_wipe" msgid="8104921337301750394">"সকিয়নী: আনল\'ক কৰিবলৈ আৰু <xliff:g id="COUNT">^1</xliff:g> বাৰ বিফল প্ৰয়াস হ\'লে আপোনাৰ ডিভাইচৰ ডেটা মচা হ\'ব!"</string>
-    <string name="crypt_keeper_enter_password" msgid="1274917431075529732">"আপোনাৰ পাছৱৰ্ড টাইপ কৰক"</string>
-    <string name="crypt_keeper_failed_title" msgid="8173654570682244149">"এনক্ৰিপশ্বন বিফল হৈছে"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"এনক্ৰিপশ্বন বিঘ্নিত হৈছে সেয়েহে ই সম্পূৰ্ণ নহ\'ল৷ ফলস্বৰূপে, আপোনাৰ টে\'বলেটত থকা ডেটা ব্যৱহাৰযোগ্য হৈ থকা নাই৷ \n\n আপোনাৰ টে\'বলেট ব্যৱহাৰ কৰি পুনৰাৰম্ভ কৰিবলৈ, আপুনি ফেক্টৰী ৰিছেট কৰিব লাগিব৷ আপুনি ৰিছেট কৰাৰ পিছত টে\'বলেটটো ছেট আপ কৰাৰ সময়ত আপোনাৰ Google একাউণ্টত বেকআপ লৈ থোৱা যিকোনো ডেটা পুনঃস্থাপন কৰিবলৈ সুবিধা পাব৷"</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"এনক্ৰিপশ্বন বিঘ্নিত হৈছে সেয়েহে ই সম্পূৰ্ণ নহ\'ল৷ ফলস্বৰূপে, আপোনাৰ ফ\'নটোত থকা ডেটা ব্যৱহাৰযোগ্য হৈ থকা নাই৷ \n\nআপোনাৰ ফ\'নটো ব্যৱহাৰ কৰি পুনৰাৰম্ভ কৰিবলৈ, আপুনি ফেক্টৰী ৰিছেট কৰিব লাগিব। আপুনি ৰিছেট কৰাৰ পিছত ফ\'নটো ছেট আপ কৰাৰ সময়ত আপোনাৰ Google একাউণ্টত বেকআপ লৈ থোৱা যিকোনো ডেটা পুনঃস্থাপন কৰিবলৈ সুবিধা পাব৷"</string>
-    <string name="crypt_keeper_data_corrupt_title" msgid="5920153462176846037">"ডিক্ৰিপশ্বন অসফল হৈছে"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"আপুনি দিয়া পাছৱৰ্ডটো শুদ্ধ, কিন্তু দুৰ্ভাগ্যক্ৰমে আপোনাৰ ডেটাখিনি অব্যৱহাৰযোগ্য। \n\nআপুনি টে\'বলেটটো আকৌ ব্যৱহাৰ কৰিবলৈ হ\'লে তাক ফেক্টৰী ৰিছেট কৰিব লাগিব। আপুনি ৰিছেট কৰাৰ পিছত টে\'বলেটটো ছেট আপ কৰাৰ সময়ত আপোনাৰ Google একাউণ্টত বেকআপ কৰি ৰখা যিকোনো ডেটা পুনঃস্থাপন কৰিবলৈ সুবিধা পাব।"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"আপুনি দিয়া পাছৱৰ্ডটো শুদ্ধ, কিন্তু দুৰ্ভাগ্যক্ৰমে আপোনাৰ ডেটাখিনি অব্যৱহাৰযোগ্য। \n\nআপুনি ফ\'নটো আকৌ ব্যৱহাৰ কৰিবলৈ হ\'লে তাক ফেক্টৰী ৰিছেট কৰিব লাগিব। আপুনি ৰিছেট কৰাৰ পিছত ফ\'নটো ছেট আপ কৰাৰ সময়ত আপোনাৰ Google একাউণ্টত বেকআপ কৰি ৰখা যিকোনো ডেটা পুনঃস্থাপন কৰিবলৈ সুবিধা পাব।"</string>
-    <string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"ইনপুট পদ্ধতি সলনি কৰক"</string>
+    <string name="encryption_settings_title" msgid="2848716008695618360">"এনক্ৰিপশ্বন"</string>
+    <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"টেবলেট এনক্ৰিপ্ট কৰক"</string>
+    <string name="encrypt_title" product="default" msgid="7337365190988321100">"ফ’ন এনক্ৰিপ্ট কৰক"</string>
+    <string name="encrypted_summary" msgid="545623487587251207">"এনক্ৰিপ্ট কৰা হৈছে"</string>
     <string name="suggested_lock_settings_title" msgid="7836065447159730217">"আপোনাৰ ফ\'নক সুৰক্ষা প্ৰদান কৰক"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"টেবলেটক সুৰক্ষা প্ৰদান কৰিবলৈ স্ক্ৰীন লক ছেট কৰক"</string>
     <string name="suggested_lock_settings_summary" product="device" msgid="8479766049078378225">"ডিভাইচক সুৰক্ষা প্ৰদান কৰিবলৈ স্ক্ৰীন লক ছেট কৰক"</string>
@@ -817,6 +791,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"আপুনি এই পিনটো অন্যটো ডিভাইচত টাইপ কৰিবলগীয়াও হ’ব পাৰে৷"</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"আপুনি এই পাছকীটো অন্য ডিভাইচত টাইপ কৰিবলগীয়াও হ’ব পাৰে৷"</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"ইয়াৰ সৈতে যোৰা লগাবলৈ:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;এইটোৱে পাছকীটো দেখুওৱাটো নিশ্চিত কৰক:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"সংগতিপূৰ্ণ ছেটৰ সৈতে পেয়াৰ কৰিবলৈ নিশ্চিত কৰক"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"ইয়াৰ পৰা:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;এইটো ডিভাইচৰ সৈতে যোৰা লগাবনে?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"যোৰা লগাবলৈ:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>তাত টাইপ কৰক:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, তাৰ পিছত ৰিটাৰ্ন বা এণ্টাৰ দবাওক।"</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"আপোনাৰ সম্পৰ্কসূচী আৰু কলৰ ইতিহাসত প্ৰৱেশ কৰিবলৈ অনুমতি দিয়ক"</string>
@@ -850,6 +825,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"সংযোগ কৰিব পৰা নগ\'ল। আকৌ চেষ্টা কৰক।"</string>
     <string name="device_details_title" msgid="1155622417516195481">"ডিভাইচৰ বিষয়ে সবিশেষ"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"ডিভাইচৰ ব্লুটুথৰ ঠিকনা: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"ডিভাইচৰ ব্লুটুথ ঠিকনা:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"ডিভাইচটো পাহৰিবনে?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"জড়িত হৈ থকাটো আঁতৰাওক"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"এপ্‌টোৰ সংযোগ বিচ্ছিন্ন কৰিবনে?"</string>
@@ -881,6 +857,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"ছেটিং মনত ৰাখক"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"সৰ্বাধিক সংযোজিত হৈ থকা ব্লুটুথ অডিঅ’ ডিভাইচৰ সংখ্যা"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"সৰ্বাধিক সংখ্যক সংযুক্ত হৈ থকা ব্লুটুথ অডিঅ\' ডিভাইচ বাছনি কৰক"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"NFC ষ্টেক ডিবাগ লগ"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"NFC ষ্টেক লগিঙৰ স্তৰ বৃদ্ধি কৰক"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"কাষ্ট"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"আইনা"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"বেতাঁৰ ডিছপ্লে’ সক্ষম কৰক"</string>
@@ -1188,6 +1166,8 @@
     <string name="wifi_hotspot_maximize_compatibility_dual_ap_summary" msgid="3579549223159056533">"অন্য ডিভাইচক এই হটস্পটটো বিচৰাত সহায় কৰে। বেটাৰীৰ ব্যৱহাৰ বৃদ্ধি কৰে।"</string>
     <string name="wifi_tether_starting" msgid="8879874184033857814">"হটস্পট  অন কৰি থকা হৈছে…"</string>
     <string name="wifi_tether_stopping" msgid="4416492968019409188">"হটস্পট  অফ কৰি থকা হৈছে…"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_title" msgid="3089432578433978073">"টিথাৰিং উপলব্ধ নহয়"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_content" msgid="5920421547607921112">"সবিশেষৰ বাবে আপোনাৰ বাহকৰ সৈতে যোগাযোগ কৰক"</string>
     <string name="wifi_tether_enabled_subtext" msgid="5085002421099821056">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> সক্ৰিয় আছে"</string>
     <string name="wifi_tether_failed_subtext" msgid="437190628041885500">"প\'ৰ্টেবল ৱাই-ফাই হটস্পট  ত্ৰুটি"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7072559431286459122">"ৱাই-ফাই হটস্পট ছেট আপ কৰক"</string>
@@ -1300,7 +1280,7 @@
     <string name="color_mode_option_saturated" msgid="3413853820158447300">"সংপৃক্ত"</string>
     <string name="color_mode_option_automatic" msgid="2281217686509980870">"অভিযোজিত"</string>
     <string name="color_mode_summary_natural" msgid="8298840714001791628">"মাত্ৰ সঠীক ৰংৰবোৰ ব্যৱহাৰ কৰক"</string>
-    <string name="color_mode_summary_automatic" msgid="8157885594041700275">"উজ্জ্বল আৰু সঠীক ৰংৰ মাজত মিলাওক"</string>
+    <string name="color_mode_summary_automatic" msgid="8157885594041700275">"উজ্জ্বল আৰু সঠিক ৰঙৰ মাজত মিলাওক"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="6413384391658481700">"টে\'বলেটো ঘূৰালে স্বয়ংক্ৰিয়ভাৱে স্ক্ৰীণৰ দিশ সলনি কৰক"</string>
     <string name="accelerometer_summary_on" product="default" msgid="7117139542131700779">"ফোনটো ঘূৰালে স্বয়ংক্ৰিয়ভাৱে স্ক্ৰীণৰ দিশ সলনি কৰক"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="3747370091309939684">"টে\'বলেটো ঘূৰালে স্বয়ংক্ৰিয়ভাৱে স্ক্ৰীণৰ দিশ সলনি কৰক"</string>
@@ -2534,11 +2514,6 @@
     <string name="enable_service_title" msgid="7231533866953706788">"<xliff:g id="SERVICE">%1$s</xliff:g>ক আপোনাৰ ডিভাইচৰ সম্পূর্ণ নিয়ন্ত্ৰণ দিবনে?"</string>
     <string name="capabilities_list_title" msgid="1225853611983394386">"<xliff:g id="SERVICE">%1$s</xliff:g>ক নিম্নোক্ত অনুমতিকেইটাৰ আৱশ্যক:"</string>
     <string name="touch_filtered_warning" msgid="4225815157460318241">"যিহেতু এটা এপে অনুমতি বিচাৰি কৰা অনুৰোধ ঢাকি ধৰিছে, Settingsএ আপোনাৰ উত্তৰ সত্যাপন কৰিব পৰা নাই।"</string>
-    <string name="enable_service_encryption_warning" msgid="931082737770453755">"যদি আপুনি <xliff:g id="SERVICE">%1$s</xliff:g> অন কৰে, তেন্তে আপোনাৰ ডিভাইচটোৱে ডেটা এনক্ৰিপশ্বন বঢ়াবলৈ স্ক্ৰীন লক ব্যৱহাৰ নকৰিব।"</string>
-    <string name="secure_lock_encryption_warning" msgid="669152607190123579">"যিহেতু আপুনি দিব্যাংগসকলৰ বাবে থকা এটা সেৱা অন কৰিছে, গতিকে আপোনাৰ ডিভাইচটোৱে ডেটা এনক্ৰিপশ্বন বঢ়াবলৈ আপোনাৰ স্ক্ৰীন লকটো ব্যৱহাৰ নকৰিব।"</string>
-    <string name="enable_service_pattern_reason" msgid="6832846117817938536">"যিহেতু <xliff:g id="SERVICE">%1$s</xliff:g>ক সক্ৰিয় কৰিলে ডেটা এনক্ৰিপশ্বনত প্ৰভাৱ পৰিব, গতিকে আপুনি আপোনাৰ আৰ্হিটো নিশ্চিত কৰিব লাগিব।"</string>
-    <string name="enable_service_pin_reason" msgid="6040417014360237703">"যিহেতু <xliff:g id="SERVICE">%1$s</xliff:g> সক্ৰিয় কৰিলে ডেটা এনক্ৰিপশ্বনত প্ৰভাৱ পৰিব, গতিকে আপুনি আপোনাৰ পিনটো নিশ্চিত কৰিব লাগিব।"</string>
-    <string name="enable_service_password_reason" msgid="6962544350351734238">"যিহেতু <xliff:g id="SERVICE">%1$s</xliff:g>ক সক্ৰিয় কৰিলে ডেটা এনক্ৰিপশ্বনত প্ৰভাৱ পৰিব, গতিকে আপুনি আপোনাৰ পাছৱৰ্ডটো নিশ্চিত কৰিব লাগিব।"</string>
     <string name="accessibility_service_warning" msgid="6779187188736432618">"<xliff:g id="SERVICE">%1$s</xliff:g>এ এই ডিভাইচটোৰ সম্পূৰ্ণ নিয়ন্ত্ৰণ বিচাৰিছে। এই সেৱাটোৱে স্ক্ৰীন পঢ়িব পাৰে আৰু ব্যৱহাৰকাৰীৰ হৈ সাধ্য সুবিধাৰ প্ৰয়োজন অনুসৰি কাম কৰিব পাৰে। বেছিভাগ এপৰ ক্ষেত্ৰত এই নিয়ন্ত্ৰণৰ স্তৰ সঠিক নহয়।"</string>
     <string name="accessibility_service_warning_description" msgid="6573203795976134751">"আপোনাক সাধ্য সুবিধাৰ প্ৰয়োজনসমূহৰ জৰিয়তে সহায় কৰা এপ্‌সমূহৰ বাবে সম্পূর্ণ নিয়ন্ত্ৰণৰ সুবিধাটো সঠিক যদিও অধিকাংশ এপৰ বাবে এয়া সঠিক নহয়।"</string>
     <string name="accessibility_service_screen_control_title" msgid="324795030658109870">"চাওক আৰু স্ক্ৰীন নিয়ন্ত্ৰণ কৰক"</string>
@@ -3103,14 +3078,6 @@
     <string name="remove_account_failed" msgid="3709502163548900644">"আপোনাৰ প্ৰশাসকে এইটো সলনি কৰিবলৈ অনুমতি নিদিয়ে"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"মেনুৱেলী ছিংক কৰিব পৰা নগ\'ল"</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"এই বস্তুটোৰ বাবে ছিংক বৰ্তমান নিষ্ক্ৰিয় হৈ আছে। সেই ছেটিংটো সলনি কৰিবলৈ সাময়িকভাৱে নেপথ্য ডেটা আৰু স্বয়ংক্ৰিয় ছিংক সক্ৰিয় কৰক।"</string>
-    <string name="enter_password" msgid="6327051330258595331">"Android আৰম্ভ কৰিবলৈ আপোনাৰ পাছৱৰ্ড দিয়ক"</string>
-    <string name="enter_pin" msgid="1029287617551232681">"Android আৰম্ভ কৰিবলৈ আপোনাৰ পিনটো দিয়ক"</string>
-    <string name="enter_pattern" msgid="1747316785866742960">"Android ষ্টাৰ্ট কৰিবলৈ আপোনাৰ আৰ্হিটো আঁকক"</string>
-    <string name="cryptkeeper_wrong_pattern" msgid="340747269176120242">"ভুল আৰ্হি"</string>
-    <string name="cryptkeeper_wrong_password" msgid="7295607881887114486">"ভুল পাছৱৰ্ড"</string>
-    <string name="cryptkeeper_wrong_pin" msgid="2347961593970714201">"ভুল পিন"</string>
-    <string name="checking_decryption" msgid="6111642972615688237">"পৰীক্ষা কৰি থকা হৈছে…"</string>
-    <string name="starting_android" msgid="6694154070215356186">"Android ষ্টাৰ্ট কৰা হৈছে…"</string>
     <string name="delete" msgid="8330605554706263775">"মচক"</string>
     <string name="misc_files" msgid="6598066985800749585">"বিভিন্ন ফাইল"</string>
     <string name="misc_files_selected_count" msgid="5597802791672749532">"<xliff:g id="TOTAL">%2$d</xliff:g>ৰ ভিতৰত <xliff:g id="NUMBER">%1$d</xliff:g> বাছনি কৰা হ’ল"</string>
@@ -3206,8 +3173,6 @@
     <string name="data_usage_metered_yes" msgid="4262598072030135223">"নিৰিখ-নিৰ্দিষ্ট"</string>
     <string name="data_usage_metered_no" msgid="1685828958417926268">"নিৰিখ-নিৰ্দিষ্ট নহয়"</string>
     <string name="data_usage_disclaimer" msgid="3271450299386176770">"বাহকৰ ডেটা গণনা কাৰ্য আপোনাৰ ডিভাইচতকৈ পৃথক হ’ব পাৰে৷"</string>
-    <string name="cryptkeeper_emergency_call" msgid="8369322820475703306">"জৰূৰীকালীন ক\'ল"</string>
-    <string name="cryptkeeper_return_to_call" msgid="3857250752781151232">"কললৈ ঘূৰি যাওক"</string>
     <string name="vpn_name" msgid="3806456074909253262">"নাম"</string>
     <string name="vpn_type" msgid="5533202873260826663">"প্রকাৰ"</string>
     <string name="vpn_server" msgid="2908816134941973935">"ছাৰ্ভাৰৰ ঠিকনা"</string>
@@ -4764,8 +4729,6 @@
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g>টা এপে সীমাহীন ডেটা ব্যৱহাৰ কৰিব পাৰে</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"অধিক চাওক"</string>
-    <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"ব্যৱহাৰকাৰীৰ ডেটা মচা আৰু ফাইল এনক্ৰিপশ্বনলৈ ৰূপান্তৰ কৰিবলৈ লোৱাটো নিশ্চিতনে?"</string>
-    <string name="button_confirm_convert_fbe" msgid="339648921918438106">"মচক আৰু ৰূপান্তৰ কৰক"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"ShortcutManager ৰেইট-লিমিট ৰিছেট কৰক"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"ShortcutManagerৰ নিৰিখ-সীমাবদ্ধকৰণ ৰিছেট কৰা হ’ল"</string>
     <string name="notification_suggestion_title" msgid="6309263655965785411">"লক স্ক্ৰীনত ওলোৱা তথ্য নিয়ন্ত্ৰণ কৰক"</string>
@@ -5292,6 +5255,7 @@
     <string name="sim_action_yes" msgid="8076556020131395515">"হয়"</string>
     <string name="sim_action_reboot" msgid="3508948833333441538">"ৰিষ্টাৰ্ট কৰক"</string>
     <string name="sim_action_no_thanks" msgid="435717748384544195">"নালাগে, ধন্যবাদ"</string>
+    <string name="sim_action_cancel" msgid="2668099867029610910">"বাতিল কৰক"</string>
     <string name="sim_switch_button" msgid="1405772571706095387">"সলনি কৰক"</string>
     <string name="dsds_activation_failure_title" msgid="4467364110584914794">"ছিমখন সক্ৰিয় কৰিব নোৱাৰি"</string>
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"ছিমখন আঁতৰাওক আৰু পুনৰ ভৰাওক। সমস্যাটো অব্যাহত থাকিলে আপোনাৰ ডিভাইচটো ৰিষ্টাৰ্ট কৰক।"</string>
@@ -5444,6 +5408,10 @@
     <string name="cached_apps_freezer" msgid="1057519579761550350">"কেশ্ব কৰা এপ্‌সমূহৰ বাবে কাৰ্যকৰীকৰণ নিলম্বন কৰক"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"Settingsত স্ক্ৰীন অ’ভাৰলে’ৰ অনুমতি দিয়ে"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"এনে এপ্‌সমূহক অনুমতি দিয়ে যি Settingsৰ স্ক্ৰীন অ’ভাৰলে’ কৰিবলৈ অন্য এপ্‌সমূহৰ ওপৰত প্ৰদৰ্শিত হ’ব পাৰে"</string>
+    <!-- no translation found for allow_mock_modem (3832264806530479214) -->
+    <skip />
+    <!-- no translation found for allow_mock_modem_summary (9097416612748005374) -->
+    <skip />
     <string name="media_controls_title" msgid="403271085636252597">"মিডিয়া"</string>
     <string name="media_controls_resume_title" msgid="855076860336652370">"মিডিয়া প্লে’য়াৰ পিন কৰক"</string>
     <string name="media_controls_resume_description" msgid="3163482266454802097">"প্লে’বেক ক্ষিপ্ৰতাৰে পুনৰ আৰম্ভ কৰিবলৈ ক্ষিপ্ৰ ছেটিঙত মিডিয়া প্লে’য়াৰ খোলা থাকে"</string>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index fd75a87..4c82b09 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -142,10 +142,11 @@
     <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"Cihaza yaxınlıqdakı Bluetooth cihazları ilə əlaqə yaratmaq icazəsi verin"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"Telefona yaxınlıqdakı Bluetooth cihazları ilə əlaqə yaratmaq icazəsi verin"</string>
     <string name="bluetooth_disable_a2dp_hw_offload" msgid="5942913792817797541">"Bluetooth A2DP profilinin aparat boşalması deaktiv edilsin"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="8610420176339657720">"Cihaz yenidən başladılsın?"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8333029144800835996">"Bu ayarı dəyişmək üçün cihazı yenidən başlatmalısınız."</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="3488695418187553566">"Yenidən başladın"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="4930826928585464191">"Ləğv edin"</string>
+    <string name="bluetooth_disable_le_audio_hw_offload" msgid="3966022676505972908">"Bluetooth LE AUDIO avadanlıq ləğvini deaktiv edin"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_title" msgid="6001142380445276918">"Cihaz yenidən başladılsın?"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_message" msgid="1524373895333698779">"Bu ayarı dəyişmək üçün cihazı yenidən başlatmalısınız."</string>
+    <string name="bluetooth_disable_hw_offload_dialog_confirm" msgid="5594859658551707592">"Yenidən başladın"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel" msgid="3663690305043973720">"Ləğv edin"</string>
     <string name="connected_device_media_device_title" msgid="3783388247594566734">"Media cihazları"</string>
     <string name="connected_device_call_device_title" msgid="88732390601723608">"Zəng cihazları"</string>
     <string name="connected_device_other_device_title" msgid="4652120430615729193">"Digər cihazlar"</string>
@@ -309,9 +310,9 @@
     <string name="security_settings_title" msgid="6710768415432791970">"Güvənlik"</string>
     <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"Şifrələmə və kimlik bilgiləri"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"Telefon şifrələnib"</string>
-    <string name="decryption_settings_summary" product="default" msgid="1742645256103613503">"Telefon şifrələnmədi"</string>
+    <string name="not_encrypted_summary" product="default" msgid="2251945842585788254">"Telefon şifrələnmədi"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"Cihaz şifrələndi"</string>
-    <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"Cihaz şifrələnmədi"</string>
+    <string name="not_encrypted_summary" product="tablet" msgid="2374263654698719382">"Cihaz şifrələnmədi"</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"Kilid ekranı"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"Nəyi göstərmək lazımdır"</string>
     <string name="security_settings_summary" msgid="1627059516127354233">"Məkanım\'ı, ekranı kiliddən çıxarmanı, hesab yaddaş kilidini ayarlayın,"</string>
@@ -568,37 +569,10 @@
     <string name="fingerprint_last_delete_message" msgid="7860374760549404410">"Telefonunuzu kiliddən çıxarmaq və ya tətbiqlərdə kimliyi doğrulamaq üçün barmaq izinizi istifadə edə bilməyəcəksiniz."</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="4104208067277655068">"İş profilinizi kiliddən çıxarmaq, alışları təsdiqləmək və ya iş tətbiqlərinə giriş üçün barmaq izinizi istifadə edə bilməyəcəksiniz"</string>
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"Bəli, silin"</string>
-    <string name="crypt_keeper_settings_title" msgid="4938812137822100044">"Şifrələmə"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"Planşeti şifrələyin"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"Telefonu şifrələyin"</string>
-    <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"Şifrəli"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"Hesabları, ayarları, endirilmiş tətbiqləri və onların datasını, medianı və digər faylları şifrələyə bilərsiniz. Planşeti şifrələyəndən sonra hesab etsək ki, ekran kilidini quraşdırmısınız (yəni, model, rəqəmli PIN və ya parol), hər dəfə planşeti işə salanda deşifrə etmək üçün ekranı kiliddən çıxarmalı olacaqsınız. Deşifrə etməyin yeganə digər yolu fabrik sıfırlanmasının edilməsidir ki, bütün datanızın silinməsi ilə nəticələnir.\n\nŞifrələnmə bir və ya bir neçə saat vaxt aparır. Şifrələməyə dolmuş batareya ilə başlamalısınız və planşet bu müddət ərzində qidalanmalıdır. Proses tamamlanmamış kəsilsə, bütün datanız itəcək."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"Hesabları, ayarları, endirilmiş tətbiqləri və onların datasını, medianı və digər faylları şifrələyə bilərsiniz. Telefonu şifrələyəndən sonra hesab etsək ki, ekran kilidini quraşdırmısınız (yəni, model, rəqəmli PIN və ya parol), hər dəfə telefonu işə salanda deşifrə etmək üçün ekranı kiliddən çıxarmalı olacaqsınız. Deşifrə etməyin yeganə digər yolu fabrik sıfırlanmasının edilməsidir ki, bütün datanızın silinməsi ilə nəticələnir.\n\nŞifrələnmə bir və ya bir neçə saat vaxt aparır. Şifrələməyə dolmuş batareya ilə başlamalısınız və telefon bu müddət ərzində qidalanmalıdır. Proses tamamlanmamış kəsilsə, bütün datanız itəcək."</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"Planşeti şifrələ"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"Telefonu şifrələyin"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"Batareyanızı dolduraraq yenidən cəhd edin."</string>
-    <string name="crypt_keeper_unplugged_text" msgid="2709721134148651329">"Adaptoru elektrik şəbəkəsinə qoşun və yenidən cəhd edin."</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="1847280235529858357">"Ekran kilidi PIN\'i və ya parol yoxdur"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="7210616262954236042">"Şifrələməyə başlamazdan əvvəl ekran kilidi üçün PIN və ya parol qoymalısınız."</string>
-    <string name="crypt_keeper_confirm_title" msgid="8600000209722452230">"Şifrələnsin?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="3270587498436152259">"Şifrələmə əməliyyatını geri qaytarmaq mümkün deyil, onu kəsdiyiniz zaman datanızı itirəcəksiniz. Şifrələmə bir saat və ya daha çox vaxt tələb edir, bu müddət ərzində planşet bir neçə dəfə sönüb yanacaq."</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="3040428543349852419">"Şifrələmə əməliyyatını geri qaytarmaq mümkün deyil, onu kəsdiyiniz zaman datanızı itirəcəksiniz. Şifrələmə bir saat və ya daha çox vaxt tələb edir, bu müddət ərzində telefon bir neçə dəfə sönüb yanacaq."</string>
-    <string name="crypt_keeper_setup_title" msgid="3339725741305796680">"Şifrələnir"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="4417016995091289019">"Planşetiniz şifrələnə kimi gösləyin. <xliff:g id="PERCENT">^1</xliff:g> % şifrələnib."</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="7902355422499500352">"Telefonunuz şifrələnə kimi gösləyin. <xliff:g id="PERCENT">^1</xliff:g> % şifrələnib."</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="8348188415839917821">"Planşetin şifrələnməsini gözləyin. Qalan vaxt: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="8556105766597855198">"Telefonun şifrələnməsini gözləyin. Qalan vaxt: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="3832496715430327682">"Tabletinizi kiliddən açmaq üçün onu söndürün və sonra yandırın."</string>
-    <string name="crypt_keeper_force_power_cycle" product="default" msgid="5070346039522135361">"Telefonunuzu kiliddən açmaq üçün onu söndürün və sonra yandırın."</string>
-    <string name="crypt_keeper_warn_wipe" msgid="8104921337301750394">"Xəbərdarlıq: <xliff:g id="COUNT">^1</xliff:g> əlavə uğursuz kiliddən çıxarma cəhdindən sonra cihazınız silinəcək!"</string>
-    <string name="crypt_keeper_enter_password" msgid="1274917431075529732">"Parolunuzu daxil edin"</string>
-    <string name="crypt_keeper_failed_title" msgid="8173654570682244149">"Uğursuz şifrələmə"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"Şifrələnmə kəsildi və davam edə bilməz. Nəticə olaraq, planşetinizdəki data əlçatmazdır. \n\n  Planşetinizin istifadəsinə davam etmək üçün ayarları sıfırlamalısınız. Sıfırlayandan sonra planşetinizi ayarlasanız, Sizin Google Hesabınızda saxladığınız istənilən datanı bərpa etmək imkanınız olacaq."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"Şifrələnmə kəsildi və davam edə bilməz. Nəticə olaraq, planşetinizdəki data əlçatmazdır. \n\n  Planşetinizin istifadəsinə davam etmək üçün ayarları sıfırlamalısınız. Sıfırlayandan sonra planşetinizi ayarlasanız, Sizin Google Hesabınızda saxladığınız istənilən datanı bərpa etmək imkanınız olacaq."</string>
-    <string name="crypt_keeper_data_corrupt_title" msgid="5920153462176846037">"Deşifrə uğursuzdur"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"Daxil etdiyiniz parol düzgündür, lakin datanız zədəlidir. \n\nPlanşeti istifadə etməyə davam etmək üçün zavod sıfırlaması etməlisiniz. Sıfırlanandan sonra Google Hesabınızda yedəklənmiş istənilən datanı bərpa edə bilərsiniz."</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"Daxil etdiyiniz parol düzgündür, lakin datanız zədəlidir. \n\nTelefonu istifadə etməyə davam etmək üçün zavod sıfırlaması etməlisiniz. Sıfırlanandan sonra Google Hesabınızda yedəklənmiş istənilən datanı bərpa edə bilərsiniz."</string>
-    <string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"Daxiletmə metoduna keç"</string>
+    <string name="encryption_settings_title" msgid="2848716008695618360">"Şifrələmə"</string>
+    <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"Planşeti şifrələyin"</string>
+    <string name="encrypt_title" product="default" msgid="7337365190988321100">"Telefonu şifrələyin"</string>
+    <string name="encrypted_summary" msgid="545623487587251207">"Şifrəli"</string>
     <string name="suggested_lock_settings_title" msgid="7836065447159730217">"Telefonu qoruyun"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"Planşeti qorumaq üçün ekran kilidi ayarlayın"</string>
     <string name="suggested_lock_settings_summary" product="device" msgid="8479766049078378225">"Cihazı qorumaq üçün ekran kilidi ayarlayın"</string>
@@ -817,6 +791,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Siz, həmçinin, digər cihaza bu PIN kodu daxil etməli ola bilərsiniz."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Siz bu əsas açarı digər cihazda da yazmalı ola bilərsiniz."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt; ilə birləşdirmək üçün, onun bu ana açarı göstərdiyinə əmin olun:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Əlaqələndirilmiş dəstlə birləşdirməyi təsdiq edin"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"Kimdən:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Cihazınız bu cihazla cütləşsin?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Bunlarla cütlənmək üçün:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Bunu yazın:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, sonra Geri və ya Giriş basın."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Kontaktlar və zəng tarixçəsinə giriş icazəsi verin"</string>
@@ -850,6 +825,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Qoşulmaq mümkün olmadı. Yenidən cəhd edin."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Cihaz məlumatları"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Cihazın Bluetooth ünvanı: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Cihazın Bluetooth ünvanı:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Cihaz unudulsun?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Əlaqəni silin"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Tətbiq ayrılsın?"</string>
@@ -881,6 +857,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Ayarları yadda saxlayın"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Qoşulu Bluetooth audiocihazlarının maksimal sayı"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Qoşulu Bluetooth audiocihazlarının maksimal sayını bildirin"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"NFC yığın sazlama qeydiyyatı"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"NFC yığın qeydiyyat səviyyəsini artırın"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Yayım"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"güzgü"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Naqilsiz displeyi aktivləşdirin"</string>
@@ -1188,6 +1166,8 @@
     <string name="wifi_hotspot_maximize_compatibility_dual_ap_summary" msgid="3579549223159056533">"Digər cihazlara bu hotspotu tapmağa yardım edir. Enerji sərfiyyatını artırır."</string>
     <string name="wifi_tether_starting" msgid="8879874184033857814">"Hotspot yandırılır..."</string>
     <string name="wifi_tether_stopping" msgid="4416492968019409188">"Hotspot söndürülür…"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_title" msgid="3089432578433978073">"Modem rejimi əlçatan deyil"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_content" msgid="5920421547607921112">"Ətraflı məlumat üçün operatorunuzla əlaqə saxlayın"</string>
     <string name="wifi_tether_enabled_subtext" msgid="5085002421099821056">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> aktivdir"</string>
     <string name="wifi_tether_failed_subtext" msgid="437190628041885500">"Daşınan Wi-Fi hotspot xətası"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7072559431286459122">"Wi-Fi hotspot ayarlayın"</string>
@@ -2534,11 +2514,6 @@
     <string name="enable_service_title" msgid="7231533866953706788">"<xliff:g id="SERVICE">%1$s</xliff:g> xidmətinin cihaza tam nəzarət etməsinə icazə vermək istəyirsiniz?"</string>
     <string name="capabilities_list_title" msgid="1225853611983394386">"<xliff:g id="SERVICE">%1$s</xliff:g> etməlidir:"</string>
     <string name="touch_filtered_warning" msgid="4225815157460318241">"Çünki, tətbiq icazə sorğusunu anlaşılmaz edir. Ayarlar cavabınızı doğrulaya bilməz."</string>
-    <string name="enable_service_encryption_warning" msgid="931082737770453755">"<xliff:g id="SERVICE">%1$s</xliff:g> aktiv olarsa, cihazınız data şifrələnməsini genişləndirmək üçün ekran kilidini istifadə etməyəcək."</string>
-    <string name="secure_lock_encryption_warning" msgid="669152607190123579">"Girişimlik xidmətini aktiv etdiyiniz üçün cihazınız data şifrələnməsini genişləndirmək üçün ekran kilidini istifadə etməyəcək."</string>
-    <string name="enable_service_pattern_reason" msgid="6832846117817938536">"<xliff:g id="SERVICE">%1$s</xliff:g> xidmətinin aktiv edilməsi şifrələnməyə təsir etdiyi üçün modelinizi təsdiq etməlisiniz."</string>
-    <string name="enable_service_pin_reason" msgid="6040417014360237703">"<xliff:g id="SERVICE">%1$s</xliff:g> xidmətinin aktiv edilməsi şifrələnməyə təsir etdiyi üçün PIN kodunu təsdiq etməlisiniz."</string>
-    <string name="enable_service_password_reason" msgid="6962544350351734238">"<xliff:g id="SERVICE">%1$s</xliff:g> xidmətinin aktiv edilməsi şifrələnməyə təsir etdiyi üçün parolunuzu təsdiq etməlisiniz."</string>
     <string name="accessibility_service_warning" msgid="6779187188736432618">"<xliff:g id="SERVICE">%1$s</xliff:g> cihaza tam nəzarət istəyir. Məlumatları ekrandan oxuya, xüsusi imkanlara ehtiyacı olan istifadəçilərin adından iş görə bilər. Tətbiqlərin çoxuna bu səviyyədə icazə vermək tövsiyə olunmur."</string>
     <string name="accessibility_service_warning_description" msgid="6573203795976134751">"Tam nəzarət icazəsi xüsusi imkanlara dair yardım edən tətbiqlərə lazımdır, digər tətbiqlərə lazım deyil."</string>
     <string name="accessibility_service_screen_control_title" msgid="324795030658109870">"Baxış və nəzarət ekranı"</string>
@@ -3103,14 +3078,6 @@
     <string name="remove_account_failed" msgid="3709502163548900644">"Admin bu dəyişikliyə icazə vermir"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"Əl vasitəsi ilə sinxronizasiya alınmır"</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"Bu element üçün sinxronlaşma hazırda deaktiv edilibş Bu ayarı dəyişmək üçün müvəqqəti olaraq fon datasını və avtomatik sinxronlaşmanı aktivləşdirin."</string>
-    <string name="enter_password" msgid="6327051330258595331">"Androidə başlamaq üçün parolu daxil edin"</string>
-    <string name="enter_pin" msgid="1029287617551232681">"Androidə başlamaq üçün PIN-i daxil edin"</string>
-    <string name="enter_pattern" msgid="1747316785866742960">"Androidə başlamaq üçün modeli çəkin"</string>
-    <string name="cryptkeeper_wrong_pattern" msgid="340747269176120242">"Yanlış Model"</string>
-    <string name="cryptkeeper_wrong_password" msgid="7295607881887114486">"Yanlış Parol"</string>
-    <string name="cryptkeeper_wrong_pin" msgid="2347961593970714201">"PIN səhvdir"</string>
-    <string name="checking_decryption" msgid="6111642972615688237">"Yoxlanır..."</string>
-    <string name="starting_android" msgid="6694154070215356186">"Android işə başlayır..."</string>
     <string name="delete" msgid="8330605554706263775">"Silin"</string>
     <string name="misc_files" msgid="6598066985800749585">"Qarışıq fayllar"</string>
     <string name="misc_files_selected_count" msgid="5597802791672749532">"<xliff:g id="NUMBER">%1$d</xliff:g> ədəddın <xliff:g id="TOTAL">%2$d</xliff:g> seçildi"</string>
@@ -3206,8 +3173,6 @@
     <string name="data_usage_metered_yes" msgid="4262598072030135223">"Tarif sayğacılı"</string>
     <string name="data_usage_metered_no" msgid="1685828958417926268">"Ödənişsiz"</string>
     <string name="data_usage_disclaimer" msgid="3271450299386176770">"Operator data hesablanması cihazınızdakından fərqli ola bilər."</string>
-    <string name="cryptkeeper_emergency_call" msgid="8369322820475703306">"Təcili zəng"</string>
-    <string name="cryptkeeper_return_to_call" msgid="3857250752781151232">"Zəngə geri qayıt"</string>
     <string name="vpn_name" msgid="3806456074909253262">"Ad"</string>
     <string name="vpn_type" msgid="5533202873260826663">"Növ"</string>
     <string name="vpn_server" msgid="2908816134941973935">"Server ünvanı"</string>
@@ -4764,8 +4729,6 @@
       <item quantity="one">1 tətbiq məhdudlaşdırılmamış data istifadə edə bilər</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"Ətraflı məlumat"</string>
-    <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"İstifadəçi datası həqiqətən silinsin və fayl şifrələnməsinə çevirilsin?"</string>
-    <string name="button_confirm_convert_fbe" msgid="339648921918438106">"Silin və çevirin"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"ShortcutManager reytinq limitini sıfırlayın"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"ShortcutManager reytinq limit sıfırlandı"</string>
     <string name="notification_suggestion_title" msgid="6309263655965785411">"Kilid ekranında nəzarət məlumatı"</string>
@@ -5292,6 +5255,7 @@
     <string name="sim_action_yes" msgid="8076556020131395515">"Bəli"</string>
     <string name="sim_action_reboot" msgid="3508948833333441538">"Yenidən başladın"</string>
     <string name="sim_action_no_thanks" msgid="435717748384544195">"Xeyr, təşəkkür"</string>
+    <string name="sim_action_cancel" msgid="2668099867029610910">"Ləğv edin"</string>
     <string name="sim_switch_button" msgid="1405772571706095387">"Keçin"</string>
     <string name="dsds_activation_failure_title" msgid="4467364110584914794">"SIM-i aktiv etmək mümkün deyil"</string>
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"SIM-i çıxarıb yenidən taxın. Problem həll olmasa, cihazı yenidən başladın."</string>
@@ -5444,6 +5408,10 @@
     <string name="cached_apps_freezer" msgid="1057519579761550350">"Keşlənmiş tətbiqlərin icrası durdurulsun"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"Ayarlarda pəncərəüstü göstərilməyə icazə verilsin"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Digər tətbiqlərin üzərində görünmək icazəsi olan tətbiqlərə ayarlar üzərində görünmək icazəsi verilsin"</string>
+    <!-- no translation found for allow_mock_modem (3832264806530479214) -->
+    <skip />
+    <!-- no translation found for allow_mock_modem_summary (9097416612748005374) -->
+    <skip />
     <string name="media_controls_title" msgid="403271085636252597">"Media"</string>
     <string name="media_controls_resume_title" msgid="855076860336652370">"Mediapleyer bərkidilsin"</string>
     <string name="media_controls_resume_description" msgid="3163482266454802097">"Oxutmanı cəld davam etdirmək üçün media pleyer Sürətli Ayarlarda açıq qalır"</string>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index 3d3b671..9b96505 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -143,10 +143,11 @@
     <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"Omogućite uređaju da komunicira sa Bluetooth uređajima u blizini"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"Omogućite telefonu da komunicira sa Bluetooth uređajima u blizini"</string>
     <string name="bluetooth_disable_a2dp_hw_offload" msgid="5942913792817797541">"Onemogući Bluetooth A2DP hardversko rasterećenje"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="8610420176339657720">"Restartujete uređaj?"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8333029144800835996">"Restartujte uređaj da biste promenili ovo podešavanje."</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="3488695418187553566">"Restartuj"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="4930826928585464191">"Otkaži"</string>
+    <string name="bluetooth_disable_le_audio_hw_offload" msgid="3966022676505972908">"Onemogući Bluetooth LE AUDIO hardversko rasterećenje"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_title" msgid="6001142380445276918">"Želite da restartujete uređaj?"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_message" msgid="1524373895333698779">"Restartujte uređaj da biste promenili ovo podešavanje."</string>
+    <string name="bluetooth_disable_hw_offload_dialog_confirm" msgid="5594859658551707592">"Restartuj"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel" msgid="3663690305043973720">"Otkaži"</string>
     <string name="connected_device_media_device_title" msgid="3783388247594566734">"Medijski uređaji"</string>
     <string name="connected_device_call_device_title" msgid="88732390601723608">"Uređaji za pozivanje"</string>
     <string name="connected_device_other_device_title" msgid="4652120430615729193">"Drugi uređaji"</string>
@@ -312,9 +313,9 @@
     <string name="security_settings_title" msgid="6710768415432791970">"Bezbednost"</string>
     <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"Šifrovanje i akreditivi"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"Telefon je šifrovan"</string>
-    <string name="decryption_settings_summary" product="default" msgid="1742645256103613503">"Telefon nije šifrovan"</string>
+    <string name="not_encrypted_summary" product="default" msgid="2251945842585788254">"Telefon nije šifrovan"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"Uređaj je šifrovan"</string>
-    <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"Uređaj nije šifrovan"</string>
+    <string name="not_encrypted_summary" product="tablet" msgid="2374263654698719382">"Uređaj nije šifrovan"</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"Zaključani ekran"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"Šta se prikazuje"</string>
     <string name="security_settings_summary" msgid="1627059516127354233">"Podešavanje Moje lokacije, otključavanja ekrana, zaključavanja SIM kartice i zaključavanja akreditiva skladišta"</string>
@@ -572,37 +573,10 @@
     <string name="fingerprint_last_delete_message" msgid="7860374760549404410">"Nećete moći da koristite otisak prsta da biste otključavali telefon ili verifikovali identitet u aplikacijama."</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="4104208067277655068">"Nećete moći da koristite otisak prsta za otključavanje poslovnog profila, ovlašćivanje kupovina ili prijavljivanje u poslovne aplikacije."</string>
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"Da, ukloni"</string>
-    <string name="crypt_keeper_settings_title" msgid="4938812137822100044">"Šifrovanje"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"Šifruj tablet"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"Šifrovanje telefona"</string>
-    <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"Šifrovano"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"Možete da šifrujete naloge, podešavanja, preuzete aplikacije i njihove podatke, medije i druge datoteke. Kada šifrujete tablet, a pod pretpostavkom da ste podesili zaključavanje ekrana (to jest, šablon, numerički PIN ili lozinku), treba da otključate ekran da biste dešifrovali tablet svaki put kada ga uključite. Jedini drugi način da dešifrujete uređaj je da obavite resetovanje na fabrička podešavanja, čime ćete izbrisati sve podatke.\n\nŠifrovanje traje sat vremena ili više. Morate da počnete sa napunjenom baterijom i da ne isključujete tablet iz punjača tokom celog tog procesa. Ako prekinete taj proces, izgubićete sve podatke ili neke od njih."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"Možete da šifrujete naloge, podešavanja, preuzete aplikacije i njihove podatke, medije i druge datoteke. Kada šifrujete telefon, a pod pretpostavkom da ste podesili zaključavanje ekrana (to jest, šablon, numerički PIN ili lozinku), treba da otključate ekran da biste dešifrovali telefon svaki put kada ga uključite. Jedini drugi način da dešifrujete uređaj je da obavite resetovanje na fabrička podešavanja, čime ćete izbrisati sve podatke.\n\nŠifrovanje traje sat vremena ili više. Morate da počnete sa napunjenom baterijom i da ne isključujete telefon iz punjača tokom celog tog procesa. Ako prekinete taj proces, izgubićete sve podatke ili neke od njih."</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"Šifruj tablet"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"Šifruj telefon"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"Napunite bateriju i pokušajte ponovo."</string>
-    <string name="crypt_keeper_unplugged_text" msgid="2709721134148651329">"Uključite punjač i pokušajte ponovo."</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="1847280235529858357">"Nema PIN-a ili lozinke za zaključavanje ekrana"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="7210616262954236042">"Potrebno je da podesite PIN ili lozinku za zaključavanje ekrana da biste mogli da započnete šifrovanje."</string>
-    <string name="crypt_keeper_confirm_title" msgid="8600000209722452230">"Želite li da šifrujete?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="3270587498436152259">"Operacija šifrovanja je neopoziva i ukoliko je prekinete, izgubićete podatke. Šifrovanje traje jedan sat ili duže i u tom periodu tablet će se ponovo pokrenuti nekoliko puta."</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="3040428543349852419">"Operacija šifrovanja je neopoziva i ukoliko je prekinete, izgubićete podatke. Šifrovanje traje jedan sat ili duže i u tom periodu telefon će se ponovo pokrenuti nekoliko puta."</string>
-    <string name="crypt_keeper_setup_title" msgid="3339725741305796680">"Šifrovanje"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="4417016995091289019">"Sačekajte da se tablet šifruje. Dovršeno je <xliff:g id="PERCENT">^1</xliff:g>%."</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="7902355422499500352">"Sačekajte da se telefon šifruje. Dovršeno je <xliff:g id="PERCENT">^1</xliff:g>%."</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="8348188415839917821">"Sačekajte dok se tablet šifruje. Preostalo vreme: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="8556105766597855198">"Sačekajte dok se telefon šifruje. Preostalo vreme: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="3832496715430327682">"Da biste otključali tablet, isključite ga, pa ga ponovo uključite."</string>
-    <string name="crypt_keeper_force_power_cycle" product="default" msgid="5070346039522135361">"Da biste otključali telefon, isključite ga, pa ga ponovo uključite."</string>
-    <string name="crypt_keeper_warn_wipe" msgid="8104921337301750394">"Upozorenje: Podaci sa uređaja će biti obrisani ako ne uspete da ga otključate još <xliff:g id="COUNT">^1</xliff:g> puta!"</string>
-    <string name="crypt_keeper_enter_password" msgid="1274917431075529732">"Unesite lozinku"</string>
-    <string name="crypt_keeper_failed_title" msgid="8173654570682244149">"Šifrovanje nije uspelo"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"Šifrovanje je prekinuto i ne može da se dovrši. Kao posledica toga, podaci na tabletu više nisu dostupni. \n\n Da biste nastavili da koristite tablet, treba da ga resetujete. Kada ga podesite nakon resetovanja na fabrička podešavanja, imaćete priliku da vratite sve podatke za koje ste napravili rezervne kopije na Google nalogu."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"Šifrovanje je prekinuto i ne može da se dovrši. Kao posledica toga, podaci na telefonu više nisu dostupni. \n\nDa biste nastavili da koristite telefon, treba da ga resetujete. Kada ga podesite nakon resetovanja na fabrička podešavanja, imaćete priliku da vratite sve podatke za koje ste napravili rezervne kopije na Google nalogu."</string>
-    <string name="crypt_keeper_data_corrupt_title" msgid="5920153462176846037">"Dešifrovanje nije uspelo"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"Lozinka koju ste uneli je tačna, ali, nažalost, podaci su oštećeni. \n\nDa biste nastavili da koristite tablet, treba da obavite resetovanje na fabrička podešavanja. Tokom podešavanja tableta posle resetovanja moći ćete da vratite sve podatke čija rezervna kopija postoji na Google nalogu."</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"Lozinka koju ste uneli je tačna, ali, nažalost, podaci su oštećeni. \n\nDa biste nastavili da koristite telefon, treba da obavite resetovanje na fabrička podešavanja. Tokom podešavanja telefona posle resetovanja moći ćete da vratite sve podatke čija rezervna kopija postoji na Google nalogu."</string>
-    <string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"Prebaci metode unosa"</string>
+    <string name="encryption_settings_title" msgid="2848716008695618360">"Šifrovanje"</string>
+    <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"Šifruj tablet"</string>
+    <string name="encrypt_title" product="default" msgid="7337365190988321100">"Šifruj telefon"</string>
+    <string name="encrypted_summary" msgid="545623487587251207">"Šifrovano"</string>
     <string name="suggested_lock_settings_title" msgid="7836065447159730217">"Zaštitite telefon"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"Podesite zaključavanje ekrana da biste zaštitili tablet"</string>
     <string name="suggested_lock_settings_summary" product="device" msgid="8479766049078378225">"Podesite zaključavanje ekrana da biste zaštitili uređaj"</string>
@@ -834,6 +808,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Možda će biti potrebno da unesete ovaj PIN i na drugom uređaju."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Možda će biti potrebno da unesete ovaj pristupni kôd i na drugom uređaju."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Da biste se uparili sa uređajem:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Uverite se da prikazuje ovaj pristupni kôd:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Potvrdite radi uparivanja sa koordinisanim skupom"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"Sa uređaja:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Želite li da se uparite sa tim uređajem?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Za uparivanje sa uređajem:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Unesite na njemu:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, a zatim pritisnite Return ili Enter."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Dozvoli pristup kontaktima i istoriji poziva"</string>
@@ -867,6 +842,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Povezivanje nije uspelo. Pokušajte ponovo."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Detalji o uređaju"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Bluetooth adresa uređaja: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Bluetooth adresa uređaja:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Želite li da zaboravite uređaj?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Ukloni povezivanje"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Želite da prekinete vezu sa aplikacijom?"</string>
@@ -898,6 +874,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Zapamti podešavanja"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Maksimalan broj povezanih Bluetooth audio uređaja"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Izaberite maksimalni broj povezanih Bluetooth audio uređaja"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"Evidencija otklanjanja grešaka za NFC grupu"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Povećajte nivo evidencije za NFC grupu"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Prebacivanje"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"preslikati"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Omogući bežični prikaz"</string>
@@ -1208,6 +1186,8 @@
     <string name="wifi_hotspot_maximize_compatibility_dual_ap_summary" msgid="3579549223159056533">"Pomaže drugim uređajima da pronađu ovaj hotspot. Povećava potrošnju baterije."</string>
     <string name="wifi_tether_starting" msgid="8879874184033857814">"Uključivanje hotspota…"</string>
     <string name="wifi_tether_stopping" msgid="4416492968019409188">"Isključivanje hotspota..."</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_title" msgid="3089432578433978073">"Privezivanje je nedostupno"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_content" msgid="5920421547607921112">"Obratite se mobilnom operateru za detalje"</string>
     <string name="wifi_tether_enabled_subtext" msgid="5085002421099821056">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> je aktivan"</string>
     <string name="wifi_tether_failed_subtext" msgid="437190628041885500">"Greška prenosnog Wi‑Fi hotspota"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7072559431286459122">"Podesi WiFi hotspot"</string>
@@ -2563,11 +2543,6 @@
     <string name="enable_service_title" msgid="7231533866953706788">"Želite li da dozvolite da <xliff:g id="SERVICE">%1$s</xliff:g> ima potpunu kontrolu nad uređajem?"</string>
     <string name="capabilities_list_title" msgid="1225853611983394386">"<xliff:g id="SERVICE">%1$s</xliff:g> treba:"</string>
     <string name="touch_filtered_warning" msgid="4225815157460318241">"Pošto aplikacija skriva zahtev za dozvolu, Podešavanja ne mogu da verifikuju odgovor."</string>
-    <string name="enable_service_encryption_warning" msgid="931082737770453755">"Ako uključite <xliff:g id="SERVICE">%1$s</xliff:g>, uređaj neće koristiti zaključavanje ekrana da bi poboljšao šifrovanje podataka."</string>
-    <string name="secure_lock_encryption_warning" msgid="669152607190123579">"Pošto ste uključili uslugu pristupačnosti, uređaj neće koristiti zaključavanje ekrana da bi poboljšao šifrovanje podataka."</string>
-    <string name="enable_service_pattern_reason" msgid="6832846117817938536">"Pošto uključivanje usluge <xliff:g id="SERVICE">%1$s</xliff:g> utiče na šifrovanje podataka, treba da potvrdite šablon."</string>
-    <string name="enable_service_pin_reason" msgid="6040417014360237703">"Pošto uključivanje usluge <xliff:g id="SERVICE">%1$s</xliff:g> utiče na šifrovanje podataka, treba da potvrdite PIN."</string>
-    <string name="enable_service_password_reason" msgid="6962544350351734238">"Pošto uključivanje usluge <xliff:g id="SERVICE">%1$s</xliff:g> utiče na šifrovanje podataka, treba da potvrdite lozinku."</string>
     <string name="accessibility_service_warning" msgid="6779187188736432618">"<xliff:g id="SERVICE">%1$s</xliff:g> traži potpunu kontrolu nad ovim uređajem. Usluga može da čita sadržaj sa ekrana i da obavlja razne zadatke za korisnike usluga pristupačnosti. Ovaj nivo kontrole nije odgovarajući za većinu aplikacija."</string>
     <string name="accessibility_service_warning_description" msgid="6573203795976134751">"Potpuna kontrola je primerena za aplikacije koje vam pomažu kod usluga pristupačnosti, ali ne i za većinu aplikacija."</string>
     <string name="accessibility_service_screen_control_title" msgid="324795030658109870">"Pregledaj i kontroliši ekran"</string>
@@ -3143,14 +3118,6 @@
     <string name="remove_account_failed" msgid="3709502163548900644">"Administrator ne dozvoljava ovu promenu"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"Ručno sinhronizovanje nije moguće"</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"Sinhronizacija za ovu stavku je trenutno onemogućena. Da biste promenili ovo podešavanje, privremeno uključite pozadinske podatke i automatsku sinhronizaciju."</string>
-    <string name="enter_password" msgid="6327051330258595331">"Da biste pokrenuli Android, unesite lozinku"</string>
-    <string name="enter_pin" msgid="1029287617551232681">"Da biste pokrenuli Android, unesite PIN"</string>
-    <string name="enter_pattern" msgid="1747316785866742960">"Da biste pokrenuli Android, nacrtajte šablon"</string>
-    <string name="cryptkeeper_wrong_pattern" msgid="340747269176120242">"Pogrešan šablon"</string>
-    <string name="cryptkeeper_wrong_password" msgid="7295607881887114486">"Pogrešna lozinka"</string>
-    <string name="cryptkeeper_wrong_pin" msgid="2347961593970714201">"Pogrešan PIN"</string>
-    <string name="checking_decryption" msgid="6111642972615688237">"Proverava se..."</string>
-    <string name="starting_android" msgid="6694154070215356186">"Pokrećemo Android..."</string>
     <string name="delete" msgid="8330605554706263775">"Izbriši"</string>
     <string name="misc_files" msgid="6598066985800749585">"Razne datoteke"</string>
     <string name="misc_files_selected_count" msgid="5597802791672749532">"izabrano je <xliff:g id="NUMBER">%1$d</xliff:g> od <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -3246,8 +3213,6 @@
     <string name="data_usage_metered_yes" msgid="4262598072030135223">"Sa ograničenjem"</string>
     <string name="data_usage_metered_no" msgid="1685828958417926268">"Bez ograničenja"</string>
     <string name="data_usage_disclaimer" msgid="3271450299386176770">"Obračun podataka kod mobilnog operatera se možda razlikuje od vašeg uređaja."</string>
-    <string name="cryptkeeper_emergency_call" msgid="8369322820475703306">"Hitan poziv"</string>
-    <string name="cryptkeeper_return_to_call" msgid="3857250752781151232">"Nazad na poziv"</string>
     <string name="vpn_name" msgid="3806456074909253262">"Naziv"</string>
     <string name="vpn_type" msgid="5533202873260826663">"Tip"</string>
     <string name="vpn_server" msgid="2908816134941973935">"Adresa servera"</string>
@@ -4832,15 +4797,13 @@
     <string name="display_cutout_emulation_keywords" msgid="4506580703807358127">"izrezana slika za ekran, urez"</string>
     <string name="overlay_option_device_default" msgid="7986355499809313848">"Podrazumevano podešavanje za uređaj"</string>
     <string name="overlay_toast_failed_to_apply" msgid="4839587811338164960">"Primena preklopnog elementa nije uspela"</string>
-    <string name="special_access" msgid="1767980727423395147">"Poseban pristup aplikaciji"</string>
+    <string name="special_access" msgid="1767980727423395147">"Poseban pristup aplikacija"</string>
     <plurals name="special_access_summary" formatted="false" msgid="4995506406763570815">
       <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> aplikacija može da koristi neograničenu količinu podataka</item>
       <item quantity="few"><xliff:g id="COUNT">%d</xliff:g> aplikacije mogu da koriste neograničenu količinu podataka</item>
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> aplikacija može da koristi neograničenu količinu podataka</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"Prikaži još"</string>
-    <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"Želite li stvarno da izbrišete podatke korisnika i da konvertujete u šifrovanje datoteka?"</string>
-    <string name="button_confirm_convert_fbe" msgid="339648921918438106">"Izbriši i konvertuj"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"Resetuj ograničavanje broja u ShortcutManager-u"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"Ograničavanje broja u ShortcutManager-u je resetovano"</string>
     <string name="notification_suggestion_title" msgid="6309263655965785411">"Kontrolišite informacije na zaključanom ekranu"</string>
@@ -5379,6 +5342,7 @@
     <string name="sim_action_yes" msgid="8076556020131395515">"Da"</string>
     <string name="sim_action_reboot" msgid="3508948833333441538">"Restartuj"</string>
     <string name="sim_action_no_thanks" msgid="435717748384544195">"Ne, hvala"</string>
+    <string name="sim_action_cancel" msgid="2668099867029610910">"Otkaži"</string>
     <string name="sim_switch_button" msgid="1405772571706095387">"Pređi"</string>
     <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Aktiviranje SIM kartice nije uspelo"</string>
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Uklonite SIM karticu, pa je stavite ponovo. Ako se problem i dalje javlja, restartujte uređaj."</string>
@@ -5408,7 +5372,7 @@
     <string name="erasing_sim" msgid="7877703231075699139">"SIM se briše…"</string>
     <string name="erase_sim_fail_title" msgid="2024446702985862427">"Brisanje SIM-a nije uspelo"</string>
     <string name="erase_sim_fail_text" msgid="7870804401227483131">"Ovaj SIM ne može da se obriše zbog greške.\n\nRestartujte uređaj i probajte ponovo."</string>
-    <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Povežite se sa uređajem"</string>
+    <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Povežite 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>
     <string name="network_connection_timeout_dialog_ok" msgid="6022675321823723755">"Probaj ponovo"</string>
@@ -5533,6 +5497,10 @@
     <string name="cached_apps_freezer" msgid="1057519579761550350">"Suspenduj izvršenje za keširane aplikacije"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"Dozvoli prekrivanje sadržaja ekrana Podešavanja"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Aplikacije koje mogu da se prikazuju preko drugih aplikacija prekrivaju sadržaj ekrana Podešavanja"</string>
+    <!-- no translation found for allow_mock_modem (3832264806530479214) -->
+    <skip />
+    <!-- no translation found for allow_mock_modem_summary (9097416612748005374) -->
+    <skip />
     <string name="media_controls_title" msgid="403271085636252597">"Mediji"</string>
     <string name="media_controls_resume_title" msgid="855076860336652370">"Zakači medija plejer"</string>
     <string name="media_controls_resume_description" msgid="3163482266454802097">"Da biste brzo nastavili reprodukciju, medija plejer ostaje otvoren u Brzim podešavanjima"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index fc1d429..cd6ee44 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -144,10 +144,11 @@
     <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"Дазволіць прыладзе абменьвацца данымі з іншымі прыладамі праз Bluetooth"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"Дазволіць тэлефону абменьвацца данымі з іншымі прыладамі праз Bluetooth"</string>
     <string name="bluetooth_disable_a2dp_hw_offload" msgid="5942913792817797541">"Адключыць выгрузку Bluetooth A2DP"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="8610420176339657720">"Перазапусціць?"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8333029144800835996">"Каб змяніць гэту наладу, трэба перазапусціць прыладу."</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="3488695418187553566">"Перазапуск"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="4930826928585464191">"Скасаваць"</string>
+    <string name="bluetooth_disable_le_audio_hw_offload" msgid="3966022676505972908">"Адключыць апаратную разгрузку для Bluetooth LE AUDIO"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_title" msgid="6001142380445276918">"Перазапусціць прыладу?"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_message" msgid="1524373895333698779">"Каб змяніць гэту наладу, трэба перазапусціць прыладу."</string>
+    <string name="bluetooth_disable_hw_offload_dialog_confirm" msgid="5594859658551707592">"Перазапусціць"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel" msgid="3663690305043973720">"Скасаваць"</string>
     <string name="connected_device_media_device_title" msgid="3783388247594566734">"Носьбіты даных"</string>
     <string name="connected_device_call_device_title" msgid="88732390601723608">"Выклікаць прылады"</string>
     <string name="connected_device_other_device_title" msgid="4652120430615729193">"Іншыя прылады"</string>
@@ -315,9 +316,9 @@
     <string name="security_settings_title" msgid="6710768415432791970">"Бяспека"</string>
     <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"Шыфраванне і ўліковыя даныя"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"Тэлефон зашыфраваны"</string>
-    <string name="decryption_settings_summary" product="default" msgid="1742645256103613503">"Тэлефон не зашыфраваны"</string>
+    <string name="not_encrypted_summary" product="default" msgid="2251945842585788254">"Даныя не зашыфраваны"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"Прылада зашыфравана"</string>
-    <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"Прылада не зашыфравана"</string>
+    <string name="not_encrypted_summary" product="tablet" msgid="2374263654698719382">"Даныя не зашыфраваны"</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"Экран блакіроўкі"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"Што паказваць"</string>
     <string name="security_settings_summary" msgid="1627059516127354233">"Задаць Маё месцазнаходжанне, разблакаванне экрана, блакаванне SIM-карты, блакаванне сховішча ўліковых дадзеных"</string>
@@ -496,7 +497,7 @@
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Дакраніцеся некалькі разоў, каб адбітак быў больш дакладны"</string>
     <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"Кожны раз падчас руху значка адбітка пальца ўтрымлівайце палец націснутым. Гэта працэдура дапаможа больш дакладна зафіксаваць адбітак пальца."</string>
     <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"Прыкладзіце да датчыка кончык пальца"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="6137605344819152477">"Пасля прыкладзіце краі пальца"</string>
+    <string name="security_settings_udfps_enroll_edge_title" msgid="6137605344819152477">"Зараз прыкладзіце краі пальца"</string>
     <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"Прыкладзіце палец да датчыка адным бокам і ўтрымлівайце яго, потым павярніце іншым бокам"</string>
     <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"Гэта працэдура дапаможа больш дакладна зафіксаваць адбітак пальца"</string>
     <!-- String.format failed for translation -->
@@ -578,37 +579,10 @@
     <string name="fingerprint_last_delete_message" msgid="7860374760549404410">"Вы не зможаце выкарыстоўваць адбітак пальца для разблакіроўкі тэлефона ці спраўджання сваёй асобы ў праграмах."</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="4104208067277655068">"Вы не зможаце выкарыстоўваць адбітак пальца для разблакіроўкі свайго працоўнага профілю, аўтарызацыі купляў і ўваходу ў працоўныя праграмы."</string>
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"Так, выдаліць"</string>
-    <string name="crypt_keeper_settings_title" msgid="4938812137822100044">"Шыфраванне"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"Шыфраваць планшэт"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"Шыфраваць тэлефон"</string>
-    <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"Зашыфравана"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"Вы можаце зашыфроўваць свае ўліковыя запісы, налады, спампаваныя дадаткі і іх даныя, медыя- і іншыя файлы. Пасля зашыфроўкі вашага планшэта, пры ўмове, што вы ўсталявалі блакіроўку экрана (з дапамогай графічнага ключа, лічбавага PIN або паролю), вы павінны будзеце разблакіроўваць экран, каб расшыфраваць свой планшэт, пры кожным уключэнні. Адзіны альтэрнатыўны спосаб расшыфроўкі – гэта скід налад з выдаленнем усіх вашых даных.\n\nШыфраванне зойме не менш за 1 гадзіну. Вы павінны пачынаць шыфраванне з поўным зарадам акумулятара і пакінуць планшэт улючаным у сетку на працягу ўсяго працэсу. Калі вы прыпынеце працэс, некаторыя або ўсе вашы даныя будуць страчаныя"</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"Вы можаце зашыфроўваць свае ўліковыя запісы, налады, спампаваныя дадаткі і іх даныя, медыя- і іншыя файлы. Пасля зашыфроўкі вашага тэлефона, пры ўмове, што вы ўсталявалі блакіроўку экрана (з дапамогай графічнага ключа, лічбавага PIN або паролю), вы павінны будзеце разблакіроўваць экран, каб расшыфраваць свой тэлефон, пры кожным уключэнні. Адзіны альтэрнатыўны спосаб расшыфроўкі – гэта скід налад з выдаленнем усіх вашых даных. \n\nШыфраванне зойме не менш за 1 гадзіну. Вы павінны пачынаць шыфраванне з поўным зарадам акумулятара і пакінуць тэлефон улючаным у сетку на працягу ўсяго працэсу. Калі вы прыпынеце працэс, некаторыя або ўсе вашы даныя будуць страчаныя."</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"Шыфраваць планшэт"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"Шыфраванне тэлефона"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"Неабходна зарадзіць акумулятар і паўтарыць спробу."</string>
-    <string name="crypt_keeper_unplugged_text" msgid="2709721134148651329">"Падключыце зарадную прыладу і паспрабуйце яшчэ раз."</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="1847280235529858357">"Няма PIN-код або паролю блакавання экрана"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="7210616262954236042">"Перш чым пачаць шыфраванне, трэба ўсталяваць PIN-код або пароль блакавання экрана."</string>
-    <string name="crypt_keeper_confirm_title" msgid="8600000209722452230">"Зашыфраваць?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="3270587498436152259">"Шыфраванне планшэта – незваротная аперацыя, у выпадку яе перарывання вы страціце даныя. Шыфраванне займае гадзіну ці больш, за гэты час планшэт будзе некалькі разоў перазагружаны."</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="3040428543349852419">"Шыфраванне тэлефона – незваротная аперацыя, у выпадку яе перарывання вы страціце даныя. Шыфраванне займае гадзіну ці больш, за гэты час тэлефон будзе некалькі разоў перазагружаны."</string>
-    <string name="crypt_keeper_setup_title" msgid="3339725741305796680">"Шыфраванне"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="4417016995091289019">"Пачакайце, пакуль ваш планшэт зашыфруецца. Завершана <xliff:g id="PERCENT">^1</xliff:g>%."</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="7902355422499500352">"Пачакайце, пакуль на вашым тэлефоне ўсталёўваецца абарона. Завершана <xliff:g id="PERCENT">^1</xliff:g>%."</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="8348188415839917821">"Пачакайце, пакуль ваш планшэт шыфруецца. Засталося часу: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="8556105766597855198">"Пачакайце, пакуль ваш тэлефон шыфруецца. Засталося часу: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="3832496715430327682">"Каб разблакіраваць свой планшэт, выключыце яго, а потым зноў уключыце."</string>
-    <string name="crypt_keeper_force_power_cycle" product="default" msgid="5070346039522135361">"Каб разблакіраваць тэлефон, выключыце яго і зноў уключыце."</string>
-    <string name="crypt_keeper_warn_wipe" msgid="8104921337301750394">"Папярэджанне: Усе налады вашай прылады будуць скінутыя пасля яшчэ <xliff:g id="COUNT">^1</xliff:g> няўдалых спроб разблакіроўкі!"</string>
-    <string name="crypt_keeper_enter_password" msgid="1274917431075529732">"Увядзіце пароль"</string>
-    <string name="crypt_keeper_failed_title" msgid="8173654570682244149">"Шыфраванне няўдалае"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"Шыфраванне было перапынена і не можа быць завершана. У выніку гэтага даныя на вашым планшэце больш не даступныя.\n\nКаб працягваць выкарыстоўваць планшэт, неабходна скінуць налады. Падчас наладкі планшэта пасля скіду налад у вас з\'явіцца магчымасць аднавіць даныя, рэзервовыя копіі якіх захоўваліся ў вашым уліковым запісе Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"Шыфраванне было перапынена і не можа быць завершана. У выніку гэтага даныя на вашым тэлефоне больш не даступныя.\n\nКаб працягваць выкарыстоўваць тэлефон, неабходна скінуць налады. Падчас наладкі тэлефона пасля скіду налад у вас з\'явіцца магчымасць аднавіць даныя, рэзервовыя копіі якіх захоўваліся ў вашым уліковы запісе Google."</string>
-    <string name="crypt_keeper_data_corrupt_title" msgid="5920153462176846037">"Расшыфроўка не атрымалася"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"Уведзены вамі пароль правільны, але, на жаль, вашы даныя пашкоджаныя. \n\nКаб працягваць выкарыстоўваць планшэт, неабходна скінуць налады. Падчас наладкі планшэта пасля скіду налад у вас з\'явіцца магчымасць аднавіць даныя, рэзервовыя копіі якіх захоўваліся ў вашым уліковым запісе Google."</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"Уведзены вамі пароль правільны, але, на жаль, вашы даныя пашкоджаныя. \n\nКаб працягваць выкарыстоўваць тэлефон, неабходна скінуць налады. Падчас наладкі тэлефона пасля скіду налад у вас з\'явіцца магчымасць аднавіць даныя, рэзервовыя копіі якіх захоўваліся ў вашым уліковы запісе Google."</string>
-    <string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"Пераключэнне рэжыму ўводу"</string>
+    <string name="encryption_settings_title" msgid="2848716008695618360">"Шыфраванне"</string>
+    <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"Зашыфраваць даныя"</string>
+    <string name="encrypt_title" product="default" msgid="7337365190988321100">"Зашыфраваць даныя"</string>
+    <string name="encrypted_summary" msgid="545623487587251207">"Зашыфравана"</string>
     <string name="suggested_lock_settings_title" msgid="7836065447159730217">"Абараніце тэлефон"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"Для абароны планшэта наладзьце блакіроўку экрана"</string>
     <string name="suggested_lock_settings_summary" product="device" msgid="8479766049078378225">"Для абароны прылады наладзьце блакіроўку экрана"</string>
@@ -853,6 +827,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Вам таксама можа спатрэбіцца ўвесці гэты PIN-код на іншай прыладзе."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Вам таксама можа спатрэбіцца ўвесці гэты ключ доступу на іншай прыладзе."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Каб падключыцца да прылады &lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;пераканайцеся, што яна адлюстроўвае ключ доступу:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Пацвердзіце спалучэнне з узгодненым наборам"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"Ад: &lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>Падключыцца да гэтай прылады?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Каб падключыцца да прылады <xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>, увядзiце <xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, затым нацiснiце \"Назад\" або Enter"</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Дазвольце доступ да сваіх кантактаў і гісторыі выклікаў"</string>
@@ -886,6 +861,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Не атрымалася ўсталяваць злучэнне. Паўтарыце спробу."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Звесткі пра прыладу"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Адрас Bluetooth прылады: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Адрас Bluetooth прылады: \n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Забыць прыладу?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Выдаліць сувязь"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Адключыць праграму?"</string>
@@ -917,6 +893,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Запомніць налады"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Максімальная колькасць падключаных аўдыяпрылад Bluetooth"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Выбар максімальнай колькасці падключаных аўдыяпрылад Bluetooth"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"Журнал адладкі стоса NFC"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Павысіць узровень вядзення журналаў для стоса NFC"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Трансляцыя"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"адлюстраванне"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Уключыць бесправадны дысплей"</string>
@@ -1230,6 +1208,8 @@
     <string name="wifi_hotspot_maximize_compatibility_dual_ap_summary" msgid="3579549223159056533">"Дапамагае іншым прыладам знаходзіць гэты хот-спот. Павышае выкарыстанне зараду акумулятара."</string>
     <string name="wifi_tether_starting" msgid="8879874184033857814">"Уключэнне хот-спота..."</string>
     <string name="wifi_tether_stopping" msgid="4416492968019409188">"Выключэнне хот-спота..."</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_title" msgid="3089432578433978073">"Мадэм недаступны"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_content" msgid="5920421547607921112">"Звяжыцеся з аператарам, каб даведацца больш"</string>
     <string name="wifi_tether_enabled_subtext" msgid="5085002421099821056">"Сетка <xliff:g id="NETWORK_SSID">%1$s</xliff:g> актыўная"</string>
     <string name="wifi_tether_failed_subtext" msgid="437190628041885500">"Памылка партатыўнага хот-спота Wi-Fi"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7072559431286459122">"Наладка хот-спота Wi-Fi"</string>
@@ -2594,11 +2574,6 @@
     <string name="enable_service_title" msgid="7231533866953706788">"<xliff:g id="SERVICE">%1$s</xliff:g>: дазволіць сэрвісу мець поўны кантроль над вашай прыладай?"</string>
     <string name="capabilities_list_title" msgid="1225853611983394386">"<xliff:g id="SERVICE">%1$s</xliff:g> патрабуе:"</string>
     <string name="touch_filtered_warning" msgid="4225815157460318241">"Паверх запыту дазволу адлюстроўваецца дадатак, таму ваш адказ не можа быць правераны ў Наладах."</string>
-    <string name="enable_service_encryption_warning" msgid="931082737770453755">"Калі вы ўключыце <xliff:g id="SERVICE">%1$s</xliff:g>, прылада не будзе выкарыстоўваць блакіроўку экрана для паляпшэння шыфравання даных."</string>
-    <string name="secure_lock_encryption_warning" msgid="669152607190123579">"Вы ўключылі службу доступу, таму ваша прылада не будзе выкарыстоўваць блакіроўку экрана для паляпшэння шыфравання даных."</string>
-    <string name="enable_service_pattern_reason" msgid="6832846117817938536">"Уключэнне <xliff:g id="SERVICE">%1$s</xliff:g> уплывае на шыфраванне даных, таму вы павінны пацвердзіць свой графічны ключ."</string>
-    <string name="enable_service_pin_reason" msgid="6040417014360237703">"Уключэнне <xliff:g id="SERVICE">%1$s</xliff:g> уплывае на шыфраванне даных, таму вы павінны пацвердзіць свой PIN-код."</string>
-    <string name="enable_service_password_reason" msgid="6962544350351734238">"Уключэнне <xliff:g id="SERVICE">%1$s</xliff:g> уплывае на шыфраванне даных, таму вы павінны пацвердзіць свой пароль."</string>
     <string name="accessibility_service_warning" msgid="6779187188736432618">"Праграма <xliff:g id="SERVICE">%1$s</xliff:g> запытвае поўны кантроль над гэтай прыладай. Яна можа чытаць змесціва экрана і дзейнічаць ад імя карыстальнікаў, якім патрабуюцца спецыяльныя магчымасці. Такі ўзровень доступу не прызначаны для большасці праграм."</string>
     <string name="accessibility_service_warning_description" msgid="6573203795976134751">"Поўны кантроль прызначаны для сэрвісаў спецыяльных магчымасцей, аднак не падыходзіць для большасці праграм."</string>
     <string name="accessibility_service_screen_control_title" msgid="324795030658109870">"Прагляд экрана і кіраванне ім"</string>
@@ -3185,14 +3160,6 @@
     <string name="remove_account_failed" msgid="3709502163548900644">"Ваш адміністратар не дазваляе гэту змену"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"Немагчыма сінхранізаваць уручную"</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"Сінхранізацыя для гэтага элемента зараз адключаная. Каб змяніць налады, часова дазвольце абмен дадзенымі ў фонавым рэжыме і аўтаматычную сінхранізацыю."</string>
-    <string name="enter_password" msgid="6327051330258595331">"Каб запусціць Android, увядзіце пароль"</string>
-    <string name="enter_pin" msgid="1029287617551232681">"Каб запусціць Android, увядзіце PIN-код"</string>
-    <string name="enter_pattern" msgid="1747316785866742960">"Каб запусціць Android, увядзіце графічны ключ"</string>
-    <string name="cryptkeeper_wrong_pattern" msgid="340747269176120242">"Няправільны ўзор"</string>
-    <string name="cryptkeeper_wrong_password" msgid="7295607881887114486">"Няправiльны пароль"</string>
-    <string name="cryptkeeper_wrong_pin" msgid="2347961593970714201">"Няправільны PIN-код"</string>
-    <string name="checking_decryption" msgid="6111642972615688237">"Праверка..."</string>
-    <string name="starting_android" msgid="6694154070215356186">"Android запускаецца..."</string>
     <string name="delete" msgid="8330605554706263775">"Выдаліць"</string>
     <string name="misc_files" msgid="6598066985800749585">"Розныя файлы"</string>
     <string name="misc_files_selected_count" msgid="5597802791672749532">"выбрана <xliff:g id="NUMBER">%1$d</xliff:g> з <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -3288,8 +3255,6 @@
     <string name="data_usage_metered_yes" msgid="4262598072030135223">"Сетка з улікам трафіка"</string>
     <string name="data_usage_metered_no" msgid="1685828958417926268">"Без уліку трафіка"</string>
     <string name="data_usage_disclaimer" msgid="3271450299386176770">"Улік даных аператара можа адрознівацца ад уліку вашай прылады."</string>
-    <string name="cryptkeeper_emergency_call" msgid="8369322820475703306">"Экстраны выклік"</string>
-    <string name="cryptkeeper_return_to_call" msgid="3857250752781151232">"Вярнуцца да выкліку"</string>
     <string name="vpn_name" msgid="3806456074909253262">"Назва"</string>
     <string name="vpn_type" msgid="5533202873260826663">"Тып"</string>
     <string name="vpn_server" msgid="2908816134941973935">"Адрас сервера"</string>
@@ -4916,8 +4881,6 @@
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> праграмы могуць выкарыстоўваць даныя без абмежаванняў</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"Яшчэ"</string>
-    <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"Вы сапраўды хочаце сцерці карыстальніцкія даныя і перайсці на шыфраванне файлаў?"</string>
-    <string name="button_confirm_convert_fbe" msgid="339648921918438106">"Сцерці і перайсці..."</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"Скінуць абмежаванне частаты ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"Абмежаванне частаты ShortcutManager было скінута"</string>
     <string name="notification_suggestion_title" msgid="6309263655965785411">"Паказваць кантрольную інфармацыю на экране блакiроўцы"</string>
@@ -5468,6 +5431,7 @@
     <string name="sim_action_yes" msgid="8076556020131395515">"Так"</string>
     <string name="sim_action_reboot" msgid="3508948833333441538">"Перазапусціць"</string>
     <string name="sim_action_no_thanks" msgid="435717748384544195">"Не, дзякуй"</string>
+    <string name="sim_action_cancel" msgid="2668099867029610910">"Скасаваць"</string>
     <string name="sim_switch_button" msgid="1405772571706095387">"Пераключыцца"</string>
     <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Не ўдалося актываваць SIM-карту"</string>
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Выдаліце SIM-карту і ўстаўце яе зноў. Калі праблема застанецца, перазапусціце прыладу."</string>
@@ -5624,6 +5588,10 @@
     <string name="cached_apps_freezer" msgid="1057519579761550350">"Прыпыніць выкананне для кэшаваных праграм"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"Дазволіць экранныя накладкі на Налады"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Дазвольце праграмам, якія могуць паказвацца паверх іншых, накладацца на экраны Налад"</string>
+    <!-- no translation found for allow_mock_modem (3832264806530479214) -->
+    <skip />
+    <!-- no translation found for allow_mock_modem_summary (9097416612748005374) -->
+    <skip />
     <string name="media_controls_title" msgid="403271085636252597">"Мультымедыя"</string>
     <string name="media_controls_resume_title" msgid="855076860336652370">"Замацаваць медыяпрайгравальнік"</string>
     <string name="media_controls_resume_description" msgid="3163482266454802097">"Каб хутка ўзнавіць прайграванне, медыяпрайгравальнік застаецца адкрытым у хуткіх наладах"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index b262583..ae6df8a 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -142,10 +142,11 @@
     <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"Разрешете на устройството си да се свързва с устройства с Bluetooth в близост"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"Разрешаване на телефона да се свързва с устройства с Bluetooth в близост"</string>
     <string name="bluetooth_disable_a2dp_hw_offload" msgid="5942913792817797541">"Деакт. на разтоварв. чрез хардуер на Bluetooth с код A2DP"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="8610420176339657720">"Рестарт. на у-вото?"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8333029144800835996">"За да промените настройката, трябва да рестарт. у-вото си."</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="3488695418187553566">"Рестарт"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="4930826928585464191">"Отказ"</string>
+    <string name="bluetooth_disable_le_audio_hw_offload" msgid="3966022676505972908">"Деактивиране на разтоварването чрез хардуер на Bluetooth LE AUDIO"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_title" msgid="6001142380445276918">"Да се рестартира ли устройството?"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_message" msgid="1524373895333698779">"За да промените настройката, трябва да рестартирате устройството си."</string>
+    <string name="bluetooth_disable_hw_offload_dialog_confirm" msgid="5594859658551707592">"Рестартиране"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel" msgid="3663690305043973720">"Отказ"</string>
     <string name="connected_device_media_device_title" msgid="3783388247594566734">"Мултимедийни устройства"</string>
     <string name="connected_device_call_device_title" msgid="88732390601723608">"Устройства за обаждания"</string>
     <string name="connected_device_other_device_title" msgid="4652120430615729193">"Други устройства"</string>
@@ -309,9 +310,9 @@
     <string name="security_settings_title" msgid="6710768415432791970">"Сигурност"</string>
     <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"Шифроване и идентификационни данни"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"Телефонът е шифрован"</string>
-    <string name="decryption_settings_summary" product="default" msgid="1742645256103613503">"Телефонът не е шифрован"</string>
+    <string name="not_encrypted_summary" product="default" msgid="2251945842585788254">"Телефонът не е шифрован"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"Устройството е шифровано"</string>
-    <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"Устройството не е шифровано"</string>
+    <string name="not_encrypted_summary" product="tablet" msgid="2374263654698719382">"Устройството не е шифровано"</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"Заключен екран"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"Какво да се показва"</string>
     <string name="security_settings_summary" msgid="1627059516127354233">"Задаване на Моето местоположение, отключване на екран, заключване на SIM картата и на хранилището за идентификационни данни"</string>
@@ -480,7 +481,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"Изтриване"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"Докоснете сензора"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"Поставете пръста си върху сензора и го вдигнете, след като усетите вибриране"</string>
-    <string name="security_settings_udfps_enroll_start_message" msgid="5032954588171487566">"Задръжте отпечатъка си върху сензора, докато усетите вибриране"</string>
+    <string name="security_settings_udfps_enroll_start_message" msgid="5032954588171487566">"Задръжте пръста си върху сензора, докато усетите вибриране"</string>
     <string name="security_settings_fingerprint_enroll_udfps_title" msgid="6665610134560896895">"Докоснете и задръжте сензора за отпечатъци"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"Вдигнете пръст и докоснете отново"</string>
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"Още веднъж"</string>
@@ -489,7 +490,7 @@
     <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"При всяко преместване на иконата за отпечатъци я докоснете и задръжте. По този начин се улавя най-голяма част от отпечатъка ви."</string>
     <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"Поставете върха на пръста си върху сензора"</string>
     <string name="security_settings_udfps_enroll_edge_title" msgid="6137605344819152477">"Накрая използвайте краищата на пръста си"</string>
-    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"Поставете едната страна на отпечатъка си върху сензора и задръжте, след това поставете другата"</string>
+    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"Поставете едната страна на пръста си върху сензора и задръжте, след това поставете другата"</string>
     <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"По този начин се улавя най-голяма част от отпечатъка ви"</string>
     <!-- String.format failed for translation -->
     <!-- no translation found for security_settings_udfps_enroll_progress_a11y_message (6183535114682369699) -->
@@ -570,37 +571,10 @@
     <string name="fingerprint_last_delete_message" msgid="7860374760549404410">"Няма да можете да използвате отпечатъка си за отключване на телефона, нито за потвърждаване на самоличността ви в приложения."</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="4104208067277655068">"Няма да можете да използвате отпечатъка си, за да отключвате служебния си потребителски профил, да оторизирате покупки или да влизате в служебни приложения."</string>
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"Да, да се премахнат"</string>
-    <string name="crypt_keeper_settings_title" msgid="4938812137822100044">"Шифроване"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"Шифроване на таблета"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"Шифроване на телефона"</string>
-    <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"Шифровано"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"Можете да шифровате своите профили, настройки, изтеглени приложения и техните данни, мултимедия и други файлове. След това, ако сте настроили заключване на екрана (тоест фигура, цифров ПИН код или парола), ще се наложи при всяко включване на таблета си да го отключвате, за да го дешифрирате. Единственият друг начин за дешифриране е възстановяване на фабричните настройки, при което ще се изтрият всичките ви данни.\n\nШифроването отнема поне един час. Трябва да стартирате със заредена батерия и да оставите таблета си включен в захранването по време на процедурата. Ако я прекъснете, ще изгубите някои или всичките си данни."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"Можете да шифровате своите профили, настройки, изтеглени приложения и техните данни, мултимедия и други файлове. След това, ако сте настроили заключване на екрана (тоест фигура, цифров ПИН код или парола), ще се наложи при всяко включване на телефона си да го отключвате, за да го дешифрирате. Единственият друг начин за дешифриране е възстановяване на фабричните настройки, при което ще се изтрият всичките ви данни.\n\nШифроването отнема поне един час. Трябва да стартирате със заредена батерия и да оставите телефона си включен в захранването по време на процедурата. Ако я прекъснете, ще изгубите някои или всичките си данни."</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"Шифроване на таблета"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"Шифроване на телефона"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"Заредете батерията си и опитайте отново."</string>
-    <string name="crypt_keeper_unplugged_text" msgid="2709721134148651329">"Включете зарядното си устройство и опитайте отново."</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="1847280235529858357">"Няма PIN код или парола за заключване на екрана"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="7210616262954236042">"Трябва да зададете ПИН код или парола за заключване на екрана, преди да можете да започнете шифроването."</string>
-    <string name="crypt_keeper_confirm_title" msgid="8600000209722452230">"Да се шифрова ли?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="3270587498436152259">"Операцията по шифроването е необратима и ако я прекъснете, ще загубите данни. Процесът отнема най-малко един час и през това време таблетът ще се рестартира няколко пъти."</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="3040428543349852419">"Операцията по шифроването е необратима и ако я прекъснете, ще загубите данни. Процесът отнема най-малко един час и през това време телефонът ще се рестартира няколко пъти."</string>
-    <string name="crypt_keeper_setup_title" msgid="3339725741305796680">"Шифроване"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="4417016995091289019">"Изчакайте, докато таблетът ви се шифрова. Завършено: <xliff:g id="PERCENT">^1</xliff:g>%."</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="7902355422499500352">"Изчакайте, докато телефонът ви се шифрова. Завършено: <xliff:g id="PERCENT">^1</xliff:g>%."</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="8348188415839917821">"Изчакайте, докато таблетът ви се шифрова. Оставащо време: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="8556105766597855198">"Изчакайте, докато телефонът ви се шифрова. Оставащо време: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="3832496715430327682">"За да отключите таблета си, го изключете и включете."</string>
-    <string name="crypt_keeper_force_power_cycle" product="default" msgid="5070346039522135361">"За да отключите телефона си, го изключете и включете."</string>
-    <string name="crypt_keeper_warn_wipe" msgid="8104921337301750394">"Предупреждение: Всичко от устройството ви ще бъде изтрито след още <xliff:g id="COUNT">^1</xliff:g> неуспешни опита за отключване!"</string>
-    <string name="crypt_keeper_enter_password" msgid="1274917431075529732">"Въведете паролата си"</string>
-    <string name="crypt_keeper_failed_title" msgid="8173654570682244149">"Шифроването не бе успешно"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"Шифроването бе прекъснато и не може да завърши. В резултат на това вече няма достъп до данните на таблета ви.\n\nЗа да възобновите използването му, трябва да възстановите фабричните настройки. След това, когато го настройвате, ще имате възможност да възстановите всички данни, на които е направено резервно копие в профила ви в Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"Шифроването бе прекъснато и не може да завърши. В резултат на това вече няма достъп до данните на телефона ви.\n\nЗа да възобновите използването му, трябва да възстановите фабричните настройки. След това, когато го настройвате, ще имате възможност да възстановите всички данни, на които е направено резервно копие в профила ви в Google."</string>
-    <string name="crypt_keeper_data_corrupt_title" msgid="5920153462176846037">"Дешифроването не бе успешно"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"Въведената от вас парола е правилна, но за съжаление данните ви са повредени. \n\nЗа да възобновите използването на таблета си, трябва да извършите възстановяване на фабричните настройки. След това, когато го настройвате, ще имате възможност да възстановите всички данни, за които сте създали резервно копие в профила си в Google."</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"Въведената от вас парола е правилна, но за съжаление данните ви са повредени. \n\nЗа да възобновите използването на телефона си, трябва да извършите възстановяване на фабричните настройки. След това, когато го настройвате, ще имате възможност да възстановите всички данни, за които сте създали резервно копие в профила си в Google."</string>
-    <string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"Превключване на метода на въвеждане"</string>
+    <string name="encryption_settings_title" msgid="2848716008695618360">"Шифроване"</string>
+    <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"Шифроване на таблета"</string>
+    <string name="encrypt_title" product="default" msgid="7337365190988321100">"Шифроване на телефона"</string>
+    <string name="encrypted_summary" msgid="545623487587251207">"Шифровано"</string>
     <string name="suggested_lock_settings_title" msgid="7836065447159730217">"Защита на телефона ви"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"Задайте закл. на екрана, за да защитите таблета"</string>
     <string name="suggested_lock_settings_summary" product="device" msgid="8479766049078378225">"Задайте закл. на екрана, за да защитите устройството"</string>
@@ -819,6 +793,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Възможно е също така да се наложи да въведете този ПИН на другото устройство."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Възможно е също така да се наложи да въведете този код за достъп на другото устройство."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"За сдвояване със::&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Уверете се, че показва този код за достъп:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Потвърдете, за да сдвоите с координирания набор"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"От:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Да се сдвои ли с това устройство?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"За сдвояване със: <xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> Въведете: <xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, след това натиснете „Return“ или „Enter“."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Разрешаване на достъпа до контактите и историята на обажданията ви"</string>
@@ -852,6 +827,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Не можа да се установи връзка. Опитайте отново."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Подробности за устройството"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Bluetooth адрес на устройството: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Адрес на Bluetooth на устройството: \n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Да се забрави ли устройството?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Премахване на свързването"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Да се прекрати ли връзката с приложението?"</string>
@@ -883,6 +859,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Запомняне на настройки"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Максимален брой свързани аудиоустройства с Bluetooth"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Изберете максималния брой свързани аудиоустройства с Bluetooth"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"Регистрац. файлове за отстраняване на грешки за стека за NFC"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Увеличаване на нивото на регистриране за стека за NFC"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Предаване"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"дублиране"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Активир. на безжичния дисплей"</string>
@@ -1190,6 +1168,8 @@
     <string name="wifi_hotspot_maximize_compatibility_dual_ap_summary" msgid="3579549223159056533">"Помага на други устройства да намерят тази точка за достъп. По-интензивно използване на батерията."</string>
     <string name="wifi_tether_starting" msgid="8879874184033857814">"Точката за достъп се включва…"</string>
     <string name="wifi_tether_stopping" msgid="4416492968019409188">"Точката за достъп се изключва…"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_title" msgid="3089432578433978073">"Функцията за тетъринг не е налице"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_content" msgid="5920421547607921112">"За подробности се обърнете към оператора си"</string>
     <string name="wifi_tether_enabled_subtext" msgid="5085002421099821056">"Мрежата „<xliff:g id="NETWORK_SSID">%1$s</xliff:g>“ е активна"</string>
     <string name="wifi_tether_failed_subtext" msgid="437190628041885500">"Грешка на преносимата точка за достъп до Wi‑Fi"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7072559431286459122">"Настройка на точката за достъп до Wi‑Fi"</string>
@@ -1508,7 +1488,7 @@
     <string name="status_prl_version" msgid="9002131357502714281">"Версия на списъка с предпочитания за роуминг"</string>
     <string name="meid_multi_sim" msgid="7645394486193991388">"MEID (слот %1$d за SIM карта)"</string>
     <string name="scanning_status_text_on" msgid="3846571210578042940">"Вкл."</string>
-    <string name="scanning_status_text_off" msgid="4002352668313705132">"Изключено"</string>
+    <string name="scanning_status_text_off" msgid="4002352668313705132">"Изкл."</string>
     <string name="scanning_status_text_wifi_on_ble_on" msgid="7644609329607744714">"Сканирането за Wi‑Fi и устройства с Bluetooth е включено"</string>
     <string name="scanning_status_text_wifi_on_ble_off" msgid="7215007787287418186">"Сканирането за Wi-Fi е включено, сканирането за устройства с Bluetooth е изключено"</string>
     <string name="scanning_status_text_wifi_off_ble_on" msgid="1396882599556304165">"Сканирането за устройства с Bluetooth е включено, сканирането за Wi‑Fi е изключено"</string>
@@ -2536,11 +2516,6 @@
     <string name="enable_service_title" msgid="7231533866953706788">"Искате ли да разрешите на <xliff:g id="SERVICE">%1$s</xliff:g> да има пълен контрол над устройството ви?"</string>
     <string name="capabilities_list_title" msgid="1225853611983394386">"<xliff:g id="SERVICE">%1$s</xliff:g> изисква:"</string>
     <string name="touch_filtered_warning" msgid="4225815157460318241">"От Настройки не може да се получи потвърждение за отговора ви, защото заявката за разрешение се прикрива от приложение."</string>
-    <string name="enable_service_encryption_warning" msgid="931082737770453755">"Ако включите <xliff:g id="SERVICE">%1$s</xliff:g>, устройството ви няма да използва заключването на екрана ви за подобряване на шифроването на данни."</string>
-    <string name="secure_lock_encryption_warning" msgid="669152607190123579">"Тъй като сте включили услуга за достъпност, устройството ви няма да използва заключването на екрана ви за подобряване на шифроването на данни."</string>
-    <string name="enable_service_pattern_reason" msgid="6832846117817938536">"Тъй като включването на <xliff:g id="SERVICE">%1$s</xliff:g> засяга шифроването на данни, трябва да потвърдите фигурата си."</string>
-    <string name="enable_service_pin_reason" msgid="6040417014360237703">"Тъй като включването на <xliff:g id="SERVICE">%1$s</xliff:g> засяга шифроването на данни, трябва да потвърдите ПИН кода си."</string>
-    <string name="enable_service_password_reason" msgid="6962544350351734238">"Тъй като включването на <xliff:g id="SERVICE">%1$s</xliff:g> засяга шифроването на данни, трябва да потвърдите паролата си."</string>
     <string name="accessibility_service_warning" msgid="6779187188736432618">"<xliff:g id="SERVICE">%1$s</xliff:g> иска пълен контрол над това устройство. Услугата може да чете екрана и да действа от името на потребителите с увреждания. Това ниво на контрол не е подходящо за повечето приложения."</string>
     <string name="accessibility_service_warning_description" msgid="6573203795976134751">"Пълният контрол е подходящ за приложенията, които помагат на потребителите със специални нужди, но не и за повечето приложения."</string>
     <string name="accessibility_service_screen_control_title" msgid="324795030658109870">"Преглед и управление на екрана"</string>
@@ -3105,14 +3080,6 @@
     <string name="remove_account_failed" msgid="3709502163548900644">"Тази промяна не е разрешена от администратора ви"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"Не може да се синхронизира ръчно"</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"Синхронизирането за този елемент понастоящем е деактивирано. За да промените настройката, временно включете данните на заден план и автоматичното синхронизиране."</string>
-    <string name="enter_password" msgid="6327051330258595331">"За да стартирате Android, въведете паролата си"</string>
-    <string name="enter_pin" msgid="1029287617551232681">"За да стартирате Android, въведете ПИН кода си"</string>
-    <string name="enter_pattern" msgid="1747316785866742960">"За да стартирате Android, начертайте фигурата си"</string>
-    <string name="cryptkeeper_wrong_pattern" msgid="340747269176120242">"Грешна фигура"</string>
-    <string name="cryptkeeper_wrong_password" msgid="7295607881887114486">"Грешна парола"</string>
-    <string name="cryptkeeper_wrong_pin" msgid="2347961593970714201">"Грешен ПИН код"</string>
-    <string name="checking_decryption" msgid="6111642972615688237">"Извършва се проверка…"</string>
-    <string name="starting_android" msgid="6694154070215356186">"Android се стартира…"</string>
     <string name="delete" msgid="8330605554706263775">"Изтриване"</string>
     <string name="misc_files" msgid="6598066985800749585">"Разни файлове"</string>
     <string name="misc_files_selected_count" msgid="5597802791672749532">"избрани са <xliff:g id="NUMBER">%1$d</xliff:g> от <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -3208,8 +3175,6 @@
     <string name="data_usage_metered_yes" msgid="4262598072030135223">"С отчитане"</string>
     <string name="data_usage_metered_no" msgid="1685828958417926268">"Без отчитане"</string>
     <string name="data_usage_disclaimer" msgid="3271450299386176770">"Отчетените от оператора данни може да се различават от показаните на у-вото ви."</string>
-    <string name="cryptkeeper_emergency_call" msgid="8369322820475703306">"Спешно обаждане"</string>
-    <string name="cryptkeeper_return_to_call" msgid="3857250752781151232">"Назад към обаждането"</string>
     <string name="vpn_name" msgid="3806456074909253262">"Име"</string>
     <string name="vpn_type" msgid="5533202873260826663">"Тип"</string>
     <string name="vpn_server" msgid="2908816134941973935">"Адрес на сървъра"</string>
@@ -4766,8 +4731,6 @@
       <item quantity="one">1 приложение може да използва неограничено количество данни</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"Вижте още"</string>
-    <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"Наистина ли искате да изтриете потребителските данни и да преобразувате към шифроване на ниво файл?"</string>
-    <string name="button_confirm_convert_fbe" msgid="339648921918438106">"Изтриване на данните и преобразуване"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"Нулиране на ограничаването на скоростта в ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"Ограничаването на скоростта в ShortcutManager е нулирано"</string>
     <string name="notification_suggestion_title" msgid="6309263655965785411">"Управление на информацията на заключения екран"</string>
@@ -5294,6 +5257,7 @@
     <string name="sim_action_yes" msgid="8076556020131395515">"Да"</string>
     <string name="sim_action_reboot" msgid="3508948833333441538">"Рестартиране"</string>
     <string name="sim_action_no_thanks" msgid="435717748384544195">"Не, благодаря"</string>
+    <string name="sim_action_cancel" msgid="2668099867029610910">"Отказ"</string>
     <string name="sim_switch_button" msgid="1405772571706095387">"Превключване"</string>
     <string name="dsds_activation_failure_title" msgid="4467364110584914794">"SIM картата не може да се активира"</string>
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Премахнете SIM картата и я поставете отново. Ако проблемът не се отстрани, рестартирайте устройството си."</string>
@@ -5446,6 +5410,10 @@
     <string name="cached_apps_freezer" msgid="1057519579761550350">"Спиране на изпълнението на кешираните приложения"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"Разрешаване на екранни наслагвания в/у „Настройки“"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Разрешаване на приложенията, които могат да се показват върху други приложения, да се наслагват върху екрана на „Настройки“"</string>
+    <!-- no translation found for allow_mock_modem (3832264806530479214) -->
+    <skip />
+    <!-- no translation found for allow_mock_modem_summary (9097416612748005374) -->
+    <skip />
     <string name="media_controls_title" msgid="403271085636252597">"Мултимедия"</string>
     <string name="media_controls_resume_title" msgid="855076860336652370">"Фиксиране на медийния плейър"</string>
     <string name="media_controls_resume_description" msgid="3163482266454802097">"С цел бързо възобновяване на възпроизвеждането медийният плейър остава отворен в бързите настройки"</string>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index e38a3d6..ebf1049 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -142,10 +142,11 @@
     <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"আপনার ডিভাইসটিকে আশেপাশের ব্লুটুথ ডিভাইসগুলির সাথে যোগাযোগ করার অনুমতি দিন"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"আপনার ফোনটিকে আশেপাশের ব্লুটুথ ডিভাইসগুলির সাথে যোগাযোগ করার অনুমতি দিন"</string>
     <string name="bluetooth_disable_a2dp_hw_offload" msgid="5942913792817797541">"ব্লুটুথ A2DP হার্ডওয়্যার অফলোড বন্ধ করুন"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="8610420176339657720">"রিস্টার্ট করবেন?"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8333029144800835996">"এই সেটিং পরিবর্তন করতে আপনার ডিভাইস রিস্টার্ট করতে হবে"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="3488695418187553566">"রিস্টার্ট"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="4930826928585464191">"বাতিল"</string>
+    <string name="bluetooth_disable_le_audio_hw_offload" msgid="3966022676505972908">"LE AUDIO ব্লুটুথের হার্ডওয়্যার অফলোড করার ফিচার বন্ধ করুন"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_title" msgid="6001142380445276918">"ডিভাইস রিস্টার্ট করবেন?"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_message" msgid="1524373895333698779">"এই সেটিং পরিবর্তন করতে আপনার ডিভাইস রিস্টার্ট করতে হবে।"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_confirm" msgid="5594859658551707592">"রিস্টার্ট করুন"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel" msgid="3663690305043973720">"বাতিল করুন"</string>
     <string name="connected_device_media_device_title" msgid="3783388247594566734">"মিডিয়া ডিভাইস"</string>
     <string name="connected_device_call_device_title" msgid="88732390601723608">"কল করার ডিভাইস"</string>
     <string name="connected_device_other_device_title" msgid="4652120430615729193">"অন্যান্য ডিভাইস"</string>
@@ -309,9 +310,9 @@
     <string name="security_settings_title" msgid="6710768415432791970">"নিরাপত্তা"</string>
     <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"এনক্রিপশন ও ক্রেডেনশিয়াল"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"ফোন এনক্রিপশন"</string>
-    <string name="decryption_settings_summary" product="default" msgid="1742645256103613503">"ফোন এনক্রিপ্ট করা হয়নি"</string>
+    <string name="not_encrypted_summary" product="default" msgid="2251945842585788254">"ফোন এনক্রিপ্ট করা হয়নি"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"ডিভাইসটি এনক্রিপ্টেড"</string>
-    <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"ডিভাইস এনক্রিপ্ট করা হয়নি"</string>
+    <string name="not_encrypted_summary" product="tablet" msgid="2374263654698719382">"ডিভাইস এনক্রিপ্ট করা হয়নি"</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"লক স্ক্রিন"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"কী দেখানো হবে"</string>
     <string name="security_settings_summary" msgid="1627059516127354233">"আমার স্থান, স্ক্রিন আনলক, সিম কার্ড লক, ক্রেডেনশিয়াল স্টোরেজ লক সেট করুন"</string>
@@ -480,7 +481,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"মুছুন"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"সেন্সর স্পর্শ করুন"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"সেন্সরে আপনার আঙ্গুল রাখুন এবং আপনি একটি কম্পন অনুভব করার পর সরিয়ে নিন"</string>
-    <string name="security_settings_udfps_enroll_start_message" msgid="5032954588171487566">"ভাইব্রেশন অনুভব না করা পর্যন্ত আপনার আঙ্গুলের ছাপ সেন্সরের উপর চেপে ধরে রাখুন"</string>
+    <string name="security_settings_udfps_enroll_start_message" msgid="5032954588171487566">"ভাইব্রেশন অনুভব না করা পর্যন্ত আপনার আঙ্গুলকে সেন্সরের উপর চেপে ধরে রাখুন"</string>
     <string name="security_settings_fingerprint_enroll_udfps_title" msgid="6665610134560896895">"\'আঙ্গুলের ছাপের সেন্সর\' টাচ করে ধরে থাকুন"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"আঙ্গুল তুলুন, তারপর আবার স্পর্শ করুন"</string>
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"আরও একবার"</string>
@@ -488,7 +489,7 @@
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"আপনার আঙ্গুলের ছাপের বিভিন্ন অংশ যোগ করার জন্য বারবার আঙুল তুলে আবার স্পর্শ করতে থাকুন"</string>
     <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"প্রতিবার ফিঙ্গারপ্রিন্ট আইকনটি সরার সময় টাচ করে ধরে থাকুন। এইভাবে সহজে আপনার ফিঙ্গারপ্রিন্টের বেশিরভাগটাই ক্যাপচার করা যাবে।"</string>
     <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"সেন্সরে আপনার আঙুল ছোঁয়ান"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="6137605344819152477">"সবশেষে, আপনার আঙুলের উপরিভাগ ব্যবহার করুন"</string>
+    <string name="security_settings_udfps_enroll_edge_title" msgid="6137605344819152477">"সবশেষে, আপনার আঙুলের প্রান্তভাগ ব্যবহার করুন"</string>
     <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"সেন্সরের উপরে আপনার ফিঙ্গারপ্রিন্টের এক দিক ছুঁইয়ে ধরে রাখুন তারপর অন্য দিকটিও ছোঁয়ান এবং একই ভাবে ধরে রাখুন"</string>
     <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"এইভাবে সহজে আপনার ফিঙ্গারপ্রিন্টের বেশিরভাগটাই ক্যাপচার করা যাবে"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"আঙ্গুলের ছাপ নথিভুক্ত করার কাজটি <xliff:g id="PERCENTAGE">%d</xliff:g> শতাংশ সম্পূর্ণ হয়েছে"</string>
@@ -568,37 +569,10 @@
     <string name="fingerprint_last_delete_message" msgid="7860374760549404410">"ফোন আনলক বা অ্যাপে নিজের পরিচয় যাচাই করার জন্য, আপনি আর ফিঙ্গারপ্রিন্ট ব্যবহার করতে পারবেন না।"</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="4104208067277655068">"ফিঙ্গারপ্রিন্ট ব্যবহার করে আপনি অফিস প্রোফাইল আনলক করতে, অফিসের অ্যাপে সাইন-ইন করতে বা কেনাকাটায় অনুমতি দিতে পারবেন না।"</string>
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"হ্যাঁ, সরান"</string>
-    <string name="crypt_keeper_settings_title" msgid="4938812137822100044">"এনক্রিপশন"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"ট্যাবলেট এনক্রিপ্ট করুন"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"ফোন এনক্রিপ্ট করুন"</string>
-    <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"এনক্রিপ্ট করা আছে"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"আপনি আপনার অ্যাকাউন্ট, সেটিংস, ডাউনলোড করা অ্যাপ্লিকেশন ও সেগুলির ডেটা, মিডিয়া এবং অন্যান্য ফাইলগুলি এনক্রিপ্ট করতে পারেন। আপনি একটি স্ক্রিন লক সেট-আপ করেছেন (যেমন, একটি প্যাটার্ন বা সাংখ্যিক পিন বা পাসওয়ার্ড) তা ধরে নিয়ে, আপনার ট্যাবলেটটি এনক্রিপ্ট করার পরে, যখনই আপনি আপনার ট্যাবলেটের পাওয়ার চালু করবেন তখনই সেটিকে ডিক্রিপ্ট করার জন্য আপনাকে স্ক্রিনটিকে আনলক করতে হবে। ডিক্রিপ্ট করার অন্য একমাত্র উপায় হল ফ্যাক্টরি ডেটা আবার সেট করা, যা আপনার সমস্ত ডেটা মুছে দেবে।\n\nএনক্রিপ্ট করার জন্য এক ঘণ্টা বা তার বেশি সময় লাগতে পারে। আপনাকে অবশ্যই চার্জ রয়েছে এমন একটি ব্যাটারি দিয়ে কাজ শুরু করতে হবে এবং সম্পূর্ণ প্রক্রিয়া চলাকালীন আপনার ট্যাবলেটটিকে প্লাগ-ইন করে রাখতে হবে। যদি আপনি এতে বাধা দেন, তাহলে আপনার সমস্ত বা কিছু ডেটা হারিয়ে যেতে পারে।"</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"আপনি আপনার অ্যাকাউন্ট, সেটিংস, ডাউনলোড করা অ্যাপ্লিকেশন ও সেগুলির ডেটা, মিডিয়া এবং অন্যান্য ফাইলগুলি এনক্রিপ্ট করতে পারেন। আপনি একটি স্ক্রিন লক সেট-আপ করেছেন (যেমন, একটি প্যাটার্ন বা সাংখ্যিক পিন বা পাসওয়ার্ড) তা ধরে নিয়ে, আপনার ফোন এনক্রিপ্ট করার পরে, যখনই আপনি আপনার ফোনের পাওয়ার চালু করবেন তখনই সেটিকে ডিক্রিপ্ট করার জন্য আপনাকে স্ক্রিনটিকে আনলক করতে হবে। ডিক্রিপ্ট করার অন্য একমাত্র উপায় হল ফ্যাক্টরি ডেটা আবার সেট করা যা আপনার সমস্ত ডেটা মুছে দেবে।\n\nএনক্রিপ্ট করার জন্য এক ঘণ্টা বা তার বেশি সময় লাগতে পারে। আপনাকে অবশ্যই চার্জ রয়েছে এমন একটি ব্যাটারি দিয়ে কাজ শুরু করতে হবে এবং সম্পূর্ণ প্রক্রিয়া চলাকালীন আপনার ফোনটিকে প্লাগ-ইন করে রাখতে হবে। যদি আপনি এতে বাধা দেন, তাহলে আপনার সমস্ত বা কিছু ডেটা হারিয়ে যেতে পারে।"</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"ট্যাবলেট এনক্রিপ্ট করুন"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"ফোন এনক্রিপ্ট করুন"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"আপনার ব্যাটারি চার্জ করুন এবং আবার চেষ্টা করুন।"</string>
-    <string name="crypt_keeper_unplugged_text" msgid="2709721134148651329">"আপনার চার্জার প্লাগ-ইন করুন এবং আবার চেষ্টা করুন।"</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="1847280235529858357">"কোনও লক স্ক্রিন পিন বা পাসওয়ার্ড নেই"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="7210616262954236042">"এনক্রিপশন শুরু করার আগে আপনাকে লক স্ক্রিন পিন বা পাসওয়ার্ড সেট করতে হবে।"</string>
-    <string name="crypt_keeper_confirm_title" msgid="8600000209722452230">"এনক্রিপ্ট?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="3270587498436152259">"এনক্রিপশন অপারেশন অপরিবর্তনীয় এবং আপনি এটা বিঘ্নিত করলে আপনি ডেটা হারাবেন। এনক্রিপশান হতে ঘণ্টা খানেক বা তার বেশি সময় লাগবে, এইসময়ে ট্যাবলেট কয়েকবার পুনর্সূচনা হবে।"</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="3040428543349852419">"এনক্রিপশন অপারেশন অপরিবর্তনীয় এবং আপনি এটা বিঘ্নিত করলে আপনি ডেটা হারাবেন। এনক্রিপশান হতে ঘণ্টা খানেক বা তার বেশি সময় লাগবে, এইসময়ে ফোন কয়েকবার পুনর্সূচনা হবে।"</string>
-    <string name="crypt_keeper_setup_title" msgid="3339725741305796680">"এনক্রিপ্ট করা হচ্ছে"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="4417016995091289019">"এখন আপনার ট্যাবলেট এনক্রিপ্ট করা হচ্ছে, অপেক্ষা করুন। <xliff:g id="PERCENT">^1</xliff:g>% সম্পূর্ণ।"</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="7902355422499500352">"এখন আপনার ফোন এনক্রিপ্ট করা হচ্ছে, অপেক্ষা করুন। <xliff:g id="PERCENT">^1</xliff:g>% সম্পূর্ণ।"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="8348188415839917821">"আপনার ট্যাবলেট এনক্রিপ্ট হওয়া পর্যন্ত অপেক্ষা করুন৷ অবশিষ্ট সময়: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="8556105766597855198">"আপনার ফোন এনক্রিপ্ট হওয়া পর্যন্ত অপেক্ষা করুন৷ অবশিষ্ট সময়: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="3832496715430327682">"আপনার ট্যাবলেট আনলক করতে, এটিকে বন্ধ করুন এবং তারপর চালু করুন৷"</string>
-    <string name="crypt_keeper_force_power_cycle" product="default" msgid="5070346039522135361">"আপনার ফোন আনলক করতে, এটিকে বন্ধ করুন এবং তারপর চালু করুন৷"</string>
-    <string name="crypt_keeper_warn_wipe" msgid="8104921337301750394">"সতর্কতা: আনলক করার আরো <xliff:g id="COUNT">^1</xliff:g>টি ব্যর্থ প্রচেষ্টার পর আপনার ডিভাইস সাফ করে ফেলা হবে।"</string>
-    <string name="crypt_keeper_enter_password" msgid="1274917431075529732">"আপনার পাসওয়ার্ড টাইপ করুন"</string>
-    <string name="crypt_keeper_failed_title" msgid="8173654570682244149">"এনক্রিপশান অসফল"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"এনক্রিপশান বিঘ্নিত হয়েছে এবং সম্পূর্ণ হয়নি। ফলস্বরুপ, আপনার ট্যাবলেটে আর ডেটা ব্যবহার করা যাবে না। \n\nআপনার ট্যাবলেট ব্যবহার করে পুনরায় শুরু করতে, আপনাকে ফ্যাক্টরি রিসেট করতে হবে। আবার সেট করার পর আপনি যখন আপনার ট্যাবলেট সেট-আপ করবেন তখন আপনার Google অ্যাকাউন্টে ব্যাকআপ করা যে কোনো ডেটা পুনরুদ্ধার করার সুযোগ পাবেন।"</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"এনক্রিপশান বিঘ্নিত হয়েছে এবং সম্পূর্ণ হয়নি। ফলস্বরুপ, আপনার ফোনে  আর ডেটা ব্যবহার করা যাবে না। \n\nআপনার ফোন ব্যবহার করে পুনরায় শুরু করতে, আপনাকে ফ্যাক্টরি রিসেট করতে হবে। আবার সেট করার পর আপনি যখন আপনার ফোন সেট-আপ করবেন তখন আপনার Google অ্যাকাউন্টে ব্যাকআপ করা যে কোনো ডেটা পুনরুদ্ধার করার সুযোগ পাবেন।"</string>
-    <string name="crypt_keeper_data_corrupt_title" msgid="5920153462176846037">"ডিক্রিপশন সফল হয়নি"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"আপনি যে পাসওয়ার্ডটি লিখেছেন সেটি ঠিক আছে, কিন্তু দুর্ভাগ্যবশত আপনার ডেটা বিকৃত হয়েছে। \n\nআবার আপনার ট্যাবলেট ব্যবহার করা আবার শুরু করতে, আপনাকে ফ্যাক্টরি রিসেট করতে হবে। আবার সেট করার পর আপনি যখন আপনার ফোন সেট-আপ করবেন তখন আপনার Google অ্যাকাউন্টে ব্যাকআপ করা যে কোনো ডেটা পুনরুদ্ধার করার সুযোগ পাবেন।"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"আপনি যে পাসওয়ার্ডটি লিখেছেন সেটি ঠিক আছে, কিন্তু দুর্ভাগ্যবশত আপনার ডেটা বিকৃত হয়েছে। \n\nআবার আপনার ফোন ব্যবহার করা আবার শুরু করতে, আপনাকে ফ্যাক্টরি রিসেট করতে হবে। আবার সেট করার পর আপনি যখন আপনার ফোন সেট-আপ করবেন তখন আপনার Google অ্যাকাউন্টে ব্যাকআপ করা যে কোনো ডেটা পুনরুদ্ধার করার সুযোগ পাবেন।"</string>
-    <string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"ইনপুট পদ্ধতি পরিবর্তন করুন"</string>
+    <string name="encryption_settings_title" msgid="2848716008695618360">"এনক্রিপশন"</string>
+    <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"ট্যাবলেট এনক্রিপ্ট করুন"</string>
+    <string name="encrypt_title" product="default" msgid="7337365190988321100">"ফোন এনক্রিপ্ট করুন"</string>
+    <string name="encrypted_summary" msgid="545623487587251207">"এনক্রিপটেড"</string>
     <string name="suggested_lock_settings_title" msgid="7836065447159730217">"ফোন সুরক্ষিত করুন"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"ট্যাবলেট নিরাপদ রাখতে স্ক্রিন লক সেট করুন"</string>
     <string name="suggested_lock_settings_summary" product="device" msgid="8479766049078378225">"ডিভাইস নিরাপদ রাখতে স্ক্রিন লক সেট করুন"</string>
@@ -817,6 +791,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"আপনাকে অন্য ডিভাইসে এই পিন টাইপ করতে হতে পারে।"</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"আপনাকে অন্য ডিভাইসে এই পাস কী টাইপ করতে হতে পারে।"</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"এর সঙ্গে যুক্ত করতে:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;নিশ্চিত করুন যে এটি এই পাস কী দেখাচ্ছে:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"কো-অর্ডিনেটেড সেটের সাথে পেয়ার করার বিষয়টি কনফার্ম করুন"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"এর থেকে:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;এই ডিভাইসের সঙ্গে যুক্ত করবেন?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"এর সঙ্গে যুক্ত করতে:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>এটিতে টাইপ করুন:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, তারপর Return বা Enter টিপুন।"</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"আপনার পরিচিতি এবং কল ইতিহাস অ্যাক্সেসের অনুমতি দিন"</string>
@@ -850,6 +825,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"কানেক্ট করা যায়নি। আবার চেষ্টা করুন।"</string>
     <string name="device_details_title" msgid="1155622417516195481">"ডিভাইসের বিবরণ"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"ডিভাইসের ব্লুটুথ অ্যাড্রেস: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"ডিভাইসের ব্লুটুথ অ্যাড্রেস:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"ডিভাইসটি কি ভুলে যাবেন?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"ডিসকানেক্ট করুন"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"অ্যাপ ডিসকানেক্ট করতে চান?"</string>
@@ -881,6 +857,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"সেটিংস মনে রাখুন"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"ব্লুটুথের মাধ্যমে কানেক্ট সর্বাধিক অডিও ডিভাইস"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"সর্বাধিক কতগুলি অডিও ডিভাইস ব্লুটুথের মাধ্যমে কানেক্ট করা যাবে তা নির্দিষ্ট করুন"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"NFC স্ট্যাক ডিবাগ লগ"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"NFC-এর স্ট্যাক লগ করার লেভেল বাড়ান"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"কাস্ট করুন"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"মিরর"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"ওয়্যারলেস প্রদর্শন সক্ষম করুন"</string>
@@ -1188,6 +1166,8 @@
     <string name="wifi_hotspot_maximize_compatibility_dual_ap_summary" msgid="3579549223159056533">"এই হটস্পট খুঁজতে অন্যান্য ডিভাইসকে সহায়তা করে। ব্যাটারির খরচ বেড়ে যায়।"</string>
     <string name="wifi_tether_starting" msgid="8879874184033857814">"হটস্পট চালু হচ্ছে..."</string>
     <string name="wifi_tether_stopping" msgid="4416492968019409188">"হটস্পট বন্ধ হচ্ছে..."</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_title" msgid="3089432578433978073">"টেথারিংয়ের সুবিধা উপলভ্য নেই"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_content" msgid="5920421547607921112">"আরও তথ্যের জন্য আপনার পরিষেবা প্রদানকারীর সাথে যোগাযোগ করুন"</string>
     <string name="wifi_tether_enabled_subtext" msgid="5085002421099821056">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> সক্রিয় আছে"</string>
     <string name="wifi_tether_failed_subtext" msgid="437190628041885500">"পোর্টেবল  ওয়াই-ফাই হটস্পট ত্রুটি"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7072559431286459122">"ওয়াই-ফাই হটস্পট সেট করুন"</string>
@@ -2534,11 +2514,6 @@
     <string name="enable_service_title" msgid="7231533866953706788">"<xliff:g id="SERVICE">%1$s</xliff:g> অ্যাপটিকে আপনার ডিভাইসে সম্পূর্ণ নিয়ন্ত্রণের অনুমতি দিতে চান?"</string>
     <string name="capabilities_list_title" msgid="1225853611983394386">"<xliff:g id="SERVICE">%1$s</xliff:g> কে এটি করতে হবে:"</string>
     <string name="touch_filtered_warning" msgid="4225815157460318241">"একটি অ্যাপ্লিকেশান কোনো অনুমোদনের অনুরোধকে অস্পষ্ট করছে, তাই সেটিংস আপনার প্রতিক্রিয়া যাচাই করতে পারেনি৷"</string>
-    <string name="enable_service_encryption_warning" msgid="931082737770453755">"আপনি যদি <xliff:g id="SERVICE">%1$s</xliff:g> চালু করেন, তাহলে ডেটা এনক্রিপশন উন্নত করতে আপনার ডিভাইস আপনার স্ক্রিন লক ব্যবহার করবে না৷"</string>
-    <string name="secure_lock_encryption_warning" msgid="669152607190123579">"যেহেতু আপনি অ্যাক্সেসযোগ্যতা পরিষেবা চালু করেছেন, তাই ডেটা এনক্রিপশন উন্নত করতে আপনার ডিভাইস আপনার স্ক্রিন লক ব্যবহার করবে না৷"</string>
-    <string name="enable_service_pattern_reason" msgid="6832846117817938536">"কারণ <xliff:g id="SERVICE">%1$s</xliff:g> চালু করলে সেটি ডেটা এনক্রিপশন প্রভাবিত করে, আপনাকে আপনার প্যাটার্ন নিশ্চিত করতে হবে।"</string>
-    <string name="enable_service_pin_reason" msgid="6040417014360237703">"কারণ <xliff:g id="SERVICE">%1$s</xliff:g> চালু করলে সেটি ডেটা এনক্রিপশন প্রভাবিত করে, আপনাকে আপনার পিন নিশ্চিত করতে হবে।"</string>
-    <string name="enable_service_password_reason" msgid="6962544350351734238">"কারণ <xliff:g id="SERVICE">%1$s</xliff:g> চালু করলে সেটি ডেটা এনক্রিপশন প্রভাবিত করে, আপনাকে আপনার পাসওয়ার্ড নিশ্চিত করতে হবে।"</string>
     <string name="accessibility_service_warning" msgid="6779187188736432618">"এই ডিভাইসের সম্পূর্ণ নিয়ন্ত্রণ পেতে <xliff:g id="SERVICE">%1$s</xliff:g>-এর তরফে অনুরোধ জানানো হচ্ছে। পরিষেবাটি স্ক্রিন পড়তে পারে এবং ব্যবহারকারীর পক্ষ থেকে অ্যাক্সেসিবিলিটির প্রয়োজন অুযায়ী কাজ করতে পারে। বেশিরভাগ অ্যাপের জন্যই লেভেলের নিয়ন্ত্রণ ঠিক নয়।"</string>
     <string name="accessibility_service_warning_description" msgid="6573203795976134751">"যে অ্যাপগুলি আপনাকে অ্যাক্সেসিবিলিটির প্রয়োজন মেটাতে সাহায্য করে সেই অ্যাপগুলির জন্য সম্পূর্ণ নিয়ন্ত্রণের বিষয়টি উপযুক্ত, কিন্তু তা বলে সমস্ত অ্যাপের জন্য নয়।"</string>
     <string name="accessibility_service_screen_control_title" msgid="324795030658109870">"স্ক্রিন দেখে নিয়ন্ত্রণ করা"</string>
@@ -3103,14 +3078,6 @@
     <string name="remove_account_failed" msgid="3709502163548900644">"আপনার প্রশাসক এই পরিবর্তনটি করতে দেবেন না"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"ম্যানুয়ালি সমন্বয় করা যাবে না"</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"এই আইটেমটির জন্য সিঙ্ক বর্তমানে অক্ষম। এই সেটিং পরিবর্তন করতে, অস্থায়ীভাবে ব্যাকগ্রাউন্ড ডেটা এবং অটোমেটিক সিঙ্ক চালু করুন।"</string>
-    <string name="enter_password" msgid="6327051330258595331">"Android শুরু করার জন্য, আপনার পাসওয়ার্ড লিখুন"</string>
-    <string name="enter_pin" msgid="1029287617551232681">"Android শুরু করার জন্য, আপনার পিন লিখুন"</string>
-    <string name="enter_pattern" msgid="1747316785866742960">"Android শুরু করার জন্য, আপনার প্যাটার্ন আঁকুন"</string>
-    <string name="cryptkeeper_wrong_pattern" msgid="340747269176120242">"ভুল প্যাটার্ন"</string>
-    <string name="cryptkeeper_wrong_password" msgid="7295607881887114486">"ভুল পাসওয়ার্ড"</string>
-    <string name="cryptkeeper_wrong_pin" msgid="2347961593970714201">"ভুল পিন"</string>
-    <string name="checking_decryption" msgid="6111642972615688237">"পরীক্ষা করা হচ্ছে..."</string>
-    <string name="starting_android" msgid="6694154070215356186">"Android শুরু হচ্ছে..."</string>
     <string name="delete" msgid="8330605554706263775">"মুছুন"</string>
     <string name="misc_files" msgid="6598066985800749585">"বিবিধ ফাইলগুলি"</string>
     <string name="misc_files_selected_count" msgid="5597802791672749532">"<xliff:g id="TOTAL">%2$d</xliff:g> এর মধ্যে <xliff:g id="NUMBER">%1$d</xliff:g> নির্বাচিত"</string>
@@ -3206,8 +3173,6 @@
     <string name="data_usage_metered_yes" msgid="4262598072030135223">"মিটার্ড"</string>
     <string name="data_usage_metered_no" msgid="1685828958417926268">"পরিমাপ করা নয়"</string>
     <string name="data_usage_disclaimer" msgid="3271450299386176770">"পরিষেবা প্রদানকারীর ডেটার হিসাব আপনার ডিভাইসের হিসাবের থেকে ভিন্ন হতে পারে।"</string>
-    <string name="cryptkeeper_emergency_call" msgid="8369322820475703306">"জরুরি কল"</string>
-    <string name="cryptkeeper_return_to_call" msgid="3857250752781151232">"কলে ফিরুন"</string>
     <string name="vpn_name" msgid="3806456074909253262">"নাম"</string>
     <string name="vpn_type" msgid="5533202873260826663">"প্রকার"</string>
     <string name="vpn_server" msgid="2908816134941973935">"সার্ভার ঠিকানা"</string>
@@ -4764,8 +4729,6 @@
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g>টি অ্যাপ অপরিমিত ডেটা ব্যবহার করতে পারে</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"আরও দেখুন"</string>
-    <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"ব্যবহারকারীর ডেটা মুছতে এবং ফাইল এনক্রিপশানে রূপান্তর করার বিষয়ে নিশ্চিত?"</string>
-    <string name="button_confirm_convert_fbe" msgid="339648921918438106">"মুছুন ও রূপান্তর করুন"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"ShortcutManager রেট-লিমিটিং আবার সেট করুন"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"ShortcutManager রেট-লিমিটিং আবার সেট করা হয়েছে"</string>
     <string name="notification_suggestion_title" msgid="6309263655965785411">"লক স্ক্রিনে নিয়ন্ত্রণের তথ্য"</string>
@@ -5292,6 +5255,7 @@
     <string name="sim_action_yes" msgid="8076556020131395515">"হ্যাঁ"</string>
     <string name="sim_action_reboot" msgid="3508948833333441538">"রিস্টার্ট করুন"</string>
     <string name="sim_action_no_thanks" msgid="435717748384544195">"না থাক"</string>
+    <string name="sim_action_cancel" msgid="2668099867029610910">"বাতিল করুন"</string>
     <string name="sim_switch_button" msgid="1405772571706095387">"পাল্টান"</string>
     <string name="dsds_activation_failure_title" msgid="4467364110584914794">"সিম চালু করা যাচ্ছে না"</string>
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"সিম কার্ডটি বের করে আবার ইনসার্ট করুন। এতেও সমস্যা ঠিক না হলে, ডিভাইস রিস্টার্ট করুন।"</string>
@@ -5444,6 +5408,10 @@
     <string name="cached_apps_freezer" msgid="1057519579761550350">"ক্যাশে করা অ্যাপের জন্য এক্সিকিউশন সাসপেন্ড করুন"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"সেটিংসে স্ক্রিন ওভারলে করার অনুমতি দিন"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"যেসব অ্যাপ অন্যান্য অ্যাপের উপর কন্টেন্ট দেখাতে পারে সেগুলিকে সেটিংস স্ক্রিনের উপর ওভারলে করার অনুমতি দিন"</string>
+    <!-- no translation found for allow_mock_modem (3832264806530479214) -->
+    <skip />
+    <!-- no translation found for allow_mock_modem_summary (9097416612748005374) -->
+    <skip />
     <string name="media_controls_title" msgid="403271085636252597">"মিডিয়া"</string>
     <string name="media_controls_resume_title" msgid="855076860336652370">"মিডিয়া প্লেয়ার পিন করুন"</string>
     <string name="media_controls_resume_description" msgid="3163482266454802097">"প্লেব্যাক দ্রুত আবার চালু করতে, \'দ্রুত সেটিংস\' মেনুতে মিডিয়া প্লেয়ার খোলা থাকে"</string>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 3240bb2..d19b062 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -143,10 +143,11 @@
     <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"Omogućite uređaju da komunicira s Bluetooth uređajima u blizini"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"Omogućite telefonu da komunicira s Bluetooth uređajima u blizini"</string>
     <string name="bluetooth_disable_a2dp_hw_offload" msgid="5942913792817797541">"Onemogući rasterećenje Bluetootha A2DP"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="8610420176339657720">"Ponovo pokrenuti?"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8333029144800835996">"Da promijenite ovu postavku, treba ponovo pokrenuti uređaj."</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="3488695418187553566">"Pokreni opet"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="4930826928585464191">"Otkaži"</string>
+    <string name="bluetooth_disable_le_audio_hw_offload" msgid="3966022676505972908">"Onemogući rasterećenje Bluetootha LE AUDIO"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_title" msgid="6001142380445276918">"Ponovo pokrenuti?"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_message" msgid="1524373895333698779">"Da promijenite ovu postavku, potrebno je ponovo pokrenuti uređaj."</string>
+    <string name="bluetooth_disable_hw_offload_dialog_confirm" msgid="5594859658551707592">"Ponovo pokreni"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel" msgid="3663690305043973720">"Otkaži"</string>
     <string name="connected_device_media_device_title" msgid="3783388247594566734">"Uređaji za medije"</string>
     <string name="connected_device_call_device_title" msgid="88732390601723608">"Uređaji za pozive"</string>
     <string name="connected_device_other_device_title" msgid="4652120430615729193">"Drugi uređaji"</string>
@@ -312,9 +313,9 @@
     <string name="security_settings_title" msgid="6710768415432791970">"Sigurnost"</string>
     <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"Šifriranje i akreditivi"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"Telefon je šifriran"</string>
-    <string name="decryption_settings_summary" product="default" msgid="1742645256103613503">"Telefon nije šifriran"</string>
+    <string name="not_encrypted_summary" product="default" msgid="2251945842585788254">"Telefon nije šifriran"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"Uređaj je šifriran"</string>
-    <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"Uređaj nije šifriran"</string>
+    <string name="not_encrypted_summary" product="tablet" msgid="2374263654698719382">"Uređaj nije šifriran"</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"Zaključani ekran"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"Šta prikazati"</string>
     <string name="security_settings_summary" msgid="1627059516127354233">"Postavite Moju lokaciju, otključavanje ekrana, zaključavanje SIM kartice, zaključavanje pohrane akreditiva"</string>
@@ -484,7 +485,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"Izbriši"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"Dodirnite senzor"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"Stavite prst na senzor i podignite ga kad osjetite vibraciju"</string>
-    <string name="security_settings_udfps_enroll_start_message" msgid="5032954588171487566">"Držite otisak prsta ravno na senzoru dok ne osjetite vibraciju"</string>
+    <string name="security_settings_udfps_enroll_start_message" msgid="5032954588171487566">"Držite prst ravno na senzoru dok ne osjetite vibraciju"</string>
     <string name="security_settings_fingerprint_enroll_udfps_title" msgid="6665610134560896895">"Dodirnite i držite senzor za otisak prsta"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"Podignite i ponovo dodirnite"</string>
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"Još jednom"</string>
@@ -572,37 +573,10 @@
     <string name="fingerprint_last_delete_message" msgid="7860374760549404410">"Nećete moći koristiti otisak prsta da otključate telefon niti da potvrdite identitet u aplikacijama."</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="4104208067277655068">"Nećete moći koristiti otisak prsta da otključate radni profil, odobrite kupovine niti da se prijavite u poslovne aplikacije."</string>
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"Da, ukloni"</string>
-    <string name="crypt_keeper_settings_title" msgid="4938812137822100044">"Šifriranje"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"Šifriraj tablet"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"Šifriranje telefona"</string>
-    <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"Šifrirano"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"Možete šifrirati svoje račune, postavke, preuzete aplikacije i njihove podatke, medijske podatke i druge fajlove. Nakon šifriranja tableta, uz pretpostavku da ste postavili zaključavanje ekrana (tj. postavili uzorak, numerički PIN ili lozinku), bit će potrebno da otključate ekran prilikom svakog uključivanja kako biste izvršili dešifriranje. Jedina alternativa dešifriranju je ponovno postavljanje na fabričke postavke uz brisanje svih vaših podataka.\n\nZa šifriranje je potreban jedan sat ili duže. Morate započeti sa napunjenom baterijom, a tablet treba biti priključen na napajanje tokom cijelog postupka. U slučaju prekida, izgubit ćete jedan dio ili sve svoje podatke"</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"Možete šifrirati svoje račune, postavke, preuzete aplikacije i njihove podatke, medijske sadržaje i druge fajlove. Nakon šifriranja telefona, uz pretpostavku da ste postavili zaključavanje ekrana (tj. postavili uzorak, numerički PIN ili lozinku), bit će potrebno da otključate ekran prilikom svakog uključivanja kako biste izvršili dešifriranje. Jedina alternativa dešifriranju je ponovno postavljanje na fabričke postavke uz brisanje svih vaših podataka.\n\nZa šifriranje je potreban jedan sat ili duže. Morate započeti sa napunjenom baterijom, a telefon treba biti priključen na napajanje tokom cijelog postupka. U slučaju prekida, izgubit ćete jedan dio ili sve svoje podatke."</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"Šifriraj tablet"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"Šifriraj telefon"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"Napunite bateriju i pokušajte ponovo."</string>
-    <string name="crypt_keeper_unplugged_text" msgid="2709721134148651329">"Priključite punjač i pokušajte ponovo."</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="1847280235529858357">"Nema PIN-a ili lozinke za zaključavanje ekrana"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="7210616262954236042">"Trebate postaviti PIN za zaključavanje ekrana ili lozinku da biste mogli pokrenuti šifriranje."</string>
-    <string name="crypt_keeper_confirm_title" msgid="8600000209722452230">"Šifriraj?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="3270587498436152259">"Postupak šifriranja je neopoziv te gubite podatke u slučaju prekida. Šifriranje traje jedan sat ili duže, pri čemu se tablet ponovo pokreće nekoliko puta."</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="3040428543349852419">"Postupak šifriranja je nepovratan; u slučaju prekida, gubite podatke. Šifriranje traje jedan sat ili duže, pri čemu se telefon ponovo pokreće nekoliko puta."</string>
-    <string name="crypt_keeper_setup_title" msgid="3339725741305796680">"Šifriranje"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="4417016995091289019">"Pričekajte dok se tablet šifrira. Dovršeno <xliff:g id="PERCENT">^1</xliff:g>%."</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="7902355422499500352">"Pričekajte dok se telefon šifrira. Dovršeno <xliff:g id="PERCENT">^1</xliff:g>%."</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="8348188415839917821">"Pričekajte dok se tablet šifrira. Preostalo vrijeme: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="8556105766597855198">"Pričekajte dok se telefon šifrira. Preostalo vrijeme: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="3832496715430327682">"Da biste otključali tablet, isključite ga, zatim ponovo uključite."</string>
-    <string name="crypt_keeper_force_power_cycle" product="default" msgid="5070346039522135361">"Da biste otključali tablet, isključite ga, a zatim ponovo uključite."</string>
-    <string name="crypt_keeper_warn_wipe" msgid="8104921337301750394">"Upozorenje: Preostalo vam je <xliff:g id="COUNT">^1</xliff:g> pokušaja otključavanja, nakon čega će sadržaj vašeg uređaja biti izbrisan!"</string>
-    <string name="crypt_keeper_enter_password" msgid="1274917431075529732">"Otkucajte lozinku"</string>
-    <string name="crypt_keeper_failed_title" msgid="8173654570682244149">"Šifriranje nije uspjelo"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"Šifriranje je prekinuto te se ne može završiti. Zbog toga podaci sa vašeg tableta više nisu dostupni. \n\n Da biste nastavili koristiti tablet, treba da izvršite vraćanje tableta na fabričke postavke. Nakon što izvršite postavke tableta nakon vraćanja na fabričke postavke, moći ćete vratiti sve podatke za koje postoji sigurnosna kopija na Google računu."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"Šifriranje je prekinuto te se ne može završiti. Zbog toga podaci sa vašeg telefona više nisu dostupni. \n\nDa biste nastavili koristiti telefon, treba da izvršite vraćanje telefona na fabričke postavke. Nakon što izvršite postavke telefona nakon vraćanja na fabričke postavke, moći ćete vratiti sve podatke za koje postoji sigurnosna kopija na Google računu."</string>
-    <string name="crypt_keeper_data_corrupt_title" msgid="5920153462176846037">"Dešifriranje nije uspjelo"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"Unesena lozinka je ispravna, ali nažalost vaši podaci su oštećeni. \n\nDa biste nastavili koristiti tablet, morate izvršiti vraćanje na fabričke postavke. Prilikom podešavanja tableta nakon ponovnog postavljanja, imat ćete priliku da vratite podatke čija sigurnosna kopija je spremljena u vaš Google račun."</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"Unesena lozinka je ispravna, ali nažalost vaši podaci su oštećeni. \n\nDa biste nastavili koristiti telefon, morate izvršiti vraćanje na fabričke postavke. Prilikom podešavanja telefona nakon ponovnog postavljanja, imat ćete priliku da vratite podatke čija sigurnosna kopija je spremljena u vaš Google račun."</string>
-    <string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"Promjena načina unosa"</string>
+    <string name="encryption_settings_title" msgid="2848716008695618360">"Šifriranje"</string>
+    <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"Šifriraj tablet"</string>
+    <string name="encrypt_title" product="default" msgid="7337365190988321100">"Šifriranje telefona"</string>
+    <string name="encrypted_summary" msgid="545623487587251207">"Šifrirano"</string>
     <string name="suggested_lock_settings_title" msgid="7836065447159730217">"Zaštitite telefon"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"Postavite zaključavanje ekrana da zaštitite tablet"</string>
     <string name="suggested_lock_settings_summary" product="device" msgid="8479766049078378225">"Postavite zaključavanje ekrana da zaštitite uređaj"</string>
@@ -834,6 +808,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Možda ćete morati otkucati ovaj PIN i na drugom uređaju."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Možda ćete morati otkucati ovaj pristupni kôd na drugom uređaju."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Da biste izvršilu uparivanje s uređajem:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Provjerite da li se prikazuje sljedeći pristupni ključ:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Potvrdite da uparite s koordiniranim kompletom"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"Od:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Želite izvršiti uparivanje s ovim uređajem?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Da biste izvršili uparivanje s uređajem:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Otkucajte na njemu:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, a zatim pritisnite Return ili Enter."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Dozvolite pristup kontaktima i historiji poziva"</string>
@@ -867,6 +842,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Nije povezan. Pokušajte ponovo."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Detalji o uređaju"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Bluetooth adresa uređaja: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Bluetooth adresa uređaja:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Zaboraviti uređaj?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Uklonite povezanost"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Prekinuti vezu s aplikacijom?"</string>
@@ -898,6 +874,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Zapamti postavke"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Maksimalan broj povezanih Bluetooth audio uređaja"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Odaberite maksimalan broj povezanih Bluetooth audio uređaja"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"Povećajte nivo evidentiranja za NFC grupu"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Povećajte nivo zapisivanja za NFC grupu"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Emitiranje"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"preslikavanje"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Omogući bežični prikaz"</string>
@@ -1208,6 +1186,8 @@
     <string name="wifi_hotspot_maximize_compatibility_dual_ap_summary" msgid="3579549223159056533">"Pomaže ostalim uređajima da pronađu ovu pristupnu tačku. Povećava potrošnju baterije."</string>
     <string name="wifi_tether_starting" msgid="8879874184033857814">"Uključivanje pristupne tačke…"</string>
     <string name="wifi_tether_stopping" msgid="4416492968019409188">"Isključivanje pristupne tačke…"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_title" msgid="3089432578433978073">"Povezivanje putem mobitela nije dostupno"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_content" msgid="5920421547607921112">"Za detalje se obratite mobilnom operateru"</string>
     <string name="wifi_tether_enabled_subtext" msgid="5085002421099821056">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> je aktivna"</string>
     <string name="wifi_tether_failed_subtext" msgid="437190628041885500">"Greška kod prijenosne WiFi pristupne tačke"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7072559431286459122">"Postavljanje WiFi pristupne tačke"</string>
@@ -2034,9 +2014,9 @@
     <string name="install_applications_title" msgid="7890233747559108106">"Dopusti sve izvore aplikacija"</string>
     <string name="recent_app_category_title" msgid="189758417804427533">"Nedavno otvarane aplikacije"</string>
     <plurals name="see_all_apps_title" formatted="false" msgid="6864581406735745400">
-      <item quantity="one">Prikaz svih aplikacija, ukupno %1$d</item>
-      <item quantity="few">Prikaz svih aplikacija, ukupno %1$d</item>
-      <item quantity="other">Prikaz svih aplikacija, ukupno %1$d</item>
+      <item quantity="one">Prikaz svih aplikacija (njih %1$d)</item>
+      <item quantity="few">Prikaz svih aplikacija (njih %1$d)</item>
+      <item quantity="other">Prikaz svih aplikacija (njih %1$d)</item>
     </plurals>
     <string name="forgot_password_title" msgid="3967873480875239885">"Kontaktirajte IT administratora"</string>
     <string name="forgot_password_text" msgid="2583194470767613163">"Može vam pomoći s poništavanjem PIN-a, uzorka ili lozinke"</string>
@@ -2563,11 +2543,6 @@
     <string name="enable_service_title" msgid="7231533866953706788">"Dozvoliti da usluga <xliff:g id="SERVICE">%1$s</xliff:g> ima punu kontrolu nad vašim uređajem?"</string>
     <string name="capabilities_list_title" msgid="1225853611983394386">"Usluga <xliff:g id="SERVICE">%1$s</xliff:g> treba da:"</string>
     <string name="touch_filtered_warning" msgid="4225815157460318241">"Aplikacija nije dala odobrenje za zahtjev pa postavke ne mogu potvrditi vaš odgovor."</string>
-    <string name="enable_service_encryption_warning" msgid="931082737770453755">"Ukoliko uključite uslugu <xliff:g id="SERVICE">%1$s</xliff:g>, uređaj neće koristiti zaključavanje ekrana za poboljšanje šifriranja podataka."</string>
-    <string name="secure_lock_encryption_warning" msgid="669152607190123579">"Pošto ste uključili uslugu pristupačnosti, vaš uređaj neće koristiti zaključavanje ekrana za poboljšanje šifriranja podataka."</string>
-    <string name="enable_service_pattern_reason" msgid="6832846117817938536">"Uključivanje usluge <xliff:g id="SERVICE">%1$s</xliff:g> utiče na šifriranje podataka, stoga je potrebno da potvrdite svoj obrazac."</string>
-    <string name="enable_service_pin_reason" msgid="6040417014360237703">"Uključivanje usluge <xliff:g id="SERVICE">%1$s</xliff:g> utiče na šifriranje podataka, stoga je potrebno da potvrdite svoj PIN."</string>
-    <string name="enable_service_password_reason" msgid="6962544350351734238">"Uključivanje usluge <xliff:g id="SERVICE">%1$s</xliff:g> utiče na šifriranje podataka, stoga je potrebno da potvrdite lozinku."</string>
     <string name="accessibility_service_warning" msgid="6779187188736432618">"Usluga <xliff:g id="SERVICE">%1$s</xliff:g> zahtijeva potpunu kontrolu ovog uređaja. Usluga može čitati sadržaj ekrana i djelovati u ime korisnika s potrebama za pristupačnost. Ovaj nivo kontrole nije prikladan za većinu aplikacija."</string>
     <string name="accessibility_service_warning_description" msgid="6573203795976134751">"Puna kontrola je prikladna za aplikacije koje vam pomažu kod potreba za pristupačnosti, ali nije za većinu aplikacija."</string>
     <string name="accessibility_service_screen_control_title" msgid="324795030658109870">"Prikaz i kontrola ekrana"</string>
@@ -3143,14 +3118,6 @@
     <string name="remove_account_failed" msgid="3709502163548900644">"Vaš administrator ne dopušta ovu promjenu"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"Nije moguće ručno sinhronizovati"</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"Sinhornizacija za ovu stavku trenutno nije moguća. Da biste promijenili ovu postavku, privremeno uključite podatke u pozadini i automatsko sinhroniziranje."</string>
-    <string name="enter_password" msgid="6327051330258595331">"Da biste pokrenuli Android, unesite lozinku"</string>
-    <string name="enter_pin" msgid="1029287617551232681">"Da biste pokrenuli Android, unesite PIN"</string>
-    <string name="enter_pattern" msgid="1747316785866742960">"Da biste pokrenuli Android, nacrtajte svoj obrazac"</string>
-    <string name="cryptkeeper_wrong_pattern" msgid="340747269176120242">"Pogrešan obrazac"</string>
-    <string name="cryptkeeper_wrong_password" msgid="7295607881887114486">"Pogrešna lozinka"</string>
-    <string name="cryptkeeper_wrong_pin" msgid="2347961593970714201">"Pogrešan PIN"</string>
-    <string name="checking_decryption" msgid="6111642972615688237">"Provjera u toku..."</string>
-    <string name="starting_android" msgid="6694154070215356186">"Pokretanje Androida…"</string>
     <string name="delete" msgid="8330605554706263775">"Izbriši"</string>
     <string name="misc_files" msgid="6598066985800749585">"Razni fajlovi"</string>
     <string name="misc_files_selected_count" msgid="5597802791672749532">"odabrano <xliff:g id="NUMBER">%1$d</xliff:g> od <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -3246,8 +3213,6 @@
     <string name="data_usage_metered_yes" msgid="4262598072030135223">"S naplatom"</string>
     <string name="data_usage_metered_no" msgid="1685828958417926268">"Bez naplate"</string>
     <string name="data_usage_disclaimer" msgid="3271450299386176770">"Obračun podataka operatera može se razlikovati od obračuna vašeg uređaja."</string>
-    <string name="cryptkeeper_emergency_call" msgid="8369322820475703306">"Poziv za hitne slučajeve"</string>
-    <string name="cryptkeeper_return_to_call" msgid="3857250752781151232">"Vrati se na poziv"</string>
     <string name="vpn_name" msgid="3806456074909253262">"Naziv"</string>
     <string name="vpn_type" msgid="5533202873260826663">"Vrsta"</string>
     <string name="vpn_server" msgid="2908816134941973935">"Adresa servera"</string>
@@ -4674,7 +4639,7 @@
     <string name="condition_battery_title" msgid="6395113995454385248">"Ušteda baterije je uključena"</string>
     <string name="condition_battery_summary" msgid="8436806157833107886">"Funkcije su ograničene"</string>
     <string name="condition_cellular_title" msgid="155474690792125747">"Prijenos podataka na mobilnoj mreži je isključen"</string>
-    <string name="condition_cellular_summary" msgid="1678098728303268851">"Internet je dostupan samo putem WiFi mreže"</string>
+    <string name="condition_cellular_summary" msgid="1678098728303268851">"Internet je dostupan samo putem WiFi-ja"</string>
     <string name="condition_bg_data_title" msgid="2719263664589753094">"Ušteda podataka"</string>
     <string name="condition_bg_data_summary" msgid="1736255283216193834">"Funkcije su ograničene"</string>
     <string name="condition_work_title" msgid="174326145616998813">"Radni profil je isključen"</string>
@@ -4839,8 +4804,6 @@
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> aplikacija može koristiti neograničen prijenos podataka</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"Prikaži više"</string>
-    <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"Zaista želite izbrisati korisničke podatke i pretvoriti u šifrirani fajl?"</string>
-    <string name="button_confirm_convert_fbe" msgid="339648921918438106">"Obriši i pretvori"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"Poništi ograničenje brzine ShortcutManagera"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"Ograničenje brzine ShortcutManagera je poništeno"</string>
     <string name="notification_suggestion_title" msgid="6309263655965785411">"Kontrolirajte informacije na zaključanom ekranu"</string>
@@ -5379,6 +5342,7 @@
     <string name="sim_action_yes" msgid="8076556020131395515">"Da"</string>
     <string name="sim_action_reboot" msgid="3508948833333441538">"Ponovo pokreni"</string>
     <string name="sim_action_no_thanks" msgid="435717748384544195">"Ne, hvala"</string>
+    <string name="sim_action_cancel" msgid="2668099867029610910">"Otkaži"</string>
     <string name="sim_switch_button" msgid="1405772571706095387">"Prebaci"</string>
     <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Nije moguće aktivirati SIM"</string>
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Izvadite SIM karticu i ponovo je umetnite. Ako se problem ne riješi, ponovo pokrenite uređaj."</string>
@@ -5533,6 +5497,10 @@
     <string name="cached_apps_freezer" msgid="1057519579761550350">"Obustavi izvršenja za aplikacije u keš memoriji"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"Dozvolite preklapanja ekrana na Postavkama"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Dozvolite aplikacijama koje mogu prikazivati preko drugih aplikacija da preklapaju ekrane Postavki"</string>
+    <!-- no translation found for allow_mock_modem (3832264806530479214) -->
+    <skip />
+    <!-- no translation found for allow_mock_modem_summary (9097416612748005374) -->
+    <skip />
     <string name="media_controls_title" msgid="403271085636252597">"Mediji"</string>
     <string name="media_controls_resume_title" msgid="855076860336652370">"Zakači medija plejer"</string>
     <string name="media_controls_resume_description" msgid="3163482266454802097">"Da brzo nastavite reprodukciju, medija plejer će ostati otvoren u Brzim postavkama"</string>
diff --git a/res/values-ca/arrays.xml b/res/values-ca/arrays.xml
index 209a522..f29f97d 100644
--- a/res/values-ca/arrays.xml
+++ b/res/values-ca/arrays.xml
@@ -66,7 +66,7 @@
     <item msgid="4649244712522775149">"Petita"</item>
     <item msgid="4350318459725129464">"Predeterminat"</item>
     <item msgid="722959474722634030">"Gran"</item>
-    <item msgid="5468692832610514379">"Més grans possible"</item>
+    <item msgid="5468692832610514379">"El més gran"</item>
   </string-array>
   <string-array name="wifi_status">
     <item msgid="1201478116293383426"></item>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 6067808..6f34cc2 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -142,10 +142,11 @@
     <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"Permet que el dispositiu es comuniqui amb dispositius Bluetooth que estiguin a prop"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"Permet que el telèfon es comuniqui amb dispositius Bluetooth que estiguin a prop"</string>
     <string name="bluetooth_disable_a2dp_hw_offload" msgid="5942913792817797541">"Desactiva baixada de maquinari (BT A2DP)"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="8610420176339657720">"Vols reiniciar-lo?"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8333029144800835996">"Has de reiniciar el dispositiu per canviar aquesta opció."</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="3488695418187553566">"Reinicia"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="4930826928585464191">"Cancel·la"</string>
+    <string name="bluetooth_disable_le_audio_hw_offload" msgid="3966022676505972908">"Desactiva la baixada de maquinari Bluetooth LE AUDIO"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_title" msgid="6001142380445276918">"Vols reiniciar-lo?"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_message" msgid="1524373895333698779">"Has de reiniciar el dispositiu per canviar aquesta opció."</string>
+    <string name="bluetooth_disable_hw_offload_dialog_confirm" msgid="5594859658551707592">"Reinicia"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel" msgid="3663690305043973720">"Cancel·la"</string>
     <string name="connected_device_media_device_title" msgid="3783388247594566734">"Dispositius multimèdia"</string>
     <string name="connected_device_call_device_title" msgid="88732390601723608">"Dispositius de trucada"</string>
     <string name="connected_device_other_device_title" msgid="4652120430615729193">"Altres dispositius"</string>
@@ -309,9 +310,9 @@
     <string name="security_settings_title" msgid="6710768415432791970">"Seguretat"</string>
     <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"Encriptació i credencials"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"Telèfon encriptat"</string>
-    <string name="decryption_settings_summary" product="default" msgid="1742645256103613503">"El telèfon no està encriptat"</string>
+    <string name="not_encrypted_summary" product="default" msgid="2251945842585788254">"El telèfon no està encriptat"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"Dispositiu encriptat"</string>
-    <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"El dispositiu no està encriptat"</string>
+    <string name="not_encrypted_summary" product="tablet" msgid="2374263654698719382">"El dispositiu no està encriptat"</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"Pantalla de bloqueig"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"Què es mostra"</string>
     <string name="security_settings_summary" msgid="1627059516127354233">"Defineix La meva ubicació, el desbloqueig de la pantalla, el bloqueig de la targeta SIM i el bloqueig de l\'emmagatzematge de credencials"</string>
@@ -568,37 +569,10 @@
     <string name="fingerprint_last_delete_message" msgid="7860374760549404410">"No podràs utilitzar l\'empremta digital per desbloquejar el telèfon o verificar la teva identitat en aplicacions."</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="4104208067277655068">"No podràs utilitzar l\'empremta digital per desbloquejar el teu perfil de treball, autoritzar compres ni iniciar la sessió en aplicacions de treball."</string>
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"Sí, suprimeix"</string>
-    <string name="crypt_keeper_settings_title" msgid="4938812137822100044">"Encriptació"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"Encriptació de la tauleta"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"Encripta el telèfon"</string>
-    <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"Encriptat"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"Pots encriptar els comptes, les configuracions, les aplicacions baixades i dades associades, els fitxers multimèdia i altres tipus de fitxers. Una vegada encriptada la teva tauleta, has d\'introduir un PIN numèric o una contrasenya per desencriptar-la cada vegada que l\'engeguis (només podràs desencriptar-la restablint les dades de fàbrica i esborrant-ne totes les dades).\n\nEl procés d\'encriptació triga fins a una hora. Cal que iniciïs aquest procés amb la bateria carregada i que mantinguis la tauleta connectada fins que s\'hagi completat. Si s\'interromp el procés d\'encriptació, perdràs totes les teves dades o bé una part."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"Pots encriptar els comptes, la configuració, les aplicacions baixades i les seves dades, els elements multimèdia i altres fitxers. Un cop encriptat el telèfon, sempre que hagis configurat un bloqueig de pantalla (és a dir, un patró, una contrasenya o un PIN numèric), hauràs de desbloquejar la pantalla per desencriptar el telèfon cada vegada que l\'engeguis.  De manera alternativa, pots desencriptar-lo restablint les dades de fàbrica, però s\'esborraran totes les teves dades.\n\nL\'encriptació pot tardar una hora o més. Has de començar el procés amb la bateria carregada i mantenir el telèfon endollat durant tot el procés. Si s\'interromp el procés, perdràs totes les teves dades o una part."</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"Encripta la tauleta"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"Encripta el telèfon"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"Carrega la bateria i torna-ho a provar."</string>
-    <string name="crypt_keeper_unplugged_text" msgid="2709721134148651329">"Endolla el carregador i torna-ho a provar."</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="1847280235529858357">"No hi ha cap PIN ni cap contrasenya de bloqueig de la pantalla"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="7210616262954236042">"Has d\'establir un PIN o una contrasenya a la pantalla de bloqueig per poder començar l\'encriptació."</string>
-    <string name="crypt_keeper_confirm_title" msgid="8600000209722452230">"Encriptar el dispositiu?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="3270587498436152259">"L\'operació d\'encriptació no es pot desfer i, si l\'interromps, perdràs dades. L\'encriptació tarda una hora com a mínim i la tauleta es reiniciarà diverses vegades durant aquest procés."</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="3040428543349852419">"L\'operació d\'encriptació no es pot desfer i, si l\'interromps, perdràs dades. L\'encriptació tarda una hora com a mínim i el telèfon es reiniciarà diverses vegades durant aquest procés."</string>
-    <string name="crypt_keeper_setup_title" msgid="3339725741305796680">"Encriptació"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="4417016995091289019">"Espera mentre s\'encripta la tauleta. <xliff:g id="PERCENT">^1</xliff:g>% complet."</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="7902355422499500352">"Espera mentre s\'encripta el telèfon. <xliff:g id="PERCENT">^1</xliff:g>% completat."</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="8348188415839917821">"Espera mentre s\'encripta la tauleta. Temps restant: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="8556105766597855198">"Espera mentre s\'encripta el telèfon. Temps restant: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="3832496715430327682">"Per desbloquejar la tauleta, apaga-la i torna-la a engegar."</string>
-    <string name="crypt_keeper_force_power_cycle" product="default" msgid="5070346039522135361">"Per desbloquejar el telèfon, apaga\'l i torna\'l a engegar."</string>
-    <string name="crypt_keeper_warn_wipe" msgid="8104921337301750394">"Advertiment: s\'esborraran totes les dades del dispositiu amb <xliff:g id="COUNT">^1</xliff:g> intents fallits més de desbloquejar-lo."</string>
-    <string name="crypt_keeper_enter_password" msgid="1274917431075529732">"Escriu la contrasenya"</string>
-    <string name="crypt_keeper_failed_title" msgid="8173654570682244149">"S\'ha produït un error en encriptar"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"S\'ha interromput l\'encriptació i no es pot completar. A conseqüència d\'això, ja no es pot accedir a les dades de la tauleta. \n\nPer reprendre l\'ús de la tauleta, cal que duguis a terme un restabliment de fàbrica. Quan configuris la tauleta després del restabliment, tindràs l\'oportunitat de restaurar les dades de les quals s\'hagi fet una còpia de seguretat al teu compte de Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"S\'ha interromput l\'encriptació i no es pot completar. A conseqüència d\'això, ja no es pot accedir a les dades del telèfon. \n\nPer reprendre l\'ús del telèfon, cal que duguis a terme un restabliment de fàbrica. Quan configuris el telèfon després del restabliment, tindràs l\'oportunitat de restaurar les dades de les quals s\'hagi fet una còpia de seguretat al teu compte de Google."</string>
-    <string name="crypt_keeper_data_corrupt_title" msgid="5920153462176846037">"No s\'ha pogut desencriptar"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"La contrasenya és correcta, però malauradament les dades estan malmeses. \n\nPer continuar fent servir la tauleta, has de restablir les característiques de fàbrica. Quan configuris la tauleta després de restablir-la, podràs recuperar les dades de què hagis fet una còpia de seguretat al compte de Google."</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"La contrasenya és correcta, però malauradament les dades estan malmeses. \n\nPer continuar fent servir el telèfon, has de restablir les característiques de fàbrica. Quan configuris el telèfon després de restablir-lo, podràs recuperar les dades de què hagis fet una còpia de seguretat al compte de Google."</string>
-    <string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"Canvia el mètode d\'introducció"</string>
+    <string name="encryption_settings_title" msgid="2848716008695618360">"Encriptació"</string>
+    <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"Encripta la tauleta"</string>
+    <string name="encrypt_title" product="default" msgid="7337365190988321100">"Encripta el telèfon"</string>
+    <string name="encrypted_summary" msgid="545623487587251207">"Encriptat"</string>
     <string name="suggested_lock_settings_title" msgid="7836065447159730217">"Protegeix el teu telèfon"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"Configura un bloqueig per protegir la tauleta"</string>
     <string name="suggested_lock_settings_summary" product="device" msgid="8479766049078378225">"Configura un bloqueig per protegir el dispositiu"</string>
@@ -817,6 +791,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Pot ser que també hagis d\'introduir aquest PIN a l\'altre dispositiu."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Pot ser que també hagis d\'introduir aquesta clau d\'accés a l\'altre dispositiu."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Per vincular a &lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;assegura\'t que es mostra aquesta clau d\'accés:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Confirma per vincular amb el conjunt coordinat"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"De:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Vols vincular aquest dispositiu?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Per vincular a <xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>escriu-hi <xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g> i, a continuació, prem Retorn."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Permet l\'accés als contactes i a l\'historial de trucades"</string>
@@ -850,6 +825,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"No s\'ha pogut connectar. Torna-ho a provar."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Detalls del dispositiu"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Adreça Bluetooth del dispositiu: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Adreça Bluetooth del dispositiu:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Vols que s\'oblidi el dispositiu?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Suprimeix l\'associació"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Vols desconnectar l\'aplicació?"</string>
@@ -881,6 +857,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Recorda la configuració"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Nombre màxim de dispositius d\'àudio Bluetooth connectats"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Selecciona el nombre màxim de dispositius d\'àudio Bluetooth connectats"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"Registre de depuració de la pila de l\'NFC"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Augmenta el nivell de registre de la pila de l\'NFC"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Emet"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"projectar"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Activa pantalla sense fil"</string>
@@ -1188,6 +1166,8 @@
     <string name="wifi_hotspot_maximize_compatibility_dual_ap_summary" msgid="3579549223159056533">"Ajuda altres dispositius a trobar aquest punt d\'accés Wi‑Fi. Augmenta l\'ús de la bateria."</string>
     <string name="wifi_tether_starting" msgid="8879874184033857814">"S\'està activant el punt d\'accés Wi-Fi…"</string>
     <string name="wifi_tether_stopping" msgid="4416492968019409188">"S\'està desactivant el punt d\'accés Wi-Fi…"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_title" msgid="3089432578433978073">"La compartició de xarxa no està disponible"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_content" msgid="5920421547607921112">"Contacta amb l\'operador per obtenir informació"</string>
     <string name="wifi_tether_enabled_subtext" msgid="5085002421099821056">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> està actiu"</string>
     <string name="wifi_tether_failed_subtext" msgid="437190628041885500">"Error de punt d\'accés Wi-Fi"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7072559431286459122">"Configura el punt d\'accés Wi-Fi"</string>
@@ -2534,11 +2514,6 @@
     <string name="enable_service_title" msgid="7231533866953706788">"Vols que <xliff:g id="SERVICE">%1$s</xliff:g> controli el teu dispositiu per complet?"</string>
     <string name="capabilities_list_title" msgid="1225853611983394386">"<xliff:g id="SERVICE">%1$s</xliff:g> necessita:"</string>
     <string name="touch_filtered_warning" msgid="4225815157460318241">"Com que hi ha una aplicació que oculta una sol·licitud de permís, no es pot verificar la teva resposta des de la configuració."</string>
-    <string name="enable_service_encryption_warning" msgid="931082737770453755">"Si actives <xliff:g id="SERVICE">%1$s</xliff:g>, el dispositiu no farà servir el bloqueig de pantalla per millorar l\'encriptació de dades."</string>
-    <string name="secure_lock_encryption_warning" msgid="669152607190123579">"Com que has activat un servei d\'accessibilitat, el teu dispositiu no farà servir el bloqueig de pantalla per millorar l\'encriptació de dades."</string>
-    <string name="enable_service_pattern_reason" msgid="6832846117817938536">"Cal que confirmis el patró perquè l\'activació del servei <xliff:g id="SERVICE">%1$s</xliff:g> afecta l\'encriptació de les dades."</string>
-    <string name="enable_service_pin_reason" msgid="6040417014360237703">"Cal que confirmis el PIN perquè l\'activació del servei <xliff:g id="SERVICE">%1$s</xliff:g> afecta l\'encriptació de les dades."</string>
-    <string name="enable_service_password_reason" msgid="6962544350351734238">"Cal que confirmis la contrasenya perquè l\'activació del servei <xliff:g id="SERVICE">%1$s</xliff:g> afecta l\'encriptació de les dades."</string>
     <string name="accessibility_service_warning" msgid="6779187188736432618">"<xliff:g id="SERVICE">%1$s</xliff:g> sol·licita un control total del dispositiu. El servei pot llegir la pantalla i actuar en nom dels usuaris amb necessitats d\'accessibilitat. Aquest nivell de control no és adequat per a la majoria d\'aplicacions."</string>
     <string name="accessibility_service_warning_description" msgid="6573203795976134751">"El control total és adequat per a les aplicacions que t\'ajuden amb l\'accessibilitat, però no per a la majoria de les aplicacions."</string>
     <string name="accessibility_service_screen_control_title" msgid="324795030658109870">"Veure i controlar la pantalla"</string>
@@ -2722,7 +2697,7 @@
     <string name="smart_battery_manager_title" msgid="3677620516657920364">"Gestor de bateria"</string>
     <string name="smart_battery_title" msgid="9095903608520254254">"Gestiona les aplicacions automàticament"</string>
     <string name="smart_battery_summary" product="default" msgid="1492277404000064998">"Limita l\'ús de bateria de les aplicacions que no utilitzes habitualment"</string>
-    <string name="smart_battery_footer" msgid="8407121907452993645">"Quan el gestor de bateria detecta que hi ha aplicacions que consumeixen molta bateria, t\'ofereix l\'opció de restringir-les. És possible que les aplicacions restringides no funcionin correctament i que en rebis les notificacions amb retard."</string>
+    <string name="smart_battery_footer" msgid="8407121907452993645">"Quan el gestor de bateria detecta que hi ha aplicacions que estan esgotant la bateria, t\'ofereix l\'opció de restringir-les. És possible que les aplicacions restringides no funcionin correctament i que en rebis les notificacions amb retard."</string>
     <string name="restricted_app_title" msgid="6585080822121007436">"Aplicacions restringides"</string>
     <plurals name="restricted_app_summary" formatted="false" msgid="6059772951505411003">
       <item quantity="other">S\'ha limitat l\'ús de la bateria per a %1$d aplicacions</item>
@@ -3103,14 +3078,6 @@
     <string name="remove_account_failed" msgid="3709502163548900644">"L\'administrador no permet aquest canvi"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"No es pot sincronitzar manualment"</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"En aquest moment, la sincronització d\'aquest element no està disponible. Per canviar la preferència, activa temporalment les dades en segon pla i la sincronització automàtica."</string>
-    <string name="enter_password" msgid="6327051330258595331">"Per iniciar Android, introdueix la contrasenya."</string>
-    <string name="enter_pin" msgid="1029287617551232681">"Per iniciar Android, introdueix el PIN."</string>
-    <string name="enter_pattern" msgid="1747316785866742960">"Per iniciar Android, dibuixa el patró."</string>
-    <string name="cryptkeeper_wrong_pattern" msgid="340747269176120242">"Patró incorrecte"</string>
-    <string name="cryptkeeper_wrong_password" msgid="7295607881887114486">"Contrasenya incorrecta"</string>
-    <string name="cryptkeeper_wrong_pin" msgid="2347961593970714201">"PIN incorrecte"</string>
-    <string name="checking_decryption" msgid="6111642972615688237">"S\'està comprovant..."</string>
-    <string name="starting_android" msgid="6694154070215356186">"S\'està iniciant Android..."</string>
     <string name="delete" msgid="8330605554706263775">"Suprimeix"</string>
     <string name="misc_files" msgid="6598066985800749585">"Fitxers diversos"</string>
     <string name="misc_files_selected_count" msgid="5597802791672749532">"s\'han seleccionat <xliff:g id="NUMBER">%1$d</xliff:g> de <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -3206,8 +3173,6 @@
     <string name="data_usage_metered_yes" msgid="4262598072030135223">"D\'ús mesurat"</string>
     <string name="data_usage_metered_no" msgid="1685828958417926268">"Sense ús mesurat"</string>
     <string name="data_usage_disclaimer" msgid="3271450299386176770">"El recompte de dades de l\'operador de telefonia mòbil pot ser diferent del calculat pel dispositiu."</string>
-    <string name="cryptkeeper_emergency_call" msgid="8369322820475703306">"Trucada d\'emergència"</string>
-    <string name="cryptkeeper_return_to_call" msgid="3857250752781151232">"Torna a la trucada"</string>
     <string name="vpn_name" msgid="3806456074909253262">"Nom"</string>
     <string name="vpn_type" msgid="5533202873260826663">"Tipus"</string>
     <string name="vpn_server" msgid="2908816134941973935">"Adreça del servidor"</string>
@@ -3965,7 +3930,7 @@
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Vols permetre que <xliff:g id="SERVICE">%1$s</xliff:g> accedeixi al servei RV?"</string>
     <string name="vr_listener_security_warning_summary" msgid="1888843557687017791">"<xliff:g id="VR_LISTENER_NAME">%1$s</xliff:g> es podrà executar quan utilitzis aplicacions en el mode de realitat virtual."</string>
     <string name="display_vr_pref_title" msgid="4850474436291113569">"Amb el dispositiu en mode RV"</string>
-    <string name="display_vr_pref_low_persistence" msgid="7039841277157739871">"Redueix el desenfocament (recomanat)"</string>
+    <string name="display_vr_pref_low_persistence" msgid="7039841277157739871">"Redueix el desenfocament (opció recomanada)"</string>
     <string name="display_vr_pref_off" msgid="4008841566387432721">"Redueix el parpelleig"</string>
     <string name="picture_in_picture_title" msgid="9001594281840542493">"Pantalla en pantalla"</string>
     <string name="picture_in_picture_empty_text" msgid="9123600661268731579">"Cap de les aplicacions instal·lades no admet pantalla en pantalla"</string>
@@ -4399,8 +4364,8 @@
       <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> s\'està comportant de manera anòmala</item>
     </plurals>
     <plurals name="power_high_usage_title" formatted="false" msgid="8013115866788425817">
-      <item quantity="other">Hi ha aplicacions que consumeixen molta bateria</item>
-      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> consumeix molta bateria</item>
+      <item quantity="other">Hi ha aplicacions que estan esgotant la bateria</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> està esgotant la bateria</item>
     </plurals>
     <string name="high_power_filter_on" msgid="447849271630431531">"Sense optimitzar"</string>
     <string name="high_power_on" msgid="8778058701270819268">"Sense optimitzar"</string>
@@ -4764,8 +4729,6 @@
       <item quantity="one">1 aplicació pot utilitzar dades sense restricció</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"Mostra\'n més"</string>
-    <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"Vols netejar les dades d\'usuari i convertir-les en encriptació de fitxers?"</string>
-    <string name="button_confirm_convert_fbe" msgid="339648921918438106">"Esborra i neteja"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"Restableix la limitació de freqüència de ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"S\'ha restablert la limitació de freqüència de ShortcutManager"</string>
     <string name="notification_suggestion_title" msgid="6309263655965785411">"Controla la informació de la pantalla de bloqueig"</string>
@@ -5292,6 +5255,7 @@
     <string name="sim_action_yes" msgid="8076556020131395515">"Sí"</string>
     <string name="sim_action_reboot" msgid="3508948833333441538">"Reinicia"</string>
     <string name="sim_action_no_thanks" msgid="435717748384544195">"No, gràcies"</string>
+    <string name="sim_action_cancel" msgid="2668099867029610910">"Cancel·la"</string>
     <string name="sim_switch_button" msgid="1405772571706095387">"Canvia"</string>
     <string name="dsds_activation_failure_title" msgid="4467364110584914794">"No s\'ha pogut activar la SIM"</string>
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Treu la SIM i torna-la a inserir. Si el problema continua, reinicia el dispositiu."</string>
@@ -5444,6 +5408,10 @@
     <string name="cached_apps_freezer" msgid="1057519579761550350">"Suspèn l\'execució d\'aplicacions en la memòria cau"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"Permet les superposicions de pantalla a Configuració"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Permet que les aplicacions que poden mostrar-se sobre altres aplicacions se superposin sobre les pantalles de Configuració"</string>
+    <!-- no translation found for allow_mock_modem (3832264806530479214) -->
+    <skip />
+    <!-- no translation found for allow_mock_modem_summary (9097416612748005374) -->
+    <skip />
     <string name="media_controls_title" msgid="403271085636252597">"Multimèdia"</string>
     <string name="media_controls_resume_title" msgid="855076860336652370">"Fixa el reproductor multimèdia"</string>
     <string name="media_controls_resume_description" msgid="3163482266454802097">"Per reprendre la reproducció ràpidament, el reproductor multimèdia continua obert a la configuració ràpida"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 11b93e4..0fb04cf 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -144,10 +144,11 @@
     <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"Povolte zařízení komunikovat se zařízeními Bluetooth v okolí"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"Povolte telefonu komunikovat se zařízeními Bluetooth v okolí"</string>
     <string name="bluetooth_disable_a2dp_hw_offload" msgid="5942913792817797541">"Zakázat hardwarové snížení zátěže Bluetooth (A2DP)"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="8610420176339657720">"Restartovat zařízení?"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8333029144800835996">"Ke změně nastavení je nutné restartovat zařízení."</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="3488695418187553566">"Restartovat"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="4930826928585464191">"Zrušit"</string>
+    <string name="bluetooth_disable_le_audio_hw_offload" msgid="3966022676505972908">"Zakázat snižování zatížení hardwaru Bluetooth LE AUDIO"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_title" msgid="6001142380445276918">"Restartovat zařízení?"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_message" msgid="1524373895333698779">"Ke změně nastavení je nutné restartovat zařízení."</string>
+    <string name="bluetooth_disable_hw_offload_dialog_confirm" msgid="5594859658551707592">"Restartovat"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel" msgid="3663690305043973720">"Zrušit"</string>
     <string name="connected_device_media_device_title" msgid="3783388247594566734">"Mediální zařízení"</string>
     <string name="connected_device_call_device_title" msgid="88732390601723608">"Volání na zařízení"</string>
     <string name="connected_device_other_device_title" msgid="4652120430615729193">"Ostatní zařízení"</string>
@@ -315,9 +316,9 @@
     <string name="security_settings_title" msgid="6710768415432791970">"Zabezpečení"</string>
     <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"Šifrování a pověření"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"Telefon je zašifrován"</string>
-    <string name="decryption_settings_summary" product="default" msgid="1742645256103613503">"Telefon není šifrován"</string>
+    <string name="not_encrypted_summary" product="default" msgid="2251945842585788254">"Telefon není šifrován"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"Zařízení je zašifrováno"</string>
-    <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"Zařízení není šifrováno"</string>
+    <string name="not_encrypted_summary" product="tablet" msgid="2374263654698719382">"Zařízení není šifrováno"</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"Obrazovka uzamčení"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"Co zobrazovat"</string>
     <string name="security_settings_summary" msgid="1627059516127354233">"Moje poloha, odemknutí obrazovky, zámek SIM, zámek úložiště pověření"</string>
@@ -576,37 +577,10 @@
     <string name="fingerprint_last_delete_message" msgid="7860374760549404410">"Pomocí otisku prstu už nebude možné odemykat telefon ani ověřovat vaši totožnost v aplikacích."</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="4104208067277655068">"Otisk prstu už nebude možné používat k odemknutí pracovního profilu, autorizaci nákupů ani přihlašování do pracovních aplikací."</string>
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"Ano, odstranit"</string>
-    <string name="crypt_keeper_settings_title" msgid="4938812137822100044">"Šifrování"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"Šifrovat tablet"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"Šifrování telefonu"</string>
-    <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"Šifrováno"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"Své účty, nastavení, stažené aplikace a jejich data, média a další soubory můžete zašifrovat. Pokud tablet zašifrujete a nastavili jste zámek obrazovky (bezpečnostní gesto, číselný kód PIN nebo heslo), bude třeba jej při každém zapnutí dešifrovat odemknutím obrazovky. Dešifrování lze provést pouze obnovením továrních dat, kterým vymažete všechna svá data.\n\nŠifrování trvá hodinu nebo i déle. Šifrování je třeba zahájit s plně nabitou baterií a tablet je třeba mít během procesu zapojený do zásuvky. Pokud šifrování přerušíte, přijdete o některá nebo všechna svá data."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"Své účty, nastavení, stažené aplikace a jejich data, média a další soubory můžete zašifrovat. Pokud telefon zašifrujete a nastavili jste zámek obrazovky (bezpečnostní gesto, číselný kód PIN nebo heslo), bude třeba jej při každém zapnutí dešifrovat odemknutím obrazovky. Jediným dalším způsobem dešifrování je obnovení továrních nastavení, kterým vymažete všechna svá data.\n\nŠifrování trvá hodinu nebo i déle. Šifrování je potřeba zahájit s nabitou baterií a během šifrování je potřeba ponechat telefon připojený ke zdroji napájení. Pokud šifrování přerušíte, přijdete o některá nebo všechna svá data."</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"Šifrovat tablet"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"Šifrovat telefon"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"Nabijte baterii a zkuste to znovu."</string>
-    <string name="crypt_keeper_unplugged_text" msgid="2709721134148651329">"Připojte nabíječku a zkuste to znovu."</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="1847280235529858357">"Chybí heslo nebo kód PIN zámku obrazovky"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="7210616262954236042">"Před začátkem šifrování musíte nastavit kód PIN nebo heslo zámku obrazovky."</string>
-    <string name="crypt_keeper_confirm_title" msgid="8600000209722452230">"Zašifrovat?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="3270587498436152259">"Zašifrování je nevratné, a pokud ho přerušíte, budou vaše data ztracena. Šifrování trvá hodinu i déle. Během této doby bude tablet několikrát restartován."</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="3040428543349852419">"Zašifrování je nevratné, a pokud ho přerušíte, budou vaše data ztracena. Šifrování trvá hodinu i více. Během této doby bude telefon několikrát restartován."</string>
-    <string name="crypt_keeper_setup_title" msgid="3339725741305796680">"Šifrování"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="4417016995091289019">"Počkejte prosím, než bude tablet zašifrován. Dokončeno: <xliff:g id="PERCENT">^1</xliff:g> %"</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="7902355422499500352">"Počkejte prosím, než bude telefon zašifrován. Dokončeno: <xliff:g id="PERCENT">^1</xliff:g> %"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="8348188415839917821">"Počkejte prosím, než bude tablet zašifrován. Zbývající čas: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="8556105766597855198">"Počkejte prosím, než bude telefon zašifrován. Zbývající čas: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="3832496715430327682">"Chcete-li tablet odemknout, vypněte jej a poté jej znovu zapněte."</string>
-    <string name="crypt_keeper_force_power_cycle" product="default" msgid="5070346039522135361">"Chcete-li telefon odemknout, vypněte jej a poté jej znovu zapněte."</string>
-    <string name="crypt_keeper_warn_wipe" msgid="8104921337301750394">"Upozornění: Po <xliff:g id="COUNT">^1</xliff:g> dalších neúspěšných pokusech o odemknutí bude zařízení vymazáno!"</string>
-    <string name="crypt_keeper_enter_password" msgid="1274917431075529732">"Zadejte heslo"</string>
-    <string name="crypt_keeper_failed_title" msgid="8173654570682244149">"Šifrování se nezdařilo"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"Šifrování bylo přerušeno a nelze je dokončit. V důsledku toho již nebudou údaje v tabletu přístupné. \n\n Chcete-li tablet opět začít používat, je potřeba obnovit tovární nastavení. Po obnově budete moci v průběhu nastavení tabletu obnovit všechna data, která jsou zálohována v účtu Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"Šifrování bylo přerušeno a nelze je dokončit. V důsledku toho již nebudou údaje v telefonu přístupné. \n\nChcete-li telefon opět začít používat, je potřeba obnovit tovární nastavení. Po obnově budete moci v průběhu nastavení telefonu obnovit všechna data, která jsou zálohována v účtu Google."</string>
-    <string name="crypt_keeper_data_corrupt_title" msgid="5920153462176846037">"Dešifrování se nezdařilo"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"Zadané heslo je správné, avšak data jsou poškozena.\n\nChcete-li tablet nadále používat, je nutné v něm obnovit tovární nastavení. Až budete tablet po obnově znovu nastavovat, bude možné obnovit veškerá data, která byla zálohována na váš účet Google."</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"Zadané heslo je správné, avšak data jsou poškozena.\n\nChcete-li telefon nadále používat, je nutné v něm obnovit tovární nastavení. Až budete telefon po obnově znovu nastavovat, bude možné obnovit veškerá data, která byla zálohována na váš účet Google."</string>
-    <string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"Přepnout metodu zadávání"</string>
+    <string name="encryption_settings_title" msgid="2848716008695618360">"Šifrování"</string>
+    <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"Šifrování tabletu"</string>
+    <string name="encrypt_title" product="default" msgid="7337365190988321100">"Šifrování telefonu"</string>
+    <string name="encrypted_summary" msgid="545623487587251207">"Šifrováno"</string>
     <string name="suggested_lock_settings_title" msgid="7836065447159730217">"Zabezpečení telefonu"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"Ochraňte tablet pomocí zámku obrazovky"</string>
     <string name="suggested_lock_settings_summary" product="device" msgid="8479766049078378225">"Ochraňte zařízení pomocí zámku obrazovky"</string>
@@ -851,6 +825,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Tento kód PIN bude možná nutné zadat i v dalším zařízení."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Tento přístupový klíč bude možná nutné zadat i v druhém zařízení."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Párování se zařízením:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Zkontrolujte, zda zařízení zobrazuje tento přístupový klíč:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Potvrďte párování s koordinovanou sadou"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"Ze zařízení:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Spárovat s tímto zařízením?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Párování se zařízením:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Zadejte:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g> a poté stiskněte klávesu Return nebo Enter."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Povolit přístup ke kontaktům a historii volání"</string>
@@ -884,6 +859,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Nelze se připojit. Zkuste to znovu."</string>
     <string name="device_details_title" msgid="1155622417516195481">"O zařízení"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Adresa Bluetooth zařízení: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Adresa Bluetooth zařízení:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Zapomenout zařízení?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Odstranit přidružení"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Odpojit aplikaci?"</string>
@@ -915,6 +891,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Zapamatovat nastavení"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Maximum připojených audiozařízení Bluetooth"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Vyberte maximální počet připojených audiozařízení Bluetooth"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"Protokol ladění sady NFC"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Zvýšit úroveň protokolování sady NFC"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Odesílání"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"zrcadlení"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Povolit bezdrátové zobrazení"</string>
@@ -1228,6 +1206,8 @@
     <string name="wifi_hotspot_maximize_compatibility_dual_ap_summary" msgid="3579549223159056533">"Pomůže ostatním zařízením najít tento hotspot. Zvyšuje využití baterie."</string>
     <string name="wifi_tether_starting" msgid="8879874184033857814">"Zapínání hotspotu…"</string>
     <string name="wifi_tether_stopping" msgid="4416492968019409188">"Vypínání hotspotu…"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_title" msgid="3089432578433978073">"Tethering není k dispozici"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_content" msgid="5920421547607921112">"Na podrobnosti se zeptejte mobilního operátora"</string>
     <string name="wifi_tether_enabled_subtext" msgid="5085002421099821056">"Síť <xliff:g id="NETWORK_SSID">%1$s</xliff:g> je aktivní"</string>
     <string name="wifi_tether_failed_subtext" msgid="437190628041885500">"Chyba přenosného hotspotu Wi-Fi"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7072559431286459122">"Nastavit hotspot sítě Wi-Fi"</string>
@@ -2592,11 +2572,6 @@
     <string name="enable_service_title" msgid="7231533866953706788">"Chcete službě <xliff:g id="SERVICE">%1$s</xliff:g> povolit plnou kontrolu nad vaším zařízením?"</string>
     <string name="capabilities_list_title" msgid="1225853611983394386">"<xliff:g id="SERVICE">%1$s</xliff:g> potřebuje:"</string>
     <string name="touch_filtered_warning" msgid="4225815157460318241">"Žádost o oprávnění je blokována jinou aplikací. Nastavení proto vaši odpověď nemůže ověřit."</string>
-    <string name="enable_service_encryption_warning" msgid="931082737770453755">"Pokud zapnete službu <xliff:g id="SERVICE">%1$s</xliff:g>, zařízení nebude používat zámek obrazovky k vylepšení šifrování dat."</string>
-    <string name="secure_lock_encryption_warning" msgid="669152607190123579">"Vzhledem k tomu, že jste zapnuli službu přístupnosti, nebude zařízení používat zámek obrazovky k vylepšení šifrování dat."</string>
-    <string name="enable_service_pattern_reason" msgid="6832846117817938536">"Protože zapnutí služby <xliff:g id="SERVICE">%1$s</xliff:g> má vliv na šifrování dat, je třeba, abyste potvrdili své gesto."</string>
-    <string name="enable_service_pin_reason" msgid="6040417014360237703">"Protože zapnutí služby <xliff:g id="SERVICE">%1$s</xliff:g> má vliv na šifrování dat, je třeba, abyste potvrdili svůj kód PIN."</string>
-    <string name="enable_service_password_reason" msgid="6962544350351734238">"Protože zapnutí služby <xliff:g id="SERVICE">%1$s</xliff:g> má vliv na šifrování dat, je třeba, abyste potvrdili své heslo."</string>
     <string name="accessibility_service_warning" msgid="6779187188736432618">"Služba <xliff:g id="SERVICE">%1$s</xliff:g> požaduje plnou kontrolu nad zařízením. Služba může číst obrazovku a vykonávat akce namísto uživatelů, kteří potřebují usnadnění přístupu. Tato úroveň kontroly není u většiny aplikací vhodná."</string>
     <string name="accessibility_service_warning_description" msgid="6573203795976134751">"Plná kontrola je vhodná u aplikací, které vám pomáhají s usnadněním přístupu. U většiny aplikací však vhodná není."</string>
     <string name="accessibility_service_screen_control_title" msgid="324795030658109870">"Zobrazení a ovládání obrazovky"</string>
@@ -3183,14 +3158,6 @@
     <string name="remove_account_failed" msgid="3709502163548900644">"Administrátor tuto změnu zakázal"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"Nelze ručně synchronizovat"</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"Synchronizace této položky je aktuálně deaktivována. Chcete-li nastavení změnit, dočasně zapněte přenos dat na pozadí a automatickou synchronizaci."</string>
-    <string name="enter_password" msgid="6327051330258595331">"Chcete-li spustit Android, zadejte heslo"</string>
-    <string name="enter_pin" msgid="1029287617551232681">"Chcete-li spustit Android, zadejte PIN"</string>
-    <string name="enter_pattern" msgid="1747316785866742960">"Chcete-li spustit Android, nakreslete gesto"</string>
-    <string name="cryptkeeper_wrong_pattern" msgid="340747269176120242">"Nesprávné gesto"</string>
-    <string name="cryptkeeper_wrong_password" msgid="7295607881887114486">"Nesprávné heslo"</string>
-    <string name="cryptkeeper_wrong_pin" msgid="2347961593970714201">"Nesprávný kód PIN"</string>
-    <string name="checking_decryption" msgid="6111642972615688237">"Kontrola…"</string>
-    <string name="starting_android" msgid="6694154070215356186">"Spouštění systému Android…"</string>
     <string name="delete" msgid="8330605554706263775">"Smazat"</string>
     <string name="misc_files" msgid="6598066985800749585">"Různé soubory"</string>
     <string name="misc_files_selected_count" msgid="5597802791672749532">"vybráno: <xliff:g id="NUMBER">%1$d</xliff:g> z <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -3286,8 +3253,6 @@
     <string name="data_usage_metered_yes" msgid="4262598072030135223">"Měřená"</string>
     <string name="data_usage_metered_no" msgid="1685828958417926268">"Neměřená"</string>
     <string name="data_usage_disclaimer" msgid="3271450299386176770">"Účtování dat operátora se může lišit od údajů zařízení."</string>
-    <string name="cryptkeeper_emergency_call" msgid="8369322820475703306">"Tísňové volání"</string>
-    <string name="cryptkeeper_return_to_call" msgid="3857250752781151232">"Zpět k hovoru"</string>
     <string name="vpn_name" msgid="3806456074909253262">"Název"</string>
     <string name="vpn_type" msgid="5533202873260826663">"Typ"</string>
     <string name="vpn_server" msgid="2908816134941973935">"Adresa serveru"</string>
@@ -4914,8 +4879,6 @@
       <item quantity="one">1 aplikace může využívat neomezená data</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"Zobrazit více"</string>
-    <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"Opravdu chcete vymazat údaje o uživateli a aktivovat šifrování souboru?"</string>
-    <string name="button_confirm_convert_fbe" msgid="339648921918438106">"Vymazat a aktivovat"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"Resetovat limity četnosti služby ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"Limity četnosti služby ShortcutManager byly resetovány"</string>
     <string name="notification_suggestion_title" msgid="6309263655965785411">"Nastavte informace na obrazovce uzamčení"</string>
@@ -5466,6 +5429,7 @@
     <string name="sim_action_yes" msgid="8076556020131395515">"Ano"</string>
     <string name="sim_action_reboot" msgid="3508948833333441538">"Restartovat"</string>
     <string name="sim_action_no_thanks" msgid="435717748384544195">"Ne, díky"</string>
+    <string name="sim_action_cancel" msgid="2668099867029610910">"Zrušit"</string>
     <string name="sim_switch_button" msgid="1405772571706095387">"Přepnout"</string>
     <string name="dsds_activation_failure_title" msgid="4467364110584914794">"SIM kartu nelze aktivovat"</string>
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Vyjměte SIM kartu a znovu ji vložte. Pokud problém přetrvává, restartujte zařízení."</string>
@@ -5622,6 +5586,10 @@
     <string name="cached_apps_freezer" msgid="1057519579761550350">"Pozastavit spouštění aplikací z mezipaměti"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"Povolit překryvné vrstvy obrazovek v Nastavení"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Povolte aplikace, které se smí zobrazovat přes jiné aplikace a vytvářet vrstvy obrazovek Nastavení"</string>
+    <!-- no translation found for allow_mock_modem (3832264806530479214) -->
+    <skip />
+    <!-- no translation found for allow_mock_modem_summary (9097416612748005374) -->
+    <skip />
     <string name="media_controls_title" msgid="403271085636252597">"Média"</string>
     <string name="media_controls_resume_title" msgid="855076860336652370">"Připnout přehrávač médií"</string>
     <string name="media_controls_resume_description" msgid="3163482266454802097">"Přehrávač médií zůstane otevřený v Rychlém nastavení, aby bylo možné rychle obnovit přehrávání"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 9466c06..f86192d 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -142,10 +142,11 @@
     <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"Tillad, at enheden kommunikerer med Bluetooth-enheder i nærheden"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"Tillad, at telefonen kommunikerer med Bluetooth-enheder i nærheden"</string>
     <string name="bluetooth_disable_a2dp_hw_offload" msgid="5942913792817797541">"Deaktiver Bluetooth A2DP-hardwareaflastning"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="8610420176339657720">"Genstart enheden?"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8333029144800835996">"Genstart enheden for at skifte indstilling"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="3488695418187553566">"Genstart"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="4930826928585464191">"Annuller"</string>
+    <string name="bluetooth_disable_le_audio_hw_offload" msgid="3966022676505972908">"Deaktiver aflastning af hardware for Bluetooth LE AUDIO"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_title" msgid="6001142380445276918">"Vil du genstarte enheden?"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_message" msgid="1524373895333698779">"Genstart enheden for at skifte indstilling"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_confirm" msgid="5594859658551707592">"Genstart"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel" msgid="3663690305043973720">"Deaktiver"</string>
     <string name="connected_device_media_device_title" msgid="3783388247594566734">"Medieenheder"</string>
     <string name="connected_device_call_device_title" msgid="88732390601723608">"Opkaldsenheder"</string>
     <string name="connected_device_other_device_title" msgid="4652120430615729193">"Andre enheder"</string>
@@ -309,9 +310,9 @@
     <string name="security_settings_title" msgid="6710768415432791970">"Sikkerhed"</string>
     <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"Kryptering og loginoplysninger"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"Telefonen er krypteret"</string>
-    <string name="decryption_settings_summary" product="default" msgid="1742645256103613503">"Telefonen er ikke krypteret"</string>
+    <string name="not_encrypted_summary" product="default" msgid="2251945842585788254">"Telefonen er ikke krypteret"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"Enheden er krypteret"</string>
-    <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"Enheden er ikke krypteret"</string>
+    <string name="not_encrypted_summary" product="tablet" msgid="2374263654698719382">"Enheden er ikke krypteret"</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"Låseskærm"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"Hvad der skal vises"</string>
     <string name="security_settings_summary" msgid="1627059516127354233">"Angiv Min lokation, oplåsning af skærmen, låst SIM-kort og lager for loginoplysninger"</string>
@@ -487,9 +488,9 @@
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"Følg fingeraftryksikonet"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Bliv ved med at løfte fingeren for at tilføje forskellige dele af dit fingeraftryk"</string>
     <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"Hver gang fingeraftryksikonet flyttes, skal du holde fingeren på det. På den måde registrere en større del af dit fingeraftryk."</string>
-    <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"Placer din fingerspids på aflæseren"</string>
+    <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"Placer din fingerspids på sensoren"</string>
     <string name="security_settings_udfps_enroll_edge_title" msgid="6137605344819152477">"Til sidst skal du bruge ydersiderne af din finger"</string>
-    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"Placer siden af din finger på aflæseren, og hold den nede. Skift derefter til den anden side."</string>
+    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"Placer siden af din finger på sensoren, og hold den nede. Skift derefter til den anden side."</string>
     <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"På den måde registrere en større del af dit fingeraftryk"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Scanning af fingeraftryk: <xliff:g id="PERCENTAGE">%d</xliff:g> procent"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Fingeraftryk tilføjet"</string>
@@ -568,37 +569,10 @@
     <string name="fingerprint_last_delete_message" msgid="7860374760549404410">"Du vil ikke have mulighed for at bruge dit fingeraftryk til at låse din telefon op eller bekræfte din identitet i apps."</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="4104208067277655068">"Du vil ikke have mulighed for at bruge dit fingeraftryk til at låse din arbejdsprofil op, godkende køb eller logge ind i arbejdsapps."</string>
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"Ja, fjern"</string>
-    <string name="crypt_keeper_settings_title" msgid="4938812137822100044">"Kryptering"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"Krypter tablet"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"Kryptér telefon"</string>
-    <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"Krypteret"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"Du kan kryptere dine konti, indstillinger, downloadede apps og deres data, medier og andre filer. Når du har krypteret din tablet, skal du låse skærmen op for at dekryptere den, hver gang du tænder for den, forudsat at du har oprettet en skærmlås (dvs. et mønster eller en numerisk pinkode eller adgangskode). Den eneste anden måde at dekryptere på er ved at udføre en gendannelse af fabriksdata, hvilket sletter alle dine data.\n\nKrypteringen tager en time eller mere. Du skal starte med et opladet batteri og sørge for, at din tablet er tilsluttet strøm under hele processen. Hvis du afbryder den, mister du nogle af eller alle dine data."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"Du kan kryptere dine konti, indstillinger, downloadede apps og deres data, medier og andre filer. Når du har krypteret din telefon, er du nødt til at låse skærmen op for at dekryptere telefonen, hver gang du tænder for den, forudsat at du har oprettet en skærmlås (dvs. et mønster eller en numerisk pinkode eller adgangskode). Den eneste anden måde at dekryptere den på er at udføre en gendannelse af fabriksdata, hvilket sletter alle dine data.\n\nKrypteringen tager en time eller mere. Du skal starte med et opladet batteri og sørge for, at din telefon er tilsluttet strøm under hele processen. Hvis du afbryder den, mister du nogle af eller alle dine data."</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"Krypter tablet"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"Kryptér telefon"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"Lad dit batteri op, og prøv igen."</string>
-    <string name="crypt_keeper_unplugged_text" msgid="2709721134148651329">"Tilslut din oplader, og prøv igen."</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="1847280235529858357">"Ingen pinkode eller adgangskode til skærmlås"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="7210616262954236042">"Du skal angive en pinkode eller adgangskode for skærmlås, inden du kan starte krypteringen."</string>
-    <string name="crypt_keeper_confirm_title" msgid="8600000209722452230">"Vil du kryptere?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="3270587498436152259">"Denne handling kan ikke fortrydes, og den kan ikke afbrydes uden tab af data til følge. Krypteringen tager mindst en time, og i den tid genstartes tabletten flere gange."</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="3040428543349852419">"Denne handling kan ikke fortrydes, og den kan ikke afbrydes uden tab af data til følge. Krypteringen tager mindst en time, og i den tid genstartes telefonen flere gange."</string>
-    <string name="crypt_keeper_setup_title" msgid="3339725741305796680">"Kryptering"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="4417016995091289019">"Vent, mens din tablet krypteres. <xliff:g id="PERCENT">^1</xliff:g> % fuldført."</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="7902355422499500352">"Vent, mens din telefon krypteres. <xliff:g id="PERCENT">^1</xliff:g> % fuldført."</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="8348188415839917821">"Vent, mens din tablet krypteres. Resterende tid: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="8556105766597855198">"Vent, mens din telefon krypteres. Resterende tid: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="3832496715430327682">"Du låser din tablet ved at slukke og tænde den."</string>
-    <string name="crypt_keeper_force_power_cycle" product="default" msgid="5070346039522135361">"Du låser din telefon ved at slukke og tænde den."</string>
-    <string name="crypt_keeper_warn_wipe" msgid="8104921337301750394">"Advarsel! Enheden ryddes efter <xliff:g id="COUNT">^1</xliff:g> mislykkede oplåsningsforsøg mere."</string>
-    <string name="crypt_keeper_enter_password" msgid="1274917431075529732">"Angiv din adgangskode"</string>
-    <string name="crypt_keeper_failed_title" msgid="8173654570682244149">"Kryptering mislykkedes"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"Krypteringen blev afbrudt og kan ikke fuldføres. Som følge heraf er dataene på din tablet ikke længere tilgængelige. \n\nHvis du vil genoptage brugen af din  tablet, skal du udføre en gendannelse af fabriksdata. Når du konfigurerer din tablet efter nulstillingen, har du mulighed for at gendanne data, der blev sikkerhedskopieret på din Google-konto."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"Krypteringen blev afbrudt og kan ikke fuldføres. Som følge heraf er dataene på din telefon ikke længere tilgængelige. \n\nHvis du vil genoptage brugen af telefonen, skal du udføre en gendannelse af fabriksdata. Når du konfigurerer din telefon efter nulstillingen, har du mulighed for at gendanne data, der blev sikkerhedskopieret på din Google-konto."</string>
-    <string name="crypt_keeper_data_corrupt_title" msgid="5920153462176846037">"Dekrypteringen mislykkedes"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"Den indtastede adgangskode er korrekt, men desværre er dine data beskadigede. \n\nFør du kan bruge din tablet igen, skal du gendanne fabriksindstillingerne. Under den efterfølgende konfiguration af tabletten får du mulighed for at gendanne eventuelle data, der er sikkerhedskopieret på din Google-konto."</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"Den indtastede adgangskode er korrekt, men desværre er dine data beskadigede. \n\nFør du kan bruge din telefon igen, skal du gendanne fabriksindstillingerne. Under den efterfølgende konfiguration af telefonen får du mulighed for at gendanne eventuelle data, der er sikkerhedskopieret på din Google-konto."</string>
-    <string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"Skift indtastningsmetode"</string>
+    <string name="encryption_settings_title" msgid="2848716008695618360">"Kryptering"</string>
+    <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"Kryptér tablet"</string>
+    <string name="encrypt_title" product="default" msgid="7337365190988321100">"Kryptér telefon"</string>
+    <string name="encrypted_summary" msgid="545623487587251207">"Krypteret"</string>
     <string name="suggested_lock_settings_title" msgid="7836065447159730217">"Beskyt din telefon"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"Konfigurer skærmlåsen for at beskytte din tablet"</string>
     <string name="suggested_lock_settings_summary" product="device" msgid="8479766049078378225">"Konfigurer skærmlåsen for at beskytte din enhed"</string>
@@ -817,6 +791,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Du skal muligvis også indtaste denne pinkode på den anden enhed."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Du skal muligvis også indtaste denne adgangsnøgle på den anden enhed."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Sådan parrer du med:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Sørg for, at den viser denne adgangsnøgle:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Bekræft for at parre med det koordinerede sæt"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"Fra:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Par med denne enhed?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Sådan parres med:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Skriv på den:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, og tryk derefter på Retur eller Enter."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Giv adgang til dine kontakter og din opkaldshistorik"</string>
@@ -850,6 +825,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Det lykkedes ikke at oprette forbindelse. Prøv igen."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Enhedsoplysninger"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Enhedens Bluetooth-adresse: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Enhedens Bluetooth-adresse:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Vil du glemme denne enhed?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Fjern tilknytning"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Vil du fjerne tilknytningen til appen?"</string>
@@ -881,6 +857,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Husk indstillinger"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Maksimalt antal tilsluttede Bluetooth-lydenheder"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Vælg det maksimale antal Bluetooth-lydenheder, der kan tilsluttes"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"Fejlretningslog for NFC-stakke"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Øg loggingsniveauet for NFC-stakke"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Cast"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"spejl"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Aktivér trådløs skærm"</string>
@@ -1188,6 +1166,8 @@
     <string name="wifi_hotspot_maximize_compatibility_dual_ap_summary" msgid="3579549223159056533">"Hjælp andre enheder med at finde dette hotspot. Medfører højere batteriforbrug."</string>
     <string name="wifi_tether_starting" msgid="8879874184033857814">"Aktiverer hotspot..."</string>
     <string name="wifi_tether_stopping" msgid="4416492968019409188">"Deaktiverer hotspot..."</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_title" msgid="3089432578433978073">"Netdeling er ikke tilgængeligt"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_content" msgid="5920421547607921112">"Kontakt dit mobilselskab for at få flere oplysninger"</string>
     <string name="wifi_tether_enabled_subtext" msgid="5085002421099821056">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> er aktivt"</string>
     <string name="wifi_tether_failed_subtext" msgid="437190628041885500">"Fejl ved mobilt Wi-Fi-hotspot"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7072559431286459122">"Konfiguration af Wi-Fi-hotspot"</string>
@@ -1833,7 +1813,7 @@
     <string name="location_category_location_services" msgid="8163798686832434284">"Lokationstjenester"</string>
     <string name="location_title" msgid="5819154746934945021">"Min lokation"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Lokation for arbejdsprofil"</string>
-    <string name="location_app_level_permissions" msgid="907206607664629759">"Placeringstilladelser for apps"</string>
+    <string name="location_app_level_permissions" msgid="907206607664629759">"Adgangstilladelse til lokation for apps"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Lokation er slået fra"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
       <item quantity="one"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> ud af <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> app har adgang til din lokation</item>
@@ -2311,7 +2291,7 @@
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"Zoom ind på skærmen"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"Tryk tre gange for at zoome ind"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Tryk på en knap for at zoome"</string>
-    <string name="accessibility_screen_magnification_summary" msgid="2527664482392097865">"Zoom hurtigt ind på skærmen for at forstørre indhold.&lt;br/&gt;&lt;br/&gt; &lt;b&gt;Sådan zoomer du ind:&lt;/b&gt;&lt;br/&gt; {0,number,integer}. Brug genvejen til at starte forstørrelse&lt;br/&gt; {1,number,integer}. Tryk på skærmen&lt;br/&gt; {2,number,integer}. Træk med to fingre for at navigere  rundt på skærmen&lt;br/&gt; {3,number,integer}. Knib med to fingre for at zoome ind eller ud&lt;br/&gt; {4,number,integer}. Brug genvejen til at stoppe forstørrelse&lt;br/&gt;&lt;br/&gt;&lt;b&gt;Sådan zoomer du midlertidigt ind:&lt;/b&gt;&lt;br/&gt; {0,number,integer}. Brug genvejen til at starte forstørrelse&lt;br/&gt; {1,number,integer}. Hold fingeren nede et vilkårligt sted på skærmen&lt;br/&gt; {2,number,integer}. Træk fingeren for at navigere rundt på skærmen&lt;br/&gt; {3,number,integer}. Løft fingeren for at stoppe forstørrelse"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="2527664482392097865">"Zoom hurtigt ind på skærmen for at forstørre indhold.&lt;br/&gt;&lt;br/&gt; &lt;b&gt;Sådan zoomer du ind:&lt;/b&gt;&lt;br/&gt; {0,number,integer}. Brug genvejen til at starte forstørrelse&lt;br/&gt; {1,number,integer}. Tryk på skærmen&lt;br/&gt; {2,number,integer}. Træk med to fingre for at navigere  rundt på skærmen&lt;br/&gt; {3,number,integer}. Spred/knib med to fingre for at zoome ind eller ud&lt;br/&gt; {4,number,integer}. Brug genvejen til at stoppe forstørrelse&lt;br/&gt;&lt;br/&gt;&lt;b&gt;Sådan zoomer du midlertidigt ind:&lt;/b&gt;&lt;br/&gt; {0,number,integer}. Brug genvejen til at starte forstørrelse&lt;br/&gt; {1,number,integer}. Hold fingeren nede et vilkårligt sted på skærmen&lt;br/&gt; {2,number,integer}. Træk fingeren for at navigere rundt på skærmen&lt;br/&gt; {3,number,integer}. Løft fingeren for at stoppe forstørrelse"</string>
     <string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"Når forstørrelse er aktiveret, kan du zoome ind på skærmen.\n\n"<b>"Hvis du vil zoome"</b>", skal du åbne forstørrelse og derefter trykke et vilkårligt sted på skærmen.\n"<ul><li>"Træk med to eller flere fingre for at rulle"</li>\n<li>"Knib sammen med to eller flere fingre for at justere zoomniveauet"</li></ul>\n\n<b>"Hvis du vil zoome midlertidigt"</b>", skal du åbne forstørrelse og holde fingeren nede et vilkårligt sted på skærmen.\n"<ul><li>"Træk for at udforske forskellige dele af skærmen"</li>\n<li>"Løft fingeren for at zoome ud"</li></ul>\n\n"Du kan ikke zoome ind på tastaturet eller navigationslinjen."</string>
     <string name="accessibility_tutorial_pager" msgid="8461939455728454061">"Side <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> af <xliff:g id="NUM_PAGES">%2$d</xliff:g>"</string>
     <string name="accessibility_tutorial_dialog_title_button" msgid="4681164949716215131">"Brug knappen Hjælpefunktioner til at åbne"</string>
@@ -2534,11 +2514,6 @@
     <string name="enable_service_title" msgid="7231533866953706788">"Vil du give <xliff:g id="SERVICE">%1$s</xliff:g> fuld kontrol over din enhed?"</string>
     <string name="capabilities_list_title" msgid="1225853611983394386">"<xliff:g id="SERVICE">%1$s</xliff:g> har brug for at:"</string>
     <string name="touch_filtered_warning" msgid="4225815157460318241">"Indstillinger kan ikke bekræfte dit svar, fordi en app tilslører tilladelsesanmodningen."</string>
-    <string name="enable_service_encryption_warning" msgid="931082737770453755">"Hvis du aktiverer <xliff:g id="SERVICE">%1$s</xliff:g>, vil enheden ikke benytte skærmlåsen til at forbedre datakrypteringen."</string>
-    <string name="secure_lock_encryption_warning" msgid="669152607190123579">"Fordi du har aktiveret en tilgængelighedstjeneste, vil enheden ikke benytte skærmlåsen for at forbedre datakrypteringen."</string>
-    <string name="enable_service_pattern_reason" msgid="6832846117817938536">"Fordi det påvirker datakryptering at slå <xliff:g id="SERVICE">%1$s</xliff:g> til, skal du bekræfte dit mønster."</string>
-    <string name="enable_service_pin_reason" msgid="6040417014360237703">"Fordi det påvirker datakryptering at slå <xliff:g id="SERVICE">%1$s</xliff:g> til, skal du bekræfte din pinkode."</string>
-    <string name="enable_service_password_reason" msgid="6962544350351734238">"Fordi det påvirker datakryptering at slå <xliff:g id="SERVICE">%1$s</xliff:g> til, skal du bekræfte din adgangskode."</string>
     <string name="accessibility_service_warning" msgid="6779187188736432618">"<xliff:g id="SERVICE">%1$s</xliff:g> anmoder om fuld kontrol over denne enhed. Tjenesten kan læse skærmen og handle på vegne af brugere med særlige behov. Dette kontrolomfang er ikke passende for de fleste apps."</string>
     <string name="accessibility_service_warning_description" msgid="6573203795976134751">"Fuld kontrol er velegnet til apps, der hjælper dig med hjælpefunktioner, men ikke de fleste apps."</string>
     <string name="accessibility_service_screen_control_title" msgid="324795030658109870">"Se og styre skærm"</string>
@@ -3103,14 +3078,6 @@
     <string name="remove_account_failed" msgid="3709502163548900644">"Din administrator har ikke givet tilladelse til at foretage denne ændring"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"Der kan ikke synkroniseres manuelt"</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"Synkronisering af dette element er deaktiveret lige nu. Hvis du vil ændre indstillingen, skal du aktivere baggrundsdata og automatisk synkronisering midlertidigt."</string>
-    <string name="enter_password" msgid="6327051330258595331">"Start Android ved at indtaste din adgangskode"</string>
-    <string name="enter_pin" msgid="1029287617551232681">"Start Android ved at indtaste din pinkode"</string>
-    <string name="enter_pattern" msgid="1747316785866742960">"Start Android ved at tegne dit mønster"</string>
-    <string name="cryptkeeper_wrong_pattern" msgid="340747269176120242">"Forkert mønster"</string>
-    <string name="cryptkeeper_wrong_password" msgid="7295607881887114486">"Forkert adgangskode"</string>
-    <string name="cryptkeeper_wrong_pin" msgid="2347961593970714201">"Forkert pinkode"</string>
-    <string name="checking_decryption" msgid="6111642972615688237">"Kontrollerer…"</string>
-    <string name="starting_android" msgid="6694154070215356186">"Starter Android…"</string>
     <string name="delete" msgid="8330605554706263775">"Slet"</string>
     <string name="misc_files" msgid="6598066985800749585">"Diverse filer"</string>
     <string name="misc_files_selected_count" msgid="5597802791672749532">"<xliff:g id="NUMBER">%1$d</xliff:g> valgte ud af <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -3206,8 +3173,6 @@
     <string name="data_usage_metered_yes" msgid="4262598072030135223">"Forbrugsafregnet"</string>
     <string name="data_usage_metered_no" msgid="1685828958417926268">"Ubegrænset brug til en fast pris"</string>
     <string name="data_usage_disclaimer" msgid="3271450299386176770">"Mobilselskabets dataopgørelse kan variere afhængigt af din enhed."</string>
-    <string name="cryptkeeper_emergency_call" msgid="8369322820475703306">"Nødopkald"</string>
-    <string name="cryptkeeper_return_to_call" msgid="3857250752781151232">"Tilbage til opkald"</string>
     <string name="vpn_name" msgid="3806456074909253262">"Navn"</string>
     <string name="vpn_type" msgid="5533202873260826663">"Type"</string>
     <string name="vpn_server" msgid="2908816134941973935">"Serveradresse"</string>
@@ -4764,8 +4729,6 @@
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> apps kan anvende ubegrænset data</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"Se mere"</string>
-    <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"Er du sikker på, at du vil rydde brugerdata og konvertere til filkryptering?"</string>
-    <string name="button_confirm_convert_fbe" msgid="339648921918438106">"Ryd og konvertér"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"Nulstil antalsbegrænsning i ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"Antalsbegrænsning i ShortcutManager er nulstillet"</string>
     <string name="notification_suggestion_title" msgid="6309263655965785411">"Bestem selv, hvilke oplysninger der vises på din låseskærm"</string>
@@ -5292,6 +5255,7 @@
     <string name="sim_action_yes" msgid="8076556020131395515">"Ja"</string>
     <string name="sim_action_reboot" msgid="3508948833333441538">"Genstart"</string>
     <string name="sim_action_no_thanks" msgid="435717748384544195">"Nej tak"</string>
+    <string name="sim_action_cancel" msgid="2668099867029610910">"Annuller"</string>
     <string name="sim_switch_button" msgid="1405772571706095387">"Skift"</string>
     <string name="dsds_activation_failure_title" msgid="4467364110584914794">"SIM-kortet kunne ikke aktiveres"</string>
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Tag SIM-kortet ud, og sæt det i igen. Genstart enheden, hvis problemet fortsætter."</string>
@@ -5444,6 +5408,10 @@
     <string name="cached_apps_freezer" msgid="1057519579761550350">"Suspender udførelse for cachelagrede apps"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"Tillad overlejring af skærme fra Indstillinger"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Giv apps, som kan vises over andre apps, tilladelse til at overlejre skærme fra appen Indstillinger"</string>
+    <!-- no translation found for allow_mock_modem (3832264806530479214) -->
+    <skip />
+    <!-- no translation found for allow_mock_modem_summary (9097416612748005374) -->
+    <skip />
     <string name="media_controls_title" msgid="403271085636252597">"Medier"</string>
     <string name="media_controls_resume_title" msgid="855076860336652370">"Fastgør medieafspiller"</string>
     <string name="media_controls_resume_description" msgid="3163482266454802097">"Medieafspilleren forbliver åben i Kvikmenu, så du hurtigt kan genoptage afspilningen"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 8a4be36..a7c127d 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -142,10 +142,11 @@
     <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"Kommunikation zwischen deinem Gerät und Bluetooth-Geräten in der Nähe zulassen"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"Kommunikation zwischen deinem Smartphone und Bluetooth-Geräten in der Nähe zulassen"</string>
     <string name="bluetooth_disable_a2dp_hw_offload" msgid="5942913792817797541">"Bluetooth-A2DP-Hardware-Offload deaktivieren"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="8610420176339657720">"Jetzt neu starten?"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8333029144800835996">"Die Änderung erfordert einen Neustart des Geräts."</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="3488695418187553566">"Neu starten"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="4930826928585464191">"Abbrechen"</string>
+    <string name="bluetooth_disable_le_audio_hw_offload" msgid="3966022676505972908">"Bluetooth-LE-AUDIO-Hardware-Offload deaktivieren"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_title" msgid="6001142380445276918">"Gerät neu starten?"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_message" msgid="1524373895333698779">"Die Änderung erfordert einen Neustart des Geräts."</string>
+    <string name="bluetooth_disable_hw_offload_dialog_confirm" msgid="5594859658551707592">"Neu starten"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel" msgid="3663690305043973720">"Abbrechen"</string>
     <string name="connected_device_media_device_title" msgid="3783388247594566734">"Mediengeräte"</string>
     <string name="connected_device_call_device_title" msgid="88732390601723608">"Anrufgeräte"</string>
     <string name="connected_device_other_device_title" msgid="4652120430615729193">"Andere Geräte"</string>
@@ -309,9 +310,9 @@
     <string name="security_settings_title" msgid="6710768415432791970">"Sicherheit"</string>
     <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"Verschlüsselung und Anmeldedaten"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"Smartphone verschlüsselt"</string>
-    <string name="decryption_settings_summary" product="default" msgid="1742645256103613503">"Smartphone nicht verschlüsselt"</string>
+    <string name="not_encrypted_summary" product="default" msgid="2251945842585788254">"Smartphone nicht verschlüsselt"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"Gerät verschlüsselt"</string>
-    <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"Gerät nicht verschlüsselt"</string>
+    <string name="not_encrypted_summary" product="tablet" msgid="2374263654698719382">"Gerät nicht verschlüsselt"</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"Sperrbildschirm"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"Anzeige"</string>
     <string name="security_settings_summary" msgid="1627059516127354233">"Meinen Standort, Display-Entsperrung, SIM-Kartensperre und Sperre für Anmeldedatenspeicher festlegen"</string>
@@ -570,37 +571,10 @@
     <string name="fingerprint_last_delete_message" msgid="7860374760549404410">"Du kannst deinen Fingerabdruck dann nicht mehr verwenden, um dein Smartphone zu entsperren oder deine Identität in Apps zu bestätigen."</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="4104208067277655068">"Du kannst deinen Fingerabdruck dann nicht mehr verwenden, um dein Arbeitsprofil zu entsperren, Käufe zu autorisieren oder dich in geschäftlichen Apps anzumelden."</string>
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"Ja, entfernen"</string>
-    <string name="crypt_keeper_settings_title" msgid="4938812137822100044">"Verschlüsselung"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"Tablet verschlüsseln"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"Smartphone verschlüsseln"</string>
-    <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"Verschlüsselt"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"Du kannst deine Konten, Einstellungen, heruntergeladenen Apps und die zugehörigen Daten, Medienelemente und andere Dateien verschlüsseln. Nachdem du dein Tablet verschlüsselt hast, musst du, sofern du eine Displaysperre eingerichtet hast (also ein Muster, eine numerische PIN oder ein Passwort), bei jedem Einschalten des Tablets das Display entsperren, um das Tablet zu entschlüsseln. Der einzige andere Weg zur Entschlüsselung ist das Zurücksetzen auf die Werkseinstellungen. Hierdurch werden alle deine Daten gelöscht.\n\nDie Verschlüsselung dauert mindestens eine Stunde. Bei Beginn muss der Akku aufgeladen sein und das Tablet muss sich während des gesamten Vorgangs im Netzbetrieb befinden. Wenn du den Vorgang unterbrichst, gehen einige oder alle deine Daten verloren."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"Du kannst deine Konten, Einstellungen, heruntergeladenen Apps und die zugehörigen Daten, Medienelemente und andere Dateien verschlüsseln. Nachdem du dein Smartphone verschlüsselt hast, musst du, sofern du eine Displaysperre eingerichtet hast (also ein Muster, eine numerische PIN oder ein Passwort), bei jedem Einschalten des Smartphones das Display entsperren, um das Smartphone zu entschlüsseln. Der einzige andere Weg zur Entschlüsselung ist das Zurücksetzen auf die Werkseinstellungen. Hierdurch werden alle deine Daten gelöscht.\n\nDie Verschlüsselung dauert mindestens eine Stunde. Bei Beginn muss der Akku aufgeladen sein und das Smartphone muss sich während des gesamten Vorgangs im Netzbetrieb befinden. Wenn du den Vorgang unterbrichst, gehen einige oder alle deine Daten verloren."</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"Tablet verschlüsseln"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"Smartphone verschlüsseln"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"Lade den Akku auf und versuche es noch einmal."</string>
-    <string name="crypt_keeper_unplugged_text" msgid="2709721134148651329">"Schließe dein Ladegerät an und versuche es noch einmal."</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="1847280235529858357">"Keine PIN oder kein Passwort für Displaysperre"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="7210616262954236042">"Du musst eine PIN oder ein Passwort für die Displaysperre festlegen, bevor du die Verschlüsselung starten kannst."</string>
-    <string name="crypt_keeper_confirm_title" msgid="8600000209722452230">"Verschlüsseln?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="3270587498436152259">"Dieser Vorgang ist nicht umkehrbar und jede Unterbrechung ist mit einem Datenverlust verbunden. Die Verschlüsselung dauert mindestens eine Stunde. In dieser Zeit wird das Tablet mehrfach neu gestartet."</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="3040428543349852419">"Dieser Vorgang ist nicht umkehrbar und jede Unterbrechung ist mit einem Datenverlust verbunden. Die Verschlüsselung dauert mindestens eine Stunde. In dieser Zeit wird das Telefon mehrfach neu gestartet."</string>
-    <string name="crypt_keeper_setup_title" msgid="3339725741305796680">"Verschlüsselung"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="4417016995091289019">"Bitte warte, während dein Tablet verschlüsselt wird. Zu <xliff:g id="PERCENT">^1</xliff:g> % abgeschlossen."</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="7902355422499500352">"Bitte warte, während dein Telefon verschlüsselt wird. Zu <xliff:g id="PERCENT">^1</xliff:g> % abgeschlossen."</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="8348188415839917821">"Dein Tablet wird verschlüsselt. Bitte warte noch <xliff:g id="DURATION">^1</xliff:g>."</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="8556105766597855198">"Dein Telefon wird verschlüsselt. Bitte warte noch <xliff:g id="DURATION">^1</xliff:g>."</string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="3832496715430327682">"Schalte dein Tablet aus und wieder ein, um es zu entsperren."</string>
-    <string name="crypt_keeper_force_power_cycle" product="default" msgid="5070346039522135361">"Schalte dein Telefon aus und wieder ein, um es zu entsperren."</string>
-    <string name="crypt_keeper_warn_wipe" msgid="8104921337301750394">"Achtung: Sollten die nächsten <xliff:g id="COUNT">^1</xliff:g> Versuche, das Gerät zu entsperren, fehlschlagen, werden die Gerätedaten gelöscht!"</string>
-    <string name="crypt_keeper_enter_password" msgid="1274917431075529732">"Passwort eingeben"</string>
-    <string name="crypt_keeper_failed_title" msgid="8173654570682244149">"Verschlüsselung fehlgeschlagen"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"Die Verschlüsselung wurde unterbrochen und kann nicht abgeschlossen werden. Daher ist der Zugriff auf die Daten auf deinem Tablet nicht mehr möglich. \n\nDamit du dein Tablet wieder verwenden kannst, musst du es auf die Werkseinstellungen zurücksetzen. Wenn du dein Tablet nach dem Zurücksetzen wieder einrichtest, kannst du gegebenenfalls Daten, die gesichert wurden, in deinem Google-Konto wiederherstellen."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"Die Verschlüsselung wurde unterbrochen und kann nicht abgeschlossen werden. Daher ist der Zugriff auf die Daten auf deinem Telefon nicht mehr möglich. \n\nDamit du dein Telefon wieder verwenden kannst, musst du es auf die Werkseinstellungen zurücksetzen. Wenn du dein Telefon nach dem Zurücksetzen wieder einrichtest, kannst du gegebenenfalls Daten, die gesichert wurden, in deinem Google-Konto wiederherstellen."</string>
-    <string name="crypt_keeper_data_corrupt_title" msgid="5920153462176846037">"Fehler bei der Verschlüsselung"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"Das von dir eingegebene Passwort ist korrekt, aber deine Daten sind beschädigt. \n\nDamit du dein Tablet weiterhin verwenden kannst, musst du es auf die Werkseinstellungen zurücksetzen. Nach dem Zurücksetzen auf die Werkseinstellungen kannst du beim Einrichten deines Tablets die Daten wiederherstellen, die du in deinem Google-Konto gesichert hattest."</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"Das von dir eingegebene Passwort ist korrekt, aber deine Daten sind beschädigt. \n\nDamit du dein Smartphone weiterhin verwenden kannst, musst du es auf die Werkseinstellungen zurücksetzen. Nach dem Zurücksetzen auf die Werkseinstellungen kannst du beim Einrichten deines Smartphones die Daten wiederherstellen, die du in deinem Google-Konto gesichert hattest."</string>
-    <string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"Eingabemethode wechseln"</string>
+    <string name="encryption_settings_title" msgid="2848716008695618360">"Verschlüsselung"</string>
+    <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"Tablet verschlüsseln"</string>
+    <string name="encrypt_title" product="default" msgid="7337365190988321100">"Smartphone verschlüsseln"</string>
+    <string name="encrypted_summary" msgid="545623487587251207">"Verschlüsselt"</string>
     <string name="suggested_lock_settings_title" msgid="7836065447159730217">"Smartphone schützen"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"Displaysperre einrichten, um das Tablet zu schützen"</string>
     <string name="suggested_lock_settings_summary" product="device" msgid="8479766049078378225">"Displaysperre einrichten, um das Gerät zu schützen"</string>
@@ -820,6 +794,7 @@
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Eventuell musst du diesen Zugangscode auch auf dem anderen Gerät eingeben."</string>
     <!-- syntax error in translation for bluetooth_confirm_passkey_msg (327192310468680072) org.xmlpull.v1.XmlPullParserException: name expected (position:START_TAG <null>@1:239 in     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Zur Kopplung mit:&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Vergewissere dich, dass folgender Zugangscode angezeigt wird:<&lt;br&gt;&lt;b&gt;P<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;."</string>
 )  -->
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Bestätigen, um die Geräte in koordinierter Art und Weise zu koppeln"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"Von:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt; Mit diesem Gerät koppeln?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Gib zur Kopplung mit <xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> <xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g> ein und drücke anschließend die Eingabetaste."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Zugriff auf meine Kontakte und meine Anrufliste zulassen"</string>
@@ -853,6 +828,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Verbindung konnte nicht hergestellt werden. Versuch es noch einmal."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Gerätedetails"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Bluetooth-Adresse des Geräts: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Bluetooth-Adresse des Geräts: \n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Gerät entkoppeln?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Verknüpfung entfernen"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"App-Verknüpfung aufheben?"</string>
@@ -884,6 +860,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Einstellungen speichern"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Maximale Zahl verbundener Bluetooth-Audiogeräte"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Maximale Zahl verbundener Bluetooth-Audiogeräte auswählen"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"NFC-Stack-Debuggingprotokoll"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"NFC-Stack-Protokollierungsebene erhöhen"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Streamen"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"spiegeln"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Kabellose Übertragung aktivieren"</string>
@@ -1010,7 +988,7 @@
     <string name="passpoint_label" msgid="6513669696739302866">"Gespeichert über"</string>
     <string name="passpoint_content" msgid="5219226173518418335">"Anmeldedaten für <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="wifi_eap_method" msgid="3776009521349381742">"EAP-Methode"</string>
-    <string name="please_select_phase2" msgid="577633852089847142">"Phase 2-Authentifizierung"</string>
+    <string name="please_select_phase2" msgid="577633852089847142">"Phase-2-Authentifizierung"</string>
     <string name="wifi_eap_ca_cert" msgid="8033404008276298886">"CA-Zertifikat"</string>
     <string name="wifi_eap_ocsp" msgid="8713933962516871238">"Online-Zertifikatstatus"</string>
     <string name="wifi_eap_domain" msgid="8304301470752333203">"Domain"</string>
@@ -1191,6 +1169,8 @@
     <string name="wifi_hotspot_maximize_compatibility_dual_ap_summary" msgid="3579549223159056533">"Hilft anderen Geräten dabei, diesen Hotspot zu finden. Erhöht den Akkuverbrauch."</string>
     <string name="wifi_tether_starting" msgid="8879874184033857814">"Hotspot wird aktiviert…"</string>
     <string name="wifi_tether_stopping" msgid="4416492968019409188">"Hotspot wird deaktiviert…"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_title" msgid="3089432578433978073">"Tethering nicht verfügbar"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_content" msgid="5920421547607921112">"Weitere Informationen erhältst du bei deinem Mobilfunkanbieter"</string>
     <string name="wifi_tether_enabled_subtext" msgid="5085002421099821056">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> ist aktiviert"</string>
     <string name="wifi_tether_failed_subtext" msgid="437190628041885500">"Fehler beim mobilen WLAN-Hotspot"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7072559431286459122">"WLAN-Hotspot einrichten"</string>
@@ -2314,8 +2294,8 @@
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"Auf dem Bildschirm heranzoomen"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"Zum Zoomen dreimal tippen"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Zum Zoomen auf eine Schaltfläche tippen"</string>
-    <string name="accessibility_screen_magnification_summary" msgid="2527664482392097865">"Du kannst auf dem Display schnell heranzoomen, um Inhalte zu vergrößern.&lt;br/&gt;&lt;br/&gt; &lt;b&gt;So zoomst du heran:&lt;/b&gt;&lt;br/&gt; {0,number,integer}. Starte die Vergrößerung über die Verknüpfung&lt;br/&gt; {1,number,integer}. Tippe auf das Display&lt;br/&gt; {2,number,integer}. Ziehe mit zwei Fingern, um den angezeigten Bildschirmausschnitt zu verschieben&lt;br/&gt; {3,number,integer}. Ziehe zwei Finger auseinander oder zusammen, um den Zoom anzupassen&lt;br/&gt; {4,number,integer}. Beende die Vergrößerung über die Verknüpfung&lt;br/&gt;&lt;br/&gt; &lt;b&gt;So zoomst du vorübergehend heran:&lt;/b&gt;&lt;br/&gt; {0,number,integer}. Starte die Vergrößerung über die Verknüpfung&lt;br/&gt; {1,number,integer}. Halte eine beliebige Stelle auf dem Display gedrückt&lt;br/&gt; {2,number,integer}. Ziehe mit dem Finger, um den angezeigten Bildschirmausschnitt zu ändern&lt;br/&gt; {3,number,integer}. Hebe den Finger, um die Vergrößerung zu beenden"</string>
-    <string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"Wenn die Vergrößerung aktiviert ist, kannst du Elemente auf dem Bildschirm heranzoomen.\n\n"<b>"Wenn du zoomen möchtest"</b>", starte die Vergrößerung und tippe dann auf eine beliebige Stelle auf dem Bildschirm.\n"<ul><li>"Zum Scrollen ziehe mit zwei oder mehr Fingern"</li>\n<li>"Zum Anpassen des Zooms ziehe zwei oder mehr Finger zusammen bzw. auseinander"</li></ul>\n\n<b>"Wenn du vorübergehend heranzoomen möchtest"</b>", starte die Vergrößerung und tippe dann auf eine beliebige Stelle auf dem Bildschirm und halte sie gedrückt.\n"<ul><li>"Wenn du dich im Bildschirm bewegen möchtest, ziehe den Bildschirm"</li>\n<li>"Zum Herauszoomen hebe den Finger"</li></ul>\n\n"In die Tastatur oder Navigationsleiste kann nicht hineingezoomt werden."</string>
+    <string name="accessibility_screen_magnification_summary" msgid="2527664482392097865">"Du kannst auf dem Display schnell heranzoomen, um Inhalte zu vergrößern.&lt;br/&gt;&lt;br/&gt; &lt;b&gt;So zoomst du heran:&lt;/b&gt;&lt;br/&gt; {0,number,integer}. Starte die Vergrößerung über die Verknüpfung&lt;br/&gt; {1,number,integer}. Tippe auf das Display&lt;br/&gt; {2,number,integer}. Ziehe mit zwei Fingern, um den angezeigten Bildschirmausschnitt zu verschieben&lt;br/&gt; {3,number,integer}. Ziehe zwei Finger auseinander oder zusammen, um den Zoom anzupassen&lt;br/&gt; {4,number,integer}. Beende die Vergrößerung über die Verknüpfung&lt;br/&gt;&lt;br/&gt; &lt;b&gt;So zoomst du vorübergehend heran:&lt;/b&gt;&lt;br/&gt; {0,number,integer}. Starte die Vergrößerung über die Verknüpfung&lt;br/&gt; {1,number,integer}. Halte eine beliebige Stelle auf dem Display gedrückt&lt;br/&gt; {2,number,integer}. Ziehe mit dem Finger, um den angezeigten Bildschirmausschnitt zu verschieben&lt;br/&gt; {3,number,integer}. Hebe den Finger, um die Vergrößerung zu beenden"</string>
+    <string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"Wenn die Vergrößerung aktiviert ist, kannst du Elemente auf dem Bildschirm heranzoomen.\n\n"<b>"Wenn du zoomen möchtest"</b>", starte die Vergrößerung und tippe dann auf eine beliebige Stelle auf dem Bildschirm.\n"<ul><li>"Zum Scrollen ziehe mit zwei oder mehr Fingern"</li>\n<li>"Zum Anpassen des Zooms ziehe zwei oder mehr Finger zusammen bzw. auseinander"</li></ul>\n\n<b>"Wenn du vorübergehend heranzoomen möchtest"</b>", starte die Vergrößerung und tippe dann auf eine beliebige Stelle auf dem Bildschirm und halte sie gedrückt.\n"<ul><li>"Wenn du den angezeigten Bildschirmausschnitt verschieben möchtest, ziehe den Bildschirm"</li>\n<li>"Zum Herauszoomen hebe den Finger"</li></ul>\n\n"In die Tastatur oder Navigationsleiste kann nicht hineingezoomt werden."</string>
     <string name="accessibility_tutorial_pager" msgid="8461939455728454061">"Seite <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> von <xliff:g id="NUM_PAGES">%2$d</xliff:g>"</string>
     <string name="accessibility_tutorial_dialog_title_button" msgid="4681164949716215131">"Zum Öffnen Schaltfläche „Bedienungshilfen“ nutzen"</string>
     <string name="accessibility_tutorial_dialog_title_volume" msgid="494810949830845234">"Zum Öffnen die Lautstärketasten gedrückt halten"</string>
@@ -2537,11 +2517,6 @@
     <string name="enable_service_title" msgid="7231533866953706788">"<xliff:g id="SERVICE">%1$s</xliff:g> die vollständige Kontrolle über dein Gerät geben?"</string>
     <string name="capabilities_list_title" msgid="1225853611983394386">"<xliff:g id="SERVICE">%1$s</xliff:g> muss:"</string>
     <string name="touch_filtered_warning" msgid="4225815157460318241">"Deine Eingabe wird von \"Einstellungen\" nicht erkannt, weil die Berechtigungsanfrage von einer App verdeckt wird."</string>
-    <string name="enable_service_encryption_warning" msgid="931082737770453755">"Wenn du <xliff:g id="SERVICE">%1$s</xliff:g> aktivierst, verwendet dein Gerät nicht die Displaysperre, um die Datenverschlüsselung zu verbessern."</string>
-    <string name="secure_lock_encryption_warning" msgid="669152607190123579">"Da du eine Bedienungshilfe aktiviert hast, verwendet dein Gerät nicht die Displaysperre, um die Datenverschlüsselung zu verbessern."</string>
-    <string name="enable_service_pattern_reason" msgid="6832846117817938536">"Da die Aktivierung von <xliff:g id="SERVICE">%1$s</xliff:g> Auswirkungen auf die Datenverschlüsselung hat, musst du dein Muster bestätigen."</string>
-    <string name="enable_service_pin_reason" msgid="6040417014360237703">"Da die Aktivierung von <xliff:g id="SERVICE">%1$s</xliff:g> Auswirkungen auf die Datenverschlüsselung hat, musst du deine PIN bestätigen."</string>
-    <string name="enable_service_password_reason" msgid="6962544350351734238">"Da die Aktivierung von <xliff:g id="SERVICE">%1$s</xliff:g> Auswirkungen auf die Datenverschlüsselung hat, musst du dein Passwort bestätigen."</string>
     <string name="accessibility_service_warning" msgid="6779187188736432618">"<xliff:g id="SERVICE">%1$s</xliff:g> fordert eine volle Kontrolle für dieses Gerät an. Der Dienst kann den Bildschirm lesen und im Namen von Nutzern mit Bedarf an Bedienungshilfen handeln. Dieses Maß an Kontrolle ist für die meisten Apps ungeeignet."</string>
     <string name="accessibility_service_warning_description" msgid="6573203795976134751">"Die vollständige Kontrolle sollte nur für Apps aktiviert werden, die dir Zugang zu App-Funktionen erleichtern. Das ist in der Regel nur ein kleiner Teil der Apps."</string>
     <string name="accessibility_service_screen_control_title" msgid="324795030658109870">"Bildschirm aufrufen und steuern"</string>
@@ -3082,7 +3057,7 @@
     <string name="sync_disabled" msgid="1636223106968593391">"Synchronisierung: AUS"</string>
     <string name="sync_error" msgid="846923369794727644">"Synchronisierungsfehler"</string>
     <string name="last_synced" msgid="1527008461298110443">"Zuletzt synchronisiert: <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
-    <string name="sync_in_progress" msgid="6200093151211458977">"Synchronisieren…"</string>
+    <string name="sync_in_progress" msgid="6200093151211458977">"Wird synchronisiert…"</string>
     <string name="settings_backup" msgid="5357973563989458049">"Einstellungen sichern"</string>
     <string name="settings_backup_summary" msgid="6803046376335724034">"Meine Einstellungen sichern"</string>
     <string name="sync_menu_sync_now" msgid="3948443642329221882">"Jetzt synchronisieren"</string>
@@ -3106,14 +3081,6 @@
     <string name="remove_account_failed" msgid="3709502163548900644">"Dein Administrator lässt diese Änderung nicht zu"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"Manuelle Synchronisierung nicht möglich"</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"Die Synchronisierung hierfür ist deaktiviert. Zur Änderung dieser Einstellung aktiviere vorübergehend die Hintergrunddaten und die automatische Synchronisierung."</string>
-    <string name="enter_password" msgid="6327051330258595331">"Gib dein Passwort ein, um Android zu starten."</string>
-    <string name="enter_pin" msgid="1029287617551232681">"Gib deine PIN ein, um Android zu starten."</string>
-    <string name="enter_pattern" msgid="1747316785866742960">"Zeichne dein Muster, um Android zu starten."</string>
-    <string name="cryptkeeper_wrong_pattern" msgid="340747269176120242">"Falsches Muster"</string>
-    <string name="cryptkeeper_wrong_password" msgid="7295607881887114486">"Falsches Passwort"</string>
-    <string name="cryptkeeper_wrong_pin" msgid="2347961593970714201">"Falsche PIN"</string>
-    <string name="checking_decryption" msgid="6111642972615688237">"Wird überprüft…"</string>
-    <string name="starting_android" msgid="6694154070215356186">"Android wird gestartet..."</string>
     <string name="delete" msgid="8330605554706263775">"Löschen"</string>
     <string name="misc_files" msgid="6598066985800749585">"Sonstige Dateien"</string>
     <string name="misc_files_selected_count" msgid="5597802791672749532">"<xliff:g id="NUMBER">%1$d</xliff:g> von <xliff:g id="TOTAL">%2$d</xliff:g> ausgewählt"</string>
@@ -3209,8 +3176,6 @@
     <string name="data_usage_metered_yes" msgid="4262598072030135223">"Kostenpflichtig"</string>
     <string name="data_usage_metered_no" msgid="1685828958417926268">"Nicht kostenpflichtig"</string>
     <string name="data_usage_disclaimer" msgid="3271450299386176770">"Dein Mobilfunkanbieter berechnet die Datennutzung eventuell anders als das Gerät."</string>
-    <string name="cryptkeeper_emergency_call" msgid="8369322820475703306">"Notruf"</string>
-    <string name="cryptkeeper_return_to_call" msgid="3857250752781151232">"Zurück zum Anruf"</string>
     <string name="vpn_name" msgid="3806456074909253262">"Name"</string>
     <string name="vpn_type" msgid="5533202873260826663">"Typ"</string>
     <string name="vpn_server" msgid="2908816134941973935">"Serveradresse"</string>
@@ -3341,7 +3306,7 @@
     <string name="user_remove_user_menu" msgid="2183714948094429367">"<xliff:g id="USER_NAME">%1$s</xliff:g> vom Gerät löschen"</string>
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"Einstellungen für den Sperrbildschirm"</string>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"Nutzer vom Sperrbildschirm aus hinzufügen"</string>
-    <string name="user_confirm_remove_self_title" msgid="926265330805361832">"Sich selbst löschen?"</string>
+    <string name="user_confirm_remove_self_title" msgid="926265330805361832">"Dich selbst löschen?"</string>
     <string name="user_confirm_remove_title" msgid="3626559103278006002">"Diesen Nutzer löschen?"</string>
     <string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"Dieses Profil entfernen?"</string>
     <string name="work_profile_confirm_remove_title" msgid="6229618888167176036">"Arbeitsprofil entfernen?"</string>
@@ -3403,7 +3368,7 @@
     <string name="extreme_threats_summary" msgid="3560742429496902008">"Warnungen zu extremen Gefahren für Leben und Eigentum erhalten"</string>
     <string name="severe_threats_title" msgid="8962959394373974324">"Erhebliche Gefahren"</string>
     <string name="severe_threats_summary" msgid="4982256198071601484">"Warnungen zu erheblichen Gefahren für Leben und Eigentum erhalten"</string>
-    <string name="amber_alerts_title" msgid="5238275758191804575">"AMBER-Benachrichtigungen"</string>
+    <string name="amber_alerts_title" msgid="5238275758191804575">"AMBER Alerts"</string>
     <string name="amber_alerts_summary" msgid="5755221775246075883">"Bulletins über Kindesentführungen erhalten"</string>
     <string name="repeat_title" msgid="8676570486899483606">"Wiederholen"</string>
     <string name="call_manager_enable_title" msgid="1214301265395158720">"Anrufverwaltung aktivieren"</string>
@@ -3640,7 +3605,7 @@
     <string name="vibrate_when_ringing_option_always_vibrate" msgid="968652667232075466">"Immer vibrieren"</string>
     <string name="vibrate_when_ringing_option_ramping_ringer" msgid="2798848945803840348">"Erst vibrieren, dann immer lauter klingeln"</string>
     <string name="other_sound_settings" msgid="5468360269346162072">"Andere Töne"</string>
-    <string name="spatial_audio_title" msgid="6591051622375191603">"Raumklang"</string>
+    <string name="spatial_audio_title" msgid="6591051622375191603">"Spatial Audio"</string>
     <string name="dial_pad_tones_title" msgid="3536945335367914892">"Wähltastentöne"</string>
     <string name="screen_locking_sounds_title" msgid="5695030983872787321">"Ton bei Displaysperre"</string>
     <string name="charging_sounds_title" msgid="5261683808537783668">"Töne und Vibration beim Aufladen"</string>
@@ -4033,7 +3998,7 @@
     <string name="notification_content_block_title" msgid="6689085826061361351">"Benachrichtigungen anzeigen"</string>
     <string name="notification_content_block_summary" msgid="329171999992248925">"Benachrichtigungen nie in der Leiste oder auf Peripheriegeräten anzeigen"</string>
     <string name="notification_badge_title" msgid="6854537463548411313">"App-Benach­rich­ti­gungs­punkt erlauben"</string>
-    <string name="notification_channel_badge_title" msgid="6505542437385640049">"App-Benachrichtigungs­punkt anzeigen"</string>
+    <string name="notification_channel_badge_title" msgid="6505542437385640049">"App-Benach­richtigungs­punkt anzeigen"</string>
     <string name="app_notification_override_dnd_title" msgid="3769539356442226691">"„Bitte nicht stören“ ignorieren"</string>
     <string name="app_notification_override_dnd_summary" msgid="4894641191397562920">"Diese Benachrichtigungen dürfen auch dann gemeldet werden, wenn „Bitte nicht stören“ aktiviert ist"</string>
     <string name="app_notification_visibility_override_title" msgid="7778628150022065920">"Sperrbildschirm"</string>
@@ -4767,8 +4732,6 @@
       <item quantity="one">1 App darf uneingeschränkt Daten nutzen</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"Mehr anzeigen"</string>
-    <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"Nutzerdaten wirklich löschen und zur Dateiverschlüsselung wechseln?"</string>
-    <string name="button_confirm_convert_fbe" msgid="339648921918438106">"Löschen und wechseln"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"Limits für ShortcutManager-Aufrufe zurücksetzen"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"Limits für ShortcutManager-Aufrufe zurückgesetzt"</string>
     <string name="notification_suggestion_title" msgid="6309263655965785411">"Infos auf Sperrbildschirm festlegen"</string>
@@ -5295,6 +5258,7 @@
     <string name="sim_action_yes" msgid="8076556020131395515">"Ja"</string>
     <string name="sim_action_reboot" msgid="3508948833333441538">"Neu starten"</string>
     <string name="sim_action_no_thanks" msgid="435717748384544195">"Nein danke"</string>
+    <string name="sim_action_cancel" msgid="2668099867029610910">"Abbrechen"</string>
     <string name="sim_switch_button" msgid="1405772571706095387">"Wechseln"</string>
     <string name="dsds_activation_failure_title" msgid="4467364110584914794">"SIM kann nicht aktiviert werden"</string>
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Nimm die SIM heraus und lege sie dann wieder ein. Sollte das Problem weiterhin bestehen, starte das Gerät neu."</string>
@@ -5429,11 +5393,11 @@
     <string name="power_menu_long_press_for_assist_sensitivity_low_label" msgid="3430099983480845635">"Kurz"</string>
     <string name="power_menu_long_press_for_assist_sensitivity_high_label" msgid="2059686170350829156">"Lang"</string>
     <string name="lockscreen_privacy_wallet_setting_toggle" msgid="4188327143734192000">"Geldbörse anzeigen"</string>
-    <string name="lockscreen_privacy_wallet_summary" msgid="5388868513484652431">"Zugriff auf Geldbörse aus Sperrbildschirm und Schnelleinstellungen erlauben"</string>
+    <string name="lockscreen_privacy_wallet_summary" msgid="5388868513484652431">"Zugriff auf Geldbörse vom Sperrbildschirm und aus den Schnelleinstellungen erlauben"</string>
     <string name="lockscreen_privacy_controls_setting_toggle" msgid="7445725343949588613">"Gerätesteuerung anzeigen"</string>
     <string name="lockscreen_privacy_controls_summary" msgid="6952176547084269909">"Zugriffssteuerung bei Sperre"</string>
-    <string name="lockscreen_double_line_clock_summary" msgid="2916159550425093703">"Uhr in zwei Zeilen anzeigen, wenn verfügbar"</string>
-    <string name="lockscreen_double_line_clock_setting_toggle" msgid="3408639316001688529">"Uhr in zwei Zeilen"</string>
+    <string name="lockscreen_double_line_clock_summary" msgid="2916159550425093703">"Uhrzeit in zwei Zeilen anzeigen, wenn verfügbar"</string>
+    <string name="lockscreen_double_line_clock_setting_toggle" msgid="3408639316001688529">"Uhrzeit in zwei Zeilen"</string>
     <string name="rtt_settings_title" msgid="7049259598645966354"></string>
     <string name="rtt_settings_no_visible" msgid="7440356831140948382"></string>
     <string name="rtt_settings_visible_during_call" msgid="7866181103286073700"></string>
@@ -5447,6 +5411,10 @@
     <string name="cached_apps_freezer" msgid="1057519579761550350">"Ausführung für Apps im Cache aussetzen"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"Apps dürfen über Einstellungen angezeigt werden"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Apps, die über anderen Apps angezeigt werden dürfen, dürfen auch über den Einstellungen angezeigt werden"</string>
+    <!-- no translation found for allow_mock_modem (3832264806530479214) -->
+    <skip />
+    <!-- no translation found for allow_mock_modem_summary (9097416612748005374) -->
+    <skip />
     <string name="media_controls_title" msgid="403271085636252597">"Medien"</string>
     <string name="media_controls_resume_title" msgid="855076860336652370">"Mediaplayer fixieren"</string>
     <string name="media_controls_resume_description" msgid="3163482266454802097">"Damit die Wiedergabe schnell fortgesetzt werden kann, bleibt der Mediaplayer in den Schnelleinstellungen geöffnet"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 7ac8306..5d256b4 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -142,10 +142,11 @@
     <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"Θα επιτρέπεται στη συσκευή σας να επικοινωνεί με συσκευές Bluetooth σε κοντινή απόσταση"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"Θα επιτρέπεται στο τηλέφωνό σας να επικοινωνεί με συσκευές Bluetooth σε κοντινή απόσταση"</string>
     <string name="bluetooth_disable_a2dp_hw_offload" msgid="5942913792817797541">"Απεν. μείωσ. φόρτ. εξοπλ. Bluetooth A2DP"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="8610420176339657720">"Επανεκ. συσκευής;"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8333029144800835996">"Πρέπει να επανεκκινηθεί η συσκευή για να αλλάξει η ρύθμιση."</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="3488695418187553566">"Επανεκ."</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="4930826928585464191">"Ακύρωση"</string>
+    <string name="bluetooth_disable_le_audio_hw_offload" msgid="3966022676505972908">"Απενεργοποίηση μείωσης φόρτου εξοπλισμού Bluetooth LE AUDIO"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_title" msgid="6001142380445276918">"Επανεκκίνηση συσκευής;"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_message" msgid="1524373895333698779">"Πρέπει να επανεκκινηθεί η συσκευή για να αλλάξει η ρύθμιση."</string>
+    <string name="bluetooth_disable_hw_offload_dialog_confirm" msgid="5594859658551707592">"Επανεκκίνηση"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel" msgid="3663690305043973720">"Ακύρωση"</string>
     <string name="connected_device_media_device_title" msgid="3783388247594566734">"Συσκευές μέσων"</string>
     <string name="connected_device_call_device_title" msgid="88732390601723608">"Συσκευές κλήσεων"</string>
     <string name="connected_device_other_device_title" msgid="4652120430615729193">"Άλλες συσκευές"</string>
@@ -309,9 +310,9 @@
     <string name="security_settings_title" msgid="6710768415432791970">"Ασφάλεια"</string>
     <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"Κρυπτογράφηση και διαπιστευτήρια"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"Το τηλέφωνο είναι κρυπτογραφημένο"</string>
-    <string name="decryption_settings_summary" product="default" msgid="1742645256103613503">"Το τηλέφωνο δεν είναι κρυπτογραφημένο"</string>
+    <string name="not_encrypted_summary" product="default" msgid="2251945842585788254">"Το τηλέφωνο δεν είναι κρυπτογραφημένο"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"Η συσκευή είναι κρυπτογραφημένη"</string>
-    <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"Η συσκευή δεν είναι κρυπτογραφημένη"</string>
+    <string name="not_encrypted_summary" product="tablet" msgid="2374263654698719382">"Η συσκευή δεν είναι κρυπτογραφημένη"</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"Οθόνη κλειδώματος"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"Τι θα εμφανίζεται"</string>
     <string name="security_settings_summary" msgid="1627059516127354233">"Ορισμός του \"Η τοποθεσία μου\", ξεκλειδώματος οθόνης, κλειδώματος κάρτας SIM, κλειδώματος αποθηκευτικού χώρου διαπιστευτηρίων"</string>
@@ -568,37 +569,10 @@
     <string name="fingerprint_last_delete_message" msgid="7860374760549404410">"Δεν θα μπορείτε να χρησιμοποιείτε το δακτυλικό σας αποτύπωμα για να ξεκλειδώσετε το τηλέφωνό σας ή να επαληθεύσετε την ταυτότητά σας σε εφαρμογές."</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="4104208067277655068">"Δεν θα μπορείτε να χρησιμοποιείτε το δακτυλικό σας αποτύπωμα για να ξεκλειδώσετε το προφίλ εργασίας σας, να εξουσιοδοτήσετε αγορές ή να συνδεθείτε σε εφαρμογές εργασιών."</string>
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"Ναι, κατάργηση"</string>
-    <string name="crypt_keeper_settings_title" msgid="4938812137822100044">"Κρυπτογράφηση"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"Κρυπτογράφηση tablet"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"Κρυπτογράφηση τηλεφώνου"</string>
-    <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"Κρυπτογραφημένο"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"Μπορείτε να κρυπτογραφήσετε τους λογαριασμούς σας, τις ρυθμίσεις, τα μέσα, τις ληφθείσες εφαρμογές σας και τα δεδομένα τους, όπως και άλλα αρχεία. Αν υποθέσουμε πως έχετε ρυθμίσει ένα κλείδωμα οθόνης (δηλαδή, ένα μοτίβο ή αριθμό PIN ή κωδικό πρόσβασης), μετά την κρυπτογράφηση του tablet σας θα πρέπει να ξεκλειδώνετε την οθόνη για να κάνετε αποκρυπτογράφηση του tablet σας κάθε φορά που το ενεργοποιείτε. Ο μόνος εναλλακτικός τρόπος για αποκρυπτογράφηση είναι μέσω της επαναφοράς των εργοστασιακών ρυθμίσεων, διαγράφοντας με αυτόν τον τρόπο όλα τα δεδομένα σας.\n\nΗ κρυπτογράφηση διαρκεί μία ώρα ή και περισσότερο. Πρέπει να ξεκινήσετε με μια φορτισμένη μπαταρία και να κρατήσετε το tablet σας συνδεδεμένο στην παροχή ρεύματος μέχρι το τέλος της διαδικασίας. Αν διακόψετε τη διαδικασία, θα χάσετε μερικά ή όλα τα δεδομένα σας."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"Μπορείτε να κρυπτογραφήσετε τους λογαριασμούς σας, τις ρυθμίσεις, τα μέσα, τις ληφθείσες εφαρμογές σας και τα δεδομένα τους, όπως και άλλα αρχεία. Αν υποθέσουμε πως έχετε ρυθμίσει ένα κλείδωμα οθόνης (δηλαδή, ένα μοτίβο ή αριθμό PIN ή κωδικό πρόσβασης), μετά την κρυπτογράφηση του τηλεφώνου σας θα πρέπει να ξεκλειδώνετε την οθόνη για να κάνετε αποκρυπτογράφηση του τηλεφώνου σας κάθε φορά που το ενεργοποιείτε. Ο μόνος εναλλακτικός τρόπος για αποκρυπτογράφηση είναι μέσω της επαναφοράς των εργοστασιακών ρυθμίσεων, διαγράφοντας με αυτόν τον τρόπο όλα τα δεδομένα σας.\n\nΗ κρυπτογράφηση διαρκεί μία ώρα ή και περισσότερο. Πρέπει να ξεκινήσετε με μια φορτισμένη μπαταρία και να κρατήσετε το τηλέφωνό σας συνδεδεμένο στην παροχή ρεύματος μέχρι το τέλος της διαδικασίας. Αν διακόψετε τη διαδικασία, θα χάσετε μερικά ή όλα τα δεδομένα σας."</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"Κρυπτογράφηση tablet"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"Κρυπτογράφηση τηλεφώνου"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"Φορτίστε την μπαταρία σας και δοκιμάστε ξανά."</string>
-    <string name="crypt_keeper_unplugged_text" msgid="2709721134148651329">"Συνδέστε τον φορτιστή σας και δοκιμάστε ξανά."</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="1847280235529858357">"Δεν υπάρχει κωδικός PIN ή κωδικός πρόσβασης κλειδώματος οθόνης"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="7210616262954236042">"Πρέπει να ορίσετε έναν κωδικό PIN ή έναν κωδικό κλειδώματος οθόνης προτού αρχίσει η κρυπτογράφηση."</string>
-    <string name="crypt_keeper_confirm_title" msgid="8600000209722452230">"Να γίνει κρυπτ/ση;"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="3270587498436152259">"Η λειτουργία κρυπτογράφησης είναι μη αναστρέψιμη και, αν τη διακόψετε, θα χαθούν δεδομένα. Η κρυπτογράφηση διαρκεί μια ώρα ή και περισσότερο, κατά τη διάρκεια της οποίας θα γίνει πολλές φορές επανεκκίνηση του tablet."</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="3040428543349852419">"Η λειτουργία κρυπτογράφησης είναι μη αναστρέψιμη και, αν τη διακόψετε, θα χαθούν δεδομένα. Η κρυπτογράφηση διαρκεί μια ώρα ή και περισσότερο, κατά τη διάρκεια της οποίας θα γίνει πολλές φορές επανεκκίνηση του τηλεφώνου."</string>
-    <string name="crypt_keeper_setup_title" msgid="3339725741305796680">"Κρυπτογράφηση"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="4417016995091289019">"Περιμένετε μέχρι να γίνει κρυπτογράφηση του tablet. <xliff:g id="PERCENT">^1</xliff:g>% ολοκληρώθηκε."</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="7902355422499500352">"Περιμένετε μέχρι να γίνει κρυπτογράφηση του τηλεφώνου σας. <xliff:g id="PERCENT">^1</xliff:g>% ολοκληρώθηκε."</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="8348188415839917821">"Περιμένετε μέχρι να ολοκληρωθεί η κρυπτογράφηση του tablet σας. Χρόνος που απομένει: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="8556105766597855198">"Περιμένετε μέχρι να ολοκληρωθεί η κρυπτογράφηση του τηλεφώνου σας. Χρόνος που απομένει: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="3832496715430327682">"Για να ξεκλειδώσετε το tablet σας, απενεργοποιήστε το και, στη συνέχεια, ενεργοποιήστε το."</string>
-    <string name="crypt_keeper_force_power_cycle" product="default" msgid="5070346039522135361">"Για να ξεκλειδώσετε το τηλέφωνό σας, απενεργοποιήστε το και, στη συνέχεια, ενεργοποιήστε το."</string>
-    <string name="crypt_keeper_warn_wipe" msgid="8104921337301750394">"Προσοχή: η συσκευή σας θα καταργηθεί μετά από <xliff:g id="COUNT">^1</xliff:g> αποτυχημένες προσπάθειες ξεκλειδώματος!"</string>
-    <string name="crypt_keeper_enter_password" msgid="1274917431075529732">"Πληκτρολογήστε τον κωδικό πρόσβασής σας"</string>
-    <string name="crypt_keeper_failed_title" msgid="8173654570682244149">"Η κρυπτογράφηση απέτυχε"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"Η κρυπτογράφηση διακόπηκε και δεν είναι δυνατή η ολοκλήρωσή της. Κατά συνέπεια, δεν είναι πλέον δυνατή η πρόσβαση στα δεδομένα στο tablet σας. \n\n Για να συνεχίσετε να χρησιμοποιείτε το tablet σας θα πρέπει να πραγματοποιήσετε επαναφορά των εργοστασιακών ρυθμίσεων. Όταν ρυθμίσετε το tablet σας μετά από την επαναφορά, θα μπορείτε να επαναφέρετε τα αντίγραφα ασφαλείας των δεδομένων σας από το Λογαριασμό σας Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"Η κρυπτογράφηση διακόπηκε και δεν είναι δυνατή η ολοκλήρωσή της. Κατά συνέπεια, δεν είναι πλέον δυνατή η πρόσβαση στα δεδομένα στο τηλέφωνό σας. \n\nΓια να συνεχίσετε να χρησιμοποιείτε το τηλέφωνό σας θα πρέπει να πραγματοποιήσετε επαναφορά των εργοστασιακών ρυθμίσεων. Όταν ρυθμίσετε το τηλέφωνό σας μετά από την επαναφορά, θα μπορείτε να επαναφέρετε τα αντίγραφα ασφαλείας των δεδομένων σας από τον Λογαριασμό σας Google."</string>
-    <string name="crypt_keeper_data_corrupt_title" msgid="5920153462176846037">"Ανεπιτυχής αποκρυπτογράφηση"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"Ο κωδικός που καταχωρίσατε είναι σωστός, αλλά, δυστυχώς, τα δεδομένα σας είναι κατεστραμμένα.\n\nΓια να συνεχίσετε να χρησιμοποιείτε το tablet σας, θα πρέπει να κάνετε επαναφορά των εργοστασιακών ρυθμίσεων. Κατά τη ρύθμιση του tablet σας μετά την επαναφορά, θα έχετε την ευκαιρία να αποκαταστήσετε όλα τα δεδομένα για τα οποία δημιουργήσατε αντίγραφα ασφαλείας στο Λογαριασμό σας Google."</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"Ο κωδικός που καταχωρίσατε είναι σωστός, αλλά, δυστυχώς, τα δεδομένα σας είναι κατεστραμμένα.\n\nΓια να συνεχίσετε να χρησιμοποιείτε το τηλέφωνό σας, θα πρέπει να κάνετε επαναφορά των εργοστασιακών ρυθμίσεων. Κατά τη ρύθμιση του τηλεφώνου σας μετά την επαναφορά, θα έχετε την ευκαιρία να αποκαταστήσετε όλα τα δεδομένα για τα οποία δημιουργήσατε αντίγραφα ασφαλείας στο Λογαριασμό σας Google."</string>
-    <string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"Εναλλαγή μεθόδου εισαγωγής"</string>
+    <string name="encryption_settings_title" msgid="2848716008695618360">"Κρυπτογράφηση"</string>
+    <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"Κρυπτογράφηση tablet"</string>
+    <string name="encrypt_title" product="default" msgid="7337365190988321100">"Κρυπτογράφηση τηλεφώνου"</string>
+    <string name="encrypted_summary" msgid="545623487587251207">"Κρυπτογραφημένο"</string>
     <string name="suggested_lock_settings_title" msgid="7836065447159730217">"Προστασία του τηλεφώνου σας"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"Ρύθμιση κλειδώματος οθόνης για προστασία του tablet"</string>
     <string name="suggested_lock_settings_summary" product="device" msgid="8479766049078378225">"Ρύθμιση κλειδώματος οθόνης για προστασία της συσκευής"</string>
@@ -817,6 +791,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Επίσης, ενδέχεται να χρειαστεί να πληκτρολογήσετε αυτό το PIN στην άλλη συσκευή."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Επίσης, ενδέχεται να χρειαστεί να πληκτρολογήσετε το κλειδί πρόσβασης στην άλλη συσκευή."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Για σύζευξη με τη συσκευή:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Βεβαιωθείτε ότι εμφανίζεται το κλειδί πρόσβασης:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Επιβεβαίωση σύζευξης με συντονισμένο σύνολο συσκευών"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"Από:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Να γίνει σύζευξη με αυτήν τη συσκευή;"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Για σύζευξη με:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Πληκτρολογήστε:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g> και πιέστε το πλήκτρο επιστροφής (Return) ή το πλήκτρο Enter."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Να επιτρέπεται η πρόσβαση στις επαφές σας και στο ιστορικό κλήσεων"</string>
@@ -850,6 +825,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Δεν ήταν δυνατή η σύνδεση. Δοκιμάστε ξανά."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Λεπτομέρειες συσκευής"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Διεύθυνση Bluetooth συσκευής: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Διεύθυνση Bluetooth συσκευής:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Κατάργηση απομνημόνευσης συσκευής;"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Κατάργηση συσχέτισης"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Αποσύνδεση εφαρμογής;"</string>
@@ -881,6 +857,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Διατήρηση ρυθμίσεων"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Μέγιστος αριθμός συνδεδεμένων συσκευών ήχου Bluetooth"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Επιλέξτε τον μέγιστο αριθμό συνδεδεμένων συσκευών ήχου Bluetooth"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"Αρχείο καταγραφής εντοπισμού σφαλμάτων στοίβας NFC"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Αύξηση επιπέδου καταγραφής στοίβας NFC"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Μετάδοση"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"κατοπτρισμός"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Ενεργοποίηση ασύρματης οθόνης"</string>
@@ -1188,6 +1166,8 @@
     <string name="wifi_hotspot_maximize_compatibility_dual_ap_summary" msgid="3579549223159056533">"Διευκολύνει την εύρεση αυτού του σημείο πρόσβασης Wi-Fi από άλλες συσκευές. Αυξάνει τη χρήση της μπαταρίας."</string>
     <string name="wifi_tether_starting" msgid="8879874184033857814">"Ενεργοποίηση σημείου πρόσβασης…"</string>
     <string name="wifi_tether_stopping" msgid="4416492968019409188">"Απενεργοποίηση σημείου πρόσβασης…"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_title" msgid="3089432578433978073">"Δεν είναι διαθέσιμη η σύνδεση"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_content" msgid="5920421547607921112">"Επικοινωνήστε με την εταιρεία κινητής τηλεφωνίας που χρησιμοποιείτε για λεπτομέρειες"</string>
     <string name="wifi_tether_enabled_subtext" msgid="5085002421099821056">"Το <xliff:g id="NETWORK_SSID">%1$s</xliff:g> είναι ενεργό"</string>
     <string name="wifi_tether_failed_subtext" msgid="437190628041885500">"Σφάλμα φορητού σημείου πρόσβασης Wi-Fi"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7072559431286459122">"Ρύθμιση φορητού σημείου πρόσβασης Wi-Fi"</string>
@@ -2534,11 +2514,6 @@
     <string name="enable_service_title" msgid="7231533866953706788">"Να επιτρέπεται στην υπηρεσία <xliff:g id="SERVICE">%1$s</xliff:g> να έχει τον πλήρη έλεγχο της συσκευής σας;"</string>
     <string name="capabilities_list_title" msgid="1225853611983394386">"Η υπηρεσία <xliff:g id="SERVICE">%1$s</xliff:g> απαιτεί τα εξής:"</string>
     <string name="touch_filtered_warning" msgid="4225815157460318241">"Επειδή μια εφαρμογή αποκρύπτει ένα αίτημα άδειας, δεν είναι δυνατή η επαλήθευση της απάντησής σας από τις Ρυθμίσεις."</string>
-    <string name="enable_service_encryption_warning" msgid="931082737770453755">"Εάν ενεργοποιήσετε την υπηρεσία <xliff:g id="SERVICE">%1$s</xliff:g>, η συσκευή σας δεν θα χρησιμοποιεί το κλείδωμα οθόνης για τη βελτίωση της κρυπτογράφησης δεδομένων."</string>
-    <string name="secure_lock_encryption_warning" msgid="669152607190123579">"Επειδή έχετε ενεργοποιήσει την υπηρεσία προσβασιμότητας, η συσκευή σας δεν θα χρησιμοποιεί το κλείδωμα οθόνης για τη βελτίωση της κρυπτογράφησης δεδομένων."</string>
-    <string name="enable_service_pattern_reason" msgid="6832846117817938536">"Επειδή η ενεργοποίηση της υπηρεσίας <xliff:g id="SERVICE">%1$s</xliff:g> επηρεάζει την κρυπτογράφηση δεδομένων, χρειάζεται να επιβεβαιώσετε το μοτίβο σας."</string>
-    <string name="enable_service_pin_reason" msgid="6040417014360237703">"Επειδή η ενεργοποίηση της υπηρεσίας <xliff:g id="SERVICE">%1$s</xliff:g> επηρεάζει την κρυπτογράφηση δεδομένων, χρειάζεται να επιβεβαιώσετε τον κωδικό σας PIN."</string>
-    <string name="enable_service_password_reason" msgid="6962544350351734238">"Επειδή η ενεργοποίηση της υπηρεσίας <xliff:g id="SERVICE">%1$s</xliff:g> επηρεάζει την κρυπτογράφηση δεδομένων, χρειάζεται να επιβεβαιώσετε τον κωδικό πρόσβασής σας."</string>
     <string name="accessibility_service_warning" msgid="6779187188736432618">"Η υπηρεσία <xliff:g id="SERVICE">%1$s</xliff:g> ζητάει πλήρη έλεγχο αυτής της συσκευής. Η υπηρεσία μπορεί να διαβάσει την οθόνη και να δράσει εκ μέρους των χρηστών με προβλήματα προσβασιμότητας. Αυτό το επίπεδο ελέγχου δεν είναι κατάλληλο για τις περισσότερες εφαρμογές."</string>
     <string name="accessibility_service_warning_description" msgid="6573203795976134751">"Ο πλήρης έλεγχος είναι κατάλληλος για εφαρμογές που εξυπηρετούν τις ανάγκες προσβασιμότητάς σας, αλλά όχι για όλες τις εφαρμογές."</string>
     <string name="accessibility_service_screen_control_title" msgid="324795030658109870">"Προβολή και έλεγχος οθόνης"</string>
@@ -3103,14 +3078,6 @@
     <string name="remove_account_failed" msgid="3709502163548900644">"Αυτή η αλλαγή δεν επιτρέπεται από τον διαχειριστή σας"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"Δεν είναι δυνατός ο μη αυτόματος συγχρονισμός"</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"Ο συγχρονισμός για αυτό το στοιχείο είναι προς το παρόν απενεργοποιημένος. Για να αλλάξετε τη ρύθμισή σας, ενεργοποιήστε προσωρινά τα δεδομένα παρασκηνίου και τον αυτόματο συγχρονισμό."</string>
-    <string name="enter_password" msgid="6327051330258595331">"Για να ξεκινήσετε το Android, εισαγάγετε τον κωδικό σας"</string>
-    <string name="enter_pin" msgid="1029287617551232681">"Για να ξεκινήσετε το Android, εισαγάγετε το PIN σας"</string>
-    <string name="enter_pattern" msgid="1747316785866742960">"Για να ξεκινήσετε το Android, σχεδιάστε το μοτίβο σας"</string>
-    <string name="cryptkeeper_wrong_pattern" msgid="340747269176120242">"Λάθος μοτίβο"</string>
-    <string name="cryptkeeper_wrong_password" msgid="7295607881887114486">"Λανθασμένος κωδικός πρόσβασης"</string>
-    <string name="cryptkeeper_wrong_pin" msgid="2347961593970714201">"Λανθασμένος κωδικός PIN"</string>
-    <string name="checking_decryption" msgid="6111642972615688237">"Έλεγχος…"</string>
-    <string name="starting_android" msgid="6694154070215356186">"Έναρξη Android..."</string>
     <string name="delete" msgid="8330605554706263775">"Διαγραφή"</string>
     <string name="misc_files" msgid="6598066985800749585">"Διάφορα αρχεία"</string>
     <string name="misc_files_selected_count" msgid="5597802791672749532">"Επιλέχθηκαν <xliff:g id="NUMBER">%1$d</xliff:g> από <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -3206,8 +3173,6 @@
     <string name="data_usage_metered_yes" msgid="4262598072030135223">"Με περιορισμούς"</string>
     <string name="data_usage_metered_no" msgid="1685828958417926268">"Χωρίς περιορισμούς"</string>
     <string name="data_usage_disclaimer" msgid="3271450299386176770">"Ο υπολογισμός δεδ.της εταιρείας κιν.τηλ. μπορεί να διαφέρει από τη συσκευή σας."</string>
-    <string name="cryptkeeper_emergency_call" msgid="8369322820475703306">"Κλήση έκτακτης ανάγκης"</string>
-    <string name="cryptkeeper_return_to_call" msgid="3857250752781151232">"Επιστροφή στην κλήση"</string>
     <string name="vpn_name" msgid="3806456074909253262">"Όνομα"</string>
     <string name="vpn_type" msgid="5533202873260826663">"Τύπος"</string>
     <string name="vpn_server" msgid="2908816134941973935">"Διεύθυνση διακομιστή"</string>
@@ -4764,8 +4729,6 @@
       <item quantity="one">1 εφαρμογή μπορεί να χρησιμοποιεί απεριόριστα δεδομένα</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"Δείτε περισσότερα"</string>
-    <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"Να γίνει όντως διαγραφή των δεδομένων χρήστη και μετατροπή σε κρυπτογράφηση αρχείου;"</string>
-    <string name="button_confirm_convert_fbe" msgid="339648921918438106">"Διαγραφή και μετατροπή"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"Επαναφορά ορίου ρυθμού ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"Έγινε επαναφορά του ορίου ρυθμού ShortcutManager"</string>
     <string name="notification_suggestion_title" msgid="6309263655965785411">"Έλεγχος πληροφοριών στην οθόνη κλειδώματος"</string>
@@ -5292,6 +5255,7 @@
     <string name="sim_action_yes" msgid="8076556020131395515">"Ναι"</string>
     <string name="sim_action_reboot" msgid="3508948833333441538">"Επανεκκίνηση"</string>
     <string name="sim_action_no_thanks" msgid="435717748384544195">"Όχι, ευχαριστώ"</string>
+    <string name="sim_action_cancel" msgid="2668099867029610910">"Ακύρωση"</string>
     <string name="sim_switch_button" msgid="1405772571706095387">"Εναλλαγή"</string>
     <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Δεν είναι δυνατή η ενεργοποίηση της SIM"</string>
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Αφαιρέστε τη SIM και τοποθετήστε τη ξανά. Εάν το πρόβλημα δεν επιλυθεί, επανεκκινήστε τη συσκευή σας."</string>
@@ -5444,6 +5408,10 @@
     <string name="cached_apps_freezer" msgid="1057519579761550350">"Αναστολή εκτέλ. εφαρμογών αποθηκ. στην κρυφή μνήμη"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"Να επιτρέπονται οι επικαλ. οθόνης στις Ρυθμίσεις"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Να επιτρέπονται εφαρμογές που μπορούν να εμφανίζονται πάνω από άλλες εφαρμογές για επικάλυψη των οθονών ρυθμίσεων"</string>
+    <!-- no translation found for allow_mock_modem (3832264806530479214) -->
+    <skip />
+    <!-- no translation found for allow_mock_modem_summary (9097416612748005374) -->
+    <skip />
     <string name="media_controls_title" msgid="403271085636252597">"Μέσα"</string>
     <string name="media_controls_resume_title" msgid="855076860336652370">"Καρφίτσωμα προγράμματος αναπαραγωγής μέσων"</string>
     <string name="media_controls_resume_description" msgid="3163482266454802097">"Για γρήγορη συνέχιση της αναπαραγωγής, το πρόγραμμα αναπαραγωγής μέσων παραμένει ανοικτό στις Γρήγορες ρυθμίσεις"</string>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 912a557..321d419 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -142,10 +142,11 @@
     <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"Allow your device to communicate with nearby Bluetooth devices"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"Allow your phone to communicate with nearby Bluetooth devices"</string>
     <string name="bluetooth_disable_a2dp_hw_offload" msgid="5942913792817797541">"Disable Bluetooth A2DP hardware offload"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="8610420176339657720">"Restart Device?"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8333029144800835996">"You need to restart your device to change this setting."</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="3488695418187553566">"Restart"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="4930826928585464191">"Cancel"</string>
+    <string name="bluetooth_disable_le_audio_hw_offload" msgid="3966022676505972908">"Disable Bluetooth LE AUDIO hardware offload"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_title" msgid="6001142380445276918">"Restart device?"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_message" msgid="1524373895333698779">"You need to restart your device to change this setting."</string>
+    <string name="bluetooth_disable_hw_offload_dialog_confirm" msgid="5594859658551707592">"Restart"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel" msgid="3663690305043973720">"Cancel"</string>
     <string name="connected_device_media_device_title" msgid="3783388247594566734">"Media devices"</string>
     <string name="connected_device_call_device_title" msgid="88732390601723608">"Call devices"</string>
     <string name="connected_device_other_device_title" msgid="4652120430615729193">"Other devices"</string>
@@ -309,9 +310,9 @@
     <string name="security_settings_title" msgid="6710768415432791970">"Security"</string>
     <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"Encryption and credentials"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"Phone encrypted"</string>
-    <string name="decryption_settings_summary" product="default" msgid="1742645256103613503">"Phone not encrypted"</string>
+    <string name="not_encrypted_summary" product="default" msgid="2251945842585788254">"Phone not encrypted"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"Device encrypted"</string>
-    <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"Device not encrypted"</string>
+    <string name="not_encrypted_summary" product="tablet" msgid="2374263654698719382">"Device not encrypted"</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"Lock screen"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"What to show"</string>
     <string name="security_settings_summary" msgid="1627059516127354233">"Set My Location, screen unlock, SIM card lock, credential storage lock"</string>
@@ -481,7 +482,7 @@
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"Touch the sensor"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"Put your finger on the sensor and lift after you feel a vibration"</string>
     <string name="security_settings_udfps_enroll_start_message" msgid="5032954588171487566">"Keep your fingerprint flat on the sensor until you feel a vibration"</string>
-    <string name="security_settings_fingerprint_enroll_udfps_title" msgid="6665610134560896895">"Touch &amp; hold the fingerprint sensor"</string>
+    <string name="security_settings_fingerprint_enroll_udfps_title" msgid="6665610134560896895">"Touch and hold the fingerprint sensor"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"Lift, then touch again"</string>
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"One more time"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"Follow the fingerprint icon"</string>
@@ -568,37 +569,10 @@
     <string name="fingerprint_last_delete_message" msgid="7860374760549404410">"You won\'t be able to use your fingerprint to unlock your phone or verify that it\'s you in apps."</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="4104208067277655068">"You won\'t be able to use your fingerprint to unlock your work profile, authorise purchases or sign in to work apps."</string>
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"Yes, remove"</string>
-    <string name="crypt_keeper_settings_title" msgid="4938812137822100044">"Encryption"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"Encrypt tablet"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"Encrypt phone"</string>
-    <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"Encrypted"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"You can encrypt your accounts, settings, downloaded apps and their data, media and other files. After you encrypt your tablet, assuming you\'ve set up a screen lock (that is, a pattern or numeric PIN or password), you\'ll need to unlock the screen to decrypt the tablet every time you power it on. The only other way to decrypt is to perform a factory data reset, erasing all your data.\n\nEncryption takes an hour or more. You must start with a charged battery and keep your tablet plugged in throughout the process. If you interrupt it, you\'ll lose some or all of your data"</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"You can encrypt your accounts, settings, downloaded apps and their data, media and other files. After you encrypt your phone, assuming you\'ve set up a screen lock (that is, a pattern or numeric PIN or password), you\'ll need to unlock the screen to decrypt the phone every time you power it on. The only other way to decrypt is to perform a factory data reset, erasing all your data.\n\nEncryption takes an hour or more. You must start with a charged battery and keep your phone plugged in throughout the process. If you interrupt it, you\'ll lose some or all of your data."</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"Encrypt tablet"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"Encrypt phone"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"Please charge your battery and try again."</string>
-    <string name="crypt_keeper_unplugged_text" msgid="2709721134148651329">"Please plug in your charger and try again."</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="1847280235529858357">"No lock-screen PIN or password"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="7210616262954236042">"You need to set a lock screen PIN or password before you can start encryption."</string>
-    <string name="crypt_keeper_confirm_title" msgid="8600000209722452230">"Encrypt?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="3270587498436152259">"The encryption operation is irreversible and if you interrupt it, you\'ll lose data. Encryption takes an hour or more, during which the tablet will restart several times."</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="3040428543349852419">"The encryption operation is irreversible and if you interrupt it, you\'ll lose data. Encryption takes an hour or more, during which the phone will restart several times."</string>
-    <string name="crypt_keeper_setup_title" msgid="3339725741305796680">"Encrypting"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="4417016995091289019">"Wait while your tablet is being encrypted. <xliff:g id="PERCENT">^1</xliff:g>% complete."</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="7902355422499500352">"Wait while your phone is being encrypted. <xliff:g id="PERCENT">^1</xliff:g>% complete."</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="8348188415839917821">"Wait while your tablet is being encrypted. Time remaining: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="8556105766597855198">"Wait while your phone is being encrypted. Time remaining: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="3832496715430327682">"To unlock your tablet, turn it off and then on."</string>
-    <string name="crypt_keeper_force_power_cycle" product="default" msgid="5070346039522135361">"To unlock your phone, turn it off and then on."</string>
-    <string name="crypt_keeper_warn_wipe" msgid="8104921337301750394">"Warning: Your device will be wiped after <xliff:g id="COUNT">^1</xliff:g> more failed attempts to be unlocked!"</string>
-    <string name="crypt_keeper_enter_password" msgid="1274917431075529732">"Type your password"</string>
-    <string name="crypt_keeper_failed_title" msgid="8173654570682244149">"Encryption unsuccessful"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"Encryption was interrupted and can\'t be completed. As a result, the data on your tablet is no longer accessible. \n\n To resume using your tablet, you need to perform a factory reset. When you set up your tablet after the reset, you\'ll have an opportunity to restore any data that was backed up to your Google Account."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"Encryption was interrupted and can\'t be completed. As a result, the data on your phone is no longer accessible. \n\nTo resume using your phone, you need to perform a factory reset. When you set up your phone after the reset, you\'ll have an opportunity to restore any data that was backed up to your Google Account."</string>
-    <string name="crypt_keeper_data_corrupt_title" msgid="5920153462176846037">"Decryption unsuccessful"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"The password that you entered is correct, but unfortunately your data is corrupt. \n\nTo resume using your tablet, you will need to perform a factory reset. When you set up your tablet after the reset, you\'ll have an opportunity to restore any data that was backed up to your Google Account."</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"The password that you entered is correct, but unfortunately your data is corrupt. \n\nTo resume using your phone, you need to perform a factory reset. When you set up your phone after the reset, you’ll have an opportunity to restore any data that was backed up to your Google Account."</string>
-    <string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"Switch input method"</string>
+    <string name="encryption_settings_title" msgid="2848716008695618360">"Encryption"</string>
+    <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"Encrypt tablet"</string>
+    <string name="encrypt_title" product="default" msgid="7337365190988321100">"Encrypt phone"</string>
+    <string name="encrypted_summary" msgid="545623487587251207">"Encrypted"</string>
     <string name="suggested_lock_settings_title" msgid="7836065447159730217">"Secure your phone"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"Set screen lock to protect tablet"</string>
     <string name="suggested_lock_settings_summary" product="device" msgid="8479766049078378225">"Set screen lock to protect device"</string>
@@ -817,6 +791,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"You may also need to type this PIN on the other device."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"You may also need to type this passkey on the other device."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"To pair with:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Make sure that it is showing this passkey:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Confirm to pair with the coordinated set"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"From:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Pair with this device?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"To pair with:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Type on it:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, then press Return or Enter."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Allow access to your contacts and call history"</string>
@@ -850,6 +825,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Couldn\'t connect. Try again."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Device details"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Device\'s Bluetooth address: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Device\'s Bluetooth address:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Forget device?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Remove association"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Disconnect app?"</string>
@@ -881,6 +857,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Remember settings"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Maximum connected Bluetooth audio devices"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Select maximum number of connected Bluetooth audio devices"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"NFC stack debug log"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Increase NFC stack logging level"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Cast"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"mirror"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Enable wireless display"</string>
@@ -1188,6 +1166,8 @@
     <string name="wifi_hotspot_maximize_compatibility_dual_ap_summary" msgid="3579549223159056533">"Helps other devices find this hotspot. Increases battery usage."</string>
     <string name="wifi_tether_starting" msgid="8879874184033857814">"Turning hotspot on…"</string>
     <string name="wifi_tether_stopping" msgid="4416492968019409188">"Turning off hotspot…"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_title" msgid="3089432578433978073">"Tethering unavailable"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_content" msgid="5920421547607921112">"Contact your operator for details"</string>
     <string name="wifi_tether_enabled_subtext" msgid="5085002421099821056">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> is active"</string>
     <string name="wifi_tether_failed_subtext" msgid="437190628041885500">"Portable Wi‑Fi hotspot error"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7072559431286459122">"Set up Wi‑Fi hotspot"</string>
@@ -2534,11 +2514,6 @@
     <string name="enable_service_title" msgid="7231533866953706788">"Allow <xliff:g id="SERVICE">%1$s</xliff:g> to have full control of your device?"</string>
     <string name="capabilities_list_title" msgid="1225853611983394386">"<xliff:g id="SERVICE">%1$s</xliff:g> needs to:"</string>
     <string name="touch_filtered_warning" msgid="4225815157460318241">"Because an app is obscuring a permission request, Settings can’t verify your response."</string>
-    <string name="enable_service_encryption_warning" msgid="931082737770453755">"If you turn on <xliff:g id="SERVICE">%1$s</xliff:g>, your device won’t use your screen lock to enhance data encryption."</string>
-    <string name="secure_lock_encryption_warning" msgid="669152607190123579">"Because you\'ve turned on an accessibility service, your device won’t use your screen lock to enhance data encryption."</string>
-    <string name="enable_service_pattern_reason" msgid="6832846117817938536">"Because turning on <xliff:g id="SERVICE">%1$s</xliff:g> affects data encryption, you need to confirm your pattern."</string>
-    <string name="enable_service_pin_reason" msgid="6040417014360237703">"Because turning on <xliff:g id="SERVICE">%1$s</xliff:g> affects data encryption, you need to confirm your PIN."</string>
-    <string name="enable_service_password_reason" msgid="6962544350351734238">"Because turning on <xliff:g id="SERVICE">%1$s</xliff:g> affects data encryption, you need to confirm your password."</string>
     <string name="accessibility_service_warning" msgid="6779187188736432618">"<xliff:g id="SERVICE">%1$s</xliff:g> is requesting full control of this device. The service can read the screen and act on behalf of users with accessibility needs. This level of control is not appropriate for most apps."</string>
     <string name="accessibility_service_warning_description" msgid="6573203795976134751">"Full control is appropriate for apps that help you with accessibility needs, but not for most apps."</string>
     <string name="accessibility_service_screen_control_title" msgid="324795030658109870">"View and control screen"</string>
@@ -3103,14 +3078,6 @@
     <string name="remove_account_failed" msgid="3709502163548900644">"This change isn\'t allowed by your admin"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"Cannot sync manually"</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"Sync for this item is currently disabled. To change your preference, temporarily turn on background data and automatic sync."</string>
-    <string name="enter_password" msgid="6327051330258595331">"To start Android, enter your password"</string>
-    <string name="enter_pin" msgid="1029287617551232681">"To start Android, enter your PIN"</string>
-    <string name="enter_pattern" msgid="1747316785866742960">"To start Android, draw your pattern"</string>
-    <string name="cryptkeeper_wrong_pattern" msgid="340747269176120242">"Wrong Pattern"</string>
-    <string name="cryptkeeper_wrong_password" msgid="7295607881887114486">"Wrong Password"</string>
-    <string name="cryptkeeper_wrong_pin" msgid="2347961593970714201">"Wrong PIN"</string>
-    <string name="checking_decryption" msgid="6111642972615688237">"Checking…"</string>
-    <string name="starting_android" msgid="6694154070215356186">"Starting Android…"</string>
     <string name="delete" msgid="8330605554706263775">"Delete"</string>
     <string name="misc_files" msgid="6598066985800749585">"Misc. files"</string>
     <string name="misc_files_selected_count" msgid="5597802791672749532">"selected <xliff:g id="NUMBER">%1$d</xliff:g> out of <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -3206,8 +3173,6 @@
     <string name="data_usage_metered_yes" msgid="4262598072030135223">"Metered"</string>
     <string name="data_usage_metered_no" msgid="1685828958417926268">"Not metered"</string>
     <string name="data_usage_disclaimer" msgid="3271450299386176770">"Operator data accounting may differ from your device."</string>
-    <string name="cryptkeeper_emergency_call" msgid="8369322820475703306">"Emergency call"</string>
-    <string name="cryptkeeper_return_to_call" msgid="3857250752781151232">"Return to call"</string>
     <string name="vpn_name" msgid="3806456074909253262">"Name"</string>
     <string name="vpn_type" msgid="5533202873260826663">"Type"</string>
     <string name="vpn_server" msgid="2908816134941973935">"Server address"</string>
@@ -4764,8 +4729,6 @@
       <item quantity="one">1 app can use unrestricted data</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"See more"</string>
-    <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"Really wipe user data and convert to file encryption?"</string>
-    <string name="button_confirm_convert_fbe" msgid="339648921918438106">"Wipe and convert"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"Reset ShortcutManager rate-limiting"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"ShortcutManager rate-limiting has been reset"</string>
     <string name="notification_suggestion_title" msgid="6309263655965785411">"Control info on lock screen"</string>
@@ -5292,6 +5255,7 @@
     <string name="sim_action_yes" msgid="8076556020131395515">"Yes"</string>
     <string name="sim_action_reboot" msgid="3508948833333441538">"Restart"</string>
     <string name="sim_action_no_thanks" msgid="435717748384544195">"No, thanks"</string>
+    <string name="sim_action_cancel" msgid="2668099867029610910">"Cancel"</string>
     <string name="sim_switch_button" msgid="1405772571706095387">"Switch"</string>
     <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Can’t activate SIM"</string>
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Remove the SIM and insert it again. If the problem continues, restart your device."</string>
@@ -5374,7 +5338,7 @@
     <string name="media_output_switch_error_text" msgid="603563475910236831">"Can’t switch. Tap to try again"</string>
     <string name="wfc_disclaimer_title_text" msgid="4617195934203523503">"Important information"</string>
     <string name="wfc_disclaimer_agree_button_text" msgid="4082872292910770344">"CONTINUE"</string>
-    <string name="wfc_disclaimer_disagree_text" msgid="8424457394700137703">"NO THANKS"</string>
+    <string name="wfc_disclaimer_disagree_text" msgid="8424457394700137703">"NO, THANKS"</string>
     <string name="wfc_disclaimer_location_title_text" msgid="7913919887475418423">"Location"</string>
     <string name="wfc_disclaimer_location_desc_text" msgid="1417004513415772582">"Your operator may collect your location when you use this service for emergency calls.\n\nVisit your operator\'s privacy policy for details."</string>
     <string name="forget_passpoint_dialog_message" msgid="2433875063907365760">"You may lose access to any remaining time or data. Check with your provider before removing."</string>
@@ -5444,6 +5408,8 @@
     <string name="cached_apps_freezer" msgid="1057519579761550350">"Suspend execution for cached apps"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"Allow screen overlays on settings"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Allow apps that can display over other apps to overlay settings screens"</string>
+    <string name="allow_mock_modem" msgid="3832264806530479214">"Allow mock modem"</string>
+    <string name="allow_mock_modem_summary" msgid="9097416612748005374">"Allow this device to run mock modem service for instrumentation testing. Do not enable this during normal usage of the phone"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Media"</string>
     <string name="media_controls_resume_title" msgid="855076860336652370">"Pin media player"</string>
     <string name="media_controls_resume_description" msgid="3163482266454802097">"To quickly resume playback, media player stays open in Quick Settings"</string>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index 15b1f31..d98e2c3 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -142,10 +142,11 @@
     <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"Allow your device to communicate with nearby Bluetooth devices"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"Allow your phone to communicate with nearby Bluetooth devices"</string>
     <string name="bluetooth_disable_a2dp_hw_offload" msgid="5942913792817797541">"Disable Bluetooth A2DP hardware offload"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="8610420176339657720">"Restart Device?"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8333029144800835996">"You need to restart your device to change this setting."</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="3488695418187553566">"Restart"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="4930826928585464191">"Cancel"</string>
+    <string name="bluetooth_disable_le_audio_hw_offload" msgid="3966022676505972908">"Disable Bluetooth LE AUDIO hardware offload"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_title" msgid="6001142380445276918">"Restart device?"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_message" msgid="1524373895333698779">"You need to restart your device to change this setting."</string>
+    <string name="bluetooth_disable_hw_offload_dialog_confirm" msgid="5594859658551707592">"Restart"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel" msgid="3663690305043973720">"Cancel"</string>
     <string name="connected_device_media_device_title" msgid="3783388247594566734">"Media devices"</string>
     <string name="connected_device_call_device_title" msgid="88732390601723608">"Call devices"</string>
     <string name="connected_device_other_device_title" msgid="4652120430615729193">"Other devices"</string>
@@ -309,9 +310,9 @@
     <string name="security_settings_title" msgid="6710768415432791970">"Security"</string>
     <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"Encryption and credentials"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"Phone encrypted"</string>
-    <string name="decryption_settings_summary" product="default" msgid="1742645256103613503">"Phone not encrypted"</string>
+    <string name="not_encrypted_summary" product="default" msgid="2251945842585788254">"Phone not encrypted"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"Device encrypted"</string>
-    <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"Device not encrypted"</string>
+    <string name="not_encrypted_summary" product="tablet" msgid="2374263654698719382">"Device not encrypted"</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"Lock screen"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"What to show"</string>
     <string name="security_settings_summary" msgid="1627059516127354233">"Set My Location, screen unlock, SIM card lock, credential storage lock"</string>
@@ -481,7 +482,7 @@
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"Touch the sensor"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"Put your finger on the sensor and lift after you feel a vibration"</string>
     <string name="security_settings_udfps_enroll_start_message" msgid="5032954588171487566">"Keep your fingerprint flat on the sensor until you feel a vibration"</string>
-    <string name="security_settings_fingerprint_enroll_udfps_title" msgid="6665610134560896895">"Touch &amp; hold the fingerprint sensor"</string>
+    <string name="security_settings_fingerprint_enroll_udfps_title" msgid="6665610134560896895">"Touch and hold the fingerprint sensor"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"Lift, then touch again"</string>
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"One more time"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"Follow the fingerprint icon"</string>
@@ -568,37 +569,10 @@
     <string name="fingerprint_last_delete_message" msgid="7860374760549404410">"You won\'t be able to use your fingerprint to unlock your phone or verify that it\'s you in apps."</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="4104208067277655068">"You won\'t be able to use your fingerprint to unlock your work profile, authorise purchases or sign in to work apps."</string>
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"Yes, remove"</string>
-    <string name="crypt_keeper_settings_title" msgid="4938812137822100044">"Encryption"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"Encrypt tablet"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"Encrypt phone"</string>
-    <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"Encrypted"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"You can encrypt your accounts, settings, downloaded apps and their data, media and other files. After you encrypt your tablet, assuming you\'ve set up a screen lock (that is, a pattern or numeric PIN or password), you\'ll need to unlock the screen to decrypt the tablet every time you power it on. The only other way to decrypt is to perform a factory data reset, erasing all your data.\n\nEncryption takes an hour or more. You must start with a charged battery and keep your tablet plugged in throughout the process. If you interrupt it, you\'ll lose some or all of your data"</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"You can encrypt your accounts, settings, downloaded apps and their data, media and other files. After you encrypt your phone, assuming you\'ve set up a screen lock (that is, a pattern or numeric PIN or password), you\'ll need to unlock the screen to decrypt the phone every time you power it on. The only other way to decrypt is to perform a factory data reset, erasing all your data.\n\nEncryption takes an hour or more. You must start with a charged battery and keep your phone plugged in throughout the process. If you interrupt it, you\'ll lose some or all of your data."</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"Encrypt tablet"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"Encrypt phone"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"Please charge your battery and try again."</string>
-    <string name="crypt_keeper_unplugged_text" msgid="2709721134148651329">"Please plug in your charger and try again."</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="1847280235529858357">"No lock-screen PIN or password"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="7210616262954236042">"You need to set a lock screen PIN or password before you can start encryption."</string>
-    <string name="crypt_keeper_confirm_title" msgid="8600000209722452230">"Encrypt?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="3270587498436152259">"The encryption operation is irreversible and if you interrupt it, you\'ll lose data. Encryption takes an hour or more, during which the tablet will restart several times."</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="3040428543349852419">"The encryption operation is irreversible and if you interrupt it, you\'ll lose data. Encryption takes an hour or more, during which the phone will restart several times."</string>
-    <string name="crypt_keeper_setup_title" msgid="3339725741305796680">"Encrypting"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="4417016995091289019">"Wait while your tablet is being encrypted. <xliff:g id="PERCENT">^1</xliff:g>% complete."</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="7902355422499500352">"Wait while your phone is being encrypted. <xliff:g id="PERCENT">^1</xliff:g>% complete."</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="8348188415839917821">"Wait while your tablet is being encrypted. Time remaining: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="8556105766597855198">"Wait while your phone is being encrypted. Time remaining: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="3832496715430327682">"To unlock your tablet, turn it off and then on."</string>
-    <string name="crypt_keeper_force_power_cycle" product="default" msgid="5070346039522135361">"To unlock your phone, turn it off and then on."</string>
-    <string name="crypt_keeper_warn_wipe" msgid="8104921337301750394">"Warning: Your device will be wiped after <xliff:g id="COUNT">^1</xliff:g> more failed attempts to be unlocked!"</string>
-    <string name="crypt_keeper_enter_password" msgid="1274917431075529732">"Type your password"</string>
-    <string name="crypt_keeper_failed_title" msgid="8173654570682244149">"Encryption unsuccessful"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"Encryption was interrupted and can\'t be completed. As a result, the data on your tablet is no longer accessible. \n\n To resume using your tablet, you need to perform a factory reset. When you set up your tablet after the reset, you\'ll have an opportunity to restore any data that was backed up to your Google Account."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"Encryption was interrupted and can\'t be completed. As a result, the data on your phone is no longer accessible. \n\nTo resume using your phone, you need to perform a factory reset. When you set up your phone after the reset, you\'ll have an opportunity to restore any data that was backed up to your Google Account."</string>
-    <string name="crypt_keeper_data_corrupt_title" msgid="5920153462176846037">"Decryption unsuccessful"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"The password that you entered is correct, but unfortunately your data is corrupt. \n\nTo resume using your tablet, you will need to perform a factory reset. When you set up your tablet after the reset, you\'ll have an opportunity to restore any data that was backed up to your Google Account."</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"The password that you entered is correct, but unfortunately your data is corrupt. \n\nTo resume using your phone, you need to perform a factory reset. When you set up your phone after the reset, you’ll have an opportunity to restore any data that was backed up to your Google Account."</string>
-    <string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"Switch input method"</string>
+    <string name="encryption_settings_title" msgid="2848716008695618360">"Encryption"</string>
+    <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"Encrypt tablet"</string>
+    <string name="encrypt_title" product="default" msgid="7337365190988321100">"Encrypt phone"</string>
+    <string name="encrypted_summary" msgid="545623487587251207">"Encrypted"</string>
     <string name="suggested_lock_settings_title" msgid="7836065447159730217">"Secure your phone"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"Set screen lock to protect tablet"</string>
     <string name="suggested_lock_settings_summary" product="device" msgid="8479766049078378225">"Set screen lock to protect device"</string>
@@ -817,6 +791,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"You may also need to type this PIN on the other device."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"You may also need to type this passkey on the other device."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"To pair with:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Make sure that it is showing this passkey:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Confirm to pair with the coordinated set"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"From:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Pair with this device?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"To pair with:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Type on it:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, then press Return or Enter."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Allow access to your contacts and call history"</string>
@@ -850,6 +825,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Couldn\'t connect. Try again."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Device details"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Device\'s Bluetooth address: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Device\'s Bluetooth address:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Forget device?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Remove association"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Disconnect app?"</string>
@@ -881,6 +857,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Remember settings"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Maximum connected Bluetooth audio devices"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Select maximum number of connected Bluetooth audio devices"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"NFC stack debug log"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Increase NFC stack logging level"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Cast"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"mirror"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Enable wireless display"</string>
@@ -1188,6 +1166,8 @@
     <string name="wifi_hotspot_maximize_compatibility_dual_ap_summary" msgid="3579549223159056533">"Helps other devices find this hotspot. Increases battery usage."</string>
     <string name="wifi_tether_starting" msgid="8879874184033857814">"Turning hotspot on…"</string>
     <string name="wifi_tether_stopping" msgid="4416492968019409188">"Turning off hotspot…"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_title" msgid="3089432578433978073">"Tethering unavailable"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_content" msgid="5920421547607921112">"Contact your operator for details"</string>
     <string name="wifi_tether_enabled_subtext" msgid="5085002421099821056">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> is active"</string>
     <string name="wifi_tether_failed_subtext" msgid="437190628041885500">"Portable Wi‑Fi hotspot error"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7072559431286459122">"Set up Wi‑Fi hotspot"</string>
@@ -2534,11 +2514,6 @@
     <string name="enable_service_title" msgid="7231533866953706788">"Allow <xliff:g id="SERVICE">%1$s</xliff:g> to have full control of your device?"</string>
     <string name="capabilities_list_title" msgid="1225853611983394386">"<xliff:g id="SERVICE">%1$s</xliff:g> needs to:"</string>
     <string name="touch_filtered_warning" msgid="4225815157460318241">"Because an app is obscuring a permission request, Settings can’t verify your response."</string>
-    <string name="enable_service_encryption_warning" msgid="931082737770453755">"If you turn on <xliff:g id="SERVICE">%1$s</xliff:g>, your device won’t use your screen lock to enhance data encryption."</string>
-    <string name="secure_lock_encryption_warning" msgid="669152607190123579">"Because you\'ve turned on an accessibility service, your device won’t use your screen lock to enhance data encryption."</string>
-    <string name="enable_service_pattern_reason" msgid="6832846117817938536">"Because turning on <xliff:g id="SERVICE">%1$s</xliff:g> affects data encryption, you need to confirm your pattern."</string>
-    <string name="enable_service_pin_reason" msgid="6040417014360237703">"Because turning on <xliff:g id="SERVICE">%1$s</xliff:g> affects data encryption, you need to confirm your PIN."</string>
-    <string name="enable_service_password_reason" msgid="6962544350351734238">"Because turning on <xliff:g id="SERVICE">%1$s</xliff:g> affects data encryption, you need to confirm your password."</string>
     <string name="accessibility_service_warning" msgid="6779187188736432618">"<xliff:g id="SERVICE">%1$s</xliff:g> is requesting full control of this device. The service can read the screen and act on behalf of users with accessibility needs. This level of control is not appropriate for most apps."</string>
     <string name="accessibility_service_warning_description" msgid="6573203795976134751">"Full control is appropriate for apps that help you with accessibility needs, but not for most apps."</string>
     <string name="accessibility_service_screen_control_title" msgid="324795030658109870">"View and control screen"</string>
@@ -2803,7 +2778,7 @@
     <string name="battery_desc_standby" product="tablet" msgid="5818742458684767043">"Battery used when tablet is idle"</string>
     <string name="battery_desc_standby" product="default" msgid="2543075041964578103">"Battery used when phone is idle"</string>
     <string name="battery_desc_radio" msgid="454677140485133914">"Battery used by mobile radio"</string>
-    <string name="battery_sugg_radio" msgid="5476234634503535270">"Switch to airplane mode to save power in areas with no cell coverage"</string>
+    <string name="battery_sugg_radio" msgid="5476234634503535270">"Switch to Airplane mode to save power in areas with no cell coverage"</string>
     <string name="battery_desc_flashlight" msgid="6694895513133361404">"Battery used by the flashlight"</string>
     <string name="battery_desc_camera" msgid="6152712271731518018">"Battery used by the camera"</string>
     <string name="battery_desc_display" msgid="7175017688954602685">"Battery used by the display and backlight"</string>
@@ -3103,14 +3078,6 @@
     <string name="remove_account_failed" msgid="3709502163548900644">"This change isn\'t allowed by your admin"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"Cannot sync manually"</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"Sync for this item is currently disabled. To change your preference, temporarily turn on background data and automatic sync."</string>
-    <string name="enter_password" msgid="6327051330258595331">"To start Android, enter your password"</string>
-    <string name="enter_pin" msgid="1029287617551232681">"To start Android, enter your PIN"</string>
-    <string name="enter_pattern" msgid="1747316785866742960">"To start Android, draw your pattern"</string>
-    <string name="cryptkeeper_wrong_pattern" msgid="340747269176120242">"Wrong Pattern"</string>
-    <string name="cryptkeeper_wrong_password" msgid="7295607881887114486">"Wrong Password"</string>
-    <string name="cryptkeeper_wrong_pin" msgid="2347961593970714201">"Wrong PIN"</string>
-    <string name="checking_decryption" msgid="6111642972615688237">"Checking…"</string>
-    <string name="starting_android" msgid="6694154070215356186">"Starting Android…"</string>
     <string name="delete" msgid="8330605554706263775">"Delete"</string>
     <string name="misc_files" msgid="6598066985800749585">"Misc. files"</string>
     <string name="misc_files_selected_count" msgid="5597802791672749532">"selected <xliff:g id="NUMBER">%1$d</xliff:g> out of <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -3206,8 +3173,6 @@
     <string name="data_usage_metered_yes" msgid="4262598072030135223">"Metered"</string>
     <string name="data_usage_metered_no" msgid="1685828958417926268">"Not metered"</string>
     <string name="data_usage_disclaimer" msgid="3271450299386176770">"Carrier data accounting may differ from your device."</string>
-    <string name="cryptkeeper_emergency_call" msgid="8369322820475703306">"Emergency call"</string>
-    <string name="cryptkeeper_return_to_call" msgid="3857250752781151232">"Return to call"</string>
     <string name="vpn_name" msgid="3806456074909253262">"Name"</string>
     <string name="vpn_type" msgid="5533202873260826663">"Type"</string>
     <string name="vpn_server" msgid="2908816134941973935">"Server address"</string>
@@ -4764,8 +4729,6 @@
       <item quantity="one">1 app can use unrestricted data</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"See more"</string>
-    <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"Really wipe user data and convert to file encryption?"</string>
-    <string name="button_confirm_convert_fbe" msgid="339648921918438106">"Wipe and convert"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"Reset ShortcutManager rate-limiting"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"ShortcutManager rate-limiting has been reset"</string>
     <string name="notification_suggestion_title" msgid="6309263655965785411">"Control info on lock screen"</string>
@@ -5292,6 +5255,7 @@
     <string name="sim_action_yes" msgid="8076556020131395515">"Yes"</string>
     <string name="sim_action_reboot" msgid="3508948833333441538">"Restart"</string>
     <string name="sim_action_no_thanks" msgid="435717748384544195">"No, thanks"</string>
+    <string name="sim_action_cancel" msgid="2668099867029610910">"Cancel"</string>
     <string name="sim_switch_button" msgid="1405772571706095387">"Switch"</string>
     <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Can’t activate SIM"</string>
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Remove the SIM and insert it again. If the problem continues, restart your device."</string>
@@ -5337,7 +5301,7 @@
     <string name="settings_panel_title" msgid="346363079938069215">"Settings Panel"</string>
     <string name="internet_connectivity_panel_title" msgid="2044237561024730108">"Internet Connectivity"</string>
     <string name="volume_connectivity_panel_title" msgid="8772438444782726321">"Volume"</string>
-    <string name="mobile_data_ap_mode_disabled" msgid="6067959496888990983">"Unavailable during airplane mode"</string>
+    <string name="mobile_data_ap_mode_disabled" msgid="6067959496888990983">"Unavailable in Airplane mode"</string>
     <string name="force_desktop_mode" msgid="1336913605091334238">"Force desktop mode"</string>
     <string name="force_desktop_mode_summary" msgid="4587416867846930479">"Force experimental desktop mode on secondary displays"</string>
     <string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Enable non-resizable in Multi-window"</string>
@@ -5374,7 +5338,7 @@
     <string name="media_output_switch_error_text" msgid="603563475910236831">"Can’t switch. Tap to try again"</string>
     <string name="wfc_disclaimer_title_text" msgid="4617195934203523503">"Important information"</string>
     <string name="wfc_disclaimer_agree_button_text" msgid="4082872292910770344">"CONTINUE"</string>
-    <string name="wfc_disclaimer_disagree_text" msgid="8424457394700137703">"NO THANKS"</string>
+    <string name="wfc_disclaimer_disagree_text" msgid="8424457394700137703">"NO, THANKS"</string>
     <string name="wfc_disclaimer_location_title_text" msgid="7913919887475418423">"Location"</string>
     <string name="wfc_disclaimer_location_desc_text" msgid="1417004513415772582">"Your operator may collect your location when you use this service for emergency calls.\n\nVisit your operator\'s privacy policy for details."</string>
     <string name="forget_passpoint_dialog_message" msgid="2433875063907365760">"You may lose access to any remaining time or data. Check with your provider before removing."</string>
@@ -5444,6 +5408,8 @@
     <string name="cached_apps_freezer" msgid="1057519579761550350">"Suspend execution for cached apps"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"Allow screen overlays on settings"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Allow apps that can display over other apps to overlay settings screens"</string>
+    <string name="allow_mock_modem" msgid="3832264806530479214">"Allow mock modem"</string>
+    <string name="allow_mock_modem_summary" msgid="9097416612748005374">"Allow this device to run mock modem service for instrumentation testing. Do not enable this during normal usage of the phone"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Media"</string>
     <string name="media_controls_resume_title" msgid="855076860336652370">"Pin media player"</string>
     <string name="media_controls_resume_description" msgid="3163482266454802097">"To quickly resume playback, media player stays open in Quick Settings"</string>
@@ -5560,7 +5526,7 @@
     <string name="request_manage_bluetooth_permission_dont_allow" msgid="8798061333407581300">"Don\'t allow"</string>
     <string name="uwb_settings_title" msgid="8578498712312002231">"Ultra-Wideband (UWB)"</string>
     <string name="uwb_settings_summary" msgid="3074271396764672268">"Helps identify the relative position of nearby devices that have UWB"</string>
-    <string name="uwb_settings_summary_airplane_mode" msgid="1328864888135086484">"Turn off aeroplane mode to use UWB"</string>
+    <string name="uwb_settings_summary_airplane_mode" msgid="1328864888135086484">"Turn off Airplane mode to use UWB"</string>
     <string name="camera_toggle_title" msgid="8952668677727244992">"Camera access"</string>
     <string name="mic_toggle_title" msgid="265145278323852547">"Microphone access"</string>
     <string name="cam_toggle_description" msgid="9212762204005146404">"For apps and services"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 19840a7..70d7783 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -142,10 +142,11 @@
     <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"Allow your device to communicate with nearby Bluetooth devices"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"Allow your phone to communicate with nearby Bluetooth devices"</string>
     <string name="bluetooth_disable_a2dp_hw_offload" msgid="5942913792817797541">"Disable Bluetooth A2DP hardware offload"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="8610420176339657720">"Restart Device?"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8333029144800835996">"You need to restart your device to change this setting."</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="3488695418187553566">"Restart"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="4930826928585464191">"Cancel"</string>
+    <string name="bluetooth_disable_le_audio_hw_offload" msgid="3966022676505972908">"Disable Bluetooth LE AUDIO hardware offload"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_title" msgid="6001142380445276918">"Restart device?"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_message" msgid="1524373895333698779">"You need to restart your device to change this setting."</string>
+    <string name="bluetooth_disable_hw_offload_dialog_confirm" msgid="5594859658551707592">"Restart"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel" msgid="3663690305043973720">"Cancel"</string>
     <string name="connected_device_media_device_title" msgid="3783388247594566734">"Media devices"</string>
     <string name="connected_device_call_device_title" msgid="88732390601723608">"Call devices"</string>
     <string name="connected_device_other_device_title" msgid="4652120430615729193">"Other devices"</string>
@@ -309,9 +310,9 @@
     <string name="security_settings_title" msgid="6710768415432791970">"Security"</string>
     <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"Encryption and credentials"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"Phone encrypted"</string>
-    <string name="decryption_settings_summary" product="default" msgid="1742645256103613503">"Phone not encrypted"</string>
+    <string name="not_encrypted_summary" product="default" msgid="2251945842585788254">"Phone not encrypted"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"Device encrypted"</string>
-    <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"Device not encrypted"</string>
+    <string name="not_encrypted_summary" product="tablet" msgid="2374263654698719382">"Device not encrypted"</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"Lock screen"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"What to show"</string>
     <string name="security_settings_summary" msgid="1627059516127354233">"Set My Location, screen unlock, SIM card lock, credential storage lock"</string>
@@ -481,7 +482,7 @@
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"Touch the sensor"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"Put your finger on the sensor and lift after you feel a vibration"</string>
     <string name="security_settings_udfps_enroll_start_message" msgid="5032954588171487566">"Keep your fingerprint flat on the sensor until you feel a vibration"</string>
-    <string name="security_settings_fingerprint_enroll_udfps_title" msgid="6665610134560896895">"Touch &amp; hold the fingerprint sensor"</string>
+    <string name="security_settings_fingerprint_enroll_udfps_title" msgid="6665610134560896895">"Touch and hold the fingerprint sensor"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"Lift, then touch again"</string>
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"One more time"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"Follow the fingerprint icon"</string>
@@ -568,37 +569,10 @@
     <string name="fingerprint_last_delete_message" msgid="7860374760549404410">"You won\'t be able to use your fingerprint to unlock your phone or verify that it\'s you in apps."</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="4104208067277655068">"You won\'t be able to use your fingerprint to unlock your work profile, authorise purchases or sign in to work apps."</string>
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"Yes, remove"</string>
-    <string name="crypt_keeper_settings_title" msgid="4938812137822100044">"Encryption"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"Encrypt tablet"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"Encrypt phone"</string>
-    <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"Encrypted"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"You can encrypt your accounts, settings, downloaded apps and their data, media and other files. After you encrypt your tablet, assuming you\'ve set up a screen lock (that is, a pattern or numeric PIN or password), you\'ll need to unlock the screen to decrypt the tablet every time you power it on. The only other way to decrypt is to perform a factory data reset, erasing all your data.\n\nEncryption takes an hour or more. You must start with a charged battery and keep your tablet plugged in throughout the process. If you interrupt it, you\'ll lose some or all of your data"</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"You can encrypt your accounts, settings, downloaded apps and their data, media and other files. After you encrypt your phone, assuming you\'ve set up a screen lock (that is, a pattern or numeric PIN or password), you\'ll need to unlock the screen to decrypt the phone every time you power it on. The only other way to decrypt is to perform a factory data reset, erasing all your data.\n\nEncryption takes an hour or more. You must start with a charged battery and keep your phone plugged in throughout the process. If you interrupt it, you\'ll lose some or all of your data."</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"Encrypt tablet"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"Encrypt phone"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"Please charge your battery and try again."</string>
-    <string name="crypt_keeper_unplugged_text" msgid="2709721134148651329">"Please plug in your charger and try again."</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="1847280235529858357">"No lock-screen PIN or password"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="7210616262954236042">"You need to set a lock screen PIN or password before you can start encryption."</string>
-    <string name="crypt_keeper_confirm_title" msgid="8600000209722452230">"Encrypt?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="3270587498436152259">"The encryption operation is irreversible and if you interrupt it, you\'ll lose data. Encryption takes an hour or more, during which the tablet will restart several times."</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="3040428543349852419">"The encryption operation is irreversible and if you interrupt it, you\'ll lose data. Encryption takes an hour or more, during which the phone will restart several times."</string>
-    <string name="crypt_keeper_setup_title" msgid="3339725741305796680">"Encrypting"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="4417016995091289019">"Wait while your tablet is being encrypted. <xliff:g id="PERCENT">^1</xliff:g>% complete."</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="7902355422499500352">"Wait while your phone is being encrypted. <xliff:g id="PERCENT">^1</xliff:g>% complete."</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="8348188415839917821">"Wait while your tablet is being encrypted. Time remaining: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="8556105766597855198">"Wait while your phone is being encrypted. Time remaining: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="3832496715430327682">"To unlock your tablet, turn it off and then on."</string>
-    <string name="crypt_keeper_force_power_cycle" product="default" msgid="5070346039522135361">"To unlock your phone, turn it off and then on."</string>
-    <string name="crypt_keeper_warn_wipe" msgid="8104921337301750394">"Warning: Your device will be wiped after <xliff:g id="COUNT">^1</xliff:g> more failed attempts to be unlocked!"</string>
-    <string name="crypt_keeper_enter_password" msgid="1274917431075529732">"Type your password"</string>
-    <string name="crypt_keeper_failed_title" msgid="8173654570682244149">"Encryption unsuccessful"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"Encryption was interrupted and can\'t be completed. As a result, the data on your tablet is no longer accessible. \n\n To resume using your tablet, you need to perform a factory reset. When you set up your tablet after the reset, you\'ll have an opportunity to restore any data that was backed up to your Google Account."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"Encryption was interrupted and can\'t be completed. As a result, the data on your phone is no longer accessible. \n\nTo resume using your phone, you need to perform a factory reset. When you set up your phone after the reset, you\'ll have an opportunity to restore any data that was backed up to your Google Account."</string>
-    <string name="crypt_keeper_data_corrupt_title" msgid="5920153462176846037">"Decryption unsuccessful"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"The password that you entered is correct, but unfortunately your data is corrupt. \n\nTo resume using your tablet, you will need to perform a factory reset. When you set up your tablet after the reset, you\'ll have an opportunity to restore any data that was backed up to your Google Account."</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"The password that you entered is correct, but unfortunately your data is corrupt. \n\nTo resume using your phone, you need to perform a factory reset. When you set up your phone after the reset, you’ll have an opportunity to restore any data that was backed up to your Google Account."</string>
-    <string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"Switch input method"</string>
+    <string name="encryption_settings_title" msgid="2848716008695618360">"Encryption"</string>
+    <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"Encrypt tablet"</string>
+    <string name="encrypt_title" product="default" msgid="7337365190988321100">"Encrypt phone"</string>
+    <string name="encrypted_summary" msgid="545623487587251207">"Encrypted"</string>
     <string name="suggested_lock_settings_title" msgid="7836065447159730217">"Secure your phone"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"Set screen lock to protect tablet"</string>
     <string name="suggested_lock_settings_summary" product="device" msgid="8479766049078378225">"Set screen lock to protect device"</string>
@@ -817,6 +791,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"You may also need to type this PIN on the other device."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"You may also need to type this passkey on the other device."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"To pair with:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Make sure that it is showing this passkey:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Confirm to pair with the coordinated set"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"From:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Pair with this device?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"To pair with:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Type on it:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, then press Return or Enter."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Allow access to your contacts and call history"</string>
@@ -850,6 +825,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Couldn\'t connect. Try again."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Device details"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Device\'s Bluetooth address: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Device\'s Bluetooth address:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Forget device?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Remove association"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Disconnect app?"</string>
@@ -881,6 +857,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Remember settings"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Maximum connected Bluetooth audio devices"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Select maximum number of connected Bluetooth audio devices"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"NFC stack debug log"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Increase NFC stack logging level"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Cast"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"mirror"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Enable wireless display"</string>
@@ -1188,6 +1166,8 @@
     <string name="wifi_hotspot_maximize_compatibility_dual_ap_summary" msgid="3579549223159056533">"Helps other devices find this hotspot. Increases battery usage."</string>
     <string name="wifi_tether_starting" msgid="8879874184033857814">"Turning hotspot on…"</string>
     <string name="wifi_tether_stopping" msgid="4416492968019409188">"Turning off hotspot…"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_title" msgid="3089432578433978073">"Tethering unavailable"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_content" msgid="5920421547607921112">"Contact your operator for details"</string>
     <string name="wifi_tether_enabled_subtext" msgid="5085002421099821056">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> is active"</string>
     <string name="wifi_tether_failed_subtext" msgid="437190628041885500">"Portable Wi‑Fi hotspot error"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7072559431286459122">"Set up Wi‑Fi hotspot"</string>
@@ -2534,11 +2514,6 @@
     <string name="enable_service_title" msgid="7231533866953706788">"Allow <xliff:g id="SERVICE">%1$s</xliff:g> to have full control of your device?"</string>
     <string name="capabilities_list_title" msgid="1225853611983394386">"<xliff:g id="SERVICE">%1$s</xliff:g> needs to:"</string>
     <string name="touch_filtered_warning" msgid="4225815157460318241">"Because an app is obscuring a permission request, Settings can’t verify your response."</string>
-    <string name="enable_service_encryption_warning" msgid="931082737770453755">"If you turn on <xliff:g id="SERVICE">%1$s</xliff:g>, your device won’t use your screen lock to enhance data encryption."</string>
-    <string name="secure_lock_encryption_warning" msgid="669152607190123579">"Because you\'ve turned on an accessibility service, your device won’t use your screen lock to enhance data encryption."</string>
-    <string name="enable_service_pattern_reason" msgid="6832846117817938536">"Because turning on <xliff:g id="SERVICE">%1$s</xliff:g> affects data encryption, you need to confirm your pattern."</string>
-    <string name="enable_service_pin_reason" msgid="6040417014360237703">"Because turning on <xliff:g id="SERVICE">%1$s</xliff:g> affects data encryption, you need to confirm your PIN."</string>
-    <string name="enable_service_password_reason" msgid="6962544350351734238">"Because turning on <xliff:g id="SERVICE">%1$s</xliff:g> affects data encryption, you need to confirm your password."</string>
     <string name="accessibility_service_warning" msgid="6779187188736432618">"<xliff:g id="SERVICE">%1$s</xliff:g> is requesting full control of this device. The service can read the screen and act on behalf of users with accessibility needs. This level of control is not appropriate for most apps."</string>
     <string name="accessibility_service_warning_description" msgid="6573203795976134751">"Full control is appropriate for apps that help you with accessibility needs, but not for most apps."</string>
     <string name="accessibility_service_screen_control_title" msgid="324795030658109870">"View and control screen"</string>
@@ -3103,14 +3078,6 @@
     <string name="remove_account_failed" msgid="3709502163548900644">"This change isn\'t allowed by your admin"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"Cannot sync manually"</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"Sync for this item is currently disabled. To change your preference, temporarily turn on background data and automatic sync."</string>
-    <string name="enter_password" msgid="6327051330258595331">"To start Android, enter your password"</string>
-    <string name="enter_pin" msgid="1029287617551232681">"To start Android, enter your PIN"</string>
-    <string name="enter_pattern" msgid="1747316785866742960">"To start Android, draw your pattern"</string>
-    <string name="cryptkeeper_wrong_pattern" msgid="340747269176120242">"Wrong Pattern"</string>
-    <string name="cryptkeeper_wrong_password" msgid="7295607881887114486">"Wrong Password"</string>
-    <string name="cryptkeeper_wrong_pin" msgid="2347961593970714201">"Wrong PIN"</string>
-    <string name="checking_decryption" msgid="6111642972615688237">"Checking…"</string>
-    <string name="starting_android" msgid="6694154070215356186">"Starting Android…"</string>
     <string name="delete" msgid="8330605554706263775">"Delete"</string>
     <string name="misc_files" msgid="6598066985800749585">"Misc. files"</string>
     <string name="misc_files_selected_count" msgid="5597802791672749532">"selected <xliff:g id="NUMBER">%1$d</xliff:g> out of <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -3206,8 +3173,6 @@
     <string name="data_usage_metered_yes" msgid="4262598072030135223">"Metered"</string>
     <string name="data_usage_metered_no" msgid="1685828958417926268">"Not metered"</string>
     <string name="data_usage_disclaimer" msgid="3271450299386176770">"Operator data accounting may differ from your device."</string>
-    <string name="cryptkeeper_emergency_call" msgid="8369322820475703306">"Emergency call"</string>
-    <string name="cryptkeeper_return_to_call" msgid="3857250752781151232">"Return to call"</string>
     <string name="vpn_name" msgid="3806456074909253262">"Name"</string>
     <string name="vpn_type" msgid="5533202873260826663">"Type"</string>
     <string name="vpn_server" msgid="2908816134941973935">"Server address"</string>
@@ -4764,8 +4729,6 @@
       <item quantity="one">1 app can use unrestricted data</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"See more"</string>
-    <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"Really wipe user data and convert to file encryption?"</string>
-    <string name="button_confirm_convert_fbe" msgid="339648921918438106">"Wipe and convert"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"Reset ShortcutManager rate-limiting"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"ShortcutManager rate-limiting has been reset"</string>
     <string name="notification_suggestion_title" msgid="6309263655965785411">"Control info on lock screen"</string>
@@ -5292,6 +5255,7 @@
     <string name="sim_action_yes" msgid="8076556020131395515">"Yes"</string>
     <string name="sim_action_reboot" msgid="3508948833333441538">"Restart"</string>
     <string name="sim_action_no_thanks" msgid="435717748384544195">"No, thanks"</string>
+    <string name="sim_action_cancel" msgid="2668099867029610910">"Cancel"</string>
     <string name="sim_switch_button" msgid="1405772571706095387">"Switch"</string>
     <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Can’t activate SIM"</string>
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Remove the SIM and insert it again. If the problem continues, restart your device."</string>
@@ -5374,7 +5338,7 @@
     <string name="media_output_switch_error_text" msgid="603563475910236831">"Can’t switch. Tap to try again"</string>
     <string name="wfc_disclaimer_title_text" msgid="4617195934203523503">"Important information"</string>
     <string name="wfc_disclaimer_agree_button_text" msgid="4082872292910770344">"CONTINUE"</string>
-    <string name="wfc_disclaimer_disagree_text" msgid="8424457394700137703">"NO THANKS"</string>
+    <string name="wfc_disclaimer_disagree_text" msgid="8424457394700137703">"NO, THANKS"</string>
     <string name="wfc_disclaimer_location_title_text" msgid="7913919887475418423">"Location"</string>
     <string name="wfc_disclaimer_location_desc_text" msgid="1417004513415772582">"Your operator may collect your location when you use this service for emergency calls.\n\nVisit your operator\'s privacy policy for details."</string>
     <string name="forget_passpoint_dialog_message" msgid="2433875063907365760">"You may lose access to any remaining time or data. Check with your provider before removing."</string>
@@ -5444,6 +5408,8 @@
     <string name="cached_apps_freezer" msgid="1057519579761550350">"Suspend execution for cached apps"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"Allow screen overlays on settings"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Allow apps that can display over other apps to overlay settings screens"</string>
+    <string name="allow_mock_modem" msgid="3832264806530479214">"Allow mock modem"</string>
+    <string name="allow_mock_modem_summary" msgid="9097416612748005374">"Allow this device to run mock modem service for instrumentation testing. Do not enable this during normal usage of the phone"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Media"</string>
     <string name="media_controls_resume_title" msgid="855076860336652370">"Pin media player"</string>
     <string name="media_controls_resume_description" msgid="3163482266454802097">"To quickly resume playback, media player stays open in Quick Settings"</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 0adec02..5d15627 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -142,10 +142,11 @@
     <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"Allow your device to communicate with nearby Bluetooth devices"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"Allow your phone to communicate with nearby Bluetooth devices"</string>
     <string name="bluetooth_disable_a2dp_hw_offload" msgid="5942913792817797541">"Disable Bluetooth A2DP hardware offload"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="8610420176339657720">"Restart Device?"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8333029144800835996">"You need to restart your device to change this setting."</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="3488695418187553566">"Restart"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="4930826928585464191">"Cancel"</string>
+    <string name="bluetooth_disable_le_audio_hw_offload" msgid="3966022676505972908">"Disable Bluetooth LE AUDIO hardware offload"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_title" msgid="6001142380445276918">"Restart device?"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_message" msgid="1524373895333698779">"You need to restart your device to change this setting."</string>
+    <string name="bluetooth_disable_hw_offload_dialog_confirm" msgid="5594859658551707592">"Restart"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel" msgid="3663690305043973720">"Cancel"</string>
     <string name="connected_device_media_device_title" msgid="3783388247594566734">"Media devices"</string>
     <string name="connected_device_call_device_title" msgid="88732390601723608">"Call devices"</string>
     <string name="connected_device_other_device_title" msgid="4652120430615729193">"Other devices"</string>
@@ -309,9 +310,9 @@
     <string name="security_settings_title" msgid="6710768415432791970">"Security"</string>
     <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"Encryption and credentials"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"Phone encrypted"</string>
-    <string name="decryption_settings_summary" product="default" msgid="1742645256103613503">"Phone not encrypted"</string>
+    <string name="not_encrypted_summary" product="default" msgid="2251945842585788254">"Phone not encrypted"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"Device encrypted"</string>
-    <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"Device not encrypted"</string>
+    <string name="not_encrypted_summary" product="tablet" msgid="2374263654698719382">"Device not encrypted"</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"Lock screen"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"What to show"</string>
     <string name="security_settings_summary" msgid="1627059516127354233">"Set My Location, screen unlock, SIM card lock, credential storage lock"</string>
@@ -481,7 +482,7 @@
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"Touch the sensor"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"Put your finger on the sensor and lift after you feel a vibration"</string>
     <string name="security_settings_udfps_enroll_start_message" msgid="5032954588171487566">"Keep your fingerprint flat on the sensor until you feel a vibration"</string>
-    <string name="security_settings_fingerprint_enroll_udfps_title" msgid="6665610134560896895">"Touch &amp; hold the fingerprint sensor"</string>
+    <string name="security_settings_fingerprint_enroll_udfps_title" msgid="6665610134560896895">"Touch and hold the fingerprint sensor"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"Lift, then touch again"</string>
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"One more time"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"Follow the fingerprint icon"</string>
@@ -568,37 +569,10 @@
     <string name="fingerprint_last_delete_message" msgid="7860374760549404410">"You won\'t be able to use your fingerprint to unlock your phone or verify that it\'s you in apps."</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="4104208067277655068">"You won\'t be able to use your fingerprint to unlock your work profile, authorise purchases or sign in to work apps."</string>
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"Yes, remove"</string>
-    <string name="crypt_keeper_settings_title" msgid="4938812137822100044">"Encryption"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"Encrypt tablet"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"Encrypt phone"</string>
-    <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"Encrypted"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"You can encrypt your accounts, settings, downloaded apps and their data, media and other files. After you encrypt your tablet, assuming you\'ve set up a screen lock (that is, a pattern or numeric PIN or password), you\'ll need to unlock the screen to decrypt the tablet every time you power it on. The only other way to decrypt is to perform a factory data reset, erasing all your data.\n\nEncryption takes an hour or more. You must start with a charged battery and keep your tablet plugged in throughout the process. If you interrupt it, you\'ll lose some or all of your data"</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"You can encrypt your accounts, settings, downloaded apps and their data, media and other files. After you encrypt your phone, assuming you\'ve set up a screen lock (that is, a pattern or numeric PIN or password), you\'ll need to unlock the screen to decrypt the phone every time you power it on. The only other way to decrypt is to perform a factory data reset, erasing all your data.\n\nEncryption takes an hour or more. You must start with a charged battery and keep your phone plugged in throughout the process. If you interrupt it, you\'ll lose some or all of your data."</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"Encrypt tablet"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"Encrypt phone"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"Please charge your battery and try again."</string>
-    <string name="crypt_keeper_unplugged_text" msgid="2709721134148651329">"Please plug in your charger and try again."</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="1847280235529858357">"No lock-screen PIN or password"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="7210616262954236042">"You need to set a lock screen PIN or password before you can start encryption."</string>
-    <string name="crypt_keeper_confirm_title" msgid="8600000209722452230">"Encrypt?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="3270587498436152259">"The encryption operation is irreversible and if you interrupt it, you\'ll lose data. Encryption takes an hour or more, during which the tablet will restart several times."</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="3040428543349852419">"The encryption operation is irreversible and if you interrupt it, you\'ll lose data. Encryption takes an hour or more, during which the phone will restart several times."</string>
-    <string name="crypt_keeper_setup_title" msgid="3339725741305796680">"Encrypting"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="4417016995091289019">"Wait while your tablet is being encrypted. <xliff:g id="PERCENT">^1</xliff:g>% complete."</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="7902355422499500352">"Wait while your phone is being encrypted. <xliff:g id="PERCENT">^1</xliff:g>% complete."</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="8348188415839917821">"Wait while your tablet is being encrypted. Time remaining: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="8556105766597855198">"Wait while your phone is being encrypted. Time remaining: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="3832496715430327682">"To unlock your tablet, turn it off and then on."</string>
-    <string name="crypt_keeper_force_power_cycle" product="default" msgid="5070346039522135361">"To unlock your phone, turn it off and then on."</string>
-    <string name="crypt_keeper_warn_wipe" msgid="8104921337301750394">"Warning: Your device will be wiped after <xliff:g id="COUNT">^1</xliff:g> more failed attempts to be unlocked!"</string>
-    <string name="crypt_keeper_enter_password" msgid="1274917431075529732">"Type your password"</string>
-    <string name="crypt_keeper_failed_title" msgid="8173654570682244149">"Encryption unsuccessful"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"Encryption was interrupted and can\'t be completed. As a result, the data on your tablet is no longer accessible. \n\n To resume using your tablet, you need to perform a factory reset. When you set up your tablet after the reset, you\'ll have an opportunity to restore any data that was backed up to your Google Account."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"Encryption was interrupted and can\'t be completed. As a result, the data on your phone is no longer accessible. \n\nTo resume using your phone, you need to perform a factory reset. When you set up your phone after the reset, you\'ll have an opportunity to restore any data that was backed up to your Google Account."</string>
-    <string name="crypt_keeper_data_corrupt_title" msgid="5920153462176846037">"Decryption unsuccessful"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"The password that you entered is correct, but unfortunately your data is corrupt. \n\nTo resume using your tablet, you will need to perform a factory reset. When you set up your tablet after the reset, you\'ll have an opportunity to restore any data that was backed up to your Google Account."</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"The password that you entered is correct, but unfortunately your data is corrupt. \n\nTo resume using your phone, you need to perform a factory reset. When you set up your phone after the reset, you’ll have an opportunity to restore any data that was backed up to your Google Account."</string>
-    <string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"Switch input method"</string>
+    <string name="encryption_settings_title" msgid="2848716008695618360">"Encryption"</string>
+    <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"Encrypt tablet"</string>
+    <string name="encrypt_title" product="default" msgid="7337365190988321100">"Encrypt phone"</string>
+    <string name="encrypted_summary" msgid="545623487587251207">"Encrypted"</string>
     <string name="suggested_lock_settings_title" msgid="7836065447159730217">"Secure your phone"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"Set screen lock to protect tablet"</string>
     <string name="suggested_lock_settings_summary" product="device" msgid="8479766049078378225">"Set screen lock to protect device"</string>
@@ -817,6 +791,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"You may also need to type this PIN on the other device."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"You may also need to type this passkey on the other device."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"To pair with:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Make sure that it is showing this passkey:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Confirm to pair with the coordinated set"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"From:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Pair with this device?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"To pair with:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Type on it:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, then press Return or Enter."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Allow access to your contacts and call history"</string>
@@ -850,6 +825,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Couldn\'t connect. Try again."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Device details"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Device\'s Bluetooth address: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Device\'s Bluetooth address:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Forget device?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Remove association"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Disconnect app?"</string>
@@ -881,6 +857,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Remember settings"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Maximum connected Bluetooth audio devices"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Select maximum number of connected Bluetooth audio devices"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"NFC stack debug log"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Increase NFC stack logging level"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Cast"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"mirror"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Enable wireless display"</string>
@@ -1188,6 +1166,8 @@
     <string name="wifi_hotspot_maximize_compatibility_dual_ap_summary" msgid="3579549223159056533">"Helps other devices find this hotspot. Increases battery usage."</string>
     <string name="wifi_tether_starting" msgid="8879874184033857814">"Turning hotspot on…"</string>
     <string name="wifi_tether_stopping" msgid="4416492968019409188">"Turning off hotspot…"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_title" msgid="3089432578433978073">"Tethering unavailable"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_content" msgid="5920421547607921112">"Contact your operator for details"</string>
     <string name="wifi_tether_enabled_subtext" msgid="5085002421099821056">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> is active"</string>
     <string name="wifi_tether_failed_subtext" msgid="437190628041885500">"Portable Wi‑Fi hotspot error"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7072559431286459122">"Set up Wi‑Fi hotspot"</string>
@@ -2534,11 +2514,6 @@
     <string name="enable_service_title" msgid="7231533866953706788">"Allow <xliff:g id="SERVICE">%1$s</xliff:g> to have full control of your device?"</string>
     <string name="capabilities_list_title" msgid="1225853611983394386">"<xliff:g id="SERVICE">%1$s</xliff:g> needs to:"</string>
     <string name="touch_filtered_warning" msgid="4225815157460318241">"Because an app is obscuring a permission request, Settings can’t verify your response."</string>
-    <string name="enable_service_encryption_warning" msgid="931082737770453755">"If you turn on <xliff:g id="SERVICE">%1$s</xliff:g>, your device won’t use your screen lock to enhance data encryption."</string>
-    <string name="secure_lock_encryption_warning" msgid="669152607190123579">"Because you\'ve turned on an accessibility service, your device won’t use your screen lock to enhance data encryption."</string>
-    <string name="enable_service_pattern_reason" msgid="6832846117817938536">"Because turning on <xliff:g id="SERVICE">%1$s</xliff:g> affects data encryption, you need to confirm your pattern."</string>
-    <string name="enable_service_pin_reason" msgid="6040417014360237703">"Because turning on <xliff:g id="SERVICE">%1$s</xliff:g> affects data encryption, you need to confirm your PIN."</string>
-    <string name="enable_service_password_reason" msgid="6962544350351734238">"Because turning on <xliff:g id="SERVICE">%1$s</xliff:g> affects data encryption, you need to confirm your password."</string>
     <string name="accessibility_service_warning" msgid="6779187188736432618">"<xliff:g id="SERVICE">%1$s</xliff:g> is requesting full control of this device. The service can read the screen and act on behalf of users with accessibility needs. This level of control is not appropriate for most apps."</string>
     <string name="accessibility_service_warning_description" msgid="6573203795976134751">"Full control is appropriate for apps that help you with accessibility needs, but not for most apps."</string>
     <string name="accessibility_service_screen_control_title" msgid="324795030658109870">"View and control screen"</string>
@@ -3103,14 +3078,6 @@
     <string name="remove_account_failed" msgid="3709502163548900644">"This change isn\'t allowed by your admin"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"Cannot sync manually"</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"Sync for this item is currently disabled. To change your preference, temporarily turn on background data and automatic sync."</string>
-    <string name="enter_password" msgid="6327051330258595331">"To start Android, enter your password"</string>
-    <string name="enter_pin" msgid="1029287617551232681">"To start Android, enter your PIN"</string>
-    <string name="enter_pattern" msgid="1747316785866742960">"To start Android, draw your pattern"</string>
-    <string name="cryptkeeper_wrong_pattern" msgid="340747269176120242">"Wrong Pattern"</string>
-    <string name="cryptkeeper_wrong_password" msgid="7295607881887114486">"Wrong Password"</string>
-    <string name="cryptkeeper_wrong_pin" msgid="2347961593970714201">"Wrong PIN"</string>
-    <string name="checking_decryption" msgid="6111642972615688237">"Checking…"</string>
-    <string name="starting_android" msgid="6694154070215356186">"Starting Android…"</string>
     <string name="delete" msgid="8330605554706263775">"Delete"</string>
     <string name="misc_files" msgid="6598066985800749585">"Misc. files"</string>
     <string name="misc_files_selected_count" msgid="5597802791672749532">"selected <xliff:g id="NUMBER">%1$d</xliff:g> out of <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -3206,8 +3173,6 @@
     <string name="data_usage_metered_yes" msgid="4262598072030135223">"Metered"</string>
     <string name="data_usage_metered_no" msgid="1685828958417926268">"Not metered"</string>
     <string name="data_usage_disclaimer" msgid="3271450299386176770">"Operator data accounting may differ from your device."</string>
-    <string name="cryptkeeper_emergency_call" msgid="8369322820475703306">"Emergency call"</string>
-    <string name="cryptkeeper_return_to_call" msgid="3857250752781151232">"Return to call"</string>
     <string name="vpn_name" msgid="3806456074909253262">"Name"</string>
     <string name="vpn_type" msgid="5533202873260826663">"Type"</string>
     <string name="vpn_server" msgid="2908816134941973935">"Server address"</string>
@@ -4764,8 +4729,6 @@
       <item quantity="one">1 app can use unrestricted data</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"See more"</string>
-    <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"Really wipe user data and convert to file encryption?"</string>
-    <string name="button_confirm_convert_fbe" msgid="339648921918438106">"Wipe and convert"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"Reset ShortcutManager rate-limiting"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"ShortcutManager rate-limiting has been reset"</string>
     <string name="notification_suggestion_title" msgid="6309263655965785411">"Control info on lock screen"</string>
@@ -5292,6 +5255,7 @@
     <string name="sim_action_yes" msgid="8076556020131395515">"Yes"</string>
     <string name="sim_action_reboot" msgid="3508948833333441538">"Restart"</string>
     <string name="sim_action_no_thanks" msgid="435717748384544195">"No, thanks"</string>
+    <string name="sim_action_cancel" msgid="2668099867029610910">"Cancel"</string>
     <string name="sim_switch_button" msgid="1405772571706095387">"Switch"</string>
     <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Can’t activate SIM"</string>
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Remove the SIM and insert it again. If the problem continues, restart your device."</string>
@@ -5374,7 +5338,7 @@
     <string name="media_output_switch_error_text" msgid="603563475910236831">"Can’t switch. Tap to try again"</string>
     <string name="wfc_disclaimer_title_text" msgid="4617195934203523503">"Important information"</string>
     <string name="wfc_disclaimer_agree_button_text" msgid="4082872292910770344">"CONTINUE"</string>
-    <string name="wfc_disclaimer_disagree_text" msgid="8424457394700137703">"NO THANKS"</string>
+    <string name="wfc_disclaimer_disagree_text" msgid="8424457394700137703">"NO, THANKS"</string>
     <string name="wfc_disclaimer_location_title_text" msgid="7913919887475418423">"Location"</string>
     <string name="wfc_disclaimer_location_desc_text" msgid="1417004513415772582">"Your operator may collect your location when you use this service for emergency calls.\n\nVisit your operator\'s privacy policy for details."</string>
     <string name="forget_passpoint_dialog_message" msgid="2433875063907365760">"You may lose access to any remaining time or data. Check with your provider before removing."</string>
@@ -5444,6 +5408,8 @@
     <string name="cached_apps_freezer" msgid="1057519579761550350">"Suspend execution for cached apps"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"Allow screen overlays on settings"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Allow apps that can display over other apps to overlay settings screens"</string>
+    <string name="allow_mock_modem" msgid="3832264806530479214">"Allow mock modem"</string>
+    <string name="allow_mock_modem_summary" msgid="9097416612748005374">"Allow this device to run mock modem service for instrumentation testing. Do not enable this during normal usage of the phone"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Media"</string>
     <string name="media_controls_resume_title" msgid="855076860336652370">"Pin media player"</string>
     <string name="media_controls_resume_description" msgid="3163482266454802097">"To quickly resume playback, media player stays open in Quick Settings"</string>
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
index c812f7f..cbd7076 100644
--- a/res/values-en-rXC/strings.xml
+++ b/res/values-en-rXC/strings.xml
@@ -142,10 +142,11 @@
     <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‎‎‏‏‎‏‎‏‏‏‎‏‎‎‏‎‏‎‏‏‎‏‎‎‏‏‎‎‏‎‏‏‏‎‏‏‏‏‏‏‎‎‏‏‏‏‎‎‏‎‏‎‎‎‎‏‏‎Allow your device to communicate with nearby Bluetooth devices‎‏‎‎‏‎"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‎‏‎‏‎‏‎‏‏‏‏‏‎‎‏‎‎‎‎‎‏‏‎‏‎‎‎‎‎‏‎‎‎‏‏‎‏‏‎‎‎‏‎‏‎‎‏‎‎‏‎‎‏‏‏‎‎‎Allow your phone to communicate with nearby Bluetooth devices‎‏‎‎‏‎"</string>
     <string name="bluetooth_disable_a2dp_hw_offload" msgid="5942913792817797541">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‎‎‏‏‏‏‎‎‏‎‏‏‏‏‎‎‎‏‎‎‏‏‎‏‏‏‎‎‎‏‏‏‏‏‎‏‎‏‏‎‎‏‎‎‏‏‎‎‏‏‎‏‎‎‏‎‏‎Disable Bluetooth A2DP hardware offload‎‏‎‎‏‎"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="8610420176339657720">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‎‏‏‏‏‏‏‎‎‏‎‏‏‎‏‏‏‎‎‎‎‏‏‏‏‏‎‎‏‎‎‏‏‎‎‏‎‏‎‎‏‏‏‎‎‎‏‏‏‏‏‏‏‎‎‎‎Restart Device?‎‏‎‎‏‎"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8333029144800835996">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‏‏‎‏‎‎‏‎‎‏‏‎‏‏‏‎‏‏‏‎‏‏‎‏‏‎‏‎‏‏‏‏‎‏‏‎‏‎‏‎‎‏‎‏‏‏‎‎‏‏‎‎‏‏‏‎‎‎You need to restart your device to change this setting.‎‏‎‎‏‎"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="3488695418187553566">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‎‎‏‏‎‏‎‏‎‎‏‎‏‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‏‎‏‎‏‎‎‏‏‎‏‎‎‎‎‏‏‎‏‏‎‎‎‏‏‏‏‎‎Restart‎‏‎‎‏‎"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="4930826928585464191">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‎‎‏‏‎‏‏‎‏‏‏‎‏‎‎‎‎‏‏‏‏‎‏‏‏‏‎‎‎‎‏‏‏‎‏‎‎‎‏‎‎‎‏‎‏‏‎‎‏‎‏‏‏‏‏‏‏‎Cancel‎‏‎‎‏‎"</string>
+    <string name="bluetooth_disable_le_audio_hw_offload" msgid="3966022676505972908">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‏‎‎‎‎‏‎‏‎‎‎‏‎‎‏‎‎‏‎‎‏‏‏‎‎‏‎‎‎‎‏‎‎‎‏‎‎‏‎‎‎‎‏‎‏‎‎‎‎‏‎‏‎‏‏‎‎‎Disable Bluetooth LE AUDIO hardware offload‎‏‎‎‏‎"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_title" msgid="6001142380445276918">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‎‏‎‎‏‎‎‎‎‏‎‏‎‏‏‏‎‎‏‏‎‎‏‏‎‎‎‏‏‎‎‎‏‏‏‏‏‎‏‏‏‎‎‏‏‎‏‎‏‏‏‏‎‏‏‎‎Restart Device?‎‏‎‎‏‎"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_message" msgid="1524373895333698779">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‏‎‎‏‎‎‏‏‏‏‎‏‎‏‎‎‏‏‏‏‏‏‎‏‏‎‎‏‏‏‎‎‎‎‎‏‏‏‏‏‎‎‏‎‏‏‏‎‎‏‏‎‏‏‎‏‏‎You need to restart your device to change this setting.‎‏‎‎‏‎"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_confirm" msgid="5594859658551707592">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‏‏‎‏‎‎‏‎‎‏‏‏‎‏‏‏‏‎‎‏‏‎‏‏‏‎‏‏‏‎‏‎‎‎‎‏‎‎‎‏‏‎‏‎‎‎‏‏‏‏‏‎‎‏‎‎‎‎Restart‎‏‎‎‏‎"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel" msgid="3663690305043973720">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‏‏‎‏‏‎‎‎‎‎‎‎‏‎‏‎‏‏‏‎‏‎‏‏‏‏‎‏‏‏‏‏‎‎‏‏‎‎‎‎‎‏‎‎‎‏‏‎‎‏‎‏‏‎‎‎‎Cancel‎‏‎‎‏‎"</string>
     <string name="connected_device_media_device_title" msgid="3783388247594566734">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‎‏‎‎‎‎‎‎‏‎‏‎‎‏‎‏‏‏‎‎‏‎‎‎‎‏‏‏‎‎‎‎‏‎‏‎‎‎‎‏‏‎‎‎‎‎‏‎‎‎‏‎‎‏‏‏‎‎Media devices‎‏‎‎‏‎"</string>
     <string name="connected_device_call_device_title" msgid="88732390601723608">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‎‏‏‎‎‏‏‏‎‏‏‎‎‏‏‏‏‎‏‏‎‏‎‎‎‏‏‏‎‎‏‏‏‎‏‏‏‏‎‎‎‏‏‎‎‎‎‏‏‏‎‏‏‎‏‏‎‎‎‎Call devices‎‏‎‎‏‎"</string>
     <string name="connected_device_other_device_title" msgid="4652120430615729193">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‏‏‏‎‏‎‎‏‏‎‏‏‏‎‎‎‏‎‎‎‏‏‎‏‏‏‎‎‏‏‎‎‎‎‎‎‎‏‎‏‎‎‎‎‏‎‏‎‎‏‎Other devices‎‏‎‎‏‎"</string>
@@ -309,9 +310,9 @@
     <string name="security_settings_title" msgid="6710768415432791970">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‎‎‏‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‎‎‎‏‏‎‎‏‎‎‏‏‏‏‎‎‏‎‎‎‎‏‎‏‎‏‏‏‏‎‏‎‎‎‏‎‎Security‎‏‎‎‏‎"</string>
     <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‏‎‏‎‎‎‏‎‏‎‏‏‏‎‏‎‏‏‎‏‏‎‏‏‎‏‏‏‎‏‎‏‏‏‎‎‎‏‎‏‏‎‏‏‏‏‏‎‎‏‏‏‎‎‏‏‏‎Encryption &amp; credentials‎‏‎‎‏‎"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‏‏‎‎‎‎‏‏‎‏‏‏‏‏‎‎‏‎‎‏‎‎‏‏‏‎‏‏‏‏‎‎‎‏‎‏‎‎‎‏‏‏‎‎‎‏‏‎‎‏‏‏‎‏‎‏‏‎Phone encrypted‎‏‎‎‏‎"</string>
-    <string name="decryption_settings_summary" product="default" msgid="1742645256103613503">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‏‎‎‎‏‏‏‏‎‏‎‏‎‎‎‎‎‏‎‏‎‎‎‏‏‏‎‎‏‎‎‏‏‎‏‎‏‎‏‎‎‎‎‏‏‏‏‏‏‎Phone not encrypted‎‏‎‎‏‎"</string>
+    <string name="not_encrypted_summary" product="default" msgid="2251945842585788254">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‎‏‎‎‎‎‎‎‏‎‎‎‎‏‎‎‏‏‎‏‎‎‎‎‎‎‎‎‎‎‎‎‏‎‏‏‏‏‏‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‎‎Phone not encrypted‎‏‎‎‏‎"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‎‎‏‏‎‏‎‎‏‏‎‏‎‏‏‏‎‎‏‏‎‏‎‎‏‏‎‎‏‏‏‏‏‏‏‏‏‎‏‏‎‏‎‎‏‎‎‎‎‎‏‎‏‎‎‎‎‎Device encrypted‎‏‎‎‏‎"</string>
-    <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‏‏‏‏‎‎‎‎‏‏‎‏‎‏‏‏‎‎‎‎‎‎‏‏‏‏‎‎‏‎‎‎‎‎‏‎‎‎‏‎‏‎‎‎‎‏‏‎‏‎‏‏‏‎‏‏‏‎Device not encrypted‎‏‎‎‏‎"</string>
+    <string name="not_encrypted_summary" product="tablet" msgid="2374263654698719382">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‎‏‏‏‏‎‎‏‏‎‎‎‏‎‏‎‎‎‎‏‏‎‏‏‎‏‏‏‎‏‏‎‏‎‏‏‏‎‎‎‎‎‎‎‏‏‎‎‎‏‎‎‏‎‏‏‎‎Device not encrypted‎‏‎‎‏‎"</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‎‏‎‏‏‎‏‎‎‏‏‎‏‎‎‏‎‎‎‎‏‎‏‎‎‏‎‏‎‏‎‎‎‎‎‎‎‏‎‏‎‏‏‎‎‏‏‎‏‎‎‏‎‏‏‎‏‎Lock screen‎‏‎‎‏‎"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‎‎‎‎‎‏‏‏‏‎‎‎‏‏‏‏‎‏‎‎‎‎‎‎‏‏‎‎‏‏‎‏‎‎‏‎‎‎‎‏‎‎‏‏‎‏‎‎‎‏‏‎‎What to show‎‏‎‎‏‎"</string>
     <string name="security_settings_summary" msgid="1627059516127354233">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‎‏‎‎‏‎‏‎‎‎‏‏‏‏‎‏‎‎‎‎‎‎‎‏‎‎‏‏‎‎‏‏‏‎‎‏‏‎‎‎‎‏‎‎‏‏‏‎‏‎‏‏‏‏‎‎‏‎Set My Location, screen unlock, SIM card lock, credential storage lock‎‏‎‎‏‎"</string>
@@ -568,37 +569,10 @@
     <string name="fingerprint_last_delete_message" msgid="7860374760549404410">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‏‎‎‎‏‎‏‎‏‏‎‏‎‏‎‎‏‎‎‏‏‎‎‏‎‏‏‎‏‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‎‏‏‏‎‏‏‏‏‏‎‏‎‎You won\'t be able to use your fingerprint to unlock your phone or verify it\'s you in apps.‎‏‎‎‏‎"</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="4104208067277655068">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‎‏‏‏‏‎‏‎‏‎‎‎‏‎‎‏‏‎‏‏‏‏‏‎‏‏‏‏‏‏‏‏‎‎‏‏‎‎‎‎‎‏‎‎‎‏‏‎‎‎‎‎‏‏‏‎‎‎You won\'t be able to use your fingerprint to unlock your work profile, authorize purchases, or sign in to work apps.‎‏‎‎‏‎"</string>
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‏‏‎‏‏‏‎‎‏‏‏‏‎‎‎‎‎‎‎‎‏‎‏‏‏‏‏‏‎‎‎‏‏‎‎‏‏‎‎‏‎‎‎‏‏‏‏‏‏‏‎‏‏‏‎‏‏‎Yes, remove‎‏‎‎‏‎"</string>
-    <string name="crypt_keeper_settings_title" msgid="4938812137822100044">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‎‏‎‎‎‏‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‎‏‏‏‎‏‏‏‏‎‏‎‎‎‏‏‎‎‎‎‏‏‎‏‎‎‏‎‎‏‏‎‎‎Encryption‎‏‎‎‏‎"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‏‏‎‏‏‏‎‏‎‎‎‎‏‎‏‏‎‏‏‏‎‎‏‏‏‎‎‎‎‎‎‏‎‏‏‎‏‎‎‏‏‎‎‏‏‎‎‏‎‏‏‎‏‎‎‎‎Encrypt tablet‎‏‎‎‏‎"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‏‎‎‏‏‏‎‎‏‏‎‏‏‏‎‏‏‏‎‎‏‏‎‏‏‎‏‏‏‎‎‏‎‎‏‏‎‏‏‏‏‏‎‎‏‏‏‏‏‏‏‎‎‎‎‎‏‎Encrypt phone‎‏‎‎‏‎"</string>
-    <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‏‏‎‏‎‏‎‎‎‏‎‎‎‎‏‏‎‏‏‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‎‏‎‎‎‎‎‏‏‎‎‎‏‎‎‏‎‎‎‎‏‏‏‎Encrypted‎‏‎‎‏‎"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‎‏‏‏‏‎‏‎‎‎‎‏‎‏‎‏‎‎‎‎‎‎‏‏‏‎‏‏‎‎‏‏‎‎‏‎‏‎‏‎‎‏‎‎‏‏‏‎‎‎‎‏‏‏‎‎‎‎You can encrypt your accounts, settings, downloaded apps and their data, media, and other files. After you encrypt your tablet, assuming you’ve set up a screen lock (that is, a pattern or numeric PIN or password), you’ll need to unlock the screen to decrypt the tablet every time you power it on. The only other way to decrypt is to perform a factory data reset, erasing all your data.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Encryption takes an hour or more. You must start with a charged battery and keep your tablet plugged in throughout the process. If you interrupt it, you’ll lose some or all of your data‎‏‎‎‏‎"</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‏‏‏‎‎‎‏‏‎‏‏‎‏‏‎‎‎‏‏‏‎‏‎‏‏‎‏‎‏‏‎‎‎‎‎‏‏‎‎‎‏‎‏‏‏‎‏‏‏‏‎‏‏‏‏‎‎‎You can encrypt your accounts, settings, downloaded apps and their data, media, and other files. After you encrypt your phone, assuming you’ve set up a screen lock (that is, a pattern or numeric PIN or password), you’ll need to unlock the screen to decrypt the phone every time you power it on. The only other way to decrypt is to perform a factory data reset, erasing all your data.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Encryption takes an hour or more. You must start with a charged battery and keep your phone plugged in throughout the process. If you interrupt it, you’ll lose some or all of your data.‎‏‎‎‏‎"</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‏‎‎‎‎‏‎‏‏‎‏‎‎‎‏‏‎‎‎‎‏‎‎‏‎‏‎‏‏‎‏‎‎‎‎‏‏‎‎‏‏‏‏‎‏‏‎‏‏‏‏‏‏‏‏‏‏‎Encrypt tablet‎‏‎‎‏‎"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‎‏‏‎‎‏‏‏‏‏‏‏‎‏‏‎‎‎‏‏‏‎‏‎‏‎‏‎‎‏‎‏‎‎‏‏‏‎‎‏‏‏‏‎‎‎‏‎‎‏‎‏‏‎‎‎‎Encrypt phone‎‏‎‎‏‎"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‎‎‏‎‎‎‏‏‏‏‎‏‎‏‎‎‏‎‏‎‎‏‎‎‎‏‎‎‏‎‏‏‏‏‏‏‎‏‎‏‎‏‎‎‎‎‏‎‎‎‎‎‎‏‎‎‏‎Charge your battery and try again.‎‏‎‎‏‎"</string>
-    <string name="crypt_keeper_unplugged_text" msgid="2709721134148651329">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‏‏‎‎‏‏‎‏‎‏‏‎‏‏‏‎‏‎‎‎‎‎‎‏‏‏‏‎‎‏‎‎‏‎‏‎‎‏‏‎‎‏‎‎‎‏‎‎‏‎‏‎‎‎‎‎‏‎Plug in your charger and try again.‎‏‎‎‏‎"</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="1847280235529858357">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‏‏‎‏‎‎‎‏‎‏‏‎‏‏‎‏‏‏‎‎‏‎‏‏‎‎‎‏‏‏‏‏‏‎‏‎‏‏‎‏‏‎‏‏‎‏‏‎‏‎‎‏‏‎‏‎‏‎No lock screen PIN or password‎‏‎‎‏‎"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="7210616262954236042">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‎‎‎‎‏‎‎‎‏‎‏‎‎‎‎‎‏‎‏‎‎‏‎‎‏‏‎‏‎‎‏‎‏‎‎‎‎‏‎‏‎‏‎‏‏‏‎‎‎‏‎‎‎‏‎‏‎‎You need to set a lock screen PIN or password before you can start encryption.‎‏‎‎‏‎"</string>
-    <string name="crypt_keeper_confirm_title" msgid="8600000209722452230">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‎‏‎‏‏‎‎‏‎‏‎‏‎‏‏‎‏‎‏‎‎‎‎‎‎‏‎‎‎‎‎‎‏‏‎‎‏‎‏‎‏‎‏‎‏‎‎‏‎‎‎‎‎‏‏‎‎Encrypt?‎‏‎‎‏‎"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="3270587498436152259">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‏‎‏‏‎‎‎‏‏‎‏‏‏‎‏‏‎‎‎‎‎‎‎‎‎‎‏‏‎‎‎‏‏‎‎‎‏‏‏‏‎‏‏‎‎‏‎‏‏‏‏‎‎‎‎‏‏‎The encryption operation is irreversible and if you interrupt it, you’ll lose data. Encryption takes an hour or more, during which the tablet will restart several times.‎‏‎‎‏‎"</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="3040428543349852419">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‎‎‎‏‏‎‎‎‏‏‏‎‎‎‏‎‏‏‎‏‎‎‏‏‎‏‎‏‏‏‎‏‏‎‏‎‏‎‎‏‏‏‎‎‎‏‎‎‏‎‎‎‎‎‎‏‏‎The encryption operation is irreversible and if you interrupt it, you’ll lose data. Encryption takes an hour or more, during which the phone will restart several times.‎‏‎‎‏‎"</string>
-    <string name="crypt_keeper_setup_title" msgid="3339725741305796680">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‎‎‏‎‏‏‎‎‏‎‎‎‏‎‏‏‎‏‏‎‏‏‏‎‏‏‏‏‏‏‎‎‏‏‏‎‎‎‎‏‎‏‎‎‏‏‎‎‎‎‏‎‎‏‎‎‎‎Encrypting‎‏‎‎‏‎"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="4417016995091289019">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‏‎‏‎‎‏‏‎‎‎‏‏‎‎‏‎‏‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‏‎‎‎‏‏‏‏‎‎‏‎‎‏‏‏‎‏‏‏‎‏‏‎Wait while your tablet is being encrypted. ‎‏‎‎‏‏‎<xliff:g id="PERCENT">^1</xliff:g>‎‏‎‎‏‏‏‎% complete.‎‏‎‎‏‎"</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="7902355422499500352">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‏‏‎‏‎‏‎‏‎‏‏‎‎‏‏‏‎‎‏‏‎‎‎‏‏‎‏‏‎‎‏‏‎‏‏‏‏‎‏‏‎‏‏‏‏‎‎‎‏‎‏‎‎‎‎‎‎‎Wait while your phone is being encrypted. ‎‏‎‎‏‏‎<xliff:g id="PERCENT">^1</xliff:g>‎‏‎‎‏‏‏‎% complete.‎‏‎‎‏‎"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="8348188415839917821">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‏‏‏‎‏‏‎‏‎‏‎‏‏‏‎‎‏‎‎‏‎‎‎‏‎‎‎‏‏‎‏‎‎‎‎‏‎‏‎‏‏‎‏‎‏‎‏‏‎‏‏‏‏‏‏‎‏‎Wait while your tablet is being encrypted. Time remaining: ‎‏‎‎‏‏‎<xliff:g id="DURATION">^1</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="8556105766597855198">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‏‎‏‏‏‏‎‏‎‏‏‎‎‏‎‎‏‏‎‏‏‏‎‎‏‏‎‎‏‏‏‎‏‎‏‏‏‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‏‏‎‎Wait while your phone is being encrypted. Time remaining: ‎‏‎‎‏‏‎<xliff:g id="DURATION">^1</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="3832496715430327682">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‏‎‎‏‎‏‏‏‏‏‏‎‎‎‎‏‏‎‏‏‏‎‏‎‏‎‎‎‎‏‏‏‎‎‎‎‏‎‎‏‏‎‏‏‏‎‏‎‏‏‎‎‎‎‎‏‎‎To unlock your tablet, turn it off and then on.‎‏‎‎‏‎"</string>
-    <string name="crypt_keeper_force_power_cycle" product="default" msgid="5070346039522135361">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‎‎‏‎‏‏‏‎‏‎‏‏‏‏‏‎‎‏‏‎‏‏‎‏‏‏‏‏‎‏‏‏‎‎‎‎‎‎‏‏‎‏‎‎‎‏‏‎‏‎‏‎‎‎‎‎‏‎To unlock your phone, turn it off and then on.‎‏‎‎‏‎"</string>
-    <string name="crypt_keeper_warn_wipe" msgid="8104921337301750394">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‏‏‎‏‏‏‎‎‎‎‎‎‏‏‏‎‏‏‏‎‏‎‎‏‎‏‏‎‏‎‏‏‎‏‎‎‏‎‎‏‏‏‏‎‏‎‎Warning: Your device will be wiped after ‎‏‎‎‏‏‎<xliff:g id="COUNT">^1</xliff:g>‎‏‎‎‏‏‏‎ more failed attempts to be unlocked!‎‏‎‎‏‎"</string>
-    <string name="crypt_keeper_enter_password" msgid="1274917431075529732">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‏‏‎‏‏‎‎‎‏‎‏‏‎‏‎‏‎‏‎‏‎‎‏‏‎‎‎‎‏‎‏‎‏‎‎‏‏‎‏‎‏‏‏‏‎‎‏‎‎‎‎‎‎‎‏‎‎‎Type your password‎‏‎‎‏‎"</string>
-    <string name="crypt_keeper_failed_title" msgid="8173654570682244149">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‎‏‏‎‏‏‏‎‏‎‏‎‎‏‏‏‏‎‎‎‎‏‏‎‏‎‏‏‎‎‏‎‎‏‎‎‎‎‏‏‎‏‎‏‏‏‎‎‎‎‏‏‎‏‎‏‎Encryption unsuccessful‎‏‎‎‏‎"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‎‎‏‏‏‎‏‎‏‏‏‎‏‎‏‏‎‏‏‎‎‏‎‎‏‏‎‎‏‎‏‏‎‎‏‏‎‎Encryption was interrupted and can’t complete. As a result, the data on your tablet is no longer accessible. ‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎ To resume using your tablet, you need to perform a factory reset. When you set up your tablet after the reset, you’ll have an opportunity to restore any data that was backed up to your Google Account.‎‏‎‎‏‎"</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‎‎‏‎‎‎‏‏‎‏‎‏‏‏‏‎‎‏‎‏‎‎‏‏‏‏‎‏‎‎‎‏‎‎‏‏‎‏‎‎‏‏‎‏‎‏‎‎‏‏‎‎‏‎‏‎‏‎Encryption was interrupted and can’t complete. As a result, the data on your phone is no longer accessible. ‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎To resume using your phone, you need to perform a factory reset. When you set up your phone after the reset, you’ll have an opportunity to restore any data that was backed up to your Google Account.‎‏‎‎‏‎"</string>
-    <string name="crypt_keeper_data_corrupt_title" msgid="5920153462176846037">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‎‎‎‏‎‏‎‎‎‏‎‎‏‏‏‎‎‎‎‏‏‎‏‎‏‎‎‏‎‎‎‎‎‏‏‎‏‏‎‎‏‏‎‎‏‎‎‎‎‏‏‎‏‎‏‎‏‎Decryption unsuccessful‎‏‎‎‏‎"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‏‎‏‎‏‏‎‎‏‎‏‎‏‏‏‎‎‏‏‏‏‎‎‏‎‏‎‎‎‎‏‏‏‎‎‎‏‏‏‎‏‏‎‏‎‏‏‏‎‎‎‎‎‎‎‎‏‎The password you entered is correct, but unfortunately your data is corrupt. ‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎To resume using your tablet, you need to perform a factory reset. When you set up your tablet after the reset, you’ll have an opportunity to restore any data that was backed up to your Google Account.‎‏‎‎‏‎"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‎‎‏‏‎‏‎‏‎‎‏‏‏‎‏‎‎‏‎‏‏‎‎‎‏‏‏‎‎‏‏‏‏‎‏‏‏‎‎‏‏‏‎‎‏‏‎‏‏‏‏‎‎‏‏‏‏‎The password you entered is correct, but unfortunately your data is corrupt. ‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎To resume using your phone, you need to perform a factory reset. When you set up your phone after the reset, you’ll have an opportunity to restore any data that was backed up to your Google Account.‎‏‎‎‏‎"</string>
-    <string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‏‎‎‎‎‏‎‎‏‎‎‏‎‎‎‎‏‎‎‎‎‎‎‏‏‎‏‎‏‎‎‎‏‏‏‎‎‏‎‎‏‏‎‎‏‏‎‏‏‎‏‏‎‏‏‎‏‎Switch input method‎‏‎‎‏‎"</string>
+    <string name="encryption_settings_title" msgid="2848716008695618360">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‏‏‎‎‎‏‎‎‎‏‎‏‎‏‏‎‎‎‎‎‏‏‏‎‏‏‏‏‎‎‏‎‎‎‏‎‎‎‏‎‏‎‏‎‏‏‎‏‏‎‎‏‏‏‎‎‎‎Encryption‎‏‎‎‏‎"</string>
+    <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‎‎‏‏‏‎‏‏‎‏‏‎‏‏‏‏‎‏‎‎‏‏‏‎‎‎‎‏‏‎‎‏‏‎‎‏‎‎‏‏‎‏‏‎‎‏‎‏‎‏‏‏‏‎‎‏‏‎Encrypt tablet‎‏‎‎‏‎"</string>
+    <string name="encrypt_title" product="default" msgid="7337365190988321100">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‏‏‎‏‎‎‏‏‏‎‎‎‏‏‏‎‏‏‎‎‎‏‎‎‎‎‏‎‎‏‎‎‎‎‏‎‏‏‎‎‏‏‎‏‎‎‎‏‎‏‎‎‏‏‎‎‎Encrypt phone‎‏‎‎‏‎"</string>
+    <string name="encrypted_summary" msgid="545623487587251207">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‏‎‎‏‎‎‏‎‎‏‏‏‎‎‎‏‏‎‏‎‏‎‏‏‏‏‎‎‏‏‏‎‏‎‏‏‏‏‏‏‎‏‏‏‎‏‎‎‎‎‎‎‎‏‏‏‎Encrypted‎‏‎‎‏‎"</string>
     <string name="suggested_lock_settings_title" msgid="7836065447159730217">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‎‏‎‏‏‏‏‏‏‎‏‎‎‏‏‎‎‎‎‎‎‎‎‎‏‏‏‎‎‎‏‏‎‏‎‏‎‏‎‏‏‎‎‎‏‎‎‎‎‎‎‏‎‏‎‎‏‎Secure your phone‎‏‎‎‏‎"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‎‏‎‎‏‏‎‎‏‎‏‏‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‎‏‏‏‏‎‎‎‎‎‏‎‎‎‎‎‏‏‎‎‎‎‎‏‎‏‏‎‏‎‎Set screen lock to protect tablet‎‏‎‎‏‎"</string>
     <string name="suggested_lock_settings_summary" product="device" msgid="8479766049078378225">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‏‎‏‎‏‏‏‎‎‎‏‎‏‏‏‎‎‏‎‎‏‎‏‏‎‎‏‏‏‏‎‏‏‎‏‏‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‏‎‎‎‏‎Set screen lock to protect device‎‏‎‎‏‎"</string>
@@ -817,6 +791,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‏‎‎‎‎‎‎‏‎‏‏‎‎‏‏‎‎‎‎‎‎‏‏‏‎‏‏‏‏‏‏‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‎‎‏‏‎‏‏‎‏‎You may also need to type this PIN on the other device.‎‏‎‎‏‎"</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‏‏‎‎‎‏‏‎‎‏‏‏‎‏‎‏‎‎‎‎‏‎‎‎‏‏‎‎‎‏‎‏‏‎‎‏‎‎‎‏‏‎‏‏‏‎‏‎‎‏‎‎‎‏‎‏‎You may also need to type this passkey on the other device.‎‏‎‎‏‎"</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‎‏‎‎‎‏‎‏‎‎‏‏‎‏‎‏‏‏‎‏‎‏‏‎‎‎‎‏‏‏‏‏‎‏‎‏‏‏‎‎‏‏‎‎‏‏‎‎‏‏‎‎‎‏‎‎‎‎To pair with:&lt;br&gt;&lt;b&gt;‎‏‎‎‏‏‎<xliff:g id="DEVICE_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎&lt;/b&gt;&lt;br&gt;&lt;br&gt;Make sure it is showing this passkey:&lt;br&gt;&lt;b&gt;‎‏‎‎‏‏‎<xliff:g id="PASSKEY">%2$s</xliff:g>‎‏‎‎‏‏‏‎&lt;/b&gt;‎‏‎‎‏‎"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‎‎‏‎‎‏‎‏‎‎‏‎‎‏‏‏‏‏‎‏‎‏‏‎‎‏‎‎‎‎‎‏‎‏‎‏‏‏‎‏‏‏‎‎‏‎‏‎‎‎Confirm to pair with the coordinated set‎‏‎‎‏‎"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‎‏‏‎‏‎‎‏‎‏‎‏‏‏‏‎‎‏‎‏‏‎‎‎‎‎‏‏‏‏‏‏‎‏‎‏‏‏‎‎‏‏‎‏‏‏‏‎‏‏‎‏‎‏‎‏‏‎From:&lt;br&gt;&lt;b&gt;‎‏‎‎‏‏‎<xliff:g id="DEVICE_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎&lt;/b&gt;&lt;br&gt;&lt;br&gt;Pair with this device?‎‏‎‎‏‎"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‎‏‎‏‏‎‏‏‏‏‏‏‏‏‎‏‎‎‏‎‎‏‎‏‏‎‎‎‏‏‎‎‏‏‏‎‏‎‏‎‎‎‎‎‎‏‏‎‎‎‎‏‏‎‎‏‎To pair with:‎‏‎‎‏‏‎<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎<xliff:g id="DEVICE_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎<xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>‎‏‎‎‏‏‏‎Type on it:‎‏‎‎‏‏‎<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎<xliff:g id="PASSKEY">%2$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎<xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>‎‏‎‎‏‏‏‎, then press Return or Enter.‎‏‎‎‏‎"</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‎‎‎‎‏‎‏‎‎‏‏‎‏‏‎‏‎‎‏‎‎‎‎‏‏‏‎‎‎‎‎‎‎‎‏‎‏‎‏‏‎‏‏‎‎‏‎‏‎‎‏‏‎‏‎‏‏‎Allow access to your contacts and call history‎‏‎‎‏‎"</string>
@@ -850,6 +825,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‏‏‎‎‎‏‎‎‎‎‏‎‏‏‏‏‏‏‎‎‏‎‎‎‏‎‏‎‎‎‎‎‎‏‏‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‎‎‏‏‏‎‏‎Couldn\'t connect. Try again.‎‏‎‎‏‎"</string>
     <string name="device_details_title" msgid="1155622417516195481">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‎‎‎‎‎‏‎‎‏‏‎‎‏‏‎‎‎‎‏‏‏‎‏‏‏‎‏‎‎‏‎‏‎‏‎‎‎‎‏‏‏‏‏‏‎‏‏‏‎‏‎‎‏‏‎‎‏‎Device details‎‏‎‎‏‎"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‏‏‎‏‎‎‎‎‏‏‎‎‎‎‏‏‏‎‏‎‏‎‏‎‏‏‏‏‎‎‏‎‏‏‎‏‎‏‎‏‎‏‏‎‎‏‎‏‎‏‎‎‏‏‏‏‏‎Device\'s Bluetooth address: ‎‏‎‎‏‏‎<xliff:g id="ADDRESS">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‎‎‎‎‏‎‎‎‎‏‎‎‎‏‎‎‏‏‏‎‎‏‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‎‏‎‎‎‎‎‎‏‎‏‎‎‏‏‎‎‎‎‎Device\'s Bluetooth address:‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎<xliff:g id="ADDRESS">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‎‎‏‎‏‏‏‎‎‏‎‏‏‏‏‎‏‏‏‎‏‎‎‏‏‏‏‏‏‏‏‏‏‎‎‏‏‎‏‏‏‏‎‏‏‏‎‎‎‎‎‎‎‎‎‏‏‎Forget device?‎‏‎‎‏‎"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‎‏‏‏‎‎‏‎‏‎‎‎‎‏‎‎‏‏‎‎‏‎‏‏‏‎‎‏‏‏‎‎‎‏‎‏‎‏‎‎‏‎‎‏‏‏‏‎‎‏‎‎‏‏‏‏‎Remove association‎‏‎‎‏‎"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‎‏‎‏‎‏‎‎‎‏‎‏‏‎‎‎‎‏‎‎‎‏‎‏‏‎‏‎‏‏‏‎‏‎‎‎‎‏‎‏‎‎‏‎‎‏‏‎‎‏‏‎‏‏‎‎‏‎Disconnect App?‎‏‎‎‏‎"</string>
@@ -881,6 +857,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‏‎‎‎‎‏‏‎‏‏‏‏‏‏‏‏‎‏‏‎‏‏‏‏‏‏‎‏‏‎‎‏‎‎‎‎‏‎‏‏‏‎‏‏‏‎‏‏‎‏‏‎‎‎‎‎‏‎Remember settings‎‏‎‎‏‎"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‏‎‎‏‏‎‏‏‏‏‎‏‏‎‏‎‏‎‏‎‎‎‎‎‏‎‎‎‏‏‏‎‎‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‏‎‏‏‏‏‎Maximum connected Bluetooth audio devices‎‏‎‎‏‎"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‎‎‏‎‎‏‏‎‎‏‎‏‏‎‎‎‎‏‏‎‎‎‏‎‏‏‎‏‎‎‎‏‏‎‎‏‏‎‏‏‏‎‎‎‎‎‏‏‎‎‏‎‏‏‎‎‏‎Select maximum number of connected Bluetooth audio devices‎‏‎‎‏‎"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‎‏‎‎‏‏‏‎‏‏‏‏‎‎‏‏‎‎‎‏‎‎‏‏‎‏‎‏‏‎‏‏‎‏‎‎‎‎‎‎‎‏‏‏‏‎‏‎‎‎‏‎‎‎‎‎‏‎NFC stack debug log‎‏‎‎‏‎"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‏‏‎‎‎‏‎‎‏‏‎‎‎‏‏‏‎‎‏‏‎‎‎‏‎‎‏‏‏‏‎‎‏‎‏‎‏‎‏‎‎‏‎‏‏‎‎‏‏‏‎‏‏‎‎‏‎Increase NFC stack logging level‎‏‎‎‏‎"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‏‏‎‎‎‏‎‎‎‏‏‎‎‎‏‏‏‎‏‎‏‎‎‎‎‏‎‎‏‏‏‏‎‎‏‎‎‎‏‏‎‎‏‏‎‎‏‎‏‎‎‏‎‏‏‏‏‎Cast‎‏‎‎‏‎"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‏‏‏‎‏‏‎‎‏‏‏‏‎‎‏‏‎‎‏‎‎‏‏‏‏‏‏‎‏‏‎‎‏‎‏‎‎‎‎‏‏‏‏‎‎‏‎‏‎‎‎‎‏‎‏‏‏‎mirror‎‏‎‎‏‎"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‎‏‎‎‏‎‏‎‏‎‎‎‏‏‎‎‎‏‏‏‎‏‏‏‏‏‎‎‏‏‎‏‏‎‎‎‏‏‏‏‏‎‏‏‏‎‏‏‎‏‏‏‏‎‏‏‎‎Enable wireless display‎‏‎‎‏‎"</string>
@@ -1188,6 +1166,8 @@
     <string name="wifi_hotspot_maximize_compatibility_dual_ap_summary" msgid="3579549223159056533">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‏‏‎‏‎‏‏‎‏‎‎‎‏‏‏‎‏‎‎‎‎‏‏‎‏‏‎‎‏‏‏‏‎‎‏‏‎‏‎‏‏‏‏‎‎‏‎‎‎‏‎‎‏‎‏‎‏‎Helps other devices find this hotspot. Increases battery usage.‎‏‎‎‏‎"</string>
     <string name="wifi_tether_starting" msgid="8879874184033857814">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‎‎‏‏‏‎‏‏‏‎‏‎‎‏‏‎‏‎‎‎‎‏‎‏‏‏‎‏‎‏‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‎‏‎‎‎‏‎‏‏‎‎Turning hotspot on…‎‏‎‎‏‎"</string>
     <string name="wifi_tether_stopping" msgid="4416492968019409188">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‏‎‏‎‎‏‎‏‎‏‎‎‎‏‎‎‎‏‏‏‏‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‎‏‏‏‎‏‎‏‏‏‎‎‏‎‎‏‎‎‏‎‎‎Turning off hotspot…‎‏‎‎‏‎"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_title" msgid="3089432578433978073">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‎‏‏‎‏‏‏‏‏‏‏‎‏‏‏‏‎‏‎‎‎‏‏‏‏‏‏‎‎‎‎‏‏‎‎‎‏‎‎‏‏‏‎‎‎‏‏‏‎‏‏‎‏‏‎‎‏‎Tethering unavailable‎‏‎‎‏‎"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_content" msgid="5920421547607921112">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‎‎‎‏‎‏‎‎‏‏‎‎‏‎‎‎‎‎‎‎‎‎‏‏‏‏‎‏‎‎‎‎‏‏‎‏‏‏‏‎‏‎‎‎‏‎‎‎‏‏‏‎‏‏‎‎‎‎Contact your carrier for details‎‏‎‎‏‎"</string>
     <string name="wifi_tether_enabled_subtext" msgid="5085002421099821056">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‎‏‎‎‏‎‎‎‏‏‎‎‎‏‏‏‎‏‏‎‎‎‎‏‎‏‎‏‎‏‏‏‏‏‎‏‎‎‏‏‏‏‏‏‏‏‎‎‎‎‎‎‎‎‎‎‎‎‎‏‎‎‏‏‎<xliff:g id="NETWORK_SSID">%1$s</xliff:g>‎‏‎‎‏‏‏‎ is active‎‏‎‎‏‎"</string>
     <string name="wifi_tether_failed_subtext" msgid="437190628041885500">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‎‎‎‎‏‎‎‎‏‎‎‏‏‎‏‏‎‏‎‎‎‏‏‏‏‎‏‎‏‎‎‏‏‏‎‎‏‎‎‎‏‎‎‎‎‎‏‏‏‎‎‏‏‏‏‎‎‎Portable Wi‑Fi hotspot error‎‏‎‎‏‎"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7072559431286459122">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‎‎‎‏‎‎‏‏‎‏‏‎‎‎‏‏‏‎‏‎‏‎‏‎‎‏‎‏‎‏‎‏‎‏‎‏‎‏‎‏‏‎‎‎‎‏‎‏‎‏‏‏‏‎‎‏‎‎Set up Wi‑Fi hotspot‎‏‎‎‏‎"</string>
@@ -2534,11 +2514,6 @@
     <string name="enable_service_title" msgid="7231533866953706788">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‎‎‏‎‏‏‎‏‏‏‎‎‏‎‎‎‏‏‎‏‏‏‏‎‎‏‏‎‏‏‎‎‎‏‏‏‏‏‎‏‏‏‎‎‎‏‏‎‏‎‎‏‎‎‏‎‎‎Allow ‎‏‎‎‏‏‎<xliff:g id="SERVICE">%1$s</xliff:g>‎‏‎‎‏‏‏‎ to have full control of your device?‎‏‎‎‏‎"</string>
     <string name="capabilities_list_title" msgid="1225853611983394386">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‏‎‎‎‎‎‎‏‏‎‎‎‏‏‎‏‏‎‏‎‏‏‏‎‏‏‎‎‎‎‎‎‎‏‏‏‎‎‏‏‎‎‏‎‏‎‏‏‎‎‏‎‏‎‎‏‎‎‎‏‎‎‏‏‎<xliff:g id="SERVICE">%1$s</xliff:g>‎‏‎‎‏‏‏‎ needs to:‎‏‎‎‏‎"</string>
     <string name="touch_filtered_warning" msgid="4225815157460318241">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‏‎‏‎‎‏‎‏‎‎‎‏‏‏‎‎‎‏‏‏‏‏‏‏‎‎‎‏‎‎‏‎‏‏‏‎‎‎‏‎‎‎‏‏‏‎‎‎‎‎‏‎‎‎‎‏‎Because an app is obscuring a permission request, Settings can’t verify your response.‎‏‎‎‏‎"</string>
-    <string name="enable_service_encryption_warning" msgid="931082737770453755">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‎‏‏‏‎‏‎‏‏‏‏‎‏‏‏‏‎‏‏‎‏‎‎‎‏‎‎‏‎‎‎‎‏‎‏‎‎‏‏‏‎‎‏‎‏‏‎‏‎‏‏‏‏‏‎‏‏‎If you turn on ‎‏‎‎‏‏‎<xliff:g id="SERVICE">%1$s</xliff:g>‎‏‎‎‏‏‏‎, your device won’t use your screen lock to enhance data encryption.‎‏‎‎‏‎"</string>
-    <string name="secure_lock_encryption_warning" msgid="669152607190123579">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‏‎‏‎‎‏‎‎‏‎‏‎‎‏‏‏‎‏‏‎‎‎‎‎‎‎‎‏‏‏‏‎‎‎‎‎‏‏‎‎‎‎‎‎‎‎‏‎‎‎‎‏‏‏‎‏‏‎Because you’ve turned on an accessibility service, your device won’t use your screen lock to enhance data encryption.‎‏‎‎‏‎"</string>
-    <string name="enable_service_pattern_reason" msgid="6832846117817938536">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‎‏‏‎‏‎‎‏‏‎‎‏‎‎‏‎‏‎‏‎‏‎‏‏‏‏‎‎‏‏‎‎‏‎‏‏‏‎‎‎‏‏‏‏‏‎‎‏‎‎‏‏‎‏‎‎‎‎Because turning on ‎‏‎‎‏‏‎<xliff:g id="SERVICE">%1$s</xliff:g>‎‏‎‎‏‏‏‎ affects data encryption, you need to confirm your pattern.‎‏‎‎‏‎"</string>
-    <string name="enable_service_pin_reason" msgid="6040417014360237703">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‏‏‎‏‎‎‏‏‏‏‎‏‏‏‏‏‎‏‎‎‎‏‎‏‎‏‏‎‎‏‎‎‎‎‏‎‏‎‏‎‏‏‏‎‎‏‏‎‏‎‎‎‎‏‏‏‎Because turning on ‎‏‎‎‏‏‎<xliff:g id="SERVICE">%1$s</xliff:g>‎‏‎‎‏‏‏‎ affects data encryption, you need to confirm your PIN.‎‏‎‎‏‎"</string>
-    <string name="enable_service_password_reason" msgid="6962544350351734238">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‎‏‎‎‏‏‏‏‏‏‏‏‎‏‏‎‏‎‎‏‏‎‎‏‎‏‎‎‎‏‏‏‏‏‎‎‏‏‏‏‎‎‎‏‏‎‏‎‏‏‏‎‏‏‏‏‎‎Because turning on ‎‏‎‎‏‏‎<xliff:g id="SERVICE">%1$s</xliff:g>‎‏‎‎‏‏‏‎ affects data encryption, you need to confirm your password.‎‏‎‎‏‎"</string>
     <string name="accessibility_service_warning" msgid="6779187188736432618">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‎‎‎‎‏‎‏‎‎‏‎‎‎‎‎‏‎‏‏‎‏‎‏‎‎‏‎‎‏‏‎‏‎‏‎‎‎‎‎‏‏‏‎‎‏‏‎‎‏‏‏‏‎‏‎‏‎‎‎‏‎‎‏‏‎<xliff:g id="SERVICE">%1$s</xliff:g>‎‏‎‎‏‏‏‎ is requesting full control of this device. The service can read the screen and act on behalf of users with accessibility needs. This level of control is not appropriate for most apps.‎‏‎‎‏‎"</string>
     <string name="accessibility_service_warning_description" msgid="6573203795976134751">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‎‎‏‏‏‎‎‎‏‎‏‏‎‏‏‎‎‎‎‎‎‏‏‎‏‎‏‎‏‏‏‏‎‏‏‎‏‎‎‎‎‎‏‎‎‎‎‎‎‏‎‏‏‏‏‏‎Full control is appropriate for apps that help you with accessibility needs, but not for most apps.‎‏‎‎‏‎"</string>
     <string name="accessibility_service_screen_control_title" msgid="324795030658109870">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‎‏‎‎‎‎‎‎‏‏‏‏‎‎‏‏‏‎‏‎‏‏‏‎‎‎‎‎‎‏‎‏‏‎‎‏‏‎‎‎‎‎‏‎‏‎‎‎‏‏‎‏‎‏‏‏‎‎View and control screen‎‏‎‎‏‎"</string>
@@ -3103,14 +3078,6 @@
     <string name="remove_account_failed" msgid="3709502163548900644">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‏‎‏‏‏‏‎‏‎‏‏‎‎‏‏‎‎‏‎‎‏‎‎‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‎‎‎‎‎‏‏‎‏‎‎‏‎‎‏‎‎‎This change isn\'t allowed by your admin‎‏‎‎‏‎"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‎‎‏‎‎‎‎‏‏‎‎‏‏‏‏‏‎‎‎‏‎‏‏‎‎‎‏‎‏‎‎‏‎‎‎‎‎‏‏‎‏‏‏‎‎‏‏‏‏‎‎‏‏‏‏‎‏‎Can’t manually sync‎‏‎‎‏‎"</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‏‏‎‏‎‎‏‎‏‎‎‏‏‏‏‎‎‎‏‎‏‏‎‏‎‏‎‎‏‏‏‏‏‎‎‏‎‎‏‏‏‎‏‎‏‎‎‎‎‏‎‎‎‎‏‎‏‎Sync for this item is currently disabled. To change this setting, temporarily turn on background data and automatic sync.‎‏‎‎‏‎"</string>
-    <string name="enter_password" msgid="6327051330258595331">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‏‏‏‎‎‏‏‏‎‎‎‏‏‎‎‏‏‏‎‏‎‏‎‎‏‏‎‏‎‎‏‏‏‏‎‏‏‏‎‎‏‏‏‏‎‏‏‏‎‎‎‎‎‎‎‏‏‎To start Android, enter your password‎‏‎‎‏‎"</string>
-    <string name="enter_pin" msgid="1029287617551232681">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‎‎‏‎‎‏‎‎‎‏‏‎‎‎‎‏‏‏‎‏‎‎‎‏‎‎‏‏‏‏‏‏‏‏‏‎‏‏‎‎‏‎‏‏‎‏‏‏‎‏‎‏‎‏‎‎‏‎To start Android, enter your PIN‎‏‎‎‏‎"</string>
-    <string name="enter_pattern" msgid="1747316785866742960">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‎‏‏‎‏‏‏‎‏‎‏‏‎‏‏‏‏‏‎‏‎‏‏‏‎‏‎‏‎‏‎‎‎‎‏‏‏‎‎‏‎‏‏‎‎‎‎‎To start Android, draw your pattern‎‏‎‎‏‎"</string>
-    <string name="cryptkeeper_wrong_pattern" msgid="340747269176120242">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‎‏‎‏‏‏‎‏‎‏‎‎‏‎‎‏‏‏‏‎‏‎‏‏‎‎‎‎‎‎‎‎‏‎‏‏‎‏‏‎‏‎‏‎‏‎‎‏‏‏‎‏‏‎‎‏‎‎Wrong Pattern‎‏‎‎‏‎"</string>
-    <string name="cryptkeeper_wrong_password" msgid="7295607881887114486">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‎‎‏‏‏‏‏‏‎‎‏‏‎‏‎‎‏‎‏‏‎‏‏‎‏‏‏‏‏‏‎‎‎‏‏‎‏‎‏‏‏‏‏‎‎‏‎‎‏‏‏‏‎‏‏‎‎Wrong Password‎‏‎‎‏‎"</string>
-    <string name="cryptkeeper_wrong_pin" msgid="2347961593970714201">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‎‏‎‎‏‎‏‎‏‏‎‏‎‎‎‏‎‏‎‏‎‎‎‎‏‎‎‏‏‎‎‏‎‏‏‏‎‎‎‏‎‎‏‏‎‎‏‏‎‎‏‎‏‏‎‎‏‎Wrong PIN‎‏‎‎‏‎"</string>
-    <string name="checking_decryption" msgid="6111642972615688237">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‏‏‎‏‎‎‎‎‏‏‏‎‏‎‏‎‏‏‏‎‎‏‏‏‎‎‎‏‏‎‎‎‏‏‎‎‎‏‎‏‎‏‎‎‎‎‎‎‎‎‏‎‏‏‎‏‎Checking…‎‏‎‎‏‎"</string>
-    <string name="starting_android" msgid="6694154070215356186">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‎‏‏‏‎‎‏‏‎‎‏‏‎‏‎‎‏‏‎‏‎‏‎‎‎‏‏‏‎‎‎‏‎‏‏‏‎‏‎‏‏‏‏‏‎‏‏‏‏‎‎‎‏‏‎‏‎‎Starting Android…‎‏‎‎‏‎"</string>
     <string name="delete" msgid="8330605554706263775">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‏‏‎‎‏‏‏‎‎‎‏‎‎‎‎‎‏‏‎‎‏‏‏‎‏‎‏‎‏‎‏‎‎‎‎‏‎‏‎‎‏‏‎‏‎‏‏‏‎‏‏‎‏‏‏‏‏‎Delete‎‏‎‎‏‎"</string>
     <string name="misc_files" msgid="6598066985800749585">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‏‎‎‏‎‎‎‏‎‎‎‎‏‎‏‎‏‏‏‏‎‏‏‏‎‎‏‎‏‏‎‎‏‏‏‎‎‎‏‎‏‏‎‏‎‎‏‎‎‎‎‏‎‎‎‏‎Misc files‎‏‎‎‏‎"</string>
     <string name="misc_files_selected_count" msgid="5597802791672749532">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‏‏‎‏‎‏‏‏‏‎‏‏‎‎‎‏‏‏‏‏‏‏‎‏‏‎‎‎‎‏‎‎‎‎‏‎‏‏‎‎‎‎‎‎‏‏‏‎‏‏‏‎‏‏‏‎‎‎selected ‎‏‎‎‏‏‎<xliff:g id="NUMBER">%1$d</xliff:g>‎‏‎‎‏‏‏‎ out of ‎‏‎‎‏‏‎<xliff:g id="TOTAL">%2$d</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
@@ -3206,8 +3173,6 @@
     <string name="data_usage_metered_yes" msgid="4262598072030135223">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‏‎‎‏‎‎‏‏‏‏‏‎‎‏‎‏‎‎‏‎‏‏‏‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‏‏‎‎‎‎‎‎‏‏‏‎‏‏‎‏‏‏‎Metered‎‏‎‎‏‎"</string>
     <string name="data_usage_metered_no" msgid="1685828958417926268">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‏‎‏‏‎‎‏‎‏‎‏‎‎‎‏‎‎‏‎‎‎‎‎‎‏‎‏‏‏‏‎‏‎‏‎‎‏‎‎‎‏‎‎‏‏‏‎‎‎‎‏‏‏‏‏‎‎‎Not metered‎‏‎‎‏‎"</string>
     <string name="data_usage_disclaimer" msgid="3271450299386176770">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‏‎‏‏‎‎‏‏‎‏‎‎‎‎‏‏‎‏‎‏‏‎‏‏‎‏‏‏‎‎‎‏‏‎‏‎‎‎‎‏‎‎‎‏‎‎‏‎‏‎‎‎‎‎‎‏‎‎Carrier data accounting may differ from your device.‎‏‎‎‏‎"</string>
-    <string name="cryptkeeper_emergency_call" msgid="8369322820475703306">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‎‎‎‏‎‎‏‎‏‏‏‎‎‏‏‏‎‏‏‎‎‎‎‏‏‎‎‏‏‏‏‎‏‎‎‎‎‎‏‏‎‎‏‎‏‎‎‎‎‎‎‎‎‏‎‏‎‎Emergency call‎‏‎‎‏‎"</string>
-    <string name="cryptkeeper_return_to_call" msgid="3857250752781151232">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‏‏‎‎‎‎‏‏‏‏‎‏‏‎‏‎‏‎‎‎‏‏‏‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‎‏‏‎‎‎‎‎‎‎‎‎‎‎Return to call‎‏‎‎‏‎"</string>
     <string name="vpn_name" msgid="3806456074909253262">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‎‏‏‎‏‎‎‏‏‎‎‏‏‏‏‏‏‏‎‏‎‎‎‎‏‏‏‏‏‎‏‏‎‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‎‎‏‏‏‎‎Name‎‏‎‎‏‎"</string>
     <string name="vpn_type" msgid="5533202873260826663">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‎‏‏‎‎‏‎‎‏‏‏‏‎‎‎‏‎‏‎‏‏‎‎‏‎‎‏‏‏‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‎‎‎‎‎‎‎‏‎‎‏‏‏‎Type‎‏‎‎‏‎"</string>
     <string name="vpn_server" msgid="2908816134941973935">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‎‎‏‎‏‏‏‏‎‎‎‏‏‎‎‎‎‏‏‎‏‏‏‎‎‏‏‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‎‏‏‎‏‎‏‏‏‏‎Server address‎‏‎‎‏‎"</string>
@@ -4764,8 +4729,6 @@
       <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‎‏‎‏‎‎‏‏‏‎‎‏‏‎‏‎‏‎‎‏‏‏‎‎‎‎‎‏‎‎‎‎‎‏‎‏‎‏‎‎‏‎‏‎‎‏‏‎‎‏‏‏‏‏‏‏‎1 app can use unrestricted data‎‏‎‎‏‎</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‎‏‏‏‏‎‏‏‎‎‎‎‎‏‏‏‎‎‏‏‎‎‏‏‎‎‎‎‎‎‎‏‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‎‎‎‏‏‎‎‎‎‏‏‎‎See more‎‏‎‎‏‎"</string>
-    <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‎‏‎‎‎‎‎‎‏‎‎‎‏‎‎‏‎‏‎‏‎‎‎‏‏‏‏‎‏‏‏‎‎‎‎‎‎‎‏‏‏‏‎‎‎‏‎‎‏‏‏‏‏‏‏‏‏‎Really wipe user data and convert to file encryption?‎‏‎‎‏‎"</string>
-    <string name="button_confirm_convert_fbe" msgid="339648921918438106">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‎‏‎‏‏‎‏‏‎‏‎‏‎‏‏‎‎‏‏‏‎‎‏‎‏‎‎‎‏‏‎‏‏‎‏‎‎‏‎‏‎‏‏‏‏‏‎‏‎‏‏‎‏‏‎‏‎‎Wipe and convert‎‏‎‎‏‎"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‎‎‏‎‎‏‏‏‎‏‏‏‎‏‎‏‎‎‎‎‏‎‏‏‏‎‏‎‎‎‎‎‎‎‎‏‎‏‏‎‏‏‎‎‎‏‏‏‏‎‏‏‎‏‎‏‎‎Reset ShortcutManager rate-limiting‎‏‎‎‏‎"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‎‎‏‏‎‏‎‎‏‎‎‏‎‏‎‏‏‎‏‏‏‏‏‏‎‏‏‏‏‎‎‏‎‎‏‏‎‏‎‏‏‏‏‎‎‏‎‎‏‏‎‏‏‏‏‎‎ShortcutManager rate-limiting has been reset‎‏‎‎‏‎"</string>
     <string name="notification_suggestion_title" msgid="6309263655965785411">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‏‏‎‎‎‏‏‏‏‎‎‎‎‎‎‎‏‏‏‎‏‏‏‏‎‎‎‎‎‎‎‎‎‎‎‎‏‏‏‏‏‎‏‏‏‏‏‎‏‎‏‎‎‎‎‏‏‎Control info on lock screen‎‏‎‎‏‎"</string>
@@ -5292,6 +5255,7 @@
     <string name="sim_action_yes" msgid="8076556020131395515">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‎‎‎‎‏‎‏‎‏‏‎‏‏‎‎‎‎‏‏‏‎‏‎‎‎‏‎‏‎‏‏‎‎‎‏‏‏‏‎‎‏‎‏‏‏‎‏‏‏‏‎‏‏‏‎‏‏‎Yes‎‏‎‎‏‎"</string>
     <string name="sim_action_reboot" msgid="3508948833333441538">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‎‏‎‏‏‎‎‏‎‎‏‎‎‏‎‏‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‎‏‏‏‎‏‏‏‎‎‎‏‏‏‎‏‎‎‎‎‎‎‎‎‏‎‎Restart‎‏‎‎‏‎"</string>
     <string name="sim_action_no_thanks" msgid="435717748384544195">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‎‎‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‏‏‏‎‏‏‏‏‎‎‏‏‏‎‏‏‎‎‏‎‏‏‎‎‏‏‎‏‎‏‏‏‎‎‎‎‏‏‎No thanks‎‏‎‎‏‎"</string>
+    <string name="sim_action_cancel" msgid="2668099867029610910">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‏‎‎‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‏‏‎‎‎‏‎‏‎‏‏‏‏‏‏‎‎‏‎‎‎‏‎‎‏‎‎‎‎‏‏‎‎‏‏‏‏‎‎Cancel‎‏‎‎‏‎"</string>
     <string name="sim_switch_button" msgid="1405772571706095387">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‏‏‏‎‏‎‏‏‎‏‎‎‏‎‏‏‎‎‏‏‏‎‎‎‎‏‏‏‎‏‏‏‎‏‏‏‎‎‎‏‏‎‏‏‎Switch‎‏‎‎‏‎"</string>
     <string name="dsds_activation_failure_title" msgid="4467364110584914794">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‏‏‏‏‏‏‏‏‏‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‎‏‎‎‏‏‎‏‏‎‏‏‏‏‏‎‎‎‏‎‎‎‏‏‎‏‏‎‏‎‏‎‎Can’t activate SIM‎‏‎‎‏‎"</string>
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‏‎‏‏‏‏‏‎‎‎‎‎‎‎‏‏‎‏‏‏‎‏‏‎‏‏‏‎‎‏‏‏‏‎‏‏‏‎‎‏‎‏‎‎‎‎‏‎‎‏‏‎‎‎‏‏‏‎Remove the SIM and insert it again. If the problem continues, restart your device.‎‏‎‎‏‎"</string>
@@ -5444,6 +5408,8 @@
     <string name="cached_apps_freezer" msgid="1057519579761550350">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‎‏‎‏‎‏‏‎‏‎‎‎‏‎‎‎‎‎‏‏‏‎‏‎‎‎‏‏‎‏‏‏‎‏‎‏‏‎‏‎‏‎‎‏‎‎‏‎‎‎‎‎‎‏‏‏‎‎Suspend execution for cached apps‎‏‎‎‏‎"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‎‎‏‎‏‎‏‎‏‎‏‏‏‎‏‏‏‏‎‎‎‎‎‎‎‏‎‎‎‏‎‎‏‎‏‏‎‏‎‏‎‏‏‎‏‎‏‏‎‎‏‎‎‏‏‎‏‎Allow screen overlays on Settings‎‏‎‎‏‎"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‎‎‎‎‏‏‎‎‏‎‏‏‎‎‏‎‎‏‏‎‎‏‎‏‏‏‎‏‎‏‏‎‎‎‎‎‎‎‏‎‎‏‎‎‏‎‏‎‏‎‏‎‎‎‏‏‎‎Allow apps that can display over other apps to overlay Settings screens‎‏‎‎‏‎"</string>
+    <string name="allow_mock_modem" msgid="3832264806530479214">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‏‎‎‏‎‏‏‏‎‏‏‏‏‎‎‎‎‏‎‎‎‏‎‎‏‏‎‎‎‏‏‏‎‎‏‏‏‏‎‏‎‏‏‏‏‎‏‎‎‎‏‏‎‏‏‏‎‎Allow Mock Modem‎‏‎‎‏‎"</string>
+    <string name="allow_mock_modem_summary" msgid="9097416612748005374">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‎‏‎‎‎‎‎‎‏‎‎‎‎‏‎‎‎‎‏‏‎‏‎‏‏‎‎‎‏‎‎‎‏‎‎‏‎‏‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‎‎Allow this device to run Mock Modem service for instrumentation testing. Do not enable this during normal usage of the phone‎‏‎‎‏‎"</string>
     <string name="media_controls_title" msgid="403271085636252597">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‏‏‎‎‏‏‎‎‎‏‎‏‏‎‏‎‎‏‏‏‎‏‎‏‎‎‏‏‎‏‏‏‏‏‎‎‎‏‎‎‎‏‏‏‏‎‎‏‏‏‎‏‏‎‏‎‏‎Media‎‏‎‎‏‎"</string>
     <string name="media_controls_resume_title" msgid="855076860336652370">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‏‏‏‎‏‏‏‎‏‏‏‎‏‎‏‏‏‏‏‎‏‏‏‏‏‏‏‎‎‎‏‎‎‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‎‏‎‏‎‎‏‎‎Pin media player‎‏‎‎‏‎"</string>
     <string name="media_controls_resume_description" msgid="3163482266454802097">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‏‏‏‏‎‎‏‏‎‏‏‏‏‎‎‏‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‏‎‎‏‎‎‏‎‎‏‏‏‏‏‎‏‎‏‏‎‎‎‏‎To quickly resume playback, media player stays open in Quick Settings‎‏‎‎‏‎"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 92fbdd5..f935137 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -142,10 +142,11 @@
     <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"Permite que el dispositivo se comunique con dispositivos Bluetooth cercanos"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"Permite que el teléfono se comunique con dispositivos Bluetooth cercanos"</string>
     <string name="bluetooth_disable_a2dp_hw_offload" msgid="5942913792817797541">"Inhabilitar descarga de hardware Bluetooth A2DP"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="8610420176339657720">"¿Reiniciar?"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8333029144800835996">"Debes reiniciar el dispositivo para cambiar esta opción."</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="3488695418187553566">"Reiniciar"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="4930826928585464191">"Cancelar"</string>
+    <string name="bluetooth_disable_le_audio_hw_offload" msgid="3966022676505972908">"Inhabilitar la descarga de hardware Bluetooth LE AUDIO"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_title" msgid="6001142380445276918">"¿Quieres reiniciar el dispositivo?"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_message" msgid="1524373895333698779">"Debes reiniciar el dispositivo para cambiar este parámetro de configuración."</string>
+    <string name="bluetooth_disable_hw_offload_dialog_confirm" msgid="5594859658551707592">"Reiniciar"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel" msgid="3663690305043973720">"Cancelar"</string>
     <string name="connected_device_media_device_title" msgid="3783388247594566734">"Dispositivos de medios"</string>
     <string name="connected_device_call_device_title" msgid="88732390601723608">"Dispositivos para llamar"</string>
     <string name="connected_device_other_device_title" msgid="4652120430615729193">"Otros dispositivos"</string>
@@ -309,9 +310,9 @@
     <string name="security_settings_title" msgid="6710768415432791970">"Seguridad"</string>
     <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"Encriptación y credenciales"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"Teléfono encriptado"</string>
-    <string name="decryption_settings_summary" product="default" msgid="1742645256103613503">"Teléfono no encriptado"</string>
+    <string name="not_encrypted_summary" product="default" msgid="2251945842585788254">"Teléfono no encriptado"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"Dispositivo encriptado"</string>
-    <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"Dispositivo no encriptado"</string>
+    <string name="not_encrypted_summary" product="tablet" msgid="2374263654698719382">"Dispositivo no encriptado"</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"Pantalla de bloqueo"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"Qué mostrar"</string>
     <string name="security_settings_summary" msgid="1627059516127354233">"Establecer Mi ubicación, desbloqueo de pantalla, bloqueo de la tarjeta SIM, bloqueo de almacenamiento de credenciales"</string>
@@ -480,7 +481,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"Borrar"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"Toca el sensor"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"Coloca el dedo en el sensor y levántalo cuando sientas una vibración."</string>
-    <string name="security_settings_udfps_enroll_start_message" msgid="5032954588171487566">"Apoya la huella dactilar completamente en el sensor hasta que sientas una vibración"</string>
+    <string name="security_settings_udfps_enroll_start_message" msgid="5032954588171487566">"Mantén toda la huella dactilar en el sensor hasta que notes una vibración"</string>
     <string name="security_settings_fingerprint_enroll_udfps_title" msgid="6665610134560896895">"Mantén presionado el sensor de huellas dactilares"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"Levanta el dedo y vuelve a tocar"</string>
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"Una vez más"</string>
@@ -570,37 +571,10 @@
     <string name="fingerprint_last_delete_message" msgid="7860374760549404410">"No podrás utilizar tu huella dactilar para desbloquear el teléfono ni verificar tu identidad en apps."</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="4104208067277655068">"No podrás usar tu huella dactilar para desbloquear tu perfil de trabajo, autorizar compras ni acceder a apps de trabajo."</string>
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"Sí, deseo quitarlas"</string>
-    <string name="crypt_keeper_settings_title" msgid="4938812137822100044">"Encriptación"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"Encriptar Tablet"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"Encriptar dispositivo"</string>
-    <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"Encriptado"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"Puedes encriptar las cuentas, configuración, aplicaciones descargadas y sus datos, archivos multimedia y otros archivos. Después de encriptar la tablet, si configuraste un bloqueo de pantalla (es decir, un patrón, un PIN numérico o una contraseña), tendrás que desbloquear la pantalla para desencriptar la tablet cada vez que la enciendas. La única otra forma de desencriptar es restablecer la configuración de fábrica, de manera que se borren todos los datos.\n\nLa encriptación tarda una hora o más. Para comenzar, la batería tiene que estar cargada y debes mantener la tablet conectada hasta que finalice el proceso. Si lo interrumpes, es posible que pierdas toda la información o parte de ella."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"Puedes encriptar las cuentas, configuración, aplicaciones descargadas y sus datos, archivos multimedia y otros archivos. Después de encriptar el teléfono, si configuraste un bloqueo de pantalla (es decir, un patrón o un PIN numérico o una contraseña), tendrás que desbloquear la pantalla para desencriptar el teléfono cada vez que lo enciendas. La única otra forma de desencriptar es restablecer la configuración de fábrica, de manera que se borren todos los datos.\n\nLa encriptación tarda una hora o más. Para comenzar, la batería tiene que estar cargada y debes mantener el teléfono conectado hasta que finalice el proceso. Si lo interrumpes, es posible que pierdas toda la información o parte de ella."</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"Encriptar tablet"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"Encriptar dispositivo"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"Carga tu batería e inténtalo nuevamente."</string>
-    <string name="crypt_keeper_unplugged_text" msgid="2709721134148651329">"Enchufa tu cargador e inténtalo nuevamente."</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="1847280235529858357">"Sin contraseña o PIN de pantalla de bloqueo"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="7210616262954236042">"Debes configurar una contraseña o PIN de pantalla de bloqueo antes de comenzar con la encriptación."</string>
-    <string name="crypt_keeper_confirm_title" msgid="8600000209722452230">"¿Encriptar?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="3270587498436152259">"La encriptación es irreversible y no puede interrumpirse; de lo contrario, perderás información. La encriptación demora al menos una hora. Durante este tiempo, la tablet se reiniciará varias veces."</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="3040428543349852419">"La encriptación es irreversible y no puede interrumpirse; de lo contrario, perderás información. La encriptación demora al menos una hora. Durante este tiempo, el dispositivo se reiniciará varias veces."</string>
-    <string name="crypt_keeper_setup_title" msgid="3339725741305796680">"Encriptando"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="4417016995091289019">"Espera mientras se encripta tu tablet. <xliff:g id="PERCENT">^1</xliff:g>% completado."</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="7902355422499500352">"Espera mientras se encripta tu dispositivo. <xliff:g id="PERCENT">^1</xliff:g>% completado."</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="8348188415839917821">"Espera mientras se encripta la tablet. Tiempo restante: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="8556105766597855198">"Espera mientras se encripta el teléfono. Tiempo restante: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="3832496715430327682">"Para desbloquear la tablet, apágala y vuelve a encenderla."</string>
-    <string name="crypt_keeper_force_power_cycle" product="default" msgid="5070346039522135361">"Para desbloquear el teléfono, apágalo y vuelve a encenderlo."</string>
-    <string name="crypt_keeper_warn_wipe" msgid="8104921337301750394">"Advertencia: Se borrarán los datos del dispositivo después de otros <xliff:g id="COUNT">^1</xliff:g> intentos fallidos para desbloquearlo."</string>
-    <string name="crypt_keeper_enter_password" msgid="1274917431075529732">"Escribe la contraseña"</string>
-    <string name="crypt_keeper_failed_title" msgid="8173654570682244149">"Encriptación incorrecta"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"La encriptación se interrumpió y no se puede completar. Por esta razón, ya no es posible acceder a los datos de tu tablet. \n\n Para reanudar el uso de tu tablet, debes restablecer los datos de fábrica. Cuando configures tu tablet luego de restablecer los datos de fábrica, tendrás la posibilidad de restaurar los datos de los que tengas una copia de seguridad en tu cuenta de Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"La encriptación se interrumpió y no se puede completar. Por esta razón, ya no es posible acceder a los datos de tu dispositivo. \n\nPara reanudar el uso de tu dispositivo, debes restablecer los datos de fábrica. Cuando configures tu dispositivo luego de restablecer los datos de fábrica, tendrás la posibilidad de restaurar los datos de los que tengas una copia de seguridad en tu cuenta de Google."</string>
-    <string name="crypt_keeper_data_corrupt_title" msgid="5920153462176846037">"Desencriptación incorrecta"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"La contraseña que ingresaste es correcta, pero los datos están dañados. \n\nPara continuar usando la tablet, debes restablecer la configuración de fábrica. Cuando configures la tablet después del restablecimiento, podrás restaurar los datos que guardaste en una copia de seguridad en la cuenta de Google."</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"La contraseña que ingresaste es correcta, pero los datos están dañados. \n\nPara continuar usando el teléfono, debes restablecer la configuración de fábrica. Cuando configures el teléfono después del restablecimiento, podrás restaurar los datos que guardaste en una copia de seguridad en la cuenta de Google."</string>
-    <string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"Cambiar método de introducción"</string>
+    <string name="encryption_settings_title" msgid="2848716008695618360">"Encriptación"</string>
+    <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"Encriptar tablet"</string>
+    <string name="encrypt_title" product="default" msgid="7337365190988321100">"Encriptar teléfono"</string>
+    <string name="encrypted_summary" msgid="545623487587251207">"Con encriptación"</string>
     <string name="suggested_lock_settings_title" msgid="7836065447159730217">"Protege tu teléfono"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"Agrega un bloqueo de pantalla para proteger la tablet"</string>
     <string name="suggested_lock_settings_summary" product="device" msgid="8479766049078378225">"Agrega bloqueo de pantalla para proteger el dispositivo"</string>
@@ -819,6 +793,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Puede que también tengas que escribir este PIN en el otro dispositivo."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Puede que también tengas que escribir esta clave de acceso en otro dispositivo."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Para vincular con&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;asegúrate de que se muestre esta clave de acceso:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;."</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Confirma para vincular con el conjunto coordinado"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"¿Desde: &lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;sincronizas con este dispositivo?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Para vincular con:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Escribe allí:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g> y luego presiona Volver o Enter."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Permitir el acceso a tus contactos y al historial de llamadas"</string>
@@ -852,6 +827,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"No se pudo establecer la conexión. Vuelve a intentarlo."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Detalles del dispositivo"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Dirección Bluetooth del dispositivo: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Dirección Bluetooth del dispositivo:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"¿Olvidar este dispositivo?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Quitar asociación"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"¿Quieres desconectar la app?"</string>
@@ -883,6 +859,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Recordar la configuración"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Máximo de dispositivos de audio Bluetooth conectados"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Selecciona una cantidad máxima de dispositivos de audio Bluetooth conectados"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"Registro de depuración de la pila de NFC"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Aumenta el nivel de acceso a la pila de NFC"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Transmitir"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"duplicar"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Habilitar pantalla inalámbrica"</string>
@@ -1190,6 +1168,8 @@
     <string name="wifi_hotspot_maximize_compatibility_dual_ap_summary" msgid="3579549223159056533">"Ayuda a que otros dispositivos encuentren este hotspot. Incrementa el uso de batería."</string>
     <string name="wifi_tether_starting" msgid="8879874184033857814">"Activando hotspot…"</string>
     <string name="wifi_tether_stopping" msgid="4416492968019409188">"Desactivando hotspot…"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_title" msgid="3089432578433978073">"Conexión mediante dispositivo móvil no disponible"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_content" msgid="5920421547607921112">"Comunícate con tu operador para obtener más detalles"</string>
     <string name="wifi_tether_enabled_subtext" msgid="5085002421099821056">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> está activa"</string>
     <string name="wifi_tether_failed_subtext" msgid="437190628041885500">"Error en hotspot de Wi-Fi portátil"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7072559431286459122">"Configurar hotspot Wi-Fi"</string>
@@ -2536,11 +2516,6 @@
     <string name="enable_service_title" msgid="7231533866953706788">"¿Deseas permitir que <xliff:g id="SERVICE">%1$s</xliff:g> tenga el control total de tu dispositivo?"</string>
     <string name="capabilities_list_title" msgid="1225853611983394386">"<xliff:g id="SERVICE">%1$s</xliff:g> necesita:"</string>
     <string name="touch_filtered_warning" msgid="4225815157460318241">"Debido a que una aplicación está bloqueando una solicitud de permiso, la Configuración no puede verificar tu respuesta."</string>
-    <string name="enable_service_encryption_warning" msgid="931082737770453755">"Si activas <xliff:g id="SERVICE">%1$s</xliff:g>, el dispositivo no utilizará el bloqueo de pantalla para mejorar el cifrado de datos."</string>
-    <string name="secure_lock_encryption_warning" msgid="669152607190123579">"Dado que activaste un servicio de accesibilidad, el dispositivo no utilizará el bloqueo de pantalla para mejorar el cifrado de datos."</string>
-    <string name="enable_service_pattern_reason" msgid="6832846117817938536">"Dado que la encriptación de datos se ve afectada al activar <xliff:g id="SERVICE">%1$s</xliff:g>, debes confirmar el patrón."</string>
-    <string name="enable_service_pin_reason" msgid="6040417014360237703">"Dado que la encriptación de datos se ve afectada al activar <xliff:g id="SERVICE">%1$s</xliff:g>, debes confirmar el PIN."</string>
-    <string name="enable_service_password_reason" msgid="6962544350351734238">"Dado que la encriptación de datos se ve afectada al activar <xliff:g id="SERVICE">%1$s</xliff:g>, debes confirmar la contraseña."</string>
     <string name="accessibility_service_warning" msgid="6779187188736432618">"<xliff:g id="SERVICE">%1$s</xliff:g> está solicitando el control total de este dispositivo. El servicio puede leer la pantalla y realizar acciones para los usuarios que necesitan accesibilidad. Este nivel de control no es apropiado para la mayoría de las apps."</string>
     <string name="accessibility_service_warning_description" msgid="6573203795976134751">"El control total es apropiado para las apps que te ayudan con las necesidades de accesibilidad, pero no para la mayoría de las apps."</string>
     <string name="accessibility_service_screen_control_title" msgid="324795030658109870">"Ver y controlar la pantalla"</string>
@@ -3105,14 +3080,6 @@
     <string name="remove_account_failed" msgid="3709502163548900644">"El administrador no permite este cambio"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"No se puede sincronizar manualmente"</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"La sincronización de este elemento actualmente está desactivada. Para cambiar tu configuración, activa momentáneamente los datos en segundo plano y la sincronización automática."</string>
-    <string name="enter_password" msgid="6327051330258595331">"Para iniciar el dispositivo Android, ingresa la contraseña."</string>
-    <string name="enter_pin" msgid="1029287617551232681">"Para iniciar el dispositivo Android, ingresa el PIN."</string>
-    <string name="enter_pattern" msgid="1747316785866742960">"Para iniciar el dispositivo Android, dibuja el patrón."</string>
-    <string name="cryptkeeper_wrong_pattern" msgid="340747269176120242">"Patrón incorrecto"</string>
-    <string name="cryptkeeper_wrong_password" msgid="7295607881887114486">"Contraseña incorrecta"</string>
-    <string name="cryptkeeper_wrong_pin" msgid="2347961593970714201">"PIN incorrecto"</string>
-    <string name="checking_decryption" msgid="6111642972615688237">"Comprobando…"</string>
-    <string name="starting_android" msgid="6694154070215356186">"Iniciando Android…"</string>
     <string name="delete" msgid="8330605554706263775">"Borrar"</string>
     <string name="misc_files" msgid="6598066985800749585">"Archivos variados"</string>
     <string name="misc_files_selected_count" msgid="5597802791672749532">"Se seleccionaron <xliff:g id="NUMBER">%1$d</xliff:g> de entre <xliff:g id="TOTAL">%2$d</xliff:g>."</string>
@@ -3208,8 +3175,6 @@
     <string name="data_usage_metered_yes" msgid="4262598072030135223">"De uso medido"</string>
     <string name="data_usage_metered_no" msgid="1685828958417926268">"Sin uso medido"</string>
     <string name="data_usage_disclaimer" msgid="3271450299386176770">"La forma en que el proveedor calcula los datos puede variar en tu dispositivo."</string>
-    <string name="cryptkeeper_emergency_call" msgid="8369322820475703306">"Llamada de emergencia"</string>
-    <string name="cryptkeeper_return_to_call" msgid="3857250752781151232">"Regresar a llamada"</string>
     <string name="vpn_name" msgid="3806456074909253262">"Nombre"</string>
     <string name="vpn_type" msgid="5533202873260826663">"Tipo"</string>
     <string name="vpn_server" msgid="2908816134941973935">"Dirección del servidor"</string>
@@ -4499,7 +4464,7 @@
     <string name="ignore_optimizations_on_desc" msgid="1280043916460939932">"Es posible que la batería se agote más rápido. La app ya no tendrá restricciones para usar batería en segundo plano."</string>
     <string name="ignore_optimizations_off_desc" msgid="3324571675983286177">"Es recomendable para una mayor duración de la batería"</string>
     <string name="ignore_optimizations_title" msgid="3464172726254542889">"¿Deseas permitir que la aplicación <xliff:g id="APP">%s</xliff:g> ignore las optimizaciones de la batería?"</string>
-    <string name="app_list_preference_none" msgid="1635406344616653756">"Ninguno"</string>
+    <string name="app_list_preference_none" msgid="1635406344616653756">"Ninguna"</string>
     <string name="work_profile_usage_access_warning" msgid="3477719910927319122">"Desactivar el acceso al uso de datos para esta app no evitará que el administrador realice el seguimiento del uso de datos de las apps de tu perfil de trabajo"</string>
     <string name="accessibility_lock_screen_progress" msgid="4597298121698665401">"Caracteres utilizados: <xliff:g id="COUNT_0">%1$d</xliff:g> de <xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
     <string name="draw_overlay" msgid="7902083260500573027">"Mostrar sobre otras apps"</string>
@@ -4766,8 +4731,6 @@
       <item quantity="one">1 app puede usar datos sin restricciones</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"Ver más"</string>
-    <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"¿Estás seguro de que quieres borrar los datos del usuario y convertirlos a encriptación de archivo?"</string>
-    <string name="button_confirm_convert_fbe" msgid="339648921918438106">"Borrar y convertir"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"Restablecer la limitación de frecuencia de ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"Se restableció la limitación de frecuencia de ShortcutManager"</string>
     <string name="notification_suggestion_title" msgid="6309263655965785411">"Controlar los datos que aparecen en la pantalla bloqueada"</string>
@@ -4791,7 +4754,7 @@
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"Entendido"</string>
     <string name="dark_theme_slice_title" msgid="4684222119481114062">"Prueba el Tema oscuro"</string>
     <string name="dark_theme_slice_subtitle" msgid="5555724345330434268">"Extiende la duración de la batería"</string>
-    <string name="quick_settings_developer_tiles" msgid="7336007844525766623">"Mosaicos de configuración rápida para programadores"</string>
+    <string name="quick_settings_developer_tiles" msgid="7336007844525766623">"Azulejos de configuración rápida para desarrolladores"</string>
     <string name="adb_authorization_timeout_title" msgid="6996844506783749754">"Inhabilitar tiempo de espera de autorización ADB"</string>
     <string name="adb_authorization_timeout_summary" msgid="409931540424019778">"Inhabilita la revocación automática de autorizaciones ADB para sistemas que no se volvieron a conectar dentro de un período predeterminado (7 días) o uno configurado por el usuario (mínimo de 1 día)."</string>
     <string name="winscope_trace_quick_settings_title" msgid="4104768565053226689">"Seguimiento de Winscope"</string>
@@ -5294,6 +5257,7 @@
     <string name="sim_action_yes" msgid="8076556020131395515">"Sí"</string>
     <string name="sim_action_reboot" msgid="3508948833333441538">"Reiniciar"</string>
     <string name="sim_action_no_thanks" msgid="435717748384544195">"No, gracias"</string>
+    <string name="sim_action_cancel" msgid="2668099867029610910">"Cancelar"</string>
     <string name="sim_switch_button" msgid="1405772571706095387">"Cambiar"</string>
     <string name="dsds_activation_failure_title" msgid="4467364110584914794">"No se puede activar la SIM"</string>
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Quita la SIM y vuelve a insertarla. Si el problema persiste, reinicia el dispositivo."</string>
@@ -5446,6 +5410,10 @@
     <string name="cached_apps_freezer" msgid="1057519579761550350">"Suspende la ejecución de apps almacenadas en caché"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"Permitir pantallas superpuestas en Configuración"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Permite que las apps que pueden mostrar contenido sobre otras se superpongan a las pantallas de Configuración"</string>
+    <!-- no translation found for allow_mock_modem (3832264806530479214) -->
+    <skip />
+    <!-- no translation found for allow_mock_modem_summary (9097416612748005374) -->
+    <skip />
     <string name="media_controls_title" msgid="403271085636252597">"Contenido multimedia"</string>
     <string name="media_controls_resume_title" msgid="855076860336652370">"Fijar reproductor multimedia"</string>
     <string name="media_controls_resume_description" msgid="3163482266454802097">"Para reanudar rápidamente la reproducción, el reproductor multimedia permanece abierto en Configuración rápida"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index b3d9c2b..855d9aa 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -94,7 +94,7 @@
     <string name="bluetooth_device" msgid="2217973503732544291">"Dispositivo Bluetooth sin nombre"</string>
     <string name="progress_scanning" msgid="2564746192843011826">"Buscando"</string>
     <string name="bluetooth_no_devices_found" msgid="7704539337219953182">"No hay dispositivos Bluetooth cercanos."</string>
-    <string name="bluetooth_notif_ticker" msgid="209515545257862858">"Solicitud de vinculación de Bluetooth"</string>
+    <string name="bluetooth_notif_ticker" msgid="209515545257862858">"Solicitud de emparejamiento por Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="1196532269131348647">"Solicitud de vinculación"</string>
     <string name="bluetooth_notif_message" msgid="5584717784198086653">"Toca para emparejar con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_show_received_files" msgid="685424727760622632">"Archivos recibidos"</string>
@@ -142,10 +142,11 @@
     <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"Permite que tu dispositivo se comunique con dispositivos Bluetooth cercanos"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"Permite que tu teléfono se comunique con dispositivos Bluetooth cercanos"</string>
     <string name="bluetooth_disable_a2dp_hw_offload" msgid="5942913792817797541">"Inhabilitar descarga hardware A2DP BT"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="8610420176339657720">"¿Reiniciar dispos.?"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8333029144800835996">"Debes reiniciar el dispositivo para cambiar este ajuste."</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="3488695418187553566">"Reiniciar"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="4930826928585464191">"Cancelar"</string>
+    <string name="bluetooth_disable_le_audio_hw_offload" msgid="3966022676505972908">"Inhabilitar descarga de hardware Bluetooth LE AUDIO"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_title" msgid="6001142380445276918">"¿Reiniciar dispositivo?"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_message" msgid="1524373895333698779">"Debes reiniciar el dispositivo para cambiar este ajuste."</string>
+    <string name="bluetooth_disable_hw_offload_dialog_confirm" msgid="5594859658551707592">"Reiniciar"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel" msgid="3663690305043973720">"Cancelar"</string>
     <string name="connected_device_media_device_title" msgid="3783388247594566734">"Dispositivos multimedia"</string>
     <string name="connected_device_call_device_title" msgid="88732390601723608">"Dispositivos de llamada"</string>
     <string name="connected_device_other_device_title" msgid="4652120430615729193">"Otros dispositivos"</string>
@@ -309,9 +310,9 @@
     <string name="security_settings_title" msgid="6710768415432791970">"Seguridad"</string>
     <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"Cifrado y credenciales"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"Teléfono cifrado"</string>
-    <string name="decryption_settings_summary" product="default" msgid="1742645256103613503">"Teléfono no cifrado"</string>
+    <string name="not_encrypted_summary" product="default" msgid="2251945842585788254">"Teléfono no cifrado"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"Dispositivo cifrado"</string>
-    <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"Dispositivo no cifrado"</string>
+    <string name="not_encrypted_summary" product="tablet" msgid="2374263654698719382">"Dispositivo no cifrado"</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"Pantalla de bloqueo"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"Qué mostrar"</string>
     <string name="security_settings_summary" msgid="1627059516127354233">"Establecer Mi ubicación, bloqueo de pantalla, bloqueo de tarjeta SIM y bloqueo de almacenamiento de credenciales"</string>
@@ -568,37 +569,10 @@
     <string name="fingerprint_last_delete_message" msgid="7860374760549404410">"No podrás usar tu huella digital para desbloquear el teléfono ni para verificar tu identidad en aplicaciones."</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="4104208067277655068">"No podrás usar tu huella digital para desbloquear un perfil de trabajo, autorizar compras o iniciar sesión en aplicaciones de trabajo."</string>
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"Sí, quitar"</string>
-    <string name="crypt_keeper_settings_title" msgid="4938812137822100044">"Cifrado"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"Cifrar tablet"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"Cifrar teléfono"</string>
-    <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"Cifrado"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"Puedes cifrar tus cuentas, los ajustes, las aplicaciones descargadas y sus datos, archivos multimedia y otros archivos. Después de cifrar el tablet, siempre que hayas configurado una pantalla de bloqueo (es decir, un patrón, una contraseña o un PIN numérico), tendrás que desbloquear la pantalla para descifrar el tablet cada vez que lo enciendas. También puedes descifrar el dispositivo restableciendo el estado de fábrica, pero se borrarán todos tus datos.\n\nEl proceso de cifrado tarda 1 hora o más. Debes iniciar el proceso con la batería cargada y mantener el tablet enchufado. Si se interrumpe el proceso, perderás tus datos de forma total o parcial"</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"Puedes cifrar tus cuentas, los ajustes, las aplicaciones descargadas y sus datos, archivos multimedia y otros archivos. Después de cifrar el teléfono, siempre que hayas configurado una pantalla de bloqueo (es decir, un patrón, una contraseña o un PIN numérico), tendrás que desbloquear la pantalla para descifrar el teléfono cada vez que lo enciendas. También puedes descifrar el dispositivo restableciendo el estado de fábrica, pero se borrarán todos tus datos.\n\nEl proceso de cifrar tarda 1 hora o más. Debes iniciar el proceso con la batería cargada y mantener el teléfono enchufado. Si se interrumpe el proceso, perderás tus datos de forma total o parcial."</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"Cifrar tablet"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"Cifrar teléfono"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"Carga la batería y vuelve a intentarlo."</string>
-    <string name="crypt_keeper_unplugged_text" msgid="2709721134148651329">"Conecta el cargador y vuelve a intentarlo."</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="1847280235529858357">"Falta la contraseña o el PIN de la pantalla de bloqueo"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="7210616262954236042">"Debes establecer una contraseña o un PIN para la pantalla de bloqueo para poder iniciar el proceso de cifrado."</string>
-    <string name="crypt_keeper_confirm_title" msgid="8600000209722452230">"¿Cifrar dispositivo?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="3270587498436152259">"La operación de cifrado no se puede deshacer y, si la interrumpes, perderás datos. El cifrado tarda aproximadamente 1 hora o más y el tablet se reinicia varias veces durante este proceso."</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="3040428543349852419">"La operación de cifrado no se puede deshacer y, si la interrumpes, perderás datos. El cifrado puede tardar 1 hora o más y el teléfono se reinicia varias veces durante este proceso."</string>
-    <string name="crypt_keeper_setup_title" msgid="3339725741305796680">"Cifrando"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="4417016995091289019">"Espera mientras se cifra el tablet. <xliff:g id="PERCENT">^1</xliff:g>% completado"</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="7902355422499500352">"Espera mientras se cifra el teléfono. <xliff:g id="PERCENT">^1</xliff:g>% completado"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="8348188415839917821">"Espera mientras se cifra el tablet. Tiempo restante: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="8556105766597855198">"Espera mientras se cifra el teléfono. Tiempo restante: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="3832496715430327682">"Para desbloquear el tablet, apágalo y vuelve a encenderlo."</string>
-    <string name="crypt_keeper_force_power_cycle" product="default" msgid="5070346039522135361">"Para desbloquear el teléfono, apágalo y vuelve a encenderlo."</string>
-    <string name="crypt_keeper_warn_wipe" msgid="8104921337301750394">"Advertencia: Se borrarán los datos del dispositivo después de otros <xliff:g id="COUNT">^1</xliff:g> intentos fallidos para desbloquearlo"</string>
-    <string name="crypt_keeper_enter_password" msgid="1274917431075529732">"Escribe tu contraseña"</string>
-    <string name="crypt_keeper_failed_title" msgid="8173654570682244149">"Error en el cifrado"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"El proceso de cifrado se ha interrumpido y no se puede completar. No podrás volver a acceder a los datos del tablet. \n\nDebes restablecer el estado de fábrica para volver a usar el tablet. Cuando configures el tablet después de este proceso, podrás restaurar los datos de los que hayas hecho una copia de seguridad en tu cuenta de Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"El cifrado se ha interrumpido y no se puede completar. No podrás volver a acceder a los datos del teléfono. \n\nDebes restablecer el estado de fábrica para volver a usar el teléfono. Cuando configures el teléfono después de este proceso, podrás restaurar los datos de los que hayas hecho una copia de seguridad en tu cuenta de Google."</string>
-    <string name="crypt_keeper_data_corrupt_title" msgid="5920153462176846037">"Descifrado incorrecto"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"La contraseña que has introducido es correcta pero, lamentablemente, tus datos están dañados. \n\nPara seguir utilizando el tablet, debes restablecer el estado de fábrica. Al configurar el dispositivo después de este proceso, podrás restaurar los datos incluidos en la copia de seguridad de tu cuenta de Google."</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"La contraseña que has introducido es correcta pero, lamentablemente, tus datos están dañados. \n\nPara seguir utilizando el teléfono, debes restablecer el estado de fábrica. Al configurar el dispositivo después de este proceso, podrás restaurar los datos incluidos en la copia de seguridad de tu cuenta de Google."</string>
-    <string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"Cambiar método de introducción"</string>
+    <string name="encryption_settings_title" msgid="2848716008695618360">"Cifrado"</string>
+    <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"Cifrar tablet"</string>
+    <string name="encrypt_title" product="default" msgid="7337365190988321100">"Cifrar teléfono"</string>
+    <string name="encrypted_summary" msgid="545623487587251207">"Cifrado"</string>
     <string name="suggested_lock_settings_title" msgid="7836065447159730217">"Protege tu teléfono"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"Añade bloqueo de pantalla para proteger el tablet"</string>
     <string name="suggested_lock_settings_summary" product="device" msgid="8479766049078378225">"Añade bloqueo de pantalla para proteger el dispositivo"</string>
@@ -817,6 +791,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Es posible que tengas que introducir este PIN en el otro dispositivo."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Es posible que tengas que introducir la clave de acceso en el otro dispositivo."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Para emparejar con:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt; Comprueba que se muestre la clave:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Confirma para emparejar con el conjunto coordinado"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"De:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;¿Emparejar con este dispositivo?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Para emparejar con:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Escribe<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g> en el dispositivo y, a continuación, pulsa la tecla Intro o de retorno."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Permitir acceso a tus contactos y al historial de llamadas"</string>
@@ -850,6 +825,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"No se ha podido establecer conexión. Vuelve a intentarlo."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Detalles del dispositivo"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Dirección de Bluetooth del dispositivo: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Dirección de Bluetooth del dispositivo: \n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"¿Olvidar dispositivo?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Deshacer asociación"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"¿Desconectar aplicación?"</string>
@@ -881,6 +857,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Ajustes de recordatorio"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Máximo de dispositivos de audio conectados por Bluetooth"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Selecciona el número máximo de dispositivos de audio conectados por Bluetooth"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"Registro de depuración de la pila de NFC"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Aumenta la cantidad de información que se registra de la pila de NFC"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Enviar"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"proyectar"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Habilitar pantalla inalámbrica"</string>
@@ -1188,6 +1166,8 @@
     <string name="wifi_hotspot_maximize_compatibility_dual_ap_summary" msgid="3579549223159056533">"Ayuda a otros dispositivos a encontrar este punto de acceso. Aumenta el uso de la batería."</string>
     <string name="wifi_tether_starting" msgid="8879874184033857814">"Activando Compartir Internet…"</string>
     <string name="wifi_tether_stopping" msgid="4416492968019409188">"Desactivando Compartir Internet…"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_title" msgid="3089432578433978073">"Conexión compartida no disponible"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_content" msgid="5920421547607921112">"Ponte en contacto con tu operador para obtener más información al respecto"</string>
     <string name="wifi_tether_enabled_subtext" msgid="5085002421099821056">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> está activa"</string>
     <string name="wifi_tether_failed_subtext" msgid="437190628041885500">"Error de Compartir Internet"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7072559431286459122">"Configurar Compartir Internet"</string>
@@ -2412,7 +2392,7 @@
     <string name="accessibility_autoclick_shorter_desc" msgid="7631013255724544348">"Más corto"</string>
     <string name="accessibility_autoclick_longer_desc" msgid="2566025502981487443">"Más largo"</string>
     <string name="accessibility_autoclick_seekbar_desc" msgid="8363959277814621118">"Tiempo de clic automático"</string>
-    <string name="accessibility_vibration_settings_title" msgid="5198184603753129450">"Intensidad de la respuesta táctil y vibración"</string>
+    <string name="accessibility_vibration_settings_title" msgid="5198184603753129450">"Intensidad de la vibración al pulsar y vibración"</string>
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Vibración de las notificaciones"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Vibración del tono"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Respuesta táctil"</string>
@@ -2489,7 +2469,7 @@
       <item quantity="other"><xliff:g id="CLICK_DELAY_LABEL_2">%1$s</xliff:g> segundos</item>
       <item quantity="one"><xliff:g id="CLICK_DELAY_LABEL_0">%1$s</xliff:g> segundo</item>
     </plurals>
-    <string name="accessibility_vibration_summary" msgid="27904038683405084">"Tono (<xliff:g id="SUMMARY_RING">%1$s</xliff:g>), notificación (<xliff:g id="SUMMARY_NOTIFICATION">%2$s</xliff:g>) y respuesta táctil (<xliff:g id="SUMMARY_TOUCH">%3$s</xliff:g>)"</string>
+    <string name="accessibility_vibration_summary" msgid="27904038683405084">"Tono (<xliff:g id="SUMMARY_RING">%1$s</xliff:g>), notificación (<xliff:g id="SUMMARY_NOTIFICATION">%2$s</xliff:g>) y vibración al pulsar (<xliff:g id="SUMMARY_TOUCH">%3$s</xliff:g>)"</string>
     <string name="accessibility_vibration_summary_off" msgid="7776105450117095736">"Desactivada para notificaciones y llamadas"</string>
     <string name="accessibility_vibration_summary_low" msgid="6482721005400340317">"Baja para notificaciones y llamadas"</string>
     <string name="accessibility_vibration_summary_medium" msgid="2348889320548746469">"Media para notificaciones y llamadas"</string>
@@ -2534,11 +2514,6 @@
     <string name="enable_service_title" msgid="7231533866953706788">"¿Quieres permitir que <xliff:g id="SERVICE">%1$s</xliff:g> pueda controlar totalmente tu dispositivo?"</string>
     <string name="capabilities_list_title" msgid="1225853611983394386">"<xliff:g id="SERVICE">%1$s</xliff:g> necesita:"</string>
     <string name="touch_filtered_warning" msgid="4225815157460318241">"Una aplicación está bloqueando una solicitud de permiso, por lo que Ajustes no puede verificar tu respuesta."</string>
-    <string name="enable_service_encryption_warning" msgid="931082737770453755">"Si activas <xliff:g id="SERVICE">%1$s</xliff:g>, el dispositivo no utilizará el bloqueo de pantalla para mejorar el cifrado de datos."</string>
-    <string name="secure_lock_encryption_warning" msgid="669152607190123579">"Has activado un servicio de accesibilidad, por lo que el dispositivo no utilizará el bloqueo de pantalla para mejorar el cifrado de datos."</string>
-    <string name="enable_service_pattern_reason" msgid="6832846117817938536">"Activar <xliff:g id="SERVICE">%1$s</xliff:g> afecta al cifrado de datos, por lo que debes confirmar tu patrón."</string>
-    <string name="enable_service_pin_reason" msgid="6040417014360237703">"Activar <xliff:g id="SERVICE">%1$s</xliff:g> afecta al cifrado de datos, por lo que debes confirmar tu PIN."</string>
-    <string name="enable_service_password_reason" msgid="6962544350351734238">"Activar <xliff:g id="SERVICE">%1$s</xliff:g> afecta al cifrado de datos, por lo que debes confirmar tu contraseña."</string>
     <string name="accessibility_service_warning" msgid="6779187188736432618">"<xliff:g id="SERVICE">%1$s</xliff:g> está solicitando el control completo del dispositivo. El servicio puede leer la pantalla y actuar en nombre de los usuarios que necesitan funciones de accesibilidad. El nivel de control no es adecuado para la mayoría de las aplicaciones."</string>
     <string name="accessibility_service_warning_description" msgid="6573203795976134751">"El control total es adecuado para las aplicaciones de accesibilidad, pero no para la mayoría de las aplicaciones."</string>
     <string name="accessibility_service_screen_control_title" msgid="324795030658109870">"Ver y controlar la pantalla"</string>
@@ -3103,14 +3078,6 @@
     <string name="remove_account_failed" msgid="3709502163548900644">"El administrador no permite realizar este cambio"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"No se puede hacer la sincronización de forma manual."</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"La sincronización de este elemento no está disponible en este momento. Para modificar tu preferencia, activa temporalmente los datos en segundo plano y la sincronización automática."</string>
-    <string name="enter_password" msgid="6327051330258595331">"Para iniciar tu dispositivo Android, introduce tu contraseña"</string>
-    <string name="enter_pin" msgid="1029287617551232681">"Para iniciar tu dispositivo Android, introduce el PIN"</string>
-    <string name="enter_pattern" msgid="1747316785866742960">"Para iniciar tu dispositivo Android, dibuja tu patrón"</string>
-    <string name="cryptkeeper_wrong_pattern" msgid="340747269176120242">"Patrón incorrecto"</string>
-    <string name="cryptkeeper_wrong_password" msgid="7295607881887114486">"Contraseña incorrecta"</string>
-    <string name="cryptkeeper_wrong_pin" msgid="2347961593970714201">"PIN incorrecto"</string>
-    <string name="checking_decryption" msgid="6111642972615688237">"Comprobando..."</string>
-    <string name="starting_android" msgid="6694154070215356186">"Iniciando Android…"</string>
     <string name="delete" msgid="8330605554706263775">"Eliminar"</string>
     <string name="misc_files" msgid="6598066985800749585">"Archivos variados"</string>
     <string name="misc_files_selected_count" msgid="5597802791672749532">"Has seleccionado <xliff:g id="NUMBER">%1$d</xliff:g> de <xliff:g id="TOTAL">%2$d</xliff:g>."</string>
@@ -3206,8 +3173,6 @@
     <string name="data_usage_metered_yes" msgid="4262598072030135223">"Red de uso medido"</string>
     <string name="data_usage_metered_no" msgid="1685828958417926268">"Sin uso medido"</string>
     <string name="data_usage_disclaimer" msgid="3271450299386176770">"El uso de datos del operador puede ser diferente al calculado por el dispositivo."</string>
-    <string name="cryptkeeper_emergency_call" msgid="8369322820475703306">"Llamada de emergencia"</string>
-    <string name="cryptkeeper_return_to_call" msgid="3857250752781151232">"Volver a llamada"</string>
     <string name="vpn_name" msgid="3806456074909253262">"Nombre"</string>
     <string name="vpn_type" msgid="5533202873260826663">"Tipo"</string>
     <string name="vpn_server" msgid="2908816134941973935">"Dirección del servidor"</string>
@@ -3393,7 +3358,7 @@
     <string name="restriction_menu_reset" msgid="92859464456364092">"Quitar restricciones"</string>
     <string name="restriction_menu_change_pin" msgid="2505923323199003718">"Cambiar PIN"</string>
     <string name="help_label" msgid="2896538416436125883">"Ayuda y comentarios"</string>
-    <string name="support_summary" msgid="6137136608018134563">"Artículos de ayuda y asistencia por teléfono y chat"</string>
+    <string name="support_summary" msgid="6137136608018134563">"Artículos de ayuda, asistencia por teléfono y chat"</string>
     <string name="user_account_title" msgid="6389636876210834864">"Cuenta para contenido"</string>
     <string name="user_picture_title" msgid="7176437495107563321">"ID de foto"</string>
     <string name="extreme_threats_title" msgid="1098958631519213856">"Amenazas extremas"</string>
@@ -3500,10 +3465,10 @@
       <item quantity="one">Mostrar %d elemento oculto</item>
     </plurals>
     <string name="network_dashboard_title" msgid="788543070557731240">"Redes e Internet"</string>
-    <string name="network_dashboard_summary_mobile" msgid="7750924671970583670">"Datos móviles, Wi‑Fi y puntos de acceso"</string>
-    <string name="network_dashboard_summary_no_mobile" msgid="4022575916334910790">"Wi‑Fi y puntos de acceso"</string>
+    <string name="network_dashboard_summary_mobile" msgid="7750924671970583670">"Datos móviles, Wi‑Fi, puntos de acceso"</string>
+    <string name="network_dashboard_summary_no_mobile" msgid="4022575916334910790">"Wi‑Fi, puntos de acceso"</string>
     <string name="connected_devices_dashboard_title" msgid="19868275519754895">"Dispositivos conectados"</string>
-    <string name="connected_devices_dashboard_default_summary" msgid="7211769956193710397">"Bluetooth y emparejamiento"</string>
+    <string name="connected_devices_dashboard_default_summary" msgid="7211769956193710397">"Bluetooth, emparejamiento"</string>
     <string name="connected_devices_dashboard_summary" msgid="6927727617078296491">"Bluetooth, modo de conducción, NFC"</string>
     <string name="connected_devices_dashboard_no_nfc_summary" msgid="8424794257586524040">"Bluetooth, modo de conducción"</string>
     <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="7155882619333726331">"Bluetooth, NFC"</string>
@@ -4412,7 +4377,7 @@
     <string name="battery_summary" msgid="2491764359695671207">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> de uso desde la última carga completa"</string>
     <string name="battery_summary_24hr" msgid="7656033283282656551">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> de uso durante las últimas 24 horas"</string>
     <string name="no_battery_summary" msgid="5769159953384122003">"No ha usado batería desde la última carga completa"</string>
-    <string name="no_battery_summary_24hr" msgid="6280079526797873842">"No se ha usado la batería en las últimas 24 horas"</string>
+    <string name="no_battery_summary_24hr" msgid="6280079526797873842">"No ha usado batería en las últimas 24 horas"</string>
     <string name="app_notification_preferences" msgid="2004680717999108725">"Ajustes de aplicaciones"</string>
     <string name="system_ui_settings" msgid="936169564323330967">"Mostrar SystemUI Tuner"</string>
     <string name="additional_permissions" msgid="4656871347558988462">"Permisos adicionales"</string>
@@ -4678,7 +4643,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> aplicaciones pueden usar datos sin restricción cuando el ahorro de datos está activado</item>
       <item quantity="one">1 aplicación puede usar datos sin restricción cuando el ahorro de datos está activado</item>
     </plurals>
-    <string name="data_usage_title" msgid="4039024073687469094">"Datos principales"</string>
+    <string name="data_usage_title" msgid="4039024073687469094">"Datos primarios"</string>
     <string name="data_usage_wifi_title" msgid="1060495519280456926">"Datos Wi‑Fi"</string>
     <string name="data_used" msgid="7770571947591789895">"<xliff:g id="ID_1">^1</xliff:g> usados"</string>
     <string name="data_used_formatted" msgid="7913920278059077938">"<xliff:g id="ID_1">^1</xliff:g> <xliff:g id="ID_2">^2</xliff:g> usados"</string>
@@ -4764,8 +4729,6 @@
       <item quantity="one">1 aplicación puede utilizar datos sin restricción</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"Ver más"</string>
-    <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"¿Seguro que quieres borrar los datos de usuario y convertirlos a cifrado de archivo?"</string>
-    <string name="button_confirm_convert_fbe" msgid="339648921918438106">"Borrar y convertir"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"Restablecer límite de frecuencia de ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"Se ha restablecido el límite de frecuencia de ShortcutManager"</string>
     <string name="notification_suggestion_title" msgid="6309263655965785411">"Controla los datos que aparecen en la pantalla de bloqueo"</string>
@@ -5292,6 +5255,7 @@
     <string name="sim_action_yes" msgid="8076556020131395515">"Sí"</string>
     <string name="sim_action_reboot" msgid="3508948833333441538">"Reiniciar"</string>
     <string name="sim_action_no_thanks" msgid="435717748384544195">"No, gracias"</string>
+    <string name="sim_action_cancel" msgid="2668099867029610910">"Cancelar"</string>
     <string name="sim_switch_button" msgid="1405772571706095387">"Cambiar"</string>
     <string name="dsds_activation_failure_title" msgid="4467364110584914794">"No se ha podido activar la tarjeta SIM"</string>
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Extrae la tarjeta SIM e insértala de nuevo. Si el problema continúa, reinicia el dispositivo."</string>
@@ -5429,8 +5393,8 @@
     <string name="lockscreen_privacy_wallet_summary" msgid="5388868513484652431">"Permite el acceso a la cartera desde la pantalla de bloqueo y los ajustes rápidos"</string>
     <string name="lockscreen_privacy_controls_setting_toggle" msgid="7445725343949588613">"Mostrar controles del dispositivo"</string>
     <string name="lockscreen_privacy_controls_summary" msgid="6952176547084269909">"Accede a los controles con la pantalla bloqueada"</string>
-    <string name="lockscreen_double_line_clock_summary" msgid="2916159550425093703">"Mostrar el reloj analógico cuando esté disponible"</string>
-    <string name="lockscreen_double_line_clock_setting_toggle" msgid="3408639316001688529">"Reloj analógico"</string>
+    <string name="lockscreen_double_line_clock_summary" msgid="2916159550425093703">"Mostrar el reloj en dos líneas cuando está disponible"</string>
+    <string name="lockscreen_double_line_clock_setting_toggle" msgid="3408639316001688529">"Reloj en dos líneas"</string>
     <string name="rtt_settings_title" msgid="7049259598645966354"></string>
     <string name="rtt_settings_no_visible" msgid="7440356831140948382"></string>
     <string name="rtt_settings_visible_during_call" msgid="7866181103286073700"></string>
@@ -5444,6 +5408,10 @@
     <string name="cached_apps_freezer" msgid="1057519579761550350">"Suspender ejecución de aplicaciones en caché"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"Permitir superposiciones de pantalla en Ajustes"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Permite que las aplicaciones que se muestran sobre otras se superpongan en pantallas de ajustes"</string>
+    <!-- no translation found for allow_mock_modem (3832264806530479214) -->
+    <skip />
+    <!-- no translation found for allow_mock_modem_summary (9097416612748005374) -->
+    <skip />
     <string name="media_controls_title" msgid="403271085636252597">"Multimedia"</string>
     <string name="media_controls_resume_title" msgid="855076860336652370">"Fijar reproductor multimedia"</string>
     <string name="media_controls_resume_description" msgid="3163482266454802097">"Para que puedas seguir rápidamente por donde lo habías dejado, el reproductor multimedia se queda abierto en los ajustes rápidos"</string>
@@ -5552,7 +5520,7 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Introducir número de teléfono"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Falta el número de teléfono."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"Aceptar"</string>
-    <string name="enable_2g_title" msgid="8184757884636162942">"Permitir el 2G"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"Permitir 2G"</string>
     <string name="enable_2g_summary" msgid="906487478332145407">"Usar conexiones móviles 2G. En las llamadas de emergencia, el 2G siempre está activado."</string>
     <string name="show_clip_access_notification" msgid="7782300987639778542">"Mostrar acceso al portapapeles"</string>
     <string name="show_clip_access_notification_summary" msgid="474090757777203207">"Muestra un mensaje cuando las aplicaciones acceden a texto, imágenes u otro contenido que has copiado"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 2265879..9a5bf9a 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -142,10 +142,11 @@
     <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"Lubage oma seadmel lähedalasuvate Bluetoothi seadmetega suhelda"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"Lubage telefonil suhelda lähedalasuvate Bluetoothi seadmetega"</string>
     <string name="bluetooth_disable_a2dp_hw_offload" msgid="5942913792817797541">"Keela Bluetoothi A2DP riistvara mahalaadimine"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="8610420176339657720">"Kas taaskäivitada seade?"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8333029144800835996">"Selle seade muutmiseks peate seadme taaskäivitama."</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="3488695418187553566">"Taaskäivita"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="4930826928585464191">"Loobu"</string>
+    <string name="bluetooth_disable_le_audio_hw_offload" msgid="3966022676505972908">"Keela Bluetooth LE AUDIO riistvara mahalaadimine"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_title" msgid="6001142380445276918">"Kas taaskäivitada seade?"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_message" msgid="1524373895333698779">"Selle seade muutmiseks peate seadme taaskäivitama."</string>
+    <string name="bluetooth_disable_hw_offload_dialog_confirm" msgid="5594859658551707592">"Taaskäivita"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel" msgid="3663690305043973720">"Tühista"</string>
     <string name="connected_device_media_device_title" msgid="3783388247594566734">"Meediaseadmed"</string>
     <string name="connected_device_call_device_title" msgid="88732390601723608">"Helistamisseadmed"</string>
     <string name="connected_device_other_device_title" msgid="4652120430615729193">"Muud seadmed"</string>
@@ -309,9 +310,9 @@
     <string name="security_settings_title" msgid="6710768415432791970">"Turvalisus"</string>
     <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"Krüpteerimine ja mandaadid"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"Telefon on krüpteeritud"</string>
-    <string name="decryption_settings_summary" product="default" msgid="1742645256103613503">"Telefon ei ole krüpteeritud"</string>
+    <string name="not_encrypted_summary" product="default" msgid="2251945842585788254">"Telefon ei ole krüpteeritud"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"Seade on krüpteeritud"</string>
-    <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"Seade ei ole krüpteeritud"</string>
+    <string name="not_encrypted_summary" product="tablet" msgid="2374263654698719382">"Seade ei ole krüpteeritud"</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"Lukustuskuva"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"Mida kuvada?"</string>
     <string name="security_settings_summary" msgid="1627059516127354233">"Määrake Minu asukoht, ekraani avamine, SIM-kaardi lukk, mandaadi talletuslukk"</string>
@@ -570,37 +571,10 @@
     <string name="fingerprint_last_delete_message" msgid="7860374760549404410">"Te ei saa oma sõrmejälge kasutades telefoni avada ega rakendustes oma isikut kinnitada."</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="4104208067277655068">"Te ei saa oma sõrmejälge kasutades tööprofiili avada, oste volitada ega töörakendustesse sisse logida."</string>
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"Jah, eemalda"</string>
-    <string name="crypt_keeper_settings_title" msgid="4938812137822100044">"Krüpteerimine"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"Tahvelarvuti krüpteerimine"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"Telefoni krüpteerimine"</string>
-    <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"Krüpteeritud"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"Saate krüpteerida kontod, seaded, allalaaditud rakendused ja nende andmed, meedia ja muud failid. Kui olete tahvelarvuti krüpteerinud ja ekraaniluku (mustri või PIN-koodi või parooli) seadistanud, peate avama ekraani, et dekrüpteerida tahvelarvuti iga kord, kui lülitate selle sisse. Ainus muu võimalus dekrüpteerimiseks on lähtestada tahvelarvuti tehaseandmetele, mille tulemusel kustutatakse kõik andmed.\n\nKrüpteerimiseks kulub vähemalt tund. Enne krüpteerimise alustamist veenduge, et aku oleks laetud. Tahvelarvuti peab olema kogu protsessi jooksul ühendatud vooluvõrguga. Kui protsess katkeb, kaotate osa andmetest või kõik andmed."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"Saate krüpteerida kontod, seaded, allalaaditud rakendused ja nende andmed, meedia ja muud failid. Kui olete telefoni krüpteerinud ja ekraaniluku (mustri või PIN-koodi või parooli) seadistanud, peate avama ekraani, et dekrüpteerida telefon iga kord, kui lülitate selle sisse. Ainus muu võimalus dekrüpteerimiseks on lähtestada telefon tehaseandmetele, mille tulemusel kustutatakse kõik andmed.\n\nKrüpteerimiseks kulub vähemalt tund. Enne krüpteerimise alustamist veenduge, et aku oleks laetud. Telefon peab olema kogu protsessi jooksul ühendatud vooluvõrguga. Kui protsess katkeb, kaotate osa andmetest või kõik andmed."</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"Krüpteeri tahvelarvuti"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"Krüpteeri telefon"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"Laadige akut ja proovige uuesti."</string>
-    <string name="crypt_keeper_unplugged_text" msgid="2709721134148651329">"Ühendage laadija ja proovige uuesti."</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="1847280235529858357">"Ekraaniluku PIN-koodi või parooli ei ole"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="7210616262954236042">"Enne krüpteerimist peate määrama lukustusekraani PIN-koodi või parooli."</string>
-    <string name="crypt_keeper_confirm_title" msgid="8600000209722452230">"Kas krüpteerida?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="3270587498436152259">"Krüpteerimistoiming on pöördumatu ja katkestamisel kaotate andmed. Krüpteerimiseks kulub tund või rohkem, mille jooksul tahvelarvuti taaskäivitub mitu korda."</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="3040428543349852419">"Krüpteerimistoiming on pöördumatu ja selle katkestamisel kaotate andmed. Krüpteerimiseks kulub tund või rohkem, selle aja jooksul taaskäivitub telefon mitu korda."</string>
-    <string name="crypt_keeper_setup_title" msgid="3339725741305796680">"Krüpteerimine"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="4417016995091289019">"Oodake, kuni teie tahvelarvutit krüpteeritakse. <xliff:g id="PERCENT">^1</xliff:g>% valmis."</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="7902355422499500352">"Oodake, kuni teie telefon krüpteeritakse. <xliff:g id="PERCENT">^1</xliff:g>% valmis."</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="8348188415839917821">"Oodake, kuni teie tahvelarvuti krüpteeritakse. Aega on jäänud: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="8556105766597855198">"Oodake, kuni teie telefon krüpteeritakse. Aega on jäänud: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="3832496715430327682">"Tahvelarvuti avamiseks lülitage see välja ja uuesti sisse."</string>
-    <string name="crypt_keeper_force_power_cycle" product="default" msgid="5070346039522135361">"Telefoni avamiseks lülitage see välja ja uuesti sisse."</string>
-    <string name="crypt_keeper_warn_wipe" msgid="8104921337301750394">"Hoiatus! Kui veel <xliff:g id="COUNT">^1</xliff:g> avamiskatset ebaõnnestub, siis seade tühjendatakse."</string>
-    <string name="crypt_keeper_enter_password" msgid="1274917431075529732">"Sisestage parool"</string>
-    <string name="crypt_keeper_failed_title" msgid="8173654570682244149">"Krüptimine ebaõnnestus"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"Krüpteerimine katkestati ja seda ei saa lõpule viia. Seetõttu ei pääse te enam oma tahvelarvutis olevatele andmetele juurde. \n\n Tahvelarvuti kasutamise jätkamiseks peate lähtestama selle tehaseseadetele. Kui seadistate tahvelarvutit pärast lähtestamist, saate taastada kõik andmed, mis olid varundatud teie Google\'i kontole."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"Krüpteerimine katkestati ja seda ei saa lõpule viia. Seetõttu ei pääse te enam oma telefonis olevatele andmetele juurde. \n\nTelefoni kasutamise jätkamiseks peate selle lähtestama tehaseseadetele. Kui seadistate telefoni pärast lähtestamist, saate taastada kõik andmed, mis olid varundatud teie Google\'i kontole."</string>
-    <string name="crypt_keeper_data_corrupt_title" msgid="5920153462176846037">"Dekrüpteerimine ebaõnnestus"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"Sisestatud parool on õige, kuid kahjuks on andmed rikutud. \n\nTahvelarvuti kasutamise jätkamiseks peate selle lähtestama tehaseseadetele. Kui seadistate tahvelarvuti pärast lähtestamist, saate taastada kõik andmed, mis on varundatud teie Google\'i kontole."</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"Sisestatud parool on õige, kuid kahjuks on andmed rikutud. \n\nTelefoni kasutamise jätkamiseks peate selle lähtestama tehaseseadetele. Kui seadistate telefoni pärast lähtestamist, saate taastada kõik andmed, mis on varundatud teie Google\'i kontole."</string>
-    <string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"Sisestusmeetodi vahetamine"</string>
+    <string name="encryption_settings_title" msgid="2848716008695618360">"Krüpteerimine"</string>
+    <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"Krüpteeri tahvelarvuti"</string>
+    <string name="encrypt_title" product="default" msgid="7337365190988321100">"Krüpteeri telefon"</string>
+    <string name="encrypted_summary" msgid="545623487587251207">"Krüpteeritud"</string>
     <string name="suggested_lock_settings_title" msgid="7836065447159730217">"Tagage oma telefoni turvalisus"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"Määrake tahvelarvuti kaitsmiseks ekraanilukk"</string>
     <string name="suggested_lock_settings_summary" product="device" msgid="8479766049078378225">"Määrake seadme kaitsmiseks ekraanilukk"</string>
@@ -819,6 +793,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Võib-olla peate selle PIN-koodi sisestama ka teise seadmesse."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Võib-olla peate selle parooli sisestama ka teise seadmesse."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Sidumine seadmega&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Veenduge, et see kuvaks järgmist parooli:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Kinnitage koordineeritud komplektiga sidumiseks"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"Seadmelt: &lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt; Kas siduda seadmega?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Siduda seadmega:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Sisestage:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, seejärel vajutage naasmis- või sisestusklahvi."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Luba juurdepääs kontaktidele ja kõneajaloole"</string>
@@ -852,6 +827,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Ühendust ei õnnestunud luua. Proovige uuesti."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Seadme üksikasjad"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Seadme Bluetoothi aadress: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Seadme Bluetoothi aadress:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Kas unustada seade?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Eemalda seos"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Kas katkestada rakenduse ühendus?"</string>
@@ -883,6 +859,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Jäta seaded meelde"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Maksimaalne arv ühendatud Bluetoothi heliseadmeid"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Maksimaalse arvu ühendatud Bluetoothi heliseadmete valimine"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"NFC virna silumise logi"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"NFC virna logimise taseme suurendamine"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Ülekandmine"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"peegeldamine"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Luba juhtmeta ekraaniühendus"</string>
@@ -1190,6 +1168,8 @@
     <string name="wifi_hotspot_maximize_compatibility_dual_ap_summary" msgid="3579549223159056533">"Aitab muudel seadmetel selle kuumkoha leida. Akukasutus suureneb."</string>
     <string name="wifi_tether_starting" msgid="8879874184033857814">"Kuumkoha sisselülitamine ..."</string>
     <string name="wifi_tether_stopping" msgid="4416492968019409188">"Kuumkoha väljalülitamine ..."</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_title" msgid="3089432578433978073">"Jagamine pole saadaval"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_content" msgid="5920421547607921112">"Lisateavet küsige operaatorilt"</string>
     <string name="wifi_tether_enabled_subtext" msgid="5085002421099821056">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> on aktiivne"</string>
     <string name="wifi_tether_failed_subtext" msgid="437190628041885500">"Mobiilse WiFi-kuumkoha viga"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7072559431286459122">"WiFi-kuumkoha seadistamine"</string>
@@ -2536,11 +2516,6 @@
     <string name="enable_service_title" msgid="7231533866953706788">"Kas anda teenusele <xliff:g id="SERVICE">%1$s</xliff:g> teie seadme üle täielik kontroll?"</string>
     <string name="capabilities_list_title" msgid="1225853611983394386">"<xliff:g id="SERVICE">%1$s</xliff:g> teeb järgmist:"</string>
     <string name="touch_filtered_warning" msgid="4225815157460318241">"Seaded ei saa teie vastust kinnitada, sest rakendus varjab loataotlust."</string>
-    <string name="enable_service_encryption_warning" msgid="931082737770453755">"Kui lülitate sisse teenuse <xliff:g id="SERVICE">%1$s</xliff:g>, ei kasuta seade andmete krüpteerimise täiustamiseks ekraanilukku."</string>
-    <string name="secure_lock_encryption_warning" msgid="669152607190123579">"Kuna lülitasite sisse juurdepääsetavuse teenuse, siis ei kasuta teie seade andmete krüpteerimise täiustamiseks ekraanilukku."</string>
-    <string name="enable_service_pattern_reason" msgid="6832846117817938536">"Kuna teenuse <xliff:g id="SERVICE">%1$s</xliff:g> sisselülitamine mõjutab andmete krüpteerimist, peate kinnitama oma mustri."</string>
-    <string name="enable_service_pin_reason" msgid="6040417014360237703">"Kuna teenuse <xliff:g id="SERVICE">%1$s</xliff:g> sisselülitamine mõjutab andmete krüpteerimist, peate kinnitama oma PIN-koodi."</string>
-    <string name="enable_service_password_reason" msgid="6962544350351734238">"Kuna teenuse <xliff:g id="SERVICE">%1$s</xliff:g> sisselülitamine mõjutab andmete krüpteerimist, peate kinnitama oma parooli."</string>
     <string name="accessibility_service_warning" msgid="6779187188736432618">"<xliff:g id="SERVICE">%1$s</xliff:g> taotleb seadme täielikku haldusõigust. Teenus saab juurdepääsufunktsioone vajavate kasutajate nimel ekraani lugeda ja tegutseda. See haldusõiguse tase ei ole enamiku rakenduste puhul sobilik."</string>
     <string name="accessibility_service_warning_description" msgid="6573203795976134751">"Täielik haldusõigus sobib rakendustele, mis pakuvad juurdepääsufunktsioone. Enamiku rakenduste puhul seda ei soovitata."</string>
     <string name="accessibility_service_screen_control_title" msgid="324795030658109870">"Ekraanikuva vaatamine ja haldamine"</string>
@@ -3105,14 +3080,6 @@
     <string name="remove_account_failed" msgid="3709502163548900644">"Administraator on selle muudatuse keelanud"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"Ei saa käsitsi sünkroonida"</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"Selle üksuse sünkroonimine on praegu keelatud. Seade muutmiseks lülitage ajutiselt sisse taustaandmed ja automaatne sünkroonimine."</string>
-    <string name="enter_password" msgid="6327051330258595331">"Androidi käivitamiseks sisestage parool"</string>
-    <string name="enter_pin" msgid="1029287617551232681">"Androidi käivitamiseks sisestage oma PIN-kood"</string>
-    <string name="enter_pattern" msgid="1747316785866742960">"Androidi käivitamiseks joonistage muster"</string>
-    <string name="cryptkeeper_wrong_pattern" msgid="340747269176120242">"Vale muster"</string>
-    <string name="cryptkeeper_wrong_password" msgid="7295607881887114486">"Vale parool"</string>
-    <string name="cryptkeeper_wrong_pin" msgid="2347961593970714201">"Vale PIN-kood"</string>
-    <string name="checking_decryption" msgid="6111642972615688237">"Kontrollimine ..."</string>
-    <string name="starting_android" msgid="6694154070215356186">"Androidi käivitamine ..."</string>
     <string name="delete" msgid="8330605554706263775">"Kustuta"</string>
     <string name="misc_files" msgid="6598066985800749585">"Mitmesugused failid"</string>
     <string name="misc_files_selected_count" msgid="5597802791672749532">"valitud <xliff:g id="NUMBER">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -3208,8 +3175,6 @@
     <string name="data_usage_metered_yes" msgid="4262598072030135223">"Mahupõhine"</string>
     <string name="data_usage_metered_no" msgid="1685828958417926268">"Pole mahupõhine"</string>
     <string name="data_usage_disclaimer" msgid="3271450299386176770">"Operaatori andmemahuarvestus võib erineda seadme omast"</string>
-    <string name="cryptkeeper_emergency_call" msgid="8369322820475703306">"Hädaabikõne"</string>
-    <string name="cryptkeeper_return_to_call" msgid="3857250752781151232">"Tagasi kõne juurde"</string>
     <string name="vpn_name" msgid="3806456074909253262">"Nimi"</string>
     <string name="vpn_type" msgid="5533202873260826663">"Tüüp"</string>
     <string name="vpn_server" msgid="2908816134941973935">"Serveri aadress"</string>
@@ -4766,8 +4731,6 @@
       <item quantity="one">1 rakendusel on piiranguteta juurdepääs andmesidele</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"Kuva rohkem"</string>
-    <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"Kas soovite tõesti kasutaja andmed kustutada ja teisendada failide krüpteerimisele?"</string>
-    <string name="button_confirm_convert_fbe" msgid="339648921918438106">"Kustuta ja teisenda"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"Teenuse ShortcutManager sageduse piiramise lähtestamine"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"Teenuse ShortcutManager sageduse piiramine lähtestati"</string>
     <string name="notification_suggestion_title" msgid="6309263655965785411">"Kontrollige lukustuskuva teavet"</string>
@@ -5024,7 +4987,7 @@
     <string name="storage_percent_full" msgid="7211888326013020857">"kasut."</string>
     <string name="storage_usage_summary" msgid="4591121727356723463">"Kasutatud on <xliff:g id="NUMBER">%1$s</xliff:g> <xliff:g id="UNIT">%2$s</xliff:g>"</string>
     <string name="storage_total_summary" msgid="7163360249534964272">"Kokku <xliff:g id="NUMBER">%1$s</xliff:g> <xliff:g id="UNIT">%2$s</xliff:g>"</string>
-    <string name="clear_instant_app_data" msgid="5951258323364386357">"Tühjenda rakendus"</string>
+    <string name="clear_instant_app_data" msgid="5951258323364386357">"Kustuta rakendus"</string>
     <string name="clear_instant_app_confirmation" msgid="3964731334459209482">"Kas soovite selle installimata avatava rakenduse eemaldada?"</string>
     <string name="launch_instant_app" msgid="8503927414339606561">"Ava"</string>
     <string name="game_storage_settings" msgid="2521393115726178837">"Mängud"</string>
@@ -5294,6 +5257,7 @@
     <string name="sim_action_yes" msgid="8076556020131395515">"Jah"</string>
     <string name="sim_action_reboot" msgid="3508948833333441538">"Taaskäivita"</string>
     <string name="sim_action_no_thanks" msgid="435717748384544195">"Tänan, ei"</string>
+    <string name="sim_action_cancel" msgid="2668099867029610910">"Loobu"</string>
     <string name="sim_switch_button" msgid="1405772571706095387">"Vaheta"</string>
     <string name="dsds_activation_failure_title" msgid="4467364110584914794">"SIM-kaarti ei saa aktiveerida"</string>
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Eemaldage SIM-kaart ja sisestage uuesti. Kui probleem jätkub, taaskäivitage seade."</string>
@@ -5446,6 +5410,10 @@
     <string name="cached_apps_freezer" msgid="1057519579761550350">"Vahemälus olevate rakenduste täitmise peatamine"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"Luba Seadetes ekraani ülekatted"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Lubage rakendustel, mida tohib kuvada teiste rakenduste peal, katta Seadete ekraanikuvasid"</string>
+    <!-- no translation found for allow_mock_modem (3832264806530479214) -->
+    <skip />
+    <!-- no translation found for allow_mock_modem_summary (9097416612748005374) -->
+    <skip />
     <string name="media_controls_title" msgid="403271085636252597">"Meedia"</string>
     <string name="media_controls_resume_title" msgid="855076860336652370">"Meediapleieri kinnitamine"</string>
     <string name="media_controls_resume_description" msgid="3163482266454802097">"Kiirelt taasesituse jätkamiseks jääb meediapleier kiirseadetes avatuks"</string>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 8a97c4b..b0497de 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -142,10 +142,11 @@
     <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"Eman gailuari inguruko Bluetooth bidezko gailuekin komunikatzeko baimena"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"Baimendu telefonoari inguruko Bluetooth bidezko gailuekin komunikatzea"</string>
     <string name="bluetooth_disable_a2dp_hw_offload" msgid="5942913792817797541">"Desgaitu Bluetooth A2DP hardwarea deskargatzeko aukera"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="8610420176339657720">"Gailua berrabiarazi?"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8333029144800835996">"Ezarpen hau aldatzeko, gailua berrabiarazi egin behar duzu."</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="3488695418187553566">"Berrabiarazi"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="4930826928585464191">"Utzi"</string>
+    <string name="bluetooth_disable_le_audio_hw_offload" msgid="3966022676505972908">"Desgaitu Bluetooth LE AUDIO-ren hardwarearen deskarga"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_title" msgid="6001142380445276918">"Gailua berrabiarazi nahi duzu?"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_message" msgid="1524373895333698779">"Ezarpen hau aldatzeko, gailua berrabiarazi behar duzu."</string>
+    <string name="bluetooth_disable_hw_offload_dialog_confirm" msgid="5594859658551707592">"Berrabiarazi"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel" msgid="3663690305043973720">"Utzi"</string>
     <string name="connected_device_media_device_title" msgid="3783388247594566734">"Multimedia-gailuak"</string>
     <string name="connected_device_call_device_title" msgid="88732390601723608">"Deiak jaso eta egiteko gailuak"</string>
     <string name="connected_device_other_device_title" msgid="4652120430615729193">"Beste gailu batzuk"</string>
@@ -309,9 +310,9 @@
     <string name="security_settings_title" msgid="6710768415432791970">"Segurtasuna"</string>
     <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"Enkriptatzea eta kredentzialak"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"Enkriptatuta dago telefonoa"</string>
-    <string name="decryption_settings_summary" product="default" msgid="1742645256103613503">"Telefonoa ez dago enkriptatuta"</string>
+    <string name="not_encrypted_summary" product="default" msgid="2251945842585788254">"Telefonoa ez dago enkriptatuta"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"Enkriptatuta dago gailua"</string>
-    <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"Gailua ez dago enkriptatuta"</string>
+    <string name="not_encrypted_summary" product="tablet" msgid="2374263654698719382">"Gailua ez dago enkriptatuta"</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"Pantaila blokeatua"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"Zer erakutsi"</string>
     <string name="security_settings_summary" msgid="1627059516127354233">"Ezarri Nire kokapena, pantailaren desblokeoa, SIM txartelaren blokeoa, kredentzialen biltegiaren blokeoa"</string>
@@ -480,7 +481,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"Ezabatu"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"Ukitu sentsorea"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"Ezarri hatza sentsorean eta, dardara sentitzen duzunean, jaso ezazu"</string>
-    <string name="security_settings_udfps_enroll_start_message" msgid="5032954588171487566">"Mantendu hatz-marka modu lauan sentsorearen gainean dardara sentitu arte"</string>
+    <string name="security_settings_udfps_enroll_start_message" msgid="5032954588171487566">"Jarri hatz-marka lau-laua sentsorearen gainean eta manten ezazu dardara sentitu arte"</string>
     <string name="security_settings_fingerprint_enroll_udfps_title" msgid="6665610134560896895">"Eduki ukituta hatz-marken sentsorea"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"Jaso hatza eta ukitu berriro"</string>
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"Beste behin"</string>
@@ -568,37 +569,10 @@
     <string name="fingerprint_last_delete_message" msgid="7860374760549404410">"Ezingo duzu erabili hatz-marka telefonoa desblokeatzeko edo aplikazioetan zeu zarela egiaztatzeko."</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="4104208067277655068">"Ezingo duzu erabili hatz-marka laneko profila desblokeatzeko, erosketak baimentzeko edo laneko aplikazioetan saioa hasteko."</string>
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"Bai, kendu"</string>
-    <string name="crypt_keeper_settings_title" msgid="4938812137822100044">"Enkriptatzea"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"Enkriptatu tableta"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"Enkriptatu telefonoa"</string>
-    <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"Enkriptatuta"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"Kontuak, ezarpenak, deskargatutako aplikazioak eta euren datuak, multimedia-edukia eta bestelako fitxategiak enkripta ditzakezu. Tableta enkriptatu ondoren, pantaila blokeatzeko aukera konfiguratu baduzu, tableta pizten duzun bakoitzean pantaila desblokeatu beharko duzu (eredu bat marraztuta edo PIN bat edo pasahitz bat idatzita) gailuko edukia desenkriptatzeko. Desenkriptatzeko dagoen beste modu bakarra jatorrizko datuak berrezartzea da, ordura arte bildutako datu guztiak ezabatuta.\n\nDatuak enkriptatzeko ordubete behar da gutxienez. Prozesuak dirauen bitartean, bateriak kargatuta egon behar du eta tabletak entxufatuta. Prozesua eteten baduzu, datu batzuk edo guztiak galduko dituzu."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"Kontuak, ezarpenak, deskargatutako aplikazioak eta haien datuak, multimedia-edukia eta bestelako fitxategiak enkripta ditzakezu. Telefonoa enkriptatu ondoren, pantaila blokeatzeko aukera konfiguratu baduzu, telefonoa pizten duzun bakoitzean pantaila desblokeatu beharko duzu (eredu bat marraztuta edo PIN bat edo pasahitz bat idatzita) gailuko edukia desenkriptatzeko. Desenkriptatzeko dagoen beste modu bakarra jatorrizko datuak berrezartzea da, ordura arte bildutako datu guztiak ezabatuta.\n\nDatuak enkriptatzeko ordubete behar da gutxienez. Prozesuak dirauen bitartean, bateriak kargatuta egon behar du eta telefonoak entxufatuta. Prozesua eteten baduzu, datu batzuk edo guztiak galduko dituzu."</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"Enkriptatu tableta"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"Enkriptatu telefonoa"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"Kargatu bateria eta saiatu berriro."</string>
-    <string name="crypt_keeper_unplugged_text" msgid="2709721134148651329">"Entxufatu kargagailua eta saiatu berriro."</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="1847280235529858357">"Pantaila desblokeatzeko PIN koderik edo pasahitzik ez"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="7210616262954236042">"Enkriptatzen hasi aurretik, pantaila desblokeatzeko PIN edo pasahitz bat zehaztu behar duzu."</string>
-    <string name="crypt_keeper_confirm_title" msgid="8600000209722452230">"Enkriptatu nahi duzu?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="3270587498436152259">"Enkriptatze-eragiketa atzeraezina da eta eteten baduzu, datuak galduko dituzu. Enkriptatzeko ordubete edo gehiago behar izaten da eta, prozesuak dirauen bitartean, tableta hainbat aldiz berrabiaraziko da."</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="3040428543349852419">"Enkriptatze-eragiketa atzeraezina da eta eteten baduzu, datuak galduko dituzu. Enkriptatzeko ordubete edo gehiago behar izaten da eta, prozesuak dirauen bitartean, telefonoa hainbat aldiz berrabiaraziko da."</string>
-    <string name="crypt_keeper_setup_title" msgid="3339725741305796680">"Enkriptatzen"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="4417016995091289019">"Itxaron tableta enkriptatzen den bitartean. % <xliff:g id="PERCENT">^1</xliff:g> osatuta."</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="7902355422499500352">"Itxaron telefonoa enkriptatzen den bitartean. % <xliff:g id="PERCENT">^1</xliff:g> osatuta."</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="8348188415839917821">"Itxaron tableta enkriptatu arte. Falta den denbora: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="8556105766597855198">"Itxaron telefonoa enkriptatu arte. Falta den denbora: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="3832496715430327682">"Tableta desblokeatzeko, itzali eta piztu berriro."</string>
-    <string name="crypt_keeper_force_power_cycle" product="default" msgid="5070346039522135361">"Telefonoa desblokeatzeko, itzali eta piztu berriro."</string>
-    <string name="crypt_keeper_warn_wipe" msgid="8104921337301750394">"Abisua: desblokeatzeko beste <xliff:g id="COUNT">^1</xliff:g> saiakera oker egiten badituzu, gailuko datu guztiak ezabatuko dira!"</string>
-    <string name="crypt_keeper_enter_password" msgid="1274917431075529732">"Idatzi pasahitza"</string>
-    <string name="crypt_keeper_failed_title" msgid="8173654570682244149">"Ezin izan da enkriptatu"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"Enkriptatzea eten da eta ezin da osatu. Ondorioz, ezin izango dituzu tabletako datuak atzitu.\n\nTableta erabiltzen jarraitzeko, jatorrizko datuak berrezarri behar dituzu. Datuak berrezarri ondoren tableta konfiguratzen duzunean, Google-ko kontuan gordetako babeskopiaren datuak leheneratu ahal izango dituzu."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"Enkriptatzea eten da eta ezin da osatu. Ondorioz, ezin izango dituzu telefonoko datuak atzitu.\n\nTelefonoa erabiltzen jarraitzeko, jatorrizko datuak berrezarri behar dituzu. Datuak berrezarri ondoren telefonoa konfiguratzen duzunean, Google-ko kontuan gordetako babeskopien datuak leheneratu ahal izango dituzu."</string>
-    <string name="crypt_keeper_data_corrupt_title" msgid="5920153462176846037">"Ezin izan da desenkriptatu"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"Idatzi duzun pasahitza zuzena da, baina datuak hondatuta daude. \n\nTableta erabiltzen jarraitzeko, jatorrizko datuak berrezarri beharko dituzu. Berrezarri ondoren, tableta konfiguratzen duzunean, Google-ko kontuan egindako babeskopiak leheneratu ahal izango dituzu."</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"Idatzi duzun pasahitza zuzena da, baina datuak hondatuta daude. \n\nTelefonoa erabiltzen jarraitzeko, jatorrizko datuak berrezarri beharko dituzu. Berrezarri ondoren, telefonoa konfiguratzen duzunean, Google-ko kontuan egindako babeskopiak leheneratu ahal izango dituzu."</string>
-    <string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"Aldatu idazketa-metodoa"</string>
+    <string name="encryption_settings_title" msgid="2848716008695618360">"Enkriptatzea"</string>
+    <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"Enkriptatu tableta"</string>
+    <string name="encrypt_title" product="default" msgid="7337365190988321100">"Enkriptatu telefonoa"</string>
+    <string name="encrypted_summary" msgid="545623487587251207">"Enkriptatuta"</string>
     <string name="suggested_lock_settings_title" msgid="7836065447159730217">"Babestu telefonoa"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"Ezarri pantailaren blokeoa tableta babesteko"</string>
     <string name="suggested_lock_settings_summary" product="device" msgid="8479766049078378225">"Ezarri pantailaren blokeoa gailua babesteko"</string>
@@ -817,6 +791,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Baliteke PIN hau beste gailuan ere idatzi behar izatea."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Baliteke pasahitz hau beste gailuan ere idatzi behar izatea."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Gailu honekin parekatzeko:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Ziurtatu pasakode hau erakusten duela:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Berretsi multzo koordinatuarekin parekatzeko"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"Igorlea:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Gailuarekin parekatu?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Honekin parekatzeko:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Idatzi hau bertan:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, eta sakatu Itzuli edo Sartu."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Eman kontaktuak eta deien historia erabiltzeko baimena"</string>
@@ -850,6 +825,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Ezin izan da konektatu. Saiatu berriro."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Gailuaren xehetasunak"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Gailua Bluetooth bidez konektatzeko helbidea: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Gailua Bluetooth bidez konektatzeko helbidea: \n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Gailua ahaztu nahi duzu?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Kendu erlazioa"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Aplikazioa deskonektatu nahi duzu?"</string>
@@ -881,6 +857,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Gogoratu ezarpenak"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Gehienez ere konekta daitezkeen Bluetooth bidezko audio-gailuak"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Hautatu gehienez ere konekta daitezkeen Bluetooth bidezko audio-gailuak"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"NFCaren pilatzea arazteko erregistroa"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Handitu NFCaren pilatzearen erregistro-maila"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Igorpena"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"islatzea"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Gaitu hari gabeko bistaratzea"</string>
@@ -964,7 +942,7 @@
     <string name="wifi_limit_optimizations_summary" msgid="8461087338100462302">"Mugatu Wi‑Fi bidezko bateria-kontsumoa"</string>
     <string name="wifi_switch_away_when_unvalidated" msgid="681353878530696197">"Aldatu datu-konexiora Wi-Fi sareak Interneteko konexioa galtzen badu."</string>
     <string name="wifi_cellular_data_fallback_title" msgid="2844653839490977040">"Aldatu datu-konexiora automatikoki"</string>
-    <string name="wifi_cellular_data_fallback_summary" msgid="7039944853033554386">"Wi-Fi bidez ezin denean, erabili datu-konexioa Internetera konektatzeko. Agian datuen erabilera ordaindu beharko duzu."</string>
+    <string name="wifi_cellular_data_fallback_summary" msgid="7039944853033554386">"Wi-Fi bidez ezin denean, erabili datu-konexioa Internetera konektatzeko. Agian datu-erabilera ordaindu beharko duzu."</string>
     <string name="wifi_add_network" msgid="4178564862173751181">"Gehitu sare bat"</string>
     <string name="wifi_configure_settings_preference_title" msgid="2536725796700696566">"Wifi-sarearen hobespenak"</string>
     <string name="wifi_configure_settings_preference_summary_wakeup_on" msgid="7822368955551467382">"Wifi-konexioa automatikoki aktibatuko da berriro"</string>
@@ -1092,7 +1070,7 @@
     <string name="partial_connectivity_text" msgid="8874614799723694554">"Baliteke aplikazio eta zerbitzu batzuk ez funtzionatzea konexio mugatua dela eta. Hala ere erabili?"</string>
     <string name="no_internet_access_remember" msgid="5113610157731269258">"Ez galdetu berriro sarea hau bada"</string>
     <string name="lost_internet_access_title" msgid="9032463989950384698">"Wifi-sarea ez dago Internetera konektatuta"</string>
-    <string name="lost_internet_access_text" msgid="1535911323549496789">"Sare mugikorra erabil dezakezu Wi-Fi sareak konexio txarra badu. Agian datuen erabilera ordaindu beharko duzu."</string>
+    <string name="lost_internet_access_text" msgid="1535911323549496789">"Sare mugikorra erabil dezakezu Wi-Fi sareak konexio txarra badu. Agian datu-erabilera ordaindu beharko duzu."</string>
     <string name="lost_internet_access_switch" msgid="7935665847081706202">"Aldatu datu-konexiora"</string>
     <string name="lost_internet_access_cancel" msgid="1981171269794585284">"Jarraitu Wi‑Fi konexioa erabiltzen"</string>
     <string name="lost_internet_access_persist" msgid="6813604557672782197">"Ez erakutsi berriro"</string>
@@ -1188,6 +1166,8 @@
     <string name="wifi_hotspot_maximize_compatibility_dual_ap_summary" msgid="3579549223159056533">"Wifi-gune hau aurkitzen laguntzen die beste gailuei. Bateria-erabilera luzatzen du."</string>
     <string name="wifi_tether_starting" msgid="8879874184033857814">"Wifi-gunea aktibatzen…"</string>
     <string name="wifi_tether_stopping" msgid="4416492968019409188">"Wifi-gunea desaktibatzen…"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_title" msgid="3089432578433978073">"Ez dago erabilgarri konexioa partekatzeko aukera"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_content" msgid="5920421547607921112">"Horri buruzko xehetasunak lortzeko, jarri operadorearekin harremanetan"</string>
     <string name="wifi_tether_enabled_subtext" msgid="5085002421099821056">"Aktibatu da <xliff:g id="NETWORK_SSID">%1$s</xliff:g>"</string>
     <string name="wifi_tether_failed_subtext" msgid="437190628041885500">"Wifi-gune eramangarriaren errorea gertatu da"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7072559431286459122">"Konfiguratu wifi-gunea"</string>
@@ -1548,8 +1528,8 @@
     <string name="sd_eject_summary" product="default" msgid="5151243312587186226">"Desmuntatu SD txartela, kentzeko prest egon dadin"</string>
     <string name="sd_insert_summary" product="nosdcard" msgid="9164545135649775664">"Sartu muntatu beharreko USB bidezko memoria"</string>
     <string name="sd_insert_summary" product="default" msgid="5949168259622002192">"Sartu muntatu beharreko SD txartela"</string>
-    <string name="sd_mount" product="nosdcard" msgid="8305985249945415150">"Muntatu USB memoria"</string>
-    <string name="sd_mount" product="default" msgid="5279813999455776169">"Muntatu SD txartela"</string>
+    <string name="sd_mount" product="nosdcard" msgid="8305985249945415150">"Instalatu USB memoria"</string>
+    <string name="sd_mount" product="default" msgid="5279813999455776169">"Instalatu SD txartela"</string>
     <string name="sd_mount_summary" product="nosdcard" msgid="2190410240845521205"></string>
     <string name="sd_mount_summary" product="default" msgid="2190410240845521205"></string>
     <string name="sd_format" product="nosdcard" msgid="8657427883364711513">"Ezabatu USB memoria"</string>
@@ -1572,7 +1552,7 @@
     <string name="storage_low_title" msgid="8002650511493419567">"Memoria agortzen ari da"</string>
     <string name="storage_low_summary" msgid="7341022293583384506">"Baliteke sistemaren funtzio batzuk behar bezala ez funtzionatzea, esaterako, sinkronizazioa. Egin tokia memorian elementu batzuk ezabatuta edo desainguratuta; adibidez, aplikazioak edo multimedia-edukia."</string>
     <string name="storage_menu_rename" msgid="8549835371429159336">"Aldatu izena"</string>
-    <string name="storage_menu_mount" msgid="4760531872302820569">"Muntatu"</string>
+    <string name="storage_menu_mount" msgid="4760531872302820569">"Instalatu"</string>
     <string name="storage_menu_unmount" msgid="8171552487742912282">"Atera"</string>
     <string name="storage_menu_format" msgid="5454870642788909443">"Formateatu"</string>
     <string name="storage_menu_format_public" msgid="5567214442727034630">"Formateatu eramangarri gisa"</string>
@@ -1599,13 +1579,13 @@
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"Memoria osotik (<xliff:g id="TOTAL">%1$s</xliff:g>} erabilitakoa"</string>
     <string name="storage_mount_success" msgid="393972242641313135">"Muntatu da <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="storage_mount_failure" msgid="3667915814876418011">"Ezin izan da muntatu <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_mount_failure" msgid="3667915814876418011">"Ezin izan da instalatu <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="storage_unmount_success" msgid="6406298575402936148">"Atera da segurtasunez <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="storage_unmount_failure" msgid="3796912279003790607">"Ezin izan da atera segurtasunez <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="storage_format_success" msgid="3028114521294256851">"Formateatu da <xliff:g id="NAME">%1$s</xliff:g> memoria-unitatea"</string>
     <string name="storage_format_failure" msgid="2042691589726261987">"Ezin izan da formateatu <xliff:g id="NAME">%1$s</xliff:g> memoria-unitatea"</string>
     <string name="storage_rename_title" msgid="5911285992205282312">"Aldatu memoriaren izena"</string>
-    <string name="storage_dialog_unmounted" msgid="1187960789775910051">"Segurtasunez kanporatu da <xliff:g id="NAME_0">^1</xliff:g>, baina oraindik erabilgarri dago.\n\n<xliff:g id="NAME_1">^1</xliff:g> erabiltzeko, lehenik eta behin, muntatu egin behar duzu."</string>
+    <string name="storage_dialog_unmounted" msgid="1187960789775910051">"Segurtasunez kanporatu da <xliff:g id="NAME_0">^1</xliff:g>, baina oraindik erabilgarri dago.\n\n<xliff:g id="NAME_1">^1</xliff:g> erabiltzeko, lehenik eta behin, instalatu egin behar duzu."</string>
     <string name="storage_dialog_unmountable" msgid="1761107904296941687">"<xliff:g id="NAME_0">^1</xliff:g> hondatuta dago. \n\n<xliff:g id="NAME_1">^1</xliff:g> erabiltzeko, lehenik eta behin, konfiguratu egin behar duzu."</string>
     <string name="storage_internal_format_details" msgid="8922023528848861812">"Formateatu ondoren, beste gailu batzuetan erabili ahal izango duzu <xliff:g id="NAME_0">^1</xliff:g>. \n\n<xliff:g id="NAME_1">^1</xliff:g> memoriako datu guztiak ezabatu egingo dira; beraz, aurretik babeskopia bat egitea gomendatzen dizugu. \n\n"<b>"Egin argazkien eta bestelako multimedia-fitxategien babeskopia"</b>\n"Eraman multimedia-fitxategiak gailu honetako beste memoria batzuetara, edo transferitu ordenagailu batera USB kable baten bidez. \n\n"<b>"Egin aplikazioen babeskopia"</b>\n"<xliff:g id="NAME_6">^1</xliff:g> memorian gordeta dauden aplikazio guztiak desinstalatu egingo dira eta horien datuak ezabatu egingo dira. Aplikazioak gordetzeko, eraman gailu honetako beste memoria batera."</string>
     <string name="storage_internal_unmount_details" msgid="487689543322907311"><b>"<xliff:g id="NAME_0">^1</xliff:g> memoria ateratzen duzunean, han gordetako aplikazioek funtzionatzeari utziko diote eta gordetako multimedia-fitxategiak ez dira erabilgarri egongo memoria berriro sartzen duzun arte."</b>\n\n"<xliff:g id="NAME_1">^1</xliff:g> memoria gailu honetan soilik funtzionatzeko formateatuta dago, eta ez du beste inon funtzionatuko."</string>
@@ -2397,10 +2377,10 @@
     <string name="accessibility_display_inversion_switch_title" msgid="7458595722552743503">"Erabili koloreen alderantzikatzea"</string>
     <string name="accessibility_display_inversion_shortcut_title" msgid="6889624526691513462">"Kolorea alderantzikatzeko lasterbidea"</string>
     <string name="accessibility_display_inversion_preference_subtitle" msgid="6955835010409034745">"Koloreen alderantzikatzeak ilun bihurtzen ditu pantaila argiak.&lt;br/&gt;&lt;br/&gt; Oharra: &lt;ol&gt; &lt;li&gt; Koloreen alderantzikatzeak argi bihurtzen ditu pantaila ilunak ere.&lt;/li&gt; &lt;li&gt; Multimedia-edukien eta irudien koloreak aldatu egingo dira.&lt;/li&gt; &lt;li&gt; Gai iluna atzeko plano ilun bat bistaratzeko erabil daiteke. Aplikazio bateragarrietan funtzionatzen du gai ilunak; koloreen alderantzikatzeak, berriz, aplikazio guztietan.&lt;/li&gt; &lt;/ol&gt;"</string>
-    <string name="accessibility_autoclick_preference_title" msgid="2703143361605555752">"Klik automatikoa (itxarote-denbora)"</string>
-    <string name="accessibility_autoclick_about_title" msgid="152923024405552594">"Klik automatikoari buruz (itxarote-denbora)"</string>
-    <string name="accessibility_autoclick_footer_learn_more_content_description" msgid="7056189627042350691">"Lortu informazio gehiago klik automatikoari buruz (itxarote-denbora)"</string>
-    <string name="accessibility_autoclick_description" msgid="6827042379062255307">"Klik automatikoak erabiltzeko, sagu bat konektatu behar da. Denbora jakin batean geldirik egon ondoren automatikoki klik egin dezan konfigura dezakezu saguaren kurtsorea."</string>
+    <string name="accessibility_autoclick_preference_title" msgid="2703143361605555752">"Automatikoki klik egiteko eginbidea (itxarote-denbora)"</string>
+    <string name="accessibility_autoclick_about_title" msgid="152923024405552594">"Automatikoki klik egiteko eginbideari buruz (itxarote-denbora)"</string>
+    <string name="accessibility_autoclick_footer_learn_more_content_description" msgid="7056189627042350691">"Lortu informazio gehiago automatikoki klik egiteko eginbideari buruz (itxarote-denbora)"</string>
+    <string name="accessibility_autoclick_description" msgid="6827042379062255307">"Automatikoki klik egiteko eginbidea erabiltzeko, sagu bat konektatu behar da. Denbora jakin batean geldirik egon ondoren automatikoki klik egin dezan konfigura dezakezu saguaren kurtsorea."</string>
     <string name="accessibility_autoclick_default_title" msgid="752429113115293087">"Desaktibatuta"</string>
     <string name="accessibility_autoclick_short_title" msgid="7938302504358912984">"Laburra"</string>
     <string name="accessibility_autoclick_short_summary" msgid="4106953930081213514">"0,2 segundo"</string>
@@ -2534,11 +2514,6 @@
     <string name="enable_service_title" msgid="7231533866953706788">"Gailua guztiz kontrolatzeko baimena eman nahi diozu <xliff:g id="SERVICE">%1$s</xliff:g> zerbitzuari?"</string>
     <string name="capabilities_list_title" msgid="1225853611983394386">"<xliff:g id="SERVICE">%1$s</xliff:g> zerbitzuak hauek egin behar ditu:"</string>
     <string name="touch_filtered_warning" msgid="4225815157460318241">"Aplikazio bat baimen-eskaera oztopatzen ari denez, ezarpenek ezin dute egiaztatu erantzuna."</string>
-    <string name="enable_service_encryption_warning" msgid="931082737770453755">"<xliff:g id="SERVICE">%1$s</xliff:g> aktibatzen baduzu, gailuak ez du pantailaren blokeoa erabiliko datuen enkriptatzea hobetzeko."</string>
-    <string name="secure_lock_encryption_warning" msgid="669152607190123579">"Erabilerraztasun-zerbitzua aktibatu duzunez, gailuak ez du pantailaren blokeoa erabiliko datuen enkriptatzea hobetzeko."</string>
-    <string name="enable_service_pattern_reason" msgid="6832846117817938536">"<xliff:g id="SERVICE">%1$s</xliff:g> zerbitzua aktibatzeak datu-enkriptatzeari eragiten dionez, eredua berretsi behar duzu."</string>
-    <string name="enable_service_pin_reason" msgid="6040417014360237703">"<xliff:g id="SERVICE">%1$s</xliff:g> zerbitzua aktibatzeak datu-enkriptatzeari eragiten dionez, PINa berretsi behar duzu."</string>
-    <string name="enable_service_password_reason" msgid="6962544350351734238">"<xliff:g id="SERVICE">%1$s</xliff:g> zerbitzua aktibatzeak datu-enkriptatzeari eragiten dionez, pasahitza berretsi behar duzu."</string>
     <string name="accessibility_service_warning" msgid="6779187188736432618">"<xliff:g id="SERVICE">%1$s</xliff:g> zerbitzuak gailu honen kontrol osoa izan nahi du. Zerbitzuak pantaila irakur dezake, eta erabilerraztasun-beharrak dituzten erabiltzaileen ordez jardun. Kontrol-maila hau ez da egokia aplikazio gehienetarako."</string>
     <string name="accessibility_service_warning_description" msgid="6573203795976134751">"Erabilerraztasun-beharrak asetzen dituzten aplikazioetan da egokia kontrol osoa, baina ez aplikazio gehienetan."</string>
     <string name="accessibility_service_screen_control_title" msgid="324795030658109870">"Ikusi eta kontrolatu pantaila"</string>
@@ -2555,7 +2530,7 @@
     <string name="accessibility_no_service_selected" msgid="1310596127128379897">"Ez da hautatu zerbitzurik"</string>
     <string name="accessibility_service_default_description" msgid="7801435825448138526">"Ez da azalpenik eman."</string>
     <string name="settings_button" msgid="2195468788019730377">"Ezarpenak"</string>
-    <string name="keywords_reduce_bright_colors" msgid="1683190961013139183">"argi-sentikortasuna, fotofobia, gai iluna, migraina, buruko mina, irakurtzeko modua, gau modua, murriztu argitasuna, puntu zuria"</string>
+    <string name="keywords_reduce_bright_colors" msgid="1683190961013139183">"argi-sentikortasuna, fotofobia, gai iluna, migraina, buruko mina, irakurtzeko modua, gau modua, murriztu distira, puntu zuria"</string>
     <string name="keywords_accessibility" msgid="4263443239404659143">"erabiltzeko erraztasuna, sartzeko erraztasuna, laguntza, erabilerraztasuna"</string>
     <string name="keywords_magnification" msgid="3908145308269840862">"leihoetarako lupa, zooma, lupa, ikusmen txarra, handitu, handiagotu"</string>
     <string name="keywords_talkback" msgid="2816435437095102527"></string>
@@ -3043,7 +3018,7 @@
     <string name="profile_owner_add_title" msgid="2774489881662331549">"Profil-kudeatzailea aktibatu nahi duzu?"</string>
     <string name="profile_owner_add_title_simplified" msgid="2320828996993774182">"Gainbegiratzeko baimena eman nahi duzu?"</string>
     <string name="adding_profile_owner_warning" msgid="6868275476058020513">"Aurrera eginez gero, administratzaileak kudeatuko dizu erabiltzaile-kontua, eta erlazionatutako datuak gorde ahal izango ditu zure datu pertsonalez gain.\n\nEra berean, erabiltzaile-kontu honekin erlazionatutako ezarpenak, sarbidea, aplikazioak eta datuak gainbegiratu eta kudeatu ahal izango ditu (esaterako, sareko jarduerak), baita gailuaren kokapen-informazioa ere."</string>
-    <string name="admin_disabled_other_options" msgid="8122039047419172139">"Gainerako aukerak desgaitu egin ditu administratzaileak"</string>
+    <string name="admin_disabled_other_options" msgid="8122039047419172139">"Administratzaileak gainerako aukerak desgaitu ditu"</string>
     <string name="admin_more_details" msgid="4928985331640193758">"Lortu informazio gehiago"</string>
     <string name="notification_log_title" msgid="2812594935014664891">"Jakinarazpenen erregistroa"</string>
     <string name="notification_history_title" msgid="8821060912502593309">"Jakinarazpenen historia"</string>
@@ -3073,7 +3048,7 @@
     <string name="background_data" msgid="321903213000101158">"Atzeko planoko datuak"</string>
     <string name="background_data_summary" msgid="6572245922513522466">"Aplikazioek datuak edonoiz sinkroniza, bidal eta jaso ditzakete"</string>
     <string name="background_data_dialog_title" msgid="1692005302993229867">"Atzeko datuak desgaitu?"</string>
-    <string name="background_data_dialog_message" msgid="7760280837612824670">"Atzeko planoko datuak desgaitzen badituzu, bateriaren iraupena areagotuko da eta datuen erabilera murriztuko da. Hala ere, aplikazio batzuek atzeko planoko datuen konexioa erabil dezakete."</string>
+    <string name="background_data_dialog_message" msgid="7760280837612824670">"Atzeko planoko datuak desgaitzen badituzu, bateriaren iraupena areagotuko da eta datu-erabilera murriztuko da. Hala ere, aplikazio batzuek atzeko planoko datuen konexioa erabil dezakete."</string>
     <string name="sync_automatically" msgid="4874122892765430304">"Sinkronizatu auto. aplikazio-datuak"</string>
     <string name="sync_enabled" msgid="5794103781356455043">"Sinkronizazioa AKTIBATUTA"</string>
     <string name="sync_disabled" msgid="1636223106968593391">"Sinkronizazioa desaktibatuta"</string>
@@ -3103,27 +3078,19 @@
     <string name="remove_account_failed" msgid="3709502163548900644">"Administratzaileak ez du eman aldaketa egiteko baimena"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"Ezin da eskuz sinkronizatu"</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"Elementua ezin da une honetan desgaitu. Ezarpena aldatzeko, aktibatu atzeko planoko datuak eta sinkronizazio automatikoa aldi baterako."</string>
-    <string name="enter_password" msgid="6327051330258595331">"Android-eko gailua abiarazteko, idatzi pasahitza"</string>
-    <string name="enter_pin" msgid="1029287617551232681">"Android-eko gailua abiarazteko, idatzi PINa"</string>
-    <string name="enter_pattern" msgid="1747316785866742960">"Android-eko gailua abiarazteko, marraztu eredua"</string>
-    <string name="cryptkeeper_wrong_pattern" msgid="340747269176120242">"Eredu okerra"</string>
-    <string name="cryptkeeper_wrong_password" msgid="7295607881887114486">"Pasahitz okerra"</string>
-    <string name="cryptkeeper_wrong_pin" msgid="2347961593970714201">"PINa okerra da"</string>
-    <string name="checking_decryption" msgid="6111642972615688237">"Egiaztatzen…"</string>
-    <string name="starting_android" msgid="6694154070215356186">"Android abiarazten…"</string>
     <string name="delete" msgid="8330605554706263775">"Ezabatu"</string>
     <string name="misc_files" msgid="6598066985800749585">"Askotariko fitxategiak"</string>
     <string name="misc_files_selected_count" msgid="5597802791672749532">"<xliff:g id="NUMBER">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g> hautatuta"</string>
     <string name="misc_files_selected_count_bytes" msgid="7622766714974500289">"<xliff:g id="NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="7898929601615536401">"Hautatu guztiak"</string>
-    <string name="data_usage_summary_title" msgid="394067070764360142">"Datuen erabilera"</string>
+    <string name="data_usage_summary_title" msgid="394067070764360142">"Datu-erabilera"</string>
     <string name="data_usage_app_summary_title" msgid="4933742247928064178">"Datu- eta wifi-konexioa"</string>
     <string name="data_usage_accounting" msgid="6832015632699116754">"Beharbada operadoreak zenbatzen duen datu kopurua eta gailuak zenbatzen duena ez datoz bat."</string>
     <string name="data_usage_app" msgid="6367974637783240699">"Aplikazioen erabilera"</string>
     <string name="data_usage_app_info_label" msgid="3542220416056122841">"APLIKAZIOAREN INFORMAZIOA"</string>
     <string name="data_usage_cellular_data" msgid="1917226172511825849">"Datu-konexioa"</string>
     <string name="data_usage_data_limit" msgid="1120291692444009289">"Ezarri datuen muga"</string>
-    <string name="data_usage_cycle" msgid="6875568429140150029">"Datuen erabilera-zikloa"</string>
+    <string name="data_usage_cycle" msgid="6875568429140150029">"Datu-erabilera-zikloa"</string>
     <string name="data_usage_app_items_header_text" msgid="7513812163443595033">"Aplikazioen erabilera"</string>
     <string name="data_usage_menu_roaming" msgid="6864561338842056939">"Ibiltaritzako datuak"</string>
     <string name="data_usage_menu_restrict_background" msgid="1414574366645086133">"Mugatu atzeko planoko datuak"</string>
@@ -3141,7 +3108,7 @@
     <string name="account_settings_menu_auto_sync_personal" msgid="2905595464540145671">"Sinkr. datu pertsonalak auto."</string>
     <string name="account_settings_menu_auto_sync_work" msgid="8561102487795657789">"Sinkronizatu laneko datuak auto."</string>
     <string name="data_usage_change_cycle" msgid="4501026427365283899">"Aldatu zikloa…"</string>
-    <string name="data_usage_pick_cycle_day" msgid="3548922497494790123">"Datuen erabilera-zikloa berrezarri beharreko hilabeteko eguna:"</string>
+    <string name="data_usage_pick_cycle_day" msgid="3548922497494790123">"Datu-erabilera-zikloa berrezarri beharreko hilabeteko eguna:"</string>
     <string name="data_usage_empty" msgid="5619908658853726866">"Ez dago epean daturik erabili duen aplikaziorik."</string>
     <string name="data_usage_label_foreground" msgid="8782117644558473624">"Aurreko planoa"</string>
     <string name="data_usage_label_background" msgid="8862781660427421859">"Atzeko planoa"</string>
@@ -3179,11 +3146,11 @@
     <string name="data_usage_cycle_editor_title" msgid="2019035830921480941">"Erabilera-zikloa berrezartzeko data"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="1026234456777365545">"Hilabeteko eguna:"</string>
     <string name="data_usage_cycle_editor_positive" msgid="6110165528024717527">"Ezarri"</string>
-    <string name="data_usage_warning_editor_title" msgid="5252748452973120016">"Ezarri datuen erabileraren abisua"</string>
-    <string name="data_usage_limit_editor_title" msgid="8826855902435008518">"Ezarri datuen erabilera-muga"</string>
-    <string name="data_usage_limit_dialog_title" msgid="2053134451707801439">"Datuen erabilera mugatzea"</string>
-    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="6000062970083379466">"Zehaztu duzun mugara iristean, tabletak desaktibatu egingo du datu-konexioa.\n\nZentzuzko muga bat ezartzea gomendatzen dizugu, datuen erabilera tabletak neurtuko duelako eta litekeena delako operadoreak datuak bestela neurtzea."</string>
-    <string name="data_usage_limit_dialog_mobile" product="default" msgid="4942895670789168024">"Zehaztu duzun mugara iristean, telefonoak desaktibatu egingo du datu-konexioa.\n\nZentzuzko muga bat ezartzea gomendatzen dizugu, datuen erabilera telefonoak neurtuko duelako eta litekeena delako operadoreak datuak bestela neurtzea."</string>
+    <string name="data_usage_warning_editor_title" msgid="5252748452973120016">"Ezarri datu-erabileraren abisua"</string>
+    <string name="data_usage_limit_editor_title" msgid="8826855902435008518">"Ezarri datu-erabilera-muga"</string>
+    <string name="data_usage_limit_dialog_title" msgid="2053134451707801439">"Datu-erabilera mugatzea"</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="6000062970083379466">"Zehaztu duzun mugara iristean, tabletak desaktibatu egingo du datu-konexioa.\n\nZentzuzko muga bat ezartzea gomendatzen dizugu, datu-erabilera tabletak neurtuko duelako eta litekeena delako operadoreak datuak bestela neurtzea."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="4942895670789168024">"Zehaztu duzun mugara iristean, telefonoak desaktibatu egingo du datu-konexioa.\n\nZentzuzko muga bat ezartzea gomendatzen dizugu, datu-erabilera telefonoak neurtuko duelako eta litekeena delako operadoreak datuak bestela neurtzea."</string>
     <string name="data_usage_restrict_background_title" msgid="2745551538820692821">"Atzeko planoko datuak mugatu?"</string>
     <string name="data_usage_restrict_background" msgid="1893102079135282794">"Atzeko planoan datu-konexioa erabiltzeko aukera mugatzen baduzu, aplikazio eta zerbitzu batzuek ez dute funtzionatuko wifi-sare batera konektatu ezean."</string>
     <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="5588623586867665419">"Atzeko planoan datu-konexioa erabiltzeko aukera mugatzen baduzu, aplikazio eta zerbitzu batzuek ez dute funtzionatuko wifi-sare batera konektatu ezean.\n\nTabletako erabiltzaile guztiei eragingo die ezarpen honek."</string>
@@ -3206,8 +3173,6 @@
     <string name="data_usage_metered_yes" msgid="4262598072030135223">"Sare neurtua"</string>
     <string name="data_usage_metered_no" msgid="1685828958417926268">"Neurtu gabekoa"</string>
     <string name="data_usage_disclaimer" msgid="3271450299386176770">"Operadoreak gailuak ez bezala zenbat litzake datuak."</string>
-    <string name="cryptkeeper_emergency_call" msgid="8369322820475703306">"Larrialdi-deia"</string>
-    <string name="cryptkeeper_return_to_call" msgid="3857250752781151232">"Itzuli deira"</string>
     <string name="vpn_name" msgid="3806456074909253262">"Izena"</string>
     <string name="vpn_type" msgid="5533202873260826663">"Mota"</string>
     <string name="vpn_server" msgid="2908816134941973935">"Zerbitzariaren helbidea"</string>
@@ -3524,7 +3489,7 @@
     <string name="search_results_title" msgid="3360639917793022533">"Ezarpenak"</string>
     <string name="keywords_wifi" msgid="8156528242318351490">"wifi, wi-fi, sareko konexioa, internet, haririk gabekoa, datuak, wi fi"</string>
     <string name="keywords_wifi_notify_open_networks" msgid="6580896556389306636">"Wi‑Fi konexioari buruzko jakinarazpena, wifi konexioari buruzko jakinarazpena"</string>
-    <string name="keywords_wifi_data_usage" msgid="4718555409695862085">"datuen erabilera"</string>
+    <string name="keywords_wifi_data_usage" msgid="4718555409695862085">"datu-erabilera"</string>
     <string name="keywords_vibrate_on_touch" msgid="8379369786860641429">"Geldiarazi dardara, sakatu, teklatua"</string>
     <string name="keywords_time_format" msgid="5384803098766166820">"Erabili 24 orduko formatua"</string>
     <string name="keywords_storage_files" msgid="4509695858659705198">"Deskargatu"</string>
@@ -3581,7 +3546,7 @@
     <string name="keywords_biometric_unlock" msgid="8569545388717753692">"aurpegia, desblokeatu, autentifikatu, hasi saioa, hatz-marka, biometrikoa"</string>
     <string name="keywords_imei_info" msgid="8848791606402333514">"imei, meid, min, prl bertsioa, imei sv"</string>
     <string name="keywords_sim_status" msgid="8784456547742075508">"sarea, sare mugikorraren egoera, zerbitzuaren egoera, seinalearen indarra, sare mugikor mota, ibiltaritza, iccid, eid"</string>
-    <string name="keywords_model_and_hardware" msgid="4723665865709965044">"serie-zenbakia, hardwarearen bertsioa"</string>
+    <string name="keywords_model_and_hardware" msgid="4723665865709965044">"serie-zenbakia, hardware-bertsioa"</string>
     <string name="keywords_android_version" msgid="1629882125290323070">"android-en segurtasunaren adabaki-maila, oinarri-bandaren bertsioa, kernel bertsioa"</string>
     <string name="keywords_dark_ui_mode" msgid="6373999418195344014">"gaia, argia, iluna, modua, argiarekiko sentikortasuna, fotofobia, ilundu, modu iluna, migraina"</string>
     <string name="keywords_systemui_theme" msgid="6341194275296707801">"gai iluna"</string>
@@ -4498,7 +4463,7 @@
     <string name="ignore_optimizations_off_desc" msgid="3324571675983286177">"Bateriak luzeago irauteko gomendatzen da"</string>
     <string name="ignore_optimizations_title" msgid="3464172726254542889">"Bateriaren optimizazioei ez ikusi egiteko baimena eman nahi diozu <xliff:g id="APP">%s</xliff:g> aplikazioari?"</string>
     <string name="app_list_preference_none" msgid="1635406344616653756">"Bat ere ez"</string>
-    <string name="work_profile_usage_access_warning" msgid="3477719910927319122">"Administratzaileari aplikazio hau erabiltzeko gaitasuna kendu arren, administratzaileak aplikazioen datuen erabileraren jarraipena egiten jarraitu ahal izango du zure laneko profilean"</string>
+    <string name="work_profile_usage_access_warning" msgid="3477719910927319122">"Administratzaileari aplikazio hau erabiltzeko gaitasuna kendu arren, administratzaileak aplikazioen datu-erabileraren jarraipena egiten jarraitu ahal izango du zure laneko profilean"</string>
     <string name="accessibility_lock_screen_progress" msgid="4597298121698665401">"<xliff:g id="COUNT_0">%1$d</xliff:g>/<xliff:g id="COUNT_1">%2$d</xliff:g> karaktere erabili dira"</string>
     <string name="draw_overlay" msgid="7902083260500573027">"Bistaratu aplikazioen gainean"</string>
     <string name="system_alert_window_settings" msgid="6458633954424862521">"Bistaratu beste aplikazioen gainean"</string>
@@ -4644,9 +4609,9 @@
     <string name="usage" msgid="287782903846013936">"Erabilera"</string>
     <string name="cellular_data_usage" msgid="5874156338825285334">"Datu-konexioaren erabilera"</string>
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"Aplikazioak erabilitako datuak"</string>
-    <string name="wifi_data_usage" msgid="6868503699134605707">"Wifi-sareko datuen erabilera"</string>
-    <string name="non_carrier_data_usage" msgid="6494603202578414755">"Operadorearenak ez diren datuen erabilera"</string>
-    <string name="ethernet_data_usage" msgid="4552227880905679761">"Ethernet datuen erabilera"</string>
+    <string name="wifi_data_usage" msgid="6868503699134605707">"Wifi-sareko datu-erabilera"</string>
+    <string name="non_carrier_data_usage" msgid="6494603202578414755">"Operadorearenak ez diren datu-erabilera"</string>
+    <string name="ethernet_data_usage" msgid="4552227880905679761">"Ethernet datu-erabilera"</string>
     <string name="wifi" msgid="2932584495223243842">"Wifia"</string>
     <string name="ethernet" msgid="4665162609974492983">"Ethernet"</string>
     <string name="cell_data_template" msgid="6077963976103260821">"Datu-konexioaren <xliff:g id="AMOUNT">^1</xliff:g>"</string>
@@ -4654,9 +4619,9 @@
     <string name="ethernet_data_template" msgid="1429173767445201145">"<xliff:g id="AMOUNT">^1</xliff:g> ethernet-konexioaren bidez"</string>
     <string name="billing_cycle" msgid="6618424022653876279">"Datuen abisua eta muga"</string>
     <string name="app_usage_cycle" msgid="341009528778520583">"Datu-konexioaren erabilera-zikloa"</string>
-    <string name="cell_data_warning" msgid="5664921950473359634">"Datuen erabileraren abisua: <xliff:g id="ID_1">^1</xliff:g>"</string>
+    <string name="cell_data_warning" msgid="5664921950473359634">"Datu-erabileraren abisua: <xliff:g id="ID_1">^1</xliff:g>"</string>
     <string name="cell_data_limit" msgid="256855024790622112">"Datuen muga: <xliff:g id="ID_1">^1</xliff:g>"</string>
-    <string name="cell_data_warning_and_limit" msgid="8393200831986035724">"Datuen erabileraren abisua: <xliff:g id="ID_1">^1</xliff:g>. Datuen muga: <xliff:g id="ID_2">^2</xliff:g>."</string>
+    <string name="cell_data_warning_and_limit" msgid="8393200831986035724">"Datu-erabileraren abisua: <xliff:g id="ID_1">^1</xliff:g>. Datuen muga: <xliff:g id="ID_2">^2</xliff:g>."</string>
     <string name="billing_cycle_fragment_summary" msgid="6346655500491631357">"Hilean behin, <xliff:g id="ID_1">%1$s</xliff:g>. egunean"</string>
     <string name="network_restrictions" msgid="8385824604048229846">"Sarearen murriztapenak"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="3875128958788008975">
@@ -4666,9 +4631,9 @@
     <string name="operator_warning" msgid="5672761970087591211">"Agian ez dira bat etorriko gailuak eta operadoreak egindako datu-kontsumoen neurketak"</string>
     <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Ez dira barne hartzen operadorearen sareek erabilitako datuak"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> erabilita"</string>
-    <string name="set_data_warning" msgid="1685771882794205462">"Ezarri datuen erabileraren abisua"</string>
-    <string name="data_warning" msgid="2925054658166062884">"Datuen erabileraren abisua"</string>
-    <string name="data_warning_footnote" msgid="5991901765915710592">"Gailuak neurtzen ditu datuen erabilera eta datuen muga. Baliteke informazio hori bat ez etortzea operadoreak egindako datuen neurketarekin."</string>
+    <string name="set_data_warning" msgid="1685771882794205462">"Ezarri datu-erabileraren abisua"</string>
+    <string name="data_warning" msgid="2925054658166062884">"Datu-erabileraren abisua"</string>
+    <string name="data_warning_footnote" msgid="5991901765915710592">"Gailuak neurtzen ditu datu-erabilera eta datuen muga. Baliteke informazio hori bat ez etortzea operadoreak egindako datuen neurketarekin."</string>
     <string name="set_data_limit" msgid="9010326815874642680">"Ezarri datuen muga"</string>
     <string name="data_limit" msgid="8731731657513652363">"Datuen muga"</string>
     <string name="data_usage_template" msgid="3822452362629968010">"<xliff:g id="ID_1">%1$s</xliff:g> erabili dira (<xliff:g id="ID_2">%2$s</xliff:g>)"</string>
@@ -4684,7 +4649,7 @@
     <string name="data_used_formatted" msgid="7913920278059077938">"<xliff:g id="ID_1">^1</xliff:g> <xliff:g id="ID_2">^2</xliff:g> erabilita"</string>
     <string name="data_overusage" msgid="3680477320458707259">"Muga baino <xliff:g id="ID_1">^1</xliff:g> gehiago"</string>
     <string name="data_remaining" msgid="6316251496381922837">"<xliff:g id="ID_1">^1</xliff:g> gelditzen dira"</string>
-    <string name="data_usage_chart_brief_content_description" msgid="5548074070258881530">"<xliff:g id="START_DATE">%1$s</xliff:g> eta <xliff:g id="END_DATE">%2$s</xliff:g> arteko datuen erabilera erakusten duen grafikoa."</string>
+    <string name="data_usage_chart_brief_content_description" msgid="5548074070258881530">"<xliff:g id="START_DATE">%1$s</xliff:g> eta <xliff:g id="END_DATE">%2$s</xliff:g> arteko datu-erabilera erakusten duen grafikoa."</string>
     <string name="data_usage_chart_no_data_content_description" msgid="5481968839079467231">"Ez dago daturik data tarte horretan"</string>
     <plurals name="billing_cycle_days_left" formatted="false" msgid="661792524671718753">
       <item quantity="other">%d egun gelditzen dira</item>
@@ -4699,7 +4664,7 @@
     <string name="launch_mdp_app_text" msgid="8791816789749304897">"Ikusi plana"</string>
     <string name="launch_wifi_text" msgid="976421974332512894">"Ikusi xehetasunak"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Datu-aurrezlea"</string>
-    <string name="unrestricted_data_saver" msgid="7922563266857367495">"Datuen erabilera mugagabea"</string>
+    <string name="unrestricted_data_saver" msgid="7922563266857367495">"Datu-erabilera mugagabea"</string>
     <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Atzeko planoko datuak desaktibatuta daude"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Aktibatuta"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Desaktibatuta"</string>
@@ -4764,8 +4729,6 @@
       <item quantity="one">1 aplikaziok du datuak mugarik gabe erabiltzeko aukera</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"Ikusi gehiago"</string>
-    <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"Ziur erabiltzailearen datu guztiak ezabatu nahi dituzula eta fitxategietan oinarritutako enkriptatzea gauzatu nahi duzula?"</string>
-    <string name="button_confirm_convert_fbe" msgid="339648921918438106">"Ezabatu eduki guztia eta enkriptatu"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"Berrezarri ShortcutManager-en mugak"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"Berrezarri dira ShortcutManager-en mugak"</string>
     <string name="notification_suggestion_title" msgid="6309263655965785411">"Pantaila blokeatuko kontrolari buruzko informazioa"</string>
@@ -5261,7 +5224,7 @@
     <string name="register_automatically" msgid="5208258089316657167">"Erregistratze automatikoa…"</string>
     <string name="roaming_alert_title" msgid="9052791521868787985">"Datu-ibiltaritza erabiltzeko baimena eman nahi duzu?"</string>
     <string name="roaming_check_price_warning" msgid="5876977438036791361">"Eskatu prezioari buruzko informazioa sare-hornitzaileari."</string>
-    <string name="mobile_data_usage_title" msgid="2047864499317759728">"Aplikazioetako datuen erabilera"</string>
+    <string name="mobile_data_usage_title" msgid="2047864499317759728">"Aplikazioetako datu-erabilera"</string>
     <string name="mobile_network_mode_error" msgid="9222056129897416074">"<xliff:g id="NETWORKMODEID">%1$d</xliff:g> sare moduak ez du balio. Egin ez ikusi."</string>
     <string name="mobile_network_apn_title" msgid="5582995550142073054">"Sarbide-puntuen izenak"</string>
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Ez dago erabilgarri <xliff:g id="CARRIER">%1$s</xliff:g> operadorera konektatuta egoteagatik"</string>
@@ -5292,6 +5255,7 @@
     <string name="sim_action_yes" msgid="8076556020131395515">"Bai"</string>
     <string name="sim_action_reboot" msgid="3508948833333441538">"Berrabiarazi"</string>
     <string name="sim_action_no_thanks" msgid="435717748384544195">"Ez, eskerrik asko"</string>
+    <string name="sim_action_cancel" msgid="2668099867029610910">"Utzi"</string>
     <string name="sim_switch_button" msgid="1405772571706095387">"Aldatu"</string>
     <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Ezin da aktibatu SIM txartela"</string>
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Kendu SIM txartela eta sar ezazu berriro. Arazoak badirau, berrabiarazi gailua."</string>
@@ -5444,6 +5408,10 @@
     <string name="cached_apps_freezer" msgid="1057519579761550350">"Utzi cacheko aplikazioak exekutatzeari"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"Eman pantailetan gainjartzeko baimena ezarpenetan"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Eman ezarpenen pantailetan gainjartzeko baimena aplikazioen gainean bistara daitezkeen aplikazioei"</string>
+    <!-- no translation found for allow_mock_modem (3832264806530479214) -->
+    <skip />
+    <!-- no translation found for allow_mock_modem_summary (9097416612748005374) -->
+    <skip />
     <string name="media_controls_title" msgid="403271085636252597">"Multimedia-edukia"</string>
     <string name="media_controls_resume_title" msgid="855076860336652370">"Ainguratu multimedia-erreproduzigailua"</string>
     <string name="media_controls_resume_description" msgid="3163482266454802097">"Erreprodukzioari bizkor berrekin ahal izateko, multimedia-erreproduzigailua irekita gelditzen da Ezarpen bizkorrak menuan"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 5d5e979..5e04599 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -142,10 +142,11 @@
     <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"به دستگاهتان اجازه دهید با دستگاه‌های بلوتوث اطراف مرتبط شود"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"به تلفنتان اجازه دهید با دستگاه‌های بلوتوث اطراف مرتبط شود"</string>
     <string name="bluetooth_disable_a2dp_hw_offload" msgid="5942913792817797541">"‏غیرفعال کردن انتقال داده ازطریق سخت‌افزار بلوتوث A2DP"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="8610420176339657720">"دستگاه بازراه‌اندازی شود؟"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8333029144800835996">"برای تغییر این تنظیم، باید دستگاه را بازراه‌اندازی کنید"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="3488695418187553566">"بازراه‌اندازی"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="4930826928585464191">"لغو"</string>
+    <string name="bluetooth_disable_le_audio_hw_offload" msgid="3966022676505972908">"‏غیرفعال کردن تخلیه سخت‌افزار بلوتوث LE AUDIO"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_title" msgid="6001142380445276918">"دستگاه بازراه‌اندازی شود؟"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_message" msgid="1524373895333698779">"برای تغییر این تنظیم، باید دستگاه را بازراه‌اندازی کنید."</string>
+    <string name="bluetooth_disable_hw_offload_dialog_confirm" msgid="5594859658551707592">"بازراه‌اندازی"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel" msgid="3663690305043973720">"لغو"</string>
     <string name="connected_device_media_device_title" msgid="3783388247594566734">"دستگاه‌های ذخیره‌سازی"</string>
     <string name="connected_device_call_device_title" msgid="88732390601723608">"دستگاه‌های برقراری تماس"</string>
     <string name="connected_device_other_device_title" msgid="4652120430615729193">"دستگاه‌های دیگر"</string>
@@ -309,9 +310,9 @@
     <string name="security_settings_title" msgid="6710768415432791970">"امنیت"</string>
     <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"رمزگذاری و اطلاعات کاربری"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"تلفن رمزگذاری شده است"</string>
-    <string name="decryption_settings_summary" product="default" msgid="1742645256103613503">"تلفن رمزگذاری‌ نشده است"</string>
+    <string name="not_encrypted_summary" product="default" msgid="2251945842585788254">"تلفن رمزگذاری‌ نشده است"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"دستگاه رمزگذاری شد"</string>
-    <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"دستگاه رمزگذاری نشده است"</string>
+    <string name="not_encrypted_summary" product="tablet" msgid="2374263654698719382">"دستگاه رمزگذاری نشده است"</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"صفحه قفل"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"چه چیزی نشان داده شود"</string>
     <string name="security_settings_summary" msgid="1627059516127354233">"تنظیم مکان من، قفل صفحه، قفل سیم کارت، قفل حافظه اطلاعات کاربری"</string>
@@ -488,7 +489,7 @@
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"مدام انگشتتان را جابه‌جا کنید تا بخش‌های مختلف اثر انگشتتان را اضافه کنید"</string>
     <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"هر بار که نماد اثر انگشت حرکت می‌کند، لمس کنید و نگه دارید. این کار کمک می‌کند بخش بیشتری از اثر انگشتتان ثبت شود."</string>
     <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"نوک انگشتتان را روی حسگر قرار دهید"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="6137605344819152477">"در آخر، از لبه‌های انگشت استفاده کنید"</string>
+    <string name="security_settings_udfps_enroll_edge_title" msgid="6137605344819152477">"در آخر، کناره‌های انگشتتان را ثبت کنید"</string>
     <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"یک سمت انگشتتان را روی حسگر اثر انگشت قرار دهید و نگه دارید، سپس این کار را با سمت دیگر تکرار کنید"</string>
     <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"این کار کمک می‌کند بخش بیشتری از اثر انگشتتان ثبت شود"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"درحال ثبت اثر انگشت: <xliff:g id="PERCENTAGE">%d</xliff:g> درصد"</string>
@@ -568,37 +569,10 @@
     <string name="fingerprint_last_delete_message" msgid="7860374760549404410">"نمی‌توانید از اثر انگشت برای باز کردن قفل تلفن یا تأیید هویتتان در برنامه‌ها استفاده کنید."</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="4104208067277655068">"نمی‌توانید از اثر انگشت برای باز کردن قفل نمایه کاری، اجازه دادن به خریدها، یا ورود به سیستم برنامه‌های کاری استفاده کنید."</string>
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"بله، پاک شود"</string>
-    <string name="crypt_keeper_settings_title" msgid="4938812137822100044">"رمزگذاری"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"رمزگذاری رایانهٔ لوحی"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"رمزگذاری تلفن"</string>
-    <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"رمز گذاری شده"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"می‌توانید حساب‌ها، تنظیمات، برنامه‌های بارگیری شده به‌علاوه داده‌های آن‌ها، رسانه‌ها و سایر فایل‌هایتان را رمزگذاری کنید. بعد از رمزگذاری رایانه لوحی‌تان، با فرض اینکه یک قفل صفحه تنظیم کرده‌اید (که می‌تواند یک الگو، پین عددی یا گذرواژه باشد)، باید هر بار که رایانه لوحی را روشن می‌کنید، قفل صفحه را برای رمزگشایی از رایانه لوحی باز کنید. تنها راه دیگر برای رمزگشایی، بازنشانی داده‌های کارخانه و پاک کردن همه داده‌هایتان می‌باشد.\n\nرمزگذاری یک ساعت یا بیشتر طول می‌کشد. باید این کار را زمانی آغاز کنید که باتری شارژ کامل باشد و در طول این مدت رایانه لوحی‌تان همچنان به برق وصل باشد. اگر وقفه‌ای در فرآیند به وجود آید، بعضی از داده‌هایتان یا همه آن‌ها را از دست خواهید داد."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"می‌توانید حساب‌ها، تنظیمات، برنامه‌های بارگیری شده به‌علاوه داده‌های آن‌ها، رسانه‌ها و سایر فایل‌هایتان را رمزگذاری کنید. بعد از رمزگذاری تلفنتان، با فرض اینکه یک قفل صفحه تنظیم کرده‌اید (که می‌تواند یک الگو، پین عددی یا گذرواژه باشد)، باید هر بار که تلفن را روشن می‌کنید، قفل صفحه را برای رمزگشایی از تلفن باز کنید. تنها راه دیگر برای رمزگشایی بازنشانی داده‌های کارخانه و پاک کردن همه داده‌هایتان می‌باشد.\n\nرمزگذاری یک ساعت یا بیشتر طول می‌کشد. باید این کار را زمانی آغاز کنید که باتری شارژ کامل باشد و در طول این مدت تلفنتان همچنان به برق وصل باشد. اگر وقفه‌ای در فرآیند به وجود آید، بعضی از داده‌هایتان یا همه آن‌ها را از دست خواهید داد."</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"رمزگذاری رایانهٔ لوحی شخصی"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"رمزگذاری تلفن"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"باتری خود را شارژ کرده و دوباره امتحان کنید."</string>
-    <string name="crypt_keeper_unplugged_text" msgid="2709721134148651329">"شارژر خود را متصل کرده و دوباره امتحان کنید."</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="1847280235529858357">"هیچ پین صفحه قفل یا گذرواژه‌ای وجود ندارد"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="7210616262954236042">"قبل از شروع به رمزگذاری باید یک پین صفحه قفل یا گذرواژه تنظیم کنید."</string>
-    <string name="crypt_keeper_confirm_title" msgid="8600000209722452230">"رمزگذاری؟"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="3270587498436152259">"عملیات رمزگذاری غیر قابل بازگشت است و در صورت ایجاد وقفه در آن، داده‌های خود را از دست خواهید داد. رمزگذاری یک ساعت یا بیشتر طول می‌کشد که در طول آن، رایانهٔ لوحی چندین بار راه‌اندازی مجدد می‌شود."</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="3040428543349852419">"عملیات رمزگذاری غیر قابل بازگشت است و در صورت ایجاد وقفه در آن، داده‌های خود را از دست خواهید داد. رمزگذاری یک ساعت یا بیشتر طول می‌کشد که در طول آن، تلفن چندین بار راه‌اندازی مجدد می‌شود."</string>
-    <string name="crypt_keeper_setup_title" msgid="3339725741305796680">"رمزگذاری"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="4417016995091289019">"هنگام رمزگذاری رایانهٔ لوحی خود، منتظر بمانید. <xliff:g id="PERCENT">^1</xliff:g> کامل شد."</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="7902355422499500352">"هنگام رمزگذاری گوشی خود، منتظر بمانید. <xliff:g id="PERCENT">^1</xliff:g>% کامل شد."</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="8348188415839917821">"وقتی رایانه لوحی‌تان رمز‌گذاری می‌شود، منتظر بمانید. مدت زمان باقیمانده: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="8556105766597855198">"وقتی تلفنتان رمز‌گذاری می‌شود، منتظر بمانید. مدت زمان باقیمانده: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="3832496715430327682">"برای باز کردن قفل رایانه لوحی‌تان، آن را خاموش و سپس روشن کنید."</string>
-    <string name="crypt_keeper_force_power_cycle" product="default" msgid="5070346039522135361">"برای باز کردن قفل تلفنتان، آن را خاموش و سپس روشن کنید."</string>
-    <string name="crypt_keeper_warn_wipe" msgid="8104921337301750394">"اخطار: دستگاهتان پس از <xliff:g id="COUNT">^1</xliff:g> تلاش ناموفق دیگر برای باز کردن قفل آن، پاک می‌شود."</string>
-    <string name="crypt_keeper_enter_password" msgid="1274917431075529732">"گذرواژه‌تان را تایپ کنید"</string>
-    <string name="crypt_keeper_failed_title" msgid="8173654570682244149">"رمزگذاری ناموفق"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"‏رمزگذاری متوقف شد و امکان تکمیل کردن آن وجود ندارد. در نتیجه، داده‌های موجود در رایانهٔ لوحی شما دیگر قابل دسترسی نیستند. \n\nبرای ادامه استفاده از رایانهٔ لوحی خود، باید تنظیمات کارخانه را بازنشانی کنید. با تنظیم کردن رایانهٔ لوحی پس از بازنشانی، این فرصت را خواهید داشت تا هرگونه داده‌ای را که از آن در حساب Google نسخهٔ پشتیبان تهیه شده بازیابی کنید."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"‏رمزگذاری متوقف شد و امکان تکمیل آن وجود ندارد. در نتیجه، داده‌های موجود در تلفن شما دیگر قابل دسترسی نیستند. \n\nبرای ادامه استفاده از تلفن خود، باید تنظیمات کارخانه را بازنشانی کنید. با راه‌اندازی تلفن پس از بازنشانی، این فرصت را خواهید داشت تا هرگونه داده‌ای را که از آن در حساب Google نسخهٔ پشتیبان تهیه شده بازیابی کنید."</string>
-    <string name="crypt_keeper_data_corrupt_title" msgid="5920153462176846037">"رمزگشایی انجام نشد"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"‏گذروا‌ژه‌ای که وارد کردید درست است، اما متأسفانه داده‌ها مخدوش است. \n\nبرای ازسرگیری استفاده از تلفنتان، باید بازنشانی به تنظیمات کارخانه را انجام دهید. وقتی پس از بازنشانی، رایانه لوحی‌تان را راه‌اندازی می‌کنید، فرصت دارید تا هر داده‌ای را که در حساب Google شما پشتیبان گرفته شده بود، بازیابی کنید."</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"‏گذروا‌ژه‌ای که وارد کردید درست است، اما متأسفانه داده‌ها مخدوش است. \n\nبرای ازسرگیری استفاده از تلفنتان، باید بازنشانی به تنظیمات کارخانه را انجام دهید. وقتی پس از بازنشانی، تلفنتان را راه‌اندازی می‌کنید، فرصت دارید تا هر داده‌ای را که در حساب Google شما پشتیبان گرفته شده بود، بازیابی کنید."</string>
-    <string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"تغییر روش ورودی"</string>
+    <string name="encryption_settings_title" msgid="2848716008695618360">"رمزگذاری"</string>
+    <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"رمزگذاری رایانه لوحی"</string>
+    <string name="encrypt_title" product="default" msgid="7337365190988321100">"رمزگذاری تلفن"</string>
+    <string name="encrypted_summary" msgid="545623487587251207">"رمزگذاری‌شده"</string>
     <string name="suggested_lock_settings_title" msgid="7836065447159730217">"تلفنتان را ایمن کنید"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"برای محافظت از رایانه لوحی، قفل صفحه تنظیم کنید"</string>
     <string name="suggested_lock_settings_summary" product="device" msgid="8479766049078378225">"برای محافظت از دستگاه، قفل صفحه تنظیم کنید"</string>
@@ -817,13 +791,14 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"ممکن است لازم باشد که این پین را در دستگاه دیگری وارد کنید."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"ممکن است لازم باشد این کلیدواژه را نیز در دستگاه دیگر وارد کنید."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"‏برای مرتبط‌سازی با:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;مطمئن شوید که دستگاه این کلیدواژه را نمایش می‌دهد:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"تأیید مرتبط‌سازی با مجموعه هماهنگ"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"‏از::&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;با این دستگاه مرتبط‌سازی شود؟"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"‏برای مرتبط‌سازی با:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>روی آن تایپ کنید:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>، سپس Return یا Enter را فشار دهید."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"اجازه دسترسی به مخاطبین و سابقه تماس"</string>
     <string name="bluetooth_error_title" msgid="2284738188253690278"></string>
     <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"اتصال به <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ممکن نیست."</string>
     <string name="bluetooth_preference_scan_title" msgid="3460316252463771851">"اسکن برای دستگاه‌ها"</string>
-    <string name="bluetooth_search_for_devices" msgid="6516902340975407648">"بازخوانی"</string>
+    <string name="bluetooth_search_for_devices" msgid="6516902340975407648">"بازآوری کردن"</string>
     <string name="bluetooth_searching_for_devices" msgid="6541984133657573124">"در حال جستجو..."</string>
     <string name="bluetooth_preference_device_settings" msgid="1688662188157019998">"تنظیمات دستگاه"</string>
     <string name="bluetooth_preference_paired_dialog_title" msgid="1090131276572055841">"دستگاه مرتبط‌شده"</string>
@@ -850,6 +825,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"متصل نشد. دوباره امتحان کنید."</string>
     <string name="device_details_title" msgid="1155622417516195481">"جزئیات دستگاه"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"نشانی بلوتوث دستگاه: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"نشانی بلوتوث دستگاه:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"دستگاه فراموش شود؟"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"حذف ارتباط"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"ارتباط برنامه قطع شود؟"</string>
@@ -881,6 +857,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"به خاطر سپردن تنظیمات"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"حداکثر تعداد دستگاه‌های صوتی بلوتوث متصل"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"حداکثر تعداد دستگاه‌های صوتی بلوتوث متصل را انتخاب کنید"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"‏گزارش اشکال‌زدایی پشته‌ای NFC"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"‏افزایش سطح گزارش‌گیری پشته‌ای NFC"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"ارسال محتوا"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"نمایش صفحه نمایش روی دستگاه دیگر"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"فعال کردن نمایش بی‌سیم"</string>
@@ -909,8 +887,8 @@
     <string name="wifi_ask_disable" msgid="1663208096020309639">"‏<xliff:g id="REQUESTER">%s</xliff:g> می‌خواهد Wi-Fi را خاموش کند"</string>
     <string name="art_verifier_for_debuggable_title" msgid="1926445785190030479">"تأیید بایت‌کد برنامه‌های اشکال‌زدا"</string>
     <string name="art_verifier_for_debuggable_summary" msgid="4802875841862652879">"‏به ART برای تأیید بایت‌کد برنامه‌های اشکال‌زدا اجازه داده شود"</string>
-    <string name="show_refresh_rate" msgid="5742688821872354973">"نمایش نرخ بازخوانی"</string>
-    <string name="show_refresh_rate_summary" msgid="3558118122374609663">"نمایش نرخ فعلی بازخوانی نمایشگر"</string>
+    <string name="show_refresh_rate" msgid="5742688821872354973">"نمایش نرخ بازآوری"</string>
+    <string name="show_refresh_rate_summary" msgid="3558118122374609663">"نمایش نرخ فعلی بازآوری نمایشگر"</string>
     <string name="nfc_quick_toggle_title" msgid="3607620705230351666">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="3622326550467939809">"‏تبادل داده‌ها هنگامی‌که رایانه لوحی دستگاه مجهزبه NFC را لمس می‌کند مجاز شود"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="1460871052409162980">"‏تبادل داده‌ها هنگامی‌که تلفن دستگاه مجهزبه NFC را لمس می‌کند مجاز شود"</string>
@@ -1188,6 +1166,8 @@
     <string name="wifi_hotspot_maximize_compatibility_dual_ap_summary" msgid="3579549223159056533">"کمک می‌کند دستگاه‌های دیگر این نقطه اتصال را پیدا کنند. مصرف باتری را افزایش می‌دهد."</string>
     <string name="wifi_tether_starting" msgid="8879874184033857814">"در حال روشن کردن نقطه اتصال…"</string>
     <string name="wifi_tether_stopping" msgid="4416492968019409188">"در حال خاموش کردن نقطه اتصال…"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_title" msgid="3089432578433978073">"اشتراک‌گذاری اینترنت دردسترس نیست"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_content" msgid="5920421547607921112">"برای اطلاع از جزئیات، با شرکت مخابراتی‌تان تماس بگیرید"</string>
     <string name="wifi_tether_enabled_subtext" msgid="5085002421099821056">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> فعال است"</string>
     <string name="wifi_tether_failed_subtext" msgid="437190628041885500">"‏خطای نقطه اتصال قابل حمل Wi-Fi"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7072559431286459122">"‏تنظیم نقطه اتصال Wi-Fi"</string>
@@ -1331,9 +1311,9 @@
     <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">"نمایشگر روان"</string>
-    <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"به‌طور خودکار سرعت بازخوانی را برای بعضی محتواها، از ۶۰ هرتز تا ۹۰ هرتز بالا می‌برد. مصرف باتری را افزایش می‌دهد."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="3325789621928312050">"اعمال بالاترین نرخ بازخوانی"</string>
-    <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"بالاترین نرخ بازخوانی برای پاسخ‌گویی بهبودیافته لمس و کیفیت پویانمایی. مصرف باتری را افزایش می‌دهد."</string>
+    <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"به‌طور خودکار نرخ بازآوری را برای بعضی محتواها از ۶۰ هرتز تا ۹۰ هرتز بالا می‌برد. مصرف باتری را افزایش می‌دهد."</string>
+    <string name="force_high_refresh_rate_toggle" msgid="3325789621928312050">"اعمال بالاترین نرخ بازآوری"</string>
+    <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"بالاترین نرخ بازآوری برای پاسخ‌گویی بهبودیافته لمس و کیفیت پویانمایی. مصرف باتری را افزایش می‌دهد."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"توجه به صفحه"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"روشن / تازمانی‌که درحال تماشای صفحه‌نمایش باشید، صفحه خاموش نخواهد شد"</string>
     <string name="adaptive_sleep_summary_off" msgid="5272156339202897523">"خاموش"</string>
@@ -1392,7 +1372,7 @@
     <string name="dark_ui_summary_on_auto_mode_custom" msgid="2526935680241734784">"در ساعت <xliff:g id="ID_1">%1$s</xliff:g> به‌طور خودکار خاموش می‌شود"</string>
     <string name="dark_ui_activation_on_custom" msgid="1889379402860316125">"تا <xliff:g id="ID_1">%1$s</xliff:g> روشن باشد"</string>
     <string name="dark_ui_activation_off_custom" msgid="2192932161592759607">"تا <xliff:g id="ID_1">%1$s</xliff:g> خاموش شود"</string>
-    <string name="dark_ui_text" msgid="4392646155331126666">"«طرح زمینه تیره» در برخی صفحه‌ها از پس‌زمینه سیاه استفاده می‌کند تا شارژ باتری برای مدتی طولانی‌تر حفظ شود. «طرح زمینه تیره» تا زمانی که صفحه خاموش باشد، زمان انتظاری برای روشن شدن تنظیم می‌کند."</string>
+    <string name="dark_ui_text" msgid="4392646155331126666">"«زمینه تیره» در برخی صفحه‌ها از پس‌زمینه سیاه استفاده می‌کند تا شارژ باتری برای مدتی طولانی‌تر حفظ شود. «زمینه تیره» تا زمانی که صفحه خاموش باشد، زمان انتظاری برای روشن شدن تنظیم می‌کند."</string>
     <string name="screen_timeout" msgid="7709947617767439410">"درنگ صفحه"</string>
     <string name="screen_timeout_title" msgid="785134393520893049">"صفحه نمایش خاموش می‌شود"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> پس از غیرفعال بودن"</string>
@@ -2121,7 +2101,7 @@
     <string name="app_ops_running" msgid="6127474473137428721">"درحال اجرا"</string>
     <string name="app_ops_never_used" msgid="9038133162371204506">"(تاکنون استفاده نشده)"</string>
     <string name="no_default_apps" msgid="8966319676910104570">"بدون برنامه‌های پیش‌فرض."</string>
-    <string name="storageuse_settings_title" msgid="3125650750657988194">"استفاده از حافظه"</string>
+    <string name="storageuse_settings_title" msgid="3125650750657988194">"فضای ذخیره‌سازی مصرفی"</string>
     <string name="storageuse_settings_summary" msgid="5001621552305431831">"مشاهده حافظه مورد استفاده برنامه‌ها"</string>
     <string name="service_restarting" msgid="5104563288155809226">"در حال راه‌اندازی مجدد"</string>
     <string name="cached" msgid="5379485147573438201">"پردازش پس‌زمینه ذخیره شده در حافظهٔ پنهان"</string>
@@ -2152,7 +2132,7 @@
     <string name="no_services" msgid="3898812785511572899">"غیر فعال"</string>
     <string name="runningservicedetails_services_title" msgid="11853795112787355">"سرویس‌ها"</string>
     <string name="runningservicedetails_processes_title" msgid="5292271587797234038">"فرآیندها"</string>
-    <string name="service_stop" msgid="5712522600201308795">"توقف"</string>
+    <string name="service_stop" msgid="5712522600201308795">"متوقف کردن"</string>
     <string name="service_manage" msgid="3896322986828332075">"تنظیمات"</string>
     <string name="service_stop_description" msgid="6327742632400026677">"این سرویس توسط برنامهٔ خود سرویس راه‌اندازی شد. توقف آن ممکن است باعث شود برنامه کار نکند."</string>
     <string name="heavy_weight_stop_description" msgid="3086419998820881290">"این برنامه را نمی‌توان به صورت ایمن متوقف کرد. در صورت متوقف کردن آن، ممکن است برخی از کارهای اخیر خود را از دست بدهید."</string>
@@ -2396,7 +2376,7 @@
     <string name="accessibility_display_inversion_preference_title" msgid="5476133104746207952">"وارونگی رنگ"</string>
     <string name="accessibility_display_inversion_switch_title" msgid="7458595722552743503">"استفاده از وارونگی رنگ"</string>
     <string name="accessibility_display_inversion_shortcut_title" msgid="6889624526691513462">"میان‌بر «وارونگی رنگ»"</string>
-    <string name="accessibility_display_inversion_preference_subtitle" msgid="6955835010409034745">"‏«وارونگی رنگ» صفحه‌نمایش روشن را تیره می‌کند.&lt;br/&gt;&lt;br/&gt; توجه: &lt;ol&gt; &lt;li&gt; «وارونگی رنگ» صفحه‌نمایش تیره را نیز روشن می‌کند.&lt;/li&gt; &lt;li&gt; رنگ‌ها در رسانه‌ها و تصاویر تغییر می‌کنند.&lt;/li&gt; &lt;li&gt; برای نمایش پس‌زمینه تیره می‌توان از طرح‌زمینه تیره استفاده کرد. «طرح زمینه تیره» با برنامه‌های پشتیبانی‌شده کار می‌کند. وارونگی رنگ در همه برنامه‌ها کار می‌کند.&lt;/li&gt; &lt;/ol&gt;"</string>
+    <string name="accessibility_display_inversion_preference_subtitle" msgid="6955835010409034745">"‏«وارونگی رنگ» صفحه‌نمایش روشن را تیره می‌کند.&lt;br/&gt;&lt;br/&gt; توجه: &lt;ol&gt; &lt;li&gt; «وارونگی رنگ» صفحه‌نمایش تیره را نیز روشن می‌کند.&lt;/li&gt; &lt;li&gt; رنگ‌ها در رسانه‌ها و تصاویر تغییر می‌کنند.&lt;/li&gt; &lt;li&gt; برای نمایش پس‌زمینه تیره می‌توان از زمینه تیره استفاده کرد. «زمینه تیره» با برنامه‌های پشتیبانی‌شده کار می‌کند. وارونگی رنگ در همه برنامه‌ها کار می‌کند.&lt;/li&gt; &lt;/ol&gt;"</string>
     <string name="accessibility_autoclick_preference_title" msgid="2703143361605555752">"کلیک خودکار (مدت توقف)"</string>
     <string name="accessibility_autoclick_about_title" msgid="152923024405552594">"درباره کلیک خودکار (مدت توقف)"</string>
     <string name="accessibility_autoclick_footer_learn_more_content_description" msgid="7056189627042350691">"درباره کلیک خودکار بیشتر بدانید (مدت توقف)"</string>
@@ -2534,11 +2514,6 @@
     <string name="enable_service_title" msgid="7231533866953706788">"به <xliff:g id="SERVICE">%1$s</xliff:g> اجازه می‌دهید بر دستگاهتان کنترل کامل داشته باشد؟"</string>
     <string name="capabilities_list_title" msgid="1225853611983394386">"<xliff:g id="SERVICE">%1$s</xliff:g> باید:"</string>
     <string name="touch_filtered_warning" msgid="4225815157460318241">"چون برنامه‌ای در حال ایجاد تداخل در درخواست مجوز است، «تنظیمات» نمی‌تواند پاسخ شما را تأیید کند."</string>
-    <string name="enable_service_encryption_warning" msgid="931082737770453755">"اگر <xliff:g id="SERVICE">%1$s</xliff:g> را روشن کنید، دستگاه شما از قفل صفحه شما جهت بهبود رمزگذاری اطلاعات استفاده نخواهد کرد."</string>
-    <string name="secure_lock_encryption_warning" msgid="669152607190123579">"از آنجا که یک سرویس دسترس‌پذیری را روشن کرده‌اید، دستگاه شما از قفل صفحه شما جهت بهبود رمزگذاری اطلاعات استفاده نخواهد کرد."</string>
-    <string name="enable_service_pattern_reason" msgid="6832846117817938536">"از آنجایی که روشن کردن <xliff:g id="SERVICE">%1$s</xliff:g> بر رمزگذاری اطلاعات تأثیر می‌گذارد، باید الگویتان را تأیید کنید."</string>
-    <string name="enable_service_pin_reason" msgid="6040417014360237703">"از آنجایی که روشن کردن <xliff:g id="SERVICE">%1$s</xliff:g> بر رمزگذاری اطلاعات تأثیر می‌گذارد، باید پینتان را تأیید کنید."</string>
-    <string name="enable_service_password_reason" msgid="6962544350351734238">"از آنجایی که روشن کردن <xliff:g id="SERVICE">%1$s</xliff:g> بر رمزگذاری اطلاعات تأثیر می‌گذارد، باید گذرواژه‌تان را تأیید کنید."</string>
     <string name="accessibility_service_warning" msgid="6779187188736432618">"<xliff:g id="SERVICE">%1$s</xliff:g> کنترل کامل بر این دستگاه را درخواست می‌کند. این سرویس می‌تواند صفحه را بخواند و ازطرف افرادی که مشکل دسترسی دارند، عمل کند. این سطح کنترل برای اکثر برنامه‌ها مناسب نیست."</string>
     <string name="accessibility_service_warning_description" msgid="6573203795976134751">"کنترل کامل برای بیشتر برنامه‌ها مناسب نیست، به‌جز برنامه‌هایی که به شما در زمینه نیازهای دسترس‌پذیری کمک می‌کند."</string>
     <string name="accessibility_service_screen_control_title" msgid="324795030658109870">"مشاهده و کنترل صفحه"</string>
@@ -2547,7 +2522,7 @@
     <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_stop" msgid="7295448112784528196">"توقف"</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>
     <string name="disable_service_message" msgid="4814173941688548016">"با زدن روی «<xliff:g id="STOP">%1$s</xliff:g>»، «<xliff:g id="SERVICE">%2$s</xliff:g>» متوقف می‌شود."</string>
@@ -2555,7 +2530,7 @@
     <string name="accessibility_no_service_selected" msgid="1310596127128379897">"سرویسی انتخاب نشده است"</string>
     <string name="accessibility_service_default_description" msgid="7801435825448138526">"شرحی ارائه نشده است."</string>
     <string name="settings_button" msgid="2195468788019730377">"تنظیمات"</string>
-    <string name="keywords_reduce_bright_colors" msgid="1683190961013139183">"حساسیت به نور، نورهراسی، طرح زمینه تیره، میگرن، سردرد، حالت خواندن، حالت شب، کاهش روشنایی، درجه سفیدی"</string>
+    <string name="keywords_reduce_bright_colors" msgid="1683190961013139183">"حساسیت به نور، نورهراسی، زمینه تیره، میگرن، سردرد، حالت خواندن، حالت شب، کاهش روشنایی، درجه سفیدی"</string>
     <string name="keywords_accessibility" msgid="4263443239404659143">"سهولت استفاده، سهولت دسترسی، دستیار، یاری‌رسان"</string>
     <string name="keywords_magnification" msgid="3908145308269840862">"ذره‌بین پنجره، بزرگ‌نمایی، درشت‌نمایی، کم‌بینا، بزرگ کردن، بزرگ‌تر کردن"</string>
     <string name="keywords_talkback" msgid="2816435437095102527"></string>
@@ -2864,7 +2839,7 @@
     <string name="menu_stats_unplugged" msgid="7125297366200634285">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> از زمان جدا کردن"</string>
     <string name="menu_stats_last_unplugged" msgid="230678127178268655">"در حین قطع اتصال آخر برای <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="2713445396954503670">"مقدار کل استفاده"</string>
-    <string name="menu_stats_refresh" msgid="6727628139586938835">"بازخوانی"</string>
+    <string name="menu_stats_refresh" msgid="6727628139586938835">"بازآوری کردن"</string>
     <string name="process_mediaserver_label" msgid="6135260215912215092">"سرور رسانه"</string>
     <string name="process_dex2oat_label" msgid="1190208677726583153">"بهینه‌سازی برنامه"</string>
     <string name="battery_saver" msgid="7737147344510595864">"بهینه‌سازی باتری"</string>
@@ -3103,14 +3078,6 @@
     <string name="remove_account_failed" msgid="3709502163548900644">"این تغییر ازطرف سرپرستتان مجاز دانسته نشده است"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"نمی‌توان به‌صورت دستی همگام‌سازی کرد"</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"همگام‌سازی برای این مورد در حال حاضر غیرفعال است. برای تغییر این تنظیم، داده‌های پس‌زمینه و همگام‌سازی خودکار را موقتاً روشن کنید."</string>
-    <string name="enter_password" msgid="6327051330258595331">"‏برای شروع Android، گذرواژه‌تان را وارد کنید"</string>
-    <string name="enter_pin" msgid="1029287617551232681">"‏برای شروع Android، پینتان را وارد کنید"</string>
-    <string name="enter_pattern" msgid="1747316785866742960">"‏برای شروع Android، الگویتان را رسم"</string>
-    <string name="cryptkeeper_wrong_pattern" msgid="340747269176120242">"الگوی اشتباه"</string>
-    <string name="cryptkeeper_wrong_password" msgid="7295607881887114486">"گذرواژه اشتباه"</string>
-    <string name="cryptkeeper_wrong_pin" msgid="2347961593970714201">"پین اشتباه"</string>
-    <string name="checking_decryption" msgid="6111642972615688237">"در حال بررسی…"</string>
-    <string name="starting_android" msgid="6694154070215356186">"‏در حال راه‌اندازی Android…"</string>
     <string name="delete" msgid="8330605554706263775">"حذف"</string>
     <string name="misc_files" msgid="6598066985800749585">"فایل‌های متفرقه"</string>
     <string name="misc_files_selected_count" msgid="5597802791672749532">"<xliff:g id="NUMBER">%1$d</xliff:g> مورد از <xliff:g id="TOTAL">%2$d</xliff:g> انتخاب شده"</string>
@@ -3206,8 +3173,6 @@
     <string name="data_usage_metered_yes" msgid="4262598072030135223">"محدودشده"</string>
     <string name="data_usage_metered_no" msgid="1685828958417926268">"محدودنشده"</string>
     <string name="data_usage_disclaimer" msgid="3271450299386176770">"ممکن است شرکت مخابراتی داده‌ها را به گونه‌ای متفاوت با دستگاه شما محاسبه کند."</string>
-    <string name="cryptkeeper_emergency_call" msgid="8369322820475703306">"تماس اضطراری"</string>
-    <string name="cryptkeeper_return_to_call" msgid="3857250752781151232">"بازگشت به تماس"</string>
     <string name="vpn_name" msgid="3806456074909253262">"نام"</string>
     <string name="vpn_type" msgid="5533202873260826663">"نوع"</string>
     <string name="vpn_server" msgid="2908816134941973935">"آدرس سرور"</string>
@@ -3560,7 +3525,7 @@
     <string name="keywords_location" msgid="8016374808099706213">"‏اطراف، مکان، سابقه، گزارش، GPS"</string>
     <string name="keywords_accounts" msgid="3482052586502133909">"حساب، افزودن حساب، نمایه کاری، افزودن حساب"</string>
     <string name="keywords_users" msgid="3497517660077620843">"محدودیت، محدود، محدودشده"</string>
-    <string name="keywords_keyboard_and_ime" msgid="4741098648730042570">"تصحیح نوشتار، تصحیح، صدا، لرزش، خودکار، زبان، اشاره، پیشنهاد دادن، پیشنهاد، طرح زمینه، توهین‌آمیز، کلمه، نوع، اموجی، بین‌المللی"</string>
+    <string name="keywords_keyboard_and_ime" msgid="4741098648730042570">"تصحیح نوشتار، تصحیح، صدا، لرزش، خودکار، زبان، اشاره، پیشنهاد دادن، پیشنهاد، زمینه، توهین‌آمیز، کلمه، نوع، اموجی، بین‌المللی"</string>
     <string name="keywords_reset_apps" msgid="8254315757754930862">"بازنشانی، اولویت‌ها، پیش‌فرض"</string>
     <string name="keywords_all_apps" msgid="9016323378609007166">"برنامه‌ها، بارگیری، برنامه‌های کاربردی، سیستم"</string>
     <string name="keywords_app_permissions" msgid="2061773665663541610">"برنامه‌ها، اجازه‌ها، امنیت"</string>
@@ -3578,13 +3543,13 @@
     <string name="keywords_backup" msgid="707735920706667685">"پشتیبان‌گیری، پشتیبان"</string>
     <string name="keywords_assist_gesture_launch" msgid="7710762655355161924">"اشاره"</string>
     <string name="keywords_face_unlock" msgid="545338452730885392">"قفل‌گشایی با چهره، اصالت‌سنجی، ورود به سیستم"</string>
-    <string name="keywords_biometric_unlock" msgid="8569545388717753692">"قفل‌گشایی با چهره، احراز هویت، ورود به سیستم، اثر انگشت، زیست‌سنجشی"</string>
+    <string name="keywords_biometric_unlock" msgid="8569545388717753692">"قفل‌گشایی با چهره، اصالت‌سنجی، ورود به سیستم، اثر انگشت، زیست‌سنجشی"</string>
     <string name="keywords_imei_info" msgid="8848791606402333514">"‏imei، ‏meid،‏ min، نسخه prl، ‏imei sv"</string>
     <string name="keywords_sim_status" msgid="8784456547742075508">"‏شبکه، وضعیت شبکه تلفن همراه، وضعیت سرویس، شدت سیگنال، نوع شبکه تلفن همراه، فراگردی، iccid و eid"</string>
     <string name="keywords_model_and_hardware" msgid="4723665865709965044">"شماره سریال، نسخه سخت‌افزار"</string>
     <string name="keywords_android_version" msgid="1629882125290323070">"‏سطح وصله امنیتی android، نسخه باند پایه، نسخه اصلی"</string>
-    <string name="keywords_dark_ui_mode" msgid="6373999418195344014">"طرح زمینه، روشن، تاریک، حالت، حساسیت به نور، نورهراسی، تاریک‌تر کردن، تاریک کردن، حالت تاریک، میگرن"</string>
-    <string name="keywords_systemui_theme" msgid="6341194275296707801">"طرح زمینه تیره"</string>
+    <string name="keywords_dark_ui_mode" msgid="6373999418195344014">"زمینه، روشن، تاریک، حالت، حساسیت به نور، نورهراسی، تاریک‌تر کردن، تاریک کردن، حالت تاریک، میگرن"</string>
+    <string name="keywords_systemui_theme" msgid="6341194275296707801">"زمینه تیره"</string>
     <string name="keywords_device_feedback" msgid="5489930491636300027">"اشکال"</string>
     <string name="keywords_ambient_display_screen" msgid="661492302323274647">"نمایشگر محیطی. نمایشگر صفحه قفل"</string>
     <string name="keywords_lock_screen_notif" msgid="6363144436467429932">"اعلان صفحه قفل، اعلان‌ها"</string>
@@ -3599,7 +3564,7 @@
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"صفحه نمایش، زمان قفل شدن، درنگ، صفحه درحالت قفل"</string>
     <string name="keywords_storage_settings" msgid="6018856193950281898">"حافظه، حافظه پنهان، داده، حذف، پاک کردن، آزاد، فضا"</string>
     <string name="keywords_bluetooth_settings" msgid="2588159530959868188">"متصل، دستگاه، هدفون‌ها، هدست‌ها، بلندگو، بی‌سیم، مرتبط‌سازی، هدفون‌های توگوشی، موسیقی، رسانه"</string>
-    <string name="keywords_wallpaper" msgid="7332890404629446192">"پس‌زمینه، طرح زمینه، جدول، سفارشی ساختن، شخصی کردن"</string>
+    <string name="keywords_wallpaper" msgid="7332890404629446192">"پس‌زمینه، زمینه، جدول، سفارشی ساختن، شخصی کردن"</string>
     <string name="keywords_styles" msgid="5291614313348476068">"نماد، رنگ تأکیدی، رنگ"</string>
     <string name="keywords_assist_input" msgid="3086289530227075593">"پیش‌فرض، دستیار"</string>
     <string name="keywords_default_payment_app" msgid="5162298193637362104">"پرداخت، پیش‌فرض"</string>
@@ -4568,7 +4533,7 @@
     <string name="storage_summary" msgid="5903562203143572768">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> استفاده‌شده - <xliff:g id="FREE_SPACE">%2$s</xliff:g> آزاد"</string>
     <string name="storage_summary_with_sdcard" msgid="2063780050580228868">"فضای ذخیره‌سازی داخلی: <xliff:g id="PERCENTAGE">%1$s</xliff:g> استفاده‌شده - <xliff:g id="FREE_SPACE">%2$s</xliff:g> آزاد"</string>
     <string name="display_summary" msgid="5526061030874717172">"خواب پس از <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> عدم فعالیت"</string>
-    <string name="display_dashboard_summary" msgid="1599453894989339454">"طرح زمینه تیره، اندازه قلم، روشنایی"</string>
+    <string name="display_dashboard_summary" msgid="1599453894989339454">"زمینه تیره، اندازه قلم، روشنایی"</string>
     <string name="display_summary_example" msgid="4275121979039344438">"خواب پس از ۱۰ دقیقه عدم فعالیت"</string>
     <string name="memory_summary" msgid="8221954450951651735">"به‌طور متوسط <xliff:g id="USED_MEMORY">%1$s</xliff:g> از <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> حافظه استفاده شده است"</string>
     <string name="users_summary" msgid="8473589474976307510">"به‌عنوان <xliff:g id="USER_NAME">%1$s</xliff:g> به سیستم وارد شده‌اید"</string>
@@ -4764,8 +4729,6 @@
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> برنامه می‌تواند از داده نامحدود استفاده کند</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"مشاهده محتوای بیشتر"</string>
-    <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"واقعاً داده‌های کاربر محو شود و به رمزگذاری فایل تبدیل شود؟"</string>
-    <string name="button_confirm_convert_fbe" msgid="339648921918438106">"محو کردن داده و تبدیل"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"‏بازنشانی محدودکننده سرعت ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"‏محدودکننده سرعت ShortcutManager بازنشانی شد"</string>
     <string name="notification_suggestion_title" msgid="6309263655965785411">"کنترل اطلاعات روی صفحه قفل"</string>
@@ -4780,14 +4743,14 @@
     <string name="bluetooth_connected_summary" msgid="8043167194934315712">"به <xliff:g id="ID_1">%1$s</xliff:g> متصل شد"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"به چند دستگاه متصل شد"</string>
     <string name="demo_mode" msgid="6566167465451386728">"حالت نمایشی میانای کاربر سیستم"</string>
-    <string name="dark_ui_mode" msgid="898146394425795281">"طرح زمینه تیره"</string>
+    <string name="dark_ui_mode" msgid="898146394425795281">"زمینه تیره"</string>
     <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="4554134480159161533">"به‌دلیل روشن بودن «بهینه‌سازی باتری» موقتاً غیرفعال شده است"</string>
     <string name="ambient_camera_summary_battery_saver_on" msgid="1787784892047029560">"به‌دلیل روشن بودن «بهینه‌سازی باتری»، موقتاً غیرفعال شده است"</string>
     <string name="ambient_camera_battery_saver_off" msgid="689825730569761613">"خاموش کردن بهینه‌سازی باتری"</string>
     <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"به‌دلیل روشن بودن «بهینه‌سازی باتری»، این تنظیم موقتاً فعال شد"</string>
-    <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"برنامه‌های پشتبانی‌شده نیز به طرح زمینه تیره تغییر می‌کنند"</string>
+    <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"برنامه‌های پشتبانی‌شده نیز به زمینه تیره تغییر می‌کنند"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"متوجه شدم"</string>
-    <string name="dark_theme_slice_title" msgid="4684222119481114062">"طرح زمینه تیره را امتحان کنید"</string>
+    <string name="dark_theme_slice_title" msgid="4684222119481114062">"زمینه تیره را امتحان کنید"</string>
     <string name="dark_theme_slice_subtitle" msgid="5555724345330434268">"به افزایش عمر باتری کمک می‌کند"</string>
     <string name="quick_settings_developer_tiles" msgid="7336007844525766623">"کاشی‌های برنامه‌نویسی تنظیمات سریع"</string>
     <string name="adb_authorization_timeout_title" msgid="6996844506783749754">"‏غیرفعال کردن درنگ مجوز adb"</string>
@@ -4917,7 +4880,7 @@
     <string name="auto_sync_account_title" msgid="1070908045600374254">"همگام‌سازی خودکار داده‌های برنامه"</string>
     <string name="auto_sync_personal_account_title" msgid="3544275021920818595">"همگام‌سازی خودکار داده‌های شخصی"</string>
     <string name="auto_sync_work_account_title" msgid="6060310415978781885">"همگام‌سازی خودکار داده‌های کاری"</string>
-    <string name="auto_sync_account_summary" msgid="7580352130028957346">"اجازه دادن به برنامه‌ها برای بازخوانی خودکار داده‌ها"</string>
+    <string name="auto_sync_account_summary" msgid="7580352130028957346">"اجازه دادن به برنامه‌ها برای بازآوری خودکار داده‌ها"</string>
     <string name="account_sync_title" msgid="7036067017433297574">"همگام‌سازی حساب"</string>
     <string name="account_sync_summary_some_on" msgid="911460286297968724">"همگام‌سازی <xliff:g id="ID_1">%1$d</xliff:g> مورد از <xliff:g id="ID_2">%2$d</xliff:g> مورد روشن است"</string>
     <string name="account_sync_summary_all_on" msgid="2953682111836599841">"همگام‌سازی همه موارد روشن است"</string>
@@ -5048,7 +5011,7 @@
     <string name="location_indicator_settings_description" msgid="2888022085372804021">"برای همه مکان‌ها نشان داده شود، ازجمله شبکه و اتصال"</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"‏اجرای کامل اندازه‌گیری GNSS"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"بدون دوره کاری، همه دسته عکس‌های پانوراما و فرکانس‌ها را ردیابی کنید."</string>
-    <string name="device_theme" msgid="5027604586494772471">"طرح زمینه دستگاه"</string>
+    <string name="device_theme" msgid="5027604586494772471">"زمینه دستگاه"</string>
     <string name="default_theme" msgid="4815428567082263639">"پیش‌فرض"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"نام شبکه"</string>
     <string name="show_operator_name_summary" msgid="5352696579216501773">"نمایش نام شبکه در نوار وضعیت"</string>
@@ -5292,6 +5255,7 @@
     <string name="sim_action_yes" msgid="8076556020131395515">"بله"</string>
     <string name="sim_action_reboot" msgid="3508948833333441538">"بازراه‌اندازی"</string>
     <string name="sim_action_no_thanks" msgid="435717748384544195">"نه متشکرم"</string>
+    <string name="sim_action_cancel" msgid="2668099867029610910">"لغو"</string>
     <string name="sim_switch_button" msgid="1405772571706095387">"عوض کردن"</string>
     <string name="dsds_activation_failure_title" msgid="4467364110584914794">"سیم‌کارت فعال نشد"</string>
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"سیم‌کارت را خارج کنید و دوباره در دستگاه بگذارید. اگر مشکل ادامه داشت، دستگاهتان را بازراه‌اندازی کنید."</string>
@@ -5444,6 +5408,10 @@
     <string name="cached_apps_freezer" msgid="1057519579761550350">"تعلیق کردن اجرای برنامه‌های ذخیره‌شده"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"مجاز کردن هم‌پوشانی صفحه‌ها در «تنظیمات»"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"مجاز کردن برنامه‌هایی که برای همپوشانی صفحه‌های «تنظیمات» می‌توانند روی برنامه‌های دیگر نمایش داده شوند"</string>
+    <!-- no translation found for allow_mock_modem (3832264806530479214) -->
+    <skip />
+    <!-- no translation found for allow_mock_modem_summary (9097416612748005374) -->
+    <skip />
     <string name="media_controls_title" msgid="403271085636252597">"رسانه"</string>
     <string name="media_controls_resume_title" msgid="855076860336652370">"سنجاق کردن پخش‌کننده رسانه"</string>
     <string name="media_controls_resume_description" msgid="3163482266454802097">"برای ازسر گرفتن سریع بازپخش، پخش‌کننده رسانه در «تنظیمات فوری» باز می‌ماند"</string>
@@ -5521,7 +5489,7 @@
     <string name="category_name_display_controls" msgid="7046581691184725216">"دیگر کنترل‌های نمایشگر"</string>
     <string name="category_name_others" msgid="2366006298768550310">"غیره"</string>
     <string name="category_name_general" msgid="7737273712848115886">"کلی"</string>
-    <string name="dark_theme_main_switch_title" msgid="4045147031947562280">"استفاده از «طرح زمینه تیره»"</string>
+    <string name="dark_theme_main_switch_title" msgid="4045147031947562280">"استفاده از «زمینه تیره»"</string>
     <string name="bluetooth_main_switch_title" msgid="8409835540311309632">"استفاده از بلوتوث"</string>
     <string name="prevent_ringing_main_switch_title" msgid="4726252811262086643">"استفاده از جلوگیری از زنگ زدن"</string>
     <string name="use_wifi_hotsopt_main_switch_title" msgid="3909731167290690539">"‏استفاده از نقطه اتصال Wi-Fi"</string>
diff --git a/res/values-fi/arrays.xml b/res/values-fi/arrays.xml
index 4c39095..aa0b0c8 100644
--- a/res/values-fi/arrays.xml
+++ b/res/values-fi/arrays.xml
@@ -375,7 +375,7 @@
     <item msgid="2166553138528640250">"Oletus"</item>
     <item msgid="4234707448428002595">"Sans Serif"</item>
     <item msgid="2390008695651897663">"Sans Serif, tiivistetty"</item>
-    <item msgid="2396492419730702454">"Sans Serif Monospace"</item>
+    <item msgid="2396492419730702454">"Sans Serif, tasalevyinen"</item>
     <item msgid="8199675052804786099">"Serif"</item>
     <item msgid="4554123140736897688">"Serif Monospace"</item>
     <item msgid="5485652650875486635">"Casual"</item>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 6fc37f5..1758ae5 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -142,10 +142,11 @@
     <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"Anna laitteen viestiä lähellä olevien Bluetooth-laitteiden kanssa"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"Anna puhelimen viestiä lähellä olevien Bluetooth-laitteiden kanssa"</string>
     <string name="bluetooth_disable_a2dp_hw_offload" msgid="5942913792817797541">"Poista käytöstä Bluetooth A2DP ‑laitteiston lähetys"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="8610420176339657720">"Käynnistä uudelleen?"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8333029144800835996">"Laite on käynnistettävä uudelleen asetuksen muuttamiseksi."</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="3488695418187553566">"Käyn. uud."</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="4930826928585464191">"Peru"</string>
+    <string name="bluetooth_disable_le_audio_hw_offload" msgid="3966022676505972908">"Poista käytöstä Bluetooth LE AUDIO ‑laitteiston lähetys"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_title" msgid="6001142380445276918">"Käynnistetäänkö laite uudelleen?"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_message" msgid="1524373895333698779">"Laite on käynnistettävä uudelleen asetuksen muuttamiseksi."</string>
+    <string name="bluetooth_disable_hw_offload_dialog_confirm" msgid="5594859658551707592">"Käynnistä uudelleen"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel" msgid="3663690305043973720">"Peru"</string>
     <string name="connected_device_media_device_title" msgid="3783388247594566734">"Medialaitteet"</string>
     <string name="connected_device_call_device_title" msgid="88732390601723608">"Soittolaitteet"</string>
     <string name="connected_device_other_device_title" msgid="4652120430615729193">"Muut laitteet"</string>
@@ -309,9 +310,9 @@
     <string name="security_settings_title" msgid="6710768415432791970">"Suojaus"</string>
     <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"Salaus ja kirjautumistiedot"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"Puhelimen tiedot on salattu."</string>
-    <string name="decryption_settings_summary" product="default" msgid="1742645256103613503">"Puhelinta ei salattu"</string>
+    <string name="not_encrypted_summary" product="default" msgid="2251945842585788254">"Puhelinta ei salattu"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"Laite salattu"</string>
-    <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"Laitetta ei salattu"</string>
+    <string name="not_encrypted_summary" product="tablet" msgid="2374263654698719382">"Laitetta ei salattu"</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"Lukitusnäyttö"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"Näkymä"</string>
     <string name="security_settings_summary" msgid="1627059516127354233">"Aseta Oma sijainti, näytön lukituksen poisto, SIM-kortin lukitus, käyttöoikeustietojen tallennustilan lukitus"</string>
@@ -319,7 +320,7 @@
     <string name="security_passwords_title" msgid="4154420930973818581">"Yksityisyys"</string>
     <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"Ei käytettävissä"</string>
     <string name="security_status_title" msgid="6958004275337618656">"Suojaustila"</string>
-    <string name="security_dashboard_summary" msgid="7571035662779425918">"Näytön lukitus, Paikanna puhelin, sovellusten tietoturva"</string>
+    <string name="security_dashboard_summary" msgid="7571035662779425918">"Näytön lukitus, Paikanna laite, sovellusten tietoturva"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Kasvot lisätty"</string>
     <string name="security_settings_face_preference_summary_none" msgid="5952752252122581846">"Ota kasvot käyttöön napauttamalla"</string>
     <string name="security_settings_face_preference_title" msgid="2126625155005348417">"Kasvojentunnistusavaus"</string>
@@ -568,37 +569,10 @@
     <string name="fingerprint_last_delete_message" msgid="7860374760549404410">"Et voi käyttää sormenjälkeäsi puhelimen lukituksen avaamiseen tai henkilöllisyyden todentamiseen sovelluksissa."</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="4104208067277655068">"Et voi käyttää sormenjälkeäsi työprofiilin lukituksen avaamiseen, ostosten hyväksymiseen tai työsovelluksiin kirjautumiseen."</string>
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"Kyllä, poista"</string>
-    <string name="crypt_keeper_settings_title" msgid="4938812137822100044">"Salaus"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"Salaa tabletti"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"Salaa puhelin"</string>
-    <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"Salattu"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"Voit salata tilisi, asetukset, ladatut sovellukset tietoineen, median ja muut tiedostot. Jos olet salannut puhelimesi ja kytkenyt näytön lukituksen (kuvion, PIN-koodin tai salasanan avulla), sinun pitää vapauttaa lukitus salauksen purkamiseksi aina virran kytkemisen jälkeen. Ainoa vaihtoehtoinen tapa poistaa salaus on suorittaa palautus tehdasasetuksiin, jolloin kaikki tiedot katoavat.\n\nSalaaminen kestää ainakin tunnin. Akun täytyy olla alussa ladattu, ja puhelimen pitää olla pistorasiaan kiinnitettynä koko prosessin ajan. Jos keskeytät sen, tiedot häviävät kokonaan tai osittain."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"Voit salata tilisi, asetukset, ladatut sovellukset tietoineen, median ja muut tiedostot. Jos olet salannut puhelimesi ja kytkenyt näytön lukituksen (kuvion, PIN-koodin tai salasanan avulla), sinun pitää vapauttaa lukitus salauksen purkamiseksi aina virran kytkemisen jälkeen. Ainoa vaihtoehtoinen tapa poistaa  salaus on suorittaa palautus tehdasasetuksiin, jolloin kaikki tiedot katoavat.\n\nSalaaminen kestää ainakin tunnin. Akun täytyy olla alussa ladattu, ja puhelimen pitää olla pistorasiaan kiinnitettynä koko prosessin ajan. Jos keskeytät sen, tiedot häviävät kokonaan tai osittain."</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"Salaa tabletti"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"Salaa puhelin"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"Lataa akku ja yritä uudelleen."</string>
-    <string name="crypt_keeper_unplugged_text" msgid="2709721134148651329">"Yhdistä laturi ja yritä uudelleen."</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="1847280235529858357">"Ei näytönlukitus-PIN-koodia tai -salasanaa"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="7210616262954236042">"Sinun on asetettava lukitusnäytön PIN-koodi tai salasana ennen salauksen aloittamista."</string>
-    <string name="crypt_keeper_confirm_title" msgid="8600000209722452230">"Salataanko?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="3270587498436152259">"Salausta ei voi peruuttaa, ja jos keskeytät sen, menetät tietoja. Salaus kestää vähintään tunnin, ja sen aikana tabletti käynnistyy uudelleen useita kertoja."</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="3040428543349852419">"Salausta ei voi peruuttaa, ja jos keskeytät sen, menetät tietoja. Salaus kestää vähintään tunnin, ja sen aikana puhelin käynnistyy uudelleen useita kertoja."</string>
-    <string name="crypt_keeper_setup_title" msgid="3339725741305796680">"Salaus käynnissä"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="4417016995091289019">"Odota, tablet-laitetta salataan. <xliff:g id="PERCENT">^1</xliff:g> % valmiina."</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="7902355422499500352">"Odota, puhelinta salataan. <xliff:g id="PERCENT">^1</xliff:g> % valmiina."</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="8348188415839917821">"Odota, tablet-laitteesi salataan. Aikaa jäljellä: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="8556105766597855198">"Odota, puhelimesi salataan. Aikaa jäljellä: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="3832496715430327682">"Avaa lukitus käynnistämällä tabletti uudelleen."</string>
-    <string name="crypt_keeper_force_power_cycle" product="default" msgid="5070346039522135361">"Avaa lukitus käynnistämällä puhelin uudelleen."</string>
-    <string name="crypt_keeper_warn_wipe" msgid="8104921337301750394">"Varoitus: laite tyhjennetään <xliff:g id="COUNT">^1</xliff:g> epäonnistuneen lukituksenpoistoyrityksen jälkeen!"</string>
-    <string name="crypt_keeper_enter_password" msgid="1274917431075529732">"Kirjoita salasana"</string>
-    <string name="crypt_keeper_failed_title" msgid="8173654570682244149">"Salaus epäonnistui"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"Salaus keskeytyi, eikä sitä voi suorittaa loppuun. Tästä johtuen tablet-laitteesi tietoja ei voi enää käyttää. \n\nVoit jatkaa tablet-laitteesi käyttöä, kun palautat tehdasasetukset. Kun olet määrittänyt tablet-laitteesi asetukset tehdasasetusten palautuksen jälkeen, voit palauttaa tiedot, jotka olet varmuuskopioinut Google-tiliisi."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"Salaus keskeytyi, eikä sitä voi suorittaa loppuun. Tästä johtuen puhelimesi tietoja ei voi enää käyttää. \n\nVoit jatkaa puhelimesi käyttöä, kun palautat tehdasasetukset. Kun olet määrittänyt puhelimesi asetukset tehdasasetusten palautuksen jälkeen, voit palauttaa tiedot, jotka olet varmuuskopioinut Google-tiliisi."</string>
-    <string name="crypt_keeper_data_corrupt_title" msgid="5920153462176846037">"Salauksen purku onnistui"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"Annoit oikean salasanan, mutta tiedot ovat valitettavasti vioittuneet. \n\nTehdasasetukset on palautettava, jotta voit jatkaa tabletin käyttöä. Tehdasasetusten palautuksen jälkeen voit määrittää tabletin asetukset uudelleen ja palauttaa Google-tiliisi mahdollisesti varmuuskopioidut tiedot."</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"Annoit oikean salasanan, mutta tiedot ovat valitettavasti vioittuneet. \n\nTehdasasetukset on palautettava, jotta voit jatkaa puhelimen käyttöä. Tehdasasetusten palautuksen jälkeen voit määrittää puhelimen asetukset uudelleen ja palauttaa Google-tiliisi mahdollisesti varmuuskopioidut tiedot."</string>
-    <string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"Vaihda syöttötapaa"</string>
+    <string name="encryption_settings_title" msgid="2848716008695618360">"Salaus"</string>
+    <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"Salaa tabletti"</string>
+    <string name="encrypt_title" product="default" msgid="7337365190988321100">"Salaa puhelin"</string>
+    <string name="encrypted_summary" msgid="545623487587251207">"Salattu"</string>
     <string name="suggested_lock_settings_title" msgid="7836065447159730217">"Suojaa puhelimesi"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"Suojaa tablettia määrittämällä näytön lukitus"</string>
     <string name="suggested_lock_settings_summary" product="device" msgid="8479766049078378225">"Suojaa laitetta määrittämällä näytön lukitus"</string>
@@ -817,6 +791,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Saatat joutua syöttämään tämän PIN-koodin myös toiseen laitteeseen."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Saatat joutua syöttämään tämän koodin myös toiseen laitteeseen."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Parin muodostus seuraavan laitteen kanssa:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Varmista, että laite esittää tämän koodin:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Vahvista laiteparin muodostus koordinoidun joukon kanssa"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"Laitteesta&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Muodostetaanko pari tämän laitteen kanssa?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Jos haluat muodostaa laiteparin laitteen <xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> kanssa, kirjoita laitteelle <xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g> ja paina Rivinvaihto tai Enter."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Anna yhteystietojesi ja puheluhistoriasi käyttöoikeus"</string>
@@ -850,6 +825,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Yhteyttä ei voi muodostaa. Yritä uudelleen."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Laitteen tiedot"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Laitteen Bluetooth-osoite: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Laitteen Bluetooth-osoite: \n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Unohdetaanko laite?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Poista yhteys"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Katkaistaanko sovelluksen yhteys?"</string>
@@ -881,6 +857,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Muista asetukset"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Liitettyjen Bluetooth-äänilaitteiden enimmäismäärä"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Valitse liitettyjen Bluetooth-äänilaitteiden enimmäismäärä"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"NFC-pinon viankorjausloki"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Nosta NFC-pinon lokikirjaustasoa"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Lähetä"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"peilaus"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Ota langaton näyttö käyttöön"</string>
@@ -1188,6 +1166,8 @@
     <string name="wifi_hotspot_maximize_compatibility_dual_ap_summary" msgid="3579549223159056533">"Auttaa muita laitteita löytämään tämän hotspotin. Lisää akun käyttöä."</string>
     <string name="wifi_tether_starting" msgid="8879874184033857814">"Otetaan yhteyspiste käyttöön..."</string>
     <string name="wifi_tether_stopping" msgid="4416492968019409188">"Poistetaan yhteyspiste käytöstä..."</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_title" msgid="3089432578433978073">"Puhelimen käyttäminen modeemina ei saatavilla"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_content" msgid="5920421547607921112">"Lisätietoja saat operaattoriltasi"</string>
     <string name="wifi_tether_enabled_subtext" msgid="5085002421099821056">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> on aktiivinen"</string>
     <string name="wifi_tether_failed_subtext" msgid="437190628041885500">"Kannettavan Wi-Fi-hotspotin virhe"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7072559431286459122">"Luo Wi-Fi-hotspot"</string>
@@ -2259,7 +2239,7 @@
     <string name="app_name_label" msgid="3809910527680143673">"Sovellus"</string>
     <string name="last_time_used_label" msgid="2639712813493534074">"Viimeinen käyttöaika"</string>
     <string name="usage_time_label" msgid="9105343335151559883">"Käyttöaika"</string>
-    <string name="accessibility_settings" msgid="4713215774904704682">"Esteettömyys"</string>
+    <string name="accessibility_settings" msgid="4713215774904704682">"Saavutettavuus"</string>
     <string name="accessibility_settings_title" msgid="6739115703615065716">"Esteettömyysasetukset"</string>
     <string name="accessibility_settings_summary" msgid="2366627644570558503">"Näyttö, käyttö, audio"</string>
     <string name="vision_settings_title" msgid="8919983801864103069">"Näköasetukset"</string>
@@ -2534,11 +2514,6 @@
     <string name="enable_service_title" msgid="7231533866953706788">"Saako <xliff:g id="SERVICE">%1$s</xliff:g> laitteesi täyden käyttöoikeuden?"</string>
     <string name="capabilities_list_title" msgid="1225853611983394386">"<xliff:g id="SERVICE">%1$s</xliff:g> saa luvan:"</string>
     <string name="touch_filtered_warning" msgid="4225815157460318241">"Sovellus peittää lupapyynnön, joten Asetukset ei voi vahvistaa valintaasi."</string>
-    <string name="enable_service_encryption_warning" msgid="931082737770453755">"Jos <xliff:g id="SERVICE">%1$s</xliff:g> otetaan käyttöön, laitteesi ei käytä näytön lukitusta tiedon salauksen parantamiseen."</string>
-    <string name="secure_lock_encryption_warning" msgid="669152607190123579">"Laite ei käytä näytön lukitusta tiedon salauksen parantamiseen, koska otit käytettävyyspalvelun käyttöön."</string>
-    <string name="enable_service_pattern_reason" msgid="6832846117817938536">"Koska palvelun <xliff:g id="SERVICE">%1$s</xliff:g> ottaminen käyttöön vaikuttaa tietojen salaukseen, sinun pitää vahvistaa kuvio."</string>
-    <string name="enable_service_pin_reason" msgid="6040417014360237703">"Koska palvelun <xliff:g id="SERVICE">%1$s</xliff:g> ottaminen käyttöön vaikuttaa tietojen salaukseen, sinun pitää vahvistaa PIN-koodi."</string>
-    <string name="enable_service_password_reason" msgid="6962544350351734238">"Koska palvelun <xliff:g id="SERVICE">%1$s</xliff:g> ottaminen käyttöön vaikuttaa tietojen salaukseen, sinun pitää vahvistaa salasana."</string>
     <string name="accessibility_service_warning" msgid="6779187188736432618">"<xliff:g id="SERVICE">%1$s</xliff:g> pyytää laitteen täyttä hallintaoikeutta. Palvelu voi lukea näytön sisällön ja toimia esteettömyyspalvelujen käyttäjien puolesta. Hallintaoikeudet ovat useimmille sovelluksille liian laajat."</string>
     <string name="accessibility_service_warning_description" msgid="6573203795976134751">"Täysi käyttöoikeus sopii esteettömyyssovelluksille, mutta ei useimmille sovelluksille."</string>
     <string name="accessibility_service_screen_control_title" msgid="324795030658109870">"Näytön katselu ja ohjaus"</string>
@@ -3103,14 +3078,6 @@
     <string name="remove_account_failed" msgid="3709502163548900644">"Järjestelmänvalvoja ei salli tätä muutosta."</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"Manuaalinen synkronointi epäonnistui"</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"Tämän kohteen synkronointi on tällä hetkellä pois käytöstä. Voit muuttaa asetuksia ottamalla taustatiedonsiirron ja automaattisen synkronoinnin väliaikaisesti käyttöön."</string>
-    <string name="enter_password" msgid="6327051330258595331">"Käynnistä Android kirjoittamalla salasana"</string>
-    <string name="enter_pin" msgid="1029287617551232681">"Käynnistä Android kirjoittamalla PIN-koodi"</string>
-    <string name="enter_pattern" msgid="1747316785866742960">"Käynnistä Android piirtämällä kuvio"</string>
-    <string name="cryptkeeper_wrong_pattern" msgid="340747269176120242">"Väärä kuvio"</string>
-    <string name="cryptkeeper_wrong_password" msgid="7295607881887114486">"Väärä salasana"</string>
-    <string name="cryptkeeper_wrong_pin" msgid="2347961593970714201">"Väärä PIN-koodi"</string>
-    <string name="checking_decryption" msgid="6111642972615688237">"Tarkistetaan…"</string>
-    <string name="starting_android" msgid="6694154070215356186">"Androidia käynnistetään…"</string>
     <string name="delete" msgid="8330605554706263775">"Poista"</string>
     <string name="misc_files" msgid="6598066985800749585">"Muut tiedostot"</string>
     <string name="misc_files_selected_count" msgid="5597802791672749532">"valittu <xliff:g id="NUMBER">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -3158,7 +3125,7 @@
     <string name="data_usage_tab_3g" msgid="6111070409752123049">"2G-3G"</string>
     <string name="data_usage_list_mobile" msgid="3738130489722964291">"Mobiili"</string>
     <string name="data_usage_list_none" msgid="2091924522549134855">"Ei yhtään"</string>
-    <string name="data_usage_enable_mobile" msgid="1996943748103310201">"Mobiilitiedonsiirto"</string>
+    <string name="data_usage_enable_mobile" msgid="1996943748103310201">"Mobiilidata"</string>
     <string name="data_usage_enable_3g" msgid="2818189799905446932">"2G-3G-tiedonsiirto"</string>
     <string name="data_usage_enable_4g" msgid="1526584080251993023">"4G-tiedonsiirto"</string>
     <string name="data_roaming_enable_mobile" msgid="5745287603577995977">"Roaming"</string>
@@ -3206,8 +3173,6 @@
     <string name="data_usage_metered_yes" msgid="4262598072030135223">"Maksullinen"</string>
     <string name="data_usage_metered_no" msgid="1685828958417926268">"Maksuton"</string>
     <string name="data_usage_disclaimer" msgid="3271450299386176770">"Operaattorin mittaustulos saattaa erota laitteesi mittaamasta."</string>
-    <string name="cryptkeeper_emergency_call" msgid="8369322820475703306">"Hätäpuhelu"</string>
-    <string name="cryptkeeper_return_to_call" msgid="3857250752781151232">"Palaa puheluun"</string>
     <string name="vpn_name" msgid="3806456074909253262">"Nimi"</string>
     <string name="vpn_type" msgid="5533202873260826663">"Tyyppi"</string>
     <string name="vpn_server" msgid="2908816134941973935">"Palvelimen osoite"</string>
@@ -4764,8 +4729,6 @@
       <item quantity="one">1 sovelluksen datankäyttöä ei rajoiteta</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"Katso lisää"</string>
-    <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"Haluatko varmasti poistaa käyttäjätiedot ja ottaa tiedostojen salauksen käyttöön?"</string>
-    <string name="button_confirm_convert_fbe" msgid="339648921918438106">"Poista ja salaa"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"Nollaa ShortcutManagerin kutsurajoitus"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"ShortcutManagerin kutsurajoitus nollattiin."</string>
     <string name="notification_suggestion_title" msgid="6309263655965785411">"Hallinnoi lukitusnäytön tietoja"</string>
@@ -5292,6 +5255,7 @@
     <string name="sim_action_yes" msgid="8076556020131395515">"Kyllä"</string>
     <string name="sim_action_reboot" msgid="3508948833333441538">"Käynnistä uudelleen"</string>
     <string name="sim_action_no_thanks" msgid="435717748384544195">"Ei kiitos"</string>
+    <string name="sim_action_cancel" msgid="2668099867029610910">"Peru"</string>
     <string name="sim_switch_button" msgid="1405772571706095387">"Vaihda"</string>
     <string name="dsds_activation_failure_title" msgid="4467364110584914794">"SIM-korttia ei voi aktivoida"</string>
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Poista SIM-kortti ja aseta se takaisin. Jos ongelma ei ratkea, käynnistä laite uudelleen."</string>
@@ -5444,6 +5408,10 @@
     <string name="cached_apps_freezer" msgid="1057519579761550350">"Keskeytä välimuistiin tallennetut sovellukset"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"Salli näytön peitto Asetukset-sovelluksessa"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Anna sovellusten, jotka voivat näkyä muiden sovellusten päällä, peittää Asetukset-sovelluksen näytöt"</string>
+    <!-- no translation found for allow_mock_modem (3832264806530479214) -->
+    <skip />
+    <!-- no translation found for allow_mock_modem_summary (9097416612748005374) -->
+    <skip />
     <string name="media_controls_title" msgid="403271085636252597">"Media"</string>
     <string name="media_controls_resume_title" msgid="855076860336652370">"Kiinnitä mediasoitin"</string>
     <string name="media_controls_resume_description" msgid="3163482266454802097">"Mediasoitin pysyy auki pika-asetuksissa, jotta toistoa voi jatkaa nopeasti"</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 86a2cec..4994afc 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -142,10 +142,11 @@
     <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"Permettre à votre appareil de communiquer avec les appareils Bluetooth à proximité"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"Permettre à votre téléphone de communiquer avec les appareils Bluetooth à proximité"</string>
     <string name="bluetooth_disable_a2dp_hw_offload" msgid="5942913792817797541">"Désactiver déchargement Bluetooth A2DP"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="8610420176339657720">"Redémarrer l\'appareil?"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8333029144800835996">"Vous devez redémarrer votre appareil pour modifier ce param."</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="3488695418187553566">"Redémarrer"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="4930826928585464191">"Annuler"</string>
+    <string name="bluetooth_disable_le_audio_hw_offload" msgid="3966022676505972908">"Désactiver la décharge matérielle de Bluetooth LE AUDIO"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_title" msgid="6001142380445276918">"Redémarrer l\'appareil?"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_message" msgid="1524373895333698779">"Vous devez redémarrer votre appareil pour modifier ce paramètre."</string>
+    <string name="bluetooth_disable_hw_offload_dialog_confirm" msgid="5594859658551707592">"Redémarrer"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel" msgid="3663690305043973720">"Annuler"</string>
     <string name="connected_device_media_device_title" msgid="3783388247594566734">"Appareils de stockage multimédia"</string>
     <string name="connected_device_call_device_title" msgid="88732390601723608">"Appareils avec fonctionnalités d\'appel"</string>
     <string name="connected_device_other_device_title" msgid="4652120430615729193">"Autres appareils"</string>
@@ -309,9 +310,9 @@
     <string name="security_settings_title" msgid="6710768415432791970">"Sécurité"</string>
     <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"Chiffrement et authentifiants"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"Téléphone chiffré"</string>
-    <string name="decryption_settings_summary" product="default" msgid="1742645256103613503">"Téléphone non chiffré"</string>
+    <string name="not_encrypted_summary" product="default" msgid="2251945842585788254">"Téléphone non chiffré"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"Appareil chiffré"</string>
-    <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"Appareil non chiffré"</string>
+    <string name="not_encrypted_summary" product="tablet" msgid="2374263654698719382">"Appareil non chiffré"</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"Écran de verrouillage"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"Éléments affichés"</string>
     <string name="security_settings_summary" msgid="1627059516127354233">"Définir les paramètres de l\'option Ma position et de verrouillage"</string>
@@ -488,7 +489,7 @@
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Déplacez légèrement votre doigt lorsque vous le relevez pour ajouter toutes les parties de votre empreinte digitale."</string>
     <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"Maintenez le doigt sur le capteur chaque fois que l\'icône de l\'empreinte digitale bouge. Cela aide à capter une plus grande partie de votre empreinte digitale."</string>
     <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"Placer le bout de votre doigt sur le capteur"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="6137605344819152477">"Finalement, utiliser les bords de votre doigt"</string>
+    <string name="security_settings_udfps_enroll_edge_title" msgid="6137605344819152477">"Pour finir, utilisez les bords de votre doigt"</string>
     <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"Placez le côté de votre doigt sur le capteur et maintenez-le en place, puis passez à l\'autre côté"</string>
     <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"Ce geste aide à capter une plus grande partie de votre empreinte digitale"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Inscription de l\'empreinte digitale : <xliff:g id="PERCENTAGE">%d</xliff:g> pour cent"</string>
@@ -568,37 +569,10 @@
     <string name="fingerprint_last_delete_message" msgid="7860374760549404410">"Vous ne pourrez pas utiliser votre empreinte digitale pour déverrouiller votre téléphone ni vérifier qu\'il s\'agit bien de vous dans les applications."</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="4104208067277655068">"Vous ne pourrez pas utiliser votre empreinte digitale pour déverrouiller votre profil professionnel, autoriser vos achats ni vous connecter à des applications professionnelles."</string>
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"Oui, supprimer"</string>
-    <string name="crypt_keeper_settings_title" msgid="4938812137822100044">"Chiffrement"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"Chiffrer la tablette"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"Chiffrer le téléphone"</string>
-    <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"Chiffré"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"Vous pouvez chiffrer vos comptes, vos paramètres, les applications téléchargées et les données associées, les contenus multimédias et d\'autres fichiers. Si vous avez chiffré votre tablette en définissant un verrouillage d\'écran (au moyen d\'un schéma, d\'un NIP ou d\'un mot de passe), vous devez déverrouiller l\'écran pour déchiffrer la tablette à chaque fois que vous l\'allumez. La seule autre manière de déchiffrer cette dernière consiste à rétablir les paramètres par défaut, ce qui entraîne la suppression de l\'ensemble de vos données.\n\nLa procédure de chiffrement dure au moins une heure. La pile de la tablette doit être chargée au départ, et la tablette doit rester branchée pendant tout le processus. Toute interruption entraîne la perte d\'une partie ou de la totalité des données."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"Vous pouvez chiffrer vos comptes, vos paramètres, les applications téléchargées et les données associées, les contenus multimédias et d\'autres fichiers. Si vous avez chiffré votre téléphone en définissant un verrouillage d\'écran (au moyen d\'un schéma, d\'un NIP ou d\'un mot de passe), vous devez déverrouiller l\'écran pour déchiffrer le téléphone à chaque fois que vous l\'allumez. La seule autre manière de déchiffrer ce dernier consiste à rétablir les paramètres par défaut, ce qui entraîne la suppression de l\'ensemble de vos données.\n\nLa procédure de chiffrement dure au moins une heure. La pile du téléphone doit être chargée au départ, et le téléphone doit rester branché pendant tout le processus. Toute interruption entraîne la perte d\'une partie ou de la totalité des données."</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"Chiffrer la tablette"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"Chiffrer le téléphone"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"Veuillez charger votre batterie, puis réessayer."</string>
-    <string name="crypt_keeper_unplugged_text" msgid="2709721134148651329">"Veuillez brancher votre chargeur, puis réessayer."</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="1847280235529858357">"Aucun NIP ni mot de passe saisi pour le verrouillage de l\'écran"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="7210616262954236042">"Vous devez définir un NIP ou un mot de passe pour le verrouillage de l\'écran avant de lancer le chiffrement."</string>
-    <string name="crypt_keeper_confirm_title" msgid="8600000209722452230">"Chiffrer?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="3270587498436152259">"Le chiffrement est irréversible, et toute interruption du processus peut entraîner la perte de données. L\'opération peut prendre une heure, voire plus, au cours de laquelle la tablette sera redémarrée à plusieurs reprises."</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="3040428543349852419">"Le chiffrement est irréversible, et toute interruption du processus peut entraîner la perte de données. L\'opération peut prendre une heure, voire plus, au cours de laquelle le téléphone sera redémarré à plusieurs reprises."</string>
-    <string name="crypt_keeper_setup_title" msgid="3339725741305796680">"Chiffrement en cours"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="4417016995091289019">"Veuillez patienter pendant le chiffrement de votre tablette. <xliff:g id="PERCENT">^1</xliff:g> % effectué(s)."</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="7902355422499500352">"Veuillez patienter pendant le chiffrement de votre téléphone. <xliff:g id="PERCENT">^1</xliff:g> % effectué(s)."</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="8348188415839917821">"Veuillez patienter pendant le chiffrement de votre tablette. Temps restant : <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="8556105766597855198">"Veuillez patienter pendant le chiffrement de votre téléphone. Temps restant : <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="3832496715430327682">"Pour déverrouiller votre tablette, redémarrez-la."</string>
-    <string name="crypt_keeper_force_power_cycle" product="default" msgid="5070346039522135361">"Pour déverrouiller votre téléphone, redémarrez-le."</string>
-    <string name="crypt_keeper_warn_wipe" msgid="8104921337301750394">"Attention : Les données de votre appareil seront effacées si vous effectuez encore <xliff:g id="COUNT">^1</xliff:g> tentatives de déverrouillage infructueuses."</string>
-    <string name="crypt_keeper_enter_password" msgid="1274917431075529732">"Saisissez votre mot de passe."</string>
-    <string name="crypt_keeper_failed_title" msgid="8173654570682244149">"Échec du chiffrement"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"Impossible de terminer le chiffrement, car celui-ci a été interrompu. Par conséquent, les données de votre tablette ne sont plus accessibles.\n\nPour continuer d\'utiliser votre tablette, vous devez rétablir les paramètres par défaut. Une fois cette opération terminée, vous pourrez restaurer toutes les données sauvegardées sur votre compte Google lors de la nouvelle configuration de votre tablette."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"Impossible de terminer le chiffrement, car celui-ci a été interrompu. Par conséquent, les données de votre téléphone ne sont plus accessibles.\n\nPour continuer d\'utiliser votre téléphone, vous devez rétablir les paramètres par défaut. Une fois cette opération terminée, vous pourrez restaurer toutes les données sauvegardées sur votre compte Google lors de la nouvelle configuration de votre téléphone."</string>
-    <string name="crypt_keeper_data_corrupt_title" msgid="5920153462176846037">"Échec du déchiffrement"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"Le mot de passe entré est correct. Malheureusement, vos données sont corrompues.\n\nPour continuer d\'utiliser votre tablette, vous devez rétablir ses paramètres par défaut. Une fois cette opération terminée, vous pourrez restaurer toutes les données que vous aviez sauvegardées dans votre compte Google lors de la nouvelle configuration de votre tablette."</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"Le mot de passe entré est correct. Malheureusement, vos données sont corrompues.\n\nPour continuer d\'utiliser votre téléphone, vous devez rétablir ses paramètres par défaut. Une fois cette opération terminée, vous pourrez restaurer toutes les données que vous aviez sauvegardées dans votre compte Google lors de la nouvelle configuration de votre téléphone."</string>
-    <string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"Changer le mode de saisie"</string>
+    <string name="encryption_settings_title" msgid="2848716008695618360">"Chiffrement"</string>
+    <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"Chiffrer la tablette"</string>
+    <string name="encrypt_title" product="default" msgid="7337365190988321100">"Chiffrer le téléphone"</string>
+    <string name="encrypted_summary" msgid="545623487587251207">"Chiffré"</string>
     <string name="suggested_lock_settings_title" msgid="7836065447159730217">"Sécurisez votre téléphone"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"Définir un verr. de l\'écran pour protéger la tablette"</string>
     <string name="suggested_lock_settings_summary" product="device" msgid="8479766049078378225">"Définir un verr. de l\'écran pour protéger l\'appareil"</string>
@@ -817,6 +791,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Vous devrez peut-être également saisir ce NIP sur l\'autre appareil."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Vous devrez peut-être également saisir ce mot de passe sur l\'autre appareil."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Pour associer votre appareil à :&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Assurez-vous que le mot de passe &lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt; s\'affiche."</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Confirmez pour effectuer l\'association avec l\'ensemble coordonné"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"De :&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Associer à cet appareil?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Pour l\'association à :<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Saisissez <xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, puis appuyez sur « Retour » ou sur « Entrée »."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Autoriser l\'accès à vos contacts et à l\'historique des appels"</string>
@@ -850,6 +825,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Échec de la connexion. Réessayez."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Détails de l\'appareil"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Adresse Bluetooth de l\'appareil : <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Adresse Bluetooth de l\'appareil :\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Oublier l\'appareil?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Retirer l\'association"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Déconnecter l\'application?"</string>
@@ -881,6 +857,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Mémoriser ces paramètres"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Maximum d\'appareils audio Bluetooth connectés"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Sélectionnez le nombre maximal d\'appareils Bluetooth connectés"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"Journal de débogage de la pile de la CCP"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Accroître le niveau de journalisation de la pile de la CCP"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Cast"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"miroir"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Activer l\'affichage sans fil"</string>
@@ -1188,6 +1166,8 @@
     <string name="wifi_hotspot_maximize_compatibility_dual_ap_summary" msgid="3579549223159056533">"Aide d\'autres appareils à détecter ce point d\'accès. Cette fonction sollicite davantage la pile de l\'appareil."</string>
     <string name="wifi_tether_starting" msgid="8879874184033857814">"Activation du point d\'accès Wi-Fi en cours…"</string>
     <string name="wifi_tether_stopping" msgid="4416492968019409188">"Désactivation du point d\'accès Wi-Fi en cours…"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_title" msgid="3089432578433978073">"Le partage de connexion n\'est pas pris en charge"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_content" msgid="5920421547607921112">"Communiquez avec votre fournisseur de services pour en savoir plus"</string>
     <string name="wifi_tether_enabled_subtext" msgid="5085002421099821056">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> est actif"</string>
     <string name="wifi_tether_failed_subtext" msgid="437190628041885500">"Erreur liée au point d\'accès Wi-Fi mobile."</string>
     <string name="wifi_tether_configure_ap_text" msgid="7072559431286459122">"Configurer le point d\'accès Wi-Fi"</string>
@@ -2465,8 +2445,8 @@
     <string name="reduce_bright_colors_switch_title" msgid="1751678397884065312">"Activer la réduction suppl. de la luminosité"</string>
     <string name="reduce_bright_colors_shortcut_title" msgid="495648157059202745">"Raccourci de la réduction supplémentaire de la luminosité"</string>
     <string name="reduce_bright_colors_about_title" msgid="503655452544934393">"Réduction supplémentaire de la luminosité"</string>
-    <string name="reduce_bright_colors_preference_summary" product="default" msgid="7878756844769221647">"Assombrir l\'écran de votre téléphone au-delà de sa luminosité minimale"</string>
-    <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="8959794720356934888">"Assombrir l\'écran de votre tablette au-delà de sa luminosité minimale"</string>
+    <string name="reduce_bright_colors_preference_summary" product="default" msgid="7878756844769221647">"Assombrissez l\'écran de votre téléphone au-delà de sa luminosité minimale"</string>
+    <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="8959794720356934888">"Assombrissez l\'écran de votre tablette au-delà de sa luminosité minimale"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="1061317523242240222">"Rendez l\'écran plus sombre pour qu\'il soit plus facile à lire.&lt;br/&gt;&lt;br/&gt; Cela peut être pratique dans certains cas : &lt;ol&gt; &lt;li&gt; La luminosité minimale par défaut de votre téléphone est quand même trop intense&lt;/li&gt; &lt;li&gt; Vous utilisez votre téléphone dans un environnement sombre, comme la nuit ou dans une salle sombre avant d\'aller vous coucher&lt;/li&gt; &lt;/ol&gt;"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="tablet" msgid="7839714100830254580">"Assombrissez votre écran pour qu\'il soit plus facile à lire.&lt;br/&gt;&lt;br/&gt; Cela peut être pratique dans certains cas : &lt;ol&gt; &lt;li&gt; La luminosité minimale par défaut de votre tablette est quand même trop intense&lt;/li&gt; &lt;li&gt; Vous utilisez votre tablette dans un environnement sombre, comme la nuit ou dans une salle sombre avant d\'aller vous coucher&lt;/li&gt; &lt;/ol&gt;"</string>
     <string name="reduce_bright_colors_intensity_preference_title" msgid="7455443033955118267">"Intensité"</string>
@@ -2534,11 +2514,6 @@
     <string name="enable_service_title" msgid="7231533866953706788">"Permettre à <xliff:g id="SERVICE">%1$s</xliff:g> de commander complètement votre appareil?"</string>
     <string name="capabilities_list_title" msgid="1225853611983394386">"<xliff:g id="SERVICE">%1$s</xliff:g> doit pouvoir :"</string>
     <string name="touch_filtered_warning" msgid="4225815157460318241">"Une application obscurcit une demande d\'autorisation, alors Paramètres ne peut pas vérifier votre réponse."</string>
-    <string name="enable_service_encryption_warning" msgid="931082737770453755">"Si vous activez <xliff:g id="SERVICE">%1$s</xliff:g>, votre appareil n\'utilisera pas le verrouillage de l\'écran pour améliorer le chiffrement des données."</string>
-    <string name="secure_lock_encryption_warning" msgid="669152607190123579">"Vous avez activé un service d\'accessibilité. Votre appareil n\'utilisera donc pas le verrouillage de l\'écran pour améliorer le chiffrement des données."</string>
-    <string name="enable_service_pattern_reason" msgid="6832846117817938536">"Étant donné que l\'activation du service <xliff:g id="SERVICE">%1$s</xliff:g> touche le chiffrement de données, vous devez confirmer votre schéma."</string>
-    <string name="enable_service_pin_reason" msgid="6040417014360237703">"Étant donné que l\'activation du service <xliff:g id="SERVICE">%1$s</xliff:g> touche le chiffrement de données, vous devez confirmer votre NIP."</string>
-    <string name="enable_service_password_reason" msgid="6962544350351734238">"Étant donné que l\'activation du service <xliff:g id="SERVICE">%1$s</xliff:g> touche le chiffrement de données, vous devez confirmer votre mot de passe."</string>
     <string name="accessibility_service_warning" msgid="6779187188736432618">"<xliff:g id="SERVICE">%1$s</xliff:g> demande l\'autorisation de contrôler cet appareil. Le service peut lire l\'écran et agir pour les utilisateurs qui font appels aux fonctions d\'accessibilité. Ce niveau de contrôle ne convient pas à la majorité des applications."</string>
     <string name="accessibility_service_warning_description" msgid="6573203795976134751">"Le contrôle total convient aux applications qui répondent à vos besoins d\'accessibilité. Il ne convient pas à la plupart des applications."</string>
     <string name="accessibility_service_screen_control_title" msgid="324795030658109870">"Afficher et commander l\'écran"</string>
@@ -3103,14 +3078,6 @@
     <string name="remove_account_failed" msgid="3709502163548900644">"Cette modification n\'est pas autorisée par votre administrateur"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"Impossible de procéder à la synchronisation manuelle."</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"La synchronisation de cet élément est actuellement désactivée. Pour modifier ce paramètre, activez temporairement les données en arrière-plan et la synchronisation automatique."</string>
-    <string name="enter_password" msgid="6327051330258595331">"Pour lancer Android, entrez votre mot de passe"</string>
-    <string name="enter_pin" msgid="1029287617551232681">"Pour lancer Android, entrez votre NIP"</string>
-    <string name="enter_pattern" msgid="1747316785866742960">"Pour lancer Android, dessinez votre schéma."</string>
-    <string name="cryptkeeper_wrong_pattern" msgid="340747269176120242">"Schéma erroné"</string>
-    <string name="cryptkeeper_wrong_password" msgid="7295607881887114486">"Mot de passe incorrect"</string>
-    <string name="cryptkeeper_wrong_pin" msgid="2347961593970714201">"NIP erroné"</string>
-    <string name="checking_decryption" msgid="6111642972615688237">"Vérification en cours…"</string>
-    <string name="starting_android" msgid="6694154070215356186">"Démarrage d\'Android en cours..."</string>
     <string name="delete" msgid="8330605554706263775">"Supprimer"</string>
     <string name="misc_files" msgid="6598066985800749585">"Fichiers divers"</string>
     <string name="misc_files_selected_count" msgid="5597802791672749532">"<xliff:g id="NUMBER">%1$d</xliff:g> fichiers sélectionnés sur <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -3206,8 +3173,6 @@
     <string name="data_usage_metered_yes" msgid="4262598072030135223">"Facturé à l\'usage"</string>
     <string name="data_usage_metered_no" msgid="1685828958417926268">"Non mesuré"</string>
     <string name="data_usage_disclaimer" msgid="3271450299386176770">"Le suivi de consommation du fournisseur de service peut différer de celui de l\'appareil."</string>
-    <string name="cryptkeeper_emergency_call" msgid="8369322820475703306">"Appel d\'urgence"</string>
-    <string name="cryptkeeper_return_to_call" msgid="3857250752781151232">"Retour à l\'appel"</string>
     <string name="vpn_name" msgid="3806456074909253262">"Nom"</string>
     <string name="vpn_type" msgid="5533202873260826663">"Type"</string>
     <string name="vpn_server" msgid="2908816134941973935">"Adresse du serveur"</string>
@@ -4758,14 +4723,12 @@
     <string name="display_cutout_emulation_keywords" msgid="4506580703807358127">"découpe d\'affichage, encoche"</string>
     <string name="overlay_option_device_default" msgid="7986355499809313848">"Valeurs par défaut de l\'appareil"</string>
     <string name="overlay_toast_failed_to_apply" msgid="4839587811338164960">"Impossible d\'appliquer la superposition"</string>
-    <string name="special_access" msgid="1767980727423395147">"Accès spéciaux aux applis"</string>
+    <string name="special_access" msgid="1767980727423395147">"Accès spécial des applis"</string>
     <plurals name="special_access_summary" formatted="false" msgid="4995506406763570815">
       <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> application peut utiliser les données sans restriction</item>
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> applications peuvent utiliser les données sans restriction</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"En voir plus"</string>
-    <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"Voulez-vous vraiment effacer les données des utilisateurs et chiffrer les fichiers?"</string>
-    <string name="button_confirm_convert_fbe" msgid="339648921918438106">"Effacer et convertir"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"Réinitialiser la limitation de fréquence ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"La limitation de fréquence ShortcutManager a été réinitialisée"</string>
     <string name="notification_suggestion_title" msgid="6309263655965785411">"Gérer les données sur l\'écran de verrouillage"</string>
@@ -5292,6 +5255,7 @@
     <string name="sim_action_yes" msgid="8076556020131395515">"Oui"</string>
     <string name="sim_action_reboot" msgid="3508948833333441538">"Redémarrer"</string>
     <string name="sim_action_no_thanks" msgid="435717748384544195">"Non merci"</string>
+    <string name="sim_action_cancel" msgid="2668099867029610910">"Annuler"</string>
     <string name="sim_switch_button" msgid="1405772571706095387">"Changer"</string>
     <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Impossible d\'activer la carte SIM"</string>
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Retirez la carte SIM, puis réinsérez-la. Si le problème persiste, redémarrez votre appareil."</string>
@@ -5444,6 +5408,10 @@
     <string name="cached_apps_freezer" msgid="1057519579761550350">"Suspendre l\'exécution pour les applications en cache"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"Autoriser les superpos. d\'écran pour les paramètres"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Autorisez les applications qui peuvent se superposer à d\'autres à afficher du contenu par-dessus les écrans des paramètres"</string>
+    <!-- no translation found for allow_mock_modem (3832264806530479214) -->
+    <skip />
+    <!-- no translation found for allow_mock_modem_summary (9097416612748005374) -->
+    <skip />
     <string name="media_controls_title" msgid="403271085636252597">"Commandes multimédias"</string>
     <string name="media_controls_resume_title" msgid="855076860336652370">"Épingler le lecteur multimédia"</string>
     <string name="media_controls_resume_description" msgid="3163482266454802097">"Pour que vous puissiez reprendre rapidement la lecture, le lecteur multimédia reste ouvert dans Paramètres rapides"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 7045615..7779ed5 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -142,10 +142,11 @@
     <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"Autoriser l\'appareil à communiquer avec les appareils Bluetooth à proximité"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"Autoriser le téléphone à communiquer avec les appareils Bluetooth à proximité"</string>
     <string name="bluetooth_disable_a2dp_hw_offload" msgid="5942913792817797541">"Désactiver le déchargement Bluetooth A2DP"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="8610420176339657720">"Redémarrer ?"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8333029144800835996">"Vous devez redémarrer l\'appareil pour modifier ce paramètre."</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="3488695418187553566">"Redémarrer"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="4930826928585464191">"Annuler"</string>
+    <string name="bluetooth_disable_le_audio_hw_offload" msgid="3966022676505972908">"Désactiver le déchargement du matériel Bluetooth LE AUDIO"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_title" msgid="6001142380445276918">"Redémarrer l\'appareil ?"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_message" msgid="1524373895333698779">"Vous devez redémarrer l\'appareil pour modifier ce paramètre."</string>
+    <string name="bluetooth_disable_hw_offload_dialog_confirm" msgid="5594859658551707592">"Redémarrer"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel" msgid="3663690305043973720">"Annuler"</string>
     <string name="connected_device_media_device_title" msgid="3783388247594566734">"Périphériques multimédias"</string>
     <string name="connected_device_call_device_title" msgid="88732390601723608">"Appareils servant pour les appels"</string>
     <string name="connected_device_other_device_title" msgid="4652120430615729193">"Autres appareils"</string>
@@ -309,9 +310,9 @@
     <string name="security_settings_title" msgid="6710768415432791970">"Sécurité"</string>
     <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"Chiffrement et identifiants"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"Téléphone chiffré"</string>
-    <string name="decryption_settings_summary" product="default" msgid="1742645256103613503">"Téléphone non chiffré"</string>
+    <string name="not_encrypted_summary" product="default" msgid="2251945842585788254">"Téléphone non chiffré"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"Appareil chiffré"</string>
-    <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"Appareil non chiffré"</string>
+    <string name="not_encrypted_summary" product="tablet" msgid="2374263654698719382">"Appareil non chiffré"</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"Écran de verrouillage"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"Ce qui doit s\'afficher"</string>
     <string name="security_settings_summary" msgid="1627059516127354233">"Définir les paramètres de l\'option Ma position et de verrouillage"</string>
@@ -480,7 +481,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"Supprimer"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"Posez le doigt sur le lecteur"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"Posez le doigt sur le lecteur et levez-le quand il vibre"</string>
-    <string name="security_settings_udfps_enroll_start_message" msgid="5032954588171487566">"Maintenez votre empreinte à plat sur le lecteur jusqu\'à ce qu\'il vibre"</string>
+    <string name="security_settings_udfps_enroll_start_message" msgid="5032954588171487566">"Maintenez votre doigt à plat sur le lecteur jusqu\'à ce que vous sentiez une vibration"</string>
     <string name="security_settings_fingerprint_enroll_udfps_title" msgid="6665610134560896895">"Appuyer de manière prolongée sur le lecteur d\'empreinte"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"Levez le doigt, puis reposez-le"</string>
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"Encore une fois"</string>
@@ -488,7 +489,7 @@
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Continuez jusqu\'à ce que toutes les parties de votre empreinte soient lues"</string>
     <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"Appuyez de manière prolongée chaque fois que l\'icône de l\'empreinte bouge. Cela permet de mieux capturer votre empreinte."</string>
     <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"Placez le bout de votre doigt sur le capteur"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="6137605344819152477">"Pour finir, utilisez les bords de votre doigt"</string>
+    <string name="security_settings_udfps_enroll_edge_title" msgid="6137605344819152477">"Pour finir, faites rouler votre doigt de chaque côté"</string>
     <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"Placez le côté de votre empreinte sur le capteur, maintenez-le, puis passez à l\'autre côté"</string>
     <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"Cela permet de mieux capturer votre empreinte"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Enregistrement de l\'empreinte digitale à <xliff:g id="PERCENTAGE">%d</xliff:g> pour cent"</string>
@@ -568,37 +569,10 @@
     <string name="fingerprint_last_delete_message" msgid="7860374760549404410">"Vous ne pourrez pas utiliser votre empreinte digitale pour déverrouiller votre téléphone ni pour confirmer votre identité dans les applis."</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="4104208067277655068">"Vous ne pourrez pas utiliser votre empreinte digitale pour déverrouiller votre profil professionnel, autoriser des achats ni vous connecter à des applis professionnelles."</string>
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"Oui, supprimer"</string>
-    <string name="crypt_keeper_settings_title" msgid="4938812137822100044">"Chiffrement"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"Chiffrer la tablette"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"Chiffrer le téléphone"</string>
-    <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"Chiffré"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"Vous pouvez chiffrer l\'ensemble de vos données : vos comptes, paramètres, applications et tout autre fichier. Si vous avez activé le verrouillage d\'écran (avec un schéma, un code ou un mot de passe), vous devez déverrouiller l\'écran pour déchiffrer la tablette chaque fois que vous l\'allumez. La seule autre manière de déchiffrer cette dernière consiste à rétablir la configuration d\'usine, ce qui entraîne la suppression de l\'ensemble de vos données.\n\nLa procédure de chiffrement dure au moins une heure. La batterie de la tablette doit être chargée au départ, et la tablette doit rester branchée pendant tout le processus. Toute interruption entraîne la perte d\'une partie ou de la totalité des données."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"Vous pouvez chiffrer l\'ensemble de vos données : vos comptes, paramètres, applications et tout autre fichier. Si vous avez activé le verrouillage d\'écran (avec un schéma, un code ou un mot de passe), vous devez déverrouiller l\'écran pour déchiffrer le téléphone chaque fois que vous l\'allumez. La seule autre manière de déchiffrer ce dernier consiste à rétablir la configuration d\'usine, ce qui entraîne la suppression de l\'ensemble de vos données.\n\nLa procédure de chiffrement dure au moins une heure. La batterie du téléphone doit être chargée au départ, et le téléphone doit rester branché pendant tout le processus. Toute interruption entraîne la perte d\'une partie ou de la totalité des données."</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"Chiffrer la tablette"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"Chiffrer le téléphone"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"Veuillez charger votre batterie, puis réessayer."</string>
-    <string name="crypt_keeper_unplugged_text" msgid="2709721134148651329">"Veuillez brancher votre chargeur, puis réessayer."</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="1847280235529858357">"Aucun code PIN ni mot de passe saisi pour le verrouillage de l\'écran"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="7210616262954236042">"Vous devez définir un code ou un mot de passe pour le verrouillage de l\'écran avant de lancer le chiffrement."</string>
-    <string name="crypt_keeper_confirm_title" msgid="8600000209722452230">"Chiffrer ?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="3270587498436152259">"Le chiffrement est irréversible, et toute interruption du processus peut entraîner la perte de données. L\'opération peut prendre une heure, voire plus, au cours de laquelle la tablette sera redémarrée à plusieurs reprises."</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="3040428543349852419">"Le chiffrement est irréversible, et toute interruption du processus peut entraîner la perte de données. L\'opération peut prendre une heure, voire plus, au cours de laquelle le téléphone sera redémarré à plusieurs reprises."</string>
-    <string name="crypt_keeper_setup_title" msgid="3339725741305796680">"Chiffrement en cours"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="4417016995091289019">"Veuillez patienter pendant le chiffrement de votre tablette. <xliff:g id="PERCENT">^1</xliff:g> % effectué(s)."</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="7902355422499500352">"Veuillez patienter pendant le chiffrement de votre téléphone. <xliff:g id="PERCENT">^1</xliff:g> % effectué(s)."</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="8348188415839917821">"Veuillez patienter pendant le chiffrement de votre tablette. Temps restant : <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="8556105766597855198">"Veuillez patienter pendant le chiffrement de votre téléphone. Temps restant : <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="3832496715430327682">"Pour déverrouiller votre tablette, éteignez-la, puis rallumez-la."</string>
-    <string name="crypt_keeper_force_power_cycle" product="default" msgid="5070346039522135361">"Pour déverrouiller votre téléphone, éteignez-le, puis rallumez-le."</string>
-    <string name="crypt_keeper_warn_wipe" msgid="8104921337301750394">"Attention : Les données de votre appareil seront effacées si vous effectuez encore <xliff:g id="COUNT">^1</xliff:g> tentatives de déverrouillage infructueuses."</string>
-    <string name="crypt_keeper_enter_password" msgid="1274917431075529732">"Saisissez votre mot de passe."</string>
-    <string name="crypt_keeper_failed_title" msgid="8173654570682244149">"Échec du chiffrement"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"Impossible de terminer le chiffrement, car celui-ci a été interrompu. Par conséquent, les données de votre tablette ne sont plus accessibles.\n\nPour continuer d\'utiliser votre tablette, vous devez rétablir la configuration d\'usine. Une fois cette opération terminée, vous pourrez restaurer toutes les données sauvegardées sur votre compte Google lors de la nouvelle configuration de votre tablette."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"Impossible de terminer le chiffrement, car celui-ci a été interrompu. Par conséquent, les données de votre téléphone ne sont plus accessibles.\n\nPour continuer d\'utiliser votre téléphone, vous devez rétablir la configuration d\'usine. Une fois cette opération terminée, vous pourrez restaurer toutes les données sauvegardées sur votre compte Google lors de la nouvelle configuration de votre téléphone."</string>
-    <string name="crypt_keeper_data_corrupt_title" msgid="5920153462176846037">"Échec du déchiffrement"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"Le mot de passe saisi est correct. Malheureusement, vos données sont corrompues. \n\nPour continuer d\'utiliser votre tablette, vous devez rétablir sa configuration d\'usine. Une fois cette opération terminée, vous pourrez restaurer toutes les données que vous aviez sauvegardées dans votre compte Google lors de la nouvelle configuration de votre tablette."</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"Le mot de passe saisi est correct. Malheureusement, vos données sont corrompues. \n\nPour continuer d\'utiliser votre téléphone, vous devez rétablir sa configuration d\'usine. Une fois cette opération terminée, vous pourrez restaurer toutes les données que vous aviez sauvegardées dans votre compte Google lors de la nouvelle configuration de votre téléphone."</string>
-    <string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"Changer le mode de saisie"</string>
+    <string name="encryption_settings_title" msgid="2848716008695618360">"Chiffrement"</string>
+    <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"Chiffrer la tablette"</string>
+    <string name="encrypt_title" product="default" msgid="7337365190988321100">"Chiffrer le téléphone"</string>
+    <string name="encrypted_summary" msgid="545623487587251207">"Chiffré"</string>
     <string name="suggested_lock_settings_title" msgid="7836065447159730217">"Sécuriser votre téléphone"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"Définissez verrouillage écran pour protéger tablette"</string>
     <string name="suggested_lock_settings_summary" product="device" msgid="8479766049078378225">"Définissez verrouillage écran pour protéger appareil"</string>
@@ -817,6 +791,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Vous devrez peut-être également saisir ce code sur l\'autre appareil."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Vous devrez peut-être également saisir ce mot de passe sur l\'autre appareil."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Pour associer votre appareil à :&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Assurez-vous que le mot de passe &lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt; s\'affiche."</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Confirmez pour associer à l\'ensemble coordonné"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"De :&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Associer à cet appareil ?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Pour l\'association à :<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Saisissez <xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, puis appuyez sur \"Retour\" ou sur \"Entrée\"."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Autoriser l\'accès à vos contacts et à l\'historique des appels"</string>
@@ -850,6 +825,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Impossible de se connecter. Réessayez."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Infos sur l\'appareil"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Adresse Bluetooth de l\'appareil : <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Adresse Bluetooth de l\'appareil :\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Oublier l\'appareil ?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Supprimer l\'association"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Dissocier l\'appli ?"</string>
@@ -881,6 +857,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Mémoriser ces paramètres"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Nombre maximal d\'appareils audio Bluetooth connectés"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Sélectionner le nombre maximal d\'appareils audio Bluetooth connectés"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"Journal de débogage des piles NFC"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Accroître le niveau de journalisation des piles NFC"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Cast"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"duplication d\'écran"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Activer l\'affichage sans fil"</string>
@@ -1188,6 +1166,8 @@
     <string name="wifi_hotspot_maximize_compatibility_dual_ap_summary" msgid="3579549223159056533">"Aide d\'autres appareils à détecter ce point d\'accès. Accroît l\'utilisation de la batterie."</string>
     <string name="wifi_tether_starting" msgid="8879874184033857814">"Activation du point d\'accès Wi-Fi en cours…"</string>
     <string name="wifi_tether_stopping" msgid="4416492968019409188">"Désactivation du point d\'accès Wi-Fi en cours…"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_title" msgid="3089432578433978073">"Partage de connexion non disponible"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_content" msgid="5920421547607921112">"Contactez votre opérateur pour en savoir plus"</string>
     <string name="wifi_tether_enabled_subtext" msgid="5085002421099821056">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> est actif"</string>
     <string name="wifi_tether_failed_subtext" msgid="437190628041885500">"Erreur liée au point d\'accès Wi-Fi mobile."</string>
     <string name="wifi_tether_configure_ap_text" msgid="7072559431286459122">"Configurer le point d\'accès Wi-Fi"</string>
@@ -1505,7 +1485,7 @@
     <string name="status_msid_number" msgid="3871958248824595774">"MSID"</string>
     <string name="status_prl_version" msgid="9002131357502714281">"Version de la liste d\'itinérance préférée"</string>
     <string name="meid_multi_sim" msgid="7645394486193991388">"MEID (emplacement SIM %1$d)"</string>
-    <string name="scanning_status_text_on" msgid="3846571210578042940">"Activé"</string>
+    <string name="scanning_status_text_on" msgid="3846571210578042940">"Activée"</string>
     <string name="scanning_status_text_off" msgid="4002352668313705132">"Désactivée"</string>
     <string name="scanning_status_text_wifi_on_ble_on" msgid="7644609329607744714">"Les recherches Wi‑Fi et Bluetooth sont activées"</string>
     <string name="scanning_status_text_wifi_on_ble_off" msgid="7215007787287418186">"La recherche Wi‑Fi est activée, mais pas la recherche Bluetooth"</string>
@@ -2534,11 +2514,6 @@
     <string name="enable_service_title" msgid="7231533866953706788">"Accorder le contrôle total de votre appareil à <xliff:g id="SERVICE">%1$s</xliff:g> ?"</string>
     <string name="capabilities_list_title" msgid="1225853611983394386">"<xliff:g id="SERVICE">%1$s</xliff:g> doit pouvoir :"</string>
     <string name="touch_filtered_warning" msgid="4225815157460318241">"Une application masque la demande d\'autorisation. Impossible de valider votre réponse via l\'application Paramètres."</string>
-    <string name="enable_service_encryption_warning" msgid="931082737770453755">"Si vous activez <xliff:g id="SERVICE">%1$s</xliff:g>, votre appareil n\'utilisera pas le verrouillage de l\'écran pour améliorer le chiffrement des données."</string>
-    <string name="secure_lock_encryption_warning" msgid="669152607190123579">"Vous avez activé un service d\'accessibilité. Votre appareil n\'utilisera donc pas le verrouillage de l\'écran pour améliorer le chiffrement des données."</string>
-    <string name="enable_service_pattern_reason" msgid="6832846117817938536">"Vous devez confirmer le schéma, car l\'activation du service <xliff:g id="SERVICE">%1$s</xliff:g> influe sur le chiffrement des données."</string>
-    <string name="enable_service_pin_reason" msgid="6040417014360237703">"Vous devez confirmer le code PIN, car l\'activation du service <xliff:g id="SERVICE">%1$s</xliff:g> influe sur le chiffrement des données."</string>
-    <string name="enable_service_password_reason" msgid="6962544350351734238">"Vous devez confirmer le mot de passe, car l\'activation du service <xliff:g id="SERVICE">%1$s</xliff:g> influe sur le chiffrement des données."</string>
     <string name="accessibility_service_warning" msgid="6779187188736432618">"<xliff:g id="SERVICE">%1$s</xliff:g> demande le contrôle total de cet appareil. Le service peut lire l\'écran et agir pour le compte des utilisateurs ayant des besoins en matière d\'accessibilité. Ce niveau de contrôle n\'est pas approprié pour la plupart des applications."</string>
     <string name="accessibility_service_warning_description" msgid="6573203795976134751">"Le contrôle total convient aux applications qui répondent à vos besoins d\'accessibilité. Il ne convient pas à la plupart des applications."</string>
     <string name="accessibility_service_screen_control_title" msgid="324795030658109870">"Afficher et contrôler l\'écran"</string>
@@ -3103,14 +3078,6 @@
     <string name="remove_account_failed" msgid="3709502163548900644">"Votre administrateur n\'autorise pas cette modification"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"Impossible de procéder à la synchronisation manuelle."</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"La synchronisation de cet élément est actuellement désactivée. Pour modifier ce paramètre, activez temporairement les données en arrière-plan et la synchronisation automatique."</string>
-    <string name="enter_password" msgid="6327051330258595331">"Pour lancer Android, saisissez votre mot de passe."</string>
-    <string name="enter_pin" msgid="1029287617551232681">"Pour lancer Android, saisissez votre code PIN."</string>
-    <string name="enter_pattern" msgid="1747316785866742960">"Pour lancer Android, dessinez votre schéma."</string>
-    <string name="cryptkeeper_wrong_pattern" msgid="340747269176120242">"Schéma incorrect"</string>
-    <string name="cryptkeeper_wrong_password" msgid="7295607881887114486">"Mot de passe erroné."</string>
-    <string name="cryptkeeper_wrong_pin" msgid="2347961593970714201">"Code PIN erroné."</string>
-    <string name="checking_decryption" msgid="6111642972615688237">"Vérification en cours…"</string>
-    <string name="starting_android" msgid="6694154070215356186">"Lancement d\'Android en cours…"</string>
     <string name="delete" msgid="8330605554706263775">"Supprimer"</string>
     <string name="misc_files" msgid="6598066985800749585">"Fichiers divers"</string>
     <string name="misc_files_selected_count" msgid="5597802791672749532">"<xliff:g id="NUMBER">%1$d</xliff:g> fichiers sélectionnés sur <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -3206,8 +3173,6 @@
     <string name="data_usage_metered_yes" msgid="4262598072030135223">"Facturé à l\'usage"</string>
     <string name="data_usage_metered_no" msgid="1685828958417926268">"Non facturé à l\'usage"</string>
     <string name="data_usage_disclaimer" msgid="3271450299386176770">"Le suivi de conso effectué par l\'opérateur peut différer de celui de l\'appareil."</string>
-    <string name="cryptkeeper_emergency_call" msgid="8369322820475703306">"Appel d\'urgence"</string>
-    <string name="cryptkeeper_return_to_call" msgid="3857250752781151232">"Retour à l\'appel"</string>
     <string name="vpn_name" msgid="3806456074909253262">"Nom"</string>
     <string name="vpn_type" msgid="5533202873260826663">"Type"</string>
     <string name="vpn_server" msgid="2908816134941973935">"Adresse du serveur"</string>
@@ -3637,7 +3602,7 @@
     <string name="vibrate_when_ringing_option_always_vibrate" msgid="968652667232075466">"Toujours déclencher le vibreur"</string>
     <string name="vibrate_when_ringing_option_ramping_ringer" msgid="2798848945803840348">"Vibreur, puis sonnerie progressive"</string>
     <string name="other_sound_settings" msgid="5468360269346162072">"Autres sons"</string>
-    <string name="spatial_audio_title" msgid="6591051622375191603">"Son spatialisé"</string>
+    <string name="spatial_audio_title" msgid="6591051622375191603">"Son spatial"</string>
     <string name="dial_pad_tones_title" msgid="3536945335367914892">"Sons du clavier"</string>
     <string name="screen_locking_sounds_title" msgid="5695030983872787321">"Son du verrouillage de l\'écran"</string>
     <string name="charging_sounds_title" msgid="5261683808537783668">"Sons et vibration de recharge"</string>
@@ -3789,9 +3754,9 @@
     <string name="notification_history" msgid="8663811361243456201">"Historique des notifications"</string>
     <string name="notification_history_toggle" msgid="9093762294928569030">"Utiliser l\'historique des notifications"</string>
     <string name="notification_history_off_title_extended" msgid="853807652537281601">"L\'historique des notifications est désactivé"</string>
-    <string name="notification_history_off_summary" msgid="671359587084797617">"Activez l\'historique des notifications pour voir les notifications récentes et répétées"</string>
+    <string name="notification_history_off_summary" msgid="671359587084797617">"Activez l\'historique des notifications pour voir les notifications récentes et en attente"</string>
     <string name="history_toggled_on_title" msgid="4518001110492652830">"Aucune notification récente"</string>
-    <string name="history_toggled_on_summary" msgid="9034278971358282728">"Les notifications récentes et répétées s\'afficheront ici"</string>
+    <string name="history_toggled_on_summary" msgid="9034278971358282728">"Les notifications récentes et en attente s\'afficheront ici"</string>
     <string name="notification_history_view_settings" msgid="5269317798670449002">"Afficher les paramètres de notification"</string>
     <string name="notification_history_open_notification" msgid="2655071846911258371">"Ouvrir la notification"</string>
     <string name="snooze_options_title" msgid="2109795569568344617">"Autoriser la mise en attente des notifications"</string>
@@ -4764,8 +4729,6 @@
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> applications peuvent utiliser les données sans restrictions</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"En savoir plus"</string>
-    <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"Voulez-vous vraiment effacer les données des utilisateurs et chiffrer les fichiers ?"</string>
-    <string name="button_confirm_convert_fbe" msgid="339648921918438106">"Effacer et chiffrer"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"Réinitialiser la limitation de fréquence ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"La limitation de fréquence ShortcutManager a bien été réinitialisée."</string>
     <string name="notification_suggestion_title" msgid="6309263655965785411">"Contrôler les informations sur l\'écran de verrouillage"</string>
@@ -5292,6 +5255,7 @@
     <string name="sim_action_yes" msgid="8076556020131395515">"Oui"</string>
     <string name="sim_action_reboot" msgid="3508948833333441538">"Redémarrer"</string>
     <string name="sim_action_no_thanks" msgid="435717748384544195">"Non, merci"</string>
+    <string name="sim_action_cancel" msgid="2668099867029610910">"Annuler"</string>
     <string name="sim_switch_button" msgid="1405772571706095387">"Changer"</string>
     <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Impossible d\'activer la carte SIM"</string>
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Retirez la carte SIM et insérez-la de nouveau. Si le problème persiste, redémarrez l\'appareil."</string>
@@ -5444,6 +5408,10 @@
     <string name="cached_apps_freezer" msgid="1057519579761550350">"Suspendre l\'exécution pour applis mises en cache"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"Autoriser superpositions d\'écran dans paramètres"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Autoriser les applications pouvant se superposer à d\'autres à se superposer aux écrans de paramètres"</string>
+    <!-- no translation found for allow_mock_modem (3832264806530479214) -->
+    <skip />
+    <!-- no translation found for allow_mock_modem_summary (9097416612748005374) -->
+    <skip />
     <string name="media_controls_title" msgid="403271085636252597">"Multimédia"</string>
     <string name="media_controls_resume_title" msgid="855076860336652370">"Épingler le lecteur multimédia"</string>
     <string name="media_controls_resume_description" msgid="3163482266454802097">"Pour reprendre rapidement la lecture, le lecteur multimédia reste ouvert dans les réglages rapides"</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 38b9b77..3cceaa7 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -142,10 +142,11 @@
     <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"Permite que o dispositivo se comunique cos dispositivos Bluetooth próximos"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"Permite que o teléfono se comunique cos dispositivos Bluetooth próximos"</string>
     <string name="bluetooth_disable_a2dp_hw_offload" msgid="5942913792817797541">"Desactivar alixeiram. de Bluetooth A2DP"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="8610420176339657720">"Reiniciar dispositivo?"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8333029144800835996">"Debes reiniciar o dispositivo para cambiar esta opción"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="3488695418187553566">"Reiniciar"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="4930826928585464191">"Cancelar"</string>
+    <string name="bluetooth_disable_le_audio_hw_offload" msgid="3966022676505972908">"Desactivar transferencia de hardware de transmisión de audio por Bluetooth de baixo consumo enerxético"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_title" msgid="6001142380445276918">"Queres reiniciar o dispositivo?"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_message" msgid="1524373895333698779">"Debes reiniciar o dispositivo para cambiar esta opción."</string>
+    <string name="bluetooth_disable_hw_offload_dialog_confirm" msgid="5594859658551707592">"Reiniciar"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel" msgid="3663690305043973720">"Cancelar"</string>
     <string name="connected_device_media_device_title" msgid="3783388247594566734">"Dispositivos multimedia"</string>
     <string name="connected_device_call_device_title" msgid="88732390601723608">"Dispositivos de chamada"</string>
     <string name="connected_device_other_device_title" msgid="4652120430615729193">"Outros dispositivos"</string>
@@ -309,9 +310,9 @@
     <string name="security_settings_title" msgid="6710768415432791970">"Seguranza"</string>
     <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"Encriptación e credenciais"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"Teléfono encriptado"</string>
-    <string name="decryption_settings_summary" product="default" msgid="1742645256103613503">"O teléfono non está encriptado"</string>
+    <string name="not_encrypted_summary" product="default" msgid="2251945842585788254">"O teléfono non está encriptado"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"O dispositivo está encriptado"</string>
-    <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"O dispositivo non está encriptado"</string>
+    <string name="not_encrypted_summary" product="tablet" msgid="2374263654698719382">"O dispositivo non está encriptado"</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"Pantalla de bloqueo"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"Que se debe mostrar"</string>
     <string name="security_settings_summary" msgid="1627059516127354233">"Define A miña localización, o desbloqueo da pantalla, o bloqueo da tarxeta SIM e o bloqueo do almacenamento de credenciais"</string>
@@ -407,7 +408,7 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"Configura a impresión dixital"</string>
-    <string name="security_settings_fingerprint_enroll_consent_introduction_title" msgid="2278592030102282364">"Permitir desbloqueo impresión"</string>
+    <string name="security_settings_fingerprint_enroll_consent_introduction_title" msgid="2278592030102282364">"Permitir desbloqueo dactilar"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"Usa a túa impresión dixital"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="6100563481214337377">"Utiliza a impresión dixital para desbloquear o teléfono ou verificar a túa identidade (por exemplo, cando queiras iniciar sesión nunha aplicación ou aprobar unha compra)."</string>
     <string name="security_settings_fingerprint_enroll_introduction_consent_message" msgid="1833139688278350628">"Permite que o teu fillo ou filla utilice a impresión dixital para desbloquear o teléfono ou verificar a súa identidade. Poderá usala cando queira iniciar sesión nunha aplicación, aprobar unha compra etc."</string>
@@ -427,12 +428,12 @@
     <string name="security_settings_fingerprint_v2_enroll_introduction_footer_title_1" msgid="4360262371633254407">"Importante"</string>
     <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_1" msgid="5824014348182478279">"Desbloquear o teléfono mediante impresión dixital pode ser menos seguro que facelo usando un padrón seguro ou un PIN"</string>
     <string name="security_settings_fingerprint_v2_enroll_introduction_footer_title_2" msgid="2580899232734177771">"Como funciona?"</string>
-    <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_2" msgid="5909924864816776516">"Co desbloqueo mediante impresión dixital, créase un modelo único da túa impresión para verificar a túa identidade. Se queres crear este modelo durante a configuración, debes xerar imaxes da impresión dixital desde distintas posicións."</string>
-    <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_2" msgid="3493356605815124807">"Co desbloqueo mediante impresión dixital, créase un modelo único da impresión do teu fillo ou filla para verificar a súa identidade. Para crear este modelo durante a configuración, a túa filla ou fillo deberá facer fotos da impresión dixital en distintas posicións."</string>
+    <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_2" msgid="5909924864816776516">"Co desbloqueo dactilar, créase un modelo único da túa impresión dixital para verificar a túa identidade. Se queres crear este modelo durante a configuración, debes xerar imaxes da impresión dixital desde distintas posicións."</string>
+    <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_2" msgid="3493356605815124807">"Co desbloqueo dactilar, créase un modelo único da impresión dixital do teu fillo ou filla para verificar a súa identidade. Para crear este modelo durante a configuración, a túa filla ou fillo deberá facer fotos da impresión dixital en distintas posicións."</string>
     <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_3" msgid="4729142136478078228">"Cando usas Pixel Imprint, utilízanse imaxes para actualizar o modelo da túa impresión dixital. As imaxes que se utilizan para crear o modelo de impresión dixital non se almacenan en ningún caso, pero este gárdase de maneira segura no teu teléfono e nunca sae del. Todo o procesamento ten lugar de maneira fiable no teléfono."</string>
     <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_3" msgid="5908959250804145997">"Cando usa Pixel Imprint, utilízanse imaxes para actualizar o modelo da súa impresión dixital. As imaxes que se utilizan para crear o modelo da impresión dixital do teu fillo ou filla non se almacenan en ningún caso, pero este gárdase de maneira segura no teléfono e nunca sae del. Todo o procesamento ten lugar de maneira fiable no teléfono."</string>
-    <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_4" msgid="3948305045484131665">"Podes eliminar as imaxes e o modelo da túa impresión dixital ou desactivar o desbloqueo mediante impresión dixital en calquera momento desde Configuración. As imaxes e os modelos da túa impresión dixital almacénanse no teléfono ata que os eliminas."</string>
-    <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_4" msgid="4983770600405797515">"O teu fillo ou filla e mais ti podedes eliminar as imaxes e o modelo da súa impresión dixital ou desactivar o desbloqueo mediante impresión dixital cando queirades en Configuración. As imaxes e os modelos de impresións dixitais gardaranse no teléfono ata que se eliminen."</string>
+    <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_4" msgid="3948305045484131665">"Podes eliminar as imaxes e o modelo da túa impresión dixital ou desactivar o desbloqueo dactilar en calquera momento desde Configuración. As imaxes e os modelos da túa impresión dixital almacénanse no teléfono ata que os eliminas."</string>
+    <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_4" msgid="4983770600405797515">"O teu fillo ou filla e mais ti podedes eliminar as imaxes e o modelo da súa impresión dixital ou desactivar o desbloqueo dactilar cando queirades en Configuración. As imaxes e os modelos de impresións dixitais gardaranse no teléfono ata que se eliminen."</string>
     <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_5" msgid="2018885671994058605">"O teléfono pode desbloquearse sen que teñas intención de facelo (por exemplo, se alguén o achega ao teu dedo)."</string>
     <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_5" msgid="8356551505082794682">"O teléfono do teu fillo ou filla pode desbloquearse sen que el ou ela teña esa intención (por exemplo, se alguén llo achega ao dedo)."</string>
     <string name="security_settings_fingerprint_v2_enroll_introduction_message_learn_more" msgid="5856010507790137793"></string>
@@ -444,11 +445,11 @@
     <string name="security_settings_fingerprint_v2_enroll_acquire_too_bright" msgid="769646735950329315">"Ponte nun lugar cunha iluminación máis suave e téntao de novo"</string>
     <string name="security_settings_fingerprint_v2_enroll_error_max_attempts" msgid="1464972470750764128">"Alcanzaches o número máximo de intentos"</string>
     <string name="security_settings_fingerprint_v2_home_screen" msgid="1709655966777714761">"Utiliza a impresión dixital para desbloquear o teléfono ou verificar a túa identidade (por exemplo, cando queiras iniciar sesión nunha aplicación)\n\n"<annotation id="url">"Máis información"</annotation></string>
-    <string name="security_settings_biometric_preference_title" msgid="298146483579539448">"Desbloqueo facial e mediante impresión dixital"</string>
+    <string name="security_settings_biometric_preference_title" msgid="298146483579539448">"Desbloqueo facial e dactilar"</string>
     <string name="security_settings_biometric_preference_summary_none_enrolled" msgid="6941188982863819389">"Toca para configurar"</string>
     <string name="security_settings_biometric_preference_summary_both_fp_multiple" msgid="4821859306609955966">"Engadíronse a cara e as impresións dixitais"</string>
     <string name="security_settings_biometric_preference_summary_both_fp_single" msgid="684409535278676426">"Engadíronse a cara e a impresión dixital"</string>
-    <string name="biometric_settings_intro" msgid="4263069383955676756">"Se configuras o desbloqueo facial e mediante impresión dixital, o teléfono pedirache a impresión dixital no caso de que leves máscara ou esteas nun espazo escuro"</string>
+    <string name="biometric_settings_intro" msgid="4263069383955676756">"Se configuras o desbloqueo facial e dactilar, o teléfono pedirache a impresión dixital no caso de que leves máscara ou esteas nun espazo escuro"</string>
     <string name="biometric_settings_category_ways_to_unlock" msgid="3384767901580915266">"Maneiras de desbloquear o dispositivo"</string>
     <string name="biometric_settings_use_biometric_unlock_phone" msgid="8180914579885804358">"Desbloquear teléfono"</string>
     <string name="biometric_settings_use_biometric_for_apps" msgid="6201168728906364189">"Verificar identidade nas aplicacións"</string>
@@ -506,15 +507,15 @@
     <string name="lock_screen_pin_skip_message" product="default" msgid="4301690296689572747">"O teléfono estará protexido por un PIN en caso de perda ou roubo"</string>
     <string name="lock_screen_pattern_skip_message" product="default" msgid="7387967847446084260">"O teléfono estará protexido por un padrón en caso de perda ou roubo"</string>
     <string name="lock_screen_password_skip_message" product="default" msgid="6415788841227543063">"O teléfono estará protexido por un contrasinal en caso de perda ou roubo"</string>
-    <string name="lock_screen_pin_skip_fingerprint_message" product="tablet" msgid="2350062798056164403">"Para configurar o desbloqueo mediante impresión dixital, necesítase un PIN.\n\nA tableta estará protexida por un PIN en caso de perda ou roubo."</string>
-    <string name="lock_screen_pattern_skip_fingerprint_message" product="tablet" msgid="222574071926747300">"Para configurar o desbloqueo mediante impresión dixital, necesítase un padrón.\n\nA tableta estará protexida por un padrón en caso de perda ou roubo."</string>
-    <string name="lock_screen_password_skip_fingerprint_message" product="tablet" msgid="7780323831330724644">"Para configurar o desbloqueo mediante impresión dixital, necesítase un contrasinal.\n\nA tableta estará protexida por un contrasinal en caso de perda ou roubo."</string>
-    <string name="lock_screen_pin_skip_fingerprint_message" product="device" msgid="7421096089691939451">"Para configurar o desbloqueo mediante impresión dixital, necesítase un PIN.\n\nO dispositivo estará protexido por un PIN en caso de perda ou roubo."</string>
-    <string name="lock_screen_pattern_skip_fingerprint_message" product="device" msgid="6458468083711413617">"Para configurar o desbloqueo mediante impresión dixital, necesítase un padrón.\n\nO dispositivo estará protexido por un padrón en caso de perda ou roubo."</string>
-    <string name="lock_screen_password_skip_fingerprint_message" product="device" msgid="1632249532665518954">"Para configurar o desbloqueo mediante impresión dixital, necesítase un contrasinal.\n\nO dispositivo estará protexido por un contrasinal en caso de perda ou roubo."</string>
-    <string name="lock_screen_pin_skip_fingerprint_message" product="default" msgid="3101384462491132314">"Para configurar o desbloqueo mediante impresión dixital, necesítase un PIN.\n\nO teléfono estará protexido por un PIN en caso de perda ou roubo."</string>
-    <string name="lock_screen_pattern_skip_fingerprint_message" product="default" msgid="382422778886929469">"Para configurar o desbloqueo mediante impresión dixital, necesítase un padrón.\n\nO teléfono estará protexido por un padrón en caso de perda ou roubo."</string>
-    <string name="lock_screen_password_skip_fingerprint_message" product="default" msgid="5515199168425229243">"Para configurar o desbloqueo mediante impresión dixital, necesítase un contrasinal.\n\nO teléfono estará protexido por un contrasinal en caso de perda ou roubo."</string>
+    <string name="lock_screen_pin_skip_fingerprint_message" product="tablet" msgid="2350062798056164403">"Para configurar o desbloqueo dactilar, necesítase un PIN.\n\nA tableta estará protexida por un PIN en caso de perda ou roubo."</string>
+    <string name="lock_screen_pattern_skip_fingerprint_message" product="tablet" msgid="222574071926747300">"Para configurar o desbloqueo dactilar, necesítase un padrón.\n\nA tableta estará protexida por un padrón en caso de perda ou roubo."</string>
+    <string name="lock_screen_password_skip_fingerprint_message" product="tablet" msgid="7780323831330724644">"Para configurar o desbloqueo dactilar, necesítase un contrasinal.\n\nA tableta estará protexida por un contrasinal en caso de perda ou roubo."</string>
+    <string name="lock_screen_pin_skip_fingerprint_message" product="device" msgid="7421096089691939451">"Para configurar o desbloqueo dactilar, necesítase un PIN.\n\nO dispositivo estará protexido por un PIN en caso de perda ou roubo."</string>
+    <string name="lock_screen_pattern_skip_fingerprint_message" product="device" msgid="6458468083711413617">"Para configurar o desbloqueo dactilar, necesítase un padrón.\n\nO dispositivo estará protexido por un padrón en caso de perda ou roubo."</string>
+    <string name="lock_screen_password_skip_fingerprint_message" product="device" msgid="1632249532665518954">"Para configurar o desbloqueo dactilar, necesítase un contrasinal.\n\nO dispositivo estará protexido por un contrasinal en caso de perda ou roubo."</string>
+    <string name="lock_screen_pin_skip_fingerprint_message" product="default" msgid="3101384462491132314">"Para configurar o desbloqueo dactilar, necesítase un PIN.\n\nO teléfono estará protexido por un PIN en caso de perda ou roubo."</string>
+    <string name="lock_screen_pattern_skip_fingerprint_message" product="default" msgid="382422778886929469">"Para configurar o desbloqueo dactilar, necesítase un padrón.\n\nO teléfono estará protexido por un padrón en caso de perda ou roubo."</string>
+    <string name="lock_screen_password_skip_fingerprint_message" product="default" msgid="5515199168425229243">"Para configurar o desbloqueo dactilar, necesítase un contrasinal.\n\nO teléfono estará protexido por un contrasinal en caso de perda ou roubo."</string>
     <string name="lock_screen_pin_skip_face_message" product="tablet" msgid="2454239555320628731">"Para configurar o desbloqueo facial, necesítase un PIN.\n\nA tableta estará protexida por un PIN en caso de perda ou roubo."</string>
     <string name="lock_screen_pattern_skip_face_message" product="tablet" msgid="4354138725903415816">"Para configurar o desbloqueo facial, necesítase un padrón.\n\nA tableta estará protexida por un padrón en caso de perda ou roubo."</string>
     <string name="lock_screen_password_skip_face_message" product="tablet" msgid="719339718267952196">"Para configurar o desbloqueo facial, necesítase un contrasinal.\n\nA tableta estará protexida por un contrasinal en caso de perda ou roubo."</string>
@@ -524,15 +525,15 @@
     <string name="lock_screen_pin_skip_face_message" product="default" msgid="2155678903559865476">"Para configurar o desbloqueo facial, necesítase un PIN.\n\nO teléfono estará protexido por un PIN en caso de perda ou roubo."</string>
     <string name="lock_screen_pattern_skip_face_message" product="default" msgid="473271568005748452">"Para configurar o desbloqueo facial, necesítase un padrón.\n\nO teléfono estará protexido por un padrón en caso de perda ou roubo."</string>
     <string name="lock_screen_password_skip_face_message" product="default" msgid="4319934862372116788">"Para configurar o desbloqueo facial, necesítase un contrasinal.\n\nO teléfono estará protexido por un contrasinal en caso de perda ou roubo."</string>
-    <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="647987565338402155">"Para configurar o desbloqueo facial e mediante impresión dixital, necesítase un PIN.\n\nA tableta estará protexida por un PIN en caso de perda ou roubo."</string>
-    <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="5293609077890072841">"Para configurar o desbloqueo facial e mediante impresión dixital, necesítase un padrón.\n\nA tableta estará protexida por un padrón en caso de perda ou roubo."</string>
-    <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="2660359318928684172">"Para configurar o desbloqueo facial e mediante impresión dixital, necesítase un contrasinal.\n\nA tableta estará protexida por un contrasinal en caso de perda ou roubo."</string>
-    <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="1278795063897397815">"Para configurar o desbloqueo facial e mediante impresión dixital, necesítase un PIN.\n\nO dispositivo estará protexido por un PIN en caso de perda ou roubo."</string>
-    <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="8766169819759371801">"Para configurar o desbloqueo facial e mediante impresión dixital, necesítase un padrón.\n\nO dispositivo estará protexido por un padrón en caso de perda ou roubo."</string>
-    <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="8611216039321306045">"Para configurar o desbloqueo facial e mediante impresión dixital, necesítase un contrasinal.\n\nO dispositivo estará protexido por un contrasinal en caso de perda ou roubo."</string>
-    <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="8796878521409329051">"Para configurar o desbloqueo facial e mediante impresión dixital, necesítase un PIN.\n\nO teléfono estará protexido por un PIN en caso de perda ou roubo."</string>
-    <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="8423700958936341596">"Para configurar o desbloqueo facial e mediante impresión dixital, necesítase un padrón.\n\nO teléfono estará protexido por un padrón en caso de perda ou roubo."</string>
-    <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="5411689248299854172">"Para configurar o desbloqueo facial e mediante impresión dixital, necesítase un contrasinal.\n\nO teléfono estará protexido por un contrasinal en caso de perda ou roubo."</string>
+    <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="647987565338402155">"Para configurar o desbloqueo facial e dactilar, necesítase un PIN.\n\nA tableta estará protexida por un PIN en caso de perda ou roubo."</string>
+    <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="5293609077890072841">"Para configurar o desbloqueo facial e dactilar, necesítase un padrón.\n\nA tableta estará protexida por un padrón en caso de perda ou roubo."</string>
+    <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="2660359318928684172">"Para configurar o desbloqueo facial e dactilar, necesítase un contrasinal.\n\nA tableta estará protexida por un contrasinal en caso de perda ou roubo."</string>
+    <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="1278795063897397815">"Para configurar o desbloqueo facial e dactilar, necesítase un PIN.\n\nO dispositivo estará protexido por un PIN en caso de perda ou roubo."</string>
+    <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="8766169819759371801">"Para configurar o desbloqueo facial e dactilar, necesítase un padrón.\n\nO dispositivo estará protexido por un padrón en caso de perda ou roubo."</string>
+    <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="8611216039321306045">"Para configurar o desbloqueo facial e dactilar, necesítase un contrasinal.\n\nO dispositivo estará protexido por un contrasinal en caso de perda ou roubo."</string>
+    <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="8796878521409329051">"Para configurar o desbloqueo facial e dactilar, necesítase un PIN.\n\nO teléfono estará protexido por un PIN en caso de perda ou roubo."</string>
+    <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="8423700958936341596">"Para configurar o desbloqueo facial e dactilar, necesítase un padrón.\n\nO teléfono estará protexido por un padrón en caso de perda ou roubo."</string>
+    <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="5411689248299854172">"Para configurar o desbloqueo facial e dactilar, necesítase un contrasinal.\n\nO teléfono estará protexido por un contrasinal en caso de perda ou roubo."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"Queres omitir a configuración do PIN?"</string>
     <string name="lock_screen_pin_skip_face_title" msgid="8810770395309512358">"Queres omitir a configuración do PIN e da cara?"</string>
     <string name="lock_screen_pin_skip_fingerprint_title" msgid="371214283158750976">"Queres omitir a configuración do PIN e da impresión dixital?"</string>
@@ -568,37 +569,10 @@
     <string name="fingerprint_last_delete_message" msgid="7860374760549404410">"Non poderás utilizar a impresión dixital para desbloquear o teléfono nin para verificar a túa identidade nas aplicacións."</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="4104208067277655068">"Non poderás utilizar a impresión dixital para desbloquear o perfil de traballo, autorizar compras nin iniciar sesión nas aplicacións de traballo."</string>
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"Si, quitar"</string>
-    <string name="crypt_keeper_settings_title" msgid="4938812137822100044">"Encriptación"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"Encriptar tableta"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"Encriptar teléfono"</string>
-    <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"Encriptado"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"Podes cifrar as túas contas, configuracións, aplicacións descargadas e os seus datos, ficheiros multimedia e demais ficheiros. Despois de cifrar a túa tableta, sempre que configurases un bloqueo da pantalla (é dicir, un padrón, un PIN numérico ou un contrasinal), terás que desbloquear a pantalla para descifrar a tableta cada vez que a acendas. A única maneira de descifrala é levando a cabo un restablecemento dos datos de fábrica, o que fará que se borren todos os teus datos.\n\nO cifrado tarda unha hora ou máis en completarse. Debes iniciala coa batería cargada e manter a tableta enchufada á corrente durante o proceso. Se o interrompes, perderás unha parte ou a totalidade dos teus datos."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"Podes cifrar as túas contas, configuracións, aplicacións descargadas e os seus datos, ficheiros multimedia e demais ficheiros. Despois de cifrar o teu teléfono, sempre que configurases un bloqueo da pantalla (é dicir, un padrón, un PIN numérico ou un contrasinal), terás que desbloquear a pantalla para descifrar o teléfono cada vez que o acendas. A única maneira de descifralo é levando a cabo un restablecemento dos datos de fábrica, o que fará que se borren todos os teus datos.\n\nO cifrado tarda unha hora ou máis en completarse. Debes inicialo coa batería cargada e manter o teléfono enchufado á corrente durante o proceso. Se o interrompes, perderás unha parte ou a totalidade dos teus datos."</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"Encriptar tableta"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"Encriptar teléfono"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"Carga a batería e téntao de novo."</string>
-    <string name="crypt_keeper_unplugged_text" msgid="2709721134148651329">"Conecta o cargador e téntao de novo."</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="1847280235529858357">"Non hai ningún PIN nin contrasinal de pantalla de bloqueo"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="7210616262954236042">"Precisas definir un PIN ou un contrasinal para a pantalla de bloqueo para poder iniciar o encriptado."</string>
-    <string name="crypt_keeper_confirm_title" msgid="8600000209722452230">"Encriptar?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="3270587498436152259">"A operación de encriptado é irreversible e, se a interrompes, perderás os datos. O encriptado tarda como mínimo unha hora en completarse e a tableta reiniciarase varias veces."</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="3040428543349852419">"A operación de encriptado é irreversible e, se a interrompes, perderás os datos. O encriptado tarda como mínimo unha hora en completarse e o teléfono reiniciarase varias veces."</string>
-    <string name="crypt_keeper_setup_title" msgid="3339725741305796680">"Encriptando"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="4417016995091289019">"Agarda mentres se encripta a túa tableta. <xliff:g id="PERCENT">^1</xliff:g>% completado."</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="7902355422499500352">"Agarda mentres se encripta o teléfono. <xliff:g id="PERCENT">^1</xliff:g>% completado."</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="8348188415839917821">"Agarda mentres se cifra a tableta. Tempo restante: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="8556105766597855198">"Agarda mentres se cifra o teléfono. Tempo restante: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="3832496715430327682">"Para desbloquear a tableta, apágao e volve acendelo."</string>
-    <string name="crypt_keeper_force_power_cycle" product="default" msgid="5070346039522135361">"Para desbloquear o teléfono, apágao e volve acendelo."</string>
-    <string name="crypt_keeper_warn_wipe" msgid="8104921337301750394">"Advertencia: O dispositivo borrarase se se realizan <xliff:g id="COUNT">^1</xliff:g> intentos máis de desbloquealo sen éxito."</string>
-    <string name="crypt_keeper_enter_password" msgid="1274917431075529732">"Escribe o teu contrasinal"</string>
-    <string name="crypt_keeper_failed_title" msgid="8173654570682244149">"Encriptación incorrecta"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"Interrompeuse o encriptado e non se pode completar. Como resultado, non se pode volver acceder aos datos da túa tableta. \n\n Para volver utilizar a tableta, precisas levar a cabo un restablecemento dos datos de fábrica. Cando configures a tableta despois do restablecemento, terás a oportunidade de restablecer os datos dos que se fixo unha copia de seguranza na túa Conta de Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"Interrompeuse o encriptado e non se pode completar. Como resultado, xa non se pode acceder aos datos do teu teléfono. \n \nPara retomar o uso do teléfono, tes que realizar un restablecemento dos datos de fábrica. Cando configures o teléfono despois do restablecemento, terás a oportunidade de restaurar os datos dos que se fixo unha copia de seguranza na túa Conta de Google."</string>
-    <string name="crypt_keeper_data_corrupt_title" msgid="5920153462176846037">"Erro no descifrado"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"O contrasinal que introduciches é correcto, pero lamentablemente os teus datos están danados. \n\nPara continuar usando a túa tableta, necesitas realizar un restablecemento de fábrica. Cando configures a túa tableta despois do restablecemento, poderás restaurar os datos dos que se fixo unha copia de seguranza na túa Conta de Google."</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"O contrasinal que introduciches é correcto, pero lamentablemente os teus datos están danados. \n\nPara continuar usando o teu teléfono, necesitas realizar un restablecemento de fábrica. Cando configures o teu teléfono despois do restablecemento, poderás restaurar os datos dos que se fixo unha copia de seguranza na túa Conta de Google."</string>
-    <string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"Cambiar de método de introdución"</string>
+    <string name="encryption_settings_title" msgid="2848716008695618360">"Encriptación"</string>
+    <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"Encriptar tableta"</string>
+    <string name="encrypt_title" product="default" msgid="7337365190988321100">"Encriptar teléfono"</string>
+    <string name="encrypted_summary" msgid="545623487587251207">"Encriptouse"</string>
     <string name="suggested_lock_settings_title" msgid="7836065447159730217">"Protexe o teléfono"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"Define un bloqueo de pantalla e protexe a tableta"</string>
     <string name="suggested_lock_settings_summary" product="device" msgid="8479766049078378225">"Define un bloqueo de pantalla e protexe o dispositivo"</string>
@@ -817,6 +791,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"É posible que tamén teñas que escribir este PIN no outro dispositivo."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"É posible que tamén teñas que escribir esta clave de acceso no outro dispositivo."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Para vincular con:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Asegúrate de que está mostrando esta clave de acceso:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Confirma que queres vincular o conxunto coordinado"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"De:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Vincular con este dispositivo?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Para vincular con:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Escribe nel:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g> e, a continuación, preme Retroceso ou Intro."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Permitir o acceso aos teus contactos e ao historial de chamadas"</string>
@@ -850,6 +825,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Non se puido conectar. Téntao de novo."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Datos do dispositivo"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Enderezo Bluetooth do dispositivo: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Enderezo Bluetooth do dispositivo:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Queres esquecer o dispositivo?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Quitar asociación"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Queres desconectar a aplicación?"</string>
@@ -881,6 +857,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Lembrar configuración"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Número máximo de dispositivos de audio Bluetooth conectados"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Selecciona o número máximo de dispositivos de audio Bluetooth conectados"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"Rexistro de depuración da pilla de NFC"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Aumenta o nivel de rexistro da pilla de NFC"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Emisión"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"proxección"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Activar visualización sen fíos"</string>
@@ -1188,6 +1166,8 @@
     <string name="wifi_hotspot_maximize_compatibility_dual_ap_summary" msgid="3579549223159056533">"Axuda a que outros dispositivos atopen esta zona wifi. Aumenta o uso da batería."</string>
     <string name="wifi_tether_starting" msgid="8879874184033857814">"Activando zona wifi..."</string>
     <string name="wifi_tether_stopping" msgid="4416492968019409188">"Desactivando zona wifi..."</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_title" msgid="3089432578433978073">"Non está dispoñible a conexión compartida"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_content" msgid="5920421547607921112">"Para obter máis detalles, ponte en contacto co teu operador"</string>
     <string name="wifi_tether_enabled_subtext" msgid="5085002421099821056">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> está activa"</string>
     <string name="wifi_tether_failed_subtext" msgid="437190628041885500">"Erro na zona wifi portátil"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7072559431286459122">"Configurar zona wifi"</string>
@@ -1476,7 +1456,7 @@
     <string name="security_patch" msgid="4071756145347865382">"Actualización de seguranza de Android"</string>
     <string name="model_info" msgid="8997566254717810904">"Modelo"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Modelo e hardware"</string>
-    <string name="hardware_revision" msgid="3454709180861965025">"Versión de hardware"</string>
+    <string name="hardware_revision" msgid="3454709180861965025">"Versión do hardware"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"ID de equipamento"</string>
     <string name="baseband_version" msgid="2600182227599835857">"Versión de banda base"</string>
     <string name="kernel_version" msgid="3513538109381366881">"Versión de kernel"</string>
@@ -2534,11 +2514,6 @@
     <string name="enable_service_title" msgid="7231533866953706788">"Queres permitir que <xliff:g id="SERVICE">%1$s</xliff:g> poida controlar totalmente o teu dispositivo?"</string>
     <string name="capabilities_list_title" msgid="1225853611983394386">"<xliff:g id="SERVICE">%1$s</xliff:g> precisa:"</string>
     <string name="touch_filtered_warning" msgid="4225815157460318241">"Posto que unha aplicación se superpón sobre una solicitude de permiso, a configuración non pode verificar a túa resposta."</string>
-    <string name="enable_service_encryption_warning" msgid="931082737770453755">"Se activas <xliff:g id="SERVICE">%1$s</xliff:g>, o dispositivo non utilizará o teu bloqueo da pantalla para mellorar o cifrado de datos."</string>
-    <string name="secure_lock_encryption_warning" msgid="669152607190123579">"Como activaches un servizo de accesibilidade, o dispositivo non utilizará o teu bloqueo da pantalla para mellorar o cifrado de datos."</string>
-    <string name="enable_service_pattern_reason" msgid="6832846117817938536">"É necesario que confirmes o teu padrón xa que a activación de <xliff:g id="SERVICE">%1$s</xliff:g> afecta ao cifrado de datos."</string>
-    <string name="enable_service_pin_reason" msgid="6040417014360237703">"É necesario que confirmes o teu PIN xa que a activación de <xliff:g id="SERVICE">%1$s</xliff:g> afecta ao cifrado de datos."</string>
-    <string name="enable_service_password_reason" msgid="6962544350351734238">"É necesario que confirmes o teu contrasinal xa que a activación de <xliff:g id="SERVICE">%1$s</xliff:g> afecta ao cifrado de datos."</string>
     <string name="accessibility_service_warning" msgid="6779187188736432618">"<xliff:g id="SERVICE">%1$s</xliff:g> solicita poder controlar totalmente este dispositivo. O servizo pode ler a pantalla e actuar en nome dos usuarios con necesidades de accesibilidade. Este nivel de control non é adecuado para a maioría das aplicacións."</string>
     <string name="accessibility_service_warning_description" msgid="6573203795976134751">"O control total é adecuado para as aplicacións que che axudan coa accesibilidade, pero non para a maioría das aplicacións."</string>
     <string name="accessibility_service_screen_control_title" msgid="324795030658109870">"Ver e controlar a pantalla"</string>
@@ -3103,14 +3078,6 @@
     <string name="remove_account_failed" msgid="3709502163548900644">"O administrador non admite este cambio"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"Non se pode vincular manualmente"</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"A vinculación deste elemento está desactivada actualmente. Para cambiar esta configuración, activa temporalmente os datos en segundo plano e a vinculación automática."</string>
-    <string name="enter_password" msgid="6327051330258595331">"Para iniciar o dispositivo Android, introduce o teu contrasinal"</string>
-    <string name="enter_pin" msgid="1029287617551232681">"Para iniciar o dispositivo Android, introduce o teu PIN"</string>
-    <string name="enter_pattern" msgid="1747316785866742960">"Para iniciar o dispositivo Android, debuxa o teu padrón"</string>
-    <string name="cryptkeeper_wrong_pattern" msgid="340747269176120242">"Padrón incorrecto"</string>
-    <string name="cryptkeeper_wrong_password" msgid="7295607881887114486">"Contrasinal incorrecto"</string>
-    <string name="cryptkeeper_wrong_pin" msgid="2347961593970714201">"PIN incorrecto"</string>
-    <string name="checking_decryption" msgid="6111642972615688237">"Comprobando..."</string>
-    <string name="starting_android" msgid="6694154070215356186">"Iniciando Android…"</string>
     <string name="delete" msgid="8330605554706263775">"Eliminar"</string>
     <string name="misc_files" msgid="6598066985800749585">"Ficheiros variados"</string>
     <string name="misc_files_selected_count" msgid="5597802791672749532">"seleccionáronse <xliff:g id="NUMBER">%1$d</xliff:g> de <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -3206,8 +3173,6 @@
     <string name="data_usage_metered_yes" msgid="4262598072030135223">"Rede sen tarifa plana"</string>
     <string name="data_usage_metered_no" msgid="1685828958417926268">"Rede con tarifa plana"</string>
     <string name="data_usage_disclaimer" msgid="3271450299386176770">"A contabilidade dos datos do operador pode ser diferente á do teu dispositivo."</string>
-    <string name="cryptkeeper_emergency_call" msgid="8369322820475703306">"Chamada de emerxencia"</string>
-    <string name="cryptkeeper_return_to_call" msgid="3857250752781151232">"Volver á chamada"</string>
     <string name="vpn_name" msgid="3806456074909253262">"Nome"</string>
     <string name="vpn_type" msgid="5533202873260826663">"Tipo"</string>
     <string name="vpn_server" msgid="2908816134941973935">"Enderezo do servidor"</string>
@@ -4764,8 +4729,6 @@
       <item quantity="one">1 aplicación pode usar datos sen restricións</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"Ver máis"</string>
-    <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"Seguro que queres limpar os datos do usuario e cambiar á encriptación baseada en ficheiros?"</string>
-    <string name="button_confirm_convert_fbe" msgid="339648921918438106">"Borrar e converter"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"Restablecer límite de velocidade de ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"Restableceuse o límite de velocidade de ShortcutManager"</string>
     <string name="notification_suggestion_title" msgid="6309263655965785411">"Información de control sobre a pantalla de bloqueo"</string>
@@ -5292,6 +5255,7 @@
     <string name="sim_action_yes" msgid="8076556020131395515">"Si"</string>
     <string name="sim_action_reboot" msgid="3508948833333441538">"Reiniciar"</string>
     <string name="sim_action_no_thanks" msgid="435717748384544195">"Non, grazas"</string>
+    <string name="sim_action_cancel" msgid="2668099867029610910">"Cancelar"</string>
     <string name="sim_switch_button" msgid="1405772571706095387">"Cambiar"</string>
     <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Non se puido activar a SIM"</string>
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Quita a SIM e introdúcea de novo. Se o problema persiste, reinicia o dispositivo."</string>
@@ -5444,6 +5408,10 @@
     <string name="cached_apps_freezer" msgid="1057519579761550350">"Suspender execución das apps da memoria caché"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"Permitir superposic. na pantalla en Configuración"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Permite que as aplicacións que se poden mostrar sobre outras se superpoñan nas pantallas da aplicación Configuración"</string>
+    <!-- no translation found for allow_mock_modem (3832264806530479214) -->
+    <skip />
+    <!-- no translation found for allow_mock_modem_summary (9097416612748005374) -->
+    <skip />
     <string name="media_controls_title" msgid="403271085636252597">"Contido multimedia"</string>
     <string name="media_controls_resume_title" msgid="855076860336652370">"Fixar reprodutor multimedia"</string>
     <string name="media_controls_resume_description" msgid="3163482266454802097">"O reprodutor multimedia permanece aberto en Configuración rápida para que poidas retomar rapidamente a reprodución"</string>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index b8b5633..3493cb7 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -142,10 +142,11 @@
     <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"તમારા ડિવાઇસને નજીકના બ્લૂટૂથ ડિવાઇસ સાથે સંચાર કરવાની મંજૂરી આપો"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"તમારા ફોનને નજીકના બ્લૂટૂથ ઉપકરણો સાથે સંચાર કરવાની મંજૂરી આપો"</string>
     <string name="bluetooth_disable_a2dp_hw_offload" msgid="5942913792817797541">"બ્લૂટૂથ A2DP હાર્ડવેર ઑફલોડને બંધ કરો"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="8610420176339657720">"ઉપકરણ ફરી શરૂ કરીએ?"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8333029144800835996">"આ સેટિંગમાં ફેરફાર કરવા માટે તમારા ડિવાઇસને ફરીથી શરૂ કરો."</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="3488695418187553566">"ફરી શરૂ કરો"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="4930826928585464191">"રદ કરો"</string>
+    <string name="bluetooth_disable_le_audio_hw_offload" msgid="3966022676505972908">"બ્લૂટૂથના LE AUDIO હાર્ડવેર ઑફલોડને બંધ કરો"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_title" msgid="6001142380445276918">"ડિવાઇસને ફરી શરૂ કરીએ?"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_message" msgid="1524373895333698779">"આ સેટિંગમાં ફેરફાર કરવા માટે, તમારે તમારા ડિવાઇસને ફરી શરૂ કરવાની જરૂર છે."</string>
+    <string name="bluetooth_disable_hw_offload_dialog_confirm" msgid="5594859658551707592">"ફરી શરૂ કરો"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel" msgid="3663690305043973720">"રદ કરો"</string>
     <string name="connected_device_media_device_title" msgid="3783388247594566734">"મીડિયા ડિવાઇસ"</string>
     <string name="connected_device_call_device_title" msgid="88732390601723608">"કૉલ ડિવાઇસ"</string>
     <string name="connected_device_other_device_title" msgid="4652120430615729193">"અન્ય ડિવાઇસ"</string>
@@ -309,9 +310,9 @@
     <string name="security_settings_title" msgid="6710768415432791970">"સુરક્ષા"</string>
     <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"એન્ક્રિપ્શન અને ઓળખપત્રો"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"ફોન એન્ક્રિપ્ટ કર્યો"</string>
-    <string name="decryption_settings_summary" product="default" msgid="1742645256103613503">"ફોન એન્ક્રિપ્ટ કરેલો નથી"</string>
+    <string name="not_encrypted_summary" product="default" msgid="2251945842585788254">"ફોન એન્ક્રિપ્ટ કરેલો નથી"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"ઉપકરણ એન્ક્રિપ્ટેડ છે"</string>
-    <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"ડિવાઇસ એન્ક્રિપ્ટ કરેલું નથી"</string>
+    <string name="not_encrypted_summary" product="tablet" msgid="2374263654698719382">"ડિવાઇસ એન્ક્રિપ્ટ કરેલું નથી"</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"લૉક સ્ક્રીન"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"શું બતાવવું છે"</string>
     <string name="security_settings_summary" msgid="1627059516127354233">"મારું સ્થાન, સ્ક્રીન અનલૉક, સિમ કાર્ડ લૉક, ક્રિડેન્શ્યલ સ્ટોરેજ લૉક સેટ કરો"</string>
@@ -568,37 +569,10 @@
     <string name="fingerprint_last_delete_message" msgid="7860374760549404410">"તમારો ફોન અનલૉક કરવા અથવા એ તમે જ છો તેની ચકાસણી ઍપમાં કરવા માટે, તમે તમારી ફિંગરપ્રિન્ટનો ઉપયોગ કરી શકશો નહીં."</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="4104208067277655068">"તમારી ઑફિસની પ્રોફાઇલ અનલૉક કરવા માટે, ખરીદીઓને અધિકૃત કરવા અથવા ઑફિસ માટેની ઍપમાં સાઇન ઇન કરવા માટે, તમે તમારી ફિંગરપ્રિન્ટનો ઉપયોગ કરી શકશો નહીં."</string>
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"હા, કાઢી નાખો"</string>
-    <string name="crypt_keeper_settings_title" msgid="4938812137822100044">"એન્ક્રિપ્શન"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"ટેબ્લેટને એન્ક્રિપ્ટ કરો"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"ફોન એન્ક્રિપ્ટ કરો"</string>
-    <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"એન્ક્રિપ્ટેડ"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"તમે તમારા એકાઉન્ટ, સેટિંગ, ડાઉનલોડ કરેલી ઍપ અને તેમનો ડેટા, મીડિયા અને અન્ય ફાઇલોને એન્ક્રિપ્ટ કરી શકો છો. તમે તમારું ટૅબ્લેટ એન્ક્રિપ્ટ કરી લો તે પછી, તમે એક સ્ક્રીન લૉક સેટ કરી લીધું છે તેમ ધારીને (તે છે કોઈ પૅટર્ન અથવા સંખ્યાકીય પિન અથવા પાસવર્ડ), તમે તેને ચાલુ કરો ત્યારે દર વખતે ટૅબ્લેટને ડિક્રિપ્ટ કરવા માટે સ્ક્રીનને અનલૉક કરવાની જરૂર પડશે. તમારો તમામ ડેટા કાઢી નાખીને ડિક્રિપ્ટ કરવા માટેનો અન્ય બીજો રસ્તો માત્ર ફેક્ટરી ડેટા રીસેટ કરવાનો છે.\n\nએન્ક્રિપ્શનમાં એક કલાક અથવા તેથી વધુ સમય લાગી શકે છે. તમારે સમગ્ર પ્રક્રિયા દરમિયાન બૅટરીને પૂર્ણ ચાર્જ અને તમારા ફોનને પ્લગ ઇન કરીને રાખવો આવશ્યક છે. જો તમે તેમાં ખલેલ પાડશો, તો તમે તમારો કેટલોક અથવા તમામ ડેટા ગુમાવશો"</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"તમે તમારા એકાઉન્ટ, સેટિંગ, ડાઉનલોડ કરેલી ઍપ અને તેમનો ડેટા, મીડિયા અને અન્ય ફાઇલોને એન્ક્રિપ્ટ કરી શકો છો. તમે તમારો ફોન એન્ક્રિપ્ટ કરી લો તે પછી, તમે એક સ્ક્રીન લૉક સેટ કરી લીધું છે તેમ ધારીને (તે છે કોઈ પૅટર્ન અથવા સંખ્યાકીય પિન અથવા પાસવર્ડ), તમે તેને ચાલુ કરો ત્યારે દર વખતે ડિક્રિપ્ટ કરવા માટે સ્ક્રીનને અનલૉક કરવાની જરૂર પડશે. તમારો તમામ ડેટા કાઢી નાખીને ડિક્રિપ્ટ કરવા માટેનો અન્ય બીજો રસ્તો માત્ર ફેક્ટરી ડેટા રીસેટ કરવાનો છે.\n\nએન્ક્રિપ્શનમાં એક કલાક અથવા તેથી વધુ સમય લાગી શકે છે. તમારે સમગ્ર પ્રક્રિયા દરમિયાન બૅટરીને પૂર્ણ ચાર્જ અને તમારા ફોનને પ્લગ ઇન કરીને રાખવો આવશ્યક છે. જો તમે તેમાં ખલેલ પાડશો, તો તમે તમારો કેટલોક અથવા તમામ ડેટા ગુમાવશો."</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"ટેબ્લેટને એન્ક્રિપ્ટ કરો"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"ફોન એન્ક્રિપ્ટ કરો"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"તમારી બૅટરી ચાર્જ કરો અને ફરીથી પ્રયાસ કરો."</string>
-    <string name="crypt_keeper_unplugged_text" msgid="2709721134148651329">"તમારું ચાર્જર પ્લગ ઇન કરો અને ફરીથી પ્રયાસ કરો."</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="1847280235529858357">"કોઈ લૉક સ્ક્રીન પિન અથવા પાસવર્ડ નથી"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="7210616262954236042">"તમે એન્ક્રિપ્શન પ્રારંભ કરી શકો છો તે પહેલાં તમારે લૉક સ્ક્રીન પિન કે પાસવર્ડ સેટ કરવો પડશે."</string>
-    <string name="crypt_keeper_confirm_title" msgid="8600000209722452230">"એન્ક્રિપ્ટ કરીએ?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="3270587498436152259">"એન્ક્રિપ્શન ઓપરેશનને રિવર્સ કરી શકાતું નથી અને જો તમે તેમાં ખલેલ પાડો, તો તમે ડેટા ગુમાવશો. એન્ક્રિપ્શનમાં એક કલાક અથવા વધુ સમય લાગે છે, તે દરમ્યાનમાં ટેબ્લેટ કેટલીક વખત પુનઃપ્રારંભ થશે."</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="3040428543349852419">"એન્ક્રિપ્શન ઓપરેશનને રિવર્સ કરી શકાતું નથી અને જો તમે તેમાં ખલેલ પાડો, તો તમે ડેટા ગુમાવશો. એન્ક્રિપ્શનમાં એક કલાક અથવા વધુ સમય લાગે છે, તે દરમ્યાનમાં ફોન કેટલીક વખત પુનઃપ્રારંભ થશે."</string>
-    <string name="crypt_keeper_setup_title" msgid="3339725741305796680">"એન્ક્રિપ્ટિંગ"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="4417016995091289019">"તમારું ટેબ્લેટ એન્ક્રિપ્ટ થઈ રહ્યું હોય ત્યાં સુધી રાહ જુઓ. <xliff:g id="PERCENT">^1</xliff:g>% પૂર્ણ."</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="7902355422499500352">"તમારો ફોન એન્ક્રિપ્ટ થઈ રહ્યો હોય ત્યાં સુધી રાહ જુઓ. <xliff:g id="PERCENT">^1</xliff:g> પૂર્ણ."</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="8348188415839917821">"તમારું ટેબ્લેટ એન્ક્રિપ્ટ થતું હોય ત્યારે પ્રતીક્ષા કરો. સમય બાકી: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="8556105766597855198">"મારો ફોન એન્ક્રિપ્ટ થઈ રહ્યો હોય ત્યાં સુધી રાહ જુઓ. સમય બાકી: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="3832496715430327682">"તમારા ટેબ્લેટને અનલૉક કરવા માટે, તેને બંધ કરો અને પછી ચાલુ કરો."</string>
-    <string name="crypt_keeper_force_power_cycle" product="default" msgid="5070346039522135361">"તમારા ફોનને અનલૉક કરવા માટે, તેને બંધ કરો અને પછી ચાલુ કરો."</string>
-    <string name="crypt_keeper_warn_wipe" msgid="8104921337301750394">"ચેતવણી: અનલૉક કરવાના <xliff:g id="COUNT">^1</xliff:g> વધુ પ્રયાસો પછી તમારા ઉપકરણને સાફ કરી નાખવામાં આવશે!"</string>
-    <string name="crypt_keeper_enter_password" msgid="1274917431075529732">"તમારો પાસવર્ડ લખો"</string>
-    <string name="crypt_keeper_failed_title" msgid="8173654570682244149">"એન્ક્રિપ્શન અસફળ થયું"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"એન્ક્રિપ્શન વિક્ષેપિત થયું હતું અને પૂર્ણ કરી શકાતું નથી. પરિણામે, તમારા ટેબ્લેટ પરનો ડેટા હવે અ‍ૅક્સેસિબલ રહેશે નહીં. \n\nતમારા  ટેબ્લેટનો ઉપયોગ ફરી શરૂ કરવા માટે, તમારે ફેક્ટરી રીસેટ કરવાની જરૂર છે. જ્યારે તમે રીસેટ પછી તમારા ટેબ્લેટને સેટ કરો ત્યારે, તમારી પાસે તમારા Google  એકાઉન્ટ પર બેકઅપ લેવાયેલ તમારા કોઈપણ ડેટાને પુનઃસ્થાપિત કરવાની એક તક હશે."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"એન્ક્રિપ્શન વિક્ષેપિત થયું હતું અને પૂર્ણ કરી શકાતું નથી. પરિણામે, તમારા ફોન પરનો ડેટા હવે અ‍ૅક્સેસિબલ રહેશે નહીં. \n\nતમારા  ફોનનો ઉપયોગ ફરી શરૂ કરવા માટે, તમારે ફેક્ટરી રીસેટ કરવાની જરૂર છે. જ્યારે તમે રીસેટ પછી તમારા ફોનને સેટ કરો ત્યારે, તમારી પાસે તમારા Google  એકાઉન્ટ પર બેકઅપ લેવાયેલ તમારા કોઈપણ ડેટાને પુનઃસ્થાપિત કરવાની એક તક હશે."</string>
-    <string name="crypt_keeper_data_corrupt_title" msgid="5920153462176846037">"ડિક્રિપ્શન અસફળ થયું"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"તમે દાખલ કરેલ પાસવર્ડ સાચો છે, પરંતુ કમનસીબે તમારો ડેટા દુષિત છે. \n\nતમારા ટેબ્લેટનો ઉપયોગ ફરી શરૂ કરવા માટે, તમારે ફેક્ટરી રીસેટ કરવાની જરૂર છે. જ્યારે તમે રીસેટ પછી તમારા ટેબ્લેટને સેટ કરો ત્યારે, તમારી પાસે તમારા Google એકાઉન્ટ પર બેકઅપ લેવાયેલ તમારા કોઈપણ ડેટાને પુનઃસ્થાપિત કરવાની એક તક હશે."</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"તમે દાખલ કરેલ પાસવર્ડ સાચો છે, પરંતુ કમનસીબે તમારો ડેટા દુષિત છે. \n\nતમારા ફોનનો ઉપયોગ ફરી શરૂ કરવા માટે, તમારે ફેક્ટરી રીસેટ કરવાની જરૂર છે. જ્યારે તમે રીસેટ પછી તમારા ફોનને સેટ કરો ત્યારે, તમારી પાસે તમારા Google એકાઉન્ટ પર બેકઅપ લેવાયેલ તમારા કોઈપણ ડેટાને પુનઃસ્થાપિત કરવાની એક તક હશે."</string>
-    <string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"ઇનપુટ પદ્ધતિ સ્વિચ કરો"</string>
+    <string name="encryption_settings_title" msgid="2848716008695618360">"એન્ક્રિપ્શન"</string>
+    <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"ટૅબ્લેટને એન્ક્રિપ્ટ કરો"</string>
+    <string name="encrypt_title" product="default" msgid="7337365190988321100">"ફોનને એન્ક્રિપ્ટ કરો"</string>
+    <string name="encrypted_summary" msgid="545623487587251207">"એન્ક્રિપ્ટેડ"</string>
     <string name="suggested_lock_settings_title" msgid="7836065447159730217">"તમારો ફોન સુરક્ષિત કરો"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"ટૅબ્લેટને સુરક્ષિત કરવા માટે સ્ક્રીન લૉક સેટ કરો"</string>
     <string name="suggested_lock_settings_summary" product="device" msgid="8479766049078378225">"ડિવાઇસને સુરક્ષિત કરવા માટે સ્ક્રીન લૉક સેટ કરો"</string>
@@ -817,6 +791,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"તમારે આ પિનને અન્ય ઉપકરણ પર પણ લખવાની જરૂર પડી શકે છે."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"તમારે આ પાસકીને અન્ય ઉપકરણ પર પણ લખવાની જરૂર પડી શકે છે."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"આની સાથે જોડી કરવા માટે:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;ખાતરી કરો કે તે આ પાસકી દર્શાવી રહ્યું છે:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"સુસંગત સેટ સાથે જોડાણ બનાવવાનું કન્ફર્મ કરો"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"અહીંથી:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;આ ઉપકરણ સાથે જોડી કરીએ?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"આની સાથે જોડી કરવા:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>તેના પર લખો:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, પછી Return અથવા Enter દબાવો."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"તમારા સંપર્કો અને કૉલ ઇતિહાસના ઍક્સેસની મંજૂરી આપો"</string>
@@ -850,6 +825,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"કનેક્ટ ન કરી શક્યાં. ફરી પ્રયાસ કરો."</string>
     <string name="device_details_title" msgid="1155622417516195481">"ડિવાઇસની વિગતો"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"ડિવાઇસનું બ્લૂટૂથ ઍડ્રેસ: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"ડિવાઇસનું બ્લૂટૂથ ઍડ્રેસ:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"ડિવાઇસને ભૂલી જઈએ?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"જોડાણ કાઢી નાખો"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"ઍપને ડિસ્કનેક્ટ કરીએ?"</string>
@@ -881,6 +857,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"સેટિંગ યાદ રાખો"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"મહત્તમ સંખ્યામાં કનેક્ટ થયેલા બ્લૂટૂથ ઑડિયો ડિવાઇસ"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"મહત્તમ સંખ્યામાં કનેક્ટ થયેલા બ્લૂટૂથ ઑડિયો ડિવાઇસ પસંદ કરો"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"NFC સ્ટૅકનો ડિબગ લૉગ"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"NFC સ્ટૅકનું લૉગ ઇન કરવાનું લેવલ વધારો"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"કાસ્ટ કરો"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"મીરર"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"વાયરલેસ ડિસ્પ્લે સક્ષમ કરો"</string>
@@ -1188,6 +1166,8 @@
     <string name="wifi_hotspot_maximize_compatibility_dual_ap_summary" msgid="3579549223159056533">"અન્ય ડિવાઇસને આ હૉટસ્પૉટ શોધવામાં સહાય કરે છે. બૅટરીના વપરાશમાં વધારો કરે છે."</string>
     <string name="wifi_tether_starting" msgid="8879874184033857814">"હૉટસ્પૉટ ચાલુ કરી રહ્યું છે…"</string>
     <string name="wifi_tether_stopping" msgid="4416492968019409188">"હૉટસ્પૉટ બંધ કરી રહ્યું છે…"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_title" msgid="3089432578433978073">"ઇન્ટરનેટ શેર કરવાની સુવિધા ઉપલબ્ધ નથી"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_content" msgid="5920421547607921112">"વિગતો માટે તમારા મોબાઇલ ઑપરેટરનો સંપર્ક કરો"</string>
     <string name="wifi_tether_enabled_subtext" msgid="5085002421099821056">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> સક્રિય છે"</string>
     <string name="wifi_tether_failed_subtext" msgid="437190628041885500">"પોર્ટેબલ વાઇ-ફાઇ હૉટસ્પૉટ ભૂલ"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7072559431286459122">"વાઇ-ફાઇ હૉટસ્પૉટ સેટ કરો"</string>
@@ -2534,11 +2514,6 @@
     <string name="enable_service_title" msgid="7231533866953706788">"શું <xliff:g id="SERVICE">%1$s</xliff:g>ને તમારા ડિવાઇસના સંપૂર્ણ નિયંત્રણની મંજૂરી આપીએ?"</string>
     <string name="capabilities_list_title" msgid="1225853611983394386">"<xliff:g id="SERVICE">%1$s</xliff:g>ને આની જરૂર છે:"</string>
     <string name="touch_filtered_warning" msgid="4225815157460318241">"એક ઍપ પરવાનગી વિનંતીને અસ્પષ્ટ કરતી હોવાને કારણે, સેટિંગ તમારા પ્રતિસાદને ચકાસી શકતી નથી."</string>
-    <string name="enable_service_encryption_warning" msgid="931082737770453755">"જો તમે <xliff:g id="SERVICE">%1$s</xliff:g> ચાલુ કરો છો, તો તમારું ઉપકરણ ડેટા એન્ક્રિપ્શનને વિસ્તૃત કરવા માટે તમારા સ્ક્રીન લૉકનો ઉપયોગ કરશે નહીં."</string>
-    <string name="secure_lock_encryption_warning" msgid="669152607190123579">"તમે અ‍ૅક્સેસિબિલિટી સેવા ચાલુ કરી હોવાને કારણે, તમારું ઉપકરણ ડેટા એન્ક્રિપ્શનને વિસ્તૃત કરવા માટે તમારા સ્ક્રીન લૉકનો ઉપયોગ કરશે નહીં."</string>
-    <string name="enable_service_pattern_reason" msgid="6832846117817938536">"<xliff:g id="SERVICE">%1$s</xliff:g> ને ચાલુ કરવું ડેટા ઇન્ક્રિપ્શન પર અસર કરતું હોવાને કારણે, તમારે તમારી પેટર્નની પુષ્ટિ કરવાની જરૂર છે."</string>
-    <string name="enable_service_pin_reason" msgid="6040417014360237703">"<xliff:g id="SERVICE">%1$s</xliff:g> ને ચાલુ કરવું ડેટા ઇન્ક્રિપ્શન પર અસર કરતું હોવાને કારણે, તમારે તમારા પિનની પુષ્ટિ કરવાની જરૂર છે."</string>
-    <string name="enable_service_password_reason" msgid="6962544350351734238">"<xliff:g id="SERVICE">%1$s</xliff:g> ને ચાલુ કરવું ડેટા ઇન્ક્રિપ્શન પર અસર કરતું હોવાને કારણે, તમારે તમારા પાસવર્ડની પુષ્ટિ કરવાની જરૂર છે."</string>
     <string name="accessibility_service_warning" msgid="6779187188736432618">"<xliff:g id="SERVICE">%1$s</xliff:g> આ ડિવાઇસના સંપૂર્ણ નિયંત્રણ માટે વિનંતી કરે છે. સેવા ઍક્સેસિબિલિટીની જરૂર હોય તેવા વપરાશકર્તા વતી સ્ક્રીન વાંચીને કાર્ય કરી શકે છે. મોટાભાગની ઍપ માટે આ લેવલનું નિયંત્રણ યોગ્ય નથી."</string>
     <string name="accessibility_service_warning_description" msgid="6573203795976134751">"ઍક્સેસિબિલિટી સંબંધિત આવશ્યકતા માટે સહાય કરતી ઍપ માટે સંપૂર્ણ નિયંત્રણ યોગ્ય છે, પણ મોટા ભાગની ઍપ માટે યોગ્ય નથી."</string>
     <string name="accessibility_service_screen_control_title" msgid="324795030658109870">"જોવા અને નિયંત્રણ માટેની સ્ક્રીન"</string>
@@ -3103,14 +3078,6 @@
     <string name="remove_account_failed" msgid="3709502163548900644">"તમારા વ્યવસ્થાપકે આ ફેરફારની મંજૂરી આપી નથી"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"મેન્યુઅલી સમન્વયિત કરી શકાતું નથી"</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"આ આઇટમ માટે સિંક હાલમાં બંધ કરેલું છે. આ સેટિંગ બદલવા માટે, બૅકગ્રાઉન્ડ ડેટા અને ઑટોમૅટિક રીતે સિંકને અસ્થાયી ધોરણે ચાલુ કરો."</string>
-    <string name="enter_password" msgid="6327051330258595331">"Android પ્રારંભ કરવા માટે, તમારો પાસવર્ડ દાખલ કરો"</string>
-    <string name="enter_pin" msgid="1029287617551232681">"Android પ્રારંભ કરવા માટે, તમારો પિન દાખલ કરો"</string>
-    <string name="enter_pattern" msgid="1747316785866742960">"Android પ્રારંભ કરવા માટે, તમારી પૅટર્ન દોરો"</string>
-    <string name="cryptkeeper_wrong_pattern" msgid="340747269176120242">"ખોટી પૅટર્ન"</string>
-    <string name="cryptkeeper_wrong_password" msgid="7295607881887114486">"ખોટો પાસવર્ડ"</string>
-    <string name="cryptkeeper_wrong_pin" msgid="2347961593970714201">"ખોટો પિન"</string>
-    <string name="checking_decryption" msgid="6111642972615688237">"તપાસી રહ્યું છે..."</string>
-    <string name="starting_android" msgid="6694154070215356186">"Android પ્રારંભ કરી રહ્યાં છીએ…"</string>
     <string name="delete" msgid="8330605554706263775">"ડિલીટ કરો"</string>
     <string name="misc_files" msgid="6598066985800749585">"વિવિધ ફાઇલો"</string>
     <string name="misc_files_selected_count" msgid="5597802791672749532">"<xliff:g id="TOTAL">%2$d</xliff:g> માંથી <xliff:g id="NUMBER">%1$d</xliff:g> પસંદ કરી"</string>
@@ -3206,8 +3173,6 @@
     <string name="data_usage_metered_yes" msgid="4262598072030135223">"મીટર કરેલું"</string>
     <string name="data_usage_metered_no" msgid="1685828958417926268">"મીટર કરેલ નથી"</string>
     <string name="data_usage_disclaimer" msgid="3271450299386176770">"કેરિઅર ડેટા એકાઉન્ટિંગ તમારા ઉપકરણથી અલગ હોઈ શકે છે."</string>
-    <string name="cryptkeeper_emergency_call" msgid="8369322820475703306">"ઇમર્જન્સી કૉલ"</string>
-    <string name="cryptkeeper_return_to_call" msgid="3857250752781151232">"કૉલ પર પાછા ફરો"</string>
     <string name="vpn_name" msgid="3806456074909253262">"નામ"</string>
     <string name="vpn_type" msgid="5533202873260826663">"પ્રકાર"</string>
     <string name="vpn_server" msgid="2908816134941973935">"સર્વર ઍડ્રેસ"</string>
@@ -4764,14 +4729,12 @@
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> ઍપ અપ્રતિબંધિત ડેટાનો ઉપયોગ કરી શકે છે</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"વધુ જુઓ"</string>
-    <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"ખરેખર વપરાશકર્તા ડેટાને સાફ કરીને ફાઇલ એન્ક્રિપ્શનમાં રૂપાંતરિત કરીએ?"</string>
-    <string name="button_confirm_convert_fbe" msgid="339648921918438106">"સાફ અને રૂપાંતરિત કરો"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"ShortcutManager દરને મર્યાદિત કરવાનું ફરીથી સેટ કરો"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"ShortcutManager દરને મર્યાદિત કરવાનું ફરીથી સેટ કરવામાં આવ્યું"</string>
     <string name="notification_suggestion_title" msgid="6309263655965785411">"લૉક સ્ક્રીન પરની માહિતી નિયંત્રિત કરો"</string>
     <string name="notification_suggestion_summary" msgid="7615611244249276113">"નોટિફિકેશન કન્ટેન્ટ બતાવો અથવા છુપાવો"</string>
     <string name="page_tab_title_summary" msgid="7188875610123234454">"તમામ"</string>
-    <string name="page_tab_title_support" msgid="3235725053332345773">"ટિપ અને સહાય"</string>
+    <string name="page_tab_title_support" msgid="3235725053332345773">"ટિપ અને સપોર્ટ"</string>
     <string name="developer_smallest_width" msgid="632354817870920911">"સૌથી નાની પહોળાઈ"</string>
     <string name="premium_sms_none" msgid="8737045049886416739">"કોઈ ઇન્સ્ટૉલ કરેલ ઍપએ પ્રીમિયમ SMS ઍક્સેસની વિનંતી કરી નથી"</string>
     <string name="premium_sms_warning" msgid="2192300872411073324">"તમને પ્રીમિયમ SMS નો શુલ્ક લાગી શકે છે અને તમારા કૅરિઅર બિલ્સમાં ઉમેરવામાં આવશે. જો તમે કોઇ ઍપ્લિકેશન માટે પરવાનગી સક્ષમ કરો, તો તમે તે ઍપ્લિકેશનનો ઉપયોગ કરીને પ્રીમિયમ SMS મોકલવા માટે સમર્થ હશો."</string>
@@ -5292,6 +5255,7 @@
     <string name="sim_action_yes" msgid="8076556020131395515">"હા"</string>
     <string name="sim_action_reboot" msgid="3508948833333441538">"ફરી શરૂ કરો"</string>
     <string name="sim_action_no_thanks" msgid="435717748384544195">"ના, આભાર"</string>
+    <string name="sim_action_cancel" msgid="2668099867029610910">"રદ કરો"</string>
     <string name="sim_switch_button" msgid="1405772571706095387">"સ્વિચ કરો"</string>
     <string name="dsds_activation_failure_title" msgid="4467364110584914794">"સિમ કાર્ડ સક્રિય કરી શકાતું નથી"</string>
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"સિમ કાર્ડ કાઢી નાખો અને તેને ફરીથી દાખલ કરો. તેમ છતાં સમસ્યા આવે, તો તમારું ડિવાઇસ ફરી શરૂ કરો."</string>
@@ -5444,6 +5408,10 @@
     <string name="cached_apps_freezer" msgid="1057519579761550350">"કૅશ મેમરીમાં સાચવેલી ઍપનો અમલ કરવાનું સસ્પેન્ડ કરો"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"સેટિંગ પર સ્ક્રીન ઓવરલે થવાની મંજૂરી આપો"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"સેટિંગ સ્ક્રીનને ઓવરલે કરવા માટે અન્ય ઍપની ટોચે પ્રદર્શિત થઈ શકે તેવી ઍપને મંજૂરી આપો"</string>
+    <!-- no translation found for allow_mock_modem (3832264806530479214) -->
+    <skip />
+    <!-- no translation found for allow_mock_modem_summary (9097416612748005374) -->
+    <skip />
     <string name="media_controls_title" msgid="403271085636252597">"મીડિયા"</string>
     <string name="media_controls_resume_title" msgid="855076860336652370">"મીડિયા પ્લેયર પિન કરો"</string>
     <string name="media_controls_resume_description" msgid="3163482266454802097">"પ્લેબૅક ઝડપથી ફરી શરૂ કરી શકવા માટે, મીડિયા પ્લેયર ઝડપી સેટિંગમાં ખુલ્લું રહે છે"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index d017a6e..54a00e0 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -142,10 +142,11 @@
     <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"अपने डिवाइस को आस-पास के ब्लूटूथ डिवाइस से संपर्क करने की मंज़ूरी दें"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"अपने फ़ोन को आस-पास के ब्लूटूथ डिवाइस से संपर्क करने की मंज़ूरी दें"</string>
     <string name="bluetooth_disable_a2dp_hw_offload" msgid="5942913792817797541">"ब्लूटूथ ए2डीपी हार्डवेयर ऑफ़लोड बंद करें"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="8610420176339657720">"डिवाइस रीस्टार्ट करें?"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8333029144800835996">"यह सेटिंग बदलने के लिए डिवाइस रीस्टार्ट करना ज़रूरी है."</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="3488695418187553566">"रीस्टार्ट करें"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="4930826928585464191">"अभी नहीं"</string>
+    <string name="bluetooth_disable_le_audio_hw_offload" msgid="3966022676505972908">"ब्लूटूथ के ले ऑडियो हार्डवेयर ऑफ़लोड को बंद करें"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_title" msgid="6001142380445276918">"क्या आपको डिवाइस रीस्टार्ट करना है?"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_message" msgid="1524373895333698779">"इस सेटिंग को बदलने के लिए, आपको अपना डिवाइस रीस्टार्ट करना होगा."</string>
+    <string name="bluetooth_disable_hw_offload_dialog_confirm" msgid="5594859658551707592">"रीस्टार्ट करें"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel" msgid="3663690305043973720">"अभी नहीं"</string>
     <string name="connected_device_media_device_title" msgid="3783388247594566734">"मीडिया डिवाइस"</string>
     <string name="connected_device_call_device_title" msgid="88732390601723608">"कॉल की सुविधा वाले डिवाइस"</string>
     <string name="connected_device_other_device_title" msgid="4652120430615729193">"दूसरे डिवाइस"</string>
@@ -309,9 +310,9 @@
     <string name="security_settings_title" msgid="6710768415432791970">"सुरक्षा"</string>
     <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"एन्क्रिप्ट (सुरक्षित) करना और क्रेडेंशियल"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"फ़ोन सुरक्षित किया गया है"</string>
-    <string name="decryption_settings_summary" product="default" msgid="1742645256103613503">"फ़ोन सुरक्षित नहीं है"</string>
+    <string name="not_encrypted_summary" product="default" msgid="2251945842585788254">"फ़ोन को एन्क्रिप्ट (सुरक्षित) नहीं किया गया है"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"सुरक्षित किया गया डिवाइस"</string>
-    <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"डिवाइस सुरक्षित नहीं है"</string>
+    <string name="not_encrypted_summary" product="tablet" msgid="2374263654698719382">"डिवाइस को एन्क्रिप्ट (सुरक्षित) नहीं किया गया है"</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"लॉक स्क्रीन"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"लाॅक स्क्रीन पर क्या दिखाएं"</string>
     <string name="security_settings_summary" msgid="1627059516127354233">"मेरी जगह, स्‍क्रीन का लॉक खोलना, सिम कार्ड लॉक, क्रेडेंशियल स्टोरेज लॉक सेट करें"</string>
@@ -568,37 +569,10 @@
     <string name="fingerprint_last_delete_message" msgid="7860374760549404410">"आप फ़ोन अनलॉक करने या ऐप्लिकेशन में अपनी पहचान की पुष्टि करने के लिए, फ़िंगरप्रिंट का इस्तेमाल नहीं कर पाएंगे."</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="4104208067277655068">"आप अपनी वर्क प्रोफ़ाइल अनलॉक करने, खरीदारी की मंज़ूरी देने या ऑफ़िस के काम से जुड़े ऐप्लिकेशन में साइन इन करने के लिए, फ़िंगरप्रिंट का इस्तेमाल नहीं कर पाएंगे."</string>
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"हां, हटाएं"</string>
-    <string name="crypt_keeper_settings_title" msgid="4938812137822100044">"एन्क्रिप्ट करना"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"टैबलेट सुरक्षित करें"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"फ़ोन एन्क्रिप्ट करें"</string>
-    <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"एन्क्रिप्ट किया गया"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"आप अपने खाते, सेटिंग, डाउनलोड किए गए ऐप और उनका डेटा, मीडिया और अन्य फ़ाइलें सुरक्षित कर सकते हैं. अपना टैबलेट सुरक्षित करने के बाद, यह मानते हुए कि आपने स्क्रीन लॉक (जैसे पैटर्न या पिन या पासवर्ड) सेट कर लिया है, आपको हर बार अपना टैबलेट चालू करते समय इसे सबकी पहुंच में लाने के लिए स्क्रीन के लॉक को खोलना होगा. आप फ़ैक्ट्री डेटा रीसेट करके भी टैबलेट को सबकी पहुंच में ला सकते हैं. \n\nसुरक्षित करने में एक घंटा या इससे ज़्यादा समय लग सकता है. आप जब सुरक्षित करना शुरू करें तो बैटरी को पूरी तरह चार्ज रखें और पूरी प्रक्रिया के दौरान अपने टैबलेट को चार्जिंग पर रखें. अगर सुरक्षित करने के दौरान कोई रुकावट आती है, तो आपका थोड़ा या सारा डेटा खो सकता है."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"आप अपने खाते, सेटिंग, डाउनलोड किए गए ऐप और उनका डेटा, मीडिया और अन्य फ़ाइलें सुरक्षित कर सकते हैं. अपना फ़ोन सुरक्षित करने के बाद, यह मानते हुए कि आपने स्क्रीन लॉक (जैसे पैटर्न या पिन या पासवर्ड) सेट कर लिया है, आपको हर बार अपना फ़ोन चालू करते समय इसे सबकी पहुंच में लाने के लिए स्क्रीन के लॉक को खोलना होगा. आप फ़ैक्ट्री डेटा रीसेट करके भी फ़ोन को सबकी पहुंच में ला सकते हैं. \n\nसुरक्षित करने में एक घंटा या इससे ज़्यादा समय लग सकता है. आप जब सुरक्षित करना शुरू करें तो बैटरी को पूरी तरह चार्ज रखें और पूरी प्रक्रिया के दौरान अपने फ़ोन को चार्जिंग पर रखें. अगर सुरक्षित करने के दौरान कोई रुकावट आती है, तो आपका थोड़ा या सारा डेटा खो सकता है."</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"टैबलेट सुरक्षित करें"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"फ़ोन एन्क्रिप्ट करें"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"अपनी बैटरी चार्ज करें और फिर से प्रयास करें."</string>
-    <string name="crypt_keeper_unplugged_text" msgid="2709721134148651329">"अपना चार्जर प्लग में लगाएं और फिर से प्रयास करें."</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="1847280235529858357">"कोई लॉक स्‍क्रीन पिन या पासवर्ड नहीं"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="7210616262954236042">"सुरक्षित करने से पहले आपको लॉक स्‍क्रीन पिन या पासवर्ड सेट करना होगा."</string>
-    <string name="crypt_keeper_confirm_title" msgid="8600000209722452230">"सुरक्षित करें?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="3270587498436152259">"सुरक्षित करने का काम एक बार शुरू करने के बाद इसे वापस बदला नहीं जा सकता और अगर आप इसे बीच में रोकते हैं, तो आप डेटा खो देंगे. सुरक्षित करने में एक घंटा या उससे ज़्यादा समय लग सकता है, इस दौरान टैबलेट कई बार रिस्टार्ट होगा."</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="3040428543349852419">"सुरक्षित करने का काम एक बार शुरू करने के बाद इसे वापस बदला नहीं जा सकता और अगर आप इसे बीच में रोकते हैं, तो आप डेटा खो देंगे. सुरक्षित करने में एक घंटा या उससे ज़्यादा समय लग सकता है, इस दौरान फ़ोन कई बार रिस्टार्ट होगा."</string>
-    <string name="crypt_keeper_setup_title" msgid="3339725741305796680">"एन्‍क्रिप्‍ट करना"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="4417016995091289019">"अपना टैबलेट एन्‍क्रिप्‍ट होने तक इंतज़ार करें. <xliff:g id="PERCENT">^1</xliff:g>% पूरा हुआ."</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="7902355422499500352">"अपना फ़ोन एन्‍क्रिप्‍ट होने तक इंतज़ार करें. <xliff:g id="PERCENT">^1</xliff:g>% पूरा हुआ."</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="8348188415839917821">"जब तक आपका टैबलेट एन्क्रिप्ट किया जा रहा है तब तक प्रतीक्षा करें. शेष समय: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="8556105766597855198">"जब तक आपका फ़ोन एन्क्रिप्ट किया जा रहा है तब तक प्रतीक्षा करें. शेष समय: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="3832496715430327682">"अपना टैबलेट अनलॉक करने के लिए, उसे बंद करें फिर चालू करें."</string>
-    <string name="crypt_keeper_force_power_cycle" product="default" msgid="5070346039522135361">"अपना फ़ोन अनलॉक करने के लिए, उसे बंद करें फिर चालू करें."</string>
-    <string name="crypt_keeper_warn_wipe" msgid="8104921337301750394">"चेतावनी: अनलॉक किए जाने के <xliff:g id="COUNT">^1</xliff:g> और विफल प्रयासों के बाद आपका डिवाइस हटा दिया जाएगा!"</string>
-    <string name="crypt_keeper_enter_password" msgid="1274917431075529732">"अपना पासवर्ड लिखें"</string>
-    <string name="crypt_keeper_failed_title" msgid="8173654570682244149">"सुरक्षित नहीं किया जा सका"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"सुरक्षित करने में रुकावट हुई और यह काम पूरा नहीं किया जा सका. इसलिए अब आपके टैबलेट के डेटा तक नहीं पहुंचा जा सकता. \n\nअपने टैबलेट का इस्तेमाल फिर से शुरू करने के लिए, आपको फ़ैक्‍ट्री रीसेट करना होगा. जब आप रीसेट करने के बाद अपना टैबलेट सेट करेंगे, तो आप अपने Google खाते पर बैकअप लिए गए किसी भी डेटा को बहाल कर सकेंगे."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"सुरक्षित करने में रुकावट हुई और यह काम पूरा नहीं किया जा सका. इसलिए अब आपके फ़ोन के डेटा तक नहीं पहुंचा जा सकता. \n\nअपने फ़ोन का इस्तेमाल फिर से शुरू करने के लिए, आपको फ़ैक्‍ट्री रीसेट करना होगा. जब आप रीसेट करने के बाद अपना फ़ोन सेट करेंगे, तो आप अपने Google खाते पर बैकअप लिए गए किसी भी डेटा को बहाल कर सकेंगे."</string>
-    <string name="crypt_keeper_data_corrupt_title" msgid="5920153462176846037">"डीक्रिप्‍शन असफल"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"  डाला गया पासवर्ड सही है, लेकिन दुर्भाग्‍य से आपका डेटा दूषित है. \n\nअपने टैबलेट का उपयोग फिर से शुरू करने के लिए आपको फ़ैक्टरी रीसेट करना होगा. जब आप रीसेट के बाद अपना टैबलेट रीसेट करते हैं, तो आपके पास अपने Google खाते में बैकअप लिए गए किसी भी डेटा को फिर से स्‍थापित करने का अवसर होगा."</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"  डाला गया पासवर्ड सही है, लेकिन दुर्भाग्‍य से आपका डेटा दूषित है. \n\nअपने फ़ोन का उपयोग फिर से शुरू करने के लिए आपको फ़ैक्टरी रीसेट करना होगा. जब आप रीसेट के बाद अपना फ़ोन सेट करते हैं, तो आपके पास अपने Google खाते में बैकअप किए गए किसी भी डेटा को फिर से स्‍थापित करने का अवसर होगा."</string>
-    <string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"इनपुट का तरीका बदलें"</string>
+    <string name="encryption_settings_title" msgid="2848716008695618360">"एन्क्रिप्ट (सुरक्षित) करने का तरीका"</string>
+    <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"टैबलेट एन्क्रिप्ट (सुरक्षित) करें"</string>
+    <string name="encrypt_title" product="default" msgid="7337365190988321100">"फ़ोन एन्क्रिप्ट (सुरक्षित) करें"</string>
+    <string name="encrypted_summary" msgid="545623487587251207">"एन्क्रिप्ट (सुरक्षित) किया गया है"</string>
     <string name="suggested_lock_settings_title" msgid="7836065447159730217">"अपना फ़ोन सुरक्षित करें"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"टैबलेट को सुरक्षित रखने के लिए स्क्रीन लॉक सेट करें"</string>
     <string name="suggested_lock_settings_summary" product="device" msgid="8479766049078378225">"डिवाइस को सुरक्षित रखने के लिए स्क्रीन लॉक सेट करें"</string>
@@ -817,6 +791,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"आपको अन्‍य डिवाइस पर भी यह पि‍न लिखने की आवश्‍यकता हो सकती है."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"आपको अन्‍य डिवाइस पर भी यह पासकी लिखनी होगी."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"इससे युग्मित करने के लिए:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;पक्का करें कि वह यह पासकी दिखा रहा है:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"कोऑर्डिनेटेड सेट से जोड़ने के लिए पुष्टि करें"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"इससे:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;इस डिवाइस से जोड़ें?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"इसके साथ युग्‍मित करने के लिए:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>इस पर लिखें:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, फिर Return या Enter दबाएं."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"अपने संपर्क और कॉल इतिहास देखने की मंज़ूरी दें"</string>
@@ -850,6 +825,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"कनेक्ट नहीं हो सका. फिर से कोशिश करें."</string>
     <string name="device_details_title" msgid="1155622417516195481">"डिवाइस की जानकारी"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"डिवाइस का ब्लूटूथ पता: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"डिवाइस के ब्लूटूथ का पता:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"डिवाइस को भूलना चाहते हैं?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"डिसकनेक्ट करें"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"क्या आप ऐप्लिकेशन को डिसकनेक्ट करना चाहते हैं?"</string>
@@ -881,6 +857,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"सेटिंग याद रखें"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"ब्लूटूथ के ज़रिए ज़्यादा से ज़्यादा कितने ऑडियो डिवाइस जुड़ सकते हैं"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"यह चुनें कि ब्लूटूथ के ज़रिए ज़्यादा से ज़्यादा कितने ऑडियो डिवाइस जुड़ सकते हैं"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"एनएफ़सी स्टैक डीबग लॉग"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"एनएफ़सी स्टैक को लॉग करने का लेवल बढ़ाएं"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"कास्ट करें"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"स्क्रीन शेयर करें"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"बिना वायर के स्क्रीन दिखाना (वायरलेस डिसप्ले) चालू करें"</string>
@@ -1188,6 +1166,8 @@
     <string name="wifi_hotspot_maximize_compatibility_dual_ap_summary" msgid="3579549223159056533">"इस सुविधा की मदद से, अन्य डिवाइस इस हॉटस्पॉट को खोज सकते हैं. इसमें बैटरी ज़्यादा खर्च होती है."</string>
     <string name="wifi_tether_starting" msgid="8879874184033857814">"हॉटस्‍पॉट को चालू किया जा रहा है…"</string>
     <string name="wifi_tether_stopping" msgid="4416492968019409188">"हॉटस्‍पॉट को बंद किया जा रहा है…"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_title" msgid="3089432578433978073">"टेदरिंग की सुविधा उपलब्ध नहीं है"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_content" msgid="5920421547607921112">"ज़्यादा जानकारी के लिए, मोबाइल और इंटरनेट सेवा देने वाली कंपनी से संपर्क करें"</string>
     <string name="wifi_tether_enabled_subtext" msgid="5085002421099821056">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> सक्रिय है"</string>
     <string name="wifi_tether_failed_subtext" msgid="437190628041885500">"पोर्टेबल वाई-फ़ाई  हॉटस्‍पॉट गड़बड़ी"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7072559431286459122">"वाई-फ़ाई  हॉटस्‍पॉट सेट करें"</string>
@@ -2446,7 +2426,7 @@
     </plurals>
     <string name="accessibility_audio_adjustment_title" msgid="1332113739136802997">"ऑडियो में बदलाव करने की सेटिंग"</string>
     <string name="accessibility_summary_shortcut_enabled" msgid="4030427268146752644">"शॉर्टकट चालू है"</string>
-    <string name="accessibility_summary_shortcut_disabled" msgid="564005462092499068">"बंद है"</string>
+    <string name="accessibility_summary_shortcut_disabled" msgid="564005462092499068">"बंद"</string>
     <string name="accessibility_summary_state_enabled" msgid="1065431632216039369">"चालू है"</string>
     <string name="accessibility_summary_state_disabled" msgid="9173234532752799694">"बंद है"</string>
     <string name="accessibility_summary_state_stopped" msgid="2343602489802623424">"सेवा काम नहीं कर रही. जानकारी पाने के लिए टैप करें."</string>
@@ -2534,11 +2514,6 @@
     <string name="enable_service_title" msgid="7231533866953706788">"<xliff:g id="SERVICE">%1$s</xliff:g> को अपना डिवाइस पूरी तरह कंट्रोल करने की अनुमति दें?"</string>
     <string name="capabilities_list_title" msgid="1225853611983394386">"<xliff:g id="SERVICE">%1$s</xliff:g> के लिए यह ज़रूरी है:"</string>
     <string name="touch_filtered_warning" msgid="4225815157460318241">"क्यूंकि ऐप की वजह से अनुमति के अनुरोध को समझने में दिक्कत हो रही है, इसलिए सेटिंग से आपके जवाब की पुष्टि नहीं हो पा रही हैं."</string>
-    <string name="enable_service_encryption_warning" msgid="931082737770453755">"अगर आप <xliff:g id="SERVICE">%1$s</xliff:g> को चालू करते हैं, तो आपका डिवाइस डेटा सुरक्षित करने के काम को बेहतर करने के लिए आपके स्क्रीन लॉक का इस्तेमाल नहीं करेगा."</string>
-    <string name="secure_lock_encryption_warning" msgid="669152607190123579">"क्योंकि आपने सुलभता सेवा चालू की हुई है इसलिए आपका डिवाइस डेटा सुरक्षित करने के बेहतर करने के लिए आपके स्क्रीन लॉक का इस्तेमाल नहीं करेगा."</string>
-    <string name="enable_service_pattern_reason" msgid="6832846117817938536">"क्‍योंकि <xliff:g id="SERVICE">%1$s</xliff:g> को चालू करने से डेटा ऐन्‍क्रिप्‍शन प्रभावित होता है, इसलिए आपको अपने पैटर्न की पुष्‍टि करनी होगी."</string>
-    <string name="enable_service_pin_reason" msgid="6040417014360237703">"क्‍योंकि <xliff:g id="SERVICE">%1$s</xliff:g> को चालू करने से डेटा ऐन्‍क्रिप्‍शन प्रभावित होता है, इसलिए आपको अपने पिन की पुष्‍टि करनी होगी"</string>
-    <string name="enable_service_password_reason" msgid="6962544350351734238">"क्‍योंकि <xliff:g id="SERVICE">%1$s</xliff:g> को चालू करने से डेटा ऐन्‍क्रिप्‍शन प्रभावित होता है, इसलिए आपको अपने पासवर्ड की पुष्‍टि करनी होगी."</string>
     <string name="accessibility_service_warning" msgid="6779187188736432618">"<xliff:g id="SERVICE">%1$s</xliff:g> इस डिवाइस पर पूरा नियंत्रण मांग रहा है. यह सेवा, स्क्रीन पर दिख रही जानकारी पढ़ सकती है और सुलभता से जुड़ी ज़रूरतों वाले उपयोगकर्ताओं की तरफ़ से काम कर सकती है. नियंत्रण का यह लेवल ज़्यादातर ऐप्लिकेशन के लिए सही नहीं है."</string>
     <string name="accessibility_service_warning_description" msgid="6573203795976134751">"पूरी तरह कंट्रोल करने की अनुमति उन ऐप्लिकेशन के लिए ठीक है जो सुलभता से जुड़ी ज़रूरतों के लिए बने हैं, लेकिन ज़्यादातर ऐप्लिकेशन के लिए यह ठीक नहीं है."</string>
     <string name="accessibility_service_screen_control_title" msgid="324795030658109870">"स्क्रीन को देखें और कंट्रोल करें"</string>
@@ -3103,14 +3078,6 @@
     <string name="remove_account_failed" msgid="3709502163548900644">"आपका व्यवस्थापक इस बदलाव की अनुमति नहीं देता"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"मैन्युअल रूप से समन्वयित नहीं कर सकता"</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"इस आइटम के लिए समन्वयन वर्तमान में अक्षम है. यह सेटिंग बदलने के लिए, पृष्ठभूमि डेटा और स्वचालित समन्वयन को अस्थायी रूप से चालू करें."</string>
-    <string name="enter_password" msgid="6327051330258595331">"Android प्रारंभ करने के लिए, अपना पासवर्ड डालें"</string>
-    <string name="enter_pin" msgid="1029287617551232681">"Android प्रारंभ करने के लिए, अपना पिन डालें"</string>
-    <string name="enter_pattern" msgid="1747316785866742960">"Android प्रारंभ करने के लिए, अपना प्रतिमान लिखें"</string>
-    <string name="cryptkeeper_wrong_pattern" msgid="340747269176120242">"गलत पैटर्न डाला गया है"</string>
-    <string name="cryptkeeper_wrong_password" msgid="7295607881887114486">"गलत पासवर्ड"</string>
-    <string name="cryptkeeper_wrong_pin" msgid="2347961593970714201">"गलत पिन"</string>
-    <string name="checking_decryption" msgid="6111642972615688237">"जाँच की जा रही है..."</string>
-    <string name="starting_android" msgid="6694154070215356186">"Android प्रारंभ किया जा रहा है..."</string>
     <string name="delete" msgid="8330605554706263775">"मिटाएं"</string>
     <string name="misc_files" msgid="6598066985800749585">"विविध फ़ाइलें"</string>
     <string name="misc_files_selected_count" msgid="5597802791672749532">"<xliff:g id="TOTAL">%2$d</xliff:g> में से <xliff:g id="NUMBER">%1$d</xliff:g> चयनित"</string>
@@ -3206,8 +3173,6 @@
     <string name="data_usage_metered_yes" msgid="4262598072030135223">"सीमित डेटा वाला नेटवर्क"</string>
     <string name="data_usage_metered_no" msgid="1685828958417926268">"बिल नहीं किया गया"</string>
     <string name="data_usage_disclaimer" msgid="3271450299386176770">"डेटा खर्च को लेकर मोबाइल और इंटरनेट सेवा देने वाली कंपनी का हिसाब आपके डिवाइस के हिसाब से अलग हो सकता है."</string>
-    <string name="cryptkeeper_emergency_call" msgid="8369322820475703306">"मुसीबत के समय कॉल"</string>
-    <string name="cryptkeeper_return_to_call" msgid="3857250752781151232">"कॉल पर वापस लौटें"</string>
     <string name="vpn_name" msgid="3806456074909253262">"नाम"</string>
     <string name="vpn_type" msgid="5533202873260826663">"टाइप"</string>
     <string name="vpn_server" msgid="2908816134941973935">"सर्वर पता"</string>
@@ -3518,7 +3483,7 @@
     <string name="app_and_notification_dashboard_summary" msgid="8047683010984186106">"हाल ही के ऐप्लिकेशन, डिफ़ॉल्ट ऐप्लिकेशन"</string>
     <string name="notification_settings_work_profile" msgid="6076211850526353975">"वर्क प्रोफ़ाइल चालू होने पर ऐप्लिकेशन से जुड़ी सूचना नहीं देखी जा सकती है."</string>
     <string name="account_dashboard_title" msgid="8228773251948253914">"पासवर्ड और खाते"</string>
-    <string name="account_dashboard_default_summary" msgid="1730719656099599488">"सेव किए गए पासवर्ड, ऑटोमैटिक भरना, सिंक किए गए खाते"</string>
+    <string name="account_dashboard_default_summary" msgid="1730719656099599488">"सेव किए गए पासवर्ड, अपने-आप भरना, सिंक किए गए खाते"</string>
     <string name="app_default_dashboard_title" msgid="4071015747629103216">"डिफ़ॉल्‍ट ऐप्लिकेशन"</string>
     <string name="system_dashboard_summary" msgid="7400745270362833832">"भाषाएं, जेस्चर, समय, बैकअप"</string>
     <string name="search_results_title" msgid="3360639917793022533">"सेटिंग"</string>
@@ -4764,8 +4729,6 @@
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> ऐप्लिकेशन बिना पाबंदी के डेटा का इस्तेमाल कर सकते हैं</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"और देखें"</string>
-    <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"उपयोगकर्ता डेटा को मिटाना और फ़ाइल सुरक्षित करने के तरीके में बदलना चाहते हैं?"</string>
-    <string name="button_confirm_convert_fbe" msgid="339648921918438106">"वाइप करें और रूपांतरित करें"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"ShortcutManager दर सीमित करना रीसेट करें"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"ShortcutManager दर सीमित करना रीसेट कर दिया गया है"</string>
     <string name="notification_suggestion_title" msgid="6309263655965785411">"लॉक स्क्रीन पर मौजूद जानकारी नियंत्रित करें"</string>
@@ -5292,6 +5255,7 @@
     <string name="sim_action_yes" msgid="8076556020131395515">"हां"</string>
     <string name="sim_action_reboot" msgid="3508948833333441538">"रीस्टार्ट करें"</string>
     <string name="sim_action_no_thanks" msgid="435717748384544195">"रहने दें"</string>
+    <string name="sim_action_cancel" msgid="2668099867029610910">"रद्द करें"</string>
     <string name="sim_switch_button" msgid="1405772571706095387">"स्‍विच करें"</string>
     <string name="dsds_activation_failure_title" msgid="4467364110584914794">"सिम चालू नहीं किया जा सका"</string>
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"सिम निकालकर फिर से लगाएं. अगर तब भी समस्या ठीक नहीं होती, तो डिवाइस को रीस्टार्ट करें."</string>
@@ -5444,6 +5408,10 @@
     <string name="cached_apps_freezer" msgid="1057519579761550350">"कैश किए गए ऐप्लिकेशन चलने से रोकना"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"\'सेटिंग\' पर स्क्रीन ओवरले करने की अनुमति दें"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"\'सेटिंग\' पर उन ऐप्लिकेशन को स्क्रीन ओवरले करने की अनुमति दें जो दूसरे ऐप्लिकेशन के ऊपर दिख सकते हैं"</string>
+    <!-- no translation found for allow_mock_modem (3832264806530479214) -->
+    <skip />
+    <!-- no translation found for allow_mock_modem_summary (9097416612748005374) -->
+    <skip />
     <string name="media_controls_title" msgid="403271085636252597">"मीडिया"</string>
     <string name="media_controls_resume_title" msgid="855076860336652370">"मीडिया प्लेयर को पिन करें"</string>
     <string name="media_controls_resume_description" msgid="3163482266454802097">"मीडिया प्लेयर \'फटाफट सेटिंग\' में खुला रहता है, ताकि आप मीडिया को तुरंत वहीं से शुरू कर सकें जहां आपने इसे छोड़ा था"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 8f4fdad..34a4e87 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -143,10 +143,11 @@
     <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"Dopustite uređaju da komunicira s Bluetooth uređajima u blizini"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"Dopustite telefonu da komunicira s Bluetooth uređajima u blizini"</string>
     <string name="bluetooth_disable_a2dp_hw_offload" msgid="5942913792817797541">"Onemogući Bluetooth A2DP hardversko rasterećenje"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="8610420176339657720">"Ponovo pokrenuti?"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8333029144800835996">"Ponovo pokrenite uređaj da biste promijenili tu postavku."</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="3488695418187553566">"Pokreni"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="4930826928585464191">"Odustani"</string>
+    <string name="bluetooth_disable_le_audio_hw_offload" msgid="3966022676505972908">"Onemogući uklanjanje Bluetooth LE AUDIO hardvera"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_title" msgid="6001142380445276918">"Ponovo pokrenuti uređaj?"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_message" msgid="1524373895333698779">"Ponovo pokrenite uređaj da biste promijenili tu postavku."</string>
+    <string name="bluetooth_disable_hw_offload_dialog_confirm" msgid="5594859658551707592">"Ponovo pokreni"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel" msgid="3663690305043973720">"Odustani"</string>
     <string name="connected_device_media_device_title" msgid="3783388247594566734">"Medijski uređaji"</string>
     <string name="connected_device_call_device_title" msgid="88732390601723608">"Uređaji za pozive"</string>
     <string name="connected_device_other_device_title" msgid="4652120430615729193">"Ostali uređaji"</string>
@@ -312,9 +313,9 @@
     <string name="security_settings_title" msgid="6710768415432791970">"Sigurnost"</string>
     <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"Enkripcija i vjerodajnice"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"Telefon je kriptiran"</string>
-    <string name="decryption_settings_summary" product="default" msgid="1742645256103613503">"Telefon nije kriptiran"</string>
+    <string name="not_encrypted_summary" product="default" msgid="2251945842585788254">"Telefon nije šifriran"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"Uređaj je kriptiran"</string>
-    <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"Uređaj nije kriptiran"</string>
+    <string name="not_encrypted_summary" product="tablet" msgid="2374263654698719382">"Uređaj nije šifriran"</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"Zaključan zaslon"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"Što prikazati"</string>
     <string name="security_settings_summary" msgid="1627059516127354233">"Postavi Moju lokaciju, otključavanje zaslona, zaključavanje SIM kartice, zaključavanje spremnika za vjerodajnice"</string>
@@ -574,37 +575,10 @@
     <string name="fingerprint_last_delete_message" msgid="7860374760549404410">"Otiskom prsta nećete moći otključati telefon niti potvrditi da ste to vi u aplikacijama."</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="4104208067277655068">"Otiskom prsta nećete moći otključati poslovni profil, autorizirati kupnje niti se prijaviti u poslovne aplikacije."</string>
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"Da, ukloni"</string>
-    <string name="crypt_keeper_settings_title" msgid="4938812137822100044">"Enkripcija"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"Kriptiraj tablet računalo"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"Šifriraj telefon"</string>
-    <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"Šifrirano"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"Možete šifrirati svoje račune, postavke, preuzete aplikacije i njihove podatke, multimedijske i druge datoteke. Nakon šifriranja tableta, pod pretpostavkom da ste postavili zaključavanje zaslona (to jest obrazac, brojčani PIN ili zaporku), prilikom svakog uključivanja morat ćete otključati zaslon kako biste dešifrirali tablet. Jedini drugi način dešifriranja jest vraćanje na tvorničko stanje, čime se brišu svi vaši podaci.\n\nŠifriranje traje najmanje sat vremena. Morate započeti s punom baterijom i tijekom postupka ostaviti tablet priključen na napajanje. Ako postupak prekinete, izgubit ćete neke ili sve svoje podatke."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"Možete šifrirati svoje račune, postavke, preuzete aplikacije i njihove podatke, multimedijske i druge datoteke. Nakon šifriranja telefona, pod pretpostavkom da ste postavili zaključavanje zaslona (to jest obrazac, brojčani PIN ili zaporku), prilikom svakog uključivanja morat ćete otključati zaslon kako biste dešifrirali telefon. Jedini drugi način dešifriranja jest vraćanje na tvorničko stanje, čime se brišu svi vaši podaci.\n\nŠifriranje traje najmanje sat vremena. Morate započeti s punom baterijom i tijekom postupka držati telefon priključen na napajanje. Ako prekinete postupak, izgubit ćete neke ili sve svoje podatke."</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"Kriptiraj tablet uređaj"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"Šifriraj telefon"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"Napunite bateriju i pokušajte ponovo."</string>
-    <string name="crypt_keeper_unplugged_text" msgid="2709721134148651329">"Uključite punjač i pokušajte ponovo."</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="1847280235529858357">"Nema PIN-a ili zaporke za zaključani zaslon"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="7210616262954236042">"Prije nego što ćete moći započeti enkripciju morat ćete postaviti PIN za zaključavanje zaslona ili zaporku."</string>
-    <string name="crypt_keeper_confirm_title" msgid="8600000209722452230">"Šifrirati?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="3270587498436152259">"Postupak šifriranja nepovratan je i ako ga prekinete, izgubit ćete podatke. Šifriranje traje najmanje sat vremena, a za to vrijeme tablet će se nekoliko puta ponovo pokrenuti."</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="3040428543349852419">"Postupak šifriranja nepovratan je i ako ga prekinete, izgubit ćete podatke. Šifriranje traje najmanje sat vremena, a za to vrijeme telefon će se nekoliko puta ponovo pokrenuti."</string>
-    <string name="crypt_keeper_setup_title" msgid="3339725741305796680">"Kriptiranje"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="4417016995091289019">"Pričekajte dok ne završi kriptiranje vašeg tabletnog računala. <xliff:g id="PERCENT">^1</xliff:g>% dovršeno."</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="7902355422499500352">"Pričekajte dok ne završi kriptiranje telefona. <xliff:g id="PERCENT">^1</xliff:g>% dovršeno."</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="8348188415839917821">"Pričekajte dok se vaš tablet kodira. Preostalo vrijeme: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="8556105766597855198">"Pričekajte dok se vaš telefon kodira. Preostalo vrijeme: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="3832496715430327682">"Da biste otključali tablet, isključite ga i ponovo uključite."</string>
-    <string name="crypt_keeper_force_power_cycle" product="default" msgid="5070346039522135361">"Da biste otključali telefon, isključite ga i ponovo uključite."</string>
-    <string name="crypt_keeper_warn_wipe" msgid="8104921337301750394">"Upozorenje: možete pokušati otključati uređaj još <xliff:g id="COUNT">^1</xliff:g> puta. Ako ne uspijete, izbrisat će se podaci na uređaju!"</string>
-    <string name="crypt_keeper_enter_password" msgid="1274917431075529732">"Unesite zaporku"</string>
-    <string name="crypt_keeper_failed_title" msgid="8173654570682244149">"Šifriranje nije uspjelo"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"Šifriranje je prekinuto i ne može se dovršiti. Podaci na vašem tabletu zbog toga više nisu dostupni.\n\nDa biste nastavili upotrebljavati svoj tablet, trebate ga vratiti na tvorničke postavke. Prilikom postavljanja tableta nakon vraćanja u tvorničko stanje imat ćete priliku vratiti sve podatke za koje ste na Google računu izradili sigurnosnu kopiju."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"Šifriranje je prekinuto i ne može se dovršiti. Podaci na vašem telefonu zato više nisu dostupni. \n\nDa biste nastavili upotrebljavati ​​telefon, morate ga vratiti na tvorničke postavke. Kada nakon toga postavite svoj telefon, imat ćete priliku vratiti sve podatke čije su sigurnosne kopije stvorene na vašem Google računu."</string>
-    <string name="crypt_keeper_data_corrupt_title" msgid="5920153462176846037">"Dešifriranje nije uspjelo"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"Unijeli ste točnu zaporku, ali su vaši podaci oštećeni. \n\nZa daljnju upotrebu tableta morate ga vratiti na tvorničke postavke. Nakon što vratite tablet na zadano, imat ćete priliku oporaviti podatke koje ste sigurnosno kopirali na svoj Google račun."</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"Unijeli ste točnu zaporku, ali su vaši podaci oštećeni. \n\nZa daljnju upotrebu telefona morate ga vratiti na tvorničke postavke. Nakon što vratite telefon na zadano, imat ćete priliku oporaviti podatke koje ste sigurnosno kopirali na svoj Google račun."</string>
-    <string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"Promjena načina unosa"</string>
+    <string name="encryption_settings_title" msgid="2848716008695618360">"Šifriranje"</string>
+    <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"Šifriraj tablet"</string>
+    <string name="encrypt_title" product="default" msgid="7337365190988321100">"Šifriraj telefon"</string>
+    <string name="encrypted_summary" msgid="545623487587251207">"Šifrirano"</string>
     <string name="suggested_lock_settings_title" msgid="7836065447159730217">"Zaštitite telefon"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"Postavite zaključavanje zaslona radi zaštite tableta"</string>
     <string name="suggested_lock_settings_summary" product="device" msgid="8479766049078378225">"Postavite zaključavanje zaslona radi zaštite uređaja"</string>
@@ -836,6 +810,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Možda biste također trebali unijeti ovaj PIN i na drugi uređaj."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Možda ćete ovaj pristupni kôd trebati unijeti i na drugi uređaj."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Za uparivanje s:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Uvjerite se da prikazuje ovaj pristupni kôd:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Potvrdite za uparivanje s koordiniranim skupom"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"Od:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Upariti se s ovim uređajem?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Za uparivanje s uređajem:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>upišite:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g> na tom uređaju pa pritisnite tipke Return ili Enter."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Dopuštam pristup kontaktima i povijesti poziva"</string>
@@ -869,6 +844,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Povezivanje nije uspjelo. Pokušajte ponovo."</string>
     <string name="device_details_title" msgid="1155622417516195481">"O uređaju"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Bluetooth adresa uređaja: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Bluetooth adresa uređaja:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Zaboraviti uređaj?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Ukloni povezivanje"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Prekinuti vezu s aplikacijom?"</string>
@@ -900,6 +876,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Zapamti postavke"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Maksimalan broj povezanih Bluetooth audiouređaja"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Odaberite maksimalan broj povezanih Bluetooth audiouređaja"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"Zapisnik o otklanjanju pogrešaka za NFC stog"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Povećajte razinu zapisivanja za NFC stog"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Emitiranje"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"zrcalo"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Omogući bežični prikaz"</string>
@@ -1210,6 +1188,8 @@
     <string name="wifi_hotspot_maximize_compatibility_dual_ap_summary" msgid="3579549223159056533">"Pomaže drugim uređajima da pronađu ovu žarišnu točku. Povećava potrošnju baterije."</string>
     <string name="wifi_tether_starting" msgid="8879874184033857814">"Uključivanje žarišne točke…"</string>
     <string name="wifi_tether_stopping" msgid="4416492968019409188">"Isključivanje žarišne točke…"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_title" msgid="3089432578433978073">"Modemsko povezivanje nije dostupno"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_content" msgid="5920421547607921112">"Više informacija zatražite od svog mobilnog operatera."</string>
     <string name="wifi_tether_enabled_subtext" msgid="5085002421099821056">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> je aktivan"</string>
     <string name="wifi_tether_failed_subtext" msgid="437190628041885500">"Pogreška prijenosne Wi-Fi žarišne točke"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7072559431286459122">"Postavljanje Wi-Fi žarišne točke"</string>
@@ -2565,11 +2545,6 @@
     <string name="enable_service_title" msgid="7231533866953706788">"Želite li usluzi <xliff:g id="SERVICE">%1$s</xliff:g> dopustiti potpunu kontrolu nad uređajem?"</string>
     <string name="capabilities_list_title" msgid="1225853611983394386">"<xliff:g id="SERVICE">%1$s</xliff:g> treba sljedeće:"</string>
     <string name="touch_filtered_warning" msgid="4225815157460318241">"Budući da aplikacija prekriva zahtjev za dopuštenje, Postavke ne mogu potvrditi vaš odgovor."</string>
-    <string name="enable_service_encryption_warning" msgid="931082737770453755">"Ako uključite <xliff:g id="SERVICE">%1$s</xliff:g>, vaš uređaj neće upotrebljavati PIN ili zaporku za zaključavanje zaslona za bolje šifriranje podataka."</string>
-    <string name="secure_lock_encryption_warning" msgid="669152607190123579">"Budući da ste uključili uslugu pristupačnosti, vaš uređaj neće upotrebljavati PIN ili zaporku za zaključavanje zaslona za bolje šifriranje podataka."</string>
-    <string name="enable_service_pattern_reason" msgid="6832846117817938536">"Budući da uključivanje usluge <xliff:g id="SERVICE">%1$s</xliff:g> utječe na enkripciju podataka, morate potvrditi uzorak."</string>
-    <string name="enable_service_pin_reason" msgid="6040417014360237703">"Budući da uključivanje usluge <xliff:g id="SERVICE">%1$s</xliff:g> utječe na enkripciju podataka, morate potvrditi PIN."</string>
-    <string name="enable_service_password_reason" msgid="6962544350351734238">"Budući da uključivanje usluge <xliff:g id="SERVICE">%1$s</xliff:g> utječe na enkripciju podataka, morate potvrditi zaporku."</string>
     <string name="accessibility_service_warning" msgid="6779187188736432618">"Usluga <xliff:g id="SERVICE">%1$s</xliff:g> zahtijeva punu kontrolu nad ovim uređajem. Ta usluga može čitati zaslon i postupati u ime korisnika kojima je potrebna prilagođena pristupačnost. Ta razina kontrole nije primjerena za većinu aplikacija."</string>
     <string name="accessibility_service_warning_description" msgid="6573203795976134751">"Potpuna kontrola prikladna je za aplikacije koje vam pomažu s potrebama pristupačnosti, ali ne i za većinu aplikacija."</string>
     <string name="accessibility_service_screen_control_title" msgid="324795030658109870">"Pregled zaslona i upravljanje njime"</string>
@@ -3145,14 +3120,6 @@
     <string name="remove_account_failed" msgid="3709502163548900644">"Vaš administrator ne dopušta tu promjenu"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"Nije moguća ručna sinkronizacija"</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"Sinkronizacija za tu stavku trenutačno je onemogućena. Da biste promijenili tu postavku, privremeno uključite pozadinske podatke i automatsku sinkronizaciju."</string>
-    <string name="enter_password" msgid="6327051330258595331">"Da biste pokrenuli Android, unesite zaporku"</string>
-    <string name="enter_pin" msgid="1029287617551232681">"Da biste pokrenuli Android, unesite svoj PIN"</string>
-    <string name="enter_pattern" msgid="1747316785866742960">"Da biste pokrenuli Android, nacrtajte svoj obrazac"</string>
-    <string name="cryptkeeper_wrong_pattern" msgid="340747269176120242">"Pogrešan uzorak"</string>
-    <string name="cryptkeeper_wrong_password" msgid="7295607881887114486">"Pogrešna zaporka"</string>
-    <string name="cryptkeeper_wrong_pin" msgid="2347961593970714201">"Pogrešan PIN"</string>
-    <string name="checking_decryption" msgid="6111642972615688237">"Provjeravanje…"</string>
-    <string name="starting_android" msgid="6694154070215356186">"Pokretanje Androida..."</string>
     <string name="delete" msgid="8330605554706263775">"Izbriši"</string>
     <string name="misc_files" msgid="6598066985800749585">"Razne datoteke"</string>
     <string name="misc_files_selected_count" msgid="5597802791672749532">"odabrano <xliff:g id="NUMBER">%1$d</xliff:g> od <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -3248,8 +3215,6 @@
     <string name="data_usage_metered_yes" msgid="4262598072030135223">"S ograničenim prometom"</string>
     <string name="data_usage_metered_no" msgid="1685828958417926268">"Bez naplate prijenosa"</string>
     <string name="data_usage_disclaimer" msgid="3271450299386176770">"Mobilni operater može obračunavati podatke na drugačiji način od uređaja."</string>
-    <string name="cryptkeeper_emergency_call" msgid="8369322820475703306">"Hitni poziv"</string>
-    <string name="cryptkeeper_return_to_call" msgid="3857250752781151232">"Vrati se na poziv"</string>
     <string name="vpn_name" msgid="3806456074909253262">"Naziv"</string>
     <string name="vpn_type" msgid="5533202873260826663">"Vrsta"</string>
     <string name="vpn_server" msgid="2908816134941973935">"Adresa poslužitelja"</string>
@@ -4841,8 +4806,6 @@
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> aplikacija može upotrebljavati neograničene podatke</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"Prikaži više"</string>
-    <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"Želite li doista izbrisati korisničke podatke i prijeći na enkripciju datoteka?"</string>
-    <string name="button_confirm_convert_fbe" msgid="339648921918438106">"Izbriši i pretvori"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"Poništi ograničavanje brzine ShortcutManagera"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"Ograničavanje brzine ShortcutManagera poništeno je"</string>
     <string name="notification_suggestion_title" msgid="6309263655965785411">"Upravljanje informacijama na zaključanom zaslonu"</string>
@@ -5381,6 +5344,7 @@
     <string name="sim_action_yes" msgid="8076556020131395515">"Da"</string>
     <string name="sim_action_reboot" msgid="3508948833333441538">"Pokreni ponovo"</string>
     <string name="sim_action_no_thanks" msgid="435717748384544195">"Ne, hvala"</string>
+    <string name="sim_action_cancel" msgid="2668099867029610910">"Odustani"</string>
     <string name="sim_switch_button" msgid="1405772571706095387">"Prebaci"</string>
     <string name="dsds_activation_failure_title" msgid="4467364110584914794">"SIM se ne može aktivirati"</string>
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Izvadite SIM i umetnite ga ponovo. Ako se problem ponovi, ponovo pokrenite uređaj."</string>
@@ -5535,6 +5499,10 @@
     <string name="cached_apps_freezer" msgid="1057519579761550350">"Obustavi izvršenje za predmemorirane aplikacije"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"Dopustite preklapanja na zaslonu na Postavkama"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Dopustite aplikacije koje se mogu prikazivati iznad drugih da se preklapaju na zaslonima Postavki"</string>
+    <!-- no translation found for allow_mock_modem (3832264806530479214) -->
+    <skip />
+    <!-- no translation found for allow_mock_modem_summary (9097416612748005374) -->
+    <skip />
     <string name="media_controls_title" msgid="403271085636252597">"Mediji"</string>
     <string name="media_controls_resume_title" msgid="855076860336652370">"Prikvači media player"</string>
     <string name="media_controls_resume_description" msgid="3163482266454802097">"Da bi se reprodukcija brzo nastavila, media player ostaje otvoren u brzim postavkama"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 2894335..aba4e16 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -142,10 +142,11 @@
     <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"Eszköze kommunikálhat a közeli Bluetooth-eszközökkel"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"Telefonja kommunikálhat a közeli Bluetooth-eszközökkel"</string>
     <string name="bluetooth_disable_a2dp_hw_offload" msgid="5942913792817797541">"Bluetooth A2DP hardver tehermentesítésének letiltása"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="8610420176339657720">"Újraindítja az eszközt?"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8333029144800835996">"A beállítás módosításához újra kell indítania az eszközt."</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="3488695418187553566">"Újraindít"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="4930826928585464191">"Mégse"</string>
+    <string name="bluetooth_disable_le_audio_hw_offload" msgid="3966022676505972908">"Bluetooth LE AUDIO hardver tehermentesítésének letiltása"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_title" msgid="6001142380445276918">"Újraindítja az eszközt?"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_message" msgid="1524373895333698779">"A beállítás módosításához újra kell indítania az eszközt."</string>
+    <string name="bluetooth_disable_hw_offload_dialog_confirm" msgid="5594859658551707592">"Újraindítás"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel" msgid="3663690305043973720">"Mégse"</string>
     <string name="connected_device_media_device_title" msgid="3783388247594566734">"Médiaeszközök"</string>
     <string name="connected_device_call_device_title" msgid="88732390601723608">"Hívóeszközök"</string>
     <string name="connected_device_other_device_title" msgid="4652120430615729193">"Egyéb eszközök"</string>
@@ -309,9 +310,9 @@
     <string name="security_settings_title" msgid="6710768415432791970">"Biztonság"</string>
     <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"Titkosítás és hitelesítési adatok"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"Telefon titkosítva"</string>
-    <string name="decryption_settings_summary" product="default" msgid="1742645256103613503">"A telefon nincs titkosítva"</string>
+    <string name="not_encrypted_summary" product="default" msgid="2251945842585788254">"A telefon nincs titkosítva"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"Az eszköz titkosítva"</string>
-    <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"Az eszköz nincs titkosítva"</string>
+    <string name="not_encrypted_summary" product="tablet" msgid="2374263654698719382">"Az eszköz nincs titkosítva"</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"Lezárási képernyő"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"Mi jelenjen meg?"</string>
     <string name="security_settings_summary" msgid="1627059516127354233">"Saját pozíció beállítása, képernyőzár feloldása, SIM-kártya zárolása, hitelesítési adatok tárolójának zárolása"</string>
@@ -480,7 +481,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"Törlés"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"Érintse meg az érzékelőt"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"Helyezze az ujját az érzékelőre, és emelje fel a rezgést követően"</string>
-    <string name="security_settings_udfps_enroll_start_message" msgid="5032954588171487566">"A rezgésig tartsa ujját egyenesen az érzékelőn"</string>
+    <string name="security_settings_udfps_enroll_start_message" msgid="5032954588171487566">"A rezgésig tartsa az ujját egyenesen az érzékelőn"</string>
     <string name="security_settings_fingerprint_enroll_udfps_title" msgid="6665610134560896895">"Tartsa ujját az ujjlenyomat-érzékelőn"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"Emelje fel, majd érintse újra"</string>
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"Még egyszer"</string>
@@ -568,37 +569,10 @@
     <string name="fingerprint_last_delete_message" msgid="7860374760549404410">"Nem tudja majd ujjlenyomatát használni a telefon zárolásának feloldásához és a személyazonossága igazolásához az alkalmazásokban."</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="4104208067277655068">"Nem tudja majd ujjlenyomatát használni munkaprofilja feloldásához, vásárlások engedélyezéséhez és munkahelyi alkalmazásokba való bejelentkezéshez."</string>
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"Igen, eltávolítom"</string>
-    <string name="crypt_keeper_settings_title" msgid="4938812137822100044">"Titkosítás"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"Táblagép titkosítása"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"Telefon titkosítása"</string>
-    <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"Titkosítva"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"Titkosíthatja fiókjait, beállításait, letöltött alkalmazásait és azok adatait, illetve média- és egyéb fájljait. Ha táblagépe titkosítását követően képernyőzárat állít be (mintával, számjegyekből álló PIN-kóddal vagy jelszóval), minden bekapcsoláskor fel kell oldania a képernyő zárolását a táblagép titkosításának feloldásához. A titkosítás feloldásának egyetlen további módja a gyári adatok visszaállítása, amely során valamennyi adat törlődik.\n\nA titkosítás legalább egy órát vesz igénybe. Feltöltött akkumulátorral kezdjen neki, és az egész folyamat során tartsa a táblagépet hálózati áramforráshoz csatlakoztatva. Ha megszakítja a folyamatot, az az adatok részleges vagy teljes elvesztésével járhat"</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"Titkosíthatja fiókjait, beállításait, letöltött alkalmazásait és azok adatait, illetve média- és egyéb fájljait. Ha telefonja titkosítását követően képernyőzárat állít be (mintával, számjegyekből álló PIN-kóddal vagy jelszóval), minden bekapcsoláskor fel kell oldania a képernyő zárolását a telefon titkosításának feloldásához. A titkosítás feloldásának egyetlen további módja a gyári adatok visszaállítása, amely során valamennyi adat törlődik.\n\nA titkosítás legalább egy órát vesz igénybe. Feltöltött akkumulátorral kezdjen neki, és az egész folyamat során tartsa a telefont hálózati áramforráshoz csatlakoztatva. Ha megszakítja a folyamatot, az az adatok részleges vagy teljes elvesztésével járhat."</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"Táblagép titkosítása"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"Telefon titkosítása"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"Töltse fel az akkumulátort, és próbálja újra."</string>
-    <string name="crypt_keeper_unplugged_text" msgid="2709721134148651329">"Csatlakoztassa töltőjét, és próbálja újra."</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="1847280235529858357">"Nincs a zárolási képernyőhöz tartozó PIN-kód vagy jelszó"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="7210616262954236042">"Be kell állítani egy zárolási képernyőhöz tartozó PIN-kódot vagy jelszót a titkosítás megkezdése előtt."</string>
-    <string name="crypt_keeper_confirm_title" msgid="8600000209722452230">"Titkosítja?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="3270587498436152259">"A titkosítási művelet visszafordíthatatlan, ha megszakítja, adatai elvesznek. A titkosítás legalább egy órát vesz igénybe, mialatt a táblagép többször újra fog indulni."</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="3040428543349852419">"A titkosítási művelet visszafordíthatatlan, ha megszakítja, adatai elvesznek. A titkosítás legalább egy órát vesz igénybe, mialatt a telefon többször újra fog indulni."</string>
-    <string name="crypt_keeper_setup_title" msgid="3339725741305796680">"Titkosítás"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="4417016995091289019">"Kérjük, várjon, amíg a táblagép titkosítása befejeződik. <xliff:g id="PERCENT">^1</xliff:g>% kész."</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="7902355422499500352">"Kérjük, várjon a telefonja titkosításáig. <xliff:g id="PERCENT">^1</xliff:g>% kész."</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="8348188415839917821">"Táblagépe titkosítása folyamatban van. Hátralévő idő: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="8556105766597855198">"Telefonja titkosítása folyamatban van. Hátralévő idő: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="3832496715430327682">"A feloldáshoz kapcsolja ki a táblagépet, majd kapcsolja be újra."</string>
-    <string name="crypt_keeper_force_power_cycle" product="default" msgid="5070346039522135361">"A feloldáshoz kapcsolja ki a telefont, majd kapcsolja be újra."</string>
-    <string name="crypt_keeper_warn_wipe" msgid="8104921337301750394">"Figyelem: <xliff:g id="COUNT">^1</xliff:g> további sikertelen feloldási próbálkozás után az eszközadatok törlődnek!"</string>
-    <string name="crypt_keeper_enter_password" msgid="1274917431075529732">"Írja be a jelszavát"</string>
-    <string name="crypt_keeper_failed_title" msgid="8173654570682244149">"A titkosítás sikertelen"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"A titkosítás megszakadt, és nem lehet befejezni. Ezért a táblagépen található adatokhoz nem lehet hozzáférni. \n\nAhhoz, hogy újra használni tudja táblagépét, vissza kell állítani a gyári beállításokat. Amikor a visszaállítás után beállítja táblagépét, lehetősége lesz minden adat visszaállítására, amelyet a rendszer tárolt a Google Fiókjában."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"A titkosítás megszakadt, és nem lehet befejezni. Ezért a telefonon található adatokhoz nem lehet hozzáférni. \n\nAhhoz, hogy újra használni tudja telefonját, vissza kell állítani a gyári beállításokat. Amikor a visszaállítás után beállítja telefonját, lehetősége lesz minden adat visszaállítására, amelyet a rendszer eltárolt a Google Fiókjában."</string>
-    <string name="crypt_keeper_data_corrupt_title" msgid="5920153462176846037">"Titkosítás feloldása sikertelen"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"A megadott jelszó helyes, adatai azonban sajnos sérültek. \n\nA táblagép használatának folytatásához végre kell hajtania a gyári adatok visszaállítását. Amikor ezt követően beállítja a táblagépet, lehetősége nyílik arra, hogy helyreállítsa mindazokat az adatokat, amelyekről másolat található Google-fiókjában."</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"A megadott jelszó helyes, adatai azonban sajnos sérültek. \n\nA telefon használatának folytatásához végre kell hajtania a gyári adatok visszaállítását. Amikor ezt követően beállítja a telefont, lehetősége nyílik arra, hogy helyreállítsa mindazokat az adatokat, amelyekről másolat található Google-fiókjában."</string>
-    <string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"Beviteli mód váltása"</string>
+    <string name="encryption_settings_title" msgid="2848716008695618360">"Titkosítás"</string>
+    <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"Táblagép titkosítása"</string>
+    <string name="encrypt_title" product="default" msgid="7337365190988321100">"Telefon titkosítása"</string>
+    <string name="encrypted_summary" msgid="545623487587251207">"Titkosítva"</string>
     <string name="suggested_lock_settings_title" msgid="7836065447159730217">"A telefon biztonságossá tétele"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"Állítson be képernyőzárat a táblagép védelme érdekében"</string>
     <string name="suggested_lock_settings_summary" product="device" msgid="8479766049078378225">"Állítson be képernyőzárat az eszköz védelme érdekében"</string>
@@ -817,6 +791,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Előfordulhat, hogy a PIN-kódot a másik készüléken is meg kell adnia."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Előfordulhat, hogy az azonosító kulcsot a másik eszközön is be kell írnia."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Párosítás ezzel:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Győződjön meg arról, hogy a következő azonosítókulcs látható rajta:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Erősítse meg a koordinált készlettel való párosításhoz"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"Küldő:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Párosítja a készüléket?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"A(z) <xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> eszközzel való párosításhoz írja be rajta a következőt: <xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g> <xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, majd nyomja meg a Return vagy az Enter billentyűt."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Hozzáférést biztosít névjegyeihez és híváslistájához"</string>
@@ -850,6 +825,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"A csatlakozás sikertelen. Próbálja újra."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Eszközadatok"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Az eszköz Bluetooth-címe: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Az eszköz Bluetooth-címe:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Elfelejti az eszközt?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Társítás megszüntetése"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Leválasztja az alkalmazást?"</string>
@@ -881,6 +857,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Beállítások megjegyzése"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Csatlakoztatott Bluetooth-audioeszközök maximális száma"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Válassza ki a csatlakoztatott Bluetooth-audioeszközök maximális számát"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"NFC-verem hibakeresési naplója"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"NFC-verem naplózási szintjének emelése"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Tartalomátküldés"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"tükrözés"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Vezeték nélküli kijelző engedélyezése"</string>
@@ -1188,6 +1166,8 @@
     <string name="wifi_hotspot_maximize_compatibility_dual_ap_summary" msgid="3579549223159056533">"Megkönnyíti más eszközök számára ennek a hotspotnak a megtalálását. Növeli az akkumulátorhasználatot."</string>
     <string name="wifi_tether_starting" msgid="8879874184033857814">"Hotspot bekapcsolása..."</string>
     <string name="wifi_tether_stopping" msgid="4416492968019409188">"Hotspot kikapcsolása..."</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_title" msgid="3089432578433978073">"Az internetmegosztás nem vehető igénybe"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_content" msgid="5920421547607921112">"További információért forduljon a szolgáltatójához"</string>
     <string name="wifi_tether_enabled_subtext" msgid="5085002421099821056">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> aktív"</string>
     <string name="wifi_tether_failed_subtext" msgid="437190628041885500">"A hordozható wifi-hotspot kapcsolatos hiba"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7072559431286459122">"Wifi-hotspot beállítása"</string>
@@ -2534,11 +2514,6 @@
     <string name="enable_service_title" msgid="7231533866953706788">"Teljes körű vezérlést biztosít eszköze felett a(z) <xliff:g id="SERVICE">%1$s</xliff:g> szolgáltatás számára?"</string>
     <string name="capabilities_list_title" msgid="1225853611983394386">"A(z) <xliff:g id="SERVICE">%1$s</xliff:g> szolgáltatásnak a következőkre van szüksége:"</string>
     <string name="touch_filtered_warning" msgid="4225815157460318241">"Mivel az egyik alkalmazás zavar egy engedélykérelmet, a Beállítások funkció nem tudja ellenőrizni az Ön válaszát."</string>
-    <string name="enable_service_encryption_warning" msgid="931082737770453755">"Ha engedélyezi a(z) <xliff:g id="SERVICE">%1$s</xliff:g> szolgáltatást, az eszköz nem fogja használni a képernyőzárat az adattitkosítás növelése érdekében."</string>
-    <string name="secure_lock_encryption_warning" msgid="669152607190123579">"Mivel engedélyezett egy kisegítő szolgáltatást, az eszköz nem fogja használni a képernyőzárat az adattitkosítás növelése érdekében."</string>
-    <string name="enable_service_pattern_reason" msgid="6832846117817938536">"Mivel a(z) <xliff:g id="SERVICE">%1$s</xliff:g> bekapcsolása hatással van az adatok titkosítására, meg kell erősítenie mintáját."</string>
-    <string name="enable_service_pin_reason" msgid="6040417014360237703">"Mivel a(z) <xliff:g id="SERVICE">%1$s</xliff:g> bekapcsolása hatással van az adatok titkosítására, meg kell erősítenie PIN-kódját."</string>
-    <string name="enable_service_password_reason" msgid="6962544350351734238">"Mivel a(z) <xliff:g id="SERVICE">%1$s</xliff:g> bekapcsolása hatással van az adatok titkosítására, meg kell erősítenie jelszavát."</string>
     <string name="accessibility_service_warning" msgid="6779187188736432618">"A(z) <xliff:g id="SERVICE">%1$s</xliff:g> teljes irányítást kér az eszköz felett. Az alkalmazás felolvashatja a képernyőn lévő tartalmat, és cselekedhet a kisegítő lehetőségekre szoruló felhasználók helyett. Az irányítás ilyen szintje nem megfelelő a legtöbb alkalmazás számára."</string>
     <string name="accessibility_service_warning_description" msgid="6573203795976134751">"A teljes vezérlés indokolt olyan alkalmazásoknál, amelyek kisegítő lehetőségeket nyújtanak, a legtöbb alkalmazásnál azonban nem."</string>
     <string name="accessibility_service_screen_control_title" msgid="324795030658109870">"Képernyő megtekintése és kezelése"</string>
@@ -3103,14 +3078,6 @@
     <string name="remove_account_failed" msgid="3709502163548900644">"Ezt a módosítást nem engedélyezi a rendszergazda"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"Nem lehet manuálisan szinkronizálni"</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"Az elem szinkronizálása jelenleg le van tiltva. A beállítás módosításához ideiglenesen kapcsolja be a háttéradatokat és az automatikus szinkronizálást."</string>
-    <string name="enter_password" msgid="6327051330258595331">"Az Android indításához írja be jelszavát"</string>
-    <string name="enter_pin" msgid="1029287617551232681">"Az Android indításához írja be PIN-kódját"</string>
-    <string name="enter_pattern" msgid="1747316785866742960">"Az Android indításához rajzolja le mintáját"</string>
-    <string name="cryptkeeper_wrong_pattern" msgid="340747269176120242">"Helytelen minta"</string>
-    <string name="cryptkeeper_wrong_password" msgid="7295607881887114486">"Helytelen jelszó"</string>
-    <string name="cryptkeeper_wrong_pin" msgid="2347961593970714201">"Helytelen PIN-kód"</string>
-    <string name="checking_decryption" msgid="6111642972615688237">"Ellenőrzés…"</string>
-    <string name="starting_android" msgid="6694154070215356186">"Az Android indítása"</string>
     <string name="delete" msgid="8330605554706263775">"Törlés"</string>
     <string name="misc_files" msgid="6598066985800749585">"Egyéb fájlok"</string>
     <string name="misc_files_selected_count" msgid="5597802791672749532">"<xliff:g id="TOTAL">%2$d</xliff:g>/<xliff:g id="NUMBER">%1$d</xliff:g> kiválasztva"</string>
@@ -3206,8 +3173,6 @@
     <string name="data_usage_metered_yes" msgid="4262598072030135223">"Mért"</string>
     <string name="data_usage_metered_no" msgid="1685828958417926268">"Nem mért"</string>
     <string name="data_usage_disclaimer" msgid="3271450299386176770">"A szolgáltató adatszámlálási módja eltérhet az eszközétől."</string>
-    <string name="cryptkeeper_emergency_call" msgid="8369322820475703306">"Segélyhívás"</string>
-    <string name="cryptkeeper_return_to_call" msgid="3857250752781151232">"Hívás folytatása"</string>
     <string name="vpn_name" msgid="3806456074909253262">"Név"</string>
     <string name="vpn_type" msgid="5533202873260826663">"Típus"</string>
     <string name="vpn_server" msgid="2908816134941973935">"Szerver címe"</string>
@@ -4764,8 +4729,6 @@
       <item quantity="one">1 alkalmazás rendelkezik korlátlan adathozzáféréssel</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"Továbbiak megjelenítése"</string>
-    <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"Valóban törli a felhasználói adatokat, és átvált fájlalapú titkosításra?"</string>
-    <string name="button_confirm_convert_fbe" msgid="339648921918438106">"Törlés és konvertálás"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"Visszaállítja a ShortcutManager gyakoriságkorlátozását"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"A ShortcutManager gyakoriságkorlátozása visszaállítva"</string>
     <string name="notification_suggestion_title" msgid="6309263655965785411">"A lezárási képernyő adatainak kezelése"</string>
@@ -5292,6 +5255,7 @@
     <string name="sim_action_yes" msgid="8076556020131395515">"Igen"</string>
     <string name="sim_action_reboot" msgid="3508948833333441538">"Újraindítás"</string>
     <string name="sim_action_no_thanks" msgid="435717748384544195">"Köszönöm, nem"</string>
+    <string name="sim_action_cancel" msgid="2668099867029610910">"Mégse"</string>
     <string name="sim_switch_button" msgid="1405772571706095387">"Váltás"</string>
     <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Nem sikerült a SIM aktiválása"</string>
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Távolítsa el a SIM-kártyát, majd helyezze be újra. Ha a probléma továbbra is fennáll, indítsa újra az eszközt."</string>
@@ -5444,6 +5408,10 @@
     <string name="cached_apps_freezer" msgid="1057519579761550350">"Végrehajtás felfüggesztése a gyorsítótárazott alkalmazásoknál"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"Beállítások feletti képernyőfedvény engedélyezése"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Engedélyezi a más alkalmazások felett megjeleníthető alkalmazások számára a Beállítások képernyők fedését"</string>
+    <!-- no translation found for allow_mock_modem (3832264806530479214) -->
+    <skip />
+    <!-- no translation found for allow_mock_modem_summary (9097416612748005374) -->
+    <skip />
     <string name="media_controls_title" msgid="403271085636252597">"Média"</string>
     <string name="media_controls_resume_title" msgid="855076860336652370">"Médialejátszó kitűzése"</string>
     <string name="media_controls_resume_description" msgid="3163482266454802097">"A lejátszás gyors folytatásának érdekében a médialejátszó megnyitva marad a Gyorsbeállításokban."</string>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 9371bba..9350401 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -142,10 +142,11 @@
     <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"Թույլատրել սարքին միանալ մոտակայքում գտնվող Bluetooth սարքերին"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"Թույլատրել հեռախոսին միանալ մոտակայքում գտնվող Bluetooth սարքերին"</string>
     <string name="bluetooth_disable_a2dp_hw_offload" msgid="5942913792817797541">"Անջատել Bluetooth A2DP-ի բեռնաթափումը"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="8610420176339657720">"Վերագործարկե՞լ սարքը"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8333029144800835996">"Վերագործարկեք սարքը՝ այս կարգավորումը փոխելու համար:"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="3488695418187553566">"Վերագործարկել"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="4930826928585464191">"Չեղարկել"</string>
+    <string name="bluetooth_disable_le_audio_hw_offload" msgid="3966022676505972908">"Անջատել Bluetooth LE AUDIO-ի սարքակազմային բեռնաթափումը"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_title" msgid="6001142380445276918">"Վերագործարկե՞լ սարքը"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_message" msgid="1524373895333698779">"Վերագործարկեք սարքը՝ այս կարգավորումը փոխելու համար։"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_confirm" msgid="5594859658551707592">"Վերագործարկել"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel" msgid="3663690305043973720">"Չեղարկել"</string>
     <string name="connected_device_media_device_title" msgid="3783388247594566734">"Մեդիա սարքեր"</string>
     <string name="connected_device_call_device_title" msgid="88732390601723608">"Հեռախոսային սարքեր"</string>
     <string name="connected_device_other_device_title" msgid="4652120430615729193">"Այլ սարքեր"</string>
@@ -309,9 +310,9 @@
     <string name="security_settings_title" msgid="6710768415432791970">"Անվտանգություն"</string>
     <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"Գաղտնագրում և մուտքի տվյալներ"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"Հեռախոսը գաղտնագրված է"</string>
-    <string name="decryption_settings_summary" product="default" msgid="1742645256103613503">"Հեռախոսը գաղտնագրված չէ"</string>
+    <string name="not_encrypted_summary" product="default" msgid="2251945842585788254">"Հեռախոսը գաղտնագրված չէ"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"Սարքը գաղտնագրված է"</string>
-    <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"Սարքը գաղտնագրված չէ"</string>
+    <string name="not_encrypted_summary" product="tablet" msgid="2374263654698719382">"Սարքը գաղտնագրված չէ"</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"Կողպէկրան"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"Ինչ ցուցադրել"</string>
     <string name="security_settings_summary" msgid="1627059516127354233">"Կարգավորել Իմ տեղադրությունը, էկրանի ապակողպումը, SIM քարտի կողպումը, վկայագրերի պահոցի կողպումը"</string>
@@ -568,37 +569,10 @@
     <string name="fingerprint_last_delete_message" msgid="7860374760549404410">"Դուք չեք կարողանա օգտագործել ձեր մատնահետքը՝ հեռախոսն ապակողպելու կամ հավելվածներում ձեր ինքնությունը հաստատելու համար։"</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="4104208067277655068">"Դուք չեք կարողանա օգտագործել ձեր մատնահետքը՝ աշխատանքային պրոֆիլն ապակողպելու, գնումները հաստատելու կամ աշխատանքային հավելվածներ մուտք գործելու համար։"</string>
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"Այո, հեռացնել"</string>
-    <string name="crypt_keeper_settings_title" msgid="4938812137822100044">"Գաղտնագրում"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"Գաղտնագրել պլանշետը"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"Գաղտնագրել տվյալները"</string>
-    <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"Գաղտնագրված են"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"Դուք կարող եք գաղտնագրել ձեր հաշիվները, կարգավորումները, ներբեռնած ծրագրերը և դրանց տվյալները, մեդիա և այլ ֆայլերը: Եթե ենթադրենք, որ դուք միացրել եք էկանի կողպումը (այն է՝ սահմանել եք թվային PIN կամ գաղտնաբառ), ապա պլանշետը գաղտնագրելուց հետո դուք պետք է ամեն անգամ այն միացնելիս ապակողպեք էկրանը՝ ապագաղտնագրելու համար: Միակ այլընտրանքը գործարանային տվյալների վերականգնումն է, որը կջնջի ձեր ողջ տվյալները:\n\nԳաղտնագրումը տևում է մեկ ժամ կամ ավելի: Դուք պետք է սկսեք լիցքավորված մարտկոցով՝ ողջ ընթացքում հեռախոսին միացրած պահելով լիցքավորիչը: Եթե ​​ընդհատեք, կարող եք կորցնել ձեր ինֆորմացիան մասնակի կամ ամբողջովին"</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"Դուք կարող եք ծածկագրել ձեր հաշիվները, կարգավորումները, ներբեռնված ծրագրերը և դրանց տվյալների, մեդիա և այլ ֆայլերը: Ձեր հեռախոսի ծածկագրումից հետո, եթե ստեղծել եք էկրանի կողպումը (այսինքն կաղապար կամ թվային PIN կամ գաղտնաբառ), պետք է ապակողպեք էկրանը` յուրաքանչյուր անգամ հեռախոսը միացնելիս այն ապածածկագրելու համար: Ապածածկագրելու այլ միակ տարբերակը գործարանային վերակայումն է` ջնջելով ձեր տվյալները:\n\nԾածկագրման համար անհրաժեշտ է մեկ կամ ավելի ժամ: Դուք պետք է կատարեք այն ամբողջովին լիցքավորված մարտկոցով և գործընթացի ժամանակ հեռախոսը լիցքավորիչին միացրած պահելով: Եթե դադարեցնեք այն, կկորցնեք որոշ տվյալներ կամ դրանք ամբողջությամբ:"</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"Գաղտնագրել պլանշետը"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"Գաղտնագրել տվյալները"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"Լիցքավորեք մարտկոցն ու նորից փորձեք:"</string>
-    <string name="crypt_keeper_unplugged_text" msgid="2709721134148651329">"Միացրեք ձեր լիցքավորիչը և կրկին փորձեք:"</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="1847280235529858357">"Էկրանի ապակողպման PIN կամ գաղտնաբառ չկա"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="7210616262954236042">"Դուք պետք է կարգավորեք էկրանի ապակողպման PIN-ը կամ գաղտնաբառը գաղտնագրումը սկսելուց առաջ:"</string>
-    <string name="crypt_keeper_confirm_title" msgid="8600000209722452230">"Գաղտնագրե՞լ:"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="3270587498436152259">"Գաղտնագրման գործողությունը անդարձ է, և այն ընդհատելու դեպքում, տվյալներ կկորցնեք: Գաղտնագրումը մեկ ժամ է տևում, անգամ ավելին, որի ընթացքում սարքը մի քանի անգամ կվերագործարկվի:"</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="3040428543349852419">"Գաղտնագրման գործընթացը անհետադարձելի է, և եթե դուք այն ընդհատեք, կկորցնեք բոլոր տվյալները: Գաղտնագրումը տևում է մեկ ժամ կամ ավելի, որի ընթացքում հեռախոսը մի քանի անգամ կվերագործարկվի:"</string>
-    <string name="crypt_keeper_setup_title" msgid="3339725741305796680">"Գաղտնագրում"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="4417016995091289019">"Սպասեք մինչ ձեր պլանշետը կգաղտնագրվի: <xliff:g id="PERCENT">^1</xliff:g>%-ով ավարտված է:"</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="7902355422499500352">"Սպասեք մինչ ձեր հեռախոսը կգաղտնագրվի: <xliff:g id="PERCENT">^1</xliff:g>%-ով ավարտված է:"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="8348188415839917821">"Սպասեք մինչև ձեր պլանշետը գաղտնագրվի: Մնաց՝ <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="8556105766597855198">"Սպասեք մինչև ձեր հեռախոսը գաղտնագրվի: Մնաց՝ <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="3832496715430327682">"Գրասալիկն ապակողպելու համար անջատեք, ապա նորից միացրեք այն:"</string>
-    <string name="crypt_keeper_force_power_cycle" product="default" msgid="5070346039522135361">"Հեռախոսն ապակողպելու համար անջատեք, ապա նորից միացրեք այն:"</string>
-    <string name="crypt_keeper_warn_wipe" msgid="8104921337301750394">"Զգուշացում. Եթե ևս <xliff:g id="COUNT">^1</xliff:g> անգամ չկարողանաք ճիշտ ապակողպել, ձեր սարքի ողջ տվյալները կջնջվեն:"</string>
-    <string name="crypt_keeper_enter_password" msgid="1274917431075529732">"Մուտքագրեք ձեր գաղտնաբառը"</string>
-    <string name="crypt_keeper_failed_title" msgid="8173654570682244149">"Գաղտնագրումը անհաջող էր"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"Գաղտնագրումը դադարեցվեց, և այն հնարավոր չէ ավարտել: Արդյունքում ձեր պլանշետի տվյալները այլևս մատչելի չեն: \n\n Շարունակելու համար օգտագործել ձեր պլանշետը` դուք պետք է կատարեք գործարանային վերականգնում: Ձեր պլանշետի վերականգնումից և կարգավորումից հետո դուք հնարավորություն կունենանք վերականգնել ցանկացած տվյալ, որը պահուստավորվել էր ձեր Google հաշվում:"</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"Գաղտնագրումը ընդհատվել է և այն հնարավոր չէ ավարտել: Արդյունքում հեռախոսի տվյալներն այլևս հասանելի չեն:\n\nՀեռախոսը նորից օգտագործելու համար պետք է գործարանային վերականգնում իրականացնեք: Երբ վերականգնումից հետո կարգավորեք հեռախոսը, հնարավորություն կունենաք վերականգնելու ցանկացած տվյալ, որ պահուստավորվել է ձեր Google հաշվում:"</string>
-    <string name="crypt_keeper_data_corrupt_title" msgid="5920153462176846037">"Չհաջողվեց վերծանել"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"Մուտքագրած գաղտնաբառը ճիշտ է, բայց ձեր տվյալները վնասված են: \n\nՈրպեսզի նորից կարողանաք օգտագործել պլանշետը, պետք է կատարեք գործարանային կարգավորումների վերականգնում: Երբ կարգավորեք պլանշետը վերակայումից հետո, կկարողանաք վերականգնել Google հաշվում պահուստավորված տվյալները:"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"Մուտքագրած գաղտնաբառը ճիշտ է, բայց ձեր տվյալները վնասված են: \n\nՈրպեսզի նորից կարողանաք օգտագործել հեռախոսը, պետք է կատարեք գործարանային կարգավորումների վերականգնում: Երբ կարգավորեք հեռախոսը վերակայումից հետո, կկարողանաք վերականգնել Google հաշվում պահուստավորված տվյալները:"</string>
-    <string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"Փոխել ներածման եղանակը"</string>
+    <string name="encryption_settings_title" msgid="2848716008695618360">"Գաղտնագրում"</string>
+    <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"Գաղտնագրել պլանշետը"</string>
+    <string name="encrypt_title" product="default" msgid="7337365190988321100">"Գաղտնագրել տվյալները"</string>
+    <string name="encrypted_summary" msgid="545623487587251207">"Գաղտնագրված է"</string>
     <string name="suggested_lock_settings_title" msgid="7836065447159730217">"Պաշտպանեք ձեր հեռախոսը"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"Կարգավորեք էկրանի կողպում՝ պլանշետը պաշտպանելու համար"</string>
     <string name="suggested_lock_settings_summary" product="device" msgid="8479766049078378225">"Կարգավորեք էկրանի կողպում՝ սարքը պաշտպանելու համար"</string>
@@ -817,6 +791,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Հնարավոր է պետք լինի մուտքագրել այս PIN-ը մյուս սարքերի վրա ևս:"</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Հնարավոր է պետք լինի մուտքագրել այս անցաբառը այլ սարքերում:"</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;-ի հետ զուգավորելու համար համոզվեք այն ցուցադրում է անցաբառը`:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Հաստատեք՝ համակարգված հավաքածուի հետ զուգակցվելու համար"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"Ումից`&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Զուգավորվե՞լ այս սարքի հետ:"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>-ի հետ զուգավորելու համար մուտքագրեք`<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, այնուհետև սեղմեք հետդարձ կամ հաստատում:"</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Թույլատրել կոնտակտների ու զանգերի պատմության հասանելիությունը"</string>
@@ -850,6 +825,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Չհաջողվեց կապակցվել: Փորձեք նորից:"</string>
     <string name="device_details_title" msgid="1155622417516195481">"Սարքի տվյալները"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Սարքի Bluetooth հասցեն՝ <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Սարքի Bluetooth հասցեն՝\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Մոռանա՞լ սարքը"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Հեռացնել կապը"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Չեղարկե՞լ հավելվածի կապը"</string>
@@ -881,6 +857,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Հիշել կարգավորումները"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Թույլատրելի առավելագույն թվով միացված Bluetooth աուդիո սարքեր"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Նշեք միացված Bluetooth աուդիո սարքերի թույլատրելի առավելագույն թիվը"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"NFC սթեքի վրիպազերծման մատյան"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Բարձրացնել NFC սթեքի գրանցման մակարդակը"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Հեռարձակում"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"հայելապատճենում"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Միացնել անլար էկրանը"</string>
@@ -1188,6 +1166,8 @@
     <string name="wifi_hotspot_maximize_compatibility_dual_ap_summary" msgid="3579549223159056533">"Թույլ է տալիս այլ սարքերին գտնել այս թեժ կետը։ Մարտկոցի լիցքն ավելի արագ է սպառվում։"</string>
     <string name="wifi_tether_starting" msgid="8879874184033857814">"Թեժ կետի միացում…"</string>
     <string name="wifi_tether_stopping" msgid="4416492968019409188">"Թեժ կետերը անջատվում են..."</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_title" msgid="3089432578433978073">"Մոդեմի ռեժիմը հասանելի չէ"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_content" msgid="5920421547607921112">"Մանրամասների համար դիմեք ձեր օպերատորին"</string>
     <string name="wifi_tether_enabled_subtext" msgid="5085002421099821056">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> ցանցն ակտիվ է"</string>
     <string name="wifi_tether_failed_subtext" msgid="437190628041885500">"Շարժական Wi‑Fi թեժ կետի սխալ"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7072559431286459122">"Կարգավորել Wi‑Fi թեժ կետը"</string>
@@ -2152,7 +2132,7 @@
     <string name="no_services" msgid="3898812785511572899">"Ակտիվ չէ"</string>
     <string name="runningservicedetails_services_title" msgid="11853795112787355">"Ծառայություններ"</string>
     <string name="runningservicedetails_processes_title" msgid="5292271587797234038">"Գործընթացներ"</string>
-    <string name="service_stop" msgid="5712522600201308795">"Դադարեցնել"</string>
+    <string name="service_stop" msgid="5712522600201308795">"Կանգնեցնել"</string>
     <string name="service_manage" msgid="3896322986828332075">"Կարգավորումներ"</string>
     <string name="service_stop_description" msgid="6327742632400026677">"Այս ծառայությունը գործարկվել է ծրագրի կոմից: Դրա դադարեցումը կարող է ձախողել ծրագիրը:"</string>
     <string name="heavy_weight_stop_description" msgid="3086419998820881290">"Այս ծրագիրը չի կարող անվտանգ դադարեցվել: Եթե դուք այն դադարեցնեք, հնարավոր է` կորցնեք ձեր ընթացիկ աշխատանքի մի մասը:"</string>
@@ -2534,11 +2514,6 @@
     <string name="enable_service_title" msgid="7231533866953706788">"Թույլատրե՞լ «<xliff:g id="SERVICE">%1$s</xliff:g>» ծառայությանը կառավարել ձեր սարքը"</string>
     <string name="capabilities_list_title" msgid="1225853611983394386">"<xliff:g id="SERVICE">%1$s</xliff:g>-ին անհրաժեշտ է`"</string>
     <string name="touch_filtered_warning" msgid="4225815157460318241">"Քանի որ ներածումն արգելափակված է ինչ-որ հավելվածի կողմից, Կարգավորումները չեն կարող հաստատել ձեր պատասխանը:"</string>
-    <string name="enable_service_encryption_warning" msgid="931082737770453755">"Եթե ​​միացնեք <xliff:g id="SERVICE">%1$s</xliff:g>-ը, ձեր սարքը չի օգտագործի էկրանի կողպումը՝ տվյալների գաղտնագրումը լավացնելու համար:"</string>
-    <string name="secure_lock_encryption_warning" msgid="669152607190123579">"Քանի որ միացրել եք մատչելիության ծառայությունը, ձեր սարքը չի օգտագործի էկրանի կողպումը՝ տվյալների գաղտնագրումը լավացնելու համար:"</string>
-    <string name="enable_service_pattern_reason" msgid="6832846117817938536">"Քանի որ <xliff:g id="SERVICE">%1$s</xliff:g> ծառայության միացումն ազդում է տվյալների գաղտնագրմանը, դուք պետք է հաստատեք ձեր ապակողպման նախշը:"</string>
-    <string name="enable_service_pin_reason" msgid="6040417014360237703">"Քանի որ <xliff:g id="SERVICE">%1$s</xliff:g> ծառայության միացումն ազդում է տվյալների գաղտնագրմանը, դուք պետք է հաստատեք ձեր PIN-ը:"</string>
-    <string name="enable_service_password_reason" msgid="6962544350351734238">"Քանի որ <xliff:g id="SERVICE">%1$s</xliff:g> ծառայության միացումն ազդում է տվյալների գաղտնագրմանը, դուք պետք է հաստատեք ձեր գաղտնաբառը:"</string>
     <string name="accessibility_service_warning" msgid="6779187188736432618">"<xliff:g id="SERVICE">%1$s</xliff:g> ծառայությունը այս սարքն ամբողջությամբ վերահսկելու թույլտվություն է ուզում: Ծառայությունը կարող է կարդալ էկրանի տվյալները և գործել այն օգտատերերի անունից, որոնց հատուկ գործառույթներ են անհրաժեշտ: Հասանելիության այս մակարդակը նախատեսված չէ հավելվածների մեծամասնության համար:"</string>
     <string name="accessibility_service_warning_description" msgid="6573203795976134751">"Ամբողջական վերահսկումն անհրաժեշտ է միայն այն հավելվածներին, որոնք օգնում են ձեզ հատուկ գործառույթներից օգտվելիս։"</string>
     <string name="accessibility_service_screen_control_title" msgid="324795030658109870">"Դիտել և կառավարել էկրանը"</string>
@@ -2547,7 +2522,7 @@
     <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_stop" msgid="7295448112784528196">"Դադարեցնել"</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>
     <string name="disable_service_message" msgid="4814173941688548016">"Եթե հպեք <xliff:g id="STOP">%1$s</xliff:g> կոճակին, <xliff:g id="SERVICE">%2$s</xliff:g> ծառայությունը կանջատվի։"</string>
@@ -2814,7 +2789,7 @@
     <string name="battery_sugg_bluetooth_basic" msgid="8943564578546832037">"Անջատեք Bluetooth-ը, երբ այն չեք օգտագործում"</string>
     <string name="battery_sugg_bluetooth_headset" msgid="6495519793211758353">"Փորձեք միանալ մեկ այլ Bluetooth սարքի"</string>
     <string name="battery_desc_apps" msgid="4187483940383266017">"Ծրագրի կողմից օգտագործված մարտկոցը"</string>
-    <string name="battery_sugg_apps_info" msgid="4796917242296658454">"Դադարեցնել կամ ապատեղադրել ծրագիրը"</string>
+    <string name="battery_sugg_apps_info" msgid="4796917242296658454">"Կանգնեցնել կամ ապատեղադրել ծրագիրը"</string>
     <string name="battery_sugg_apps_gps" msgid="7221335088647925110">"Ընտրեք մարտկոցը խնայող ռեժիմ"</string>
     <string name="battery_sugg_apps_settings" msgid="6527223370162382166">"Հավելվածը կարող է առաջարկել կարգավորումներ` մարտկոցի օգտագործումը նվազեցնելու համար"</string>
     <string name="battery_desc_users" msgid="1959428568888686847">"Օգտատիրոջ կողմից օգտագործված մարտկոցը"</string>
@@ -3103,14 +3078,6 @@
     <string name="remove_account_failed" msgid="3709502163548900644">"Ձեր ադմինիստրատորը չի թույլատրում այս փոփոխությունը"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"Հնարավոր չէ ձեռքով համաժամացնել"</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"Համաժամացումը այս տարրի համար այժմ անջատված է: Այս կարգավորումը փոխելու համար ժամանակավորապես միացրեք հետնաշերտի տվյալները և ինքնահամաժամացումը:"</string>
-    <string name="enter_password" msgid="6327051330258595331">"Android-ի մեկնարկի համար մուտքագրեք ձեր գաղտնաբառը"</string>
-    <string name="enter_pin" msgid="1029287617551232681">"Android-ի մեկնարկի համար մուտքագրեք ձեր PIN-ը"</string>
-    <string name="enter_pattern" msgid="1747316785866742960">"Android-ի մեկնարկի համար մուտքագրեք ձեր նախշը"</string>
-    <string name="cryptkeeper_wrong_pattern" msgid="340747269176120242">"Կաղապարը սխալ է"</string>
-    <string name="cryptkeeper_wrong_password" msgid="7295607881887114486">"Գաղտնաբառը սխալ է"</string>
-    <string name="cryptkeeper_wrong_pin" msgid="2347961593970714201">"PIN-ը սխալ է"</string>
-    <string name="checking_decryption" msgid="6111642972615688237">"Ստուգվում է…"</string>
-    <string name="starting_android" msgid="6694154070215356186">"Android-ը գործարկվում է…"</string>
     <string name="delete" msgid="8330605554706263775">"Ջնջել"</string>
     <string name="misc_files" msgid="6598066985800749585">"Խառը ֆայլեր"</string>
     <string name="misc_files_selected_count" msgid="5597802791672749532">"Ընտրված է <xliff:g id="NUMBER">%1$d</xliff:g>-ը <xliff:g id="TOTAL">%2$d</xliff:g>-ից"</string>
@@ -3206,8 +3173,6 @@
     <string name="data_usage_metered_yes" msgid="4262598072030135223">"Սահմանափակ"</string>
     <string name="data_usage_metered_no" msgid="1685828958417926268">"Անսահմանափակ"</string>
     <string name="data_usage_disclaimer" msgid="3271450299386176770">"Օպերատորի վիճակագրությունը կարող է տարբերվել սարքի տվյալներից։"</string>
-    <string name="cryptkeeper_emergency_call" msgid="8369322820475703306">"Շտապ կանչ"</string>
-    <string name="cryptkeeper_return_to_call" msgid="3857250752781151232">"Վերադառնալ զանգին"</string>
     <string name="vpn_name" msgid="3806456074909253262">"Անուն"</string>
     <string name="vpn_type" msgid="5533202873260826663">"Տեսակը"</string>
     <string name="vpn_server" msgid="2908816134941973935">"Սերվերի հասցեն"</string>
@@ -4764,8 +4729,6 @@
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> հավելված կարող է անսահմանափակ տվյալներ օգտագործել</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"Տեսնել ավելին"</string>
-    <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"Սրբե՞լ օգտատիրոջ տվյալները և անցնել ֆայլի գաղտնագրման:"</string>
-    <string name="button_confirm_convert_fbe" msgid="339648921918438106">"Սրբել և անցնել"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"Վերակայել ShortcutManager-ի արագության սահմանափակումները"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"ShortcutManager-ի արագության սահմանափակումները վերակայվել են"</string>
     <string name="notification_suggestion_title" msgid="6309263655965785411">"Կառավարեք կողպէկրանին հայտնվող տեղեկությունները"</string>
@@ -5292,6 +5255,7 @@
     <string name="sim_action_yes" msgid="8076556020131395515">"Այո"</string>
     <string name="sim_action_reboot" msgid="3508948833333441538">"Վերագործարկել"</string>
     <string name="sim_action_no_thanks" msgid="435717748384544195">"Ոչ, շնորհակալություն"</string>
+    <string name="sim_action_cancel" msgid="2668099867029610910">"Չեղարկել"</string>
     <string name="sim_switch_button" msgid="1405772571706095387">"Անցնել"</string>
     <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Չհաջողվեց ակտիվացնել SIM քարտը"</string>
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Հանեք, այնուհետև նորից տեղադրեք SIM քարտը։ Եթե խնդիրը չվերանա, վերագործարկեք սարքը։"</string>
@@ -5435,15 +5399,19 @@
     <string name="rtt_settings_no_visible" msgid="7440356831140948382"></string>
     <string name="rtt_settings_visible_during_call" msgid="7866181103286073700"></string>
     <string name="rtt_settings_always_visible" msgid="2364173070088756238"></string>
-    <string name="media_output_panel_stop_casting_button" msgid="6094875883164119035">"Դադարեցնել հեռարձակումը"</string>
+    <string name="media_output_panel_stop_casting_button" msgid="6094875883164119035">"Կանգնեցնել հեռարձակումը"</string>
     <string name="volte_5G_limited_title" msgid="5908052268836750629">"Անջատե՞լ VoLTE-ն"</string>
     <string name="volte_5G_limited_text" msgid="7150583768725182345">"5G կապը նույնպես կանջատվի։\nՁայնային զանգերի ժամանակ դուք չեք կարող օգտվել ինտերնետից, և որոշ հավելվածներ կարող են չաշխատել։"</string>
     <string name="no_5g_in_dsds_text" product="default" msgid="772747677303920132">"Երկու SIM քարտ օգտագործելու դեպքում այս հեռախոսը կսահմանափակվի 4G ցանցով։ "<annotation id="url">"Իմանալ ավելին"</annotation></string>
     <string name="no_5g_in_dsds_text" product="tablet" msgid="4757328474425714624">"Երկու SIM քարտ օգտագործելու դեպքում այս պլանշետը կսահմանափակվի 4G ցանցով։ "<annotation id="url">"Իմանալ ավելին"</annotation></string>
     <string name="no_5g_in_dsds_text" product="device" msgid="6983783505032683314">"Երկու SIM քարտ օգտագործելու դեպքում այս սարքը կսահմանափակվի 4G ցանցով։ "<annotation id="url">"Իմանալ ավելին"</annotation></string>
-    <string name="cached_apps_freezer" msgid="1057519579761550350">"Դադարեցնել քեշավորված հավելվածների գործարկումը"</string>
+    <string name="cached_apps_freezer" msgid="1057519579761550350">"Կանգնեցնել քեշավորված հավելվածների գործարկումը"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"Թույլատրել Կարգավորումների էկրանների վրադրումները"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Թույլատրել հավելվածներին, որոնք կարող են ցուցադրվել այլ հավելվածների վրա, վրադրել Կարգավորումների էկրանները"</string>
+    <!-- no translation found for allow_mock_modem (3832264806530479214) -->
+    <skip />
+    <!-- no translation found for allow_mock_modem_summary (9097416612748005374) -->
+    <skip />
     <string name="media_controls_title" msgid="403271085636252597">"Մեդիա"</string>
     <string name="media_controls_resume_title" msgid="855076860336652370">"Ամրացնել մեդիա նվագարկիչը"</string>
     <string name="media_controls_resume_description" msgid="3163482266454802097">"Մեդիա նվագարկիչը բաց է մնում Արագ կարգավորումներում, որպեսզի դուք կարողանաք անմիջապես վերսկսել նվագարկումը։"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index c0c2566..534454b 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -142,10 +142,11 @@
     <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"Memungkinkan perangkat Anda berkomunikasi dengan perangkat Bluetooth di sekitar"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"Memungkinkan ponsel Anda berkomunikasi dengan perangkat Bluetooth di sekitar"</string>
     <string name="bluetooth_disable_a2dp_hw_offload" msgid="5942913792817797541">"Nonaktifkan offload hardware Bluetooth A2DP"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="8610420176339657720">"Mulai Ulang Perangkat?"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8333029144800835996">"Anda perlu memulai ulang perangkat untuk mengubah setelan."</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="3488695418187553566">"Mulai Ulang"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="4930826928585464191">"Batal"</string>
+    <string name="bluetooth_disable_le_audio_hw_offload" msgid="3966022676505972908">"Nonaktifkan offload hardware Bluetooth LE AUDIO"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_title" msgid="6001142380445276918">"Mulai Ulang Perangkat?"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_message" msgid="1524373895333698779">"Anda perlu memulai ulang perangkat untuk mengubah setelan ini."</string>
+    <string name="bluetooth_disable_hw_offload_dialog_confirm" msgid="5594859658551707592">"Mulai ulang"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel" msgid="3663690305043973720">"Batal"</string>
     <string name="connected_device_media_device_title" msgid="3783388247594566734">"Perangkat Media"</string>
     <string name="connected_device_call_device_title" msgid="88732390601723608">"Perangkat panggilan telepon"</string>
     <string name="connected_device_other_device_title" msgid="4652120430615729193">"Perangkat lain"</string>
@@ -309,9 +310,9 @@
     <string name="security_settings_title" msgid="6710768415432791970">"Keamanan"</string>
     <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"Enkripsi &amp; kredensial"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"Telepon dienkripsi"</string>
-    <string name="decryption_settings_summary" product="default" msgid="1742645256103613503">"Ponsel tidak dienkripsi"</string>
+    <string name="not_encrypted_summary" product="default" msgid="2251945842585788254">"Ponsel tidak dienkripsi"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"Perangkat dienkripsi"</string>
-    <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"Perangkat tidak dienkripsi"</string>
+    <string name="not_encrypted_summary" product="tablet" msgid="2374263654698719382">"Perangkat tidak dienkripsi"</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"Layar kunci"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"Untuk ditampilkan"</string>
     <string name="security_settings_summary" msgid="1627059516127354233">"Setel Lokasiku, pembuka kunci layar, kunci kartu SIM, kunci penyimpanan kredensial"</string>
@@ -568,37 +569,10 @@
     <string name="fingerprint_last_delete_message" msgid="7860374760549404410">"Anda tidak akan dapat menggunakan sidik jari untuk membuka kunci ponsel atau memverifikasi diri Anda di aplikasi."</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="4104208067277655068">"Anda tidak akan dapat menggunakan sidik jari untuk membuka kunci profil kerja, menyetujui pembelian, atau login ke aplikasi kerja."</string>
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"Ya, hapus"</string>
-    <string name="crypt_keeper_settings_title" msgid="4938812137822100044">"Enkripsi"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"Enkripsi tablet"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"Enkripsi ponsel"</string>
-    <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"Dienkripsi"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"Anda dapat mengenkripsi akun, setelan, aplikasi yang didownload serta datanya, media, dan file lainnya. Setelah mengenkripsi tablet, anggaplah Anda telah menyiapkan kunci layar (pola, PIN numerik, atau sandi), Anda perlu membuka layar untuk mendekripsi tablet setiap kali menyalakannya. Satu-satunya cara lain untuk mendekripsi adalah mengembalikannya ke setelan pabrik yang akan menghapus semua data Anda.\n\nProses enkripsi membutuhkan waktu satu jam atau lebih. Anda perlu memulainya dengan baterai yang terisi penuh dan mencolokkan tablet ke sumber listrik selama proses berlangsung. Jika Anda menghentikannya, semua atau beberapa data Anda akan hilang."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"Anda dapat mengenkripsi akun, setelan, aplikasi yang didownload serta datanya, media, dan file lainnya. Setelah mengenkripsi ponsel, anggaplah Anda telah menyiapkan kunci layar (pola, PIN numerik, atau sandi), Anda perlu membuka layar untuk mendekripsi ponsel setiap kali menyalakannya. Satu-satunya cara lain untuk mendekripsi adalah mengembalikannya ke setelan pabrik yang akan menghapus semua data Anda.\n\nProses enkripsi membutuhkan waktu satu jam atau lebih. Anda perlu memulainya dengan baterai yang terisi penuh dan mencolokkan ponsel ke sumber listrik selama proses berlangsung. Jika Anda menghentikannya, semua atau beberapa data Anda akan hilang."</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"Enkripsi tablet"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"Enkripsi ponsel"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"Isi daya baterai Anda dan coba lagi."</string>
-    <string name="crypt_keeper_unplugged_text" msgid="2709721134148651329">"Pasang pengisi daya Anda dan coba lagi."</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="1847280235529858357">"Tidak ada PIN atau sandi pengunci layar"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="7210616262954236042">"Anda perlu menyetel PIN atau sandi pengunci layar sebelum dapat memulai enkripsi."</string>
-    <string name="crypt_keeper_confirm_title" msgid="8600000209722452230">"Enkripsikan?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="3270587498436152259">"Operasi enkripsi tidak dapat dibatalkan dan jika Anda menghentikannya, data akan hilang. Enkripsi membutuhkan waktu satu jam atau lebih, dan selama itu tablet akan dimulai ulang beberapa kali."</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="3040428543349852419">"Operasi enkripsi tidak dapat dibatalkan dan jika Anda menghentikannya, data akan hilang. Enkripsi membutuhkan waktu satu jam atau lebih, dan selama itu ponsel akan dimulai ulang beberapa kali."</string>
-    <string name="crypt_keeper_setup_title" msgid="3339725741305796680">"Mengenkripsi"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="4417016995091289019">"Tunggu sampai tablet selesai dienkripsi. <xliff:g id="PERCENT">^1</xliff:g>% selesai."</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="7902355422499500352">"Tunggu sampai ponsel selesai dienkripsi. <xliff:g id="PERCENT">^1</xliff:g>% selesai."</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="8348188415839917821">"Tunggu, tablet sedang dienkripsi. Sisa waktu: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="8556105766597855198">"Tunggu, ponsel sedang dienkripsi. Sisa waktu: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="3832496715430327682">"Untuk membuka kunci, matikan, lalu nyalakan kembali tablet Anda."</string>
-    <string name="crypt_keeper_force_power_cycle" product="default" msgid="5070346039522135361">"Untuk membuka kunci, matikan, lalu nyalakan kembali ponsel Anda."</string>
-    <string name="crypt_keeper_warn_wipe" msgid="8104921337301750394">"Peringatan: Perangkat Anda akan dihapus setelah <xliff:g id="COUNT">^1</xliff:g> percobaan gagal lagi dalam pembukaan kunci!"</string>
-    <string name="crypt_keeper_enter_password" msgid="1274917431075529732">"Ketikkan sandi Anda"</string>
-    <string name="crypt_keeper_failed_title" msgid="8173654570682244149">"Enkripsi gagal"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"Enkripsi terputus dan tidak dapat diselesaikan. Akibatnya, data pada tablet Anda tidak dapat diakses lagi. \n\n Untuk terus menggunakan tablet, Anda perlu mengembalikannya ke setelan pabrik. Saat menyiapkan tablet setelah mengembalikannya ke setelan pabrik, Anda memiliki kesempatan untuk memulihkan data apa pun yang telah dicadangkan ke Akun Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"Enkripsi terputus dan tidak dapat diselesaikan. Akibatnya, data di ponsel Anda tidak dapat diakses lagi. \n\n Untuk terus menggunakan ponsel, Anda perlu mengembalikannya ke setelan pabrik. Saat menyiapkan ponsel setelah mengembalikannya ke setelan pabrik, Anda memiliki kesempatan untuk memulihkan data apa pun yang telah dicadangkan ke Akun Google."</string>
-    <string name="crypt_keeper_data_corrupt_title" msgid="5920153462176846037">"Dekripsi gagal"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"Sandi yang Anda masukkan benar, namun sayangnya data rusak. \n\nUntuk melanjutkan dengan tablet, Anda perlu mengembalikannya ke setelan pabrik. Saat menyiapkan tablet setelah direset, akan ada kesempatan untuk memulihkan data apa pun yang telah dicadangkan ke Akun Google."</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"Sandi yang Anda masukkan benar, namun sayangnya data rusak. \n\nUntuk melanjutkan dengan ponsel, Anda perlu mengembalikannya ke setelan pabrik. Jika Anda menyiapkan ponsel setelah reset, akan ada kesempatan untuk memulihkan data apa pun yang telah dicadangkan ke Akun Google."</string>
-    <string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"Beralih metode input"</string>
+    <string name="encryption_settings_title" msgid="2848716008695618360">"Enkripsi"</string>
+    <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"Enkripsi tablet"</string>
+    <string name="encrypt_title" product="default" msgid="7337365190988321100">"Enkripsi ponsel"</string>
+    <string name="encrypted_summary" msgid="545623487587251207">"Dienkripsi"</string>
     <string name="suggested_lock_settings_title" msgid="7836065447159730217">"Amankan ponsel Anda"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"Setel kunci layar untuk melindungi tablet"</string>
     <string name="suggested_lock_settings_summary" product="device" msgid="8479766049078378225">"Setel kunci layar untuk melindungi perangkat"</string>
@@ -817,6 +791,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Anda mungkin juga perlu mengetikkan PIN ini ke perangkat lain."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Anda mungkin juga perlu mengetikkan sandi ini ke perangkat lain."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Untuk menyandingkan dengan:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Pastikan bahwa perangkat tersebut menampilkan kode sandi:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Konfirmasikan agar dapat tersambung dengan kumpulan perangkat terkoordinasi"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"Dari:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Sandingkan dengan perangkat ini?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Untuk menyandingkan dengan:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Ketikkan:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, kemudian tekan Kembali atau Enter."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Izinkan akses ke kontak dan histori panggilan Anda"</string>
@@ -850,6 +825,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Tidak dapat terhubung. Coba lagi."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Detail perangkat"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Alamat Bluetooth perangkat: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Alamat Bluetooth perangkat:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Lupakan perangkat?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Hapus atribusi"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Putuskan Koneksi Aplikasi?"</string>
@@ -881,6 +857,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Ingat setelan"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Perangkat audio Bluetooth maksimum yang terhubung"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Pilih jumlah maksimum perangkat audio Bluetooth yang terhubung"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"Log debug stack NFC"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Tingkatkan level logging stack NFC"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Transmisi"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"cermin"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Aktifkan layar nirkabel"</string>
@@ -1188,6 +1166,8 @@
     <string name="wifi_hotspot_maximize_compatibility_dual_ap_summary" msgid="3579549223159056533">"Membantu perangkat lain menemukan hotspot ini. Meningkatkan penggunaan baterai."</string>
     <string name="wifi_tether_starting" msgid="8879874184033857814">"Menyalakan hotspot..."</string>
     <string name="wifi_tether_stopping" msgid="4416492968019409188">"Mematikan hotspot..."</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_title" msgid="3089432578433978073">"Tethering tidak tersedia"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_content" msgid="5920421547607921112">"Hubungi operator untuk mengetahui detailnya"</string>
     <string name="wifi_tether_enabled_subtext" msgid="5085002421099821056">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> aktif"</string>
     <string name="wifi_tether_failed_subtext" msgid="437190628041885500">"Kesalahan hotspot Wi-Fi portabel"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7072559431286459122">"Siapkan hotspot Wi-Fi"</string>
@@ -1238,7 +1218,7 @@
     <string name="wifi_calling_not_supported" msgid="3303917737849393175">"Panggilan Wi-Fi tidak didukung untuk %1$s"</string>
     <string name="wifi_disconnected_from" msgid="5249576734324159708">"Terputus dari <xliff:g id="SSID">%1$s</xliff:g>"</string>
     <string name="carrier" msgid="1755020806290963951">"Operator"</string>
-    <string name="display_settings_title" msgid="626835071804834218">"Tampilan"</string>
+    <string name="display_settings_title" msgid="626835071804834218">"Layar"</string>
     <string name="sound_settings" msgid="5514582720435174014">"Suara"</string>
     <string name="all_volume_title" msgid="6196367642878437513">"Volume"</string>
     <string name="musicfx_title" msgid="5458574743312283473">"Efek musik"</string>
@@ -2114,7 +2094,7 @@
     <string name="app_disable_dlg_positive" msgid="1414218905322009505">"Menonaktifkan aplikasi"</string>
     <string name="app_disable_dlg_text" msgid="2449382902751908916">"Jika Anda menonaktifkan aplikasi ini, Android dan aplikasi lain mungkin tidak berfungsi lagi sesuai harapan. Perlu diingat, Anda tidak dapat menghapus aplikasi yang disertakan oleh pabrikan di perangkat Anda. Namun, Anda dapat menonaktifkannya, yang berarti mematikan dan menyembunyikan aplikasi tersebut di perangkat Anda."</string>
     <string name="app_disable_notifications_dlg_title" msgid="6686569904059411780">"Matikan notifikasi?"</string>
-    <string name="app_install_details_group_title" msgid="1172114479073704677">"Toko Aplikasi"</string>
+    <string name="app_install_details_group_title" msgid="1172114479073704677">"App Store"</string>
     <string name="app_install_details_title" msgid="7783556181897142187">"Detail aplikasi"</string>
     <string name="app_install_details_summary" msgid="2013043219249992373">"Aplikasi diinstal dari <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
     <string name="instant_app_details_summary" msgid="417197491598208216">"Info selengkapnya di <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
@@ -2152,7 +2132,7 @@
     <string name="no_services" msgid="3898812785511572899">"Tidak aktif"</string>
     <string name="runningservicedetails_services_title" msgid="11853795112787355">"Layanan"</string>
     <string name="runningservicedetails_processes_title" msgid="5292271587797234038">"Proses"</string>
-    <string name="service_stop" msgid="5712522600201308795">"Berhenti"</string>
+    <string name="service_stop" msgid="5712522600201308795">"Hentikan"</string>
     <string name="service_manage" msgid="3896322986828332075">"Setelan"</string>
     <string name="service_stop_description" msgid="6327742632400026677">"Layanan ini dimulai oleh aplikasinya. Menghentikan layanan dapat mengakibatkan gagalnya apl."</string>
     <string name="heavy_weight_stop_description" msgid="3086419998820881290">"Apl ini tidak dapat dihentikan dengan aman. Jika Anda menghentikannya, beberapa pekerjaan yang sedang dilakukan mungkin akan hilang."</string>
@@ -2534,11 +2514,6 @@
     <string name="enable_service_title" msgid="7231533866953706788">"Izinkan <xliff:g id="SERVICE">%1$s</xliff:g> memiliki kontrol penuh atas perangkat Anda?"</string>
     <string name="capabilities_list_title" msgid="1225853611983394386">"<xliff:g id="SERVICE">%1$s</xliff:g> perlu:"</string>
     <string name="touch_filtered_warning" msgid="4225815157460318241">"Karena sebuah aplikasi menghalangi permintaan izin, Setelan tidak dapat memverifikasi tanggapan Anda."</string>
-    <string name="enable_service_encryption_warning" msgid="931082737770453755">"Jika Anda mengaktifkan <xliff:g id="SERVICE">%1$s</xliff:g>, perangkat tidak akan menggunakan kunci layar untuk meningkatkan enkripsi data."</string>
-    <string name="secure_lock_encryption_warning" msgid="669152607190123579">"Karena Anda telah mengaktifkan layanan aksesibilitas, perangkat tidak akan menggunakan kunci layar untuk meningkatkan enkripsi data."</string>
-    <string name="enable_service_pattern_reason" msgid="6832846117817938536">"Karena mengaktifkan <xliff:g id="SERVICE">%1$s</xliff:g> memengaruhi enkripsi data, Anda perlu mengonfirmasi pola."</string>
-    <string name="enable_service_pin_reason" msgid="6040417014360237703">"Karena mengaktifkan <xliff:g id="SERVICE">%1$s</xliff:g> memengaruhi enkripsi data, Anda perlu mengonfirmasi PIN."</string>
-    <string name="enable_service_password_reason" msgid="6962544350351734238">"Karena mengaktifkan <xliff:g id="SERVICE">%1$s</xliff:g> memengaruhi enkripsi data, Anda perlu mengonfirmasi sandi."</string>
     <string name="accessibility_service_warning" msgid="6779187188736432618">"<xliff:g id="SERVICE">%1$s</xliff:g> meminta kontrol penuh atas perangkat ini. Layanan dapat membaca layar dan bertindak atas nama pengguna yang memiliki kebutuhan aksesibilitas. Kontrol tingkat ini tidak sesuai untuk kebanyakan aplikasi."</string>
     <string name="accessibility_service_warning_description" msgid="6573203795976134751">"Kontrol penuh sesuai untuk aplikasi yang membantu Anda terkait kebutuhan aksesibilitas, tetapi tidak untuk sebagian besar aplikasi."</string>
     <string name="accessibility_service_screen_control_title" msgid="324795030658109870">"Melihat dan mengontrol layar"</string>
@@ -3103,14 +3078,6 @@
     <string name="remove_account_failed" msgid="3709502163548900644">"Perubahan ini tidak diizinkan oleh admin"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"Tidak dapat menyinkronkan secara manual"</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"Saat ini, sinkronisasi untuk item ini dinonaktifkan. Untuk mengubah setelan ini, aktifkan data latar belakang dan sinkronisasi otomatis untuk sementara."</string>
-    <string name="enter_password" msgid="6327051330258595331">"Untuk memulai Android, masukkan sandi"</string>
-    <string name="enter_pin" msgid="1029287617551232681">"Untuk memulai Android, masukkan PIN"</string>
-    <string name="enter_pattern" msgid="1747316785866742960">"Untuk memulai Android, gambar pola Anda"</string>
-    <string name="cryptkeeper_wrong_pattern" msgid="340747269176120242">"Pola Salah"</string>
-    <string name="cryptkeeper_wrong_password" msgid="7295607881887114486">"Sandi Salah"</string>
-    <string name="cryptkeeper_wrong_pin" msgid="2347961593970714201">"PIN Salah"</string>
-    <string name="checking_decryption" msgid="6111642972615688237">"Memeriksa…"</string>
-    <string name="starting_android" msgid="6694154070215356186">"Memulai Android..."</string>
     <string name="delete" msgid="8330605554706263775">"Hapus"</string>
     <string name="misc_files" msgid="6598066985800749585">"File Serbaneka"</string>
     <string name="misc_files_selected_count" msgid="5597802791672749532">"Terpilih <xliff:g id="NUMBER">%1$d</xliff:g> dari <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -3206,8 +3173,6 @@
     <string name="data_usage_metered_yes" msgid="4262598072030135223">"Berbayar"</string>
     <string name="data_usage_metered_no" msgid="1685828958417926268">"Tidak berbayar"</string>
     <string name="data_usage_disclaimer" msgid="3271450299386176770">"Penghitungan data operator mungkin berbeda dengan perangkat Anda."</string>
-    <string name="cryptkeeper_emergency_call" msgid="8369322820475703306">"Panggilan darurat"</string>
-    <string name="cryptkeeper_return_to_call" msgid="3857250752781151232">"Kembali ke panggilan"</string>
     <string name="vpn_name" msgid="3806456074909253262">"Nama"</string>
     <string name="vpn_type" msgid="5533202873260826663">"Jenis"</string>
     <string name="vpn_server" msgid="2908816134941973935">"Alamat server"</string>
@@ -4764,8 +4729,6 @@
       <item quantity="one">1 aplikasi dapat menggunakan data tanpa dibatasi</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"Lihat lainnya"</string>
-    <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"Benar-benar hapus data pengguna dan konversikan ke enkripsi file?"</string>
-    <string name="button_confirm_convert_fbe" msgid="339648921918438106">"Hapus dan konversikan"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"Reset pembatasan frekuensi ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"Pembatasan kecepatan PengelolaPintasan telah direset"</string>
     <string name="notification_suggestion_title" msgid="6309263655965785411">"Kontrol info di layar kunci"</string>
@@ -5292,6 +5255,7 @@
     <string name="sim_action_yes" msgid="8076556020131395515">"Ya"</string>
     <string name="sim_action_reboot" msgid="3508948833333441538">"Mulai ulang"</string>
     <string name="sim_action_no_thanks" msgid="435717748384544195">"Lain kali"</string>
+    <string name="sim_action_cancel" msgid="2668099867029610910">"Batal"</string>
     <string name="sim_switch_button" msgid="1405772571706095387">"Alihkan"</string>
     <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Tidak dapat mengaktifkan SIM"</string>
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Keluarkan SIM, lalu masukkan lagi. Jika masalah berlanjut, mulai ulang perangkat."</string>
@@ -5444,6 +5408,10 @@
     <string name="cached_apps_freezer" msgid="1057519579761550350">"Tangguhkan eksekusi aplikasi yang di-cache"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"Mengizinkan overlay layar pada Setelan"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Izinkan aplikasi yang dapat ditampilkan di atas aplikasi lain untuk menempatkan layar Setelan"</string>
+    <!-- no translation found for allow_mock_modem (3832264806530479214) -->
+    <skip />
+    <!-- no translation found for allow_mock_modem_summary (9097416612748005374) -->
+    <skip />
     <string name="media_controls_title" msgid="403271085636252597">"Media"</string>
     <string name="media_controls_resume_title" msgid="855076860336652370">"Sematkan pemutar media"</string>
     <string name="media_controls_resume_description" msgid="3163482266454802097">"Untuk melanjutkan pemutaran dengan cepat, pemutar media tetap terbuka di Setelan Cepat"</string>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index d3e5eef..fbbbddb 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -142,10 +142,11 @@
     <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"Leyfa tækinu þínu að eiga í samskiptum við nálæg Bluetooth-tæki"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"Leyfa símanum þínum að eiga í samskiptum við nálæg Bluetooth-tæki"</string>
     <string name="bluetooth_disable_a2dp_hw_offload" msgid="5942913792817797541">"Slökkva á vélbúnaðarnotk. Bluetooth A2DP"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="8610420176339657720">"Endurræsa tæki?"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8333029144800835996">"Endurræsa þarf tækið til að breyta þessari stillingu."</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="3488695418187553566">"Endurræsa"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="4930826928585464191">"Hætta við"</string>
+    <string name="bluetooth_disable_le_audio_hw_offload" msgid="3966022676505972908">"Slökkva á Bluetooth vélbúnaðarnotkun LE AUDIO"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_title" msgid="6001142380445276918">"Endurræsa tæki?"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_message" msgid="1524373895333698779">"Endurræsa þarf tækið til að breyta þessari stillingu."</string>
+    <string name="bluetooth_disable_hw_offload_dialog_confirm" msgid="5594859658551707592">"Endurræsa"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel" msgid="3663690305043973720">"Hætta við"</string>
     <string name="connected_device_media_device_title" msgid="3783388247594566734">"Geymslumiðlar"</string>
     <string name="connected_device_call_device_title" msgid="88732390601723608">"Símtæki"</string>
     <string name="connected_device_other_device_title" msgid="4652120430615729193">"Önnur tæki"</string>
@@ -309,9 +310,9 @@
     <string name="security_settings_title" msgid="6710768415432791970">"Öryggi"</string>
     <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"Dulkóðun og skilríki"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"Sími dulkóðaður"</string>
-    <string name="decryption_settings_summary" product="default" msgid="1742645256103613503">"Síminn er ekki dulkóðaður"</string>
+    <string name="not_encrypted_summary" product="default" msgid="2251945842585788254">"Síminn er ekki dulkóðaður"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"Tæki dulkóðað"</string>
-    <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"Tækið er ekki dulkóðað"</string>
+    <string name="not_encrypted_summary" product="tablet" msgid="2374263654698719382">"Tækið er ekki dulkóðað"</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"Lásskjár"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"Hvað á að sýna"</string>
     <string name="security_settings_summary" msgid="1627059516127354233">"Stilla staðsetninguna mína, opnun skjás, SIM-kortalás, lás skilríkjageymslu"</string>
@@ -568,37 +569,10 @@
     <string name="fingerprint_last_delete_message" msgid="7860374760549404410">"Þú munt ekki geta notað fingrafarið þitt til að opna símann eða staðfesta hver þú ert í forritum."</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="4104208067277655068">"Þú munt ekki geta notað fingrafarið þitt til að taka vinnusniðið úr lás, heimila kaup eða skrá þig inn í vinnuforrit."</string>
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"Já, fjarlægja"</string>
-    <string name="crypt_keeper_settings_title" msgid="4938812137822100044">"Dulkóðun"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"Dulkóða spjaldtölvu"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"Dulkóða síma"</string>
-    <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"Dulkóðaður"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"Hægt er að dulkóða reikninga, stillingar, sótt forrit og gögn þeirra, margmiðlunarefni og aðrar skrár. Eftir að þú dulkóðar spjaldtölvuna, að því gefnu að þú notist við skjálás (mynstur, PIN-númer eða aðgangsorð), þarftu að opna skjáinn til að afkóða spjaldtölvuna í hvert skipti sem þú kveikir á henni. Eina önnur leiðin sem finnst til að afkóða spjaldtölvuna er með núllstillingu sem eyðir öllum gögnunum þínum.\n\nDulkóðun tekur klukkutíma eða meira. Rafhlaðan þarf að vera fullhlaðin og spjaldtölvan verður að vera tengd við rafmagn meðan á ferlinu stendur. Ef truflun verður á ferlinu muntu glata einhverjum eða öllum gögnunum þínum."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"Hægt er að dulkóða reikninga, stillingar, sótt forrit og gögn þeirra, margmiðlunarefni og aðrar skrár. Eftir að þú dulkóðar símann, að því gefnu að þú notist við skjálás (mynstur, PIN-númer eða aðgangsorð), þarftu að opna skjáinn til að afkóða símann í hvert skipti sem þú kveikir á honum. Eina önnur leiðin sem finnst til að afkóða símann er með núllstillingu sem eyðir öllum gögnunum þínum.\n\nDulkóðun tekur klukkutíma eða meira. Rafhlaðan þarf að vera fullhlaðin og síminn verður að vera tengdur við rafmagn meðan á ferlinu stendur. Ef truflun verður á ferlinu muntu glata einhverjum eða öllum gögnunum þínum."</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"Dulkóða spjaldtölvu"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"Dulkóða síma"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"Hladdu rafhlöðuna og reyndu aftur."</string>
-    <string name="crypt_keeper_unplugged_text" msgid="2709721134148651329">"Settu hleðslutækið í samband og reyndu aftur."</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="1847280235529858357">"Ekkert PIN-númer eða aðgangsorð fyrir lásskjá"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="7210616262954236042">"Þú þarft að velja PIN-númer eða aðgangsorð fyrir lásskjáinn til að geta hafið dulkóðun."</string>
-    <string name="crypt_keeper_confirm_title" msgid="8600000209722452230">"Dulkóða?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="3270587498436152259">"Dulkóðunaraðgerðin er óafturkræf og ef hún er trufluð glatar þú gögnum. Dulkóðun tekur allt frá einni klukkustund og á þeim tíma endurræsir spjaldtölvan sig nokkrum sinnum."</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="3040428543349852419">"Dulkóðunaraðgerðin er óafturkræf og ef hún er trufluð glatar þú gögnum. Dulkóðun tekur allt frá einni klukkustund og á þeim tíma endurræsir síminn sig nokkrum sinnum."</string>
-    <string name="crypt_keeper_setup_title" msgid="3339725741305796680">"Dulkóðun"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="4417016995091289019">"Bíddu á meðan verið er að dulkóða spjaldtölvuna. <xliff:g id="PERCENT">^1</xliff:g>% lokið."</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="7902355422499500352">"Bíddu á meðan verið er að dulkóða símann. <xliff:g id="PERCENT">^1</xliff:g>% lokið."</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="8348188415839917821">"Bíddu á meðan verið er að dulkóða spjaldtölvuna. Tími eftir: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="8556105766597855198">"Bíddu á meðan verið er að dulkóða símann. Tími eftir: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="3832496715430327682">"Slökktu á spjaldtölvunni og kveiktu á henni aftur til að taka hana úr lás."</string>
-    <string name="crypt_keeper_force_power_cycle" product="default" msgid="5070346039522135361">"Slökktu á símanum og kveiktu á honum aftur til að taka hann úr lás."</string>
-    <string name="crypt_keeper_warn_wipe" msgid="8104921337301750394">"Viðvörun: Eftir <xliff:g id="COUNT">^1</xliff:g> misheppnaðar opnunartilraunir í viðbót verður allt þurrkað út úr tækinu."</string>
-    <string name="crypt_keeper_enter_password" msgid="1274917431075529732">"Sláðu inn aðgangsorðið þitt"</string>
-    <string name="crypt_keeper_failed_title" msgid="8173654570682244149">"Dulkóðun mistókst"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"Dulkóðunin var trufluð og ekki er hægt að ljúka henni. Gögn spjaldtölvunnar eru því ekki aðgengileg lengur. \n\nTil að halda áfram að nota spjaldtölvuna þarftu að núllstilla hana. Þegar þú setur tölvuna upp eftir núllstillinguna gefst þér kostur á að endurheimta öll gögn sem afrituð voru á Google reikninginn þinn."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"Dulkóðunin var trufluð og ekki er hægt að ljúka henni. Gögn símans eru því ekki aðgengileg lengur. \n\nTil að halda áfram að nota símann þarftu að núllstilla hann. Þegar þú setur símann upp eftir núllstillinguna gefst þér kostur á að endurheimta öll gögn sem afrituð voru á Google reikninginn þinn."</string>
-    <string name="crypt_keeper_data_corrupt_title" msgid="5920153462176846037">"Afkóðun mistókst"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"Aðgangsorðið sem þú slóst inn er rétt en því miður eru gögnin þín skemmd. \n\nÞú þarft að núllstilla spjaldtölvuna til að halda áfram að nota hana. Þegar þú hefur sett spjaldtölvuna upp aftur eftir núllstillingu færðu tækifæri til að endurheimta gögn sem þú hefur afritað yfir á Google reikninginn þinn."</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"Aðgangsorðið sem þú slóst inn er rétt en því miður eru gögnin þín skemmd. \n\nÞú þarft að núllstilla símann til að halda áfram að nota hann. Þegar þú hefur sett símann upp aftur eftir núllstillingu færðu tækifæri til að endurheimta gögn sem þú hefur afritað yfir á Google reikninginn þinn."</string>
-    <string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"Skipta um innsláttaraðferð"</string>
+    <string name="encryption_settings_title" msgid="2848716008695618360">"Dulkóðun"</string>
+    <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"Dulkóða spjaldtölvu"</string>
+    <string name="encrypt_title" product="default" msgid="7337365190988321100">"Dulkóða síma"</string>
+    <string name="encrypted_summary" msgid="545623487587251207">"Dulkóðað"</string>
     <string name="suggested_lock_settings_title" msgid="7836065447159730217">"Tryggðu öryggi símans"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"Stilltu skjálás til að vernda spjaldtölvuna"</string>
     <string name="suggested_lock_settings_summary" product="device" msgid="8479766049078378225">"Stilltu skjálás til að vernda tækið"</string>
@@ -817,6 +791,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Þú gætir einnig þurft að slá þetta PIN-númer inn í hinu tækinu."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Þú gætir einnig þurft að slá þennan aðgangslykil inn á hinu tækinu."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Til að para við:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Gakktu úr skugga um að þessi aðgangslykill birtist:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Staðfestu pörun við samstillta settið"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"Frá:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Para við þetta tæki?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Til að para við:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Sláðu inn:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g> og ýttu síðan á vendihnappinn eða Enter."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Veita aðgang að tengiliðum þínum og símtalaferli"</string>
@@ -850,6 +825,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Ekki tókst að tengjast. Reyndu aftur."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Upplýsingar um tæki"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Bluetooth-vistfang tækis: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Bluetooth-vistfang tækis:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Gleyma tæki?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Fjarlægja tengingu"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Aftengja forrit?"</string>
@@ -881,6 +857,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Muna stillingar"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Hámarksfjöldi tengdra Bluetooth-hljómtækja"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Velja hámarksfjölda tengdra Bluetooth-hljómtækja"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"Villuleitarannáll NFC-stafla"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Auka skráningarstig NFC-stafla"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Útsending"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"spegla"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Leyfa þráðlausan skjá"</string>
@@ -1188,6 +1166,8 @@
     <string name="wifi_hotspot_maximize_compatibility_dual_ap_summary" msgid="3579549223159056533">"Hjálpar öðrum tækjum að finna þennan heita reit. Eykur rafhlöðunotkun."</string>
     <string name="wifi_tether_starting" msgid="8879874184033857814">"Kveikir á heitum reit…"</string>
     <string name="wifi_tether_stopping" msgid="4416492968019409188">"Slekkur á heitum reit…"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_title" msgid="3089432578433978073">"Tjóðrun er ekki tiltæk"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_content" msgid="5920421547607921112">"Hafðu samband við símafyrirtækið til að fá frekari upplýsingar"</string>
     <string name="wifi_tether_enabled_subtext" msgid="5085002421099821056">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> er virkt"</string>
     <string name="wifi_tether_failed_subtext" msgid="437190628041885500">"Villa með heitan Wi‑Fi reit"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7072559431286459122">"Setja upp heitan Wi-Fi reit"</string>
@@ -2534,11 +2514,6 @@
     <string name="enable_service_title" msgid="7231533866953706788">"Viltu leyfa <xliff:g id="SERVICE">%1$s</xliff:g> að hafa fulla stjórn yfir tækinu þínu?"</string>
     <string name="capabilities_list_title" msgid="1225853611983394386">"<xliff:g id="SERVICE">%1$s</xliff:g> þarf að:"</string>
     <string name="touch_filtered_warning" msgid="4225815157460318241">"Stillingar geta ekki staðfest svarið þitt vegna þess að forrit er að fela heimildarbeiðni."</string>
-    <string name="enable_service_encryption_warning" msgid="931082737770453755">"Ef þú kveikir á <xliff:g id="SERVICE">%1$s</xliff:g> mun tækið ekki nota skjálásinn til að efla dulkóðun gagna."</string>
-    <string name="secure_lock_encryption_warning" msgid="669152607190123579">"Þar sem þú hefur kveikt á aðgengisþjónustu mun tækið ekki nota skjálásinn til að efla dulkóðun gagna."</string>
-    <string name="enable_service_pattern_reason" msgid="6832846117817938536">"Ef <xliff:g id="SERVICE">%1$s</xliff:g> er gert virkt hefur það áhrif á dulkóðun gagna og því þarftu að staðfesta mynstrið þitt."</string>
-    <string name="enable_service_pin_reason" msgid="6040417014360237703">"Ef <xliff:g id="SERVICE">%1$s</xliff:g> er gert virkt hefur það áhrif á dulkóðun gagna og því þarftu að staðfesta PIN-númerið þitt."</string>
-    <string name="enable_service_password_reason" msgid="6962544350351734238">"Ef <xliff:g id="SERVICE">%1$s</xliff:g> er gert virkt hefur það áhrif á dulkóðun gagna og því þarftu að staðfesta aðgangsorðið þitt."</string>
     <string name="accessibility_service_warning" msgid="6779187188736432618">"<xliff:g id="SERVICE">%1$s</xliff:g> biður um fulla stjórn yfir þessu tæki. Þjónustan getur lesið af skjánum og gripið til aðgerða fyrir hönd notenda sem hafa ekki aðgang. Þess konar stjórnun er óviðeigandi fyrir flest forrit."</string>
     <string name="accessibility_service_warning_description" msgid="6573203795976134751">"Full stjórnun er viðeigandi fyrir forrit sem hjálpa þér ef þú hefur ekki aðgang, en ekki fyrir flest forrit."</string>
     <string name="accessibility_service_screen_control_title" msgid="324795030658109870">"Skoða og stjórna skjá"</string>
@@ -3103,14 +3078,6 @@
     <string name="remove_account_failed" msgid="3709502163548900644">"Stjórnandinn þinn leyfir ekki þessa breytingu"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"Ekki er hægt að samstilla handvirkt"</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"Samstilling fyrir þetta atriði er óvirk sem stendur. Til að breyta þeirri stillingu skaltu kveikja tímabundið á bakgrunnsgögnum og sjálfvirkri samstillingu."</string>
-    <string name="enter_password" msgid="6327051330258595331">"Sláðu inn aðgangsorðið þitt til að ræsa Android"</string>
-    <string name="enter_pin" msgid="1029287617551232681">"Sláðu inn PIN-númerið þitt til að ræsa Android"</string>
-    <string name="enter_pattern" msgid="1747316785866742960">"Teiknaðu opnunarmynstrið til að ræsa Android"</string>
-    <string name="cryptkeeper_wrong_pattern" msgid="340747269176120242">"Rangt mynstur"</string>
-    <string name="cryptkeeper_wrong_password" msgid="7295607881887114486">"Rangt aðgangsorð"</string>
-    <string name="cryptkeeper_wrong_pin" msgid="2347961593970714201">"Rangt PIN-númer"</string>
-    <string name="checking_decryption" msgid="6111642972615688237">"Athugar…"</string>
-    <string name="starting_android" msgid="6694154070215356186">"Ræsir Android…"</string>
     <string name="delete" msgid="8330605554706263775">"Eyða"</string>
     <string name="misc_files" msgid="6598066985800749585">"Ýmsar skrár"</string>
     <string name="misc_files_selected_count" msgid="5597802791672749532">"<xliff:g id="NUMBER">%1$d</xliff:g> valdar af <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -3206,8 +3173,6 @@
     <string name="data_usage_metered_yes" msgid="4262598072030135223">"Mæld notkun"</string>
     <string name="data_usage_metered_no" msgid="1685828958417926268">"Ekki með mældri notkun"</string>
     <string name="data_usage_disclaimer" msgid="3271450299386176770">"Gagnaútreikningur símafyrirtækisins kann að sýna aðra niðurstöðu en tækið þitt."</string>
-    <string name="cryptkeeper_emergency_call" msgid="8369322820475703306">"Neyðarsímtal"</string>
-    <string name="cryptkeeper_return_to_call" msgid="3857250752781151232">"Aftur í símtal"</string>
     <string name="vpn_name" msgid="3806456074909253262">"Heiti"</string>
     <string name="vpn_type" msgid="5533202873260826663">"Tegund"</string>
     <string name="vpn_server" msgid="2908816134941973935">"Vistfang þjóns"</string>
@@ -4764,8 +4729,6 @@
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> forrit geta notað ótakmörkuð gögn</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"Sjá meira"</string>
-    <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"Viltu örugglega eyða notendagögnum og umbreyta í dulkóðun skráa?"</string>
-    <string name="button_confirm_convert_fbe" msgid="339648921918438106">"Þurrka út og umbreyta"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"Endurstilla ShortcutManager hraðatakmörkun"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"Hraðatakmörkun ShortcutManager hefur verið endurstillt"</string>
     <string name="notification_suggestion_title" msgid="6309263655965785411">"Stjórna upplýsingum á lásskjá"</string>
@@ -5292,6 +5255,7 @@
     <string name="sim_action_yes" msgid="8076556020131395515">"Já"</string>
     <string name="sim_action_reboot" msgid="3508948833333441538">"Endurræsa"</string>
     <string name="sim_action_no_thanks" msgid="435717748384544195">"Nei, takk"</string>
+    <string name="sim_action_cancel" msgid="2668099867029610910">"Hætta við"</string>
     <string name="sim_switch_button" msgid="1405772571706095387">"Skipta"</string>
     <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Ekki er hægt að virkja SIM-kort"</string>
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Fjarlægðu SIM-kortið og settu það inn aftur. Ef vandamálið leysist ekki skaltu endurræsa tækið."</string>
@@ -5444,6 +5408,10 @@
     <string name="cached_apps_freezer" msgid="1057519579761550350">"Stöðva keyrslu forrita í skyndiminni"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"Leyfa yfirlögn yfir stillingar"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Leyfa forrit sem geta birst yfir öðrum forritum að leggjast yfir stillingaskjái"</string>
+    <!-- no translation found for allow_mock_modem (3832264806530479214) -->
+    <skip />
+    <!-- no translation found for allow_mock_modem_summary (9097416612748005374) -->
+    <skip />
     <string name="media_controls_title" msgid="403271085636252597">"Margmiðlunarefni"</string>
     <string name="media_controls_resume_title" msgid="855076860336652370">"Festa efnisspilara"</string>
     <string name="media_controls_resume_description" msgid="3163482266454802097">"Efnisspilarinn helst opinn í flýtistillingum svo hægt sé að ræsa spilun aftur í skyndi"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index e408720..18611e6 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -24,8 +24,8 @@
     <string name="confirmation_turn_on" msgid="2979094011928347665">"Attiva"</string>
     <string name="device_info_default" msgid="1406619232867343310">"Sconosciuto"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="1646187747875476269">
-      <item quantity="one">You are now <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> steps away from being a developer.</item>
       <item quantity="other">Ora ti mancano <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> passaggi per diventare uno sviluppatore.</item>
+      <item quantity="one">Ora ti manca <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> passaggio per diventare uno sviluppatore.</item>
     </plurals>
     <string name="show_dev_on" msgid="2840850085134853754">"Ora sei uno sviluppatore."</string>
     <string name="show_dev_already" msgid="7041756429707644630">"Non è necessario, sei già uno sviluppatore."</string>
@@ -142,10 +142,11 @@
     <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"Consenti la comunicazione del dispositivo con dispositivi Bluetooth nelle vicinanze"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"Consenti la comunicazione del telefono con dispositivi Bluetooth nelle vicinanze"</string>
     <string name="bluetooth_disable_a2dp_hw_offload" msgid="5942913792817797541">"Disattiva offload hardware Bluetooth A2DP"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="8610420176339657720">"Riavv. dispositivo?"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8333029144800835996">"Riavvia il dispositivo per modificare questa impostazione."</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="3488695418187553566">"Riavvia"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="4930826928585464191">"Annulla"</string>
+    <string name="bluetooth_disable_le_audio_hw_offload" msgid="3966022676505972908">"Disattiva offload hardware Bluetooth LE AUDIO"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_title" msgid="6001142380445276918">"Riavviare il dispositivo?"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_message" msgid="1524373895333698779">"Riavvia il dispositivo per modificare questa impostazione."</string>
+    <string name="bluetooth_disable_hw_offload_dialog_confirm" msgid="5594859658551707592">"Riavvia"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel" msgid="3663690305043973720">"Annulla"</string>
     <string name="connected_device_media_device_title" msgid="3783388247594566734">"Dispositivi multimediali"</string>
     <string name="connected_device_call_device_title" msgid="88732390601723608">"Dispositivi di chiamata"</string>
     <string name="connected_device_other_device_title" msgid="4652120430615729193">"Altri dispositivi"</string>
@@ -208,8 +209,8 @@
     <string name="locale_remove_menu" msgid="3521546263421387474">"Rimuovi"</string>
     <string name="add_a_language" msgid="2126220398077503271">"Aggiungi una lingua"</string>
     <plurals name="dlg_remove_locales_title" formatted="false" msgid="2845515796732609837">
-      <item quantity="one">Remove selected languages?</item>
       <item quantity="other">Rimuovere le lingue selezionate?</item>
+      <item quantity="one">Rimuovere la lingua selezionata?</item>
     </plurals>
     <string name="dlg_remove_locales_message" msgid="8110560091134252067">"Il testo verrà mostrato in un\'altra lingua."</string>
     <string name="dlg_remove_locales_error_title" msgid="5875503658221562572">"Impossibile rimuovere tutte le lingue"</string>
@@ -298,8 +299,8 @@
     <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Usa posizione"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Off"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
-      <item quantity="one">On - <xliff:g id="COUNT_1">%1$d</xliff:g> app ha accesso alla posizione</item>
       <item quantity="other">On - <xliff:g id="COUNT_1">%1$d</xliff:g> app hanno accesso alla posizione</item>
+      <item quantity="one">ON - <xliff:g id="COUNT_0">%1$d</xliff:g> app ha accesso alla posizione</item>
     </plurals>
     <string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"Caricamento…"</string>
     <string name="location_settings_footer_general" msgid="1040507068701188821">"Le app con l\'autorizzazione Dispositivi nelle vicinanze possono stabilire la posizione relativa dei dispositivi connessi."</string>
@@ -309,9 +310,9 @@
     <string name="security_settings_title" msgid="6710768415432791970">"Sicurezza"</string>
     <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"Crittografia e credenziali"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"Telefono criptato"</string>
-    <string name="decryption_settings_summary" product="default" msgid="1742645256103613503">"Telefono non criptato"</string>
+    <string name="not_encrypted_summary" product="default" msgid="2251945842585788254">"Telefono non criptato"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"Dispositivo criptato"</string>
-    <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"Dispositivo non criptato"</string>
+    <string name="not_encrypted_summary" product="tablet" msgid="2374263654698719382">"Dispositivo non criptato"</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"Schermata di blocco"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"Cosa mostrare"</string>
     <string name="security_settings_summary" msgid="1627059516127354233">"Imposta La mia posizione, sblocco schermo, blocco SIM, blocco cred."</string>
@@ -402,8 +403,8 @@
     <string name="fingerprint_add_title" msgid="1837610443487902050">"Aggiungi impronta"</string>
     <string name="fingerprint_enable_keyguard_toggle_title" msgid="5451094461919440992">"blocco schermo"</string>
     <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="6897454766137108776">
-      <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> impronta aggiunta</item>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> impronte aggiunte</item>
+      <item quantity="one">Impronta aggiunta</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"Imposta la tua impronta"</string>
@@ -568,37 +569,10 @@
     <string name="fingerprint_last_delete_message" msgid="7860374760549404410">"Non potrai usare la tua impronta per sbloccare il telefono o verificare la tua identità nelle app."</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="4104208067277655068">"Non potrai utilizzare la tua impronta per sbloccare il profilo di lavoro, autorizzare gli acquisti o accedere alle app di lavoro."</string>
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"Sì, rimuovi"</string>
-    <string name="crypt_keeper_settings_title" msgid="4938812137822100044">"Crittografia"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"Cripta tablet"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"Cripta telefono"</string>
-    <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"Criptato"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"Puoi criptare account, impostazioni, app scaricate e relativi dati, contenuti multimediali e altri file. Una volta criptato il tablet, presumendo che tu abbia impostato il blocco schermo (vale a dire una sequenza, un PIN numerico o una password), devi sbloccare lo schermo per decriptare il tablet a ogni accensione. L\'unico altro metodo di decriptazione consiste nell\'eseguire un ripristino dei dati di fabbrica, che cancella tutti i dati.\n\nLa procedura di crittografia richiede almeno un\'ora. Devi iniziarla con la batteria completamente carica e tenere il telefono sempre collegato a una presa di corrente per tutta la durata della procedura. Qualora dovessi interromperla, perderai tutti i dati o parte di essi."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"Puoi criptare account, impostazioni, app scaricate e relativi dati, contenuti multimediali e altri file. Una volta criptato il telefono, presumendo che tu abbia impostato il blocco schermo (vale a dire una sequenza, un PIN numerico o una password), devi sbloccare lo schermo per decriptare il telefono a ogni accensione. L\'unico altro metodo di decriptazione consiste nell\'eseguire un ripristino dei dati di fabbrica, che cancella tutti i dati.\n\nLa procedura di crittografia richiede almeno un\'ora. Devi iniziarla con la batteria completamente carica e tenere il telefono sempre collegato a una presa di corrente per tutta la durata della procedura. Qualora dovessi interromperla, perderai tutti i dati o parte di essi."</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"Cripta tablet"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"Cripta telefono"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"Carica la batteria e riprova."</string>
-    <string name="crypt_keeper_unplugged_text" msgid="2709721134148651329">"Collega il caricabatterie e riprova."</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="1847280235529858357">"Nessun PIN/password di blocco dello schermo"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="7210616262954236042">"Devi impostare un PIN o una password di blocco dello schermo per poter iniziare la crittografia."</string>
-    <string name="crypt_keeper_confirm_title" msgid="8600000209722452230">"Criptare?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="3270587498436152259">"L\'operazione di crittografia non è reversibile e la sua interruzione causerà la perdita di dati. La crittografia richiede almeno un\'ora, durante la quale il tablet verrà riavviato diverse volte."</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="3040428543349852419">"L\'operazione di crittografia non è reversibile e la sua interruzione causerà la perdita di dati. La crittografia richiede almeno un\'ora, durante la quale il telefono verrà riavviato diverse volte."</string>
-    <string name="crypt_keeper_setup_title" msgid="3339725741305796680">"Crittografia"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="4417016995091289019">"Attendi il termine della crittografia del tablet. <xliff:g id="PERCENT">^1</xliff:g>% completato."</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="7902355422499500352">"Attendi il termine della crittografia del telefono. <xliff:g id="PERCENT">^1</xliff:g>% completato."</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="8348188415839917821">"Attendi che il tablet venga criptato. Tempo rimanente: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="8556105766597855198">"Attendi che il telefono venga criptato. Tempo rimanente: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="3832496715430327682">"Per sbloccare il tablet, spegnilo e accendilo."</string>
-    <string name="crypt_keeper_force_power_cycle" product="default" msgid="5070346039522135361">"Per sbloccare il telefono, spegnilo e accendilo."</string>
-    <string name="crypt_keeper_warn_wipe" msgid="8104921337301750394">"Avviso. I dati del dispositivo verranno cancellati dopo altri <xliff:g id="COUNT">^1</xliff:g> tentativi di sblocco non riusciti."</string>
-    <string name="crypt_keeper_enter_password" msgid="1274917431075529732">"Digita la password"</string>
-    <string name="crypt_keeper_failed_title" msgid="8173654570682244149">"Crittografia non riuscita"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"La crittografia è stata interrotta e non è possibile portarla a termine. Di conseguenza, i dati memorizzati sul tablet non sono più accessibili. \n\nPer riprendere a utilizzare il tablet devi effettuare un ripristino dei dati di fabbrica. Quando configuri il tablet dopo il ripristino, hai la possibilità di ripristinare i dati di cui hai effettuato il backup nel tuo Account Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"La crittografia è stata interrotta e non è possibile portarla a termine. Di conseguenza, i dati memorizzati sul telefono non sono più accessibili. \n\nPer riprendere a utilizzare il telefono devi effettuare il ripristino dei dati di fabbrica. Quando configuri il telefono dopo il ripristino, hai la possibilità di ripristinare i dati di cui hai effettuato il backup nel tuo Account Google."</string>
-    <string name="crypt_keeper_data_corrupt_title" msgid="5920153462176846037">"Decrittografia non riuscita"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"La password inserita è corretta ma purtroppo i tuoi dati sono danneggiati. \n\nPer riprendere a utilizzare il tablet, devi eseguire un ripristino dei dati di fabbrica. Durante la configurazione del tablet dopo il ripristino, potrai ripristinare i dati di cui hai effettuato il backup nel tuo Account Google."</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"La password inserita è corretta ma purtroppo i tuoi dati sono danneggiati. \n\nPer riprendere a utilizzare il telefono, devi eseguire un ripristino dei dati di fabbrica. Durante la configurazione del telefono dopo il ripristino, potrai ripristinare i dati di cui hai effettuato il backup nel tuo Account Google."</string>
-    <string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"Cambia metodo di immissione"</string>
+    <string name="encryption_settings_title" msgid="2848716008695618360">"Crittografia"</string>
+    <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"Cripta tablet"</string>
+    <string name="encrypt_title" product="default" msgid="7337365190988321100">"Cripta telefono"</string>
+    <string name="encrypted_summary" msgid="545623487587251207">"Crittografia attiva"</string>
     <string name="suggested_lock_settings_title" msgid="7836065447159730217">"Proteggi il tuo telefono"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"Imposta un blocco schermo per proteggere il tablet"</string>
     <string name="suggested_lock_settings_summary" product="device" msgid="8479766049078378225">"Imposta un blocco schermo per proteggere il dispositivo"</string>
@@ -732,21 +706,21 @@
     <string name="lock_failed_attempts_now_wiping_profile" msgid="3171880997211568208">"Troppi tentativi errati. Questo profilo di lavoro e i relativi dati verranno eliminati."</string>
     <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="170155081899679669">"Chiudi"</string>
     <plurals name="lockpassword_password_too_short" formatted="false" msgid="2192234965414232157">
-      <item quantity="one">Must be at least <xliff:g id="COUNT_1">%d</xliff:g> characters</item>
       <item quantity="other">Deve contenere almeno <xliff:g id="COUNT_1">%d</xliff:g> caratteri</item>
+      <item quantity="one">Deve contenere almeno <xliff:g id="COUNT_0">%d</xliff:g> carattere</item>
     </plurals>
     <plurals name="lockpassword_pin_too_short" formatted="false" msgid="6817086810898414162">
-      <item quantity="one">PIN must be at least <xliff:g id="COUNT_1">%d</xliff:g> digits</item>
       <item quantity="other">Il PIN deve contenere almeno <xliff:g id="COUNT_1">%d</xliff:g> cifre</item>
+      <item quantity="one">Il PIN deve contenere almeno <xliff:g id="COUNT_0">%d</xliff:g> cifra</item>
     </plurals>
     <string name="lockpassword_continue_label" msgid="2507983991979547816">"Continua"</string>
     <plurals name="lockpassword_password_too_long" formatted="false" msgid="8118091957172967677">
-      <item quantity="one">Must be fewer than <xliff:g id="NUMBER_1">%d</xliff:g> characters</item>
       <item quantity="other">Deve contenere meno di <xliff:g id="NUMBER_1">%d</xliff:g> caratteri</item>
+      <item quantity="one">Deve contenere meno di <xliff:g id="NUMBER_0">%d</xliff:g> carattere</item>
     </plurals>
     <plurals name="lockpassword_pin_too_long" formatted="false" msgid="8706992338720310765">
-      <item quantity="one">Must be fewer than <xliff:g id="NUMBER_1">%d</xliff:g> digits</item>
       <item quantity="other">Deve contenere meno di <xliff:g id="NUMBER_1">%d</xliff:g> cifre</item>
+      <item quantity="one">Deve contenere meno di <xliff:g id="NUMBER_0">%d</xliff:g> cifra</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"L\'amministratore del dispositivo non consente l\'utilizzo di un PIN recente"</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Non può contenere un carattere non valido"</string>
@@ -754,32 +728,32 @@
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Deve contenere almeno una cifra"</string>
     <string name="lockpassword_password_requires_symbol" msgid="6178512486154701321">"Deve contenere almeno un simbolo"</string>
     <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="2385916409676839024">
-      <item quantity="one">Must contain at least <xliff:g id="COUNT">%d</xliff:g> letters</item>
       <item quantity="other">Deve contenere almeno <xliff:g id="COUNT">%d</xliff:g> lettere</item>
+      <item quantity="one">Deve contenere almeno 1 lettera</item>
     </plurals>
     <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="2057467885488612701">
-      <item quantity="one">Must contain at least <xliff:g id="COUNT">%d</xliff:g> lowercase letters</item>
       <item quantity="other">Deve contenere almeno <xliff:g id="COUNT">%d</xliff:g> lettere minuscole</item>
+      <item quantity="one">Deve contenere almeno 1 lettera minuscola</item>
     </plurals>
     <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="4541266279643052025">
-      <item quantity="one">Must contain at least <xliff:g id="COUNT">%d</xliff:g> uppercase letters</item>
       <item quantity="other">Deve contenere almeno <xliff:g id="COUNT">%d</xliff:g> lettere maiuscole</item>
+      <item quantity="one">Deve contenere almeno 1 lettera maiuscola</item>
     </plurals>
     <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="70617964591376248">
-      <item quantity="one">Must contain at least <xliff:g id="COUNT">%d</xliff:g> numerical digits</item>
       <item quantity="other">Deve contenere almeno <xliff:g id="COUNT">%d</xliff:g> numeri</item>
+      <item quantity="one">Deve contenere almeno 1 numero</item>
     </plurals>
     <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="7981236881269921943">
-      <item quantity="one">Must contain at least <xliff:g id="COUNT">%d</xliff:g> special symbols</item>
       <item quantity="other">Deve contenere almeno <xliff:g id="COUNT">%d</xliff:g> simboli speciali</item>
+      <item quantity="one">Deve contenere almeno 1 simbolo speciale</item>
     </plurals>
     <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="1567877061888948467">
-      <item quantity="one">Must contain at least <xliff:g id="COUNT">%d</xliff:g> non-letter characters</item>
       <item quantity="other">Deve contenere almeno <xliff:g id="COUNT">%d</xliff:g> caratteri non costituiti da una lettera</item>
+      <item quantity="one">Deve contenere almeno 1 carattere non costituito da una lettera</item>
     </plurals>
     <plurals name="lockpassword_password_requires_nonnumerical" formatted="false" msgid="5056743974888384475">
-      <item quantity="one">Deve contenere almeno <xliff:g id="COUNT">%d</xliff:g> caratteri non numerici</item>
       <item quantity="other">Deve contenere almeno <xliff:g id="COUNT">%d</xliff:g> caratteri non numerici</item>
+      <item quantity="one">Deve contenere almeno 1 carattere non numerico</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"L\'amministratore del dispositivo non consente l\'utilizzo di una password recente."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Non sono consentite sequenze di cifre in ordine ascendente o discendente oppure ripetute"</string>
@@ -793,15 +767,15 @@
     <string name="manage_device_admin" msgid="1044620606203916275">"App di amministrazione del dispositivo"</string>
     <string name="number_of_device_admins_none" msgid="152926922020437312">"Nessuna app attiva"</string>
     <plurals name="number_of_device_admins" formatted="false" msgid="2528735319390151989">
-      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> active apps</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> app attive</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> app attiva</item>
     </plurals>
     <string name="manage_trust_agents" msgid="6410149930029992356">"Agenti di attendibilità"</string>
     <string name="disabled_because_no_backup_security" msgid="4998095356607488854">"Per usare questa opzione, imposta prima un blocco schermo"</string>
     <string name="manage_trust_agents_summary" msgid="6423843123607674286">"Nessuno"</string>
     <plurals name="manage_trust_agents_summary_on" formatted="false" msgid="5438047398376802735">
-      <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> active trust agents</item>
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> agenti di attendibilità attivi</item>
+      <item quantity="one">1 agente di attendibilità attivo</item>
     </plurals>
     <string name="bluetooth_quick_toggle_title" msgid="5955341060378240781">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5257744297562880017">"Attiva Bluetooth"</string>
@@ -817,6 +791,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Potrebbe inoltre essere necessario digitare questo PIN sull\'altro dispositivo."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Potrebbe inoltre essere necessario digitare questa passkey sull\'altro dispositivo."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Per l\'accoppiamento con:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Assicurati che sia visualizzata questa passkey:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Conferma per eseguire l\'accoppiamento con il set coordinato"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"Da:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Accoppiare con questo dispositivo?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Per eseguire l\'accoppiamento con <xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>, digita sul dispositivo <xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, quindi premi A capo o Invio."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Consenti l\'accesso ai tuoi contatti e alla cronologia chiamate"</string>
@@ -850,6 +825,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Connessione non riuscita. Riprova."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Dettagli dispositivo"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Indirizzo Bluetooth del dispositivo: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Indirizzo Bluetooth del dispositivo:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Eliminare il dispositivo?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Rimuovi associazione"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Vuoi scollegare l\'app?"</string>
@@ -881,6 +857,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Ricorda impostazioni"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Numero max dispositivi audio Bluetooth connessi"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Seleziona il numero massimo di dispositivi audio Bluetooth connessi"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"Log di debug stack NFC"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Aumenta livello di logging stack NFC"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Trasmissione"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"mirroring"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Attiva display wireless"</string>
@@ -1112,16 +1090,16 @@
     <string name="wifi_forget_dialog_title" msgid="4363829200968563164">"Vuoi eliminare la rete?"</string>
     <string name="wifi_forget_dialog_message" msgid="8419499588321940243">"Tutte le password relative a questa rete verranno eliminate"</string>
     <plurals name="wifi_saved_access_points_summary" formatted="false" msgid="2802436466732147888">
-      <item quantity="one">%d networks</item>
       <item quantity="other">%d reti</item>
+      <item quantity="one">1 rete</item>
     </plurals>
     <plurals name="wifi_saved_passpoint_access_points_summary" formatted="false" msgid="5802057518058840450">
-      <item quantity="one">%d iscrizione</item>
       <item quantity="other">%d iscrizioni</item>
+      <item quantity="one">1 iscrizione</item>
     </plurals>
     <plurals name="wifi_saved_all_access_points_summary" formatted="false" msgid="5125849180309374451">
-      <item quantity="one">%d rete e iscrizione</item>
       <item quantity="other">%d reti e iscrizioni</item>
+      <item quantity="one">1 rete e iscrizione</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="1234150304285575798">"Wi‑Fi avanzate"</string>
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
@@ -1188,6 +1166,8 @@
     <string name="wifi_hotspot_maximize_compatibility_dual_ap_summary" msgid="3579549223159056533">"Consente ad altri dispositivi di trovare questo hotspot. Il consumo della batteria aumenta."</string>
     <string name="wifi_tether_starting" msgid="8879874184033857814">"Attivazione hotspot…"</string>
     <string name="wifi_tether_stopping" msgid="4416492968019409188">"Disattivazione hotspot…"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_title" msgid="3089432578433978073">"Tethering non disponibile"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_content" msgid="5920421547607921112">"Contatta l\'operatore per avere informazioni dettagliate"</string>
     <string name="wifi_tether_enabled_subtext" msgid="5085002421099821056">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> è attivo"</string>
     <string name="wifi_tether_failed_subtext" msgid="437190628041885500">"Errore hotspot Wi‑Fi portatile"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7072559431286459122">"Configura hotspot Wi‑Fi"</string>
@@ -1465,8 +1445,8 @@
     <string name="sim_preferred_message" msgid="6004009449266648351">"<xliff:g id="NEW_SIM">%1$s</xliff:g> è l\'unica SIM del tuo dispositivo. Vuoi utilizzarla per dati mobili, chiamate e SMS?"</string>
     <string name="wrong_pin_code_pukked" msgid="3414172752791445033">"Codice PIN della SIM errato. Devi contattare l\'operatore per sbloccare il dispositivo."</string>
     <plurals name="wrong_pin_code" formatted="false" msgid="4054088588731305475">
-      <item quantity="one">Incorrect SIM PIN code, you have <xliff:g id="NUMBER_1">%d</xliff:g> remaining attempts.</item>
       <item quantity="other">Codice PIN della SIM errato. Hai ancora <xliff:g id="NUMBER_1">%d</xliff:g> tentativi a disposizione.</item>
+      <item quantity="one">Codice PIN della SIM errato. Hai ancora <xliff:g id="NUMBER_0">%d</xliff:g> tentativo a disposizione, dopodiché dovrai contattare l\'operatore per sbloccare il dispositivo.</item>
     </plurals>
     <string name="wrong_pin_code_one" msgid="6924852214263071441">"Codice PIN della SIM errato. Hai ancora un tentativo a disposizione, dopodiché dovrai contattare l\'operatore per sbloccare il dispositivo."</string>
     <string name="pin_failed" msgid="3726505565797352255">"Operazione con PIN della SIM non riuscita."</string>
@@ -1836,8 +1816,8 @@
     <string name="location_app_level_permissions" msgid="907206607664629759">"Autorizzazioni per la posizione"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"La geolocalizzazione non è attiva"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
-      <item quantity="one"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> app su <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> hanno accesso alla posizione</item>
       <item quantity="other"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> app su <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> hanno accesso alla posizione</item>
+      <item quantity="one"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_0">%1$d</xliff:g> app su <xliff:g id="TOTAL_LOCATION_APP_COUNT_1">%2$d</xliff:g> ha accesso alla posizione</item>
     </plurals>
     <string name="location_category_recent_location_access" msgid="2558063524482178146">"Accesso recente"</string>
     <string name="location_recent_location_access_see_all" msgid="4203102419355323325">"Mostra tutto"</string>
@@ -2012,8 +1992,8 @@
     <string name="install_applications_title" msgid="7890233747559108106">"Consenti tutte le fonti di app"</string>
     <string name="recent_app_category_title" msgid="189758417804427533">"App aperte di recente"</string>
     <plurals name="see_all_apps_title" formatted="false" msgid="6864581406735745400">
-      <item quantity="one">Mostra tutte le app (%1$d)</item>
       <item quantity="other">Mostra tutte le app (%1$d)</item>
+      <item quantity="one">Mostra tutte le app</item>
     </plurals>
     <string name="forgot_password_title" msgid="3967873480875239885">"Contatta il tuo amministratore IT"</string>
     <string name="forgot_password_text" msgid="2583194470767613163">"Può aiutarti a reimpostare il PIN, la sequenza o la password"</string>
@@ -2032,8 +2012,8 @@
     <string name="clear_cache_btn_text" msgid="8597272828928143723">"Svuota cache"</string>
     <string name="cache_size_label" msgid="313456088966822757">"Cache"</string>
     <plurals name="uri_permissions_text" formatted="false" msgid="8212425823423508096">
-      <item quantity="one">%d items</item>
       <item quantity="other">%d elementi</item>
+      <item quantity="one">1 elemento</item>
     </plurals>
     <string name="clear_uri_btn_text" msgid="4828117421162495134">"Cancella accesso"</string>
     <string name="controls_label" msgid="8671492254263626383">"Controlli"</string>
@@ -2279,7 +2259,7 @@
     <string name="experimental_category_title" msgid="898904396646344152">"Sperimentali"</string>
     <string name="feature_flags_dashboard_title" msgid="348990373716658289">"Flag di funzioni"</string>
     <string name="talkback_title" msgid="8756080454514251327">"TalkBack"</string>
-    <string name="talkback_summary" msgid="5820927220378864281">"Lo screen reader è rivolto principalmente a utenti non vedenti o con problemi di vista"</string>
+    <string name="talkback_summary" msgid="5820927220378864281">"Lo screen reader è rivolto principalmente a utenti ciechi o con problemi di vista"</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"Tocca gli elementi sullo schermo per ascoltarne la lettura ad alta voce"</string>
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Preferenze sottotitoli"</string>
     <string name="accessibility_captioning_about_title" msgid="3542171637334191563">"Informazioni sulle preferenze relative ai sottotitoli"</string>
@@ -2441,8 +2421,8 @@
     <string name="accessibility_hearingaid_pair_instructions_message" msgid="8913409742121315657">"Per accoppiare i tuoi apparecchi acustici, cerca e tocca il dispositivo nella prossima schermata. Assicurati che gli apparecchi acustici siano in modalità di accoppiamento."</string>
     <string name="accessibility_hearingaid_active_device_summary" msgid="509703438222873967">"Dispositivo <xliff:g id="DEVICE_NAME">%1$s</xliff:g> attivo"</string>
     <plurals name="show_number_hearingaid_count" formatted="false" msgid="776000580683647556">
-      <item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> saved hearing aids</item>
       <item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> apparecchi acustici salvati</item>
+      <item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g> apparecchio acustico salvato</item>
     </plurals>
     <string name="accessibility_audio_adjustment_title" msgid="1332113739136802997">"Regolazione dell\'audio"</string>
     <string name="accessibility_summary_shortcut_enabled" msgid="4030427268146752644">"Scorciatoia attivata"</string>
@@ -2474,20 +2454,20 @@
     <string name="reduce_bright_colors_intensity_end_label" msgid="1422600205484299860">"Più luminosità"</string>
     <string name="reduce_bright_colors_persist_preference_title" msgid="4368829654993343354">"Mantieni l\'opzione attiva dopo il riavvio del dispositivo"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_short_delay" formatted="false" msgid="5354221071353645263">
-      <item quantity="one">Breve (<xliff:g id="CLICK_DELAY_LABEL_1">%1$s</xliff:g> secondi)</item>
       <item quantity="other">Breve (<xliff:g id="CLICK_DELAY_LABEL_1">%1$s</xliff:g> secondi)</item>
+      <item quantity="one">Breve (<xliff:g id="CLICK_DELAY_LABEL_0">%1$s</xliff:g> secondo)</item>
     </plurals>
     <plurals name="accessibilty_autoclick_preference_subtitle_medium_delay" formatted="false" msgid="1550891909800510628">
-      <item quantity="one">Medio (<xliff:g id="CLICK_DELAY_LABEL_1">%1$s</xliff:g> secondi)</item>
       <item quantity="other">Medio (<xliff:g id="CLICK_DELAY_LABEL_1">%1$s</xliff:g> secondi)</item>
+      <item quantity="one">Medio (<xliff:g id="CLICK_DELAY_LABEL_0">%1$s</xliff:g> secondo)</item>
     </plurals>
     <plurals name="accessibilty_autoclick_preference_subtitle_long_delay" formatted="false" msgid="2230755548820485984">
-      <item quantity="one">Lungo (<xliff:g id="CLICK_DELAY_LABEL_1">%1$s</xliff:g> secondi)</item>
       <item quantity="other">Lungo (<xliff:g id="CLICK_DELAY_LABEL_1">%1$s</xliff:g> secondi)</item>
+      <item quantity="one">Lungo (<xliff:g id="CLICK_DELAY_LABEL_0">%1$s</xliff:g> secondo)</item>
     </plurals>
     <plurals name="accessibilty_autoclick_delay_unit_second" formatted="false" msgid="4537791441118261556">
-      <item quantity="one"><xliff:g id="CLICK_DELAY_LABEL_2">%1$s</xliff:g> secondi</item>
       <item quantity="other"><xliff:g id="CLICK_DELAY_LABEL_2">%1$s</xliff:g> secondi</item>
+      <item quantity="one"><xliff:g id="CLICK_DELAY_LABEL_0">%1$s</xliff:g> secondo</item>
     </plurals>
     <string name="accessibility_vibration_summary" msgid="27904038683405084">"Squillo: <xliff:g id="SUMMARY_RING">%1$s</xliff:g> - Notifiche: <xliff:g id="SUMMARY_NOTIFICATION">%2$s</xliff:g> - Tocco: <xliff:g id="SUMMARY_TOUCH">%3$s</xliff:g>"</string>
     <string name="accessibility_vibration_summary_off" msgid="7776105450117095736">"Impostazione di suoneria e notifiche: off"</string>
@@ -2534,11 +2514,6 @@
     <string name="enable_service_title" msgid="7231533866953706788">"Vuoi consentire a <xliff:g id="SERVICE">%1$s</xliff:g> di avere il controllo totale del tuo dispositivo?"</string>
     <string name="capabilities_list_title" msgid="1225853611983394386">"<xliff:g id="SERVICE">%1$s</xliff:g> deve:"</string>
     <string name="touch_filtered_warning" msgid="4225815157460318241">"Un\'app sta oscurando una richiesta di autorizzazione, pertanto Impostazioni non può verificare la tua risposta."</string>
-    <string name="enable_service_encryption_warning" msgid="931082737770453755">"Se attivi <xliff:g id="SERVICE">%1$s</xliff:g>, il dispositivo non utilizzerà il blocco schermo per migliorare la crittografia dei dati."</string>
-    <string name="secure_lock_encryption_warning" msgid="669152607190123579">"Il dispositivo non utilizzerà il blocco schermo per migliorare la crittografia dei dati perché hai attivato un servizio di accessibilità."</string>
-    <string name="enable_service_pattern_reason" msgid="6832846117817938536">"L\'attivazione di <xliff:g id="SERVICE">%1$s</xliff:g> incide sulla crittografia dei dati, pertanto devi confermare la sequenza."</string>
-    <string name="enable_service_pin_reason" msgid="6040417014360237703">"L\'attivazione di <xliff:g id="SERVICE">%1$s</xliff:g> incide sulla crittografia dei dati, pertanto devi confermare il PIN."</string>
-    <string name="enable_service_password_reason" msgid="6962544350351734238">"L\'attivazione di <xliff:g id="SERVICE">%1$s</xliff:g> incide sulla crittografia dei dati, pertanto devi confermare la password."</string>
     <string name="accessibility_service_warning" msgid="6779187188736432618">"<xliff:g id="SERVICE">%1$s</xliff:g> richiede il totale controllo di questo dispositivo. Il servizio può leggere i contenuti sullo schermo e agire per conto di utenti con esigenze di accessibilità. Questo livello di controllo non è appropriato per la maggior parte delle app."</string>
     <string name="accessibility_service_warning_description" msgid="6573203795976134751">"Il controllo totale è appropriato per le app che rispondono alle tue esigenze di accessibilità, ma non per gran parte delle app."</string>
     <string name="accessibility_service_screen_control_title" msgid="324795030658109870">"Visualizzare e controllare lo schermo"</string>
@@ -2559,7 +2534,7 @@
     <string name="keywords_accessibility" msgid="4263443239404659143">"facilità d\'uso, facilità di accesso, assistenza, assistivo"</string>
     <string name="keywords_magnification" msgid="3908145308269840862">"ingrandimento della finestra, zoom, ingrandimento, ipovedente, ingrandimento, ingrandire"</string>
     <string name="keywords_talkback" msgid="2816435437095102527"></string>
-    <string name="keywords_live_caption" msgid="1667203998080567556">"sottotitoli, sottotitolaggio, CC, Trascrizione istantanea, problemi di udito, perdita dell\'udito, CART, conversione della voce in testo, sottotitolo"</string>
+    <string name="keywords_live_caption" msgid="1667203998080567556">"sottotitoli codificati, sottotitolaggio codificato, CC, Trascrizione istantanea, problemi di udito, perdita dell\'udito, CART, conversione della voce in testo, sottotitolo"</string>
     <string name="keywords_live_transcribe" msgid="3226990195174890997"></string>
     <string name="keywords_sound_notifications" msgid="8183107485754075413"></string>
     <string name="keywords_sound_amplifier" msgid="939404835256246663"></string>
@@ -2577,12 +2552,12 @@
     <string name="print_settings" msgid="8519810615863882491">"Stampa"</string>
     <string name="print_settings_summary_no_service" msgid="6721731154917653862">"Off"</string>
     <plurals name="print_settings_summary" formatted="false" msgid="1034273609054146099">
-      <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> print services on</item>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> servizi di stampa attivi</item>
+      <item quantity="one">1 servizio di stampa attivo</item>
     </plurals>
     <plurals name="print_jobs_summary" formatted="false" msgid="3933688846338306536">
-      <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> print jobs</item>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> processi di stampa</item>
+      <item quantity="one">1 processo di stampa</item>
     </plurals>
     <string name="print_settings_title" msgid="7680498284751129935">"Servizi di stampa"</string>
     <string name="print_no_services_installed" msgid="7554057966540602692">"Nessun servizio installato"</string>
@@ -2689,24 +2664,24 @@
     <string name="battery_tip_dialog_message" product="device" msgid="3896805213768863874">"Poiché hai utilizzato il dispositivo più del solito, la batteria potrebbe esaurirsi prima del previsto.\n\nApp che consumano maggiormente la batteria:"</string>
     <string name="battery_tip_dialog_message_footer" msgid="986542164372177504">"Include attività in background a consumo elevato"</string>
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="3108195491484891588">
-      <item quantity="one">Restrict %1$d apps</item>
       <item quantity="other">Limita %1$d app</item>
+      <item quantity="one">Limita %1$d app</item>
     </plurals>
     <plurals name="battery_tip_restrict_handled_title" formatted="false" msgid="5862649927574803958">
-      <item quantity="one">%2$d apps recently restricted</item>
       <item quantity="other">%2$d app con limitazione recente</item>
+      <item quantity="one">%1$s app con limitazione recente</item>
     </plurals>
     <plurals name="battery_tip_restrict_summary" formatted="false" msgid="3328499737453686910">
-      <item quantity="one">%2$d apps have high background battery usage</item>
       <item quantity="other">Le app %2$d consumano molta batteria in background</item>
+      <item quantity="one">L\'app %1$s consuma molta batteria in background</item>
     </plurals>
     <plurals name="battery_tip_restrict_handled_summary" formatted="false" msgid="3036853535034350991">
-      <item quantity="one">These apps can\'t run in the background</item>
       <item quantity="other">Queste app non possono essere eseguite in background</item>
+      <item quantity="one">Questa app non può essere eseguita in background</item>
     </plurals>
     <plurals name="battery_tip_restrict_app_dialog_title" formatted="false" msgid="7897944678619251740">
-      <item quantity="one">Restrict %1$d apps?</item>
       <item quantity="other">Limitare %1$d app?</item>
+      <item quantity="one">Limitare l\'app?</item>
     </plurals>
     <string name="battery_tip_restrict_app_dialog_message" msgid="137856003724730751">"Per consumare meno batteria, impedisci all\'app <xliff:g id="APP">%1$s</xliff:g> di usare batteria in background. L\'app potrebbe non funzionare correttamente e potresti ricevere le notifiche in ritardo."</string>
     <string name="battery_tip_restrict_apps_less_than_5_dialog_message" msgid="5894648804112181324">"Per consumare meno batteria, impedisci a queste app di utilizzare la batteria in background. Le app con limitazioni potrebbero non funzionare correttamente e potresti ricevere le relative notifiche in ritardo.\n\nApp:"</string>
@@ -2725,8 +2700,8 @@
     <string name="smart_battery_footer" msgid="8407121907452993645">"Quando Battery Manager rileva che le app stanno scaricando la batteria, puoi applicare limitazioni a queste app. Le app con limitazioni potrebbero non funzionare correttamente e potresti ricevere le notifiche in ritardo."</string>
     <string name="restricted_app_title" msgid="6585080822121007436">"App con limitazioni"</string>
     <plurals name="restricted_app_summary" formatted="false" msgid="6059772951505411003">
-      <item quantity="one">Limiting battery usage for %1$d apps</item>
       <item quantity="other">Limitazione del consumo della batteria per %1$d app</item>
+      <item quantity="one">Limitazione del consumo della batteria per %1$d app</item>
     </plurals>
     <string name="restricted_app_time_summary" msgid="3097721884155913252">"Limitazioni applicate <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="restricted_app_detail_footer" msgid="3495725286882138803">"Queste app non sono autorizzate a usare la batteria in background. Potrebbero non funzionare come previsto e potresti ricevere le notifiche in ritardo."</string>
@@ -2736,8 +2711,8 @@
     <string name="battery_manager_summary_unsupported" msgid="7334173707292807964">"Rilevamento del momento in cui le app scaricano la batteria attivo"</string>
     <string name="battery_manager_off" msgid="673547668722420924">"Off"</string>
     <plurals name="battery_manager_app_restricted" formatted="false" msgid="6714534362166394848">
-      <item quantity="one">%1$d apps restricted</item>
       <item quantity="other">%1$d app con restrizioni</item>
+      <item quantity="one">%1$d app con restrizioni</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
     <string name="battery_missing_message" msgid="400958471814422770">"Problema durante la lettura dell\'indicatore di livello della batteria."</string>
@@ -3003,8 +2978,8 @@
     <string name="remove_credential_management_app_dialog_title" msgid="5713525435104706772">"Rimuovere questa app?"</string>
     <string name="remove_credential_management_app_dialog_message" msgid="7739474298063646935">"Questa app non gestirà i certificati, ma rimarrà sul dispositivo. Eventuali certificati installati dall\'app verranno disinstallati."</string>
     <plurals name="number_of_urls" formatted="false" msgid="403979258551655023">
-      <item quantity="one"><xliff:g id="NUMBER_1">%d</xliff:g> URL</item>
       <item quantity="other"><xliff:g id="NUMBER_1">%d</xliff:g> URL</item>
+      <item quantity="one"><xliff:g id="NUMBER_0">%d</xliff:g> URL</item>
     </plurals>
     <string name="emergency_tone_title" msgid="6673118505206685168">"Segnale chiamata di emergenza"</string>
     <string name="emergency_tone_summary" msgid="2519776254708767388">"Imposta il comportamento in caso di chiamata di emergenza"</string>
@@ -3051,8 +3026,8 @@
     <string name="notification_history_snooze" msgid="3980568893290512257">"Posticipate"</string>
     <string name="notification_history_dismiss" msgid="6180321217375722918">"Ignorate di recente"</string>
     <plurals name="notification_history_count" formatted="false" msgid="1859304685071321991">
-      <item quantity="one"><xliff:g id="NUMBER_1">%d</xliff:g> notifiche</item>
       <item quantity="other"><xliff:g id="NUMBER_1">%d</xliff:g> notifiche</item>
+      <item quantity="one"><xliff:g id="NUMBER_0">%d</xliff:g> notifica</item>
     </plurals>
     <string name="sound_category_call_ringtone_vibrate_title" msgid="9090693401915654528">"Suoneria e vibrazione chiamata"</string>
     <string name="wifi_setup_detail" msgid="2012898800571616422">"Dettagli rete"</string>
@@ -3103,14 +3078,6 @@
     <string name="remove_account_failed" msgid="3709502163548900644">"Questa modifica non è consentita dall\'amministratore"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"Impossibile sincronizzare manualmente"</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"Al momento la sincronizzazione di questo elemento non è attiva. Per modificare questa impostazione, attiva temporaneamente i dati in background e la sincronizzazione automatica."</string>
-    <string name="enter_password" msgid="6327051330258595331">"Per avviare Android, inserisci la password"</string>
-    <string name="enter_pin" msgid="1029287617551232681">"Per avviare Android, inserisci il PIN"</string>
-    <string name="enter_pattern" msgid="1747316785866742960">"Per avviare Android, traccia la tua sequenza"</string>
-    <string name="cryptkeeper_wrong_pattern" msgid="340747269176120242">"Sequenza sbagliata"</string>
-    <string name="cryptkeeper_wrong_password" msgid="7295607881887114486">"Password sbagliata"</string>
-    <string name="cryptkeeper_wrong_pin" msgid="2347961593970714201">"PIN errato"</string>
-    <string name="checking_decryption" msgid="6111642972615688237">"Verifica…"</string>
-    <string name="starting_android" msgid="6694154070215356186">"Avvio di Android…"</string>
     <string name="delete" msgid="8330605554706263775">"Elimina"</string>
     <string name="misc_files" msgid="6598066985800749585">"File vari"</string>
     <string name="misc_files_selected_count" msgid="5597802791672749532">"selezionati <xliff:g id="NUMBER">%1$d</xliff:g> di <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -3206,8 +3173,6 @@
     <string name="data_usage_metered_yes" msgid="4262598072030135223">"A consumo"</string>
     <string name="data_usage_metered_no" msgid="1685828958417926268">"Non a consumo"</string>
     <string name="data_usage_disclaimer" msgid="3271450299386176770">"La misurazione dell\'operatore potrebbe differire da quella del dispositivo."</string>
-    <string name="cryptkeeper_emergency_call" msgid="8369322820475703306">"Chiamata di emergenza"</string>
-    <string name="cryptkeeper_return_to_call" msgid="3857250752781151232">"Torna a chiamata"</string>
     <string name="vpn_name" msgid="3806456074909253262">"Nome"</string>
     <string name="vpn_type" msgid="5533202873260826663">"Tipo"</string>
     <string name="vpn_server" msgid="2908816134941973935">"Indirizzo server"</string>
@@ -3302,21 +3267,21 @@
     <string name="ssl_ca_cert_warning" msgid="3898387588657346106">"La rete potrebbe essere monitorata"</string>
     <string name="done_button" msgid="6269449526248267">"Fine"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="5491460811755938449">
-      <item quantity="one">Trust or remove certificates</item>
       <item quantity="other">Considera attendibili i certificati o rimuovili</item>
+      <item quantity="one">Considera attendibile il certificato o rimuovilo</item>
     </plurals>
     <plurals name="ssl_ca_cert_info_message_device_owner" formatted="false" msgid="2788832560436163252">
-      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> has installed certificate authorities on your device, which may allow them to monitor your device network activity, including emails, apps, and secure websites.\n\nFor more information about these certificates, contact your admin.</item>
       <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> ha installato autorità di certificazione sul tuo dispositivo, da cui è possibile monitorare l\'attività di rete del dispositivo, inclusi siti web protetti, email e app.\n\nContatta l\'amministratore per avere ulteriori informazioni sui certificati.</item>
+      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> ha installato un\'autorità di certificazione sul tuo dispositivo, da cui è possibile monitorare l\'attività di rete del dispositivo, inclusi siti web protetti, email e app.\n\nContatta l\'amministratore per avere ulteriori informazioni sul certificato.</item>
     </plurals>
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="3989916958347169622">
-      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> has installed certificate authorities for your work profile, which may allow them to monitor work network activity, including emails, apps, and secure websites.\n\nFor more information about these certificates, contact your admin.</item>
       <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> ha installato autorità di certificazione per il tuo profilo di lavoro. L\'amministratore potrebbe monitorare l\'attività di rete lavorativa, inclusi siti web protetti, email e app.\n\nContatta l\'amministratore per avere ulteriori informazioni sui certificati.</item>
+      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> ha installato un\'autorità di certificazione per il tuo profilo di lavoro. L\'amministratore potrebbe monitorare l\'attività di rete lavorativa, inclusi siti web protetti, email e app.\n\nContatta l\'amministratore per avere ulteriori informazioni sul certificato.</item>
     </plurals>
     <string name="ssl_ca_cert_warning_message" msgid="4374052724815563051">"Una terza parte può monitorare la tua attività di rete, inclusi siti web protetti, email e applicazioni.\n\nQuesto è reso possibile da credenziali attendibili installate sul tuo dispositivo."</string>
     <plurals name="ssl_ca_cert_settings_button" formatted="false" msgid="125941406175485894">
-      <item quantity="one">Check certificates</item>
       <item quantity="other">Controlla i certificati</item>
+      <item quantity="one">Controlla il certificato</item>
     </plurals>
     <string name="user_settings_title" msgid="6550866465409807877">"Utenti multipli"</string>
     <string name="user_settings_footer_text" product="device" msgid="7523914344521302179">"Condividi il tuo dispositivo aggiungendo nuovi utenti. Ogni utente dispone di uno spazio personale sul dispositivo per impostare schermate Home personalizzate, account, app, impostazioni e altro ancora."</string>
@@ -3496,8 +3461,8 @@
     <string name="sim_selection_channel_title" msgid="3193666315607572484">"Selezione della SIM"</string>
     <string name="dashboard_title" msgid="5660733037244683387">"Impostazioni"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="6585075562837786847">
-      <item quantity="one">Show %d hidden items</item>
       <item quantity="other">Mostra %d elementi nascosti</item>
+      <item quantity="one">Mostra %d elemento nascosto</item>
     </plurals>
     <string name="network_dashboard_title" msgid="788543070557731240">"Rete e Internet"</string>
     <string name="network_dashboard_summary_mobile" msgid="7750924671970583670">"Dati mobili, Wi‑Fi, hotspot"</string>
@@ -3549,7 +3514,7 @@
     <string name="keywords_battery_adaptive_preferences" msgid="1774870663426502938">"preferenze adattive, batteria adattiva"</string>
     <string name="keywords_spell_checker" msgid="5148906820603481657">"ortografia, dizionario, correttore ortografico, correzione automatica"</string>
     <string name="keywords_voice_input" msgid="7534900094659358971">"funzione di riconoscimento, immissione, vocale, parlare, lingua, vivavoce, viva voce, riconoscimento, offensivo, parola, audio, cronologia, auricolare bluetooth"</string>
-    <string name="keywords_text_to_speech_output" msgid="6728080502619011668">"velocità, lingua, predefinita, voce, parlare, sintesi vocale, accessibilità, screen reader, non vedenti"</string>
+    <string name="keywords_text_to_speech_output" msgid="6728080502619011668">"velocità, lingua, predefinita, voce, parlare, sintesi vocale, accessibilità, screen reader, persona cieca"</string>
     <string name="keywords_date_and_time" msgid="4402136313104901312">"orologio, 24 ore"</string>
     <string name="keywords_network_reset" msgid="4075670452112218042">"reimpostare, ripristinare, dati di fabbrica"</string>
     <string name="keywords_factory_data_reset" msgid="4979623326958976773">"cancellare, eliminare, ripristinare, rimuovere, ripristino dei dati di fabbrica"</string>
@@ -3654,7 +3619,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Attiva suoni"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Sottotitoli in tempo reale"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Sottotitoli automatici"</string>
-    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Nessuna}=1{1 pianificazione impostata}one{# pianificazione impostata}other{# pianificazioni impostate}}"</string>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Nessuna}=1{1 pianificazione impostata}other{# pianificazioni impostate}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Non disturbare"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Ricevi soltanto le notifiche di app e persone importanti"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Limitare le interruzioni"</string>
@@ -3725,9 +3690,9 @@
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"On"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Chiedi ogni volta"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Fino alla disattivazione"</string>
-    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 ora}one{# ore}other{# ore}}"</string>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 minuto}one{# minuti}other{# minuti}}"</string>
-    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Off}=1{Off/1 pianificazione può attivarsi automaticamente}one{Off/# pianificazione può attivarsi automaticamente}other{Off/# pianificazioni possono attivarsi automaticamente}}"</string>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 ora}other{# ore}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 minuto}other{# minuti}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Off}=1{Off/1 pianificazione può attivarsi automaticamente}other{Off/# pianificazioni possono attivarsi automaticamente}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Possono interrompere la modalità Non disturbare"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Persone"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"App"</string>
@@ -3874,8 +3839,8 @@
     <string name="manage_conversations" msgid="4440289604887824337">"Gestisci le conversazioni"</string>
     <string name="priority_conversation_count_zero" msgid="3862289535537564713">"Nessuna conversazione prioritaria"</string>
     <plurals name="priority_conversation_count" formatted="false" msgid="4229447176780862649">
-      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> conversazioni prioritarie</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> conversazioni prioritarie</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> conversazione prioritaria</item>
     </plurals>
     <string name="important_conversations" msgid="1233893707189659401">"Conversazioni prioritarie"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"Appaiono in cima alla sezione delle conversazioni sotto forma di bolle mobili"</string>
@@ -3917,12 +3882,12 @@
     <string name="notification_app_switch_label" msgid="4422902423925084193">"Tutte le notifiche di <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
     <string name="default_notification_assistant" msgid="243718059890346442">"Notifiche adattative"</string>
     <plurals name="notifications_sent_daily" formatted="false" msgid="1479283620504341566">
-      <item quantity="one">~<xliff:g id="NUMBER_1">%d</xliff:g> notifiche al giorno</item>
       <item quantity="other">~<xliff:g id="NUMBER_1">%d</xliff:g> notifiche al giorno</item>
+      <item quantity="one">~<xliff:g id="NUMBER_0">%d</xliff:g> notifica al giorno</item>
     </plurals>
     <plurals name="notifications_sent_weekly" formatted="false" msgid="4913443431857170519">
-      <item quantity="one">~<xliff:g id="NUMBER_1">%d</xliff:g> notifiche alla settimana</item>
       <item quantity="other">~<xliff:g id="NUMBER_1">%d</xliff:g> notifiche alla settimana</item>
+      <item quantity="one">~<xliff:g id="NUMBER_0">%d</xliff:g> notifica alla settimana</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"Mai"</string>
     <string name="manage_notification_access_title" msgid="6481256069087219982">"Notifiche app e dispositivi"</string>
@@ -3930,8 +3895,8 @@
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"Accosso bloccato alle notifiche del profilo di lavoro"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"Le app non possono leggere le notifiche"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
-      <item quantity="one">%d apps can read notifications</item>
       <item quantity="other">Le app %d possono leggere le notifiche</item>
+      <item quantity="one">L\'app %d può leggere le notifiche</item>
     </plurals>
     <string name="notification_assistant_title" msgid="5889201903272393099">"Notifiche avanzate"</string>
     <string name="notification_assistant_summary" msgid="1957783114840908887">"Ricevi suggerimenti di azioni, risposte e altro"</string>
@@ -3992,8 +3957,8 @@
     <string name="interact_across_profiles_consent_dialog_permissions_summary" msgid="995051542847604039">"Questa app può utilizzare le autorizzazioni della tua app personale <xliff:g id="NAME">%1$s</xliff:g>, come l\'accesso alla posizione, allo spazio di archiviazione o ai contatti."</string>
     <string name="interact_across_profiles_number_of_connected_apps_none" msgid="8573289199942092964">"Nessuna app collegata"</string>
     <plurals name="interact_across_profiles_number_of_connected_apps" formatted="false" msgid="6991750455661974772">
-      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> app collegate</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> app collegate</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> app collegata</item>
     </plurals>
     <string name="interact_across_profiles_install_work_app_title" msgid="2821669067014436056">"Per collegare queste app, installa l\'app <xliff:g id="NAME">%1$s</xliff:g> nel tuo profilo di lavoro"</string>
     <string name="interact_across_profiles_install_personal_app_title" msgid="4790651223324866344">"Per collegare queste app, installa l\'app <xliff:g id="NAME">%1$s</xliff:g> nel tuo profilo personale"</string>
@@ -4008,20 +3973,20 @@
     <string name="notification_channels" msgid="1502969522886493799">"Categorie"</string>
     <string name="notification_channels_other" msgid="18159805343647908">"Altro"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="483490958130993160">
-      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> categories</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> categorie</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> categoria</item>
     </plurals>
     <string name="no_channels" msgid="4716199078612071915">"L\'app non ha pubblicato alcuna notifica"</string>
     <string name="app_settings_link" msgid="6725453466705333311">"Altre impostazioni nell\'app"</string>
     <string name="notification_screen_summary" msgid="5984915275134654822">"Cronologia delle notifiche, bolle e inviate di recente"</string>
     <string name="app_notification_listing_summary_zero" msgid="2988400013221120744">"Attive per tutte le app"</string>
     <plurals name="app_notification_listing_summary_others" formatted="false" msgid="1506127395400503717">
-      <item quantity="one">Off for <xliff:g id="COUNT_1">%d</xliff:g> apps</item>
       <item quantity="other">Disattivate per <xliff:g id="COUNT_1">%d</xliff:g> app</item>
+      <item quantity="one">Disattivate per <xliff:g id="COUNT_0">%d</xliff:g> app</item>
     </plurals>
     <plurals name="deleted_channels" formatted="false" msgid="5963473421547029532">
-      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> categories deleted</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> categorie eliminate</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> categoria eliminata</item>
     </plurals>
     <string name="notification_toggle_on" msgid="1624283327379059003">"On"</string>
     <string name="notification_toggle_off" msgid="3295373308338024844">"Non attive"</string>
@@ -4093,7 +4058,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Tutte le conversazioni"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Conversazioni prioritarie"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Nessuna"</string>
-    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Nessuna}=1{1 conversazione}one{# conversazioni}other{# conversazioni}}"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Nessuna}=1{1 conversazione}other{# conversazioni}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Chi può interrompere"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Chiamate"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Chiamate"</string>
@@ -4102,7 +4067,7 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Per assicurarti che le chiamate consentite possano essere sentite, controlla che la suoneria del telefono sia attiva"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"Per la pianificazione \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\" le chiamate in arrivo sono bloccate. Puoi regolare le impostazioni per permettere ai tuoi amici, alla tua famiglia e ad altri contatti di raggiungerti."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Contatti speciali"</string>
-    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Nessuno}=1{{contact_1}}=2{{contact_1} e {contact_2}}=3{{contact_1}, {contact_2} e {contact_3}}one{{contact_1}, {contact_2} e # altro contatto}other{{contact_1}, {contact_2} e altri # contatti}}"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Nessuno}=1{{contact_1}}=2{{contact_1} e {contact_2}}=3{{contact_1}, {contact_2} e {contact_3}}other{{contact_1}, {contact_2} e altri # contatti}}"</string>
     <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"(Nessun nome)"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Messaggi"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"messaggi"</string>
@@ -4112,7 +4077,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"Per la pianificazione \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\" i messaggi in arrivo sono bloccati. Puoi modificare le impostazioni per permettere ai tuoi amici, alla tua famiglia e ad altri contatti di raggiungerti."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Puoi ricevere tutti i messaggi"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Puoi ricevere tutte le chiamate"</string>
-    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Nessuno}=1{1 contatto}one{# contatti}other{# contatti}}"</string>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Nessuno}=1{1 contatto}other{# contatti}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Chiunque"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Contatti"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Contatti speciali"</string>
@@ -4150,13 +4115,13 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Tutte le notifiche"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Alcune notifiche"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Le persone selezionate possono comunque contattarti, anche se non consenti l\'interruzione da parte delle app"</string>
-    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Nessuna app può interrompere}=1{{app_1} può interrompere}=2{{app_1} e {app_2} possono interrompere}=3{{app_1}, {app_2} e {app_3} possono interrompere}one{{app_1}, {app_2} e # altra app possono interrompere}other{{app_1}, {app_2} e altre # app possono interrompere}}"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Nessuna app può interrompere}=1{{app_1} può interrompere}=2{{app_1} e {app_2} possono interrompere}=3{{app_1}, {app_2} e {app_3} possono interrompere}other{{app_1}, {app_2} e altre # app possono interrompere}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"App"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Tutte le notifiche"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Alcune notifiche"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Notifiche che possono interrompere"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Consenti tutte le notifiche"</string>
-    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Niente può interrompere}=1{{sound_category_1} può interrompere}=2{{sound_category_1} e {sound_category_2} possono interrompere}=3{{sound_category_1}, {sound_category_2} e {sound_category_3} possono interrompere}one{{sound_category_1}, {sound_category_2} e # altro suono possono interrompere}other{{sound_category_1}, {sound_category_2} e altri # suoni possono interrompere}}"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Niente può interrompere}=1{{sound_category_1} può interrompere}=2{{sound_category_1} e {sound_category_2} possono interrompere}=3{{sound_category_1}, {sound_category_2} e {sound_category_3} possono interrompere}other{{sound_category_1}, {sound_category_2} e altri # suoni possono interrompere}}"</string>
     <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Niente può interrompere"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Nessuno può interrompere"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Alcune persone possono interrompere"</string>
@@ -4181,12 +4146,12 @@
     <string name="zen_mode_end_time_next_day_summary_format" msgid="419683704068360804">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> del giorno successivo"</string>
     <string name="zen_mode_summary_alarms_only_indefinite" msgid="910047326128154945">"Cambia su Solo sveglie sempre"</string>
     <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="1900512966361163390">
-      <item quantity="one">Change to alarms only for <xliff:g id="DURATION">%1$d</xliff:g> minutes (until <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
       <item quantity="other">Cambia su Solo sveglie per <xliff:g id="DURATION">%1$d</xliff:g> minuti (fino alle <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Cambia su Solo sveglie per un minuto (fino alle <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>)</item>
     </plurals>
     <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="955991428001659124">
-      <item quantity="one">Change to alarms only for <xliff:g id="DURATION">%1$d</xliff:g> hours until <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
       <item quantity="other">Cambia su Solo sveglie per <xliff:g id="DURATION">%1$d</xliff:g> ore (fino alle <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Cambia su Solo sveglie per un\'ora (fino alle <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>)</item>
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"Cambia su Solo sveglie fino alle <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="722093064250082317">"Cambia su Interrompi sempre"</string>
@@ -4260,20 +4225,20 @@
     <string name="app_launch_add_link" msgid="8622558044530305811">"Aggiungi link"</string>
     <string name="app_launch_footer" msgid="4521865035105622557">"Un\'app può verificare i link da aprire automaticamente nell\'app."</string>
     <plurals name="app_launch_verified_links_title" formatted="false" msgid="3945301449178587783">
-      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> link verificato</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> link verificati</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> link verificato</item>
     </plurals>
     <plurals name="app_launch_verified_links_message" formatted="false" msgid="1209292155940482111">
-      <item quantity="one">Questo link è stato verificato e viene aperto automaticamente in questa app.</item>
       <item quantity="other">Questi link sono stati verificati e vengono aperti automaticamente in questa app.</item>
+      <item quantity="one">Questo link è stato verificato e viene aperto automaticamente in questa app.</item>
     </plurals>
     <string name="app_launch_dialog_ok" msgid="1446157681861409861">"OK"</string>
     <string name="app_launch_verified_links_info_description" msgid="7514750232467132117">"Mostra l\'elenco di link verificati"</string>
     <string name="app_launch_checking_links_title" msgid="6119228853554114201">"Controllo di altri link supportati in corso…"</string>
     <string name="app_launch_dialog_cancel" msgid="6961071841814898663">"Annulla"</string>
     <plurals name="app_launch_supported_links_title" formatted="false" msgid="8579323750839397568">
-      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> link supportato</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> link supportati</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> link supportato</item>
     </plurals>
     <string name="app_launch_supported_links_add" msgid="3271247750388016131">"Aggiungi"</string>
     <string name="app_launch_supported_links_subtext" msgid="4268004019469184113">"Si apre nell\'app <xliff:g id="APP_LABEL">%s</xliff:g>"</string>
@@ -4297,20 +4262,20 @@
     <string name="notification_summary_level" msgid="4074326972839105652">"Livello %d"</string>
     <string name="notification_summary_channel" msgid="8459033623057872803">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> • <xliff:g id="GROUP_NAME">%2$s</xliff:g>"</string>
     <plurals name="notifications_categories_off" formatted="false" msgid="1385401442703692986">
-      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> categories turned off</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> categorie disattivate</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> categoria disattivata</item>
     </plurals>
     <plurals name="permissions_summary" formatted="false" msgid="5015472550875144481">
-      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> permissions granted</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> autorizzazioni concesse</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> autorizzazione concessa</item>
     </plurals>
     <plurals name="runtime_permissions_summary" formatted="false" msgid="2091022049141391855">
-      <item quantity="one"><xliff:g id="COUNT_2">%d</xliff:g> of <xliff:g id="COUNT_3">%d</xliff:g> permissions granted</item>
       <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> autorizzazioni su <xliff:g id="COUNT_3">%d</xliff:g> concesse</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> autorizzazione su <xliff:g id="COUNT_1">%d</xliff:g> concessa</item>
     </plurals>
     <plurals name="runtime_permissions_additional_count" formatted="false" msgid="5888624648943937645">
-      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> additional permissions</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> autorizzazioni aggiuntive</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> autorizzazione aggiuntiva</item>
     </plurals>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="7456745929035665029">"Nessuna autorizzazione concessa"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7174876170116073356">"Nessuna autorizzazione richiesta"</string>
@@ -4319,8 +4284,8 @@
     <string name="permissions_usage_summary" msgid="6784310472062516454">"Mostra quali app hanno usato le autorizzazioni di recente"</string>
     <string name="unused_apps" msgid="4566272194756830656">"App inutilizzate"</string>
     <plurals name="unused_apps_summary" formatted="false" msgid="3827583582750975783">
-      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> app inutilizzata</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> app inutilizzate</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> app inutilizzata</item>
     </plurals>
     <string name="unused_apps_switch" msgid="419282628373205038">"Rimuovi autorizzazioni e libera spazio"</string>
     <string name="filter_all_apps" msgid="6645539744080251371">"Tutte le app"</string>
@@ -4346,15 +4311,15 @@
     <string name="domain_urls_summary_some" msgid="1197692164421314523">"Apri <xliff:g id="DOMAIN">%s</xliff:g> e altri URL"</string>
     <string name="domain_urls_apps_summary_off" msgid="2534980824850890416">"Nessuna app che apre i link supportati"</string>
     <plurals name="domain_urls_apps_summary_on" formatted="false" msgid="7864816862441985323">
-      <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> apps opening supported links</item>
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> app che aprono i link supportati</item>
+      <item quantity="one">Un\'app che apre i link supportati</item>
     </plurals>
     <string name="app_link_open_always" msgid="9167065494930657503">"Consenti all\'app di aprire i link supportati"</string>
     <string name="app_link_open_ask" msgid="2422450109908936371">"Chiedi ogni volta"</string>
     <string name="app_link_open_never" msgid="5299808605386052350">"Non consentire all\'app di aprire i link"</string>
     <plurals name="app_link_open_always_summary" formatted="false" msgid="1816161439007251694">
-      <item quantity="one">L\'app richiede di gestire <xliff:g id="COUNT_1">%d</xliff:g> link</item>
       <item quantity="other">L\'app richiede di gestire <xliff:g id="COUNT_1">%d</xliff:g> link</item>
+      <item quantity="one">L\'app richiede di gestire <xliff:g id="COUNT_0">%d</xliff:g> link</item>
     </plurals>
     <string name="open_supported_links_footer" msgid="3188808142432787933">"L\'app richiede di gestire i seguenti link:"</string>
     <string name="default_apps_title" msgid="6943471331817718664">"Predefinite"</string>
@@ -4395,12 +4360,12 @@
     <string name="show_all_apps" msgid="4490719452453223082">"Mostra utilizzo completo del dispositivo"</string>
     <string name="hide_extra_apps" msgid="7313907836289865123">"Mostra utilizzo delle app"</string>
     <plurals name="power_high_usage_summary" formatted="false" msgid="573433136005336970">
-      <item quantity="one"><xliff:g id="NUMBER">%2$d</xliff:g> apps behaving abnormally</item>
       <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> app si comportano in modo anomalo</item>
+      <item quantity="one">L\'app <xliff:g id="APP">%1$s</xliff:g> si comporta in modo anomalo</item>
     </plurals>
     <plurals name="power_high_usage_title" formatted="false" msgid="8013115866788425817">
-      <item quantity="one">Apps draining battery</item>
       <item quantity="other">Alcune app stanno consumando la batteria</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> sta consumando la batteria</item>
     </plurals>
     <string name="high_power_filter_on" msgid="447849271630431531">"Senza ottimizzazione"</string>
     <string name="high_power_on" msgid="8778058701270819268">"Senza ottimizzazione"</string>
@@ -4481,8 +4446,8 @@
     <string name="free_memory" msgid="439783742246854785">"Memoria disponibile"</string>
     <string name="memory_usage_apps" msgid="5776108502569850579">"Memoria utilizzata dalle app"</string>
     <plurals name="memory_usage_apps_summary" formatted="false" msgid="1355637088533572208">
-      <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> apps used memory in the last <xliff:g id="DURATION_1">%2$s</xliff:g></item>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> app hanno utilizzato la memoria nelle ultime <xliff:g id="DURATION_1">%2$s</xliff:g></item>
+      <item quantity="one">1 app ha utilizzato la memoria nelle ultime <xliff:g id="DURATION_0">%2$s</xliff:g></item>
     </plurals>
     <string name="running_frequency" msgid="7260225121706316639">"Frequenza"</string>
     <string name="memory_maximum_usage" msgid="2047013391595835607">"Utilizzo massimo"</string>
@@ -4559,8 +4524,8 @@
     <string name="data_usage_summary_format" msgid="6844301859713164522">"<xliff:g id="AMOUNT">%1$s</xliff:g> di dati utilizzati"</string>
     <string name="data_usage_wifi_format" msgid="7644390582649568117">"Dati utilizzati su Wi-Fi: <xliff:g id="AMOUNT">^1</xliff:g>"</string>
     <plurals name="notification_summary" formatted="false" msgid="7638388920823212470">
-      <item quantity="one">Off for <xliff:g id="COUNT">%d</xliff:g> apps</item>
       <item quantity="other">Disattivate per <xliff:g id="COUNT">%d</xliff:g> app</item>
+      <item quantity="one">Disattivate per 1 app</item>
     </plurals>
     <string name="notification_summary_none" msgid="9179312319023988089">"Attive per tutte le app"</string>
     <string name="apps_summary" msgid="4007416751775414252">"<xliff:g id="COUNT">%1$d</xliff:g> app installate"</string>
@@ -4627,12 +4592,12 @@
     <string name="suggestions_summary" msgid="1709710458908440469">"+ <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="suggestions_more_title" msgid="240124526378997009">"+ altri <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <plurals name="suggestions_collapsed_title" formatted="false" msgid="5023679825210836444">
-      <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> suggestions</item>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> suggerimenti</item>
+      <item quantity="one">1 suggerimento</item>
     </plurals>
     <plurals name="suggestions_collapsed_summary" formatted="false" msgid="3789011332018516832">
-      <item quantity="one">+<xliff:g id="COUNT">%1$d</xliff:g> suggestions</item>
       <item quantity="other">+<xliff:g id="COUNT">%1$d</xliff:g> suggerimenti</item>
+      <item quantity="one">+1 suggerimento</item>
     </plurals>
     <string name="suggestion_remove" msgid="6753986344585367776">"Rimuovi"</string>
     <string name="color_temperature" msgid="8256912135746305176">"Temperatura di colore fredda"</string>
@@ -4660,8 +4625,8 @@
     <string name="billing_cycle_fragment_summary" msgid="6346655500491631357">"Il giorno <xliff:g id="ID_1">%1$s</xliff:g> di ogni mese"</string>
     <string name="network_restrictions" msgid="8385824604048229846">"Restrizioni di rete"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="3875128958788008975">
-      <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> restrictions</item>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> restrizioni</item>
+      <item quantity="one">1 restrizione</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"La misurazione dell\'operatore potrebbe differire da quella del dispositivo"</string>
     <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Sono esclusi i dati usati dalle reti dell\'operatore"</string>
@@ -4675,8 +4640,8 @@
     <string name="configure" msgid="1499586749829665889">"Configura"</string>
     <string name="data_usage_other_apps" msgid="5649047093607329537">"Altre app incluse nell\'utilizzo"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="3316296488378947221">
-      <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> apps allowed to use unrestricted data when Data Saver is on</item>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> app autorizzate a utilizzare dati senza limitazioni quando la funzione Risparmio dati è attiva</item>
+      <item quantity="one">1 app autorizzata a utilizzare dati senza limitazioni quando la funzione Risparmio dati è attiva</item>
     </plurals>
     <string name="data_usage_title" msgid="4039024073687469094">"Dati principali"</string>
     <string name="data_usage_wifi_title" msgid="1060495519280456926">"Dati Wi‑Fi"</string>
@@ -4687,8 +4652,8 @@
     <string name="data_usage_chart_brief_content_description" msgid="5548074070258881530">"Grafico che mostra l\'utilizzo dei dati dal giorno <xliff:g id="START_DATE">%1$s</xliff:g> al giorno <xliff:g id="END_DATE">%2$s</xliff:g>."</string>
     <string name="data_usage_chart_no_data_content_description" msgid="5481968839079467231">"Non ci sono dati in questo intervallo di date"</string>
     <plurals name="billing_cycle_days_left" formatted="false" msgid="661792524671718753">
-      <item quantity="one">%d days left</item>
       <item quantity="other">%d giorni rimanenti</item>
+      <item quantity="one">%d giorno rimanente</item>
     </plurals>
     <string name="billing_cycle_none_left" msgid="1694844019159277504">"Tempo scaduto"</string>
     <string name="billing_cycle_less_than_one_day_left" msgid="1210202399053992163">"Meno di 1 giorno rimanente"</string>
@@ -4760,12 +4725,10 @@
     <string name="overlay_toast_failed_to_apply" msgid="4839587811338164960">"Applicazione dell\'overlay non riuscita"</string>
     <string name="special_access" msgid="1767980727423395147">"Accesso speciale per le app"</string>
     <plurals name="special_access_summary" formatted="false" msgid="4995506406763570815">
-      <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> apps can use unrestricted data</item>
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> app possono usare dati senza limitazioni</item>
+      <item quantity="one">1 app può usare dati senza limitazioni</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"Altro"</string>
-    <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"Vuoi cancellare i dati utente e convertire in crittografia dei file?"</string>
-    <string name="button_confirm_convert_fbe" msgid="339648921918438106">"Cancella e converti"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"Reimposta il limite di frequenza in ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"Il limite di frequenza di ShortcutManager è stato reimpostato"</string>
     <string name="notification_suggestion_title" msgid="6309263655965785411">"Gestisci le informazioni nella schermata di blocco"</string>
@@ -4800,16 +4763,16 @@
     <string name="cross_profile_calendar_title" msgid="7570277841490216947">"Calendario di più profili"</string>
     <string name="cross_profile_calendar_summary" msgid="8856185206722860069">"Mostra gli eventi di lavoro sul tuo calendario personale"</string>
     <plurals name="hours" formatted="false" msgid="1853396353451635458">
-      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> hours</item>
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> ore</item>
+      <item quantity="one">1 ora</item>
     </plurals>
     <plurals name="minutes" formatted="false" msgid="6244503272924425418">
-      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> minutes</item>
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minuti</item>
+      <item quantity="one">1 minuto</item>
     </plurals>
     <plurals name="seconds" formatted="false" msgid="4237020272336995370">
-      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> seconds</item>
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> secondi</item>
+      <item quantity="one">1 secondo</item>
     </plurals>
     <string name="automatic_storage_manager_settings" msgid="519158151463974656">"Gestisci archiviazione"</string>
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"Per liberare spazio, la gestione memoria rimuove foto e video dal dispositivo dopo averne eseguito il backup."</string>
@@ -4939,16 +4902,16 @@
     <string name="enterprise_privacy_enterprise_installed_packages" msgid="9114143640515900082">"App installate"</string>
     <string name="enterprise_privacy_apps_count_estimation_info" msgid="7959907857710107792">"Il numero delle app è una stima e potrebbe non includere le app installate all\'esterno del Play Store."</string>
     <plurals name="enterprise_privacy_number_packages_lower_bound" formatted="false" msgid="5403847001419529018">
-      <item quantity="one">Minimum <xliff:g id="COUNT_1">%d</xliff:g> apps</item>
       <item quantity="other">Minimo <xliff:g id="COUNT_1">%d</xliff:g> app</item>
+      <item quantity="one">Minimo <xliff:g id="COUNT_0">%d</xliff:g> app</item>
     </plurals>
     <string name="enterprise_privacy_location_access" msgid="8023838718108456971">"Autorizzazioni di accesso alla posizione"</string>
     <string name="enterprise_privacy_microphone_access" msgid="7242958026470143653">"Autorizzazioni microfono"</string>
     <string name="enterprise_privacy_camera_access" msgid="7685460535880069016">"Autorizzazioni fotocamera"</string>
     <string name="enterprise_privacy_enterprise_set_default_apps" msgid="7498546659083996300">"App predefinite"</string>
     <plurals name="enterprise_privacy_number_packages" formatted="false" msgid="8568544906431825430">
-      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> apps</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> app</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> app</item>
     </plurals>
     <string name="enterprise_privacy_input_method" msgid="3278314982700662246">"Tastiera predefinita"</string>
     <string name="enterprise_privacy_input_method_name" msgid="2974859490559054584">"Metodo impostato: <xliff:g id="APP_LABEL">%s</xliff:g>"</string>
@@ -4960,16 +4923,16 @@
     <string name="enterprise_privacy_ca_certs_personal" msgid="1516422660828485795">"Credenziali attendibili nel profilo personale"</string>
     <string name="enterprise_privacy_ca_certs_work" msgid="4318941788592655561">"Credenziali attendibili nel profilo di lavoro"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="6459725295322004179">
-      <item quantity="one">Minimum <xliff:g id="COUNT_1">%d</xliff:g> CA certificates</item>
       <item quantity="other">Minimo <xliff:g id="COUNT_1">%d</xliff:g> certificati CA</item>
+      <item quantity="one">Minimo <xliff:g id="COUNT_0">%d</xliff:g> certificato CA</item>
     </plurals>
     <string name="enterprise_privacy_lock_device" msgid="464054894363899866">"L\'amministratore può bloccare il dispositivo e reimpostare la password"</string>
     <string name="enterprise_privacy_wipe_device" msgid="869589182352244591">"L\'amministratore può eliminare tutti i dati del dispositivo"</string>
     <string name="enterprise_privacy_failed_password_wipe_device" msgid="7045164901334821226">"Tentativi di inserimento della password non riusciti prima dell\'eliminazione di tutti i dati del dispositivo"</string>
     <string name="enterprise_privacy_failed_password_wipe_work" msgid="2537582942554484170">"Tentativi di inserimento della password non riusciti prima dell\'eliminazione dei dati del profilo di lavoro"</string>
     <plurals name="enterprise_privacy_number_failed_password_wipe" formatted="false" msgid="8811973918944217791">
-      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> attempts</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> tentativi</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> tentativo</item>
     </plurals>
     <string name="do_disclosure_generic" msgid="3067459392402324538">"Questo dispositivo è gestito dalla tua organizzazione."</string>
     <string name="do_disclosure_with_name" msgid="867544298924410766">"Questo dispositivo è gestito da <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
@@ -4984,19 +4947,19 @@
     <string name="financed_privacy_failed_password_wipe_device" msgid="8777230427603977667">"Tentativi di inserimento della password non riusciti prima dell\'eliminazione dei dati del dispositivo"</string>
     <string name="financed_privacy_header" msgid="7215645340918406124">"Il tuo fornitore di credito può modificare le impostazioni e installare software su questo dispositivo.\n\nPer saperne di più, contatta il fornitore di credito."</string>
     <plurals name="default_camera_app_title" formatted="false" msgid="8112432929729136399">
-      <item quantity="one">Camera apps</item>
       <item quantity="other">App Fotocamera</item>
+      <item quantity="one">App Fotocamera</item>
     </plurals>
     <string name="default_calendar_app_title" msgid="1870095225089706093">"App di calendario"</string>
     <string name="default_contacts_app_title" msgid="7740028900741944569">"App di contatti"</string>
     <plurals name="default_email_app_title" formatted="false" msgid="8338194872609410234">
-      <item quantity="one">Email client apps</item>
       <item quantity="other">App client di posta</item>
+      <item quantity="one">App client di posta</item>
     </plurals>
     <string name="default_map_app_title" msgid="7569231732944853320">"App di mappe"</string>
     <plurals name="default_phone_app_title" formatted="false" msgid="4222188821845826493">
-      <item quantity="one">Phone apps</item>
       <item quantity="other">App Telefono</item>
+      <item quantity="one">App Telefono</item>
     </plurals>
     <string name="app_names_concatenation_template_2" msgid="8320181646458855457">"<xliff:g id="FIRST_APP_NAME">%1$s</xliff:g>, <xliff:g id="SECOND_APP_NAME">%2$s</xliff:g>"</string>
     <string name="app_names_concatenation_template_3" msgid="7019703249717854148">"<xliff:g id="FIRST_APP_NAME">%1$s</xliff:g>, <xliff:g id="SECOND_APP_NAME">%2$s</xliff:g>, <xliff:g id="THIRD_APP_NAME">%3$s</xliff:g>"</string>
@@ -5032,8 +4995,8 @@
     <string name="autofill_app" msgid="7595308061826307921">"Compilazione automatica"</string>
     <string name="autofill_passwords" msgid="6708057251459761083">"Password"</string>
     <plurals name="autofill_passwords_count" formatted="false" msgid="7715009165029452622">
-      <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> password</item>
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> password</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> password</item>
     </plurals>
     <string name="autofill_keywords" msgid="8598763328489346438">"automatica, compilazione, compilazione automatica, password"</string>
     <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;Verifica che questa app sia attendibile&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=La Compilazione automatica di Google&gt;%1$s&lt;/xliff:g&gt; usa ciò che appare sullo schermo per stabilire quali contenuti possono essere compilati automaticamente."</string>
@@ -5212,8 +5175,8 @@
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Chiedi ogni volta"</string>
     <string name="mobile_network_summary_add_a_network" msgid="9079866102827526779">"Aggiungi una rete"</string>
     <plurals name="mobile_network_summary_count" formatted="false" msgid="5173633860800230925">
-      <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> SIM</item>
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> SIM</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> SIM</item>
     </plurals>
     <string name="default_for_calls" msgid="2788950217176988034">"Predefinita per le chiamate"</string>
     <string name="default_for_sms" msgid="1316988329407434771">"Predefinita per SMS"</string>
@@ -5292,6 +5255,7 @@
     <string name="sim_action_yes" msgid="8076556020131395515">"Sì"</string>
     <string name="sim_action_reboot" msgid="3508948833333441538">"Riavvia"</string>
     <string name="sim_action_no_thanks" msgid="435717748384544195">"No grazie"</string>
+    <string name="sim_action_cancel" msgid="2668099867029610910">"Annulla"</string>
     <string name="sim_switch_button" msgid="1405772571706095387">"Cambia"</string>
     <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Impossibile attivare la SIM"</string>
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Rimuovi la SIM e inseriscila di nuovo. Se il problema persiste, riavvia il dispositivo."</string>
@@ -5306,7 +5270,7 @@
     <string name="dsds_notification_after_suw_title" msgid="3738898232310273982">"Configura l\'altra SIM"</string>
     <string name="dsds_notification_after_suw_text" msgid="1287357774676361084">"Scegli la SIM attiva o usa due SIM contemporaneamente"</string>
     <string name="choose_sim_title" msgid="4804689675237716286">"Scegli un numero da utilizzare"</string>
-    <string name="choose_sim_text" msgid="4356662002583501647">"{count,plural, =1{È disponibile 1 numero su questo dispositivo, ma è possibile usarne solo uno alla volta}=2{Sono disponibili 2 numeri su questo dispositivo, ma è possibile usarne solo uno alla volta}one{È disponibile # numero su questo dispositivo, ma è possibile usarne solo uno alla volta}other{Sono disponibili # numeri su questo dispositivo, ma è possibile usarne solo uno alla volta}}"</string>
+    <string name="choose_sim_text" msgid="4356662002583501647">"{count,plural, =1{È disponibile 1 numero su questo dispositivo, ma è possibile usarne solo uno alla volta}=2{Sono disponibili 2 numeri su questo dispositivo, ma è possibile usarne solo uno alla volta}other{Sono disponibili # numeri su questo dispositivo, ma è possibile usarne solo uno alla volta}}"</string>
     <string name="choose_sim_activating" msgid="9035902671985449448">"Attivazione in corso<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
     <string name="choose_sim_could_not_activate" msgid="2154564459842291617">"Al momento non è possibile attivarlo"</string>
     <string name="choose_sim_item_summary_unknown" msgid="7854314795485227568">"Numero sconosciuto"</string>
@@ -5360,13 +5324,13 @@
     <string name="permission_bar_chart_title" msgid="2493212904955611441">"Uso autorizzazioni nelle ultime 24 ore"</string>
     <string name="permission_bar_chart_details" msgid="5816698018592357088">"Mostra tutto nella Dashboard"</string>
     <plurals name="permission_bar_chart_label" formatted="false" msgid="4853396794340896078">
-      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> app</item>
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> app</item>
+      <item quantity="one">1 app</item>
     </plurals>
     <string name="accessibility_usage_title" msgid="9190967143518779145">"Utilizzo dell\'accessibilità"</string>
     <plurals name="accessibility_usage_summary" formatted="false" msgid="6910643986958263005">
-      <item quantity="one"><xliff:g id="SERVICE_COUNT">%1$d</xliff:g> app hanno accesso completo al tuo dispositivo</item>
       <item quantity="other"><xliff:g id="SERVICE_COUNT">%1$d</xliff:g> app hanno accesso completo al tuo dispositivo</item>
+      <item quantity="one">1 app ha accesso completo al tuo dispositivo</item>
     </plurals>
     <string name="media_output_panel_title" msgid="5920946795078065159">"Cambia uscita"</string>
     <string name="media_output_panel_summary_of_playing_device" msgid="6998758947764222915">"Attualmente in riproduzione sul dispositivo <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
@@ -5444,6 +5408,10 @@
     <string name="cached_apps_freezer" msgid="1057519579761550350">"Sospendi esecuzione app memorizzate nella cache"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"Consenti gli overlay schermo sulle Impostazioni"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Consenti alle app visualizzabili sopra altre app di sovrapporre le schermate Impostazioni"</string>
+    <!-- no translation found for allow_mock_modem (3832264806530479214) -->
+    <skip />
+    <!-- no translation found for allow_mock_modem_summary (9097416612748005374) -->
+    <skip />
     <string name="media_controls_title" msgid="403271085636252597">"Contenuti multimediali"</string>
     <string name="media_controls_resume_title" msgid="855076860336652370">"Blocca media player sullo schermo"</string>
     <string name="media_controls_resume_description" msgid="3163482266454802097">"Per riprendere velocemente la riproduzione, il media player rimane aperto nelle Impostazioni rapide"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 8e62ae0..6553fb0 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -144,10 +144,11 @@
     <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"‏המכשיר שלך יוכל לתקשר עם מכשירי Bluetooth שנמצאים בקרבת מקום"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"‏הטלפון שלך יוכל לתקשר עם מכשירי Bluetooth שנמצאים בקרבת מקום"</string>
     <string name="bluetooth_disable_a2dp_hw_offload" msgid="5942913792817797541">"‏השבתת העברה לחומרת A2DP של Bluetooth"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="8610420176339657720">"להפעיל מכשיר מחדש?"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8333029144800835996">"עליך להפעיל מחדש את המכשיר כדי לשנות הגדרה זו."</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="3488695418187553566">"הפעלה מחדש"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="4930826928585464191">"ביטול"</string>
+    <string name="bluetooth_disable_le_audio_hw_offload" msgid="3966022676505972908">"‏השבתת ההעברה לחומרת LE AUDIO של Bluetooth"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_title" msgid="6001142380445276918">"להפעיל את המכשיר מחדש?"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_message" msgid="1524373895333698779">"עליך להפעיל מחדש את המכשיר כדי לשנות הגדרה זו."</string>
+    <string name="bluetooth_disable_hw_offload_dialog_confirm" msgid="5594859658551707592">"הפעלה מחדש"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel" msgid="3663690305043973720">"ביטול"</string>
     <string name="connected_device_media_device_title" msgid="3783388247594566734">"מכשירים לאחסון מדיה"</string>
     <string name="connected_device_call_device_title" msgid="88732390601723608">"מכשירי התקשרות"</string>
     <string name="connected_device_other_device_title" msgid="4652120430615729193">"מכשירים אחרים"</string>
@@ -315,9 +316,9 @@
     <string name="security_settings_title" msgid="6710768415432791970">"אבטחה"</string>
     <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"הצפנה ופרטי כניסה"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"טלפון מוצפן"</string>
-    <string name="decryption_settings_summary" product="default" msgid="1742645256103613503">"הטלפון לא מוצפן"</string>
+    <string name="not_encrypted_summary" product="default" msgid="2251945842585788254">"הטלפון לא מוצפן"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"המכשיר מוצפן"</string>
-    <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"המכשיר לא מוצפן"</string>
+    <string name="not_encrypted_summary" product="tablet" msgid="2374263654698719382">"המכשיר לא מוצפן"</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"מסך נעילה"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"מה להציג"</string>
     <string name="security_settings_summary" msgid="1627059516127354233">"‏הגדרת \'המיקום שלי\', ביטול נעילת מסך, נעילת כרטיס SIM, נעילת אחסון אישורים"</string>
@@ -488,7 +489,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"מחיקה"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"נגיעה בחיישן"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"יש להניח את האצבע על החיישן ולהרים אותה לאחר שמרגישים רטט"</string>
-    <string name="security_settings_udfps_enroll_start_message" msgid="5032954588171487566">"צריך לשמור שטביעת האצבע תהיה שטוחה על החיישן עד שמרגישים רטט"</string>
+    <string name="security_settings_udfps_enroll_start_message" msgid="5032954588171487566">"צריך להחזיק את האצבע כך שטביעת האצבע תהיה על החיישן, עד שמרגישים רטט"</string>
     <string name="security_settings_fingerprint_enroll_udfps_title" msgid="6665610134560896895">"לחיצה ארוכה על חיישן טביעות האצבע"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"להרים ולגעת בחיישן שוב"</string>
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"ושוב…"</string>
@@ -496,7 +497,7 @@
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"יש להרים את האצבע ולגעת בחיישן עם חלקים שונים של האצבע לקבלת טביעת אצבע מלאה"</string>
     <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"לוחצים לחיצה ארוכה בכל פעם שסמל טביעת האצבע זז. כך יתועד חלק גדול יותר מהאצבע."</string>
     <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"מניחים את קצה האצבע על החיישן"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="6137605344819152477">"לבסוף, משתמשים בקצוות האצבע"</string>
+    <string name="security_settings_udfps_enroll_edge_title" msgid="6137605344819152477">"יש לסובב את קצה האצבע"</string>
     <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"מניחים צד אחד של האצבע על החיישן ומחזיקים. אחר כך עוברים לצד השני"</string>
     <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"כך יתועד חלק גדול יותר מהאצבע"</string>
     <!-- String.format failed for translation -->
@@ -578,37 +579,10 @@
     <string name="fingerprint_last_delete_message" msgid="7860374760549404410">"לא תהיה לך אפשרות להשתמש בטביעת האצבע כדי לבטל את הנעילה של הטלפון או לאמת את הזהות שלך באפליקציות."</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="4104208067277655068">"לא תהיה לך אפשרות להשתמש בטביעת האצבע כדי לבטל את נעילת פרופיל העבודה שלך, לאשר רכישות או להיכנס לאפליקציות לעבודה."</string>
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"כן, להסיר"</string>
-    <string name="crypt_keeper_settings_title" msgid="4938812137822100044">"הצפנה"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"הצפנת טאבלט"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"הצפנת הטלפון"</string>
-    <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"מוצפן"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"ניתן להצפין חשבונות, הגדרות, אפליקציות שהורדת והנתונים שלהן, מדיה וקבצים אחרים. לאחר הצפנת הטאבלט, בהנחה שהגדרת נעילת מסך (כלומר קו ביטול נעילה, קוד אימות או סיסמה), יהיה עליך לבטל את נעילת המסך כדי לפענח את הצפנת הטאבלט בכל פעם שתפעיל אותו. הדרך האחרת היחידה לפענוח ההצפנה היא לבצע איפוס לנתוני היצרן – פעולה שמוחקת את כל הנתונים.\n\nתהליך ההצפנה נמשך שעה או יותר. יש להתחיל כשהסוללה טעונה במלואה ולהשאיר את הטאבלט מחובר לחשמל במשך כל התהליך. אם התהליך יופסק, ייתכן שתאבד חלק מהנתונים או את כולם."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"ניתן להצפין חשבונות, הגדרות, אפליקציות שהורדת והנתונים שלהן, מדיה וקבצים אחרים. לאחר הצפנת הטלפון, בהנחה שהגדרת נעילת מסך (כלומר קו ביטול נעילה, קוד אימות או סיסמה), יהיה עליך לבטל את נעילת המסך כדי לפענח את הצפנת הטלפון בכל פעם שתפעיל אותו. הדרך האחרת היחידה לפענוח ההצפנה היא לבצע איפוס לנתוני היצרן – פעולה שמוחקת את כל הנתונים.\n\nתהליך ההצפנה נמשך שעה או יותר. יש להתחיל כשהסוללה טעונה במלואה ולהשאיר את הטלפון מחובר לחשמל במשך כל התהליך. אם התהליך יופסק, ייתכן שתאבד חלק מהנתונים או את כולם."</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"הצפנת טאבלט"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"הצפנת הטלפון"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"כדאי לטעון את הסוללה ולנסות שוב."</string>
-    <string name="crypt_keeper_unplugged_text" msgid="2709721134148651329">"יש לחבר את המטען ולנסות שוב."</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="1847280235529858357">"אין קוד גישה או סיסמה לנעילת מסך"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="7210616262954236042">"עליך להגדיר קוד גישה או סיסמה לנעילת מסך כדי שאפשר יהיה להתחיל בהצפנה."</string>
-    <string name="crypt_keeper_confirm_title" msgid="8600000209722452230">"האם להצפין?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="3270587498436152259">"פעולת ההצפנה אינה ניתנת לביטול, ואם היא תופסק, יאבדו נתונים. ההצפנה אורכת שעה לפחות, ובמהלך זמן זה הטאבלט יופעל מחדש כמה פעמים."</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="3040428543349852419">"פעולת ההצפנה אינה ניתנת לביטול, ואם תפסיק אותה תאבד נתונים. ההצפנה אורכת שעה לפחות, ובמהלך זמן זה הטלפון יופעל מחדש כמה פעמים."</string>
-    <string name="crypt_keeper_setup_title" msgid="3339725741305796680">"מצפין"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="4417016995091289019">"יש להמתין בזמן הצפנת הטאבלט. <xliff:g id="PERCENT">^1</xliff:g> הושלמו."</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="7902355422499500352">"יש להמתין בזמן הצפנת הטלפון. <xliff:g id="PERCENT">^1</xliff:g> הושלמו."</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="8348188415839917821">"יש להמתין עד להשלמת ההצפנה של הטאבלט. הזמן הנותר: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="8556105766597855198">"יש להמתין עד להשלמת ההצפנה של הטלפון. זמן נותר: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="3832496715430327682">"כדי לבטל את נעילת הטאבלט, יש לכבות את הטאבלט ולהפעיל אותו שוב."</string>
-    <string name="crypt_keeper_force_power_cycle" product="default" msgid="5070346039522135361">"כדי לבטל את נעילת הטלפון, כבה את הטלפון והפעל אותו שוב."</string>
-    <string name="crypt_keeper_warn_wipe" msgid="8104921337301750394">"אזהרה: המכשיר שלך יימחק לאחר <xliff:g id="COUNT">^1</xliff:g> ניסיונות כושלים נוספים לביטול הנעילה!"</string>
-    <string name="crypt_keeper_enter_password" msgid="1274917431075529732">"עליך להקליד את הסיסמה שלך"</string>
-    <string name="crypt_keeper_failed_title" msgid="8173654570682244149">"ההצפנה נכשלה"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"‏ההצפנה הופסקה ואין אפשרות להשלים אותה. בשל כך, לא ניתן עוד לגשת לנתונים בטאבלט שלך. \n\nכדי לחזור ולהשתמש בטאבלט, עליך לבצע איפוס נתוני יצרן. אחרי הגדרת הטאבלט לאחר האיפוס, ניתן יהיה לשחזר נתונים שגובו בחשבון Google שלך."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"‏ההצפנה הופסקה ואין אפשרות להשלים אותה. כתוצאה מכך, לא ניתן עוד לגשת לנתונים בטלפון שלך. \n\nכדי לחזור ולהשתמש בטלפון, עליך לבצע איפוס להגדרות היצרן. כאשר תגדיר את הטלפון לאחר האיפוס, תהיה לך הזדמנות לשחזר נתונים שגובו בחשבון Google שלך."</string>
-    <string name="crypt_keeper_data_corrupt_title" msgid="5920153462176846037">"הפענוח נכשל"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"‏הסיסמה שהזנת נכונה, אך לצערנו הנתונים שלך פגומים. \n\nכדי לחזור ולהשתמש בטאבלט, עליך לבצע איפוס להגדרות היצרן. בזמן הגדרת הטאבלט לאחר האיפוס, תהיה לך הזדמנות לשחזר נתונים שגובו בחשבון Google שלך."</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"‏הסיסמה שהזנת נכונה, אך לצערנו הנתונים שלך פגומים. \n\nכדי לחזור ולהשתמש בטלפון, עליך לבצע איפוס להגדרות היצרן. בזמן הגדרת הטלפון לאחר האיפוס, תהיה לך הזדמנות לשחזר נתונים שגובו בחשבון Google שלך."</string>
-    <string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"החלפת שיטת קלט"</string>
+    <string name="encryption_settings_title" msgid="2848716008695618360">"הצפנה"</string>
+    <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"הצפנת הטאבלט"</string>
+    <string name="encrypt_title" product="default" msgid="7337365190988321100">"הצפנת הטלפון"</string>
+    <string name="encrypted_summary" msgid="545623487587251207">"ההצפנה פועלת"</string>
     <string name="suggested_lock_settings_title" msgid="7836065447159730217">"שמירה על אבטחת הטלפון"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"הגדרה של נעילת מסך לצורך הגנה על הטאבלט"</string>
     <string name="suggested_lock_settings_summary" product="device" msgid="8479766049078378225">"הגדרה של נעילת מסך לצורך הגנה על המכשיר"</string>
@@ -853,6 +827,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"ייתכן שתצטרך להקליד את קוד הגישה הזה גם במכשיר השני."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"ייתכן שתצטרך להקליד את המפתח הזה גם במכשיר השני."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"‏כדי להתאים עם:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;ודא שהמכשיר מציג סיסמה זו:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"עליך לאשר התאמה עם הקבוצה המתואמת"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"‏מאת:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;לבצע התאמה עם מכשיר זה?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"‏כדי להתאים עם:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>יש הקלד בו:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, ולאחר מכן להקיש על Return או Enter."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"אישור גישה אל אנשי הקשר והיסטוריית השיחות"</string>
@@ -886,6 +861,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"לא ניתן להתחבר. יש לנסות שוב."</string>
     <string name="device_details_title" msgid="1155622417516195481">"פרטי המכשיר"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"‏כתובת המכשיר לחיבור דרך Bluetooth‏: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"‏כתובת המכשיר לחיבור דרך Bluetooth:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"לשכוח את המכשיר?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"הסרת השיוך"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"האם לנתק את האפליקציה?"</string>
@@ -917,6 +893,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"לא לשכוח הגדרות"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"‏מקסימום התקני אודיו המחוברים באמצעות Bluetooth"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"‏בחירת מספר מקסימלי של התקני אודיו המחוברים באמצעות Bluetooth"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"‏יומן ניפוי באגים של מקבץ NFC"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"‏העלאת רמת הרישום של מקבץ NFC ביומן"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"‏העברה (cast)"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"‏העברה (csat)"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"‏הפעלת תצוגת WiFi"</string>
@@ -1230,6 +1208,8 @@
     <string name="wifi_hotspot_maximize_compatibility_dual_ap_summary" msgid="3579549223159056533">"האפשרות הזו עוזרת למכשירים אחרים לאתר את נקודת האינטרנט הזו. השימוש בסוללה יוגבר."</string>
     <string name="wifi_tether_starting" msgid="8879874184033857814">"מתבצעת הפעלה של נקודה לשיתוף אינטרנט…"</string>
     <string name="wifi_tether_stopping" msgid="4416492968019409188">"מתבצע כיבוי של נקודה לשיתוף אינטרנט…"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_title" msgid="3089432578433978073">"‏שיתוף האינטרנט בין מכשירים (tethering) לא זמין"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_content" msgid="5920421547607921112">"למידע נוסף, ניתן לפנות לספק"</string>
     <string name="wifi_tether_enabled_subtext" msgid="5085002421099821056">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> פעיל"</string>
     <string name="wifi_tether_failed_subtext" msgid="437190628041885500">"‏שגיאה בנקודה ניידת לשיתוף אינטרנט ב-Wi-Fi"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7072559431286459122">"‏הגדרת נקודה לשיתוף אינטרנט דרך Wi-Fi"</string>
@@ -2594,11 +2574,6 @@
     <string name="enable_service_title" msgid="7231533866953706788">"להעניק לשירות <xliff:g id="SERVICE">%1$s</xliff:g> שליטה מלאה במכשיר?"</string>
     <string name="capabilities_list_title" msgid="1225853611983394386">"‏<xliff:g id="SERVICE">%1$s</xliff:g> צריך אפשרות לבצע:"</string>
     <string name="touch_filtered_warning" msgid="4225815157460318241">"יש אפליקציה שמסתירה את בקשת ההרשאה, ולכן להגדרות אין אפשרות לאמת את התשובה."</string>
-    <string name="enable_service_encryption_warning" msgid="931082737770453755">"אם מפעילים את <xliff:g id="SERVICE">%1$s</xliff:g>, המכשיר לא ישתמש בנעילת המסך כדי לשפר את הצפנת הנתונים."</string>
-    <string name="secure_lock_encryption_warning" msgid="669152607190123579">"מפני שהפעלת שירות נגישות, המכשיר לא ישתמש בנעילת המסך כדי להגביר את הצפנת הנתונים."</string>
-    <string name="enable_service_pattern_reason" msgid="6832846117817938536">"הפעלת <xliff:g id="SERVICE">%1$s</xliff:g> משפיעה על הצפנת הנתונים, לכן עליך לאשר את קו ביטול הנעילה שלך."</string>
-    <string name="enable_service_pin_reason" msgid="6040417014360237703">"מאחר שהפעלת <xliff:g id="SERVICE">%1$s</xliff:g> משפיעה על הצפנת הנתונים, עליך לאשר את קוד הגישה שלך."</string>
-    <string name="enable_service_password_reason" msgid="6962544350351734238">"מאחר שהפעלת <xliff:g id="SERVICE">%1$s</xliff:g> משפיעה על הצפנת הנתונים, עליך לאשר את הסיסמה שלך."</string>
     <string name="accessibility_service_warning" msgid="6779187188736432618">"השירות <xliff:g id="SERVICE">%1$s</xliff:g> מבקש שליטה מלאה במכשיר זה. השירות יכול לקרוא את המסך ולפעול בשמם של משתמשים בעלי צרכים של נגישות. רמה כזו של שליטה אינה מתאימה לרוב האפליקציות."</string>
     <string name="accessibility_service_warning_description" msgid="6573203795976134751">"האפשרות לשליטה מלאה במכשיר לא מתאימה לכל האפליקציות, אלא רק לאפליקציות שעוזרות עם צורכי הנגישות שלך."</string>
     <string name="accessibility_service_screen_control_title" msgid="324795030658109870">"הצגת המסך ושליטה בו"</string>
@@ -3185,14 +3160,6 @@
     <string name="remove_account_failed" msgid="3709502163548900644">"מנהל המכשיר אינו מתיר שינוי זה"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"לא ניתן לסנכרן באופן ידני"</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"אפשרות הסנכרון עבור פריט זה מושבתת כרגע. כדי לשנות את ההגדרה, יש להפעיל באופן זמני את נתוני הרקע והסנכרון האוטומטי."</string>
-    <string name="enter_password" msgid="6327051330258595331">"‏כדי להפעיל את Android עליך להזין את הסיסמה שלך"</string>
-    <string name="enter_pin" msgid="1029287617551232681">"‏כדי להפעיל את Android, יש להזין את קוד האימות"</string>
-    <string name="enter_pattern" msgid="1747316785866742960">"‏כדי להפעיל את Android, יש לשרטט את קו ביטול הנעילה"</string>
-    <string name="cryptkeeper_wrong_pattern" msgid="340747269176120242">"קו ביטול נעילה שגוי"</string>
-    <string name="cryptkeeper_wrong_password" msgid="7295607881887114486">"סיסמה שגויה"</string>
-    <string name="cryptkeeper_wrong_pin" msgid="2347961593970714201">"קוד גישה שגוי"</string>
-    <string name="checking_decryption" msgid="6111642972615688237">"מתבצעת בדיקה…"</string>
-    <string name="starting_android" msgid="6694154070215356186">"‏הפעלת Android מתבצעת…"</string>
     <string name="delete" msgid="8330605554706263775">"מחיקה"</string>
     <string name="misc_files" msgid="6598066985800749585">"קובצי \'שונות\'"</string>
     <string name="misc_files_selected_count" msgid="5597802791672749532">"נבחרו <xliff:g id="NUMBER">%1$d</xliff:g> מתוך <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -3288,8 +3255,6 @@
     <string name="data_usage_metered_yes" msgid="4262598072030135223">"חיוב לפי שימוש בנתונים"</string>
     <string name="data_usage_metered_no" msgid="1685828958417926268">"לא נמדדת"</string>
     <string name="data_usage_disclaimer" msgid="3271450299386176770">"ייתכן שחישוב השימוש בנתונים אצל הספק יהיה שונה מזה שבמכשיר."</string>
-    <string name="cryptkeeper_emergency_call" msgid="8369322820475703306">"שיחת חירום"</string>
-    <string name="cryptkeeper_return_to_call" msgid="3857250752781151232">"חזרה לשיחה"</string>
     <string name="vpn_name" msgid="3806456074909253262">"שם"</string>
     <string name="vpn_type" msgid="5533202873260826663">"סוג"</string>
     <string name="vpn_server" msgid="2908816134941973935">"כתובת שרת"</string>
@@ -4916,8 +4881,6 @@
       <item quantity="one">אפליקציה אחת יכולה להשתמש בנתונים בלתי מוגבלים</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"תכונות נוספות"</string>
-    <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"האם ברצונך למחוק נתוני משתמשים ולהמיר להצפנת קבצים?"</string>
-    <string name="button_confirm_convert_fbe" msgid="339648921918438106">"מחיקה והמרה"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"‏איפוס הגבלת דירוג ב-ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"‏אופסה הגבלת דירוג ב-ShortcutManager"</string>
     <string name="notification_suggestion_title" msgid="6309263655965785411">"בחירת הפרטים שמופיעים במסך הנעילה"</string>
@@ -5468,6 +5431,7 @@
     <string name="sim_action_yes" msgid="8076556020131395515">"כן"</string>
     <string name="sim_action_reboot" msgid="3508948833333441538">"הפעלה מחדש"</string>
     <string name="sim_action_no_thanks" msgid="435717748384544195">"לא תודה"</string>
+    <string name="sim_action_cancel" msgid="2668099867029610910">"ביטול"</string>
     <string name="sim_switch_button" msgid="1405772571706095387">"מעבר"</string>
     <string name="dsds_activation_failure_title" msgid="4467364110584914794">"‏לא ניתן להפעיל את ה-SIM"</string>
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"‏יש להוציא את ה-SIM ולהכניס אותו חזרה. אם הבעיה נמשכת, יש להפעיל מחדש את המכשיר."</string>
@@ -5624,6 +5588,10 @@
     <string name="cached_apps_freezer" msgid="1057519579761550350">"השעיית הביצוע לאפליקציות שנשמרו במטמון"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"אפשרות של שכבות-על במסכי \'הגדרות\'"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"אפליקציות שיכולות להופיע מעל אפליקציות אחרות יוכלו ליצור שכבות-על במסכי ההגדרות"</string>
+    <!-- no translation found for allow_mock_modem (3832264806530479214) -->
+    <skip />
+    <!-- no translation found for allow_mock_modem_summary (9097416612748005374) -->
+    <skip />
     <string name="media_controls_title" msgid="403271085636252597">"מדיה"</string>
     <string name="media_controls_resume_title" msgid="855076860336652370">"הצמדה של נגן המדיה"</string>
     <string name="media_controls_resume_description" msgid="3163482266454802097">"לצורך המשך מהיר של ההפעלה, נגן המדיה נשאר פתוח בהגדרות המהירות"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 9c67fd1..b79fc29 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -142,10 +142,11 @@
     <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"デバイスが付近の Bluetooth デバイスと通信することを許可する"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"スマートフォンが付近の Bluetooth デバイスと通信することを許可する"</string>
     <string name="bluetooth_disable_a2dp_hw_offload" msgid="5942913792817797541">"Bluetooth A2DP ハードウェア オフロードの無効化"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="8610420176339657720">"デバイスを再起動しますか?"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8333029144800835996">"この設定を変更するには、デバイスの再起動が必要です。"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="3488695418187553566">"再起動"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="4930826928585464191">"キャンセル"</string>
+    <string name="bluetooth_disable_le_audio_hw_offload" msgid="3966022676505972908">"Bluetooth LE AUDIO ハードウェア オフロードを無効にする"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_title" msgid="6001142380445276918">"デバイスを再起動しますか?"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_message" msgid="1524373895333698779">"この設定を変更するには、デバイスの再起動が必要です。"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_confirm" msgid="5594859658551707592">"再起動"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel" msgid="3663690305043973720">"キャンセル"</string>
     <string name="connected_device_media_device_title" msgid="3783388247594566734">"メディア デバイス"</string>
     <string name="connected_device_call_device_title" msgid="88732390601723608">"通話デバイス"</string>
     <string name="connected_device_other_device_title" msgid="4652120430615729193">"その他のデバイス"</string>
@@ -309,9 +310,9 @@
     <string name="security_settings_title" msgid="6710768415432791970">"セキュリティ"</string>
     <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"暗号化と認証情報"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"スマートフォンの暗号化"</string>
-    <string name="decryption_settings_summary" product="default" msgid="1742645256103613503">"スマートフォンが暗号化されていません"</string>
+    <string name="not_encrypted_summary" product="default" msgid="2251945842585788254">"スマートフォンが暗号化されていません"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"デバイスの暗号化"</string>
-    <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"デバイスが暗号化されていません"</string>
+    <string name="not_encrypted_summary" product="tablet" msgid="2374263654698719382">"デバイスが暗号化されていません"</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"ロック画面"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"表示する情報"</string>
     <string name="security_settings_summary" msgid="1627059516127354233">"現在地、画面ロック、SIMカードロック、認証情報ストレージのロック"</string>
@@ -480,7 +481,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"削除"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"センサーを指でタッチ"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"指をセンサーに当て、振動したら離します。"</string>
-    <string name="security_settings_udfps_enroll_start_message" msgid="5032954588171487566">"振動を感じるまでセンサーから指を離さないでください"</string>
+    <string name="security_settings_udfps_enroll_start_message" msgid="5032954588171487566">"振動を感じるまでセンサーに指を平らに押し当てます"</string>
     <string name="security_settings_fingerprint_enroll_udfps_title" msgid="6665610134560896895">"指紋認証センサーを長押ししてください"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"指をタッチして離す"</string>
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"もう一度"</string>
@@ -488,8 +489,8 @@
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"指を何度か離して、あらゆる角度から指紋を登録します。"</string>
     <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"指紋アイコンの動きに合わせて長押ししてください。これで指紋を正しく登録できるようになります。"</string>
     <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"指先をセンサーに当ててください"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="6137605344819152477">"最後に指の縁の部分を使用してください"</string>
-    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"指紋をセンサーに当てて長押しし、指を離してから別の部分を当ててください"</string>
+    <string name="security_settings_udfps_enroll_edge_title" msgid="6137605344819152477">"最後に指の端を押し当ててください"</string>
+    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"指の一方の端をセンサーに押し当て、その後他方の端を押し当てます"</string>
     <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"これで指紋を正しく登録できるようになります。"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"指紋の登録中: <xliff:g id="PERCENTAGE">%d</xliff:g> パーセント"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"指紋の登録完了"</string>
@@ -568,37 +569,10 @@
     <string name="fingerprint_last_delete_message" msgid="7860374760549404410">"スマートフォンのロック解除やアプリでの本人確認に、指紋を使用できなくなります。"</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="4104208067277655068">"仕事用プロファイルのロック解除や、購入の承認、仕事用アプリへのログインに、指紋を使用できなくなります。"</string>
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"削除"</string>
-    <string name="crypt_keeper_settings_title" msgid="4938812137822100044">"暗号化"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"タブレットの暗号化"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"スマートフォンの暗号化"</string>
-    <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"暗号化されています"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"アカウント、設定、ダウンロードしたアプリとそのデータ、メディアなどのファイルを暗号化できます。タブレットを暗号化すると、画面ロック(パターン、数値PIN、パスワード)を設定済みの場合は、電源を入れるたびに画面のロックを解除してタブレットを復号化する必要があります。他に暗号化を解除する方法は、データの初期化を行ってすべてのデータを消去する方法のみです。\n\n暗号化には1時間以上かかります。開始する前に完全に充電し、暗号化が完了するまでタブレットを電源に接続しておく必要があります。中断すると、一部またはすべてのデータが失われます。"</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"アカウント、設定、ダウンロードしたアプリとそのデータ、メディアなどのファイルを暗号化できます。スマートフォンを暗号化すると、画面ロック(パターン、数値PIN、パスワード)を設定済みの場合は、電源を入れるたびに画面のロックを解除してスマートフォンを復号化する必要があります。他に暗号化を解除する方法は、データの初期化を行ってすべてのデータを消去する方法のみです。\n\n暗号化には1時間以上かかります。開始する前に完全に充電し、暗号化が完了するまでスマートフォンを電源に接続しておく必要があります。中断すると、一部またはすべてのデータが失われます。"</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"タブレットを暗号化"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"スマートフォンを暗号化"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"充電してからもう一度お試しください。"</string>
-    <string name="crypt_keeper_unplugged_text" msgid="2709721134148651329">"電源に接続してもう一度お試しください。"</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="1847280235529858357">"画面ロックのPIN/パスワードがありません"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="7210616262954236042">"暗号化を開始するには、画面ロックのPINまたはパスワードを設定する必要があります。"</string>
-    <string name="crypt_keeper_confirm_title" msgid="8600000209722452230">"暗号化しますか?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="3270587498436152259">"この暗号化操作は元に戻すことができず、途中で中断するとデータが失われます。暗号化には1時間以上かかり、途中でタブレットが何度か再起動されます。"</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="3040428543349852419">"この暗号化操作は元に戻すことができず、途中で中断するとデータが失われます。暗号化には1時間以上かかり、途中でスマートフォンが何度か再起動されます。"</string>
-    <string name="crypt_keeper_setup_title" msgid="3339725741305796680">"暗号化しています"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="4417016995091289019">"タブレットを暗号化しています。しばらくお待ちください。<xliff:g id="PERCENT">^1</xliff:g>%完了。"</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="7902355422499500352">"モバイル デバイスを暗号化しています。しばらくお待ちください。<xliff:g id="PERCENT">^1</xliff:g>%完了。"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="8348188415839917821">"タブレットを暗号化していますのでお待ちください。残り時間: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="8556105766597855198">"携帯電話を暗号化していますのでお待ちください。残り時間: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="3832496715430327682">"タブレットのロックを解除するには、OFFにしてからONにします。"</string>
-    <string name="crypt_keeper_force_power_cycle" product="default" msgid="5070346039522135361">"携帯電話のロックを解除するには、OFFにしてからONにします。"</string>
-    <string name="crypt_keeper_warn_wipe" msgid="8104921337301750394">"警告: ロック解除にあと<xliff:g id="COUNT">^1</xliff:g>回失敗すると、デバイスのデータが消去されます。"</string>
-    <string name="crypt_keeper_enter_password" msgid="1274917431075529732">"パスワードを入力してください"</string>
-    <string name="crypt_keeper_failed_title" msgid="8173654570682244149">"暗号化できませんでした"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"暗号化処理が中断されて完了できなかったためタブレット上のデータにアクセスできなくなりました。\n\nタブレットの使用を再開するには出荷時設定にリセットする必要があります。リセット後、タブレットのセットアップの段階で、Googleアカウントにバックアップしたデータの復元を選択できます。"</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"暗号化処理が中断されて完了できなかったためデバイス上のデータにアクセスできなくなりました。\n\nデバイスの使用を再開するには出荷時設定にリセットする必要があります。リセット後、デバイスのセットアップの段階で、Googleアカウントにバックアップしたデータの復元を選択できます。"</string>
-    <string name="crypt_keeper_data_corrupt_title" msgid="5920153462176846037">"復号の失敗"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"入力したパスワードは正しいのですが、データが破損しています。\n\nタブレットの使用を再開するには出荷時設定にリセットする必要があります。リセット後、タブレットのセットアップの段階で、Googleアカウントにバックアップしたデータの復元を選択できます。"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"入力したパスワードは正しいのですが、データが破損しています。\n\nスマートフォンの使用を再開するには出荷時設定にリセットする必要があります。リセット後、スマートフォンのセットアップの段階で、Googleアカウントにバックアップしたデータの復元を選択できます。"</string>
-    <string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"入力方法の切り替え"</string>
+    <string name="encryption_settings_title" msgid="2848716008695618360">"暗号化"</string>
+    <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"タブレットの暗号化"</string>
+    <string name="encrypt_title" product="default" msgid="7337365190988321100">"スマートフォンの暗号化"</string>
+    <string name="encrypted_summary" msgid="545623487587251207">"暗号化されています"</string>
     <string name="suggested_lock_settings_title" msgid="7836065447159730217">"スマートフォンの保護"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"画面ロックを設定するとタブレットを保護できます"</string>
     <string name="suggested_lock_settings_summary" product="device" msgid="8479766049078378225">"画面ロックを設定するとデバイスを保護できます"</string>
@@ -817,6 +791,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"もう一方のデバイスでも、このPINの入力が必要な場合があります。"</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"もう一方のデバイスでも、このパスキーの入力が必要な場合があります。"</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"次のデバイスをペアに設定する場合:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;次のパスキーが表示されていることを確認してください:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"確認すると、調整された設定でペア設定します"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"発信元:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;このデバイスをペアに設定しますか?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>をペアに設定するには、「<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>」と入力してから、ReturnキーまたはEnterキーを押します。"</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"連絡先と通話履歴へのアクセスを許可する"</string>
@@ -850,6 +825,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"接続できませんでした。もう一度お試しください。"</string>
     <string name="device_details_title" msgid="1155622417516195481">"デバイスの詳細"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"デバイスの Bluetooth アドレス: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"デバイスの Bluetooth アドレス:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"このデバイスとのペア設定を解除しますか?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"関連付けを削除"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"アプリの接続を解除しますか?"</string>
@@ -881,6 +857,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"設定を保存"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"接続できる Bluetooth オーディオ デバイスの上限"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"接続できる Bluetooth オーディオ デバイス数の上限の選択"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"NFC スタック デバッグログ"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"NFC スタック ロギングレベルを増やす"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"キャスト"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"ミラー"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"ワイヤレス ディスプレイの有効化"</string>
@@ -1188,6 +1166,8 @@
     <string name="wifi_hotspot_maximize_compatibility_dual_ap_summary" msgid="3579549223159056533">"他のデバイスにこのアクセス ポイントが公開されます。バッテリー使用量が増えます。"</string>
     <string name="wifi_tether_starting" msgid="8879874184033857814">"アクセスポイントをONにしています…"</string>
     <string name="wifi_tether_stopping" msgid="4416492968019409188">"アクセスポイントをOFFにしています…"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_title" msgid="3089432578433978073">"テザリングは利用できません"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_content" msgid="5920421547607921112">"詳しくは携帯通信会社にお問い合わせください"</string>
     <string name="wifi_tether_enabled_subtext" msgid="5085002421099821056">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> はアクティブです"</string>
     <string name="wifi_tether_failed_subtext" msgid="437190628041885500">"ポータブルWi-Fiアクセスポイントエラー"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7072559431286459122">"Wi-Fiアクセスポイントをセットアップ"</string>
@@ -2534,11 +2514,6 @@
     <string name="enable_service_title" msgid="7231533866953706788">"<xliff:g id="SERVICE">%1$s</xliff:g> にデバイスのフル コントロールを許可しますか?"</string>
     <string name="capabilities_list_title" msgid="1225853611983394386">"<xliff:g id="SERVICE">%1$s</xliff:g>では以下が必要です。"</string>
     <string name="touch_filtered_warning" msgid="4225815157460318241">"アプリが許可リクエストを隠しているため、設定側でユーザーの応答を確認できません。"</string>
-    <string name="enable_service_encryption_warning" msgid="931082737770453755">"<xliff:g id="SERVICE">%1$s</xliff:g>をONにすると、デバイスデータの暗号化の強化に画面ロックは使用されなくなります。"</string>
-    <string name="secure_lock_encryption_warning" msgid="669152607190123579">"ユーザー補助サービスがONに設定されているため、デバイスデータの暗号化の強化に画面ロックは使用されません。"</string>
-    <string name="enable_service_pattern_reason" msgid="6832846117817938536">"<xliff:g id="SERVICE">%1$s</xliff:g>をONにするとデータの暗号化に影響するため、パターンの確認が必要となります。"</string>
-    <string name="enable_service_pin_reason" msgid="6040417014360237703">"<xliff:g id="SERVICE">%1$s</xliff:g>をONにするとデータの暗号化に影響するため、PINの確認が必要となります。"</string>
-    <string name="enable_service_password_reason" msgid="6962544350351734238">"<xliff:g id="SERVICE">%1$s</xliff:g>をONにするとデータの暗号化に影響するため、パスワードの確認が必要となります。"</string>
     <string name="accessibility_service_warning" msgid="6779187188736432618">"<xliff:g id="SERVICE">%1$s</xliff:g> はこのデバイスのフル コントロールをリクエストしています。これは、ユーザー補助を必要とするユーザーに代わって画面を読み上げたり操作したりするサービスです。大半のアプリに、このレベルのコントロールは適していません。"</string>
     <string name="accessibility_service_warning_description" msgid="6573203795976134751">"フル コントロールは、ユーザー補助機能を必要とするユーザーをサポートするアプリには適していますが、ほとんどのアプリには適していません。"</string>
     <string name="accessibility_service_screen_control_title" msgid="324795030658109870">"画面の表示と操作"</string>
@@ -3103,14 +3078,6 @@
     <string name="remove_account_failed" msgid="3709502163548900644">"この変更は管理者によって許可されていません"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"手動では同期できません"</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"このアイテムの同期は現在無効になっています。この設定を変更するには、バックグラウンドデータと自動同期を一時的にONにします。"</string>
-    <string name="enter_password" msgid="6327051330258595331">"Androidを起動するには、パスワードを入力します"</string>
-    <string name="enter_pin" msgid="1029287617551232681">"Androidを起動するには、PINを入力します"</string>
-    <string name="enter_pattern" msgid="1747316785866742960">"Androidを起動するには、パターンを入力します"</string>
-    <string name="cryptkeeper_wrong_pattern" msgid="340747269176120242">"パターンが正しくありません"</string>
-    <string name="cryptkeeper_wrong_password" msgid="7295607881887114486">"パスワードが正しくありません"</string>
-    <string name="cryptkeeper_wrong_pin" msgid="2347961593970714201">"PIN が正しくありません"</string>
-    <string name="checking_decryption" msgid="6111642972615688237">"確認しています…"</string>
-    <string name="starting_android" msgid="6694154070215356186">"Androidを起動しています…"</string>
     <string name="delete" msgid="8330605554706263775">"削除"</string>
     <string name="misc_files" msgid="6598066985800749585">"その他のファイル"</string>
     <string name="misc_files_selected_count" msgid="5597802791672749532">"選択済み: <xliff:g id="NUMBER">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>件"</string>
@@ -3206,8 +3173,6 @@
     <string name="data_usage_metered_yes" msgid="4262598072030135223">"従量制"</string>
     <string name="data_usage_metered_no" msgid="1685828958417926268">"定額制"</string>
     <string name="data_usage_disclaimer" msgid="3271450299386176770">"デバイスで記録されるデータ使用量と携帯通信会社のデータ使用量は異なる場合があります。"</string>
-    <string name="cryptkeeper_emergency_call" msgid="8369322820475703306">"緊急通報"</string>
-    <string name="cryptkeeper_return_to_call" msgid="3857250752781151232">"通話に戻る"</string>
     <string name="vpn_name" msgid="3806456074909253262">"名前"</string>
     <string name="vpn_type" msgid="5533202873260826663">"タイプ"</string>
     <string name="vpn_server" msgid="2908816134941973935">"サーバー アドレス"</string>
@@ -3481,7 +3446,7 @@
     <string name="sim_no_inserted_msg" msgid="7272710974813741735">"SIMカードが挿入されていません"</string>
     <string name="sim_status_title" msgid="6188770698037109774">"SIM のステータス"</string>
     <string name="sim_status_title_sim_slot" msgid="4932996839194493313">"SIM ステータス(SIM スロット %1$d)"</string>
-    <string name="sim_call_back_title" msgid="4274099761123657464">"デフォルトのSIMからコールバック"</string>
+    <string name="sim_call_back_title" msgid="4274099761123657464">"デフォルトの SIM からかけ直す"</string>
     <string name="sim_outgoing_call_title" msgid="7759080345748128897">"発信用のSIM"</string>
     <string name="sim_other_call_settings" msgid="5956308869284958883">"その他の通話設定"</string>
     <string name="preferred_network_offload_title" msgid="6453199586512609557">"優先ネットワークオフロード"</string>
@@ -3512,7 +3477,7 @@
     <string name="connected_devices_dashboard_android_auto_no_nfc_summary" msgid="2532811870469405527">"Bluetooth、Android Auto、運転モード"</string>
     <string name="connected_devices_dashboard_android_auto_no_driving_mode_summary" msgid="6426996842202276640">"Bluetooth、Android Auto、NFC"</string>
     <string name="connected_devices_dashboard_android_auto_no_nfc_no_driving_mode" msgid="1672426693308438634">"Bluetooth、Android Auto"</string>
-    <string name="nfc_and_payment_settings_payment_off_nfc_off_summary" msgid="7132040463607801625">"NFC がオフのため使用できません"</string>
+    <string name="nfc_and_payment_settings_payment_off_nfc_off_summary" msgid="7132040463607801625">"NFC が OFF のため使用できません"</string>
     <string name="nfc_and_payment_settings_no_payment_installed_summary" msgid="4879818114908207465">"使用するには、まずお支払いアプリをインストールしてください"</string>
     <string name="app_and_notification_dashboard_title" msgid="2861781687031832943">"アプリと通知"</string>
     <string name="app_and_notification_dashboard_summary" msgid="8047683010984186106">"最近使ったアプリ、デフォルトのアプリ"</string>
@@ -4764,8 +4729,6 @@
       <item quantity="one">1 個のアプリがモバイルデータを無制限に使用可能</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"詳細"</string>
-    <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"ファイル暗号化のためにユーザーのデータを消去して変換してもよろしいですか?"</string>
-    <string name="button_confirm_convert_fbe" msgid="339648921918438106">"消去して変換"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"ShortcutManager のレート制限をリセット"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"ShortcutManager のレート制限をリセットしました"</string>
     <string name="notification_suggestion_title" msgid="6309263655965785411">"ロック画面に表示される情報を管理する"</string>
@@ -5292,6 +5255,7 @@
     <string name="sim_action_yes" msgid="8076556020131395515">"はい"</string>
     <string name="sim_action_reboot" msgid="3508948833333441538">"再起動"</string>
     <string name="sim_action_no_thanks" msgid="435717748384544195">"いいえ"</string>
+    <string name="sim_action_cancel" msgid="2668099867029610910">"キャンセル"</string>
     <string name="sim_switch_button" msgid="1405772571706095387">"切り替える"</string>
     <string name="dsds_activation_failure_title" msgid="4467364110584914794">"SIM を有効にできません"</string>
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"SIM カードを取り出して、もう一度挿入してください。問題が解決しない場合は、デバイスを再起動してください。"</string>
@@ -5412,7 +5376,7 @@
     <string name="quick_controls_lower" msgid="6675573610027367819">"デバイス コントロール"</string>
     <string name="cards_passes_sentence" msgid="1866311782387946944">"カードとパス"</string>
     <string name="cards_passes_lower" msgid="2429722007109957877">"カードとパス"</string>
-    <string name="power_menu_setting_name" msgid="7291642927216934159">"電源ボタンを長押しする"</string>
+    <string name="power_menu_setting_name" msgid="7291642927216934159">"電源ボタンを長押し"</string>
     <string name="power_menu_summary_long_press_for_assist_enabled" msgid="5322150755041458952">"長押しするとアシスタントが有効になります"</string>
     <string name="power_menu_summary_long_press_for_assist_disabled_with_power_menu" msgid="5165714995895517816">"長押しすると電源ボタン メニューが表示されます"</string>
     <string name="power_menu_summary_long_press_for_assist_disabled_no_action" msgid="2831598484771657432">"長押しは無効です"</string>
@@ -5444,6 +5408,10 @@
     <string name="cached_apps_freezer" msgid="1057519579761550350">"キャッシュに保存されたアプリの実行を停止"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"設定での画面オーバーレイを許可する"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"他のアプリの上に重ねて表示して設定画面をオーバーレイすることをアプリに許可します"</string>
+    <!-- no translation found for allow_mock_modem (3832264806530479214) -->
+    <skip />
+    <!-- no translation found for allow_mock_modem_summary (9097416612748005374) -->
+    <skip />
     <string name="media_controls_title" msgid="403271085636252597">"メディア"</string>
     <string name="media_controls_resume_title" msgid="855076860336652370">"メディア プレーヤーを固定する"</string>
     <string name="media_controls_resume_description" msgid="3163482266454802097">"再生をすばやく再開するには、[クイック設定] でメディア プレーヤーを開いたままにしてください"</string>
@@ -5523,7 +5491,7 @@
     <string name="category_name_general" msgid="7737273712848115886">"全般"</string>
     <string name="dark_theme_main_switch_title" msgid="4045147031947562280">"ダークモードを使用"</string>
     <string name="bluetooth_main_switch_title" msgid="8409835540311309632">"Bluetooth を使用"</string>
-    <string name="prevent_ringing_main_switch_title" msgid="4726252811262086643">"ショートカットを使用"</string>
+    <string name="prevent_ringing_main_switch_title" msgid="4726252811262086643">"着信音ミュート用のショートカットを使用する"</string>
     <string name="use_wifi_hotsopt_main_switch_title" msgid="3909731167290690539">"Wi-Fi アクセス ポイントの使用"</string>
     <string name="app_pinning_main_switch_title" msgid="5465506660064032876">"アプリ固定機能を使用"</string>
     <string name="developer_options_main_switch_title" msgid="1720074589554152501">"開発者向けオプションの使用"</string>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index d11c6d0..c2bcf0e 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -142,10 +142,11 @@
     <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"თქვენი მოწყობილობის მიერ ახლომდებარე Bluetooth მოწყობილობებთან კომუნიკაციის დაშვება"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"თქვენი ტელეფონის მიერ ახლომდებარე Bluetooth მოწყობილობებთან კომუნიკაციის დაშვება"</string>
     <string name="bluetooth_disable_a2dp_hw_offload" msgid="5942913792817797541">"Bluetooth A2DP-ის აპარატული განტვირთვის გათიშვა"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="8610420176339657720">"გადაიტვირთოს მოწყობილობა?"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8333029144800835996">"ამ პარამეტრის შესაცვლელად საჭიროა მოწყობილობის გადატვირთვა."</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="3488695418187553566">"გადატვირთვა"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="4930826928585464191">"გაუქმება"</string>
+    <string name="bluetooth_disable_le_audio_hw_offload" msgid="3966022676505972908">"Bluetooth LE AUDIO-ს აპარატურული განტვირთვის გათიშვა"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_title" msgid="6001142380445276918">"გსურთ მოწყობილობის გადატვირთვა?"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_message" msgid="1524373895333698779">"ამ პარამეტრის შესაცვლელად საჭიროა მოწყობილობის გადატვირთვა."</string>
+    <string name="bluetooth_disable_hw_offload_dialog_confirm" msgid="5594859658551707592">"გადატვირთვა"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel" msgid="3663690305043973720">"გაუქმება"</string>
     <string name="connected_device_media_device_title" msgid="3783388247594566734">"მედია მოწყობილობები"</string>
     <string name="connected_device_call_device_title" msgid="88732390601723608">"მოწყობილობებზე დარეკვა"</string>
     <string name="connected_device_other_device_title" msgid="4652120430615729193">"სხვა მოწყობილობები"</string>
@@ -309,9 +310,9 @@
     <string name="security_settings_title" msgid="6710768415432791970">"უსაფრთხოება"</string>
     <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"დაშიფვრა და ავტორიზაციის მონაცემები"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"ტელეფონი დაშიფრულია"</string>
-    <string name="decryption_settings_summary" product="default" msgid="1742645256103613503">"ტელეფონი არაა დაშიფრული"</string>
+    <string name="not_encrypted_summary" product="default" msgid="2251945842585788254">"ტელეფონი არაა დაშიფრული"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"მოწყობილობა დაშიფრულია"</string>
-    <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"მოწყობილობა არაა დაშიფრული"</string>
+    <string name="not_encrypted_summary" product="tablet" msgid="2374263654698719382">"მოწყობილობა არაა დაშიფრული"</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"ჩაკეტილი ეკრანი"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"რა უნდა იყოს ნაჩვენები"</string>
     <string name="security_settings_summary" msgid="1627059516127354233">"„ჩემი მდებარეობის“ პარამეტრების დაყენება, ეკრანის განბლოკვა და SIM ბარათის დაბლოკვა, ავტორიზაციის მონაცემების საცავის დაბლოკვა"</string>
@@ -568,37 +569,10 @@
     <string name="fingerprint_last_delete_message" msgid="7860374760549404410">"ტელეფონის განსაბლოკად ან აპებში ვინაობის დასადასტურებლად ვეღარ შეძლებთ თითის ანაბეჭდის გამოყენებას."</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="4104208067277655068">"თქვენ ვეღარ შეძლებთ თითის ანაბეჭდის გამოყენებას სამსახურის პროფილის განსაბლოკად, შენაძენების ავტორიზაციისთვის თუ სამსახურის აპებში შესასვლელად."</string>
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"დიახ, წაიშალოს"</string>
-    <string name="crypt_keeper_settings_title" msgid="4938812137822100044">"დაშიფვრა"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"ტაბლეტის დაშიფრვა"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"ტელეფონის დაშიფვრა"</string>
-    <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"დაშიფრული"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"შეგიძლიათ დაშიფროთ თქვენი ანგარიშები, პარამეტრები, ჩამოტვირთული აპები და სხვა მონაცემები, მედია და სხვა ფაილები. თქვენი ტაბლეტის დაშიფვრის შემდეგ, როცა სავარაუდოდ დაყენებული გექნებათ ეკრანის დაბლოკვა (ფორმა, რიცხვითი PIN-კოდი ან პაროლი), მოგიწევთ ეკრანის განბლოკვა ტაბლეტის გასაშიფრად ყოველი ჩართვისას. გაშიფვრის ერთადერთი სხვა საშუალება ქარხნული მონაცემების აღდგენაა, რაც წაშლის მთელ თქვენს მონაცემებს.\n\nდაშიფვრას ერთი საათი ან მეტი სჭირდება. უნდა დაიწყოთ დამუხტული ბატარეით და დატოვოთ ტაბლეტი მიერთებული მთელი პროცესის განმავლობაში. პროცესის შეწყვეტის შემთხვევაში ნაწილობრივ ან სრულად დაკარგავთ თქვენს მონაცემებს."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"შეგიძლიათ დაშიფროთ თქვენი ანგარიშები, პარამეტრები, ჩამოტვირთული აპები და სხვა მონაცემები,  მედია და სხვა ფაილები. თქვენი ტელეფონის დაშიფვრის შემდეგ, როცა სავარაუდოდ დაყენებული გექნებათ ეკრანის დაბლოკვა (ფორმა, რიცხვითი PIN-კოდი ან პაროლი), მოგიწევთ ეკრანის განბლოკვა ტელეფონის გასაშიფრად ყოველი ჩართვისას. გაშიფვრის ერთადერთი სხვა საშუალება ქარხნული მონაცემების აღდგენაა, რაც წაშლის მთელ თქვენს მონაცემებს.\n\nდაშიფვრას ერთი საათი ან მეტი სჭირდება. უნდა დაიწყოთ დამუხტული ბატარეით და დატოვოთ ტელეფონი მიერთებული მთელი პროცესის განმავლობაში. პროცესის შეწყვეტის შემთხვევაში ნაწილობრივ ან სრულად დაკარგავთ თქვენს მონაცემებს."</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"ტაბლეტის დაშიფვრა"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"ტელეფონის დაშიფრვა"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"გთხოვთ, დატენოთ ბატარეა და სცადოთ ხელახლა."</string>
-    <string name="crypt_keeper_unplugged_text" msgid="2709721134148651329">"შეაერთეთ დამტენი და სცადეთ ხელახლა."</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="1847280235529858357">"ეკრანის დაბლოკვის PIN კოდი ან პაროლი არ არის დაყენებული"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="7210616262954236042">"დაშიფვრის დაწყებამდე უნდა დააყენოთ ეკრანის ჩაკეტვის PIN-კოდი ან პაროლი."</string>
-    <string name="crypt_keeper_confirm_title" msgid="8600000209722452230">"დავშიფრო?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="3270587498436152259">"დაშიფვრის ოპერაციის შეწყვეტა არ შეიძლება. თუ შეწყვიტავთ დაკარგავთ მონაცემებს. დაშიფვრას დასჭირდება საათი ან მეტი, რომლის განმავლობაშიც ტაბლეტი რამდენჯერმე გადაიტვირთება."</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="3040428543349852419">"დაშიფვრის ოპერაციის შეწყვეტა არ შეიძლება, წინააღმდეგ შემთხვევაში თქვენ დაკარგავთ ყველა მონაცემს. დაშიფვრას დასჭირდება საათი ან მეტი, რომლის განმავლობაშიც ტელეფონი რამდენჯერმე გადაიტვირთება."</string>
-    <string name="crypt_keeper_setup_title" msgid="3339725741305796680">"დაშიფვრა"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="4417016995091289019">"დაელოდეთ, ვიდრე თქვენი ტაბლეტი დაიშიფრება. <xliff:g id="PERCENT">^1</xliff:g>% შესრულებულია."</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="7902355422499500352">"დაელოდეთ, ვიდრე თქვენი ტელეფონი დაიშიფრება. <xliff:g id="PERCENT">^1</xliff:g>% შესრულებულია."</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="8348188415839917821">"მოითმინეთ, სანამ თქვენი ტაბლეტი დაიშიფრებოდეს. დარჩენილი დრო: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="8556105766597855198">"მოითმინეთ, სანამ თქვენი ტელეფონი დაიშიფრებოდეს. დარჩენილი დრო: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="3832496715430327682">"თქვენი ტაბლეტის განბლოკვისათვის, გამორთეთ და ხელახლა ჩართეთ."</string>
-    <string name="crypt_keeper_force_power_cycle" product="default" msgid="5070346039522135361">"ტელეფონის განბლოკვისათვის, გამორთეთ და ხელახლა ჩართეთ."</string>
-    <string name="crypt_keeper_warn_wipe" msgid="8104921337301750394">"გაფრთხილება: თქვენი მოწყობილობა სრულად წაიშლება განბლოკვის კიდევ <xliff:g id="COUNT">^1</xliff:g> არასწორი მცდელობის შემდეგ!"</string>
-    <string name="crypt_keeper_enter_password" msgid="1274917431075529732">"აკრიფეთ თქვენი პაროლი"</string>
-    <string name="crypt_keeper_failed_title" msgid="8173654570682244149">"დაშიფვრა ვერ შესრულდა"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"დაშიფვრის შეწყვეტის გამო თქვენ ტაბლეტზე შენახული მონაცემები ხელმისაწვდომი აღარ არის. \n\n ტაბლეტის გამოყენების გასაგრძელებლად, მოახდინეთ მონაცემების სრული გადაყენება. ამის შემდეგ გექნებათ თქვენ Google ანგარიშზე დამარქაფებული მონაცემების აღდგენის შესაძლებლობა."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"დაშიფვრის შეწყვეტის გამო თქვენ ტელეფონზე შენახული მონაცემები ხელმისაწვდომი აღარ არის. \n\n ტელეფონით სარგებლობის გასაგრძელებლად, აღადგინეთ ქარხნული მონაცემები. ამის შემდეგ გექნებათ ყველა იმ მონაცემის აღდგენის საშუალება, რომელთათვისაც Google ანგარიშში შექმენით სარეზერვო ასლები."</string>
-    <string name="crypt_keeper_data_corrupt_title" msgid="5920153462176846037">"გაშიფვრა ვერ განხორციელდა"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"თქვენ მიერ შეყვანილი პაროლი სწორია, თუმცა, სამწუხაროდ, თქვენი მონაცემები დაზიანებულია. \n\nთქვენი ტაბლეტის გამოყენების გასაგრძელებლად ქარხნულ მონაცემებზე დაბრუნება მოგიწევთ. როდესაც ამის შემდეგ ტაბლეტს ხელახლა გამართავთ, გექნებათ საშუალება, აღადგინოთ თქვენს Google ანგარიშში დამარქაფებული ყველა მონაცემი."</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"თქვენ მიერ შეყვანილი პაროლი სწორია, თუმცა, სამწუხაროდ, თქვენი მონაცემები დაზიანებულია. \n\nტელეფონის გამოყენების გასაგრძელებლად ქარხნულ მონაცემებზე დაბრუნება მოგიწევთ. როდესაც ამის შემდეგ ტელეფონს ხელახლა გამართავთ, გექნებათ საშუალება, აღადგინოთ თქვვენს Google ანგარიშში დამარქაფებული ყველა მონაცემი."</string>
-    <string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"შეყვანის მეთოდის ცვლილება"</string>
+    <string name="encryption_settings_title" msgid="2848716008695618360">"დაშიფვრა"</string>
+    <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"ტაბლეტის დაშიფვრა"</string>
+    <string name="encrypt_title" product="default" msgid="7337365190988321100">"ტელეფონის დაშიფვრა"</string>
+    <string name="encrypted_summary" msgid="545623487587251207">"დაშიფრული"</string>
     <string name="suggested_lock_settings_title" msgid="7836065447159730217">"დაიცავით თქვენი ტელეფონი"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"დააყენეთ ეკრანის დაბლოკვა, რათა ტაბლეტი დაიცვათ"</string>
     <string name="suggested_lock_settings_summary" product="device" msgid="8479766049078378225">"დააყენეთ ეკრანის დაბლოკვა მოწყობილობის დასაცავად"</string>
@@ -817,6 +791,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"შესაძლოა პინის შეყვანა სხვა მოწყობილობისათვისაც დაგჭირდეთ."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"შესაძლოა ამ წვდომის გასაღების სხვა მოწყობილობაში შეყვანაც დაგჭირდეთ."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;-თან დასაწყვილებლად დარწმუნდით, რომ ის გიჩვენებთ წვდომის გასაღებს:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"დაადასტურეთ კოორდინირებულ ნაკრებთან დასაწყვილებლად"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;-ისგან. დაწყვილდეს ამ მოწყობილობასთან?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>-თან დასაწყვილებლად დაბეჭდეთ მასზე:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, შემდეგ დააწკაპუნეთ ღილაკზე Return ან Enter."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"კონტაქტებსა და საუბრის ისტორიაზე წვდომის დაშვება"</string>
@@ -850,6 +825,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"დაკავშირება ვერ მოხერხდა. ცადეთ ხელახლა."</string>
     <string name="device_details_title" msgid="1155622417516195481">"მოწყობილობის დეტალები"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"მოწყობილობის Bluetooth მისამართი: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"მოწყობილობის Bluetooth მისამართი:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"გსურთ მოწყობილობის დავიწყება?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"კავშირის ამოშლა"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"გაწყდეს აპთან კავშირი?"</string>
@@ -881,6 +857,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"პარამეტრების დამახსოვრება"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"დაკავშირებულ Bluetooth აუდიო-მოწყობილობათა მაქსიმალური რიცხვი"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"აირჩიეთ დაკავშირებულ Bluetooth აუდიო-მოწყობილობათა მაქსიმალური რიცხვი"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"NFC დასტის ხარვეზების გამართვის ჟურნალი"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"NFC დასტის ჟურნალის დონის გაზრდა"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"ტრანსლირება"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"გამოსახულების ასლი"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"უსადენო ეკრანის ჩართვა"</string>
@@ -1188,6 +1166,8 @@
     <string name="wifi_hotspot_maximize_compatibility_dual_ap_summary" msgid="3579549223159056533">"ეხმარება სხვა მოწყობილობებს უსადენო ქსელის პოვნაში. ზრდის ბატარეის მოხმარებას."</string>
     <string name="wifi_tether_starting" msgid="8879874184033857814">"უსადენო ქსელი ჩართვა…"</string>
     <string name="wifi_tether_stopping" msgid="4416492968019409188">"hotspot-ია გამორთვა…"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_title" msgid="3089432578433978073">"ტეტერინგი მიუწვდომელია"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_content" msgid="5920421547607921112">"დეტალური ინფორმაციისთვის მიმართეთ ოპერატორს"</string>
     <string name="wifi_tether_enabled_subtext" msgid="5085002421099821056">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> აქტიურია"</string>
     <string name="wifi_tether_failed_subtext" msgid="437190628041885500">"პორტატიული Wi-Fi-ის უსადენო ქსელის შეცდომა"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7072559431286459122">"დააყენეთ Wi‑Fi უსადენო ქსელი"</string>
@@ -2534,11 +2514,6 @@
     <string name="enable_service_title" msgid="7231533866953706788">"დართავთ ნებას <xliff:g id="SERVICE">%1$s</xliff:g>-ს, სრულად მართოს თქვენი მოწყობილობა?"</string>
     <string name="capabilities_list_title" msgid="1225853611983394386">"<xliff:g id="SERVICE">%1$s</xliff:g>-ს ესაჭიროება:"</string>
     <string name="touch_filtered_warning" msgid="4225815157460318241">"აპის მიერ ნებართვის მოთხოვნის დაფარვის გამო, ვერ ხერხდება თქვენი პასუხის დადასტურება პარამეტრებით."</string>
-    <string name="enable_service_encryption_warning" msgid="931082737770453755">"<xliff:g id="SERVICE">%1$s</xliff:g>-ს თუ ჩართავთ, მონაცემთა დაშიფვრის გასაფართოებლად თქვენი მოწყობილობა ჩაკეტვის ეკრანს არ გამოიყენებს."</string>
-    <string name="secure_lock_encryption_warning" msgid="669152607190123579">"ვინაიდან ხელმისაწვდომობის სერვისი ჩართეთ, მონაცემთა დაშიფვრის გასაფართოებლად თქვენი მოწყობილობა ჩაკეტვის ეკრანს არ გამოიყენებს."</string>
-    <string name="enable_service_pattern_reason" msgid="6832846117817938536">"ვინაიდან <xliff:g id="SERVICE">%1$s</xliff:g>-ის ჩართვას მონაცემთა დაშიფვრაზე აქვს გავლენა, გთხოვთ, ხელახლა შეიყვანოთ ნიმუში."</string>
-    <string name="enable_service_pin_reason" msgid="6040417014360237703">"ვინაიდან <xliff:g id="SERVICE">%1$s</xliff:g>-ის ჩართვას მონაცემთა დაშიფვრაზე აქვს გავლენა, გთხოვთ, ხელახლა შეიყვანოთ PIN."</string>
-    <string name="enable_service_password_reason" msgid="6962544350351734238">"ვინაიდან <xliff:g id="SERVICE">%1$s</xliff:g>-ის ჩართვას მონაცემთა დაშიფვრაზე აქვს გავლენა, გთხოვთ, ხელახლა შეიყვანოთ პაროლი."</string>
     <string name="accessibility_service_warning" msgid="6779187188736432618">"<xliff:g id="SERVICE">%1$s</xliff:g> ითხოვს სრულ კონტროლს ამ მოწყობილობაზე. სერვისს შეუძლია ეკრანზე არსებული კონტენტის წაკითხვა და განსაკუთრებული საჭიროების მქონე მომხმარებლების სახელით მოქმედება. ამ დონის კონტროლი არ არის საჭირო აპების უმეტესობისთვის."</string>
     <string name="accessibility_service_warning_description" msgid="6573203795976134751">"სრული კონტროლი გამოსადეგია აპებისთვის, რომლებიც მარტივი წვდომის საჭიროებისას გეხმარებათ, მაგრამ არა აპების უმრავლესობისთვის."</string>
     <string name="accessibility_service_screen_control_title" msgid="324795030658109870">"ეკრანის ნახვა და მართვა"</string>
@@ -3103,14 +3078,6 @@
     <string name="remove_account_failed" msgid="3709502163548900644">"ეს ცვლილება თქვენი ადმინისტრატორის მიერ ნებადართული არ არის"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"შეუძლებელია ერთობლივი სინქრონიზაცია"</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"სინქრონიზაცია გამორთულია. პარამეტრების შესაცვლელად დროებით ჩართეთ მონაცემების ფონური და ავტომატური სინქრონიზაცია."</string>
-    <string name="enter_password" msgid="6327051330258595331">"Android-ის ჩასართავად, შეიყვანეთ თქვენი პაროლი."</string>
-    <string name="enter_pin" msgid="1029287617551232681">"Android-ის ჩასართავად, შეიყვანეთ თქვენი PIN."</string>
-    <string name="enter_pattern" msgid="1747316785866742960">"Android-ის ჩასართავად, მოხაზეთ თქვენი ნიმუში."</string>
-    <string name="cryptkeeper_wrong_pattern" msgid="340747269176120242">"არასწორი ნიმუში"</string>
-    <string name="cryptkeeper_wrong_password" msgid="7295607881887114486">"არასწორი პაროლი"</string>
-    <string name="cryptkeeper_wrong_pin" msgid="2347961593970714201">"არასწორი PIN"</string>
-    <string name="checking_decryption" msgid="6111642972615688237">"შემოწმება..."</string>
-    <string name="starting_android" msgid="6694154070215356186">"Android-ის დაწყება…"</string>
     <string name="delete" msgid="8330605554706263775">"წაშლა"</string>
     <string name="misc_files" msgid="6598066985800749585">"სხვადასხვა ფაილი"</string>
     <string name="misc_files_selected_count" msgid="5597802791672749532">"არჩეულია <xliff:g id="NUMBER">%1$d</xliff:g> სულ <xliff:g id="TOTAL">%2$d</xliff:g>-დან"</string>
@@ -3206,8 +3173,6 @@
     <string name="data_usage_metered_yes" msgid="4262598072030135223">"ლიმიტირებული"</string>
     <string name="data_usage_metered_no" msgid="1685828958417926268">"ულიმიტო"</string>
     <string name="data_usage_disclaimer" msgid="3271450299386176770">"ოპერატორის მიერ მონაცემთა აღრიცხვა შესაძლოა თქვენი მოწყობილობის აღრიცხვისგან განსხვავდებოდეს."</string>
-    <string name="cryptkeeper_emergency_call" msgid="8369322820475703306">"გადაუდებელი ზარი"</string>
-    <string name="cryptkeeper_return_to_call" msgid="3857250752781151232">"ზარზე დაბრუნება"</string>
     <string name="vpn_name" msgid="3806456074909253262">"სახელი"</string>
     <string name="vpn_type" msgid="5533202873260826663">"ტიპი"</string>
     <string name="vpn_server" msgid="2908816134941973935">"სერვერის მისამართი"</string>
@@ -4764,8 +4729,6 @@
       <item quantity="one">მონაცემთა შეუზღუდავად გამოყენება 1 აპს შეუძლია</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"მეტის ნახვა"</string>
-    <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"ნამდვილად გსურთ მომხმარებლის მონაცემების ამოშლა და ფაილების დაშიფვრაზე გარდაქმნა?"</string>
-    <string name="button_confirm_convert_fbe" msgid="339648921918438106">"ამოშლა და გარდაქმნა"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"ShortcutManager-ის სიხშირის შეზღუდვის გადაყენება"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"ShortcutManager-ის სიხშირის შეზღუდვა გადაყენებულია"</string>
     <string name="notification_suggestion_title" msgid="6309263655965785411">"გააკონტროლეთ ჩაკეტილ ეკრანზე ნაჩვენები ინფორმაცია"</string>
@@ -5292,6 +5255,7 @@
     <string name="sim_action_yes" msgid="8076556020131395515">"დიახ"</string>
     <string name="sim_action_reboot" msgid="3508948833333441538">"გადატვირთვა"</string>
     <string name="sim_action_no_thanks" msgid="435717748384544195">"არა, გმადლობთ"</string>
+    <string name="sim_action_cancel" msgid="2668099867029610910">"გაუქმება"</string>
     <string name="sim_switch_button" msgid="1405772571706095387">"გადართვა"</string>
     <string name="dsds_activation_failure_title" msgid="4467364110584914794">"SIM ბარათის გააქტიურება ვერ ხერხდება"</string>
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"ამოიღეთ SIM ბარათი და მოათავსეთ ის ხელახლა. თუ პრობლემა არ მოგვარდა, გადატვირთეთ მოწყობილობა."</string>
@@ -5444,6 +5408,10 @@
     <string name="cached_apps_freezer" msgid="1057519579761550350">"აღსრულების შეჩერება ქეშირებული აპებისთვის"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"პარამეტრებზე ეკრანის გადაფარვის დაშვება"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"პარამეტრების ეკრანების გადაფარვის დაშვება აპებისთვის, რომლებსაც სხვა აპების ზემოდან გამოჩენა შეუძლია"</string>
+    <!-- no translation found for allow_mock_modem (3832264806530479214) -->
+    <skip />
+    <!-- no translation found for allow_mock_modem_summary (9097416612748005374) -->
+    <skip />
     <string name="media_controls_title" msgid="403271085636252597">"მედია"</string>
     <string name="media_controls_resume_title" msgid="855076860336652370">"მედია დამკვრელის ჩამაგრება"</string>
     <string name="media_controls_resume_description" msgid="3163482266454802097">"დაკვრის სწრაფად გასაგრძელებლად მედია დამკვრელი გახსნილი დარჩება სწრაფ პარამეტრებში"</string>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index 932a83b..1b592af 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -142,10 +142,11 @@
     <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"Құрылғыңызға маңайдағы Bluetooth құрылғыларымен байланыс орнатуға рұқсат етіңіз"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"Телефоныңызға маңайдағы Bluetooth құрылғыларымен байланыс орнатуға рұқсат етіңіз"</string>
     <string name="bluetooth_disable_a2dp_hw_offload" msgid="5942913792817797541">"Bluetooth A2DP жүктемесін түсіруді өшіру"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="8610420176339657720">"Құрылғы қайта қосылсын ба?"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8333029144800835996">"Бұл параметрді өзгерту үшін құрылғыны қайта қосу қажет."</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="3488695418187553566">"Қайта қосу"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="4930826928585464191">"Бас тарту"</string>
+    <string name="bluetooth_disable_le_audio_hw_offload" msgid="3966022676505972908">"Bluetooth LE AUDIO жабдық жүктемесін түсіруді өшіру"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_title" msgid="6001142380445276918">"Құрылғыны өшіріп қосасыз ба?"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_message" msgid="1524373895333698779">"Бұл параметрді өзгерту үшін құрылғыны өшіріп қосу қажет."</string>
+    <string name="bluetooth_disable_hw_offload_dialog_confirm" msgid="5594859658551707592">"Қайта қосу"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel" msgid="3663690305043973720">"Бас тарту"</string>
     <string name="connected_device_media_device_title" msgid="3783388247594566734">"Сақтау құрылғылары"</string>
     <string name="connected_device_call_device_title" msgid="88732390601723608">"Қоңырау шалуға болатын құрылғылар"</string>
     <string name="connected_device_other_device_title" msgid="4652120430615729193">"Басқа құрылғылар"</string>
@@ -309,9 +310,9 @@
     <string name="security_settings_title" msgid="6710768415432791970">"Қауіпсіздік"</string>
     <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"Шифрлау және тіркелу деректері"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"Телефон шифрланған"</string>
-    <string name="decryption_settings_summary" product="default" msgid="1742645256103613503">"Телефон шифрланбаған"</string>
+    <string name="not_encrypted_summary" product="default" msgid="2251945842585788254">"Телефон шифрланбаған"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"Құрылғы шифрланған"</string>
-    <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"Құрылғы шифрланбаған"</string>
+    <string name="not_encrypted_summary" product="tablet" msgid="2374263654698719382">"Құрылғы шифрланбаған"</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"Құлыптаулы экран"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"Көрсетілетін ақпарат"</string>
     <string name="security_settings_summary" msgid="1627059516127354233">"Менің аймағым, экран бекіту, SIM картасын құлыптау, растау дерекқорын бекітуді орнату"</string>
@@ -568,37 +569,10 @@
     <string name="fingerprint_last_delete_message" msgid="7860374760549404410">"Телефон құлпын ашу немесе қолданбаларда жеке басыңызды растау үшін саусақ ізін пайдалана алмайсыз."</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="4104208067277655068">"Жұмыс профилінің құлпын ашу, сатып алу транзакцияларын орындау немесе жұмыс қолданбаларына кіру үшін саусақ ізін пайдалана алмайсыз."</string>
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"Иә, жою"</string>
-    <string name="crypt_keeper_settings_title" msgid="4938812137822100044">"Шифрлау"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"Планшетті кодтау"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"Телефонды шифрлау"</string>
-    <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"Шифрланды"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"Аккаунттарды, параметрлерді, жүктелген қолданбаларды және олардың деректерін, мультимедиа және басқа файлдарды шифрлауға болады. Планшетті шифрлағаннан кейін, экран құлпын (яғни өрнек немесе сандық PIN коды, я болмаса құпия сөз) орнатқан болсаңыз, қуатын қосқан сайын планшетті шифрлаудан шығару үшін экран құлпын ашу керек болады. Шифрлаудан шығарудың тағы бір жалғыз жолы – зауыттық деректерді қалпына келтіріп, бүкіл деректерді өшіру.\n\nШифрлауға бір сағат немесе одан көп уақыт кетеді. Зарядталған батареямен бастап, бүкіл процесте планшетті розеткаға қосулы ұстау керек. Процесті үзсеңіз, деректердің кейбір бөлігін немесе барлығын жоғалтасыз."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"Аккаунттарды, параметрлерді, жүктелген қолданбаларды және олардың деректерін, мультимедиа және басқа файлдарды шифрлауға болады. Телефонды шифрлағаннан кейін, экран құлпын (яғни өрнек немесе сандық PIN коды, я болмаса құпия сөз) орнатқан болсаңыз, қуатын қосқан сайын телефонды шифрлаудан шығару үшін экран құлпын ашу керек болады. Шифрлаудан шығарудың тағы бір жалғыз жолы – зауыттық деректерді қалпына келтіріп, бүкіл деректерді өшіру.\n\nШифрлауға бір сағат немесе одан көп уақыт кетеді. Зарядталған батареямен бастап, бүкіл процесте телефонды розеткаға қосулы ұстау керек. Процесті үзсеңіз, деректердің кейбір бөлігін немесе барлығын жоғалтасыз."</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"Планшетті кодтау"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"Телефонды шифрлау"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"Батареяны зарядтап, қайта әрекеттеніңіз."</string>
-    <string name="crypt_keeper_unplugged_text" msgid="2709721134148651329">"Зарядтағышты жалғап, қайта әрекеттеніңіз."</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="1847280235529858357">"Экран бекіту PIN коды немесе кілтсөзі жоқ"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="7210616262954236042">"Кодтауды бастағанша экран бекіту PIN кодын немесе кілтсөзді тағайындап алуыңыз қажет."</string>
-    <string name="crypt_keeper_confirm_title" msgid="8600000209722452230">"Кодтау?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="3270587498436152259">"Кодтау жұмысын тоқтату мүмкін емес, сондықтан егер үрдіс үзілсе, деректеріңізді жоғалтасыз. Кодтауға бір сағат немесе одан көбірек уақыт керек, бұл уақытта планшетті бірнеше рет өшіріп, қайта қосу қажет болады."</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="3040428543349852419">"Кодтау жұмысын тоқтату мүмкін емес, сондықтан егер үрдіс үзілсе, деректеріңізді жоғалтасыз. Кодтауға бір сағат немесе одан көбірек уақыт керек, бұл уақытта телефонды бірнеше рет өшіріп, қайта қосу қажет болады."</string>
-    <string name="crypt_keeper_setup_title" msgid="3339725741305796680">"Кодтауда"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="4417016995091289019">"Планшет кодталғанша күтіңіз. <xliff:g id="PERCENT">^1</xliff:g>% аяқталды."</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="7902355422499500352">"Телефон зарядталғанша күтіңіз. <xliff:g id="PERCENT">^1</xliff:g>% аяқталды."</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="8348188415839917821">"Планшет шифрланып жатыр, күтіңіз. Қалған уақыт: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="8556105766597855198">"Телефон шифрланып жатыр, күтіңіз. Қалған уақыт: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="3832496715430327682">"To unlock your tablet, turn it off and then on."</string>
-    <string name="crypt_keeper_force_power_cycle" product="default" msgid="5070346039522135361">"To unlock your phone, turn it off and then on."</string>
-    <string name="crypt_keeper_warn_wipe" msgid="8104921337301750394">"Ескерту: бекітпесін ашудың тағы <xliff:g id="COUNT">^1</xliff:g> әрекетінен кейін құрылғыңыздың деректері өшіріледі!"</string>
-    <string name="crypt_keeper_enter_password" msgid="1274917431075529732">"Кілстөзін теру"</string>
-    <string name="crypt_keeper_failed_title" msgid="8173654570682244149">"Кодтау орындалмады"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"Кодтау үзілді және аяқтау мүмкін болмайды. Нәтижесінде планшеттегі деректер қол жетімсіз. \n\n Планшетті қолдану мүмкін болу үшін зауыттық параметрін қайтару қажет. Планшетті қайта ретегеннен кейін орнату барысында Google аккаунтыңыздағы сақтық көшірмелері арқылы деректерді қалпына келтіру мүмкіндігіңіз болады."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"Кодтау үзілді және аяқтау мүмкін болмайды. Нәтижесінде телефондағы деректер қол жетімсіз. \n\nТелефонды қолдану мүмкін болу үшін зауыттық параметрін қайтару қажет. Телефонды қайта ретегеннен кейін орнату барысында Google аккаунтыңыздағы сақтық көшірмелері арқылы деректерді қалпына келтіру мүмкіндігіңіз болады."</string>
-    <string name="crypt_keeper_data_corrupt_title" msgid="5920153462176846037">"Шифрлаудан шығару сәтсіз аяқталды"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"Сіз енгізген құпия сөз дұрыс, бірақ, өкінішке орай, деректеріңіз бүлінген. \n\nПланшетті әрі қарай пайдалану үшін, зауыттық параметрлерді қалпына келтіруіңіз керек. Қалпына келтіргеннен кейін планшетті реттегенде, сізде Google аккаунтыңызға сақтық көшірмесі жасалған барлық деректерді қалпына келтіру мүмкіндігі болады."</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"Сіз енгізген құпия сөз дұрыс, бірақ, өкінішке орай, деректеріңіз бүлінген. \n\nТелефонды әрі қарай пайдалану үшін, зауыттық параметрлерді қалпына келтіруіңіз керек. Қалпына келтіргеннен кейін телефонды реттегенде, сізде Google аккаунтыңызға сақтық көшірмесі жасалған барлық деректерді қалпына келтіру мүмкіндігі болады."</string>
-    <string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"Енгізу әдістерін ауыстыру"</string>
+    <string name="encryption_settings_title" msgid="2848716008695618360">"Шифрлау"</string>
+    <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"Планшетті шифрлау"</string>
+    <string name="encrypt_title" product="default" msgid="7337365190988321100">"Телефонды шифрлау"</string>
+    <string name="encrypted_summary" msgid="545623487587251207">"Шифрланған"</string>
     <string name="suggested_lock_settings_title" msgid="7836065447159730217">"Телефоныңызды қорғаңыз"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"Планшетті қорғау үшін экран құлпын орнатыңыз"</string>
     <string name="suggested_lock_settings_summary" product="device" msgid="8479766049078378225">"Құрылғыны қорғау үшін экран құлпын орнатыңыз"</string>
@@ -817,6 +791,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Бұл PIN кодты басқа құрылғыда да теру қажет болуы мүмкін."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Бұл кілтпернені басқа құрылғыларды қолданғанда да теру қажет болады."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Жұпталу үшін:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Оның келесі кілтсөзді көрсетуін қадағалаңыз:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Үйлестірілген жинақпен жұптауды растаңыз."</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"Келесі құрылғыдан:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Осы құрылғымен жұпталсын ба?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Жұпталу үшін:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Теріңіз:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, одан кейін Оралу немесе Енгізу пәрменін басыңыз."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Контактілер мен қоңыраулар тарихына кіруге рұқсат беру"</string>
@@ -850,6 +825,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Қосылмады. Әрекетті қайталаңыз."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Құрылғы мәліметтері"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Құрылғының Bluetooth мекенжайы: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Құрылғының Bluetooth мекенжайы:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Құрылғы ұмытылсын ба?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Байланысты жою"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Қолданбаны ажырату керек пе?"</string>
@@ -881,6 +857,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Параметрлерді есте сақтау"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Байланыстырылған Bluetooth аудиоқұрылғылардың максималды саны"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Байланыстырылған Bluetooth аудиоқұрылғылардың максималды санын таңдау"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"NFC стэгінің түзету журналы"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"NFC стэгін тіркеу деңгейін арттыру"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Трансляция"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"айна"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Сымсыз дисплейді қосу"</string>
@@ -1188,6 +1166,8 @@
     <string name="wifi_hotspot_maximize_compatibility_dual_ap_summary" msgid="3579549223159056533">"Басқа құрылғыларға осы хотспотты табуға көмектеседі. Батарея шығынын көбейтеді."</string>
     <string name="wifi_tether_starting" msgid="8879874184033857814">"Хотспот қосылуда…"</string>
     <string name="wifi_tether_stopping" msgid="4416492968019409188">"Хотспот өшірілуде…"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_title" msgid="3089432578433978073">"Тетеринг қолжетімсіз"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_content" msgid="5920421547607921112">"Мәлімет алу үшін операторға хабарласыңыз."</string>
     <string name="wifi_tether_enabled_subtext" msgid="5085002421099821056">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> қосулы"</string>
     <string name="wifi_tether_failed_subtext" msgid="437190628041885500">"Жиналамалы Wi‑Fi хотспот қателігі"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7072559431286459122">"Wi‑Fi хотспот орнату"</string>
@@ -2534,11 +2514,6 @@
     <string name="enable_service_title" msgid="7231533866953706788">"<xliff:g id="SERVICE">%1$s</xliff:g> қызметіне құрылғыны толық басқаруға рұқсат етілсін бе?"</string>
     <string name="capabilities_list_title" msgid="1225853611983394386">"<xliff:g id="SERVICE">%1$s</xliff:g> қызметіне қажет:"</string>
     <string name="touch_filtered_warning" msgid="4225815157460318241">"Бағдарлама рұқсат сұрауын жасырып тұрғандықтан, Параметрлер жауабыңызды тексере алмайды."</string>
-    <string name="enable_service_encryption_warning" msgid="931082737770453755">"<xliff:g id="SERVICE">%1$s</xliff:g> қоссаңыз, құрылғыңыз деректерді шифрлау үшін экранды бекітуді пайдаланбайды."</string>
-    <string name="secure_lock_encryption_warning" msgid="669152607190123579">"Сіз арнайы мүмкіндіктер қызметін қосқандықтан, құрылғыңыз деректерді шифрлау үшін экранды бекітуді пайдаланбайды."</string>
-    <string name="enable_service_pattern_reason" msgid="6832846117817938536">"<xliff:g id="SERVICE">%1$s</xliff:g> қосу деректерді шифрлауға әсер ететіндіктен, өрнекті растау керек."</string>
-    <string name="enable_service_pin_reason" msgid="6040417014360237703">"<xliff:g id="SERVICE">%1$s</xliff:g> қосу деректерді шифрлауға әсер ететіндіктен, PIN кодын растау керек."</string>
-    <string name="enable_service_password_reason" msgid="6962544350351734238">"<xliff:g id="SERVICE">%1$s</xliff:g> қосу деректерді шифрлауға әсер ететіндіктен, құпия сөзді растау керек."</string>
     <string name="accessibility_service_warning" msgid="6779187188736432618">"<xliff:g id="SERVICE">%1$s</xliff:g> қызметі құрылғыға толық кіру мүмкіндігін сұрауда. Ол экрандағы мәліметтерді оқып, арнайы мүмкіндіктерді талап ететін пайдаланушылар атынан әрекет ете алады. Мұндай басқару деңгейі қолданбалардың көбісіне сәйкес келмейді."</string>
     <string name="accessibility_service_warning_description" msgid="6573203795976134751">"Арнайы мүмкіндіктер бойынша көмектесетін қолданбаларға ғана құрылғыны толық басқару рұқсатын берген дұрыс."</string>
     <string name="accessibility_service_screen_control_title" msgid="324795030658109870">"Экранды көру және басқару"</string>
@@ -3103,14 +3078,6 @@
     <string name="remove_account_failed" msgid="3709502163548900644">"Әкімші бұл өзгертуге рұқсат бермеген"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"Қолмен синхрондау мүмкін болмады"</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"Бұл нысан үшін синхрондау уақытша өшірілген. Бұл параметрді өзгерту үшін артқы шеп деректері мен автоматты сихнрондауды уақытша қосыңыз."</string>
-    <string name="enter_password" msgid="6327051330258595331">"Android құрылғысын іске қосу үшін құпия сөзіңізді енгізіңіз"</string>
-    <string name="enter_pin" msgid="1029287617551232681">"Android құрылғысын іске қосу үшін PIN кодын енгізіңіз"</string>
-    <string name="enter_pattern" msgid="1747316785866742960">"Android құрылғысын іске қосу үшін өрнекті енгізіңіз"</string>
-    <string name="cryptkeeper_wrong_pattern" msgid="340747269176120242">"Қате өрнек"</string>
-    <string name="cryptkeeper_wrong_password" msgid="7295607881887114486">"Қате құпия сөз"</string>
-    <string name="cryptkeeper_wrong_pin" msgid="2347961593970714201">"Қате PIN"</string>
-    <string name="checking_decryption" msgid="6111642972615688237">"Тексеру…"</string>
-    <string name="starting_android" msgid="6694154070215356186">"Android жүйесі іске қосылуда..."</string>
     <string name="delete" msgid="8330605554706263775">"Жою"</string>
     <string name="misc_files" msgid="6598066985800749585">"Басқа файлдар"</string>
     <string name="misc_files_selected_count" msgid="5597802791672749532">"<xliff:g id="NUMBER">%1$d</xliff:g> таңдалды, барлығы <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -3206,8 +3173,6 @@
     <string name="data_usage_metered_yes" msgid="4262598072030135223">"Трафик саналатын желі"</string>
     <string name="data_usage_metered_no" msgid="1685828958417926268">"Өлшенбейтін"</string>
     <string name="data_usage_disclaimer" msgid="3271450299386176770">"Оператордың деректер есебі құрылғыңыздан басқаша болуы мүмкін."</string>
-    <string name="cryptkeeper_emergency_call" msgid="8369322820475703306">"Төтенше қоңырау"</string>
-    <string name="cryptkeeper_return_to_call" msgid="3857250752781151232">"Қоңырауға оралу"</string>
     <string name="vpn_name" msgid="3806456074909253262">"Атауы"</string>
     <string name="vpn_type" msgid="5533202873260826663">"Tүрі"</string>
     <string name="vpn_server" msgid="2908816134941973935">"Сервер мекенжайы"</string>
@@ -4764,8 +4729,6 @@
       <item quantity="one">1 қолданба деректерді шексіз пайдалана алады</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"Толығырақ"</string>
-    <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"Шынымен пайдаланушы деректерін өшіру және файлды шифрлауға түрлендіру керек пе?"</string>
-    <string name="button_confirm_convert_fbe" msgid="339648921918438106">"Өшіру және түрлендіру"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"ShortcutManager жылдамдық шектеуін бастапқы күйіне қайтару"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"ShortcutManager жылдамдық шектеуі бастапқы күйіне қайтарылды"</string>
     <string name="notification_suggestion_title" msgid="6309263655965785411">"Құлып экранында ақпаратты басқарыңыз"</string>
@@ -5292,6 +5255,7 @@
     <string name="sim_action_yes" msgid="8076556020131395515">"Иә"</string>
     <string name="sim_action_reboot" msgid="3508948833333441538">"Өшіріп қосу"</string>
     <string name="sim_action_no_thanks" msgid="435717748384544195">"Жоқ, рақмет"</string>
+    <string name="sim_action_cancel" msgid="2668099867029610910">"Бас тарту"</string>
     <string name="sim_switch_button" msgid="1405772571706095387">"Ауысу"</string>
     <string name="dsds_activation_failure_title" msgid="4467364110584914794">"SIM картасын іске қосу мүмкін емес"</string>
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"SIM картасын шығарып, қайта салыңыз. Егер ақау жойылмаса, құрылғыны өшіріп қосыңыз."</string>
@@ -5444,6 +5408,10 @@
     <string name="cached_apps_freezer" msgid="1057519579761550350">"Кэштелген қолданбалардың орындалуын уақытша тоқтату"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"Параметрлер экранының үстін жабуға рұқсат ету"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Басқа қолданбалардың үстінен шыға алатын қолданбаларға параметрлер экранының бетіне шығуға рұқсат ету"</string>
+    <!-- no translation found for allow_mock_modem (3832264806530479214) -->
+    <skip />
+    <!-- no translation found for allow_mock_modem_summary (9097416612748005374) -->
+    <skip />
     <string name="media_controls_title" msgid="403271085636252597">"Мультимедиа"</string>
     <string name="media_controls_resume_title" msgid="855076860336652370">"Медиа ойнатқышты бекіту"</string>
     <string name="media_controls_resume_description" msgid="3163482266454802097">"Ойнатуды оңай жалғастыру үшін медиа ойнатқыш \"Жылдам параметрлер\" мәзірінде ашық тұрады."</string>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index 58de8ab..bcb20ae 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -134,7 +134,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="2647611490952377156">"%1$s ចង់​ចូល​ដំណើរការ​សារ​របស់​អ្នក។ សូម​ផ្ដល់​ការ​ចូល​ដំណើរការ​ទៅ​កាន់​%2$s?"</string>
     <string name="bluetooth_sap_request" msgid="473439406287008397">"សំណើចូលដំណើរការស៊ីម"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="2849083276356078655">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> ចង់ចូលដំណើរការស៊ីមកាតរបស់អ្នក។ ការផ្តល់ការអនុញ្ញាតចូលដំណើរការស៊ីមកាតនឹងបិទដំណើរការតភ្ជាប់ទិន្នន័យនៅលើឧបករណ៍របស់អ្នកក្នុងអំឡុងពេលធ្វើការតភ្ជាប់។ អនុញ្ញាតឲ្យចូលដំណើរការ <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
-    <string name="bluetooth_device_name_summary" msgid="8678342689845439583">"អាច​មើលឃើញជា <xliff:g id="DEVICE_NAME">^1</xliff:g> ចំពោះ​ឧបករណ៍ផ្សេងទៀត"</string>
+    <string name="bluetooth_device_name_summary" msgid="8678342689845439583">"បង្ហាញឈ្មោះថា <xliff:g id="DEVICE_NAME">^1</xliff:g> ដល់ឧបករណ៍ផ្សេងទៀត"</string>
     <string name="bluetooth_off_footer" msgid="76578735660216295">"បើក​ប៊្លូធូស​ដើម្បី​ភ្ជាប់​ទៅ​ឧបករណ៍​ផ្សេង​ទៀត។"</string>
     <string name="bluetooth_paired_device_title" msgid="3240639218362342026">"ឧបករណ៍របស់អ្នក"</string>
     <string name="bluetooth_pairing_page_title" msgid="3403981358823707692">"ផ្គូផ្គង​ឧបករណ៍ថ្មី"</string>
@@ -142,10 +142,11 @@
     <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"អនុញ្ញាត​ឱ្យ​ឧបករណ៍​របស់អ្នក​ភ្ជាប់​ជាមួយ​ឧបករណ៍​ប៊្លូធូស​ដែល​នៅ​ជិត"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"អនុញ្ញាត​ឱ្យ​ទូរសព្ទ​របស់អ្នក​ភ្ជាប់​​ជាមួយ​ឧបករណ៍​ប៊្លូធូស​ដែល​នៅ​ជិត"</string>
     <string name="bluetooth_disable_a2dp_hw_offload" msgid="5942913792817797541">"បិទការ​ផ្ទេរបន្ទុកទៅហាតវែរ A2DP ប៊្លូធូស"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="8610420176339657720">"ចាប់ផ្តើមឧបករណ៍ឡើងវិញ?"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8333029144800835996">"អ្នក​ត្រូវ​ចាប់ផ្ដើម​ឧបករណ៍​របស់អ្នកឡើងវិញ ដើម្បី​ផ្លាស់ប្ដូរ​ការកំណត់​នេះ។"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="3488695418187553566">"ចាប់ផ្ដើមឡើងវិញ"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="4930826928585464191">"បោះបង់"</string>
+    <string name="bluetooth_disable_le_audio_hw_offload" msgid="3966022676505972908">"បិទការផ្ទេរហាតវែរ LE AUDIO ប៊្លូធូស"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_title" msgid="6001142380445276918">"ចាប់ផ្តើមឧបករណ៍ឡើងវិញឬ?"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_message" msgid="1524373895333698779">"អ្នក​ត្រូវ​ចាប់ផ្ដើម​ឧបករណ៍​របស់អ្នកឡើងវិញ ដើម្បី​ផ្លាស់ប្ដូរ​ការកំណត់​នេះ។"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_confirm" msgid="5594859658551707592">"ចាប់ផ្ដើមឡើងវិញ"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel" msgid="3663690305043973720">"បោះបង់"</string>
     <string name="connected_device_media_device_title" msgid="3783388247594566734">"ឧបករណ៍ផ្ទុកទិន្នន័យ"</string>
     <string name="connected_device_call_device_title" msgid="88732390601723608">"ឧបករណ៍​ហៅ​ទូរសព្ទ"</string>
     <string name="connected_device_other_device_title" msgid="4652120430615729193">"ឧបករណ៍ផ្សេងទៀត"</string>
@@ -309,9 +310,9 @@
     <string name="security_settings_title" msgid="6710768415432791970">"សុវត្ថិភាព"</string>
     <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"ការ​អ៊ីនគ្រីប និងព័ត៌មានផ្ទៀងផ្ទាត់"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"បានអ៊ិនគ្រីបទូរសព្ទ"</string>
-    <string name="decryption_settings_summary" product="default" msgid="1742645256103613503">"ទូរសព្ទ​មិនបាន​អិុនគ្រីប​ទេ"</string>
+    <string name="not_encrypted_summary" product="default" msgid="2251945842585788254">"មិនបាន​អ៊ីនគ្រីប​ទូរសព្ទទេ"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"ឧបករណ៍​ត្រូវបានអ៊ិនគ្រីប"</string>
-    <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"ឧបករណ៍​មិនបាន​អិុនគ្រីប​ទេ"</string>
+    <string name="not_encrypted_summary" product="tablet" msgid="2374263654698719382">"មិនបាន​អ៊ីនគ្រីប​ឧបករណ៍ទេ"</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"អេក្រង់ចាក់សោ"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"អ្វីដែលត្រូវ​បង្ហាញ​"</string>
     <string name="security_settings_summary" msgid="1627059516127354233">"កំណត់​ទីតាំង​របស់​ខ្ញុំ ដោះ​សោ​អេក្រង់ ចាក់​សោ​ស៊ីម​កាត ចាក់​សោ​ការ​ផ្ទុក​ព័ត៌មាន​សម្ងាត់"</string>
@@ -568,37 +569,10 @@
     <string name="fingerprint_last_delete_message" msgid="7860374760549404410">"អ្នកនឹងមិន​អាចប្រើស្នាមម្រាមដៃ​របស់អ្នក ដើម្បីដោះសោ​ទូរសព្ទរបស់អ្នក ឬផ្ទៀងផ្ទាត់​ថាជាអ្នកនៅក្នុង​កម្មវិធីបានទេ។"</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="4104208067277655068">"អ្នកនឹង​មិនអាចប្រើ​ស្នាមម្រាមដៃ​របស់អ្នក ដើម្បី​ដោះសោ​កម្រងព័ត៌មាន​ការងារ​របស់អ្នក ផ្តល់សិទ្ធិ​ក្នុងការទិញ ឬ​ចូល​កម្មវិធីការងារបានទេ។"</string>
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"បាទ/ចាស លុបចេញ"</string>
-    <string name="crypt_keeper_settings_title" msgid="4938812137822100044">"ការអ៊ីនគ្រីប"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"ដាក់​លេខ​កូដ​កុំព្យូទ័រ​បន្ទះ"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"អ៊ីនគ្រីបទូរសព្ទ"</string>
-    <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"បាន​អ៊ីនគ្រីប"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"អ្នក​អាច​ដាក់​លេខ​កូដ​គណនី​, ការកំណត់, កម្មវិធី​បាន​ទាញ​យក​ និង​ទិន្នន័យ​​របស់​វា, មេឌៀ ​និង​ឯកសារ​ផ្សេងៗ​ទៀត។ បន្ទាប់ពី​អ្នក​ដាក់​លេខ​កូដ​ទូរស័ព្ទ​របស់​អ្នក សន្មត​ថា​​អ្នក​បាន​រៀបចំ​ការ​ចាក់​សោ​អេក្រង់ (ដែល​​មាន លំនាំ ឬ​កូដ​ PIN ជា​លេខ​ ឬ​ពាក្យ​សម្ងាត់) អ្នក​នឹង​ត្រូវ​ដោះ​សោ​អេក្រង់​ ដើម្បី​ដោះ​លេខ​កូដ​កុំព្យូទ័រ​បន្ទះ​​រាល់​ពេល​ដែល​អ្នក​បើក​វា។ មាន​វិធី​ផ្សេង​តែ​មួយ​គត់​​គឺ​ត្រូវ​អនុវត្ត​ការ​កំណត់​ទិន្នន័យ​ដូច​ពេល​ចេញ​ពី​រោងចក្រ ដោយ​លុប​ទិន្នន័យ​របស់​អ្នក​ទាំងអស់។\n\nការ​ដាក់​លេខ​កូដ​ចំណាយ​ពេល​មួយ​ម៉ោង ឬ​ច្រើន​ជាង​នេះ។ អ្នក​ត្រូវ​តែ​ចាប់ផ្ដើម​ដោយ​​មាន​ថ្ម​ពេញ និង​ដោត​កុំព្យូទ័រ​បន្ទះ​ជាប់​ក្នុង​ពេល​ដំណើរការ។ បើ​អ្នក​ផ្អាក​វា អ្នក​នឹង​បាត់បង់​ទិន្នន័យ​របស់​អ្នក​មួយ​ចំនួន ឬ​ទាំងអស់​តែ​ម្ដង។"</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"អ្នក​អាច​ដាក់​លេខ​កូដ​គណនី​, ការកំណត់, កម្មវិធី​បាន​ទាញ​យក​ និង​ទិន្នន័យ​​របស់​វា, មេឌៀ និង​ឯកសារ​ផ្សេងៗ​ទៀត។ បន្ទាប់ពី​អ្នក​ដាក់​លេខ​កូដ​ទូរស័ព្ទ​របស់​អ្នក សន្មត​ថា​​អ្នក​បាន​រៀបចំ​ការ​ចាក់​សោ​អេក្រង់ (ដែល​​មាន លំនាំ ឬ​កូដ​ PIN ជា​លេខ​ ឬ​ពាក្យ​សម្ងាត់) អ្នក​នឹង​ត្រូវ​ដោះ​សោ​អេក្រង់​ ដើម្បី​ដោះ​លេខ​កូដ​គឺ​ត្រូវ​អនុវត្ត​ការ​កំណត់​ទិន្នន័យ​ដូច​ពេល​ចេញ​ពី​រោងចក្រ ដោយ​លុប​ទិន្នន័យ​របស់​អ្នក​ទាំងអស់។\n\nការ​ដាក់​លេខ​កូដ​ចំណាយ​ពេល​មួយ​ម៉ោង ឬ​ច្រើន​ជាង​នេះ។ អ្នក​ត្រូវ​តែ​ចាប់ផ្ដើម​ដោយ​​មាន​ថ្ម​ពេញ និង​ដោត​ជាប់​ក្នុង​ពេល​ដំណើរការ។ បើ​អ្នក​ផ្អាក​វា អ្នក​នឹង​បាត់បង់​ទិន្នន័យ​របស់​អ្នក​មួយ​ចំនួន ឬ​ទាំងអស់​តែ​ម្ដង។"</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"ដាក់​លេខ​កូដ​កុំព្យូទ័រ​បន្ទះ"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"អ៊ីនគ្រីបទូរសព្ទ"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"បញ្ចូល​ថ្ម ហើយ​ព្យាយាម​ម្ដង​ទៀត។"</string>
-    <string name="crypt_keeper_unplugged_text" msgid="2709721134148651329">"បញ្ចូល​ថ្ម ហើយ​ព្យាយាម​ម្ដង​ទៀត។"</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="1847280235529858357">"គ្មាន​ពាក្យ​សម្ងាត់ ឬ​​កូដ PIN ចាក់​សោ​អេក្រង់"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="7210616262954236042">"អ្នក​ត្រូវ​តែ​កំណត់​កូដ​ PIN ឬ​ពាក្យ​សម្ងាត់​ចាក់សោ​អេក្រង់​​ មុន​ពេល​អ្នក​ចាប់ផ្ដើម​ដាក់លេខ​កូដ។"</string>
-    <string name="crypt_keeper_confirm_title" msgid="8600000209722452230">"ដាក់លេខ​កូដ?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="3270587498436152259">"ប្រតិបត្តិការ​ដាក់​លេខ​កូដ​មិន​អាច​ត្រឡប់​វិញ​បានទេ ហើយ​បើ​អ្នក​ផ្អាក​វា អ្នក​នឹង​បាត់បង់​ទិន្នន័យ។ ការ​ដាក់​លេខ​កូដ​ចំណាយ​ពេល​ប្រហែល ១ ម៉ោង​ ឬ​ច្រើន​ជាង​នេះ អំឡុង​ពេល​នោះ​កុំព្យូទ័រ​បន្ទះ​នឹង​ចាប់ផ្ដើម​ឡើងវិញ​ច្រើន​ដង។"</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="3040428543349852419">"ប្រតិបត្តិការ​ដាក់លេខ​កូដ​មិន​អាច​ត្រឡប់​វិញ​បាន​ទេ ហើយ​ប្រសិន​បើ​អ្នក​ផ្អាក​វា អ្នក​នឹង​បាត់បង់​ទិន្នន័យ​ទាំងអស់។ ការ​ដាក់​លេខ​កូដ​ចំណាយ​ពេល​មួយ​ម៉ោង ឬ​ច្រើន​ជាង​នេះ អំឡុង​ពេល​នោះ​ទូរស័ព្ទ​នឹង​ចាប់ផ្ដើម​ឡើងវិញ​ច្រើន​ដង។"</string>
-    <string name="crypt_keeper_setup_title" msgid="3339725741305796680">"ការ​ដាក់​លេខ​កូដ"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="4417016995091289019">"រង់ចាំ​ខណៈ​ដែល​កុំព្យូទ័រ​បន្ទះ​បស់​អ្នក​កំពុង​ត្រូវ​បាន​ដាក់លេខ​កូដ។ បញ្ចប់ <xliff:g id="PERCENT">^1</xliff:g>% ។"</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="7902355422499500352">"រង់ចាំ​ខណៈ​ដែល​ទូរស័ព្ទ​របស់​អ្នក​កំពុង​ត្រូវ​បាន​ដាក់លេខ​កូដ។ បញ្ចប់ <xliff:g id="PERCENT">^1</xliff:g>% ។"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="8348188415839917821">"រង់ចាំ​ខណៈ​ពេល​ដែល​ឧបករណ៍​កុំព្យូទ័រ​បន្ទះ​របស់​អ្នក​កំពុង​​ត្រូវ​បាន​អ៊ិនគ្រីប​។ ពេលវេលា​នៅ​សល់​៖ <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="8556105766597855198">"រង់ចាំ​ខណៈ​ពេល​ដែល​ទូរស័ព្ទ​របស់​អ្នក​កំពុង​ត្រូវ​បាន​អ៊ិនគ្រីប​។ ពេលវេលា​នៅ​សល់​៖ <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="3832496715430327682">"ដើម្បីដោះសោថេប្លេតរបស់អ្នក ត្រូវបិទវា ហើយបើកវាវិញ។"</string>
-    <string name="crypt_keeper_force_power_cycle" product="default" msgid="5070346039522135361">"ដើម្បីដោះសោទូរស័ព្ទរបស់អ្នក ត្រូវបិទវា ហើយបើកវាវិញ។"</string>
-    <string name="crypt_keeper_warn_wipe" msgid="8104921337301750394">"ព្រមាន៖ ឧបករណ៍​របស់​អ្នក​នឹង​ត្រូវ​បាន​លុប​បន្ទាប់ពី​ការ​ព្យាយាម​ដោះ​សោ​បរាជ័យ <xliff:g id="COUNT">^1</xliff:g> ដង!"</string>
-    <string name="crypt_keeper_enter_password" msgid="1274917431075529732">"បញ្ចូល​ពាក្យ​សម្ងាត់​របស់​អ្នក"</string>
-    <string name="crypt_keeper_failed_title" msgid="8173654570682244149">"កា​រដាក់​លេខ​កូដ​មិន​ជោគជ័យ"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"ការ​ដាក់លេខ​កូដ​ត្រូវ​បាន​ផ្អាក និង​មិន​អាច​បញ្ចប់​បាន​ទេ។ ជា​លទ្ធផល ទិន្នន័យ​ក្នុង​កុំព្យូទ័រ​បន្ទះ​របស់​អ្នក​មិន​អាច​ចូល​ \n\n ដើម្បី​បន្ត​ប្រើ​កុំព្យូទ័រ​បន្ទះ​របស់​អ្នក អ្នក​ត្រូវ​តែ​កំណត់​ដូច​ចេញ​ពី​រោងចក្រ​ឡើងវិញ។ ពេល​អ្នក​រៀបចំ​កុំព្យូទ័រ​បន្ទះ​របស់​អ្នក​បន្ទាប់​ពី​កំណត់​ឡើងវិញ អ្នក​មាន​ឱកាស​ដើម្បី​ស្ដារ​ទិន្នន័យ​ដែល​ត្រូវ​បាន​បម្រុង​ទុក​ក្នុង​គណនី Google របស់​អ្នក។"</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"ការ​ដាក់​លេខ​កូដ​ត្រូវ​បាន​ផ្អាក និង​មិន​អាច​បញ្ចប់​ទេ។ ជា​លទ្ធផល ទិន្នន័យ​ក្នុង​ទូរស័ព្ទ​របស់​អ្នក​មិន​អាច​ចូល​ដំណើរការ​បាន​ទេ។ \n\nដើម្បី​បន្ត​ប្រើ​ទូរស័ព្ទ​របស់​អ្នក អ្នក​ត្រូវ​អនុវត្ត​ការ​កំណត់​ដូច​ចេញ​ពី​រោងចក្រ។ ពេល​អ្នក​រៀបចំ​ទូរស័ព្ទ​របស់​អ្នក​បន្ទាប់​ពី​កំណត់ អ្នក​នឹង​មាន​ឱកាស​ដើម្បី​ស្ដារ​ទិន្នន័យ​ដែល​ត្រូវ​បាន​បម្រុងទុក​ក្នុង​គណនី Google របស់​​អ្នក។"</string>
-    <string name="crypt_keeper_data_corrupt_title" msgid="5920153462176846037">"ការ​អ៊ិនគ្រីប​​មិន​បាន​ជោគជ័យ"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"ពាក្យសម្ងាត់ដែលអ្នកបានបញ្ចូលត្រឹមត្រូវ ប៉ុន្តែសំណាងមិនល្អទិន្នន័យរបស់អ្នកខូច។ \n\n ដើម្បីបន្តប្រើថេប្លេតរបស់អ្នក អ្នកចាំបាច់ត្រូវធ្វើការកំណត់ដូចចេញពីរោចចក្រឡើងវិញ។ នៅពេលដែលអ្នកដំឡើងថេប្លេតរបស់អ្នកបន្ទាប់ពីកំណត់ឡើងវិញនោះ អ្នកនឹងមានឱកាសដើម្បីស្តារទិន្នន័យទាំងឡាយដែលបានបម្រុងទុកទៅគណនី Google របស់អ្នក។"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"ពាក្យសម្ងាត់ដែលអ្នកបានបញ្ចូលត្រឹមត្រូវ ប៉ុន្តែសំណាងមិនល្អទិន្នន័យរបស់អ្នកខូច។ \n\nដើម្បីបន្តប្រើទូរស័ព្ទរបស់អ្នក អ្នកចាំបាច់ត្រូវធ្វើការកំណត់ដូចចេញពីរោចចក្រឡើងវិញ។ នៅពេលដែលអ្នកដំឡើងទូរស័ព្ទរបស់អ្នកបន្ទាប់ពីកំណត់ឡើងវិញនោះ អ្នកនឹងមានឱកាសដើម្បីស្តារទិន្នន័យទាំងឡាយដែលបានបម្រុងទុកទៅគណនី Google របស់អ្នក។"</string>
-    <string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"ប្ដូរ​វិធីសាស្ត្រ​បញ្ចូល"</string>
+    <string name="encryption_settings_title" msgid="2848716008695618360">"ការ​អ៊ីនគ្រីប"</string>
+    <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"អ៊ីនគ្រីប​ថេប្លេត"</string>
+    <string name="encrypt_title" product="default" msgid="7337365190988321100">"អ៊ីនគ្រីប​ទូរសព្ទ"</string>
+    <string name="encrypted_summary" msgid="545623487587251207">"បាន​អ៊ីនគ្រីប"</string>
     <string name="suggested_lock_settings_title" msgid="7836065447159730217">"រក្សា​សុវត្ថិភាព​ទូរសព្ទ​របស់អ្នក"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"កំណត់​ការ​ចាក់​សោ​អេក្រង់ ដើម្បី​ការពារ​ថេប្លេត"</string>
     <string name="suggested_lock_settings_summary" product="device" msgid="8479766049078378225">"កំណត់​ការ​ចាក់​សោ​អេក្រង់ ដើម្បី​ការពារ​ឧបករណ៍"</string>
@@ -817,6 +791,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"អ្នក​ក៏​ត្រូវ​បញ្ចូល​កូដ PIN នេះ​លើ​ឧបករណ៍​ផ្សេង​ដែរ។"</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"អ្នក​ក៏​អាច​ត្រូវ​បញ្ចូល​លេខ​កូដ​នេះ​លើ​ឧបករណ៍​ផ្សេង។"</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"ដើម្បី​ផ្គូផ្គង​ជា​មួយ៖&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;ប្រាកដ​ថា វា​កំពុង​បង្ហាញ​​លេខ​កូដ​នេះ៖&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"បញ្ជាក់ ដើម្បីផ្គូផ្គងជាមួយសំណុំដែលបានសម្របសម្រួល"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"ពី៖ &lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;ផ្គូផ្គង​ជា​មួយ​ឧបករណ៍​នេះ?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"ដើម្បី​ផ្គូផ្គង​ជា​មួយ៖ <xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>វាយ​បញ្ចូល៖ <xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g> បន្ទាប់​មក​ចុច​ Return ឬ Enter ។"</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"ផ្ដល់​សិទ្ធិ​អនុញ្ញាត​ចូល​ប្រើ​ទំនាក់ទំនង​ និង​ប្រវត្តិ​ហៅ​ទូរសព្ទ​របស់អ្នក"</string>
@@ -850,6 +825,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"មិនអាចភ្ជាប់បានទេ។ សូមព្យាយាមម្តងទៀត។"</string>
     <string name="device_details_title" msgid="1155622417516195481">"ព័ត៌មានលម្អិត​អំពី​ឧបករណ៍"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"អាសយដ្ឋាន​ប៊្លូធូស​របស់ឧបករណ៍៖ <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"អាសយដ្ឋាន​ប៊្លូធូស​របស់ឧបករណ៍៖\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"បំភ្លេច​ឧបករណ៍?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"ដកភាពពាក់ព័ន្ធចេញ"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"ផ្ដាច់​កម្មវិធីឬ?"</string>
@@ -881,6 +857,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"ចងចាំ​ការ​កំណត់"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"ចំនួនអតិបរមា​នៃ​ឧបករណ៍​សំឡេង​ដែលភ្ជាប់​ប៊្លូធូស​"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"ជ្រើសរើស​ចំនួនអតិបរមា​នៃ​ឧបករណ៍​សំឡេង​ដែលភ្ជាប់​ប៊្លូធូស"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"កំណត់ហេតុ​ជួសជុលគំនរ NFC"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"បង្កើន​កម្រិតធ្វើ​កំណត់ហេតុ​គំនរ NFC"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"ភ្ជាប់"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"កញ្ចក់"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"បើក​ការ​បង្ហាញ​ឥត​ខ្សែ"</string>
@@ -1188,6 +1166,8 @@
     <string name="wifi_hotspot_maximize_compatibility_dual_ap_summary" msgid="3579549223159056533">"ជួយឱ្យឧបករណ៍ផ្សេងទៀតរកឃើញហតស្ប៉តនេះ។ ប្រើប្រាស់ថ្ម​ច្រើន​ជាងមុន។"</string>
     <string name="wifi_tether_starting" msgid="8879874184033857814">"កំពុង​បើក​ហតស្ពត..."</string>
     <string name="wifi_tether_stopping" msgid="4416492968019409188">"កំពុង​បិទ​ហតស្ពត..."</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_title" msgid="3089432578433978073">"មិនអាច​ភ្ជាប់​បានទេ"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_content" msgid="5920421547607921112">"សូមទាក់ទងក្រុមហ៊ុន​សេវាទូរសព្ទ​របស់អ្នក ដើម្បីទទួលបាន​ព័ត៌មានលម្អិត"</string>
     <string name="wifi_tether_enabled_subtext" msgid="5085002421099821056">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> ដំណើរការ"</string>
     <string name="wifi_tether_failed_subtext" msgid="437190628041885500">"កំហុស​វ៉ាយហ្វាយ​ហតស្ពត​ចល័ត"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7072559431286459122">"រៀបចំ Wi-Fi ហតស្ប៉ត"</string>
@@ -2534,11 +2514,6 @@
     <string name="enable_service_title" msgid="7231533866953706788">"អនុញ្ញាតឱ្យ <xliff:g id="SERVICE">%1$s</xliff:g> គ្រប់គ្រងឧបករណ៍​របស់អ្នក​ទាំងស្រុង?"</string>
     <string name="capabilities_list_title" msgid="1225853611983394386">"<xliff:g id="SERVICE">%1$s</xliff:g> ត្រូវ​ការ៖"</string>
     <string name="touch_filtered_warning" msgid="4225815157460318241">"ដោយសារកម្មវិធីមួយកំពុងធ្វើឲ្យសំណើរអនុញ្ញាតមានភាពមិនច្បាស់ ការកំណត់នេះមិនអាចផ្ទៀងផ្ទាត់ការឆ្លើយតបរបស់អ្នកបានទេ។"</string>
-    <string name="enable_service_encryption_warning" msgid="931082737770453755">"បើ​អ្នក​បើក <xliff:g id="SERVICE">%1$s</xliff:g>, ឧបករណ៍របស់​អ្នកនឹង​មិន​ប្រើ​អេក្រង់​ជាប់សោ​របស់​អ្នក​ដើម្បី​បង្កើន​ការ​អ៊ិនគ្រីប​ទិន្នន័យ​ទេ។"</string>
-    <string name="secure_lock_encryption_warning" msgid="669152607190123579">"ព្រោះ​អ្នក​​បាន​បើក​សេវាកម្ម​ភាព​ងាយស្រួល ឧបករណ៍របស់​អ្នក​នឹង​មិន​ប្រើ​អេក្រង់​ជាប់​សោ​របស់​អ្នក​ដើម្បី​បង្កើន​ការ​អ៊ិនគ្រីប​ទិន្នន័យ។"</string>
-    <string name="enable_service_pattern_reason" msgid="6832846117817938536">"ព្រោះ​បើក <xliff:g id="SERVICE">%1$s</xliff:g> ប៉ះពាល់​ដល់​ការ​អ៊ិនគ្រីប​ទិន្នន័យ អ្នក​ត្រូវតែ​បញ្ជាក់​​លំនាំ​​របស់​អ្នក។"</string>
-    <string name="enable_service_pin_reason" msgid="6040417014360237703">"ព្រោះ​បើក <xliff:g id="SERVICE">%1$s</xliff:g> ប៉ះពាល់​ដល់​ការ​អ៊ិនគ្រីប​ទិន្នន័យ អ្នក​ត្រូវតែ​បញ្ជាក់​កូដ PIN ​របស់​អ្នក។"</string>
-    <string name="enable_service_password_reason" msgid="6962544350351734238">"ព្រោះ​​បើក <xliff:g id="SERVICE">%1$s</xliff:g> ប៉ះពាល់​ដល់​ការ​អ៊ិនគ្រីប​ទិន្នន័យ អ្នក​ត្រូវតែ​បញ្ជាក់​ពាក្យសម្ងាត់​របស់​អ្នក។"</string>
     <string name="accessibility_service_warning" msgid="6779187188736432618">"<xliff:g id="SERVICE">%1$s</xliff:g> កំពុង​ស្នើ​សុំគ្រប់គ្រង​ឧបករណ៍​នេះ​ទាំងស្រុង។ សេវាកម្ម​នេះអាច​អាន​អេក្រង់ និងធ្វើសកម្មភាពជំនួស​ឱ្យអ្នកប្រើប្រាស់​ដែលត្រូវការ​មុខងារ​ភាពងាយស្រួល។ កម្រិត​នៃការគ្រប់គ្រង​នេះ​មិនស័ក្តិសម​សម្រាប់​កម្មវិធី​ភាគច្រើនទេ។"</string>
     <string name="accessibility_service_warning_description" msgid="6573203795976134751">"ការគ្រប់គ្រង​ទាំងស្រុងមានលក្ខណៈ​សមស្របសម្រាប់​កម្មវិធី ដែលជួយអ្នក​ទាក់ទងនឹងការប្រើមុខងារភាពងាយស្រួល ប៉ុន្តែមិនសមស្របសម្រាប់​កម្មវិធីភាគច្រើនទេ។"</string>
     <string name="accessibility_service_screen_control_title" msgid="324795030658109870">"មើល និង​គ្រប់គ្រងអេក្រង់"</string>
@@ -3103,14 +3078,6 @@
     <string name="remove_account_failed" msgid="3709502163548900644">"ការផ្លាស់ប្តូរនេះ​មិនត្រូវ​បាន​អនុញ្ញាត​ដោយអ្នកគ្រប់គ្រងរបស់អ្នក"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"មិន​អាច​ធ្វើ​សម​កាល​កម្ម​ដោយ​ដៃ"</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"បច្ចុប្បន្ន​បាន​បិទ​ការ​ធ្វើ​សម​កាល​កម្ម​សម្រាប់​​ធាតុ​នេះ។ ដើម្បី​ប្ដូរ​ការ​កំណត់​នេះ បើក​ទិន្នន័យ​​ផ្ទៃ​ខាង​ក្រោយ និង​ធ្វើ​សម​កាល​កម្ម​​ស្វ័យ​ប្រវត្តិ​ជា​បណ្ដោះអាសន្ន។"</string>
-    <string name="enter_password" msgid="6327051330258595331">"ដើម្បី​ចាប់ផ្ដើម Android បញ្ចូល​ពាក្យ​សម្ងាត់​របស់​អ្នក"</string>
-    <string name="enter_pin" msgid="1029287617551232681">"ដើម្បី​ចាប់ផ្ដើម Android បញ្ចូល​កូដ PIN របស់​អ្នក"</string>
-    <string name="enter_pattern" msgid="1747316785866742960">"ដើម្បី​ចាប់ផ្ដើម Android គូរ​លំនាំ​របស់​អ្នក"</string>
-    <string name="cryptkeeper_wrong_pattern" msgid="340747269176120242">"លំនាំ​មិន​ត្រឹមត្រូវ"</string>
-    <string name="cryptkeeper_wrong_password" msgid="7295607881887114486">"ពាក្យ​សម្ងាត់​មិន​ត្រឹមត្រូវ"</string>
-    <string name="cryptkeeper_wrong_pin" msgid="2347961593970714201">"កូដ PIN មិន​ត្រឹមត្រូវ"</string>
-    <string name="checking_decryption" msgid="6111642972615688237">"កំពុង​ពិនិត្យ​មើល..."</string>
-    <string name="starting_android" msgid="6694154070215356186">"កំពុងចាប់ផ្ដើម Android…"</string>
     <string name="delete" msgid="8330605554706263775">"លុប"</string>
     <string name="misc_files" msgid="6598066985800749585">"ឯកសារ​ផ្សេងៗ"</string>
     <string name="misc_files_selected_count" msgid="5597802791672749532">"បាន​ជ្រើស <xliff:g id="NUMBER">%1$d</xliff:g> នៃ <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -3206,8 +3173,6 @@
     <string name="data_usage_metered_yes" msgid="4262598072030135223">"ផ្អែកតាមទិន្នន័យដែលប្រើ"</string>
     <string name="data_usage_metered_no" msgid="1685828958417926268">"ធូរថ្លៃ"</string>
     <string name="data_usage_disclaimer" msgid="3271450299386176770">"ការ​គណនា​​ទិន្នន័យ​របស់​ក្រុមហ៊ុន​ផ្ដល់សេវាទូរស័ព្ទ​អាច​ខុស​គ្នា​ពី​ឧបករណ៍​របស់​អ្នក។"</string>
-    <string name="cryptkeeper_emergency_call" msgid="8369322820475703306">"ការ​ហៅ​​ពេល​អាសន្ន"</string>
-    <string name="cryptkeeper_return_to_call" msgid="3857250752781151232">"ត្រឡប់​​ទៅ​ការ​ហៅ"</string>
     <string name="vpn_name" msgid="3806456074909253262">"ឈ្មោះ"</string>
     <string name="vpn_type" msgid="5533202873260826663">"ប្រភេទ"</string>
     <string name="vpn_server" msgid="2908816134941973935">"អាសយដ្ឋាន​ម៉ាស៊ីន​មេ"</string>
@@ -4764,8 +4729,6 @@
       <item quantity="one">កម្មវិធី 1 អាច​ប្រើ​ទិន្នន័យដែលគ្មានការដាក់កំហិត</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"មើលច្រើនទៀត"</string>
-    <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"តើពិតជាចង់លុបទិន្នន័យអ្នកប្រើ និងបម្លែងទៅការអ៊ិនគ្រីបឯកសារមែនទេ?"</string>
-    <string name="button_confirm_convert_fbe" msgid="339648921918438106">"លុប និងបម្លែង"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"កំណត់ការកម្រិតការវាយតម្លៃលើ ShortcutManager ឡើងវិញ"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"ការកម្រិតការវាយតម្លៃ ShortcutManager ត្រូវបានកំណត់ឡើងវិញ"</string>
     <string name="notification_suggestion_title" msgid="6309263655965785411">"គ្រប់គ្រង​ព័ត៌មាន​លើអេក្រង់ចាក់សោ"</string>
@@ -5292,6 +5255,7 @@
     <string name="sim_action_yes" msgid="8076556020131395515">"បាទ/ចាស"</string>
     <string name="sim_action_reboot" msgid="3508948833333441538">"ចាប់ផ្ដើមឡើងវិញ"</string>
     <string name="sim_action_no_thanks" msgid="435717748384544195">"ទេ អរគុណ"</string>
+    <string name="sim_action_cancel" msgid="2668099867029610910">"បោះបង់"</string>
     <string name="sim_switch_button" msgid="1405772571706095387">"ប្តូរ"</string>
     <string name="dsds_activation_failure_title" msgid="4467364110584914794">"មិនអាច​បើកដំណើរការ​ស៊ីមបានទេ"</string>
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"សូមដកស៊ីម រួចបញ្ចូលឡើងវិញ។ ប្រសិនបើនៅតែមានបញ្ហា សូម​ចាប់ផ្ដើម​ឧបករណ៍​របស់អ្នកឡើងវិញ។"</string>
@@ -5444,6 +5408,10 @@
     <string name="cached_apps_freezer" msgid="1057519579761550350">"ផ្អាកប្រតិបត្តិការសម្រាប់កម្មវិធីក្នុងឃ្លាំងបម្រុង"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"អនុញ្ញាត​ការត្រួតគ្នាលើ​អេក្រង់នៅលើ​ការកំណត់"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"អនុញ្ញាតឱ្យ​កម្មវិធីដែលអាច​បង្ហាញនៅលើកម្មវិធី​ផ្សេងទៀត​ដាក់អេក្រង់ការកំណត់​ត្រួតគ្នា"</string>
+    <!-- no translation found for allow_mock_modem (3832264806530479214) -->
+    <skip />
+    <!-- no translation found for allow_mock_modem_summary (9097416612748005374) -->
+    <skip />
     <string name="media_controls_title" msgid="403271085636252597">"មេឌៀ"</string>
     <string name="media_controls_resume_title" msgid="855076860336652370">"ខ្ទាស់​កម្មវិធីចាក់មេឌៀ"</string>
     <string name="media_controls_resume_description" msgid="3163482266454802097">"ដើម្បីបន្ត​ការចាក់​បានរហ័ស កម្មវិធី​ចាក់មេឌៀ​បន្តបើក​នៅក្នុង​ការកំណត់រហ័ស"</string>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 6ce6d1a..f15e6b5 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -142,10 +142,11 @@
     <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"ಸಮೀಪದ ಬ್ಲೂಟೂತ್ ಸಾಧನಗಳೊಂದಿಗೆ ಸಂವಹನ ನಡೆಸಲು ನಿಮ್ಮ ಸಾಧನವನ್ನು ಅನುಮತಿಸಿ"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"ಸಮೀಪದ ಬ್ಲೂಟೂತ್ ಸಾಧನಗಳೊಂದಿಗೆ ಸಂವಹನ ನಡೆಸಲು ನಿಮ್ಮ ಫೋನ್ ಅನ್ನು ಅನುಮತಿಸಿ"</string>
     <string name="bluetooth_disable_a2dp_hw_offload" msgid="5942913792817797541">"ಬ್ಲೂಟೂತ್ A2DP ಹಾರ್ಡ್‌ವೇರ್‌ ಆಫ್‍‍ಲೋಡ್ ಅನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="8610420176339657720">"ಸಾಧನ ಮರುಪ್ರಾರಂಭಿಸಬೇಕೆ?"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8333029144800835996">"ಈ ಸೆಟ್ಟಿಂಗ್ ಅನ್ನು ಬದಲಾಯಿಸಲು ನಿಮ್ಮ ಸಾಧನವನ್ನು ನೀವು ಮರುಪ್ರಾರಂಭಿಸುವ ಅಗತ್ಯವಿದೆ."</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="3488695418187553566">"ಮರುಪ್ರಾರಂಭ"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="4930826928585464191">"ರದ್ದುಮಾಡಿ"</string>
+    <string name="bluetooth_disable_le_audio_hw_offload" msgid="3966022676505972908">"ಬ್ಲೂಟೂತ್ LE AUDIO ಹಾರ್ಡ್‌ವೇರ್ ಆಫ್‌ಲೋಡ್ ಅನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_title" msgid="6001142380445276918">"ಸಾಧನವನ್ನು ಮರುಪ್ರಾರಂಭಿಸಬೇಕೆ?"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_message" msgid="1524373895333698779">"ಈ ಸೆಟ್ಟಿಂಗ್ ಅನ್ನು ಬದಲಾಯಿಸಲು ನಿಮ್ಮ ಸಾಧನವನ್ನು ನೀವು ಮರುಪ್ರಾರಂಭಿಸುವ ಅಗತ್ಯವಿದೆ."</string>
+    <string name="bluetooth_disable_hw_offload_dialog_confirm" msgid="5594859658551707592">"ಮರುಪ್ರಾರಂಭಿಸಿ"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel" msgid="3663690305043973720">"ರದ್ದುಮಾಡಿ"</string>
     <string name="connected_device_media_device_title" msgid="3783388247594566734">"ಮೀಡಿಯಾ ಸಾಧನಗಳು"</string>
     <string name="connected_device_call_device_title" msgid="88732390601723608">"ಸಾಧನಗಳಿಗೆ ಕರೆಮಾಡಿ"</string>
     <string name="connected_device_other_device_title" msgid="4652120430615729193">"ಇತರ ಸಾಧನಗಳು"</string>
@@ -309,9 +310,9 @@
     <string name="security_settings_title" msgid="6710768415432791970">"ಭದ್ರತೆ"</string>
     <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"ಎನ್‌ಕ್ರಿಪ್ಶನ್ &amp; ರುಜುವಾತುಗಳು"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"ಫೋನ್ ಎನ್‌ಕ್ರಿಪ್ಟ್ ಮಾಡಲಾಗಿದೆ"</string>
-    <string name="decryption_settings_summary" product="default" msgid="1742645256103613503">"ಫೋನ್ ಅನ್ನು ಎನ್‌ಕ್ರಿಪ್ಟ್ ಮಾಡಲಾಗಿಲ್ಲ"</string>
+    <string name="not_encrypted_summary" product="default" msgid="2251945842585788254">"ಫೋನ್ ಅನ್ನು ಎನ್‌ಕ್ರಿಪ್ಟ್ ಮಾಡಲಾಗಿಲ್ಲ"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"ಸಾಧನ ಎನ್‌ಕ್ರಿಪ್ಟ್ ಆಗಿದೆ"</string>
-    <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"ಸಾಧನವನ್ನು ಎನ್‌ಕ್ರಿಪ್ಟ್ ಮಾಡಲಾಗಿಲ್ಲ"</string>
+    <string name="not_encrypted_summary" product="tablet" msgid="2374263654698719382">"ಸಾಧನವನ್ನು ಎನ್‌ಕ್ರಿಪ್ಟ್ ಮಾಡಲಾಗಿಲ್ಲ"</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"ಲಾಕ್ ಸ್ಕ್ರೀನ್"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"ಏನನ್ನು ತೋರಿಸಲು"</string>
     <string name="security_settings_summary" msgid="1627059516127354233">"ನನ್ನ ಸ್ಥಳ, ಪರದೆ ಅನ್‌ಲಾಕ್, ಸಿಮ್‌ ಕಾರ್ಡ್‌ ಲಾಕ್, ರುಜುವಾತು ಸಂಗ್ರಹಣೆ ಲಾಕ್ ಅನ್ನು ಹೊಂದಿಸಿ"</string>
@@ -568,37 +569,10 @@
     <string name="fingerprint_last_delete_message" msgid="7860374760549404410">"ನಿಮ್ಮ ಫೋನ್ ಅನ್‌ಲಾಕ್ ಮಾಡಲು ಅಥವಾ ಆ್ಯಪ್‌ಗಳಲ್ಲಿ ನೀವೇ ಎಂದು ಪರಿಶೀಲಿಸಲು ನಿಮ್ಮ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಅನ್ನು ಬಳಸಲು ನಿಮಗೆ ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ."</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="4104208067277655068">"ನಿಮ್ಮ ಕೆಲಸದ ಪ್ರೊಫೈಲ್ ಅನ್‌ಲಾಕ್ ಮಾಡಲು, ಖರೀದಿಗಳನ್ನು ದೃಢೀಕರಿಸಲು ಅಥವಾ ಕೆಲಸದ ಆ್ಯಪ್‌ಗಳಿಗೆ ಸೈನ್ ಇನ್ ಮಾಡಲು ನಿಮ್ಮ ಫಿಂಗರ್‌ ಪ್ರಿಂಟ್ ಅನ್ನು ಬಳಸಲು ನಿಮಗೆ ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ."</string>
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"ಹೌದು, ತೆಗೆದುಹಾಕಿ"</string>
-    <string name="crypt_keeper_settings_title" msgid="4938812137822100044">"ಎನ್‌ಕ್ರಿಪ್ಷನ್"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"ಟ್ಯಾಬ್ಲೆಟ್ ಅನ್ನು ಎನ್‌ಕ್ರಿಪ್ಟ್ ಮಾಡು"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"ಫೋನ್ ಎನ್‌ಕ್ರಿಪ್ಟ್ ಮಾಡಿ"</string>
-    <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"ಎನ್‌ಕ್ರಿಪ್ಟ್ ಮಾಡಲಾಗಿದೆ"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"ನಿಮ್ಮ ಖಾತೆಗಳು, ಸೆಟ್ಟಿಂಗ್‌ಗಳು, ಡೌನ್‌ಲೋಡ್‌ ಮಾಡಲಾದ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಮತ್ತು ಅದರ ಡೇಟಾ, ಮಾಧ್ಯಮ, ಹಾಗೂ ಇತರ ಫೈಲ್‌ಗಳನ್ನು ನೀವು ಎನ್‌ಕ್ರಿಪ್ಟ್ ಮಾಡಬಹುದು. ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್‌‌ ಅನ್ನು ನೀವು ಎನ್‌ಕ್ರಿಪ್ಟ್‌ ಮಾಡಿದ ನಂತರ, ನೀವು ಪರದೆಯ ಲಾಕ್ ಅನ್ನು ಹೊಂದಿಸಿರುವಿರಿ ಎಂದು ಭಾವಿಸಿಕೊಳ್ಳಿ (ಅದು ಒಂದು ನಮೂನೆ ಅಥವಾ ಸಂಖ್ಯಾ ಪಿನ್‌ ಅಥವಾ ಪಾಸ್‌ವರ್ಡ್ ಆಗಿರಬಹುದು), ಟ್ಯಾಬ್ಲೆಟ್‌‌ ಅನ್ನು ಡೀಕ್ರಿಪ್ಟ್‌ ಮಾಡಲು ಪ್ರತಿ ಬಾರಿಯೂ ಪವರ್‌ ಆನ್‌ ಮಾಡಿದಾಗ ನೀವು ಪರದೆಯನ್ನು ಅನ್‌ಲಾಕ್‌ ಮಾಡುವ ಅಗತ್ಯವಿದೆ. ನಿಮ್ಮ ಎಲ್ಲಾ ಡೇಟಾವನ್ನು ಅಳಿಸಿಹಾಕುವ ಮೂಲಕ ಫ್ಯಾಕ್ಟರಿ ಡೇಟಾ ರೀಸೆಟ್, ಡೀಕ್ರಿಪ್ಟ್‌‌ ಮಾಡಲು ಇರುವ ಇನ್ನೊಂದು ಮಾರ್ಗವಾಗಿದೆ. \n\nಎನ್ಕ್ರಿಪ್ಶನ್‌ಗೆ ಒಂದು ಗಂಟೆ ಅಥವಾ ಹೆಚ್ಚಿನ ಕಾಲ ತೆಗೆದುಕೊಳ್ಳುತ್ತದೆ. ನೀವು ಚಾರ್ಜ್‌ ಮಾಡಿದ ಬ್ಯಾಟರಿಯ ಜೊತೆಗೆ ಪ್ರಾರಂಭಿಸಬೇಕು ಮತ್ತು ಪ್ರಕ್ರಿಯೆಯ ಉದ್ದಕ್ಕೂ ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್‌‌ ಅನ್ನು ಪ್ಲಗ್ ಇನ್ ಮಾಡಿರಬೇಕು. ಒಂದು ವೇಳೆ ನೀವು ಅಡ್ಡಿಪಡಿಸಿದರೆ, ಕೆಲವು ಅಥವಾ ನಿಮ್ಮ ಎಲ್ಲಾ ಡೇಟಾವನ್ನು ನೀವು ಕಳೆದುಕೊಳ್ಳುತ್ತೀರಿ"</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"ನಿಮ್ಮ ಖಾತೆಗಳು, ಸೆಟ್ಟಿಂಗ್‌ಗಳು, ಡೌನ್‌ಲೋಡ್‌‌ ಮಾಡಲಾದ ಆ್ಯಪ್‍‌ಗಳು ಮತ್ತು ಅದರ ಡೇಟಾ, ಮಾಧ್ಯಮ ಹಾಗೂ ಇತರ ಫೈಲ್‌ಗಳನ್ನು ನೀವು ಎನ್‌ಕ್ರಿಪ್ಟ್‌ ಮಾಡಬಹುದು. ನಿಮ್ಮ ಫೋನ್‌ ಅನ್ನು ನೀವು ಎನ್‌ಕ್ರಿಪ್ಟ್‌ ಮಾಡಿದ ನಂತರ, ನೀವು ಪರದೆಯ ಲಾಕ್ ಅನ್ನು ಸೆಟ್ ಅಪ್ ಮಾಡುವಿರಿ ಎಂದು ಭಾವಿಸಿಕೊಳ್ಳಿ (ಅದು ಒಂದು ನಮೂನೆ ಅಥವಾ ಸಂಖ್ಯಾ ಪಿನ್‌ ಅಥವಾ ಪಾಸ್‌ವರ್ಡ್‌ ಆಗಿರಬಹುದು), ಪ್ರತಿ ಬಾರಿ ಪವರ್‌ ಆನ್‌ ಮಾಡಿದಾಗಲೆಲ್ಲಾ ಫೋನ್ ಅನ್ನು ಡೀಕ್ರಿಪ್ಟ್‌ ಮಾಡಲು ನೀವು ಪರದೆಯನ್ನು ಅನ್‌ಲಾಕ್‌ ಮಾಡುವ ಅಗತ್ಯವಿದೆ. ನಿಮ್ಮ ಎಲ್ಲಾ ಡೇಟಾವನ್ನು ಅಳಿಸಿಹಾಕುವ ಮೂಲಕ ಫ್ಯಾಕ್ಟರಿ ಡೇಟಾ ರೀಸೆಟ್ ಮಾಡುವುದು ಡೀಕ್ರಿಪ್ಟ್‌‌ ಮಾಡಲು ಇರುವ ಇನ್ನೊಂದು ಮಾರ್ಗವಾಗಿದೆ.\n\nಎನ್‌ಕ್ರಿಪ್ಶನ್‌ಗೆ ಒಂದು ಗಂಟೆ ಅಥವಾ ಹೆಚ್ಚಿನ ಕಾಲ ತೆಗೆದುಕೊಳ್ಳುತ್ತದೆ. ನೀವು ಚಾರ್ಜ್‌ ಮಾಡಿದ ಬ್ಯಾಟರಿಯ ಜೊತೆಗೆ ಪ್ರಾರಂಭಿಸಬೇಕು ಮತ್ತು ಪ್ರಕ್ರಿಯೆಯ ಉದ್ದಕ್ಕೂ ನಿಮ್ಮ ಫೋನ್ ಅನ್ನು ಪ್ಲಗ್ ಇನ್ ಮಾಡಿರಿ. ಒಂದು ವೇಳೆ ನೀವು ಅದನ್ನು ಅಡ್ಡಿಪಡಿಸಿದರೆ, ಕೆಲವು ಅಥವಾ ನಿಮ್ಮ ಎಲ್ಲಾ ಡೇಟಾವನ್ನು ನೀವು ಕಳೆದುಕೊಳ್ಳುತ್ತಿರಿ."</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"ಟ್ಯಾಬ್ಲೆಟ್ ಅನ್ನು ಎನ್‌ಕ್ರಿಪ್ಟ್ ಮಾಡು"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"ಫೋನ್ ಎನ್‌ಕ್ರಿಪ್ಟ್ ಮಾಡಿ"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"ನಿಮ್ಮ ಬ್ಯಾಟರಿಯನ್ನು ಚಾರ್ಜ್‌ ಮಾಡಿ ಹಾಗೂ ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ."</string>
-    <string name="crypt_keeper_unplugged_text" msgid="2709721134148651329">"ನಿಮ್ಮ ಚಾರ್ಜರ್ ಅನ್ನು ಪ್ಲಗ್ ಮಾಡಿ ಹಾಗೂ ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ."</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="1847280235529858357">"ಯಾವುದೇ ಲಾಕ್‌ ಪರದೆಯ ಪಿನ್‌ ಅಥವಾ ಪಾಡ್‌ವರ್ಡ್‌ ಇಲ್ಲ"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="7210616262954236042">"ನೀವು ಎನ್‌ಕ್ರಿಪ್ಶನ್‌‌ ಪ್ರಾರಂಭಿಸುವ ಮೊದಲು ನೀವು ಲಾಕ್‌ ಸ್ಕ್ರೀನ್‌ ಪಿನ್‌ ಅಥವಾ ಪಾಸ್‌ವರ್ಡ್‌ ಹೊಂದಿಸುವ ಅಗತ್ಯವಿದೆ."</string>
-    <string name="crypt_keeper_confirm_title" msgid="8600000209722452230">"ಎನ್‌ಕ್ರಿಪ್ಟ್‌‌ ಮಾಡುವುದೇ?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="3270587498436152259">"ಎನ್‌ಕ್ರಿಪ್ಶನ್‌ ಕಾರ್ಯಾಚರಣೆಯನ್ನು ಬದಲಾಯಿಸಲಾಗುವುದಿಲ್ಲ ಮತ್ತು ನೀವು ಅದನ್ನು ಅಡ್ಡಿಪಡಿಸಿದರೆ, ನೀವು ಡೇಟಾವನ್ನು ಕಳೆದುಕೊಳ್ಳುತ್ತೀರಿ. ಟ್ಯಾಬ್ಲೆಟ್‌ ಅನೇಕ ಬಾರಿ ಮರುಪ್ರಾರಂಭಗೊಳ್ಳುವ ಅವಧಿಯಲ್ಲಿ, ಎನ್‌ಕ್ರಿಪ್ಶನ್‌ ಒಂದು ಗಂಟೆ ಅಥವಾ ಹೆಚ್ಚಿನ ಸಮಯ ತೆಗೆದುಕೊಳ್ಳುತ್ತದೆ."</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="3040428543349852419">"ಎನ್‌ಕ್ರಿಪ್ಶನ್‌ ಕಾರ್ಯಾಚರಣೆಯನ್ನು ಬದಲಾಯಿಸಲಾಗುವುದಿಲ್ಲ ಮತ್ತು ನೀವು ಅದನ್ನು ಅಡ್ಡಿಪಡಿಸಿದರೆ, ನೀವು ಡೇಟಾವನ್ನು ಕಳೆದುಕೊಳ್ಳುತ್ತೀರಿ. ಫೋನ್ ಅನೇಕ ಬಾರಿ ಮರುಪ್ರಾರಂಭಗೊಳ್ಳುವ ಅವಧಿಯಲ್ಲಿ, ಎನ್‌ಕ್ರಿಪ್ಶನ್‌ ಒಂದು ಗಂಟೆ ಅಥವಾ ಹೆಚ್ಚಿನ ಸಮಯ ತೆಗೆದುಕೊಳ್ಳುತ್ತದೆ."</string>
-    <string name="crypt_keeper_setup_title" msgid="3339725741305796680">"ಎನ್‌ಕ್ರಿಪ್ಟ್ ಮಾಡಲಾಗುತ್ತಿದೆ"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="4417016995091289019">"ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್‌ ಅನ್ನು ಎನ್‌ಕ್ರಿಪ್ಟ್‌ ಮಾಡುವಾಗ ನಿರೀಕ್ಷಿಸಿ. <xliff:g id="PERCENT">^1</xliff:g>% ಪೂರ್ಣಗೊಂಡಿದೆ."</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="7902355422499500352">"ನಿಮ್ಮ ಫೋನ್ ಅನ್ನು ಎನ್‌ಕ್ರಿಪ್ಟ್‌ ಮಾಡುವಾಗ ನಿರೀಕ್ಷಿಸಿ. <xliff:g id="PERCENT">^1</xliff:g>% ಪೂರ್ಣಗೊಂಡಿದೆ."</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="8348188415839917821">"ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್ ಎನ್‌ಕ್ರಿಪ್ಟ್ ಆಗುವವರೆಗೆ ಕಾಯಿರಿ. ಉಳಿದಿರುವ ಸಮಯ: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="8556105766597855198">"ನಿಮ್ಮ ಫೋನ್ ಎನ್‌ಕ್ರಿಪ್ಟ್ ಆಗುವವರೆಗೆ ಕಾಯಿರಿ. ಉಳಿದಿರುವ ಸಮಯ: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="3832496715430327682">"ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್‌ ಅನ್‌ಲಾಕ್‌ ಮಾಡಲು, ಅದನ್ನು ಆಫ್‌ ಮಾಡಿ ನಂತರ ಆನ್‌ ಮಾಡಿ."</string>
-    <string name="crypt_keeper_force_power_cycle" product="default" msgid="5070346039522135361">"ನಿಮ್ಮ ಫೋನ್‌ ಅನ್‌ಲಾಕ್‌ ಮಾಡಲು, ಅದನ್ನು ಆಫ್‌ ಮಾಡಿ ನಂತರ ಆನ್‌ ಮಾಡಿ."</string>
-    <string name="crypt_keeper_warn_wipe" msgid="8104921337301750394">"ಎಚ್ಚರಿಕೆ: ಅನ್‌ಲಾಕ್‌ ಮಾಡಲು <xliff:g id="COUNT">^1</xliff:g> ಹೆಚ್ಚಿನ ವಿಫಲ ಪ್ರಯತ್ನಗಳ ನಂತರ ನಿಮ್ಮ ಸಾಧನವನ್ನು ಅಳಿಸಲಾಗುತ್ತದೆ!"</string>
-    <string name="crypt_keeper_enter_password" msgid="1274917431075529732">"ನಿಮ್ಮ ಪಾಸ್‌ವರ್ಡ್‌ ಟೈಪ್ ಮಾಡಿ"</string>
-    <string name="crypt_keeper_failed_title" msgid="8173654570682244149">"ಎನ್‌ಕ್ರಿಪ್ಷನ್ ಯಶಸ್ವಿಯಾಗಿದೆ"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"ಎನ್‌ಕ್ರಿಪ್ಶನ್‌‌ ಅಡಚಣೆಗೊಳಗಾಗಿದೆ ಮತ್ತು ಪೂರ್ಣಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ. ಇದರ ಪರಿಣಾಮವಾಗಿ, ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್‌‌ನಲ್ಲಿ ಇನ್ನು ಮುಂದೆ ಡೇಟಾವನ್ನು ಪ್ರವೇಶಿಸಲಾಗುವುದಿಲ್ಲ. \n\n ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್‌‌ ಅನ್ನು ಬಳಸಿಕೊಂಡು ಪುನರಾರಂಭಿಸಲು, ನಿಮಗೆ ಫ್ಯಾಕ್ಟರಿಯನ್ನು ರೀಸೆಟ್ ಮಾಡಬೇಕಾದ ಅಗತ್ಯವಿದೆ. ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್‌ ಅನ್ನು ರೀಸೆಟ್ ಮಾಡಿದ ನಂತರ ನೀವು ಅದನ್ನು ಸೆಟ್ ಅಪ್ ಮಾಡಿದಾಗ, ನಿಮ್ಮ Google ಖಾತೆಯಲ್ಲಿ ಬ್ಯಾಕಪ್‌ ಆಗಿರುವ ಯಾವುದೇ ಡೇಟಾವನ್ನು ನೀವು ಮರುಸ್ಥಾಪಿಸುವ ಅವಕಾಶವನ್ನು ಹೊಂದಿರುತ್ತೀರಿ."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"ಎನ್‌ಕ್ರಿಪ್ಶನ್‌‌ ಅಡಚಣೆಗೊಳಗಾಗಿದೆ ಮತ್ತು ಪೂರ್ಣಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ. ಇದರ ಪರಿಣಾಮವಾಗಿ, ನಿಮ್ಮ ಫೋನ್‌ನಲ್ಲಿ ಇನ್ನು ಮುಂದೆ ಡೇಟಾವನ್ನು ಪ್ರವೇಶಿಸಲಾಗುವುದಿಲ್ಲ. \n\nನಿಮ್ಮ ಫೋನ್‌ ಅನ್ನು ಬಳಸುವುದನ್ನು ಮುಂದುವರಿಸಲು, ನೀವು ಫ್ಯಾಕ್ಟರಿ ರೀಸೆಟ್ ಮಾಡುವ ಅಗತ್ಯವಿರುತ್ತದೆ. ನಿಮ್ಮ ಫೋನ್‌ ಅನ್ನು ರೀಸೆಟ್ ಮಾಡಿದ ನಂತರ ಅದನ್ನು ನೀವು ಹೊಂದಿಸಿದರೆ, ನಿಮ್ಮ Google ಖಾತೆಯಲ್ಲಿ ಬ್ಯಾಕಪ್‌ ಮಾಡಲಾದ ಯಾವುದೇ ಡೇಟಾವನ್ನು ಮರುಸ್ಥಾಪಿಸುವ ಅವಕಾಶವನ್ನು ನೀವು ಹೊಂದಿರುತ್ತೀರಿ."</string>
-    <string name="crypt_keeper_data_corrupt_title" msgid="5920153462176846037">"ಡೀಕ್ರಿಪ್ಷನ್ ಯಶಸ್ವಿಯಾಗಿಲ್ಲ"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"ನೀವು ನಮೂದಿಸಿದ ಪಾಸ್‌ವರ್ಡ್‌ ಸರಿಯಾಗಿದೆ, ಆದರೆ ದುರದೃಷ್ಟವಶಾತ್ ನಿಮ್ಮ ಡೇಟಾ ದೋಷಪೂರಿತವಾಗಿದೆ. \n\nನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್‌ ಬಳಕೆಯನ್ನು ಮುಂದುವರಿಸಲು, ನೀವು ಫ್ಯಾಕ್ಟರಿ ಮರುಹೊಂದಿಸುವಿಕೆಯನ್ನು ನಿರ್ವಹಿಸುವ ಅಗತ್ಯವಿದೆ. ಮರುಹೊಂದಿಕೆಯ ನಂತರ ನಿಮ್ಮ ಫೋನ್‌ ಅನ್ನು ನೀವು ಹೊಂದಿಸಿದಾಗ, ನಿಮ್ಮ Google ಖಾತೆಗೆ ಬ್ಯಾಕಪ್‌ ಮಾಡಲಾದ ಆ ಯಾವುದೇ ಡೇಟಾವನ್ನು ಮರುಸ್ಥಾಪಿಸಲು ನೀವು ಅವಕಾಶವನ್ನು ಹೊಂದಿರುತ್ತೀರಿ."</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"ನೀವು ನಮೂದಿಸಿದ ಪಾಸ್‌ವರ್ಡ್‌ ಸರಿಯಾಗಿದೆ, ಆದರೆ ದುರದೃಷ್ಟವಶಾತ್ ನಿಮ್ಮ ಡೇಟಾ ದೋಷಪೂರಿತವಾಗಿದೆ. \n\nನಿಮ್ಮ ಫೋನ್ ಬಳಸಿಕೊಂಡು ಪುನರಾರಂಭಿಸಲು, ನೀವು ಫ್ಯಾಕ್ಟರಿ ರಿಸೆಟ್ ಅನ್ನು ಮಾಡಬೇಕಾದ ಅಗತ್ಯವಿರುತ್ತದೆ. ರಿಸೆಟ್ ಮಾಡಿದ ನಂತರ ನಿಮ್ಮ ಫೋನ್‌ ಅನ್ನು ನೀವು ಹೊಂದಿಸಿದಾಗ, ನಿಮ್ಮ Google ಖಾತೆಗೆ ಬ್ಯಾಕಪ್‌ ಮಾಡಲಾದ ಆ ಯಾವುದೇ ಡೇಟಾವನ್ನು ಮರುಸ್ಥಾಪಿಸಲು ನೀವು ಅವಕಾಶವನ್ನು ಹೊಂದಿರುತ್ತೀರಿ."</string>
-    <string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"ಇನ್‌ಪುಟ್‌‌ ವಿಧಾನ ಬದಲಿಸಿ"</string>
+    <string name="encryption_settings_title" msgid="2848716008695618360">"ಎನ್‌ಕ್ರಿಪ್ಷನ್"</string>
+    <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"ಟ್ಯಾಬ್ಲೆಟ್ ಅನ್ನು ಎನ್‌ಕ್ರಿಪ್ಟ್ ಮಾಡಿ"</string>
+    <string name="encrypt_title" product="default" msgid="7337365190988321100">"ಫೋನ್ ಅನ್ನು ಎನ್‌ಕ್ರಿಪ್ಟ್ ಮಾಡಿ"</string>
+    <string name="encrypted_summary" msgid="545623487587251207">"ಎನ್‌ಕ್ರಿಪ್ಟ್ ಮಾಡಲಾಗಿದೆ"</string>
     <string name="suggested_lock_settings_title" msgid="7836065447159730217">"ನಿಮ್ಮ ಫೋನ್ ಅನ್ನು ಸುರಕ್ಷಿತಗೊಳಿಸಿ"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"ಟ್ಯಾಬ್ಲೆಟ್ ರಕ್ಷಿಸಲು ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಹೊಂದಿಸಿ"</string>
     <string name="suggested_lock_settings_summary" product="device" msgid="8479766049078378225">"ಸಾಧನವನ್ನು ರಕ್ಷಿಸಲು ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಹೊಂದಿಸಿ"</string>
@@ -817,6 +791,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"ನಿಮಗೆ ಇತರ ಸಾಧನದಲ್ಲಿ ಈ ಪಿನ್‌ ಟೈಪ್‌ ಮಾಡುವ ಅಗತ್ಯವಿರಬಹುದು."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"ನಿಮಗೆ ಇತರ ಸಾಧನದಲ್ಲಿ ಈ ಪಾಸ್‌ಕೀಯನ್ನು ಟೈಪ್‌ ಮಾಡುವ ಅಗತ್ಯವಿದೆ."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"ಇದರೊಂದಿಗೆ ಜೋಡಿಸಲು:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;ಇದು ಈ ಪಾಸ್‌ಕೀ ಅನ್ನು ತೋರಿಸುತ್ತಿದೆಯೇ ಎಂಬುದನ್ನು ಖಾತ್ರಿಪಡಿಸಿಕೊಳ್ಳಿ:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"ಸಂಯೋಜಿತ ಪ್ಯಾಕೇಜ್‌ನಲ್ಲಿರುವ ಎಲ್ಲಾ ಸಾಧನಗಳಿಗೆ ಜೋಡಿಸುವುದನ್ನು ಮರೆಯದಿರಿ"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"ಇದರಿಂದ:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;ಈ ಸಾಧನದೊಂದಿಗೆ ಜೋಡಿಸುವುದೇ?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"ಇದರೊಂದಿಗೆ ಜೋಡಿಸಲು:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>ಇದರಲ್ಲಿ ಟೈಪ್‌ ಮಾಡಿ:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, ನಂತರ ಹಿಂತಿರುಗು ಅಥವಾ ನಮೂದಿಸು ಒತ್ತಿರಿ."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"ನಿಮ್ಮ ಸಂಪರ್ಕಗಳು ಮತ್ತು ಕರೆ ಇತಿಹಾಸಕ್ಕೆ ಪ್ರವೇಶವನ್ನು ಅನುಮತಿಸಿ"</string>
@@ -850,6 +825,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"ಸಂಪರ್ಕಿಸಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ. ಪುನಃ ಪ್ರಯತ್ನಿಸಿ."</string>
     <string name="device_details_title" msgid="1155622417516195481">"ಸಾಧನದ ವಿವರಗಳು"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"ಸಾಧನದ ಬ್ಲೂಟೂತ್ ವಿಳಾಸ: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"ಸಾಧನದ ಬ್ಲೂಟೂತ್ ವಿಳಾಸ:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"ಸಾಧನವನ್ನು ಮರೆತಿದ್ದೀರಾ?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"ಅಸೋಸಿಯೇಷನ್ ಅನ್ನು ತೆಗೆದುಹಾಕಿ"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"ಆ್ಯಪ್ ಅನ್ನು ಡಿಸ್‌ಕನೆಕ್ಟ್ ಮಾಡುವುದೇ?"</string>
@@ -881,6 +857,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ನೆನಪಿನಲ್ಲಿಡು"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"ಗರಿಷ್ಠ ಸಂಪರ್ಕಿತ ಬ್ಲೂಟೂತ್ ಆಡಿಯೋ ಸಾಧನಗಳು"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"ಸಂಪರ್ಕಿತ ಬ್ಲೂಟೂತ್ ಆಡಿಯೋ ಸಾಧನಗಳ ಗರಿಷ್ಠ ಸಂಖ್ಯೆಯನ್ನು ಆಯ್ಕೆಮಾಡಿ"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"NFC ಸ್ಟ್ಯಾಕ್ ಡೀಬಗ್‌ಲಾಗ್"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"NFC ಸ್ಟ್ಯಾಕ್ ಲಾಗಿಂಗ್ ಹಂತವನ್ನು ಹೆಚ್ಚಿಸಿ"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"ಬಿತ್ತರಿಸುವಿಕೆ"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"ಕನ್ನಡಿ"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"ವೈರ್‌ಲೆಸ್ ಪ್ರದರ್ಶನ ಸಕ್ರಿಯಗೊಳಿಸಿ"</string>
@@ -1188,6 +1166,8 @@
     <string name="wifi_hotspot_maximize_compatibility_dual_ap_summary" msgid="3579549223159056533">"ಈ ಹಾಟ್‌ಸ್ಪಾಟ್ ಹುಡುಕಲು ಇತರ ಸಾಧನಗಳಿಗೆ ಸಹಾಯ ಮಾಡುತ್ತದೆ. ಬ್ಯಾಟರಿ ಬಳಕೆಯನ್ನು ಹೆಚ್ಚಿಸುತ್ತದೆ."</string>
     <string name="wifi_tether_starting" msgid="8879874184033857814">"ಹಾಟ್‌ಸ್ಪಾಟ್ ಆನ್‌ ಮಾಡಲಾಗುತ್ತಿದೆ…"</string>
     <string name="wifi_tether_stopping" msgid="4416492968019409188">"ಹಾಟ್‌ಸ್ಪಾಟ್ ಆಫ್‌ ಮಾಡಲಾಗುತ್ತಿದೆ…"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_title" msgid="3089432578433978073">"ಟೆಥರಿಂಗ್ ಲಭ್ಯವಿಲ್ಲ"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_content" msgid="5920421547607921112">"ವಿವರಗಳಿಗಾಗಿ ನಿಮ್ಮ ಕ್ಯಾರಿಯರ್ ಅನ್ನು ಸಂಪರ್ಕಿಸಿ"</string>
     <string name="wifi_tether_enabled_subtext" msgid="5085002421099821056">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> ಸಕ್ರಿಯವಾಗಿದೆ"</string>
     <string name="wifi_tether_failed_subtext" msgid="437190628041885500">"ಪೋರ್ಟಬಲ್ ವೈ-ಫೈ ಹಾಟ್‌ಸ್ಪಾಟ್ ದೋಷ ಎದುರಾಗಿದೆ"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7072559431286459122">"ವೈ-ಫೈ ಹಾಟ್‌ಸ್ಪಾಟ್‌ ಹೊಂದಿಸಿ"</string>
@@ -2534,11 +2514,6 @@
     <string name="enable_service_title" msgid="7231533866953706788">"ನಿಮ್ಮ ಸಾಧನದ ಸಂಪೂರ್ಣ ನಿಯಂತ್ರಣವನ್ನು ಹೊಂದಲು <xliff:g id="SERVICE">%1$s</xliff:g> ಗೆ ಅನುಮತಿಸಬೇಕೇ?"</string>
     <string name="capabilities_list_title" msgid="1225853611983394386">"<xliff:g id="SERVICE">%1$s</xliff:g> ಈ ಕೆಳಗಿನವುಗಳನ್ನು ಮಾಡುತ್ತದೆ:"</string>
     <string name="touch_filtered_warning" msgid="4225815157460318241">"ಅನುಮತಿ ವಿನಂತಿಯನ್ನು ಅಪ್ಲಿಕೇಶನ್ ಮರೆಮಾಚುತ್ತಿರುವ ಕಾರಣ, ಸೆಟ್ಟಿಂಗ್‌ಗಳಿಗೆ ನಿಮ್ಮ ಪ್ರತಿಕ್ರಿಯೆಯನ್ನು ಪರಿಶೀಲಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."</string>
-    <string name="enable_service_encryption_warning" msgid="931082737770453755">"<xliff:g id="SERVICE">%1$s</xliff:g> ಅನ್ನು ನೀವು ಆನ್‌ ಮಾಡಿದರೆ, ಡೇಟಾ ಎನ್ಕ್ರಿಪ್ಷನ್ ಅನ್ನು ವರ್ಧಿಸಲು ನಿಮ್ಮ ಸಾಧನವು ನಿಮ್ಮ ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಬಳಸುವುದಿಲ್ಲ."</string>
-    <string name="secure_lock_encryption_warning" msgid="669152607190123579">"ನೀವು ಪ್ರವೇಶಿಸುವಿಕೆ ಸೇವೆಯನ್ನು ಆನ್‌ ಮಾಡಿರುವುದರರಿಂದ, ಡೇಟಾ ಎನ್ಕ್ರಿಪ್ಷನ್ ಅನ್ನು ವರ್ಧಿಸಲು ನಿಮ್ಮ ಸಾಧನವು ನಿಮ್ಮ ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಬಳಸುವುದಿಲ್ಲ."</string>
-    <string name="enable_service_pattern_reason" msgid="6832846117817938536">"<xliff:g id="SERVICE">%1$s</xliff:g> ಆನ್‌ ಮಾಡುವುದರಿಂದಾಗಿ ಡೇಟಾ ಎನ್ಕ್ರಿಪ್ಷನ್‌ಗೆ ಪರಿಣಾಮಬೀರುವ ಕಾರಣ, ನಿಮ್ಮ ನಮೂನೆಯನ್ನು ನೀವು ಖಚಿತಡಿಸಬೇಕಾದ ಅಗತ್ಯವಿದೆ."</string>
-    <string name="enable_service_pin_reason" msgid="6040417014360237703">"<xliff:g id="SERVICE">%1$s</xliff:g> ಆನ್‌ ಮಾಡುವುದರಿಂದಾಗಿ ಡೇಟಾ ಎನ್ಕ್ರಿಪ್ಷನ್‌ಗೆ ಪರಿಣಾಮಬೀರುವ ಕಾರಣ, ನಿಮ್ಮ PIN ಅನ್ನು ನೀವು ಖಚಿತಡಿಸಬೇಕಾದ ಅಗತ್ಯವಿದೆ."</string>
-    <string name="enable_service_password_reason" msgid="6962544350351734238">"<xliff:g id="SERVICE">%1$s</xliff:g> ಆನ್‌ ಮಾಡುವುದರಿಂದಾಗಿ ಡೇಟಾ ಎನ್ಕ್ರಿಪ್ಷನ್‌ಗೆ ಪರಿಣಾಮಬೀರುವ ಕಾರಣ, ನಿಮ್ಮ ಪಾಸ್‌ವರ್ಡ್ ಅನ್ನು ನೀವು ಖಚಿತಡಿಸಬೇಕಾದ ಅಗತ್ಯವಿದೆ."</string>
     <string name="accessibility_service_warning" msgid="6779187188736432618">"ಈ ಸಾಧನದ ಪೂರ್ಣ ನಿಯಂತ್ರಣವನ್ನು <xliff:g id="SERVICE">%1$s</xliff:g>ವಿನಂತಿಸುತ್ತಿದೆ. ಸೇವೆಯು ಸ್ಕ್ರೀನ್ ಅನ್ನು ಓದಬಹುದು ಮತ್ತು ಪ್ರವೇಶ ಅಗತ್ಯಗಳೊಂದಿಗೆ ಬಳಕೆದಾರರ ಪರವಾಗಿ ಕಾರ್ಯನಿರವಹಿಸುತ್ತದೆ. ಹೆಚ್ಚಿನ ಆ್ಯಪ್‌ಗಳಿಗೆ ಈ ಮಟ್ಟದ ನಿಯಂತ್ರಣ ಸೂಕ್ತವಲ್ಲ."</string>
     <string name="accessibility_service_warning_description" msgid="6573203795976134751">"ಪ್ರವೇಶಿಸುವಿಕೆಯ ಅವಶ್ಯಕತೆಗಳಿಗೆ ಸಹಾಯ ಮಾಡುವ ಆ್ಯಪ್‌ಗಳಿಗೆ ಪೂರ್ಣ ನಿಯಂತ್ರಣ ನೀಡುವುದು ಸೂಕ್ತವಾಗಿರುತ್ತದೆ, ಆದರೆ ಬಹುತೇಕ ಆ್ಯಪ್‌ಗಳಿಗೆ ಇದು ಸೂಕ್ತವಲ್ಲ."</string>
     <string name="accessibility_service_screen_control_title" msgid="324795030658109870">"ಸ್ಕ್ರೀನ್ ವೀಕ್ಷಿಸಿ ಮತ್ತು ನಿಯಂತ್ರಿಸಿ"</string>
@@ -3103,14 +3078,6 @@
     <string name="remove_account_failed" msgid="3709502163548900644">"ಈ ಬದಲಾವಣೆಗೆ ನಿಮ್ಮ ನಿರ್ವಾಹಕರು ಅನುಮತಿಸುವುದಿಲ್ಲ"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"ಹಸ್ತಚಾಲಿತವಾಗಿ ಸಿಂಕ್‌ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"ಸಿಂಕ್‌ ಮಾಡುವುದನ್ನು ಈ ಐಟಮ್‌ಗೆ ಪ್ರಸ್ತುತ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ. ಈ ಸೆಟ್ಟಿಂಗ್‌ ಅನ್ನು ಬದಲಾಯಿಸಲು, ಹಿನ್ನೆಲೆ ಡೇಟಾ ಮತ್ತು ಸ್ವಯಂಚಾಲಿತ ಸಿಂಕ್ ಅನ್ನು ತಾತ್ಕಾಲಿಕವಾಗಿ ಆನ್ ಮಾಡಿ."</string>
-    <string name="enter_password" msgid="6327051330258595331">"Android ಪ್ರಾರಂಭಿಸಲು, ನಿಮ್ಮ ಪಾಸ್‌ವರ್ಡ್‌ ನಮೂದಿಸಿ"</string>
-    <string name="enter_pin" msgid="1029287617551232681">"Android ಪ್ರಾರಂಭಿಸಲು, ನಿಮ್ಮ ಪಿನ್‌ ನಮೂದಿಸಿ"</string>
-    <string name="enter_pattern" msgid="1747316785866742960">"Android ಪ್ರಾರಂಭಿಸಲು, ನಿಮ್ಮ ನಮೂನೆಯನ್ನು ಚಿತ್ರಿಸಿ"</string>
-    <string name="cryptkeeper_wrong_pattern" msgid="340747269176120242">"ಪ್ಯಾಟರ್ನ್ ತಪ್ಪಾಗಿದೆ"</string>
-    <string name="cryptkeeper_wrong_password" msgid="7295607881887114486">"ತಪ್ಪು ಪಾಸ್‌ವರ್ಡ್"</string>
-    <string name="cryptkeeper_wrong_pin" msgid="2347961593970714201">"ಪಿನ್‌ ತಪ್ಪಾಗಿದೆ"</string>
-    <string name="checking_decryption" msgid="6111642972615688237">"ಪರಿಶೀಲಿಸಲಾಗುತ್ತಿದೆ..."</string>
-    <string name="starting_android" msgid="6694154070215356186">"Android ಪ್ರಾರಂಭಿಸಲಾಗುತ್ತಿದೆ..."</string>
     <string name="delete" msgid="8330605554706263775">"ಅಳಿಸಿ"</string>
     <string name="misc_files" msgid="6598066985800749585">"ಇತರೆ ಫೈಲ್‌ಗಳು"</string>
     <string name="misc_files_selected_count" msgid="5597802791672749532">"<xliff:g id="TOTAL">%2$d</xliff:g> ರಲ್ಲಿ <xliff:g id="NUMBER">%1$d</xliff:g> ಅನ್ನು ಆಯ್ಕೆ ಮಾಡಲಾಗಿದೆ"</string>
@@ -3206,8 +3173,6 @@
     <string name="data_usage_metered_yes" msgid="4262598072030135223">"ಮೀಟರ್ ಮಾಡಲಾಗಿದೆ"</string>
     <string name="data_usage_metered_no" msgid="1685828958417926268">"ಮೀಟರ್ ಮಾಡಲಾಗಿಲ್ಲ"</string>
     <string name="data_usage_disclaimer" msgid="3271450299386176770">"ವಾಹಕ ಡೇಟಾ ಲೆಕ್ಕಾಚಾರವು ನಿಮ್ಮ ಸಾಧನಕ್ಕಿಂತ ಭಿನ್ನವಾಗಿರಬಹುದು."</string>
-    <string name="cryptkeeper_emergency_call" msgid="8369322820475703306">"ತುರ್ತು ಕರೆಗಳು"</string>
-    <string name="cryptkeeper_return_to_call" msgid="3857250752781151232">"ಕರೆಗೆ ಹಿಂತಿರುಗು"</string>
     <string name="vpn_name" msgid="3806456074909253262">"ಹೆಸರು"</string>
     <string name="vpn_type" msgid="5533202873260826663">"ಪ್ರಕಾರ"</string>
     <string name="vpn_server" msgid="2908816134941973935">"ಸರ್ವರ್ ವಿಳಾಸ"</string>
@@ -4764,8 +4729,6 @@
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> ಅಪ್ಲಿಕೇಶನ್‌ಗಳು, ಅನಿರ್ಬಂಧಿತ ಡೇಟಾ ಬಳಸಬಹುದು</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"ಇನ್ನಷ್ಟು ನೋಡಿ"</string>
-    <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"ನಿಜವಾಗಿಯೂ ಬಳಕೆದಾರ ಡೇಟಾವನ್ನು ಅಳಿಸಿ ಫೈಲ್ ಎನ್‌ಕ್ರಿಪ್ಶನ್‌ಗೆ ಪರಿವರ್ತಿಸುವುದೇ?"</string>
-    <string name="button_confirm_convert_fbe" msgid="339648921918438106">"ಅಳಿಸಿ ಮತ್ತು ಪರಿವರ್ತಿಸು"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"ShortcutManager ನ ದರ-ಮಿತಿಗೊಳಿಸುವಿಕೆಯನ್ನು ಮರುಹೊಂದಿಸಿ"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"ShortcutManager ದರ-ಮಿತಿಗೊಳಿಸುವಿಕೆಯನ್ನು ಮರುಹೊಂದಿಸಲಾಗಿದೆ"</string>
     <string name="notification_suggestion_title" msgid="6309263655965785411">"ಲಾಕ್ ಪರದೆಯ ಮೇಲೆ ನಿಯಂತ್ರಣದ ಮಾಹಿತಿ"</string>
@@ -5292,6 +5255,7 @@
     <string name="sim_action_yes" msgid="8076556020131395515">"ಹೌದು"</string>
     <string name="sim_action_reboot" msgid="3508948833333441538">"ಮರುಪ್ರಾರಂಭಿಸಿ"</string>
     <string name="sim_action_no_thanks" msgid="435717748384544195">"ಬೇಡ"</string>
+    <string name="sim_action_cancel" msgid="2668099867029610910">"ರದ್ದುಮಾಡಿ"</string>
     <string name="sim_switch_button" msgid="1405772571706095387">"ಬದಲಿಸಿ"</string>
     <string name="dsds_activation_failure_title" msgid="4467364110584914794">"ಸಿಮ್ ಅನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"ಸಿಮ್ ಅನ್ನು ತೆಗೆದುಹಾಕಿ ಹಾಗೂ ಅದನ್ನು ಮತ್ತೆ ಸೇರಿಸಿ. ಸಮಸ್ಯೆ ಮುಂದುವರಿದರೆ, ನಿಮ್ಮ ಸಾಧನವನ್ನು ಮರುಪ್ರಾರಂಭಿಸಿ."</string>
@@ -5444,6 +5408,10 @@
     <string name="cached_apps_freezer" msgid="1057519579761550350">"ಕ್ಯಾಶ್ ಮಾಡಿದ ಆ್ಯಪ್‌ನ ಕಾರ್ಯಗತಗೊಳಿಸುವಿಕೆ ಅಮಾನತು ಮಾಡಿ"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"ಸೆಟ್ಟಿಂಗ್‌ಗಳಲ್ಲಿ ಸ್ಕ್ರೀನ್ ಓವರ್‌ಲೇಗಳನ್ನು ಅನುಮತಿಸಿ"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"ಸೆಟ್ಟಿಂಗ್‌ಗಳ ಸ್ಕ್ರೀನ್‌ಗಳನ್ನು ಓವರ್‌ಲೇ ಮಾಡಲು ಇತರ ಆ್ಯಪ್‌ಗಳಲ್ಲಿ ಡಿಸ್‌ಪ್ಲೇ ಮಾಡಬಹುದಾದ ಆ್ಯಪ್‌ಗಳನ್ನು ಅನುಮತಿಸಿ"</string>
+    <!-- no translation found for allow_mock_modem (3832264806530479214) -->
+    <skip />
+    <!-- no translation found for allow_mock_modem_summary (9097416612748005374) -->
+    <skip />
     <string name="media_controls_title" msgid="403271085636252597">"ಮಾಧ್ಯಮ"</string>
     <string name="media_controls_resume_title" msgid="855076860336652370">"ಮೀಡಿಯಾ ಪ್ಲೇಯರ್ ಅನ್ನು ಪಿನ್ ಮಾಡಿ"</string>
     <string name="media_controls_resume_description" msgid="3163482266454802097">"ಪ್ಲೇಬ್ಯಾಕ್ ಅನ್ನು ತ್ವರಿತವಾಗಿ ಪುನರಾರಂಭಿಸಲು, ತ್ವರಿತ ಸೆಟ್ಟಿಂಗ್‌ಗಳಲ್ಲಿ ಮೀಡಿಯಾ ಪ್ಲೇಯರ್ ತೆರೆದಿರುತ್ತದೆ"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index cf9e512..539875b 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -142,10 +142,11 @@
     <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"기기가 주변 블루투스 기기와 통신하도록 허용"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"휴대전화가 주변 블루투스 기기와 통신하도록 허용"</string>
     <string name="bluetooth_disable_a2dp_hw_offload" msgid="5942913792817797541">"블루투스 A2DP 하드웨어 오프로드 사용 중지"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="8610420176339657720">"기기 다시 시작"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8333029144800835996">"설정을 변경하려면 기기를 다시 시작해야 합니다."</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="3488695418187553566">"다시 시작"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="4930826928585464191">"취소"</string>
+    <string name="bluetooth_disable_le_audio_hw_offload" msgid="3966022676505972908">"블루투스 LE AUDIO 하드웨어 오프로드 사용 중지"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_title" msgid="6001142380445276918">"기기를 다시 시작하시겠습니까?"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_message" msgid="1524373895333698779">"설정을 변경하려면 기기를 다시 시작해야 합니다."</string>
+    <string name="bluetooth_disable_hw_offload_dialog_confirm" msgid="5594859658551707592">"다시 시작"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel" msgid="3663690305043973720">"취소"</string>
     <string name="connected_device_media_device_title" msgid="3783388247594566734">"미디어 기기"</string>
     <string name="connected_device_call_device_title" msgid="88732390601723608">"통화 기기"</string>
     <string name="connected_device_other_device_title" msgid="4652120430615729193">"다른 기기"</string>
@@ -309,9 +310,9 @@
     <string name="security_settings_title" msgid="6710768415432791970">"보안"</string>
     <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"암호화 및 사용자 인증 정보"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"휴대전화 암호화됨"</string>
-    <string name="decryption_settings_summary" product="default" msgid="1742645256103613503">"휴대전화가 암호화되지 않았습니다."</string>
+    <string name="not_encrypted_summary" product="default" msgid="2251945842585788254">"휴대전화가 암호화되지 않음"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"기기가 암호화됨"</string>
-    <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"기기가 암호화되지 않았습니다."</string>
+    <string name="not_encrypted_summary" product="tablet" msgid="2374263654698719382">"기기가 암호화되지 않음"</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"잠금 화면"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"표시 내용"</string>
     <string name="security_settings_summary" msgid="1627059516127354233">"내 위치, 화면 잠금해제, SIM 카드 잠금, 사용자 인증 정보 저장소 잠금 설정"</string>
@@ -480,7 +481,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"삭제"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"센서 터치"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"센서에 손가락을 올리고 진동이 느껴지면 떼세요."</string>
-    <string name="security_settings_udfps_enroll_start_message" msgid="5032954588171487566">"지문이 센서에 완전히 닿게 손가락을 대고 진동이 느껴질 때까지 기다리세요."</string>
+    <string name="security_settings_udfps_enroll_start_message" msgid="5032954588171487566">"지문이 센서에 완전히 닿도록 손가락을 대고 진동이 느껴질 때까지 기다리세요."</string>
     <string name="security_settings_fingerprint_enroll_udfps_title" msgid="6665610134560896895">"지문 센서를 길게 터치하세요"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"손가락을 뗀 후 다시 터치"</string>
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"한 번 더 하세요"</string>
@@ -488,7 +489,7 @@
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"손가락을 뗀 후 다시 터치하여 지문의 다른 부분을 추가하세요."</string>
     <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"지문 아이콘이 움직일 때마다 길게 터치합니다. 이렇게 하면 지문을 더 많이 캡처할 수 있습니다"</string>
     <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"센서에 손가락 끝부분을 올리세요"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="6137605344819152477">"마지막으로 손가락 가장자리를 사용하세요."</string>
+    <string name="security_settings_udfps_enroll_edge_title" msgid="6137605344819152477">"마지막으로 손가락 가장자리를 사용하세요"</string>
     <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"센서에 손가락 한쪽을 올리고 잠시 기다린 후에 다른 쪽을 올리세요"</string>
     <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"이렇게 하면 지문을 더 많이 캡처할 수 있습니다"</string>
     <!-- String.format failed for translation -->
@@ -570,37 +571,10 @@
     <string name="fingerprint_last_delete_message" msgid="7860374760549404410">"지문을 사용하여 휴대전화를 잠금 해제하거나 앱에서 본인을 인증할 수 없게 됩니다."</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="4104208067277655068">"지문을 사용하여 직장 프로필을 잠금 해제하거나 구매를 승인하거나 직장 앱에 로그인할 수 없게 됩니다."</string>
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"삭제"</string>
-    <string name="crypt_keeper_settings_title" msgid="4938812137822100044">"암호화"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"태블릿 암호화"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"휴대전화 암호화"</string>
-    <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"암호화됨"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"계정, 설정, 다운로드된 앱과 데이터, 미디어 및 기타 파일을 암호화할 수 있습니다. 태블릿을 암호화하고 화면 잠금(패턴, 숫자 PIN 또는 비밀번호)을 설정할 경우, 전원을 켤 때마다 화면 잠금을 해제하여 태블릿의 암호화를 해제해야 합니다. 암호화를 해제하는 다른 유일한 방법은 초기화하여 모든 데이터를 삭제하는 것입니다.\n\n암호화에는 1시간 이상이 걸릴 수 있습니다. 충전된 배터리를 이용하여 암호화를 시작하고 암호화가 완료될 때까지 태블릿의 전원 연결을 해제하지 않아야 합니다. 암호화 프로세스를 중단하면 데이터의 일부 또는 전부를 잃게 됩니다."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"계정, 설정, 다운로드된 앱과 데이터, 미디어 및 기타 파일을 암호화할 수 있습니다. 휴대전화를 암호화하고 화면 잠금(패턴, 숫자 PIN 또는 비밀번호)을 설정할 경우, 전원을 켤 때마다 화면 잠금을 해제하여 휴대전화의 암호화를 해제해야 합니다. 암호화를 해제하는 다른 유일한 방법은 초기화하여 모든 데이터를 삭제하는 것입니다.\n\n암호화에는 1시간 이상이 걸릴 수 있습니다. 충전된 배터리를 이용하여 암호화를 시작하고 암호화가 완료될 때까지 휴대전화의 전원 연결을 해제하지 않아야 합니다. 암호화 프로세스를 중단하면 데이터의 일부 또는 전부를 잃게 됩니다."</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"태블릿 암호화"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"휴대전화 암호화"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"배터리를 충전한 다음 다시 시도하세요."</string>
-    <string name="crypt_keeper_unplugged_text" msgid="2709721134148651329">"충전기를 연결한 다음 다시 시도하세요."</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="1847280235529858357">"화면 잠금 PIN 또는 비밀번호 없음"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="7210616262954236042">"암호화를 시작하기 전에 화면 잠금 PIN 또는 비밀번호를 설정해야 합니다."</string>
-    <string name="crypt_keeper_confirm_title" msgid="8600000209722452230">"암호화하시겠습니까?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="3270587498436152259">"암호화 작업은 되돌릴 수 없으며 중단하면 데이터를 잃게 됩니다. 암호화는 한 시간 이상이 걸리며 그 동안 태블릿은 몇 번 다시 시작됩니다."</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="3040428543349852419">"암호화 작업은 되돌릴 수 없으며 중단하면 데이터를 잃게 됩니다. 암호화는 한 시간 이상이 걸리며 그 동안 휴대전화는 몇 번 다시 시작됩니다."</string>
-    <string name="crypt_keeper_setup_title" msgid="3339725741305796680">"암호화 중"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="4417016995091289019">"태블릿을 암호화하는 동안 잠시 기다려 주세요. <xliff:g id="PERCENT">^1</xliff:g>% 완료되었습니다."</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="7902355422499500352">"휴대전화를 암호화하는 동안 잠시 기다려 주세요. <xliff:g id="PERCENT">^1</xliff:g>% 완료되었습니다."</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="8348188415839917821">"태블릿을 암호화하는 동안 잠시 기다려 주세요. 남은 시간: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="8556105766597855198">"휴대전화를 암호화하는 동안 잠시 기다려 주세요. 남은 시간: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="3832496715430327682">"태블릿의 잠금을 해제하려면 전원을 껐다가 다시 켜세요."</string>
-    <string name="crypt_keeper_force_power_cycle" product="default" msgid="5070346039522135361">"휴대전화의 잠금을 해제하려면 전원을 껐다가 다시 켜세요."</string>
-    <string name="crypt_keeper_warn_wipe" msgid="8104921337301750394">"경고: 잠금 해제 시도를 <xliff:g id="COUNT">^1</xliff:g>회 이상 실패할 경우 기기의 데이터가 삭제됩니다!"</string>
-    <string name="crypt_keeper_enter_password" msgid="1274917431075529732">"비밀번호 입력"</string>
-    <string name="crypt_keeper_failed_title" msgid="8173654570682244149">"암호화하지 못했습니다."</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"암호화가 중단되어 완료할 수 없습니다. 따라서 태블릿의 데이터에 더 이상 액세스할 수 없습니다. \n\n 태블릿을 다시 사용하려면 초기화해야 합니다. 초기화한 후 태블릿을 설정하면, Google 계정에 백업되어 있던 데이터를 복원할 수 있습니다."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"암호화가 중단되어 완료할 수 없습니다. 따라서 휴대전화의 데이터에 더 이상 액세스할 수 없습니다. \n\n휴대전화를 다시 사용하려면 초기화해야 합니다. 초기화한 후 휴대전화를 설정하면, Google 계정에 백업되어 있던 데이터를 복원할 수 있습니다."</string>
-    <string name="crypt_keeper_data_corrupt_title" msgid="5920153462176846037">"복호화 실패"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"입력한 비밀번호는 정확하지만 안타깝게도 사용자의 데이터가 손상되었습니다. \n\n태블릿을 다시 사용하려면 초기화해야 합니다. 초기화 후 태블릿을 설정할 때 Google 계정에 백업된 데이터를 복원할 수 있습니다."</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"입력한 비밀번호는 정확하지만 안타깝게도 사용자의 데이터가 손상되었습니다. \n\n휴대전화를 다시 사용하려면 초기화해야 합니다. 초기화 후 휴대전화를 설정할 때 Google 계정에 백업된 데이터를 복원할 수 있습니다."</string>
-    <string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"입력 방법 전환"</string>
+    <string name="encryption_settings_title" msgid="2848716008695618360">"암호화"</string>
+    <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"태블릿 암호화"</string>
+    <string name="encrypt_title" product="default" msgid="7337365190988321100">"휴대전화 암호화"</string>
+    <string name="encrypted_summary" msgid="545623487587251207">"암호화됨"</string>
     <string name="suggested_lock_settings_title" msgid="7836065447159730217">"휴대전화 보안 강화"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"화면 잠금을 설정하여 태블릿 보호"</string>
     <string name="suggested_lock_settings_summary" product="device" msgid="8479766049078378225">"화면 잠금을 설정하여 기기 보호"</string>
@@ -819,6 +793,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"또한 다른 기기에 이 PIN을 입력해야 할 수도 있습니다."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"또한 경우에 따라 다른 기기에 이 패스키를 입력해야 합니다."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;와(과) 페어링하려면&lt;br&gt;&lt;br&gt;이 패스키(&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;)가 표시되는지 확인하세요.&lt;br&gt;&lt;br&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"통합 세트와의 페어링 확인"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"출처:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;이 기기와 페어링하시겠습니까?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>와(과) 페어링하려면 <xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>을(를) 입력한 다음 Return 또는 Enter 키를 누르세요."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"연락처 및 통화 기록 액세스 허용"</string>
@@ -852,6 +827,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"연결할 수 없습니다. 다시 시도해 주세요."</string>
     <string name="device_details_title" msgid="1155622417516195481">"기기 세부정보"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"기기 블루투스 주소: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"기기 블루투스 주소: \n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"기기를 지우시겠습니까?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"연결 삭제"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"앱 연결을 해제할까요?"</string>
@@ -883,6 +859,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"설정 기억"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"연결된 블루투스 오디오 기기의 최대 개수"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"연결된 블루투스 오디오 기기의 최대 개수 선택"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"NFC 스택 디버그 로그"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"NFC 스택 로깅 수준 높이기"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"전송"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"미러링"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"무선 디스플레이 사용"</string>
@@ -1190,6 +1168,8 @@
     <string name="wifi_hotspot_maximize_compatibility_dual_ap_summary" msgid="3579549223159056533">"다른 기기가 이 핫스팟을 찾도록 돕습니다. 배터리 사용량이 증가합니다."</string>
     <string name="wifi_tether_starting" msgid="8879874184033857814">"핫스팟 켜는 중…"</string>
     <string name="wifi_tether_stopping" msgid="4416492968019409188">"핫스팟 끄는 중…"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_title" msgid="3089432578433978073">"테더링을 사용할 수 없음"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_content" msgid="5920421547607921112">"자세한 내용은 이동통신사에 문의하세요."</string>
     <string name="wifi_tether_enabled_subtext" msgid="5085002421099821056">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g>이(가) 활성화됨"</string>
     <string name="wifi_tether_failed_subtext" msgid="437190628041885500">"휴대용 Wi-Fi 핫스팟 오류"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7072559431286459122">"Wi-Fi 핫스팟 설정"</string>
@@ -2536,11 +2516,6 @@
     <string name="enable_service_title" msgid="7231533866953706788">"<xliff:g id="SERVICE">%1$s</xliff:g>에서 기기를 완전히 제어하도록 허용하시겠습니까?"</string>
     <string name="capabilities_list_title" msgid="1225853611983394386">"<xliff:g id="SERVICE">%1$s</xliff:g>에 필요한 기능:"</string>
     <string name="touch_filtered_warning" msgid="4225815157460318241">"권한 요청을 보이지 않게 하는 앱이 있어서 설정에서 내 응답을 확인할 수 없습니다."</string>
-    <string name="enable_service_encryption_warning" msgid="931082737770453755">"<xliff:g id="SERVICE">%1$s</xliff:g>을(를) 사용 설정하면 기기에서 데이터 암호화를 개선하기 위해 화면 잠금을 사용하지 않습니다."</string>
-    <string name="secure_lock_encryption_warning" msgid="669152607190123579">"접근성 서비스를 사용 설정했으므로 기기에서 데이터 암호화를 개선하기 위해 화면 잠금을 사용하지 않습니다."</string>
-    <string name="enable_service_pattern_reason" msgid="6832846117817938536">"<xliff:g id="SERVICE">%1$s</xliff:g>을(를) 사용 설정하면 데이터 암호화에 영향을 주기 때문에 패턴 확인이 필요합니다."</string>
-    <string name="enable_service_pin_reason" msgid="6040417014360237703">"<xliff:g id="SERVICE">%1$s</xliff:g>을(를) 사용 설정하면 데이터 암호화에 영향을 주기 때문에 PIN 확인이 필요합니다."</string>
-    <string name="enable_service_password_reason" msgid="6962544350351734238">"<xliff:g id="SERVICE">%1$s</xliff:g>을(를) 사용 설정하면 데이터 암호화에 영향을 주기 때문에 비밀번호 확인이 필요합니다."</string>
     <string name="accessibility_service_warning" msgid="6779187188736432618">"<xliff:g id="SERVICE">%1$s</xliff:g>이(가) 기기의 전체 제어 권한을 요청합니다. 서비스가 화면을 읽고 거동이 불편한 사용자를 대신하여 작업을 실행할 수 있습니다. 대부분의 앱에는 이러한 제어 수준이 적절하지 않습니다."</string>
     <string name="accessibility_service_warning_description" msgid="6573203795976134751">"접근성 관련 지원을 제공하는 앱에는 완벽한 제어권을 부여하는 것이 좋으나, 대부분의 앱에는 적합하지 않습니다."</string>
     <string name="accessibility_service_screen_control_title" msgid="324795030658109870">"화면 확인 및 제어"</string>
@@ -3105,14 +3080,6 @@
     <string name="remove_account_failed" msgid="3709502163548900644">"관리자가 이 변경을 허용하지 않습니다."</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"수동으로 동기화할 수 없음"</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"현재 이 항목에 대해 동기화를 사용할 수 없습니다. 이 설정을 변경하려면 백그라운드 데이터 및 자동 동기화를 일시적으로 사용하도록 설정하세요."</string>
-    <string name="enter_password" msgid="6327051330258595331">"Android를 시작하려면 비밀번호를 입력하세요."</string>
-    <string name="enter_pin" msgid="1029287617551232681">"Android를 시작하려면 PIN을 입력하세요."</string>
-    <string name="enter_pattern" msgid="1747316785866742960">"Android를 시작하려면 패턴을 그리세요."</string>
-    <string name="cryptkeeper_wrong_pattern" msgid="340747269176120242">"잘못된 패턴"</string>
-    <string name="cryptkeeper_wrong_password" msgid="7295607881887114486">"잘못된 비밀번호"</string>
-    <string name="cryptkeeper_wrong_pin" msgid="2347961593970714201">"잘못된 PIN"</string>
-    <string name="checking_decryption" msgid="6111642972615688237">"확인 중..."</string>
-    <string name="starting_android" msgid="6694154070215356186">"Android 시작하는 중..."</string>
     <string name="delete" msgid="8330605554706263775">"삭제"</string>
     <string name="misc_files" msgid="6598066985800749585">"기타 파일"</string>
     <string name="misc_files_selected_count" msgid="5597802791672749532">"<xliff:g id="TOTAL">%2$d</xliff:g>개 중 <xliff:g id="NUMBER">%1$d</xliff:g>개가 선택됨"</string>
@@ -3208,8 +3175,6 @@
     <string name="data_usage_metered_yes" msgid="4262598072030135223">"종량제 네트워크"</string>
     <string name="data_usage_metered_no" msgid="1685828958417926268">"무제한 네트워크"</string>
     <string name="data_usage_disclaimer" msgid="3271450299386176770">"기기에 표시되는 데이터 사용량은 이동통신사에서 산출한 데이터 사용량과 다를 수 있습니다."</string>
-    <string name="cryptkeeper_emergency_call" msgid="8369322820475703306">"긴급 전화"</string>
-    <string name="cryptkeeper_return_to_call" msgid="3857250752781151232">"통화로 돌아가기"</string>
     <string name="vpn_name" msgid="3806456074909253262">"이름"</string>
     <string name="vpn_type" msgid="5533202873260826663">"유형"</string>
     <string name="vpn_server" msgid="2908816134941973935">"서버 주소"</string>
@@ -4766,8 +4731,6 @@
       <item quantity="one">앱 1개에서 무제한 데이터 사용 가능</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"더보기"</string>
-    <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"사용자 데이터를 삭제하고 파일 암호화로 변환하시겠습니까?"</string>
-    <string name="button_confirm_convert_fbe" msgid="339648921918438106">"삭제 및 변환"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"ShortcutManager 대역 제한 기능 재설정"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"ShortcutManager 대역 제한 기능이 재설정되었습니다."</string>
     <string name="notification_suggestion_title" msgid="6309263655965785411">"잠금 화면에서 정보 제어"</string>
@@ -5294,6 +5257,7 @@
     <string name="sim_action_yes" msgid="8076556020131395515">"예"</string>
     <string name="sim_action_reboot" msgid="3508948833333441538">"다시 시작"</string>
     <string name="sim_action_no_thanks" msgid="435717748384544195">"사용 안함"</string>
+    <string name="sim_action_cancel" msgid="2668099867029610910">"취소"</string>
     <string name="sim_switch_button" msgid="1405772571706095387">"전환"</string>
     <string name="dsds_activation_failure_title" msgid="4467364110584914794">"SIM을 활성화할 수 없음"</string>
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"SIM을 삭제하고 다시 삽입해 보세요. 그래도 문제가 지속되면 기기를 다시 시작하세요."</string>
@@ -5446,6 +5410,10 @@
     <string name="cached_apps_freezer" msgid="1057519579761550350">"캐시된 앱 실행 정지"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"설정에서 화면 오버레이 허용"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"다른 앱 위에 표시할 수 있는 앱이 설정 화면을 오버레이하도록 허용합니다."</string>
+    <!-- no translation found for allow_mock_modem (3832264806530479214) -->
+    <skip />
+    <!-- no translation found for allow_mock_modem_summary (9097416612748005374) -->
+    <skip />
     <string name="media_controls_title" msgid="403271085636252597">"미디어"</string>
     <string name="media_controls_resume_title" msgid="855076860336652370">"미디어 플레이어 고정"</string>
     <string name="media_controls_resume_description" msgid="3163482266454802097">"재생을 빠르게 재개할 수 있도록 빠른 설정에서 미디어 플레이어를 계속 열어 둡니다."</string>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index c0c8c1a..b15a0be 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -142,10 +142,11 @@
     <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"Түзмөгүңүзгө жакын жердеги Bluetooth түзмөктөрү менен байланышууга уруксат бериңиз"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"Телефонуңузду жакын жердеги Bluetooth түзмөктөрүнө байланыштырат."</string>
     <string name="bluetooth_disable_a2dp_hw_offload" msgid="5942913792817797541">"Bluetooth A2DP программасын кайра баштоону өчүрүү"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="8610420176339657720">"Түзмөк өчүп күйсүнбү?"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8333029144800835996">"Бул жөндөөнү өзгөртүү үчүн түзмөгүңүздү өчүрүп күйгүзүңүз."</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="3488695418187553566">"Өчүрүп күйгүзүү"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="4930826928585464191">"Жок"</string>
+    <string name="bluetooth_disable_le_audio_hw_offload" msgid="3966022676505972908">"Bluetooth LE AUDIO аппараттык камсыздоосун жеңилдетүүнү өчүрүү"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_title" msgid="6001142380445276918">"Түзмөктү өчүрүп күйгүзөсүзбү?"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_message" msgid="1524373895333698779">"Бул жөндөөнү өзгөртүү үчүн түзмөгүңүздү өчүрүп күйгүзүңүз."</string>
+    <string name="bluetooth_disable_hw_offload_dialog_confirm" msgid="5594859658551707592">"Өчүрүп күйгүзүү"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel" msgid="3663690305043973720">"Жокко чыгаруу"</string>
     <string name="connected_device_media_device_title" msgid="3783388247594566734">"Медиа түзмөктөр"</string>
     <string name="connected_device_call_device_title" msgid="88732390601723608">"Түзмөктөргө чалуу"</string>
     <string name="connected_device_other_device_title" msgid="4652120430615729193">"Башка түзмөктөр"</string>
@@ -309,9 +310,9 @@
     <string name="security_settings_title" msgid="6710768415432791970">"Коопсуздук"</string>
     <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"Шифрлөө/каттоо маалыматы"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"Телефон шифрленген"</string>
-    <string name="decryption_settings_summary" product="default" msgid="1742645256103613503">"Телефон шифрленген эмес"</string>
+    <string name="not_encrypted_summary" product="default" msgid="2251945842585788254">"Телефон шифрленген эмес"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"Түзмөк шифрленген"</string>
-    <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"Түзмөк шифрленген эмес"</string>
+    <string name="not_encrypted_summary" product="tablet" msgid="2374263654698719382">"Түзмөк шифрленген эмес"</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"Экранды кулпулоо"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"Эмнелер көрүнөт"</string>
     <string name="security_settings_summary" msgid="1627059516127354233">"Жайгашкан жеримди, экрандын кулпусун ачуу ыкмасын, SIM карта кулпусун, аныктоо эстутумунун кулпусун коюу"</string>
@@ -489,7 +490,7 @@
     <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"Сүрөтчө жылган сайын аны коё бербей басып туруңуз. Бул манжаңыздын изин көбүрөөк тартууга жардам берет."</string>
     <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"Манжаңыздын учун сенсорго коюңуз"</string>
     <string name="security_settings_udfps_enroll_edge_title" msgid="6137605344819152477">"Эми манжаңыздын четтерин коюңуз"</string>
-    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"Манжаңыздын бир тарабын сенсорго коюп, кармап туруңуз, андан кийин башка тарабына которулуңуз"</string>
+    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"Манжаңызды сенсорго капталдатып коюп, кармап туруңуз, андан кийин башка капталдарын коюңуз."</string>
     <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"Бул манжаңыздын изин көбүрөөк тартууга жардам берет"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Манжа изи катталууда: <xliff:g id="PERCENTAGE">%d</xliff:g> пайыз"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Манжа изи кошулду"</string>
@@ -568,37 +569,10 @@
     <string name="fingerprint_last_delete_message" msgid="7860374760549404410">"Манжаңыздын изи менен телефонуңуздун кулпусун ача албай, колдонмолорго кирүүдө өзүңүздү ырастай албай каласыз."</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="4104208067277655068">"Манжаңыздын изи менен жумуш профилиңиздин кулпусун ача албай, эч нерсе сатып ала албай, колдонмолорго кирүүдө өзүңүздү ырастай албай каласыз."</string>
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"Ооба, өчүрөм"</string>
-    <string name="crypt_keeper_settings_title" msgid="4938812137822100044">"Шифрлөө"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"Планшетти шифрлөө"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"Телефонду шифрлөө"</string>
-    <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"Шифрленген"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"Аккаунттарыңызды, жөндөөлөрүңүздү, жүктөп алынган колдонмолоруңузду жана алардын дайындарын, медиа жана башка файлдарды шифрлей аласыз. Планшетиңиз шифрленгенден кийин, экран кулпуланганда (башкача айтканда, үлгү же сандык PIN же сырсөз менен), планшетиңиз күйгүзүлгөн сайын, аны дешифрлөө үчүн экрандын кулпусун ачууга туура келет. Дешифрлөөнүн бирден-бир жалгыз жолу – бардык дайын-даректериңизди өчүрүү менен, планшетиңизди демейки абалга кайтаруу.\n\nШифрлөөгө бир саат же көбүрөөк убакыт талап кылынышы мүмкүн. Ишти кубатталган батарея менен баштап, процесс аягына чейин чыкмайынча, планшетиңизди суурубай туруңуз. Эгер аны үзгүлтүккө учуратсаңыз, айрым дайын-даректериңизди же баарын жоготуп алышыңыз мүмкүн."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"Аккаунттарыңызды, жөндөөлөрүңүздү, жүктөп алынган колдонмолоруңузду жана алардын дайындарын, медиа жана башка файлдарды шифрлей аласыз. Телефонуңуз шифрленгенден кийин, экран кулпуланганда (башкача айтканда, үлгү же сандык PIN же сырсөз менен), телефонуңуз күйгүзүлгөн сайын, аны дешифрлөө үчүн экрандын кулпусун ачууга туура келет. Дешифрлөөнүн бирден-бир жалгыз жолу – бардык дайын-даректериңизди өчүрүү менен, телефонуңузду демейки абалга кайтаруу.\n\nШифрлөөгө бир саат же көбүрөөк убакыт талап кылынышы мүмкүн. Ишти кубатталган батарея менен баштап, процесс аягына чейин чыкмайынча, телефонуңузду суурубай туруңуз. Эгер аны үзгүлтүккө учуратсаңыз, айрым дайын-даректериңизди же баарын жоготуп алышыңыз мүмкүн."</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"Планшетти шифрлөө"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"Телефонду шифрлөө"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"Батарейди дүрмөттөп, кайрадан аракет кылыңыз."</string>
-    <string name="crypt_keeper_unplugged_text" msgid="2709721134148651329">"Дүрмөттөөчү түзмөгүңүздү туташтырып, кайталап көрүңүз."</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="1847280235529858357">"Экран кулпусунун PIN коду же сырсөзү жок"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="7210616262954236042">"Шифрлөөнү баштаардан мурун, сиз экранды бөгөтөөчү PIN же сырсөз коюшуңуз керек."</string>
-    <string name="crypt_keeper_confirm_title" msgid="8600000209722452230">"Шифрлейлиби?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="3270587498436152259">"Шифрлөө - кайтарылбас процесс. Эгер аны үзгүлтүккө учуратсаңыз, берилиштериңиз жоголот. Шифрлөө бир сааттан ашык убакыт алат, жана анын жүрүшүндө планшетиңиз бир нече жолу өчүрүлүп кайра жүктөлөт."</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="3040428543349852419">"Шифрлөө - кайтарылбас процесс. Эгер аны үзгүлтүккө учуратсаңыз, берилиштериңиз жоголот. Шифрлөө бир сааттан ашык убакыт алат, жана анын жүрүшүндө телефонуңуз бир нече жолу өчүрүлүп кайра жүктөлөт."</string>
-    <string name="crypt_keeper_setup_title" msgid="3339725741305796680">"Шифрленүүдө"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="4417016995091289019">"Планшетиңиз шифрленгиче күтө туруңуз. <xliff:g id="PERCENT">^1</xliff:g>% аткарылды."</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="7902355422499500352">"Телефонуңуз шифрленгичке күтө туруңуз. <xliff:g id="PERCENT">^1</xliff:g>% аткарылды."</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="8348188415839917821">"Планшетиңиз шифрленгенче күтө туруңуз. <xliff:g id="DURATION">^1</xliff:g> убакыт калды."</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="8556105766597855198">"Телефонуңуз шифрленгенче күтө туруңуз. <xliff:g id="DURATION">^1</xliff:g> убакыт калды."</string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="3832496715430327682">"Планшетиңиздин кулпусун ачуу үчүн, аны өчүрүп күйгүзүңүз."</string>
-    <string name="crypt_keeper_force_power_cycle" product="default" msgid="5070346039522135361">"Телефонуңуздун кулпусун ачуу үчүн, аны өчүрүп күйгүзүңүз."</string>
-    <string name="crypt_keeper_warn_wipe" msgid="8104921337301750394">"Эскертүү: Кулпуну дагы <xliff:g id="COUNT">^1</xliff:g> жолу ача албай койсоңуз, түзмөгүңүз тазаланат!"</string>
-    <string name="crypt_keeper_enter_password" msgid="1274917431075529732">"Сырсөзүңүздү териңиз"</string>
-    <string name="crypt_keeper_failed_title" msgid="8173654570682244149">"Шифрлөө ийгиликсиз аяктады"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"Шифрлөө үзгүлтүккө учурагандыктан, планшетиңиздеги дайындар жеткиликсиз болуп калды.\n\nПланшетиңизди кайрадан колдоно берүү үчүн, аны баштапкы абалга кайтаруу керек. Ошондон кийин гана, Google аккаунтуңузда сакталган бардык маалыматтарды калыбына келтире аласыз."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"Шифрлөө үзгүлтүккө учурагандыктан, телефонуңуздагы дайындар жеткиликсиз болуп калды. \n\nТелефонуңузду кайрадан колдоно берүү үчүн, аны баштапкы абалга кайтаруу керек. Ошондон кийин гана, Google аккаунтуңузда сакталган бардык маалыматтарды калыбына келтире аласыз."</string>
-    <string name="crypt_keeper_data_corrupt_title" msgid="5920153462176846037">"Дешифрлөө ийгиликсиз аяктады"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"Сырсөздү туура киргиздиңиз, бирок тилекке каршы планшетиңиздеги дайындар бузулуп калган. \n\nПланшетиңизди пайдаланууну улантуу үчүн, аны баштапкы абалга кайтарышыңыз керек. Планшетиңиз баштапкы абалга кайтарылгандан кийин, маалыматтарды калыбына келтире аласыз жана алардын камдык көчүрмөсү Google аккаунтуңузда сакталат."</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"Сырсөздү туура киргиздиңиз, бирок тилекке каршы телефонуңуздагы дайындар бузулуп калган. \n\nТелефонуңузду пайдаланууну улантуу үчүн, аны баштапкы абалга кайтарышыңыз керек. Телефонуңуз баштапкы абалга кайтарылгандан кийин, маалыматтарды калыбына келтире аласыз жана алардын камдык көчүрмөсү Google аккаунтуңузда сакталат."</string>
-    <string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"Киргизүү ыкмасын которуу"</string>
+    <string name="encryption_settings_title" msgid="2848716008695618360">"Шифрлөө"</string>
+    <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"Планшетти шифрлөө"</string>
+    <string name="encrypt_title" product="default" msgid="7337365190988321100">"Телефонду шифрлөө"</string>
+    <string name="encrypted_summary" msgid="545623487587251207">"Шифрленген"</string>
     <string name="suggested_lock_settings_title" msgid="7836065447159730217">"Телефонуңузду коргоңуз"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"Планшетти коргоо үчүн экран кулпусун коюңуз"</string>
     <string name="suggested_lock_settings_summary" product="device" msgid="8479766049078378225">"Түзмөктү коргоо үчүн экран кулпусун коюңуз"</string>
@@ -817,6 +791,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Сиз бул PIN\'ди башка түзмөккө дагы киргизишиңиз керек болушу мүмкүн."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Сиз бул сырсөздү башка түзмөккө дагы киргизишиңиз керек болушу мүмкүн."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Муну менен туташыш үчүн:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Ал бул кодду көрсөтүп жатканын текшериңиз:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Координацияланган топтомго туташуу үчүн ырастаңыз"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"Жөнөтүүчү:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Бул түзмөк менен туташсынбы?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Кийинки менен туташуу үчүн:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Андан муну терип:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, Return же Enter\'ди басыңыз."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Байланыштар менен чалуулар таржымалына мүмкүнчүлүк берүү"</string>
@@ -850,6 +825,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Туташпай калды. Кайталап көрүңүз."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Түзмөктүн чоо-жайы"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Түзмөктүн Bluetooth дареги: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Түзмөктүн Bluetooth дареги:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Түзмөк унутулсунбу?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Байланышты өчүрүү"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Колдонмону ажыратасызбы?"</string>
@@ -881,6 +857,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Жөндөөлөрдү эстеп калуу"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Туташып турган Bluetooth аудио түзмөктөрүнүн уруксат берилген эң жогорку саны"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Туташып турган Bluetooth аудио түзмөктөрүнүн эң жогорку санын тандоо"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"Мүчүлүштүктөрдү оңдоо үчүн NFC топтомун жайгаштыруу"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"NFC топтомун жайгаштыруу деңгээлин жогорулатуу"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Тышкы экранга чыгаруу"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"күзгү"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Зымсыз мониторду иштетүү"</string>
@@ -1188,6 +1166,8 @@
     <string name="wifi_hotspot_maximize_compatibility_dual_ap_summary" msgid="3579549223159056533">"Башка түзмөктөргө бул байланыш түйүнүн табууга жардам берет Батареянын колдонулушун жогорулатат."</string>
     <string name="wifi_tether_starting" msgid="8879874184033857814">"Байланыш түйүнү жандырылууда…"</string>
     <string name="wifi_tether_stopping" msgid="4416492968019409188">"Байланыш түйүнү өчүрүлүүдө…"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_title" msgid="3089432578433978073">"Байланыш түйүнү жеткиликсиз"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_content" msgid="5920421547607921112">"Кеңири маалымат үчүн байланыш операторуңузга кайрылыңыз"</string>
     <string name="wifi_tether_enabled_subtext" msgid="5085002421099821056">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> иштеп жатат"</string>
     <string name="wifi_tether_failed_subtext" msgid="437190628041885500">"Көчмө Wi‑Fi түйүнүнө туташууда ката кетти"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7072559431286459122">"Wi‑Fi байланыш түйүнүн жөндөө"</string>
@@ -2534,11 +2514,6 @@
     <string name="enable_service_title" msgid="7231533866953706788">"<xliff:g id="SERVICE">%1$s</xliff:g> кызматына түзмөгүңүздү толугу менен көзөмөлдөөгө уруксат бересизби?"</string>
     <string name="capabilities_list_title" msgid="1225853611983394386">"<xliff:g id="SERVICE">%1$s</xliff:g>:"</string>
     <string name="touch_filtered_warning" msgid="4225815157460318241">"Колдонмо уруксат суроо-талабын түшүнбөй жаткандыктан, Жөндөөлөр жообуңузду текшере албайт."</string>
-    <string name="enable_service_encryption_warning" msgid="931082737770453755">"Эгер <xliff:g id="SERVICE">%1$s</xliff:g> күйгүзүлсө, түзмөгүңүз маалыматтарды шифрлөөнү күчтөндүрүү үчүн экраныңыздын кулпусун пайдаланбайт."</string>
-    <string name="secure_lock_encryption_warning" msgid="669152607190123579">"Атайын мүмкүнчүлүктөр кызматы күйгүзүлгөндүктөн, түзмөгүңүз маалыматтарды шифрлөөнү күчтөндүрүү үчүн экраныңыздын кулпусун пайдаланбайт."</string>
-    <string name="enable_service_pattern_reason" msgid="6832846117817938536">"<xliff:g id="SERVICE">%1$s</xliff:g> күйгүзүлгөндө маалыматтарды шифрлөөгө таасир тийгизгендиктен, үлгүңүздү ырасташыңыз керек."</string>
-    <string name="enable_service_pin_reason" msgid="6040417014360237703">"<xliff:g id="SERVICE">%1$s</xliff:g> күйгүзүлгөндө маалыматтарды шифрлөөгө таасир тийгизгендиктен, PIN ырасташыңыз керек."</string>
-    <string name="enable_service_password_reason" msgid="6962544350351734238">"<xliff:g id="SERVICE">%1$s</xliff:g> күйгүзүлгөндө маалыматтарды шифрлөөгө таасир тийгизгендиктен, сырсөзүңүздү ырасташыңыз керек."</string>
     <string name="accessibility_service_warning" msgid="6779187188736432618">"<xliff:g id="SERVICE">%1$s</xliff:g> бул түзмөктү толук көзөмөлдөөнү талап кылууда. Бул кызмат экранды окуп, атайын мүмкүнчүлүктөрдү пайдаланган колдонуучулардын атынан аракеттерди жасай алат. Көзөмөлдүн деңгээли колдонмолордун көбүнө ылайыксыз."</string>
     <string name="accessibility_service_warning_description" msgid="6573203795976134751">"Толук көзөмөл атайын мүмкүнчүлүктөрдү пайдаланууга керек, бирок калган көпчүлүк колдонмолорго кереги жок."</string>
     <string name="accessibility_service_screen_control_title" msgid="324795030658109870">"Экранды көрүп, көзөмөлдөө"</string>
@@ -3103,14 +3078,6 @@
     <string name="remove_account_failed" msgid="3709502163548900644">"Мындай өзгөртүүгө администраторуңуз тыюу салган"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"Кол менен синхрондоштуруу мүмкүн эмес"</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"Бул үчүн синхрондоштуруу азыр өчүрүлгөн. Бул тууралоону өзгөртүш үчүн, фондук алмашуу жана авто-синхрондоштурууну убактылуу иштетиңиз."</string>
-    <string name="enter_password" msgid="6327051330258595331">"Android\'ду иштетүү үчүн сырсөзүңүздү киргизиңиз"</string>
-    <string name="enter_pin" msgid="1029287617551232681">"Android\'ду иштетүү үчүн PIN\'иңизди киргизиңиз"</string>
-    <string name="enter_pattern" msgid="1747316785866742960">"Android\'ду иштетүү үчүн үлгүңүздү чийиңиз"</string>
-    <string name="cryptkeeper_wrong_pattern" msgid="340747269176120242">"Графикалык ачкыч туура эмес"</string>
-    <string name="cryptkeeper_wrong_password" msgid="7295607881887114486">"Сырсөз туура эмес"</string>
-    <string name="cryptkeeper_wrong_pin" msgid="2347961593970714201">"PIN код туура эмес"</string>
-    <string name="checking_decryption" msgid="6111642972615688237">"Текшерүүдө…"</string>
-    <string name="starting_android" msgid="6694154070215356186">"Android жүргүзүлүүдө…"</string>
     <string name="delete" msgid="8330605554706263775">"Жок кылуу"</string>
     <string name="misc_files" msgid="6598066985800749585">"Башка файлдар"</string>
     <string name="misc_files_selected_count" msgid="5597802791672749532">"<xliff:g id="TOTAL">%2$d</xliff:g> ичинен <xliff:g id="NUMBER">%1$d</xliff:g> тандалды"</string>
@@ -3206,8 +3173,6 @@
     <string name="data_usage_metered_yes" msgid="4262598072030135223">"Трафик ченелет"</string>
     <string name="data_usage_metered_no" msgid="1685828958417926268">"Трафик ченелбейт"</string>
     <string name="data_usage_disclaimer" msgid="3271450299386176770">"Оператор эсептеген дайындар түзмөгүңүздө эсептелген дайындардан айырмаланышы мүмкүн."</string>
-    <string name="cryptkeeper_emergency_call" msgid="8369322820475703306">"Шашылыш чалуу"</string>
-    <string name="cryptkeeper_return_to_call" msgid="3857250752781151232">"Чалууга кайтуу"</string>
     <string name="vpn_name" msgid="3806456074909253262">"Аталышы"</string>
     <string name="vpn_type" msgid="5533202873260826663">"Түрү"</string>
     <string name="vpn_server" msgid="2908816134941973935">"Сервердин дареги"</string>
@@ -3431,7 +3396,7 @@
     <string name="preferred_network_type_title" msgid="812509938714590857">"Тармактын түрү"</string>
     <string name="preferred_network_type_summary" msgid="8786291927331323061">"LTE (сунушталат)"</string>
     <string name="mms_message_title" msgid="6624505196063391964">"MMS билдирүүлөр"</string>
-    <string name="mms_message_summary" msgid="2855847140141698341">"Мобилдик трафик өчүк кезде жөнөтүү жана кабыл алуу"</string>
+    <string name="mms_message_summary" msgid="2855847140141698341">"MMS билдирүүлөрдү мобилдик Интернет өчүк кезде жөнөтүп, кабыл аласыз"</string>
     <string name="data_during_calls_title" msgid="3940276893360429144">"Чалуу учурундагы трафик"</string>
     <string name="data_during_calls_summary" msgid="2289050189544214759">"Бул SIM карта чалуу учурунда мобилдик Интернетти пайдалануу үчүн гана колдонулат"</string>
     <string name="work_sim_title" msgid="8999872928646924429">"Жумуш SIM"</string>
@@ -4764,8 +4729,6 @@
       <item quantity="one">1 колдонмо маалыматтарды чектөөсүз өткөрө алат</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"Дагы көрүү"</string>
-    <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"Колдонуучунун дайындарын тазалап, файлды шифрлөөгө өтөсүзбү?"</string>
-    <string name="button_confirm_convert_fbe" msgid="339648921918438106">"Тазалап туруп өтүү"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"ShortcutManager эсептегичтерин баштапкы абалга келтирүү"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"ShortcutManager ылдамдыкты чектөө баштапкы абалга келтирилди"</string>
     <string name="notification_suggestion_title" msgid="6309263655965785411">"Кулпуланган экрандагы маалыматты көзөмөлдөө"</string>
@@ -5292,6 +5255,7 @@
     <string name="sim_action_yes" msgid="8076556020131395515">"Ооба"</string>
     <string name="sim_action_reboot" msgid="3508948833333441538">"Өчүрүп күйгүзүү"</string>
     <string name="sim_action_no_thanks" msgid="435717748384544195">"Жок, рахмат"</string>
+    <string name="sim_action_cancel" msgid="2668099867029610910">"Жокко чыгаруу"</string>
     <string name="sim_switch_button" msgid="1405772571706095387">"Которулуу"</string>
     <string name="dsds_activation_failure_title" msgid="4467364110584914794">"SIM-карта иштетилген жок"</string>
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"SIM-картаны чыгарып, кайра салыңыз. Эгер маселе чечилбесе, түзмөктү өчүрүп күйгүзүңүз."</string>
@@ -5444,6 +5408,10 @@
     <string name="cached_apps_freezer" msgid="1057519579761550350">"Кештелген колдонмолордун иштетилишин убактылуу токтотуу"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"Колдонмолорду жөндөөлөрдүн үстүнө коюуга уруксат берүү"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Башка колдонмолордун үстүнөн көрүнгөн колдонмолорго Жөндөөлөр экранынын үстүнөн да көрүнүүгө уруксат берүү"</string>
+    <!-- no translation found for allow_mock_modem (3832264806530479214) -->
+    <skip />
+    <!-- no translation found for allow_mock_modem_summary (9097416612748005374) -->
+    <skip />
     <string name="media_controls_title" msgid="403271085636252597">"Медиа"</string>
     <string name="media_controls_resume_title" msgid="855076860336652370">"Медиа ойноткучту кадап коюу"</string>
     <string name="media_controls_resume_description" msgid="3163482266454802097">"Ойнотулуп жаткан нерсени ыкчам улантуу үчүн, медиа ойноткучтар Ыкчам жөндөөлөрдө ачык абалда болуп турат"</string>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index 49e05bb..30b0684 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -142,10 +142,11 @@
     <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"ເຮັດໃຫ້ອຸປະກອນຂອງທ່ານເຊື່ອມຕໍ່ກັບອຸປະກອນ Bluetooth ທີ່ຢູ່ໃກ້ຄຽງໄດ້"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"ເຮັດໃຫ້ໂທລະສັບຂອງທ່ານເຊື່ອມຕໍ່ກັບອຸປະກອນ Bluetooth ທີ່ຢູ່ໃກ້ຄຽງໄດ້"</string>
     <string name="bluetooth_disable_a2dp_hw_offload" msgid="5942913792817797541">"ປິດການອອບໂຫລດຮາດແວ Bluetooth A2DP"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="8610420176339657720">"ຣີສະຕາດອຸປະກອນບໍ?"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8333029144800835996">"ທ່ານຕ້ອງຣີສະຕາດອຸປະກອນຂອງທ່ານເພື່ອປ່ຽນການຕັ້ງຄ່ານີ້."</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="3488695418187553566">"ປິດເປີດໃໝ່"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="4930826928585464191">"ຍົກເລີກ"</string>
+    <string name="bluetooth_disable_le_audio_hw_offload" msgid="3966022676505972908">"ປິດການນຳໃຊ້ການອອບໂຫຼດຮາດແວ Bluetooth LE AUDIO"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_title" msgid="6001142380445276918">"ຣີສະຕາດອຸປະກອນບໍ?"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_message" msgid="1524373895333698779">"ທ່ານຕ້ອງຣີສະຕາດອຸປະກອນຂອງທ່ານເພື່ອປ່ຽນການຕັ້ງຄ່ານີ້."</string>
+    <string name="bluetooth_disable_hw_offload_dialog_confirm" msgid="5594859658551707592">"ຣີສະຕາດ"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel" msgid="3663690305043973720">"ຍົກເລີກ"</string>
     <string name="connected_device_media_device_title" msgid="3783388247594566734">"ອຸປະກອນມີເດຍ"</string>
     <string name="connected_device_call_device_title" msgid="88732390601723608">"ອຸປະກອນໂທ"</string>
     <string name="connected_device_other_device_title" msgid="4652120430615729193">"ອຸປະກອນອື່ນໆ"</string>
@@ -309,9 +310,9 @@
     <string name="security_settings_title" msgid="6710768415432791970">"ຄວາມ​ປອດ​ໄພ"</string>
     <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"ການເຂົ້າລະຫັດ ແລະ ຂໍ້ມູນການເຂົ້າສູ່ລະບົບ"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"ເຂົ້າລະຫັດໂທລະສັບແລ້ວ"</string>
-    <string name="decryption_settings_summary" product="default" msgid="1742645256103613503">"ໂທລະສັບບໍ່ໄດ້ຖືກເຂົ້າລະຫັດ"</string>
+    <string name="not_encrypted_summary" product="default" msgid="2251945842585788254">"ບໍ່ໄດ້ເຂົ້າລະຫັດໂທລະສັບ"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"ເຂົ້າລະຫັດອຸປະກອນແລ້ວ"</string>
-    <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"ອຸປະກອນບໍ່ໄດ້ຖືກເຂົ້າລະຫັດ"</string>
+    <string name="not_encrypted_summary" product="tablet" msgid="2374263654698719382">"ບໍ່ໄດ້ເຂົ້າລະຫັດອຸປະກອນ"</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"ໜ້າຈໍລັອກ"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"ສິ່ງທີ່ຈະສະແດງ"</string>
     <string name="security_settings_summary" msgid="1627059516127354233">"ຕັ້ງທີ່ຢູ່ຂອງຂ້ອຍ, ໜ້າຈໍປົດລັອກ, ການລັອກຊິມກາດ, ການລັອກບ່ອນຈັດເກັບຂໍ້ມູນຮັບຮອງ"</string>
@@ -568,37 +569,10 @@
     <string name="fingerprint_last_delete_message" msgid="7860374760549404410">"ທ່ານຈະບໍ່ສາມາດໃຊ້ລາຍນິ້ວມືຂອງທ່ານເພື່ອປົດລັອກໂທລະສັບຂອງທ່ານ ຫຼື ຢັ້ງຢືນວ່າແມ່ນທ່ານໃນແອັບໄດ້."</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="4104208067277655068">"ທ່ານຈະບໍ່ສາມາດໃຊ້ລາຍນິ້ວມືຂອງທ່ານເພື່ອປົດລັອກໂປຣໄຟລ໌ບ່ອນເຮັດວຽກຂອງທ່ານ, ອະນຸມັດການສັ່ງຊືື້ ຫຼື ເຂົ້າສູ່ລະບົບຫາແອັບບ່ອນເຮັດວຽກໄດ້."</string>
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"ແມ່ນແລ້ວ​, ເອົາອອກ"</string>
-    <string name="crypt_keeper_settings_title" msgid="4938812137822100044">"ການເຂົ້າລະຫັດ"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"ເຂົ້າລະຫັດແທັບເລັດ"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"ເຂົ້າລະຫັດໂທລະສັບ"</string>
-    <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"ເຂົ້າລະຫັດແລ້ວ"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"ທ່ານ​ສາ​ມາດ​ເຂົ້າ​ລະ​ຫັດ​ບັນ​ຊີ​, ການ​ຕັ້ງ​ຄ່າ, ແອັບຯ​ທີ່​ດາວ​ໂຫລດ​ມາ​ແລ້ວ​ແລະ​ຂໍ້​ມູນ​ຂອງ​ແອັບຯ​​ຂອງ​ທ່ານ​ໄດ້. ຫຼັງ​ຈາກ​ທ່ານ​ເຂົ້າ​ລະ​ຫັດ​ແທັບ​ເລັດ​ຂອງ​ທ່ານ​ແລ້ວ, ສົມ​ມຸດ​ວ່າ​ທ່ານ​ມີ​ການ​ຕັ້ງ​ລະ​ຫັດ​ລັອກ​ໄວ້ (​ເຊັ່ນ: ໃຊ້​ຮູບ​ແບບ​ປົດ​ລັອກ, ລະ​ຫັດ​ໂຕ​ເລກ ຫຼື​ລະ​ຫັດ​ຜ່ານ), ທ່ານ​ຈະ​ຕ້ອງ​ປົດ​ລັອກ​ໜ້າ​ຈໍ​ເພື່ອ​ຖອດ​ລະ​ຫັດ​ແທັບ​ເລັດ​ທຸກໆ​ເທື່ອ​ທີ່​ທ່ານ​ເປີດ​ນຳ​ໃຊ້​ມັນ. ວິ​ທີ​ດຽວ​ທີ່​ຈະ​ປົດ​ລັອກ​​ຂໍ້​ມູນ​ແທັບ​ເລັດ​ຄືນ​ໄດ້​ຖາ​ວອນ​ແມ່ນ​ການ​ຣີ​ເຊັດ​ຄ່າ​ຈາກ​ໂຮງ​ງານ ເຊິ່ງ​ຈະ​ເປັນ​ການ​ລຶບ​ຂໍ້​ມູນ​ທັງ​ໝົດ​ຂອງ​ທ່ານ​ອອກ.\n\nການ​ເຂົ້າ​ລະ​ຫັດ​ຈະ​ໃຊ້​ເວ​ລາ​ຊົ່ວ​ໂມງ​ນຶ່ງ ຫຼືຫຼາຍກວ່າ​ນັ້ນ. ທ່ານ​ຈະ​ຕ້ອງ​ເລີ່ມ​ຕົ້ນ​ດ້ວຍ​ການ​ສາກ​ແບັດ​ເຕີ​ຣີ​ໃຫ້​ເຕັມ​ກ່ອນ ແລະ​ສຽບ​ສາຍ​ສາ​ກ​ປະ​ໄວ້​​ຕະຫຼອດ​ໄລ​ຍະ​ເວ​ລາ​ທີ່​ລະ​ບົບ​​ດຳ​ເນີນ​ການ​ເຂົ້າ​ລະ​ຫັດ. ຫາກ​ທ່ານ​ລົບ​ກວນ​ການ​ເຮັດ​ວຽກ​ຂອງ​ລະ​ບົບ​ໃນ​ເວ​ລາ​ທີ່​ເຂົ້າ​ລະ​ຫັດ, ທ່ານ​ຈະ​ສູນ​ເສຍ​ຂໍ້​ມູນ​ບາງ​ສ່ວນຫຼື​ທັງ​ໝົດ​ຂອງ​ທ່ານ."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"ທ່ານ​ສາ​ມາດ​ເຂົ້າ​ລະ​ຫັດ​ບັນ​ຊີ​, ການ​ຕັ້ງ​ຄ່າ, ແອັບຯ​ທີ່​ດາວ​ໂຫລດ​ມາ​ແລ້ວ​ແລະ​ຂໍ້​ມູນ​ຂອງ​ແອັບຯ​​ຂອງ​ທ່ານ​ໄດ້. ຫຼັງ​ຈາກ​ທ່ານ​ເຂົ້າ​ລະ​ຫັດ​ໂທ​ລະ​ສັບ​ຂອງ​ທ່ານ​ແລ້ວ, ສົມ​ມຸດ​ວ່າ​ທ່ານ​ມີ​ການ​ຕັ້ງ​ລະ​ຫັດ​ລັອກ​ໄວ້ (​ເຊັ່ນ: ໃຊ້​ຮູບ​ແບບ​ປົດ​ລັອກ, ລະ​ຫັດ​ໂຕ​ເລກ ຫຼື​ລະ​ຫັດ​ຜ່ານ), ທ່ານ​ຈະ​ຕ້ອງ​ປົດ​ລັອກ​ໜ້າ​ຈໍ​ເພື່ອ​ຖອດ​ລະ​ຫັດ​ໂທ​ລະ​ສັບ​ທຸກໆ​ເທື່ອ​ທີ່​ທ່ານ​ເປີດ​ນຳ​ໃຊ້​ມັນ. ວິ​ທີ​ດຽວ​ທີ່​ຈະ​ປົດ​ລັອກ​​ຂໍ້​ມູນ​ໂທ​ລະ​ສັບ​ຄືນ​ໄດ້​ຖາ​ວອນ​ແມ່ນ​ການ​ຣີ​ເຊັດ​ຄ່າ​ຈາກ​ໂຮງ​ງານ ເຊິ່ງ​ຈະ​ເປັນ​ການ​ລຶບ​ຂໍ້​ມູນ​ທັງ​ໝົດ​ຂອງ​ທ່ານ​ອອກ.\n\nການ​ເຂົ້າ​ລະ​ຫັດ​ຈະ​ໃຊ້​ເວ​ລາ​ຊົ່ວ​ໂມງ​ນຶ່ງ ຫຼືຫຼາຍກວ່າ​ນັ້ນ. ທ່ານ​ຈະ​ຕ້ອງ​ເລີ່ມ​ຕົ້ນ​ດ້ວຍ​ການ​ສາກ​ແບັດ​ເຕີ​ຣີ​ໃຫ້​ເຕັມ​ກ່ອນ ແລະ​ສຽບ​ສາຍ​ສາ​ກ​ປະ​ໄວ້​​ຕະຫຼອດ​ໄລ​ຍະ​ເວ​ລາ​ທີ່​ລະ​ບົບ​​ດຳ​ເນີນ​ການ​ເຂົ້າ​ລະ​ຫັດ. ຫາກ​ທ່ານ​ລົບ​ກວນ​ການ​ເຮັດ​ວຽກ​ຂອງ​ລະ​ບົບ​ໃນ​ເວ​ລາ​ທີ່​ເຂົ້າ​ລະ​ຫັດ, ທ່ານ​ຈະ​ສູນ​ເສຍ​ຂໍ້​ມູນ​ບາງ​ສ່ວນຫຼື​ທັງ​ໝົດ​ຂອງ​ທ່ານ."</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"ເຂົ້າລະຫັດແທັບເລັດ"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"ເຂົ້າລະຫັດໂທລະສັບ"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"ສາກແບັດເຕີຣີຂອງທ່ານ ແລ້ວລອງອີກຄັ້ງ."</string>
-    <string name="crypt_keeper_unplugged_text" msgid="2709721134148651329">"ສຽບສາຍສາກຂອງທ່ານ ແລ້ວລອງໃໝ່ອີກຄັ້ງ."</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="1847280235529858357">"ບໍ່ໄດ້ຕັ້ງ PIN ຫຼືລະຫັດລັອກໜ້າຈໍ"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="7210616262954236042">"ທ່ານຈຳເປັນຕ້ອງຕັ້ງລະຫັດ PIN ຫຼືລະຫັດຜ່ານກ່ອນຈະເລີ່ມຕົ້ນການເຂົ້າລະຫັດໄດ້."</string>
-    <string name="crypt_keeper_confirm_title" msgid="8600000209722452230">"ເຂົ້າລະຫັດ?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="3270587498436152259">"ການດຳເນີນການເຂົ້າລະຫັດ ແມ່ນຂັ້ນຕອນທີ່ບໍ່ສາມາດຍົກເລີກກັບຄືນໄດ້ ແລະຫາກທ່ານຢຸດມັນລະຫວ່າງທາງ ທ່ານຈະສູນເສຍຂໍ້ມູນຂອງທ່ານ. ການເຂົ້າລະຫັດໃຊ້ເວລາຊົ່ວໂມງນຶ່ງ ຫຼືຫຼາຍກວ່ານັ້ນ, ໃນລະຫວ່າງນັ້ນແທັບເລັດຈະຣີສະຕາດເອງຫຼາຍຄັ້ງ."</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="3040428543349852419">"ການດຳເນີນການເຂົ້າລະຫັດ ແມ່ນຂັ້ນຕອນທີ່ບໍ່ສາມາດຍົກເລີກກັບຄືນໄດ້ ແລະຫາກທ່ານຢຸດມັນລະຫວ່າງທາງ ທ່ານຈະສູນເສຍຂໍ້ມູນຂອງທ່ານ. ການເຂົ້າລະຫັດໃຊ້ເວລາຊົ່ວໂມງນຶ່ງ ຫຼືຫຼາຍກວ່ານັ້ນ, ໃນລະຫວ່າງນັ້ນໂທລະສັບຈະຣີສະຕາດເອງຫຼາຍຄັ້ງ."</string>
-    <string name="crypt_keeper_setup_title" msgid="3339725741305796680">"ກຳລັງເຂົ້າລະຫັດ"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="4417016995091289019">"ລໍຖ້າລະຫວ່າງທີ່ແທັບເລັດຂອງທ່ານກຳລັງຖືກເຂົ້າລະຫັດ. ສຳເລັດແລ້ວ <xliff:g id="PERCENT">^1</xliff:g>%."</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="7902355422499500352">"ລໍຖ້າລະຫວ່າງທີ່ໂທລະສັບຂອງທ່ານກຳລັງຖືກເຂົ້າລະຫັດ. ສຳເລັດແລ້ວ <xliff:g id="PERCENT">^1</xliff:g>%."</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="8348188415839917821">"ກະ​ລຸ​ນາ​ລໍ​ຖ້າ​ຂະ​ນະ​ທີ່​ແທັບ​ເລັດຂອງ​ທ່ານ​ກຳ​ລັງ​ຖືກ​ເຂົ້າ​ລະ​ຫັດ. ຍັງ​ເຫຼືອ​ອີກ: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="8556105766597855198">"ກະ​ລຸ​ນາ​ລໍ​ຖ້າ​ຂະ​ນະ​ທີ່​ໂທ​ລະ​ສັບ​ຂອງ​ທ່ານ​ກຳ​ລັງ​ຖືກ​ເຂົ້າ​ລະ​ຫັດ. ຍັງ​ເຫຼືອ​ອີກ: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="3832496715430327682">"ເພືອ​ປົດ​ລັອກ​ແທັບ​ເລັດຂອງ​ທ່ານ, ປິດ ແລະ​ເປີດ​ມັນ​ອີກ."</string>
-    <string name="crypt_keeper_force_power_cycle" product="default" msgid="5070346039522135361">"ເພືອ​ປົດ​ລັອກ​ໂທ​ລະ​ສັ​ບ​ຂອງ​ທ່ານ, ປິດ ແລະ​ເປີດ​ມັນ​ອີກ."</string>
-    <string name="crypt_keeper_warn_wipe" msgid="8104921337301750394">"ຄຳ​ເຕືອນ: ອຸ​ປະ​ກອນ​ຂອງ​ທ່ານ​ຈະ​ຖືກ​ລຶບ​ຂໍ້​ມູນຫຼັງ​ຈາກ​ທີ່​ພະ​ຍາ​ຍາມ​ປົດ​ລັອກ​ລົ້ມ​ເຫລວ <xliff:g id="COUNT">^1</xliff:g> ເທື່ອ!"</string>
-    <string name="crypt_keeper_enter_password" msgid="1274917431075529732">"ພິມລະຫັດຜ່ານຂອງທ່ານ"</string>
-    <string name="crypt_keeper_failed_title" msgid="8173654570682244149">"ການເຂົ້າລະຫັດບໍ່ສຳເລັດ"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"ການເຂົ້າລະຫັດຖືກລົບກວນ ແລະບໍ່ສາມາດເຮັດໃຫ້ສຳເລັດໄດ້ ສົ່ງຜົນໃຫ້ຂໍ້ມູນໃນແທັບເລັດຂອງທ່ານ ບໍ່ສາມາດເຂົ້າເຖິງໄດ້ອີກຕໍ່ໄປ. \n\n ເພື່ອສືບຕໍ່ນຳໃຊ້ແທັບເລັດຂອງທ່ານ, ທ່ານຕ້ອງດຳເນີນການຣີເຊັດຄ່າຈາກໂຮງງານ. ເມື່ອທ່ານຕັ້ງຄ່າແທັບເລັດຂອງທ່ານຫຼັງຈາກຣີເຊັດແລ້ວ, ທ່ານຈະສາມາດກູ້ຄືນຂໍ້ມູນໃດໆ ທີ່ເຄີຍໄດ້ສຳຮອງໄວ້ກັບບັນຊີ Google ຂອງທ່ານໄດ້."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"ການເຂົ້າລະຫັດຖືກລົບກວນ ແລະບໍ່ສາມາດເຮັດໃຫ້ສຳເລັດໄດ້ ສົ່ງຜົນໃຫ້ຂໍ້ມູນໃນໂທລະສັບຂອງທ່ານ ບໍ່ສາມາດເຂົ້າເຖິງໄດ້ອີກຕໍ່ໄປ. \n\nເພື່ອສືບຕໍ່ນຳໃຊ້ແທັບເລັດຂອງທ່ານ, ທ່ານຕ້ອງດຳເນີນການຣີເຊັດຄ່າຈາກໂຮງງານ. ເມື່ອຮອດຂັ້ນຕອນການຕັ້ງຄ່າໂທລະສັບຂອງທ່ານ ຫຼັງຈາກການຣີເຊັດ, ທ່ານຈະສາມາດກູ້ຄືນຂໍ້ມູນໃດໆ ທີ່ເຄີຍໄດ້ສຳຮອງໄວ້ກັບບັນຊີ Google ຂອງທ່ານໄດ້."</string>
-    <string name="crypt_keeper_data_corrupt_title" msgid="5920153462176846037">"ການຖອດ​ລະຫັດ​ບໍ່ສຳ​ເລັດ​ຜົນ"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"ລະຫັດ​ຜ່ານທີ່​ທ່ານໃສ່​ລົງໄປ​ນັ້ນຖືກ​ຕ້ອງແລ້ວ, ແຕ່ຂໍ້​ມູນ​ຂອງ​ທ່ານ​ເສຍ​ຫາຍ. \n\n1ເພື່ອ​ກັບໄປ​ນຳ​ໃຊ້​ແທັບເລັດ​ຂອງທ່ານ, ທ່ານຕ້ອງ​ຕັ້ງ​ຄ່າ​ແທັບເລັດ​ຂອງທ່ານ​ກັບໄປເປັນ​ຄ່າຈາກ​ໂຮງງານຄືນ. ເມື່ອ​ທ່ານ​ຕັ້ງຄ່າ​ແທັບເລັດ​ຂອງທ່ານ​ຫຼັງຈາກ​ການຕັ້ງ​ຄ່າ​ຄືນ, ທ່ານ​ຈະສາມາດ​ດຶງ​ຂໍ້ມູນ​ທີ່ທ່ານ​ສຳຮອງ​ໄວ້ໃນ​ບັນຊີ Google Account ຂອງທ່ານ​ຄືນມາໄດ້."</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"ລະຫັດ​ຜ່ານທີ່​ທ່ານໃສ່​ລົງໄປ​ນັ້ນຖືກ​ຕ້ອງແລ້ວ, ແຕ່ຂໍ້​ມູນ​ຂອງ​ທ່ານ​ເສຍ​ຫາຍ. \n\nເພື່ອ​ກັບໄປ​ນຳ​ໃຊ້​ໂທລະສັບ​ຂອງທ່ານ, ທ່ານຕ້ອງຕັ້ງ​ຄ່າ​ໂທລະສັບ​ຂອງທ່ານ​ກັບໄປເປັນ​ຄ່າຈາກ​ໂຮງງານຄືນ. ເມື່ອ​ທ່ານ​ຕັ້ງຄ່າ​ໂທລະສັບ​ຂອງທ່ານ​ຫຼັງຈາກ​ການ​ຕັ້ງ​ຄ່າ​ຄືນ, ທ່ານ​ຈະສາມາດ​ດຶງ​ຂໍ້ມູນ​ທີ່ທ່ານ​ສຳຮອງ​ໄວ້ໃນ​ບັນຊີ Google ຂອງທ່ານ​ຄືນມາໄດ້."</string>
-    <string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"ສະລັບຮູບແບບການປ້ອນຂໍ້ມູນ"</string>
+    <string name="encryption_settings_title" msgid="2848716008695618360">"ການເຂົ້າລະຫັດ"</string>
+    <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"ເຂົ້າລະຫັດແທັບເລັດ"</string>
+    <string name="encrypt_title" product="default" msgid="7337365190988321100">"ເຂົ້າລະຫັດໂທລະສັບ"</string>
+    <string name="encrypted_summary" msgid="545623487587251207">"ເຂົ້າລະຫັດແລ້ວ"</string>
     <string name="suggested_lock_settings_title" msgid="7836065447159730217">"ຮັກສາຄວາມປອດໄພໂທລະສັບຂອງທ່ານ"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"ຕັ້ງໜ້າຈໍລັອກເພື່ອປົກປ້ອງແທັບເລັດຂອງທ່ານ"</string>
     <string name="suggested_lock_settings_summary" product="device" msgid="8479766049078378225">"ຕັ້ງໜ້າຈໍລັອກເພື່ອປົກປ້ອງອຸປະກອນຂອງທ່ານ"</string>
@@ -817,6 +791,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"ທ່ານອາດຕ້ອງພິມລະຫັດ PIN ນີ້ໃສ່ອຸປະກອນອື່ນນຳ."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"ທ່ານອາດຕ້ອງພິມ passkey ນີ້ໃນອຸປະກອນອື່ນນຳ"</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"ເພື່ອຈັບຄູ່ກັບ:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;ໃຫ້ກວດສອບວ່າມັນສະແດງ passkey ນີ້ຢູ່:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"ຢືນຢັນເພື່ອຈັບຄູ່ກັບຊຸດທີ່ປະສານກັນ"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"ຈາກ:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;ຈັບຄູ່ກັບອຸປະກອນນີ້ບໍ່?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"ເພື່ອຈັບຄູ່ກັບ:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>ໃຫ້ພິມ:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, ຈາກນັ້ນກົດ Return ຫຼື Enter."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"ອະນຸຍາດໃຫ້ເຂົ້າເຖິງລາຍຊື່ຜູ້ຕິດຕໍ່ ແລະ ປະຫວັດການໂທຂອງທ່ານ"</string>
@@ -850,6 +825,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"ບໍ່ສາມາດເຊື່ອມຕໍ່ໄດ້. ກະລຸນາລອງອີກຄັ້ງ."</string>
     <string name="device_details_title" msgid="1155622417516195481">"ລາຍລະອຽດອຸປະກອນ"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"ທີ່ຢູ່ Bluetooth ຂອງອຸປະກອນ: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"ທີ່ຢູ່ Bluetooth ຂອງອຸປະກອນ:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"ລືມອຸປະກອນບໍ?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"ລຶບການເຊື່ອມໂຍງ"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"ຕັດການເຊື່ອມຕໍ່ແອັບບໍ?"</string>
@@ -881,6 +857,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"ຈື່ການຕັ້ງຄ່າ"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"ອຸປະກອນສຽງ Bluetooth ທີ່ເຊື່ອມຕໍ່ສູງສຸດ"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"ເລືອກຈຳນວນອຸປະກອນສຽງ Bluetooth ທີ່ເຊື່ອມຕໍ່ສູງສຸດ"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"ບັນທຶກດີບັກການວາງຊ້ອນ NFC"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"ເພີ່ມລະດັບການບັນທຶກການວາງຊ້ອນ NFC"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"ການສົ່ງສັນຍານ"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"ແວ່ນສະທ້ອນ"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"ເປີດໃຊ້ງານການສະແດງພາບໄຮ້ສາຍ"</string>
@@ -1188,6 +1166,8 @@
     <string name="wifi_hotspot_maximize_compatibility_dual_ap_summary" msgid="3579549223159056533">"ຊ່ວຍອຸປະກອນອື່ນຊອກຫາຮັອດສະປອດນີ້. ເພີ່ມການນຳໃຊ້ແບັດເຕີຣີ."</string>
     <string name="wifi_tether_starting" msgid="8879874184033857814">"ກຳລັງເປີດໃຊ້ຮັອດສະປອດ..."</string>
     <string name="wifi_tether_stopping" msgid="4416492968019409188">"ກຳລັງປິດຮັອດສະປອດ..."</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_title" msgid="3089432578433978073">"ບໍ່ສາມາດໃຊ້ການປ່ອຍສັນຍານໄດ້"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_content" msgid="5920421547607921112">"ກະລຸນາຕິດຕໍ່ຫາຜູ້ໃຫ້ບໍລິການຂອງທ່ານສຳລັບລາຍລະອຽດ"</string>
     <string name="wifi_tether_enabled_subtext" msgid="5085002421099821056">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> ເຮັດວຽກຢູ່"</string>
     <string name="wifi_tether_failed_subtext" msgid="437190628041885500">"Wi-Fi ຮັອດສະປອດເຄື່ອນທີ່ເກີດຄວາມຜິດພາດ"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7072559431286459122">"ຕັ້ງຄ່າ Wi-Fi ຮັອດສະປອດ"</string>
@@ -2534,11 +2514,6 @@
     <string name="enable_service_title" msgid="7231533866953706788">"ອະນຸຍາດໃຫ້ <xliff:g id="SERVICE">%1$s</xliff:g> ຄວບຄຸມອຸປະກອນທ່ານໄດ້ເຕັມຮູບແບບບໍ?"</string>
     <string name="capabilities_list_title" msgid="1225853611983394386">"<xliff:g id="SERVICE">%1$s</xliff:g> ຕ້ອງການ:"</string>
     <string name="touch_filtered_warning" msgid="4225815157460318241">"ເພາະ​ວ່າ​ແອັບຯ​ກຳ​ລັງ​ຂັດ​ຂວາງ​ການ​ຂໍ​ອະ​ນຸ​ຍາດ, ການ​ຕັ້ງ​ຄ່າ​ບໍ່​ສາ​ມາດກວດ​ສອບ​ການ​ຕອບ​ຮັບ​ຂອງ​ທ່ານ​ໄດ້."</string>
-    <string name="enable_service_encryption_warning" msgid="931082737770453755">"ຫາກ​ທ່ານ​ເປີດ​ໃຊ້ <xliff:g id="SERVICE">%1$s</xliff:g>, ​ອຸ​ປະ​ກອນ​ຂອງ​ທ່ານ​ຈະ​ບໍ່​ໃຊ້​ການ​ລັອກ​ໜ້າ​ຈໍ​ຂອງ​ທ່ານ​ເພື່ອ​ເພີ່ມ​ການ​ເຂົ້າ​ລະ​ຫັດ​ຂໍ້​ມູນ."</string>
-    <string name="secure_lock_encryption_warning" msgid="669152607190123579">"​ເນື່ອງ​ຈາກ​ທ່ານ​ໄດ້​ເປີດ​ບໍ​ລິ​ການ​ການ​ຊ່ວຍ​ການ​ເຂົ້າ​ເຖິງ, ອຸ​ປະ​ກອນ​ຂອງ​ທ່ານ​ຈະ​ບໍ່​ໃຊ້​ການ​ລັອກ​ໜ້າ​ຈໍ​ຂອງ​ທ່ານ​ເພື່ອ​ເພີ່ມ​ການ​ເຂົ້າ​ລະ​ຫັດ​ຂໍ້​ມູນ."</string>
-    <string name="enable_service_pattern_reason" msgid="6832846117817938536">"ເພາະ​ວ່າ​ການ​ເປີດ <xliff:g id="SERVICE">%1$s</xliff:g> ມີ​ຜົນ​ຕໍ່​ການ​ເຂົ້າ​ລະ​ຫັດ, ​ທ່ານ​ຈຶ່ງ​ຈຳ​ຕ້ອງ​ຢືນ​ຢັນ​ຮູບ​ແບບ​ການ​ລັອກ​ຂອງ​ທ່ານ."</string>
-    <string name="enable_service_pin_reason" msgid="6040417014360237703">"ເພາະ​ວ່າ​ການ​ເປີດ <xliff:g id="SERVICE">%1$s</xliff:g> ມີ​ຜົນ​ຕໍ່​ການ​ເຂົ້າ​ລະ​ຫັດ, ​ທ່ານ​ຈຶ່ງ​ຈຳ​ຕ້ອງ​ຢືນ​ຢັນ​​ລະ​ຫັດ PIN ​ຂອງ​ທ່ານ."</string>
-    <string name="enable_service_password_reason" msgid="6962544350351734238">"ເພາະ​ວ່າ​ການ​ເປີດ <xliff:g id="SERVICE">%1$s</xliff:g> ​ມີ​ຜົນ​ຕໍ່​ການ​ເຂົ້າ​ລະ​ຫັດ, ​ທ່ານ​ຈຶ່ງ​ຈຳ​ຕ້ອງ​ຢືນ​ຢັນ​ລະ​ຫັດ​ຜ່ານ​ຂອງ​ທ່ານ."</string>
     <string name="accessibility_service_warning" msgid="6779187188736432618">"<xliff:g id="SERVICE">%1$s</xliff:g> ກຳລັງຮ້ອງຂໍການຄວບຄຸມອຸປະກອນນີ້ຢ່າງເຕັມຮູບແບບ. ບໍລິການຈະສາມາດອ່ານໜ້າຈໍ ແລະ ດຳເນີນການໃນນາມຜູ້ໃຊ້ທີ່ມີຄວາມຕ້ອງການຊ່ວຍເຂົ້າເຖິງໄດ້. ການຄວບຄຸມລະດັບນີ້ບໍ່ເໝາະສົມສຳລັບແອັບສ່ວນໃຫຍ່."</string>
     <string name="accessibility_service_warning_description" msgid="6573203795976134751">"ການຄວບຄຸມແບບເຕັມຮູບແບບແມ່ນເໝາະສົມສຳລັບແອັບທີ່ຊ່ວຍທ່ານໃນດ້ານການຊ່ວຍເຂົ້າເຖິງ, ແຕ່ບໍ່ເໝາະສຳລັບທຸກແອັບ."</string>
     <string name="accessibility_service_screen_control_title" msgid="324795030658109870">"ເບິ່ງ ແລະ ຄວບຄຸມໜ້າຈໍ"</string>
@@ -3103,14 +3078,6 @@
     <string name="remove_account_failed" msgid="3709502163548900644">"ຜູ້ເບິ່ງແຍງລະບົບຂອງທ່ານບໍ່ອະນຸຍາດໃຫ້ປ່ຽນແປງສິ່ງນີ້"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"ບໍ່ສາມາດຊິ້ງຂໍ້ມູນເອງໄດ້"</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"ການຊິ້ງຂໍ້ມູນຂອງລາຍການນີ້ຖືກປິດຢູ່. ເພື່ອປ່ຽນການຕັ້ງຄ່ານີ້, ໃຫ້ເປິດການນຳໃຊ້ຂໍ້ມູນພື້ນຫຼັງ ແລະການຊິ້ງຂໍ້ມູນອັດຕະໂນມັດຊົ່ວຄາວ."</string>
-    <string name="enter_password" msgid="6327051330258595331">"ເພີ່ມ​ເລີ່ມ​ຕົ້ນ​ໃຊ້ Android, ໃຫ້​ໃສ່​ລະ​ຫັດ​ຜ່ານ​ຂອງ​ທ່ານ"</string>
-    <string name="enter_pin" msgid="1029287617551232681">"ເພີ່ມ​ເລີ່ມ​ຕົ້ນ​ໃຊ້ Android, ໃຫ້​​ໃສ່​ລະ​ຫັດ PIN ຂອງ​ທ່ານ"</string>
-    <string name="enter_pattern" msgid="1747316785866742960">"ເພີ່ມ​ເລີ່ມ​ຕົ້ນ​ໃຊ້ Android, ໃຫ້​ແຕ້ມ​ຮູບ​ແບບ​ປົດ​ລອກ​ຂອງ​ທ່ານ"</string>
-    <string name="cryptkeeper_wrong_pattern" msgid="340747269176120242">"ຮູບແບບປົດ​ລັອກ​ບໍ່​ຖືກ​ຕ້ອງ"</string>
-    <string name="cryptkeeper_wrong_password" msgid="7295607881887114486">"ລະຫັດຜ່ານ​ບໍ່ຖືກຕ້ອງ"</string>
-    <string name="cryptkeeper_wrong_pin" msgid="2347961593970714201">"ລະຫັດ PIN ​ບໍ່​ຖືກ​ຕ້ອງ"</string>
-    <string name="checking_decryption" msgid="6111642972615688237">"ກຳລັງກວດສອບ..."</string>
-    <string name="starting_android" msgid="6694154070215356186">"ກຳລັງເລີ່ມ Android…"</string>
     <string name="delete" msgid="8330605554706263775">"ລຶບ"</string>
     <string name="misc_files" msgid="6598066985800749585">"ໄຟລ໌ອື່ນໆ"</string>
     <string name="misc_files_selected_count" msgid="5597802791672749532">"ເລືອກແລ້ວ <xliff:g id="NUMBER">%1$d</xliff:g> ຈາກທັງໝົດ <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -3206,8 +3173,6 @@
     <string name="data_usage_metered_yes" msgid="4262598072030135223">"ມີການວັດແທກ"</string>
     <string name="data_usage_metered_no" msgid="1685828958417926268">"ບໍ່ມີການວັດແທກ"</string>
     <string name="data_usage_disclaimer" msgid="3271450299386176770">"​ການ​ນັບ​ຈ​ຳ​ນວນ​ຂໍ້​ມູນ​ທີ່​ໃຊ້​ຂອງ​ຜູ່​ໃຫ້​ບໍ​ລິ​ການ​ອາດ​ແຕກ​ຕ່າງ​ຈາກ​​ທີ່ອຸ​ປະ​ກອນ​ຂອງ​ທ່ານນັບ."</string>
-    <string name="cryptkeeper_emergency_call" msgid="8369322820475703306">"ການໂທສຸກເສີນ"</string>
-    <string name="cryptkeeper_return_to_call" msgid="3857250752781151232">"ກັບໄປຫາການໂທ"</string>
     <string name="vpn_name" msgid="3806456074909253262">"ຊື່"</string>
     <string name="vpn_type" msgid="5533202873260826663">"ປະເພດ"</string>
     <string name="vpn_server" msgid="2908816134941973935">"ທີ່ຢູ່ເຊີບເວີ"</string>
@@ -4764,8 +4729,6 @@
       <item quantity="one">1 ແອັບສາມາດໃຊ້ຂໍ້ມູນທີ່ບໍ່ຖືກຈຳກັດໄດ້</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"ເບິ່ງເພີ່ມເຕີມ"</string>
-    <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"ລຶບຂໍ້ມູນຜູ້ໃຊ້ ແລະ ແປງເປັນການເຂົ້າລະຫັດໄຟລ໌ແທ້ບໍ?"</string>
-    <string name="button_confirm_convert_fbe" msgid="339648921918438106">"ລຶບ ແລະ ປ່ຽນ"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"ຣີເຊັດການຈຳກັດອັດຕາ ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"ຣີເຊັດການຈຳກັດອັດຕາ ShortcutManager ແລ້ວ"</string>
     <string name="notification_suggestion_title" msgid="6309263655965785411">"ຂໍ້ມູນການຄວບຄຸມໃນໜ້າຈໍລັອກ"</string>
@@ -5292,6 +5255,7 @@
     <string name="sim_action_yes" msgid="8076556020131395515">"ແມ່ນ"</string>
     <string name="sim_action_reboot" msgid="3508948833333441538">"ຣີສະຕາດ"</string>
     <string name="sim_action_no_thanks" msgid="435717748384544195">"ບໍ່, ຂອບໃຈ"</string>
+    <string name="sim_action_cancel" msgid="2668099867029610910">"ຍົກເລີກ"</string>
     <string name="sim_switch_button" msgid="1405772571706095387">"ສະຫຼັບ"</string>
     <string name="dsds_activation_failure_title" msgid="4467364110584914794">"ບໍ່ສາມາດເປີດນຳໃຊ້ຊິມໄດ້"</string>
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"ກະລຸນາຖອດຊິມອອກແລ້ວໃສ່ເຂົ້າໄປໃໝ່. ຫາກຍັງຄົງພົບບັນຫາຢູ່, ໃຫ້ຣີສະຕາດອຸປະກອນຂອງທ່ານ."</string>
@@ -5444,6 +5408,10 @@
     <string name="cached_apps_freezer" msgid="1057519579761550350">"ລະງັບການດຳເນີນການສຳລັບແອັບທີ່ແຄສໄວ້"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"ອະນຸຍາດໃຫ້ມີການຊ້ອນໜ້າຈໍຢູ່ການຕັ້ງຄ່າ"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"ອະນຸຍາດໃຫ້ແອັບທີ່ສາມາດສະແດງຜົນທັບແອັບອື່ນເພື່ອຊ້ອນໜ້າຈໍການຕັ້ງຄ່າ"</string>
+    <!-- no translation found for allow_mock_modem (3832264806530479214) -->
+    <skip />
+    <!-- no translation found for allow_mock_modem_summary (9097416612748005374) -->
+    <skip />
     <string name="media_controls_title" msgid="403271085636252597">"ມີເດຍ"</string>
     <string name="media_controls_resume_title" msgid="855076860336652370">"ປັກໝຸດເຄື່ອງຫຼິ້ນມີເດຍ"</string>
     <string name="media_controls_resume_description" msgid="3163482266454802097">"ເພື່ອສືບຕໍ່ການຫຼິ້ນແບບໄວໆ, ເຄື່ອງຫຼິ້ນມີເດຍຈະເປີດປະໄວ້ໃນການຕັ້ງຄ່າດ່ວນ"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index c5fdb2b..272bf11 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -144,10 +144,11 @@
     <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"Leiskite įrenginiui užmegzti ryšį su netoliese esančiais „Bluetooth“ įrenginiais"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"Leiskite telefonui užmegzti ryšį su netoliese esančiais „Bluetooth“ įrenginiais"</string>
     <string name="bluetooth_disable_a2dp_hw_offload" msgid="5942913792817797541">"Išj. „Bluetooth“ A2DP apar. įr. iškelt."</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="8610420176339657720">"Pal. įr. iš naujo?"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8333029144800835996">"Turite paleisti įr. iš naujo, kad gal. pakeisti šį nustat."</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="3488695418187553566">"Pal. iš n."</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="4930826928585464191">"Atšaukti"</string>
+    <string name="bluetooth_disable_le_audio_hw_offload" msgid="3966022676505972908">"Išjungti „Bluetooth“ LE AUDIO aparatinės įrangos iškeltį"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_title" msgid="6001142380445276918">"Paleisti įrenginį iš naujo?"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_message" msgid="1524373895333698779">"Turite paleisti įrenginį iš naujo, kad galėtumėte pakeisti šį nustatymą."</string>
+    <string name="bluetooth_disable_hw_offload_dialog_confirm" msgid="5594859658551707592">"Paleisti iš naujo"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel" msgid="3663690305043973720">"Atšaukti"</string>
     <string name="connected_device_media_device_title" msgid="3783388247594566734">"Laikmenos"</string>
     <string name="connected_device_call_device_title" msgid="88732390601723608">"Skambinimo įrenginiai"</string>
     <string name="connected_device_other_device_title" msgid="4652120430615729193">"Kiti įrenginiai"</string>
@@ -315,9 +316,9 @@
     <string name="security_settings_title" msgid="6710768415432791970">"Sauga"</string>
     <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"Šifruotė ir prisijungimo duomenys"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"Telefonas užšifruotas"</string>
-    <string name="decryption_settings_summary" product="default" msgid="1742645256103613503">"Telefonas nešifruotas"</string>
+    <string name="not_encrypted_summary" product="default" msgid="2251945842585788254">"Telefonas nešifruotas"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"Įrenginys šifruotas"</string>
-    <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"Įrenginys nešifruotas"</string>
+    <string name="not_encrypted_summary" product="tablet" msgid="2374263654698719382">"Įrenginys nešifruotas"</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"Užrakinimo ekranas"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"Ką rodyti"</string>
     <string name="security_settings_summary" msgid="1627059516127354233">"Nustatyti mano vietą, ekrano atrakinimą, SIM kortelės užraktą, prisijungimo duomenų saugyklos užraktą"</string>
@@ -576,37 +577,10 @@
     <string name="fingerprint_last_delete_message" msgid="7860374760549404410">"Negalėsite naudoti kontrolinio kodo, kad atrakintumėte telefoną ar patvirtintumėte savo tapatybę programose."</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="4104208067277655068">"Negalėsite naudoti kontrolinio kodo, kad atrakintumėte darbo profilį, įgaliotumėte pirkimo operacijas ar prisijungtumėte prie darbo programų."</string>
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"Taip, pašalinti"</string>
-    <string name="crypt_keeper_settings_title" msgid="4938812137822100044">"Šifruotė"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"Šifruoti planšetinį kompiuterį"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"Šifruoti telefoną"</string>
-    <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"Šifruotas"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"Galite šifruoti paskyras, nustatymus, atsisiųstas programas ir jų duomenis, mediją ir kitus failus. Užšifravę planšetinį kompiuterį ir nustatę ekrano užraktą (šabloną, skaitinį PIN kodą ar slaptažodį), turėsite atrakinti ekraną, kad iššifruotumėte planšetinį kompiuterį kaskart, kai jį įjungsite. Vienintelis kitas būdas iššifruoti yra atkurti gamyklinius duomenis (bus ištrinti visi duomenys).\n\nŠifravimas užtruks valandą ar daugiau. Šifravimą pradėkite tik visiškai įkrovę akumuliatorių ir viso proceso metu planšetinis kompiuteris turėtų būti prijungtas prie maitinimo šaltinio. Jei pertrauksite procesą, galite prarasti dalį duomenų ar visus duomenis."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"Galite šifruoti paskyras, nustatymus, atsisiųstas programas ir jų duomenis, mediją ir kitus failus. Užšifravę telefoną ir nustatę ekrano užraktą (šabloną, skaitinį PIN kodą ar slaptažodį), turėsite atrakinti ekraną, kad iššifruotumėte telefoną kaskart, kai jį įjungsite. Vienintelis kitas būdas iššifruoti yra atkurti gamyklinius duomenis (bus ištrinti visi duomenys).\n\nŠifravimas užtruks valandą ar daugiau. Šifravimą pradėkite tik visiškai įkrovę akumuliatorių ir viso proceso metu telefonas turėtų būti prijungtas prie maitinimo šaltinio. Jei pertrauksite procesą, galite prarasti dalį duomenų ar visus duomenis."</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"Šifruoti planšetinį kompiuterį"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"Šifruoti telefoną"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"Įkraukite akumuliatorių ir bandykite dar kartą."</string>
-    <string name="crypt_keeper_unplugged_text" msgid="2709721134148651329">"Įjunkite kroviklį į lizdą ir bandykite dar kartą."</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="1847280235529858357">"Nėra ekrano užrakto PIN kodo ar slaptažodžio"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="7210616262954236042">"Prieš pradėdami šifravimo procesą turite nustatyti ekrano užrakto PIN kodą arba slaptažodį."</string>
-    <string name="crypt_keeper_confirm_title" msgid="8600000209722452230">"Šifruoti?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="3270587498436152259">"Šifravimo operacijos anuliuoti negalima ir, jei ją pertrauksite, prarasite duomenis. Šifravimas trunka valandą ar ilgiau; jam vykstant planšetinis kompiuteris kelis kartus bus paleidžiamas iš naujo."</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="3040428543349852419">"Šifravimo operacijos anuliuoti negalima ir, jei ją pertrauksite, prarasite duomenis. Šifravimas trunka valandą ar ilgiau; jam vykstant telefonas kelis kartus bus paleidžiamas iš naujo."</string>
-    <string name="crypt_keeper_setup_title" msgid="3339725741305796680">"Šifruojama"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="4417016995091289019">"Palaukite, kol šifruojamas planšetinis kompiuteris. Baigta <xliff:g id="PERCENT">^1</xliff:g> %."</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="7902355422499500352">"Palaukite, kol šifruojamas telefonas. Baigta <xliff:g id="PERCENT">^1</xliff:g> %."</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="8348188415839917821">"Palaukite, kol planšetinis kompiuteris bus užšifruotas. Liko laiko: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="8556105766597855198">"Palaukite, kol telefonas bus užšifruotas. Liko laiko: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="3832496715430327682">"Jei norite atrakinti planšetinį kompiuterį, išjunkite jį ir vėl įjunkite."</string>
-    <string name="crypt_keeper_force_power_cycle" product="default" msgid="5070346039522135361">"Jei norite atrakinti telefoną, išjunkite jį ir vėl įjunkite."</string>
-    <string name="crypt_keeper_warn_wipe" msgid="8104921337301750394">"Įspėjimas: įrenginys bus išvalytas, jei dar <xliff:g id="COUNT">^1</xliff:g> k. nesėkmingai bandysite jį atrakinti!"</string>
-    <string name="crypt_keeper_enter_password" msgid="1274917431075529732">"Įveskite slaptažodį"</string>
-    <string name="crypt_keeper_failed_title" msgid="8173654570682244149">"Šifruotė nepavyko"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"Šifravimas buvo pertrauktas ir negali būti užbaigtas. Todėl duomenys planšetiniame kompiuteryje nebepasiekiami. \n\n Jei norite vėl naudoti planšetinį kompiuterį, turite iš naujo nustatyti gamyklinius nustatymus. Kai iš naujo nustatę nustatysite planšetinį kompiuterį, galėsite atkurti visus duomenis, kurių atsarginės kopijos buvo sukurtos „Google“ paskyroje."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"Šifravimas buvo pertrauktas ir negali būti užbaigtas. Todėl duomenys telefone nebepasiekiami. \n\nJei norite vėl naudoti telefoną, turite iš naujo nustatyti gamyklinius nustatymus. Kai iš naujo nustatę nustatysite telefoną, galėsite atkurti visus duomenis, kurių atsarginės kopijos buvo sukurtos „Google“ paskyroje."</string>
-    <string name="crypt_keeper_data_corrupt_title" msgid="5920153462176846037">"Nepavyko iššifruoti"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"Įvestas slaptažodis tinkamas, bet, deja, jūsų duomenys sugadinti.\n\nKad galėtumėte vėl naudoti planšetinį kompiuterį, turite atkurti gamyklinius duomenis. Kai atkūrę duomenis nustatysite planšetinį kompiuterį, galėsite atkurti bet kokius duomenis, kurių atsarginės kopijos buvo sukurtos „Google“ paskyroje."</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"Įvestas slaptažodis tinkamas, bet, deja, jūsų duomenys sugadinti.\n\nKad galėtumėte vėl naudoti telefoną, turite atkurti gamyklinius duomenis. Kai atkūrę duomenis nustatysite telefoną, galėsite atkurti bet kokius duomenis, kurių atsarginės kopijos buvo sukurtos „Google“ paskyroje."</string>
-    <string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"Perjungti įvesties metodą"</string>
+    <string name="encryption_settings_title" msgid="2848716008695618360">"Šifruotė"</string>
+    <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"Planšetinio kompiuterio šifravimas"</string>
+    <string name="encrypt_title" product="default" msgid="7337365190988321100">"Telefono šifravimas"</string>
+    <string name="encrypted_summary" msgid="545623487587251207">"Šifruota"</string>
     <string name="suggested_lock_settings_title" msgid="7836065447159730217">"Apsaugokite telefoną"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"Nustatykite ekrano užraktą, kad apsaug. planš. komp."</string>
     <string name="suggested_lock_settings_summary" product="device" msgid="8479766049078378225">"Nustatykite ekrano užraktą, kad apsaugotumėte įrenginį"</string>
@@ -851,6 +825,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Galbūt reikės šį PIN kodą įvesti kitame įrenginyje."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Galbūt reikės šį prieigos raktą įvesti kitame įrenginyje."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Jei norite suporuoti su:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Įsitikinkite, kad jame rodomas šis prieigos raktas:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Patvirtinkite, kad susietumėte su suderintu rinkiniu"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"Iš:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Poruoti su šiuo įrenginiu?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Susieti su: <xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> Įveskite: <xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, tada paspauskite „Grįžti“ arba „Enter“."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Leisti pasiekti jūsų kontaktus ir skambučių istoriją"</string>
@@ -884,6 +859,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Nepavyko prisijungti. Bandykite dar kartą."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Išsami įrenginio info."</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Įrenginio „Bluetooth“ adresas: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Įrenginio „Bluetooth“ adresas:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Pamiršti įrenginį?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Pašalinti susiejimą"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Atjungti programą?"</string>
@@ -915,6 +891,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Atsiminti nustatymus"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Maksimalus prijungtų „Bluetooth“ garso įrenginių skaičius"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Pasirinkite maksimalų prijungtų „Bluetooth“ garso įrenginių skaičių"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"NFC dėklo derinimo žurnalas"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Padidinti NFC dėklo įrašymo į žurnalą lygį"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Perdavimas"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"ekrano vaizdo bendrinimas"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Įgalinti belaidį rodymą"</string>
@@ -1228,6 +1206,8 @@
     <string name="wifi_hotspot_maximize_compatibility_dual_ap_summary" msgid="3579549223159056533">"Padeda kitiems įrenginiams rasti šį viešosios interneto prieigos tašką. Naudojama daugiau akumuliatoriaus energijos."</string>
     <string name="wifi_tether_starting" msgid="8879874184033857814">"Įjungiamas viešosios interneto prieigos taškas…"</string>
     <string name="wifi_tether_stopping" msgid="4416492968019409188">"Išjungiamas viešosios interneto prieigos taškas…"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_title" msgid="3089432578433978073">"Įrenginio kaip modemo naudojimas nepasiekiamas"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_content" msgid="5920421547607921112">"Jei reikia išsamios informacijos, susisiekite su operatoriumi"</string>
     <string name="wifi_tether_enabled_subtext" msgid="5085002421099821056">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> aktyvus"</string>
     <string name="wifi_tether_failed_subtext" msgid="437190628041885500">"Kilnojamojo „Wi-Fi“ viešosios interneto prieigos taško klaida"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7072559431286459122">"Nustatyti „Wi-Fi“ viešosios interneto prieigos tašką"</string>
@@ -2592,11 +2572,6 @@
     <string name="enable_service_title" msgid="7231533866953706788">"Leisti „<xliff:g id="SERVICE">%1$s</xliff:g>“ valdyti visas įrenginio funkcijas?"</string>
     <string name="capabilities_list_title" msgid="1225853611983394386">"„<xliff:g id="SERVICE">%1$s</xliff:g>“ reikia:"</string>
     <string name="touch_filtered_warning" msgid="4225815157460318241">"Kadangi programa užstoja leidimo užklausą, nustatymuose negalima patvirtinti jūsų atsakymo."</string>
-    <string name="enable_service_encryption_warning" msgid="931082737770453755">"Jei įjungsite „<xliff:g id="SERVICE">%1$s</xliff:g>“, įrenginyje nebus naudojamas ekrano užraktas siekiant patobulinti duomenų šifruotę."</string>
-    <string name="secure_lock_encryption_warning" msgid="669152607190123579">"Kadangi įjungėte pritaikymo neįgaliesiems paslaugą, įrenginyje nebus naudojamas ekrano užraktas siekiant patobulinti duomenų šifruotę."</string>
-    <string name="enable_service_pattern_reason" msgid="6832846117817938536">"Įjungus „<xliff:g id="SERVICE">%1$s</xliff:g>“ paveikiama duomenų šifruotė, todėl reikia patvirtinti atrakinimo piešinį."</string>
-    <string name="enable_service_pin_reason" msgid="6040417014360237703">"Įjungus „<xliff:g id="SERVICE">%1$s</xliff:g>“ paveikiama duomenų šifruotė, todėl reikia patvirtinti PIN kodą."</string>
-    <string name="enable_service_password_reason" msgid="6962544350351734238">"Įjungus „<xliff:g id="SERVICE">%1$s</xliff:g>“ paveikiama duomenų šifruotė, todėl reikia patvirtinti slaptažodį."</string>
     <string name="accessibility_service_warning" msgid="6779187188736432618">"„<xliff:g id="SERVICE">%1$s</xliff:g>“ nori valdyti visas šio įrenginio funkcijas. Paslauga gali skaityti ekraną ir veikti specialiųjų poreikių turinčių naudotojų vardu. Šis valdymo lygis nėra tinkamas daugumai programų."</string>
     <string name="accessibility_service_warning_description" msgid="6573203795976134751">"Galimybę valdyti visas funkcijas patariama suteikti programoms, kurios padeda specialiųjų poreikių turintiems asmenims, bet ne daugumai programų."</string>
     <string name="accessibility_service_screen_control_title" msgid="324795030658109870">"Ekrano peržiūra ir valdymas"</string>
@@ -3183,14 +3158,6 @@
     <string name="remove_account_failed" msgid="3709502163548900644">"Administratorius neleidžia atlikti šio pakeitimo"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"Negalima sinchronizuoti neautomatiškai"</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"Šiuo metu šio elemento sinchronizavimas neleidžiamas. Jei norite pakeisti šį nustatymą, laikinai įjunkite foninius duomenis ir automatinį sinchronizavimą."</string>
-    <string name="enter_password" msgid="6327051330258595331">"Jei norite paleisti „Android“, įveskite slaptažodį"</string>
-    <string name="enter_pin" msgid="1029287617551232681">"Jei norite paleisti „Android“, įveskite PIN kodą"</string>
-    <string name="enter_pattern" msgid="1747316785866742960">"Jei norite paleisti „Android“, nupieškite savo šabloną"</string>
-    <string name="cryptkeeper_wrong_pattern" msgid="340747269176120242">"Netinkamas piešinys"</string>
-    <string name="cryptkeeper_wrong_password" msgid="7295607881887114486">"Netinkamas slaptažodis"</string>
-    <string name="cryptkeeper_wrong_pin" msgid="2347961593970714201">"Netinkamas PIN kodas"</string>
-    <string name="checking_decryption" msgid="6111642972615688237">"Tikrinama…"</string>
-    <string name="starting_android" msgid="6694154070215356186">"Paleidžiama „Android“…"</string>
     <string name="delete" msgid="8330605554706263775">"Ištrinti"</string>
     <string name="misc_files" msgid="6598066985800749585">"Įvairūs failai"</string>
     <string name="misc_files_selected_count" msgid="5597802791672749532">"pasirinkti (-a) <xliff:g id="NUMBER">%1$d</xliff:g> iš <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -3286,8 +3253,6 @@
     <string name="data_usage_metered_yes" msgid="4262598072030135223">"Matuojamas"</string>
     <string name="data_usage_metered_no" msgid="1685828958417926268">"Nematuojamas"</string>
     <string name="data_usage_disclaimer" msgid="3271450299386176770">"Operatoriaus duomenų apskaita gali skirtis nuo informacijos įrenginyje."</string>
-    <string name="cryptkeeper_emergency_call" msgid="8369322820475703306">"Skambutis pagalbos numeriu"</string>
-    <string name="cryptkeeper_return_to_call" msgid="3857250752781151232">"Grįžti prie skambučio"</string>
     <string name="vpn_name" msgid="3806456074909253262">"Pavadinimas"</string>
     <string name="vpn_type" msgid="5533202873260826663">"Tipas"</string>
     <string name="vpn_server" msgid="2908816134941973935">"Serverio adresas"</string>
@@ -4914,8 +4879,6 @@
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> programų gali naudoti neribotus duomenis</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"Žr. daugiau"</string>
-    <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"Tikrai išvalyti naudotojo duomenis ir konvertuoti į failų šifruotę?"</string>
-    <string name="button_confirm_convert_fbe" msgid="339648921918438106">"Išvalyti ir konvertuoti"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"Iš naujo nustatyti „ShortcutManager“ įkainių ribojimą"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"„ShortcutManager“ įkainių ribojimas nustatytas iš naujo"</string>
     <string name="notification_suggestion_title" msgid="6309263655965785411">"Valdykite informaciją užrakinimo ekrane"</string>
@@ -5466,6 +5429,7 @@
     <string name="sim_action_yes" msgid="8076556020131395515">"Taip"</string>
     <string name="sim_action_reboot" msgid="3508948833333441538">"Paleisti iš naujo"</string>
     <string name="sim_action_no_thanks" msgid="435717748384544195">"Ne, ačiū"</string>
+    <string name="sim_action_cancel" msgid="2668099867029610910">"Atšaukti"</string>
     <string name="sim_switch_button" msgid="1405772571706095387">"Perjungti"</string>
     <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Nepavyko suaktyvinti SIM kortelės"</string>
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Išimkite SIM kortelę ir vėl įdėkite. Jei problema išlieka, iš naujo paleiskite įrenginį."</string>
@@ -5622,6 +5586,10 @@
     <string name="cached_apps_freezer" msgid="1057519579761550350">"Sustabdykite talpykloje išsaugotų programų vykdymą"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"Leisti ekranų perdangas skiltyje „Nustatymai“"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Leiskite virš kitų programų rodomoms programoms perdengti skilties „Nustatymai“ ekranus"</string>
+    <!-- no translation found for allow_mock_modem (3832264806530479214) -->
+    <skip />
+    <!-- no translation found for allow_mock_modem_summary (9097416612748005374) -->
+    <skip />
     <string name="media_controls_title" msgid="403271085636252597">"Medija"</string>
     <string name="media_controls_resume_title" msgid="855076860336652370">"Medijos leistuvės prisegimas"</string>
     <string name="media_controls_resume_description" msgid="3163482266454802097">"Kad būtų galima sparčiai atnaujinti atkūrimą, medijos leistuvė lieka atidaryta „Sparčiųjų nustatymų“ skiltyje"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index f748239..ad08c87 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -30,7 +30,7 @@
     </plurals>
     <string name="show_dev_on" msgid="2840850085134853754">"Tagad jūs esat izstrādātājs!"</string>
     <string name="show_dev_already" msgid="7041756429707644630">"Nav nepieciešams, ja jau esat izstrādātājs."</string>
-    <string name="dev_settings_disabled_warning" msgid="6971867026249671244">"Lūdzu, vispirms iespējojiet izstrādātājiem paredzētās opcijas."</string>
+    <string name="dev_settings_disabled_warning" msgid="6971867026249671244">"Lūdzu, vispirms iespējojiet izstrādātāju opcijas."</string>
     <string name="header_category_wireless_networks" msgid="303445626075235229">"Bezvadu sakari un tīkli"</string>
     <string name="header_category_system" msgid="1665516346845259058">"Sistēma"</string>
     <string name="radioInfo_service_in" msgid="9088637745836646271">"Darbojas"</string>
@@ -143,10 +143,11 @@
     <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"Ļaujiet ierīcei izveidot savienojumu ar tuvumā esošām Bluetooth ierīcēm."</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"Ļaujiet tālrunim izveidot savienojumu ar tuvumā esošām Bluetooth ierīcēm."</string>
     <string name="bluetooth_disable_a2dp_hw_offload" msgid="5942913792817797541">"Atspējot Bluetooth A2DP aparatūras izlādi"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="8610420176339657720">"Restartēt ierīci?"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8333029144800835996">"Lai mainītu šo iestatījumu, jums jārestartē ierīce."</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="3488695418187553566">"Restartēt"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="4930826928585464191">"Atcelt"</string>
+    <string name="bluetooth_disable_le_audio_hw_offload" msgid="3966022676505972908">"Atspējot Bluetooth LE AUDIO aparatūras izlādi"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_title" msgid="6001142380445276918">"Vai restartēt ierīci?"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_message" msgid="1524373895333698779">"Lai mainītu šo iestatījumu, jums jārestartē ierīce."</string>
+    <string name="bluetooth_disable_hw_offload_dialog_confirm" msgid="5594859658551707592">"Restartēt"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel" msgid="3663690305043973720">"Atcelt"</string>
     <string name="connected_device_media_device_title" msgid="3783388247594566734">"Multivides ierīces"</string>
     <string name="connected_device_call_device_title" msgid="88732390601723608">"Zvanīšanas ierīces"</string>
     <string name="connected_device_other_device_title" msgid="4652120430615729193">"Citas ierīces"</string>
@@ -312,9 +313,9 @@
     <string name="security_settings_title" msgid="6710768415432791970">"Drošība"</string>
     <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"Šifrēšana un akreditācijas dati"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"Tālrunis ir šifrēts"</string>
-    <string name="decryption_settings_summary" product="default" msgid="1742645256103613503">"Tālrunis nav šifrēts"</string>
+    <string name="not_encrypted_summary" product="default" msgid="2251945842585788254">"Tālrunis nav šifrēts"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"Ierīce ir šifrēta"</string>
-    <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"Ierīce nav šifrēta"</string>
+    <string name="not_encrypted_summary" product="tablet" msgid="2374263654698719382">"Ierīce nav šifrēta"</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"Bloķēšanas ekrāns"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"Ko rādīt"</string>
     <string name="security_settings_summary" msgid="1627059516127354233">"Manas atrašanās vietas, ekrāna atbloķēšanas, SIM kartes bloķēšanas, akreditācijas datu krātuves bloķēšanas iestatīšana"</string>
@@ -572,37 +573,10 @@
     <string name="fingerprint_last_delete_message" msgid="7860374760549404410">"Jūs nevarēsiet izmantot pirksta nospiedumu, lai autorizētu tālruni vai apstiprinātu savu identitāti lietotnēs."</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="4104208067277655068">"Jūs nevarēsiet izmantot pirksta nospiedumu, lai atbloķētu darba profilu, autorizētu pirkumus vai pierakstītos darba lietotnēs."</string>
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"Jā, noņemt"</string>
-    <string name="crypt_keeper_settings_title" msgid="4938812137822100044">"Šifrējums"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"Šifrēt planšetdatoru"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"Šifrēt tālruni"</string>
-    <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"Šifrēts"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"Varat šifrēt savus kontus, iestatījumus, lejupielādētās lietotnes un to datus, multivides un citu formātu failus. Pēc planšetdatora šifrēšanas, pieņemot, ka esat iestatījis bloķēšanas ekrānu (t.i., izmantojot kombināciju, skaitlisku PIN kodu vai paroli), jums būs jāatbloķē ekrāns vai jāatšifrē planšetdators katru reizi, kad to ieslēgsiet. Vienīgais alternatīvais veids, kā atšifrēt planšetdatoru, ir veikt rūpnīcas datu atiestatīšanu, izdzēšot visus datus.\n\nŠifrēšana ilgst vismaz stundu. Planšetdatora akumulatoram šī procesa sākumā ir jābūt uzlādētam, un planšetdatoram visu procesa laiku ir jābūt pievienotam lādētājam. Ja tiks pārtraukta lādēšana, zaudēsiet daļu datu vai visus datus."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"Varat šifrēt savus kontus, iestatījumus, lejupielādētās lietotnes un to datus, multivides un citu formātu failus. Pēc tālruņa šifrēšanas, pieņemot, ka esat iestatījis bloķēšanas ekrānu (t.i., izmantojot kombināciju, skaitlisku PIN kodu vai paroli), jums būs jāatbloķē ekrāns vai jāatšifrē tālrunis katru reizi, kad to ieslēgsiet. Vienīgais alternatīvais veids, kā atšifrēt tālruni, ir veikt rūpnīcas datu atiestatīšanu, izdzēšot visus datus.\n\nŠifrēšana ilgst vismaz stundu. Tālruņa akumulatoram šī procesa sākumā ir jābūt uzlādētam, un tālrunim visu procesa laiku ir jābūt pievienotam lādētājam. Ja tiks pārtraukta lādēšana, zaudēsiet daļu datu vai visus datus."</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"Šifrēt planšetdatoru"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"Šifrēt tālruni"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"Uzlādējiet akumulatoru un mēģiniet vēlreiz."</string>
-    <string name="crypt_keeper_unplugged_text" msgid="2709721134148651329">"Pievienojiet lādētāju un mēģiniet vēlreiz."</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="1847280235529858357">"Nav ekrāna bloķēšanas PIN vai paroles"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="7210616262954236042">"Lai varētu sākt šifrēšanu, ir jāiestata bloķēšanas ekrāna PIN vai parole."</string>
-    <string name="crypt_keeper_confirm_title" msgid="8600000209722452230">"Vai veikt šifrēšanu?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="3270587498436152259">"Šifrēšanas darbība ir neatgriezeniska; pārtraucot šifrēšanu, dati tiks zaudēti. Šifrēšana ilgst vienu stundu vai ilgāk, un tās laikā planšetdators vairākas reizes tiks restartēts."</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="3040428543349852419">"Šifrēšanas darbība ir neatgriezeniska; pārtraucot šifrēšanu, dati tiks zaudēti. Šifrēšana ilgst vienu stundu vai ilgāk, un tās laikā tālrunis vairākas reizes tiks restartēts."</string>
-    <string name="crypt_keeper_setup_title" msgid="3339725741305796680">"Šifrēšana"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="4417016995091289019">"Uzgaidiet, kamēr tiek šifrēts jūsu planšetdators. Pabeigti <xliff:g id="PERCENT">^1</xliff:g>%."</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="7902355422499500352">"Uzgaidiet, kamēr tiek šifrēts jūsu tālrunis. Pabeigti <xliff:g id="PERCENT">^1</xliff:g>%."</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="8348188415839917821">"Uzgaidiet, līdz tiks pabeigta planšetdatora šifrēšana. Atlikušais laiks: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="8556105766597855198">"Uzgaidiet, līdz tiks pabeigta tālruņa šifrēšana. Atlikušais laiks: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="3832496715430327682">"Lai atbloķētu planšetdatoru, izslēdziet un atkal ieslēdziet to."</string>
-    <string name="crypt_keeper_force_power_cycle" product="default" msgid="5070346039522135361">"Lai atbloķētu tālruni, izslēdziet un atkal ieslēdziet to."</string>
-    <string name="crypt_keeper_warn_wipe" msgid="8104921337301750394">"Brīdinājums: pēc vēl <xliff:g id="COUNT">^1</xliff:g> neveiksmīgiem ierīces atbloķēšanas mēģinājumiem tās dati tiks dzēsti."</string>
-    <string name="crypt_keeper_enter_password" msgid="1274917431075529732">"Ierakstiet paroli"</string>
-    <string name="crypt_keeper_failed_title" msgid="8173654570682244149">"Šifrēšana neizdevās."</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"Šifrēšana tika pārtraukta, un to nevar pabeigt. Planšetdatora dati vairs nav pieejami.\n\nLai atsāktu lietot planšetdatoru, ir jāveic rūpnīcas iestatījumu atiestatīšana. Kad pēc atiestatīšanas esat pabeidzis planšetdatora iestatīšanu, varat atjaunot visus datus, kas tika dublēti jūsu Google kontā."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"Šifrēšana tika pārtraukta, un to nevar pabeigt. Tālruņa dati vairs nav pieejami.\n\nLai atsāktu lietot tālruni, ir jāveic rūpnīcas iestatījumu atiestatīšana. Kad pēc atiestatīšanas esat pabeidzis tālruņa iestatīšanu, varat atjaunot visus datus, kas tika dublēti jūsu Google kontā."</string>
-    <string name="crypt_keeper_data_corrupt_title" msgid="5920153462176846037">"Atšifrēšana neizdevās"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"Ievadītā parole ir pareiza, bet diemžēl jūsu dati ir bojāti.\n\nLai varētu atsākt lietot planšetdatoru, ir jāatiestata rūpnīcas dati. Kad planšetdators būs atiestatīts, varēsiet atjaunot visus datus, kas bija dublēti jūsu Google kontā."</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"Ievadītā parole ir pareiza, bet diemžēl jūsu dati ir bojāti.\n\nLai varētu atsākt lietot tālruni, ir jāatiestata rūpnīcas dati. Kad tālrunis būs atiestatīts, varēsiet atjaunot visus datus, kas bija dublēti jūsu Google kontā."</string>
-    <string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"Pārslēgt ievades metodi"</string>
+    <string name="encryption_settings_title" msgid="2848716008695618360">"Šifrēšana"</string>
+    <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"Šifrēt planšetdatoru"</string>
+    <string name="encrypt_title" product="default" msgid="7337365190988321100">"Šifrēt tālruni"</string>
+    <string name="encrypted_summary" msgid="545623487587251207">"Šifrēts"</string>
     <string name="suggested_lock_settings_title" msgid="7836065447159730217">"Tālruņa drošība"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"Iestatiet ekr. bloķ. opciju planšetdatora aizsardzībai"</string>
     <string name="suggested_lock_settings_summary" product="device" msgid="8479766049078378225">"Iestatiet ekrāna bloķēšanas opciju ierīces aizsardzībai"</string>
@@ -834,6 +808,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Iespējams, šis PIN būs jāievada arī otrā ierīcē."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Iespējams, šī ieejas atslēga būs jāievada arī otrā ierīcē."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Lai savienotu pārī ar:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Pārliecinieties, ka tiek rādīta šī ieejas atslēga:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Apstipriniet, lai savienotu pārī ar koordinēto kopu."</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"No:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Vai savienot pārī ar šo ierīci?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Lai izveidotu savienojumu pārī ar ierīci <xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>, ierakstiet tajā atslēgu <xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g> un pēc tam nospiediet ievadīšanas taustiņu."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Atļaut piekļuvi jūsu kontaktpersonām un zvanu vēsturei"</string>
@@ -867,6 +842,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Nevarēja izveidot savienojumu. Mēģiniet vēlreiz."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Ierīces dati"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Ierīces Bluetooth adrese: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Ierīces Bluetooth adrese:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Vai aizmirst ierīci?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Noņemt saistījumu"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Vai atvienot lietotni?"</string>
@@ -898,6 +874,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Iegaumēt iestatījumus"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Pievienoto Bluetooth audioierīču maksimālais skaits"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Pievienoto Bluetooth audioierīču maksimālā skaita atlase"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"NFC steka atkļūdošanas žurnāls"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Palielināt NFC steka reģistrēšanas līmeni"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Apraide"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"spogulis"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Bezvadu attēlošanas iespējošana"</string>
@@ -1047,13 +1025,13 @@
     <string name="wifi_subscription_summary" msgid="18802471063384598">"Skatīt vai mainīt abonementu"</string>
     <string name="wifi_privacy_settings_ephemeral_summary" msgid="8502084692297249372">"Nejauši atlasīta MAC adr."</string>
     <string name="wifi_dpp_add_device_to_network" msgid="6141246783457722976">"Ierīces pievienošana"</string>
-    <string name="wifi_dpp_center_qr_code" msgid="5270782275746178104">"Lai izveidotu ierīces savienojumu ar <xliff:g id="SSID">%1$s</xliff:g>, centrējiet tālāk norādīto QR kodu."</string>
-    <string name="wifi_dpp_scan_qr_code" msgid="3543923817779444434">"QR koda skenēšana"</string>
-    <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Lai izveidotu savienojumu ar <xliff:g id="SSID">%1$s</xliff:g>, centrējiet tālāk norādīto QR kodu."</string>
-    <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Lai pievienotos Wi-Fi tīklam, skenējiet ātrās atbildes kodu."</string>
+    <string name="wifi_dpp_center_qr_code" msgid="5270782275746178104">"Lai izveidotu ierīces savienojumu ar <xliff:g id="SSID">%1$s</xliff:g>, centrējiet tālāk norādīto kvadrātkodu."</string>
+    <string name="wifi_dpp_scan_qr_code" msgid="3543923817779444434">"Kvadrātkoda skenēšana"</string>
+    <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Lai izveidotu savienojumu ar <xliff:g id="SSID">%1$s</xliff:g>, centrējiet tālāk norādīto kvadrātkodu."</string>
+    <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Lai pievienotos Wi-Fi tīklam, skenējiet kvadrātkodu."</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Wi‑Fi tīkla koplietošana"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Lai pievienotos tīklam “<xliff:g id="SSID">%1$s</xliff:g>”, skenējiet šo ātrās atbildes kodu, izmantojot citu ierīci."</string>
-    <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Lai izveidotu savienojumu ar tīklu <xliff:g id="SSID">%1$s</xliff:g>, skenējiet šo QR kodu"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Lai pievienotos tīklam “<xliff:g id="SSID">%1$s</xliff:g>”, skenējiet šo kvadrātkodu, izmantojot citu ierīci."</string>
+    <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Lai izveidotu savienojumu ar tīklu <xliff:g id="SSID">%1$s</xliff:g>, skenējiet šo kvadrātkodu"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Mēģiniet vēlreiz. Ja problēma joprojām pastāv, sazinieties ar ierīces ražotāju."</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Radās problēma"</string>
     <string name="wifi_dpp_failure_timeout" msgid="7902971341771145564">"Ierīcei ir jābūt pievienotai, uzlādētai un ieslēgtai"</string>
@@ -1080,8 +1058,8 @@
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Automātiski izveidot savienojumu"</string>
     <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Atļaujiet savienojuma izveidi ar šo tīklu, kad tas ir pieejams"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Pievienot ierīci"</string>
-    <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Izmantojiet ātrās atbildes kodu, lai pievienotu ierīci šim tīklam"</string>
-    <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"Ātrās atbildes koda formāts nav derīgs."</string>
+    <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Izmantojiet kvadrātkodu, lai pievienotu ierīci šim tīklam"</string>
+    <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"Kvadrātkoda formāts nav derīgs."</string>
     <string name="retry" msgid="7542103800274026915">"Mēģināt vēlreiz"</string>
     <string name="wifi_shared" msgid="8850748923537589782">"Koplietot ar citiem ierīces lietotājiem"</string>
     <string name="wifi_unchanged" msgid="8026045290856150191">"(bez izmaiņām)"</string>
@@ -1208,6 +1186,8 @@
     <string name="wifi_hotspot_maximize_compatibility_dual_ap_summary" msgid="3579549223159056533">"Palīdz citām ierīcēm noteikt šo tīklāju. Šī funkcija palielina akumulatora lietojumu."</string>
     <string name="wifi_tether_starting" msgid="8879874184033857814">"Notiek tīklāja ieslēgšana…"</string>
     <string name="wifi_tether_stopping" msgid="4416492968019409188">"Notiek tīklāja izslēgšana…"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_title" msgid="3089432578433978073">"Piesaiste nav pieejama"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_content" msgid="5920421547607921112">"Lai iegūtu detalizētu informāciju, sazinieties ar mobilo sakaru operatoru."</string>
     <string name="wifi_tether_enabled_subtext" msgid="5085002421099821056">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> ir aktīvs"</string>
     <string name="wifi_tether_failed_subtext" msgid="437190628041885500">"Pārnēsājamā Wi-Fi tīklāja kļūda"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7072559431286459122">"Iestatīt Wi-Fi tīklāju"</string>
@@ -2563,11 +2543,6 @@
     <string name="enable_service_title" msgid="7231533866953706788">"Vai atļaut pakalpojumam <xliff:g id="SERVICE">%1$s</xliff:g> pilnībā kontrolēt jūsu ierīci?"</string>
     <string name="capabilities_list_title" msgid="1225853611983394386">"Pakalpojumam <xliff:g id="SERVICE">%1$s</xliff:g> nepieciešams:"</string>
     <string name="touch_filtered_warning" msgid="4225815157460318241">"Lietotne Iestatījumi nevar verificēt jūsu atbildi, jo cita lietotne aizsedz atļaujas pieprasījumu."</string>
-    <string name="enable_service_encryption_warning" msgid="931082737770453755">"Ja ieslēgsiet pakalpojumu <xliff:g id="SERVICE">%1$s</xliff:g>, ierīce neizmantos ekrāna bloķēšanu datu šifrēšanas uzlabošanai."</string>
-    <string name="secure_lock_encryption_warning" msgid="669152607190123579">"Tā kā esat ieslēdzis pieejamības pakalpojumu, ierīce neizmantos ekrāna bloķēšanu datu šifrēšanas uzlabošanai."</string>
-    <string name="enable_service_pattern_reason" msgid="6832846117817938536">"Tā kā pakalpojuma <xliff:g id="SERVICE">%1$s</xliff:g> ieslēgšana ietekmē datu šifrēšanu, jums ir jāapstiprina sava grafiskā atslēga."</string>
-    <string name="enable_service_pin_reason" msgid="6040417014360237703">"Tā kā pakalpojuma <xliff:g id="SERVICE">%1$s</xliff:g> ieslēgšana ietekmē datu šifrēšanu, jums ir jāapstiprina savs PIN."</string>
-    <string name="enable_service_password_reason" msgid="6962544350351734238">"Tā kā pakalpojuma <xliff:g id="SERVICE">%1$s</xliff:g> ieslēgšana ietekmē datu šifrēšanu, jums ir jāapstiprina sava parole."</string>
     <string name="accessibility_service_warning" msgid="6779187188736432618">"Pakalpojums <xliff:g id="SERVICE">%1$s</xliff:g> pieprasa pilnīgu šīs ierīces kontroli. Pakalpojums var piekļūt ekrānā redzamajai informācijai un veikt darbības to lietotāju vārdā, kuriem ir īpašas vajadzības. Šāda līmeņa kontrole vairākumam lietotņu nav nepieciešama."</string>
     <string name="accessibility_service_warning_description" msgid="6573203795976134751">"Pilnīga kontrole ir piemērota lietotnēm, kas nepieciešamas lietotājiem ar īpašām vajadzībām, taču ne lielākajai daļai lietotņu."</string>
     <string name="accessibility_service_screen_control_title" msgid="324795030658109870">"Skatīt un pārvaldīt ekrānu"</string>
@@ -3143,14 +3118,6 @@
     <string name="remove_account_failed" msgid="3709502163548900644">"Jūsu administrators neļauj veikt šīs izmaiņas."</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"Nevar sinhronizēt manuāli"</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"Pašlaik ir atspējota šī vienuma sinhronizācija. Lai mainītu šo iestatījumu, īslaicīgi ieslēdziet fona datu lietojumu un automātisko sinhronizāciju."</string>
-    <string name="enter_password" msgid="6327051330258595331">"Lai startētu Android ierīci, ievadiet savu paroli"</string>
-    <string name="enter_pin" msgid="1029287617551232681">"Lai startētu Android ierīci, ievadiet savu PIN kodu"</string>
-    <string name="enter_pattern" msgid="1747316785866742960">"Lai startētu Android ierīci, uzzīmējiet savu kombināciju"</string>
-    <string name="cryptkeeper_wrong_pattern" msgid="340747269176120242">"Nepareiza kombinācija."</string>
-    <string name="cryptkeeper_wrong_password" msgid="7295607881887114486">"Nepareiza parole."</string>
-    <string name="cryptkeeper_wrong_pin" msgid="2347961593970714201">"Nepareizs PIN kods."</string>
-    <string name="checking_decryption" msgid="6111642972615688237">"Notiek pārbaude..."</string>
-    <string name="starting_android" msgid="6694154070215356186">"Notiek Android startēšana…"</string>
     <string name="delete" msgid="8330605554706263775">"Dzēst"</string>
     <string name="misc_files" msgid="6598066985800749585">"Dažādi faili"</string>
     <string name="misc_files_selected_count" msgid="5597802791672749532">"Atlasīti <xliff:g id="NUMBER">%1$d</xliff:g> no <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -3246,8 +3213,6 @@
     <string name="data_usage_metered_yes" msgid="4262598072030135223">"Maksas"</string>
     <string name="data_usage_metered_no" msgid="1685828958417926268">"Nav maksas"</string>
     <string name="data_usage_disclaimer" msgid="3271450299386176770">"Mobilo sakaru operatora datu uzskaite var atšķirties no datu uzskaites ierīcē."</string>
-    <string name="cryptkeeper_emergency_call" msgid="8369322820475703306">"Ārkārtas zvans"</string>
-    <string name="cryptkeeper_return_to_call" msgid="3857250752781151232">"Atgriezties pie zvana"</string>
     <string name="vpn_name" msgid="3806456074909253262">"Nosaukums"</string>
     <string name="vpn_type" msgid="5533202873260826663">"Veids"</string>
     <string name="vpn_server" msgid="2908816134941973935">"Servera adrese"</string>
@@ -4267,7 +4232,7 @@
     <string name="screen_pinning_description" msgid="7289730998890213708">"Kamēr lietotne ir piesprausta, tā var atvērt citas lietotnes, kā arī var būt iespējams piekļūt personas datiem. \n\nLai izmantotu lietotņu piespraušanu, veiciet tālāk norādītās darbības: 	\n1.	Ieslēdziet lietotņu piespraušanu. 	\n2.	Atveriet sadaļu Pārskats. 	\n3.	Ekrāna augšdaļā pieskarieties konkrētas lietotnes ikonai un pēc tam — vienumam Piespraust."</string>
     <string name="screen_pinning_guest_user_description" msgid="5826264265872938958">"Kamēr lietotne ir piesprausta, tā var atvērt citas lietotnes, kā arī var būt iespējams piekļūt personas datiem. \n\nJa vēlaties droši kopīgot savu ierīci ar citu personu, lietotņu piespraušanas vietā varat izmantot vieslietotāja profilu. \n\nLai izmantotu lietotņu piespraušanu, veiciet tālāk norādītās darbības. 	\n1.	Ieslēdziet lietotņu piespraušanu. 	\n2.	Atveriet sadaļu Pārskats. 	\n3.	Ekrāna augšdaļā pieskarieties konkrētas lietotnes ikonai un pēc tam — vienumam Piespraust."</string>
     <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"Kamēr lietotne ir piesprausta, pastāv šādi riski. \n\n•	 Var būt iespējams piekļūt personas datiem \n		(piemēram, kontaktpersonu sarakstam un e-pasta ziņojumu saturam). \n•	 Piespraustā lietotne var atvērt citas lietotnes. \n\nIzmantojiet lietotņu piespraušanu tikai kopā ar uzticamām personām."</string>
-    <string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"Pirms atspraušanas pieprasīt grafisko atsl."</string>
+    <string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"Pirms atspraušanas pieprasīt atbloķēšanas kombināciju"</string>
     <string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"Prasīt PIN kodu pirms atspraušanas"</string>
     <string name="screen_pinning_unlock_password" msgid="4957969621904790573">"Pirms atspraušanas pieprasīt paroli"</string>
     <string name="screen_pinning_unlock_none" msgid="2474959642431856316">"Bloķēt ierīci, kad tiek veikta atspraušana"</string>
@@ -4839,8 +4804,6 @@
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> lietotnēs var izmantot neierobežotu datu apjomu</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"Skatīt vairāk"</string>
-    <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"Vai tiešām vēlaties dzēst lietotāja datus un pārvērst par failu šifrējumu?"</string>
-    <string name="button_confirm_convert_fbe" msgid="339648921918438106">"Dzēst un pārvērst"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"Vai atiestatīt ShortcutManager ātruma ierobežošanu?"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"ShortcutManager ātruma ierobežošana ir atiestatīta."</string>
     <string name="notification_suggestion_title" msgid="6309263655965785411">"Kontrolējiet informāciju bloķēšanas ekrānā"</string>
@@ -5128,7 +5091,7 @@
     <string name="autofill_max_partitions" msgid="7342195529574406366">"Maksimālais pieprasījumu skaits katrā sesijā"</string>
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"Maksimālais redzamo datu kopu skaits"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"Atiestatīt uz noklusējuma vērtībām"</string>
-    <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"Izstrādātājiem paredzēto opciju automātiskā aizpilde ir atiestatīta."</string>
+    <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"Izstrādātāju opciju automātiskā aizpilde ir atiestatīta."</string>
     <string name="location_category" msgid="3496759112306219062">"Atrašanās vieta"</string>
     <string name="location_indicator_settings_title" msgid="6655916258720093451">"Atrašanās vietas indikators statusa joslā"</string>
     <string name="location_indicator_settings_description" msgid="2888022085372804021">"Rādīt vienmēr, kad tiek noteikta atrašanās vieta, tostarp tad, ja tā var tikt atklāta, izmantojot tīklu vai savienojamību"</string>
@@ -5379,6 +5342,7 @@
     <string name="sim_action_yes" msgid="8076556020131395515">"Jā"</string>
     <string name="sim_action_reboot" msgid="3508948833333441538">"Restartēt"</string>
     <string name="sim_action_no_thanks" msgid="435717748384544195">"Nē, paldies"</string>
+    <string name="sim_action_cancel" msgid="2668099867029610910">"Atcelt"</string>
     <string name="sim_switch_button" msgid="1405772571706095387">"Pārslēgt"</string>
     <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Nevar aktivizēt SIM karti"</string>
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Izņemiet un atkal ievietojiet SIM karti. Ja problēma nav novērsta, restartējiet savu ierīci."</string>
@@ -5533,6 +5497,10 @@
     <string name="cached_apps_freezer" msgid="1057519579761550350">"Kešatmiņā saglabāto lietotņu izpildes apturēšana"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"Atļaut ekrānu pārklāšanu iestatījumos"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Atļaut lietotnēm, ko var rādīt pāri citām lietotnēm, pārklāt iestatījumu ekrānus"</string>
+    <!-- no translation found for allow_mock_modem (3832264806530479214) -->
+    <skip />
+    <!-- no translation found for allow_mock_modem_summary (9097416612748005374) -->
+    <skip />
     <string name="media_controls_title" msgid="403271085636252597">"Multivide"</string>
     <string name="media_controls_resume_title" msgid="855076860336652370">"Piespraust multivides atskaņotāju"</string>
     <string name="media_controls_resume_description" msgid="3163482266454802097">"Multivides atskaņotājs paliek atvērts sadaļā Ātrie iestatījumi, lai varētu ātri atsākt atskaņošanu"</string>
@@ -5615,7 +5583,7 @@
     <string name="prevent_ringing_main_switch_title" msgid="4726252811262086643">"Izmantot zvana signāla novēršanu"</string>
     <string name="use_wifi_hotsopt_main_switch_title" msgid="3909731167290690539">"Izmantot Wi-Fi tīklāju"</string>
     <string name="app_pinning_main_switch_title" msgid="5465506660064032876">"Izmantot lietotņu piespraušanu"</string>
-    <string name="developer_options_main_switch_title" msgid="1720074589554152501">"Izmantot izstrādātājiem paredzētās opcijas"</string>
+    <string name="developer_options_main_switch_title" msgid="1720074589554152501">"Izmantot izstrādātāju opcijas"</string>
     <string name="default_print_service_main_switch_title" msgid="4697133737128324036">"Izmantot drukāšanas pakalpojumu"</string>
     <string name="multiple_users_main_switch_title" msgid="2759849884417772712">"Izmantot vairākus lietotāju profilus"</string>
     <string name="wireless_debugging_main_switch_title" msgid="8463499572781441719">"Izmantot bezvadu atkļūdošanu"</string>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 1d36096..262f154 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -142,10 +142,11 @@
     <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"Дозволете уредот да комуницира со уредите со Bluetooth во близина"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"Дозволете телефонот да комуницира со уредите со Bluetooth во близина"</string>
     <string name="bluetooth_disable_a2dp_hw_offload" msgid="5942913792817797541">"Оневоз. хард. ослоб. за Bluetooth A2DP"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="8610420176339657720">"Да се рестартира?"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8333029144800835996">"Треба да го рестартирате уредот за да ја смените поставкава."</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="3488695418187553566">"Да"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="4930826928585464191">"Откажи"</string>
+    <string name="bluetooth_disable_le_audio_hw_offload" msgid="3966022676505972908">"Оневозможете хардверско ослободување за Bluetooth LE AUDIO"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_title" msgid="6001142380445276918">"Да се рестартира уредот?"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_message" msgid="1524373895333698779">"Треба да го рестартирате уредот за да ја смените поставкава."</string>
+    <string name="bluetooth_disable_hw_offload_dialog_confirm" msgid="5594859658551707592">"Рестартирај"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel" msgid="3663690305043973720">"Откажи"</string>
     <string name="connected_device_media_device_title" msgid="3783388247594566734">"Преносливи уреди"</string>
     <string name="connected_device_call_device_title" msgid="88732390601723608">"Уреди за повикување"</string>
     <string name="connected_device_other_device_title" msgid="4652120430615729193">"Други уреди"</string>
@@ -309,9 +310,9 @@
     <string name="security_settings_title" msgid="6710768415432791970">"Безбедност"</string>
     <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"Шифрирање и акредитиви"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"Телефонот е шифриран"</string>
-    <string name="decryption_settings_summary" product="default" msgid="1742645256103613503">"Телефонот не е шифриран"</string>
+    <string name="not_encrypted_summary" product="default" msgid="2251945842585788254">"Телефонот не е шифриран"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"Уредот е шифриран"</string>
-    <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"Уредот не е шифриран"</string>
+    <string name="not_encrypted_summary" product="tablet" msgid="2374263654698719382">"Уредот не е шифриран"</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"Заклучен екран"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"Што да се прикажува"</string>
     <string name="security_settings_summary" msgid="1627059516127354233">"Постави „Моја локација“, отклучување на екран, заклучување на SIM картичка, заклучување на меморија со акредитиви"</string>
@@ -489,7 +490,7 @@
     <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"Допрете и задржете секој пат кога иконата за отпечаток ќе се премести. Ова помага за да се сними повеќе од отпечатокот."</string>
     <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"Поставете го врвот на прстот на сензорот"</string>
     <string name="security_settings_udfps_enroll_edge_title" msgid="6137605344819152477">"За крај, користете ги рабовите на прстот"</string>
-    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"Поставете го отпечаток странично на сензорот и задржете, а потоа направете исто со другата страна"</string>
+    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"Поставете го отпечатокот странично на сензорот и задржете, а потоа направете исто со другата страна"</string>
     <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"Ова помага за да се сними повеќе од отпечатокот"</string>
     <!-- String.format failed for translation -->
     <!-- no translation found for security_settings_udfps_enroll_progress_a11y_message (6183535114682369699) -->
@@ -570,37 +571,10 @@
     <string name="fingerprint_last_delete_message" msgid="7860374760549404410">"Нема да може да го користите отпечатокот за да го отклучувате телефонот или да потврдувате дека сте вие во апликациите."</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="4104208067277655068">"Нема да може да го користите отпечатокот за да го отклучувате работниот профил, да овластувате купувања или да се најавувате на работните апликации."</string>
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"Отстрани"</string>
-    <string name="crypt_keeper_settings_title" msgid="4938812137822100044">"Шифрирање"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"Шифрирај таблет"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"Шифрирање на телефонот"</string>
-    <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"Шифрирано"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"Може да ги шифрирате вашите сметки, поставки, преземени апликации и податоци за нив, медиуми и други датотеки. Откако ќе го шифрирате таблетот, со претпоставка дека сте поставиле заклучување на екран (односно, шема, нумерички PIN или лозинка), ќе треба да го отклучите екранот за да го дешифрирате таблетот секојпат кога ќе го вклучите. Единствениот друг начин да дешифрирате е да извршите ресетирање до фабричките вредности, со што ќе се избришат сите ваши податоци.\n\nШифрирањето трае еден час или повеќе. Мора да започнете со наполнета батерија и таблетот треба да биде приклучен на полнач во текот на процесот. Ако го прекинете, може да изгубите дел или сите податоци."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"Може да ги шифрирате вашите сметки, поставки, преземени апликации и податоци за нив, медиуми и други датотеки. Откако ќе го шифрирате телефонот, со претпоставка дека сте поставиле заклучување на екран (односно, шема, нумерички PIN или лозинка), ќе треба да го отклучите екранот за да го дешифрирате телефонот секојпат кога ќе го вклучите. Единствениот друг начин да дешифрирате е да извршите ресетирање до фабричките вредности, со што ќе се избришат сите ваши податоци.\n\nШифрирањето трае еден час или повеќе. Мора да започнете со наполнета батерија и телефонот треба да биде приклучен на полнач во текот на процесот. Ако го прекинете, може да изгубите дел или сите податоци."</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"Шифрирај таблет"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"Шифрирање на телефонот"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"Наполни ја батеријата и обиди се повторно."</string>
-    <string name="crypt_keeper_unplugged_text" msgid="2709721134148651329">"Приклучете го полначот и обидете се повторно."</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="1847280235529858357">"Нема PIN или лозинка за заклучување екран"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="7210616262954236042">"Треба да поставите PIN или лозинка за заклучување на екранот пред да започнете со шифрирање."</string>
-    <string name="crypt_keeper_confirm_title" msgid="8600000209722452230">"Шифрирај?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="3270587498436152259">"Операцијата шифрирање е неповратен процес и ако се прекине, ќе ги изгубите податоците. Шифрирањето трае еден час или подолго и за тоа време таблетот ќе се рестартира неколку пати."</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="3040428543349852419">"Операцијата шифрирање е неповратен процес и ако се прекине, ќе ги изгубите податоците. Шифрирањето трае еден час или подолго и за тоа време телефонот ќе се рестартира неколку пати."</string>
-    <string name="crypt_keeper_setup_title" msgid="3339725741305796680">"Шифрирање"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="4417016995091289019">"Почекајте додека таблетот се шифрира. <xliff:g id="PERCENT">^1</xliff:g>% завршено."</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="7902355422499500352">"Почекајте додека телефон се шифрира. <xliff:g id="PERCENT">^1</xliff:g>% завршено."</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="8348188415839917821">"Почекајте додека се кодира вашиот таблет. Преостанато време: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="8556105766597855198">"Почекајте додека се кодира вашиот телефон. Преостанато време: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="3832496715430327682">"За да го отклучите таблетот, исклучете го и повторно вклучете го."</string>
-    <string name="crypt_keeper_force_power_cycle" product="default" msgid="5070346039522135361">"За да го отклучите телефонот, исклучете го и повторно вклучете го."</string>
-    <string name="crypt_keeper_warn_wipe" msgid="8104921337301750394">"Предупредување: уредот ќе се избрише по уште <xliff:g id="COUNT">^1</xliff:g> неуспешни обиди да се отклучи!"</string>
-    <string name="crypt_keeper_enter_password" msgid="1274917431075529732">"Напиши ја лозинката"</string>
-    <string name="crypt_keeper_failed_title" msgid="8173654570682244149">"Шифрирањето е неуспешно"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"Шифрирањето се прекина и не може да се заврши. Како резултат на тоа, податоците од вашиот таблет веќе не се достапни. \n \n За да продолжите да го користите таблетот, треба да се изврши ресетирање на фабричките поставки. Кога ќе го подесите таблетот по ресетирањето, ќе имате можност да ги обновите сите податоци за кои имате резервна копија на вашата сметка на Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"Шифрирањето се прекина и не може да се заврши. Како резултат на тоа, податоците од вашиот телефон веќе не се достапни. \n \nЗа да продолжите да го користите телефонот, треба да се изврши ресетирање на фабричките поставувања. Кога ќе го подесите телефонот по ресетирањето, ќе имате можност да ги обновите сите податоци за кои имате резервна копија на вашата сметка на Google."</string>
-    <string name="crypt_keeper_data_corrupt_title" msgid="5920153462176846037">"Дешифрирањето е неуспешно"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"Лозинката што ја внесовте е правилна, но, за жал, податоците се оштетени. \n\nЗа да продолжите да го користите таблетот, треба да извршите фабричко ресетирање. Кога ќе го поставувате таблетот по ресетирањето, ќе имате можност да ги обновите сите податоци што имаат резервни копии на вашата сметка на Google."</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"Лозинката што ја внесовте е правилна, но, за жал, податоците се оштетени. \n\nЗа да продолжите да го користите телефонот, треба да извршите фабричко ресетирање. Кога ќе го поставувате телефонот по ресетирањето, ќе имате можност да ги обновите сите податоци што имаат резервни копии на вашата сметка на Google."</string>
-    <string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"Префрли метод на внес"</string>
+    <string name="encryption_settings_title" msgid="2848716008695618360">"Шифрирање"</string>
+    <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"Шифрирајте го таблетот"</string>
+    <string name="encrypt_title" product="default" msgid="7337365190988321100">"Шифрирајте го телефонот"</string>
+    <string name="encrypted_summary" msgid="545623487587251207">"Шифрирано"</string>
     <string name="suggested_lock_settings_title" msgid="7836065447159730217">"Заштита на телефонот"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"Поставете заклучување екран за заштита на таблетот"</string>
     <string name="suggested_lock_settings_summary" product="device" msgid="8479766049078378225">"Поставете заклучување екран за заштита на уредот"</string>
@@ -819,6 +793,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Можеби ќе треба да го внесе овој PIN и на другиот уред."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Може ќе треба да ја внесете лозинката и на другиот уред."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"За да се спари со:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Проверете дали се прикажува оваа лозинка:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Потврдете за спарување со координираниот комплет"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"Од:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Спари се со овој уред?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"За да се спари со:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Напишете на него:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, потоа притиснете „Врати“ или „Внеси“."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Дозволете пристап до вашите контакти и историјата на повици"</string>
@@ -852,6 +827,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Не може да се поврзе. Обидете се повторно."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Детали за уредот"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Адреса на Bluetooth на уредот: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Адреса на Bluetooth на уредот:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Да се заборави уредот?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Отстрани асоцијација"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Да се прекине врската со апликацијата?"</string>
@@ -883,6 +859,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Запомни поставки"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Максимален број аудиоуреди поврзани преку Bluetooth"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Изберете го максималниот број аудиоуреди поврзани преку Bluetooth"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"Евиденција за отстранување грешки за NFC stack"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Зголеми го нивото на евиденција за NFC stack"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Емитувај"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"огледало"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Овозможи приказ на безжични мрежи"</string>
@@ -1190,6 +1168,8 @@
     <string name="wifi_hotspot_maximize_compatibility_dual_ap_summary" msgid="3579549223159056533">"Помага другите уреди да ја најдат точкава на пристап. Го зголемува користењето на батеријата."</string>
     <string name="wifi_tether_starting" msgid="8879874184033857814">"Вклучување точка на пристап..."</string>
     <string name="wifi_tether_stopping" msgid="4416492968019409188">"Исклучување точка на пристап..."</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_title" msgid="3089432578433978073">"Интернет преку мобилен не е достапен"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_content" msgid="5920421547607921112">"Контактирајте со операторот за детали"</string>
     <string name="wifi_tether_enabled_subtext" msgid="5085002421099821056">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> е активно"</string>
     <string name="wifi_tether_failed_subtext" msgid="437190628041885500">"Грешка на точка на пристап на пренослива Wi-Fi"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7072559431286459122">"Поставете точка на пристап со Wi-Fi"</string>
@@ -2536,11 +2516,6 @@
     <string name="enable_service_title" msgid="7231533866953706788">"Дали дозволувате <xliff:g id="SERVICE">%1$s</xliff:g> да има целосна контрола врз вашиот уред?"</string>
     <string name="capabilities_list_title" msgid="1225853611983394386">"<xliff:g id="SERVICE">%1$s</xliff:g> треба да:"</string>
     <string name="touch_filtered_warning" msgid="4225815157460318241">"Бидејќи апликацијата го прикрива барањето за дозвола, Поставките не може да го потврдат вашиот одговор."</string>
-    <string name="enable_service_encryption_warning" msgid="931082737770453755">"Ако вклучите <xliff:g id="SERVICE">%1$s</xliff:g>, уредот нема да го користи заклучувањето на екранот за да го подобри шифрирањето на податоците."</string>
-    <string name="secure_lock_encryption_warning" msgid="669152607190123579">"Со оглед на тоа што вклучивте услуга на пристапност, уредот нема да го користи заклучувањето на екранот за да го подобри шифрирањето на податоците."</string>
-    <string name="enable_service_pattern_reason" msgid="6832846117817938536">"Со оглед на тоа што вклучувањето <xliff:g id="SERVICE">%1$s</xliff:g> влијае врз шифрирањето податоци, треба да ја потврдите шемата."</string>
-    <string name="enable_service_pin_reason" msgid="6040417014360237703">"Со оглед на тоа што вклучувањето <xliff:g id="SERVICE">%1$s</xliff:g> влијае врз шифрирањето податоци, треба да го потврдите PIN-кодот."</string>
-    <string name="enable_service_password_reason" msgid="6962544350351734238">"Со оглед на тоа што вклучувањето <xliff:g id="SERVICE">%1$s</xliff:g> влијае врз шифрирањето податоци, треба да ја потврдите лозинката."</string>
     <string name="accessibility_service_warning" msgid="6779187188736432618">"<xliff:g id="SERVICE">%1$s</xliff:g> бара целосна контрола на уредов. Услугава може да го чита екранот и да делува во име на корисниците со потреба за пристапност. Ова ниво на контрола не е соодветно за повеќето апликации."</string>
     <string name="accessibility_service_warning_description" msgid="6573203795976134751">"Целосната контрола е соодветна за апликации што ви помагаат со потребите за пристапност, но не и за повеќето апликации."</string>
     <string name="accessibility_service_screen_control_title" msgid="324795030658109870">"Приказ и контрола на екранот"</string>
@@ -3105,14 +3080,6 @@
     <string name="remove_account_failed" msgid="3709502163548900644">"Администраторот не ја дозволува промената"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"Не може рачно да се синхронизира"</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"Синхронизирањето за оваа ставка е моментално оневозможено. За да го промените ова подесување, привремено вклучете податоци во заднина и автоматско синхронизирање."</string>
-    <string name="enter_password" msgid="6327051330258595331">"За да стартувате Android, внесете ја лозинката"</string>
-    <string name="enter_pin" msgid="1029287617551232681">"За да стартувате Android, внесете го PIN-кодот"</string>
-    <string name="enter_pattern" msgid="1747316785866742960">"За да стартувате Android, внесете ја шемата"</string>
-    <string name="cryptkeeper_wrong_pattern" msgid="340747269176120242">"Погрешна шема"</string>
-    <string name="cryptkeeper_wrong_password" msgid="7295607881887114486">"Погрешна лозинка"</string>
-    <string name="cryptkeeper_wrong_pin" msgid="2347961593970714201">"Погрешен PIN"</string>
-    <string name="checking_decryption" msgid="6111642972615688237">"Се проверува..."</string>
-    <string name="starting_android" msgid="6694154070215356186">"Се вклучува Android..."</string>
     <string name="delete" msgid="8330605554706263775">"Избриши"</string>
     <string name="misc_files" msgid="6598066985800749585">"Разни датотеки"</string>
     <string name="misc_files_selected_count" msgid="5597802791672749532">"избрани <xliff:g id="NUMBER">%1$d</xliff:g> од <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -3208,8 +3175,6 @@
     <string name="data_usage_metered_yes" msgid="4262598072030135223">"Со ограничен интернет"</string>
     <string name="data_usage_metered_no" msgid="1685828958417926268">"Со неограничен интернет"</string>
     <string name="data_usage_disclaimer" msgid="3271450299386176770">"Пресметувањето податоци на операторот може да се разликува од вашиот уред."</string>
-    <string name="cryptkeeper_emergency_call" msgid="8369322820475703306">"Итен повик"</string>
-    <string name="cryptkeeper_return_to_call" msgid="3857250752781151232">"Врати се на повик"</string>
     <string name="vpn_name" msgid="3806456074909253262">"Име"</string>
     <string name="vpn_type" msgid="5533202873260826663">"Тип"</string>
     <string name="vpn_server" msgid="2908816134941973935">"Адреса на сервер"</string>
@@ -4409,8 +4374,8 @@
     <string name="high_power_off" msgid="317000444619279018">"Се оптимизира користењето на батеријата"</string>
     <string name="high_power_system" msgid="3966701453644915787">"Оптимизација на батеријата не е достапна"</string>
     <string name="high_power_desc" msgid="2753076899835765338">"Не применувајте оптимизација на батеријата. Може побрзо да ја истроши вашата батерија."</string>
-    <string name="high_power_prompt_title" msgid="2574478825228409124">"Да се извршува во заднина?"</string>
-    <string name="high_power_prompt_body" msgid="6460557929559616041">"Ако дозволите <xliff:g id="APP_NAME">%1$s</xliff:g> секогаш да се извршува во заднина, тоа може да го намали траењето на батеријата. \n\nОва може да го промените подоцна во „Поставки &gt; Апликации и известувања“."</string>
+    <string name="high_power_prompt_title" msgid="2574478825228409124">"Да работи во заднина?"</string>
+    <string name="high_power_prompt_body" msgid="6460557929559616041">"Ако дозволите <xliff:g id="APP_NAME">%1$s</xliff:g> секогаш да работи во заднина, тоа може да го намали траењето на батеријата. \n\nОва може да го промените подоцна во „Поставки &gt; Апликации и известувања“."</string>
     <string name="battery_summary" msgid="2491764359695671207">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> употреба од последното целосно полнење"</string>
     <string name="battery_summary_24hr" msgid="7656033283282656551">"Користење од <xliff:g id="PERCENTAGE">%1$s</xliff:g> во минатите 24 часа"</string>
     <string name="no_battery_summary" msgid="5769159953384122003">"Нема употреба на батерија од последното целосно полнење"</string>
@@ -4766,8 +4731,6 @@
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> апликации може да користат неограничен мобилен интернет</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"Видете повеќе"</string>
-    <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"Навистина ли да се избришат податоците за корисникот и да се конвертираат во шифрирана датотека?"</string>
-    <string name="button_confirm_convert_fbe" msgid="339648921918438106">"Избриши и конвертирај"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"Ресетирајте го ограничувањето оценки на ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"Ограничувањето оценки на ShortcutManager е ресетирано"</string>
     <string name="notification_suggestion_title" msgid="6309263655965785411">"Контролирајте ги информациите на заклучениот екран"</string>
@@ -5294,6 +5257,7 @@
     <string name="sim_action_yes" msgid="8076556020131395515">"Да"</string>
     <string name="sim_action_reboot" msgid="3508948833333441538">"Рестартирај"</string>
     <string name="sim_action_no_thanks" msgid="435717748384544195">"Не, фала"</string>
+    <string name="sim_action_cancel" msgid="2668099867029610910">"Откажи"</string>
     <string name="sim_switch_button" msgid="1405772571706095387">"Префрли"</string>
     <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Не може да се активира SIM-картичката"</string>
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Извадете и повторно вметнете ја SIM-картичката. Ако и понатаму се соочувате со проблемот, рестартирајте го уредот."</string>
@@ -5446,6 +5410,10 @@
     <string name="cached_apps_freezer" msgid="1057519579761550350">"Суспендирај извршување на кеширани апликации"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"Дозволи преклопување на екраните на Поставки"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Дозволи апликации што може да прикажуваат врз други апликации да ги преклопуваат екраните на Поставки"</string>
+    <!-- no translation found for allow_mock_modem (3832264806530479214) -->
+    <skip />
+    <!-- no translation found for allow_mock_modem_summary (9097416612748005374) -->
+    <skip />
     <string name="media_controls_title" msgid="403271085636252597">"Аудиовизуелни содржини"</string>
     <string name="media_controls_resume_title" msgid="855076860336652370">"Закачете го плеерот"</string>
     <string name="media_controls_resume_description" msgid="3163482266454802097">"За брзо продолжување на репродукцијата, плеерот останува отворен во „Брзи поставки“"</string>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index 24e6c53..8bb416f 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -142,10 +142,11 @@
     <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"അടുത്തുള്ള Bluetooth ഉപകരണങ്ങളുമായി ആശയവിനിമയം നടത്താൻ നിങ്ങളുടെ ഉപകരണത്തെ അനുവദിക്കുക"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"അടുത്തുള്ള Bluetooth ഉപകരണങ്ങളുമായി ആശയവിനിമയം നടത്താൻ നിങ്ങളുടെ ഫോണിനെ അനുവദിക്കുക"</string>
     <string name="bluetooth_disable_a2dp_hw_offload" msgid="5942913792817797541">"Bluetooth A2DP ഹാര്‍ഡ്‍വെയര്‍ ഓഫ്‌ലോഡ് പ്രവർത്തനരഹിതമാക്കുക"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="8610420176339657720">"ഉപകരണം റീസ്‌റ്റാർട്ട് ചെയ്യണോ?"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8333029144800835996">"ഈ ക്രമീകരണം മാറ്റാൻ നിങ്ങളുടെ ഉപകരണം റീസ്‌റ്റാർട്ട് ചെയ്യേണ്ടതുണ്ട്."</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="3488695418187553566">"റീസ്‌റ്റാർട്ട് ചെയ്യുക"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="4930826928585464191">"റദ്ദാക്കുക"</string>
+    <string name="bluetooth_disable_le_audio_hw_offload" msgid="3966022676505972908">"Bluetooth LE AUDIO ഹാർഡ്‍വെയർ ഓഫ്‌ലോഡ് പ്രവർത്തനരഹിതമാക്കുക"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_title" msgid="6001142380445276918">"ഉപകരണം റീസ്‌റ്റാർട്ട് ചെയ്യണോ?"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_message" msgid="1524373895333698779">"ഈ ക്രമീകരണം മാറ്റാൻ നിങ്ങളുടെ ഉപകരണം റീസ്‌റ്റാർട്ട് ചെയ്യേണ്ടതുണ്ട്."</string>
+    <string name="bluetooth_disable_hw_offload_dialog_confirm" msgid="5594859658551707592">"റീസ്‌റ്റാർട്ട് ചെയ്യുക"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel" msgid="3663690305043973720">"റദ്ദാക്കുക"</string>
     <string name="connected_device_media_device_title" msgid="3783388247594566734">"മീഡിയ ഉപകരണങ്ങൾ"</string>
     <string name="connected_device_call_device_title" msgid="88732390601723608">"കോൾ ഉപകരണങ്ങൾ"</string>
     <string name="connected_device_other_device_title" msgid="4652120430615729193">"മറ്റ് ഉപകരണങ്ങൾ"</string>
@@ -309,9 +310,9 @@
     <string name="security_settings_title" msgid="6710768415432791970">"സുരക്ഷ"</string>
     <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"എൻക്രിപ്‌ഷനും ക്രെഡന്‍ഷ്യലുകളും"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"ഫോൺ എൻക്രിപ്‌റ്റ് ചെയ്‌തു"</string>
-    <string name="decryption_settings_summary" product="default" msgid="1742645256103613503">"ഫോൺ എൻക്രിപ്റ്റ് ചെയ്‌തിട്ടില്ല"</string>
+    <string name="not_encrypted_summary" product="default" msgid="2251945842585788254">"ഫോൺ എൻക്രിപ്റ്റ് ചെയ്‌തിട്ടില്ല"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"ഉപകരണം എൻക്രിപ്റ്റ് ചെയ്തു"</string>
-    <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"ഉപകരണം എൻക്രിപ്റ്റ് ചെയ്‌തിട്ടില്ല"</string>
+    <string name="not_encrypted_summary" product="tablet" msgid="2374263654698719382">"ഉപകരണം എൻക്രിപ്റ്റ് ചെയ്‌തിട്ടില്ല"</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"ലോക്ക് സ്‌ക്രീൻ"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"എന്താണ് കാണിക്കേണ്ടത്"</string>
     <string name="security_settings_summary" msgid="1627059516127354233">"എന്റെ ലൊക്കേഷൻ, സ്‌ക്രീൻ അൺലോക്ക്, സിം കാർഡ് ലോക്ക്, ക്രഡൻഷ്യൽ സംഭരണ ലോക്ക് എന്നിവ സജ്ജീകരിക്കുക"</string>
@@ -481,7 +482,7 @@
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"സെൻസർ സ്പർശിക്കുക"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"സെൻസറിൽ വിരൽ വച്ച് വൈബ്രേഷൻ അനുഭവപ്പെട്ട ശേഷം വിരൽ മാറ്റുക."</string>
     <string name="security_settings_udfps_enroll_start_message" msgid="5032954588171487566">"വൈബ്രേഷൻ അനുഭവപ്പെടുന്നത് വരെ സെൻസറിൽ നിങ്ങളുടെ ഫിംഗർപ്രിന്റ് ചേർത്തുപിടിക്കുക"</string>
-    <string name="security_settings_fingerprint_enroll_udfps_title" msgid="6665610134560896895">"വിരലടയാള സെൻസറിൽ സ്‌പർശിച്ചുപിടിക്കുക"</string>
+    <string name="security_settings_fingerprint_enroll_udfps_title" msgid="6665610134560896895">"ഫിംഗർപ്രിന്റ് സെൻസറിൽ സ്‌പർശിച്ചുപിടിക്കുക"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"വിരലെടുക്കുക, വീണ്ടും സ്പർശിക്കുക"</string>
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"ഒരിക്കൽ കൂടി"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"ഫിംഗർപ്രിന്റ് ഐക്കൺ പിന്തുടരുക"</string>
@@ -568,37 +569,10 @@
     <string name="fingerprint_last_delete_message" msgid="7860374760549404410">"ഫോൺ അൺലോക്ക് ചെയ്യാനോ ആപ്പുകളിൽ ഇത് നിങ്ങൾ തന്നെയാണെന്ന് പരിശോധിച്ചുറപ്പിക്കാനോ നിങ്ങളുടെ ഫിംഗർപ്രിന്റ് ഉപയോഗിക്കാനാകില്ല."</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="4104208067277655068">"നിങ്ങളുടെ ഔദ്യോഗിക പ്രൊഫൈൽ അൺലോക്ക് ചെയ്യാനോ വാങ്ങലുകൾ അംഗീകരിക്കാനോ ഔദ്യോഗിക ആപ്പുകളിലേക്ക് സൈൻ ഇൻ ചെയ്യാനോ ഫിംഗർപ്രിന്റ് ഉപയോഗിക്കാനാകില്ല."</string>
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"അതെ, നീക്കംചെയ്യുക"</string>
-    <string name="crypt_keeper_settings_title" msgid="4938812137822100044">"എൻ‌ക്രിപ്ഷൻ"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"ടാ‌ബ്‌ലെറ്റ് എൻ‌ക്രിപ്റ്റുചെയ്യുക"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"ഫോൺ എൻ‌ക്രിപ്റ്റ് ചെയ്യുക"</string>
-    <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"എൻക്രിപ്റ്റ് ചെയ്‌തു"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"നിങ്ങളുടെ അക്കൗണ്ടുകളും ക്രമീകരണങ്ങളും ഡൗൺലോഡുചെയ്‌ത അപ്ലിക്കേഷനുകളും അവയുടെ ഡാറ്റയും മീഡിയയും മറ്റ് ഫയലുകളും എൻക്രിപ്‌റ്റുചെയ്യാനാവും.നിങ്ങളുടെ ടാബ്‌ലെറ്റ് എൻക്രിപ്‌റ്റ് ചെയ്‌തതിന് ശേഷം ഒരു സ്‌ക്രീൻ ലോക്ക് സജ്ജീകരിക്കുകയാണെങ്കിൽ (അതായത് ഒരു പാറ്റേൺ, സംഖ്യാ പിൻ അല്ലെങ്കിൽ പാസ്‌വേഡ്), നിങ്ങൾ ടാബ്‌ലെറ്റ് ഓൺ ചെയ്യുമ്പോഴെല്ലാം അത് ഡീക്രി‌പ്‌റ്റ് ചെയ്യുന്നതിന് അൺലോക്ക് ചെയ്യേണ്ടതുണ്ട്. നിങ്ങളുടെ എല്ലാ ഡാറ്റയും മായ്‌ക്കുന്ന ഫാക്‌ടറി ഡാറ്റ പുനഃസജ്ജീകരണം നടത്തുക എന്നതാണ് ഡിക്രിപ്‌റ്റ് ചെയ്യാനുള്ള ഒരേയൊരു മാർഗം.\n\nഎൻക്രിപ്‌ഷന് ഒരു മണിക്കൂറോ അതിൽ കൂടുതലോ സമയമെടുക്കും. നിങ്ങൾ ഒരു ചാർജ്ജുചെയ്‌ത ബാറ്ററി ഉപയോഗിച്ച് ആരംഭിക്കേണ്ടതാണ് ഒപ്പം പ്രോസസ്സിലുടനീളം ടാബ്‌ലെറ്റ് പ്ലഗ് ഇൻ ചെയ്‌ത് നിർത്തുകയും വേണം. നിങ്ങൾ തടസ്സപ്പെടുത്തുകയാണെങ്കിൽ, കുറച്ച് ഡാറ്റ അല്ലെങ്കിൽ എല്ലാ ഡാറ്റയും നഷ്‌ടപ്പെടും"</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"നിങ്ങളുടെ അക്കൗണ്ടുകളും ക്രമീകരണങ്ങളും ഡൗൺലോഡുചെയ്‌ത അപ്ലിക്കേഷനുകളും അവയുടെ ഡാറ്റയും മീഡിയയും മറ്റ് ഫയലുകളും എൻക്രിപ്‌റ്റുചെയ്യാനാവും. നിങ്ങളുടെ ഫോൺ എൻക്രിപ്‌റ്റ് ചെയ്‌തതിന് ശേഷം ഒരു സ്‌ക്രീൻ ലോക്ക് സജ്ജീകരിക്കുകയാണെങ്കിൽ (അതായത് ഒരു പാറ്റേൺ, സംഖ്യാ പിൻ അല്ലെങ്കിൽ പാസ്‌വേഡ്), നിങ്ങൾ ഫോൺ ഓൺ ചെയ്യുമ്പോഴെല്ലാം അത് ഡീക്രി‌പ്‌റ്റ് ചെയ്യുന്നതിന് അൺലോക്ക് ചെയ്യേണ്ടിവരും. നിങ്ങളുടെ എല്ലാ ഡാറ്റയും മായ്‌ക്കുന്ന ഫാക്‌ടറി ഡാറ്റ പുനഃസജ്ജീകരണം നടത്തുക എന്നതാണ് ഡിക്രിപ്‌റ്റ് ചെയ്യാനുള്ള ഒരേയൊരു മാർഗം.\n\nഎൻക്രിപ്‌ഷന് ഒരു മണിക്കൂറോ അതിൽ കൂടുതലോ സമയമെടുക്കും. നിങ്ങൾ ഒരു ചാർജ്ജുചെയ്‌ത ബാറ്ററി ഉപയോഗിച്ച് ആരംഭിക്കേണ്ടതാണ് ഒപ്പം പ്രോസസ്സിലുടനീളം ഫോൺ പ്ലഗ് ഇൻ ചെയ്‌ത് നിർത്തുകയും വേണം. നിങ്ങൾ തടസ്സപ്പെടുത്തുകയാണെങ്കിൽ, കുറച്ച് ഡാറ്റ അല്ലെങ്കിൽ എല്ലാ ഡാറ്റയും നഷ്‌ടപ്പെടും."</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"ടാ‌ബ്‌ലെറ്റ് എൻ‌ക്രിപ്റ്റുചെയ്യുക"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"ഫോൺ എൻ‌ക്രിപ്റ്റ് ചെയ്യൂ"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"നിങ്ങളുടെ ബാറ്ററി ചാർജ്ജുചെയ്‌തതിനുശേഷം വീണ്ടും ശ്രമിക്കുക."</string>
-    <string name="crypt_keeper_unplugged_text" msgid="2709721134148651329">"നിങ്ങളുടെ ചാർജർ പ്ലഗ്ഗുചെയ്‌ത് വീണ്ടും ശ്രമിക്കുക."</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="1847280235529858357">"ലോക്ക് സ്‌ക്രീൻ പിൻ അല്ലെങ്കിൽ പാസ്‌വേഡ് ഇല്ല"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="7210616262954236042">"എൻക്രിപ്‌ഷൻ ആരംഭിക്കുന്നതിന് മുമ്പ് നിങ്ങൾ ഒരു ലോക്ക് സ്‌ക്രീൻ പിൻ അല്ലെങ്കിൽ പാസ്‌വേഡ് സജ്ജീകരിക്കേണ്ടതുണ്ട്."</string>
-    <string name="crypt_keeper_confirm_title" msgid="8600000209722452230">"എൻക്രിപ്റ്റുചെയ്യണോ?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="3270587498436152259">"എൻക്രിപ്‌ഷൻ പ്രവർത്തനം റദ്ദാക്കാനാകില്ല, നിങ്ങൾ അത് തടസ്സപ്പെടുത്തുകയാണെങ്കിൽ ഡാറ്റ നഷ്‌ടപ്പെടും. എൻക്രിപ്ഷന് ഒരു മണിക്കൂറോ അതിലധികമോ സമയമെടുക്കാം, ആ സമയം ടാബ്‌ലെറ്റ് നിരവധി തവണം പുനരാരംഭിക്കും."</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="3040428543349852419">"എൻക്രിപ്‌ഷൻ പ്രവർത്തനം റദ്ദാക്കാനാകില്ല, നിങ്ങൾ അത് തടസ്സപ്പെടുത്തിയാൽ ഡാറ്റ നഷ്‌ടപ്പെടും. എൻക്രിപ്ഷന് ഒരു മണിക്കൂറോ അതിലധികമോ സമയമെടുക്കാം, ആ സമയം ഫോൺ നിരവധി തവണം പുനരാരംഭിക്കും."</string>
-    <string name="crypt_keeper_setup_title" msgid="3339725741305796680">"എൻക്രിപ്റ്റുചെയ്യുന്നു"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="4417016995091289019">"നിങ്ങളുടെ ടാബ്‌ലെറ്റ് എൻക്രിപ്റ്റുചെയ്‌തുകൊണ്ടിരിക്കുമ്പോൾ കാത്തിരിക്കുക. <xliff:g id="PERCENT">^1</xliff:g>% പൂർത്തിയാക്കി."</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="7902355422499500352">"നിങ്ങളുടെ ഫോൺ എൻക്രിപ്റ്റുചെയ്യുമ്പോൾ കാത്തിരിക്കുക. <xliff:g id="PERCENT">^1</xliff:g>% പൂർത്തിയായി."</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="8348188415839917821">"നിങ്ങളുടെ ടാബ്‌ലെറ്റ് എൻക്രിപ്‌റ്റു‌ചെയ്യുമ്പോൾ കാത്തിരിക്കുക. ശേഷിക്കുന്ന സമയം: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="8556105766597855198">"നിങ്ങളുടെ ഫോൺ എൻക്രിപ്‌റ്റു‌ചെയ്യുമ്പോൾ കാത്തിരിക്കുക. ശേഷിക്കുന്ന സമയം: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="3832496715430327682">"നിങ്ങളുടെ ടാബ്‌ലെറ്റ് അൺലോക്കുചെയ്യാൻ, ഇത് ഓഫാക്കിയശേഷം ഓണാക്കുക."</string>
-    <string name="crypt_keeper_force_power_cycle" product="default" msgid="5070346039522135361">"നിങ്ങളുടെ ഫോൺ അൺലോക്കുചെയ്യാൻ, ഇത് ഓഫാക്കിയശേഷം ഓണാക്കുക."</string>
-    <string name="crypt_keeper_warn_wipe" msgid="8104921337301750394">"മുന്നറിയിപ്പ്: <xliff:g id="COUNT">^1</xliff:g>-ൽ കൂടുതൽ തവണ അൺലോക്ക് ചെയ്യാനുള്ള ശ്രമങ്ങൾ പരാജയപ്പെട്ടുകഴിഞ്ഞാൽ നിങ്ങളുടെ ഉപകരണം മായ്ക്കപ്പെടും!"</string>
-    <string name="crypt_keeper_enter_password" msgid="1274917431075529732">"നിങ്ങളുടെ പാസ്‌വേഡ് ടൈപ്പുചെയ്യുക"</string>
-    <string name="crypt_keeper_failed_title" msgid="8173654570682244149">"എൻക്രിപ്റ്റുചെയ്യൽ പരാജയപ്പെട്ടു"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"എൻക്രിപ്ഷൻ തടസ്സപ്പെട്ടതിനാൽ പൂർത്തിയാക്കാനായില്ല. തൽഫലമായി, നിങ്ങളുടെ ടാബ്‌ലെറ്റിലെ ഡാറ്റ ഇപ്പോൾ ആക്‌സസ്സുചെയ്യാനാകില്ല. \n\n നിങ്ങളുടെ ടാബ്‌ലെറ്റ് പുനരാരംഭിക്കുന്നതിന് ഒരു ഫാക്‌ടറി പുനഃസജ്ജീകരണം ആവശ്യമാണ്. പുനഃസജ്ജീകരണത്തിനുശേഷം നിങ്ങളുടെ ടാബ്‌ലെറ്റ് സജ്ജമാക്കുമ്പോൾ, നിങ്ങളുടെ Google അക്കൗണ്ടിൽ ബാക്കപ്പുചെയ്‌തിരിക്കുന്ന എല്ലാ ഡാറ്റയും പുനഃസ്ഥാപിക്കാനുള്ള ഒരു അവസരം നിങ്ങൾക്ക് ഉണ്ടായിരിക്കും."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"എൻക്രിപ്ഷൻ തടസ്സപ്പെട്ടതിനാൽ പൂർത്തിയാക്കാനായില്ല. തൽഫലമായി, നിങ്ങളുടെ ഫോണിലെ ഡാറ്റ ഇപ്പോൾ ആക്‌സസ്സുചെയ്യാനാകില്ല. \n\nനിങ്ങളുടെ ഫോൺ പുനരാരംഭിക്കുന്നതിന് ഒരു ഫാക്‌ടറി പുനഃസജ്ജീകരണം ആവശ്യമാണ്. പുനഃസജ്ജീകരണത്തിനുശേഷം നിങ്ങളുടെ ഫോൺ സജ്ജമാക്കുമ്പോൾ, നിങ്ങളുടെ Google അക്കൗണ്ടിൽ ബാക്കപ്പുചെയ്‌തിരിക്കുന്ന എല്ലാ ഡാറ്റയും പുനഃസ്ഥാപിക്കാനുള്ള ഒരു അവസരം നിങ്ങൾക്ക് ഉണ്ടായിരിക്കും."</string>
-    <string name="crypt_keeper_data_corrupt_title" msgid="5920153462176846037">"ഡീക്രി‌പ്‌ഷൻ പരാജയപ്പെട്ടു"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"നിങ്ങൾ നൽകിയ പാസ്‌വേഡ് ശരിയാണെങ്കിലും നിർഭാഗ്യവശാൽ ഡാറ്റ കേടായി. \n\nനിങ്ങളുടെ ടാബ്‌ലെറ്റ് ഉപയോഗിച്ച് പുനരാരംഭിക്കാൻ ഒരു ഫാക്‌ടറി പുനഃസജ്ജീകരണം നടത്തേണ്ടതുണ്ട്. പുനഃസജ്ജീകരിച്ച ശേഷം നിങ്ങളുടെ ടാബ്‌ലെറ്റ് സജ്ജീകരിക്കുമ്പോൾ, Google അക്കൗണ്ടിൽ ബാക്കപ്പുചെയ്‌തിരിക്കുന്ന എല്ലാ ഡാറ്റയും പുനഃസ്ഥാപിക്കാൻ അവസരം ലഭിക്കും."</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"നിങ്ങൾ നൽകിയ പാസ്‌വേഡ് ശരിയാണെങ്കിലും നിർഭാഗ്യവശാൽ ഡാറ്റ കേടായി. \n\nനിങ്ങളുടെ ഫോൺ ഉപയോഗിച്ച് പുനരാരംഭിക്കാൻ ഒരു ഫാക്‌ടറി പുനഃസജ്ജീകരണം നടത്തേണ്ടതുണ്ട്. പുനഃസജ്ജീകരിച്ച ശേഷം നിങ്ങളുടെ ഫോൺ സജ്ജീകരിക്കുമ്പോൾ, Google അക്കൗണ്ടിൽ ബാക്കപ്പുചെയ്‌തിരിക്കുന്ന എല്ലാ ഡാറ്റയും പുനഃസ്ഥാപിക്കാൻ അവസരം ലഭിക്കും."</string>
-    <string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"ടൈപ്പിംഗ് രീതി മാറുക"</string>
+    <string name="encryption_settings_title" msgid="2848716008695618360">"എൻ‌ക്രിപ്ഷൻ"</string>
+    <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"ടാബ്‌ലെറ്റ് എൻ‌ക്രിപ്റ്റ് ചെയ്യുക"</string>
+    <string name="encrypt_title" product="default" msgid="7337365190988321100">"ഫോൺ എൻ‌ക്രിപ്റ്റ് ചെയ്യുക"</string>
+    <string name="encrypted_summary" msgid="545623487587251207">"എൻക്രിപ്റ്റ് ചെയ്‌തു"</string>
     <string name="suggested_lock_settings_title" msgid="7836065447159730217">"ഫോൺ പരിരക്ഷിക്കുക"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"ടാബ്‌ലെറ്റ് പരിരക്ഷിക്കാൻ സ്‌ക്രീൻ ലോക്ക് സജ്ജീകരിക്കുക"</string>
     <string name="suggested_lock_settings_summary" product="device" msgid="8479766049078378225">"ഉപകരണം പരിരക്ഷിക്കാൻ സ്‌ക്രീൻ ലോക്ക് സജ്ജീകരിക്കുക"</string>
@@ -817,6 +791,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"മറ്റൊരു ഉപകരണത്തിൽ നിങ്ങൾക്ക് ഈ പിൻ ടൈപ്പുചെയ്യേണ്ടതായും വരാം."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"മറ്റൊരു ഉപകരണത്തിൽ നിങ്ങൾ ഈ പാസ്‌കീ നൽകേണ്ടതായും വരാം."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"ഇതുമായി ജോടിയാക്കുന്നതിന്:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;അത് ഈ പാസ്കീ തന്നെയാണ് ദൃശ്യമാക്കുന്നതെന്ന് ഉറപ്പാക്കുക:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"കോർഡിനേറ്റഡ് സെറ്റുമായി ജോടിയാക്കാൻ സ്ഥിരീകരിക്കുക"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"ഇതിൽ നിന്ന്:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;ഈ ഉപകരണവുമായി ജോടിയാക്കണോ?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"ഇതുമായി ജോടിയാക്കുക:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>ഇതിൽ ടൈപ്പുചെയ്യുക:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, തുടർന്ന് മടങ്ങുക അല്ലെങ്കിൽ നൽകുക അമർത്തുക."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"കോൺടാക്‌റ്റുകളിലേക്കും കോൾ ചരിത്രത്തിലേക്കും ആക്‌സസ് അനുവദിക്കുക"</string>
@@ -850,6 +825,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"കണക്റ്റുചെയ്യാനായില്ല. വീണ്ടും ശ്രമിക്കുക."</string>
     <string name="device_details_title" msgid="1155622417516195481">"ഉപകരണ വിശദാംശങ്ങൾ"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"ഉപകരണത്തിന്റെ Bluetooth വിലാസം: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"ഉപകരണത്തിന്റെ Bluetooth വിലാസം:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"ഉപകരണം മറക്കണോ?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"ബന്ധം നീക്കം ചെയ്യുക"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"ആപ്പ് വിച്‌ഛേദിക്കണോ?"</string>
@@ -881,6 +857,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"ക്രമീകരണങ്ങൾ ഓർമ്മിക്കുക"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"കണക്റ്റ് ചെയ്‌ത പരമാവധി Bluetooth ഓഡിയോ ഉപകരണങ്ങൾ"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"കണക്റ്റ് ചെയ്‌ത പരമാവധി Bluetooth ഓഡിയോ ഉപകരണങ്ങളുടെ എണ്ണം തിരഞ്ഞെടുക്കുക"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"NFC സ്റ്റാക്ക് ഡീബഗ് ലോഗ്"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"NFC സ്റ്റാക്ക് ലോഗിംഗ് ലെവൽ ഉയർത്തുക"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"കാസ്‌റ്റ് ചെയ്യുക"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"മിറർ"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"വയർലസ്‌ഡിസ്പ്ലേ സജീവമാക്കൂ"</string>
@@ -1188,6 +1166,8 @@
     <string name="wifi_hotspot_maximize_compatibility_dual_ap_summary" msgid="3579549223159056533">"ഈ ഹോട്ട്‌സ്‌പോട്ട് കണ്ടെത്താൻ മറ്റ് ഉപകരണങ്ങളെ സഹായിക്കുന്നു. ബാറ്ററി ഉപയോഗം വർദ്ധിപ്പിക്കുന്നു."</string>
     <string name="wifi_tether_starting" msgid="8879874184033857814">"ഹോട്ട്‌സ്പോട്ട് ഓണാക്കുന്നു…"</string>
     <string name="wifi_tether_stopping" msgid="4416492968019409188">"ഹോട്ട്‌സ്പോട്ട് ഓഫാക്കുന്നു…"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_title" msgid="3089432578433978073">"ടെതറിംഗ് ലഭ്യമല്ല"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_content" msgid="5920421547607921112">"വിശദാംശങ്ങൾക്ക് നിങ്ങളുടെ സേവനദാതാവിനെ ബന്ധപ്പെടുക"</string>
     <string name="wifi_tether_enabled_subtext" msgid="5085002421099821056">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> സജീവമാണ്"</string>
     <string name="wifi_tether_failed_subtext" msgid="437190628041885500">"പോർട്ടബിൾ വൈഫൈ ഹോട്ട്‌സ്പോട്ട് പിശക്"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7072559431286459122">"വൈഫൈ ഹോട്ട്‌സ്പോട്ട് സജ്ജീകരിക്കുക"</string>
@@ -2534,11 +2514,6 @@
     <string name="enable_service_title" msgid="7231533866953706788">"<xliff:g id="SERVICE">%1$s</xliff:g> എന്നതിന് നിങ്ങളുടെ ഉപകരണത്തിൻ്റെ പൂർണ്ണ നിയന്ത്രണം ലഭിക്കാൻ അനുവദിക്കണോ?"</string>
     <string name="capabilities_list_title" msgid="1225853611983394386">"<xliff:g id="SERVICE">%1$s</xliff:g> എന്നതിന് ഇവ ആവശ്യമാണ്:"</string>
     <string name="touch_filtered_warning" msgid="4225815157460318241">"അനുമതി അഭ്യർത്ഥനയെ ഒരു അപ്ലിക്കേഷൻ മറയ്‌ക്കുന്നതിനാൽ, ക്രമീകരണത്തിന് നിങ്ങളുടെ പ്രതികരണം പരിശോധിച്ചുറപ്പിക്കാനാകില്ല."</string>
-    <string name="enable_service_encryption_warning" msgid="931082737770453755">"<xliff:g id="SERVICE">%1$s</xliff:g> ഓണാക്കിയെങ്കിൽ, ഡാറ്റ എൻക്രിപ്‌ഷൻ മെച്ചപ്പെടുത്താനായി ഉപകരണം നിങ്ങളുടെ സ്‌ക്രീൻ ലോക്ക് ഉപയോഗിക്കില്ല."</string>
-    <string name="secure_lock_encryption_warning" msgid="669152607190123579">"നിങ്ങൾ ഉപയോഗസഹായി സേവനം ഓണാക്കിയതിനാൽ, ഡാറ്റ എൻക്രിപ്‌ഷൻ മെച്ചപ്പെടുത്താനായി ഉപകരണം നിങ്ങളുടെ സ്‌ക്രീൻ ലോക്ക് ഉപയോഗിക്കില്ല."</string>
-    <string name="enable_service_pattern_reason" msgid="6832846117817938536">"<xliff:g id="SERVICE">%1$s</xliff:g> ഓണാക്കുന്നത് ഡാറ്റ എൻക്രിപ്‌ഷനെ ബാധിക്കുന്നതിനാൽ, നിങ്ങളുടെ പാറ്റേൺ സ്ഥിരീകരിക്കേണ്ടതുണ്ട്."</string>
-    <string name="enable_service_pin_reason" msgid="6040417014360237703">"<xliff:g id="SERVICE">%1$s</xliff:g> ഓണാക്കുന്നത് ഡാറ്റ എൻക്രിപ്‌ഷനെ ബാധിക്കുന്നതിനാൽ, നിങ്ങളുടെ PIN സ്ഥിരീകരിക്കേണ്ടതുണ്ട്."</string>
-    <string name="enable_service_password_reason" msgid="6962544350351734238">"<xliff:g id="SERVICE">%1$s</xliff:g> ഓണാക്കുന്നത് ഡാറ്റ എൻക്രിപ്‌ഷനെ ബാധിക്കുന്നതിനാൽ, നിങ്ങളുടെ പാസ്‌വേഡ് സ്ഥിരീകരിക്കേണ്ടതുണ്ട്."</string>
     <string name="accessibility_service_warning" msgid="6779187188736432618">"<xliff:g id="SERVICE">%1$s</xliff:g>, ഈ ഉപകരണത്തിന്റെ പൂർണ്ണ നിയന്ത്രണം അഭ്യർത്ഥിക്കുന്നു. ഉപയോഗസഹായം ആവശ്യമുള്ള ഉപയോക്താക്കൾക്ക് വേണ്ടി, സ്ക്രീനിലുള്ളത് വായിക്കാനും അവർക്ക് വേണ്ടി പ്രവർത്തിക്കാനും സേവനത്തിന് കഴിയും. മിക്ക ആപ്പുകളിലും ഈ തലത്തിലുള്ള നിയന്ത്രണം ഉചിതമല്ല."</string>
     <string name="accessibility_service_warning_description" msgid="6573203795976134751">"ഉപയോഗസഹായി ആവശ്യങ്ങൾക്കായി നിങ്ങളെ സഹായിക്കുന്ന ആപ്പുകൾക്ക് പൂർണ്ണ നിയന്ത്രണം അനുയോജ്യമാണെങ്കിലും മിക്ക ആപ്പുകൾക്കും അനുയോജ്യമല്ല."</string>
     <string name="accessibility_service_screen_control_title" msgid="324795030658109870">"സ്‌ക്രീൻ കാണുക, നിയന്ത്രിക്കുക"</string>
@@ -3103,14 +3078,6 @@
     <string name="remove_account_failed" msgid="3709502163548900644">"ഈ മാറ്റം നിങ്ങളുടെ അഡ്‌മിൻ അനുവദിച്ചതല്ല"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"സ്വമേധയാ സമന്വയിപ്പിക്കാനായില്ല"</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"ഈ ഇനത്തിനായുള്ള സമന്വയം നിലവിൽ പ്രവർത്തനരഹിതമാണ്. ഈ ക്രമീകരണം മാറ്റുന്നതിന്, പശ്ചാത്തല ഡാറ്റയും യാന്ത്രിക സമന്വയവും താൽക്കാലികമായി ഓണാക്കുക."</string>
-    <string name="enter_password" msgid="6327051330258595331">"Android ആരംഭിക്കുന്നതിന്, നിങ്ങളുടെ പാസ്‌വേഡ് നൽകുക"</string>
-    <string name="enter_pin" msgid="1029287617551232681">"Android ആരംഭിക്കുന്നതിന്, നിങ്ങളുടെ പിൻ നൽകുക"</string>
-    <string name="enter_pattern" msgid="1747316785866742960">"Android ആരംഭിക്കുന്നതിന്, നിങ്ങളുടെ പാറ്റേൺ വരയ്‌ക്കുക"</string>
-    <string name="cryptkeeper_wrong_pattern" msgid="340747269176120242">"പാറ്റേൺ തെറ്റാണ്"</string>
-    <string name="cryptkeeper_wrong_password" msgid="7295607881887114486">"പാസ്‌വേഡ് തെറ്റാണ്"</string>
-    <string name="cryptkeeper_wrong_pin" msgid="2347961593970714201">"പിൻ തെറ്റാണ്"</string>
-    <string name="checking_decryption" msgid="6111642972615688237">"പരിശോധിക്കുന്നു…"</string>
-    <string name="starting_android" msgid="6694154070215356186">"Android ആരംഭിക്കുന്നു…"</string>
     <string name="delete" msgid="8330605554706263775">"ഇല്ലാതാക്കുക"</string>
     <string name="misc_files" msgid="6598066985800749585">"പലവക ഫയലുകൾ"</string>
     <string name="misc_files_selected_count" msgid="5597802791672749532">"<xliff:g id="TOTAL">%2$d</xliff:g>-ൽ <xliff:g id="NUMBER">%1$d</xliff:g> എണ്ണം തിരഞ്ഞടുത്തു"</string>
@@ -3206,8 +3173,6 @@
     <string name="data_usage_metered_yes" msgid="4262598072030135223">"മീറ്റർ ചെയ്തത്"</string>
     <string name="data_usage_metered_no" msgid="1685828958417926268">"മീറ്റർമാപകം"</string>
     <string name="data_usage_disclaimer" msgid="3271450299386176770">"കാരിയർ ഡാറ്റ കണക്കാക്കുന്നത് ഉപകരണത്തിൽ നിന്നും വ്യത്യാസപ്പെട്ടിരിക്കാം."</string>
-    <string name="cryptkeeper_emergency_call" msgid="8369322820475703306">"അടിയന്തര കോൾ"</string>
-    <string name="cryptkeeper_return_to_call" msgid="3857250752781151232">"കോളിലേക്ക് മടങ്ങുക"</string>
     <string name="vpn_name" msgid="3806456074909253262">"പേര്"</string>
     <string name="vpn_type" msgid="5533202873260826663">"തരം"</string>
     <string name="vpn_server" msgid="2908816134941973935">"സെർവർ വിലാസം"</string>
@@ -4764,8 +4729,6 @@
       <item quantity="one">1 ആപ്പിന് നിയന്ത്രണമില്ലാതെ ഡാറ്റ ഉപയോഗിക്കാം</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"കൂടുതൽ കാണുക"</string>
-    <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"ശരിക്കും ഉപയോക്തൃ ഡാറ്റ വൈപ്പുചെയ്ത് ഫയൽ എൻക്രിപ്ഷനിലേക്ക് പരിവർത്തനം ചെയ്യണോ?"</string>
-    <string name="button_confirm_convert_fbe" msgid="339648921918438106">"വൈപ്പുചെയ്ത് പരിവർത്തനം ചെയ്യുക"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"ShortcutManager നിരക്ക് പരിമിതപ്പെടുത്തൽ റീസെറ്റ് ചെയ്യുക"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"കുറുക്കുവഴിമാനേജർ നിരക്ക്-പരിമിതപ്പെടുത്തൽ പുനഃക്രമീകരിച്ചു"</string>
     <string name="notification_suggestion_title" msgid="6309263655965785411">"ലോക്ക് സ്‌ക്രീനിൽ ‌വിവരം നിയന്ത്രിക്കുക"</string>
@@ -5292,6 +5255,7 @@
     <string name="sim_action_yes" msgid="8076556020131395515">"ഉവ്വ്"</string>
     <string name="sim_action_reboot" msgid="3508948833333441538">"റീസ്‌റ്റാർട്ട് ചെയ്യുക"</string>
     <string name="sim_action_no_thanks" msgid="435717748384544195">"വേണ്ട"</string>
+    <string name="sim_action_cancel" msgid="2668099867029610910">"റദ്ദാക്കുക"</string>
     <string name="sim_switch_button" msgid="1405772571706095387">"മാറുക"</string>
     <string name="dsds_activation_failure_title" msgid="4467364110584914794">"SIM സജീവമാക്കാനാകില്ല"</string>
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"SIM നീക്കം ചെയ്‌ത് വീണ്ടും ഇടുക. പ്രശ്‌നം തുടരുകയാണെങ്കിൽ ഉപകരണം റീസ്‌റ്റാർട്ട് ചെയ്യുക."</string>
@@ -5444,6 +5408,10 @@
     <string name="cached_apps_freezer" msgid="1057519579761550350">"കാഷെ ചെയ്ത ആപ്പിനുള്ള നിർവഹണം തൽക്കാലം റദ്ദാക്കൽ"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"Settings ആപ്പിൽ സ്‌ക്രീൻ ഓവർലേ അനുവദിക്കുക"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Settings സ്‌ക്രീനുകളിൽ ഓവർലേ ചെയ്യാൻ മറ്റ് ആപ്പുകൾക്ക് മുകളിൽ കാണിക്കാനാകുന്ന ആപ്പുകളെ അനുവദിക്കുക"</string>
+    <!-- no translation found for allow_mock_modem (3832264806530479214) -->
+    <skip />
+    <!-- no translation found for allow_mock_modem_summary (9097416612748005374) -->
+    <skip />
     <string name="media_controls_title" msgid="403271085636252597">"മീഡിയ"</string>
     <string name="media_controls_resume_title" msgid="855076860336652370">"മീഡിയ പ്ലേയർ പിൻ ചെയ്യുക"</string>
     <string name="media_controls_resume_description" msgid="3163482266454802097">"പ്ലേബാക്ക് വേഗത്തിൽ പുനരാരംഭിക്കാൻ, ദ്രുത ക്രമീകരണത്തിൽ മീഡിയ പ്ലേയർ തുറന്ന നിലയിൽ തുടരും"</string>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index 4c12280..840d3c4 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -142,10 +142,11 @@
     <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"Төхөөрөмждөө ойролцоох Bluetooth төхөөрөмжүүдэд холбогдохыг зөвшөөрөх"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"Утсандаа ойролцоох Bluetooth төхөөрөмжүүдэд холбогдохыг зөвшөөрөх"</string>
     <string name="bluetooth_disable_a2dp_hw_offload" msgid="5942913792817797541">"Bluetooth A2DP техник хангамжийн хурдасгуурыг идэвхгүй болгох"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="8610420176339657720">"Төхөөрөмжийг дахин эхлүүлэх үү?"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8333029144800835996">"Та энэ тохиргоог өөрчлөхийн тулд төхөөрөмжөө дахин эхлүүлэх шаардлагатай."</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="3488695418187553566">"Дахин эхлүүлэх"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="4930826928585464191">"Цуцлах"</string>
+    <string name="bluetooth_disable_le_audio_hw_offload" msgid="3966022676505972908">"Bluetooth LE AUDIO техник хангамжийн шилжүүлэлтийг идэвхгүй болгох"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_title" msgid="6001142380445276918">"Төхөөрөмжийг дахин эхлүүлэх үү?"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_message" msgid="1524373895333698779">"Та энэ тохиргоог өөрчлөхийн тулд төхөөрөмжөө дахин эхлүүлэх шаардлагатай."</string>
+    <string name="bluetooth_disable_hw_offload_dialog_confirm" msgid="5594859658551707592">"Дахин эхлүүлэх"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel" msgid="3663690305043973720">"Цуцлах"</string>
     <string name="connected_device_media_device_title" msgid="3783388247594566734">"Медиа төхөөрөмжүүд"</string>
     <string name="connected_device_call_device_title" msgid="88732390601723608">"Дуудлага хийх төхөөрөмжүүд"</string>
     <string name="connected_device_other_device_title" msgid="4652120430615729193">"Бусад төхөөрөмж"</string>
@@ -309,9 +310,9 @@
     <string name="security_settings_title" msgid="6710768415432791970">"Аюулгүй байдал"</string>
     <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"Шифр, мандат үнэмлэх"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"Утсыг кодолсон"</string>
-    <string name="decryption_settings_summary" product="default" msgid="1742645256103613503">"Утсыг шифрлээгүй байна"</string>
+    <string name="not_encrypted_summary" product="default" msgid="2251945842585788254">"Утсыг шифрлээгүй байна"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"Төхөөрөмж шифрлэсэн"</string>
-    <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"Төхөөрөмжийг шифрлээгүй байна"</string>
+    <string name="not_encrypted_summary" product="tablet" msgid="2374263654698719382">"Төхөөрөмжийг шифрлээгүй байна"</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"Түгжигдсэн дэлгэц"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"Харуулах зүйл"</string>
     <string name="security_settings_summary" msgid="1627059516127354233">"Миний Байршил, дэлгэц тайлах, SIM картны түгжээ, жуухны сангийн түгжээг тохируулах"</string>
@@ -488,7 +489,7 @@
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Хурууныхаа хээг бүрэн гаргахын тулд хуруугаа ахин дахин хөндийрүүлж хүргэнэ үү"</string>
     <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"Хурууны хээний дүрс тэмдэг хөдлөх бүрд удаан дарна уу. Энэ нь таны хурууны хээний илүү их зургийг авахад тусална."</string>
     <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"Хурууныхаа үзүүрийг мэдрэгч дээр байрлуулна уу"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="6137605344819152477">"Эцэст нь хурууныхаа үзүүрийг ашиглана уу"</string>
+    <string name="security_settings_udfps_enroll_edge_title" msgid="6137605344819152477">"Эцэст нь хурууныхаа өндөгний захын хээг ашиглана уу"</string>
     <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"Хурууныхаа хээний хажуу талыг мэдрэгч дээр удаан байрлуулж, дараа нь нөгөө тал руу сэлгэнэ үү"</string>
     <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"Энэ нь таны хурууны хээний илүү их зургийг авахад тусална"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Хурууны хээ бүртгүүлэх явц <xliff:g id="PERCENTAGE">%d</xliff:g> хувь"</string>
@@ -568,37 +569,10 @@
     <string name="fingerprint_last_delete_message" msgid="7860374760549404410">"Та хурууны хээгээ утасныхаа түгжээг тайлах эсвэл аппуудад өөрийгөө мөн болохыг баталгаажуулахын тулд ашиглах боломжгүй болно."</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="4104208067277655068">"Та хурууны хээгээ ажлын профайлынхаа түгжээг тайлах, худалдан авалтуудыг зөвшөөрөх эсвэл ажлын аппуудад нэвтрэхийн тулд ашиглах боломжгүй болно."</string>
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"Тийм, устгана уу"</string>
-    <string name="crypt_keeper_settings_title" msgid="4938812137822100044">"Шифрлэлт"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"Таблетыг шифрлэх"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"Утсыг шифрлэх"</string>
-    <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"Шифрлэгдсэн"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"Та өөрийн бүртгэл, тохиргоо, татсан апп-ууд, тэдгээрийн дата, медиа болон бусад файлуудыг шифрлэх боломжтой. Та утсаа шифрлэсний дараа дэлгэцийг түгжсэн гэж бодвол (хээ буюу тоон ПИН буюу нууц үгээр), та утасны шифрийг тайлахын тулд асаах бүртээ дэлгэцний түгжээг тайлах шаардлагатай болно. Өөр ганц арга байгаа нь утсыг үйлдвэрээс гарсан төлөв рүү сэргээж, бүх датаг арилгах юм.\n\nШифрлэлтэд нэг буюу түүнээс их цаг зарцуулагдана. Та энэ хугацааны турш утасныхаа батерегй цэнэглэж, цахилгаанд залгасан байх хэрэгтэй. Хэрэв тасалдвал та зарим буюу бүх датагаа алдаж болзошгүй."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"Та өөрийн бүртгэл, тохиргоо, татсан апп-ууд, тэдгээрийн дата, медиа болон бусад файлуудыг шифрлэх боломжтой. Та утсаа шифрлэсний дараа дэлгэцийг түгжсэн гэж бодвол (хээ буюу тоон ПИН буюу нууц үгээр), та утасны шифрийг тайлахын тулд асаах бүртээ дэлгэцний түгжээг тайлах шаардлагатай болно. Өөр ганц арга байгаа нь утсыг үйлдвэрээс гарсан төлөв рүү сэргээж, бүх датаг арилгах юм.\n\nШифрлэлтэд нэг буюу түүнээс их цаг зарцуулагдана. Та энэ хугацааны турш утасныхаа батерегй цэнэглэж, цахилгаанд залгасан байх хэрэгтэй. Хэрэв тасалдвал та зарим буюу бүх датагаа алдаж болзошгүй."</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"Таблетыг шифрлэх"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"Утсыг шифрлэх"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"Зайгаа цэнэглээд дахин оролдоно уу."</string>
-    <string name="crypt_keeper_unplugged_text" msgid="2709721134148651329">"Цэнэглэгчээ залгаад дахин оролдоно уу."</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="1847280235529858357">"Дэлгэцийн түгжээний ПИН буюу нууц үг байхгүй"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="7210616262954236042">"Та шифрлэлтийг эхлүүлэхийн өмнө дэлгэцийн түгжээний ПИН буюу нууц үгийг тохируулах шаардлагатай."</string>
-    <string name="crypt_keeper_confirm_title" msgid="8600000209722452230">"Шифрлэх үү?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="3270587498436152259">"Шифрлэлтийн үйлдлийг буцаах боломжгүй бөгөөд та тасалдуулбал өгөгдлөө алдах болно. Шифрлэлтэд нэг цаг хүртэл хугацаа орж болох бөгөөд таблет хэд хэдэн удаа дахин асах болно."</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="3040428543349852419">"Шифрлэлтийн үйлдлийг буцаах боломжгүй бөгөөд та тасалдуулбал өгөгдлөө алдах болно. Шифрлэлтэд нэг цаг болон түүнээс удаан хугацаа орж болох бөгөөд утас хэд хэдэн удаа дахин асах болно."</string>
-    <string name="crypt_keeper_setup_title" msgid="3339725741305796680">"Шифрлэж байна"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="4417016995091289019">"Таны таблетыг шифрлэх хооронд хүлээнэ үү. <xliff:g id="PERCENT">^1</xliff:g>% гүйцсэн."</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="7902355422499500352">"Таны утсыг шифрлэх хооронд хүлээнэ үү. <xliff:g id="PERCENT">^1</xliff:g>% гүйцсэн."</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="8348188415839917821">"Таны таблетыг шифрлэх зуур хүлээнэ үү. Үлдсэн хугацаа: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="8556105766597855198">"Таны утсыг шифрлэх зуур хүлээнэ үү. Үлдсэн хугацаа: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="3832496715430327682">"Та таблетаа түгжээнээс нь гаргахын тулд унтраагаад асаана уу."</string>
-    <string name="crypt_keeper_force_power_cycle" product="default" msgid="5070346039522135361">"Та утсаа түгжээнээс нь гаргахын тулд унтраагаад асаана уу."</string>
-    <string name="crypt_keeper_warn_wipe" msgid="8104921337301750394">"Анхааруулга: Түгжээ тайлах <xliff:g id="COUNT">^1</xliff:g> удаагийн оролдлого амжилтгүй болбол таны төхөөрөмжийн мэдээллийг арчих болно!"</string>
-    <string name="crypt_keeper_enter_password" msgid="1274917431075529732">"Өөрийн нууц үгийг оруулна уу"</string>
-    <string name="crypt_keeper_failed_title" msgid="8173654570682244149">"Шифрлэлт амжилтгүй"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"Шифрлэлт таслагдсан бөгөөд дуусгах боломжгүй. Үр дүнд нь таны таблетын өгөгдөлд хандалт хийх боломжгүй болсон. \n\n Таблетаа ашиглаж эхлэхийн тулд үйлдвэрээс гарсан төлөв рүү шинэчлэх шаардлагатай. Шинэчилж дууссаны дараа өөрийн Google бүртгэлд нөөшлөгдсөн өгөгдлүүдийг сэргээх боломжтой болно."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"Шифрлэлт тасалдсан бөгөөд дуусгах боломжгүй. Үүний үр дүнд таны утсан дээр өгөгдөлд хандалт хийх боломжгүй болсон. \n\nУтсаа ашиглаж эхлэхийн тулд та үйлдвэрээс гарсан байдал руу буцаан шинэчлэх шаардлагатай. Утсаа шинэчилсний дараа тохируулахдаа өөрийн Google бүртгэлд нөөцлөгдсөн дурын өгөгдлийг сэргээж болно."</string>
-    <string name="crypt_keeper_data_corrupt_title" msgid="5920153462176846037">"Шифр тайлах амжилтгүй"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"Таны оруулсан нууц үг зөв боловч таны өгөгдөл гэмтсэн байна. \n\nТаблетаа үргэлжлүүлэн ашиглахын тулд үйлдвэрээс гарсан анхны төлөв рүү сэргээх хэрэгтэй. Сэргээсний дараа таблетаа тохируулахдаа өөрийн Google бүртгэл дээр нөөцөлсөн аливаа өгөгдлийг эргүүлэн сэргээх боломжтой."</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"Таны оруулсан нууц үг зөв боловч таны өгөгдөл гэмтсэн байна. \n\nУтсаа үргэлжлүүлэн ашиглахын тулд үйлдвэрээс гарсан анхны төлөв рүү сэргээх хэрэгтэй. Сэргээсний дараа утсаа тохируулахдаа өөрийн Google бүртгэл дээр нөөцөлсөн аливаа өгөгдлийг эргүүлэн сэргээх боломжтой."</string>
-    <string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"Оруулах аргыг солих"</string>
+    <string name="encryption_settings_title" msgid="2848716008695618360">"Шифрлэлт"</string>
+    <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"Таблетыг шифрлэх"</string>
+    <string name="encrypt_title" product="default" msgid="7337365190988321100">"Утсыг шифрлэх"</string>
+    <string name="encrypted_summary" msgid="545623487587251207">"Шифрлэсэн"</string>
     <string name="suggested_lock_settings_title" msgid="7836065447159730217">"Утсаа хамгаалах"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"Таблетаа хамгаалахын тулд дэлгэцийн түгжээ тохируулах"</string>
     <string name="suggested_lock_settings_summary" product="device" msgid="8479766049078378225">"Төхөөрөмжөө хамгаалахын тулд дэлгэцийн түгжээ тохируулах"</string>
@@ -817,6 +791,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Та мөн энэ ПИН-г нөгөө төхөөрөмжүүд дээр оруулах хэрэгтэй болж магадгүй."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Та мөн энэ түлхүүрийг нөгөө төхөөрөмж дээр оруулах хэрэгтэй болж магадгүй."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Дараахтай хослуулах:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Дараах түлхүүрийг харуулж байгаа эсэхийг анхаарна уу:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Зохицсон багцтай хослуулахыг баталгаажуулна уу"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"Юунаас:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Энэ төхөөрөмжтэй хослуулах уу?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>-тай хослуулахын тулд дээр нь <xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>-г оруулаанд Буцах буюу Оруулах товчийг дарна уу."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Харилцагч болон дуудлагын түүхийн хандалтыг зөвшөөрөх"</string>
@@ -850,6 +825,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Холбогдож чадсангүй. Дахин оролдоно уу."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Төхөөрөмжийн дэлгэрэнгүй"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Төхөөрөмжийн Bluetooth хаяг: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Төхөөрөмжийн Bluetooth хаяг:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Төхөөрөмжийг мартах уу?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Холбогдох байдлыг хасах"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Аппыг салгах уу?"</string>
@@ -881,6 +857,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Тохиргоог сануулах"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Холбогдсон Bluetooth аудио төхөөрөмжийн дээд тоо"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Холбогдсон Bluetooth аудио төхөөрөмжийн дээд тоог сонгох"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"NFC стекийн дебаг хийх лог"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"NFC стекийн логийн түвшнийг нэмэгдүүлэх"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Дамжуулах"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"тусгал"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Утасгүй дэлгэцийг идэвхжүүлэх"</string>
@@ -1188,6 +1166,8 @@
     <string name="wifi_hotspot_maximize_compatibility_dual_ap_summary" msgid="3579549223159056533">"Бусад төхөөрөмжид энэ сүлжээний цэгийг олоход нь тусална. Батарей ашиглалтыг нэмэгдүүлнэ."</string>
     <string name="wifi_tether_starting" msgid="8879874184033857814">"Сүлжээний цэгийг асааж байна…"</string>
     <string name="wifi_tether_stopping" msgid="4416492968019409188">"Сүлжээний цэгийг унтрааж байна…"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_title" msgid="3089432578433978073">"Модем хийх боломжгүй байна"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_content" msgid="5920421547607921112">"Дэлгэрэнгүй мэдээлэл авах бол оператор компанитайгаа холбогдоно уу"</string>
     <string name="wifi_tether_enabled_subtext" msgid="5085002421099821056">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> идэвхтэй байна"</string>
     <string name="wifi_tether_failed_subtext" msgid="437190628041885500">"Зөөврийн Wi‑Fi сүлжээний цэгийн алдаа"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7072559431286459122">"Wi-Fi сүлжээний цэгийг тохируулах"</string>
@@ -2534,11 +2514,6 @@
     <string name="enable_service_title" msgid="7231533866953706788">"<xliff:g id="SERVICE">%1$s</xliff:g>-д таны төхөөрөмжийг бүрэн хянахыг зөвшөөрөх үү?"</string>
     <string name="capabilities_list_title" msgid="1225853611983394386">"<xliff:g id="SERVICE">%1$s</xliff:g> шаардлага:"</string>
     <string name="touch_filtered_warning" msgid="4225815157460318241">"Апп нь зөвшөөрөл авах хүсэлтийг танихгүй байгаа тул Тохиргооноос таны хариултыг баталгаажуулж чадахгүй байна."</string>
-    <string name="enable_service_encryption_warning" msgid="931082737770453755">"Хэрэв та <xliff:g id="SERVICE">%1$s</xliff:g>-г асаавал таны төхөөрөмж дата шифрлэлтийг сайжруулах дэлгэцийн түгжээг ашиглахгүй."</string>
-    <string name="secure_lock_encryption_warning" msgid="669152607190123579">"Та хандалтын үйлчилгээг асаасан учир таны төхөөрөмж таны дэлгэцийн түгжээг дата шифрлэлтэнд ашиглахгүй."</string>
-    <string name="enable_service_pattern_reason" msgid="6832846117817938536">"<xliff:g id="SERVICE">%1$s</xliff:g>-г асаах нь дата шифрлэлтэд нөлөөлөх учир та хээгээ баталгаажуулах шаардлагатай."</string>
-    <string name="enable_service_pin_reason" msgid="6040417014360237703">"<xliff:g id="SERVICE">%1$s</xliff:g>-г асаах нь дата шифрлэлтэд нөлөөлөх учир та ПИН-ээ баталгаажуулах шаардлагатай."</string>
-    <string name="enable_service_password_reason" msgid="6962544350351734238">"<xliff:g id="SERVICE">%1$s</xliff:g>-г асаах нь дата шифрлэлтэд нөлөөлөх учир та нууц үгээ баталгаажуулах шаардлагатай."</string>
     <string name="accessibility_service_warning" msgid="6779187188736432618">"<xliff:g id="SERVICE">%1$s</xliff:g> энэ төхөөрөмжийг бүрэн хянах хүсэлтэй байна. Энэ үйлчилгээ дэлгэцийг уншиж, хүртээмжийн үйлчилгээ шаардлагатай хэрэглэгчдийн өмнөөс үйлдэл хийх боломжтой. Энэ түвшний хяналт нь ихэнх аппад тохиромжгүй."</string>
     <string name="accessibility_service_warning_description" msgid="6573203795976134751">"Бүрэн хянах нь таны хандалтын үйлчилгээний шаардлагад тусалдаг аппуудад тохиромжтой боловч ихэнх аппад тохиромжгүй байдаг."</string>
     <string name="accessibility_service_screen_control_title" msgid="324795030658109870">"Дэлгэцийг харах ба хянах"</string>
@@ -3103,14 +3078,6 @@
     <string name="remove_account_failed" msgid="3709502163548900644">"Энэ өөрчлөлтийг таны админ зөвшөөрөөгүй байна"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"Гараар синк хийх боломжгүй"</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"Энэ зүйлийн синкийг одоогоор идэвхгүйжүүлсэн байна. Тохиргоог өөрчлөхийн тулд далд дата болон автомат синкийг түр идэвхжүүлнэ үү."</string>
-    <string name="enter_password" msgid="6327051330258595331">"Андройдыг эхлүүлэхийн тулд нууц үгээ оруулна уу"</string>
-    <string name="enter_pin" msgid="1029287617551232681">"Андройдыг эхлүүлэхийн тулд ПИН оруулна уу"</string>
-    <string name="enter_pattern" msgid="1747316785866742960">"Андройдыг эхлүүлэхийн тулд хээгээ зурна уу"</string>
-    <string name="cryptkeeper_wrong_pattern" msgid="340747269176120242">"Нууц хэв буруу байна"</string>
-    <string name="cryptkeeper_wrong_password" msgid="7295607881887114486">"Нууц үг буруу байна"</string>
-    <string name="cryptkeeper_wrong_pin" msgid="2347961593970714201">"ПИН код буруу байна"</string>
-    <string name="checking_decryption" msgid="6111642972615688237">"Шалгаж байна..."</string>
-    <string name="starting_android" msgid="6694154070215356186">"Андройдыг эхлүүлж байна..."</string>
     <string name="delete" msgid="8330605554706263775">"Устгах"</string>
     <string name="misc_files" msgid="6598066985800749585">"Янз бүрийн файлууд"</string>
     <string name="misc_files_selected_count" msgid="5597802791672749532">"<xliff:g id="TOTAL">%2$d</xliff:g>-с <xliff:g id="NUMBER">%1$d</xliff:g> нь сонгосон"</string>
@@ -3206,8 +3173,6 @@
     <string name="data_usage_metered_yes" msgid="4262598072030135223">"Хязгаартай"</string>
     <string name="data_usage_metered_no" msgid="1685828958417926268">"Хязгааргүй"</string>
     <string name="data_usage_disclaimer" msgid="3271450299386176770">"Операторын дата хэмжилт таны төхөөрөмжийнхөөс өөр байж болно."</string>
-    <string name="cryptkeeper_emergency_call" msgid="8369322820475703306">"Яаралтай дуудлага"</string>
-    <string name="cryptkeeper_return_to_call" msgid="3857250752781151232">"Дуудлагаруу буцах"</string>
     <string name="vpn_name" msgid="3806456074909253262">"Нэр"</string>
     <string name="vpn_type" msgid="5533202873260826663">"Төрөл"</string>
     <string name="vpn_server" msgid="2908816134941973935">"Серверийн хаяг"</string>
@@ -4764,8 +4729,6 @@
       <item quantity="one">Хязгааргүй датаг 1 апп ашиглах боломжтой</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"Дэлгэрэнгүй харах"</string>
-    <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"Хэрэглэгчийн өгөгдлийг устгаж, файлын шифрлэлт болгон хөрвүүлэх үү?"</string>
-    <string name="button_confirm_convert_fbe" msgid="339648921918438106">"Арчаад, хөрвүүлэх"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"ShortcutManager үнэлгээ хязгаарлалтыг дахин тохируулах"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"ShortcutManager үнэлгээ хязгаарлалтыг дахин тохируулсан"</string>
     <string name="notification_suggestion_title" msgid="6309263655965785411">"Түгжигдсэн дэлгэцийн мэдээллийг хянах"</string>
@@ -5292,6 +5255,7 @@
     <string name="sim_action_yes" msgid="8076556020131395515">"Тийм"</string>
     <string name="sim_action_reboot" msgid="3508948833333441538">"Дахин эхлүүлэх"</string>
     <string name="sim_action_no_thanks" msgid="435717748384544195">"Үгүй, баярлалаа"</string>
+    <string name="sim_action_cancel" msgid="2668099867029610910">"Цуцлах"</string>
     <string name="sim_switch_button" msgid="1405772571706095387">"Сэлгэх"</string>
     <string name="dsds_activation_failure_title" msgid="4467364110584914794">"SIM-г идэвхжүүлэх боломжгүй"</string>
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"SIM-г салгаад, дахин хийнэ үү. Хэрэв асуудал үргэлжилсээр байвал төхөөрөмжөө дахин эхлүүлнэ үү."</string>
@@ -5444,6 +5408,10 @@
     <string name="cached_apps_freezer" msgid="1057519579761550350">"Завсрын санах ойд хадгалсан аппын ажиллагааг түр хаах"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"Тохиргооны дэлгэцэд давхарлахыг зөвшөөрөх"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Бусад аппын дээр үзүүлэх боломжтой аппуудыг Тохиргооны дэлгэцийг давхарлахыг зөвшөөрөх"</string>
+    <!-- no translation found for allow_mock_modem (3832264806530479214) -->
+    <skip />
+    <!-- no translation found for allow_mock_modem_summary (9097416612748005374) -->
+    <skip />
     <string name="media_controls_title" msgid="403271085636252597">"Медиа"</string>
     <string name="media_controls_resume_title" msgid="855076860336652370">"Медиа тоглуулагчийг бэхлэх"</string>
     <string name="media_controls_resume_description" msgid="3163482266454802097">"Дахин тоглуулахыг шуурхай үргэлжлүүлэхийн тулд медиа тоглуулагч Шуурхай тохиргоонд нээлттэй хэвээр байдаг"</string>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index bcb32c4..4325514 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -142,10 +142,11 @@
     <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"तुमच्या डिव्हाइसला जवळपासच्या ब्लूटूथ डिव्हाइससह संवाद साधण्याची अनुमती द्या"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"तुमच्या फोनला जवळपासच्या ब्लूटूथ डिव्हाइसशी संवाद साधण्याची अनुमती द्या"</string>
     <string name="bluetooth_disable_a2dp_hw_offload" msgid="5942913792817797541">"ब्लूटूथ A2DP हार्डवेअर ऑफलोड बंद करा"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="8610420176339657720">"डिव्हाइस रीस्टार्ट करायचे?"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8333029144800835996">"हे सेटिंग बदलण्यासाठी तुम्ही तुमचे डिव्हाइस रीस्टार्ट करणे आवश्यक आहे."</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="3488695418187553566">"रीस्टार्ट"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="4930826928585464191">"रद्द करा"</string>
+    <string name="bluetooth_disable_le_audio_hw_offload" msgid="3966022676505972908">"Bluetooth LE AUDIO हार्डवेअर ऑफलोड बंद करा"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_title" msgid="6001142380445276918">"डिव्हाइस रीस्टार्ट करायचे आहे का?"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_message" msgid="1524373895333698779">"हे सेटिंग बदलण्यासाठी तुम्ही तुमचे डिव्हाइस रीस्टार्ट करणे आवश्यक आहे."</string>
+    <string name="bluetooth_disable_hw_offload_dialog_confirm" msgid="5594859658551707592">"रीस्टार्ट करा"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel" msgid="3663690305043973720">"रद्द करा"</string>
     <string name="connected_device_media_device_title" msgid="3783388247594566734">"मीडिया डिव्हाइस"</string>
     <string name="connected_device_call_device_title" msgid="88732390601723608">"कॉल डिव्हाइस"</string>
     <string name="connected_device_other_device_title" msgid="4652120430615729193">"इतर डिव्हाइस"</string>
@@ -309,9 +310,9 @@
     <string name="security_settings_title" msgid="6710768415432791970">"सुरक्षा"</string>
     <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"एंक्रिप्शन आणि क्रेडेंशियल"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"फोन एंक्रिप्ट केला"</string>
-    <string name="decryption_settings_summary" product="default" msgid="1742645256103613503">"फोन एंक्रिप्‍ट केला नाही"</string>
+    <string name="not_encrypted_summary" product="default" msgid="2251945842585788254">"फोन एंक्रिप्‍ट केलेला नाही"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"डिव्हाइस एन्क्रिप्‍ट केले"</string>
-    <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"डिव्‍हाइस एंक्रिप्‍ट केले नाही"</string>
+    <string name="not_encrypted_summary" product="tablet" msgid="2374263654698719382">"डिव्‍हाइस एंक्रिप्‍ट केलेले नाही"</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"लॉक स्क्रीन"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"काय दाखवायचे"</string>
     <string name="security_settings_summary" msgid="1627059516127354233">"माझे स्थान, स्क्रीन अनलॉक, सिम कार्ड लॉक, क्रेडेन्शियल स्टोरेज लॉक सेट करा"</string>
@@ -568,37 +569,10 @@
     <string name="fingerprint_last_delete_message" msgid="7860374760549404410">"तुम्ही तुमचा फोन अनलॉक करण्यासाठी किंवा ॲप्समध्ये ते तुम्हीच आहात याची पडताळणी करण्यासाठी तुमची फिंगरप्रिंट वापरू शकणार नाही."</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="4104208067277655068">"तुम्ही तुमची फिंगरप्रिंट तुमचे कार्य प्रोफाइल अनलॉक करण्‍यासाठी, खरेदी ऑथोराइझ करण्‍यासाठी किंवा कार्य ॲप्समध्‍ये साइन इन करण्‍यासाठी वापरू शकणार नाही."</string>
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"होय, काढा"</string>
-    <string name="crypt_keeper_settings_title" msgid="4938812137822100044">"एंक्रिप्शन"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"टॅबलेट एंक्रिप्ट करा"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"फोन एंक्रिप्ट करा"</string>
-    <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"एंक्रिप्ट केले"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"तुम्ही तुमची खाती, सेटिंग्ज, डाउनलोड केलेले अ‍ॅप्स आणि त्यांचा डेटा, मीडिया आणि इतर फाइल एंक्रिप्ट करू शकता. तुम्ही तुमचा टॅब्लेट एंक्रिप्ट केल्यानंतर, तुम्ही स्क्रीन लॉक (म्हणजे, एक पॅटर्न किंवा अंकीय पिन किंवा पासवर्ड) सेट केला आहे हे गृहित धरून, प्रत्येकवेळी तुम्ही टॅब्लेट सुरू करता तेव्हा त्याचे एंक्रिप्ट करण्‍यासाठी आपल्‍याला स्क्रीन अनलॉक करण्‍याची आवश्यकता असेल. एंक्रिप्ट करण्‍याचा अन्य एकमेव मार्ग तुमचा सर्व डेटा मिटवून, फॅक्‍टरी डेटा रीसेट करणे हा होय.\n\nएंक्रिप्शनला एक तास किंवा अधिक वेळ लागू शकतो. तुम्ही संपूर्ण प्रक्रियेत चार्ज केलेल्या बॅटरीसह सुरू करणे आणि तुमचा टॅब्लेट प्लग इन केलेला ठेवणे आवश्यक आहे. तुम्ही त्यात व्यत्यय आणल्यास, तुम्ही तुमचा काही किंवा सर्व डेटा गमवाल."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"तुम्ही तुमची खाती, सेटिंग्ज, डाउनलोड केलेली अ‍ॅप्स आणि त्यांचा डेटा, मीडिया आणि इतर फाइल एंक्रिप्ट करू शकता. तुम्ही तुमचा फोन एंक्रिप्ट केल्यानंतर, तुम्ही स्क्रीन लॉक (म्हणजे, एक पॅटर्न किंवा अंकीय पिन किंवा पासवर्ड) सेट केला आहे हे गृहित धरून, प्रत्येकवेळी तुम्ही फोन सुरू करता तेव्हा त्याचे एंक्रिप्ट करण्‍यासाठी आपल्‍याला स्क्रीन अनलॉक करण्‍याची आवश्यकता असेल. एंक्रिप्ट करण्‍याचा अन्य एकमेव मार्ग तुमचा सर्व डेटा मिटवून, फॅक्‍टरी डेटा रीसेट करणे हा होय.\n\nएंक्रिप्टीकरणास एक तास किंवा अधिक वेळ लागू शकतो. तुम्ही संपूर्ण प्रक्रियेत चार्ज केलेल्या बॅटरीसह सुरू करणे आणि तुमचा फोन प्लग इन केलेला ठेवणे आवश्यक आहे. तुम्ही त्यात व्यत्यय आणल्यास, तुम्ही तुमचा काही किंवा सर्व डेटा गमवाल."</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"टॅबलेट एंक्रिप्ट करा"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"फोन एंक्रिप्ट करा"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"तुमची बॅटरी चार्ज करा आणि पुन्हा प्रयत्न करा."</string>
-    <string name="crypt_keeper_unplugged_text" msgid="2709721134148651329">"तुमचा चार्जर प्लग इन करा आणि पुन्हा प्रयत्न करा."</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="1847280235529858357">"कोणताही लॉक स्क्रीन पिन किंवा पासवर्ड नाही"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="7210616262954236042">"तुम्ही एनक्रिप्शन सुरू करण्यापूर्वी तुम्हाला एक लॉक स्क्रीन पिन ‍किंवा पासवर्ड सेट करण्याची आवश्यकता आहे."</string>
-    <string name="crypt_keeper_confirm_title" msgid="8600000209722452230">"एंक्रिप्ट करायचे?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="3270587498436152259">"एंक्रिप्शन कार्य परत न करता येणारे आहे आणि तुम्ही त्यात व्यत्यय आणल्यास, तुमचा डेटा गमावेल. एंक्रिप्शनला एखादा तास किंवा जास्त वेळ लागतो, यादरम्यान टॅबलेट कित्येक वेळा रीस्टार्ट होईल."</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="3040428543349852419">"एंक्रिप्शन कार्य परत न करता येणारे आहे आणि तुम्ही त्यात व्यत्यय आणल्यास, तुमचा डेटा गमावेल. एंक्रिप्शनला एखादा तास किंवा जास्त वेळ लागतो, यादरम्यान फोन कित्येक वेळा रीस्टार्ट होईल."</string>
-    <string name="crypt_keeper_setup_title" msgid="3339725741305796680">"एंक्रिप्ट करत आहे"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="4417016995091289019">"तुमचा टॅब्लेट एंक्रिप्ट केला जात असताना प्रतीक्षा करा. <xliff:g id="PERCENT">^1</xliff:g>% पूर्ण."</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="7902355422499500352">"तुमचा फोन एंक्रिप्ट केला जात असताना प्रतीक्षा करा. <xliff:g id="PERCENT">^1</xliff:g>% पूर्ण."</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="8348188415839917821">"तुमचा टॅब्लेट एंक्रिप्ट केला जात असताना प्रतीक्षा करा. शिल्लक वेळ: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="8556105766597855198">"तुमचा फोन एंक्रिप्ट केला जात असताना प्रतीक्षा करा. शिल्लक वेळ: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="3832496715430327682">"तुमचा टॅबलेट अनलॉक करण्‍यासाठी, तो बंद करा आणि नंतर सुरू करा."</string>
-    <string name="crypt_keeper_force_power_cycle" product="default" msgid="5070346039522135361">"तुमचा फोन अनलॉक करण्‍यासाठी, तो बंद करा आणि नंतर सुरू करा."</string>
-    <string name="crypt_keeper_warn_wipe" msgid="8104921337301750394">"चेतावणी: अनलॉक करण्‍याच्या आणखी <xliff:g id="COUNT">^1</xliff:g> अयशस्‍वी प्रयत्नांनंतर तुमचे डिव्हाइस पुसले जाईल."</string>
-    <string name="crypt_keeper_enter_password" msgid="1274917431075529732">"तुमचा पासवर्ड टाइप करा"</string>
-    <string name="crypt_keeper_failed_title" msgid="8173654570682244149">"एंक्रिप्शन अयशस्वी"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"कूटबद्धीकरणात व्यत्यय आला आणि हे पूर्ण होऊ शकत नाही. परिणामस्वरूप, आपल्या टॅबलेटवरील डेटा यापुढे प्रवेशयोग्य राहणार नाही. \n\n तुमचा टॅबलेट वापरून पुन्हा सुरू करण्यासाठी, तुम्हाला फॅक्टरी रीसेट करण्याची आवश्यकता आहे. रीसेट केल्यानंतर तुम्ही तुमचा टॅबलेट सेट करता, तेव्हा आपल्याकडे आपल्या Google खात्यावर बॅकअप घेतलेला कोणताही डेटा रीस्टोअर करण्याची संधी असेल."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"कूटबद्धीकरणात व्यत्यय आला आणि पूर्ण होऊ शकत नाही. परिणामस्वरूप, आपल्या फोनवरील डेटा यापुढे प्रवेशयोग्य नाही.\n\nतुमचा फोन वापरणे पुन्हा सुरू करण्यासाठी, तुम्हाला फॅक्टरी रीसेट करण्याची आवश्यकता आहे. रीसेट केल्यानंतर जेव्हा तुम्ही तुमचा फोन सेट करता, तेव्हा आपल्याकडे आपल्या Google खात्यावर बॅकअप घेतलेला कोणताही डेटा रीस्टोअर करण्याची संधी असेल."</string>
-    <string name="crypt_keeper_data_corrupt_title" msgid="5920153462176846037">"विकूटन अयशस्वी"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"तुम्ही एंटर केलेला पासवर्ड चुकीचा आहे, परंतु दुर्दैवाने तुमचा डेटा दूषित आहे. \n\nतुमचा टॅबलेट वापरणे पुनः सुरू करण्यासाठी, तुम्हाला फॅक्टरी रीसेट करणे आवश्यक आहे. रीसेट केल्यानंतर तुम्ही तुमचा टॅबलेट सेट करता, तेव्हा तुम्हाला आपल्या Google खात्यावर बॅक अप घेतलेला कोणताही डेटा रीस्टोअर करण्याची संधी असेल."</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"तुम्ही एंटर केलेला पासवर्ड बरोबर आहे, परंतु दुर्दैवाने तुमचा डेटा दूषित आहे. \n\nतुमचा फोन वापरणे पुनः सुरू करण्यासाठी, तुम्हाला फॅक्टरी रीसेट करणे आवश्यक आहे. रीसेट केल्यानंतर तुम्ही तुमचा फोन सेट करता, तेव्हा तुम्हाला आपल्या Google खात्यावर बॅक अप घेतलेला कोणताही डेटा रीस्टोअर करण्याची संधी असेल."</string>
-    <string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"इनपुट पद्धत स्विच करा"</string>
+    <string name="encryption_settings_title" msgid="2848716008695618360">"एंक्रिप्शन"</string>
+    <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"टॅबलेट एंक्रिप्ट करा"</string>
+    <string name="encrypt_title" product="default" msgid="7337365190988321100">"फोन एंक्रिप्ट करा"</string>
+    <string name="encrypted_summary" msgid="545623487587251207">"एंक्रिप्ट केले"</string>
     <string name="suggested_lock_settings_title" msgid="7836065447159730217">"तुमचा फोन सुरक्षित ठेवा"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"टॅबलेटचे संरक्षण करण्‍यासाठी स्‍क्रीन लॉक सेट करा"</string>
     <string name="suggested_lock_settings_summary" product="device" msgid="8479766049078378225">"डिव्‍हाइसचे संरक्षण करण्‍यासाठी स्‍क्रीन लॉक सेट करा"</string>
@@ -817,6 +791,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"तुम्हाला इतर डिव्हाइसवर देखील हा पिन टाईप करण्याची आवश्यकता असू शकते."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"तुम्हाला इतर डिव्हाइसवर देखील ही पासकी टाईप करण्याची आवश्यकता असू शकते."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"यासह जोडण्यासाठी:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;हे ही पासकी दर्शवत असल्याचे सुनिश्चित करा:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"समन्वित सेटशी पेअर करण्याचे कंफर्म करा"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"यावरून:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;हे डिव्हाइस जोडायचे?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"यासह जोडण्यासाठी:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>यावर टाइप करा:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, नंतर Return किंवा Enter दाबा."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"तुमच्या संपर्क आणि कॉल इतिहासातील अ‍ॅक्सेसची अनुमती द्या"</string>
@@ -850,6 +825,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"कनेक्ट होऊ शकत नाही. पुन्हा प्रयत्न करा."</string>
     <string name="device_details_title" msgid="1155622417516195481">"डिव्हाइस तपशील"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"डिव्हाइसचा ब्लूटूथ अ‍ॅड्रेस: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"डिव्हाइसचा ब्लूटूथ अ‍ॅड्रेस:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"डिव्हाइस विसरायचे का?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"सहयोग काढा"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"अ‍ॅप डिस्कनेक्‍ट करायचे आहे का?"</string>
@@ -881,6 +857,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"सेटिंग्ज लक्षात ठेवा"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"जास्तीत जास्त कनेक्ट होऊ शकणारी ऑडिओ डिव्हाइस"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"जास्तीत जास्त कनेक्ट होऊ शकणार्‍या ऑडिओ डिव्हाइसची संख्या निवडा"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"NFC स्टॅक डीबग लॉग"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"NFC स्टॅक लॉग करण्याची पातळी वाढवा"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"कास्‍ट करा"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"मिरर करा"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"वायरलेस डिस्प्ले सुरू करा"</string>
@@ -1188,6 +1166,8 @@
     <string name="wifi_hotspot_maximize_compatibility_dual_ap_summary" msgid="3579549223159056533">"हा हॉटस्पॉट शोधण्यात इतर डिव्हाइसना मदत करते. बॅटरी वापर वाढवते."</string>
     <string name="wifi_tether_starting" msgid="8879874184033857814">"हॉटस्पॉट सुरू करत आहे…"</string>
     <string name="wifi_tether_stopping" msgid="4416492968019409188">"हॉटस्पॉट बंद करत आहे…"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_title" msgid="3089432578433978073">"टेदरिंग उपलब्ध नाही"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_content" msgid="5920421547607921112">"तपशिलांसाठी तुमच्या वाहकाशी संपर्क साधा"</string>
     <string name="wifi_tether_enabled_subtext" msgid="5085002421099821056">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> सक्रिय आहे"</string>
     <string name="wifi_tether_failed_subtext" msgid="437190628041885500">"पोर्टेबल वाय-फाय हॉटस्पॉट एरर"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7072559431286459122">"वाय-फाय हॉटस्पॉट सेट करा"</string>
@@ -2535,11 +2515,6 @@
     <string name="enable_service_title" msgid="7231533866953706788">"<xliff:g id="SERVICE">%1$s</xliff:g> ला तुमच्या डिव्हाइसचे संपूर्ण नियंत्रण देण्यासाठी अनुमती द्यायची आहे का?"</string>
     <string name="capabilities_list_title" msgid="1225853611983394386">"यासाठी <xliff:g id="SERVICE">%1$s</xliff:g> आवश्यक आहे:"</string>
     <string name="touch_filtered_warning" msgid="4225815157460318241">"अ‍ॅप परवानगी विनंती अस्पष्‍ट करीत असल्‍याने, सेटिंग्ज आपल्या प्रतिसादाची पडताळणी करू शकत नाहीत."</string>
-    <string name="enable_service_encryption_warning" msgid="931082737770453755">"तुम्ही <xliff:g id="SERVICE">%1$s</xliff:g> सुरू केल्‍यास, तुमचे डिव्हाइस डेटा एंक्रिप्शन वर्धित करण्‍यासाठी तुमचे स्क्रीन लॉक वापरणार नाही."</string>
-    <string name="secure_lock_encryption_warning" msgid="669152607190123579">"तुम्ही ॲक्सेसयोग्यता सेवा सुरू केली असल्‍यामुळे, तुमचे डिव्हाइस डेटा एंक्रिप्शन वर्धित करण्‍यासाठी तुमचे स्क्रीन लॉक वापरणार नाही."</string>
-    <string name="enable_service_pattern_reason" msgid="6832846117817938536">"<xliff:g id="SERVICE">%1$s</xliff:g> सुरू करण्यामुळे डेटा एंक्रिप्शनवर परिणाम होतो, तुम्हाला तुमच्या पॅटर्नची पुष्टी करण्याची आवश्यकता आहे."</string>
-    <string name="enable_service_pin_reason" msgid="6040417014360237703">"<xliff:g id="SERVICE">%1$s</xliff:g> सुरू करण्याने एंक्रिप्शन डेटा प्रभावित होतो, तुम्हाला तुमच्या पिन ची पुष्टी करण्याची आवश्यकता आहे."</string>
-    <string name="enable_service_password_reason" msgid="6962544350351734238">"<xliff:g id="SERVICE">%1$s</xliff:g> सुरू करण्यामुळे डेटा एंक्रिप्शनवर परिणाम होतो, तुम्हाला तुमच्या पासवर्डची पुष्टी करण्याची आवश्यकता आहे."</string>
     <string name="accessibility_service_warning" msgid="6779187188736432618">"<xliff:g id="SERVICE">%1$s</xliff:g>या डिव्हाइसच्या पूर्ण नियंत्रणासाठी विनंती करत आहे. सेवा स्क्रीन रीड करू शकते आणि अ‍ॅक्सेसिबिलिटीच्या गरजा असलेल्या वापरकर्त्यांच्या वतीने कृती करू शकते. नियंत्रणाची ही पातळी बहुतांश अ‍ॅप्ससाठी योग्य नाही."</string>
     <string name="accessibility_service_warning_description" msgid="6573203795976134751">"जी ॲप्स तुमच्या ॲक्सेसिबिलिटी गरजा पूर्ण करतात अशा ॲप्ससाठी संपूर्ण नियंत्रण योग्य आहे. पण ते सर्व ॲप्सना लागू होईल असे नाही."</string>
     <string name="accessibility_service_screen_control_title" msgid="324795030658109870">"स्क्रीन पहा आणि नियंत्रित करा"</string>
@@ -3104,14 +3079,6 @@
     <string name="remove_account_failed" msgid="3709502163548900644">"या बदलाला आपल्या प्रशासकाद्वारे अनुमती नाही"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"व्यक्तिचलितपणे सिंक करू शकत नाही"</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"या आयटमसाठी सध्या सिंक अक्षम केले आहे. हे सेटिंग बदलण्यासाठी, पार्श्वभूमीवरील डेटा आणि आपोआप होणारे सिंक तात्पुरते सुरू करा."</string>
-    <string name="enter_password" msgid="6327051330258595331">"Android सुरू करण्‍यासाठी, तुमचा पासवर्ड प्रविष्‍ट करा"</string>
-    <string name="enter_pin" msgid="1029287617551232681">"Android सुरू करण्‍यासाठी, तुमचा पिन प्रविष्‍ट करा"</string>
-    <string name="enter_pattern" msgid="1747316785866742960">"Android सुरू करण्‍यासाठी, आपल्या नमुन्याची रेखाटणी करा"</string>
-    <string name="cryptkeeper_wrong_pattern" msgid="340747269176120242">"चुकीचा पॅटर्न"</string>
-    <string name="cryptkeeper_wrong_password" msgid="7295607881887114486">"चुकीचा पासवर्ड"</string>
-    <string name="cryptkeeper_wrong_pin" msgid="2347961593970714201">"चुकीचा पिन"</string>
-    <string name="checking_decryption" msgid="6111642972615688237">"तपासत आहे..."</string>
-    <string name="starting_android" msgid="6694154070215356186">"Android सुरू करत आहोत..."</string>
     <string name="delete" msgid="8330605554706263775">"हटवा"</string>
     <string name="misc_files" msgid="6598066985800749585">"संकीर्ण फाइल"</string>
     <string name="misc_files_selected_count" msgid="5597802791672749532">"<xliff:g id="TOTAL">%2$d</xliff:g> पैकी <xliff:g id="NUMBER">%1$d</xliff:g> निवडले"</string>
@@ -3207,8 +3174,6 @@
     <string name="data_usage_metered_yes" msgid="4262598072030135223">"मर्यादित डेटा वापराचे नेटवर्क"</string>
     <string name="data_usage_metered_no" msgid="1685828958417926268">"मीटरने मोजले नाही"</string>
     <string name="data_usage_disclaimer" msgid="3271450299386176770">"वाहक डेटा गणना तुमच्या डिव्हाइसपेक्षा भिन्न असू शकते."</string>
-    <string name="cryptkeeper_emergency_call" msgid="8369322820475703306">"आणीबाणीचा कॉल"</string>
-    <string name="cryptkeeper_return_to_call" msgid="3857250752781151232">"कॉल वर परत"</string>
     <string name="vpn_name" msgid="3806456074909253262">"नाव"</string>
     <string name="vpn_type" msgid="5533202873260826663">"प्रकार"</string>
     <string name="vpn_server" msgid="2908816134941973935">"सर्व्हर अ‍ॅड्रेस"</string>
@@ -4765,8 +4730,6 @@
       <item quantity="one">1 अ‍ॅप अनिर्बंधित डेटा वापरू शकते</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"आणखी पहा"</string>
-    <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"वापरकर्ता डेटा खरोखर पुसायचा आणि फाइल कूटबद्धीकरणमध्ये रूपांतरित करायचा?"</string>
-    <string name="button_confirm_convert_fbe" msgid="339648921918438106">"पुसा आणि रुपांतरित करा"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"ShortcutManager दर मर्यादित करणे रीसेट करा"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"ShortcutManager दर-मर्यादित करणे रीसेट केले गेले आहे"</string>
     <string name="notification_suggestion_title" msgid="6309263655965785411">"लॉक स्क्रीनवरील माहिती नियंत्रित करा"</string>
@@ -5293,6 +5256,7 @@
     <string name="sim_action_yes" msgid="8076556020131395515">"होय"</string>
     <string name="sim_action_reboot" msgid="3508948833333441538">"रीस्टार्ट करा"</string>
     <string name="sim_action_no_thanks" msgid="435717748384544195">"नाही, नको"</string>
+    <string name="sim_action_cancel" msgid="2668099867029610910">"रद्द करा"</string>
     <string name="sim_switch_button" msgid="1405772571706095387">"स्विच करा"</string>
     <string name="dsds_activation_failure_title" msgid="4467364110584914794">"सिम ॲक्टिव्हेट करू शकत नाही"</string>
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"सिम काढा आणि ते पुन्हा घाला. समस्या कायम राहिल्यास, तुमचे डिव्हाइस रीस्टार्ट करा."</string>
@@ -5445,6 +5409,10 @@
     <string name="cached_apps_freezer" msgid="1057519579761550350">"कॅशे केलेल्या ॲप्सची अंमलबजावणी निलंबित करा"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"Settings यामध्ये स्‍क्रीन ओव्‍हरलेची अनुमती द्या"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Settings स्क्रीनवर ओव्हरले करण्यासाठी इतर अ‍ॅप्सवर प्रदर्शित करू शकणाऱ्या अ‍ॅप्सना अनुमती द्या"</string>
+    <!-- no translation found for allow_mock_modem (3832264806530479214) -->
+    <skip />
+    <!-- no translation found for allow_mock_modem_summary (9097416612748005374) -->
+    <skip />
     <string name="media_controls_title" msgid="403271085636252597">"मीडिया"</string>
     <string name="media_controls_resume_title" msgid="855076860336652370">"मीडिया प्लेअर पिन करा"</string>
     <string name="media_controls_resume_description" msgid="3163482266454802097">"प्लेबॅक करणे पुन्‍हा झटपट सुरू करण्यासाठी, क्विक सेटिंग्जमध्ये मीडिया प्लेअर उघडा राहतो"</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 1ecc106..f44466e 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -142,10 +142,11 @@
     <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"Benarkan peranti anda berkomunikasi dengan peranti Bluetooth yang berdekatan"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"Benarkan telefon anda berkomunikasi dengan peranti Bluetooth yang berdekatan"</string>
     <string name="bluetooth_disable_a2dp_hw_offload" msgid="5942913792817797541">"Lumpuhkan lepas muatan perkakasan A2DP Bluetooth"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="8610420176339657720">"Mulakan Sml Peranti?"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8333029144800835996">"Mulakan semula peranti untuk menukar tetapan ini."</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="3488695418187553566">"Mulakan semula"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="4930826928585464191">"Batal"</string>
+    <string name="bluetooth_disable_le_audio_hw_offload" msgid="3966022676505972908">"Lumpuhkan lepas muatan perkakasan LE AUDIO Bluetooth"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_title" msgid="6001142380445276918">"Mulakan Semula Peranti?"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_message" msgid="1524373895333698779">"Mulakan semula peranti untuk menukar tetapan ini."</string>
+    <string name="bluetooth_disable_hw_offload_dialog_confirm" msgid="5594859658551707592">"Mulakan semula"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel" msgid="3663690305043973720">"Batal"</string>
     <string name="connected_device_media_device_title" msgid="3783388247594566734">"Peranti media"</string>
     <string name="connected_device_call_device_title" msgid="88732390601723608">"Panggil peranti"</string>
     <string name="connected_device_other_device_title" msgid="4652120430615729193">"Peranti lain"</string>
@@ -309,9 +310,9 @@
     <string name="security_settings_title" msgid="6710768415432791970">"Keselamatan"</string>
     <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"Penyulitan &amp; bukti kelayakan"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"Telefon disulitkan"</string>
-    <string name="decryption_settings_summary" product="default" msgid="1742645256103613503">"Telefon tidak disulitkan"</string>
+    <string name="not_encrypted_summary" product="default" msgid="2251945842585788254">"Telefon tidak disulitkan"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"Peranti disulitkan"</string>
-    <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"Peranti tidak disulitkan"</string>
+    <string name="not_encrypted_summary" product="tablet" msgid="2374263654698719382">"Peranti tidak disulitkan"</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"Skrin kunci"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"Item untuk ditunjukkan"</string>
     <string name="security_settings_summary" msgid="1627059516127354233">"Tetapkan Lokasi Saya, buka kunci skrin, kunci kad SIM, kunci storan bukti kelayakan"</string>
@@ -568,37 +569,10 @@
     <string name="fingerprint_last_delete_message" msgid="7860374760549404410">"Anda tidak akan dapat menggunakan cap jari anda untuk membuka kunci telefon anda atau mengesahkan sama ada itulah anda atau tidak dalam apl."</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="4104208067277655068">"Anda tidak akan dapat menggunakan cap jari anda untuk membuka kunci profil kerja anda, membenarkan pembelian atau log masuk apl kerja."</string>
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"Ya, alih keluar"</string>
-    <string name="crypt_keeper_settings_title" msgid="4938812137822100044">"Penyulitan"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"Sulitkan tablet"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"Sulitkan telefon"</string>
-    <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"Disulitkan"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"Anda boleh sulitkan akaun anda, tetapan, apl yang dimuat turun dan data apl, media serta fail lain. Selepas anda menyulitkan tablet anda, dengan anggapan anda sudah menyediakan kunci skrin (iaitu corak atau PIN berangka atau kata laluan), anda perlu membuka kunci skrin untuk menyahsulit tablet setiap kali anda menghidupkan tablet. Satu-satunya cara lain untuk menyahsulit adalah dengan melakukan tetapan semula data kilang yang akan memadam semua data anda\n\nPenyulitan mengambil masa sejam atau lebih. Anda mesti bermula dengan bateri yang dicas dan pastikan tablet anda dipalamkan sepanjang proses. Jika anda mengganggu proses, anda akan kehilangan sebahagian atau semua data anda."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"Anda boleh sulitkan akaun anda, tetapan, apl yang dimuat turun dan data apl, media serta fail lain. Selepas anda menyulitkan telefon anda, dengan anggapan anda sudah menyediakan kunci skrin (iaitu corak atau PIN berangka atau kata laluan), anda perlu membuka kunci skrin untuk menyahsulit telefon setiap kali anda menghidupkan telefon. Satu-satunya cara lain untuk menyahsulit adalah dengan melakukan tetapan semula data kilang yang akan memadam semua data anda.\n\nPenyulitan mengambil masa sejam atau lebih. Anda mesti bermula dengan bateri yang dicas dan pastikan telefon anda dipalamkan sepanjang proses. Jika anda mengganggu proses, anda akan kehilangan sebahagian atau semua data anda."</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"Sulitkan tablet"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"Sulitkan telefon"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"Cas bateri anda dan cuba lagi."</string>
-    <string name="crypt_keeper_unplugged_text" msgid="2709721134148651329">"Pasangkan palam pengecas anda dan cuba lagi."</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="1847280235529858357">"Tiada PIN kunci skrin atau kata laluan"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="7210616262954236042">"Anda perlu menetapkan PIN atau kata laluan kunci skrin sebelum anda boleh memulakan penyulitan."</string>
-    <string name="crypt_keeper_confirm_title" msgid="8600000209722452230">"Sulitkan?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="3270587498436152259">"Operasi penyulitan ini tidak boleh dibalikkan dan sekiranya anda mengganggunya, anda akan kehilangan data. Penyulitan mengambil masa sejam atau lebih dan dalam masa yang sama, tablet akan dimulakan semula beberapa kali."</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="3040428543349852419">"Operasi penyulitan ini tidak boleh dibalikkan dan sekiranya anda mengganggunya, anda akan kehilangan data. Penyulitan mengambil masa sejam atau lebih dan dalam masa yang sama, fon akan dimulakan semula beberapa kali."</string>
-    <string name="crypt_keeper_setup_title" msgid="3339725741305796680">"Penyulitan"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="4417016995091289019">"Sila tunggu sementara tablet anda disulitkan. <xliff:g id="PERCENT">^1</xliff:g>% selesai."</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="7902355422499500352">"Sila tunggu sementara telefon anda disulitkan. <xliff:g id="PERCENT">^1</xliff:g>% selesai."</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="8348188415839917821">"Sila tunggu sementara tablet anda disulitkan. Masa yang tinggal: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="8556105766597855198">"Sila tunggu sementara telefon anda disulitkan. Masa yang tinggal: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="3832496715430327682">"Untuk membuka kunci tablet anda, matikan, kemudian hidupkan tablet itu."</string>
-    <string name="crypt_keeper_force_power_cycle" product="default" msgid="5070346039522135361">"Untuk membuka kunci telefon anda, matikan, kemudian hidupkan telefon itu."</string>
-    <string name="crypt_keeper_warn_wipe" msgid="8104921337301750394">"Amaran: Peranti anda akan disilih selepas <xliff:g id="COUNT">^1</xliff:g> lagi percubaan yang gagal untuk membuka kunci!"</string>
-    <string name="crypt_keeper_enter_password" msgid="1274917431075529732">"Taipkan kata laluan anda"</string>
-    <string name="crypt_keeper_failed_title" msgid="8173654570682244149">"Penyulitan tidak berjaya"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"Penyulitan telah diganggu dan tidak dapat dilengkapkan. Akibatnya, data pada tablet anda tidak lagi boleh diakses. \n\n Untuk menyambung semula menggunakan tablet anda, anda perlu melakukan tetapan semula kilang. Apabila anda menyediakan tablet anda selepas menetap semula, anda akan berpeluang untuk memulihkan apa-apa data yang dibuat sandaran ke Akaun Google anda."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"Penyulitan telah diganggu dan tidak dapat dilengkapkan. Akibatnya, data pada telefon anda tidak lagi boleh diakses. \n\nUntuk menyambung semula menggunakan telefon anda, anda perlu melakukan tetapan semula kilang. Apabila anda menetapkan telefon anda selepas menetap semula, anda akan mempunyai peluang untuk memulihkan apa-apa data yang dibuat sandaran ke Akaun Google anda."</string>
-    <string name="crypt_keeper_data_corrupt_title" msgid="5920153462176846037">"Penyahsulitan tidak berjaya"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"Kata laluan yang anda masukkan betul, malangnya data anda rosak. \n\nUntuk menyambung semula penggunaan tablet, anda perlu melakukan tetapan semula kilang. Apabila anda menyediakan tablet selepas membuat penetapan semula, anda berpeluang memulihkan sebarang data yang telah disandarkan ke Akaun Google anda."</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"Kata laluan yang anda masukkan betul, malangnya data anda rosak. \n\nUntuk menyambung semula penggunaan telefon, anda perlu melakukan tetapan semula kilang. Apabila anda menyediakan telefon selepas membuat penetapan semula, anda berpeluang memulihkan sebarang data yang telah disandarkan ke Akaun Google anda."</string>
-    <string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"Tukar kaedah input"</string>
+    <string name="encryption_settings_title" msgid="2848716008695618360">"Penyulitan"</string>
+    <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"Sulitkan tablet"</string>
+    <string name="encrypt_title" product="default" msgid="7337365190988321100">"Sulitkan telefon"</string>
+    <string name="encrypted_summary" msgid="545623487587251207">"Disulitkan"</string>
     <string name="suggested_lock_settings_title" msgid="7836065447159730217">"Lindungi telefon anda"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"Tetapkan kunci skrin untuk melindungi tablet"</string>
     <string name="suggested_lock_settings_summary" product="device" msgid="8479766049078378225">"Tetapkan kunci skrin untuk melindungi peranti"</string>
@@ -817,6 +791,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Anda juga mungkin perlu menaipkan PIN ini pada peranti satu lagi."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Anda juga mungkin perlu memasukkan kunci laluan ini pada peranti satu lagi."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Untuk menjadi pasangan:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Pastikan ia menunjukkan kunci laluan ini:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Sahkan untuk bergandingan dengan set yang diselaraskan"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"Dari:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Jadikan pasangan peranti ini?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Untuk berpasangan dengan:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Taip padanya:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, kemudian tekan Kembali atau Enter."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Benarkan akses kepada kenalan dan sejarah panggilan anda"</string>
@@ -850,6 +825,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Tidak dapat bersambung. Cuba lagi."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Butiran peranti"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Alamat Bluetooth peranti: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Alamat Bluetooth peranti:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Lupakan peranti?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Keluarkan kaitan"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Putuskan Sambungan Apl?"</string>
@@ -881,6 +857,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Ingat tetapan"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Bilangan maksimum peranti audio Bluetooth yang disambungkan"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Pilih bilangan maksimum peranti audio Bluetooth yang disambungkan"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"Log nyahpepijat tindanan NFC"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Tingkatkan tahap pengelogan tindanan NFC"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Hantar"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"cermin"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Dayakan paparan wayarles"</string>
@@ -1188,6 +1166,8 @@
     <string name="wifi_hotspot_maximize_compatibility_dual_ap_summary" msgid="3579549223159056533">"Membantu peranti lain menemukan tempat liputan ini. Meningkatkan penggunaan bateri."</string>
     <string name="wifi_tether_starting" msgid="8879874184033857814">"Menghidupkan tempat liputan..."</string>
     <string name="wifi_tether_stopping" msgid="4416492968019409188">"Mematikan tempat liputan..."</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_title" msgid="3089432578433978073">"Penambatan tidak tersedia"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_content" msgid="5920421547607921112">"Hubungi pembawa anda untuk mendapatkan butiran"</string>
     <string name="wifi_tether_enabled_subtext" msgid="5085002421099821056">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> aktif"</string>
     <string name="wifi_tether_failed_subtext" msgid="437190628041885500">"Ralat tempat liputan Wi-Fi mudah alih"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7072559431286459122">"Sediakan liputan Wi-Fi"</string>
@@ -2534,11 +2514,6 @@
     <string name="enable_service_title" msgid="7231533866953706788">"Benarkan <xliff:g id="SERVICE">%1$s</xliff:g> mempunyai kawalan penuh atas peranti anda?"</string>
     <string name="capabilities_list_title" msgid="1225853611983394386">"<xliff:g id="SERVICE">%1$s</xliff:g> perlu:"</string>
     <string name="touch_filtered_warning" msgid="4225815157460318241">"Oleh sebab apl melindungi permintaan kebenaran, Tetapan tidak dapat mengesahkan jawapan anda."</string>
-    <string name="enable_service_encryption_warning" msgid="931082737770453755">"Jika anda menghidupkan <xliff:g id="SERVICE">%1$s</xliff:g>, peranti anda tidak akan menggunakan kunci skrin anda untuk meningkatkan penyulitan data."</string>
-    <string name="secure_lock_encryption_warning" msgid="669152607190123579">"Oleh sebab anda telah menghidupkan perkhidmatan kebolehaksesan, peranti anda tidak akan menggunakan kunci skrin anda untuk meningkatkan penyulitan data."</string>
-    <string name="enable_service_pattern_reason" msgid="6832846117817938536">"Oleh kerana menghidupkan <xliff:g id="SERVICE">%1$s</xliff:g> mempengaruhi penyulitan data, anda perlu mengesahkan corak anda."</string>
-    <string name="enable_service_pin_reason" msgid="6040417014360237703">"Oleh kerana menghidupkan <xliff:g id="SERVICE">%1$s</xliff:g> mempengaruhi penyulitan data, anda perlu mengesahkan PIN anda."</string>
-    <string name="enable_service_password_reason" msgid="6962544350351734238">"Oleh kerana menghidupkan <xliff:g id="SERVICE">%1$s</xliff:g> mempengaruhi penyulitan data, anda perlu mengesahkan kata laluan anda."</string>
     <string name="accessibility_service_warning" msgid="6779187188736432618">"<xliff:g id="SERVICE">%1$s</xliff:g> meminta kawalan sepenuhnya ke atas peranti ini. Perkhidmatan dapat membaca skrin dan bertindak bagi pihak pengguna dengan keperluan kebolehaksesan. Tahap kawalan ini tidak sesuai untuk kebanyakan apl."</string>
     <string name="accessibility_service_warning_description" msgid="6573203795976134751">"Kawalan penuh sesuai untuk apl yang membantu anda dengan keperluan kebolehaksesan tetapi bukan untuk kebanyakan apl."</string>
     <string name="accessibility_service_screen_control_title" msgid="324795030658109870">"Melihat dan mengawal skrin"</string>
@@ -3103,14 +3078,6 @@
     <string name="remove_account_failed" msgid="3709502163548900644">"Perubahan ini tidak dibenarkan oleh pentadbir anda"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"Tidak boleh menyegerakkan secara manual"</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"Penyegerakan untuk item ini dilumpuhkan pada masa ini. Untuk menukar tetapan ini, hidupkan data latar belakang dan penyegerakan automatik buat sementara waktu."</string>
-    <string name="enter_password" msgid="6327051330258595331">"Untuk memulakan Android, masukkan kata laluan anda"</string>
-    <string name="enter_pin" msgid="1029287617551232681">"Untuk memulakan Android, masukkan PIN anda"</string>
-    <string name="enter_pattern" msgid="1747316785866742960">"Untuk memulakan Android, lukis corak anda"</string>
-    <string name="cryptkeeper_wrong_pattern" msgid="340747269176120242">"Corak salah"</string>
-    <string name="cryptkeeper_wrong_password" msgid="7295607881887114486">"Kata Laluan salah"</string>
-    <string name="cryptkeeper_wrong_pin" msgid="2347961593970714201">"PIN salah"</string>
-    <string name="checking_decryption" msgid="6111642972615688237">"Menyemak…"</string>
-    <string name="starting_android" msgid="6694154070215356186">"Memulakan Android…"</string>
     <string name="delete" msgid="8330605554706263775">"Padam"</string>
     <string name="misc_files" msgid="6598066985800749585">"Fail Pelbagai"</string>
     <string name="misc_files_selected_count" msgid="5597802791672749532">"pilihan <xliff:g id="NUMBER">%1$d</xliff:g> dari <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -3206,8 +3173,6 @@
     <string name="data_usage_metered_yes" msgid="4262598072030135223">"Bermeter"</string>
     <string name="data_usage_metered_no" msgid="1685828958417926268">"Tidak bermeter"</string>
     <string name="data_usage_disclaimer" msgid="3271450299386176770">"Cara pengiraan data pembawa mungkin berbeza dengan peranti anda."</string>
-    <string name="cryptkeeper_emergency_call" msgid="8369322820475703306">"Panggilan kecemasan"</string>
-    <string name="cryptkeeper_return_to_call" msgid="3857250752781151232">"Kembali ke panggilan"</string>
     <string name="vpn_name" msgid="3806456074909253262">"Nama"</string>
     <string name="vpn_type" msgid="5533202873260826663">"Jenis"</string>
     <string name="vpn_server" msgid="2908816134941973935">"Alamat pelayan"</string>
@@ -4764,8 +4729,6 @@
       <item quantity="one">1 apl boleh menggunakan data tanpa had</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"Lihat lagi"</string>
-    <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"Benar-benar padamkan data pengguna dan tukarkan kepada penyulitan fail?"</string>
-    <string name="button_confirm_convert_fbe" msgid="339648921918438106">"Padamkan dan tukar"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"Tetapkan semula had kadar ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"Had kadar ShortcutManager telah ditetapkan semula"</string>
     <string name="notification_suggestion_title" msgid="6309263655965785411">"Kawal maklumat pada skrin kunci"</string>
@@ -5292,6 +5255,7 @@
     <string name="sim_action_yes" msgid="8076556020131395515">"Ya"</string>
     <string name="sim_action_reboot" msgid="3508948833333441538">"Mulakan semula"</string>
     <string name="sim_action_no_thanks" msgid="435717748384544195">"Tidak perlu"</string>
+    <string name="sim_action_cancel" msgid="2668099867029610910">"Batal"</string>
     <string name="sim_switch_button" msgid="1405772571706095387">"Tukar"</string>
     <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Tidak dapat mengaktifkan SIM"</string>
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Keluarkan SIM dan masukkan kad itu kembali. Jika masalah berlanjutan, mulakan semula peranti anda."</string>
@@ -5444,6 +5408,10 @@
     <string name="cached_apps_freezer" msgid="1057519579761550350">"Gantung pelaksanaan untuk apl cache"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"Benarkan tindanan skrin pada Tetapan"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Benarkan apl yang boleh dipaparkan di atas apl lain untuk menindan skrin Tetapan"</string>
+    <!-- no translation found for allow_mock_modem (3832264806530479214) -->
+    <skip />
+    <!-- no translation found for allow_mock_modem_summary (9097416612748005374) -->
+    <skip />
     <string name="media_controls_title" msgid="403271085636252597">"Media"</string>
     <string name="media_controls_resume_title" msgid="855076860336652370">"Sematkan pemain media"</string>
     <string name="media_controls_resume_description" msgid="3163482266454802097">"Untuk menyambung semula main balik dengan pantas, biarkan pemain media kekal terbuka dalam Tetapan Pantas"</string>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index f5b4ded..5dbb245 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -142,10 +142,11 @@
     <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"သင့်စက်ပစ္စည်းအား အနီးအနားရှိ \'ဘလူးတုသ်\' စက်ပစ္စည်းများနှင့် ချိတ်ဆက်ခွင့်ပေးသည်"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"သင့်ဖုန်းအား အနီးအနားရှိ \'ဘလူးတုသ်\' စက်ပစ္စည်းများနှင့် ချိတ်ဆက်ခွင့်ပေးသည်"</string>
     <string name="bluetooth_disable_a2dp_hw_offload" msgid="5942913792817797541">"ဘလူးတုသ် A2DP ဟာ့ဒ်ဝဲဖြုတ်ခြင်း ပိတ်ရန်"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="8610420176339657720">"စက်ပြန်စတင်မလား။"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8333029144800835996">"ဤဆက်တင်ကိုပြောင်းရန် သင့်စက်ကို ပြန်စတင်ရပါမည်။"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="3488695418187553566">"ပြန်စရန်"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="4930826928585464191">"မလုပ်တော့"</string>
+    <string name="bluetooth_disable_le_audio_hw_offload" msgid="3966022676505972908">"ဘလူးတုသ် LE AUDIO ဟာ့ဒ်ဝဲဖြုတ်ချမှု ပိတ်ခြင်း"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_title" msgid="6001142380445276918">"စက်ပြန်စလိုပါသလား။"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_message" msgid="1524373895333698779">"ဤဆက်တင်ကိုပြောင်းရန် သင့်စက်ကို ပြန်စရမည်။"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_confirm" msgid="5594859658551707592">"ပြန်စရန်"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel" msgid="3663690305043973720">"မလုပ်တော့"</string>
     <string name="connected_device_media_device_title" msgid="3783388247594566734">"မီဒီယာ စက်ပစ္စည်းများ"</string>
     <string name="connected_device_call_device_title" msgid="88732390601723608">"ခေါ်ဆိုမှု စက်ပစ္စည်းများ"</string>
     <string name="connected_device_other_device_title" msgid="4652120430615729193">"အခြား စက်ပစ္စည်းများ"</string>
@@ -309,9 +310,9 @@
     <string name="security_settings_title" msgid="6710768415432791970">"လုံခြုံရေး"</string>
     <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"အသွင်ဝှက်ခြင်းနှင့် အထောက်အထားများ"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"ဖုန်းကို အသွင်ဝှက်ထားသည်"</string>
-    <string name="decryption_settings_summary" product="default" msgid="1742645256103613503">"ဖုန်းကို အသွင်ဝှက်မထားပါ"</string>
+    <string name="not_encrypted_summary" product="default" msgid="2251945842585788254">"ဖုန်းကို အသွင်ဝှက်မထားပါ"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"စက်ပစ္စည်းကို အသွင်ဝှက်ထားသည်"</string>
-    <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"စက်ပစ္စည်းကို အသွင်ဝှက်မထားပါ"</string>
+    <string name="not_encrypted_summary" product="tablet" msgid="2374263654698719382">"စက်ပစ္စည်းကို အသွင်ဝှက်မထားပါ"</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"လော့ခ်မျက်နှာပြင်"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"ပြသမည့်အရာ"</string>
     <string name="security_settings_summary" msgid="1627059516127354233">"ကျွန်ုပ်၏တည်နေရာ စကရင်ကိုလော့ခ်ဖွင့်ခြင်း ဆင်းမ်ကတ်လော့ခ်ချခြင်း ယုံကြည်စိတ်ချရသောသိုလှောင်ရာနေရာတို့ကို သတ်မှတ်မည်"</string>
@@ -480,7 +481,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"ဖျက်ရန်"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"အာရုံခံကိရိယာကို ထိပါ"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"သင့်လက်ချောင်းကို အာရုံခံကိရိယာပေါ်သို့ တင်လိုက်ပြီး တုန်ခါမှုကို ခံစားရချိန်တွင် ပြန်ရုပ်လိုက်ပါ"</string>
-    <string name="security_settings_udfps_enroll_start_message" msgid="5032954588171487566">"တုန်ခါမှုကို ခံစားရချိန်အထိ အာရုံခံကိရိယာပေါ်တွင် သင့်လက်ဗွေထည့်သွင်းပါ"</string>
+    <string name="security_settings_udfps_enroll_start_message" msgid="5032954588171487566">"တုန်ခါမှုကို ခံစားရချိန်အထိ အာရုံခံကိရိယာပေါ်တွင် သင့်လက်ဗွေအပြားလိုက် တင်ထားပါ"</string>
     <string name="security_settings_fingerprint_enroll_udfps_title" msgid="6665610134560896895">"လက်ဗွေ အာရုံခံကိရိယာကို တို့ထိ၍ ဖိထားပါ"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"မြှောက်ပါ၊ ထို့နောက် ပြန်ထိပါ"</string>
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"နောက်တစ်ကြိမ်"</string>
@@ -568,37 +569,10 @@
     <string name="fingerprint_last_delete_message" msgid="7860374760549404410">"အက်ပ်များတွင် သင်ဖြစ်ကြောင်းအတည်ပြုရန်အတွက် (သို့) သင့်ဖုန်းကို လော့ခ်ဖွင့်ရန်အတွက် သင့်လက်ဗွေကို အသုံးပြု၍ရတော့မည် မဟုတ်ပါ။"</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="4104208067277655068">"သင်၏အလုပ်ပရိုဖိုင်ကို လော့ခ်ဖွင့်ရန်၊ ဝယ်ယူမှုများကို ခွင့်ပြုရန် (သို့) အလုပ်သုံးအက်ပ်များသို့ လက်မှတ်ထိုးဝင်ရန်တို့အတွက် သင့်လက်ဗွေကို အသုံးပြု၍ရတော့မည် မဟုတ်ပါ။"</string>
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"ဖယ်ရှားပါ"</string>
-    <string name="crypt_keeper_settings_title" msgid="4938812137822100044">"အသွင်ဝှက်ခြင်း"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"တက်ပလက်ကိုလျှို့ဝှက်အသွင်ပြောင်းရန်"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"ဖုန်းကို အသွင်ဝှက်ထားခြင်း"</string>
-    <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"အသွင်ဝှက်ထားသည်"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"သင်သည် သင်၏ အကောင့်များ၊ ဆက်တင်များ၊ ဒေါင်းလုဒ် အက်ပ်များ နှင့် ၎င်းတို့၏ ဒေတာများကို၊ ပြီးတော့ မီဒီယာ နှင့် အခြားဖိုင်များကို လျှို့ဝှက်ကုဒ်သွင်းနိုင်သည်။ သင်က သင့်တက်ဘလက်ကို လျှို့ဝှက်ကုဒ် သွင်းပြီးနောက်မှာ၊ သင်သည် မျက်နှာပြင် သော့ပိတ်မှု တစ်ခုခု (ပုံဆွဲပုံစံ သို့မဟုတ် ကိန်းဂဏန်း PIN သို့မဟုတ် စကားဝှက်) ကို သတ်မှတ်ဖွယ်ရာ ရှိလေရာ၊ သင်က တက်ဘလက်ကို ပါဝါဖွင့်တိုင်းမှာ သင်သည် လျှို့ဝှက်ကုဒ်ကို ပြန်ဖြေရန် အတွက် မျက်နှာပြင်ကို သော့ဖွင့်ရန် လိုပါလိမ့်မည်။ လျှို့ဝှက်ကုဒ်ကို ပြန်ဖြေရန် အတွက် တစ်ခုတည်းသော အခြား နည်းလမ်းမှာ စက်ရုံ အတိုင်း ပြန်ညှိမှု ဖြစ်လေရာ သင်၏ ဒေတာ အားလုံး ဖျက်ပစ်ခံရပါမည်။ \n\n  လျှို့ဝှက်ကုဒ်သွင်းမှုမှာ တစ်နာရီ သို့မဟုတ် ပိုကြာနိုင်ပါသည်။ သင်သည် အားသွင်းပြီး ဘက်ထရီဖြင့် စတင်ရန် လိုပြီး ထိုလုပ်ငန်းစဉ် တစ်ခုလုံး အတွင်းမှာ တက်ဘလက်ကို ပလပ်ထိုးထားရပါမည်။ သင်က ရပ်တန့်ပစ်ခဲ့လျှင်၊ သင်သည် ဒေတာ အချို့ သို့မဟုတ် အားလုံးကို ဆုံးရှုံးသွားနိုင်သည်။"</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"သင်သည် သင်၏ အကောင့်များ၊ ဆက်တင်များ၊ ဒေါင်းလုဒ် အက်ပ်များ နှင့် ၎င်းတို့၏ ဒေတာများကို၊ ပြီးတော့ မီဒီယာ နှင့် အခြားဖိုင်များကို လျှို့ဝှက်ကုဒ်သွင်းနိုင်သည်။ သင်က သင့်ဖုန်းကို လျှို့ဝှက်ကုဒ် သွင်းပြီးနောက်မှာ၊ သင်သည် မျက်နှာပြင် သော့ပိတ်မှု တစ်ခုခု (ပုံစွဲဇယား သို့မဟုတ် ကိန်းဂဏန်း PIN သို့မဟုတ် စကားဝှက်) ကို သတ်မှတ်ဖွယ်ရာ ရှိလေရာ၊ သင်က ဖုန်းကို ပါဝါဖွင့်တိုင်းမှာ သင်သည် လျှို့ဝှက်ကုဒ်ကို ပြန်ဖြေရန် အတွက် မျက်နှာပြင်ကို သော့ဖွင့်ရန် လိုပါလိမ့်မည်။ လျှို့ဝှက်ကုဒ်ကို ပြန်ဖြေရန် အတွက် တစ်ခုတည်းသော အခြား နည်းလမ်းမှာ စက်ရုံ အတိုင်း ပြန်ညှိမှု ဖြစ်လေရာ သင်၏ ဒေတာ အားလုံး ဖျက်ပစ်ခံရပါမည်။ \n\n လျှို့ဝှက်ကုဒ်သွင်းမှုမှာ တစ်နာရီ သို့မဟုတ် ပိုကြာနိုင်ပါသည်။ သင်သည် အားသွင်းပြီး ဘက်ထရီဖြင့် စတင်ရန် လိုပြီး ထိုလုပ်ငန်းစဉ် တစ်ခုလုံး အတွင်းမှာ ဖုန်းကို ပလပ်ထိုးထားရပါမည်။ သင်က ရပ်တန့်ပစ်ခဲ့လျှင်၊ သင်သည် ဒေတာ အချို့ သို့မဟုတ် အားလုံးကို ဆုံးရှုံးသွားနိုင်သည်။"</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"လျှို့ဝှက်အသွင်ပြောင်းထားသောတက်ပလက်"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"အသွင်ဝှက်ထားသောဖုန်း"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"သင့်ဘက်ထရီကိုအားသွင်းပြီးနောက် နောက်ထပ်ကြိုးစားကြည့်ပါ"</string>
-    <string name="crypt_keeper_unplugged_text" msgid="2709721134148651329">"သင့်အားသွင်းကြိုးကို ပလပ်တပ်ပြီး ထပ်မံကြိုးစားကြည့်ပါ။"</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="1847280235529858357">"လော့ခ်မျက်နှာပြင် ပင်နံပါတ် သို့မဟုတ် စကားဝှက် မရှိပါ"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="7210616262954236042">"လျှို့ဝှက်အသွင်ပြောင်းခြင်းမစမီ လော့ခ်မျက်နှာပြင် ပင်နံပါတ် (သို့) စကားဝှက် သတ်မှတ်ရန်လိုသည်။"</string>
-    <string name="crypt_keeper_confirm_title" msgid="8600000209722452230">"လျှို့ဝှက်အသွင်ပြောင်းမည်လား ?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="3270587498436152259">"လျှို့ဝှက်အသွင်ပြောင်းခြင်းလုပ်ငန်းစဉ်သည် နောက်ကြောင်းပြန်လှည့်၍ မရနိုင်သောကြောင့် သင်ကြားဖြတ်နှောင့်ယှက်မိပါက အချက်အလက်များ ဆုံးရှုံးမည်ဖြစ်သည်။ လျှို့ဝှက်အသွင်ပြောင်းခြင်းသည် ၁နာရီ သို့ ၎င်းထက်ပိုကြာနိုင်ပြီး ၎င်းအချိန်အတွင်း တက်ဘလက်သည် ကြိမ်ဖန်များစွာ အစမှ ပြန်စလိမ့်မည်။"</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="3040428543349852419">"လျှို့ဝှက်အသွင်ပြောင်းခြင်းလုပ်ငန်းစဉ်သည် နောက်ကြောင်းပြန်လှည့်၍ မရနိုင်သောကြောင့် သင်ကြားဖြတ်နှောင့်ယှက်မိပါက အချက်အလက်များ ဆုံးရှုံးမည်ဖြစ်သည်။ လျှို့ဝှက်အသွင်ပြောင်းခြင်းသည် ၁နာရီ သို့ ၎င်းထက်ပိုကြာနိုင်ပြီး ၎င်းအချိန်အတွင်း ဖုန်းသည် ကြိမ်ဖန်များစွာ အစမှ ပြန်စလိမ့်မည်။"</string>
-    <string name="crypt_keeper_setup_title" msgid="3339725741305796680">"လျှို့ဝှက်အသွင်ပြောင်းနေသည်"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="4417016995091289019">"သင့်တက်ပလက်အား လျှို့ဝှက်အသွင်ပြောင်းနေခြင်းကို စောင့်ပါ။ <xliff:g id="PERCENT">^1</xliff:g>% ပြီးဆုံးပါပြီ။"</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="7902355422499500352">"သင့်ဖုန်းအား လျှို့ဝှက်အသွင်ပြောင်းနေခြင်းကို စောင့်ပါ။ <xliff:g id="PERCENT">^1</xliff:g>% ပြီးဆုံးပါပြီ။"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="8348188415839917821">"သင့် တက်ဘလက်ကို လျှို့ဝှက်ကုဒ် သွင်းနေစဉ် စောင့်ပါ။ ကျန်ရှိနေသည့် အချိန်: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="8556105766597855198">"သင့် ဖုန်းကို လျှို့ဝှက်ကုဒ် သွင်းနေစဉ် စောင့်ပါ။ ကျန်ရှိနေသည့် အချိန်: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="3832496715430327682">"သင့်တက်ဘလက် ဖွင့်ရန်၊ ပိတ်ပြီးမှ ပြန်ဖွင့်ပါ။"</string>
-    <string name="crypt_keeper_force_power_cycle" product="default" msgid="5070346039522135361">"သင့်ဖုန်း ဖွင့်ရန်၊ ပိတ်ပြီးမှ ပြန်ဖွင့်ပါ။"</string>
-    <string name="crypt_keeper_warn_wipe" msgid="8104921337301750394">"သတိပေးချက်: သော့ဖွင့်ရန် ကြိုးပမ်းမှု နောက်ထပ် <xliff:g id="COUNT">^1</xliff:g>နောက်မှာ သင်၏ ကိရိယာမှာ ဖျက်ပစ်ခံရလိမ့်မည်!"</string>
-    <string name="crypt_keeper_enter_password" msgid="1274917431075529732">"သင့်စကားဝှက်အား ထည့်ပါ"</string>
-    <string name="crypt_keeper_failed_title" msgid="8173654570682244149">"လျှို့ဝှက်အသွင်ပြောင်းခြင်း မအောင်မြင်ပါ"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"လျှို့ဝှက်အသွင်ပြောင်းခြင်းလုပ်ငန်းစဉ်ကို ကြားဖြတ်နှောင့်ယှက် ခံရသောကြောင့်  အပြီးမသတ်နိုင်ပါ။ ရလဒ်အနေဖြင့် သင်၏ တက်ဘလက်ပေါ်မှ အချက်အလက်များကို သုံးစွဲ၍ မရတော့ပါ။ \n\n သင်၏ တက်ဘလက်ကို ဆက်လက်အသုံးပြုလိုပါက စက်ရုံထုတ်အခြေအနေပြန်ယူခြင်း လုပ်ရန် လိုအပ်သည်။  သင်၏ တက်ဘလက်ကို အစမှ ပြန်စပြီးလျှင် သင်၏ဂူဂယ်လ်အကောင့်သို့ အရန်အဖြစ်သိမ်းထားခဲ့သော အချက်အလက်များကို ပြန်လည်ရယူရန် အခွင့်အရေး ရလာမည်ဖြစ်သည်။"</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"လျှို့ဝှက်အသွင်ပြောင်းခြင်းလုပ်ငန်းစဉ်ကို ကြားဖြတ်နှောင့်ယှက် ခံရသောကြောင့် အပြီးမသတ်နိုင်ပါ။ ရလဒ်အနေဖြင့် သင်၏ ဖုန်းပေါ်မှ အချက်အလက်များကို သုံးစွဲ၍ မရတော့ပါ။ \n\n သင်၏ ဖုန်းကို ဆက်လက်အသုံးပြုလိုပါက စက်ရုံထုတ်အခြေအနေပြန်ယူခြင်း လုပ်ရန် လိုအပ်သည်။  သင်၏ ဖုန်းကို အစမှ ပြန်စပြီးလျှင် သင်၏ ဂူဂဲလ်အကောင့်သို့ အရန်အဖြစ်သိမ်းထားခဲ့သော အချက်အလက်များကို ပြန်လည်ရယူရန် အခွင့်အရေး ရလာမည်ဖြစ်သည်။"</string>
-    <string name="crypt_keeper_data_corrupt_title" msgid="5920153462176846037">"ကုဒ်ဖြ​​ေခြင်း မအောင်မြင်ပါ"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"သင်ရိုက်ထည့်သောစကားဝှက် မှန်ကန်သော်လည်း သင့်အချက်အလက်တွေကမောက်ကမဖြစ်နေသည်။\n\nသင့်တပ်ဘလက်ကို ဆက်လက်သုံးစွဲရန်အတွက် စက်ရုံထုတ်အခြေအနေသို့ ပြန်ပြောင်းပါ။ ယင်းသို့‌ပြောင်းလဲ‌ပြီးသင့်တပ်ဘလက်ကိုပြန်သုံးစွဲသည့်အခါ သင့် Google အကောင့်အားထောက်ပံ့ပေးထားသော မည်သည့်အချက်အလက်ကိုမဆို ပြန်လည်ရယူနိုင်ခွင့်ရှိသည်။"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"သင်ရိုက်ထည့်သောစကားဝှက် မှန်ကန်သော်လည်း သင့်အချက်အလက်တွေကမောက်ကမဖြစ်နေသည်။\n\nသင့်ဖုန်းကို ဆက်လက်သုံးစွဲရန်အတွက် စက်ရုံထုတ်အခြေအနေသို့ပြန်ပြောင်းပါ။ယင်းသို့‌ပြောင်းလဲ‌ပြီးသင့်ဖုန်းကိုပြန်သုံးစွဲသည့်အခါ သင့် Google အကောင့်အားထောက်ပံ့ပေးထားသော မည်သည့်အချက်အလက်ကိုမဆို ပြန်လည်ရယူနိုင်ခွင့်ရှိသည်။"</string>
-    <string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"စာရိုက်ထည့်ပုံ‌ ပြောင်းရန်"</string>
+    <string name="encryption_settings_title" msgid="2848716008695618360">"အသွင်ဝှက်ခြင်း"</string>
+    <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"တက်ဘလက်ကို အသွင်ဝှက်ခြင်း"</string>
+    <string name="encrypt_title" product="default" msgid="7337365190988321100">"ဖုန်းကို အသွင်ဝှက်ခြင်း"</string>
+    <string name="encrypted_summary" msgid="545623487587251207">"အသွင်ဝှက်ထားသည်"</string>
     <string name="suggested_lock_settings_title" msgid="7836065447159730217">"သင့်ဖုန်းကို လုံခြုံအောင်ပြုလုပ်ပါ"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"တက်ဘလက်ကို ကာကွယ်ရန် ဖန်သားပြင်လော့ခ် သတ်မှတ်ပါ"</string>
     <string name="suggested_lock_settings_summary" product="device" msgid="8479766049078378225">"စက်ပစ္စည်းကို ကာကွယ်ရန် ဖန်သားပြင်လော့ခ် သတ်မှတ်ပါ"</string>
@@ -817,6 +791,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"ဤပင်နံပါတ်ကို အခြား စက်ပစ္စည်းတွင်လည်း ရိုက်ထည့်ရန် လိုအပ်နိုင်သည်။"</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"ဤ ဖြတ်သန်းခွင့်ကုဒ်ကို အခြား စက်ပစ္စည်းတွင်လည်း ရိုက်ထည့်ရန် လိုအပ်နိုင်သည်။"</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">":&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;များနှင့်တွဲချိတ်စေရန် &lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;ဖြတ်သန်းခွင့်ကီးပြသစေရန် သေချာပါစေ"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"ချိတ်ဆက်ထားသည့်အစီအစဉ်အတိုင်း တွဲချိတ်ရန်အတည်ပြုပါ"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">":&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;မှ ဤစက်နှင့်တွဲချိတ်မည်လား"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">":<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>နှင့်ချိတ်တွဲရန်:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>ကိုရိုက်ထည့်ကာ, Return သို့မဟုတ် Enterကိုနှိပ်ပါ"</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"သင်၏ အဆက်အသွယ်များနှင့် ယခင်ခေါ်ဆိုမှုမှတ်တမ်းသို့ ဝင်ခွင့်ပြုပါ"</string>
@@ -850,6 +825,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"ချိတ်ဆက်မရပါ။ ထပ်လုပ်ကြည့်ပါ။"</string>
     <string name="device_details_title" msgid="1155622417516195481">"စက်အသေးစိတ်များ"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"စက်ပစ္စည်း၏ ဘလူးတုသ်လိပ်စာ- <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"စက်၏ ဘလူးတုသ်လိပ်စာ-\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"စက်ပစ္စည်းကို ပယ်ဖျက်လိုပါသလား။"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"အဖွဲ့ကို ဖယ်ရှားရန်"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"အက်ပ် ချိတ်ဆက်မှုဖြုတ်မလား။"</string>
@@ -881,6 +857,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"ဆက်တင်များအားမှတ်မိစေရန်"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"ဘလူးတုသ်က အများဆုံးချိတ်ဆက်ထားနိုင်သည့် စက်အရေအတွက်"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"ချိတ်ဆက်ထားနိုင်သည့် ဘလူးတုသ် ချိတ်ဆက်နိုင်သည့် အများဆုံးအရေအတွက်ကို ရွေးပါ"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"NFC ဖွဲ့စည်းပုံ အမှားရှာပြင်မှတ်တမ်း"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"NFC ဖွဲ့စည်းပုံ မှတ်တမ်း အဆင့်ကို တိုးရန်"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"ကာစ်"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"စကရင်ပွားရန်"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"ကြိုးမဲ့ ပြသမှုကို ဖွင့်ရန်"</string>
@@ -1188,6 +1166,8 @@
     <string name="wifi_hotspot_maximize_compatibility_dual_ap_summary" msgid="3579549223159056533">"အခြားစက်များအတွက် ဤဟော့စပေါ့ကို ကူရှာပေးသည်။ ဘက်ထရီ အသုံးပြုမှု ပိုများသည်။"</string>
     <string name="wifi_tether_starting" msgid="8879874184033857814">"ဟော့စပေါ့ ဖွင့်နေသည် …"</string>
     <string name="wifi_tether_stopping" msgid="4416492968019409188">"ဟော့စပေါ့ ပိတ်နေသည် …"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_title" msgid="3089432578433978073">"မိုဘိုင်းသုံးတွဲချိတ်ခြင်း မရပါ"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_content" msgid="5920421547607921112">"အသေးစိတ်အတွက် သင့်မိုဘိုင်းဖုန်းကုမ္ပဏီကို ဆက်သွယ်ပါ"</string>
     <string name="wifi_tether_enabled_subtext" msgid="5085002421099821056">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> ပွင့်နေသည်"</string>
     <string name="wifi_tether_failed_subtext" msgid="437190628041885500">"ခရီးဆောင် Wi-Fi  ဟော့စပေါ့ မှားယွင်းချက်"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7072559431286459122">"Wi-Fi ဟော့စပေါ့ သတ်မှတ်ရန်"</string>
@@ -2534,11 +2514,6 @@
     <string name="enable_service_title" msgid="7231533866953706788">"<xliff:g id="SERVICE">%1$s</xliff:g> အား သင့်စက်ပစ္စည်းကို အပြည့်အဝ ထိန်းချုပ်ခွင့်ပေးလိုပါသလား။"</string>
     <string name="capabilities_list_title" msgid="1225853611983394386">"<xliff:g id="SERVICE">%1$s</xliff:g> ကလုပ်ဆောင်ရန်များ-"</string>
     <string name="touch_filtered_warning" msgid="4225815157460318241">"အပလီကေးရှင်းသည် ခွင့်ပြုချက်တောင်းခံမှုကို ပိတ်လိုက်ခြင်းကြောင့်၊ သင့်တုန့်ပြန်မှုကို အချိန်ညှိချက်များ အတည်မပြုနိုင်ပါ။"</string>
-    <string name="enable_service_encryption_warning" msgid="931082737770453755">"သင် ဖွင့်လိုက်လျှင် <xliff:g id="SERVICE">%1$s</xliff:g>၊ သင့်ကိရိယာက သင်၏ မျက်နှာပြင် သော့ပိတ်မှုကို ဒေတာ လျှို့ဝှက်ကုဒ်သွင်းမှု မြှင့်တင်ရန် သုံးမည် မဟုတ်ပါ။"</string>
-    <string name="secure_lock_encryption_warning" msgid="669152607190123579">"သင်က ရယူသုံးစွဲရန် ဝန်ဆောင်မှုကို ဖွင့်ထား၍ ၊ သင့်ကိရိယာက သင်၏ မျက်နှာပြင် သော့ပိတ်မှုကို ဒေတာ လျှို့ဝှက်ကုဒ်သွင်းမှု မြှင့်တင်ရန် သုံးမည် မဟုတ်ပါ။"</string>
-    <string name="enable_service_pattern_reason" msgid="6832846117817938536">"<xliff:g id="SERVICE">%1$s</xliff:g>အား ဖွင့်ခြင်းသည် ဒေတာများ လျှို့ဝှက်ကုဒ်အသွင်​​ပြောင်းခြင်းအား အကျိုးသက်ရောက်စေသော​ကြောင့်၊ သင့် ရေးဆွဲပုံစံဖြင့် အတည်ပြုရန် လိုသည်။"</string>
-    <string name="enable_service_pin_reason" msgid="6040417014360237703">"<xliff:g id="SERVICE">%1$s</xliff:g>အား ဖွင့်ခြင်းသည် ဒေတာများ လျှို့ဝှက်ကုဒ်အသွင်​​ပြောင်းခြင်းအား အကျိုးသက်ရောက်စေသော​ကြောင့်၊ သင့် PIN ဖြင့် အတည်ပြုရန် လိုသည်။"</string>
-    <string name="enable_service_password_reason" msgid="6962544350351734238">"<xliff:g id="SERVICE">%1$s</xliff:g>အား ဖွင့်ခြင်းသည် ဒေတာများ လျှို့ဝှက်ကုဒ်အသွင်​​ပြောင်းခြင်းအား အကျိုးသက်ရောက်စေသော​ကြောင့်၊ သင့် လျှို့ဝှက်ကုဒ်ဖြင့် အတည်ပြုရန် လိုသည်။"</string>
     <string name="accessibility_service_warning" msgid="6779187188736432618">"<xliff:g id="SERVICE">%1$s</xliff:g> က ဤကိရိယာကို အပြည့်အဝ ထိန်းချုပ်ခွင့် တောင်းဆိုနေသည်။ ဤဝန်ဆောင်မှုက ဖန်သားပြင်ရှိအရာများကို ဖတ်နိုင်ပြီး အများသုံးစွဲနိုင်မှု လိုအပ်ချက်များသုံး၍ အသုံးပြုသူများကိုယ်စား လုပ်ဆောင်နိုင်သည်။ ဤထိန်းချုပ်မှု အဆင့်သည် အက်ပ်အများစုအတွက် မသင့်လျော်ပါ။"</string>
     <string name="accessibility_service_warning_description" msgid="6573203795976134751">"အများသုံးစွဲနိုင်မှု လိုအပ်ချက်များအတွက် အထောက်အကူပြုသည့် အက်ပ်များကို အပြည့်အဝထိန်းချုပ်ခြင်းသည် သင့်လျော်သော်လည်း အက်ပ်အများစုအတွက် မသင့်လျော်ပါ။"</string>
     <string name="accessibility_service_screen_control_title" msgid="324795030658109870">"ဖန်သားပြင်ကို ကြည့်ရှုထိန်းချုပ်ခြင်း"</string>
@@ -3103,14 +3078,6 @@
     <string name="remove_account_failed" msgid="3709502163548900644">"ဤပြောင်းလဲမှုကို သင့်စီမံခန့်ခွဲသူက ခွင့်မပြုပါ"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"ထပ်တူကိုက်ညီရန် လူအားဖြင့်ပြုလုပ်၍မရပါ"</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"လက်ရှိဤအရာအား ထပ်တူကိုက်ညီစေရန်ပြုလုပ်မရပါ။ ထိုအပြင်အဆင်အားပြောင်းရန် နောက်ခံဒေတာနှင့် အလိုအလျောက်ထပ်တူကိုက်ညီစေရန်ပြုလုပ်ခြင်းတို့အား ခေတ္တဖွင့်ပါ။"</string>
-    <string name="enter_password" msgid="6327051330258595331">"အန်ဒရွိုက်ကို စရန်၊ သင်၏ စကားဝှက်ကို ရိုက်ထည့်ပါ"</string>
-    <string name="enter_pin" msgid="1029287617551232681">"အန်ဒရွိုက်ကို စရန်၊ သင်၏ PIN ကို ရိုက်ထည့်ပါ"</string>
-    <string name="enter_pattern" msgid="1747316785866742960">"အန်ဒရွိုက်ကို စရန်၊ သင်၏ ပုံဆွဲပုံစံကို ရေးဆွဲပါ"</string>
-    <string name="cryptkeeper_wrong_pattern" msgid="340747269176120242">"ပုံဆွဲအမှား"</string>
-    <string name="cryptkeeper_wrong_password" msgid="7295607881887114486">"စကားဝှက်အမှား"</string>
-    <string name="cryptkeeper_wrong_pin" msgid="2347961593970714201">"ပင်နံပါတ် မှားနေသည်"</string>
-    <string name="checking_decryption" msgid="6111642972615688237">"စစ်ဆေးနေပါသည်…"</string>
-    <string name="starting_android" msgid="6694154070215356186">"Android စနေစဉ်…"</string>
     <string name="delete" msgid="8330605554706263775">"ဖျက်ရန်"</string>
     <string name="misc_files" msgid="6598066985800749585">"အသေးအဖွဲဖိုင်များ"</string>
     <string name="misc_files_selected_count" msgid="5597802791672749532">"<xliff:g id="TOTAL">%2$d</xliff:g> ထဲမှ<xliff:g id="NUMBER">%1$d</xliff:g> ရွေးမည်"</string>
@@ -3206,8 +3173,6 @@
     <string name="data_usage_metered_yes" msgid="4262598072030135223">"အခမဲ့ မဟုတ်ပါ"</string>
     <string name="data_usage_metered_no" msgid="1685828958417926268">"မီတာဖြင့်ကောက်ခံခြင်း မဟုတ်ပါ"</string>
     <string name="data_usage_disclaimer" msgid="3271450299386176770">"စီမံပေးသူ၏ ဒေတာ စာရင်းမှာ သင့် ကိရိယာ ထဲကနှင့် ခြားနားနိုင်သည်။။"</string>
-    <string name="cryptkeeper_emergency_call" msgid="8369322820475703306">"အရေးပေါ်ခေါ်ဆိုရန်"</string>
-    <string name="cryptkeeper_return_to_call" msgid="3857250752781151232">"ခေါ်ဆိုမှုထံပြန်သွားရန်"</string>
     <string name="vpn_name" msgid="3806456074909253262">"အမည်"</string>
     <string name="vpn_type" msgid="5533202873260826663">"အမျိုးအစား"</string>
     <string name="vpn_server" msgid="2908816134941973935">"ဆာဗာလိပ်စာ"</string>
@@ -4315,7 +4280,7 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="7456745929035665029">"ခွင့်ပြုထားသော ခွင့်ပြုချက်များ မရှိပါ"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7174876170116073356">"တောင်းခံထားသော ခွင့်ပြုချက်များ မရှိပါ"</string>
     <string name="runtime_permissions_summary_control_app_access" msgid="3744591396348990500">"ဒေတာအား အက်ပ်အသုံးပြုခွင့် ထိန်းချုပ်ပါ"</string>
-    <string name="permissions_usage_title" msgid="2942741460679049132">"ပုဂ္ဂိုလ်ရေးလုံခြုံမှု ဒက်ရှ်ဘုတ်"</string>
+    <string name="permissions_usage_title" msgid="2942741460679049132">"ကိုယ်ရေးအချက်အလက်လုံခြုံမှု ဒက်ရှ်ဘုတ်"</string>
     <string name="permissions_usage_summary" msgid="6784310472062516454">"မည်သည့်အက်ပ်များသည် မကြာသေးမီက ခွင့်ပြုချက်များ သုံးထားသည်ကို ပြသည်"</string>
     <string name="unused_apps" msgid="4566272194756830656">"အသုံးမပြုသော အက်ပ်များ"</string>
     <plurals name="unused_apps_summary" formatted="false" msgid="3827583582750975783">
@@ -4764,8 +4729,6 @@
       <item quantity="one">အက်ပ် ၁ ခုက ဒေတာကို အကန့်အသတ်မရှိ သုံးနိုင်သည်</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"နောက်ထပ်ကြည့်ပါ"</string>
-    <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"အသုံးပြုသူ၏ဒေတာများကို ရှင်းလင်းပြီး အသွင်ဝှက်ထားသည့် ဖိုင်သို့ ပြောင်းလဲမလား။"</string>
-    <string name="button_confirm_convert_fbe" msgid="339648921918438106">"ရှင်းလင်းပြီး အသွင်ပြောင်းလဲပါ"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"ShortcutManager နှုန်းကန့်သတ်ခြင်းကို ပြန်လည်သတ်မှတ်ပါ"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"ShortcutManager နှုန်းကန့်သတ်ခြင်းကို ပြန်လည်သတ်မှတ်ပြီးပါပြီ"</string>
     <string name="notification_suggestion_title" msgid="6309263655965785411">"လော့ခ်မျက်နှာပြင်ရှိ အချက်အလက်များ ထိန်းချုပ်ရန်"</string>
@@ -5292,6 +5255,7 @@
     <string name="sim_action_yes" msgid="8076556020131395515">"Yes"</string>
     <string name="sim_action_reboot" msgid="3508948833333441538">"ပြန်စရန်"</string>
     <string name="sim_action_no_thanks" msgid="435717748384544195">"မလိုပါ"</string>
+    <string name="sim_action_cancel" msgid="2668099867029610910">"မလုပ်တော့"</string>
     <string name="sim_switch_button" msgid="1405772571706095387">"ပြောင်းရန်"</string>
     <string name="dsds_activation_failure_title" msgid="4467364110584914794">"ဆင်းမ်ကို ဖွင့်၍မရပါ"</string>
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"ဆင်းမ်ကို ဖယ်ရှားပြီး ပြန်ထည့်ကြည့်ပါ။ ပြဿနာရှိနေသေးပါက သင့်စက်ကို ပြန်လည်စတင်ပါ။"</string>
@@ -5444,6 +5408,10 @@
     <string name="cached_apps_freezer" msgid="1057519579761550350">"ကက်ရှ်ယူထားသောအက်ပ်များ ဆောင်ရွက်မှုဆိုင်းငံ့ခြင်း"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"ဆက်တင်များပေါ် ဖန်သားပြင်ထပ်ဆင့်ပြခွင့်ပြုခြင်း"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"အခြားအက်ပ်များအပေါ်တွင် ပြသနိုင်သည့် အက်ပ်များအား \'ဆက်တင်များ\' မျက်နှာပြင်ကို ထပ်ဆင့်ပြခွင့်ပြုပါ"</string>
+    <!-- no translation found for allow_mock_modem (3832264806530479214) -->
+    <skip />
+    <!-- no translation found for allow_mock_modem_summary (9097416612748005374) -->
+    <skip />
     <string name="media_controls_title" msgid="403271085636252597">"မီဒီယာ"</string>
     <string name="media_controls_resume_title" msgid="855076860336652370">"မီဒီယာ ပလေယာကို ပင်ထိုးရန်"</string>
     <string name="media_controls_resume_description" msgid="3163482266454802097">"အမြန်ပြန်ဖွင့်ရန်အတွက် ‘အမြန် ဆက်တင်များ’ တွင် မီဒီယာ ပလေယာ ဆက်ဖွင့်ထားသည်"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 870e518..63ae6a4 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -142,10 +142,11 @@
     <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"Tillat at enheten din kommuniserer med Bluetooth-enheter i nærheten"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"Tillat at telefonen din kommuniserer med Bluetooth-enheter i nærheten"</string>
     <string name="bluetooth_disable_a2dp_hw_offload" msgid="5942913792817797541">"Slå av Bluetooth A2DP hardware offload"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="8610420176339657720">"Start enhet på nytt?"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8333029144800835996">"Du må starte enheten din på nytt for å endre innstillingen."</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="3488695418187553566">"Start på nytt"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="4930826928585464191">"Avbryt"</string>
+    <string name="bluetooth_disable_le_audio_hw_offload" msgid="3966022676505972908">"Slå av avlastning av maskinvare for Bluetooth LE AUDIO"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_title" msgid="6001142380445276918">"Vil du starte enheten på nytt?"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_message" msgid="1524373895333698779">"Du må starte enheten på nytt for å endre denne innstillingen."</string>
+    <string name="bluetooth_disable_hw_offload_dialog_confirm" msgid="5594859658551707592">"Start på nytt"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel" msgid="3663690305043973720">"Avbryt"</string>
     <string name="connected_device_media_device_title" msgid="3783388247594566734">"Medieenheter"</string>
     <string name="connected_device_call_device_title" msgid="88732390601723608">"Ringeenheter"</string>
     <string name="connected_device_other_device_title" msgid="4652120430615729193">"Andre enheter"</string>
@@ -309,9 +310,9 @@
     <string name="security_settings_title" msgid="6710768415432791970">"Sikkerhet"</string>
     <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"Kryptering og legitimasjon"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"Telefonen er kryptert"</string>
-    <string name="decryption_settings_summary" product="default" msgid="1742645256103613503">"Telefonen er ikke kryptert"</string>
+    <string name="not_encrypted_summary" product="default" msgid="2251945842585788254">"Telefonen er ikke kryptert"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"Enheten er kryptert"</string>
-    <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"Enheten er ikke kryptert"</string>
+    <string name="not_encrypted_summary" product="tablet" msgid="2374263654698719382">"Enheten er ikke kryptert"</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"Låseskjerm"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"Dette skal vises"</string>
     <string name="security_settings_summary" msgid="1627059516127354233">"Posisjon, skjermlås, SIM-kort-lås"</string>
@@ -568,37 +569,10 @@
     <string name="fingerprint_last_delete_message" msgid="7860374760549404410">"Da kan du ikke bruke fingeravtrykket til å låse opp telefonen eller bekrefte identiteten din i apper."</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="4104208067277655068">"Da kan du ikke bruke fingeravtrykket til å låse opp jobbprofilen din, autorisere kjøp eller logge på jobbapper."</string>
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"Ja, fjern"</string>
-    <string name="crypt_keeper_settings_title" msgid="4938812137822100044">"Kryptering"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"Kryptér nettbrettet"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"Kryptér telefonen"</string>
-    <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"Kryptert"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"Du kan kryptere kontoer, innstillinger, nedlastede apper og tilhørende data, medier og andre filer. Etter at du har kryptert nettbrettet, forutsatt at du har satt opp en skjermlås (det vil si et mønster, en numerisk PIN-kode eller et passord), må du låse opp skjermen for å dekryptere nettbrettet hver gang du slår det på. Den eneste andre måten å dekryptere det på, er ved å foreta en tilbakestilling til fabrikkstandard, som sletter alle dataene dine. \n\nKrypteringen kommer til å ta en time eller mer. Du må starte med oppladet batteri, og nettbrettet må være tilkoblet under hele prosessen. Hvis du avbryter den, mister du noe av eller all informasjonen din."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"Du kan kryptere kontoer, innstillinger, nedlastede apper og tilhørende data, medier og andre filer. Etter at du har kryptert telefonen – forutsatt at du har konfigurert en skjermlås (det vil si et mønster, en numerisk PIN-kode eller et passord) – må du låse opp skjermen for å dekryptere telefonen hver gang du slår den på. Den eneste andre måten å dekryptere den på, er ved å foreta en tilbakestilling til fabrikkstandard. Dette sletter alle dataene dine. \n\nKrypteringen kommer til å ta en time eller mer. Du må starte med oppladet batteri, og telefonen må være tilkoblet under hele prosessen. Hvis du avbryter den, mister du noe av eller all informasjonen din."</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"Kryptér nettbrettet"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"Kryptér telefonen"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"Lad batteriet og prøv på nytt."</string>
-    <string name="crypt_keeper_unplugged_text" msgid="2709721134148651329">"Sett inn laderen og prøv på nytt."</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="1847280235529858357">"Ingen personlig kode eller passord for å låse skjermen."</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="7210616262954236042">"Du må angi en PIN-kode eller et passord for skjermlås før du kan starte krypteringen."</string>
-    <string name="crypt_keeper_confirm_title" msgid="8600000209722452230">"Vil du kryptere?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="3270587498436152259">"Krypteringshandlingen kan ikke angres, og hvis du avbryter den, risikerer du å miste data. Krypteringsprosessen tar minst én time, og nettbrettet kommer til å starte på nytt flere ganger underveis."</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="3040428543349852419">"Krypteringshandlingen kan ikke angres, og hvis du avbryter den, risikerer du å miste data. Krypteringsprosessen tar minst én time, og telefonen kommer til å starte på nytt flere ganger underveis."</string>
-    <string name="crypt_keeper_setup_title" msgid="3339725741305796680">"Kryptering"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="4417016995091289019">"Vent mens telefonen krypteres. <xliff:g id="PERCENT">^1</xliff:g> fullført."</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="7902355422499500352">"Vent mens telefonen krypteres. <xliff:g id="PERCENT">^1</xliff:g> fullført."</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="8348188415839917821">"Vent mens nettbrettet ditt krypteres. Tid som gjenstår: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="8556105766597855198">"Vent mens telefonen din krypteres. Tid som gjenstår: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="3832496715430327682">"For å låse opp nettbrettet ditt må du slå det av og så på igjen."</string>
-    <string name="crypt_keeper_force_power_cycle" product="default" msgid="5070346039522135361">"For å låse opp telefonen din må du slå den av og så på igjen."</string>
-    <string name="crypt_keeper_warn_wipe" msgid="8104921337301750394">"Advarsel: Enheten din tømmes etter <xliff:g id="COUNT">^1</xliff:g> mislykkede opplåsningsforsøk til."</string>
-    <string name="crypt_keeper_enter_password" msgid="1274917431075529732">"Skriv inn passordet"</string>
-    <string name="crypt_keeper_failed_title" msgid="8173654570682244149">"Kryptering mislykket"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"Krypteringen ble avbrutt og kan ikke fullføres. Dette betyr at dataene på nettbrettet ditt ikke lenger er tilgjengelige.\n\nFor å fortsette å bruke nettbrettet, må du gjennomføre en tilbakestilling til fabrikkstandard. Når du konfigurerer nettbrettet etter tilbakestillingen, får du mulighet til å gjenopprette data som ble sikkerhetskopiert til Google-kontoen din."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"Krypteringen ble avbrutt og kan ikke fullføres. Dette betyr at dataene på telefonen din ikke lenger er tilgjengelige.\n\nFor å fortsette å bruke telefonen, må du gjennomføre en tilbakestilling til fabrikkstandard. Når du konfigurerer telefonen etter tilbakestillingen, får du mulighet til å gjenopprette data som ble sikkerhetskopiert til Google-kontoen din."</string>
-    <string name="crypt_keeper_data_corrupt_title" msgid="5920153462176846037">"Dekrypteringen mislyktes"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"Passordet du skrev inn, er korrekt, men dataene dine er dessverre skadet. \n\nHvis du vil bruke nettbrettet ditt, må du tilbakestille det til fabrikkstandard. Når du konfigurerer nettbrettet etter tilbakestillingen, kan du gjenopprette alle data som er blitt sikkerhetskopiert fra Google-kontoen din."</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"Passordet du skrev inn, er korrekt, men dataene dine er dessverre skadet. \n\nHvis du vil bruke telefonen din, må du tilbakestille den til fabrikkstandard. Når du konfigurerer telefonen etter tilbakestillingen, kan du gjenopprette alle data som er blitt sikkerhetskopiert fra Google-kontoen din."</string>
-    <string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"Bytt inndatametode"</string>
+    <string name="encryption_settings_title" msgid="2848716008695618360">"Kryptering"</string>
+    <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"Krypter nettbrettet"</string>
+    <string name="encrypt_title" product="default" msgid="7337365190988321100">"Krypter telefonen"</string>
+    <string name="encrypted_summary" msgid="545623487587251207">"Kryptert"</string>
     <string name="suggested_lock_settings_title" msgid="7836065447159730217">"Sikre telefonen din"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"Angi en skjermlås for å beskytte nettbrettet"</string>
     <string name="suggested_lock_settings_summary" product="device" msgid="8479766049078378225">"Angi en skjermlås for å beskytte enheten"</string>
@@ -817,6 +791,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Det er mulig at du må skrive inn denne PIN-koden også på den andre enheten."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Det er mulig at du må oppgi dette passordet også på den andre enheten."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Sånn kobler du til:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Kontroller at dette passordet vises:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Bekreft for å koble til det koordinerte settet"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"Fra:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Vil du koble til denne enheten?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Sånn kobler du til: <xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> Skriv inn følgende: <xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, og trykk deretter på Retur eller Enter."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Gi tilgang til kontaktene dine og anropsloggen din"</string>
@@ -850,6 +825,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Kunne ikke koble til. Prøv på nytt."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Enhetsdetaljer"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Enhetens Bluetooth-adresse: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Enhetens Bluetooth-adresse:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Vil du glemme enheten?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Fjern tilknytning"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Vil du koble fra appen?"</string>
@@ -881,6 +857,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Husk innstillinger"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Maksimalt antall Bluetooth-lydenheter"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Velg maksimalt antall tilkoblede Bluetooth-lydenheter"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"Feilsøkingslogg for NFC-stabel"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Øk loggføringsnivå for NFC-stabel"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Cast"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"speil"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Slå på trådløs skjermdeling"</string>
@@ -1188,6 +1166,8 @@
     <string name="wifi_hotspot_maximize_compatibility_dual_ap_summary" msgid="3579549223159056533">"Dette hjelper andre enheter med å finne denne Wi-Fi-sonen. Øker batteribruken."</string>
     <string name="wifi_tether_starting" msgid="8879874184033857814">"Slår på Wi-Fi-sone …"</string>
     <string name="wifi_tether_stopping" msgid="4416492968019409188">"Slår av trådløs sone …"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_title" msgid="3089432578433978073">"Internettdeling er utilgjengelig"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_content" msgid="5920421547607921112">"Kontakt operatøren din for å få mer informasjon"</string>
     <string name="wifi_tether_enabled_subtext" msgid="5085002421099821056">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> er aktiv"</string>
     <string name="wifi_tether_failed_subtext" msgid="437190628041885500">"Feil med flyttbar Wi-Fi-sone"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7072559431286459122">"Konfigurer Wi-Fi-sone"</string>
@@ -2534,11 +2514,6 @@
     <string name="enable_service_title" msgid="7231533866953706788">"Vil du gi <xliff:g id="SERVICE">%1$s</xliff:g> full kontroll over enheten din?"</string>
     <string name="capabilities_list_title" msgid="1225853611983394386">"<xliff:g id="SERVICE">%1$s</xliff:g> må"</string>
     <string name="touch_filtered_warning" msgid="4225815157460318241">"Fordi en app skjuler tillatelsesforespørselen, kan ikke Innstillinger bekrefte svaret ditt."</string>
-    <string name="enable_service_encryption_warning" msgid="931082737770453755">"Hvis du slår på <xliff:g id="SERVICE">%1$s</xliff:g>, bruker ikke enheten skjermlåsen til å forbedre datakryptering."</string>
-    <string name="secure_lock_encryption_warning" msgid="669152607190123579">"Fordi du har slått på en tilgjengelighetstjeneste, bruker ikke enheten skjermlåsen til å forbedre datakryptering."</string>
-    <string name="enable_service_pattern_reason" msgid="6832846117817938536">"Du må bekrefte mønsteret ditt for å slå på <xliff:g id="SERVICE">%1$s</xliff:g>, fordi den påvirker datakryptering."</string>
-    <string name="enable_service_pin_reason" msgid="6040417014360237703">"Du må bekrefte PIN-koden din for å slå på <xliff:g id="SERVICE">%1$s</xliff:g>, fordi den påvirker datakryptering."</string>
-    <string name="enable_service_password_reason" msgid="6962544350351734238">"Du må bekrefte passordet ditt for å slå på <xliff:g id="SERVICE">%1$s</xliff:g>, fordi den påvirker datakryptering."</string>
     <string name="accessibility_service_warning" msgid="6779187188736432618">"<xliff:g id="SERVICE">%1$s</xliff:g> ber om full kontroll over denne enheten. Tjenesten kan lese skjermen og handle på vegne av brukere med tilgjengelighetsbehov. Dette kontrollnivået er ikke passende for de fleste apper."</string>
     <string name="accessibility_service_warning_description" msgid="6573203795976134751">"Full kontroll er passende for apper som hjelper deg med tilgjengelighetsbehov, men ikke for de fleste apper."</string>
     <string name="accessibility_service_screen_control_title" msgid="324795030658109870">"Se og kontrollér skjermen"</string>
@@ -3103,14 +3078,6 @@
     <string name="remove_account_failed" msgid="3709502163548900644">"Denne endringen er ikke tillatt av administratoren"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"Kan ikke synkronisere manuelt"</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"Synkronisering for dette elementet er deaktivert. Hvis du vil endre innstillinger, kan du midlertidig slå på bakgrunnsdata og automatisk synkronisering."</string>
-    <string name="enter_password" msgid="6327051330258595331">"Skriv inn passordet ditt for å starte Android"</string>
-    <string name="enter_pin" msgid="1029287617551232681">"Skriv inn PIN-koden din for å starte Android"</string>
-    <string name="enter_pattern" msgid="1747316785866742960">"Tegn mønsteret ditt for å starte Android"</string>
-    <string name="cryptkeeper_wrong_pattern" msgid="340747269176120242">"Feil mønster"</string>
-    <string name="cryptkeeper_wrong_password" msgid="7295607881887114486">"Feil passord"</string>
-    <string name="cryptkeeper_wrong_pin" msgid="2347961593970714201">"Feil PIN-kode"</string>
-    <string name="checking_decryption" msgid="6111642972615688237">"Kontrollerer …"</string>
-    <string name="starting_android" msgid="6694154070215356186">"Starter Android …"</string>
     <string name="delete" msgid="8330605554706263775">"Slett"</string>
     <string name="misc_files" msgid="6598066985800749585">"Diverse filer"</string>
     <string name="misc_files_selected_count" msgid="5597802791672749532">"du har valgt <xliff:g id="NUMBER">%1$d</xliff:g> av <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -3206,8 +3173,6 @@
     <string name="data_usage_metered_yes" msgid="4262598072030135223">"Med datamåling"</string>
     <string name="data_usage_metered_no" msgid="1685828958417926268">"Uten datamåling"</string>
     <string name="data_usage_disclaimer" msgid="3271450299386176770">"Operatørens måling av databruk samsvarer ikke nødvendigvis med enhetens måling."</string>
-    <string name="cryptkeeper_emergency_call" msgid="8369322820475703306">"Nødanrop"</string>
-    <string name="cryptkeeper_return_to_call" msgid="3857250752781151232">"Tilbake til anrop"</string>
     <string name="vpn_name" msgid="3806456074909253262">"Navn"</string>
     <string name="vpn_type" msgid="5533202873260826663">"Type"</string>
     <string name="vpn_server" msgid="2908816134941973935">"Tjeneradresse"</string>
@@ -4764,8 +4729,6 @@
       <item quantity="one">1 app kan bruke ubegrenset med data</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"Se mer"</string>
-    <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"Er du sikker på at du vil slette brukerdataene og konvertere til filkryptering?"</string>
-    <string name="button_confirm_convert_fbe" msgid="339648921918438106">"Slett og konvertér"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"Tilbakestill kallgrense for ShortcutManager API"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"Frekvensberegning for ShortcutManager er tilbakestilt"</string>
     <string name="notification_suggestion_title" msgid="6309263655965785411">"Kontrollér informasjon på låseskjermen"</string>
@@ -5292,6 +5255,7 @@
     <string name="sim_action_yes" msgid="8076556020131395515">"Ja"</string>
     <string name="sim_action_reboot" msgid="3508948833333441538">"Start på nytt"</string>
     <string name="sim_action_no_thanks" msgid="435717748384544195">"Nei takk"</string>
+    <string name="sim_action_cancel" msgid="2668099867029610910">"Avbryt"</string>
     <string name="sim_switch_button" msgid="1405772571706095387">"Bytt"</string>
     <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Kan ikke aktivere SIM-kortet"</string>
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Fjern SIM-kortet og sett det inn igjen. Start enheten på nytt hvis problemet vedvarer."</string>
@@ -5444,6 +5408,10 @@
     <string name="cached_apps_freezer" msgid="1057519579761550350">"Sperr kjøring midlertidig for bufrede apper"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"Tillat skjermoverlegg over Innstillinger"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Tillat apper som kan vises over andre apper, å legge seg over Innstillinger-skjermer"</string>
+    <!-- no translation found for allow_mock_modem (3832264806530479214) -->
+    <skip />
+    <!-- no translation found for allow_mock_modem_summary (9097416612748005374) -->
+    <skip />
     <string name="media_controls_title" msgid="403271085636252597">"Medier"</string>
     <string name="media_controls_resume_title" msgid="855076860336652370">"Fest medieavspilleren"</string>
     <string name="media_controls_resume_description" msgid="3163482266454802097">"For å gjenoppta avspilling raskt holdes medieavspilleren åpen i hurtiginnstillingene"</string>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 4845b0f..8c61853 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -136,16 +136,17 @@
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="2849083276356078655">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> ले तपाईँको SIM कार्ड पहुँच गर्न चाहन्छ। डिभाइसमा SIM कार्ड पहुँच प्रदान गर्दा जडान अवधिको समयमा तपाईँको डेटा जडान निष्क्रिय हुनेछ। <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> लाई पहुँच प्रदान गर्नुहोस्"</string>
     <string name="bluetooth_device_name_summary" msgid="8678342689845439583">"अन्य डिभाइसमा <xliff:g id="DEVICE_NAME">^1</xliff:g> को रूपमा देखिन्छ"</string>
     <string name="bluetooth_off_footer" msgid="76578735660216295">"अन्य डिभाइससँग कनेक्ट गर्न ब्लुटुथ अन गर्नुहोस्‌।"</string>
-    <string name="bluetooth_paired_device_title" msgid="3240639218362342026">"तपाईंका यन्त्रहरू"</string>
+    <string name="bluetooth_paired_device_title" msgid="3240639218362342026">"तपाईंका डिभाइसहरू"</string>
     <string name="bluetooth_pairing_page_title" msgid="3403981358823707692">"नयाँ डिभाइस कनेक्ट गर्नुहोस्"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3506962706611366830">"आफ्नो ट्याब्लेटलाई वरपरका ब्लुटुथ यन्त्रहरूसँग सञ्चार गर्न दिनुहोस्"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"आफ्नो यन्त्रलाई वरपरका ब्लुटुथ यन्त्रहरूसँग सञ्चार गर्न दिनुहोस्"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"आफ्नो फोनलाई वरपरका ब्लुटुथ यन्त्रहरूसँग सञ्चार गर्न दिनुहोस्"</string>
     <string name="bluetooth_disable_a2dp_hw_offload" msgid="5942913792817797541">"ब्लुटुथ A2DP हार्डवेयरको अफलोड असक्षम पारियोस्"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="8610420176339657720">"यन्त्र पुनः सुरु गर्ने हो?"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8333029144800835996">"यो सेटिङ परिवर्तन गर्न तपाईंले आफ्नो यन्त्र पुनः सुरु गर्नु पर्छ।"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="3488695418187553566">"पुन: सुरु गर्नु…"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="4930826928585464191">"रद्द गर्नु…"</string>
+    <string name="bluetooth_disable_le_audio_hw_offload" msgid="3966022676505972908">"ब्लुटुथ LE AUDIO हार्डवेयरको अफलोड असक्षम पारियोस्"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_title" msgid="6001142380445276918">"डिभाइस रिस्टार्ट गर्ने हो?"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_message" msgid="1524373895333698779">"यो सेटिङ बदल्न तपाईंले आफ्नो डिभाइस रिस्टार्ट गर्नु पर्ने हुन्छ।"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_confirm" msgid="5594859658551707592">"रिस्टार्ट गर्नुहोस्"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel" msgid="3663690305043973720">"रद्द गर्नुहोस्"</string>
     <string name="connected_device_media_device_title" msgid="3783388247594566734">"मिडियासम्बन्धी यन्त्रहरू"</string>
     <string name="connected_device_call_device_title" msgid="88732390601723608">"कल गर्ने सुविधा भएका यन्त्रहरू"</string>
     <string name="connected_device_other_device_title" msgid="4652120430615729193">"अन्य डिभाइसहरू"</string>
@@ -309,9 +310,9 @@
     <string name="security_settings_title" msgid="6710768415432791970">"सुरक्षा"</string>
     <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"इन्क्रिप्सन र क्रिडेन्सियल"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"फोन इन्क्रिप्ट गरिएको छ"</string>
-    <string name="decryption_settings_summary" product="default" msgid="1742645256103613503">"फोन इन्क्रिप्ट गरिएको छैन"</string>
+    <string name="not_encrypted_summary" product="default" msgid="2251945842585788254">"फोन इन्क्रिप्ट गरिएको छैन"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"यन्त्रलाई इन्क्रिप्ट गरिएको छ"</string>
-    <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"यन्त्र इन्क्रिप्ट गरिएको छैन"</string>
+    <string name="not_encrypted_summary" product="tablet" msgid="2374263654698719382">"डिभाइस इन्क्रिप्ट गरिएको छैन"</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"लक स्क्रिन"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"देखाइने वस्तु"</string>
     <string name="security_settings_summary" msgid="1627059516127354233">"मेरो स्थान, स्क्रिन अनलक, SIM कार्ड लक, प्रामाणिक भण्डारण लक सेट गर्नुहोस्"</string>
@@ -568,37 +569,10 @@
     <string name="fingerprint_last_delete_message" msgid="7860374760549404410">"तपाईं आफ्नो फोन अनलक गर्न वा एपमा आफ्नो पहिचान पुष्टि गर्न आफ्नो फिंगरप्रिन्ट प्रयोग गर्न सक्नु हुने छैन।"</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="4104208067277655068">"तपाईं आफ्नो कार्य प्रोफाइल अनलक गर्न, खरिद गर्ने अनुमति दिन, वा कामसम्बन्धी एपमा साइन इन गर्न आफ्नो फिंगरप्रिन्ट प्रयोग गर्न सक्नु हुने छैन।"</string>
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"हो, हटाउनुहोस्"</string>
-    <string name="crypt_keeper_settings_title" msgid="4938812137822100044">"इन्क्रिप्सन"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"इन्क्रिप्ट ट्याब्लेट"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"फोन इन्क्रिप्ट गर्नुहोस्"</string>
-    <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"इन्क्रिप्ट गरिएको छ"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"तपाईं आफ्नो खाताहरू, सेटिङहरू, डाउनलोड गरिएका एपहरू र तिनीहरूको डेटा, मिडिया, र अन्य फाइलहरू इन्क्रिप्ट गर्न सक्नुहुन्छ। आफ्नो ट्याब्लेट इन्क्रिप्ट गरेपछि, स्क्रिन लक सेट गरिएको मानेर (यो कि, नमुना वा संख्यात्मक PIN वा पासवर्ड), तपाईंले संचालन गर्दा हरेक समय ट्याब्लेटको इन्क्रिप्ट उल्टाइ बन्द खोल्न आवश्यक छ। इन्क्रिप्ट उल्टाउने मात्र अन्य तरिका, आफ्नो सबै डेटा मेटाएर फ्याक्ट्री डेटा रिसेट गर्नुपर्छ।\n\nइन्क्रिप्ट गर्न एक घन्टा वा बढी समय लाग्छ। प्रक्रिया अवधिभरमा ट्याब्लेट तपाईंले चार्ज भएको ब्याट्रिको साथ सुरु गरि र प्लग इन गरिराख्नुपर्छ। यदि कार्यमा अवरोध भयो भने तपाईंले केही वा सबै डेटा गुमाउनुहुन्छ।"</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"तपाईं आफ्नो खाताहरू, सेटिङहरू, डाउनलोड गरिएका एपहरू र तिनीहरूको डेटा, मिडिया, र अन्य फाइलहरू इन्क्रिप्ट गर्न सक्नुहुन्छ। आफ्नो फोन इन्क्रिप्ट गरेपछि, स्क्रिन लक सेट गरिएको मानेर (यो कि, नमुना वा संख्यात्मक PIN वा पासवर्ड), तपाईंले संचालन गर्दा हरेक समय फोनको इन्क्रिप्ट उल्टाइ बन्द खोल्न आवश्यक छ। इन्क्रिप्ट उल्टाउने मात्र अन्य तरिका, आफ्नो सबै डेटा मेटाएर फ्याक्ट्री डेटा रिसेट गर्नुपर्छ।\n\nइन्क्रिप्ट गर्न एक घन्टा वा बढी समय लाग्छ। प्रक्रिया अवधिभरमा फोन तपाईंले चार्ज भएको ब्याट्रिको साथ सुरुगरि र प्लग इन गरि राख्नुपर्छ। यदि कार्यमा अवरोध भयो भने तपाईंले केही वा सबै डेटा गुमाउनुहुन्छ।"</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"ट्याब्लेट इन्क्रिप्ट गर्नुहोस्"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"फोन इन्क्रिप्ट गर्नुहोस्"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"तपाईँको ब्याट्री चार्ज गरी पुनःप्रयास गर्नुहोस्।"</string>
-    <string name="crypt_keeper_unplugged_text" msgid="2709721134148651329">"तपाईंको चार्जरमा प्लग इन गरेर फेरि प्रयास गर्नुहोस्।"</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="1847280235529858357">"कुनै लक स्क्रिन PIN वा पासवर्ड छैन"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="7210616262954236042">"तपाईंले इन्क्रिप्सन सुरु गर्नुअघि लक स्क्रिन PIN वा पासवर्ड सेट गर्न आवश्यक छ।"</string>
-    <string name="crypt_keeper_confirm_title" msgid="8600000209722452230">"इन्क्रिप्ट गर्ने हो?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="3270587498436152259">"इन्क्रिप्सन कार्य उल्ट्याउन मिल्दैन र यदि तपाईँले अवरोध पुर्‍याउनु भयो भने तपाईँले डेटा गुमाउनु हुने छ। इन्क्रिप्सनले एक घन्टा वा बढी समय लिन सक्छ, यस समयमा ट्याब्लेट धेरै पटक पुनःस्टार्ट हुन सक्छ।"</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="3040428543349852419">"इन्क्रिप्सन अपरेसन उल्टाउन मिल्दैन र यदि तपाईँले यसलाई अवरूद्ध गर्नु भयो भने तपाईँले डेटा गुमाउनु हुने छ। इनक्रिप्सनलाई करिब एक घन्टा वा बढी लाग्छ जुन समय फोन धेरै चोटि पुनःस्टार्ट हुन सक्छ।"</string>
-    <string name="crypt_keeper_setup_title" msgid="3339725741305796680">"इन्क्रिप्ट हुँदै"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="4417016995091289019">"तपाईँको ट्याब्लेट इन्क्रिप्ट हुने बखत प्रतीक्षा गर्नुहोस्। <xliff:g id="PERCENT">^1</xliff:g> % पूरा भयो।"</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="7902355422499500352">"तपाईँको फोन इन्क्रिप्ट हुने बखत प्रतीक्षा गर्नुहोस्। <xliff:g id="PERCENT">^1</xliff:g> % पूरा भयो।"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="8348188415839917821">"आफ्नो ट्याब्लेट इन्क्रिप्ट नहुन्जेलसम्म पर्खनुहोस्। बाँकी समय: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="8556105766597855198">"आफ्नो ट्याब्लेट इन्क्रिप्ट नहुन्जेलसम्म पर्खनुहोस्। बाँकी समय: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="3832496715430327682">"तपाईंको ट्याबलेट अनलक गर्न, यसलाई बन्द गरि अन गर्नुहोस्।"</string>
-    <string name="crypt_keeper_force_power_cycle" product="default" msgid="5070346039522135361">"तपाईंको फोन अनलक गर्न, यसलाई बन्द गरि अन गर्नुहोस्।"</string>
-    <string name="crypt_keeper_warn_wipe" msgid="8104921337301750394">"चेतावनी: खुला गर्न <xliff:g id="COUNT">^1</xliff:g> भन्दा बढी असफल प्रयासहरू पछि तपाईँको उपकरण पुछिने छ!"</string>
-    <string name="crypt_keeper_enter_password" msgid="1274917431075529732">"तपाईँको पासवर्ड टाइप गर्नुहोस्"</string>
-    <string name="crypt_keeper_failed_title" msgid="8173654570682244149">"इन्क्रिप्सन असफल"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"इन्क्रिप्सन अवरूद्ध भयो र पूरा हुन सक्दैन। परिणामस्वरूप तपाईंको ट्याब्लेटको डेटा अब पहुँचयोग्य हुँदैन।\n \n तपाईंको ट्याब्लेटको प्रयोग सुरु गर्नाका लागि तपाईंले कारखाना रिसेट गर्नु  पर्छ। जब रिसेट हुन्छ तब तपाईं ट्याब्लेट सेट गर्नुहुन्छ, तपाईंको Google खातामा जगेडा गरिएको कुनै पनि डेटा पुनर्स्थापना गर्ने अवसर तपाईंलाई हुने छ।"</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"इन्क्रिप्सन रोकिएको थियो र पूरा हुन सकेन। नतिजाको रूपमा तपाईंको फोनमा डेटा पहुँच यग्य छैन। \n\nतपाईंको फोनको उपयोग फरि सुरु गर्नको लागि तपाईंले एउटा फ्याक्ट्रि रिसेट गर्न जरुरी छ। जब तपाईं रिसेटपछि तपाईंको फोन सेटअप गर्नु हुन्छ भने  कुनै पनि डेटा जुन तपाईंको Google खातामा ब्याकअप गरिएको थियो तपाईंलाई पुनःप्राप्त गर्ने अवसर हुने छ।"</string>
-    <string name="crypt_keeper_data_corrupt_title" msgid="5920153462176846037">"गुप्तिकरण उल्टाउन असफल"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"तपाईँले प्रविष्ट गर्नुभएको पासवर्ड ठिक छ, तर दुर्भाग्यबश तपाईँको डेटा बिग्रिएको छ।\n\n तपाईँको ट्याब्लेट पुन: प्रयोग गर्न फ्याक्ट्री रिसेट गर्न पर्छ। रिसेट गरे पश्चात जब तपाई आफ्नो ट्याब्लेट सेटअप गर्नुहुन्छ तपाईँले Google खातामा ब्याकअप भए सम्मका डेटा पुनर्स्थापना गर्ने अवसर प्राप्त गर्नु हुनेछ।"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"तपाईंले प्रविष्ट गर्नुभएको पासवर्ड ठिक छ, तर दुर्भाग्यबश तपाईंको डेटा बिग्रिएको छ।\n\n तपाईंको फोन पुन: प्रयोग गर्न फ्याक्ट्री रिसेट गर्न पर्छ। रिसेट गरे पश्चात जब तपाईं आफ्नो फोन सेटअप गर्नुहुन्छ तपाईंले Google खातामा ब्याकअप भए सम्मका डेटा पुनर्स्थापना गर्ने अवसर प्राप्त गर्नु हुनेछ।"</string>
-    <string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"स्विच इनपुट विधि"</string>
+    <string name="encryption_settings_title" msgid="2848716008695618360">"इन्क्रिप्सन"</string>
+    <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"ट्याब्लेट इन्क्रिप्ट गर्नुहोस्"</string>
+    <string name="encrypt_title" product="default" msgid="7337365190988321100">"फोन इन्क्रिप्ट गर्नुहोस्"</string>
+    <string name="encrypted_summary" msgid="545623487587251207">"इन्क्रिप्ट गरिएको छ"</string>
     <string name="suggested_lock_settings_title" msgid="7836065447159730217">"आफ्नो फोनलाई सुरक्षित राख्नुहोस्"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"ट्याब्लेटलाई सुरक्षित राख्न स्क्रिन लक सेट गर्नुहोस्"</string>
     <string name="suggested_lock_settings_summary" product="device" msgid="8479766049078378225">"यन्त्रलाई सुरक्षित राख्न स्क्रिन लक सेट गर्नुहोस्"</string>
@@ -817,6 +791,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"तपाईँले अर्को उपकरणमा पनि PIN टाइप गर्न पर्ने हुन सक्छ।"</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"तपाईँले सायद यो पासकि अन्य उपकरणमा पनि टाइप गर्नुपर्छ।"</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> को साथ जोडी पार्न निश्चित गर्नुहोस् यसले यो पास कुञ्जी देखाइरहेको छ <xliff:g id="PASSKEY">%2$s</xliff:g>"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"समायोजित सेटमा कनेक्ट गर्न पुष्टि गर्नुहोस्"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"बाट: &lt;br&gt; &lt;b&gt; <xliff:g id="DEVICE_NAME">%1$s</xliff:g> &lt;/ b&gt; यस उपकरणका साथ जोडा बाँध्ने हो?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>सँग जोडी गर्न यसमा टाइप गर्नुहोस्: <xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g> <xliff:g id="PASSKEY">%2$s</xliff:g> <xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g> अनि रिटर्न वा इन्टर थिच्नुहोस्।"</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"आफ्ना सम्पर्क ठेगाना र फोन सम्पर्कको इतिहास हेर्ने अनुमति दिनुहोस्"</string>
@@ -850,6 +825,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"जडान गर्न सकिएन। फेरि प्रयास गर्नुहोस्।"</string>
     <string name="device_details_title" msgid="1155622417516195481">"डिभाइसको विवरण"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"डिभाइसको ब्लुटुथ एड्रेस: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"डिभाइसको ब्लुटुथ ठेगाना: \n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"डिभाइस बिर्सने हो?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"डिस्कनेक्ट गर्नुहोस्"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"एप डिस्कनेक्ट गर्ने हो?"</string>
@@ -881,6 +857,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"सेटिङहरू सम्झनुहोस्"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"जडान भएका ब्लुटुथ अडियो डिभाइसहरूको अधिकतम सङ्ख्या"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"जडान भएका ब्लुटुथ अडियो डिभाइसहरूको अधिकतम सङ्ख्या चयन गर्नुहोस्"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"NFC स्ट्याकको डिबग लग"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"NFC स्ट्याकको लगिङ लेभल बढाउनुहोस्"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Cast"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"स्क्रिन मिरर गर्नुहोस्"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"वायरलेस प्रदर्शन सक्षम गर्नुहोस्"</string>
@@ -1188,6 +1166,8 @@
     <string name="wifi_hotspot_maximize_compatibility_dual_ap_summary" msgid="3579549223159056533">"यो सुविधाको सहायताले अन्य डिभाइसहरू यो हटस्पट भेट्टाउन सक्छन्। यसले गर्दा ब्याट्रीको खपत बढ्छ।"</string>
     <string name="wifi_tether_starting" msgid="8879874184033857814">"हटस्पट खुल्दै..."</string>
     <string name="wifi_tether_stopping" msgid="4416492968019409188">"हटस्पट बन्द गरिँदै..."</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_title" msgid="3089432578433978073">"टेदरिङ उपलब्ध छैन"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_content" msgid="5920421547607921112">"यससम्बन्धी थप जानकारी प्राप्त गर्न आफ्नो मोबाइल सेवा प्रदायकलाई सम्पर्क गर्नुहोस्"</string>
     <string name="wifi_tether_enabled_subtext" msgid="5085002421099821056">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> सक्रिय छ"</string>
     <string name="wifi_tether_failed_subtext" msgid="437190628041885500">"पोर्टेबल Wi-Fi हटस्पट त्रुटि"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7072559431286459122">"Wi-Fi हटस्पट सेटअप गर्नुहोस्"</string>
@@ -2534,11 +2514,6 @@
     <string name="enable_service_title" msgid="7231533866953706788">"<xliff:g id="SERVICE">%1$s</xliff:g> लाई आफ्नो डिभाइस पूर्ण रूपमा नियन्त्रण गर्न दिने हो?"</string>
     <string name="capabilities_list_title" msgid="1225853611983394386">"<xliff:g id="SERVICE">%1$s</xliff:g> लाई आवश्यक:"</string>
     <string name="touch_filtered_warning" msgid="4225815157460318241">"एपले अनुमति अनुरोधलाई अस्पष्ट मानिरहेको हुनाले, सेटिङहरूलले तपाईंको प्रतिक्रियालाई प्रमाणित गर्न सक्दैनन्।"</string>
-    <string name="enable_service_encryption_warning" msgid="931082737770453755">"यदि तपाईंले <xliff:g id="SERVICE">%1$s</xliff:g> खोल्नुभयो भने, आफ्नो उपकरणले डेटा गुप्तिकरण अभिवृद्धि गर्न स्क्रिन लक प्रयोग गर्ने छैन।"</string>
-    <string name="secure_lock_encryption_warning" msgid="669152607190123579">"आफ्नो उपकरणले डेटा गुप्तिकरण अभिवृद्धि गर्न स्क्रिन लक प्रयोग गर्ने छैन, किनभने तपाईंले पहुँच सेवा खोल्नुभएको छ।"</string>
-    <string name="enable_service_pattern_reason" msgid="6832846117817938536">"किनभने <xliff:g id="SERVICE">%1$s</xliff:g> सेवा प्रयोग गर्दा डेटा गुप्तिकरणमा असर गर्छ, तपाईंले आफ्नो प्याटर्न पुष्टि गर्न आवश्यक छ।"</string>
-    <string name="enable_service_pin_reason" msgid="6040417014360237703">"किनभने <xliff:g id="SERVICE">%1$s</xliff:g> सेवा प्रयोग गर्दा डेटा गुप्तिकरणमा असर गर्छ, तपाईं आफ्नो PIN पुष्टि गर्न आवश्यक छ।"</string>
-    <string name="enable_service_password_reason" msgid="6962544350351734238">"किनभने <xliff:g id="SERVICE">%1$s</xliff:g> सेबा प्रयोग गर्दा डेटा गुप्तिकरणमा असर गर्छ, तपाईं आफ्नो पासवर्ड पुष्टि गर्न आवश्यक छ।"</string>
     <string name="accessibility_service_warning" msgid="6779187188736432618">"<xliff:g id="SERVICE">%1$s</xliff:g> ले यो डिभाइस पूर्ण रूपमा नियन्त्रण गर्ने अनुमति माग्दै छ। यो सेवाले स्क्रिनमा भएका जानकारी पढ्न तथा पहुँचसम्बन्धी आवश्यकता भएका प्रयोगकर्ताहरूका तर्फबाट कारबाही गर्न सक्छ। धेरैजसो अनुप्रयोगहरूका हकमा यो स्तरको नियन्त्रण उपयुक्त हुँदैन।"</string>
     <string name="accessibility_service_warning_description" msgid="6573203795976134751">"तपाईंलाई पहुँच राख्न आवश्यक पर्ने कुरामा सहयोग गर्ने एपमाथि पूर्ण नियन्त्रण गर्नु उपयुक्त हुन्छ तर अधिकांश अनुप्रयोगहरूका हकमा यस्तो नियन्त्रण उपयुक्त हुँदैन।"</string>
     <string name="accessibility_service_screen_control_title" msgid="324795030658109870">"स्क्रिन हेर्नुहोस् र नियन्त्रण गर्नुहोस्"</string>
@@ -3103,14 +3078,6 @@
     <string name="remove_account_failed" msgid="3709502163548900644">"यसलाई परिवर्तन गर्न तपाईंको प्रशासकले अनुमति दिँदैन"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"आफैँ सिंक गर्न सकेन।"</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"हालका लागि यस वस्तुको सिंक असक्षम पारिएको छ। यस सेटिङलाई परिवर्तन गर्न अस्थायी रूपमा ब्याकग्राउन्ड डेटा र स्वचालित सिंक सक्रिय पार्नुहोस्।"</string>
-    <string name="enter_password" msgid="6327051330258595331">"Android सुरु गर्न, आफ्नो पासवर्ड प्रविष्टि गर्नुहोस्"</string>
-    <string name="enter_pin" msgid="1029287617551232681">"Android सुरु गर्न, आफ्नो पिन प्रविष्टि गर्नुहोस्"</string>
-    <string name="enter_pattern" msgid="1747316785866742960">"Android सुरु गर्न, आफ्नो ढाँचा कोर्नुहोस्"</string>
-    <string name="cryptkeeper_wrong_pattern" msgid="340747269176120242">"प्याटर्न मिलेन"</string>
-    <string name="cryptkeeper_wrong_password" msgid="7295607881887114486">"गलत पासवर्ड"</string>
-    <string name="cryptkeeper_wrong_pin" msgid="2347961593970714201">"गलत PIN"</string>
-    <string name="checking_decryption" msgid="6111642972615688237">"जाँच गर्दै..."</string>
-    <string name="starting_android" msgid="6694154070215356186">"Android सुरु गर्दै…"</string>
     <string name="delete" msgid="8330605554706263775">"मेट्नुहोस्"</string>
     <string name="misc_files" msgid="6598066985800749585">"विविध फाइलहरू"</string>
     <string name="misc_files_selected_count" msgid="5597802791672749532">"चयनित <xliff:g id="NUMBER">%1$d</xliff:g> यस <xliff:g id="TOTAL">%2$d</xliff:g>भन्दा बाहिर"</string>
@@ -3206,8 +3173,6 @@
     <string name="data_usage_metered_yes" msgid="4262598072030135223">"शुल्क लाग्ने"</string>
     <string name="data_usage_metered_no" msgid="1685828958417926268">"सशुल्क प्रावधान तय नगरिसकिएको"</string>
     <string name="data_usage_disclaimer" msgid="3271450299386176770">"वाहक डेटा लेखाकृत गर्ने तपाईँको उपकरणबाट फरक हुन सक्छ।"</string>
-    <string name="cryptkeeper_emergency_call" msgid="8369322820475703306">"आपत्‌कालीन कल"</string>
-    <string name="cryptkeeper_return_to_call" msgid="3857250752781151232">"कलमा फर्किनुहोस्"</string>
     <string name="vpn_name" msgid="3806456074909253262">"नाम"</string>
     <string name="vpn_type" msgid="5533202873260826663">"प्रकार"</string>
     <string name="vpn_server" msgid="2908816134941973935">"सर्भर एड्रेस"</string>
@@ -4764,8 +4729,6 @@
       <item quantity="one">१ एपले असीमित डेटा प्रयोग गर्न सक्छ</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"थप हेर्नुहोस्"</string>
-    <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"निश्चित रूपमा प्रयोगकर्ताको डेटालाई वाइप गरेर फाइल इन्क्रिप्सनमा रूपान्तरण गर्ने हो?"</string>
-    <string name="button_confirm_convert_fbe" msgid="339648921918438106">"वाइप गरेर रूपान्तरण गर्नुहोस्"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"ShortcutManager को दर-सीमित गर्ने सुविधालाई रिसेट गर्नुहोस्"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"ShortcutManager को दर-सीमित गर्ने सुविधालाई रिसेट गरियो"</string>
     <string name="notification_suggestion_title" msgid="6309263655965785411">"लक स्क्रिनमा जानकारी नियन्त्रण गर्नुहोस्"</string>
@@ -5292,6 +5255,7 @@
     <string name="sim_action_yes" msgid="8076556020131395515">"अँ"</string>
     <string name="sim_action_reboot" msgid="3508948833333441538">"रिस्टार्ट गर्नुहोस्"</string>
     <string name="sim_action_no_thanks" msgid="435717748384544195">"पर्दैन, धन्यवाद"</string>
+    <string name="sim_action_cancel" msgid="2668099867029610910">"रद्द गर्नुहोस्"</string>
     <string name="sim_switch_button" msgid="1405772571706095387">"बदल्नुहोस्"</string>
     <string name="dsds_activation_failure_title" msgid="4467364110584914794">"SIM सक्रिय गर्न सकिएन"</string>
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"SIM बाहिर झिकेर फेरि हाल्नुहोस्। अझै समस्या रहिरह्यो भने आफ्नो डिभाइस रिस्टार्ट गर्नुहोस्।"</string>
@@ -5444,6 +5408,10 @@
     <string name="cached_apps_freezer" msgid="1057519579761550350">"क्यास गरिएका एपको क्रियाकलाप केही समयका लागि रोकियोस्"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"सेटिङमा स्क्रिन ओभरले देखिन दिइयोस्"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"अन्य एपको माथिपट्टि देखिन सक्ने एपहरूलाई ओभरले सेटिङ स्क्रिनको माथिपट्टि देखिन दिइयोस्"</string>
+    <!-- no translation found for allow_mock_modem (3832264806530479214) -->
+    <skip />
+    <!-- no translation found for allow_mock_modem_summary (9097416612748005374) -->
+    <skip />
     <string name="media_controls_title" msgid="403271085636252597">"मिडिया"</string>
     <string name="media_controls_resume_title" msgid="855076860336652370">"मिडिया प्लेयर पिन गरियोस्"</string>
     <string name="media_controls_resume_description" msgid="3163482266454802097">"प्लेब्याक तुरुन्तै सुचारु गर्न सकियोस् भन्नाका खातिर द्रुत सेटिङमा मिडिया प्लेयर खुला रहन्छ"</string>
diff --git a/res/values-night/styles.xml b/res/values-night/styles.xml
index 87159b8..a388855 100644
--- a/res/values-night/styles.xml
+++ b/res/values-night/styles.xml
@@ -16,9 +16,18 @@
 -->
 
 <resources>
+    <style name="Widget.ActionBar.Base" parent="@android:style/Widget.DeviceDefault.ActionBar.Solid">
+        <item name="android:background">?android:attr/colorPrimaryDark</item>
+    </style>
 
-<style name="Widget.ActionBar.Base" parent="@android:style/Widget.DeviceDefault.ActionBar.Solid">
-  <item name="android:background">?android:attr/colorPrimaryDark</item>
-</style>
+    <style name="TextAppearance.SimConfirmDialogList" parent="@style/TextAppearance.DialogMessage">
+      <item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>
+      <item name="android:textColor">?android:attr/textColorPrimaryInverse</item>
+    </style>
 
+    <style name="TextAppearance.SimConfirmDialogList.Summary">
+        <item name="android:textAppearance">?android:attr/textAppearanceSmall</item>
+        <item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>
+        <item name="android:textColor">?android:attr/textColorPrimaryInverse</item>
+    </style>
 </resources>
\ No newline at end of file
diff --git a/res/values-night/themes.xml b/res/values-night/themes.xml
index b61a98d..4564827 100644
--- a/res/values-night/themes.xml
+++ b/res/values-night/themes.xml
@@ -28,16 +28,18 @@
 
     <style name="Theme.SubSettings" parent="Theme.SubSettings.Base"/>
 
-    <style name="ThemeOverlay.SwitchBar.Settings" parent="ThemeOverlay.SwitchBar.Settings.Base">
-        <item name="android:textColorPrimaryInverse">@android:color/black</item>
-    </style>
-
     <style name="Theme.AlertDialog.Base" parent="@style/Theme.AppCompat.DayNight.Dialog.Alert">
         <item name="colorAccent">@*android:color/accent_device_default_dark</item>
         <item name="android:colorError">@color/settings_dialog_colorError</item>
         <item name="android:colorBackground">@*android:color/surface_dark</item>
     </style>
 
+    <style name="Theme.AlertDialog.Base.Material3" parent="Theme.MaterialComponents.DayNight.Dialog.Alert">
+        <item name="colorPrimary">@*android:color/primary_device_default_settings</item>
+        <item name="colorAccent">@*android:color/accent_device_default_dark</item>
+        <item name="android:colorBackground">@*android:color/surface_dark</item>
+    </style>
+
     <!-- Material theme for the pages containing TabLayout and ViewPager -->
     <style name="Theme.TabTheme" parent="@style/Theme.MaterialComponents.DayNight">
         <item name="colorPrimary">@*android:color/edge_effect_device_default_dark</item>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index f8934eb..42ac32b 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -142,10 +142,11 @@
     <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"Je apparaat toestaan om te communiceren met Bluetooth-apparaten in de nabije omgeving"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"Je telefoon toestaan om te communiceren met Bluetooth-apparaten in de nabije omgeving"</string>
     <string name="bluetooth_disable_a2dp_hw_offload" msgid="5942913792817797541">"Bluetooth A2DP-hardware-offload uitzetten"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="8610420176339657720">"Apparaat herstarten?"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8333029144800835996">"Start het apparaat opnieuw op om de instelling te wijzigen."</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="3488695418187553566">"Herstarten"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="4930826928585464191">"Annuleren"</string>
+    <string name="bluetooth_disable_le_audio_hw_offload" msgid="3966022676505972908">"Bluetooth LE AUDIO-hardware-offload uitzetten"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_title" msgid="6001142380445276918">"Apparaat opnieuw opstarten?"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_message" msgid="1524373895333698779">"Start het apparaat opnieuw op om de instelling te wijzigen."</string>
+    <string name="bluetooth_disable_hw_offload_dialog_confirm" msgid="5594859658551707592">"Opnieuw opstarten"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel" msgid="3663690305043973720">"Annuleren"</string>
     <string name="connected_device_media_device_title" msgid="3783388247594566734">"Media-apparaten"</string>
     <string name="connected_device_call_device_title" msgid="88732390601723608">"Apparaten voor gesprekken"</string>
     <string name="connected_device_other_device_title" msgid="4652120430615729193">"Andere apparaten"</string>
@@ -298,8 +299,8 @@
     <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Locatie gebruiken"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Uit"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
-      <item quantity="other">Aan: <xliff:g id="COUNT_1">%1$d</xliff:g> apps hebben toegang tot de locatie</item>
-      <item quantity="one">Aan: <xliff:g id="COUNT_0">%1$d</xliff:g> app heeft toegang tot de locatie</item>
+      <item quantity="other">Aan: <xliff:g id="COUNT_1">%1$d</xliff:g> apps hebben locatietoegang</item>
+      <item quantity="one">Aan: <xliff:g id="COUNT_0">%1$d</xliff:g> app heeft locatietoegang</item>
     </plurals>
     <string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"Laden…"</string>
     <string name="location_settings_footer_general" msgid="1040507068701188821">"Apps met rechten voor apparaten in de buurt kunnen ongeveer inschatten waar verbonden apparaten zijn."</string>
@@ -309,9 +310,9 @@
     <string name="security_settings_title" msgid="6710768415432791970">"Beveiliging"</string>
     <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"Versleuteling en gegevens"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"Telefoon versleuteld"</string>
-    <string name="decryption_settings_summary" product="default" msgid="1742645256103613503">"Telefoon niet gecodeerd"</string>
+    <string name="not_encrypted_summary" product="default" msgid="2251945842585788254">"Telefoon niet versleuteld"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"Apparaat versleuteld"</string>
-    <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"Apparaat niet gecodeerd"</string>
+    <string name="not_encrypted_summary" product="tablet" msgid="2374263654698719382">"Apparaat niet versleuteld"</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"Vergrendelscherm"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"Wat wordt getoond"</string>
     <string name="security_settings_summary" msgid="1627059516127354233">"\'Mijn locatie\', schermontgrendeling, sim- en certificaatopslagvergrendeling instellen"</string>
@@ -480,7 +481,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"Verwijderen"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"Raak de sensor aan"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"Plaats je vinger op de sensor en til deze op nadat je een trilling hebt gevoeld."</string>
-    <string name="security_settings_udfps_enroll_start_message" msgid="5032954588171487566">"Houd je vinger plat op de sensor totdat je een trilling voelt"</string>
+    <string name="security_settings_udfps_enroll_start_message" msgid="5032954588171487566">"Houd je vinger plat op de sensor totdat je een trilling voelt."</string>
     <string name="security_settings_fingerprint_enroll_udfps_title" msgid="6665610134560896895">"Raak de vingerafdruksensor aan en houd deze vast"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"Raak de sensor opnieuw aan"</string>
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"Nog een keer"</string>
@@ -488,7 +489,7 @@
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Raak de sensor meerdere keren aan om de verschillende delen van je vingerafdruk toe te voegen."</string>
     <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"Tik en houd vast elke keer dat het vingerafdrukicoon beweegt. Zo kan er meer van je vingerafdruk worden geregistreerd."</string>
     <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"Leg het puntje van je vingertop op de sensor"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="6137605344819152477">"Gebruik tot slot de randen van je vinger"</string>
+    <string name="security_settings_udfps_enroll_edge_title" msgid="6137605344819152477">"Scan nu de randen van je vinger"</string>
     <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"Leg de zijkant van je vingerafdruk op de sensor en houd vast. Doe dan hetzelfde aan de andere kant."</string>
     <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"Zo kan er meer van je vingerafdruk worden geregistreerd"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Vingerafdruk vastleggen: <xliff:g id="PERCENTAGE">%d</xliff:g> procent"</string>
@@ -568,37 +569,10 @@
     <string name="fingerprint_last_delete_message" msgid="7860374760549404410">"Je kunt je vingerafdruk niet gebruiken om je telefoon te ontgrendelen of voor verificatie in apps."</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="4104208067277655068">"Je kunt je vingerafdruk niet gebruiken om je werkprofiel te ontgrendelen, aankopen te autoriseren of in te loggen bij werk-apps."</string>
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"Ja, verwijderen"</string>
-    <string name="crypt_keeper_settings_title" msgid="4938812137822100044">"Versleuteling"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"Tablet versleutelen"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"Telefoon versleutelen"</string>
-    <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"Versleuteld"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"Je kunt je accounts, instellingen, gedownloade apps en bijbehorende gegevens, media en andere bestanden versleutelen. Als je na de versleuteling van je tablet een schermvergrendeling hebt ingesteld (een patroon, numerieke pincode of wachtwoord), moet je het scherm ontgrendelen om de tablet te ontsleutelen telkens als je deze aanzet. De enige andere manier om de tablet te ontsleutelen is de fabrieksinstellingen terugzetten, waarbij al je gegevens worden gewist.\n\nVersleutelen duurt een uur of langer. Je moet beginnen met een opgeladen batterij en je tablet moet het hele proces aangesloten zijn op een stopcontact. Als je het proces onderbreekt, verlies je een deel van je gegevens of alle gegevens."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"Je kunt je accounts, instellingen, gedownloade apps en bijbehorende gegevens, media en andere bestanden versleutelen. Als je na de versleuteling van je telefoon een schermvergrendeling hebt ingesteld (een patroon, numerieke pincode of wachtwoord), moet je het scherm ontgrendelen om de telefoon te ontsleutelen telkens als je deze aanzet. De enige andere manier om de telefoon te ontsleutelen is de fabrieksinstellingen terugzetten, waarbij al je gegevens worden gewist.\n\nVersleutelen duurt een uur of langer. Je moet beginnen met een opgeladen batterij en je telefoon moet het hele proces aangesloten zijn op een stopcontact. Als je het proces onderbreekt, verlies je een deel van je gegevens of alle gegevens."</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"Tablet versleutelen"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"Telefoon versleutelen"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"Laad de batterij op en probeer het opnieuw."</string>
-    <string name="crypt_keeper_unplugged_text" msgid="2709721134148651329">"Sluit je lader aan en probeer het opnieuw."</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="1847280235529858357">"Geen pincode of wachtwoord voor schermvergrendeling"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="7210616262954236042">"Je moet een pincode of wachtwoord voor schermvergrendeling instellen voordat je de encryptie kunt starten."</string>
-    <string name="crypt_keeper_confirm_title" msgid="8600000209722452230">"Versleutelen?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="3270587498436152259">"De versleuteling kan niet ongedaan worden gemaakt en als je het proces onderbreekt, gaan er gegevens verloren. Het versleutelen duurt een uur of langer en de telefoon wordt meerdere keren opnieuw opgestart."</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="3040428543349852419">"De versleuteling kan niet ongedaan worden gemaakt en als je het proces onderbreekt, gaan er gegevens verloren. Het versleutelen duurt een uur of langer en de telefoon wordt meerdere keren opnieuw opgestart."</string>
-    <string name="crypt_keeper_setup_title" msgid="3339725741305796680">"Versleutelen"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="4417016995091289019">"Wacht totdat je telefoon is gecodeerd. <xliff:g id="PERCENT">^1</xliff:g> procent voltooid."</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="7902355422499500352">"Wacht totdat je telefoon is gecodeerd. <xliff:g id="PERCENT">^1</xliff:g> procent voltooid."</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="8348188415839917821">"Wacht terwijl je telefoon wordt versleuteld. Resterende tijd: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="8556105766597855198">"Wacht terwijl je telefoon wordt versleuteld. Resterende tijd: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="3832496715430327682">"Als je je tablet wilt ontgrendelen, zet je deze uit en weer aan."</string>
-    <string name="crypt_keeper_force_power_cycle" product="default" msgid="5070346039522135361">"Als je je telefoon wilt ontgrendelen, zet je deze uit en weer aan."</string>
-    <string name="crypt_keeper_warn_wipe" msgid="8104921337301750394">"Waarschuwing: na nog <xliff:g id="COUNT">^1</xliff:g> mislukte pogingen om te ontgrendelen, wordt je apparaat gewist."</string>
-    <string name="crypt_keeper_enter_password" msgid="1274917431075529732">"Typ je wachtwoord"</string>
-    <string name="crypt_keeper_failed_title" msgid="8173654570682244149">"Encryptie mislukt"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"Het versleutelen is onderbroken en kan niet worden voltooid. Als gevolg hiervan zijn de gegevens op je telefoon niet meer toegankelijk. \n\nAls je je tablet weer wilt gebruiken, moet je de fabrieksinstellingen herstellen. Wanneer je de tablet instelt na het herstel, krijg je de mogelijkheid gegevens waarvan je een back-up hebt gemaakt in je Google-account, terug te zetten."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"Het versleutelen is onderbroken en kan niet worden voltooid. Daardoor zijn de gegevens op je telefoon niet meer toegankelijk. \n\nAls je je telefoon weer wilt gebruiken, moet je de fabrieksinstellingen herstellen. Wanneer je de telefoon instelt na het herstel, krijg je de mogelijkheid gegevens terug te zetten waarvan je een back-up hebt gemaakt in je Google-account."</string>
-    <string name="crypt_keeper_data_corrupt_title" msgid="5920153462176846037">"Ontsleutelen mislukt"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"Het wachtwoord dat je hebt opgegeven, is correct, maar je gegevens zijn beschadigd. \n\nAls je je tablet weer wilt gebruiken, moet je deze terugzetten naar de fabrieksinstellingen. Wanneer je je tablet instelt na het terugzetten, heb je de mogelijkheid gegevens waarvan je een back-up in je Google-account hebt gemaakt, te herstellen."</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"Het wachtwoord dat je hebt opgegeven, is correct, maar je gegevens zijn beschadigd. \n\nAls je je telefoon weer wilt gebruiken, moet je deze terugzetten naar de fabrieksinstellingen. Wanneer je je telefoon instelt na het terugzetten, heb je de mogelijkheid gegevens waarvan je een back-up in je Google-account hebt gemaakt, te herstellen."</string>
-    <string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"Invoermethode schakelen"</string>
+    <string name="encryption_settings_title" msgid="2848716008695618360">"Versleuteling"</string>
+    <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"Tablet versleutelen"</string>
+    <string name="encrypt_title" product="default" msgid="7337365190988321100">"Telefoon versleutelen"</string>
+    <string name="encrypted_summary" msgid="545623487587251207">"Versleuteld"</string>
     <string name="suggested_lock_settings_title" msgid="7836065447159730217">"Beveilig je telefoon"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"Schermvergrendeling instellen om tablet te beschermen"</string>
     <string name="suggested_lock_settings_summary" product="device" msgid="8479766049078378225">"Schermvergrendeling instellen om apparaat te beveiligen"</string>
@@ -817,6 +791,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Je moet deze pincode wellicht ook opgeven op het andere apparaat."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Je moet deze toegangscode wellicht ook opgeven op het andere apparaat."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Koppelen met:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Zorg ervoor dat de volgende toegangscode wordt vermeld:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Bevestigen om te koppelen met de gecoördineerde set"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"Van:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Koppelen met dit apparaat?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Koppelen met:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Typ het volgende:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g> en druk op Enter."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Toegang geven tot je contacten en gespreksgeschiedenis"</string>
@@ -850,6 +825,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Kan geen verbinding maken. Probeer het opnieuw."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Apparaatgegevens"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Bluetooth-adres van je apparaat: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Bluetooth-adres van apparaat:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Apparaat vergeten?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Koppeling verwijderen"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"App ontkoppelen?"</string>
@@ -881,6 +857,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Instellingen onthouden"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Maximum aantal verbonden bluetooth-audioapparaten"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Selecteer het maximum aantal verbonden Bluetooth-audioapparaten"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"Foutopsporingslogboek voor NFC-stack"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Registratieniveau voor NFC-stack verhogen"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Casten"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"mirroren"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Draadloze weergave aanzetten"</string>
@@ -1188,6 +1166,8 @@
     <string name="wifi_hotspot_maximize_compatibility_dual_ap_summary" msgid="3579549223159056533">"Hiermee kunnen andere apparaten deze hotspot vinden. Het batterijgebruik neemt toe."</string>
     <string name="wifi_tether_starting" msgid="8879874184033857814">"Hotspot aanzetten…"</string>
     <string name="wifi_tether_stopping" msgid="4416492968019409188">"Hotspot uitzetten…"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_title" msgid="3089432578433978073">"Tethering niet beschikbaar"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_content" msgid="5920421547607921112">"Neem contact op met je provider voor meer informatie"</string>
     <string name="wifi_tether_enabled_subtext" msgid="5085002421099821056">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> is actief"</string>
     <string name="wifi_tether_failed_subtext" msgid="437190628041885500">"Fout met draagbare wifi-hotspot"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7072559431286459122">"Wifi-hotspot instellen"</string>
@@ -1354,7 +1334,7 @@
     <string name="night_display_auto_mode_title" msgid="5869128421470824381">"Schema"</string>
     <string name="night_display_auto_mode_never" msgid="2721729920187175239">"Geen"</string>
     <string name="night_display_auto_mode_custom" msgid="3938791496034086916">"Op aangepaste tijd"</string>
-    <string name="night_display_auto_mode_twilight" msgid="4291855156158833997">"Van zonsondergang tot zonsopgang"</string>
+    <string name="night_display_auto_mode_twilight" msgid="4291855156158833997">"Van zonsondergang tot zonsopkomst"</string>
     <string name="night_display_start_time_title" msgid="2611541851596977786">"Begintijd"</string>
     <string name="night_display_end_time_title" msgid="5243112480391192111">"Eindtijd"</string>
     <string name="night_display_status_title" msgid="9006282950657941820">"Status"</string>
@@ -1364,31 +1344,31 @@
     <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"Wordt automatisch aangezet bij zonsondergang"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"Wordt nooit automatisch uitgezet"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"Wordt automatisch uitgezet om <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"Wordt automatisch uitgezet bij zonsopgang"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"Wordt automatisch uitgezet bij zonsopkomst"</string>
     <string name="night_display_activation_on_manual" msgid="7999294858026069365">"Nu aanzetten"</string>
     <string name="night_display_activation_off_manual" msgid="4842907786868153218">"Nu uitzetten"</string>
-    <string name="night_display_activation_on_twilight" msgid="3440889451767582067">"Aanzetten tot zonsopgang"</string>
+    <string name="night_display_activation_on_twilight" msgid="3440889451767582067">"Aanzetten tot zonsopkomst"</string>
     <string name="night_display_activation_off_twilight" msgid="2853594955401726956">"Uitzetten tot zonsondergang"</string>
     <string name="night_display_activation_on_custom" msgid="4951143503599226846">"Aanzetten tot <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_activation_off_custom" msgid="79965738861100371">"Uitzetten tot <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_not_currently_on" msgid="6600205753103093827">"Nachtverlichting staat uit"</string>
-    <string name="twilight_mode_location_off_dialog_message" msgid="4559150893687124801">"Apparaatlocatie is vereist om de tijden voor zonsondergang en zonsopgang te bepalen"</string>
+    <string name="twilight_mode_location_off_dialog_message" msgid="4559150893687124801">"Apparaatlocatie is vereist om de tijden voor zonsondergang en zonsopkomst te bepalen"</string>
     <string name="twilight_mode_launch_location" msgid="7799112373591153956">"Locatie-instellingen"</string>
     <string name="dark_ui_activation_on_manual" msgid="1541006734577325234">"Nu aanzetten"</string>
     <string name="dark_ui_activation_off_manual" msgid="2395333709291250065">"Nu uitzetten"</string>
-    <string name="dark_ui_activation_on_auto" msgid="4824339634784765049">"Aanzetten tot zonsopgang"</string>
+    <string name="dark_ui_activation_on_auto" msgid="4824339634784765049">"Aanzetten tot zonsopkomst"</string>
     <string name="dark_ui_activation_off_auto" msgid="9136717444658505208">"Uitzetten tot zonsondergang"</string>
     <string name="dark_ui_title" msgid="3373976268671557416">"Donkere modus"</string>
     <string name="dark_ui_auto_mode_title" msgid="9027528859262295099">"Schema"</string>
     <string name="dark_ui_auto_mode_never" msgid="3980412582267787662">"Geen"</string>
-    <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"Van zonsondergang tot zonsopgang"</string>
+    <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"Van zonsondergang tot zonsopkomst"</string>
     <string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"Op aangepaste tijd"</string>
     <string name="dark_ui_status_title" msgid="3505119141437774329">"Status"</string>
     <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"Wordt nooit automatisch aangezet"</string>
     <string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"Wordt automatisch aangezet bij zonsondergang"</string>
     <string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"Wordt automatisch aangezet om <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Wordt nooit automatisch uitgezet"</string>
-    <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Wordt automatisch uitgezet bij zonsopgang"</string>
+    <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Wordt automatisch uitgezet bij zonsopkomst"</string>
     <string name="dark_ui_summary_on_auto_mode_custom" msgid="2526935680241734784">"Wordt automatisch uitgezet om <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_activation_on_custom" msgid="1889379402860316125">"Aanzetten tot <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_activation_off_custom" msgid="2192932161592759607">"Uitzetten tot <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -1480,7 +1460,7 @@
     <string name="fcc_equipment_id" msgid="6596668314025646129">"Apparatuur-ID"</string>
     <string name="baseband_version" msgid="2600182227599835857">"Smalbandversie"</string>
     <string name="kernel_version" msgid="3513538109381366881">"Kernel-versie"</string>
-    <string name="build_number" msgid="9009733242117579826">"Build-nummer"</string>
+    <string name="build_number" msgid="9009733242117579826">"Buildnummer"</string>
     <string name="module_version" msgid="1787518340082046658">"Google Play-systeemupdate"</string>
     <string name="device_info_not_available" msgid="4804474466616712326">"Niet beschikbaar"</string>
     <string name="device_status_activity_title" msgid="1812666241137263882">"Status"</string>
@@ -1836,8 +1816,8 @@
     <string name="location_app_level_permissions" msgid="907206607664629759">"Locatierechten voor apps"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Locatie staat uit"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
-      <item quantity="other"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> van <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> apps hebben toegang tot de locatie</item>
-      <item quantity="one"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_0">%1$d</xliff:g> van <xliff:g id="TOTAL_LOCATION_APP_COUNT_1">%2$d</xliff:g> apps heeft toegang tot de locatie</item>
+      <item quantity="other"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> van <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> apps hebben locatietoegang</item>
+      <item quantity="one"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_0">%1$d</xliff:g> van <xliff:g id="TOTAL_LOCATION_APP_COUNT_1">%2$d</xliff:g> apps heeft locatietoegang</item>
     </plurals>
     <string name="location_category_recent_location_access" msgid="2558063524482178146">"Recente toegang"</string>
     <string name="location_recent_location_access_see_all" msgid="4203102419355323325">"Alles tonen"</string>
@@ -2534,11 +2514,6 @@
     <string name="enable_service_title" msgid="7231533866953706788">"Toestaan dat <xliff:g id="SERVICE">%1$s</xliff:g> volledige controle over je apparaat heeft?"</string>
     <string name="capabilities_list_title" msgid="1225853611983394386">"\'<xliff:g id="SERVICE">%1$s</xliff:g>\' moet het volgende kunnen:"</string>
     <string name="touch_filtered_warning" msgid="4225815157460318241">"Aangezien een app een rechtenverzoek afdekt, kan Instellingen je reactie niet verifiëren."</string>
-    <string name="enable_service_encryption_warning" msgid="931082737770453755">"Als je <xliff:g id="SERVICE">%1$s</xliff:g> aanzet, gebruikt je apparaat geen schermvergrendeling om de gegevensversleuteling te verbeteren."</string>
-    <string name="secure_lock_encryption_warning" msgid="669152607190123579">"Je hebt een toegankelijkheidsservice aangezet, waardoor je apparaat geen schermvergrendeling gebruikt om de gegevensversleuteling te verbeteren."</string>
-    <string name="enable_service_pattern_reason" msgid="6832846117817938536">"Aangezien het aanzetten van <xliff:g id="SERVICE">%1$s</xliff:g> van invloed is op de gegevensversleuteling, moet je je patroon bevestigen."</string>
-    <string name="enable_service_pin_reason" msgid="6040417014360237703">"Aangezien het aanzetten van <xliff:g id="SERVICE">%1$s</xliff:g> van invloed is op de gegevensversleuteling, moet de pincode worden bevestigd."</string>
-    <string name="enable_service_password_reason" msgid="6962544350351734238">"Aangezien het aanzetten van <xliff:g id="SERVICE">%1$s</xliff:g> van invloed is op de gegevensversleuteling, moet je je wachtwoord bevestigen."</string>
     <string name="accessibility_service_warning" msgid="6779187188736432618">"<xliff:g id="SERVICE">%1$s</xliff:g> vraagt om volledig beheer voor dit apparaat. De service kan het scherm lezen en handelen namens gebruikers met toegankelijkheidsbehoeften. Dit beheerniveau is voor de meeste apps niet gepast."</string>
     <string name="accessibility_service_warning_description" msgid="6573203795976134751">"Volledige controle is gepast voor apps die je helpen met toegankelijkheid, maar voor de meeste apps is het ongepast."</string>
     <string name="accessibility_service_screen_control_title" msgid="324795030658109870">"Scherm bekijken en bedienen"</string>
@@ -3103,14 +3078,6 @@
     <string name="remove_account_failed" msgid="3709502163548900644">"Deze wijziging is niet toegestaan door je beheerder"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"Kan niet handmatig synchroniseren"</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"Synchronisatie staat op dit moment uit voor dit item. Als je deze instelling wilt wijzigen, zet je achtergrondgegevens en automatisch synchroniseren tijdelijk aan."</string>
-    <string name="enter_password" msgid="6327051330258595331">"Geef je wachtwoord op om Android te starten"</string>
-    <string name="enter_pin" msgid="1029287617551232681">"Geef je pincode op om Android te starten"</string>
-    <string name="enter_pattern" msgid="1747316785866742960">"Teken je patroon om Android te starten"</string>
-    <string name="cryptkeeper_wrong_pattern" msgid="340747269176120242">"Onjuist patroon"</string>
-    <string name="cryptkeeper_wrong_password" msgid="7295607881887114486">"Onjuist wachtwoord"</string>
-    <string name="cryptkeeper_wrong_pin" msgid="2347961593970714201">"Onjuiste pincode"</string>
-    <string name="checking_decryption" msgid="6111642972615688237">"Controleren…"</string>
-    <string name="starting_android" msgid="6694154070215356186">"Android starten…"</string>
     <string name="delete" msgid="8330605554706263775">"Verwijderen"</string>
     <string name="misc_files" msgid="6598066985800749585">"Diverse bestanden"</string>
     <string name="misc_files_selected_count" msgid="5597802791672749532">"<xliff:g id="NUMBER">%1$d</xliff:g> van <xliff:g id="TOTAL">%2$d</xliff:g> geselecteerd"</string>
@@ -3206,8 +3173,6 @@
     <string name="data_usage_metered_yes" msgid="4262598072030135223">"Met datalimiet"</string>
     <string name="data_usage_metered_no" msgid="1685828958417926268">"Zonder datalimiet"</string>
     <string name="data_usage_disclaimer" msgid="3271450299386176770">"Het door de provider berekende dataverbruik kan afwijken van die van je apparaat."</string>
-    <string name="cryptkeeper_emergency_call" msgid="8369322820475703306">"Noodoproep"</string>
-    <string name="cryptkeeper_return_to_call" msgid="3857250752781151232">"Terug naar gesprek"</string>
     <string name="vpn_name" msgid="3806456074909253262">"Naam"</string>
     <string name="vpn_type" msgid="5533202873260826663">"Type"</string>
     <string name="vpn_server" msgid="2908816134941973935">"Serveradres"</string>
@@ -3519,7 +3484,7 @@
     <string name="notification_settings_work_profile" msgid="6076211850526353975">"Toegang tot meldingen is niet beschikbaar voor apps in het werkprofiel."</string>
     <string name="account_dashboard_title" msgid="8228773251948253914">"Wachtwoorden en accounts"</string>
     <string name="account_dashboard_default_summary" msgid="1730719656099599488">"Opgeslagen wachtwoorden, automatisch invullen, gesynchroniseerde accounts"</string>
-    <string name="app_default_dashboard_title" msgid="4071015747629103216">"Standaard apps"</string>
+    <string name="app_default_dashboard_title" msgid="4071015747629103216">"Standaard-apps"</string>
     <string name="system_dashboard_summary" msgid="7400745270362833832">"Talen, gebaren, tijd, back-up"</string>
     <string name="search_results_title" msgid="3360639917793022533">"Instellingen"</string>
     <string name="keywords_wifi" msgid="8156528242318351490">"wifi, wifi-netwerk, netwerkverbinding, internet, draadloos, gegevens, wifi-verbinding"</string>
@@ -4764,8 +4729,6 @@
       <item quantity="one">1 app kan onbeperkt data gebruiken</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"Meer tonen"</string>
-    <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"Weet je zeker dat je de gebruikersgegevens wilt wissen en wilt converteren naar versleuteling op basis van bestanden?"</string>
-    <string name="button_confirm_convert_fbe" msgid="339648921918438106">"Wissen en converteren"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"Rate limiting van ShortcutManager resetten"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"De rate limiting van ShortcutManager is gereset."</string>
     <string name="notification_suggestion_title" msgid="6309263655965785411">"Informatie op vergrendelscherm beheren"</string>
@@ -5292,6 +5255,7 @@
     <string name="sim_action_yes" msgid="8076556020131395515">"Ja"</string>
     <string name="sim_action_reboot" msgid="3508948833333441538">"Opnieuw opstarten"</string>
     <string name="sim_action_no_thanks" msgid="435717748384544195">"Nee, bedankt"</string>
+    <string name="sim_action_cancel" msgid="2668099867029610910">"Annuleren"</string>
     <string name="sim_switch_button" msgid="1405772571706095387">"Overschakelen"</string>
     <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Kan simkaart niet activeren"</string>
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Verwijder de simkaart en plaats deze opnieuw. Als het probleem blijft optreden, start je het apparaat opnieuw op."</string>
@@ -5444,6 +5408,10 @@
     <string name="cached_apps_freezer" msgid="1057519579761550350">"Uitvoering opschorten voor gecachte apps"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"Schermoverlays toestaan voor Instellingen"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Sta toe dat apps met schermoverlay vóór instellingsschermen worden getoond"</string>
+    <!-- no translation found for allow_mock_modem (3832264806530479214) -->
+    <skip />
+    <!-- no translation found for allow_mock_modem_summary (9097416612748005374) -->
+    <skip />
     <string name="media_controls_title" msgid="403271085636252597">"Media"</string>
     <string name="media_controls_resume_title" msgid="855076860336652370">"Mediaspeler vastzetten"</string>
     <string name="media_controls_resume_description" msgid="3163482266454802097">"De mediaspeler blijft open staan in Snelle instellingen, zodat je snel kunt verdergaan met afspelen"</string>
diff --git a/res/values-or/arrays.xml b/res/values-or/arrays.xml
index cda80f2..0cfbdf4 100644
--- a/res/values-or/arrays.xml
+++ b/res/values-or/arrays.xml
@@ -251,7 +251,7 @@
     <item msgid="5167716820004184705">"SMS ପଠାନ୍ତୁ"</item>
     <item msgid="3834284815734286927">"ICC SMS ପଢ଼ନ୍ତୁ"</item>
     <item msgid="6394881108820762646">"ICC SMS ଲେଖନ୍ତୁ"</item>
-    <item msgid="3275060808384314406">"ସେଟିଙ୍ଗରେ ସଂଶୋଧନ କରନ୍ତୁ"</item>
+    <item msgid="3275060808384314406">"ସେଟିଂସ ପରିବର୍ତ୍ତନ କରନ୍ତୁ"</item>
     <item msgid="8672921438869137431">"ସ୍କ୍ରୀନ୍‌ର ଉପର ଭାଗରେ ଆଙ୍କନ୍ତୁ"</item>
     <item msgid="346101114322879720">"ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକୁ ଆକ୍‌ସେସ୍‌ କରନ୍ତୁ"</item>
     <item msgid="4760681822601767255">"କ୍ୟାମେରା"</item>
@@ -318,7 +318,7 @@
     <item msgid="9189359977063200554">"SMS/MMS ପଠାନ୍ତୁ"</item>
     <item msgid="6954817837534799424">"SMS/MMS ପଢ଼ନ୍ତୁ"</item>
     <item msgid="7921014514153395846">"SMS/MMS ଲେଖନ୍ତୁ"</item>
-    <item msgid="8997371825401751421">"ସେଟିଙ୍ଗଗୁଡ଼ିକ ବଦଳାନ୍ତୁ"</item>
+    <item msgid="8997371825401751421">"ସେଟିଂସ ବଦଳାନ୍ତୁ"</item>
     <item msgid="7005755175240764443">"ଉପର ଭାଗରେ ଆଙ୍କନ୍ତୁ"</item>
     <item msgid="8267704990417682222">"ବିଜ୍ଞପ୍ତି ଆକସେସ୍‌ କରନ୍ତୁ"</item>
     <item msgid="3180676986290096851">"କ୍ୟାମେରା"</item>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index 15edf89..7dab073 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -71,8 +71,8 @@
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4959591522483403402">"ସ୍କ୍ରୀନ୍‌ ଲକ୍‌ ଥିବାବେଳେ ବ୍ଲୁଟୂଥ୍‍‌ ଡାଏଲର୍‌ର ବ୍ୟବହାରକୁ ରୋକନ୍ତୁ"</string>
     <string name="bluetooth_devices" msgid="1063177983261608277">"ବ୍ଲୁଟୁଥ୍ ଡିଭାଇସ୍‌ଗୁଡ଼ିକ"</string>
     <string name="bluetooth_device_name" msgid="1294669733490268384">"ଡିଭାଇସ୍‌ର ନାମ"</string>
-    <string name="bluetooth_device_details" msgid="630702184344217832">"ଡିଭାଇସ୍ ସେଟିଂସ୍"</string>
-    <string name="bluetooth_profile_details" msgid="1269419918127093325">"ପ୍ରୋଫାଇଲ୍‌ର ସେଟିଙ୍ଗ"</string>
+    <string name="bluetooth_device_details" msgid="630702184344217832">"ଡିଭାଇସ ସେଟିଂସ"</string>
+    <string name="bluetooth_profile_details" msgid="1269419918127093325">"ପ୍ରୋଫାଇଲ ସେଟିଂସ"</string>
     <string name="bluetooth_name_not_set" msgid="4654357917928126208">"ଆକାଉଣ୍ଟ ନାମ ବ୍ୟବହାର କରି କୌଣସି ନାମ ସେଟ୍‌ ହୋଇନାହିଁ"</string>
     <string name="bluetooth_scan_for_devices" msgid="8143654526358934069">"ଡିଭାଇସ୍‌ଗୁଡ଼ିକୁ ଖୋଜ"</string>
     <string name="bluetooth_rename_device" msgid="4219655243836021443">"ଏହି ଡିଭାଇସ୍‌ର ନାମ ବଦଳାନ୍ତୁ"</string>
@@ -82,10 +82,10 @@
     <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="336622948210457991">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>ଠାରୁ ଆପଣଙ୍କ ଟାବ୍‌ଲେଟ୍‌ ବିଚ୍ଛିନ୍ନ ହେବ।"</string>
     <string name="bluetooth_disconnect_all_profiles" product="device" msgid="6944790936166852428">"ଆପଣଙ୍କ ଡିଭାଇସ୍‌ <xliff:g id="DEVICE_NAME">%1$s</xliff:g>ରୁ ବିଚ୍ଛିନ୍ନ ହେବ।"</string>
     <string name="bluetooth_disconnect_dialog_ok" msgid="4173740094381092185">"ବିଚ୍ଛିନ୍ନ"</string>
-    <string name="bluetooth_empty_list_user_restricted" msgid="909734990821975673">"ବ୍ଲୁଟୂଥ୍‍‌ ସେଟିଙ୍ଗ ବଦଳାଇବା ପାଇଁ ଆପଣଙ୍କ ପାଖେ ଅନୁମତି ନାହିଁ।"</string>
+    <string name="bluetooth_empty_list_user_restricted" msgid="909734990821975673">"ବ୍ଲୁଟୂଥ୍‍‌ ସେଟିଂସ ବଦଳାଇବା ପାଇଁ ଆପଣଙ୍କ ପାଖରେ ଅନୁମତି ନାହିଁ।"</string>
     <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"ନୂଆ ଡିଭାଇସ୍‌ ପେୟାର୍‌ କରନ୍ତୁ"</string>
     <string name="keywords_add_bt_device" msgid="4533191164203174011">"ବ୍ଲୁଟୁଥ୍"</string>
-    <string name="bluetooth_is_visible_message" msgid="3811631869768157387">"ବ୍ଲୁଟୂଥ୍‍‌ ସେଟିଙ୍ଗ ଖୋଲା ଥିବାବେଳେ ଆଖପାଖ ଡିଭାଇସ୍‌ଗୁଡ଼ିକୁ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ଦେଖାଦେଉଛି।"</string>
+    <string name="bluetooth_is_visible_message" msgid="3811631869768157387">"ବ୍ଲୁଟୂଥ୍‍‌ ସେଟିଂସ ଖୋଲା ଥିବାବେଳେ ଆଖପାଖ ଡିଭାଇସଗୁଡ଼ିକୁ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ଦେଖାଦିଏ।"</string>
     <string name="bluetooth_footer_mac_message" product="default" msgid="4782330594323261630">"ଫୋନ୍‌ର ବ୍ଲୁଟୂଥ୍‍‌ ଠିକଣା ହେଉଛି: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_footer_mac_message" product="tablet" msgid="1257226691967432025">"ଟାବ୍‌ଲେଟ୍‌ର ବ୍ଲୁଟୂଥ୍‍‌ ଠିକଣା ହେଉଛି: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_footer_mac_message" product="device" msgid="2863536947810007600">"ଡିଭାଇସ୍‌ର ବ୍ଲୁଟୁଥ ଠିକଣା ହେଉଛି: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
@@ -109,18 +109,18 @@
     <string name="bluetooth_ask_discovery" product="default" msgid="7013223328571883275">"<xliff:g id="TIMEOUT">%2$d</xliff:g> ସେକେଣ୍ଡ ପାଇଁ <xliff:g id="APP_NAME">%1$s</xliff:g> ଆପଣଙ୍କ ଫୋନ୍‌କୁ ଅନ୍ୟ ବ୍ଲୁଟୂଥ୍‍‌ ଡିଭାଇସ୍‌ଗୁଡ଼ିକୁ ଦେଖାଇବାକୁ ଚାହୁଁଛି।"</string>
     <string name="bluetooth_ask_discovery_no_name" product="tablet" msgid="3266007454914144057">"କିଛି <xliff:g id="TIMEOUT">%1$d</xliff:g> ସେକେଣ୍ଡ ପାଇଁ ଗୋଟିଏ ଆପ୍‌ ଆପଣଙ୍କ ଟାବ୍‌ଲେଟ୍‌କୁ ଅନ୍ୟ ବ୍ଲୁଟୂଥ୍‍‌ ଡିଭାଇସ୍‌ଗୁଡ଼ିକୁ ଦେଖାଇବାକୁ ଚାହୁଁଛି।"</string>
     <string name="bluetooth_ask_discovery_no_name" product="default" msgid="7989444746980501116">"ଗୋଟିଏ ଆପ୍‌ ଆପଣଙ୍କ ଫୋନ୍‌କୁ ଅନ୍ୟ ବ୍ଲୁଟୂଥ୍‍‌ ଡିଭାଇସ୍‌ଗୁଡ଼ିକୁ <xliff:g id="TIMEOUT">%1$d</xliff:g> ସେକେଣ୍ଡ ପାଇଁ ଦେଖାଇବାକୁ ଚାହୁଁଛି।"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="6482084870735107773">"<xliff:g id="APP_NAME">%1$s</xliff:g> ଆପଣଙ୍କ ଟାବଲେଟ୍‌କୁ ଅନ୍ୟ ବ୍ଲୁଟୂଥ୍‍‌ ଡିଭାଇସ୍‌ଗୁଡ଼ିକୁ ଦେଖାଇବାକୁ ଚାହୁଁଛି। ବ୍ଲୁଟୂଥ୍‍‌ ସେଟିଙ୍ଗରେ ଆପଣ ଏହାକୁ ପରେ ବଦଳାଇପାରିବେ।"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="2352494279465502950">"<xliff:g id="APP_NAME">%1$s</xliff:g> ଆପଣଙ୍କ ଫୋନ୍‌କୁ ଅନ୍ୟ ବ୍ଲୁଟୂଥ୍‍‌ ଡିଭାଇସ୍‌ଗୁଡ଼ିକୁ ଦୃଶ୍ୟମାନ କରାଇବାକୁ ଚାହେଁ। ବ୍ଲୁଟୂଥ୍‍‌ ସେଟିଙ୍ଗରେ ଆପଣ ଏହା ପରେ ପରିବର୍ତ୍ତନ କରିପାରିବେ।"</string>
-    <string name="bluetooth_ask_lasting_discovery_no_name" product="tablet" msgid="2732992604509910896">"ଗୋଟିଏ ଆପ୍‌, ଅନ୍ୟ ବ୍ଲୁଟୂଥ୍‍‌ ଡିଭାଇସ୍‌ଗୁଡ଼ିକୁ ଆପଣଙ୍କ ଟାବ୍‌ଲେଟ୍‌ ଦେଖାଇବାକୁ ଚାହୁଁଛି। ଏହାକୁ ଆପଣ ପରେ ବ୍ଲୁଟୂଥ୍‍‌ ସେଟିଙ୍ଗରେ ବଦାଳାଇପାରିବେ।"</string>
-    <string name="bluetooth_ask_lasting_discovery_no_name" product="default" msgid="356982103612920264">"ଏକ ଆପ୍‌ ଆପଣଙ୍କ ଫୋନ୍‌ ଅନ୍ୟ ବ୍ଲୁଟୂଥ୍‍‌ ଡିଭାଇସ୍‌‌ଗୁଡ଼ିକୁ ଦୃଶ୍ୟମାନ କରାଇବାକୁ ଚାହେଁ। ବ୍ଲୁଟୂଥ୍‍‌ ସେଟିଙ୍ଗରେ ଆପଣ ଏହା ପରେ ପରିବର୍ତ୍ତନ କରିପାରିବେ।"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="6482084870735107773">"<xliff:g id="APP_NAME">%1$s</xliff:g> ଆପଣଙ୍କ ଟାବଲେଟକୁ ଅନ୍ୟ ବ୍ଲୁଟୂଥ୍‍‌ ଡିଭାଇସଗୁଡ଼ିକୁ ଦେଖାଇବାକୁ ଚାହୁଁଛି। ଆପଣ ଏହାକୁ ପରେ ବ୍ଲୁଟୂଥ୍‍‌ ସେଟିଂସରେ ବଦଳାଇପାରିବେ।"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="2352494279465502950">"<xliff:g id="APP_NAME">%1$s</xliff:g> ଆପଣଙ୍କ ଫୋନକୁ ଅନ୍ୟ ବ୍ଲୁଟୂଥ୍‍‌ ଡିଭାଇସଗୁଡ଼ିକରେ ଦୃଶ୍ୟମାନ କରାଇବାକୁ ଚାହେଁ। ଆପଣ ଏହାକୁ ପରେ ବ୍ଲୁଟୂଥ୍‍‌ ସେଟିଂସରେ ବଦଳାଇପାରିବେ।"</string>
+    <string name="bluetooth_ask_lasting_discovery_no_name" product="tablet" msgid="2732992604509910896">"ଗୋଟିଏ ଆପ ଅନ୍ୟ ବ୍ଲୁଟୂଥ୍‍‌ ଡିଭାଇସଗୁଡ଼ିକରେ ଆପଣଙ୍କ ଟାବଲେଟ ଦୃଶ୍ୟମାନ କରିବାକୁ ଚାହେଁ। ଆପଣ ଏହାକୁ ପରେ ବ୍ଲୁଟୂଥ୍‍‌ ସେଟିଂସରେ ବଦାଳାଇପାରିବେ।"</string>
+    <string name="bluetooth_ask_lasting_discovery_no_name" product="default" msgid="356982103612920264">"ଏକ ଆପ ଆପଣଙ୍କ ଫୋନକୁ ଅନ୍ୟ ବ୍ଲୁଟୂଥ୍‍‌ ଡିଭାଇସଗୁଡ଼ିକୁ ଦେଖାଇବାକୁ ଚାହେଁ। ଆପଣ ଏହାକୁ ପରେ ବ୍ଲୁଟୂଥ୍‍‌ ସେଟିଂସରେ ପରିବର୍ତ୍ତନ କରିପାରିବେ।"</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="6103655179509599427">"<xliff:g id="APP_NAME">%1$s</xliff:g> ବ୍ଲୁଟୂଥ୍‍‌ ଅନ୍‌ କରିବାକୁ ଏବଂ ଆପଣଙ୍କ ଟାବ୍‌ଲେଟ୍‌କୁ <xliff:g id="TIMEOUT">%2$d</xliff:g> ସେକେଣ୍ଡ ପାଇଁ ଅନ୍ୟ ଡିଭାଇସ୍‌‌ଗୁଡ଼ିକୁ ଦେଖାଇବାକୁ ଚାହେଁ।"</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="934276632311449337">"<xliff:g id="APP_NAME">%1$s</xliff:g> ଆପଣଙ୍କର ବ୍ଲୁଟୂଥ୍‍‌ ଅନ୍ କରି <xliff:g id="TIMEOUT">%2$d</xliff:g> ସେକେଣ୍ଡ ପାଇଁ ଆପଣଙ୍କ ଫୋନ୍‌କୁ, ଅନ୍ୟ ଡିଭାଇସ୍‌ଗୁଡ଼ିକୁ ଦେଖାଇବାକୁ ଚାହୁଁଛି।"</string>
     <string name="bluetooth_ask_enablement_and_discovery_no_name" product="tablet" msgid="1284048348024444485">"ଏକ ଆପ୍‌ ବ୍ଲୁଟୂଥ୍‍‌ ଅନ୍‌ କରିବାକୁ ଏବଂ ଆପଣଙ୍କ ଟାବଲେଟ୍‌ ଅନ୍ୟ ଡିଭାଇସ୍‌‌ଗୁଡିକୁ <xliff:g id="TIMEOUT">%1$d</xliff:g> ସେକେଣ୍ଡ ପାଇଁ ଦୃଶ୍ୟମାନ କରାଇବାକୁ ଚାହେଁ।"</string>
     <string name="bluetooth_ask_enablement_and_discovery_no_name" product="default" msgid="2661614145022629454">"ଏକ ଆପ୍‌ ବ୍ଲୁଟୂଥ୍‍‌ ଚାଲୁ କରି ଆପଣଙ୍କ ଫୋନ୍‌ ଅନ୍ୟ ଡିଭାଇସ୍‌‌ଗୁଡ଼ିକୁ <xliff:g id="TIMEOUT">%1$d</xliff:g> ସେକେଣ୍ଡ ପାଇଁ ଦୃଶ୍ୟମାନ କରାଇବାକୁ ଚାହେଁ।"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="8588317955400593623">"<xliff:g id="APP_NAME">%1$s</xliff:g> ବ୍ଲୁଟୂଥ୍‍‌କୁ ଅନ୍‌ କରି ଅନ୍ୟ ଡିଭାଇସ୍‌ଗୁଡ଼ିକୁ ଦେଖାଇବାକୁ ଚାହୁଁଛି।  ପରେ ଆପଣ ଏହାକୁ ବ୍ଲୁଟୂଥ୍‍‌ ସେଟିଙ୍ଗରେ ବଦଳାଇପାରିବେ।"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="4047444317445386579">"<xliff:g id="APP_NAME">%1$s</xliff:g> ଆପଣଙ୍କର ବ୍ଲୁଟୂଥ୍‍‌ ଅନ୍ କରି ସେକେଣ୍ଡ ପାଇଁ ଆପଣଙ୍କ ଫୋନ୍‌କୁ, ଅନ୍ୟ ଡିଭାଇସ୍‌ଗୁଡ଼ିକୁ ଦେଖାଇବାକୁ ଚାହୁଁଛି। ଏହାକୁ ଆପଣ ପରେ, ବ୍ଲୁଟୂଥ୍‍‌ ସେଟିଙ୍ଗରେ ବଦଳାଇପାରିବେ।"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="tablet" msgid="4922952478824372605">"ଗୋଟିଏ ଆପ୍‌, ବ୍ଲୁଟୂଥ୍‍‌ ଅନ୍ କରି ଆପଣଙ୍କ ଟାବଲେଟ୍‌କୁ, ଅନ୍ୟ ଡିଭାଇସ୍‌ଗୁଡ଼ିକୁ ଦେଖାଇବାକୁ ଚାହୁଁଛି। ଏହାକୁ ଆପଣ ପରେ ବ୍ଲୁଟୂଥ୍‍‌ ସେଟିଙ୍ଗରେ ବଦଳାଇପାରିବେ।"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="1381582950049639439">"ଗୋଟିଏ ଆପ୍‌, ବ୍ଲୁଟୂଥ୍‍‌ ଅନ୍ କରି ଆପଣଙ୍କ ଫୋନ୍‌କୁ, ଅନ୍ୟ ଡିଭାଇସ୍‌ଗୁଡ଼ିକୁ ଦେଖାଇବାକୁ ଚାହୁଁଛି। ଏହାକୁ ଆପଣ ପରେ ବ୍ଲୁଟୂଥ୍‍‌ ସେଟିଙ୍ଗରେ ବଦଳାଇପାରିବେ।"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="8588317955400593623">"<xliff:g id="APP_NAME">%1$s</xliff:g> ବ୍ଲୁଟୂଥ୍‍‌କୁ ଚାଲୁ କରି ଅନ୍ୟ ଡିଭାଇସଗୁଡ଼ିକୁ ଆପଣଙ୍କ ଟାବଲେଟ ଦେଖାଇବାକୁ ଚାହୁଁଛି। ଆପଣ ଏହାକୁ ପରେ ବ୍ଲୁଟୂଥ୍‍‌ ସେଟିଂସରେ ବଦଳାଇପାରିବେ।"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="4047444317445386579">"<xliff:g id="APP_NAME">%1$s</xliff:g> ବ୍ଲୁଟୂଥ୍‍‌ ଚାଲୁ କରିବାକୁ ଏବଂ ଆପଣଙ୍କ ଫୋନକୁ ଅନ୍ୟ ଡିଭାଇସଗୁଡ଼ିକୁ ଦେଖାଇବାକୁ ଚାହୁଁଛି। ଏହାକୁ ଆପଣ ପରେ ବ୍ଲୁଟୂଥ୍‍‌ ସେଟିଂସରେ ବଦଳାଇପାରିବେ।"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="tablet" msgid="4922952478824372605">"ଗୋଟିଏ ଆପ, ବ୍ଲୁଟୂଥ୍‍‌ ଚାଲୁ କରି ଆପଣଙ୍କ ଟାବଲେଟକୁ, ଅନ୍ୟ ଡିଭାଇସଗୁଡ଼ିକୁ ଦେଖାଇବାକୁ ଚାହୁଁଛି। ଏହାକୁ ଆପଣ ପରେ ବ୍ଲୁଟୂଥ୍‍‌ ସେଟିଂସରେ ବଦଳାଇପାରିବେ।"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="1381582950049639439">"ଗୋଟିଏ ଆପ ବ୍ଲୁଟୂଥ୍‍‌ ଚାଲୁ କରି ଆପଣଙ୍କ ଫୋନକୁ ଅନ୍ୟ ଡିଭାଇସଗୁଡ଼ିକୁ ଦେଖାଇବାକୁ ଚାହୁଁଛି। ଏହାକୁ ଆପଣ ପରେ ବ୍ଲୁଟୂଥ୍‍‌ ସେଟିଂସରେ ବଦଳାଇପାରିବେ।"</string>
     <string name="bluetooth_turning_on" msgid="3842613808709024730">"ବ୍ଲୁଟୂଥ୍‍‌ ଅନ୍‌ କରାଯାଉଛି…"</string>
     <string name="bluetooth_turning_off" msgid="7406309124247701148">"ବ୍ଲୁଟୂଥ୍‍‌ ଅଫ୍‌ କରାଯାଉଛି…"</string>
     <string name="bluetooth_connection_permission_request" msgid="8793131019383198861">"ବ୍ଲୁଟୂଥ୍‍‌ ସଂଯୋଗ ଅନୁରୋଧ"</string>
@@ -142,10 +142,11 @@
     <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"ଆପଣଙ୍କର ଡିଭାଇସ୍‌କୁ ଆଖପାଖରେ ଥିବା ବ୍ଲୁଟୂଥ୍‍ ଡିଭାଇସ୍ ସହ ଯୋଗାଯୋଗ କରିବାକୁ ଦିଅନ୍ତୁ"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"ଆପଣଙ୍କର ଫୋନ୍‌କୁ ଆଖପାଖରେ ଥିବା ବ୍ଲୁଟୂଥ୍‍ ଡିଭାଇସ୍ ସହ ଯୋଗାଯୋଗ କରିବାକୁ ଦିଅନ୍ତୁ"</string>
     <string name="bluetooth_disable_a2dp_hw_offload" msgid="5942913792817797541">"Bluetooth A2DP ହାର୍ଡୱେର୍‍ ଅଫଲୋଡ୍ ଅକ୍ଷମ କରନ୍ତୁ"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="8610420176339657720">"ଡିଭାଇସ୍‍ ରିଷ୍ଟାର୍ଟ କରିବେ କି?"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8333029144800835996">"ଏହି ସେଟିଂ ବଦଳାଇବାକୁ ଆପଣଙ୍କୁ ଆପଣଙ୍କର ଡିଭାଇସ୍‍ ରିଷ୍ଟାର୍ଟ କରିବାକୁ ହେବ।"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="3488695418187553566">"ରିଷ୍ଟାର୍ଟ କରନ୍ତୁ"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="4930826928585464191">"ବାତିଲ୍ କରନ୍ତୁ"</string>
+    <string name="bluetooth_disable_le_audio_hw_offload" msgid="3966022676505972908">"ବ୍ଲୁଟୁଥ LE AUDIO ହାର୍ଡୱେର ଅଫଲୋଡକୁ ଅକ୍ଷମ କରନ୍ତୁ"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_title" msgid="6001142380445276918">"ଡିଭାଇସକୁ ରିଷ୍ଟାର୍ଟ କରିବେ?"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_message" msgid="1524373895333698779">"ଏହି ସେଟିଂ ବଦଳାଇବାକୁ ଆପଣଙ୍କୁ ଆପଣଙ୍କ ଡିଭାଇସ ରିଷ୍ଟାର୍ଟ କରିବାକୁ ହେବ।"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_confirm" msgid="5594859658551707592">"ରିଷ୍ଟାର୍ଟ କରନ୍ତୁ"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel" msgid="3663690305043973720">"ବାତିଲ୍ କରନ୍ତୁ"</string>
     <string name="connected_device_media_device_title" msgid="3783388247594566734">"ମିଡିଆ ଡିଭାଇସ୍‌ଗୁଡ଼ିକ"</string>
     <string name="connected_device_call_device_title" msgid="88732390601723608">"କଲ୍ ଡିଭାଇସ୍‌ଗୁଡ଼ିକ"</string>
     <string name="connected_device_other_device_title" msgid="4652120430615729193">"ଅନ୍ୟ ଡିଭାଇସ୍‌ଗୁଡ଼ିକ"</string>
@@ -224,7 +225,7 @@
     <string name="display_label" msgid="3056320781191343221">"ସ୍କ୍ରିନ୍"</string>
     <string name="sd_card_settings_label" product="nosdcard" msgid="1850505156136467106">"USB ଷ୍ଟୋରେଜ୍‌"</string>
     <string name="sd_card_settings_label" product="default" msgid="8715502912796241588">"SD କାର୍ଡ"</string>
-    <string name="proxy_settings_label" msgid="6300573815025557843">"ପ୍ରକ୍ସି ସେଟିଂସ୍"</string>
+    <string name="proxy_settings_label" msgid="6300573815025557843">"ପ୍ରକ୍ସି ସେଟିଂସ"</string>
     <string name="cancel" msgid="5780102414089664898">"ବାତିଲ୍"</string>
     <string name="okay" msgid="4827099303045669054">"ଠିକ୍‌ ଅଛି"</string>
     <string name="forget" msgid="3754013654135912783">"ଭୁଲିଯାଆନ୍ତୁ"</string>
@@ -233,9 +234,9 @@
     <string name="apply" msgid="7834684883190163536">"ଲାଗୁ କରନ୍ତୁ"</string>
     <string name="share" msgid="8502235338607613795">"ସେୟାର୍‍ କରନ୍ତୁ"</string>
     <string name="add" msgid="8335206931421683426">"ଯୋଗ କରନ୍ତୁ"</string>
-    <string name="settings_label" msgid="943294133671632976">"ସେଟିଂସ୍"</string>
-    <string name="settings_label_launcher" msgid="820982375501978609">"ସେଟିଂସ୍"</string>
-    <string name="settings_shortcut" msgid="8548239727871847171">"ସେଟିଂସ୍ ସର୍ଟକଟ୍‌"</string>
+    <string name="settings_label" msgid="943294133671632976">"ସେଟିଂସ"</string>
+    <string name="settings_label_launcher" msgid="820982375501978609">"ସେଟିଂସ"</string>
+    <string name="settings_shortcut" msgid="8548239727871847171">"ସେଟିଂସ ସର୍ଟକଟ"</string>
     <string name="airplane_mode" msgid="3196085857882526817">"ଏୟାର୍‌ପ୍ଲେନ୍‌ ମୋଡ୍"</string>
     <string name="wireless_networks_settings_title" msgid="8557542379234105369">"ୱାୟର୍‌ଲେସ୍‌ ଓ ନେଟ୍‌ୱର୍କ"</string>
     <string name="radio_controls_summary" msgid="9028430178697624501">"ୱାଇ-ଫାଇ, ବ୍ଲୁଟୂଥ୍‍‌, ବିମାନ ମୋଡ୍, ମୋବାଇଲ୍‌ ନେଟ୍‌ୱର୍କସ୍‌, ଓ VPNଗୁଡିକର ପରିଚାଳନା କରନ୍ତୁ"</string>
@@ -304,14 +305,14 @@
     <string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"ଲୋଡ୍ ହେଉଛି…"</string>
     <string name="location_settings_footer_general" msgid="1040507068701188821">"ଆଖପାଖର ଡିଭାଇସଗୁଡ଼ିକ ପାଇଁ ଅନୁମତି ଥିବା ଆପଗୁଡ଼ିକ ସଂଯୁକ୍ତ ଡିଭାଇସଗୁଡ଼ିକର ଆପେକ୍ଷିକ ଅବସ୍ଥିତିକୁ ନିର୍ଦ୍ଧାରଣ କରିପାରିବ।"</string>
     <string name="location_settings_footer_location_off" msgid="8568995909147566720">"ଆପ୍ ଓ ସେବାଗୁଡ଼ିକ ପାଇଁ ଲୋକେସନ୍ ଆକ୍ସେସ୍ ବନ୍ଦ ଅଛି। ଆପଣ ଏକ ଜରୁରୀକାଳୀନ ନମ୍ବରକୁ କଲ୍ କରିବା କିମ୍ବା ଟେକ୍ସଟ୍ ମେସେଜ୍ ପଠାଇବା ସମୟରେ ଆପଣଙ୍କ ଡିଭାଇସର ଲୋକେସନ୍ ଏବେ ବି ଜରୁରୀକାଳୀନ ଉତ୍ତରଦାତାମାନଙ୍କୁ ପଠାଯାଇପାରେ।"</string>
-    <string name="location_settings_footer_learn_more_content_description" msgid="5329024810729665156">"ଲୋକେସନ୍ ସେଟିଂସ୍ ବିଷୟରେ ଅଧିକ ଜାଣନ୍ତୁ।"</string>
+    <string name="location_settings_footer_learn_more_content_description" msgid="5329024810729665156">"ଲୋକେସନ ସେଟିଂସ ବିଷୟରେ ଅଧିକ ଜାଣନ୍ତୁ।"</string>
     <string name="account_settings_title" msgid="9138880127246241885">"ଆକାଉଣ୍ଟ"</string>
     <string name="security_settings_title" msgid="6710768415432791970">"ସୁରକ୍ଷା"</string>
     <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"ଏନକ୍ରିପ୍ସନ୍‌ ଓ କ୍ରେଡେନସିଆଲ୍‌"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"ଫୋନ୍‌ଟି ଏନ୍‌କ୍ରିପ୍ଟ ହୋଇଛି"</string>
-    <string name="decryption_settings_summary" product="default" msgid="1742645256103613503">"ଫୋନ୍ ଏନକ୍ରିପ୍ଟ ହୋଇନାହିଁ"</string>
+    <string name="not_encrypted_summary" product="default" msgid="2251945842585788254">"ଫୋନକୁ ଏନକ୍ରିପ୍ଟ କରାଯାଇନାହିଁ"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"ଡିଭାଇସ୍‌ଟି ଏନ୍‌କ୍ରିପ୍ଟ ହୋଇଛି"</string>
-    <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"ଡିଭାଇସ୍ ଏନକ୍ରିପ୍ଟ ହୋଇନାହିଁ"</string>
+    <string name="not_encrypted_summary" product="tablet" msgid="2374263654698719382">"ଡିଭାଇସକୁ ଏନକ୍ରିପ୍ଟ କରାଯାଇନାହିଁ"</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"ଲକ୍ ସ୍କ୍ରିନ୍"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"କ’ଣ ଦେଖାଇବ"</string>
     <string name="security_settings_summary" msgid="1627059516127354233">"ମୋ ଅବସ୍ଥାନ, ସ୍କ୍ରିନ୍‌ ଅନଲକ୍‌, SIM କାର୍ଡ ଲକ୍‌, ପରିଚୟ ଷ୍ଟୋରେଜ୍‌ ଲକ୍‌ ସେଟ୍‌ କରନ୍ତୁ"</string>
@@ -414,7 +415,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_footer_title_1" msgid="6808124116419325722">"ଆପଣଙ୍କ ନିୟନ୍ତ୍ରଣରେ ଅଛି"</string>
     <string name="security_settings_fingerprint_enroll_introduction_footer_title_consent_1" msgid="1122676690472680734">"ଆପଣଙ୍କ ଏବଂ ଆପଣଙ୍କ ପିଲା ପାଖରେ ନିୟନ୍ତ୍ରଣ ଅଛି"</string>
     <string name="security_settings_fingerprint_enroll_introduction_footer_title_2" msgid="5663733424583416266">"ମନେ ରଖନ୍ତୁ"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"ଟିପଚିହ୍ନ ମାଧ୍ୟମରେ ରେକର୍ଡ କରାଯାଇଥିବା ଡାଟା ସୁରକ୍ଷିତ ଭାବେ ଷ୍ଟୋର୍ କରାଯାଇଥାଏ ଏବଂ ଏହାକୁ କେବେ ବି ଆପଣଙ୍କ ଫୋନରୁ କାଢ଼ି ଦିଆଯାଏ ନାହିଁ। ଆପଣ ସେଟିଂସରେ ଯେ କୌଣସି ସମୟରେ ଆପଣଙ୍କ ଡାଟା ଡିଲିଟ୍ କରିପାରିବେ।"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"ଟିପଚିହ୍ନ ମାଧ୍ୟମରେ ରେକର୍ଡ କରାଯାଇଥିବା ଡାଟା ସୁରକ୍ଷିତ ଭାବେ ଷ୍ଟୋର କରାଯାଇଥାଏ ଏବଂ ଏହା କେବେ ବି ଆପଣଙ୍କ ଫୋନରୁ କାଢ଼ି ହେବ ନାହିଁ। ଆପଣ ସେଟିଂସରେ ଯେ କୌଣସି ସମୟରେ ଆପଣଙ୍କ ଡାଟା ଡିଲିଟ କରିପାରିବେ।"</string>
     <string name="security_settings_fingerprint_enroll_introduction_footer_message_2" msgid="3507618608004123384">"ଏକ ଦୃଢ଼ ପାଟର୍ନ କିମ୍ବା PINଠାରୁ ଆପଣଙ୍କ ଟିପଚିହ୍ନ କମ୍ ସୁରକ୍ଷିତ ହୋଇପାରେ।"</string>
     <string name="security_settings_fingerprint_enroll_introduction_footer_message_3" product="default" msgid="4757472591076060066">"ଉନ୍ନତ ଟିପଚିହ୍ନ ମଡେଲଗୁଡ଼ିକୁ ତିଆରି କରିବା ପାଇଁ ଆପଣଙ୍କର ଫୋନ୍ ବେଳେବେଳେ ଆପଣଙ୍କ ବର୍ତ୍ତମାନର ଟିପଚିହ୍ନ ଛବିଗୁଡ଼ିକୁ ବ୍ୟବହାର କରିବ।"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"ଫୋନ୍‌କୁ ଅନ୍‌ଲକ୍‌ କରିବା କିମ୍ୱା କିଣାକିଣିକୁ ଅନୁମୋଦନ କରିବା ପାଇଁ ନିଜ ଟିପଚିହ୍ନର ବ୍ୟବହାର କରନ୍ତୁ।\n\nଧ୍ୟାନଦିଅନ୍ତୁ: ଏହି ଡିଭାଇସ୍‌ ଅନଲକ୍‌ କରିବାକୁ ଆପଣ ଟିପଚିହ୍ନ ବ୍ୟବହାର କରିପାରିବେ ନାହିଁ। ଅଧିକ ସୂଚନା ପାଇଁ, ଆପଣଙ୍କ ସଂସ୍ଥାର ଆଡମିନଙ୍କ ସହ ଯୋଗାଯୋଗ କରନ୍ତୁ।"</string>
@@ -422,7 +423,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"ନା, ଧନ୍ୟବାଦ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_agree" msgid="4068276083536421828">"ମୁଁ ରାଜି"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="2473807887676247264">"ଟିପଚିହ୍ନ ବାଦ୍ ଦେବେ?"</string>
-    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="2412645723804450304">"ଟିପଚିହ୍ନ ସେଟଅପ୍‌ କେବଳ ଏକ କିମ୍ବା ଦୁଇ ମିନିଟ୍‌ ସମୟ ନିଏ। ଯଦି ଆପଣ ଏହାକୁ ବାଦ୍ ଦିଅନ୍ତି, ଆପଣ ପରେ ସେଟିଂସରେ ନିଜର ଟିପଚିହ୍ନ ଯୋଗ କରିପାରିବେ।"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="2412645723804450304">"ଟିପଚିହ୍ନ ସେଟଅପ କେବଳ ଏକ କିମ୍ବା ଦୁଇ ମିନିଟ ସମୟ ନିଏ। ଯଦି ଆପଣ ଏହାକୁ ବାଦ ଦିଅନ୍ତି, ଆପଣ ପରେ ସେଟିଂସରେ ନିଜର ଟିପଚିହ୍ନ ଯୋଗ କରିପାରିବେ।"</string>
     <string name="security_settings_fingerprint_v2_enroll_introduction_message_setup" msgid="6255210343107484206">"ଆପଣ ଆପଗୁଡ଼ିକରେ ସାଇନ୍ ଇନ୍ କରିବା କିମ୍ବା ଏକ କ୍ରୟକୁ ଅନୁମୋଦନ ଦେବା ପରି କାର୍ଯ୍ୟ କରିବା ସମୟରେ ଏହି ଆଇକନ୍ ଦେଖିଲେ, ପ୍ରମାଣୀକରଣ ପାଇଁ ଆପଣଙ୍କ ଟିପଚିହ୍ନ ବ୍ୟବହାର କରନ୍ତୁ"</string>
     <string name="security_settings_fingerprint_v2_enroll_introduction_footer_title_1" msgid="4360262371633254407">"ମନେ ରଖନ୍ତୁ"</string>
     <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_1" msgid="5824014348182478279">"ଆପଣଙ୍କ ଫୋନକୁ ଅନଲକ୍ କରିବା ପାଇଁ ଏକ ଦୃଢ଼ ପାଟର୍ନ କିମ୍ବା PIN ଅପେକ୍ଷା ଟିପଚିହ୍ନ ବ୍ୟବହାର କରିବା କମ୍ ସୁରକ୍ଷିତ ହୋଇପାରେ"</string>
@@ -431,8 +432,8 @@
     <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_2" msgid="3493356605815124807">"ଏହା ଆପଣଙ୍କ ପିଲା ଅଟେ ବୋଲି ଯାଞ୍ଚ କରିବା ପାଇଁ ଫିଙ୍ଗରପ୍ରିଣ୍ଟ ଅନଲକ୍ ତା\'ର ଟିପଚିହ୍ନର ଏକ ସ୍ୱତନ୍ତ୍ର ମଡେଲ୍ ତିଆରି କରିଥାଏ। ସେଟଅପ୍ ସମୟରେ ଏହି ଟିପଚିହ୍ନ ମଡେଲ୍ ତିଆରି କରିବାକୁ, ସେ ବିଭିନ୍ନ ଅବସ୍ଥିତିରୁ ତା\'ର ଟିପଚିହ୍ନର ଛବି ନେବ।"</string>
     <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_3" msgid="4729142136478078228">"ଆପଣ Pixel Imprint ବ୍ୟବହାର କରିବା ସମୟରେ, ଆପଣଙ୍କ ଟିପଚିହ୍ନ ମଡେଲକୁ ଅପଡେଟ୍ କରିବା ପାଇଁ ଛବିଗୁଡ଼ିକୁ ବ୍ୟବହାର କରାଯାଏ। ଆପଣଙ୍କ ଟିପଚିହ୍ନ ମଡେଲ୍ ତିଆରି କରିବା ପାଇଁ ବ୍ୟବହୃତ ଛବିଗୁଡ଼ିକୁ କେବେ ବି ଷ୍ଟୋର୍ କରାଯାଏ ନାହିଁ, କିନ୍ତୁ ଟିପଚିହ୍ନ ମଡେଲ୍ ଆପଣଙ୍କ ଫୋନରେ ସୁରକ୍ଷିତ ଭାବେ ଷ୍ଟୋର୍ କରାଯାଇଥାଏ ଏବଂ କେବେ ବି ଫୋନରୁ କାଢ଼ି ଦିଆଯାଏ ନାହିଁ। ସମସ୍ତ ପ୍ରକ୍ରିୟାକରଣ ସୁରକ୍ଷିତ ଭାବେ ଆପଣଙ୍କ ଫୋନରେ କରାଯାଇଥାଏ।"</string>
     <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_3" msgid="5908959250804145997">"ସେ Pixel Imprint ବ୍ୟବହାର କରିବା ସମୟରେ, ତା\'ର ଟିପଚିହ୍ନ ମଡେଲକୁ ଅପଡେଟ୍ କରିବା ପାଇଁ ଛବିଗୁଡ଼ିକୁ ବ୍ୟବହାର କରାଯାଏ। ଆପଣଙ୍କ ପିଲାର ଟିପଚିହ୍ନ ମଡେଲ୍ ତିଆରି କରିବା ପାଇଁ ବ୍ୟବହୃତ ଛବିଗୁଡ଼ିକୁ କେବେ ବି ଷ୍ଟୋର୍ କରାଯାଏ ନାହିଁ, କିନ୍ତୁ ଟିପଚିହ୍ନ ମଡେଲକୁ ଫୋନରେ ସୁରକ୍ଷିତ ଭାବେ ଷ୍ଟୋର୍ କରାଯାଇଥାଏ ଏବଂ କେବେ ବି ଫୋନରୁ କାଢ଼ି ଦିଆଯାଏ ନାହିଁ। ସମସ୍ତ ପ୍ରକ୍ରିୟାକରଣ ସୁରକ୍ଷିତ ଭାବେ ଫୋନରେ କରାଯାଇଥାଏ।"</string>
-    <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_4" msgid="3948305045484131665">"ଆପଣ ଆପଣଙ୍କ ଟିପଚିହ୍ନର ଛବି ଓ ମଡେଲଗୁଡ଼ିକୁ ଡିଲିଟ୍ କରିପାରିବେ କିମ୍ବା ଯେ କୌଣସି ସମୟରେ ସେଟିଂସରେ \"ଟିପଚିହ୍ନ ଅନଲକ\"କୁ ବନ୍ଦ କରିପାରିବେ। ଟିପଚିହ୍ନର ଛବି ଓ ମଡେଲଗୁଡ଼ିକୁ ଆପଣ ଡିଲିଟ୍ ନକରିବା ପର୍ଯ୍ୟନ୍ତ ଫୋନରେ ଷ୍ଟୋର୍ କରାଯାଇଥାଏ।"</string>
-    <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_4" msgid="4983770600405797515">"ଟିପଚିହ୍ନର ଛବି ଓ ମଡେଲକୁ ଆପଣ ଏବଂ ଆପଣଙ୍କ ପିଲା ଡିଲିଟ୍ କରିପାରିବେ କିମ୍ବା ଯେ କୌଣସି ସମୟରେ ସେଟିଂସରେ ଫିଙ୍ଗରପ୍ରିଣ୍ଟ ଅନଲକ୍ ବନ୍ଦ କରିପାରିବେ। ଟିପଚିହ୍ନ ଛବି ଏବଂ ମଡେଲଗୁଡ଼ିକୁ ଡିଲିଟ୍ କରାନଯିବା ପର୍ଯ୍ୟନ୍ତ ସେଗୁଡ଼ିକ ଫୋନରେ ଷ୍ଟୋର୍ ହୋଇ ରହିଥାଏ।"</string>
+    <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_4" msgid="3948305045484131665">"ଆପଣ ଆପଣଙ୍କ ଟିପଚିହ୍ନର ଛବି ଓ ମଡେଲଗୁଡ଼ିକୁ ଡିଲିଟ କରିପାରିବେ କିମ୍ବା ଯେ କୌଣସି ସମୟରେ ସେଟିଂସରେ ଫିଙ୍ଗରପ୍ରିଣ୍ଟ ଅନଲକକୁ ବନ୍ଦ କରିପାରିବେ। ଟିପଚିହ୍ନର ଛବି ଓ ମଡେଲଗୁଡ଼ିକୁ ଆପଣ ଡିଲିଟ ନକରିବା ପର୍ଯ୍ୟନ୍ତ ତାହା ଫୋନରେ ଷ୍ଟୋର ହୋଇ ରହିଥାଏ।"</string>
+    <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_4" msgid="4983770600405797515">"ଟିପଚିହ୍ନର ଛବି ଓ ମଡେଲକୁ ଆପଣ ଏବଂ ଆପଣଙ୍କ ପିଲା ଡିଲିଟ କରିପାରିବେ କିମ୍ବା ଯେ କୌଣସି ସମୟରେ ସେଟିଂସରେ ଫିଙ୍ଗରପ୍ରିଣ୍ଟ ଅନଲକ ବନ୍ଦ କରିପାରିବେ। ଟିପଚିହ୍ନ ଛବି ଏବଂ ମଡେଲଗୁଡ଼ିକୁ ଡିଲିଟ ନକରିବା ପର୍ଯ୍ୟନ୍ତ ସେଗୁଡ଼ିକ ଫୋନରେ ଷ୍ଟୋର ହୋଇ ରହିଥାଏ।"</string>
     <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_5" msgid="2018885671994058605">"ଯଦି କେହି ଜଣେ ବ୍ୟକ୍ତି ଆପଣଙ୍କ ଫୋନକୁ ଆପଣଙ୍କ ଆଙ୍ଗୁଠିରେ ସ୍ପର୍ଶ କରେ, ତେବେ ଆପଣଙ୍କ ଅଜାଣତରେ ମଧ୍ୟ, ଏହାକୁ ଅନଲକ୍ କରାଯାଇପାରିବ।"</string>
     <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_5" msgid="8356551505082794682">"ଯଦି କେହି ଜଣେ ବ୍ୟକ୍ତି ଆପଣଙ୍କ ପିଲାର ଫୋନକୁ ତା’ର ଆଙ୍ଗୁଠିରେ ସ୍ପର୍ଶ କରେ, ତେବେ ତା’ର ଅଜାଣତରେ ମଧ୍ୟ, ଏହାକୁ ଅନଲକ୍ କରାଯାଇପାରିବ।"</string>
     <string name="security_settings_fingerprint_v2_enroll_introduction_message_learn_more" msgid="5856010507790137793"></string>
@@ -568,37 +569,10 @@
     <string name="fingerprint_last_delete_message" msgid="7860374760549404410">"ଆପଣ ଆପଣଙ୍କ ଫୋନକୁ ଅନଲକ୍ କରିବା କିମ୍ବା ଆପଗୁଡ଼ିକରେ ଏହା ଆପଣ ବୋଲି ଯାଞ୍ଚ କରିବା ପାଇଁ ଆପଣଙ୍କ ଟିପଚିହ୍ନ ବ୍ୟବହାର କରିବାକୁ ସକ୍ଷମ ହେବେ ନାହିଁ।"</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="4104208067277655068">"ଆପଣ ଆପଣଙ୍କ ୱାର୍କ ପ୍ରୋଫାଇଲକୁ ଅନଲକ୍ କରିବା, କ୍ରୟଗୁଡ଼ିକୁ ଅନୁମୋଦନ ଦେବା କିମ୍ବା ୱାର୍କ ଆପଗୁଡ଼ିକରେ ସାଇନ୍ ଇନ୍ କରିବା ପାଇଁ ଆପଣଙ୍କ ଟିପଚିହ୍ନ ବ୍ୟବହାର କରିବାକୁ ସକ୍ଷମ ହେବେ ନାହିଁ।"</string>
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"ହଁ, କାଢ଼ି ଦିଅନ୍ତୁ"</string>
-    <string name="crypt_keeper_settings_title" msgid="4938812137822100044">"ଏନକ୍ରିପ୍ସନ୍"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"ଟାବ୍‌ଲେଟ୍‌ ଏନ୍‌କ୍ରିପ୍ଟ କରନ୍ତୁ"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"ଫୋନ୍‌ ଏନ୍‌କ୍ରିପ୍ଟ କରନ୍ତୁ"</string>
-    <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"ଏନ୍‌କ୍ରିପ୍ଟ କରାଯାଇଛି"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"ଆପଣଙ୍କ ଆକାଉଣ୍ଟ, ସେଟିଙ୍ଗ, ଡାଉନଲୋଡ୍ କରାଯାଇଥିବା ଆପସ୍‌ ଏବଂ ସେଗୁଡିକର ଡାଟାଅ, ମିଡିଆ, ଏବଂ ଅନ୍ୟାନ୍ୟ ଫାଇଲ୍‌ଗୁଡିକ ଏନକ୍ରିପ୍ଟ କରିପାରିବେ। ଆପଣ ଏକ ସ୍କ୍ରିନ୍‌ ଲକ୍‌ ସେଟ୍‌ ଅପ୍‌ କରିଥିବା ଧରିନେଇ (ଯେପରି, ଏକ ଶୈଳୀ କିମ୍ବା ସାଂଖ୍ୟିକ PIN କିମ୍ବା ପାସୱାର୍ଡ), ଆପଣଙ୍କ ଟାବଲେଟ୍‌ ଆପଣ ଏନକ୍ରିପ୍ଟ୍‌ କରିବା ପରେ, ପ୍ରତିଥର ଆପଣ ଟାବଲେଟ୍‌ଟି ପାୱାର୍‌ ଅନ୍‌ କରିବା ବେଳେ, ଏହାକୁ ଡିକ୍ରିପ୍ଟ କରିବାକୁ ସ୍କ୍ରିନ୍‌ ଅନଲକ୍‌ କରିବା ଆପଣ ଆବଶ୍ୟକ କରିବେ। ଡିକ୍ରିପ୍ଟ କରିବାର ଅନ୍ୟ ଏକ ମାତ୍ର ଉପାୟ ହେଉଛି ଆପଣଙ୍କ ସମସ୍ତ ଡାଟା ଲିଭାଇ, ଏକ ଫ୍ୟାକ୍ଟ୍ରି ଡାଟା ରିସେଟ୍‌ କରିବା।\n\nଏନକ୍ରିପସନ୍‌ ଏକ ଘଣ୍ଟା କିମ୍ବା ଅଧିକ ସମୟ ନେଇ ପାରେ। ଆପଣ ଚାର୍ଜ ହୋଇଥିବା ଏକ ବ୍ୟାଟେରୀ ସହ ଆରମ୍ଭ କରିବା ଏବଂ ଟାବଲେଟ୍‌ଟି ସମଗ୍ର ପ୍ରକ୍ରିୟାରେ ପ୍ଲଗ୍‌ ଇନ୍‌ କରି ରଖିବା ଜରୁରୀ। ଯଦି ଆପଣ ଏଥିରେ ବାଧା ଦିଅନ୍ତି, ଆପଣଙ୍କ ଡାଟାରୁ ଆପଣ କିଛି ହରାଇବେ"</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"ଆପଣ, ନିଜର ଆକାଉଣ୍ଟ, ସେଟିଙ୍ଗ, ଡାଉନ୍‌‍ଲୋଡ୍‌ ହୋଇଥିବା ଆପ୍‍ ଓ ସେଗୁଡ଼ିକର ଡାଟା, ମିଡିଆ ତଥା ଅନ୍ୟ୍ୟନ୍ୟ ଫାଇଲ୍‌ଗୁଡ଼ିକୁ ଏନ୍‌‍କ୍ରିପ୍ଟ କରିପାରିବେ। ଆପଣ ନିଜ ଫୋନ୍‌ ଏନ୍‌କ୍ରିପ୍ଟ କରିସାରିବା ପରେ, ଏକ ସ୍କ୍ରୀନ୍‌ ଲକ୍‌ (ଯାହା ହେଊଛି, ଏକ ପାଟର୍ନ କିମ୍ୱା ସଂଖ୍ୟା ବିଶିଷ୍ଟ ପିନ୍‌ କିମ୍ୱା ପାସ୍‌ୱର୍ଡ) ବିଷୟରେ ଚିନ୍ତା କରି, ପ୍ରତ୍ୟେକ ଥର ଫୋନ୍‌ ଅନ୍‌ କରିବାବେଳେ, ତାକୁ ଡିକ୍ରିପ୍ଟ କରିବା ପାଇଁ ଆପଣଙ୍କୁ ସ୍କ୍ରୀନ୍‌କୁ ଅନ୍‌ଲକ୍‌ କରିବାକୁ ପଡ଼ିବ। ଡିକ୍ରିପ୍ଟ କରିବାର ଆଉ କେବଳମାତ୍ର ବାଟ ହେଉଛି ଆପଣଙ୍କର ସମସ୍ତ ଡାଟାକୁ ଉଡ଼ାଇ ଫ୍ୟାକ୍ଟୋରୀ ଡାଟା ରିସେଟ୍‌ କରିବା।\n\nଏନ୍‌କ୍ରିପ୍ସନ୍‌, ଘଣ୍ଟେ କିମ୍ୱା ଅଧିକ ସମୟ ନିଏ। ଆପଣଙ୍କୁ ଏକ ଚାର୍ଜ ହୋଇଥିବା ବ୍ୟାଟେରୀ ସହିତ ଆରମ୍ଭ କରିବାକୁ ପଡ଼ିବ ଏବଂ ସମଗ୍ର ପ୍ରକ୍ରିୟାରେ ଫୋନ୍‌କୁ ପ୍ଲଗ୍‌ରେ ହିଁ ଲଗାଇ ରଖିବାକୁ ପଡ଼ିବ। ଯଦି ଏଥିରେ ବାଧା ଦିଅନ୍ତି, ତେବେ ଆପଣ ନିଜର କିଛି କିମ୍ୱା ସମସ୍ତ ଡାଟା ହରାଇବେ।"</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"ଟାବଲେଟ୍‌କୁ ଏନ୍‌କ୍ରିପ୍ଟ କରନ୍ତୁ"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"ଫୋନ୍‌ ଏନ୍‌କ୍ରିପ୍ଟ କରନ୍ତୁ"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"ଆପଣଙ୍କ ବ୍ୟାଟେରୀ ଚାର୍ଜ କରନ୍ତୁ ଓ ପୁଣି ଚେଷ୍ଟା କରନ୍ତୁ।"</string>
-    <string name="crypt_keeper_unplugged_text" msgid="2709721134148651329">"ଚାର୍ଜର୍‌ ଲଗାଇ ପୁଣିଥରେ ଚେଷ୍ଟା କରନ୍ତୁ।"</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="1847280235529858357">"କୌଣସି ଲକ୍‌ ସ୍କ୍ରୀନ୍‌ ପିନ୍‌ କିମ୍ବା ପାସ୍‌ୱର୍ଡ ନାହିଁ"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="7210616262954236042">"ଏନ୍‌କ୍ରିପ୍ସନ୍ ଆରମ୍ଭ କରିବା ପୂର୍ବରୁ ଆପଣଙ୍କୁ ଏକ ସ୍କ୍ରୀନ୍‌ ପିନ୍‌ ନମ୍ୱର୍‍ କିମ୍ୱା ପାସ୍‌ୱର୍ଡ ସେଟ୍‌ କରିବାକୁ ପଡ଼ିବ।"</string>
-    <string name="crypt_keeper_confirm_title" msgid="8600000209722452230">"ଏନ୍‌କ୍ରିପ୍ଟ କରିବେ?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="3270587498436152259">"ଏନ୍‌କ୍ରିପ୍ସନ୍‌ କାର୍ଯ୍ୟକୁ ବନ୍ଦ କରିହେବ ନାହିଁ ଏବଂ ଯଦି ଆପଣ ଏଥିରେ ବାଧା ଦିଅନ୍ତି, ତେବେ ନିଜର ଡାଟା ହରାଇବେ। ଏନ୍‌କ୍ରିପ୍ସନ୍‌, ଏକ ଘଣ୍ଟା କିମ୍ୱା ଅଧିକ ସମୟ ନିଏ, ଯାହା ମଧ୍ୟରେ ଟାବ୍‌ଲେଟ୍‌ ଅନେକ ଥର ରିଷ୍ଟାର୍ଟ ହେବ।"</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="3040428543349852419">"ଏନ୍‌କ୍ରିପ୍ସନ୍‌‍ କାର୍ଯ୍ୟକୁ ବନ୍ଦ କରିହେବ ନାହିଁ ଏବଂ ଯଦି ଆପଣ ଏଥିରେ ବାଧା ଦିଅନ୍ତି, ତେବେ ନିଜର ଡାଟା ହରାଇବେ। ଏନ୍‌କ୍ରିପ୍ସନ୍‌‍, ଘଣ୍ଟେ କିମ୍ୱା ଅଧିକ ସମୟ ନିଏ, ଯାହା ମଧ୍ୟରେ ଫୋନ୍‌ ଅନେକ ଥର ରିଷ୍ଟାର୍ଟ ହେବ।"</string>
-    <string name="crypt_keeper_setup_title" msgid="3339725741305796680">"ଏନ୍‌କ୍ରିପ୍ଟ କରୁଛି"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="4417016995091289019">"ଆପଣଙ୍କର ଟାବ୍‌ଲେଟ୍‌ ଏନ୍‌କ୍ରିପ୍ଟ ହେବା ପର୍ଯ୍ୟନ୍ତ, ଅପେକ୍ଷା କରନ୍ତୁ। <xliff:g id="PERCENT">^1</xliff:g>% ସମ୍ପୂର୍ଣ୍ଣ ହୋଇଛି।"</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="7902355422499500352">"ଆପଣଙ୍କର ଫୋନ୍‌ ଏନ୍‌କ୍ରିପ୍ଟ ହେବା ପର୍ଯ୍ୟନ୍ତ ଅପେକ୍ଷା କରନ୍ତୁ। <xliff:g id="PERCENT">^1</xliff:g>% ସରିଛି।"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="8348188415839917821">"ଆପଣଙ୍କର ଟାବ୍‌ଲେଟ୍‌ ଏନ୍‌କ୍ରିପ୍ଟ ହେବା ପର୍ଯ୍ୟନ୍ତ ଅପେକ୍ଷା କରନ୍ତୁ। ଅବଶିଷ୍ଟ ସମୟ ହେଉଛି: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="8556105766597855198">"ଆପଣଙ୍କର ଫୋନ୍‌ ଏନ୍‌କ୍ରିପ୍ଟ ହେବା ପର୍ଯ୍ୟନ୍ତ, ଅପେକ୍ଷା କରନ୍ତୁ। ଅବଶିଷ୍ଟ ସମୟ ହେଉଛି: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="3832496715430327682">"ନିଜ ଟାବ୍‌ଲେଟ୍‌କୁ ଅନ୍‌ଲକ୍‌ କରିବା ପାଇଁ, ଏହାକୁ ଅଫ୍‌ କରି ଅନ୍‌ କରନ୍ତୁ।"</string>
-    <string name="crypt_keeper_force_power_cycle" product="default" msgid="5070346039522135361">"ଫୋନ୍‌କୁ ଅନ୍‌ଲକ୍‌ କରିବା ପାଇଁ, ଏହାକୁ ବନ୍ଦ କରନ୍ତୁ ଓ ତା’ପରେ ଖୋଲନ୍ତୁ।"</string>
-    <string name="crypt_keeper_warn_wipe" msgid="8104921337301750394">"ଚେତାବନୀ: ଅନ୍‌ଲକ୍‌ କରିବା ପାଇଁ <xliff:g id="COUNT">^1</xliff:g> ଟିରୁ ଅଧିକ ବିଫଳ ପ୍ରୟାସ ପରେ ଆପଣଙ୍କ ଡିଭାଇସ୍‌ରୁ ଡାଟା ଲିଭିଯିବ!"</string>
-    <string name="crypt_keeper_enter_password" msgid="1274917431075529732">"ନିଜ ପାସ୍‌ୱର୍ଡ ଲେଖନ୍ତୁ"</string>
-    <string name="crypt_keeper_failed_title" msgid="8173654570682244149">"ଏନ୍‌କ୍ରିପ୍ସନ୍‌ ହୋଇପାରିଲା ନାହିଁ"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"ବାଧାପ୍ରାପ୍ତ ଯୋଗୁଁ ଏନକ୍ରିପସନ୍‌‌ ସମ୍ପୂର୍ଣ୍ଣ ହୋଇପାରିଲା ନାହିଁ। ଫଳସ୍ୱରୂପ, ଆପଣଙ୍କ ଟାବଲେଟ୍‌ରେ ଥିବା ଡାଟା ଆଉ ଆକସେସ୍‌ କରାଯାଇପାରିବ ନାହିଁ। \n\n ଫ୍ୟାକ୍ଟୋରୀ ରିସେଟ୍‌ କଲେ ହିଁ ଆପଣ ନିଜ ଟାବ୍‌ଲେଟ୍‌କୁ ପୁଣି ବ୍ୟବହାର କରିପାରିବେ। ରିସେଟ୍‌ କରିବା ପରେ ନିଜ ଟାବ୍‌ଲେଟ୍‌ ସେଟ୍‌ଅପ୍‌ କରିବାବେଳେ Google ଆକାଉଣ୍ଟରେ ବ୍ୟାକ୍‌ଅପ୍‌ ନିଆଯାଇଥିବା ଆପଣଙ୍କର ଯେକୌଣସି ଡାଟାକୁ ଫେରାଇ ଆଣିହେବ।"</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"ଏନ୍‌କ୍ରିପ୍ସନ୍‌ରେ ବାଧା ସୃଷ୍ଟି ଯୋଗୁଁ ସମ୍ପୂର୍ଣ୍ଣ ହୋଇପାରିଲା ନାହିଁ। ପରିଣାମସ୍ୱରୂପ, ଫୋନ୍‌ରେ ଥିବା ଡାଟାଗୁଡ଼ିକୁ ଆପଣ ଆଉ ଦେଖିପାରିବେ ନାହିଁ। \n\n ନିଜ ଫୋନ୍‌କୁ ପୁଣି ବ୍ୟବହାର କରିବା ପାଇଁ ଆପଣଙ୍କୁ ଫ୍ୟାକ୍ଟୋରୀ ରିସେଟ୍‌ କରିବାକୁ ପଡ଼ିବ। ରିଷ୍ଟାର୍ଟ ପରେ ଯେତେବେଳେ ଆପଣ ନିଜ ଫୋନ୍‌କୁ ସେଟ୍‌ କରିବେ, Google ଆକାଉଣ୍ଟରେ ବ୍ୟାକ୍‌ଅପ୍‌ ଥିବା ଡାଟାଗୁଡ଼ିକୁ ଆପଣ ଫେରିପାଇବେ।"</string>
-    <string name="crypt_keeper_data_corrupt_title" msgid="5920153462176846037">"ଡିକ୍ରିପ୍ସନ୍‌ ବିଫଳ ହୋଇଛି"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"ଆପଣ ଠିକ୍ ପାସ୍‌ୱର୍ଡ ଲେଖିଛନ୍ତି, ହେଲେ ଆପଣଙ୍କର ଡାଟା ନଷ୍ଟ ହୋଇଯାଇଛି। \n\nଫ୍ୟାକ୍ଟୋରୀ ରିସେଟ୍‌ କଲେ ହିଁ ଆପଣ ନିଜ ଟାବ୍‌ଲେଟ୍‌ ପୁଣି ବ୍ୟବହାର କରିପାରିବେ। ରିସେଟ୍‌ କରିବା ପରେ ନିଜ ଟାବ୍‌ଲେଟ୍‌ ସେଟ୍‌ଅପ୍‌ କରିବାବେଳେ ଆପଣଙ୍କ Google ଆକାଉଣ୍ଟରେ ବ୍ୟାକ୍‌ଅପ୍‌ ନିଆଯାଇଥିବା ଯେକୌଣସି ଡାଟାକୁ ପୁଣି ଫେରାଇ ଆଣିବାର ସୁଯୋଗ ପାଇବେ।"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"ଆପଣ ଠିକ୍ ପାସୱର୍ଡ ପ୍ରବେଶ କରିଛନ୍ତି, ହେଲେ ଆପଣଙ୍କର ତଥ୍ୟ ନଷ୍ଟ ହୋଇଯାଇଛି। \n\nଫ୍ୟାକ୍ଟୋରୀ ରିସେଟ କଲେ ହିଁ ଆପଣ ନିଜ ଫୋନ ପୁଣି ବ୍ୟବହାର କରିପାରିବେ। ରିସେଟ କରିବା ପରେ ନିଜ ଫୋନ ସେଟ କରିବାବେଳେ ଆପଣଙ୍କ Google ଆକାଉଣ୍ଟରେ ବ୍ୟାକଅପ ଥିବା ଯେକୌଣସି ତଥ୍ୟକୁ ପୁନଃପ୍ରାପ୍ତ କରିପାରିବେ।"</string>
-    <string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"ଇନ୍‌‌ପୁଟ୍‌ ପଦ୍ଧତି ବଦଳାନ୍ତୁ"</string>
+    <string name="encryption_settings_title" msgid="2848716008695618360">"ଏନକ୍ରିପ୍ସନ"</string>
+    <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"ଟାବଲେଟକୁ ଏନକ୍ରିପ୍ଟ କରନ୍ତୁ"</string>
+    <string name="encrypt_title" product="default" msgid="7337365190988321100">"ଫୋନକୁ ଏନକ୍ରିପ୍ଟ କରନ୍ତୁ"</string>
+    <string name="encrypted_summary" msgid="545623487587251207">"ଏନକ୍ରିପ୍ଟ କରାଯାଇଛି"</string>
     <string name="suggested_lock_settings_title" msgid="7836065447159730217">"ଆପଣଙ୍କ ଫୋନ୍‌କୁ ସୁରକ୍ଷିତ ରଖନ୍ତୁ"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"ଟାବଲେଟ୍‌ର ସୁରକ୍ଷା ପାଇଁ ସ୍କ୍ରୀନ୍‌ ଲକ୍‌ ସେଟ୍‌ କରନ୍ତୁ"</string>
     <string name="suggested_lock_settings_summary" product="device" msgid="8479766049078378225">"ଡିଭାଇସ୍‌ର ସୁରକ୍ଷା ପାଇଁ ସ୍କ୍ରୀନ୍‌ ଲକ୍‌ ସେଟ୍‌ କରନ୍ତୁ"</string>
@@ -664,7 +638,7 @@
     <string name="unlock_set_unlock_mode_pattern" msgid="1926480143883094896">"ପାଟର୍ନ"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="9028659554829888373">"PIN"</string>
     <string name="unlock_set_unlock_mode_password" msgid="8810609692771987513">"ପାସୱାର୍ଡ"</string>
-    <string name="unlock_setup_wizard_fingerprint_details" msgid="5974580769186206478">"ସ୍କ୍ରିନ୍‌ ଲକ୍‌ ସେଟ୍‌ କରିସାରିବା ପରେ, ସେଟିଂସ୍ ଓ ସୁରକ୍ଷାରେ ଆପଣ, ନିଜ ଟିପଚିହ୍ନକୁ ମଧ୍ୟ ସେଟ୍‌ଅପ୍ କରିପାରିବେ।"</string>
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="5974580769186206478">"ଥରେ ସ୍କ୍ରିନ ଲକ ସେଟ କରିବା ପରେ, ସେଟିଂସ ଓ ସୁରକ୍ଷାରେ ଆପଣ ଆପଣଙ୍କ ଟିପଚିହ୍ନକୁ ମଧ୍ୟ ସେଟ ଅପ କରିପାରିବେ।"</string>
     <string name="unlock_disable_lock_title" msgid="2564279819907932759">"ସ୍କ୍ରୀନ ଲକକୁ ବନ୍ଦ କର"</string>
     <string name="unlock_disable_frp_warning_title" msgid="3606280046362811229">"ସ୍କ୍ରିନ୍ ଲକ୍ ଡିଲିଟ୍ କରିବେ?"</string>
     <string name="unlock_disable_frp_warning_title_profile" msgid="1005284289723910461">"ପ୍ରୋଫାଇଲ୍‌ ସୁରକ୍ଷା କାଢ଼ିଦେବେ?"</string>
@@ -817,6 +791,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"ଆପଣ ଏହି PIN ଅନ୍ୟ ଡିଭାଇସ୍‌ରେ ମଧ୍ୟ ଟାଇପ୍‌ କରିବା ଆବଶ୍ୟକ କରିପାରନ୍ତି।"</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"ଏହି ପାସ୍‌-କୀକୁ ଅନ୍ୟ ଡିଭାଇସ୍‌ରେ ମଧ୍ୟ ଟାଇପ୍‌ କରିବା ଆବଶ୍ୟକ ହୋଇପରେ।"</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"ଏହା ସହ ପେୟାର୍‌ କରିବାକୁ:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;ନିଶ୍ଚିତ କରନ୍ତୁ ଏହା ଦେଖାଉଛି ପାସ୍‌‌କୀ:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"କୋର୍ଡିନେଟ କରାଯାଇଥିବା ସେଟ ସହ ପେୟାର କରିବାକୁ ସୁନିଶ୍ଚିତ କରନ୍ତୁ"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"ଏହାଙ୍କ ପାଖରୁ:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;ଏହି ଡିଭାଇସ୍‌ ସହ ପେୟାର୍‌ କରିବେ?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"ପେୟାର୍‌ କରିବା ପାଇଁ:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>ଏହା ଉପରେ ଟାଇପ୍ କରନ୍ତୁ:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, ତା’ପରେ ରିଟର୍ନ କିମ୍ୱା ଏଣ୍ଟର୍ ଦାବନ୍ତୁ।"</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"ଆପଣଙ୍କ ଯୋଗାଯୋଗ ଓ କଲ୍‌ ହିଷ୍ଟୋରୀକୁ ଆକ୍ସେସ୍ କରିବାର ଅନୁମତି‌ ଦିଅନ୍ତୁ"</string>
@@ -825,7 +800,7 @@
     <string name="bluetooth_preference_scan_title" msgid="3460316252463771851">"ଡିଭାଇସ୍‌ଗୁଡ଼ିକୁ ଖୋଜ"</string>
     <string name="bluetooth_search_for_devices" msgid="6516902340975407648">"ସତେଜ"</string>
     <string name="bluetooth_searching_for_devices" msgid="6541984133657573124">"ଖୋଜୁଛି…"</string>
-    <string name="bluetooth_preference_device_settings" msgid="1688662188157019998">"ଡିଭାଇସ୍ ସେଟିଂସ୍"</string>
+    <string name="bluetooth_preference_device_settings" msgid="1688662188157019998">"ଡିଭାଇସ ସେଟିଂସ"</string>
     <string name="bluetooth_preference_paired_dialog_title" msgid="1090131276572055841">"ପେୟାର୍‌ ହୋଇଥିବା ଡିଭାଇସ୍‌"</string>
     <string name="bluetooth_preference_paired_dialog_internet_option" msgid="4337953030661626289">"ଇଣ୍ଟର୍‌ନେଟ୍‌ ସଂଯୋଗ"</string>
     <string name="bluetooth_preference_paired_dialog_keyboard_option" msgid="8247634441638919886">"କୀବୋର୍ଡ"</string>
@@ -845,11 +820,12 @@
     <string name="bluetooth_menu_advanced" msgid="7633682234855216066">"ଉନ୍ନତ"</string>
     <string name="bluetooth_advanced_titlebar" msgid="5369701494951467257">"ଉନ୍ନତ ବ୍ଲୁଟୂଥ୍‍‌"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="316627049372961941">"ଆପଣଙ୍କ ବ୍ଲୁଟୁଥ ଚାଲୁଥିବା ବେଳେ ଆପଣଙ୍କ ଡିଭାଇସ ଆଖପାଖରେ ଥିବା ବ୍ଲୁଟୁଥ ଡିଭାଇସଗୁଡ଼ିକ ସହ ଯୋଗାଯୋଗ କରିପାରିବ।"</string>
-    <string name="bluetooth_scanning_on_info_message" msgid="6667723887545056976">"ବ୍ଲୁଟୁଥ ଚାଲୁ ଥିବାବେଳେ ଆପଣଙ୍କ ଡିଭାଇସ୍ ଆଖପାଖରେ ଥିବା ଅନ୍ୟ ବ୍ଲୁଟୁଥ ଡିଭାଇସ୍ ସହ ଯୋଗାଯୋଗ କରିପାରିବ। \n\nଡିଭାଇସ୍ ଅନୁଭୂତିକୁ ଉନ୍ନତ କରିବା ପାଇଁ, ବ୍ଲୁଟୁଥ ବନ୍ଦ ଥିଲେ ମଧ୍ୟ ଆପ୍ ଓ ସେବାଗୁଡ଼ିକ ଯେ କୌଣସି ସମୟରେ ଆଖପାଖର ଡିଭାଇସଗୁଡ଼ିକ ପାଇଁ ସ୍କାନ୍ କରିପାରିବ। ଉଦାହରଣ ସ୍ଵରୂପ, ଲୋକେସନ୍-ଆଧାରିତ ଫିଚର୍ ଓ ସେବାଗୁଡ଼ିକୁ ଉନ୍ନତ କରିବା ପାଇଁ ଏହାକୁ ବ୍ୟବହାର କରାଯାଇପାରିବ। ଆପଣ ଏହାକୁ "<annotation id="link">"ବ୍ଲୁଟୁଥ୍ ସ୍କାନିଂ ସେଟିଂସ"</annotation>"ରେ ବଦଳାଇପାରିବେ।"</string>
-    <string name="ble_scan_notify_text" msgid="1358879010396045164">"ଲୋକେସନ୍‌ ସଠିକତାକୁ ଉନ୍ନତ କରିବା ପାଇଁ, ସିଷ୍ଟମ୍‌ ଆପ୍‍ ଓ ସେବାଗୁଡ଼ିକ ବ୍ଲୁଟୂଥ୍‍‌ ଡିଭାଇସ୍‌ଗୁଡ଼ିକୁ ଚିହ୍ନଟ କରିପାରିବେ। ଆପଣ ଏହାକୁ <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>ଖୋଜିବା ସେଟିଙ୍ଗରେ<xliff:g id="LINK_END_1">LINK_END</xliff:g>ବଦଳାଇପାରିବେ।"</string>
+    <string name="bluetooth_scanning_on_info_message" msgid="6667723887545056976">"ବ୍ଲୁଟୁଥ୍ ଚାଲୁ ଥିବାବେଳେ ଆପଣଙ୍କ ଡିଭାଇସ ଆଖପାଖରେ ଥିବା ଅନ୍ୟ ବ୍ଲୁଟୁଥ୍ ଡିଭାଇସ ସହ ଯୋଗାଯୋଗ କରିପାରିବ। \n\nଡିଭାଇସ ଅନୁଭୂତିକୁ ଉନ୍ନତ କରିବା ପାଇଁ, ବ୍ଲୁଟୁଥ୍ ବନ୍ଦ ଥିଲେ ମଧ୍ୟ ଆପ୍ସ ଓ ସେବାଗୁଡ଼ିକ ଯେ କୌଣସି ସମୟରେ ଆଖପାଖର ଡିଭାଇସଗୁଡ଼ିକ ପାଇଁ ଏବେ ବି ସ୍କାନ କରିପାରିବ। ଉଦାହରଣ ସ୍ଵରୂପ, ଲୋକେସନ-ଆଧାରିତ ଫିଚର ଓ ସେବାଗୁଡ଼ିକୁ ଉନ୍ନତ କରିବା ପାଇଁ ଏହାକୁ ବ୍ୟବହାର କରାଯାଇପାରିବ। ଆପଣ ଏହାକୁ "<annotation id="link">"ବ୍ଲୁଟୁଥ୍ ସ୍କାନିଂ ସେଟିଂସ"</annotation>"ରେ ବଦଳାଇପାରିବେ।"</string>
+    <string name="ble_scan_notify_text" msgid="1358879010396045164">"ଲୋକେସନ ସଠିକତାକୁ ଉନ୍ନତ କରିବା ପାଇଁ, ସିଷ୍ଟମ ଆପ ଓ ସେବାଗୁଡ଼ିକ ବ୍ଲୁଟୂଥ୍‍‌ ଡିଭାଇସଗୁଡ଼ିକୁ ଚିହ୍ନଟ କରିପାରେ। ଆପଣ ଏହାକୁ <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>ସ୍କାନିଂ ସେଟିଂସ<xliff:g id="LINK_END_1">LINK_END</xliff:g>ରେ ବଦଳାଇପାରିବେ।"</string>
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"ସଂଯୋଗ କରିପାରୁନାହିଁ। ପୁଣିଥରେ ଚେଷ୍ଟା କରନ୍ତୁ।"</string>
     <string name="device_details_title" msgid="1155622417516195481">"ଡିଭାଇସ୍‌ର ବିବରଣୀ"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"ଡିଭାଇସ୍‌ର ବ୍ଲୁଟୁଥ ଠିକଣା ହେଉଛି: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"ଡିଭାଇସର ବ୍ଲୁଟୁଥ ଠିକଣା:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"ଡିଭାଇସ୍‌ଟିକୁ ଭୁଲିଯିବେ?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"ଆସୋସିଏସନକୁ କାଢ଼ି ଦିଅନ୍ତୁ"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"ଆପକୁ ବିଚ୍ଛିନ୍ନ କରିବେ?"</string>
@@ -874,13 +850,15 @@
     <string name="bluetooth_device_advanced_enable_opp_title" msgid="7604726126703453984">"ଇନକମିଙ୍ଗ ଫାଇଲ୍‌ ଟ୍ରାନ୍ସଫର୍‌ ଅନୁମତି ଦିଅନ୍ତୁ"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="7851033200857999275">"ଆଭ୍ୟନ୍ତରୀଣ ଆକ୍ସେସ୍ ପାଇଁ ଡିଭାଇସ୍‌ ସହିତ ସଂଯୁକ୍ତ"</string>
     <string name="bluetooth_pan_nap_profile_summary_connected" msgid="5563892893331988809">"ଡିଭାଇସ୍‌‌ ସହ ସ୍ଥାନୀୟ ଇଣ୍ଟରନେଟ୍‌ ସଂଯୋଗ ସେୟାର୍‌ କରାଯାଉଛି"</string>
-    <string name="bluetooth_dock_settings" msgid="1709536202189755022">"ଡକ୍‌ ସେଟିଙ୍ଗ"</string>
+    <string name="bluetooth_dock_settings" msgid="1709536202189755022">"ଡକ୍‌ ସେଟିଂସ"</string>
     <string name="bluetooth_dock_settings_title" msgid="4872789068019972847">"ଅଡିଓ ପାଇଁ ଡକ୍‌ ବ୍ୟବହାର କରନ୍ତୁ"</string>
     <string name="bluetooth_dock_settings_headset" msgid="5756482379574272554">"ସ୍ପିକର୍ ଫୋନ୍‌ ଭାବେ"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="434520221656010141">"ମ୍ୟୁଜିକ୍‌ ଓ ମିଡିଆ ପାଇଁ"</string>
-    <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"ସେଟିଙ୍ଗଗୁଡ଼ିକ ମନେରଖ"</string>
+    <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"ସେଟିଂସକୁ ମନେରଖ"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"ସର୍ବାଧିକ ସଂଯୁକ୍ତ ହୋଇଥିବା ବ୍ଲୁଟୂଥ୍‍‌ ଅଡିଓ ଡିଭାଇସ୍‌ଗୁଡ଼ିକ"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"ସଂଯୁକ୍ତ ବ୍ଲୁଟୂଥ୍‍‌ ଅଡିଓ ଡିଭାଇସ୍‌ଗୁଡ଼ିକର ସର୍ବାଧିକ ସଂଖ୍ୟା ବାଛନ୍ତୁ"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"NFC ଷ୍ଟାକ୍ ଡିବଗ୍ ଲଗ୍"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"NFC ଷ୍ଟାକ୍ ଲଗିଂ ଲେଭେଲକୁ ବଢ଼ାନ୍ତୁ"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"କାଷ୍ଟ"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"ମିରର୍"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"ୱେୟାରଲେସ୍‌ ପ୍ରଦର୍ଶନ ସକ୍ଷମ କରନ୍ତୁ"</string>
@@ -889,7 +867,7 @@
     <string name="wifi_display_status_connected" msgid="2189925211258519539">"ସଂଯୁକ୍ତ"</string>
     <string name="wifi_display_status_in_use" msgid="5904009697167947449">"ବ୍ୟବହାରରେ ଅଛି"</string>
     <string name="wifi_display_status_not_available" msgid="8463750208946968594">"ଅନୁପଲବ୍ଧ"</string>
-    <string name="wifi_display_details" msgid="2351632307998142920">"ଡିସପ୍ଲେ ସେଟିଂସ୍"</string>
+    <string name="wifi_display_details" msgid="2351632307998142920">"ଡିସପ୍ଲେ ସେଟିଂସ"</string>
     <string name="wifi_display_options_title" msgid="7584326966240865043">"ୱାୟର୍‌ଲେସ୍‌ ମାଧ୍ୟମରେ ଡିସ୍‌ପ୍ଲେର ବିକଳ୍ପମାନ"</string>
     <string name="wifi_display_options_forget" msgid="3140558691112356024">"ଭୁଲିଯାଆନ୍ତୁ"</string>
     <string name="wifi_display_options_done" msgid="7608851767701954020">"ହୋଇଗଲା"</string>
@@ -928,7 +906,7 @@
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"ୱାଇ-ଫାଇ ଅନ୍‌ କରନ୍ତୁ"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"ୱାଇ-ଫାଇ"</string>
     <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"ୱାଇ-ଫାଇ ବ୍ୟବହାର କରନ୍ତୁ"</string>
-    <string name="wifi_settings_category" msgid="3523464780563778321">"ୱାଇ-ଫାଇ ସେଟିଂସ୍"</string>
+    <string name="wifi_settings_category" msgid="3523464780563778321">"ୱାଇ-ଫାଇ ସେଟିଂସ"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"ୱାଇ-ଫାଇ"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"ୱାୟର୍‌ଲେସ୍‌ ଆକ୍ସେସ୍‌ ପଏଣ୍ଟର ସେଟ୍‌ଅପ୍‍ ଓ ପରିଚାଳନା"</string>
     <string name="wifi_select_network" msgid="6692897876718813259">"ୱାଇ-ଫାଇ ବାଛନ୍ତୁ"</string>
@@ -952,8 +930,8 @@
     <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="2299284032301667622">"ବ୍ୟବହାର କରିବା ପାଇଁ ଏକ ନେଟ୍‌ୱର୍କ ରେଟିଙ୍ଗ୍‌ ପ୍ରଦାତା ବାଛନ୍ତୁ"</string>
     <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="1780306481499369913">"ବ୍ୟବହାର କରିବା ପାଇଁ, ଏକ ଅନୁକୂଳ ନେଟ୍‌ୱର୍କ ରେଟିଙ୍ଗ ପ୍ରଦାତାଙ୍କୁ ବାଛନ୍ତୁ"</string>
     <string name="wifi_install_credentials" msgid="5192903644606839972">"ସାର୍ଟିଫିକେଟ ଇନ୍‌ଷ୍ଟଲ୍‌"</string>
-    <string name="wifi_scan_notify_text" msgid="7163137260385995873">"ଲୋକେସନ୍ ସଠିକତାକୁ ଉନ୍ନତ କରିବା ପାଇଁ, ୱାଇ-ଫାଇ ବନ୍ଦ ଥିଲେ ମଧ୍ୟ ଆପ୍ ଓ ସେବାଗୁଡ଼ିକ ଯେ କୌଣସି ସମୟରେ ୱାଇ-ଫାଇ ନେଟୱାର୍କ ପାଇଁ ସ୍କାନ୍ କରିପାରିବ। ଉଦାହରଣ ସ୍ଵରୂପ, ଲୋକେସନ୍-ଆଧାରିତ ଫିଚର୍ ଓ ସେବାଗୁଡ଼ିକୁ ଉନ୍ନତ କରିବା ପାଇଁ ଏହାକୁ ବ୍ୟବହାର କରାଯାଇପାରିବ। ଆପଣ ଏହାକୁ <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>ୱାଇ-ଫାଇ ସ୍କାନିଂ ସେଟିଂସ<xliff:g id="LINK_END_1">LINK_END</xliff:g>ରେ ବଦଳାଇପାରିବେ।"</string>
-    <string name="wifi_scan_notify_text_scanning_off" msgid="7439201783168213149">"ଲୋକେସନ୍ ସଠିକତାକୁ ଉନ୍ନତ କରିବା ପାଇଁ, <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>ୱାଇ-ଫାଇ ସ୍କାନିଂ ସେଟିଂସ<xliff:g id="LINK_END_1">LINK_END</xliff:g>ରେ ୱାଇ-ଫାଇ ସ୍କାନିଂ ଚାଲୁ କରନ୍ତୁ।"</string>
+    <string name="wifi_scan_notify_text" msgid="7163137260385995873">"ଲୋକେସନ ସଠିକତାକୁ ଉନ୍ନତ କରିବା ପାଇଁ, ୱାଇ-ଫାଇ ବନ୍ଦ ଥିଲେ ମଧ୍ୟ ଆପ୍ସ ଏବଂ ସେବାଗୁଡ଼ିକ ଯେ କୌଣସି ସମୟରେ ୱାଇ-ଫାଇ ନେଟୱାର୍କ ପାଇଁ ସ୍କାନ କରିପାରିବେ। ଉଦାହରଣ ସ୍ଵରୂପ, ଲୋକେସନ-ଆଧାରିତ ଫିଚର ଓ ସେବାଗୁଡ଼ିକୁ ଉନ୍ନତ କରିବା ପାଇଁ ଏହାକୁ ବ୍ୟବହାର କରାଯାଇପାରିବ। ଆପଣ ଏହାକୁ <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>ୱାଇ-ଫାଇ ସ୍କାନିଂ ସେଟିଂସ<xliff:g id="LINK_END_1">LINK_END</xliff:g>ରେ ବଦଳାଇପାରିବେ।"</string>
+    <string name="wifi_scan_notify_text_scanning_off" msgid="7439201783168213149">"ଲୋକେସନ ସଠିକତାକୁ ଉନ୍ନତ କରିବା ପାଇଁ, <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>ୱାଇ-ଫାଇ ସ୍କାନିଂ ସେଟିଂସ<xliff:g id="LINK_END_1">LINK_END</xliff:g>ରେ ୱାଇ-ଫାଇ ସ୍କାନିଂ ଚାଲୁ କରନ୍ତୁ।"</string>
     <string name="wifi_scan_notify_remember_choice" msgid="8436897497968907701">"ପୁଣି ଦେଖାନ୍ତୁ ନାହିଁ"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="6285374200292675649">"ସ୍କ୍ରୀନ୍‌ ଅଫ୍‌ ଥିବା ବେଳେ ୱାଇ-ଫାଇ ଅନ୍‌ ରଖନ୍ତୁ"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8753852404141070878">"ସୁପ୍ତ ବେଳେ Wi‑Fi ଅନ୍‌"</string>
@@ -996,7 +974,7 @@
     <string name="wifi_ssid_hint" msgid="1940577553241083524">"SSID ଲେଖନ୍ତୁ"</string>
     <string name="wifi_security" msgid="9095934643631406913">"ସୁରକ୍ଷା"</string>
     <string name="wifi_hidden_network" msgid="6466834025375485596">"ଲୁକ୍କାୟିତ ନେଟୱାର୍କ"</string>
-    <string name="wifi_hidden_network_warning" msgid="3937433813754746158">"ଯଦି ଆପଣଙ୍କ ରାଉଟର୍ ଗୋଟିଏ ନେଟୱାର୍କ IDକୁ ବ୍ରଡକାଷ୍ଟ କରୁନାହିଁ କିନ୍ତୁ ଭବିଷ୍ୟତରେ ଆପଣ ତାହା ସହିତ ସଂଯୋଗ କରିବାକୁ ଚାହୁଁଛନ୍ତି, ତେବେ ଆପଣ ନେଟୱାର୍କକୁ ଲୁକ୍କାୟିତ ଭାବେ ସେଟ୍ କରିପାରିବେ। \n\n ଏହା ସୁରକ୍ଷା ଉପରେ ପ୍ରଶ୍ନ ସୃଷ୍ଟି କରିପାରେ, କାରଣ ଆପଣଙ୍କ ଫୋନ୍ ନେଟୱାର୍କ ପ୍ରାପ୍ତ କରିବା ପାଇଁ ନିୟମିତ ଭାବେ ନିଜର ସିଗନାଲ୍‌କୁ ବ୍ରଡକାଷ୍ଟ କରିବ। \n\nଲୁକ୍କାୟିତ ଭାବେ ନେଟୱାର୍କକୁ ସେଟ୍ କରିବା ଦ୍ଵାରା ରାଉଟର୍‌ର ସେଟିଂସ୍ ବଦଳିବ ନାହିଁ।"</string>
+    <string name="wifi_hidden_network_warning" msgid="3937433813754746158">"ଯଦି ଆପଣଙ୍କ ରାଉଟର ଗୋଟିଏ ନେଟୱାର୍କ IDକୁ ବ୍ରଡକାଷ୍ଟ କରୁନାହିଁ କିନ୍ତୁ ଭବିଷ୍ୟତରେ ଆପଣ ତାହା ସହିତ ସଂଯୋଗ କରିବାକୁ ଚାହୁଁଛନ୍ତି, ତେବେ ଆପଣ ନେଟୱାର୍କକୁ ଲୁକ୍କାୟିତ ଭାବେ ସେଟ କରିପାରିବେ। \n\n ଏହା ସୁରକ୍ଷା ଉପରେ ପ୍ରଶ୍ନ ସୃଷ୍ଟି କରିପାରେ, କାରଣ ଆପଣଙ୍କ ଫୋନ ନେଟୱାର୍କ ପ୍ରାପ୍ତ କରିବା ପାଇଁ ନିୟମିତ ଭାବେ ନିଜର ସିଗନାଲକୁ ବ୍ରଡକାଷ୍ଟ କରିବ। \n\nଲୁକ୍କାୟିତ ଭାବେ ନେଟୱାର୍କକୁ ସେଟ କରିବା ଦ୍ଵାରା ରାଉଟରର ସେଟିଂସ ବଦଳିବ ନାହିଁ।"</string>
     <string name="wifi_signal" msgid="4442182285304271424">"ସିଗନାଲ୍ କ୍ଷମତା"</string>
     <string name="wifi_status" msgid="5349199188871002778">"ସ୍ଥିତି"</string>
     <string name="tx_wifi_speed" msgid="2368986629172050673">"ଟ୍ରାନ୍ସମିଟ୍ ଲିଙ୍କ୍ ବେଗ"</string>
@@ -1024,7 +1002,7 @@
     <string name="wifi_ap_2G" msgid="4099628221864343015">"2.4 GHz"</string>
     <string name="wifi_ap_5G" msgid="3493942667238551207">"2.4 GHz"</string>
     <string name="wifi_ap_band_select_one" msgid="5221193733812493435">"ୱାଇ-ଫାଇ ହଟସ୍ପଟ୍ ପାଇଁ ଅତିକମ୍‌ରେ ଗୋଟିଏ ବ୍ୟାଣ୍ଡକୁ ଚୟନ କରନ୍ତୁ:"</string>
-    <string name="wifi_ip_settings" msgid="6420498748726599133">"IP ସେଟିଂସ୍"</string>
+    <string name="wifi_ip_settings" msgid="6420498748726599133">"IP ସେଟିଂସ"</string>
     <string name="wifi_privacy_settings" msgid="3283946009000725698">"ଗୋପନୀୟତା"</string>
     <string name="wifi_subscription" msgid="4432423938285430113">"ସଦସ୍ୟତା"</string>
     <string name="wifi_subscription_summary" msgid="18802471063384598">"ସଦସ୍ୟତା ଦେଖନ୍ତୁ କିମ୍ବା ବଦଳାନ୍ତୁ"</string>
@@ -1137,8 +1115,8 @@
     <string name="wifi_saved_access_points_label" msgid="5691340724310548151">"ସେଭ୍‌ ହୋଇଥିବା ନେଟ୍‌ୱାର୍କ"</string>
     <string name="wifi_subscribed_access_points_tab" msgid="7224061396195667208">"ସଦସ୍ୟତା"</string>
     <string name="wifi_saved_other_networks_tab" msgid="7942647415716557293">"ଅନ୍ୟ ନେଟୱାର୍କ"</string>
-    <string name="wifi_advanced_settings_label" msgid="5880605751602184383">"IP ସେଟିଂସ୍"</string>
-    <string name="wifi_advanced_not_available" msgid="8701003884367299092">"ଏହି ଉପଯୋଗକର୍ତ୍ତାଙ୍କ ପାଇଁ ୱାଇ-ଫାଇ ଉନ୍ନତ ସେଟିଙ୍ଗ ଉପଲବ୍ଧ ନାହିଁ"</string>
+    <string name="wifi_advanced_settings_label" msgid="5880605751602184383">"IP ସେଟିଂସ"</string>
+    <string name="wifi_advanced_not_available" msgid="8701003884367299092">"ଏହି ଉପଯୋଗକର୍ତ୍ତାଙ୍କ ପାଇଁ ୱାଇ-ଫାଇର ଉନ୍ନତ ସେଟିଂସ ଉପଲବ୍ଧ ନାହିଁ"</string>
     <string name="wifi_ip_settings_menu_save" msgid="5190481040428567106">"ସେଭ୍‌ କରନ୍ତୁ"</string>
     <string name="wifi_ip_settings_menu_cancel" msgid="1757817733064004598">"ବାତିଲ୍‌ କରନ୍ତୁ"</string>
     <string name="wifi_ip_settings_invalid_ip_address" msgid="3622891107865052307">"ଏକ ବୈଧ IP ଠିକଣା ଟାଇପ୍‌ କରନ୍ତୁ"</string>
@@ -1188,6 +1166,8 @@
     <string name="wifi_hotspot_maximize_compatibility_dual_ap_summary" msgid="3579549223159056533">"ଏହି ହଟସ୍ପଟକୁ ଖୋଜିବାରେ ଅନ୍ୟ ଡିଭାଇସଗୁଡ଼ିକୁ ସାହାଯ୍ୟ କରେ। ବ୍ୟାଟେରୀର ବ୍ୟବହାର ବଢ଼ାଇଥାଏ।"</string>
     <string name="wifi_tether_starting" msgid="8879874184033857814">"ହଟସ୍ପଟ ଅନ କରୁଛି…"</string>
     <string name="wifi_tether_stopping" msgid="4416492968019409188">"ହଟସ୍ପଟ୍‌ ଅଫ୍‌ କରାଯାଉଛି…"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_title" msgid="3089432578433978073">"ଟିଥରିଂ ଉପଲବ୍ଧ ନାହିଁ"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_content" msgid="5920421547607921112">"ବିବରଣୀ ପାଇଁ ଆପଣଙ୍କ କ୍ୟାରିଅର ସହ ଯୋଗାଯୋଗ କରନ୍ତୁ"</string>
     <string name="wifi_tether_enabled_subtext" msgid="5085002421099821056">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> ସକ୍ରିୟ ଅଛି"</string>
     <string name="wifi_tether_failed_subtext" msgid="437190628041885500">"ପୋର୍ଟବଲ୍‌ ୱାଇ-ଫାଇ ହଟ୍‌ସ୍ପଟ୍‌ର ସମସ୍ୟା"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7072559431286459122">"ୱାଇ-ଫାଇ ହଟସ୍ପଟ୍‌ ସେଟ୍ ଅପ୍‌ କରନ୍ତୁ"</string>
@@ -1253,7 +1233,7 @@
     <string name="media_volume_title" msgid="5209147840160985178">"ମିଡିଆ"</string>
     <string name="media_volume_summary" msgid="4671324482655564873">"ମ୍ୟୁଜିକ୍‌ ଓ ଭିଡିଓଗୁଡିକ ପାଇଁ ଭଲ୍ୟୁମ ସେଟ୍‌ କରନ୍ତୁ"</string>
     <string name="alarm_volume_title" msgid="706302621191735343">"ଆଲାରାମ୍"</string>
-    <string name="dock_settings_summary" msgid="8548721822219932359">"ଲାଗିଥିବା ଡକ୍‌ ପାଇଁ ଅଡିଓ ସେଟିଙ୍ଗ"</string>
+    <string name="dock_settings_summary" msgid="8548721822219932359">"ସଂଲଗ୍ନ ଡକ୍‌ ପାଇଁ ଅଡିଓ ସେଟିଂସ"</string>
     <string name="dtmf_tone_enable_title" msgid="2241337296249130217">"ଡାୟଲ୍‌ ପ୍ୟାଡ୍‌ ସ୍ପର୍ଶ ଶବ୍ଦ"</string>
     <string name="sound_effects_enable_title" msgid="328569690466233866">"ଟାପ୍‌ ଶବ୍ଦ"</string>
     <string name="lock_sounds_enable_title" msgid="804365014499259673">"ସ୍କ୍ରୀନ ଲକ ଶବ୍ଦ"</string>
@@ -1267,13 +1247,13 @@
     <string name="volume_notification_mute" msgid="2612197659377126312">"ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକୁ ନିରବ କରନ୍ତୁ"</string>
     <string name="volume_alarm_mute" msgid="3730895630530980760">"ଆଲାର୍ମ ମ୍ୟୁଟ୍‌ କରନ୍ତୁ"</string>
     <string name="dock_settings" msgid="4654404127402812514">"ଡକ୍"</string>
-    <string name="dock_settings_title" msgid="1276956575555480214">"ଡକ୍‌ ସେଟିଙ୍ଗ"</string>
+    <string name="dock_settings_title" msgid="1276956575555480214">"ଡକ୍‌ ସେଟିଂସ"</string>
     <string name="dock_audio_settings_title" msgid="8294821925086965934">"ଅଡିଓ"</string>
-    <string name="dock_audio_summary_desk" msgid="4158593887711452737">"ଲାଗିଥିବା ଡେସ୍କଟପ୍‌ ଡକ୍‌ ପାଇଁ ସେଟିଙ୍ଗ୍ସ"</string>
-    <string name="dock_audio_summary_car" msgid="292911654994476080">"ଲାଗିଥିବା କାର୍‌ ଡକ୍‌ ପାଇଁ ସେଟିଙ୍ଗ"</string>
+    <string name="dock_audio_summary_desk" msgid="4158593887711452737">"ଲାଗିଥିବା ଡେସ୍କଟପ ଡକ୍‌ ପାଇଁ ସେଟିଂସ"</string>
+    <string name="dock_audio_summary_car" msgid="292911654994476080">"ଲାଗିଥିବା କାର ଡକ୍‌ ପାଇଁ ସେଟିଂସ"</string>
     <string name="dock_audio_summary_none" product="tablet" msgid="7758416095500202500">"ଟାବଲେଟ୍‌ ଡକ୍‌ କରାଯାଇ ନାହିଁ"</string>
     <string name="dock_audio_summary_none" product="default" msgid="9056359991181743485">"ଫୋନ୍‌ ଡକ୍‌ କରାଯାଇ ନାହିଁ"</string>
-    <string name="dock_audio_summary_unknown" msgid="5486086330763810318">"ସଂଲଗ୍ନ ହୋଇଥିବା ଡକ୍‌ ପାଇଁ ସେଟିଙ୍ଗ"</string>
+    <string name="dock_audio_summary_unknown" msgid="5486086330763810318">"ସଂଲଗ୍ନ ଡକ୍‌ ପାଇଁ ସେଟିଂସ"</string>
     <string name="dock_not_found_title" msgid="4721157149003423417">"ଡକ ମିଳୁନାହିଁ"</string>
     <string name="dock_not_found_text" product="tablet" msgid="9192097687086523411">"ଡକ୍‌ ଅଡିଓ ସେଟ୍‌ ଅପ୍‌ କରିବା ପୂର୍ବରୁ ଆପଣଙ୍କୁ ଟାବ୍‌ଲେଟ୍‌‌ଟିକୁ ଡକ୍‌ କରିବାକୁ ପଡ଼ିବ।"</string>
     <string name="dock_not_found_text" product="default" msgid="2247163115146852069">"ଡକ୍‌ ଅଡିଓ ସେଟ୍‌ କରିବା ପୂର୍ବରୁ, ଆପଣଙ୍କୁ ଫୋନ୍‌କୁ ଡକ୍‌ କରିବାକୁ ପଡ଼ିବ"</string>
@@ -1373,7 +1353,7 @@
     <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>
     <string name="twilight_mode_location_off_dialog_message" msgid="4559150893687124801">"ଆପଣଙ୍କ ସୂର୍ଯ୍ୟାସ୍ତ ଏବଂ ସୂର୍ଯ୍ୟୋଦୟ ସମୟ ସ୍ଥିର କରିବାକୁ ଡିଭାଇସର ଲୋକେସନ୍ ଆବଶ୍ୟକ।"</string>
-    <string name="twilight_mode_launch_location" msgid="7799112373591153956">"ଲୋକେସନ୍ ସେଟିଂସ୍"</string>
+    <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>
@@ -1417,7 +1397,7 @@
     <string name="screensaver_settings_when_to_dream" msgid="8145025742428940520">"କେତେବେଳେ ଆରମ୍ଭ କରିବେ"</string>
     <string name="screensaver_settings_current" msgid="390472865895976891">"ବର୍ତ୍ତମାନର ସ୍କ୍ରିନ୍ ସେଭର୍"</string>
     <string name="screensaver_settings_dream_start" msgid="6486360145976995856">"ବର୍ତ୍ତମାନ ଆରମ୍ଭ କରନ୍ତୁ"</string>
-    <string name="screensaver_settings_button" msgid="6159236558934930238">"ସେଟିଂସ୍"</string>
+    <string name="screensaver_settings_button" msgid="6159236558934930238">"ସେଟିଂସ"</string>
     <string name="automatic_brightness" msgid="4599827881929079513">"ସ୍ୱଚାଳିତ ଉଜ୍ଜ୍ୱଳତା"</string>
     <string name="lift_to_wake_title" msgid="8994218158737714046">"ଉଠାଇଲେ ଜାଗ୍ରତ ହେବ"</string>
     <string name="ambient_display_screen_title" msgid="8615947016991429325">"ଆମ୍ବିଏଣ୍ଟ୍ ଡିସ୍‌ପ୍ଲେ"</string>
@@ -1429,7 +1409,7 @@
     <string name="force_bold_text" msgid="4620929631102086716">"ବୋଲ୍ଡ ଟେକ୍ସଟ୍"</string>
     <string name="title_font_size" msgid="570613010306330622">"ଫଣ୍ଟ ସାଇଜ୍"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"ଟେକ୍ସଟ୍‌କୁ ବଡ଼ କିମ୍ୱା ଛୋଟ କରନ୍ତୁ"</string>
-    <string name="sim_lock_settings" msgid="4493069398250139205">"SIM କାର୍ଡ ଲକ୍‌ ସେଟିଙ୍ଗ"</string>
+    <string name="sim_lock_settings" msgid="4493069398250139205">"SIM କାର୍ଡ ଲକ ସେଟିଂସ"</string>
     <string name="sim_lock_settings_category" msgid="4280307997492851625">"SIM କାର୍ଡ ଲକ୍‌"</string>
     <string name="sim_lock_settings_summary_off" msgid="4570941250786847095">"ବନ୍ଦ"</string>
     <string name="sim_lock_settings_summary_on" msgid="1562184566830887925">"ଲକ୍ ଅଛି"</string>
@@ -1490,7 +1470,7 @@
     <string name="storage_settings" msgid="7472188817781592677">"ଷ୍ଟୋରେଜ୍‌"</string>
     <string name="storage_settings_for_app" msgid="229425418984637483">"ଷ୍ଟୋରେଜ୍ &amp; କେଚ୍"</string>
     <string name="storage_usb_settings" msgid="7058142934214211583">"ଷ୍ଟୋରେଜ୍"</string>
-    <string name="storage_settings_title" msgid="486118156723194815">"ଷ୍ଟୋରେଜ୍‌ ସେଟିଂସ୍"</string>
+    <string name="storage_settings_title" msgid="486118156723194815">"ଷ୍ଟୋରେଜ ସେଟିଂସ"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="3858049818577638926">"USB ଷ୍ଟୋରେଜ୍‌କୁ ଅନ୍‌ମାଉଣ୍ଟ କରନ୍ତୁ, ଉପଲବ୍ଧ ଷ୍ଟୋରେଜ୍‌ ଦେଖନ୍ତୁ"</string>
     <string name="storage_settings_summary" product="default" msgid="267557695753980969">"SD କାର୍ଡକୁ ଅନ୍‌ମାଉଣ୍ଟ କରନ୍ତୁ, ଉପଲବ୍ଧ ଷ୍ଟୋରେଜ୍‌ ଦେଖନ୍ତୁ"</string>
     <string name="imei_multi_sim" msgid="71477088017585479">"IMEI (ସିମ୍‌ ସ୍ଲଟ୍‌ %1$d)"</string>
@@ -1636,7 +1616,7 @@
     <string name="storage_wizard_migrate_details" msgid="7474061662976940407">"ସ୍ଥାନାନ୍ତର କରିବା ସମୟରେ \n• <xliff:g id="NAME">^1</xliff:g>କାଢ଼ନ୍ତୁ ନାହିଁ। \n• କିଛି ଆପ୍‌ ଠିକ୍‌ ଭାବରେ କାମ କରିବ ନାହିଁ। \n• ଡିଭାଇସ୍‌କୁ ଚାର୍ଜ କରି ରଖନ୍ତୁ।"</string>
     <string name="storage_wizard_ready_title" msgid="3093468548660255543">"ଆପଣଙ୍କର <xliff:g id="NAME">^1</xliff:g> ବ୍ୟବହାର ପାଇଁ ପ୍ରସ୍ତୁତ"</string>
     <string name="storage_wizard_ready_external_body" msgid="45040717412844114">"ଫଟୋ ଏବଂ ଅନ୍ୟାନ୍ୟ ମିଡିଆ ସହ ବ୍ୟବହାର କରାଯିବାକୁ ଆପଣଙ୍କ <xliff:g id="NAME">^1</xliff:g> ପ୍ରସ୍ତୁତ।"</string>
-    <string name="storage_wizard_ready_internal_body" msgid="7734817996475607447">"ଆପଣଙ୍କ ନୂଆ <xliff:g id="NAME">^1</xliff:g> କାମ କରୁଛି। \n\nଫଟୋ, ଫାଇଲ ଏବଂ ଆପ୍‌ ଡାଟା ଏହି ଡିଭାଇସ୍‌ରେ ନେବାକୁ, ସେଟିଙ୍ଗ &gt; ଷ୍ଟୋରେଜ୍‌‌କୁ ଯାଆନ୍ତୁ।"</string>
+    <string name="storage_wizard_ready_internal_body" msgid="7734817996475607447">"ଆପଣଙ୍କ ନୂଆ <xliff:g id="NAME">^1</xliff:g> କାମ କରୁଛି। \n\nଫଟୋ, ଫାଇଲ ଏବଂ ଆପ ଡାଟାକୁ ଏହି ଡିଭାଇସରେ ନେବା ପାଇଁ, ସେଟିଂସ &gt; ଷ୍ଟୋରେଜକୁ ଯାଆନ୍ତୁ।"</string>
     <string name="storage_wizard_move_confirm_title" msgid="6812469630804101590">"<xliff:g id="APP">^1</xliff:g>କୁ ଘୁଞ୍ଚାନ୍ତୁ"</string>
     <string name="storage_wizard_move_confirm_body" msgid="1713022828842263574">"<xliff:g id="APP">^1</xliff:g> ଏବଂ ତାହାର ଡାଟା <xliff:g id="NAME_0">^2</xliff:g> କୁ ନେବାରେ କିଛି ସମୟ ଲାଗିବ। ଏହି ଚାଳନା ସମ୍ପୂର୍ଣ୍ଣ ନହେବା ପର୍ଯ୍ୟନ୍ତ ଆପଣ ଆପ୍‌ଟିକୁ ବ୍ୟବହାର କରିପାରିବେ ନାହିଁ। \n\nଚାଳନା ବେଳେ <xliff:g id="NAME_1">^2</xliff:g>କୁ ବାହାର କରନ୍ତୁ ନାହିଁ।"</string>
     <string name="storage_wizard_move_unlock" msgid="14651384927767749">"ଡାଟା ନେବାକୁ ଆପଣଙ୍କୁ ଉପଯୋଗକର୍ତ୍ତା <xliff:g id="APP">^1</xliff:g> ଅନଲକ୍‌ କରିବା ଆବଶ୍ୟକ।"</string>
@@ -1675,8 +1655,8 @@
     <string name="storage_wizard_slow_v2_start_over" msgid="1806852287668077536">"ଆରମ୍ଭ କରନ୍ତୁ"</string>
     <string name="storage_wizard_slow_v2_continue" msgid="7469713755893007901">"ଜାରି ରଖନ୍ତୁ"</string>
     <string name="storage_wizard_ready_v2_external_body" msgid="3896836008684280905">"ଆପଣ ନିଜ କଣ୍ଟେଣ୍ଟକୁ <xliff:g id="NAME">^1</xliff:g>କୁ ନେଇପାରିବେ"</string>
-    <string name="storage_wizard_ready_v2_internal_body" msgid="5710665992219332454">"<xliff:g id="NAME">^1</xliff:g>କୁ କଣ୍ଟେଣ୍ଟ ନେବାପାଇଁ, "<b>"ସେଟିଙ୍ଗ &gt; ଷ୍ଟୋରେଜ୍‌"</b>"କୁ ଯାଆନ୍ତୁ"</string>
-    <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1269878056598666852">"ଆପଣଙ୍କର କଣ୍ଟେଣ୍ଟ <xliff:g id="NAME_0">^1</xliff:g>କୁ ନିଆଗଲା। \n\n ଏହି <xliff:g id="NAME_1">^2</xliff:g>କୁ ପରିଚାଳନା କରିବା ପାଇଁ, "<b>"ସେଟିଙ୍ଗ &gt; ଷ୍ଟୋରେଜ୍"</b>"କୁ ଯାଆନ୍ତୁ।"</string>
+    <string name="storage_wizard_ready_v2_internal_body" msgid="5710665992219332454">"<xliff:g id="NAME">^1</xliff:g>କୁ କଣ୍ଟେଣ୍ଟକୁ ମୁଭ କରିବାପାଇଁ, "<b>"ସେଟିଂସ &gt; ଷ୍ଟୋରେଜ"</b>"କୁ ଯାଆନ୍ତୁ"</string>
+    <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1269878056598666852">"ଆପଣଙ୍କର କଣ୍ଟେଣ୍ଟ <xliff:g id="NAME_0">^1</xliff:g>କୁ ମୁଭ କରାଯାଇଛି। \n\n ଏହି <xliff:g id="NAME_1">^2</xliff:g>କୁ ପରିଚାଳନା କରିବା ପାଇଁ, "<b>"ସେଟିଂସ &gt; ଷ୍ଟୋରେଜ"</b>"କୁ ଯାଆନ୍ତୁ।"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"ବ୍ୟାଟେରୀ ସ୍ଥିତି"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"ବ୍ୟାଟେରୀ ସ୍ତର"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APNs"</string>
@@ -1719,30 +1699,30 @@
     <string name="error_mcc_not3" msgid="883659545640179094">"MCC ଫିଲ୍ଡ 3 ଅଙ୍କ ବିଶିଷ୍ଟ ହେବା ଦରକାର"</string>
     <string name="error_mnc_not23" msgid="7642478711158474918">"MNC ଫିଲ୍ଡ ୨ କିମ୍ବା ୩ ସଂଖ୍ୟା ବିଶିଷ୍ଟ ହେବା ଆବଶ୍ୟକ।"</string>
     <string name="error_adding_apn_type" msgid="1324263534991467943">"%s ପ୍ରକାରର APNଗୁଡ଼ିକୁ ମୋବାଇଲ୍‌ ବାହକ ଯୋଡ଼େନାହିଁ।"</string>
-    <string name="restore_default_apn" msgid="6596048535642130689">"ଡିଫଲ୍ଟ APN ସେଟିଙ୍ଗ ରିଷ୍ଟୋର୍ ହେଉଛି"</string>
+    <string name="restore_default_apn" msgid="6596048535642130689">"ଡିଫଲ୍ଟ APN ସେଟିଂସ ରିଷ୍ଟୋର ହେଉଛି"</string>
     <string name="menu_restore" msgid="4310539620115151551">"ଡିଫଲ୍ଟରେ ରିସେଟ୍‌ କରନ୍ତୁ"</string>
-    <string name="restore_default_apn_completed" msgid="5167505087078340256">"ଡିଫଲ୍ଟ APN ସେଟିଂସ୍ ରିସେଟ୍‌ କରାଯାଇଛି।"</string>
+    <string name="restore_default_apn_completed" msgid="5167505087078340256">"ଡିଫଲ୍ଟ APN ସେଟିଂସ ରିସେଟ ସରିଯାଇଛି।"</string>
     <string name="reset_dashboard_title" msgid="7423200250697886918">"ରିସେଟ୍‌ କରିବାର ବିକଳ୍ପଗୁଡ଼ିକ"</string>
     <string name="reset_dashboard_summary" msgid="4390780188264852956">"ନେଟ୍‌ୱର୍କ, ଆପ୍‌, କିମ୍ବା ଡିଭାଇସ୍‌ ରିସେଟ୍‌ କରାଯାଇପାରିବ"</string>
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"ଆପ୍‍ଗୁଡ଼ିକୁ ରିସେଟ୍ କରାଯାଇପାରିବ"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"ୱାଇ-ଫାଇ, ମୋବାଇଲ ଓ ବ୍ଲୁଟୁଥ୍‌ ରିସେଟ୍‌ କରନ୍ତୁ"</string>
-    <string name="reset_network_desc" msgid="1112523764899788246">"ଏହା ସମସ୍ତ ନେଟୱାର୍କ ସେଟିଂସକୁ ରିସେଟ୍‌ କରିବ, ଯେଉଁଥିରେ ଏସବୁ ରହିଛି:\n\n"<li>"ୱାଇ-ଫାଇ"</li>\n<li>"ମୋବାଇଲ୍‌ ଡାଟା"</li>\n<li>"ବ୍ଲୁଟୁଥ୍‍"</li></string>
+    <string name="reset_network_desc" msgid="1112523764899788246">"ଏହା:\n\n"<li>"ୱାଇ-ଫାଇ"</li>\n<li>"ମୋବାଇଲ ଡାଟା"</li>\n<li>"ବ୍ଲୁଟୁଥ୍‍"</li>" ସମେତ ସମସ୍ତ ନେଟୱାର୍କ ସେଟିଂସକୁ ରିସେଟ କରିବ"</string>
     <string name="erase_euicc_data_button" msgid="728078969563311737">"ଖାଲି କରନ୍ତୁ"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"ଡାଉନଲୋଡ୍ ହୋଇଥିବା SIMକୁ ଖାଲି କରନ୍ତୁ"</string>
     <string name="reset_esim_desc" msgid="3662444090563399131">"ଏହା କୌଣସି ମୋବାଇଲ ସେବା ପ୍ଲାନକୁ ବାତିଲ୍ କରିବ ନାହିଁ। ରିପ୍ଲେସମେଣ୍ଟ SIMଗୁଡ଼ିକୁ ଡାଉନଲୋଡ୍ କରିବାକୁ ଆପଣଙ୍କ କ୍ୟାରିଅରଙ୍କ ସହ ଯୋଗାଯୋଗ କରନ୍ତୁ।"</string>
-    <string name="reset_network_button_text" msgid="2281476496459610071">"ସେଟିଂସ୍ ରିସେଟ୍‌ କରନ୍ତୁ"</string>
-    <string name="reset_network_final_desc" msgid="5304365082065278425">"ସମସ୍ତ ନେଟ୍‌ୱାର୍କ ସେଟିଂ ରିସେଟ୍ କରିବେ? ଏହାକୁ ଆପଣ ଆଉ ପୂର୍ବବତ୍ କରିପାରିବେ ନାହିଁ।"</string>
-    <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"ସମସ୍ତ ନେଟ୍‌ୱର୍କ ସେଟିଂ ରିସେଟ୍ ଏବଂ ଡାଉନଲୋଡ୍ ହୋଇଥିବା SIMକୁ ଖାଲି କରିବେ କି? ଆପଣ ଏହି କାର୍ଯ୍ୟକୁ ପୂର୍ବବତ୍ କରିପାରିବେ ନାହିଁ।"</string>
-    <string name="reset_network_final_button_text" msgid="2433867118414000462">"ସେଟିଂସ୍ ରିସେଟ୍ କରନ୍ତୁ"</string>
+    <string name="reset_network_button_text" msgid="2281476496459610071">"ସେଟିଂସ ରିସେଟ କରନ୍ତୁ"</string>
+    <string name="reset_network_final_desc" msgid="5304365082065278425">"ସମସ୍ତ ନେଟୱାର୍କ ସେଟିଂସ ରିସେଟ କରିବେ? ଏହାକୁ ଆପଣ ଆଉ ପୂର୍ବବତ୍ କରିପାରିବେ ନାହିଁ।"</string>
+    <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"ସମସ୍ତ ନେଟୱାର୍କ ସେଟିଂସ ରିସେଟ ଏବଂ ଡାଉନଲୋଡ ହୋଇଥିବା SIMକୁ ଖାଲି କରିବେ କି? ଆପଣ ଏହି କାର୍ଯ୍ୟକୁ ପୂର୍ବବତ୍ କରିପାରିବେ ନାହିଁ।"</string>
+    <string name="reset_network_final_button_text" msgid="2433867118414000462">"ସେଟିଂସ ରିସେଟ କରନ୍ତୁ"</string>
     <string name="reset_network_confirm_title" msgid="913014422184481270">"ରିସେଟ୍‌ କରିବେ?"</string>
     <string name="network_reset_not_available" msgid="1966334631394607829">"ଏହି ଉପଯୋଗକର୍ତ୍ତାଙ୍କ ପାଇଁ ନେଟ୍‌ୱର୍କ ରିସେଟ୍‌ ଉପଲବ୍ଧ ନାହିଁ"</string>
-    <string name="reset_network_complete_toast" msgid="1367872474130621115">"ନେଟ୍‌ୱର୍କ ସେଟିଙ୍ଗକୁ ରିସେଟ୍‌ କରିଦିଆଯାଇଛି"</string>
+    <string name="reset_network_complete_toast" msgid="1367872474130621115">"ନେଟୱାର୍କ ସେଟିଂସକୁ ରିସେଟ କରି ଦିଆଯାଇଛି"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"SIMକୁ ଖାଲି କରିହେବ ନାହିଁ"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"ଏକ ତ୍ରୁଟି ଯୋଗୁଁ ଡାଉନଲୋଡ୍ ହୋଇଥିବା SIMଗୁଡ଼ିକ ଲିଭାଯାଇ ପାରିବାନାହିଁ।\n\nଆପଣଙ୍କର ଡିଭାଇସ୍‌କୁ ରିଷ୍ଟାର୍ଟ କରନ୍ତୁ ଏବଂ ପୁଣି ଚେଷ୍ଟା କରନ୍ତୁ।"</string>
     <string name="main_clear_title" msgid="277664302144837723">"ସମସ୍ତ ଡାଟା ଖାଲି କରନ୍ତୁ (ଫ୍ୟାକ୍ଟୋରୀ ରିସେଟ୍)"</string>
     <string name="main_clear_short_title" msgid="4752094765533020696">"ସମସ୍ତ ଡାଟା ଖାଲି କରନ୍ତୁ (ଫ୍ୟାକ୍ଟୋରୀ ରିସେଟ୍)"</string>
-    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"ଏହା, ଆପଣଙ୍କ ଟାବଲେଟର "<b>"ଇଣ୍ଟର୍ନଲ୍ ଷ୍ଟୋରେଜ"</b>"ରେ ଥିବା ସମସ୍ତ ଡାଟା ସମେତ ଏହି ସବୁ ମଧ୍ୟ ଖାଲି କରିଦେବ:\n\n"<li>"ଆପଣଙ୍କ Google ଆକାଉଣ୍ଟ"</li>\n<li>"ସିଷ୍ଟମ ଏବଂ ଆପ୍ ଡାଟା ଓ ସେଟିଂସ୍"</li>\n<li>"ଡାଉନଲୋଡ୍ ହୋଇଥିବା ଆପଗୁଡ଼ିକ"</li></string>
-    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"ଏହା, ଆପଣଙ୍କ ଫୋନର "<b>"ଇଣ୍ଟର୍ନଲ୍ ଷ୍ଟୋରେଜ୍"</b>"ରେ ଥିବା ସମସ୍ତ ଡାଟା ସମେତ ଏହି ସବୁ ମଧ୍ୟ ଖାଲି କରିଦେବ:\n\n"<li>"ଆପଣଙ୍କ Google ଆକାଉଣ୍ଟ"</li>\n<li>"ସିଷ୍ଟମ ଏବଂ ଆପ୍ ଡାଟା ଓ ସେଟିଂସ୍"</li>\n<li>"ଡାଉନଲୋଡ୍ ହୋଇଥିବା ଆପଗୁଡ଼ିକ"</li></string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"ଏହା ଆପଣଙ୍କ ଟାବଲେଟର "<b>"ଇଣ୍ଟର୍ନଲ ଷ୍ଟୋରେଜ"</b>", ସମେତ:\n\n"<li>"ଆପଣଙ୍କ Google ଆକାଉଣ୍ଟ"</li>\n<li>"ସିଷ୍ଟମ ଏବଂ ଆପ ଡାଟା ଓ ସେଟିଂସ"</li>\n<li>"ଡାଉନଲୋଡ ହୋଇଥିବା ଆପ୍ସ"</li>"ରେ ଥିବା ସମସ୍ତ ଡାଟାକୁ ଲିଭେଇ ଦେବ"</string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"ଏହା ଆପଣଙ୍କ ଫୋନର "<b>"ଇଣ୍ଟର୍ନଲ ଷ୍ଟୋରେଜ"</b>", ସମେତ:\n\n"<li>"ଆପଣଙ୍କ Google ଆକାଉଣ୍ଟ"</li>\n<li>"ସିଷ୍ଟମ ଏବଂ ଆପ ଡାଟା ଓ ସେଟିଂସ"</li>\n<li>"ଡାଉନଲୋଡ ହୋଇଥିବା ଆପ୍ସ"</li>"ରେ ଥିବା ସମସ୍ତ ଡାଟାକୁ ଲିଭେଇ ଦେବ"</string>
     <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"ଆପଣ ବର୍ତ୍ତମାନ ନିମ୍ନୋକ୍ତ ଆକାଉଣ୍ଟଗୁଡ଼ିକରେ ସାଇନ୍ ଇନ୍ କରିଛନ୍ତି:\n"</string>
     <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"ଏହି ଡିଭାଇସରେ ଅନ୍ୟ ଉପଯୋଗକର୍ତ୍ତା ଅଛନ୍ତି।\n"</string>
     <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"ସଙ୍ଗୀତ"</li>\n<li>"ଫଟୋ"</li>\n<li>"ଅନ୍ୟ ଉପଯୋଗକର୍ତ୍ତା ଡାଟା"</li></string>
@@ -1762,7 +1742,7 @@
     <string name="main_clear_not_available" msgid="3433795327146684827">"ଏହି ଉପଯୋଗକର୍ତ୍ତାଙ୍କ ପାଇଁ ଫ୍ୟାକ୍ଟୋରୀ ରିସେଟ୍ ଉପଲବ୍ଧ ନାହିଁ"</string>
     <string name="main_clear_progress_title" msgid="7239741132015617719">"ଖାଲି କରାଯାଉଛି"</string>
     <string name="main_clear_progress_text" msgid="4636695115176327972">"ଦୟାକରି ଅପେକ୍ଷା କରନ୍ତୁ…"</string>
-    <string name="call_settings_title" msgid="2531072044177194164">"କଲ୍‌ ସେଟିଂସ୍"</string>
+    <string name="call_settings_title" msgid="2531072044177194164">"କଲ ସେଟିଂସ"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"ଭଏସ୍‌ମେଲ୍‌, କଲ୍‌ ଫର୍‌ୱାର୍ଡିଙ୍ଗ, କଲ୍‌ ୱେଟିଙ୍ଗ, କଲର୍‌ ID ସେଟ୍‌ କରନ୍ତୁ"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB ଟିଥରିଂ"</string>
     <string name="tether_settings_title_wifi" msgid="4327056146425282159">"ପୋର୍ଟବଲ୍‌ ହଟସ୍ପଟ୍‌"</string>
@@ -1855,8 +1835,8 @@
     <string name="managed_profile_location_services" msgid="8172092734138341880">"କାର୍ଯ୍ୟ ପାଇଁ ଲୋକେସନ୍ ସମ୍ପର୍କିତ ସେବା"</string>
     <string name="location_time_zone_detection_toggle_title" msgid="6518338597250564260">"ଟାଇମ୍ ଜୋନ୍ ସେଟ୍ କରିବାକୁ ଲୋକେସନ୍ ବ୍ୟବହାର କରନ୍ତୁ"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"ଡିଭାଇସର ଲୋକେସନ୍ ଆବଶ୍ୟକ"</string>
-    <string name="location_time_zone_detection_location_is_off_dialog_message" msgid="5846316326139169523">"ଆପଣଙ୍କ ଲୋକେସନ୍ ବ୍ୟବହାର କରି ଟାଇମ୍ ଜୋନ୍ ସେଟ୍ କରିବାକୁ ଲୋକେସନ୍ ଚାଲୁ କରନ୍ତୁ, ତା\'ପରେ ଟାଇମ୍ ଜୋନ୍ ସେଟିଂସ୍ ଅପଡେଟ୍ କରନ୍ତୁ"</string>
-    <string name="location_time_zone_detection_location_is_off_dialog_ok_button" msgid="2685647335717750297">"ଲୋକେସନ୍ ସେଟିଂସ୍"</string>
+    <string name="location_time_zone_detection_location_is_off_dialog_message" msgid="5846316326139169523">"ଆପଣଙ୍କ ଲୋକେସନ ବ୍ୟବହାର କରି ଟାଇମ ଜୋନ ସେଟ କରିବାକୁ ଲୋକେସନ ଚାଲୁ କରନ୍ତୁ, ତା\'ପରେ ଟାଇମ ଜୋନ ସେଟିଂସ ଅପଡେଟ କରନ୍ତୁ"</string>
+    <string name="location_time_zone_detection_location_is_off_dialog_ok_button" msgid="2685647335717750297">"ଲୋକେସନ ସେଟିଂସ"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_cancel_button" msgid="3968729678789071154">"ବାତିଲ୍ କରନ୍ତୁ"</string>
     <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"ସ୍ୱଚାଳିତ ଟାଇମ୍ ଜୋନ୍ ବନ୍ଦ ଅଛି"</string>
     <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"ଲୋକେସନ୍ ଟାଇମ୍ ଜୋନ୍ ଚିହ୍ନଟକରଣ ଅକ୍ଷମ କରାଯାଇଛି"</string>
@@ -1957,9 +1937,9 @@
     <string name="lockpassword_strong_auth_required_work_pattern" msgid="6803652050512161140">"ଅତିରିକ୍ତ ସୁରକ୍ଷା ପାଇଁ, ନିଜର କାର୍ଯ୍ୟ ପାଟର୍ନ ବ୍ୟବହାର କରନ୍ତୁ"</string>
     <string name="lockpassword_strong_auth_required_work_pin" msgid="4208510396448713500">"ଅତିରିକ୍ତ ସୁରକ୍ଷା ପାଇଁ, ଆପଣଙ୍କ କାର୍ଯ୍ୟ PIN ପ୍ରବେଶ କରନ୍ତୁ"</string>
     <string name="lockpassword_strong_auth_required_work_password" msgid="6119482061429323090">"ଯୋଡାଯାଇଥିବା ସୁରକ୍ଷା ପାଇଁ, ଆପଣଙ୍କ କାର୍ଯ୍ୟ ପାସୱାର୍ଡ୍ ପ୍ରବେଶ କରନ୍ତୁ"</string>
-    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6351784282865851482">"ଆପଣଙ୍କ ଫୋନ୍‌ ଫ୍ୟାକ୍ଟୋରୀ ସେଟିଙ୍ଗକୁ ରିସେଟ୍‌ ହେଲା। ଏହି ଫୋନ୍‌ ବ୍ୟବହାର କରିବାକୁ, ଆପଣଙ୍କ ପୂର୍ବ ପାଟର୍ନ ଲେଖନ୍ତୁ।"</string>
-    <string name="lockpassword_confirm_your_pin_details_frp" msgid="2128795640346033349">"ଆପଣଙ୍କ ଫୋନ୍‌ ଫ୍ୟାକ୍ଟୋରୀ ସେଟିଙ୍ଗକୁ ରିସେଟ୍‌ ହେଲା। ଏହି ଫୋନ୍‌ ବ୍ୟବହାର କରିବାକୁ, ଆପଣଙ୍କ ପୂର୍ବ PIN ପ୍ରବେଶ କରନ୍ତୁ।"</string>
-    <string name="lockpassword_confirm_your_password_details_frp" msgid="4031863562975125016">"ଆପଣଙ୍କ ଫୋନ୍‌ ଫ୍ୟାକ୍ଟୋରୀ ସେଟିଙ୍ଗକୁ ରିସେଟ୍‌ ହେଲା। ଏହି ଫୋନ୍‌ ବ୍ୟବହାର କରିବାକୁ, ଆପଣଙ୍କ ପୂର୍ବ ପାସୱାର୍ଡ୍ ପ୍ରବେଶ କରନ୍ତୁ।"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6351784282865851482">"ଆପଣଙ୍କ ଫୋନ ଫ୍ୟାକ୍ଟୋରୀ ସେଟିଂସକୁ ରିସେଟ କରାଯାଇଛି। ଏହି ଫୋନ ବ୍ୟବହାର କରିବାକୁ, ଆପଣଙ୍କ ପୂର୍ବ ପାଟର୍ନ ଲେଖନ୍ତୁ।"</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="2128795640346033349">"ଆପଣଙ୍କ ଫୋନ ଫ୍ୟାକ୍ଟୋରୀ ସେଟିଂସକୁ ରିସେଟ ହୋଇଯାଇଛି। ଏହି ଫୋନ ବ୍ୟବହାର କରିବାକୁ, ଆପଣଙ୍କ ପୂର୍ବ PIN ପ୍ରବେଶ କରନ୍ତୁ।"</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="4031863562975125016">"ଆପଣଙ୍କ ଫୋନ ଫ୍ୟାକ୍ଟୋରୀ ସେଟିଂସକୁ ରିସେଟ କରାଯାଇଛି। ଏହି ଫୋନ ବ୍ୟବହାର କରିବାକୁ, ଆପଣଙ୍କ ପୂର୍ବ ପାସୱାର୍ଡ ଲେଖନ୍ତୁ।"</string>
     <string name="lockpassword_confirm_your_pattern_header_frp" msgid="5641858015891896427">"ପାଟର୍ନ ଯାଞ୍ଚ କରନ୍ତୁ"</string>
     <string name="lockpassword_confirm_your_pin_header_frp" msgid="8285647793164729982">"ପିନ୍‌ ଯାଞ୍ଚ କରନ୍ତୁ"</string>
     <string name="lockpassword_confirm_your_password_header_frp" msgid="7932240547542564033">"ପାସ୍‌ୱର୍ଡ ଯାଞ୍ଚ କରନ୍ତୁ:"</string>
@@ -2007,7 +1987,7 @@
     <string name="manageapplications_settings_summary" msgid="848586372489062357">"ଇନ୍‌ଷ୍ଟଲ୍‌ ହୋଇଥିବା ଆପ୍‌ଗୁଡ଼ିକର ପରିଚାଲନା କରନ୍ତୁ ଓ କାଢ଼ନ୍ତୁ"</string>
     <string name="applications_settings" msgid="1941993743933425622">"ଆପ୍‌ ସୂଚନା"</string>
     <string name="applications_settings_summary" msgid="8206066893744768531">"ଆପ୍‌ଗୁଡ଼ିକୁ ପରିଚାଳନା କରନ୍ତୁ, ଦ୍ରୁତ ଲଞ୍ଚ ଶର୍ଟକଟ୍ସ ସେଟ୍‌ଅପ୍‌ କରନ୍ତୁ"</string>
-    <string name="applications_settings_header" msgid="3154670675856048015">"ଆପ୍‌ ସେଟିଂସ୍"</string>
+    <string name="applications_settings_header" msgid="3154670675856048015">"ଆପ ସେଟିଂସ"</string>
     <string name="install_applications" msgid="3921609656584369901">"ଅଜଣା ଉତ୍ସ"</string>
     <string name="install_applications_title" msgid="7890233747559108106">"ସମସ୍ତ ଆପ୍‌ର ଉତ୍ସଗୁଡ଼ିକୁ ଅନୁମତି ଦିଅନ୍ତୁ"</string>
     <string name="recent_app_category_title" msgid="189758417804427533">"ବର୍ତ୍ତମାନ ଖୋଲାଯାଇଥିବା ଆପ୍‌ଗୁଡ଼ିକ"</string>
@@ -2020,8 +2000,8 @@
     <string name="install_all_warning" product="tablet" msgid="7010749217925069520">"ଆପଣଙ୍କ ଟାବଲେଟ୍‌ ଏବଂ ବ୍ୟକ୍ତିଗତ ଡାଟା ଅଜ୍ଞାତ ଆପସ୍‌ ଦ୍ୱାରା ଆକ୍ରମଣ କରାଯିବାରେ ଅଧିକ ଉନ୍ମୁକ୍ତ ହୋଇଥାଆନ୍ତି। ଏହି ଉତ୍ସରୁ ଆପସ୍‌ ସଂସ୍ଥାପନ କରିବା ଦ୍ୱାରା, ଆପଣ ରାଜି ହୁଅନ୍ତି ଯେ ଆପଣଙ୍କ ଟାବଲେଟ୍‌‌ରେ ହେବା କୌଣସି ପ୍ରକାର କ୍ଷତି କିମ୍ବା ସେଗୁଡିକ ବ୍ୟବହାରରୁ ଘଟିବା କୌଣସି ପ୍ରକାର ଡାଟାର ହାନୀ ପାଇଁ ଆପଣ ଉତ୍ତରଦାୟୀ ଅଟନ୍ତି।"</string>
     <string name="install_all_warning" product="default" msgid="652516435709047343">"ଅଜ୍ଞାତ ଆପ୍‌ ଦ୍ୱାରା ଆପଣଙ୍କ ଫୋନ୍‌ ଏବଂ ବ୍ୟକ୍ତିଗତ ଡାଟା ଆକ୍ରାନ୍ତ ହେବାର ସମ୍ଭାବନା ବହୁତ ଅଧିକ। ଏହି ଉତ୍ସରୁ ଆପ୍‌ ଇନଷ୍ଟଲ୍‌ କରିବାର ଅର୍ଥ, ଆପଣଙ୍କ ଫୋନ୍‌ରେ ଘଟିବା କୌଣସି ପ୍ରକାର କ୍ଷତି କିମ୍ବା ସେଗୁଡ଼ିକ ବ୍ୟବହାରରୁ ହେବା କୌଣସି ପ୍ରକାର ଡାଟାର ହାନୀ ପାଇଁ ଆପଣ ଦାୟୀ ରହିବାକୁ ରାଜି ହୁଅନ୍ତି।"</string>
     <string name="install_all_warning" product="device" msgid="2348262609815354500">"ଅଜ୍ଞାତ ଆପ୍‌ ଦ୍ୱାରା ଆପଣଙ୍କ ଫୋନ୍‌ ଏବଂ ବ୍ୟକ୍ତିଗତ ଡାଟା ଆକ୍ରାନ୍ତ ହେବାର ସମ୍ଭାବନା ବହୁତ ଅଧିକ। ଏହି ଉତ୍ସରୁ ଆପ୍‌ ଇନଷ୍ଟଲ୍‌ କରିବାର ଅର୍ଥ, ଆପଣଙ୍କ ଫୋନ୍‌ରେ ଘଟିବା କୌଣସି ପ୍ରକାର କ୍ଷତି କିମ୍ବା ସେଗୁଡ଼ିକର ବ୍ୟବହାରରୁ ହେବା କୌଣସି ପ୍ରକାର ଡାଟା ହାନି ପାଇଁ ଆପଣ ଦାୟୀ ରହିବାକୁ ରାଜି ହୁଅନ୍ତି।"</string>
-    <string name="advanced_settings" msgid="2368905204839169094">"ଉନ୍ନତ ସେଟିଙ୍ଗ"</string>
-    <string name="advanced_settings_summary" msgid="1823765348195530035">"ଅଧିକ ସେଟିଙ୍ଗ ବିକଳ୍ପ ସକ୍ଷମ କରନ୍ତୁ"</string>
+    <string name="advanced_settings" msgid="2368905204839169094">"ଉନ୍ନତ ସେଟିଂସ"</string>
+    <string name="advanced_settings_summary" msgid="1823765348195530035">"ଅଧିକ ସେଟିଂସ ବିକଳ୍ପ ସକ୍ଷମ କରନ୍ତୁ"</string>
     <string name="application_info_label" msgid="1015706497694165866">"ଆପ୍‍ ସୂଚନା"</string>
     <string name="storage_label" msgid="2522307545547515733">"ଷ୍ଟୋରେଜ୍‌"</string>
     <string name="auto_launch_label" msgid="4069860409309364872">"ଡିଫଲ୍ଟ ଭାବରେ ଖୋଲାଯାଉ"</string>
@@ -2153,11 +2133,11 @@
     <string name="runningservicedetails_services_title" msgid="11853795112787355">"ସେବା"</string>
     <string name="runningservicedetails_processes_title" msgid="5292271587797234038">"ପ୍ରକ୍ରିୟା"</string>
     <string name="service_stop" msgid="5712522600201308795">"ରୋକନ୍ତୁ"</string>
-    <string name="service_manage" msgid="3896322986828332075">"ସେଟିଂସ୍"</string>
+    <string name="service_manage" msgid="3896322986828332075">"ସେଟିଂସ"</string>
     <string name="service_stop_description" msgid="6327742632400026677">"ଏହି ସେବା ଏହାର ଆପ୍‌ ଦ୍ୱାରା ଆରମ୍ଭ କରାଯାଇଛି। ଏହା ବନ୍ଦ କରିବା ଦ୍ୱାରା ଆପ୍‌ଟି ଚାଲିବା ବନ୍ଦ ହୋଇପାରେ।"</string>
     <string name="heavy_weight_stop_description" msgid="3086419998820881290">"ଏହି ଆପ୍‌ ନିରାପଦ ଭାବେ ବନ୍ଦ ହୋଇପାରିବ ନାହିଁ। ଯଦି ଆପଣ ଏହାକୁ ବନ୍ଦ କରନ୍ତି, ତେବେ ନିଜ ବର୍ତ୍ତମାନ କାର୍ଯ୍ୟରୁ କିଛି ହରାଇବେ।"</string>
     <string name="background_process_stop_description" msgid="4792038933517438037">"ଏହି ପୁରୁଣା ଆପ୍‌ ପ୍ରକ୍ରିୟାଟି ଏପର୍ଯ୍ୟନ୍ତ ଚାଲୁଛି, କାରଣ ଏହାର ପୁଣିଥରେ ଆବଶ୍ୟକତା ପଡ଼ିପାରେ। ଏହାକୁ ବନ୍ଦ କରିବାର କୌଣସି କାରଣ ନାହିଁ।"</string>
-    <string name="service_manage_description" msgid="6615788996428486121">"<xliff:g id="CLIENT_NAME">%1$s</xliff:g>: ବର୍ତ୍ତମାନ ବ୍ୟବହାରରେ ଅଛି। ଏହାକୁ ନିୟନ୍ତ୍ରଣ କରିବା ପାଇଁ ସେଟିଙ୍ଗ୍‌ରେ ଟାପ୍‌ କରନ୍ତୁ"</string>
+    <string name="service_manage_description" msgid="6615788996428486121">"<xliff:g id="CLIENT_NAME">%1$s</xliff:g>: ବର୍ତ୍ତମାନ ବ୍ୟବହାରରେ ଅଛି। ଏହାକୁ ନିୟନ୍ତ୍ରଣ କରିବା ପାଇଁ ସେଟିଂସରେ ଟାପ କରନ୍ତୁ"</string>
     <string name="main_running_process_description" msgid="6685973937935027773">"ମୁଖ୍ୟ ପ୍ରକ୍ରିୟା ବ୍ୟବହାରରେ ଅଛି।"</string>
     <string name="process_service_in_use_description" msgid="4210957264507014878">"ସେବା <xliff:g id="COMP_NAME">%1$s</xliff:g> ବ୍ୟବହାରରେ ଅଛି।"</string>
     <string name="process_provider_in_use_description" msgid="6730020083976048028">"<xliff:g id="COMP_NAME">%1$s</xliff:g> ପ୍ରଦାନକାରୀ ବ୍ୟବହାରରେ ଅଛି।"</string>
@@ -2180,12 +2160,12 @@
     <string name="auto_caps" msgid="5573583581288305355">"ସ୍ଵତଃ-କ୍ୟାପିଟାଲାଇଜେଶନ୍"</string>
     <string name="auto_caps_summary" msgid="3144141933426846665">"ବାକ୍ୟର ପ୍ରଥମ ଅକ୍ଷରକୁ ବଡ଼ କରନ୍ତୁ"</string>
     <string name="auto_punctuate" msgid="2838809477621809507">"ସ୍ୱତଃ-ବିରାମ ଚିହ୍ନ"</string>
-    <string name="hardkeyboard_category" msgid="8729780593378161071">"ଫିଜିକଲ୍ କୀ’ବୋର୍ଡ ସେଟିଙ୍ଗ"</string>
+    <string name="hardkeyboard_category" msgid="8729780593378161071">"ଫିଜିକାଲ କୀ’ବୋର୍ଡ ସେଟିଂସ"</string>
     <string name="auto_punctuate_summary" msgid="3549190848611386748">"\".\" ଲେଖିବାକୁ ସ୍ପେସ୍‌ କୀ ଦୁଇଥର ଦବାନ୍ତୁ"</string>
     <string name="show_password" msgid="7101900779571040117">"ପାସୱାର୍ଡ ଦେଖାନ୍ତୁ"</string>
     <string name="show_password_summary" msgid="9025960283785111619">"ଆପଣ ଟାଇପ୍‌ କରିବା ଅନୁସାରେ ଅକ୍ଷର ଦେଖାଏ"</string>
     <string name="spellchecker_security_warning" msgid="2016059050608271820">"ବ୍ୟକ୍ତିଗତ ତଥ୍ୟ, ଯେପରି ପାସୱର୍ଡ ଓ କ୍ରେଡିଟ କାର୍ଡ ନମ୍ୱର ସମେତ ଆପଣ ଯାହା ସବୁ ବି ଟାଇପ କରିବେ, ତାହାକୁ ଏହି ବନାନ ଚେକର ସଂଗ୍ରହ କରିପାରେ। ଏହା, ଏପ <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g> ରୁ ଆସିଥାଏ। ଏହି ବନାନ ଚେକର ବ୍ୟବହାର କରିବେ କି?"</string>
-    <string name="spellchecker_quick_settings" msgid="6449414356743946577">"ସେଟିଂସ୍"</string>
+    <string name="spellchecker_quick_settings" msgid="6449414356743946577">"ସେଟିଂସ"</string>
     <string name="spellchecker_language" msgid="8905487366580285282">"ଭାଷା"</string>
     <string name="keyboard_and_input_methods_category" msgid="5296847777802891649">"କୀବୋର୍ଡଗୁଡ଼ିକ"</string>
     <string name="virtual_keyboard_category" msgid="2339505603075527212">"ଅନ୍-ସ୍କ୍ରିନ୍ କୀବୋର୍ଡ"</string>
@@ -2241,13 +2221,13 @@
     <string name="input_method_selector_always_show_title" msgid="2479533500357556146">"ସର୍ବଦା ଦେଖାନ୍ତୁ"</string>
     <string name="input_method_selector_always_hide_title" msgid="807424180027384849">"ସର୍ବଦା ଲୁଚାଇ ରଖ"</string>
     <string name="configure_input_method" msgid="8831343065130376880">"ସେଟ୍‌ ଅପ୍‌ ଇନ୍‌ପୁଟ୍‌ ପଦ୍ଧତି"</string>
-    <string name="input_method_settings" msgid="4177883733022569830">"ସେଟିଂସ୍"</string>
-    <string name="input_method_settings_button" msgid="5145039044301426311">"ସେଟିଂସ୍"</string>
+    <string name="input_method_settings" msgid="4177883733022569830">"ସେଟିଂସ"</string>
+    <string name="input_method_settings_button" msgid="5145039044301426311">"ସେଟିଂସ"</string>
     <string name="input_methods_settings_label_format" msgid="5809693308957109022">"<xliff:g id="IME_NAME">%1$s</xliff:g> ସେଟିଂସ"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="8940326108334307057">"ସକ୍ରିୟ ଇନ୍‌ପୁଟ୍‌ ପଦ୍ଧତି ବାଛନ୍ତୁ"</string>
-    <string name="onscreen_keyboard_settings_summary" msgid="3975358507879701606">"ଅନ୍‌ସ୍କ୍ରୀନ୍‌ କୀ’ବୋର୍ଡ ସେଟିଙ୍ଗ"</string>
+    <string name="onscreen_keyboard_settings_summary" msgid="3975358507879701606">"ଅନସ୍କ୍ରିନ କୀ’ବୋର୍ଡ ସେଟିଂସ"</string>
     <string name="builtin_keyboard_settings_title" msgid="5096171620714179661">"ଫିଜିକଲ୍ କୀ’ବୋର୍ଡ"</string>
-    <string name="builtin_keyboard_settings_summary" msgid="4332792334499933856">"ଫିଜିକଲ୍ କୀ’ବୋର୍ଡ ସେଟିଙ୍ଗ"</string>
+    <string name="builtin_keyboard_settings_summary" msgid="4332792334499933856">"ଫିଜିକାଲ କୀ’ବୋର୍ଡ ସେଟିଂସ"</string>
     <string name="gadget_picker_title" msgid="7615902510050731400">"ଗ୍ୟାଜେଟ୍‌ ବାଛନ୍ତୁ"</string>
     <string name="widget_picker_title" msgid="7641298325488989676">"ୱିଜେଟ୍‌ ବାଛନ୍ତୁ"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="3537968409832846255">"ୱିଜେଟ୍‌ ତିଆରି କରି ଆକ୍ସେସ୍‌ର ଅନୁମତି ଦେବେ?"</string>
@@ -2260,10 +2240,10 @@
     <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_title" msgid="6739115703615065716">"ଆକ୍ସେସିବିଲିଟୀ ସେଟିଙ୍ଗ"</string>
+    <string name="accessibility_settings_title" msgid="6739115703615065716">"ଆକ୍ସେସିବିଲିଟୀ ସେଟିଂସ"</string>
     <string name="accessibility_settings_summary" msgid="2366627644570558503">"ଡିସପ୍ଲେ, ଇଣ୍ଟରାକସନ୍, ଅଡିଓ"</string>
-    <string name="vision_settings_title" msgid="8919983801864103069">"ଭିଜନ୍‌ ସେଟିଂସ୍"</string>
-    <string name="vision_settings_description" msgid="7614894785054441991">"ନିଜର ଆବଶ୍ୟକତା ଅନୁସାରେ ଏହି ଡିଭାଇସ୍‌କୁ ଆପଣ କଷ୍ଟମାଇଜ୍‌ କରିପାରିବେ। ଏହି ଆକ୍ସେସିବିଲିଟୀ ଫିଚରଗୁଡ଼ିକୁ ପରେ ସେଟିଂସରେ ବଦଳା ଯାଇପାରିବ।"</string>
+    <string name="vision_settings_title" msgid="8919983801864103069">"ଭିଜନ ସେଟିଂସ"</string>
+    <string name="vision_settings_description" msgid="7614894785054441991">"ନିଜର ଆବଶ୍ୟକତା ଅନୁସାରେ ଏହି ଡିଭାଇସକୁ ଆପଣ କଷ୍ଟମାଇଜ କରିପାରିବେ। ଏହି ଆକ୍ସେସିବିଲିଟୀ ଫିଚରଗୁଡ଼ିକୁ ପରେ ସେଟିଂସରେ ବଦଳାଯାଇପାରିବ।"</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"ଫଣ୍ଟ ସାଇଜ୍ ବଦଳାନ୍ତୁ"</string>
     <string name="screen_reader_category_title" msgid="5825700839731107803">"ସ୍କ୍ରିନ୍ ରିଡର୍"</string>
     <string name="captions_category_title" msgid="574490148949400274">"କ୍ୟାପସନଗୁଡ଼ିକ"</string>
@@ -2302,7 +2282,7 @@
     <string name="accessibility_magnification_switch_shortcut_message" msgid="7718653917415163833">"ଆପଣଙ୍କ ସ୍କ୍ରିନର ଅଂଶକୁ ମ୍ୟାଗ୍ନିଫାଏ କରିବା ପାଇଁ \"ତିନିଥର-ଟାପ୍\" ବିକଳ୍ପକୁ ବ୍ୟବହାର କରିବା ଫଳରେ ଟାଇପିଂ ଓ ଅନ୍ୟ କାର୍ଯ୍ୟରେ ବିଳମ୍ବ ହୋଇଥାଏ।\n\nଆକ୍ସେସିବିଲିଟୀ ବଟନଟି ସ୍କ୍ରିନରେ ଅନ୍ୟ ଆପଗୁଡ଼ିକ ଉପରେ ରୁହେ। ମ୍ୟାଗ୍ନିଫାଏ କରିବାକୁ ଏଥିରେ ଟାପ୍ କରନ୍ତୁ।"</string>
     <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"ଆକ୍ସେସିବିଲିଟୀ ବଟନକୁ ସ୍ୱିଚ୍ କରନ୍ତୁ"</string>
     <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="7115794462123071594">"\"ତିନିଥର-ଟାପ୍\" ବିକଳ୍ପକୁ ବ୍ୟବହାର କରନ୍ତୁ"</string>
-    <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"ମାଗ୍ନିଫିକେସନ୍ ସେଟିଂସ୍"</string>
+    <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"ମାଗ୍ନିଫିକେସନ ସେଟିଂସ"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"ଟ୍ରିପଲ୍‌-ଟାପ୍‌ ଦ୍ୱାରା ମାଗ୍ନିଫାଏ କରନ୍ତୁ"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"ସର୍ଟକଟ୍ ସାହାଯ୍ୟରେ ମାଗ୍ନିଫାଏ କରନ୍ତୁ"</string>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="8067042663897802231">"ତିନି ଥର ଟାପ୍ ଓ ସର୍ଟକଟ୍ ସାହାଯ୍ୟରେ ମାଗ୍ନିଫାଏ କରନ୍ତୁ"</string>
@@ -2351,7 +2331,7 @@
     <string name="accessibility_screen_magnification_gesture_navigation_warning" msgid="991017769735632046">"ଆକ୍ସେସିବିଲିଟୀ ଜେଶ୍ଚର୍ <xliff:g id="SERVICE">%1$s</xliff:g>ରେ ସେଟ୍ କରାଯାଇଛି। ମ୍ୟାଗ୍ନିଫିକେସନ୍ ବ୍ୟବହାର କରିବା ପାଇଁ, ଦୁଇଟି ଆଙ୍ଗୁଠିରେ ସ୍କ୍ରିନ୍‌ର ତଳୁ ଉପର ଆଡ଼କୁ ସ୍ୱାଇପ୍ କରି ଧରି ରଖନ୍ତୁ। ତା’ପରେ ମ୍ୟାଗ୍ନିଫିକେସନ୍ ଚୟନ କରନ୍ତୁ।"</string>
     <string name="accessibility_global_gesture_preference_title" msgid="3713636732641882959">"ଭଲ୍ୟୁମ୍ କୀ’ ସର୍ଟକଟ୍"</string>
     <string name="accessibility_shortcut_service_title" msgid="6842883700702723355">"ଶର୍ଟକଟ୍‌ ସେବା"</string>
-    <string name="accessibility_shortcut_settings" msgid="836783442658447995">"ସର୍ଟକଟ୍ ସେଟିଂସ୍"</string>
+    <string name="accessibility_shortcut_settings" msgid="836783442658447995">"ସର୍ଟକଟ ସେଟିଂସ"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="3923122834058574478">"ଲକ୍ ସ୍କ୍ରିନରୁ ସର୍ଟକଟ୍"</string>
     <string name="accessibility_shortcut_description" msgid="2184693606202133549">"ଲକ୍ ସ୍କ୍ରିନରୁ ଫିଚର୍ ସର୍ଟକଟ୍ ଚାଲୁ କରିବାକୁ ଅନୁମତି ଦିଅନ୍ତୁ। କିଛି ସେକେଣ୍ଡ ପାଇଁ ଉଭୟ ଭଲ୍ୟୁମ୍ କୀ’କୁ ଧରି ରଖନ୍ତୁ।"</string>
     <string name="accessibility_button_title" msgid="5251235485581552614">"ଆକ୍ସେସିବିଲିଟୀ ବଟନ୍"</string>
@@ -2361,8 +2341,8 @@
     <string name="accessibility_button_gesture_footer_learn_more_content_description" msgid="4144803517680297869">"ଆକ୍ସେସିବିଲିଟୀ ବଟନ୍ ଏବଂ ଜେଶ୍ଚର୍ ବିଷୟରେ ଅଧିକ ଜାଣନ୍ତୁ"</string>
     <string name="accessibility_button_intro" msgid="2601976470525277903">"ଆକ୍ସେସିବିଲିଟୀ ବଟନ୍ ବ୍ୟବହାର କରାଯାଉଛି। 3-ବଟନ୍ ନାଭିଗେସନ୍ ମାଧ୍ୟମରେ ଜେଶ୍ଚର୍ ଉପଲବ୍ଧ ନାହିଁ।"</string>
     <string name="accessibility_button_summary" msgid="8510939012631455831">"ଆକ୍ସେସିବିଲିଟୀ ଫିଚରକୁ ଶୀଘ୍ର ଆକ୍ସେସ୍ କରନ୍ତୁ"</string>
-    <string name="accessibility_button_gesture_description" msgid="785178810659647474">"ଯେ କୌଣସି ସ୍କ୍ରିନରୁ ଆକ୍ସେସିବିଲିଟୀ ଫିଚରଗୁଡ଼ିକୁ ଶୀଘ୍ର ଆକ୍ସେସ୍ କରନ୍ତୁ।\n\nଆରମ୍ଭ କରିବାକୁ, ଆକ୍ସେସିବିଲିଟୀ ସେଟିଂସକୁ ଯାଇ ଏକ ଫିଚର୍ ଚୟନ କରନ୍ତୁ। ସର୍ଟକଟରେ ଟାପ୍ କରି ଆକ୍ସେସିବିଲିଟୀ ବଟନ କିମ୍ବା ଜେଶ୍ଚରକୁ ଚୟନ କରନ୍ତୁ।"</string>
-    <string name="accessibility_button_description" msgid="3664784100487881054">"ଯେ କୌଣସି ସ୍କ୍ରିନରୁ ଆକ୍ସେସିବିଲିଟୀ ଫିଚରଗୁଡ଼ିକୁ ଶୀଘ୍ର ଆକ୍ସେସ୍ କରନ୍ତୁ।\n\nଆରମ୍ଭ କରିବାକୁ, ଆକ୍ସେସିବିଲିଟୀ ସେଟିଂସକୁ ଯାଇ ଏକ ଫିଚର୍ ଚୟନ କରନ୍ତୁ। ସର୍ଟକଟରେ ଟାପ୍ କରି ଆକ୍ସେସିବିଲିଟୀ ବଟନକୁ ଚୟନ କରନ୍ତୁ।"</string>
+    <string name="accessibility_button_gesture_description" msgid="785178810659647474">"ଯେ କୌଣସି ସ୍କ୍ରିନରୁ ଆକ୍ସେସିବିଲିଟୀ ଫିଚରଗୁଡ଼ିକୁ ଶୀଘ୍ର ଆକ୍ସେସ କରନ୍ତୁ।\n\nଆରମ୍ଭ କରିବାକୁ, ଆକ୍ସେସିବିଲିଟୀ ସେଟିଂସକୁ ଯାଇ ଏକ ଫିଚର ଚୟନ କରନ୍ତୁ। ସର୍ଟକଟରେ ଟାପ କରି ଆକ୍ସେସିବିଲିଟୀ ବଟନ କିମ୍ବା ଜେଶ୍ଚରକୁ ଚୟନ କରନ୍ତୁ।"</string>
+    <string name="accessibility_button_description" msgid="3664784100487881054">"ଯେ କୌଣସି ସ୍କ୍ରିନରୁ ଆକ୍ସେସିବିଲିଟୀ ଫିଚରଗୁଡ଼ିକୁ ଶୀଘ୍ର ଆକ୍ସେସ କରନ୍ତୁ।\n\nଆରମ୍ଭ କରିବାକୁ, ଆକ୍ସେସିବିଲିଟୀ ସେଟିଂସକୁ ଯାଇ ଏକ ଫିଚର ଚୟନ କରନ୍ତୁ। ସର୍ଟକଟରେ ଟାପ କରି ଆକ୍ସେସିବିଲିଟୀ ବଟନକୁ ଚୟନ କରନ୍ତୁ।"</string>
     <string name="accessibility_button_or_gesture_title" msgid="3510075963401163529">"ବଟନ୍ କିମ୍ବା ଜେଶ୍ଚର୍ ବ୍ୟବହାର କରନ୍ତୁ"</string>
     <string name="accessibility_button_location_title" msgid="7182107846092304942">"ଲୋକେସନ୍"</string>
     <string name="accessibility_button_size_title" msgid="5785110470538960881">"ଆକାର"</string>
@@ -2452,7 +2432,7 @@
     <string name="accessibility_summary_state_stopped" msgid="2343602489802623424">"କାମ କରୁ ନାହିଁ। ସୂଚନା ପାଇଁ ଟାପ୍ କରନ୍ତୁ।"</string>
     <string name="accessibility_description_state_stopped" msgid="5364752492861199133">"ଏହି ସେବା ଠିକ୍‌ରୂପେ କାମ କରୁ ନାହିଁ।"</string>
     <string name="accessibility_shortcuts_settings_title" msgid="974740249671825145">"ଆକ୍ସେସିବିଲିଟୀ ସର୍ଟକଟଗୁଡ଼ିକ"</string>
-    <string name="enable_quick_setting" msgid="6648073323202243604">"ଦ୍ରୁତ ସେଟିଙ୍ଗରେ ଦେଖାନ୍ତୁ"</string>
+    <string name="enable_quick_setting" msgid="6648073323202243604">"କ୍ୱିକ୍ ସେଟିଂସରେ ଦେଖାନ୍ତୁ"</string>
     <string name="daltonizer_type" msgid="1715154680803795947">"ସଂଶୋଧନ ମୋଡ୍"</string>
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"ଡ୍ୟୁଟେରାନୋମାଲି"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"ପ୍ରୋଟାନୋମାଲି"</string>
@@ -2498,7 +2478,7 @@
     <string name="accessibility_vibration_intensity_low" msgid="6311161118835287335">"କମ୍"</string>
     <string name="accessibility_vibration_intensity_medium" msgid="1734058611879392797">"ମଧ୍ୟମ"</string>
     <string name="accessibility_vibration_intensity_high" msgid="5982896399775212514">"ଅଧିକ"</string>
-    <string name="accessibility_menu_item_settings" msgid="2652637954865389271">"ସେଟିଂସ୍"</string>
+    <string name="accessibility_menu_item_settings" msgid="2652637954865389271">"ସେଟିଂସ"</string>
     <string name="accessibility_feature_state_on" msgid="1777344331063467511">"ଚାଲୁ"</string>
     <string name="accessibility_feature_state_off" msgid="169119895905460512">"ବନ୍ଦ"</string>
     <string name="captioning_preview_title" msgid="2888561631323180535">"ପ୍ରିଭ୍ୟୁ"</string>
@@ -2533,12 +2513,7 @@
     <string name="color_magenta" msgid="8943538189219528423">"ମାଜେଣ୍ଟା"</string>
     <string name="enable_service_title" msgid="7231533866953706788">"<xliff:g id="SERVICE">%1$s</xliff:g>କୁ ଆପଣଙ୍କ ଡିଭାଇସ୍‍ର ସମ୍ପୂର୍ଣ୍ଣ ନିୟନ୍ତ୍ରଣର ଅନୁମତି ଦେବେ?"</string>
     <string name="capabilities_list_title" msgid="1225853611983394386">"<xliff:g id="SERVICE">%1$s</xliff:g> ଆବଶ୍ୟକ କରେ:"</string>
-    <string name="touch_filtered_warning" msgid="4225815157460318241">"ଗୋଟିଏ ଏପ ଏକ ଅନୁମତି ଅନୁରୋଧକୁ ଅଣଦେଖା କରୁଥିବା କାରଣରୁ, ସେଟିଙ୍ଗ ଆପଣଙ୍କ ଉତ୍ତରକୁ ଯାଞ୍ଚ କରିପାରିବ ନାହିଁ।"</string>
-    <string name="enable_service_encryption_warning" msgid="931082737770453755">"ଯଦି ଆପଣ <xliff:g id="SERVICE">%1$s</xliff:g>କୁ ଅନ୍‌ କରନ୍ତି, ତେବେ ଡାଟା ଏନକ୍ରିପ୍ସନ୍‌ ବୃଦ୍ଧି କରିବାକୁ ଆପଣଙ୍କ ଡିଭାଇସ୍‌, ଆପଣଙ୍କ ସ୍କ୍ରୀନ୍‌ ଲକ୍‌କୁ ବ୍ୟବହାର କରିବ ନାହିଁ।"</string>
-    <string name="secure_lock_encryption_warning" msgid="669152607190123579">"ଯେହେତୁ ଆପଣ ଏକ ଆକ୍‌ସେସିବିଲିଟୀ ସେବାକୁ ଅନ୍‌ କରିଛନ୍ତି, ଡାଟା ଏନ୍‌କ୍ରିପ୍ସନ୍ ବୃଦ୍ଧି କରିବା ପାଇଁ ଆପଣଙ୍କର ଡିଭାଇସ୍ ସ୍କ୍ରୀନ୍‌ ଲକ୍‌କୁ ବ୍ୟବହାର କରିବ ନାହିଁ।"</string>
-    <string name="enable_service_pattern_reason" msgid="6832846117817938536">"କାରଣ <xliff:g id="SERVICE">%1$s</xliff:g> ଅନ୍‌ କରିବା ଦ୍ୱାରା ଡାଟା ଏନକ୍ରିପସନ୍‌ ପ୍ରଭାବିତ ହେବ, ତେଣୁ ଆପଣଙ୍କ ଶୈଳୀ ଆପଣ ନିଶ୍ଚିତ କରିବା ଆବଶ୍ୟକ କରନ୍ତି।"</string>
-    <string name="enable_service_pin_reason" msgid="6040417014360237703">"କାରଣ <xliff:g id="SERVICE">%1$s</xliff:g> କୁ ଅନ୍‌ କଲେ, ତାହା ଡାଟା ଏନ୍‌କ୍ରିପ୍‌ଶନ୍‌କୁ ପ୍ରଭାବିତ କରିବ, ଆପଣଙ୍କୁ ନିଜ PIN ସୁନିଶ୍ଚିତ କରିବାକୁ ପଡ଼ିବ।"</string>
-    <string name="enable_service_password_reason" msgid="6962544350351734238">"କାରଣ <xliff:g id="SERVICE">%1$s</xliff:g> ଅନ୍‌ କରିବା ଦ୍ୱାରା ଡାଟା ଏନକ୍ରିପସନ୍‌ ପ୍ରଭାବିତ ହେବ, ତେଣୁ ଆପଣଙ୍କ ପାସୱାର୍ଡ୍ ଆପଣ ନିଶ୍ଚିତ କରିବା ଆବଶ୍ୟକ କରନ୍ତି।"</string>
+    <string name="touch_filtered_warning" msgid="4225815157460318241">"ଗୋଟିଏ ଆପ ଏକ ଅସ୍ପଷ୍ଟ ଅନୁରୋଧକୁ ଅଣଦେଖା କରୁଥିବା ଯୋଗୁଁ, ସେଟିଂସ ଆପଣଙ୍କ ଉତ୍ତରକୁ ଯାଞ୍ଚ କରିପାରିବ ନାହିଁ।"</string>
     <string name="accessibility_service_warning" msgid="6779187188736432618">"<xliff:g id="SERVICE">%1$s</xliff:g>, ଏହି ଡିଭାଇସ୍‌ର ସମ୍ପୂର୍ଣ୍ଣ ନିୟନ୍ତ୍ରଣ ଅନୁରୋଧ କରୁଛି। ଏହି ସେବା, ସ୍କ୍ରିନ୍‌ ପଢିପାରିବ ଏବଂ ଆକ୍ସେସିବିଲିଟୀ ଆବଶ୍ୟକତା ଅନୁଯାୟୀ ଉପଯୋଗକର୍ତ୍ତା ତରଫରୁ କାର୍ଯ୍ୟ କରିପାରିବ। ଅଧିକାଂଶ ଆପ୍‌ ପାଇଁ ଏହି ସ୍ତରର ନିୟନ୍ତ୍ରଣ ସଠିକ୍‌ ନୁହେଁ।"</string>
     <string name="accessibility_service_warning_description" msgid="6573203795976134751">"ଯେଉଁ ଆପ୍ସ ଆପଣଙ୍କୁ ଆକ୍ସେସିବିଲିଟୀ ଆବଶ୍ୟକତାରେ ସହାୟତା କରେ, ସେହି ଆପ୍ସ ପାଇଁ ସମ୍ପୂର୍ଣ୍ଣ ନିୟନ୍ତ୍ରଣ ଉପଯୁକ୍ତ ଅଟେ, କିନ୍ତୁ ଅଧିକାଂଶ ଆପ୍ସ ପାଇଁ ଉପଯୁକ୍ତ ନୁହେଁ।"</string>
     <string name="accessibility_service_screen_control_title" msgid="324795030658109870">"ଭ୍ୟୁ ଏବଂ ସ୍କ୍ରିନ୍‍ ନିୟନ୍ତ୍ରଣ"</string>
@@ -2554,7 +2529,7 @@
     <string name="accessibility_no_services_installed" msgid="3725569493860028593">"କୌଣସି ସେବା ସଂସ୍ଥାପିତ ହୋଇନାହିଁ"</string>
     <string name="accessibility_no_service_selected" msgid="1310596127128379897">"କୌଣସି ସେବାର ଚୟନ କରାଯାଇନାହିଁ"</string>
     <string name="accessibility_service_default_description" msgid="7801435825448138526">"କୌଣସି ବ୍ୟାଖ୍ୟା ଦିଆଯାଇ ନାହିଁ।"</string>
-    <string name="settings_button" msgid="2195468788019730377">"ସେଟିଂସ୍"</string>
+    <string name="settings_button" msgid="2195468788019730377">"ସେଟିଂସ"</string>
     <string name="keywords_reduce_bright_colors" msgid="1683190961013139183">"ଆଲୋକ ସମ୍ବେଦନଶୀଳତା, ଫଟୋଫୋବିଆ, ଗାଢ଼ା ଥିମ୍, ଅଧକପାଳି, ମୁଣ୍ଡବ୍ୟଥା, ରିଡିଂ ମୋଡ୍, ନାଇଟ୍ ମୋଡ୍, ଉଜ୍ଜ୍ୱଳତା କମାନ୍ତୁ, ହ୍ୱାଇଟ୍ ପଏଣ୍ଟ"</string>
     <string name="keywords_accessibility" msgid="4263443239404659143">"ବ୍ୟବହାର କରିବା ପାଇଁ ସହଜ, ଆକ୍ସେସ୍ କରିବାକୁ ସହଜ, ସହାୟତା, ସହାୟକ"</string>
     <string name="keywords_magnification" msgid="3908145308269840862">"ୱିଣ୍ଡୋ ମ୍ୟାଗ୍ନିଫାୟର୍, ଜୁମ୍, ମ୍ୟାଗ୍ନିଫିକେସନ୍, କମ୍ ଦେଖାଯାଉଥିବା, ବଡ଼ କରନ୍ତୁ, ଆହୁରି ବଡ଼ କରନ୍ତୁ"</string>
@@ -2587,7 +2562,7 @@
     <string name="print_settings_title" msgid="7680498284751129935">"ପ୍ରିଣ୍ଟ ସେବା"</string>
     <string name="print_no_services_installed" msgid="7554057966540602692">"କୌଣସି ସେବା ଇନଷ୍ଟଲ୍‌ ହୋଇନାହିଁ"</string>
     <string name="print_no_printers_found" msgid="4833082484646109486">"କୌଣସି ପ୍ରିଣ୍ଟର୍ ମିଳିଲା ନାହିଁ"</string>
-    <string name="print_menu_item_settings" msgid="8202755044784599740">"ସେଟିଂସ୍"</string>
+    <string name="print_menu_item_settings" msgid="8202755044784599740">"ସେଟିଂସ"</string>
     <string name="print_menu_item_add_printers" msgid="7958192149202584039">"ପ୍ରିଣ୍ଟର ଯୋଡ଼ନ୍ତୁ"</string>
     <string name="print_feature_state_on" msgid="7132063461008624685">"ଚାଲୁ"</string>
     <string name="print_feature_state_off" msgid="1466195699995209446">"ବନ୍ଦ"</string>
@@ -2795,10 +2770,10 @@
     <string name="usage_type_actual_power" msgid="1221358930299037926">"ପରିଲକ୍ଷିତ ଶକ୍ତିର ବ୍ୟବହାର"</string>
     <string name="battery_action_stop" msgid="6998228610098034316">"ବାଧ୍ୟତାର ସହ ବନ୍ଦ କରନ୍ତୁ"</string>
     <string name="battery_action_app_details" msgid="7201369216798227707">"ଏପ ତଥ୍ୟ"</string>
-    <string name="battery_action_app_settings" msgid="2437124469335488464">"ଆପ୍‌ ସେଟିଂସ୍"</string>
-    <string name="battery_action_display" msgid="6515712081248863749">"ସ୍କ୍ରୀନ୍‌ ସେଟିଙ୍ଗ୍ସ"</string>
-    <string name="battery_action_wifi" msgid="1829212604573932607">"Wi‑Fi ସେଟିଂସ୍"</string>
-    <string name="battery_action_bluetooth" msgid="4723692623358386789">"ବ୍ଲୁଟୂଥ୍‍‌ ସେଟିଙ୍ଗ"</string>
+    <string name="battery_action_app_settings" msgid="2437124469335488464">"ଆପ ସେଟିଂସ"</string>
+    <string name="battery_action_display" msgid="6515712081248863749">"ସ୍କ୍ରିନ ସେଟିଂସ"</string>
+    <string name="battery_action_wifi" msgid="1829212604573932607">"ୱାଇ-ଫାଇ ସେଟିଂସ"</string>
+    <string name="battery_action_bluetooth" msgid="4723692623358386789">"ବ୍ଲୁଟୂଥ୍‍‌ ସେଟିଂସ"</string>
     <string name="battery_desc_voice" msgid="6900799826084022585">"ଭଏସ୍‌ କଲରେ ବ୍ୟବହୃତ ବ୍ୟାଟେରୀ"</string>
     <string name="battery_desc_standby" product="tablet" msgid="5818742458684767043">"ଟାବ୍‌ଲେଟ୍‌ ନିଷ୍କ୍ରିୟ ଥିବାବେଳେ ବ୍ୟାଟେରୀ ବ୍ୟବହୃତ ହୋଇଥାଏ"</string>
     <string name="battery_desc_standby" product="default" msgid="2543075041964578103">"ନିଷ୍କ୍ରିୟ ଫୋନରେ ବ୍ୟବହୃତ ବ୍ୟାଟେରୀ"</string>
@@ -2816,7 +2791,7 @@
     <string name="battery_desc_apps" msgid="4187483940383266017">"ଆପ୍‌ ଦ୍ୱାରା ବ୍ୟବହୃତ ବ୍ୟାଟେରୀ"</string>
     <string name="battery_sugg_apps_info" msgid="4796917242296658454">"ଆପ୍‌କୁ ବନ୍ଦ କିମ୍ୱା ଅନ୍‌ଇନ୍‌ଷ୍ଟଲ୍‌ କରନ୍ତୁ"</string>
     <string name="battery_sugg_apps_gps" msgid="7221335088647925110">"ବ୍ୟାଟେରୀ-ସେଭିଙ୍ଗ ମୋଡ୍‌ ଚୟନ କରନ୍ତୁ"</string>
-    <string name="battery_sugg_apps_settings" msgid="6527223370162382166">"ଏପ ବ୍ୟବହାର ଦ୍ୱାରା ବ୍ୟାଟେରୀ ବ୍ୟବହାର କମ କରାଯାଇପାରେ"</string>
+    <string name="battery_sugg_apps_settings" msgid="6527223370162382166">"ବ୍ୟାଟେରୀର ବ୍ୟବହାର କମ୍ କରିବାକୁ ଆପରେ ସେଟିଂସ ଥାଇପାରେ"</string>
     <string name="battery_desc_users" msgid="1959428568888686847">"ଉପଭୋକ୍ତା ବ୍ୟବହୃତ ବ୍ୟାଟେରୀ"</string>
     <string name="battery_desc_unaccounted" msgid="1649497860893660763">"ବ୍ୟାଟେରୀର ଅନ୍ୟାନ୍ୟ ବ୍ୟବହାର"</string>
     <string name="battery_msg_unaccounted" msgid="5647345548624995064">"ବ୍ୟାଟେରୀ ବ୍ୟବହାର ହେଉଛି ପାୱର୍‌ ବ୍ୟବହାରର ଏକ ନିକଟତା ଏବଂ ବ୍ୟାଟେରୀ ସରିବାର ପ୍ରତ୍ୟେକ ଉତ୍ସକୁ ମିଶାଏ ନାହିଁ। ବ୍ୟାଟେରୀରେ ଦେଖାଯାଇଥିବା ହାରାହାରି ବ୍ୟବହାର ଏବଂ ପ୍ରକୃତରେ ସରିଥିବା ପାୱର୍‌ର ଗଣନା ମଧ୍ୟରେ ଭିନ୍ନତାକୁ ମିସେଲେନିଅସ୍‌ କୁହାଯାଏ।"</string>
@@ -2935,17 +2910,17 @@
     <string name="menu_proc_stats_type_foreground" msgid="9011432748521890803">"ଫୋର୍‌ଗ୍ରାଉଣ୍ଡ"</string>
     <string name="menu_proc_stats_type_cached" msgid="1351321959600144622">"କ୍ୟାଶ୍‌ ହୋଇଛି"</string>
     <string name="voice_input_output_settings" msgid="1055497319048272051">"ଭଏସ୍‌ ଇନ୍‌ପୁଟ୍‌‍ ଓ ଆଉଟ୍‌ପୁଟ୍‌"</string>
-    <string name="voice_input_output_settings_title" msgid="6449454483955543064">"ଭଏସ୍‌ ଇନପୁଟ୍‌ ଓ ଆଉଟପୁଟ୍‌ ସେଟିଙ୍ଗ"</string>
+    <string name="voice_input_output_settings_title" msgid="6449454483955543064">"ଭଏସ ଇନପୁଟ ଓ ଆଉଟପୁଟ ସେଟିଂସ"</string>
     <string name="voice_search_settings_title" msgid="228743187532160069">"ଭଏସ୍‌ ସନ୍ଧାନ"</string>
     <string name="keyboard_settings_title" msgid="2199286020368890114">"Android କୀବୋର୍ଡ"</string>
-    <string name="voice_input_settings" msgid="105821652985768064">"ଭଏସ୍‌ ଇନ୍‌ପୁଟ୍ ସେଟିଙ୍ଗ"</string>
+    <string name="voice_input_settings" msgid="105821652985768064">"ଭଏସ ଇନପୁଟ ସେଟିଂସ"</string>
     <string name="voice_input_settings_title" msgid="3708147270767296322">"ଭଏସ୍‌ ଇନପୁଟ୍"</string>
     <string name="voice_service_preference_section_title" msgid="4807795449147187497">"ଭଏସ୍‌ ଇନପୁଟ୍‌ ସେବାମାନ"</string>
     <string name="voice_interactor_preference_summary" msgid="3942881638813452880">"ସମ୍ପୂର୍ଣ୍ଣ hotword ଓ ଯୋଗାଯୋଗ"</string>
     <string name="voice_recognizer_preference_summary" msgid="9195427725367463336">"କଥା ରୁ ଲେଖା"</string>
     <string name="voice_interaction_security_warning" msgid="7962884055885987671">"ଏହି ଭଏସ୍‌ ଇନପୁଟ୍‌ ସେବା ସର୍ବଦା-ଅନ୍‌ ଭଏସ୍‌ ନୀରିକ୍ଷଣ ସମ୍ପାଦନ କରିପାରିବ ଏବଂ ଆପଣଙ୍କ ତରଫରୁ ଭଏସ୍‌ ସକ୍ଷମ ହୋଇଥିବା ଆପ୍ଲିକେସନଗୁଡିକ ନିୟନ୍ତ୍ରଣ କରିପାରିବେ। ଏହା <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g> ଆପ୍ଲିକେସନରୁ ଆସିଥାଏ। ଏହି ସେବାର ବ୍ୟବହାର ସକ୍ଷମ କରିବେ?"</string>
     <string name="tts_engine_preference_title" msgid="7808775764174571132">"ନିଜ ପସନ୍ଦର ଇଞ୍ଜିନ୍"</string>
-    <string name="tts_engine_settings_title" msgid="1298093555056321577">"ଇଞ୍ଜିନ ସେଟିଂସ୍"</string>
+    <string name="tts_engine_settings_title" msgid="1298093555056321577">"ଇଞ୍ଜିନ ସେଟିଂସ"</string>
     <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>
@@ -3014,19 +2989,19 @@
     <string name="backup_section_title" msgid="6539706829848457794">"ବ୍ୟାକ୍‌ଅପ୍‌ ଓ ରିଷ୍ଟୋର୍‌"</string>
     <string name="personal_data_section_title" msgid="6368610168625722682">"ବ୍ୟକ୍ତିଗତ ଡାଟା"</string>
     <string name="backup_data_title" msgid="507663517227498525">"ମୋ ଡାଟାର ବ୍ୟାକ୍‌ଅପ୍‌ ନିଅ"</string>
-    <string name="backup_data_summary" msgid="8054551085241427531">"Google ସର୍ଭର୍‌ରେ ଆପ୍‌ ଡାଟା ବ୍ୟାକ୍‌ଅପ୍‌, ୱାଇ-ଫାଇ ପାସ୍‌ୱର୍ଡ ଓ ଅନ୍ୟାନ୍ୟ ସେଟିଙ୍ଗଗୁଡ଼ିକ"</string>
+    <string name="backup_data_summary" msgid="8054551085241427531">"Google ସର୍ଭରରେ ଆପ ଡାଟା, ୱାଇ-ଫାଇ ପାସୱାର୍ଡ ଓ ଅନ୍ୟ ସେଟିଂସର ବ୍ୟାକଅପ ନିଅନ୍ତୁ"</string>
     <string name="backup_configure_account_title" msgid="8574055186903658842">"ବ୍ୟାକ-ଅପ ଆକାଉଣ୍ଟ"</string>
     <string name="backup_data_management_title" msgid="6596830198441939702">"ବ୍ୟାକ‍ଅପ୍ ଆକାଉଣ୍ଟକୁ ପରିଚାଳନା କରନ୍ତୁ"</string>
     <string name="include_app_data_title" msgid="2969603876620594523">"ଆପ୍‌ ଡାଟା ମିଶାନ୍ତୁ"</string>
     <string name="auto_restore_title" msgid="4124345897936637561">"ସ୍ୱଚାଳିତ ରିଷ୍ଟୋର୍"</string>
-    <string name="auto_restore_summary" msgid="6830198851045584001">"ଏକ ଆପ୍‌ ପୁନଃସଂସ୍ଥାପନ କରିବା ବେଳେ, ବ୍ୟାକଅପ୍‌ ନିଆଯାଇଥିବା ସେଟିଙ୍ଗ ତଥା ଡାଟା ପୁନଃଷ୍ଟୋର୍‌ କରନ୍ତୁ"</string>
+    <string name="auto_restore_summary" msgid="6830198851045584001">"ଏକ ଆପ ପୁନଃସଂସ୍ଥାପନ କରିବା ବେଳେ, ବ୍ୟାକଅପ ନିଆଯାଇଥିବା ସେଟିଂସ ତଥା ଡାଟାକୁ ରିଷ୍ଟୋର କରନ୍ତୁ"</string>
     <string name="backup_inactive_title" msgid="6753265378043349277">"ବ୍ୟାକ୍‌ଅପ୍‌ ସେବା ସକ୍ରିୟ ନାହିଁ"</string>
     <string name="backup_configure_account_default_summary" msgid="5323225330966306690">"ବ୍ୟାକ୍‌ଅପ୍‌ କରାଯାଇଥିବା ଡାଟାକୁ ଏବେ କୌଣସି ଆକାଉଣ୍ଟ ଷ୍ଟୋର୍‌ କରୁନାହିଁ"</string>
     <string name="backup_erase_dialog_title" msgid="5892431263348766484"></string>
-    <string name="backup_erase_dialog_message" msgid="2250872501409574331">"ଆପଣଙ୍କ ୱାଇ-ଫାଇ ପାସ୍‌ୱର୍ଡ, ବୁକ୍‌ମାର୍କ, ଅନ୍ୟାନ୍ୟ ସେଟିଙ୍ଗଗୁଡ଼ିକ ତଥା ଆପ୍‌ ଡାଟା ବ୍ୟାକ୍‌‌ଅପ୍‌ ନେବା ବନ୍ଦ କରି Google ସର୍ଭର୍‌ରୁ ସମସ୍ତ କପୀଗୁଡ଼ିକ ଲିଭାଇବେ?"</string>
-    <string name="fullbackup_erase_dialog_message" msgid="2379053988557486162">"ଡିଭାଇସ୍‌ ଡାଟା (ଯେପରି ୱାଇ-ଫାଇ ପାସ୍‌ୱର୍ଡ ଓ କଲ୍‌ ଇତିହାସ) ଓ ଆପ୍‌ ଡାଟା (ଯେପରି ଆପ୍‌ଗୁଡ଼ିକ ଦ୍ୱାରା ଷ୍ଟୋର୍‌ କରାଯାଇଥିବା ସେଟିଙ୍ଗ ଓ ଫାଇଲ୍‌ଗୁଡ଼ିକ)ର ବ୍ୟାକ୍‌ଅପ୍‌ ବନ୍ଦ କରି ରିମୋଟ୍‌ ସର୍ଭର୍‌ରୁ ସମସ୍ତ ନକଲ ଉଡ଼ାଇଦେବେ?"</string>
-    <string name="fullbackup_data_summary" msgid="971587401251601473">"ଦୂରରୁ ଡିଭାଇସ୍‌ ଡାଟା (ଯେପରିକି ୱାଇ-ଫାଇ ପାସ୍‌ୱାର୍ଡ‌ ଏବଂ କଲ୍‌ର ଇତିବୃତି) ଏବଂ ଆପ୍‌ ଡାଟା (ଯେପରିକି ସେଟିଙ୍ଗ ଏବଂ ଆପ୍‌ ଦ୍ୱାରା ଷ୍ଟୋର୍‌ କରାଯାଇଥିବା ଫାଇଲ୍‌ଗୁଡ଼ିକ) ନିଜକୁ ନିଜ ବ୍ୟାକ୍‌ ଅପ୍‌ ନିଅନ୍ତୁ।\n\n ନିଜକୁ ନିଜ ବ୍ୟାକ୍‌ଅପ୍‌ ଆପଣ ଚାଲୁ କରିବା ବେଳେ, ଡିଭାଇସ୍‌ ଏବଂ ଆପ୍‌ ଡାଟା ସମୟାନୁକ୍ରମେ ଦୂରରୁ ସେଭ୍ କରାଯାଇଥାଏ। ଆପ୍‌ ଡାଟା, ସମ୍ବେଦନଶୀଳ ଡାଟା ଯେପରିକି ସମ୍ପର୍କ, ବାର୍ତ୍ତା କିମ୍ବା ଫଟୋଗୁଡ଼ିକ ଅନ୍ତର୍ଭୂକ୍ତ କରି, ଯେକୌଣସି ଡାଟା ହୋଇପାରେ ଯାହା ଏକ ଆପ୍‌ ସଞ୍ଚୟ କରିଥାଏ (ଡେଭଲପର୍‌ ସେଟିଙ୍ଗକୁ ଆଧାର କରି)।"</string>
-    <string name="device_admin_settings_title" msgid="31392408594557070">"ଡିଭାଇସ୍‌ ପ୍ରଶାସକ ସେଟିଙ୍ଗ"</string>
+    <string name="backup_erase_dialog_message" msgid="2250872501409574331">"ଆପଣଙ୍କ ୱାଇ-ଫାଇ ପାସୱାର୍ଡ, ବୁକମାର୍କ, ଅନ୍ୟାନ୍ୟ ସେଟିଂସ ତଥା ଆପ ଡାଟାର ବ୍ୟାକଅପ ନେବା ବନ୍ଦ କରି Google ସର୍ଭରରୁ ସମସ୍ତ କପିଗୁଡ଼ିକ ଲିଭାଇବେ?"</string>
+    <string name="fullbackup_erase_dialog_message" msgid="2379053988557486162">"ଡିଭାଇସ ଡାଟା (ଯେପରି ୱାଇ-ଫାଇ ପାସୱାର୍ଡ ଏବଂ କଲ ଇତିହାସ) ଏବଂ ଆପ ଡାଟା (ଯେପରି ଆପ୍ସ ଦ୍ୱାରା ଷ୍ଟୋର କରାଯାଇଥିବା ସେଟିଂସ ଓ ଫାଇଲଗୁଡ଼ିକ)ର ବ୍ୟାକଅପ ବନ୍ଦ କରି ରିମୋଟ ସର୍ଭରରୁ ସମସ୍ତ କପି ଲିଭାଇଦେବ?"</string>
+    <string name="fullbackup_data_summary" msgid="971587401251601473">"ଦୂରରୁ ଡିଭାଇସ ଡାଟା (ଯେପରିକି ୱାଇ-ଫାଇ ପାସୱାର୍ଡ‌ ଏବଂ କଲ ଇତିହାସ) ଏବଂ ଆପ ଡାଟା (ଯେପରିକି ସେଟିଂସ ଏବଂ ଆପ ଦ୍ୱାରା ଷ୍ଟୋର କରାଯାଇଥିବା ଫାଇଲଗୁଡ଼ିକ)ର ସ୍ଵଚାଳିତ ଭାବେ ବ୍ୟାକଅପ ନିଅନ୍ତୁ।\n\n ଯେତେବେଳେ ଆପଣ ସ୍ଵଚାଳିତ ବ୍ୟାକଅପକୁ ଚାଲୁ କରନ୍ତି, ସେତେବେଳେ ଡିଭାଇସ ଏବଂ ଆପ ଡାଟା ଥର କୁ ଥର ଦୂରରୁ ସେଭ ହୁଏ। ଆପ ଡାଟା, ସମ୍ଭାବ୍ୟ ସମ୍ବେଦନଶୀଳ ତଥ୍ୟ ଯେପରିକି ସମ୍ପର୍କ, ବାର୍ତ୍ତା, ଏବଂ ଫଟୋକୁ ଅନ୍ତର୍ଭୁକ୍ତ କରି ଯେକୌଣସି ଡାଟା ହୋଇପାରେ ଯାହା ଏକ ଆପ ସେଭ କରିଥାଏ (ଡେଭେଲପର ସେଟିଂସ ଆଧାରରେ)।"</string>
+    <string name="device_admin_settings_title" msgid="31392408594557070">"ଡିଭାଇସ ଆଡମିନ ସେଟିଂସ"</string>
     <string name="active_device_admin_msg" msgid="7744106305636543184">"ଡିଭାଇସ୍‌ ଆଡମିନ୍‌ ଆପ୍‌"</string>
     <string name="remove_device_admin" msgid="3143059558744287259">"ଏହି ଡିଭାଇସ୍‌ର ଆଡମିନ୍‌ ଆପ୍‌କୁ ନିଷ୍କ୍ରିୟ କରନ୍ତୁ"</string>
     <string name="uninstall_device_admin" msgid="4481095209503956916">"ଆପ୍‌ ଅଣସଂସ୍ଥାପନ କରନ୍ତୁ"</string>
@@ -3042,7 +3017,7 @@
     <string name="device_admin_status" msgid="6332571781623084064">"ଏହି ଆଡମିନ୍‌ ଆପ୍‌ ସକ୍ରିୟ ଅଛି ଏବଂ <xliff:g id="APP_NAME">%1$s</xliff:g> ଆପ୍‌ ଦ୍ୱାରା ନିମ୍ନଲିଖିତ କାର୍ଯ୍ୟଗୁଡ଼ିକ କରାଉଛି:"</string>
     <string name="profile_owner_add_title" msgid="2774489881662331549">"ପ୍ରୋଫାଇଲ୍‌ ମ୍ୟାନେଜର୍‌ ସକ୍ରିୟ କରିବେ?"</string>
     <string name="profile_owner_add_title_simplified" msgid="2320828996993774182">"ନିରୀକ୍ଷଣ ପାଇଁ ଅନୁମତି ଦେବେ?"</string>
-    <string name="adding_profile_owner_warning" msgid="6868275476058020513">"ଆଗକୁ ବଢ଼ିବାର ଅର୍ଥ, ଆପଣଙ୍କ ବ୍ୟବହାରକର୍ତ୍ତା ଆପଣଙ୍କ ପ୍ରଶାସକ ଦ୍ୱାରା ପରିଚାଳିତ ହେବେ ଯିଏ ଆପଣଙ୍କ ବ୍ୟକ୍ତିଗତ ଡାଟା ସହିତ, ସମ୍ପର୍କିତ ଅନ୍ୟାନ୍ୟ ଡାଟା ମଧ୍ୟ ଷ୍ଟୋର୍‌ କରି ପାରିବେ।\n\nଆପଣଙ୍କ ପ୍ରଶାସକଙ୍କ ପାଖରେ ନେଟ୍‌ୱର୍କ ସମ୍ପର୍କିତ କାର୍ଯ୍ୟକଳାପ ଏବଂ ଆପଣଙ୍କ ଡିଭାଇସ୍‌ର ଲୋକେଶନ୍‌ର ତଥ୍ୟ ଅନ୍ତର୍ଭୂକ୍ତ କରି ସେଟିଙ୍ଗ, ଆକସେସ୍‌, ଆପ୍‌ ଏବଂ ଏହି ବ୍ୟବହାରକର୍ତ୍ତାଙ୍କ ସହ ଜଡ଼ିତ ଡାଟା ନୀରିକ୍ଷଣ କରିବା ତଥା ପରିଚାଳନା କରିବାର ଦକ୍ଷତା ରହିଛି।"</string>
+    <string name="adding_profile_owner_warning" msgid="6868275476058020513">"ଆଗକୁ ବଢି, ଆପଣଙ୍କ ଉପଯୋଗକର୍ତ୍ତା ଆପଣଙ୍କର ଆଡମିନ ଦ୍ୱାରା ପରିଚାଳିତ ହେବ ଯିଏ ଆପଣଙ୍କ ବ୍ୟକ୍ତିଗତ ଡାଟା ସହିତ, ସମ୍ବନ୍ଧିତ ଡାଟା ମଧ୍ୟ ଷ୍ଟୋର କରି ପାରିବେ।\n\nଆପଣଙ୍କ ଆଡମିନର ନେଟୱାର୍କ କାର୍ଯ୍ୟକଳାପ ଏବଂ ଆପଣଙ୍କ ଡିଭାଇସର ଲୋକେସନ ସୂଚନା ସମେତ ସେଟିଂସ, ଆକ୍ସେସ, ଆପ୍ସ ଏବଂ ଏହି ଉପଯୋଗକର୍ତ୍ତାଙ୍କ ସହ ଜଡ଼ିତ ଡାଟା ତଦାରଖ କରିବା ତଥା ପରିଚାଳନା କରିବାର ଦକ୍ଷତା ଅଛି।"</string>
     <string name="admin_disabled_other_options" msgid="8122039047419172139">"ଆଡମିନ ଅକ୍ଷମ କରିଥିବା ଅନ୍ୟାନ୍ୟ ବିକଳ୍ପମାନ"</string>
     <string name="admin_more_details" msgid="4928985331640193758">"ଅଧିକ ଜାଣନ୍ତୁ"</string>
     <string name="notification_log_title" msgid="2812594935014664891">"ବିଜ୍ଞପ୍ତି ଲଗ୍‌"</string>
@@ -3080,8 +3055,8 @@
     <string name="sync_error" msgid="846923369794727644">"ସିଙ୍କ୍‌ରେ ତ୍ରୁଟି"</string>
     <string name="last_synced" msgid="1527008461298110443">"<xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g> ରେ ଶେଷଥର ସିଙ୍କ ହୋଇଥିଲା"</string>
     <string name="sync_in_progress" msgid="6200093151211458977">"ଏବେ ସିଙ୍କ କରୁଛି…"</string>
-    <string name="settings_backup" msgid="5357973563989458049">"ବ୍ୟାକ୍‌ଅପ୍‌ ସେଟିଙ୍ଗ୍‌"</string>
-    <string name="settings_backup_summary" msgid="6803046376335724034">"ମୋ ସେଟିଙ୍ଗଗୁଡ଼ିକର ବ୍ୟାକ୍‌ଅପ୍‌ ନିଅ"</string>
+    <string name="settings_backup" msgid="5357973563989458049">"ବ୍ୟାକଅପ ସେଟିଂସ"</string>
+    <string name="settings_backup_summary" msgid="6803046376335724034">"ମୋ ସେଟିଂସର ବ୍ୟାକଅପ ନିଅ"</string>
     <string name="sync_menu_sync_now" msgid="3948443642329221882">"ବର୍ତ୍ତମାନ ସିଙ୍କ କରନ୍ତୁ"</string>
     <string name="sync_menu_sync_cancel" msgid="2422994461106269813">"ସିଙ୍କ୍‌ ବାତିଲ୍‌‌ କରନ୍ତୁ"</string>
     <string name="sync_one_time_sync" msgid="8114337154112057462">"<xliff:g id="LAST_SYNC_TIME">
@@ -3090,10 +3065,10 @@
     <string name="sync_calendar" msgid="4603704438090387251">"କ୍ୟାଲେଣ୍ଡର୍"</string>
     <string name="sync_contacts" msgid="2376465611511325472">"ସମ୍ପର୍କ"</string>
     <string name="sync_plug" msgid="7956982719077985381"><font fgcolor="#ffffffff">"Google ସିଙ୍କକୁ ସ୍ୱାଗତ!"</font>" \nଆପଣ ଯେଉଁଠି ବି ଥାଆନ୍ତୁ ନାଁ କାହିଁକି ଆପଣଙ୍କ ସମ୍ପର୍କ, ଆପଏଣ୍ଟମେଣ୍ଟ ଏବଂ ଆହୁରି ଅନେକ କିଛିକୁ ଆକସେସ୍‌ ଅନୁମତି ଦେବା ପାଇଁ ଡାଟା ସିଙ୍କ କରିବାକୁ Google ର ଏକ ପ୍ରୟାସ।"</string>
-    <string name="header_application_sync_settings" msgid="7427706834875419243">"ଆପ୍‌ ସିଙ୍କ ସେଟିଙ୍ଗ"</string>
+    <string name="header_application_sync_settings" msgid="7427706834875419243">"ଆପ ସିଙ୍କ ସେଟିଂସ"</string>
     <string name="header_data_and_synchronization" msgid="453920312552838939">"ତାରିଖ ଓ ସିଙ୍କ୍ରୋନାଇଜେଶନ୍‌"</string>
     <string name="preference_change_password_title" msgid="5465821666939825972">"ପାସ୍‌ୱର୍ଡ ବଦଳାନ୍ତୁ"</string>
-    <string name="header_account_settings" msgid="1189339410278750008">"ଆକାଉଣ୍ଟ ସେଟିଂସ୍"</string>
+    <string name="header_account_settings" msgid="1189339410278750008">"ଆକାଉଣ୍ଟ ସେଟିଂସ"</string>
     <string name="remove_account_label" msgid="4169490568375358010">"ଆକାଉଣ୍ଟ କାଢ଼ିଦିଅନ୍ତୁ"</string>
     <string name="header_add_an_account" msgid="3919151542338822661">"ଗୋଟିଏ ଆକାଉଣ୍ଟ ଯୋଗ କରନ୍ତୁ"</string>
     <string name="really_remove_account_title" msgid="253097435885652310">"ଆକାଉଣ୍ଟ କାଢ଼ିଦେବେ?"</string>
@@ -3103,14 +3078,6 @@
     <string name="remove_account_failed" msgid="3709502163548900644">"ଏହି ପରିବର୍ତ୍ତନ ପାଇଁ ଆପଣଙ୍କ ଆଡମିନ୍‌ ଅନୁମତି ଦେଇନାହାନ୍ତି"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"ମାନୁଆଲୀ ସିଙ୍କ କରିପାରିବ ନାହିଁ"</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"ଏହି ଆଇଟମ୍‌ ପାଇଁ ସିଙ୍କ୍‌ କରିବା ବର୍ତ୍ତମାନ ଅକ୍ଷମ କରାଯାଇଛି। ଏହି ସେଟିଙ୍ଗ ପରିବର୍ତ୍ତନ କରିବାକୁ, ସାମୟିକ ଭାବେ ବ୍ୟାକ୍‌ଗ୍ରାଉଣ୍ଡ ଡାଟା ଏବଂ ଅଟୋମେଟିକ୍‌ ସିଙ୍କ୍‌ ଅନ୍‌ କରନ୍ତୁ।"</string>
-    <string name="enter_password" msgid="6327051330258595331">"Android ଆରମ୍ଭ କରିବା ପାଇଁ, ନିଜ ପାସୱର୍ଡ ଦିଅନ୍ତୁ"</string>
-    <string name="enter_pin" msgid="1029287617551232681">"Android ଆରମ୍ଭ କରିବା ପାଇଁ ନିଜର PIN ଦିଅନ୍ତୁ"</string>
-    <string name="enter_pattern" msgid="1747316785866742960">"Android ଆରମ୍ଭ କରିବା ପାଇଁ ନିଜର ପାଟର୍ନ ଆଙ୍କନ୍ତୁ"</string>
-    <string name="cryptkeeper_wrong_pattern" msgid="340747269176120242">"ଭୁଲ ପାଟର୍ନ"</string>
-    <string name="cryptkeeper_wrong_password" msgid="7295607881887114486">"ଭୁଲ ପାସ୍‌ୱର୍ଡ"</string>
-    <string name="cryptkeeper_wrong_pin" msgid="2347961593970714201">"ଭୁଲ PIN"</string>
-    <string name="checking_decryption" msgid="6111642972615688237">"ଯାଞ୍ଚ କରାଯାଉଛି…"</string>
-    <string name="starting_android" msgid="6694154070215356186">"Android ଆରମ୍ଭ କରୁଛି…"</string>
     <string name="delete" msgid="8330605554706263775">"ଡିଲିଟ୍‌ କରନ୍ତୁ"</string>
     <string name="misc_files" msgid="6598066985800749585">"ଅନ୍ୟାନ୍ୟ ଫାଇଲ୍‌ଗୁଡ଼ିକ"</string>
     <string name="misc_files_selected_count" msgid="5597802791672749532">"<xliff:g id="TOTAL">%2$d</xliff:g> ମଧ୍ୟରୁ <xliff:g id="NUMBER">%1$d</xliff:g> ଚୟନିତ"</string>
@@ -3164,12 +3131,12 @@
     <string name="data_roaming_enable_mobile" msgid="5745287603577995977">"ରୋମିଙ୍ଗ"</string>
     <string name="data_usage_forground_label" msgid="5762048187044975428">"ଫୋର୍‌ଗ୍ରାଉଣ୍ଡ:"</string>
     <string name="data_usage_background_label" msgid="5363718469293175279">"ବ୍ୟାକ୍‌ଗ୍ରାଉଣ୍ଡ"</string>
-    <string name="data_usage_app_settings" msgid="5693524672522122485">"ଆପ୍‌ ସେଟିଙ୍ଗ"</string>
+    <string name="data_usage_app_settings" msgid="5693524672522122485">"ଆପ ସେଟିଂସ"</string>
     <string name="data_usage_app_restrict_background" msgid="5728840276368097276">"ପୃଷ୍ଠପଟର ଡାଟା"</string>
     <string name="data_usage_app_restrict_background_summary" msgid="2997942775999602794">"ବ୍ୟାକ୍‌ଗ୍ରାଉଣ୍ଡରେ ମୋବାଇଲ୍‌ ଡାଟାର ବ୍ୟବହାରକୁ ସକ୍ଷମ କରନ୍ତୁ"</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="8213268097024597864">"ଏହି ଆପ୍‌ ପାଇଁ ବ୍ୟାକ୍‌ଗ୍ରାଉଣ୍ଡ ଡାଟା ରୋକିବାକୁ, ପ୍ରଥମେ ମୋବାଇଲ୍‌ ଡାଟାର ଏକ ସୀମା ସେଟ୍‌ କରନ୍ତୁ।"</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="5383874438677899255">"ପୃଷ୍ଠପଟର ଡାଟା ପ୍ରତିବନ୍ଧିତ କରିବେ?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="5534272311979978297">"ଯେତେବେଳେ କେବଳ ମୋବାଇଲ୍‌ ଡାଟା ଉପଲବ୍ଧ ଥାଏ, ଏହି ସୁବିଧାଟି ବ୍ୟାକ୍‌ଗ୍ରାଉଣ୍ଡ ଡାଟା ଉପରେ ନିର୍ଭର କରୁଥିବା ଆପ୍‌କୁ ଅଚଳ କରି ଦେଇପାରେ।\n\nଆପ୍‌ ମଧ୍ୟରେ ଥିବା ସେଟିଙ୍ଗରେ ଡାଟା ବ୍ୟବହାରର ଅଧିକ ଉପଯୁକ୍ତ ନିୟନ୍ତ୍ରଣଗୁଡ଼ିକ ରହିଛି।"</string>
+    <string name="data_usage_app_restrict_dialog" msgid="5534272311979978297">"ଯେତେବେଳେ କେବଳ ମୋବାଇଲ ଡାଟା ଉପଲବ୍ଧ ଥାଏ, ଏହି ସୁବିଧାଟି ବ୍ୟାକ୍‌ଗ୍ରାଉଣ୍ଡ ଡାଟା ଉପରେ ନିର୍ଭର କରୁଥିବା ଆପକୁ ବନ୍ଦ କରିପାରେ।\n\nଆପ ମଧ୍ୟରେ ଥିବା ସେଟିଂସରେ ଡାଟା ବ୍ୟବହାରର ଅଧିକ ଉପଯୁକ୍ତ ନିୟନ୍ତ୍ରଣଗୁଡ଼ିକ ପାଇପାରିବେ।"</string>
     <string name="data_usage_restrict_denied_dialog" msgid="8599940395497268584">"ଏକ ମୋବାଇଲ୍‌ ଡାଟା ସୀମା ସେଟ୍‌ କରିଥିଲେ ହିଁ ବ୍ୟାକ୍‌ଗ୍ରାଉଣ୍ଡ ଡାଟାକୁ ରୋକିହେବ।"</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2048411447974361181">"ସ୍ୱଚାଳିତ-ସିଙ୍କ ଡାଟା ଅନ୍ କରିବେ?"</string>
     <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="6387714350903085918">"ୱେବ୍‌ରେ ଆପଣ ନିଜ ଆକାଉଣ୍ଟରେ ଯାହାକିଛି ବି ପରିବର୍ତ୍ତନ କରିବେ, ତାହା ଅଟୋମେଟିକାଲୀ ଆପଣଙ୍କ ଟାବ୍‌ଲେଟ୍‌କୁ ଚାଲିଆସିବ।\n\nକେତେକ ଆକାଉଣ୍ଟ, ଟାବ୍‌ଲେଟ୍‌ରେ କରାଯାଇଥିବା ପରିବର୍ତ୍ତନକୁ ଅଟୋମେଟିକଲୀ ୱେବ୍‌କୁ ନେଇଯାଆନ୍ତି। ଗୋଟିଏ ଗୁଗଲ୍‌ ଆକାଉଣ୍ଟ, ଏହିପରି କାମ କରିଥାଏ।"</string>
@@ -3206,8 +3173,6 @@
     <string name="data_usage_metered_yes" msgid="4262598072030135223">"ମିଟର୍ଡ"</string>
     <string name="data_usage_metered_no" msgid="1685828958417926268">"ମପାଯାଉନାହିଁ"</string>
     <string name="data_usage_disclaimer" msgid="3271450299386176770">"ଆପଣଙ୍କ ଡିଭାଇସ୍‌ରେ କ୍ୟାରିଅରଙ୍କ ଡାଟା ଗଣନା ଭିନ୍ନ ହୋଇପାରେ।"</string>
-    <string name="cryptkeeper_emergency_call" msgid="8369322820475703306">"ଜରୁରୀକାଳୀନ କଲ୍‌"</string>
-    <string name="cryptkeeper_return_to_call" msgid="3857250752781151232">"କଲ୍‌କୁ ଫେରନ୍ତୁ"</string>
     <string name="vpn_name" msgid="3806456074909253262">"ନାମ"</string>
     <string name="vpn_type" msgid="5533202873260826663">"ପ୍ରକାର"</string>
     <string name="vpn_server" msgid="2908816134941973935">"ସର୍ଭର୍‌ ଠିକଣା"</string>
@@ -3319,9 +3284,9 @@
       <item quantity="one">ସର୍ଟିଫିକେଟ୍‌କୁ ଦେଖନ୍ତୁ</item>
     </plurals>
     <string name="user_settings_title" msgid="6550866465409807877">"ଏକାଧିକ ଉପଯୋଗକର୍ତ୍ତା"</string>
-    <string name="user_settings_footer_text" product="device" msgid="7523914344521302179">"ନୂଆ ୟୁଜର୍‍ ଯୋଡ଼ି ଆପଣଙ୍କ ଡିଭାଇସ୍‍ ସେୟାର୍‍ କରନ୍ତୁ। କଷ୍ଟମ୍‍ ହୋମ୍‍ ସ୍କ୍ରୀନ୍‍, ଆକାଉଣ୍ଟ, ଆପ୍‍, ସେଟିଙ୍ଗ ଏବଂ ଅଧିକ ପାଇଁ ଆପଣଙ୍କ ଡିଭାଇସ୍‍ରେ ପ୍ରତି ୟୁଜର୍‍ଙ୍କର ଏକ ବ୍ୟକ୍ତିଗତ ସ୍ଥାନ ରହିଛି।"</string>
-    <string name="user_settings_footer_text" product="tablet" msgid="3730074318510244552">"ନୂଆ ୟୁଜର୍‍ ଯୋଡ଼ି ଆପଣଙ୍କ ଡିଭାଇସ୍‍ ସେୟାର୍‍ କରନ୍ତୁ। କଷ୍ଟମ୍‍ ହୋମ୍‍ ସ୍କ୍ରୀନ୍‍, ଆକାଉଣ୍ଟ, ଆପ୍‍, ସେଟିଙ୍ଗ ଏବଂ ଅଧିକ ପାଇଁ ଆପଣଙ୍କ ଟାବଲେଟ୍‌ରେ ପ୍ରତି ୟୁଜର୍‍ଙ୍କର ଏକ ବ୍ୟକ୍ତିଗତ ସ୍ଥାନ ରହିଛି।"</string>
-    <string name="user_settings_footer_text" product="default" msgid="4420915712050349125">"ନୂଆ ଉପଯୋଗକର୍ତ୍ତାଙ୍କୁ ଯୋଗ କରି ଆପଣଙ୍କ ଫୋନ୍ ସେୟାର୍‍ କରନ୍ତୁ। କଷ୍ଟମ୍‍ ହୋମ୍‍ ସ୍କ୍ରିନ୍‍, ଆକାଉଣ୍ଟ, ଆପ୍‍, ସେଟିଂସ୍ ଏବଂ ଅଧିକ ପାଇଁ ଆପଣଙ୍କ ଫୋନ୍‌ରେ ପ୍ରତ୍ୟେକ ଉପଯୋଗକର୍ତ୍ତାଙ୍କ ପାଇଁ ଏକ ବ୍ୟକ୍ତିଗତ ସ୍ଥାନ ରହିଛି।"</string>
+    <string name="user_settings_footer_text" product="device" msgid="7523914344521302179">"ନୂଆ ଉପଯୋଗକର୍ତ୍ତାଙ୍କୁ ଯୋଗ କରି ଆପଣଙ୍କ ଡିଭାଇସ ସେୟାର କରନ୍ତୁ। କଷ୍ଟମ ହୋମ ସ୍କ୍ରିନ, ଆକାଉଣ୍ଟ, ଆପ୍ସ, ସେଟିଂସ ଏବଂ ଅଧିକ ପାଇଁ ଆପଣଙ୍କ ଡିଭାଇସରେ ପ୍ରତ୍ୟକ ଉପଯୋଗକର୍ତ୍ତାଙ୍କ ପାଇଁ ଏକ ବ୍ୟକ୍ତିଗତ ସ୍ପେସ ରହିଛି।"</string>
+    <string name="user_settings_footer_text" product="tablet" msgid="3730074318510244552">"ନୂଆ ଉପଯୋଗକର୍ତ୍ତା ଯୋଗ କରି ଆପଣଙ୍କ ଟାବଲେଟ ସେୟାର କରନ୍ତୁ। କଷ୍ଟମ ହୋମ୍‍ ସ୍କ୍ରିନ, ଆକାଉଣ୍ଟ, ଆପ୍ସ, ସେଟିଂସ ଏବଂ ଅଧିକ ପାଇଁ ଆପଣଙ୍କ ଟାବଲେଟରେ ପ୍ରତି ଉପଯୋଗକର୍ତ୍ତାଙ୍କର ଏକ ବ୍ୟକ୍ତିଗତ ସ୍ଥାନ ରହିଛି।"</string>
+    <string name="user_settings_footer_text" product="default" msgid="4420915712050349125">"ନୂଆ ଉପଯୋଗକର୍ତ୍ତାଙ୍କୁ ଯୋଗ କରି ଆପଣଙ୍କ ଫୋନ ସେୟାର୍‍ କରନ୍ତୁ। କଷ୍ଟମ୍ ହୋମ ସ୍କ୍ରିନ, ଆକାଉଣ୍ଟ, ଆପ୍ସ, ସେଟିଂସ ଏବଂ ଆହୁରି ଅଧିକ ପାଇଁ ଆପଣଙ୍କ ଫୋନରେ ପ୍ରତ୍ୟେକ ଉପଯୋଗକର୍ତ୍ତାଙ୍କ ପାଇଁ ଏକ ବ୍ୟକ୍ତିଗତ ସ୍ପେସ୍ ରହିଛି।"</string>
     <string name="user_list_title" msgid="1387379079186123404">"ଉପଯୋଗକର୍ତ୍ତା ଓ ପ୍ରୋଫାଇଲ୍‌"</string>
     <string name="user_add_user_or_profile_menu" msgid="305851380425838287">"ୟୁଜର୍ ବା ପ୍ରୋଫାଇଲ ଯୋଡ଼ନ୍ତୁ"</string>
     <string name="user_add_user_menu" msgid="6395904234221724625">"ଉପଯୋଗକର୍ତ୍ତାଙ୍କୁ ଯୋଗ କରନ୍ତୁ"</string>
@@ -3336,7 +3301,7 @@
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"କେବଳ ଫୋନ୍‌ର ମାଲିକ ଉପଯୋଗକର୍ତ୍ତାଙ୍କୁ ପରିଚାଳନା କରିପାରିବେ।"</string>
     <string name="user_cannot_add_accounts_message" msgid="2351326078338805337">"ପ୍ରତିବନ୍ଧିତ ପ୍ରୋଫାଇଲ୍‌ଗୁଡ଼ିକ ଆକାଉଣ୍ଟ ଆଡ୍‌ କରିପାରିବ ନାହିଁ"</string>
     <string name="user_remove_user_menu" msgid="2183714948094429367">"ଏହି ଡିଭାଇସ୍‌ରୁ <xliff:g id="USER_NAME">%1$s</xliff:g> ଙ୍କୁ ଡିଲିଟ୍‍ କରନ୍ତୁ"</string>
-    <string name="user_lockscreen_settings" msgid="4596612658981942092">"ଲକ୍‌ ସ୍କ୍ରିନ୍‌ ସେଟିଙ୍ଗ"</string>
+    <string name="user_lockscreen_settings" msgid="4596612658981942092">"ଲକ ସ୍କ୍ରିନ ସେଟିଂସ"</string>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"ଲକ୍‌ ସ୍କ୍ରିନ୍‌ରୁ ଉପଯୋଗକର୍ତ୍ତାଙ୍କୁ ଯୋଗ କରନ୍ତୁ"</string>
     <string name="user_confirm_remove_self_title" msgid="926265330805361832">"ନିଜକୁ ଡିଲିଟ୍‌ କରିବେ?"</string>
     <string name="user_confirm_remove_title" msgid="3626559103278006002">"ଏହି ୟୁଜରଙ୍କୁ ଡିଲିଟ୍‍ କରିବେ?"</string>
@@ -3365,10 +3330,10 @@
     <string name="emergency_info_title" msgid="8233682750953695582">"ଜରୁରୀକାଳୀନ ସୂଚନା"</string>
     <string name="emergency_info_summary" msgid="8463622253016757697">"<xliff:g id="USER_NAME">%1$s</xliff:g>ଙ୍କ ପାଇଁ ସୂଚନା ଓ ସମ୍ପର୍କ"</string>
     <string name="open_app_button" msgid="5025229765547191710">"<xliff:g id="APP_NAME">%1$s</xliff:g> ଖୋଲନ୍ତୁ"</string>
-    <string name="more_settings_button" msgid="8988612279031242411">"ଅଧିକ ସେଟିଂସ୍"</string>
+    <string name="more_settings_button" msgid="8988612279031242411">"ଅଧିକ ସେଟିଂସ"</string>
     <string name="application_restrictions" msgid="276179173572729205">"ଆପ୍‌ ଓ ବିଷୟବସ୍ତୁର ଅନୁମତି ଦିଅନ୍ତୁ"</string>
     <string name="apps_with_restrictions_header" msgid="5277698582872267931">"ପ୍ରତିବନ୍ଧକ ସହ ଆପ୍ଲିକେଶନ୍‌ଗୁଡିକ"</string>
-    <string name="apps_with_restrictions_settings_button" msgid="2648355133416902221">"ଆପ୍ଲିକେଶନ୍‌ ପାଇଁ ସେଟିଙ୍ଗ ସମ୍ପ୍ରସାରଣ କରନ୍ତୁ"</string>
+    <string name="apps_with_restrictions_settings_button" msgid="2648355133416902221">"ଆପ୍ଲିକେସନ ପାଇଁ ସେଟିଂସକୁ ବିସ୍ତାର କରନ୍ତୁ"</string>
     <string name="nfc_payment_settings_title" msgid="2043139180030485500">"କଣ୍ଟାକ୍ଟଲେସ୍ ପେମେଣ୍ଟଗୁଡ଼ିକ"</string>
     <string name="nfc_payment_how_it_works" msgid="3658253265242662010">"ଏହା କିପରି କାମ କରେ"</string>
     <string name="nfc_payment_no_apps" msgid="6840001883471438798">"ଷ୍ଟୋର୍‌ରେ ନିଜ ଫୋନ୍ ଦ୍ୱାରା ପୈଠ କରନ୍ତୁ"</string>
@@ -3442,9 +3407,9 @@
     <string name="app_sees_restricted_accounts" msgid="3526008344222566318">"ଏହି ଆପ୍‌ ଆପଣଙ୍କ ଆକାଉଣ୍ଟ ଆକ୍ସେସ୍‌ କରିପାରେ"</string>
     <string name="app_sees_restricted_accounts_and_controlled_by" msgid="8338520379923447143">"ଏହି ଆପ୍‌ ଆପଣଙ୍କ ଆକାଉଣ୍ଟ ଆକସେସ୍‌ କରିପାରିବ। <xliff:g id="APP">%1$s</xliff:g> ଦ୍ୱାରା ନିୟନ୍ତ୍ରିତ"</string>
     <string name="restriction_wifi_config_title" msgid="2630656989926554685">"ୱାଇ-ଫାଇ ଓ ମୋବାଇଲ"</string>
-    <string name="restriction_wifi_config_summary" msgid="920419010472168694">"Wi‑Fi ଏବଂ ମୋବାଇଲ୍‌ ସେଟିଙ୍ଗ ବଦଳାଇବା ଅନୁମତି ଦିଅନ୍ତୁ"</string>
+    <string name="restriction_wifi_config_summary" msgid="920419010472168694">"ୱାଇ-ଫାଇ ଏବଂ ମୋବାଇଲ୍‌ ସେଟିଂସ ବଦଳାଇବାକୁ ଅନୁମତି ଦିଅନ୍ତୁ"</string>
     <string name="restriction_bluetooth_config_title" msgid="220586273589093821">"ବ୍ଲୁଟୁଥ"</string>
-    <string name="restriction_bluetooth_config_summary" msgid="7558879931011271603">"ବ୍ଲୁଟୂଥ୍‍‌ ପେୟାରିଙ୍ଗ ଓ ସେଟିଙ୍ଗକୁ ବଦଳାନ୍ତୁ"</string>
+    <string name="restriction_bluetooth_config_summary" msgid="7558879931011271603">"ବ୍ଲୁଟୂଥ୍‍‌ ପେୟାରିଂ ଏବଂ ସେଟିଂସ ପରିବର୍ତ୍ତନ କରିବାକୁ ଅନୁମତି ଦିଅନ୍ତୁ"</string>
     <string name="restriction_nfc_enable_title" msgid="525512312298242911">"NFC"</string>
     <string name="restriction_nfc_enable_summary_config" msgid="8065688740509581028">"ଏହି <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ଅନ୍ୟ NFC ଡିଭାଇସ୍‌ ସ୍ପର୍ଶ କରିବା ବେଳେ ଡାଟା ପ୍ରତିବଦଳ ଅନୁମତି ଦିଅନ୍ତୁ"</string>
     <string name="restriction_nfc_enable_summary" product="tablet" msgid="6397567147629410131">"ଟାବ୍‌ଲେଟ୍‌ ଅନ୍ୟ ଡିଭାଇସ୍‌କୁ ଛୁଇଁଲେ ଡାଟା ଆଦାନପ୍ରଦାନର ଅନୁମତି ଦିଅନ୍ତୁ"</string>
@@ -3483,7 +3448,7 @@
     <string name="sim_status_title_sim_slot" msgid="4932996839194493313">"SIMର ସ୍ଥିତି (SIM ସ୍ଲଟ୍‌ %1$d)"</string>
     <string name="sim_call_back_title" msgid="4274099761123657464">"ପୂର୍ବ-ନିର୍ଦ୍ଧାରିତ ସିମ୍‌ରୁ କଲ୍‌ ବ୍ୟାକ୍‌"</string>
     <string name="sim_outgoing_call_title" msgid="7759080345748128897">"ଆଉଟ୍‌ଗୋଇଙ୍ଗ କଲ୍‌ ପାଇଁ ସିମ୍‌"</string>
-    <string name="sim_other_call_settings" msgid="5956308869284958883">"ଅନ୍ୟାନ୍ୟ କଲ୍‌ ସେଟିଙ୍ଗ"</string>
+    <string name="sim_other_call_settings" msgid="5956308869284958883">"ଅନ୍ୟ କଲ ସେଟିଂସ"</string>
     <string name="preferred_network_offload_title" msgid="6453199586512609557">"ମନପସନ୍ଦ ନେଟୱାର୍କ୍‌ ଅଫଲୋଡ୍"</string>
     <string name="preferred_network_offload_header" msgid="4842188794016376899">"ନେଟ୍‌ୱର୍କ ନାମ ବ୍ରଡକାଷ୍ଟ ଅକ୍ଷମ କରନ୍ତୁ"</string>
     <string name="preferred_network_offload_footer" msgid="374984523082849648">"ନେଟ୍‌ୱର୍କ ନାମ ବ୍ରଡ୍‌କାଷ୍ଟ ଅକ୍ଷମ ମାଧ୍ୟମରେ ଆପଣଙ୍କ ନେଟ୍‌ୱର୍କ ସୂଚନାକୁ ଆକ୍ସେସ୍‌ କରିବାରୁ ତୃତୀୟ ପକ୍ଷଠାରୁ ରକ୍ଷା କରେ।"</string>
@@ -3494,7 +3459,7 @@
     <string name="sim_calls_ask_first_prefs_title" msgid="3077694594349657933">"ପ୍ରତ୍ୟେକ ଥର ପଚାର"</string>
     <string name="sim_selection_required_pref" msgid="231437651041498359">"ମନୋନୟନ ଆବଶ୍ୟକୀୟ"</string>
     <string name="sim_selection_channel_title" msgid="3193666315607572484">"SIM ଚୟନ"</string>
-    <string name="dashboard_title" msgid="5660733037244683387">"ସେଟିଂସ୍"</string>
+    <string name="dashboard_title" msgid="5660733037244683387">"ସେଟିଂସ"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="6585075562837786847">
       <item quantity="other">ଲୁଚିଥିବା %d ଆଇଟମ୍‌ଗୁଡ଼ିକୁ ଦେଖାନ୍ତୁ</item>
       <item quantity="one">ଲୁଚିଥିବା %d ଆଇଟମ୍ ଦେଖାନ୍ତୁ</item>
@@ -3521,7 +3486,7 @@
     <string name="account_dashboard_default_summary" msgid="1730719656099599488">"ସେଭ୍ କରାଯାଇଥିବା ପାସୱାର୍ଡ, ସ୍ୱତଃପୂରଣ, ସିଙ୍କ୍ କରାଯାଇଥିବା ଆକାଉଣ୍ଟଗୁଡ଼ିକ"</string>
     <string name="app_default_dashboard_title" msgid="4071015747629103216">"ଡିଫଲ୍ଟ ଆପ୍‌"</string>
     <string name="system_dashboard_summary" msgid="7400745270362833832">"ଭାଷା, ଜେଶ୍ଚର, ସମୟ, ବ୍ୟାକଅପ୍‌"</string>
-    <string name="search_results_title" msgid="3360639917793022533">"ସେଟିଂସ୍"</string>
+    <string name="search_results_title" msgid="3360639917793022533">"ସେଟିଂସ"</string>
     <string name="keywords_wifi" msgid="8156528242318351490">"ୱାଇଫାଇ, ୱାଇ-ଫାଇ, ନେଟ୍‌ୱର୍କ କନେକ୍ସନ୍, ଇଣ୍ଟରନେଟ୍, ୱାୟରଲେସ୍, ଡାଟା, ୱାଇ ଫାଇ"</string>
     <string name="keywords_wifi_notify_open_networks" msgid="6580896556389306636">"ୱାଇ-ଫାଇ ବିଜ୍ଞପ୍ତି, ୱାଇଫାଇ ବିଜ୍ଞପ୍ତି"</string>
     <string name="keywords_wifi_data_usage" msgid="4718555409695862085">"ଡାଟା ବ୍ୟବହାର"</string>
@@ -3717,8 +3682,8 @@
     <string name="zen_mode_settings_dnd_manual_indefinite" msgid="1436568478062106132">"ଆପଣ ବନ୍ଦ ନକରିବା ପର୍ଯ୍ୟନ୍ତ \'ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ\' ଚାଲୁ‌ ରହିବ"</string>
     <string name="zen_mode_settings_dnd_automatic_rule" msgid="1958092329238152236">"ଏକ (<xliff:g id="RULE_NAME">%s</xliff:g>) ନିୟମ ଦ୍ୱାରା ବିରକ୍ତ କର ନାହିଁ ସ୍ୱଚାଳିତ ଭାବେ ଚାଲୁ ହୋଇଗଲା"</string>
     <string name="zen_mode_settings_dnd_automatic_rule_app" msgid="3401685760954156067">"ଏକ ଆପ୍‌ (<xliff:g id="APP_NAME">%s</xliff:g>) ଦ୍ୱାରା ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ ସ୍ୱଚାଳିତ ଭାବେ ଅନ୍‌ ହେଲା"</string>
-    <string name="zen_mode_settings_dnd_custom_settings_footer" msgid="6566115866660865385">"କଷ୍ଟମ୍ ସେଟିଂସ୍ ଥିବା <xliff:g id="RULE_NAMES">%s</xliff:g> ପାଇଁଁ ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ\" ଚାଲୁ ଅଛି।"</string>
-    <string name="zen_mode_settings_dnd_custom_settings_footer_link" msgid="8255159194653341835">" "<annotation id="link">"କଷ୍ଟମ୍ ସେଟିଂସ୍ ଦେଖନ୍ତୁ"</annotation></string>
+    <string name="zen_mode_settings_dnd_custom_settings_footer" msgid="6566115866660865385">"କଷ୍ଟମ ସେଟିଂସରେ ଥିବା <xliff:g id="RULE_NAMES">%s</xliff:g> ପାଇଁଁ \"ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ\" ଚାଲୁ ଅଛି।"</string>
+    <string name="zen_mode_settings_dnd_custom_settings_footer_link" msgid="8255159194653341835">" "<annotation id="link">"କଷ୍ଟମ ସେଟିଂସ ଦେଖନ୍ତୁ"</annotation></string>
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"କେବଳ ପ୍ରାଥମିକତା"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"ଅନ୍/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -3733,23 +3698,23 @@
     <string name="zen_category_apps" msgid="1167374545618451925">"ଆପ୍ସ"</string>
     <string name="zen_category_exceptions" msgid="1316097981052752811">"ଆଲାରାମ୍ ଏବଂ ଅନ୍ୟ ବାଧା"</string>
     <string name="zen_category_schedule" msgid="2003707171924226212">"ସିଡୁଲ୍"</string>
-    <string name="zen_category_duration" msgid="7515850842082631460">"ଦ୍ରୁତ ସେଟିଂସ୍ ପାଇଁ ଅବଧି"</string>
+    <string name="zen_category_duration" msgid="7515850842082631460">"କ୍ଵିକ ସେଟିଂସ ପାଇଁ ଅବଧି"</string>
     <string name="zen_settings_general" msgid="2704932194620124153">"ସାଧାରଣ"</string>
     <string name="zen_sound_footer" msgid="4090291351903631977">"ଯେତେବେଳେ ’ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ’ ଅନ ଥିବ, ସେତେବେଳେ ଉପରେ ଆପଣ ଅନୁମତି ଦେଇଥିବା ଆଇଟମ୍ ବ୍ୟତୀତ ସାଉଣ୍ଡ ଓ ଭାଇବ୍ରେଶନ୍ ମ୍ୟୁଟ୍ ହୋଇଯିବ।"</string>
-    <string name="zen_custom_settings_dialog_title" msgid="4613603772432720380">"କଷ୍ଟମ୍‍ ସେଟିଂସ୍"</string>
+    <string name="zen_custom_settings_dialog_title" msgid="4613603772432720380">"କଷ୍ଟମ ସେଟିଂସ"</string>
     <string name="zen_custom_settings_dialog_review_schedule" msgid="4674671820584759928">"ସମୟ ନିର୍ଦ୍ଧାରଣର ସମୀକ୍ଷା କରନ୍ତୁ"</string>
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"ବୁଝିଗଲି"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକ"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"ଅବଧି"</string>
     <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"ମେସେଜ୍, ଇଭେଣ୍ଟ ଓ ରିମାଇଣ୍ଡର୍"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"ଯେତେବେଳେ ’ଡୁ ନଟ୍‍ ଡିଷ୍ଟ୍ରବ୍‍’ ଅନ୍ ଥିବ, ସେତେବେଳେ ଉପରେ ଆପଣ ଅନୁମତି ଦେଇଥିବା ଉପରୋକ୍ତ ଆଇଟମ୍ ବ୍ୟତୀତ ମେସେଜ୍, ରିମାଇଣ୍ଡର୍ ଓ ଇଭେଣ୍ଟ ମ୍ୟୁଟ୍ ହୋ‍ଇଯିବ। ନିଜର ସାଙ୍ଗ, ପରିବାର କିମ୍ବା ଅନ୍ୟ କଣ୍ଟାକ୍ଟଗୁଡ଼ିକ ଆପଣଙ୍କ ପାଖରେ ପହଞ୍ଚିବା ପାଇଁ ଆପଣ ସେଟିଙ୍ଗକୁ ବ୍ୟବହାର ଉପଯୋଗୀ କରିପାରିବେ।"</string>
+    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"ଯେତେବେଳେ \"ବିରକ୍ତି କରନ୍ତୁ ନାହିଁ\" ଅନ ଥାଏ, ସେତେବେଳେ ଆପଣ ଅନୁମତି ଦେଇଥିବା ଉପରୋକ୍ତ ଆଇଟମ ବ୍ୟତୀତ ମେସେଜ, ରିମାଇଣ୍ଡର ଓ ଇଭେଣ୍ଟ ମ୍ୟୁଟ୍ ହୋ‍ଇଯିବ। ଆପଣଙ୍କର ସାଙ୍ଗ, ପରିବାର କିମ୍ବା ଅନ୍ୟ ଯୋଗାଯୋଗ ଆପଣଙ୍କୁ ସମ୍ପର୍କ କରିବା ପାଇଁ ଆପଣ ମେସେଜ ସେଟିଂସ ଆଡଜଷ୍ଟ କରିପାରିବେ।"</string>
     <string name="zen_onboarding_ok" msgid="8764248406533833392">"ହୋ‍ଇଗଲା"</string>
-    <string name="zen_onboarding_settings" msgid="2815839576245114342">"ସେଟିଂସ୍"</string>
+    <string name="zen_onboarding_settings" msgid="2815839576245114342">"ସେଟିଂସ"</string>
     <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"ବିଜ୍ଞପ୍ତି ଆସିଲେ କୌଣସି ଭିଜୁଆଲ୍ ଦେଖାଯିବ ନାହିଁ କିମ୍ବା ସାଉଣ୍ଡ୍‍ ବାହାରିବ ନାହିଁ"</string>
     <string name="zen_onboarding_current_setting_title" msgid="5024603685220407195">"ବିଜ୍ଞପ୍ତି ଆସିଲେ କୌଣସି ସାଉଣ୍ଡ ନହେଉ"</string>
     <string name="zen_onboarding_new_setting_summary" msgid="7695808354942143707">"ଆପଣ ବିଜ୍ଞପ୍ତିକୁ ଦେଖି କିମ୍ବା ଶୁଣିପାରିବେ ନାହିଁ। ତାରାଙ୍କିତ ଯୋଗାଯୋଗରୁ ଆସିଥିବା କଲ୍ ଏବଂ ପୁଣି କଲ୍ କରୁଥିବା କଲର୍‍ଙ୍କୁ ଅନୁମତି ଦିଆଯାଇଛି।"</string>
     <string name="zen_onboarding_current_setting_summary" msgid="8864567406905990095">"(ସାମ୍ପ୍ରତିକ ସେଟିଙ୍ଗ)"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"’ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ’ ବିଜ୍ଞପ୍ତି ସେଟିଙ୍ଗ ବଦଳାଇବେ?"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"\"ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ\" ବିଜ୍ଞପ୍ତି ସେଟିଂସକୁ ବଦଳାଇବେ?"</string>
     <string name="sound_work_settings" msgid="752627453846309092">"ୱାର୍କ୍ ପ୍ରୋଫାଇଲ୍‌ ସାଉଣ୍ଡ"</string>
     <string name="work_use_personal_sounds_title" msgid="7729428677919173609">"ବ୍ୟକ୍ତିଗତ ପ୍ରୋଫାଇଲ୍‌ ସାଉଣ୍ଡ ବ୍ୟବହାର କରନ୍ତୁ"</string>
     <string name="work_use_personal_sounds_summary" msgid="608061627969077231">"ବ୍ୟକ୍ତିଗତ ପ୍ରୋଫାଇଲରେ ବ୍ୟବହାର କରାଯାଉଥିବା ସମାନ ସାଉଣ୍ଡଗୁଡ଼ିକୁ ବ୍ୟବହାର କରନ୍ତୁ"</string>
@@ -3770,7 +3735,7 @@
     <string name="recent_notifications" msgid="1105631022180160436">"ବର୍ତ୍ତମାନ ବିଜ୍ଞପ୍ତି ପଠାଇଥିବା ଆପ୍"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"ବିଗତ 7 ଦିନର ସବୁକୁ ଦେଖନ୍ତୁ"</string>
     <string name="general_notification_header" msgid="3669031068980713359">"ପରିଚାଳନା କରନ୍ତୁ"</string>
-    <string name="app_notification_field" msgid="3858667320444612716">"ଆପ୍ ସେଟିଂସ୍"</string>
+    <string name="app_notification_field" msgid="3858667320444612716">"ଆପ ସେଟିଂସ"</string>
     <string name="app_notification_field_summary" msgid="5981393613897713471">"ଅଲଗା ଅଲଗା ଆପରୁ ମିଳୁଥିବା ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକୁ ନିୟନ୍ତ୍ରଣ କରନ୍ତୁ"</string>
     <string name="advanced_section_header" msgid="6478709678084326738">"ସାଧାରଣ"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"କାର୍ଯ୍ୟ ବିଜ୍ଞପ୍ତି"</string>
@@ -3782,7 +3747,7 @@
     <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"ଆଡେପ୍ଟିଭ୍ ବିଜ୍ଞପ୍ତିର ମତାମତ"</string>
     <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"ଏହା ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକରେ କରାଯାଇଥିବା ଆଡଜଷ୍ଟମେଣ୍ଟଗୁଡ଼ିକୁ ସୂଚିତ କରେ ଏବଂ ସିଷ୍ଟମକୁ ମତାମତ ଦେବାର ବିକଳ୍ପ ଦେଖାଏ"</string>
     <string name="asst_importance_reset_title" msgid="6191265591976440115">"ବିଜ୍ଞପ୍ତି ଗୁରୁତ୍ୱ ରିସେଟ୍ କରନ୍ତୁ"</string>
-    <string name="asst_importance_reset_summary" msgid="684794589254282667">"ଉପଯୋଗକର୍ତ୍ତାଙ୍କ ଦ୍ୱାରା ବଦଳାଯାଇଥିବା ଗୁରୁତ୍ଵପୂର୍ଣ୍ଣ ସେଟିଂସକୁ ରିସେଟ୍ କରନ୍ତୁ ଓ ବିଜ୍ଞପ୍ତି ଆସିଷ୍ଟାଣ୍ଟକୁ ପ୍ରାଥମିକତା ଦେବା ପାଇଁ ଅନୁମତି ଦିଅନ୍ତୁ"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"ଉପଯୋଗକର୍ତ୍ତାଙ୍କ ଦ୍ୱାରା ବଦଳାଯାଇଥିବା ଗୁରୁତ୍ଵପୂର୍ଣ୍ଣ ସେଟିଂସକୁ ରିସେଟ କରନ୍ତୁ ଓ ପ୍ରାଥମିକତା ପାଇଁ ବିଜ୍ଞପ୍ତି ଆସିଷ୍ଟାଣ୍ଟକୁ ଦିଅନ୍ତୁ"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"ପ୍ରସ୍ତାବିତ କାର୍ଯ୍ୟ ଏବଂ ପ୍ରତ୍ୟୁତ୍ତରଗୁଡ଼ିକ"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"ସ୍ୱଚାଳିତ ଭାବେ ପରାମର୍ଶ କରାଯାଇଥିବା କାର୍ଯ୍ୟ ଏବଂ ଉତ୍ତରଗୁଡ଼ିକ ଦେଖାନ୍ତୁ"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"ବର୍ତ୍ତମାନର ଏବଂ ସ୍ନୁଜ୍ କରାଯାଇଥିବା ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକୁ ଦେଖାନ୍ତୁ"</string>
@@ -3792,7 +3757,7 @@
     <string name="notification_history_off_summary" msgid="671359587084797617">"ବର୍ତ୍ତମାନର ବିଜ୍ଞପ୍ତି ଏବଂ ସ୍ନୁଜ୍ କରାଯାଇଥିବା ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକୁ ଦେଖିବାକୁ ବିଜ୍ଞପ୍ତି ଇତିହାସ ଚାଲୁ କରନ୍ତୁ"</string>
     <string name="history_toggled_on_title" msgid="4518001110492652830">"ବର୍ତ୍ତମାନର କୌଣସି ବିଜ୍ଞପ୍ତି ନାହିଁ"</string>
     <string name="history_toggled_on_summary" msgid="9034278971358282728">"ଆପଣଙ୍କ ବର୍ତ୍ତମାନର ଏବଂ ସ୍ନୁଜ୍ କରାଯାଇଥିବା ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକ ଏଠାରେ ଦେଖାଯିବ"</string>
-    <string name="notification_history_view_settings" msgid="5269317798670449002">"ବିଜ୍ଞପ୍ତି ସେଟିଂସ୍ ଦେଖନ୍ତୁ"</string>
+    <string name="notification_history_view_settings" msgid="5269317798670449002">"ବିଜ୍ଞପ୍ତି ସେଟିଂସ ଦେଖନ୍ତୁ"</string>
     <string name="notification_history_open_notification" msgid="2655071846911258371">"ବିଜ୍ଞପ୍ତି ଖୋଲନ୍ତୁ"</string>
     <string name="snooze_options_title" msgid="2109795569568344617">"ବିଜ୍ଞପ୍ତି ସ୍ନୁଜ୍ କରିବା ପାଇଁ ଅନୁମତି ଦିଅନ୍ତୁ"</string>
     <string name="hide_silent_icons_title" msgid="5951392023601167577">"ଜେଣ୍ଟଲ୍ ନୋଟିଫିକ୍ସନ୍‌ରୁ ଆଇକନ୍‌ଗୁଡ଼ିକୁ ଲୁଚାନ୍ତୁ"</string>
@@ -3802,7 +3767,7 @@
     <string name="notification_bubbles_title" msgid="5681506665322329301">"ବବଲ୍‌ଗୁଡ଼ିକ"</string>
     <string name="bubbles_feature_education" msgid="4088275802688887634">"କିଛି ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକ ଏବଂ ଅନ୍ୟ ବିଷୟବସ୍ତୁ ସ୍କ୍ରିନ୍‌ରେ ବବଲ୍‌ଗୁଡ଼ିକ ଭଳି ଦେଖାଯାଇପାରେ। ଏକ ବବଲ୍‌କୁ ଖୋଲିବାକୁ, ଏଥିରେ ଟାପ୍ କରନ୍ତୁ। ଏହା ଖାରଜ କରିବାକୁ, ଏହାକୁ ସ୍କ୍ରିନ୍‌ର ତଳକୁ ଟାଣି ଆଣନ୍ତୁ।"</string>
     <string name="bubbles_app_toggle_title" msgid="5319021259954576150">"ବବଲ୍‌ଗୁଡ଼ିକ"</string>
-    <string name="bubbles_conversation_app_link" msgid="5468779786387915337">"ସବୁ ବବଲ୍ ସେଟିଂସ୍"</string>
+    <string name="bubbles_conversation_app_link" msgid="5468779786387915337">"ସମସ୍ତ ବବଲ୍ ସେଟିଂସ"</string>
     <string name="bubbles_conversation_toggle_title" msgid="5225039214083311316">"ଏହି ବାର୍ତ୍ତାଳାପକୁ ବବଲ୍ କରନ୍ତୁ"</string>
     <string name="bubbles_conversation_toggle_summary" msgid="720229032254323578">"ଆପଗୁଡ଼ିକ ଉପରେ ଫ୍ଲୋଟିଂ ଆଇକନ୍ ଦେଖାନ୍ତୁ"</string>
     <string name="bubbles_app_toggle_summary" msgid="1574515698567947948">"ବବଲ୍‌ଗୁଡ଼ିକ ଭଳି କିଛି ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକ ଦେଖେଇବାକୁ <xliff:g id="APP_NAME">%1$s</xliff:g>କୁ ଅନୁମତି ଦିଅନ୍ତୁ"</string>
@@ -3890,7 +3855,7 @@
     <string name="important_bubble" msgid="7911698275408390846">"ପ୍ରାଥମିକତା ଦିଆଯାଉଥିବା ବାର୍ତ୍ତାଳାପଗୁଡ଼ିକୁ ବବଲ୍ କରନ୍ତୁ"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"ପ୍ରାଥମିକତା ଦିଆଯାଉଥିବା ବାର୍ତ୍ତାଳାପଗୁଡ଼ିକ ପୁଲ୍-ଡାଉନ୍ ସେଡର ଶୀର୍ଷରେ ଦେଖାନ୍ତୁ। ଆପଣ ସେଗୁଡ଼ିକୁ ବବଲ୍ ଭାବେ ମଧ୍ୟ ସେଟ୍ କରିପାରିବେ ଏବଂ \'ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ\' ମୋଡକୁ ବାଧା ଦେଇପାରିବେ।"</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"ପ୍ରାଥମିକତା ଦିଆଯାଇଥିବା ଏବଂ ପରିବର୍ତ୍ତିତ ବାର୍ତ୍ତାଳାପଗୁଡ଼ିକ ଏଠାରେ ଦେଖାଯିବ"</string>
-    <string name="conversation_onboarding_summary" msgid="2484845363368486941">"ଆପଣ କୌଣସି ବାର୍ତ୍ତାଳାପକୁ ପ୍ରାଥମିକତା ଦିଆଯାଉଥିବା ଭାବେ ଚିହ୍ନଟ କଲେ କିମ୍ବା ବାର୍ତ୍ତାଳାପଗୁଡ଼ିକରେ ଅନ୍ୟ କୌଣସି ପରିବର୍ତ୍ତନ କଲେ, ସେଗୁଡ଼ିକ ଏଠାରେ ଦେଖାଯିବ। \n\nବାର୍ତ୍ତାଳାପ ସେଟିଂସ୍ ପରିବର୍ତ୍ତନ କରିବାକୁ: \n ପୁଲ୍-ଡାଉନ୍ ସେଡ୍ ଖୋଲିବାକୁ ସ୍କ୍ରିନର ଶୀର୍ଷରୁ ତଳକୁ ସ୍ୱାଇପ୍ କରନ୍ତୁ, ତା’ପରେ ଏକ ବାର୍ତ୍ତାଳାପକୁ ଦାବି ଧରନ୍ତୁ।"</string>
+    <string name="conversation_onboarding_summary" msgid="2484845363368486941">"ଆପଣ କୌଣସି ବାର୍ତ୍ତାଳାପକୁ ପ୍ରାଥମିକତା ଭାବେ ଚିହ୍ନଟ କଲେ କିମ୍ବା ବାର୍ତ୍ତାଳାପଗୁଡ଼ିକରେ ଅନ୍ୟ କୌଣସି ପରିବର୍ତ୍ତନ କଲେ, ସେଗୁଡ଼ିକ ଏଠାରେ ଦେଖାଯିବ। \n\nବାର୍ତ୍ତାଳାପ ସେଟିଂସ ପରିବର୍ତ୍ତନ କରିବାକୁ: \n ପୁଲ୍-ଡାଉନ୍ ସେଡ୍ ଖୋଲିବାକୁ ସ୍କ୍ରିନର ଶୀର୍ଷରୁ ତଳକୁ ସ୍ୱାଇପ୍ କରନ୍ତୁ, ତା’ପରେ ଏକ ବାର୍ତ୍ତାଳାପକୁ ଦବେଇ ଧରନ୍ତୁ।"</string>
     <string name="notification_importance_min" msgid="4609688642942787774">"ନିରବରେ ଦେଖାଇବା ସହିତ ମିନିମାଇଜ୍ କରନ୍ତୁ"</string>
     <string name="notification_importance_low" msgid="7562535765919565273">"ନିରବରେ ଦେଖାନ୍ତୁ"</string>
     <string name="notification_importance_default" msgid="7483906490369073043">"ଶବ୍ଦ କର"</string>
@@ -3911,7 +3876,7 @@
     <string name="notification_channel_summary_min" msgid="8823399508450176842">"ପୁଲ୍-ଡାଉନ୍ ସେଡ୍‌ରେ, ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକୁ ଗୋଟିଏ ଧାଡ଼ିରେ ସଙ୍କୁଚିତ କରନ୍ତୁ"</string>
     <string name="notification_channel_summary_low" msgid="5549662596677692000">"କୌଣସି ସାଉଣ୍ଡ କିମ୍ବା ଭାଇବ୍ରେସନ୍ ନାହିଁ"</string>
     <string name="notification_conversation_summary_low" msgid="6352818857388412326">"କୌଣସି ସାଉଣ୍ଡ କିମ୍ବା ଭାଇବ୍ରେସନ୍ ନାହିଁ ଏବଂ ବାର୍ତ୍ତାଳାପ ବିଭାଗର ନିମ୍ନରେ ଦେଖାଯାଏ"</string>
-    <string name="notification_channel_summary_default" msgid="3674057458265438896">"ଫୋନ୍ ସେଟିଂସ୍ ଆଧାରରେ ରିଙ୍ଗ କିମ୍ବା ଭାଇବ୍ରେଟ୍ ହୋଇପାରେ"</string>
+    <string name="notification_channel_summary_default" msgid="3674057458265438896">"ଫୋନ ସେଟିଂସ ଆଧାରରେ ରିଙ୍ଗ କିମ୍ବା ଭାଇବ୍ରେଟ୍ ହୋଇପାରେ"</string>
     <string name="notification_channel_summary_high" msgid="3411637309360617621">"ଡିଭାଇସ୍ ଅନ୍‌ଲକ୍ ଥିବା ବେଳେ ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକ ସ୍କ୍ରିନ୍‌ର ଉପର ପାର୍ଶ୍ୱରେ ବ୍ୟାନର୍ ଭଳି ଦେଖାଯିବ"</string>
     <string name="notification_switch_label" msgid="8029371325967501557">"ସମସ୍ତ \"<xliff:g id="APP_NAME">%1$s</xliff:g>\" ବିଜ୍ଞପ୍ତି"</string>
     <string name="notification_app_switch_label" msgid="4422902423925084193">"ସମସ୍ତ <xliff:g id="APP_NAME">%1$s</xliff:g> ବିଜ୍ଞପ୍ତି"</string>
@@ -3941,7 +3906,7 @@
     <string name="notification_assistant_security_warning_title" msgid="2972346436050925276">"<xliff:g id="SERVICE">%1$s</xliff:g> ପାଇଁ ବିଜ୍ଞପ୍ତି ଆକ୍ସେସ୍‌ର ଅନୁମତି ଦେବେ?"</string>
     <string name="notification_assistant_security_warning_summary" msgid="4846559755787348129">"Android 12ରେ Android ଆଡେପ୍ଟିଭ୍ ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକୁ ଉନ୍ନତ ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକରେ ପରିବର୍ତ୍ତନ କରାଯାଇଛି। ଏହି ଫିଚର୍ ପ୍ରସ୍ତାବିତ କାର୍ଯ୍ୟ ଏବଂ ପ୍ରତ୍ୟୁତ୍ତରଗୁଡ଼ିକୁ ଦେଖାଏ ଏବଂ ଆପଣଙ୍କ ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକୁ ବ୍ୟବସ୍ଥିତ କରେ। \n\nଉନ୍ନତ ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକ ଯୋଗାଯୋଗ ନାମ ଏବଂ ମେସେଜଗୁଡ଼ିକ ପରି ବ୍ୟକ୍ତିଗତ ସୂଚନା ସମେତ ବିଜ୍ଞପ୍ତିର ବିଷୟବସ୍ତୁକୁ ଆକ୍ସେସ୍ କରିପାରିବ। ଏହି ଫିଚର୍ ଫୋନ୍ କଲଗୁଡ଼ିକର ଉତ୍ତର ଦେବା ଏବଂ \'ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ\'କୁ ନିୟନ୍ତ୍ରଣ କରିବା ପରି, ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକୁ ମଧ୍ୟ ଖାରଜ କରିପାରିବ କିମ୍ବା ସେଗୁଡ଼ିକର ଉତ୍ତର ଦେଇପାରିବ।"</string>
     <string name="notification_listener_security_warning_title" msgid="5791700876622858363">"<xliff:g id="SERVICE">%1$s</xliff:g> ପାଇଁ ବିଜ୍ଞପ୍ତି ଆକ୍ସେସ୍‌ର ଅନୁମତି ଦେବେ?"</string>
-    <string name="notification_listener_security_warning_summary" msgid="3668606006326629153">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> ଯୋଗାଯୋଗ ନାମ ଏବଂ ଆପଣ ପାଇଥିବା ମେସେଜର ଟେକ୍ସଟ୍ ପରି ବ୍ୟକ୍ତିଗତ ସୂଚନା ସମେତ ସମସ୍ତ ବିଜ୍ଞପ୍ତି ପଢ଼ିବାକୁ ସକ୍ଷମ ହେବ। ଏହି ଆପ୍ ଫୋନ୍ କଲଗୁଡ଼ିକର ଉତ୍ତର ଦେବା ସହ ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକୁ ସ୍ନୁଜ୍ କିମ୍ବା ଖାରଜ କରିବାକୁ କିମ୍ବା ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକରେ ଥିବା ବଟନଗୁଡ଼ିକ ଉପରେ ପଦକ୍ଷେପ ନେବା ପାଇଁ ମଧ୍ୟ ସକ୍ଷମ ହେବ। \n\nଏହା ଆପଟିକୁ ’ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ’କୁ ଚାଲୁ କିମ୍ବା ବନ୍ଦ କରିବା ଏବଂ ସମ୍ବନ୍ଧିତ ସେଟିଂସ୍ ପରିବର୍ତ୍ତନ କରିବା ପାଇଁ ମଧ୍ୟ କ୍ଷମତା ଦେବ।"</string>
+    <string name="notification_listener_security_warning_summary" msgid="3668606006326629153">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> ଯୋଗାଯୋଗ ନାମ ଏବଂ ଆପଣ ପାଇଥିବା ମେସେଜର ଟେକ୍ସଟ୍ ପରି ବ୍ୟକ୍ତିଗତ ସୂଚନା ସମେତ ସମସ୍ତ ବିଜ୍ଞପ୍ତି ପଢ଼ିବାକୁ ସକ୍ଷମ ହେବ। ଏହି ଆପ ଫୋନ କଲଗୁଡ଼ିକର ଉତ୍ତର ଦେବା ସହ ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକୁ ସ୍ନୁଜ୍ କିମ୍ବା ଖାରଜ କରିବାକୁ କିମ୍ବା ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକରେ ଥିବା ବଟନଗୁଡ଼ିକ ଉପରେ ପଦକ୍ଷେପ ନେବା ପାଇଁ ମଧ୍ୟ ସକ୍ଷମ ହେବ। \n\nଏହା ଆପଟିକୁ ’ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ’କୁ ଚାଲୁ କିମ୍ବା ବନ୍ଦ କରିବା ଏବଂ ସମ୍ବନ୍ଧିତ ସେଟିଂସ ପରିବର୍ତ୍ତନ କରିବା ପାଇଁ ମଧ୍ୟ କ୍ଷମତା ଦେବ।"</string>
     <string name="notification_listener_disable_warning_summary" msgid="8373396293802088961">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> ପାଇଁ ଯଦି ଆପଣ ବିଜ୍ଞପ୍ତି ଆକ୍ସେସ୍‌କୁ ବନ୍ଦ କରୁଛନ୍ତି, ତେବେ \"ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ\" ବିକଳ୍ପ ଆକ୍ସେସ୍‌ ମଧ୍ୟ ବନ୍ଦ ହୋଇଯାଇପାରେ।"</string>
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"ବନ୍ଦ କରନ୍ତୁ"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"ବାତିଲ୍"</string>
@@ -3951,15 +3916,15 @@
     <string name="notif_type_conversation" msgid="4383931408641374979">"ବାର୍ତ୍ତାଳାପଗୁଡ଼ିକ"</string>
     <string name="notif_type_conversation_summary" msgid="179142405410217101">"SMS, ଟେକ୍ସଟ୍ ମେସେଜ୍ ଏବଂ ଅନ୍ୟ କମ୍ୟୁନିକେସନଗୁଡ଼ିକ"</string>
     <string name="notif_type_alerting" msgid="4713073696855718576">"ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକ"</string>
-    <string name="notif_type_alerting_summary" msgid="4681068287836313604">"ସେଟିଂସ୍ ଆଧାରରେ ରିଙ୍ଗ କିମ୍ବା ଭାଇବ୍ରେଟ୍ ହୋଇପାରେ"</string>
+    <string name="notif_type_alerting_summary" msgid="4681068287836313604">"ସେଟିଂସ ଉପରେ ଆଧାର କରି ରିଙ୍ଗ କିମ୍ବା ଭାଇବ୍ରେଟ୍ ହୋଇପାରେ"</string>
     <string name="notif_type_silent" msgid="6273951794420331010">"ନୀରବ"</string>
     <string name="notif_type_silent_summary" msgid="7820923063105060844">"ଆଦୌ ସାଉଣ୍ଡ କିମ୍ବା ଭାଇବ୍ରେସନ୍ କରୁ ନଥିବା ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକ"</string>
     <string name="notification_listener_allowed" msgid="5536962633536318551">"ଅନୁମତି ଦିଆଯାଇଛି"</string>
     <string name="notification_listener_not_allowed" msgid="3352962779597846538">"ଅନୁମତି ଦିଆଯାଇନାହିଁ"</string>
     <string name="notif_listener_excluded_app_title" msgid="6679316209330349730">"ସମସ୍ତ ଆପ୍ ଦେଖନ୍ତୁ"</string>
-    <string name="notif_listener_excluded_app_summary" msgid="2914567678047195396">"ବିଜ୍ଞପ୍ତି ପଠାଉଥିବା ପ୍ରତ୍ୟେକ ଆପ୍ ପାଇଁ ସେଟିଂସକୁ ପରିବର୍ତ୍ତନ କରନ୍ତୁ"</string>
+    <string name="notif_listener_excluded_app_summary" msgid="2914567678047195396">"ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକ ପଠାଉଥିବା ପ୍ରତ୍ୟେକ ଆପ ପାଇଁ ସେଟିଂସକୁ ପରିବର୍ତ୍ତନ କରନ୍ତୁ"</string>
     <string name="notif_listener_excluded_app_screen_title" msgid="8636196723227432994">"ଡିଭାଇସରେ ଦେଖାଯାଇଥିବା ଆପଗୁଡ଼ିକ"</string>
-    <string name="notif_listener_not_migrated" msgid="6265206376374278226">"ଏହି ଆପ୍ ଉନ୍ନତ ସେଟିଂସକୁ ସମର୍ଥନ କରେ ନାହିଁ"</string>
+    <string name="notif_listener_not_migrated" msgid="6265206376374278226">"ଏହି ଆପ ଉନ୍ନତ ସେଟିଂସକୁ ସମର୍ଥନ କରେ ନାହିଁ"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR ସାହାଯ୍ୟକାରୀ ସେବା"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"VR ସାହାଯ୍ୟକାରୀ ସେବା ଭାବରେ ଚଲାଯିବା ପାଇଁ, ଇନଷ୍ଟଲ୍‌ ହୋଇଥିବା କୌଣସି ଆପ୍‌ ଅନୁରୋଧ କରିନାହିଁ।"</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"<xliff:g id="SERVICE">%1$s</xliff:g> ପାଇଁ VR ସେବା ଆକ୍ସେସକୁ ଅନୁମତି ଦେବେ?"</string>
@@ -3983,7 +3948,7 @@
     <string name="interact_across_profiles_switch_disabled" msgid="4312196170211463988">"ଏହି ଆପଗୁଡ଼ିକୁ ସଂଯୋଗ କରନ୍ତୁ"</string>
     <string name="interact_across_profiles_summary_1" msgid="6093976896137600231">"ସଂଯୁକ୍ତ ଥିବା ଆପଗୁଡ଼ିକ ଅନୁମତିଗୁଡ଼ିକୁ ସେୟାର୍ କରି ପରସ୍ପରର ଡାଟା ଆକ୍ସେସ୍ କରିପାରିବେ।"</string>
     <string name="interact_across_profiles_summary_2" msgid="505748305453633885">"ଯଦି ଆପଣ ବିଶ୍ଵାସ କରନ୍ତି ତେବେ କେବଳ ସେହି ଆପଗୁଡ଼ିକୁ ସଂଯୋଗ କରନ୍ତୁ ଯାହା ଆପଣଙ୍କ IT ଆଡମିନଙ୍କ ସହ ବ୍ୟକ୍ତିଗତ ଡାଟା ସେୟାର୍ କରିବ ନାହିଁ।"</string>
-    <string name="interact_across_profiles_summary_3" msgid="444428694843299854">"ଆପଣ ଯେ କୌଣସି ସମୟରେ ଆପଣଙ୍କ ଡିଭାଇସର ଗୋପନୀୟତା ସେଟିଂସରେ ଆପଗୁଡ଼ିକୁ ବିଚ୍ଛିନ୍ନ କରିପାରିବେ।"</string>
+    <string name="interact_across_profiles_summary_3" msgid="444428694843299854">"ଆପଣ ଯେ କୌଣସି ସମୟରେ ଆପଣଙ୍କ ଡିଭାଇସର ଗୋପନୀୟତା ସେଟିଂସରେ ଆପ୍ସକୁ ବିଚ୍ଛିନ୍ନ କରିପାରିବେ।"</string>
     <string name="interact_across_profiles_consent_dialog_title" msgid="8530621211216508681">"ଆପଣଙ୍କ ବ୍ୟକ୍ତିଗତ ଡାଟାକୁ କାର୍ଯ୍ୟସ୍ଥଳୀ <xliff:g id="NAME">%1$s</xliff:g>ରେ ବ୍ୟବହାର କରିବାକୁ ବିଶ୍ୱାସ କରନ୍ତି କି?"</string>
     <string name="interact_across_profiles_consent_dialog_summary" msgid="3949870271562055048">"ଯଦି ଆପଣ ବିଶ୍ଵାସ କରନ୍ତି ତେବେ, କେବଳ ସେହି ଆପଗୁଡ଼ିକୁ ସଂଯୋଗ କରନ୍ତୁ ଯାହା ଆପଣଙ୍କ IT ଆଡମିନଙ୍କ ସହ ବ୍ୟକ୍ତିଗତ ଡାଟା ସେୟାର୍ କରିବ ନାହିଁ।"</string>
     <string name="interact_across_profiles_consent_dialog_app_data_title" msgid="8436318876213958940">"ଆପ୍ ଡାଟା"</string>
@@ -4012,7 +3977,7 @@
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> ବର୍ଗ</item>
     </plurals>
     <string name="no_channels" msgid="4716199078612071915">"ଏହି ଆପ୍‌ଟି କୌଣସି ବିଜ୍ଞପ୍ତି ପୋଷ୍ଟ୍ କରିନାହିଁ"</string>
-    <string name="app_settings_link" msgid="6725453466705333311">"ଆପ୍‌ରେ ଅତିରିକ୍ତ ସେଟିଙ୍ଗ"</string>
+    <string name="app_settings_link" msgid="6725453466705333311">"ଆପର ଅତିରିକ୍ତ ସେଟିଂସ"</string>
     <string name="notification_screen_summary" msgid="5984915275134654822">"ବିଜ୍ଞପ୍ତିର ଇତିହାସ, ବବଲ୍, ବର୍ତ୍ତମାନ ପଠାଯାଇଥିବା ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକ"</string>
     <string name="app_notification_listing_summary_zero" msgid="2988400013221120744">"ସମସ୍ତ ଆପ୍‌ ପାଇଁ ଚାଲୁ ଅଛି"</string>
     <plurals name="app_notification_listing_summary_others" formatted="false" msgid="1506127395400503717">
@@ -4057,9 +4022,9 @@
     <string name="zen_mode_delete_rule_confirmation" msgid="6195069346439736688">"“<xliff:g id="RULE">%1$s</xliff:g>” ନିୟମକୁ ଡିଲିଟ୍‌ କରିବେ?"</string>
     <string name="zen_mode_delete_rule_button" msgid="8328729110756882244">"ଡିଲିଟ୍‌ କରନ୍ତୁ"</string>
     <string name="zen_mode_rule_type_unknown" msgid="7819162569994282316">"ଅଜ୍ଞାତ"</string>
-    <string name="zen_mode_app_set_behavior" msgid="4319517270279704677">"ବର୍ତ୍ତମାନ ଏହି ସେଟିଙ୍ଗ ବଦଳାଇହେବନାହିଁ। ନିର୍ଦ୍ଧାରିତ କାର୍ଯ୍ୟ ଅନୁଯାୟୀ ଗୋଟିଏ ଆପ୍‌ (<xliff:g id="APP_NAME">%1$s</xliff:g>) ଅଟୋମେଟିକାଲୀ \"ବିରକ୍ତ କର ନାହିଁ\" ଅନ୍‌ କରିଦେଇଛି।"</string>
-    <string name="zen_mode_unknown_app_set_behavior" msgid="8544413884273894104">"ବର୍ତ୍ତମାନ ଏହି ସେଟିଙ୍ଗ ବଦଳାଇ ହେବନାହିଁ। କଷ୍ଟମ ବ୍ୟବହାର ସହ ଏକ ଆପ୍‌ ସ୍ୱଚାଳିତ ଭାବେ ବ୍ୟତିବ୍ୟସ୍ତ କରନ୍ତୁ ନାହିଁ ଅନ୍‌ କରିଛି।"</string>
-    <string name="zen_mode_qs_set_behavior" msgid="3805244555649172848">"ବର୍ତ୍ତମାନ ଏହି ସେଟିଙ୍ଗଗୁଡ଼ିକୁ ବଦଳାଇ ହେବନାହିଁ। \"ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ\" ବିକଳ୍ପଟି କଷ୍ଟମ୍‌ ଆଚରଣ ସହ ମାନୁଆଲୀ ଚାଲୁ କରାଯାଇଛି।"</string>
+    <string name="zen_mode_app_set_behavior" msgid="4319517270279704677">"ଏହି ସେଟିଂସକୁ ବର୍ତ୍ତମାନ ବଦଳାଯାଇପାରିବ ନାହିଁ। କଷ୍ଟମ ଆଚରଣ ଅନୁଯାୟୀ ଗୋଟିଏ ଆପ (<xliff:g id="APP_NAME">%1$s</xliff:g>) ସ୍ଵଚାଳିତ ଭାବେ \"ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ\"କୁ ଅନ କରିଦେଇଛି।"</string>
+    <string name="zen_mode_unknown_app_set_behavior" msgid="8544413884273894104">"ଏହି ସେଟିଂସକୁ ବର୍ତ୍ତମାନ ବଦଳାଯାଇପାରିବ ନାହିଁ। କଷ୍ଟମ ଆଚରଣ ଅନୁଯାୟୀ ଏକ ଆପ ସ୍ୱଚାଳିତ ଭାବେ \"ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ\"କୁ ଚାଲୁ କରିଛି।"</string>
+    <string name="zen_mode_qs_set_behavior" msgid="3805244555649172848">"ବର୍ତ୍ତମାନ ଏହି ସେଟିଂସକୁ ବଦଳାଇ ହେବ ନାହିଁ। \"ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ\" ବିକଳ୍ପଟି କଷ୍ଟମ ଆଚରଣ ସହ ମାନୁଆଲୀ ଚାଲୁ କରାଯାଇଛି।"</string>
     <string name="zen_schedule_rule_type_name" msgid="8071428540221112090">"ସମୟ"</string>
     <string name="zen_schedule_rule_enabled_toast" msgid="6534402316741678208">"ନିର୍ଦ୍ଦିଷ୍ଟ ହୋଇଥିବା ସମୟରେ \"ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ\" ଅନ୍‍ କରିବା ପାଇଁ ଅଟୋମେଟିକ୍‌ ନିୟମ ସେଟ୍‌ କରନ୍ତୁ"</string>
     <string name="zen_event_rule_type_name" msgid="1921166617081971754">"ଇଭେଣ୍ଟ"</string>
@@ -4082,8 +4047,8 @@
     <string name="zen_mode_schedule_alarm_title" msgid="305237266064819345">"ଆଲାରାମ୍, ସମାପ୍ତ ସମୟକୁ ଓଭରରାଇଡ୍ କରିପାରେ"</string>
     <string name="zen_mode_schedule_alarm_summary" msgid="9162760856136645133">"ଯେତେବେଳେ ଆଲାରାମ୍ ବାଜେ ସେତେବେଳେ ସିଡୁଲ୍ ବନ୍ଦ ହୋ‍ଇଥାଏ"</string>
     <string name="zen_mode_custom_behavior_title" msgid="92525364576358085">"\"ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ\" ବ୍ୟବହାର"</string>
-    <string name="zen_mode_custom_behavior_summary_default" msgid="3259312823717839148">"ଡିଫଲ୍ଟ୍ ସେଟିଂସ୍ ବ୍ୟବହାର କରନ୍ତୁ"</string>
-    <string name="zen_mode_custom_behavior_summary" msgid="5390522750884328843">"ଏହି ସିଡୁଲ୍ ପାଇଁ କଷ୍ଟମ୍ ସେଟିଂସ୍ ତିଆରି କରନ୍ତୁ"</string>
+    <string name="zen_mode_custom_behavior_summary_default" msgid="3259312823717839148">"ଡିଫଲ୍ଟ ସେଟିଂସ ବ୍ୟବହାର କରନ୍ତୁ"</string>
+    <string name="zen_mode_custom_behavior_summary" msgid="5390522750884328843">"ଏହି ସିଡୁଲ୍ ପାଇଁ କଷ୍ଟମ ସେଟିଂସ ତିଆରି କରନ୍ତୁ"</string>
     <string name="zen_mode_custom_behavior_category_title" msgid="7815612569425733764">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’ ପାଇଁ"</string>
     <string name="summary_divider_text" msgid="8836285171484563986">", "</string>
     <string name="summary_range_symbol_combination" msgid="8447490077794415525">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
@@ -4100,7 +4065,7 @@
     <string name="zen_mode_calls_list" msgid="5044730950895749093">"କଲଗୁଡ଼ିକ"</string>
     <string name="zen_mode_calls_header" msgid="8379225445095856726">"ବାଧା ସୃଷ୍ଟି କରିପାରୁଥିବା କଲଗୁଡ଼ିକ"</string>
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"ଅନୁମତି ପ୍ରାପ୍ତ କଲଗୁଡ଼ିକ ଆସିଲେ ସାଉଣ୍ଡ ହେବାକୁ ସୁନିଶ୍ଚିତ କରିବା ପାଇଁ ଡିଭାଇସଟି ରିଂ ହେବା ମୋଡରେ ସେଟ୍ କରାଯାଇଛି ବୋଲି ଯାଞ୍ଚ କରନ୍ତୁ"</string>
-    <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’ ପାଇଁ ଇନକମିଂ କଲ୍‍‍‍‍‍‍‍‍ଗୁଡ଼ିକ ବ୍ଲକ୍ କରାଯାଇଛି। ସାଙ୍ଗ,ପରିବାର ଲୋକେ କିମ୍ବା ଅନ୍ୟ ଯୋଗାଯୋଗ ଆପଣଙ୍କୁ ସମ୍ପର୍କ କରିବା ପାଇଁ ଆପଣ ସେଟିଂସ୍‍କୁ ଆଡ୍‌ଜଷ୍ଟ କରିପାରିବେ।"</string>
+    <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’ ପାଇଁ ଇନକମିଂ କଲଗୁଡ଼ିକ ବ୍ଲକ କରାଯାଇଛି। ଆପଣଙ୍କର ସାଙ୍ଗ,ପରିବାର କିମ୍ବା ଅନ୍ୟ ଯୋଗାଯୋଗ ଆପଣଙ୍କୁ ସମ୍ପର୍କ କରିବା ପାଇଁ ଆପଣ ସେଟିଂସକୁ ଆଡଜଷ୍ଟ କରିପାରିବେ।"</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"ତାରାଙ୍କିତ ଯୋଗାଯୋଗ"</string>
     <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{କିଛି ନାହିଁ}=1{{contact_1}}=2{{contact_1} ଏବଂ {contact_2}}=3{{contact_1}, {contact_2} ଏବଂ {contact_3}}other{{contact_1}, {contact_2} ଏବଂ ଅନ୍ୟ #ଟି ଯୋଗାଯୋଗ}}"</string>
     <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"(କୌଣସି ନାମ ନାହିଁ)"</string>
@@ -4109,7 +4074,7 @@
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"ମେସେଜ୍"</string>
     <string name="zen_mode_messages_header" msgid="253721635061451577">"ବାଧା ସୃଷ୍ଟି କରିପାରୁଥିବା ମେସେଜଗୁଡ଼ିକ"</string>
     <string name="zen_mode_messages_footer" msgid="6002468050854126331">"ଅନୁମତି ପ୍ରାପ୍ତ ମେସେଜଗୁଡ଼ିକ ଆସିଲେ ସାଉଣ୍ଡ ହୁଏ ତାହା ସୁନିଶ୍ଚିତ କରିବାକୁ, ଡିଭାଇସଟି ରିଂ ହେବା ମୋଡରେ ସେଟ୍ କରାଯାଇଛି ବୋଲି ଯାଞ୍ଚ କରନ୍ତୁ"</string>
-    <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’ ପାଇଁ ଇନକମିଂ ମେସେଜ୍‌ଗୁଡ଼ିକ ବ୍ଲକ୍ କରାଯାଇଛି। ଆପଣଙ୍କ ବନ୍ଧୁ, ପରିବାର ବର୍ଗ କିମ୍ବା ଅନ୍ୟ ଯୋଗାଯୋଗ ଆପଣଙ୍କୁ ସମ୍ପର୍କ କରିବା ପାଇଁ ଆପଣ ସେଟିଂସ୍‍କୁ ଆଡ୍‌ଜଷ୍ଟ କରିପାରିବେ।"</string>
+    <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’ ପାଇଁ ଇନକମିଂ ମେସେଜଗୁଡ଼ିକ ବ୍ଲକ କରାଯାଇଛି। ଆପଣଙ୍କ ସାଙ୍ଗ, ପରିବାର କିମ୍ବା ଅନ୍ୟ ଯୋଗାଯୋଗ ଆପଣଙ୍କୁ ସମ୍ପର୍କ କରିବା ପାଇଁ ଆପଣ ସେଟିଂସକୁ ଆଡଜଷ୍ଟ କରିପାରିବେ।"</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"ସମସ୍ତ ମେସେଜ୍ ଆପଣଙ୍କ ପାଖରେ ପହଞ୍ଚିପାରିବ"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"ସମସ୍ତ କଲ୍ ଆପଣଙ୍କ ପାଖରେ ପହଞ୍ଚିପାରିବ"</string>
     <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{କିଛି ନାହିଁ}=1{1ଟି ଯୋଗାଯୋଗ}other{#ଟି ଯୋଗାଯୋଗ}}"</string>
@@ -4195,7 +4160,7 @@
     <string name="zen_mode_screen_off" msgid="7069798697669366075">"ସ୍କ୍ରିନ୍‌ ବନ୍ଦ ଥିବା ବେଳେ"</string>
     <string name="zen_mode_screen_off_summary" msgid="4698018253505406152">"\"ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ\"କୁ ସ୍କ୍ରିନ୍‌ ଉପରେ ଅନ୍‌ କରି ଏବଂ ଆଲୋକକୁ ଧପଧପ କରି ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକୁ ନିରବ କରନ୍ତୁ।"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="1958271859408992636">"ସ୍କ୍ରୀନ୍‌ ଉପରେ \"ବିରକ୍ତ କର ନାହିଁ\"କୁ ଚାଲୁ କରି ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକୁ ନିରବ କରନ୍ତୁ"</string>
-    <string name="notification_app_settings_button" msgid="4692549882609342128">"ବିଜ୍ଞପ୍ତି ସେଟିଙ୍ଗ"</string>
+    <string name="notification_app_settings_button" msgid="4692549882609342128">"ବିଜ୍ଞପ୍ତି ସେଟିଂସ"</string>
     <string name="warning_button_text" msgid="1274234338874005639">"ଚେତାବନୀ"</string>
     <string name="suggestion_button_text" msgid="4370673818678692873">"ଠିକ୍‌ ଅଛି"</string>
     <string name="suggestion_button_close" msgid="6865170855573283759">"ବନ୍ଦ କରନ୍ତୁ"</string>
@@ -4378,7 +4343,7 @@
     <string name="permit_usage_access" msgid="179630895262172674">"ବ୍ୟବହାରର ଆକ୍ସେସକୁ ଅନୁମତି ଦିଅନ୍ତୁ"</string>
     <string name="app_usage_preference" msgid="7062447555623339120">"ଆପ୍‌ ବ୍ୟବହାରର ପସନ୍ଦ"</string>
     <string name="time_spent_in_app_pref_title" msgid="25327097913383330">"ସ୍କ୍ରିନ୍‌ ସମୟ"</string>
-    <string name="usage_access_description" msgid="8547716253713890707">"ଅନ୍ୟ ଆପ୍‌ଗୁଡ଼ିକ କଣ ଓ କେତେଥର ବ୍ୟବହାର କରୁଛନ୍ତି, ତଥା ଆପଣଙ୍କ କେରିଅର୍‌, ଭାଷା ସେଟିଙ୍ଗ, ଓ ଅନ୍ୟାନ୍ୟ ବିବରଣୀ ଟ୍ରାକ୍‌ କରିବା ପାଇଁ ଏକ ଆପ୍‌କୁ ବ୍ୟବହାର ଆକସେସ୍‌ ଅନୁମତି ଦେଇଥାଏ।"</string>
+    <string name="usage_access_description" msgid="8547716253713890707">"ଅନ୍ୟ ଆପଗୁଡ଼ିକ କଣ ଓ କେତେଥର ଆପଣ ବ୍ୟବହାର କରୁଛନ୍ତି, ତଥା ଆପଣଙ୍କ କ୍ୟାରିଅର, ଭାଷା ସେଟିଂସ, ଓ ଅନ୍ୟ ବିବରଣୀ ଟ୍ରାକ କରିବା ପାଇଁ ଏକ ଆପକୁ ବ୍ୟବହାର ଆକ୍ସେସ ଅନୁମତି ଦେଇଥାଏ।"</string>
     <string name="memory_settings_title" msgid="6582588646363308430">"ମେମୋରୀ"</string>
     <string name="memory_details_title" msgid="3048107441540417799">"ମେମୋରୀ ବିବରଣୀ"</string>
     <string name="always_running" msgid="9012705720688200252">"ସର୍ବଦା (<xliff:g id="PERCENTAGE">%s</xliff:g>) ଚାଲୁଛି"</string>
@@ -4408,12 +4373,12 @@
     <string name="high_power_system" msgid="3966701453644915787">"ବ୍ୟାଟେରୀ ଅପ୍ଟିମାଇଜେସନ୍ ଉପଲବ୍ଧ ନାହିଁ"</string>
     <string name="high_power_desc" msgid="2753076899835765338">"ବ୍ୟାଟେରୀ ଅପ୍ଟିମାଇଜେସନ୍ ଲାଗୁ କରନ୍ତୁ ନାହିଁ। ଏହା ଆପଣଙ୍କ ବ୍ୟାଟେରୀକୁ ଖୁବ ଶୀଘ୍ର ସାରିଦେଇପାରେ।"</string>
     <string name="high_power_prompt_title" msgid="2574478825228409124">"ଆପ‌ଟିକୁ ପୃଷ୍ଠପଟରେ ସର୍ବଦା ଚାଲୁ ରହିବାକୁ ଦେବେ କି?"</string>
-    <string name="high_power_prompt_body" msgid="6460557929559616041">"<xliff:g id="APP_NAME">%1$s</xliff:g>କୁ ସର୍ବଦା ପୃଷ୍ଠପଟରେ ଚାଲିବାକୁ ଦେବା ଦ୍ୱାରା ବ୍ୟାଟେରୀ ଜୀବନ ହ୍ରାସ ହୋଇପାରେ। \n\nଆପଣ ଏହାକୁ ପରେ ସେଟିଂସ୍ &gt; ଆପ୍ସ ଓ ବିଜ୍ଞପ୍ତିରେ ବଦଳାଇପାରିବେ।"</string>
+    <string name="high_power_prompt_body" msgid="6460557929559616041">"<xliff:g id="APP_NAME">%1$s</xliff:g>କୁ ସର୍ବଦା ପୃଷ୍ଠପଟରେ ଚାଲିବାକୁ ଦେବା ଦ୍ୱାରା ବ୍ୟାଟେରୀର ଜୀବନ ହ୍ରାସ ହୋଇପାରେ। \n\nଆପଣ ଏହାକୁ ପରେ ସେଟିଂସ &gt; ଆପ୍ସ ଓ ବିଜ୍ଞପ୍ତିରେ ବଦଳାଇପାରିବେ।"</string>
     <string name="battery_summary" msgid="2491764359695671207">"ଗତଥର ସମ୍ପୂର୍ଣ୍ଣ ଚାର୍ଜ ହେବା ପରଠାରୁ <xliff:g id="PERCENTAGE">%1$s</xliff:g> ବ୍ୟବହୃତ"</string>
     <string name="battery_summary_24hr" msgid="7656033283282656551">"ଗତ 24 ଘଣ୍ଟାରେ <xliff:g id="PERCENTAGE">%1$s</xliff:g> ବ୍ୟବହାର କରାଯାଇଛି"</string>
     <string name="no_battery_summary" msgid="5769159953384122003">"ଗତଥର ପୂର୍ଣ୍ଣ ଚାର୍ଜ ହେବାଠାରୁ ବ୍ୟାଟେରୀର କୌଣସି ବ୍ୟବହାର ହୋଇନାହିଁ"</string>
     <string name="no_battery_summary_24hr" msgid="6280079526797873842">"ଗତ 24 ଘଣ୍ଟାରେ ବ୍ୟାଟେରୀ ବ୍ୟବହାର କରାଯାଇନାହିଁ"</string>
-    <string name="app_notification_preferences" msgid="2004680717999108725">"ଆପ୍‌ ସେଟିଙ୍ଗ"</string>
+    <string name="app_notification_preferences" msgid="2004680717999108725">"ଆପ ସେଟିଂସ"</string>
     <string name="system_ui_settings" msgid="936169564323330967">"SystemUI ଟ୍ୟୁନର ଦେଖାଅ"</string>
     <string name="additional_permissions" msgid="4656871347558988462">"ଅତିରିକ୍ତ ଅନୁମତି"</string>
     <string name="additional_permissions_more" msgid="8188145515437525307">"<xliff:g id="COUNT">%1$d</xliff:g> ଟି ଅଧିକ"</string>
@@ -4437,7 +4402,7 @@
     <string name="usb_use_MIDI_desc" msgid="6464135515868405143">"MIDI ଭାବରେ ଏହି ଡିଭାଇସ୍‌କୁ ବ୍ୟବହାର କରନ୍ତୁ"</string>
     <string name="usb_use" msgid="6783183432648438528">"ଏହା ପାଇଁ USB ବ୍ୟବହାର କରନ୍ତୁ"</string>
     <string name="usb_default_label" msgid="3372838450371060750">"ଡିଫଲ୍ଟ USB କନଫିଗରେସନ୍"</string>
-    <string name="usb_default_info" msgid="167172599497085266">"ଯେତେବେଳେ ଅନ୍ୟ ଡିଭାଇସ୍ କନେକ୍ଟ ହୋଇଥାଏ ଏବଂ ଆପଣଙ୍କର ଫୋନ୍ ଅନଲକ୍ ଥାଏ, ଏହି ସେଟିଙ୍ଗଗୁଡ଼ିକ ଲାଗୁ ହେବ। କେବଳ ବିଶ୍ୱସନୀୟ ଡିଭାଇସ୍‌ଗୁଡ଼ିକ ସହ କନେକ୍ଟ କରନ୍ତୁ।"</string>
+    <string name="usb_default_info" msgid="167172599497085266">"ଯେତେବେଳେ ଅନ୍ୟ ଏକ ଡିଭାଇସ କନେକ୍ଟ ହୋଇଥାଏ ଏବଂ ଆପଣଙ୍କର ଫୋନ ଅନଲକ ଥାଏ, ସେତେବେଳେ ଏହି ସେଟିଂସ ଲାଗୁ ହେବ। କେବଳ ବିଶ୍ୱସନୀୟ ଡିଭାଇସଗୁଡ଼ିକ ସହ କନେକ୍ଟ କରନ୍ତୁ।"</string>
     <string name="usb_power_title" msgid="5602112548385798646">"ପାୱାର ବିକଳ୍ପଗୁଡ଼ିକ"</string>
     <string name="usb_file_transfer_title" msgid="2261577861371481478">"ଫାଇଲ୍ ଟ୍ରାନ୍ସଫର୍ ବିକଳ୍ପଗୁଡ଼ିକ"</string>
     <string name="usb_pref" msgid="8521832005703261700">"USB"</string>
@@ -4488,7 +4453,7 @@
     <string name="memory_maximum_usage" msgid="2047013391595835607">"ସର୍ବାଧିକ ବ୍ୟବହାର"</string>
     <string name="no_data_usage" msgid="4665617440434654132">"କୌଣସି ଡାଟା ବ୍ୟବହୃତ ହୋଇନାହିଁ"</string>
     <string name="zen_access_warning_dialog_title" msgid="6323325813123130154">"<xliff:g id="APP">%1$s</xliff:g> ପାଇଁ \"ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ\"ର ଆକ୍ସେସ୍ ଅନୁମତି ଦେବେ?"</string>
-    <string name="zen_access_warning_dialog_summary" msgid="8468714854067428987">"ଏହି ଆପ୍‌, \"ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ\"କୁ ଚାଲୁ/ବନ୍ଦ କରିବା ଏବଂ ସମ୍ପର୍କିତ ସେଟିଙ୍ଗଗୁଡ଼ିକରେ ପରିବର୍ତ୍ତନ କରିବାକୁ ସକ୍ଷମ ହେବ।"</string>
+    <string name="zen_access_warning_dialog_summary" msgid="8468714854067428987">"ଏହି ଆପ \"ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ\"କୁ ଚାଲୁ/ବନ୍ଦ କରିବା ଏବଂ ସମ୍ପର୍କିତ ସେଟିଂସ ପରିବର୍ତ୍ତନ କରିବାକୁ ସକ୍ଷମ ହେବ।"</string>
     <string name="zen_access_disabled_package_warning" msgid="6565908224294537889">"ନିଶ୍ଚିତ ଭାବେ ଚାଲୁଥିବା ଦରକାର କାରଣ ବିଜ୍ଞପ୍ତି ଆକ୍ସେସ୍‌ ଅନ୍‌ ଅଛି"</string>
     <string name="zen_access_revoke_warning_dialog_title" msgid="7377261509261811449">"<xliff:g id="APP">%1$s</xliff:g> ପାଇଁ \"ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ\" ଆକ୍‌ସେସ୍‌ ରଦ୍ଦ କରିବେ?"</string>
     <string name="zen_access_revoke_warning_dialog_summary" msgid="8689801842914183595">"ଏହି ଆପ୍‌ ଦ୍ୱାରା, \"ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ\" ପାଇଁ କରାଯାଇଥିବା ସମସ୍ତ ନିୟମ କାଢ଼ିଦିଆଯିବ।"</string>
@@ -4521,15 +4486,15 @@
     <string name="app_permission_summary_allowed" msgid="1155115629167757278">"ଅନୁମତିପ୍ରାପ୍ତ"</string>
     <string name="app_permission_summary_not_allowed" msgid="2673793662439097900">"ଅନୁମତି ଦିଆଯାଇନାହିଁ"</string>
     <string name="keywords_install_other_apps" msgid="563895867658775580">"ଅଜଣ ଉତ୍ସରୁ ଆପ୍‌ଗୁଡ଼ିକୁ ଇନ୍‌ଷ୍ଟଲ୍‌ କରନ୍ତୁ"</string>
-    <string name="write_settings" msgid="6864794401614425894">"ସିଷ୍ଟମ୍‌ ସେଟିଂସ ବଦଳାନ୍ତୁ"</string>
-    <string name="keywords_write_settings" msgid="6908708078855507813">"ଲେଖିବା ଓ ପରିବର୍ତ୍ତନ କରିବାର ସିଷ୍ଟମ୍‌ ସେଟିଙ୍ଗ"</string>
-    <string name="write_settings_summary" msgid="2085800775513476479">"<xliff:g id="COUNT_1">%2$d</xliff:g> ର <xliff:g id="COUNT_0">%1$d</xliff:g> ଆପ୍‌, ସିଷ୍ଟମ୍‌ ସେଟିଙ୍ଗ ବଦଳାଇପାରିବେ"</string>
+    <string name="write_settings" msgid="6864794401614425894">"ସିଷ୍ଟମ ସେଟିଂସ ବଦଳାନ୍ତୁ"</string>
+    <string name="keywords_write_settings" msgid="6908708078855507813">"ସିଷ୍ଟମ ସେଟିଂସ ପରିବର୍ତ୍ତନ କରିବାକୁ ଲେଖନ୍ତୁ"</string>
+    <string name="write_settings_summary" msgid="2085800775513476479">"<xliff:g id="COUNT_1">%2$d</xliff:g> ଆପ୍ସର <xliff:g id="COUNT_0">%1$d</xliff:g> ସିଷ୍ଟମ ସେଟିଂସ ବଦଳାଇବା ପାଇଁ ଅନୁମତି ଦେଇଛି"</string>
     <string name="filter_install_sources_apps" msgid="6930762738519588431">"ଅନ୍ୟ ଏପଗୁଡ଼ିକୁ ଇନଷ୍ଟଲ କରିପାରେ"</string>
-    <string name="filter_write_settings_apps" msgid="4754994984909024093">"ସିଷ୍ଟମ୍‌ ସେଟିଂସ୍ ପରିବର୍ତ୍ତନ କରିପାରିବ"</string>
-    <string name="write_settings_title" msgid="3011034187823288557">"ସିଷ୍ଟମ୍‌ ସେଟିଂସ୍ ପରିବର୍ତ୍ତନ କରିପାରିବ"</string>
-    <string name="write_system_settings" msgid="5555707701419757421">"ସିଷ୍ଟମ୍‌ ସେଟିଂସ ବଦଳାନ୍ତୁ"</string>
-    <string name="permit_write_settings" msgid="3113056800709924871">"ସିଷ୍ଟମ୍‌ ସେଟିଙ୍ଗ ବଦଳାଇବାକୁ ଅନୁମତି ଦିଅନ୍ତୁ"</string>
-    <string name="write_settings_description" msgid="1474881759793261146">"ଏହି ଅନୁମତି ଗୋଟିଏ ଆପକୁ ସିଷ୍ଟମ ସେଟିଂସରେ ପରିବର୍ତ୍ତନ କରିବାର ଅନୁମତି ଦେଇଥାଏ।"</string>
+    <string name="filter_write_settings_apps" msgid="4754994984909024093">"ସିଷ୍ଟମ ସେଟିଂସ ପରିବର୍ତ୍ତନ କରିପାରିବ"</string>
+    <string name="write_settings_title" msgid="3011034187823288557">"ସିଷ୍ଟମ ସେଟିଂସ ପରିବର୍ତ୍ତନ କରିପାରିବ"</string>
+    <string name="write_system_settings" msgid="5555707701419757421">"ସିଷ୍ଟମ ସେଟିଂସ ବଦଳାନ୍ତୁ"</string>
+    <string name="permit_write_settings" msgid="3113056800709924871">"ସିଷ୍ଟମ ସେଟିଂସ ବଦଳାଇବାକୁ ଅନୁମତି ଦିଅନ୍ତୁ"</string>
+    <string name="write_settings_description" msgid="1474881759793261146">"ଏହି ଅନୁମତି ଗୋଟିଏ ଆପକୁ ସିଷ୍ଟମ ସେଟିଂସରେ ପରିବର୍ତ୍ତନ କରିବାକୁ ଅନୁମତି ଦିଏ।"</string>
     <string name="write_settings_on" msgid="8533286548451191112">"ହଁ"</string>
     <string name="write_settings_off" msgid="1781103034490679144">"ନା"</string>
     <string name="external_source_switch_title" msgid="101571983954849473">"ଏହି ସୋର୍ସରୁ ଅନୁମତି ଦିଅନ୍ତୁ"</string>
@@ -4588,10 +4553,10 @@
     <string name="disabled_by_policy_content_biometric_parental_consent" msgid="7124116806784305206">"ଏହାକୁ ସେଟ୍ ଅପ୍ କରିବା ଆରମ୍ଭ କରିବାକୁ ଫୋନଟି ତୁମ ବାପାମାଙ୍କୁ ଦିଅ"</string>
     <string name="default_admin_support_msg" msgid="8338570262037182531">"ଯଦି ଆପଣଙ୍କର କିଛି ପ୍ରଶ୍ନ ଥାଏ, ତେବେ ନିଜ IT ଆଡମିନ୍‌ଙ୍କ ସହ ସମ୍ପର୍କ କରନ୍ତୁ"</string>
     <string name="admin_support_more_info" msgid="8407433155725898290">"ଅଧିକ ବିବରଣୀ"</string>
-    <string name="admin_profile_owner_message" msgid="8860709969532649195">"ସେଟିଙ୍ଗ, ଅନୁମତି, କର୍ପୋରେଟ୍‌ ଆକ୍ସେସ୍‌, ନେଟ୍‌ୱର୍କ କାର୍ଯ୍ୟକଳାପ ଓ ଡିଭାଇସ୍‌ର ଲୋକେସନ୍‌ ସୂଚନା ସମେତ ଆପଣଙ୍କର କାର୍ଯ୍ୟ ପ୍ରୋଫାଇଲ୍‌ ସହ ଜଡ଼ିତ ଥିବା ଆପ୍‌ଗୁଡ଼ିକ ଓ ଡାଟାକୁ ଆପଣଙ୍କ ଆଡ୍‌ମିନ୍‌ ତଦାରଖ ଓ ପରିଚାଳନା କରିପାରିବ।"</string>
-    <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"ସେଟିଙ୍ଗ୍, ଅନୁମତି, କର୍ପୋରେଟ୍ ଆକ୍ସେସ୍, ନେଟ୍‌ୱର୍କ କାର୍ଯ୍ୟକଳାପ ଏବଂ ଡିଭାଇସ୍‌ର ଲୋକେସନ୍ ସୂଚନା ସମେତ ଏହି ଉପଯୋଗକର୍ତ୍ତାଙ୍କ ସହ ଜଡ଼ିତ ଥିବା ଡାଟା ଓ ଆପ୍‌ଗୁଡ଼ିକୁ ଆପଣଙ୍କର ଆଡ୍‌ମିନ୍‌ ତଦାରଖ ଓ ପରିଚାଳନା କରିବେ।"</string>
-    <string name="admin_device_owner_message" msgid="5503131744126520590">"ଆପଣଙ୍କ ଆଡମିନ୍‌ ସେଟିଂସ୍, ଅନୁମତି, କର୍ପୋରେଟ୍‌ ଆକସେସ୍‌, ନେଟୱର୍କ କାର୍ଯ୍ୟକଳାପ ଓ ଡିଭାଇସ୍‌ର ଲୋକେସନ୍‌ ସୂଚନା ସହ ଏହି ଡିଭାଇସ୍‌ରେ ସମ୍ପୃକ୍ତ ଥିବା ଆପ୍‌ ଓ ଡାଟା ନିରୀକ୍ଷଣ ତଥା ପରିଚାଳନା କରିପାରିବେ।"</string>
-    <string name="admin_financed_message" msgid="1156197630834947884">"ଆପଣଙ୍କ ଡିଭାଇସ୍ ଆଡମିନିଷ୍ଟ୍ରେଟର୍ ଏହି ଡିଭାଇସ ସହ ସମ୍ବନ୍ଧିତ ଡାଟା ଆକ୍ସେସ୍ କରିବା, ଆପଗୁଡ଼ିକୁ ପରିଚାଳନା କରିବା ଏବଂ ଏହି ଡିଭାଇସର ସେଟିଂସ୍ ବଦଳାଇବାକୁ ସକ୍ଷମ ହୋଇପାରନ୍ତି।"</string>
+    <string name="admin_profile_owner_message" msgid="8860709969532649195">"ସେଟିଂସ, ଅନୁମତି, କର୍ପୋରେଟ୍‌ ଆକ୍ସେସ, ନେଟୱାର୍କ କାର୍ଯ୍ୟକଳାପ ଓ ଡିଭାଇସର ଲୋକେସନ ସୂଚନା ସମେତ ଆପଣଙ୍କର କାର୍ଯ୍ୟ ପ୍ରୋଫାଇଲ ସହ ଜଡ଼ିତ ଥିବା ଆପ୍ସ ଓ ଡାଟାକୁ ଆପଣଙ୍କ ଆଡମିନ ତଦାରଖ ଓ ପରିଚାଳନା କରିପାରିବେ।"</string>
+    <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"ସେଟିଂସ, ଅନୁମତି, କର୍ପୋରେଟ ଆକ୍ସେସ, ନେଟୱାର୍କ କାର୍ଯ୍ୟକଳାପ ଏବଂ ଡିଭାଇସର ଲୋକେସନ ସୂଚନା ସମେତ ଏହି ଉପଯୋଗକର୍ତ୍ତାଙ୍କ ସହ ଜଡ଼ିତ ଥିବା ଆପ୍ସ ଓ ଡାଟାକୁ ଆପଣଙ୍କର ଆଡମିନ ତଦାରଖ ଓ ପରିଚାଳନା କରିପାରିବେ।"</string>
+    <string name="admin_device_owner_message" msgid="5503131744126520590">"ସେଟିଂସ, ଅନୁମତି, କର୍ପୋରେଟ ଆକ୍ସେସ, ନେଟୱାର୍କ କାର୍ଯ୍ୟକଳାପ ଏବଂ ଡିଭାଇସର ଲୋକେସନ ସୂଚନା ସମେତ ଏହି ଡିଭାଇସ ସହ ଜଡ଼ିତ ଥିବା ଆପ୍ସ ଓ ଡାଟାକୁ ଆପଣଙ୍କର ଆଡମିନ ତଦାରଖ ଓ ପରିଚାଳନା କରିପାରିବ।"</string>
+    <string name="admin_financed_message" msgid="1156197630834947884">"ଆପଣଙ୍କ ଡିଭାଇସ ଆଡମିନିଷ୍ଟ୍ରେଟର ଏହି ଡିଭାଇସ ସହ ସମ୍ବନ୍ଧିତ ଡାଟା ଆକ୍ସେସ କରିବା, ଆପ୍ସ ପରିଚାଳନା କରିବା ଏବଂ ଏହି ଡିଭାଇସର ସେଟିଂସ ବଦଳାଇବାକୁ ସକ୍ଷମ ହୋଇପାରନ୍ତି।"</string>
     <string name="condition_turn_off" msgid="402707350778441939">"ବନ୍ଦ କରନ୍ତୁ"</string>
     <string name="condition_turn_on" msgid="3911077299444314791">"ଚାଲୁ କରନ୍ତୁ"</string>
     <string name="condition_expand_show" msgid="1501084007540953213">"ଦେଖାନ୍ତୁ"</string>
@@ -4764,8 +4729,6 @@
       <item quantity="one">1ଟି ଆପ୍‌, ଅପ୍ରତିବନ୍ଧିତ ଡାଟା ବ୍ୟବହାର କରିପାରେ</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"ଅଧିକ ଦେଖନ୍ତୁ"</string>
-    <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"ପ୍ରକୃତରେ କ’ଣ ଉପଯୋଗକର୍ତ୍ତା ଡାଟାକୁ ଲିଭାଇଦେଇ ଫାଇଲ୍‌ ଏନ୍‌କ୍ରିପ୍ସନ୍‌ କରିବେ?"</string>
-    <string name="button_confirm_convert_fbe" msgid="339648921918438106">"ଲିଭାନ୍ତୁ ଓ ବଦଳାନ୍ତୁ"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"ShortcutManager ରେଟ୍‌-ଲିମିଟିଙ୍ଗ ରିସେଟ୍‌ କରନ୍ତୁ"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"ShortcutManager ର ହାର-ସୀମିତକରଣ ରିସେଟ୍‌ କରିଦିଆଗଲା"</string>
     <string name="notification_suggestion_title" msgid="6309263655965785411">"ଲକ୍‌ ସ୍କ୍ରୀନ୍‌ ଉପରେ ନିୟନ୍ତ୍ରଣ ସମ୍ପର୍କିତ ବିଜ୍ଞପ୍ତି"</string>
@@ -4789,12 +4752,12 @@
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"ବୁଝିଗଲି"</string>
     <string name="dark_theme_slice_title" msgid="4684222119481114062">"ଗାଢ଼ ଥିମ୍ ବ୍ୟବହାର କରି ଦେଖନ୍ତୁ"</string>
     <string name="dark_theme_slice_subtitle" msgid="5555724345330434268">"ବ୍ୟାଟେରୀ ଲାଇଫ୍ ବଢ଼ାଇବାରେ ସାହାଯ୍ୟ କରେ"</string>
-    <string name="quick_settings_developer_tiles" msgid="7336007844525766623">"ତ୍ୱରିତ ସେଟିଙ୍ଗ ଡେଭେଲପର୍‌ ଟାଇଲ୍ସ"</string>
+    <string name="quick_settings_developer_tiles" msgid="7336007844525766623">"କ୍ୱିକ୍ ସେଟିଂସ ଡେଭେଲପର ଟାଇଲ୍ସ"</string>
     <string name="adb_authorization_timeout_title" msgid="6996844506783749754">"adb ଅଧିକାର ସମାପ୍ତ ହେବା ଅକ୍ଷମ କରନ୍ତୁ"</string>
     <string name="adb_authorization_timeout_summary" msgid="409931540424019778">"ଡିଫଲ୍ଟ (7 ଦିନ) କିମ୍ବା ଉପଯୋଗକର୍ତ୍ତାଙ୍କ ଦ୍ୱାରା କନଫିଗର୍ କରାଯାଇଥିବା (ସର୍ବନିମ୍ନ 1 ଦିନ) ସମୟ ଭିତରେ ପୁଣି ସଂଯୋଗ କରାଯାଇନଥିବା ସିଷ୍ଟମଗୁଡ଼ିକ ପାଇଁ adb ଅଧିକାରଗୁଡ଼ିକର ସ୍ୱଚାଳିତ ବାତିଲକରଣ ସୁବିଧା ଅକ୍ଷମ କରନ୍ତୁ।"</string>
     <string name="winscope_trace_quick_settings_title" msgid="4104768565053226689">"Winscope ଟ୍ରେସ୍"</string>
     <string name="sensors_off_quick_settings_title" msgid="8472151847125917167">"ସେନ୍ସର୍‍ଗୁଡ଼ିକ ବନ୍ଦ ଅଛି"</string>
-    <string name="managed_profile_settings_title" msgid="3400923723423564217">"ୱାର୍କ ପ୍ରୋଫାଇଲ ସେଟିଂସ୍"</string>
+    <string name="managed_profile_settings_title" msgid="3400923723423564217">"ୱାର୍କ ପ୍ରୋଫାଇଲ ସେଟିଂସ"</string>
     <string name="managed_profile_contact_search_title" msgid="6562061740814513737">"ବ୍ୟକ୍ତିଗତ ଆପଗୁଡ଼ିକରେ ୱାର୍କ ଡିରେକ୍ଟୋରୀର ଯୋଗାଯୋଗଗୁଡ଼ିକୁ ସନ୍ଧାନ କରନ୍ତୁ"</string>
     <string name="managed_profile_contact_search_summary" msgid="4974727886709219105">"ଆପଣଙ୍କ IT ଆଡମିନଙ୍କୁ ଆପଣଙ୍କର ସନ୍ଧାନ ଏବଂ ଇନକମିଂ କଲଗୁଡ଼ିକ ଦେଖାଯାଇପାରେ"</string>
     <string name="cross_profile_calendar_title" msgid="7570277841490216947">"କ୍ରସ୍‌-ପ୍ରୋଫାଇଲ୍ କ୍ୟାଲେଣ୍ଡର୍‌"</string>
@@ -4853,7 +4816,7 @@
     <string name="right_edge" msgid="1505309103265829121">"ଡାହାଣ ଧାର"</string>
     <string name="back_sensitivity_dialog_message" msgid="6638367716784103306">"ଉଚ୍ଚ ସମ୍ବେଦନଶୀଳତା, ସ୍କ୍ରିନ୍‌ର ଧାର ସମେତ ଯେ କୌଣସି ଆପ୍ ଜେଶ୍ଚର୍‌ରେ ପ୍ରଭାବ ପକାଇପାରେ।"</string>
     <string name="back_sensitivity_dialog_title" msgid="6153608904168908264">"ବ୍ୟାକ୍ ସମ୍ୱେଦନଶୀଳତା"</string>
-    <string name="gesture_settings_activity_title" msgid="6047431928567911330">"ଜେଶ୍ଚର୍ ସେଟିଂସ୍"</string>
+    <string name="gesture_settings_activity_title" msgid="6047431928567911330">"ଜେଶ୍ଚର ସେଟିଂସ"</string>
     <string name="keywords_gesture_navigation_settings" msgid="667561222717238931">"ଜେଶ୍ଚର୍ ନାଭିଗେସନ୍, ବ୍ୟାକ୍ ସେନ୍‌ସିଟିଭିଟି, ବ୍ୟାକ୍ ଜେଶ୍ଚର୍"</string>
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"ଫୋନ୍‌ ଚେକ୍ କରିବାକୁ ଦୁଇଥର-ଟାପ୍‌ କରନ୍ତୁ"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"ଟାବ୍‌ଲେଟ୍‌ ଯାଞ୍ଚ କରିବାକୁ ଡବଲ୍‌-ଟାପ୍‌ କରନ୍ତୁ"</string>
@@ -4864,11 +4827,11 @@
     <string name="keywords_one_handed" msgid="969440592493034101">"ରିଚେବିଲିଟୀ"</string>
     <string name="one_handed_mode_swipe_down_category" msgid="110178629274462484">"ଏହା କରିବା ପାଇଁ ତଳକୁ ସ୍ୱାଇପ୍ କରନ୍ତୁ"</string>
     <string name="one_handed_mode_use_shortcut_category" msgid="1414714099339147711">"ଏଥିପାଇଁ ସର୍ଟକଟ୍ ବ୍ୟବହାର କରନ୍ତୁ"</string>
-    <string name="one_handed_mode_intro_text" msgid="4313074112548160836">"ଏକ ହାତ ମୋଡ୍ ବ୍ୟବହାର କରିବା ପାଇଁ, ସ୍କ୍ରିନର ତଳ ପାର୍ଶ୍ୱରେ ତଳକୁ ସ୍ୱାଇପ୍ କରନ୍ତୁ। ଏହି ଫିଚରକୁ ବ୍ୟବହାର କରିବା ପାଇଁ, ସିଷ୍ଟମ୍ ନାଭିଗେସନ୍ ସେଟିଂସରେ ଜେଶ୍ଚର୍ ନାଭିଗେସନ୍ ଚାଲୁ ଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।"</string>
+    <string name="one_handed_mode_intro_text" msgid="4313074112548160836">"ଏକ ହାତ ମୋଡ ବ୍ୟବହାର କରିବା ପାଇଁ, ସ୍କ୍ରିନର ନିମ୍ନ ଧାର ପାର୍ଶ୍ଵରେ ତଳକୁ ସ୍ୱାଇପ୍ କରନ୍ତୁ। ଏହି ଫିଚରକୁ ବ୍ୟବହାର କରିବା ପାଇଁ, ସିଷ୍ଟମ ନାଭିଗେସନ ସେଟିଂସରେ ଜେଶ୍ଚର ନାଭିଗେସନ ଚାଲୁ ଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତ"</string>
     <string name="one_handed_action_pull_down_screen_title" msgid="9187194533815438150">"ସ୍କ୍ରିନକୁ ଆଙ୍ଗୁଠି ପହଞ୍ଚି ପାରିବା ପର୍ଯ୍ୟନ୍ତ ଟାଣନ୍ତୁ"</string>
     <string name="one_handed_action_pull_down_screen_summary" msgid="7582432473450036628">"ଆପଣଙ୍କ ବୁଢ଼ା ଆଙ୍ଗୁଠି ସ୍କ୍ରିନର ଯେଉଁ ଅଂଶ ପର୍ଯ୍ୟନ୍ତ ପହଞ୍ଚିପାରିବ, ସେ ପର୍ଯ୍ୟନ୍ତ ସ୍କ୍ରିନର ଉପର ଭାଗଟି ମୁଭ୍ ହୋଇଯିବ।"</string>
     <string name="one_handed_action_show_notification_title" msgid="8789305491485437130">"ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକ ଦେଖାନ୍ତୁ"</string>
-    <string name="one_handed_action_show_notification_summary" msgid="8281689861222000436">"ବିଜ୍ଞପ୍ତି ଏବଂ ସେଟିଂସ୍ ଦେଖାଯିବ।"</string>
+    <string name="one_handed_action_show_notification_summary" msgid="8281689861222000436">"ବିଜ୍ଞପ୍ତି ଏବଂ ସେଟିଂସ ଦେଖାଯିବ।"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"ସମୟ, ବିଜ୍ଞପ୍ତି, ଏବଂ ଅନ୍ୟ ସୂଚନା ଦେଖିବାକୁ, ଆପଣଙ୍କ ସ୍କ୍ରିନ୍‌କୁ ଦୁଇଥର ଟାପ୍‌ କରନ୍ତୁ।"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"ଫୋନ୍‌ ଚେକ୍ କରିବା ପାଇଁ ଉଠାନ୍ତୁ"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"ଟାବଲେଟ୍‌ ଯାଞ୍ଚ କରିବାକୁ ଉଠାନ୍ତୁ"</string>
@@ -4923,9 +4886,9 @@
     <string name="account_sync_summary_all_on" msgid="2953682111836599841">"ସମସ୍ତ ଆଇଟମ୍‌ଗୁଡ଼ିକ ପାଇଁ ସିଙ୍କ୍‌ ଅନ୍‌ ଅଛି"</string>
     <string name="account_sync_summary_all_off" msgid="6378301874540507884">"ସବୁ ଆଇଟମ୍‌ ପାଇଁ ସିଙ୍କ ବନ୍ଦ"</string>
     <string name="enterprise_privacy_settings" msgid="786350385374794180">"ପରିଚାଳିତ ଡିଭାଇସ୍‌ ସୂଚନା"</string>
-    <string name="enterprise_privacy_settings_summary_generic" msgid="5471858290610344646">"ଆପଣଙ୍କ ସଂସ୍ଥା ଦ୍ୱାରା ପରିବର୍ତ୍ତନ ଓ ସେଟିଙ୍ଗ ପରିଚାଳନା କରାଯାଇଥାଏ"</string>
-    <string name="enterprise_privacy_settings_summary_with_name" msgid="1315413275836515937">"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g> ଦ୍ୱାରା ପରିବର୍ତ୍ତନ ଓ ସେଟିଙ୍ଗ ପରିଚାଳିତ ହୁଏ"</string>
-    <string name="enterprise_privacy_header" msgid="4626225398848641603">"ଆପଣଙ୍କର କାର୍ଯ୍ୟ ଡାଟା ପ୍ରତି ଆକ୍‌ସେସ୍‌ ପ୍ରଦାନ କରିବା ପାଇଁ, ଆପଣଙ୍କ ସଂସ୍ଥା ସେଟିଙ୍ଗ ବଦଳାଇପାରନ୍ତି ଏବଂ ଆପଣଙ୍କ ଡିଭାଇସ୍‌ରେ ସଫ୍ଟୱେର୍‌ ଇନ୍‌ଷ୍ଟଲ୍‌ କରିପାରନ୍ତି। \n\n ଅଧିକ ବିବରଣୀ ପାଇଁ, ନିଜ ସଂସ୍ଥାର ଆଡ୍‌ମିନ୍‌ଙ୍କୁ ସମ୍ପର୍କ କରନ୍ତୁ।"</string>
+    <string name="enterprise_privacy_settings_summary_generic" msgid="5471858290610344646">"ଆପଣଙ୍କ ସଂସ୍ଥା ଦ୍ୱାରା ପରିଚାଳିତ ପରିବର୍ତ୍ତନ ଓ ସେଟିଂସ"</string>
+    <string name="enterprise_privacy_settings_summary_with_name" msgid="1315413275836515937">"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g> ଦ୍ୱାରା ପରିଚାଳିତ ପରିବର୍ତ୍ତନ ଓ ସେଟିଂସ"</string>
+    <string name="enterprise_privacy_header" msgid="4626225398848641603">"ଆପଣଙ୍କର କାର୍ଯ୍ୟ ଡାଟାକୁ ଆକ୍ସେସ ପ୍ରଦାନ କରିବା ପାଇଁ, ଆପଣଙ୍କ ସଂସ୍ଥା ସେଟିଂସ ବଦଳାଇପାରନ୍ତି ଏବଂ ଆପଣଙ୍କ ଡିଭାଇସରେ ସଫ୍ଟୱେର ଇନଷ୍ଟଲ କରିପାରନ୍ତି। \n\n ଅଧିକ ବିବରଣୀ ପାଇଁ, ନିଜ ସଂସ୍ଥାର ଆଡମିନଙ୍କ ସହ ଯୋଗାଯୋଗ  କରନ୍ତୁ।"</string>
     <string name="enterprise_privacy_exposure_category" msgid="2507761423540037308">"ସୂଚନାର ପ୍ରକାର, ଯାହା ଆପଣଙ୍କର ସଂସ୍ଥା ଦେଖିପାରିବ"</string>
     <string name="enterprise_privacy_exposure_changes_category" msgid="5459989751333816587">"ଆପଣଙ୍କ ସଂସ୍ଥାର ଆଡ୍‌ମିନ୍‌ଙ୍କ ଦ୍ୱାରା କରାଯାଇଥିବା ପରିବର୍ତ୍ତନ"</string>
     <string name="enterprise_privacy_device_access_category" msgid="140157499478630004">"ଏହି ଡିଭାଇସ୍‌ ପ୍ରତି ଆପଣଙ୍କର ଆକ୍ସେସ୍"</string>
@@ -4982,7 +4945,7 @@
     <string name="financed_privacy_lock_device" msgid="8963934429658453147">"ଡିଭାଇସ୍ ଆଡମିନିଷ୍ଟ୍ରେଟର୍ ଏହି ଡିଭାଇସକୁ ଲକ୍ କରିପାରିବେ ଏବଂ ପାସୱାର୍ଡକୁ ରିସେଟ୍ କରିପାରିବେ"</string>
     <string name="financed_privacy_wipe_device" msgid="5711746449385459844">"ଡିଭାଇସ୍ ଆଡମିନିଷ୍ଟ୍ରେଟର୍ ଡିଭାଇସର ସମସ୍ତ ଡାଟାକୁ ଡିଲିଟ୍ କରିପାରିବେ"</string>
     <string name="financed_privacy_failed_password_wipe_device" msgid="8777230427603977667">"ଡିଭାଇସର ଡାଟା ଡିଲିଟ୍ କରିବା ପୂର୍ବରୁ ବିଫଳ ହୋଇଥିବା ପାସୱାର୍ଡ ପ୍ରଚେଷ୍ଟା"</string>
-    <string name="financed_privacy_header" msgid="7215645340918406124">"ଆପଣଙ୍କ କ୍ରେଡିଟ୍ ପ୍ରଦାନକାରୀ ଏହି ଡିଭାଇସରେ ସେଟିଂସ୍ ପରିବର୍ତ୍ତନ ଏବଂ ସଫ୍ଟୱେର୍ ଇନଷ୍ଟଲ୍ କରିପାରିବ।\n\nଅଧିକ ଜାଣିବାକୁ, ଆପଣଙ୍କ କ୍ରେଡିଟ୍ ପ୍ରଦାନକାରୀ ସହ ଯୋଗାଯୋଗ କରନ୍ତୁ।"</string>
+    <string name="financed_privacy_header" msgid="7215645340918406124">"ଆପଣଙ୍କ କ୍ରେଡିଟ୍ ପ୍ରଦାନକାରୀ ଏହି ଡିଭାଇସରେ ସେଟିଂସ ପରିବର୍ତ୍ତନ ଏବଂ ସଫ୍ଟୱେର ଇନଷ୍ଟଲ କରିପାରିବେ।\n\nଅଧିକ ଜାଣିବାକୁ, ଆପଣଙ୍କ କ୍ରେଡିଟ୍ ପ୍ରଦାନକାରୀ ସହ ଯୋଗାଯୋଗ କରନ୍ତୁ।"</string>
     <plurals name="default_camera_app_title" formatted="false" msgid="8112432929729136399">
       <item quantity="other">କ୍ୟାମେରା ଆପସ୍‌</item>
       <item quantity="one">କ୍ୟାମେରା ଆପ୍‌</item>
@@ -5070,7 +5033,7 @@
     <string name="angle_enabled_app_not_set" msgid="4472572224881726067">"କୌଣସି ANGLE ସକ୍ଷମ ଥିବା ଆପ୍ଲିକେଶନ୍ ସେଟ୍ କରାଯାଇନାହିଁ"</string>
     <string name="angle_enabled_app_set" msgid="7811829383833353021">"ANGLE ସକ୍ଷମ ଆପ୍ଲିକେଶନ୍: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
     <string name="graphics_driver_dashboard_title" msgid="5661084817492587796">"ଗ୍ରାଫିକ୍ସ ଡ୍ରାଇଭର୍ ଅଗ୍ରାଧିକାର"</string>
-    <string name="graphics_driver_dashboard_summary" msgid="6348759885315793654">"ଗ୍ରାଫିକ୍ସ ଡ୍ରାଇଭର୍ ସେଟିଂସ୍ ବଦଳାନ୍ତୁ"</string>
+    <string name="graphics_driver_dashboard_summary" msgid="6348759885315793654">"ଗ୍ରାଫିକ୍ସ ଡ୍ରାଇଭର ସେଟିଂସ ବଦଳାନ୍ତୁ"</string>
     <string name="graphics_driver_footer_text" msgid="5123754522284046790">"ଏକାଧିକ ଗ୍ରାଫିକ୍ସ ଡ୍ରାଇଭର୍ ଥିବା ବେଳେ, ଡିଭାଇସରେ ଇନଷ୍ଟଲ୍ ଥିବା ଆପ୍ସ ପାଇଁ ବ୍ୟବହାର କରିବାକୁ ଅପଡେଟ୍ ହୋଇଥିବା ଗ୍ରାଫିକ୍ସ ଡ୍ରାଇଭର୍ ବାଛିପାରିବେ।"</string>
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"ସମସ୍ତ ଆପ୍ ପାଇଁ ସକ୍ଷମ କରନ୍ତୁ"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"ଗ୍ରାଫିକ୍ସ ଡ୍ରାଇଭର୍ ଚୟନ କରନ୍ତୁ"</string>
@@ -5137,7 +5100,7 @@
     <string name="pref_title_network_details" msgid="7329759534269363308">"ନେଟୱାର୍କ୍‌ ବିବରଣୀ"</string>
     <string name="about_phone_device_name_warning" msgid="1938930553285875166">"ଆପଣଙ୍କ ଫୋନରେ ଥିବା ଆପଗୁଡ଼ିକୁ ଆପଣଙ୍କ ଡିଭାଇସ୍ ନାମ ଦୃଶ୍ୟମାନ ହୋଇଥାଏ। ଯେତେବେଳେ ଆପଣ ବ୍ଲୁଟୁଥ୍ ଡିଭାଇସଗୁଡ଼ିକ ସହ ସଂଯୋଗ କରନ୍ତି, ଏକ ୱାଇ-ଫାଇ ନେଟୱାର୍କ ସହ ସଂଯୋଗ କରନ୍ତି କିମ୍ବା ଏକ ୱାଇ-ଫାଇ ହଟସ୍ପଟ୍ ସେଟ୍ ଅପ୍ କରନ୍ତି, ସେତେବେଳେ ଏହା ଅନ୍ୟ ଲୋକମାନଙ୍କୁ ମଧ୍ୟ ଦେଖାଯାଇପାରେ।"</string>
     <string name="devices_title" msgid="649715719278562515">"ଡିଭାଇସ୍‌"</string>
-    <string name="homepage_all_settings" msgid="1877827279189801035">"ସମସ୍ତ ସେଟିଂସ୍‌"</string>
+    <string name="homepage_all_settings" msgid="1877827279189801035">"ସମସ୍ତ ସେଟିଂସ"</string>
     <string name="homepage_personal_settings" msgid="8312279476519359656">"ପରାମର୍ଶ"</string>
     <string name="choose_network_title" msgid="5355609223363859430">"ନେଟ୍‌ୱାର୍କ ବାଛନ୍ତୁ"</string>
     <string name="network_disconnected" msgid="8281188173486212661">"ବିଛିନ୍ନ ହୋ‍ଇଗଲା"</string>
@@ -5200,8 +5163,8 @@
     <string name="not_allowed" msgid="5756935665192962915">"ଆପଣଙ୍କର SIM କାର୍ଡ ଏହି ନେଟ୍‌ୱର୍କ‌ରେ ସଂଯୁକ୍ତ ହେବା ପାଇଁ ଅନୁମତି ଦିଏ ନାହିଁ।"</string>
     <string name="connect_later" msgid="2330538069949281352">"ବର୍ତ୍ତମାନ ଏହି ନେଟ୍‌ୱର୍କ‌ରେ ସଂଯୋଗ କରାଯାଇପାରିବ ନାହିଁ। ପରେ ପୁଣି ଚେଷ୍ଟା କରନ୍ତୁ।"</string>
     <string name="registration_done" msgid="1750434215698850123">"ଏହି ନେଟ୍‌ୱର୍କରେ ପଞ୍ଜିକୃତ କରାଯାଇଛି।"</string>
-    <string name="select_automatically" msgid="2419752566747259155">"ସ୍ଵଚାଳିତ ଭାବେ ନେଟ୍‌ୱର୍କ ଚୟନ କରନ୍ତୁ"</string>
-    <string name="carrier_settings_title" msgid="6959295328730560529">"ବାହକ ସେଟିଂସ୍"</string>
+    <string name="select_automatically" msgid="2419752566747259155">"ସ୍ଵଚାଳିତ ଭାବେ ନେଟୱାର୍କ ଚୟନ କରନ୍ତୁ"</string>
+    <string name="carrier_settings_title" msgid="6959295328730560529">"କ୍ୟାରିଅର ସେଟିଂସ"</string>
     <string name="cdma_lte_data_service" msgid="6937443423651347345">"ଡାଟା ସେବା ସେଟ୍‌ଅପ୍ କରନ୍ତୁ"</string>
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"ମୋବାଇଲ୍ ଡାଟା"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"ମୋବାଇଲ୍ ନେଟ୍‌ୱର୍କକୁ ବ୍ୟବହାର କରି ଡାଟା ଆକ୍ସେସ୍ କରନ୍ତୁ"</string>
@@ -5247,7 +5210,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"ନେଟ୍‌ୱର୍କ ଅପରେଟିଙ୍ଗ ମୋଡ୍‌କୁ ପରିବର୍ତ୍ତନ କରନ୍ତୁ"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"ପସନ୍ଦର ନେଟୱାର୍କ ପ୍ରକାର"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"ବାହକ"</string>
-    <string name="carrier_settings_version" msgid="3364919669057317776">"କ୍ୟାରିଅର୍ ସେଟିଂସ୍ ସଂସ୍କରଣ"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"କ୍ୟାରିଅର୍ ସେଟିଂସ ସଂସ୍କରଣ"</string>
     <string name="call_category" msgid="641461844504128789">"କଲିଂ"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"ବାହକ ଭିଡିଓ କଲିଂ"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"ସିଷ୍ଟମ୍‌ ଚୟନ କରନ୍ତୁ"</string>
@@ -5292,6 +5255,7 @@
     <string name="sim_action_yes" msgid="8076556020131395515">"ହଁ"</string>
     <string name="sim_action_reboot" msgid="3508948833333441538">"ରିଷ୍ଟାର୍ଟ କରନ୍ତୁ"</string>
     <string name="sim_action_no_thanks" msgid="435717748384544195">"ନା, ଧନ୍ୟବାଦ"</string>
+    <string name="sim_action_cancel" msgid="2668099867029610910">"ବାତିଲ୍ କରନ୍ତୁ"</string>
     <string name="sim_switch_button" msgid="1405772571706095387">"ସ୍ୱିଚ୍ କରନ୍ତୁ"</string>
     <string name="dsds_activation_failure_title" msgid="4467364110584914794">"SIMକୁ ସକ୍ରିୟ କରାଯାଇପାରିବ ନାହିଁ"</string>
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"SIMକୁ କାଢ଼ି ପୁଣି ଭର୍ତ୍ତି କରନ୍ତୁ। ଯଦି ସମସ୍ୟା ଜାରି ରହେ, ତେବେ ଆପଣଙ୍କ ଡିଭାଇସକୁ ରିଷ୍ଟାର୍ଟ କରନ୍ତୁ।"</string>
@@ -5299,7 +5263,7 @@
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"ନେଟୱାର୍କ ସକ୍ରିୟକରଣ"</string>
     <string name="sim_switch_channel_id" msgid="4927038626791837861">"କ୍ୟାରିଅର୍ ସ୍ୱିଚ୍ କରାଯାଉଛି"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> ସକ୍ରିୟ ଅଛି"</string>
-    <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"SIM ସେଟିଂସକୁ ଅପଡେଟ୍ କରିବା ପାଇଁ ଟାପ୍ କରନ୍ତୁ"</string>
+    <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"SIM ସେଟିଂସକୁ ଅପଡେଟ କରିବା ପାଇଁ ଟାପ କରନ୍ତୁ"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>କୁ ସ୍ୱିଚ୍ କରାଯାଇଛି"</string>
     <string name="switch_to_removable_notification_no_carrier_name" msgid="7384856964036215338">"ଅନ୍ୟ ଏକ କ୍ୟାରିଅରକୁ ସ୍ୱିଚ୍ କରାଯାଇଛି"</string>
     <string name="network_changed_notification_text" msgid="2407908598496951243">"ଆପଣଙ୍କ ମୋବାଇଲ୍ ନେଟୱାର୍କ ବଦଳିଯାଇଛି"</string>
@@ -5313,7 +5277,7 @@
     <string name="switch_sim_dialog_title" msgid="5407316878973237773">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> ବ୍ୟବହାର କରିବେ?"</string>
     <string name="switch_sim_dialog_text" msgid="7530186862171635464">"ମୋବାଇଲ୍ ଡାଟା, କଲ୍ ଓ SMS ପାଇଁ <xliff:g id="CARRIER_NAME">%1$s</xliff:g>କୁ ବ୍ୟବହାର କରାଯିବ।"</string>
     <string name="switch_sim_dialog_no_switch_title" msgid="809763410787744247">"କୌଣସି ସକ୍ରିୟ SIM ଉପଲବ୍ଧ ନାହିଁ"</string>
-    <string name="switch_sim_dialog_no_switch_text" msgid="7053939850026876088">"ପରବର୍ତ୍ତୀ ସମୟରେ ମୋବାଇଲ୍ ଡାଟା, କଲ୍ ଫିଚର୍ ଓ SMS ବ୍ୟବହାର କରିବା ପାଇଁ ଆପଣଙ୍କ ନେଟୱାର୍କ ସେଟିଂସକୁ ଯାଆନ୍ତୁ"</string>
+    <string name="switch_sim_dialog_no_switch_text" msgid="7053939850026876088">"ପରବର୍ତ୍ତୀ ସମୟରେ ମୋବାଇଲ ଡାଟା, କଲ ଫିଚର ଓ SMS ବ୍ୟବହାର କରିବା ପାଇଁ ଆପଣଙ୍କ ନେଟୱାର୍କ ସେଟିଂସକୁ ଯାଆନ୍ତୁ"</string>
     <string name="sim_card_label" msgid="5632157635124050923">"SIM କାର୍ଡ"</string>
     <string name="erase_sim_dialog_title" msgid="881253002169177016">"ଡାଉନଲୋଡ୍ ହୋଇଥିବା ଏହି SIMକୁ ଖାଲି କରିବେ?"</string>
     <string name="erase_sim_dialog_text" msgid="753031064269699885">"ଏହି SIMକୁ ଖାଲି କରିବା ଦ୍ୱାରା, ଏହି ଡିଭାଇସରୁ <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> ସେବାକୁ କାଢ଼ି ଦିଆଯିବ।\n\n<xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> ପାଇଁ ସେବା ବାତିଲ୍ ହେବ ନାହିଁ।"</string>
@@ -5334,7 +5298,7 @@
     <string name="bluetooth_left_name" msgid="7440064067910080502">"ବାମ"</string>
     <string name="bluetooth_right_name" msgid="7588088072444124949">"ଡାହାଣ"</string>
     <string name="bluetooth_middle_name" msgid="3909371955137442319">"କେସ୍‍"</string>
-    <string name="settings_panel_title" msgid="346363079938069215">"ସେଟିଂସ୍‍ ପ୍ୟାନେଲ୍‍"</string>
+    <string name="settings_panel_title" msgid="346363079938069215">"ସେଟିଂସ ପ୍ୟାନେଲ"</string>
     <string name="internet_connectivity_panel_title" msgid="2044237561024730108">"ଇଣ୍ଟର୍ନେଟ୍‍ କନେକ୍ଟିଭିଟୀ"</string>
     <string name="volume_connectivity_panel_title" msgid="8772438444782726321">"ଭଲ୍ୟୁମ୍"</string>
     <string name="mobile_data_ap_mode_disabled" msgid="6067959496888990983">"ଏୟାରପ୍ଲେନ୍‌ ମୋଡ୍‌ ସମୟରେ ଉପଲବ୍ଧ ନୁହେଁ"</string>
@@ -5401,7 +5365,7 @@
     <string name="dual_cdma_sim_warning_notification_summary" msgid="2826474790710586487">"<xliff:g id="OPERATOR_NAMES">%1$s</xliff:g> ବ୍ୟବହାର କରିବା ଦ୍ୱାରା କାର୍ଯ୍ୟକ୍ଷମତା ସୀମିତ ହୋଇପାରେ। ଅଧିକ ଜାଣିବା ପାଇଁ ଟାପ୍ କରନ୍ତୁ।"</string>
     <string name="dual_cdma_sim_warning_notification_channel_title" msgid="1049161096896074364">"SIM କମ୍ବିନେସନ୍"</string>
     <string name="work_policy_privacy_settings" msgid="2702644843505242596">"ଆପଣଙ୍କ କାର୍ଯ୍ୟ ନୀତି ସୂଚନା"</string>
-    <string name="work_policy_privacy_settings_summary" msgid="690118670737638405">"ଆପଣଙ୍କ IT ଆଡ୍‌ମିନ୍‌ଙ୍କ ଦ୍ୱାରା ସେଟିଂସ୍ ପରିଚାଳିତ କରାଯାଇଛି।"</string>
+    <string name="work_policy_privacy_settings_summary" msgid="690118670737638405">"ଆପଣଙ୍କ IT ଆଡମିନଙ୍କ ଦ୍ୱାରା ସେଟିଂସ ପରିଚାଳିତ କରାଯାଇଛି।"</string>
     <string name="track_frame_time_keywords" msgid="7885340257945922239">"GPU"</string>
     <string name="bug_report_handler_title" msgid="713439959113250125">"ବଗ୍ ରିପୋର୍ଟ ହ୍ୟାଣ୍ଡଲର୍"</string>
     <string name="bug_report_handler_picker_footer_text" msgid="4935758328366585673">"ଆପଣଙ୍କ ଡିଭାଇସ୍‌ରେ କେଉଁ ଆପ୍ ବଗ୍ ରିପୋର୍ଟ ସର୍ଟକର୍ଟ ପରିଚାଳନା କରେ, ତାହା ନିର୍ଦ୍ଧାରଣ କରେ।"</string>
@@ -5426,7 +5390,7 @@
     <string name="power_menu_long_press_for_assist_sensitivity_low_label" msgid="3430099983480845635">"କମ୍ ସମୟ"</string>
     <string name="power_menu_long_press_for_assist_sensitivity_high_label" msgid="2059686170350829156">"ଅଧିକ ସମୟ"</string>
     <string name="lockscreen_privacy_wallet_setting_toggle" msgid="4188327143734192000">"ୱାଲେଟ୍ ଦେଖାନ୍ତୁ"</string>
-    <string name="lockscreen_privacy_wallet_summary" msgid="5388868513484652431">"ଲକ୍ ସ୍କ୍ରିନ୍ ଏବଂ କ୍ୱିକ୍ ସେଟିଂସରୁ ୱାଲେଟକୁ ଆକ୍ସେସ୍ କରିବା ପାଇଁ ଅନୁମତି ଦିଅନ୍ତୁ"</string>
+    <string name="lockscreen_privacy_wallet_summary" msgid="5388868513484652431">"ଲକ ସ୍କ୍ରିନ ଏବଂ କ୍ୱିକ୍ ସେଟିଂସରୁ ୱାଲେଟକୁ ଆକ୍ସେସ କରିବା ପାଇଁ ଅନୁମତି ଦିଅନ୍ତୁ"</string>
     <string name="lockscreen_privacy_controls_setting_toggle" msgid="7445725343949588613">"ଡିଭାଇସ୍ ନିୟନ୍ତ୍ରଣଗୁଡ଼ିକୁ ଦେଖାନ୍ତୁ"</string>
     <string name="lockscreen_privacy_controls_summary" msgid="6952176547084269909">"ଲକ୍ ଥିବା ସମୟରେ ନିୟନ୍ତ୍ରଣଗୁଡ଼ିକୁ ଆକ୍ସେସ୍ କରନ୍ତୁ"</string>
     <string name="lockscreen_double_line_clock_summary" msgid="2916159550425093703">"ଉପଲବ୍ଧ ହେଲେ ଡବଲ-ଲାଇନ ଘଣ୍ଟା ଦେଖାନ୍ତୁ"</string>
@@ -5442,11 +5406,15 @@
     <string name="no_5g_in_dsds_text" product="tablet" msgid="4757328474425714624">"2ଟି ସିମ୍ ବ୍ୟବହାର କରାଯାଉଥିବା ସମୟରେ, ଏହି ଟାବଲେଟ୍ 4Gରେ ସୀମିତ ରହିବ। "<annotation id="url">"ଅଧିକ ଜାଣନ୍ତୁ"</annotation></string>
     <string name="no_5g_in_dsds_text" product="device" msgid="6983783505032683314">"2ଟି ସିମ୍ ବ୍ୟବହାର କରାଯାଉଥିବା ସମୟରେ, ଏହି ଡିଭାଇସ୍ 4Gରେ ସୀମିତ ରହିବ। "<annotation id="url">"ଅଧିକ ଜାଣନ୍ତୁ"</annotation></string>
     <string name="cached_apps_freezer" msgid="1057519579761550350">"କ୍ୟାଶ୍ ହୋଇଥିବା ଆପ୍ସ ପାଇଁ ଏକଜିକ୍ୟୁସନ ସସପେଣ୍ଡ କରନ୍ତୁ"</string>
-    <string name="overlay_settings_title" msgid="1032863083496396365">"ସେଟିଂସରେ ସ୍କ୍ରିନ୍ ଓଭରଲେକୁ ଅନୁମତି ଦିଅନ୍ତୁ"</string>
-    <string name="overlay_settings_summary" msgid="2745336273786148166">"ସେଟିଂସ୍ ସ୍କ୍ରିନଗୁଡ଼ିକୁ ଓଭରଲେ କରିବାକୁ ସେହି ଆପ୍ସକୁ ଅନୁମତି ଦିଅନ୍ତୁ ଯାହା ଅନ୍ୟ ଆପ୍ସ ଉପରେ ଡିସପ୍ଲେ ହୋଇପାରିବ"</string>
+    <string name="overlay_settings_title" msgid="1032863083496396365">"ସେଟିଂସରେ ସ୍କ୍ରିନ ଓଭରଲେକୁ ଅନୁମତି ଦିଅନ୍ତୁ"</string>
+    <string name="overlay_settings_summary" msgid="2745336273786148166">"ସେଟିଂସ ସ୍କ୍ରିନଗୁଡ଼ିକୁ ଓଭରଲେ କରିବାକୁ ସେହି ଆପ୍ସକୁ ଅନୁମତି ଦିଅନ୍ତୁ ଯାହା ଅନ୍ୟ ଆପ୍ସ ଉପରେ ଡିସପ୍ଲେ ହୋଇପାରିବ"</string>
+    <!-- no translation found for allow_mock_modem (3832264806530479214) -->
+    <skip />
+    <!-- no translation found for allow_mock_modem_summary (9097416612748005374) -->
+    <skip />
     <string name="media_controls_title" msgid="403271085636252597">"ମିଡିଆ"</string>
     <string name="media_controls_resume_title" msgid="855076860336652370">"ମିଡିଆ ପ୍ଲେୟାରରେ ପିନ୍ କରନ୍ତୁ"</string>
-    <string name="media_controls_resume_description" msgid="3163482266454802097">"ଶୀଘ୍ର ପ୍ଲେବ୍ୟାକ୍ ପୁଣି ଆରମ୍ଭ କରିବାକୁ କ୍ୱିକ୍ ସେଟିଂସରେ ମିଡିଆ ପ୍ଲେୟାର୍ ଖୋଲା ରହିଥାଏ"</string>
+    <string name="media_controls_resume_description" msgid="3163482266454802097">"ଶୀଘ୍ର ପ୍ଲେବ୍ୟାକ ପୁଣି ଆରମ୍ଭ କରିବାକୁ କ୍ୱିକ୍ ସେଟିଂସରେ ମିଡିଆ ପ୍ଲେୟାର ଖୋଲା ରହିଥାଏ"</string>
     <string name="media_controls_recommendations_title" msgid="184225835236807677">"ମିଡିଆ ସୁପାରିଶଗୁଡ଼ିକ ଦେଖାନ୍ତୁ"</string>
     <string name="media_controls_recommendations_description" msgid="7596498733126824030">"ଆପଣଙ୍କ କାର୍ଯ୍ୟକଳାପ ଆଧାରରେ"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"ପ୍ଲେୟାରକୁ ଲୁଚାନ୍ତୁ"</string>
@@ -5495,7 +5463,7 @@
     <string name="default_active_sim_calls" msgid="2390973682556353558">"କଲଗୁଡ଼ିକ"</string>
     <string name="default_active_sim_sms" msgid="8041498593025994921">"SMS"</string>
     <string name="default_active_sim_mobile_data" msgid="6798083892814045301">"ମୋବାଇଲ ଡାଟା"</string>
-    <string name="wifi_scan_notify_message" msgid="4130641837826688879">"ଡିଭାଇସ ଅନୁଭୂତିକୁ ଉନ୍ନତ କରିବା ପାଇଁ, ୱାଇ-ଫାଇ ବନ୍ଦ ଥିଲେ ମଧ୍ୟ ଆପ ଓ ସେବାଗୁଡ଼ିକ ଏବେ ବି ଯେ କୌଣସି ସମୟରେ ୱାଇ-ଫାଇ ନେଟୱାର୍କ ପାଇଁ ସ୍କାନ କରିପାରିବ। ଉଦାହରଣ ସ୍ଵରୂପ, ଲୋକେସନ-ଆଧାରିତ ଫିଚର ଓ ସେବାଗୁଡ଼ିକୁ ଉନ୍ନତ କରିବା ପାଇଁ ଏହାକୁ ବ୍ୟବହାର କରାଯାଇପାରିବ। ଆପଣ ଏହାକୁ ୱାଇ-ଫାଇ ସ୍କାନିଂ ସେଟିଂସରେ ପରିବର୍ତ୍ତନ କରିପାରିବେ।"<annotation id="link">"ପରିବର୍ତ୍ତନ କରନ୍ତୁ"</annotation></string>
+    <string name="wifi_scan_notify_message" msgid="4130641837826688879">"ଡିଭାଇସ ଅନୁଭୂତିକୁ ଉନ୍ନତ କରିବା ପାଇଁ, ୱାଇ-ଫାଇ ବନ୍ଦ ଥିଲେ ମଧ୍ୟ ଆପ୍ସ ଏବଂ ସେବାଗୁଡ଼ିକ ଏବେ ବି ଯେ କୌଣସି ସମୟରେ ୱାଇ-ଫାଇ ନେଟୱାର୍କ ପାଇଁ ସ୍କାନ କରିପାରିବେ। ଉଦାହରଣ ସ୍ଵରୂପ, ଲୋକେସନ-ଆଧାରିତ ଫିଚର ଓ ସେବାଗୁଡ଼ିକୁ ଉନ୍ନତ କରିବା ପାଇଁ ଏହାକୁ ବ୍ୟବହାର କରାଯାଇପାରିବ। ଆପଣ ଏହାକୁ ୱାଇ-ଫାଇ ସ୍କାନିଂ ସେଟିଂସରେ ପରିବର୍ତ୍ତନ କରିପାରିବେ।"<annotation id="link">"ପରିବର୍ତ୍ତନ କରନ୍ତୁ"</annotation></string>
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"ସଂଯୋଗ କରାଯାଇଛି"</string>
     <string name="mobile_data_no_connection" msgid="905897142426974030">"ସଂଯୋଗ ନାହିଁ"</string>
@@ -5543,9 +5511,9 @@
     <string name="smart_forwarding_title" msgid="8368634861971949799">"ସ୍ମାର୍ଟ ଫରୱାର୍ଡିଂ"</string>
     <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"ସ୍ମାର୍ଟ ଫରୱାର୍ଡିଂ ସକ୍ଷମ କରାଯାଇଛି"</string>
     <string name="smart_forwarding_summary_disabled" msgid="5033880700091914809">"ସ୍ମାର୍ଟ ଫରୱାର୍ଡିଂ ଅକ୍ଷମ କରାଯାଇଛି"</string>
-    <string name="smart_forwarding_ongoing_title" msgid="962226849074401228">"କଲ୍ ସେଟିଂସ୍"</string>
-    <string name="smart_forwarding_ongoing_text" msgid="2189209372407117114">"ସେଟିଂସ୍ ଅପଡେଟ୍ ହେଉଛି…"</string>
-    <string name="smart_forwarding_failed_title" msgid="1859891191023516080">"କଲ୍ ସେଟିଂସ୍ ତ୍ରୁଟି"</string>
+    <string name="smart_forwarding_ongoing_title" msgid="962226849074401228">"କଲ ସେଟିଂସ"</string>
+    <string name="smart_forwarding_ongoing_text" msgid="2189209372407117114">"ସେଟିଂସ ଅପଡେଟ ହେଉଛି…"</string>
+    <string name="smart_forwarding_failed_title" msgid="1859891191023516080">"କଲ ସେଟିଂସରେ ତ୍ରୁଟି"</string>
     <string name="smart_forwarding_failed_text" msgid="5370431503707373653">"ନେଟୱାର୍କ କିମ୍ବା SIM କାର୍ଡ ତ୍ରୁଟି।"</string>
     <string name="smart_forwarding_failed_not_activated_text" msgid="997396203001257904">"SIM ସକ୍ରିୟ କରାଯାଇନାହିଁ।"</string>
     <string name="smart_forwarding_input_mdn_title" msgid="5105463748849841763">"ଫୋନ୍ ନମ୍ଵରଗୁଡ଼ିକ ଲେଖନ୍ତୁ"</string>
@@ -5565,7 +5533,7 @@
     <string name="mic_toggle_title" msgid="265145278323852547">"ମାଇକ୍ରୋଫୋନ୍ ଆକ୍ସେସ୍"</string>
     <string name="cam_toggle_description" msgid="9212762204005146404">"ଆପ ଓ ସେବାଗୁଡ଼ିକ ପାଇଁ"</string>
     <string name="mic_toggle_description" msgid="484139688645092237">"ଆପ ଓ ସେବାଗୁଡ଼ିକ ପାଇଁ। ଯଦି ଏହି ସେଟିଂ ବନ୍ଦ ଥାଏ, ତେବେ ଆପଣ ଏକ ଜରୁରୀକାଳୀନ ନମ୍ବରକୁ କଲ କରିବା ସମୟରେ ମାଇକ୍ରୋଫୋନ ଡାଟା ଏବେ ବି ସେୟାର କରାଯାଇପାରେ।"</string>
-    <string name="game_settings_title" msgid="1028178627743422090">"ଗେମ୍ ସେଟିଂସ୍"</string>
+    <string name="game_settings_title" msgid="1028178627743422090">"ଗେମ ସେଟିଂସ"</string>
     <string name="game_settings_summary" msgid="2548056479103747555">"ଗେମ୍ ଡ୍ୟାସବୋର୍ଡ ସର୍ଟକଟ୍ ଇତ୍ୟାଦି ଚାଲୁ କରନ୍ତୁ"</string>
     <string name="previous_page_content_description" msgid="6438292457923282991">"ପୂର୍ବବର୍ତ୍ତୀ"</string>
     <string name="next_page_content_description" msgid="1641835099813416294">"ପରବର୍ତ୍ତୀ"</string>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index dff9ea7..388d9bb 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -142,10 +142,11 @@
     <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"ਆਪਣੇ ਡੀਵਾਈਸ ਨੂੰ ਨਜ਼ਦੀਕੀ ਬਲੂਟੁੱਥ ਡੀਵਾਈਸਾਂ ਨਾਲ ਸੰਚਾਰ ਕਰਨ ਦਿਓ"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਨਜ਼ਦੀਕੀ ਬਲੂਟੁੱਥ ਡੀਵਾਈਸਾਂ ਨਾਲ ਸੰਚਾਰ ਕਰਨ ਦਿਓ"</string>
     <string name="bluetooth_disable_a2dp_hw_offload" msgid="5942913792817797541">"ਬਲੂਟੁੱਥ A2DP ਹਾਰਡਵੇਅਰ ਆਫ਼ਲੋਡ ਬੰਦ ਕਰੋ"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="8610420176339657720">"ਡੀਵਾਈਸ ਮੁੜ-ਚਾਲੂ ਕਰੀਏ?"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8333029144800835996">"ਤੁਹਾਨੂੰ ਇਹ ਸੈਟਿੰਗ ਬਦਲਣ ਲਈ ਡੀਵਾਈਸ ਨੂੰ ਮੁੜ-ਚਾਲੂ ਕਰਨ ਦੀ ਲੋੜ ਹੈ।"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="3488695418187553566">"ਮੁੜ-ਚਾਲੂ ਕਰੋ"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="4930826928585464191">"ਰੱਦ ਕਰੋ"</string>
+    <string name="bluetooth_disable_le_audio_hw_offload" msgid="3966022676505972908">"ਬਲੂਟੁੱਥ LE AUDIO ਹਾਰਡਵੇਅਰ ਆਫ਼ਲੋਡ ਬੰਦ ਕਰੋ"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_title" msgid="6001142380445276918">"ਕੀ ਡੀਵਾਈਸ ਮੁੜ-ਸ਼ੁਰੂ ਕਰਨਾ ਹੈ?"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_message" msgid="1524373895333698779">"ਤੁਹਾਨੂੰ ਇਹ ਸੈਟਿੰਗ ਬਦਲਣ ਲਈ ਡੀਵਾਈਸ ਨੂੰ ਮੁੜ-ਸ਼ੁਰੂ ਕਰਨ ਦੀ ਲੋੜ ਹੈ।"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_confirm" msgid="5594859658551707592">"ਮੁੜ-ਸ਼ੁਰੂ ਕਰੋ"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel" msgid="3663690305043973720">"ਰੱਦ ਕਰੋ"</string>
     <string name="connected_device_media_device_title" msgid="3783388247594566734">"ਮੀਡੀਆ ਡੀਵਾਈਸਾਂ"</string>
     <string name="connected_device_call_device_title" msgid="88732390601723608">"ਕਾਲ ਡੀਵਾਈਸ"</string>
     <string name="connected_device_other_device_title" msgid="4652120430615729193">"ਹੋਰ ਡੀਵਾਈਸ"</string>
@@ -309,9 +310,9 @@
     <string name="security_settings_title" msgid="6710768415432791970">"ਸੁਰੱਖਿਆ"</string>
     <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"ਇਨਕ੍ਰਿਪਸ਼ਨ ਅਤੇ ਕ੍ਰੀਡੈਂਸ਼ੀਅਲ"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"ਫ਼ੋਨ ਇਨਕ੍ਰਿਪਟ ਕੀਤਾ ਗਿਆ"</string>
-    <string name="decryption_settings_summary" product="default" msgid="1742645256103613503">"ਫ਼ੋਨ ਇਨਕ੍ਰਿਪਟ ਨਹੀਂ ਕੀਤਾ ਗਿਆ"</string>
+    <string name="not_encrypted_summary" product="default" msgid="2251945842585788254">"ਫ਼ੋਨ ਇਨਕ੍ਰਿਪਟ ਨਹੀਂ ਕੀਤਾ ਗਿਆ"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"ਡੀਵਾਈਸ ਇਨਕ੍ਰਿਪਟ ਕੀਤਾ ਗਿਆ"</string>
-    <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"ਡੀਵਾਈਸ ਇਨਕ੍ਰਿਪਟ ਨਹੀਂ ਕੀਤਾ ਗਿਆ"</string>
+    <string name="not_encrypted_summary" product="tablet" msgid="2374263654698719382">"ਡੀਵਾਈਸ ਇਨਕ੍ਰਿਪਟ ਨਹੀਂ ਕੀਤਾ ਗਿਆ"</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"ਲਾਕ ਸਕ੍ਰੀਨ"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"ਦਿਖਾਉਣ ਲਈ ਚੀਜ਼ਾਂ"</string>
     <string name="security_settings_summary" msgid="1627059516127354233">"ਮੇਰਾ ਟਿਕਾਣਾ, ਸਕ੍ਰੀਨ ਅਣਲਾਕ, ਸਿਮ ਕਾਰਡ ਲਾਕ, ਕ੍ਰੀਡੈਂਸ਼ੀਅਲ ਸਟੋਰੇਜ ਲਾਕ ਸੈੱਟ ਕਰੋ"</string>
@@ -568,37 +569,10 @@
     <string name="fingerprint_last_delete_message" msgid="7860374760549404410">"ਤੁਸੀਂ ਆਪਣਾ ਫ਼ੋਨ ਅਣਲਾਕ ਕਰਨ ਜਾਂ ਐਪਾਂ ਵਿੱਚ ਆਪਣੀ ਪੁਸ਼ਟੀ ਕਰਨ ਲਈ ਆਪਣਾ ਫਿੰਗਰਪ੍ਰਿੰਟ ਨਹੀਂ ਵਰਤ ਸਕੋਗੇ।"</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="4104208067277655068">"ਤੁਸੀਂ ਆਪਣਾ ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਅਣਲਾਕ ਕਰਨ, ਖਰੀਦਾਂ ਨੂੰ ਅਧਿਕਾਰਤ ਕਰਨ ਜਾਂ ਕਾਰਜ ਐਪਾਂ ਵਿੱਚ ਸਾਈਨ-ਇਨ ਕਰਨ ਲਈ ਆਪਣਾ ਫਿੰਗਰਪ੍ਰਿੰਟ ਨਹੀਂ ਵਰਤ ਸਕੋਗੇ।"</string>
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"ਹਾਂ, ਹਟਾਓ"</string>
-    <string name="crypt_keeper_settings_title" msgid="4938812137822100044">"ਇਨਕ੍ਰਿਪਸ਼ਨ"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"ਟੈਬਲੈੱਟ ਇਨਕ੍ਰਿਪਟ ਕਰੋ"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"ਫ਼ੋਨ ਇਨਕ੍ਰਿਪਟ ਕਰੋ"</string>
-    <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"ਇਨਕ੍ਰਿਪਟ ਹੈ"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"ਤੁਸੀਂ ਆਪਣੇ ਖਾਤੇ, ਸੈਟਿੰਗਾਂ, ਡਾਊਨਲੋਡ ਕੀਤੇ ਐਪ ਅਤੇ ਉਹਨਾਂ ਦਾ ਡਾਟਾ, ਮੀਡੀਆ ਅਤੇ ਹੋਰ ਫਾਈਲਾਂ ਇਨਕ੍ਰਿਪਟ ਕਰ ਸਕਦੇ ਹੋ। ਆਪਣੀ ਟੈਬਲੈੱਟ ਨੂੰ ਇਨਕ੍ਰਿਪਟ ਕਰਨ ਤੋਂ ਬਾਅਦ, ਇਹ ਮੰਨਦੇ ਹੋਏ ਕਿ ਤੁਸੀਂ ਇੱਕ ਸਕ੍ਰੀਨ ਲਾਕ ਸੈੱਟ ਅੱਪ ਕੀਤਾ ਹੈ (ਮਤਲਬ, ਇੱਕ ਪੈਟਰਨ ਜਾਂ ਸੰਖਿਆਤਮਿਕ ਪਿੰਨ ਜਾਂ ਪਾਸਵਰਡ), ਤੁਹਾਨੂੰ ਹਰ ਵਾਰ ਟੈਬਲੈੱਟ ਨੂੰ ਚਾਲੂ ਕਰਨ ਵੇਲੇ ਇਸਨੂੰ ਡੀਕ੍ਰਿਪਟ ਕਰਨ ਲਈ ਸਕ੍ਰੀਨ ਨੂੰ ਅਣਲਾਕ ਕਰਨ ਦੀ ਲੋੜ ਹੈ। ਡੀਕ੍ਰਿਪਟ ਕਰਨ ਦਾ ਹੋਰ ਤਰੀਕਾ ਕੇਵਲ ਆਪਣਾ ਸਾਰਾ ਡਾਟਾ ਮਿਟਾਉਂਦੇ ਹੋਏ, ਇੱਕ ਫੈਕਟਰੀ ਡਾਟਾ ਰੀਸੈੱਟ ਕਰਨਾ ਹੈ।\n\nਇਨਕ੍ਰਿਪਸ਼ਨ ਵਿੱਚ ਇੱਕ ਘੰਟਾ ਜਾਂ ਵੱਧ ਸਮਾਂ ਲੱਗ ਸਕਦਾ ਹੈ। ਤੁਹਾਨੂੰ ਇੱਕ ਚਾਰਜ ਕੀਤੀ ਬੈਟਰੀ ਨਾਲ ਸ਼ੁਰੂ ਕਰਨਾ ਚਾਹੀਦਾ ਹੈ ਅਤੇ ਪੂਰੀ ਪ੍ਰਕਿਰਿਆ ਦੇ ਦੌਰਾਨ ਆਪਣੇ ਟੈਬਲੈੱਟ ਨੂੰ ਪਲੱਗ-ਇਨ ਰੱਖਣਾ ਚਾਹੀਦਾ ਹੈ। ਜੇਕਰ ਤੁਸੀਂ ਇਸਨੂੰ ਰੋਕਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡਾ ਕੁਝ ਜਾਂ ਸਾਰਾ ਡਾਟਾ ਨਸ਼ਟ ਹੋ ਜਾਏਗਾ।"</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"ਤੁਸੀਂ ਆਪਣੇ ਖਾਤੇ, ਸੈਟਿੰਗਾਂ, ਡਾਊਨਲੋਡ ਕੀਤੇ ਐਪ ਅਤੇ ਉਹਨਾਂ ਦਾ ਡਾਟਾ, ਮੀਡੀਆ ਅਤੇ ਹੋਰ ਫਾਈਲਾਂ ਇਨਕ੍ਰਿਪਟ ਕਰ ਸਕਦੇ ਹੋ। ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਇਨਕ੍ਰਿਪਟ ਕਰਨ ਤੋਂ ਬਾਅਦ, ਇਹ ਮੰਨਦੇ ਹੋਏ ਕਿ ਤੁਸੀਂ ਇੱਕ ਸਕ੍ਰੀਨ ਲਾਕ ਸੈੱਟ ਅੱਪ ਕੀਤਾ ਹੈ (ਮਤਲਬ, ਇੱਕ ਪੈਟਰਨ ਜਾਂ ਸੰਖਿਆਤਮਿਕ ਪਿੰਨ ਜਾਂ ਪਾਸਵਰਡ), ਤੁਹਾਨੂੰ ਹਰ ਵਾਰ ਫ਼ੋਨ ਨੂੰ ਚਾਲੂ ਕਰਨ ਵੇਲੇ ਇਸਨੂੰ ਡੀਕ੍ਰਿਪਟ ਕਰਨ ਲਈ ਸਕ੍ਰੀਨ ਨੂੰ ਅਣਲਾਕ ਕਰਨ ਦੀ ਲੋੜ ਹੈ। ਡੀਕ੍ਰਿਪਟ ਕਰਨ ਦਾ ਹੋਰ ਤਰੀਕਾ ਕੇਵਲ ਆਪਣਾ ਸਾਰਾ ਡਾਟਾ ਮਿਟਾਉਂਦੇ ਹੋਏ, ਇੱਕ ਫੈਕਟਰੀ ਡਾਟਾ ਰੀਸੈੱਟ ਕਰਨਾ ਹੈ।\n\nਇਨਕ੍ਰਿਪਸ਼ਨ ਵਿੱਚ ਇੱਕ ਘੰਟਾ ਜਾਂ ਵੱਧ ਸਮਾਂ ਲੱਗ ਸਕਦਾ ਹੈ। ਤੁਹਾਨੂੰ ਇੱਕ ਚਾਰਜ ਕੀਤੀ ਬੈਟਰੀ ਨਾਲ ਸ਼ੁਰੂ ਕਰਨਾ ਚਾਹੀਦਾ ਹੈ ਅਤੇ ਪੂਰੀ ਪ੍ਰਕਿਰਿਆ ਦੇ ਦੌਰਾਨ ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਪਲੱਗ-ਇਨ ਰੱਖਣਾ ਚਾਹੀਦਾ ਹੈ। ਜੇਕਰ ਤੁਸੀਂ ਇਸਨੂੰ ਰੋਕਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡਾ ਕੁਝ ਜਾਂ ਸਾਰਾ ਡਾਟਾ ਨਸ਼ਟ ਹੋ ਜਾਏਗਾ।"</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"ਟੈਬਲੈੱਟ ਇਨਕ੍ਰਿਪਟ ਕਰੋ"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"ਫ਼ੋਨ ਇਨਕ੍ਰਿਪਟ ਕਰੋ"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"ਆਪਣੀ ਬੈਟਰੀ ਚਾਰਜ ਕਰੋ ਅਤੇ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"</string>
-    <string name="crypt_keeper_unplugged_text" msgid="2709721134148651329">"ਆਪਣਾ ਚਾਰਜਰ ਪਲੱਗ-ਇਨ ਕਰੋ ਅਤੇ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="1847280235529858357">"ਕੋਈ ਲਾਕ ਸਕ੍ਰੀਨ ਪਿੰਨ ਜਾਂ ਪਾਸਵਰਡ ਨਹੀਂ"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="7210616262954236042">"ਤੁਹਾਨੂੰ ਇਨਕ੍ਰਿਪਸ਼ਨ ਸ਼ੁਰੂ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਇੱਕ ਲਾਕ ਸਕ੍ਰੀਨ ਪਿੰਨ ਜਾਂ ਪਾਸਵਰਡ ਸੈੱਟ ਕਰਨ ਦੀ ਲੋੜ ਹੈ"</string>
-    <string name="crypt_keeper_confirm_title" msgid="8600000209722452230">"ਕੀ ਇਨਕ੍ਰਿਪਟ ਕਰਨਾ ਹੈ?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="3270587498436152259">"ਇਨਕ੍ਰਿਪਸ਼ਨ ਓਪਰੇਸ਼ਨ ਅਬਦਲ ਹੈ ਅਤੇ ਜੇਕਰ ਤੁਸੀਂ ਇਸਨੂੰ ਰੋਕਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡਾ ਡਾਟਾ ਨਸ਼ਟ ਹੋ ਜਾਵੇਗਾ। ਇਨਕ੍ਰਿਪਸ਼ਨ ਵਿੱਚ ਇੱਕ ਘੰਟਾ ਜਾਂ ਇਸਤੋਂ ਵੱਧ ਸਮਾਂ ਲੱਗਦਾ ਹੈ, ਜਿਸਦੇ ਦੌਰਾਨ ਟੈਬਲੈੱਟ ਕਈ ਵਾਰ ਮੁੜ-ਚਾਲੂ ਹੋਵੇਗਾ।"</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="3040428543349852419">"ਇਨਕ੍ਰਿਪਸ਼ਨ ਓਪਰੇਸ਼ਨ ਅਬਦਲ ਹੈ ਅਤੇ ਜੇਕਰ ਤੁਸੀਂ ਇਸਨੂੰ ਰੋਕਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡਾ ਡਾਟਾ ਨਸ਼ਟ ਹੋ ਜਾਏਗਾ। ਇਨਕ੍ਰਿਪਸ਼ਨ ਵਿੱਚ ਇੱਕ ਘੰਟਾ ਜਾਂ ਇਸਤੋਂ ਵੱਧ ਸਮਾਂ ਲੱਗਦਾ ਹੈ, ਜਿਸਦੇ ਦੌਰਾਨ ਫ਼ੋਨ ਕਈ ਵਾਰ ਰੀਸਟਾਰਟ ਹੋਵੇਗਾ।"</string>
-    <string name="crypt_keeper_setup_title" msgid="3339725741305796680">"ਇਨਕ੍ਰਿਪਟ ਕਰ ਰਿਹਾ ਹੈ"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="4417016995091289019">"ਤੁਹਾਡਾ ਟੈਬਲੈੱਟ ਇਨਕ੍ਰਿਪਟ ਹੋਣ ਤਕ ਇੰਤਜ਼ਾਰ ਕਰੋ। <xliff:g id="PERCENT">^1</xliff:g> ਪੂਰਾ।"</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="7902355422499500352">"ਜਦੋਂ ਤੁਹਾਡਾ ਫ਼ੋਨ ਇਨਕ੍ਰਿਪਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੋਵੇ ਤਾਂ ਠਹਿਰੋ। <xliff:g id="PERCENT">^1</xliff:g>% ਪੂਰਾ।"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="8348188415839917821">"ਤੁਹਾਡਾ ਟੈਬਲੈੱਟ ਇਨਕ੍ਰਿਪਟ ਹੋਣ ਤਕ ਇੰਤਜ਼ਾਰ ਕਰੋ। ਬਾਕੀ ਸਮਾਂ: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="8556105766597855198">"ਜਦੋਂ ਤੁਹਾਡਾ ਫ਼ੋਨ ਇਨਕ੍ਰਿਪਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੋਵੇ ਤਂ ਠਹਿਰੋ। ਬਾਕੀ ਸਮਾਂ: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="3832496715430327682">"ਆਪਣੇ ਟੈਬਲੈੱਟ ਨੂੰ ਅਣਲਾਕ ਕਰਨ ਲਈ, ਇਸਨੂੰ ਬੰਦ ਕਰੋ ਅਤੇ ਫਿਰ ਚਾਲੂ ਕਰੋ।"</string>
-    <string name="crypt_keeper_force_power_cycle" product="default" msgid="5070346039522135361">"ਆਪਣਾ ਫ਼ੋਨ ਅਣਲਾਕ ਕਰਨ ਲਈ, ਇਸਨੂੰ ਬੰਦ ਅਤੇ ਫਿਰ ਚਾਲੂ ਕਰੋ।"</string>
-    <string name="crypt_keeper_warn_wipe" msgid="8104921337301750394">"ਚਿਤਾਵਨੀ: ਅਣਲਾਕ ਕੀਤੇ ਜਾਣ ਲਈ <xliff:g id="COUNT">^1</xliff:g> ਤੋਂ ਵੱਧ ਅਸਫਲ ਕੋਸ਼ਿਸ਼ਾਂ ਤੋਂ ਬਾਅਦ ਤੁਹਾਡਾ ਡੀਵਾਈਸ ਮਿਟਾ ਦਿੱਤਾ ਜਾਏਗਾ!"</string>
-    <string name="crypt_keeper_enter_password" msgid="1274917431075529732">"ਆਪਣਾ ਪਾਸਵਰਡ ਟਾਈਪ ਕਰੋ"</string>
-    <string name="crypt_keeper_failed_title" msgid="8173654570682244149">"ਇਨਕ੍ਰਿਪਸ਼ਨ ਅਸਫਲ"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"ਇਨਕ੍ਰਿਪਸ਼ਨ ਰੋਕਿਆ ਗਿਆ ਸੀ ਅਤੇ ਪੂਰਾ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ। ਸਿੱਟੇ ਵਜੋਂ, ਤੁਹਾਡੇ ਟੈਬਲੈੱਟ ਤੇ ਡਾਟਾ ਹੁਣ ਪਹੁੰਚਯੋਗ ਨਹੀਂ ਹੈ। \n\n ਆਪਣਾ ਟੈਬਲੈੱਟ ਵਰਤਣਾ ਦੁਬਾਰਾ ਸ਼ੁਰੂ ਕਰਨ ਲਈ, ਤੁਹਾਨੂੰ ਇੱਕ ਫੈਕਟਰੀ ਰੀਸੈੱਟ ਕਰਨ ਦੀ ਲੋੜ ਹੈ। ਜਦੋਂ ਤੁਸੀਂ ਰੀਸੈੱਟ ਤੋਂ ਬਾਅਦ ਆਪਣਾ ਟੈਬਲੈੱਟ ਸੈੱਟ ਅੱਪ ਕਰਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡੇ ਕੋਲ ਉਹ ਕੋਈ ਵੀ ਡਾਟਾ ਰੀਸਟੋਰ ਕਰਨ ਦਾ ਮੌਕਾ ਹੁੰਦਾ ਹੈ, ਜੋ ਤੁਹਾਡੇ Google ਖਾਤੇ ਨਾਲ ਬੈੱਕ ਅੱਪ ਕੀਤਾ ਗਿਆ ਸੀ।"</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"ਇਨਕ੍ਰਿਪਸ਼ਨ ਰੋਕਿਆ ਗਿਆ ਸੀ ਅਤੇ ਪੂਰਾ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ। ਸਿੱਟੇ ਵਜੋਂ, ਤੁਹਾਡੇ ਫ਼ੋਨ ਤੇ ਡਾਟਾ ਹੁਣ ਪਹੁੰਚਯੋਗ ਨਹੀਂ ਹੈ। \n\nਆਪਣਾ ਫ਼ੋਨ ਵਰਤਣਾ ਦੁਬਾਰਾ ਸ਼ੁਰੂ ਕਰਨ ਲਈ, ਤੁਹਾਨੂੰ ਇੱਕ ਫੈਕਟਰੀ ਰੀਸੈੱਟ ਕਰਨ ਦੀ ਲੋੜ ਹੈ। ਜਦੋਂ ਤੁਸੀਂ ਰੀਸੈੱਟ ਤੋਂ ਬਾਅਦ ਆਪਣਾ ਫ਼ੋਨ ਸੈੱਟ ਅੱਪ ਕਰਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡੇ ਕੋਲ ਉਹ ਕੋਈ ਵੀ ਡਾਟਾ ਰੀਸਟੋਰ ਕਰਨ ਦਾ ਮੌਕਾ ਹੁੰਦਾ ਹੈ, ਜੋ ਤੁਹਾਡੇ Google ਖਾਤੇ ਨਾਲ ਬੈਕ ਅੱਪ ਕੀਤਾ ਗਿਆ ਸੀ।"</string>
-    <string name="crypt_keeper_data_corrupt_title" msgid="5920153462176846037">"ਡੀਕ੍ਰਿਪਸ਼ਨ ਅਸਫਲ"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"ਤੁਹਾਡੇ ਵੱਲੋਂ ਦਰਜ ਕੀਤਾ ਪਾਸਵਰਡ ਸਹੀ ਹੈ, ਪਰੰਤੂ ਅਫ਼ਸੋਸ ਨਾਲ ਡਾਟਾ ਕਰਪਟ ਹੈ। \n\nਆਪਣੀ ਟੈਬਲੈੱਟ ਵਰਤਣਾ ਦੁਬਾਰਾ ਸ਼ੁਰੂ ਕਰਨ ਲਈ, ਤੁਹਾਨੂੰ ਇੱਕ ਫੈਕਟਰੀ ਰੀਸੈੱਟ ਕਰਨ ਦੀ ਲੋੜ ਹੈ। ਜਦੋਂ ਤੁਸੀਂ ਰੀਸੈੱਟ ਤੋਂ ਬਾਅਦ ਆਪਣੀ ਟੈਬਲੈੱਟ ਸੈੱਟ ਅੱਪ ਕਰਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡੇ ਕੋਲ ਉਹ ਕੋਈ ਵੀ ਡਾਟਾ ਰੀਸਟੋਰ ਕਰਨ ਦਾ ਮੌਕਾ ਹੁੰਦਾ ਹੈ, ਜੋ ਤੁਹਾਡੇ Google ਖਾਤੇ ਨਾਲ ਬੈਕ ਅੱਪ ਕੀਤਾ ਗਿਆ ਸੀ।"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"ਤੁਹਾਡੇ ਵੱਲੋਂ ਦਰਜ ਕੀਤਾ ਪਾਸਵਰਡ ਸਹੀ ਹੈ, ਪਰੰਤੂ ਅਫ਼ਸੋਸ ਨਾਲ ਡਾਟਾ ਕਰਪਟ ਹੈ। \n\nਆਪਣਾ ਫ਼ੋਨ ਵਰਤਣਾ ਦੁਬਾਰਾ ਸ਼ੁਰੂ ਕਰਨ ਲਈ, ਤੁਹਾਨੂੰ ਇੱਕ ਫੈਕਟਰੀ ਰੀਸੈੱਟ ਕਰਨ ਦੀ ਲੋੜ ਹੈ। ਜਦੋਂ ਤੁਸੀਂ ਰੀਸੈੱਟ ਤੋਂ ਬਾਅਦ ਆਪਣੀ ਟੈਬਲੈੱਟ ਸੈੱਟ ਅੱਪ ਕਰਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡੇ ਕੋਲ ਉਹ ਕੋਈ ਵੀ ਡਾਟਾ ਰੀਸਟੋਰ ਕਰਨ ਦਾ ਮੌਕਾ ਹੁੰਦਾ ਹੈ, ਜੋ ਤੁਹਾਡੇ Google ਖਾਤੇ ਨਾਲ ਬੈਕ ਅੱਪ ਕੀਤਾ ਗਿਆ ਸੀ।"</string>
-    <string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"ਇਨਪੁੱਟ ਵਿਧੀ ਸਵਿੱਚ ਕਰੋ"</string>
+    <string name="encryption_settings_title" msgid="2848716008695618360">"ਇਨਕ੍ਰਿਪਸ਼ਨ"</string>
+    <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"ਟੈਬਲੈੱਟ ਇਨਕ੍ਰਿਪਟ ਕਰੋ"</string>
+    <string name="encrypt_title" product="default" msgid="7337365190988321100">"ਫ਼ੋਨ ਇਨਕ੍ਰਿਪਟ ਕਰੋ"</string>
+    <string name="encrypted_summary" msgid="545623487587251207">"ਇਨਕ੍ਰਿਪਟਡ"</string>
     <string name="suggested_lock_settings_title" msgid="7836065447159730217">"ਆਪਣਾ ਫ਼ੋਨ ਸੁਰੱਖਿਅਤ ਕਰੋ"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"ਟੈਬਲੈੱਟ ਦੀ ਸੁਰੱਖਿਆ ਲਈ ਸਕ੍ਰੀਨ ਲਾਕ ਸੈੱਟ ਕਰੋ"</string>
     <string name="suggested_lock_settings_summary" product="device" msgid="8479766049078378225">"ਡੀਵਾਈਸ ਦੀ ਸੁਰੱਖਿਆ ਲਈ ਸਕ੍ਰੀਨ ਲਾਕ ਸੈੱਟ ਕਰੋ"</string>
@@ -817,6 +791,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"ਤੁਹਾਨੂੰ ਹੋਰ ਡੀਵਾਈਸ ਤੇ ਇਹ ਪਿੰਨ ਟਾਈਪ ਕਰਨ ਦੀ ਲੋੜ ਹੋ ਸਕਦੀ ਹੈ।"</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"ਤੁਹਾਨੂੰ ਹੋਰ ਡੀਵਾਈਸ ਤੇ ਵੀ ਇਹ ਪਾਸਕੁੰਜੀ ਟਾਈਪ ਕਰਨ ਦੀ ਲੋੜ ਹੋ ਸਕਦੀ ਹੈ।"</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"ਇਸ ਨਾਲ ਪੇਅਰ ਕਰਨ ਲਈ:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;ਯਕੀਨੀ ਬਣਾਓ ਕਿ ਇਹ ਇਸ ਪਾਸਕੁੰਜੀ ਨੂੰ ਦਿਖਾ ਰਿਹਾ ਹੈ:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"ਤਾਲ-ਮੇਲ ਵਾਲੇ ਸੈੱਟ ਨਾਲ ਜੋੜਾਬੱਧ ਕਰਨ ਲਈ ਤਸਦੀਕ ਕਰੋ"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"ਇਸਤੋਂ:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;ਕੀ ਇਸ ਡੀਵਾਈਸ ਨਾਲ ਜੋੜਾਬੱਧ ਕਰਨਾ ਹੈ?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"ਇਸ ਨਾਲ ਜੋੜਾਬੱਧ ਕਰਨ ਲਈ:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>ਇਸਤੇ ਟਾਈਪ ਕਰੋ:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, ਫਿਰ \'ਵਾਪਸ ਜਾਓ\' ਜਾਂ \'ਦਾਖਲ ਕਰੋ\' ਕੁੰਜੀ ਨੂੰ ਦਬਾਓ।"</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"ਆਪਣੇ ਸੰਪਰਕਾਂ ਅਤੇ ਕਾਲ ਇਤਿਹਾਸ \'ਤੇ ਪਹੁੰਚ ਕਰਨ ਦਿਓ"</string>
@@ -850,6 +825,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"ਕਨੈਕਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ। ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"</string>
     <string name="device_details_title" msgid="1155622417516195481">"ਡੀਵਾਈਸ ਦੇ ਵੇਰਵੇ"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"ਡੀਵਾਈਸ ਦਾ ਬਲੂਟੁੱਥ ਪਤਾ: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"ਡੀਵਾਈਸ ਦਾ ਬਲੂਟੁੱਥ ਪਤਾ: \n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"ਕੀ ਡੀਵਾਈਸ ਨੂੰ ਭੁੱਲਣਾ ਹੈ?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"ਐਸੋਸੀਏਸ਼ਨ ਹਟਾਓ"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"ਕੀ ਐਪ ਡਿਸਕਨੈਕਟ ਕਰਨੀ ਹੈ?"</string>
@@ -881,6 +857,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"ਸੈਟਿੰਗਾਂ ਯਾਦ ਰੱਖੋ"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"ਵੱਧ ਤੋਂ ਵੱਧ ਕਨੈਕਟ ਕੀਤੇ ਬਲੂਟੁੱਥ ਆਡੀਓ ਡੀਵਾਈਸ"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"ਵੱਧ ਤੋਂ ਵੱਧ ਕਨੈਕਟ ਕੀਤੇ ਬਲੂਟੁੱਥ ਆਡੀਓ ਡੀਵਾਈਸ ਚੁਣੋ"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"NFC ਸਟੈਕ ਡੀਬੱਗ ਲੌਗ"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"NFC ਸਟੈਕ ਲੌਗਿੰਗ ਪੱਧਰ ਵਧਾਓ"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"ਕਾਸਟ ਕਰੋ"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"ਸ਼ੀਸ਼ਾ"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"ਵਾਇਰਲੈਸ ਡਿਸਪਲੇ ਚਾਲੂ ਕਰੋ"</string>
@@ -1188,6 +1166,8 @@
     <string name="wifi_hotspot_maximize_compatibility_dual_ap_summary" msgid="3579549223159056533">"ਹੋਰ ਡੀਵਾਈਸਾਂ ਨੂੰ ਇਹ ਹੌਟਸਪੌਟ ਲੱਭਣ ਵਿੱਚ ਮਦਦ ਮਿਲਦੀ ਹੈ। ਬੈਟਰੀ ਵਰਤੋਂ ਵੱਧ ਜਾਂਦੀ ਹੈ।"</string>
     <string name="wifi_tether_starting" msgid="8879874184033857814">"ਹੌਟਸਪੌਟ ਚਾਲੂ ਕਰ ਰਿਹਾ ਹੈ..."</string>
     <string name="wifi_tether_stopping" msgid="4416492968019409188">"ਹੌਟਸਪੌਟ ਬੰਦ ਕਰ ਰਿਹਾ ਹੈ…"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_title" msgid="3089432578433978073">"ਟੈਦਰਿੰਗ ਅਣਉਪਲਬਧ ਹੈ"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_content" msgid="5920421547607921112">"ਵੇਰਵਿਆਂ ਲਈ ਆਪਣੇ ਕੈਰੀਅਰ ਨਾਲ ਸੰਪਰਕ ਕਰੋ"</string>
     <string name="wifi_tether_enabled_subtext" msgid="5085002421099821056">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> ਕਿਰਿਆਸ਼ੀਲ ਹੈ"</string>
     <string name="wifi_tether_failed_subtext" msgid="437190628041885500">"ਪੋਰਟੇਬਲ ਵਾਈ‑ਫਾਈ ਹੌਟਸਪੌਟ ਗੜਬੜ"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7072559431286459122">"ਵਾਈ‑ਫਾਈ ਹੌਟਸਪੌਟ ਸਥਾਪਤ ਕਰੋ"</string>
@@ -1570,7 +1550,7 @@
     <string name="sd_ejecting_title" msgid="1641122369013595273">"ਅਨਮਾਉਂਟ ਕਰ ਰਿਹਾ ਹੈ"</string>
     <string name="sd_ejecting_summary" msgid="861928572729341132">"ਪ੍ਰਗਤੀ ਵਿੱਚ ਅਨਮਾਉਂਟ ਕਰੋ"</string>
     <string name="storage_low_title" msgid="8002650511493419567">"ਸਟੋਰੇਜ ਦੀ ਜਗ੍ਹਾ ਖਾਲੀ ਹੋ ਰਹੀ ਹੈ"</string>
-    <string name="storage_low_summary" msgid="7341022293583384506">"ਕੁਝ ਸਿਸਟਮ ਫੰਕਸ਼ਨ, ਜਿਵੇਂ ਸਮਕਾਲੀਕਿਰਤ ਕਰਨਾ, ਸਹੀ ਢੰਗ ਨਾਲ ਕੰਮ ਨਹੀਂ ਵੀ ਕਰ ਸਕਦੇ। ਆਈਟਮਾਂ ਮਿਟਾ ਕੇ ਜਾਂ ਅਨਪਿੰਨ ਕਰਕੇ ਸਪੇਸ ਖਾਲੀ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰੋ, ਜਿਵੇਂ ਐਪਾਂ ਜਾਂ ਮੀਡੀਆ ਸਮੱਗਰੀ।"</string>
+    <string name="storage_low_summary" msgid="7341022293583384506">"ਕੁਝ ਸਿਸਟਮ ਫੰਕਸ਼ਨ, ਜਿਵੇਂ ਸਿੰਕ ਕਰਨਾ, ਸਹੀ ਢੰਗ ਨਾਲ ਕੰਮ ਨਹੀਂ ਵੀ ਕਰ ਸਕਦੇ। ਆਈਟਮਾਂ ਮਿਟਾ ਕੇ ਜਾਂ ਅਣਪਿੰਨ ਕਰਕੇ ਜਗ੍ਹਾ ਖਾਲੀ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰੋ, ਜਿਵੇਂ ਐਪਾਂ ਜਾਂ ਮੀਡੀਆ ਸਮੱਗਰੀ।"</string>
     <string name="storage_menu_rename" msgid="8549835371429159336">"ਨਾਮ ਬਦਲੋ"</string>
     <string name="storage_menu_mount" msgid="4760531872302820569">"ਮਾਉਂਟ ਕਰੋ"</string>
     <string name="storage_menu_unmount" msgid="8171552487742912282">"ਬਾਹਰ ਕੱਢੋ"</string>
@@ -2534,11 +2514,6 @@
     <string name="enable_service_title" msgid="7231533866953706788">"ਕੀ <xliff:g id="SERVICE">%1$s</xliff:g> ਨੂੰ ਤੁਹਾਡੇ ਡੀਵਾਈਸ ਦਾ ਪੂਰਾ ਕੰਟਰੋਲ ਦੇਣਾ ਹੈ?"</string>
     <string name="capabilities_list_title" msgid="1225853611983394386">"<xliff:g id="SERVICE">%1$s</xliff:g> ਨੂੰ ਇਹ ਕਰਨ ਦੀ ਲੋੜ ਹੈ:"</string>
     <string name="touch_filtered_warning" msgid="4225815157460318241">"ਕਿਉਂਕਿ ਇੱਕ ਐਪ ਇੱਕ ਇਜਾਜ਼ਤ ਬੇਨਤੀ ਨੂੰ ਅਸਪਸ਼ਟ ਬਣਾ ਰਿਹਾ ਹੈ, ਸੈਟਿੰਗਾਂ ਤੁਹਾਡੇ ਜਵਾਬ ਦੀ ਜਾਂਚ ਨਹੀਂ ਕਰ ਸਕਦੀਆਂ।"</string>
-    <string name="enable_service_encryption_warning" msgid="931082737770453755">"ਜੇਕਰ ਤੁਸੀਂ <xliff:g id="SERVICE">%1$s</xliff:g> ਚਾਲੂ ਕਰਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡਾ ਡੀਵਾਈਸ ਡਾਟਾ ਇਨਕ੍ਰਿਪਸ਼ਨ ਵਧਾਉਣ ਲਈ ਤੁਹਾਡੀ ਸਕ੍ਰੀਨ ਲਾਕ ਨਹੀਂ ਵਰਤੇਗੀ।"</string>
-    <string name="secure_lock_encryption_warning" msgid="669152607190123579">"ਕਿਉਂਕਿ ਤੁਸੀਂ ਇੱਕ ਪਹੁੰਚਯੋਗਤਾ ਸੇਵਾ ਚਾਲੂ ਕੀਤੀ ਹੈ, ਤੁਹਾਡਾ ਡੀਵਾਈਸ ਡਾਟਾ ਇਨਕ੍ਰਿਪਸ਼ਨ ਨੂੰ ਵਧਾਉਣ ਲਈ ਤੁਹਾਡਾ ਸਕ੍ਰੀਨ ਅਨਲਾਕ ਨਹੀਂ ਵਰਤੇਗਾ।"</string>
-    <string name="enable_service_pattern_reason" msgid="6832846117817938536">"ਕਿਉਂਕਿ <xliff:g id="SERVICE">%1$s</xliff:g> ਨੂੰ ਚਾਲੂ ਕਰਨ ਨਾਲ  ਡਾਟਾ  ਇਨਕ੍ਰਿਪਸ਼ਨ ਤੇ ਅਸਰ ਪੈਂਦਾ ਹੈ, ਤੁਹਾਨੂੰ ਆਪਣੇ ਪੈਟਰਨ ਦੀ ਪੁਸ਼ਟੀ ਕਰਨ ਦੀ ਲੋੜ ਹੈ।"</string>
-    <string name="enable_service_pin_reason" msgid="6040417014360237703">"ਤੁਹਾਨੂੰ ਆਪਣੇ ਪਿੰਨ ਦੀ ਪੁਸ਼ਟੀ ਕਰਨ ਦੀ ਲੋੜ ਹੈ, ਕਿਉਂਕਿ <xliff:g id="SERVICE">%1$s</xliff:g> ਨੂੰ ਚਾਲੂ ਕਰਨ ਨਾਲ ਡਾਟਾ ਇਨਕ੍ਰਿਪਸ਼ਨ ਤੇ ਅਸਰ ਪੈਂਦਾ ਹੈ।"</string>
-    <string name="enable_service_password_reason" msgid="6962544350351734238">"ਕਿਉਂਕਿ <xliff:g id="SERVICE">%1$s</xliff:g> ਨੂੰ ਚਾਲੂ ਕਰਨ ਨਾਲ ਡਾਟਾ ਇਨਕ੍ਰਿਪਸ਼ਨ ਤੇ ਅਸਰ ਪੈਂਦਾ ਹੈ, ਤੁਹਾਨੂੰ ਆਪਣੇ ਪਾਸਵਰਡ ਦੀ ਪੁਸ਼ਟੀ ਕਰਨ ਦੀ ਲੋੜ ਹੈ।"</string>
     <string name="accessibility_service_warning" msgid="6779187188736432618">"<xliff:g id="SERVICE">%1$s</xliff:g> ਇਸ ਡੀਵਾਈਸ ਦੇ ਪੂਰੇ ਕੰਟਰੋਲ ਲਈ ਬੇਨਤੀ ਕਰ ਰਹੀ ਹੈ। ਸੇਵਾ ਸਕ੍ਰੀਨ ਨੂੰ ਪੜ੍ਹ ਕੇ ਪਹੁੰਚਯੋਗਤਾ ਜ਼ਰੂਰਤਾਂ ਵਾਲੇ ਵਰਤੋਂਕਾਰਾਂ ਵਜੋਂ ਕੰਮ ਕਰ ਸਕਦੀ ਹੈ। ਜ਼ਿਆਦਾਤਰ ਐਪਾਂ ਲਈ ਕੰਟਰੋਲ ਦਾ ਇਹ ਪੱਧਰ ਢੁਕਵਾਂ ਨਹੀਂ ਹੈ।"</string>
     <string name="accessibility_service_warning_description" msgid="6573203795976134751">"ਪੂਰਾ ਕੰਟਰੋਲ ਉਹਨਾਂ ਐਪਾਂ ਲਈ ਢੁਕਵਾਂ ਹੈ ਜੋ ਪਹੁੰਚਯੋਗਤਾ ਸੰਬੰਧੀ ਲੋੜਾਂ ਵਿੱਚ ਤੁਹਾਡੀ ਮਦਦ ਕਰਦੀਆਂ ਹਨ, ਪਰ ਜ਼ਿਆਦਾਤਰ ਐਪਾਂ ਲਈ ਢੁਕਵਾਂ ਨਹੀਂ ਹੁੰਦਾ।"</string>
     <string name="accessibility_service_screen_control_title" msgid="324795030658109870">"ਸਕ੍ਰੀਨ ਨੂੰ ਦੇਖੋ ਅਤੇ ਕੰਟਰੋਲ ਕਰੋ"</string>
@@ -3103,14 +3078,6 @@
     <string name="remove_account_failed" msgid="3709502163548900644">"ਤੁਹਾਡੇ ਪ੍ਰਸ਼ਾਸਕ ਵੱਲੋਂ ਇਸ ਤਬਦੀਲੀ ਦੀ ਇਜਾਜ਼ਤ ਨਹੀਂ ਹੈ"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"ਮੈਨੂਅਲੀ ਸਿੰਕ ਨਹੀਂ ਕਰ ਸਕਦਾ"</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"ਇਸ ਆਈਟਮ ਲਈ ਸਿੰਕ ਇਸ ਵੇਲੇ ਅਸਮਰਥਿਤ ਹੈ। ਇਸ ਸੈਟਿੰਗ ਨੂੰ ਬਦਲਣ ਲਈ, ਪਿਛੋਕੜ  ਡਾਟਾ  ਅਤੇ ਆਟੋਮੈਟਿਕ ਸਿੰਕ ਅਸਥਾਈ ਤੌਰ ਤੇ ਚਾਲੂ ਕਰੋ।"</string>
-    <string name="enter_password" msgid="6327051330258595331">"Android ਨੂੰ ਚਾਲੂ ਕਰਨ ਲਈ, ਆਪਣਾ ਪਾਸਵਰਡ ਦਾਖਲ ਕਰੋ"</string>
-    <string name="enter_pin" msgid="1029287617551232681">"Android ਨੂੰ ਚਾਲੂ ਕਰਨ ਲਈ, ਆਪਣਾ ਪਿੰਨ ਦਾਖਲ ਕਰੋ"</string>
-    <string name="enter_pattern" msgid="1747316785866742960">"Android ਨੂੰ ਚਾਲੂ ਕਰਨ ਲਈ, ਆਪਣਾ ਪੈਟਰਨ ਡ੍ਰਾ ਕਰੋ"</string>
-    <string name="cryptkeeper_wrong_pattern" msgid="340747269176120242">"ਗਲਤ ਪੈਟਰਨ"</string>
-    <string name="cryptkeeper_wrong_password" msgid="7295607881887114486">"ਗਲਤ ਪਾਸਵਰਡ"</string>
-    <string name="cryptkeeper_wrong_pin" msgid="2347961593970714201">"ਗਲਤ ਪਿੰਨ"</string>
-    <string name="checking_decryption" msgid="6111642972615688237">"ਜਾਂਚ ਕਰ ਰਿਹਾ ਹੈ..."</string>
-    <string name="starting_android" msgid="6694154070215356186">"Android ਨੂੰ ਚਾਲੂ ਕਰ ਰਿਹਾ ਹੈ..."</string>
     <string name="delete" msgid="8330605554706263775">"ਮਿਟਾਓ"</string>
     <string name="misc_files" msgid="6598066985800749585">"ਵਿਵਿਧ ਫ਼ਾਈਲਾਂ"</string>
     <string name="misc_files_selected_count" msgid="5597802791672749532">"<xliff:g id="TOTAL">%2$d</xliff:g> ਵਿੱਚੋਂ <xliff:g id="NUMBER">%1$d</xliff:g> ਚੁਣਿਆ"</string>
@@ -3134,12 +3101,12 @@
     <string name="data_usage_menu_show_ethernet" msgid="4401026240876938859">"ਈਥਰਨੈਟ ਵਰਤੋਂ ਦਿਖਾਓ"</string>
     <string name="data_usage_menu_hide_ethernet" msgid="7792365022467586772">"ਈਥਰਨੈਟ ਵਰਤੋਂ ਲੁਕਾਓ"</string>
     <string name="data_usage_menu_metered" msgid="4279260736172851951">"ਨੈੱਟਵਰਕ ਪ੍ਰਤਿਬੰਧ"</string>
-    <string name="data_usage_menu_auto_sync" msgid="2632694000068175025">" ਡਾਟਾ  ਸਵੈ-ਸਮਕਾਲੀਕਿਰਤ ਕਰੋ"</string>
+    <string name="data_usage_menu_auto_sync" msgid="2632694000068175025">"ਡਾਟਾ ਸਵੈ-ਸਿੰਕ ਕਰੋ"</string>
     <string name="data_usage_menu_sim_cards" msgid="8966135605336735887">"SIM ਕਾਰਡ"</string>
     <string name="data_usage_cellular_data_summary" msgid="8139993171126153316">"ਸੀਮਾ ਤੇ ਰੋਕਿਆ"</string>
-    <string name="account_settings_menu_auto_sync" msgid="1660484779001900562">" ਡਾਟਾ  ਸਵੈ-ਸਮਕਾਲੀਕਿਰਤ ਕਰੋ"</string>
-    <string name="account_settings_menu_auto_sync_personal" msgid="2905595464540145671">"ਨਿੱਜੀ ਡਾਟਾ ਸਵੈ-ਸਮਕਾਲੀਕਿਰਤ ਕਰੋ"</string>
-    <string name="account_settings_menu_auto_sync_work" msgid="8561102487795657789">"ਕੰਮ ਸੰਬੰਧੀ ਡਾਟਾ ਸਵੈ-ਸਮਕਾਲੀਕਿਰਤ ਕਰੋ"</string>
+    <string name="account_settings_menu_auto_sync" msgid="1660484779001900562">"ਡਾਟਾ ਸਵੈ-ਸਿੰਕ ਕਰੋ"</string>
+    <string name="account_settings_menu_auto_sync_personal" msgid="2905595464540145671">"ਨਿੱਜੀ ਡਾਟਾ ਸਵੈ-ਸਿੰਕ ਕਰੋ"</string>
+    <string name="account_settings_menu_auto_sync_work" msgid="8561102487795657789">"ਕੰਮ ਸੰਬੰਧੀ ਡਾਟਾ ਸਵੈ-ਸਿੰਕ ਕਰੋ"</string>
     <string name="data_usage_change_cycle" msgid="4501026427365283899">"ਸਾਈਕਲ ਬਦਲੋ..."</string>
     <string name="data_usage_pick_cycle_day" msgid="3548922497494790123">"ਡਾਟਾ ਵਰਤੋਂ ਸਾਈਕਲ ਰੀਸੈੱਟ ਕਰਨ ਲਈ ਮਹੀਨੇ ਦਾ ਦਿਨ:"</string>
     <string name="data_usage_empty" msgid="5619908658853726866">"ਇਸ ਮਿਆਦ ਦੇ ਦੌਰਾਨ ਕਿਸੇ ਐਪਸ ਨੇ  ਡਾਟਾ  ਨਹੀਂ ਵਰਤਿਆ।"</string>
@@ -3206,8 +3173,6 @@
     <string name="data_usage_metered_yes" msgid="4262598072030135223">"ਮੀਟਰਬੱਧ ਕੀਤਾ ਗਿਆ"</string>
     <string name="data_usage_metered_no" msgid="1685828958417926268">"ਮੀਟਰਬੱਧ ਨਹੀਂ ਕੀਤਾ ਗਿਆ"</string>
     <string name="data_usage_disclaimer" msgid="3271450299386176770">"ਕੈਰੀਅਰ ਦਾ ਡਾਟਾ ਹਿਸਾਬ ਤੁਹਾਡੇ ਡੀਵਾਈਸ ਤੋਂ ਵੱਖ ਹੋ ਸਕਦਾ ਹੈ।"</string>
-    <string name="cryptkeeper_emergency_call" msgid="8369322820475703306">"ਸੰਕਟਕਾਲੀਨ ਕਾਲ"</string>
-    <string name="cryptkeeper_return_to_call" msgid="3857250752781151232">"ਕਾਲ \'ਤੇ ਵਾਪਸ ਜਾਓ"</string>
     <string name="vpn_name" msgid="3806456074909253262">"ਨਾਮ"</string>
     <string name="vpn_type" msgid="5533202873260826663">"ਕਿਸਮ"</string>
     <string name="vpn_server" msgid="2908816134941973935">"ਸਰਵਰ ਦਾ ਪਤਾ"</string>
@@ -3377,7 +3342,7 @@
     <string name="nfc_payment_app_and_desc" msgid="2607417639227030398">"<xliff:g id="APP">%1$s</xliff:g> - <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="nfc_payment_use_default" msgid="788899906312142803">"ਪੂਰਵ-ਨਿਰਧਾਰਿਤ ਵਰਤੋ"</string>
     <string name="nfc_payment_favor_default" msgid="4508491832174644772">"ਹਮੇਸ਼ਾਂ"</string>
-    <string name="nfc_payment_favor_open" msgid="8554643344050373346">"ਸਿਵਾਏ ਇਸਦੇ ਜਦੋਂ ਦੂਜਾ ਭੁਗਤਾਨ ਐਪ ਖੁੱਲ੍ਹਾ ਹੋਵੇ"</string>
+    <string name="nfc_payment_favor_open" msgid="8554643344050373346">"ਸਿਵਾਏ ਇਸਦੇ ਜਦੋਂ ਦੂਜੀ ਭੁਗਤਾਨ ਐਪ ਖੁੱਲ੍ਹੀ ਹੋਵੇ"</string>
     <string name="nfc_payment_pay_with" msgid="3001320460566523453">"ਸੰਪਰਕ-ਰਹਿਤ ਟਰਮੀਨਲ ਵਿਖੇ, ਇਸ ਨਾਲ ਭੁਗਤਾਨ ਕਰੋ:"</string>
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"ਟਰਮੀਨਲ \'ਤੇ ਭੁਗਤਾਨ ਕਰਨਾ"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"ਇੱਕ ਭੁਗਤਾਨ ਐਪ ਸੈੱਟ ਅੱਪ ਕਰੋ। ਫਿਰ ਸੰਪਰਕ-ਰਹਿਤ ਚਿੰਨ੍ਹ ਵਾਲੇ ਕਿਸੇ ਵੀ ਟਰਮੀਨਲ ਵੱਲ ਨੂੰ ਆਪਣੇ ਫ਼ੋਨ ਦਾ ਪਿਛਲਾ ਪਾਸਾ ਸਿਰਫ਼ ਫੜ੍ਹ ਕੇ ਰੱਖੋ।"</string>
@@ -4764,8 +4729,6 @@
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> ਐਪਾਂ ਅਣ-ਪ੍ਰਤੀਬੰਧਿਤ ਡਾਟੇ ਦੀ ਵਰਤੋਂ ਕਰ ਸਕਦੀਆਂ ਹਨ</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"ਹੋਰ ਦੇਖੋ"</string>
-    <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"ਕੀ ਸੱਚਮੁੱਚ ਵਰਤੋਂਕਾਰ  ਡਾਟੇ  ਨੂੰ ਮਿਟਾਉਣਾ ਅਤੇ ਫ਼ਾਈਲ ਇਨਕ੍ਰਿਪਸ਼ਨ ਵਿੱਚ ਤਬਦੀਲ ਕਰਨਾ ਹੈ?"</string>
-    <string name="button_confirm_convert_fbe" msgid="339648921918438106">"ਮਿਟਾਓ ਅਤੇ ਰੁਪਾਂਤਰਣ ਕਰੋ"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"ShortcutManager ਰੇਟ-ਲਿਮਿਟਿੰਗ ਰੀਸੈੱਟ ਕਰੋ"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"ShortcutManager ਰੇਟ-ਲਿਮਟਿੰਗ ਰੀਸੈੱਟ ਕੀਤੀ ਜਾ ਚੁੱਕੀ ਹੈ"</string>
     <string name="notification_suggestion_title" msgid="6309263655965785411">" ਲਾਕ  ਸਕ੍ਰੀਨ \'ਤੇ ਜਾਣਕਾਰੀ ਨੂੰ ਕੰਟਰੋਲ ਕਰੋ"</string>
@@ -4915,8 +4878,8 @@
     <string name="account_for_section_header" msgid="7466759342105251096">"<xliff:g id="USER_NAME">%1$s</xliff:g> ਦੇ ਖਾਤੇ"</string>
     <string name="configure_section_header" msgid="3126887329521705210">"ਰੂਪ-ਰੇਖਾ ਬਦਲੋ"</string>
     <string name="auto_sync_account_title" msgid="1070908045600374254">"ਐਪ ਡਾਟੇ ਦਾ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਸਿੰਕ ਕਰੋ"</string>
-    <string name="auto_sync_personal_account_title" msgid="3544275021920818595">"ਨਿੱਜੀ  ਡਾਟੇ  ਨੂੰ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਸਮਕਾਲੀਕਿਰਤ ਕਰੋ"</string>
-    <string name="auto_sync_work_account_title" msgid="6060310415978781885">"ਕਾਰਜ  ਡਾਟੇ  ਨੂੰ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਸਮਕਾਲੀਕਿਰਤ ਕਰੋ"</string>
+    <string name="auto_sync_personal_account_title" msgid="3544275021920818595">"ਨਿੱਜੀ  ਡਾਟੇ  ਨੂੰ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਸਿੰਕ ਕਰੋ"</string>
+    <string name="auto_sync_work_account_title" msgid="6060310415978781885">"ਕਾਰਜ  ਡਾਟੇ  ਨੂੰ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਸਿੰਕ ਕਰੋ"</string>
     <string name="auto_sync_account_summary" msgid="7580352130028957346">"ਐਪਾਂ ਨੂੰ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਡਾਟਾ ਰਿਫ੍ਰੈਸ਼ ਕਰਨ ਦਿਓ"</string>
     <string name="account_sync_title" msgid="7036067017433297574">"ਖਾਤਾ ਸਿੰਕ"</string>
     <string name="account_sync_summary_some_on" msgid="911460286297968724">"<xliff:g id="ID_2">%2$d</xliff:g> ਵਿੱਚੋਂ <xliff:g id="ID_1">%1$d</xliff:g> ਆਈਟਮਾਂ ਲਈ ਸਿੰਕ ਚਾਲੂ ਹੈ"</string>
@@ -5292,6 +5255,7 @@
     <string name="sim_action_yes" msgid="8076556020131395515">"ਹਾਂ"</string>
     <string name="sim_action_reboot" msgid="3508948833333441538">"ਮੁੜ-ਸ਼ੁਰੂ ਕਰੋ"</string>
     <string name="sim_action_no_thanks" msgid="435717748384544195">"ਨਹੀਂ ਧੰਨਵਾਦ"</string>
+    <string name="sim_action_cancel" msgid="2668099867029610910">"ਰੱਦ ਕਰੋ"</string>
     <string name="sim_switch_button" msgid="1405772571706095387">"ਸਵਿੱਚ ਕਰੋ"</string>
     <string name="dsds_activation_failure_title" msgid="4467364110584914794">"ਸਿਮ ਨੂੰ ਕਿਰਿਆਸ਼ੀਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ"</string>
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"ਸਿਮ ਹਟਾ ਕੇ ਦੁਬਾਰਾ ਪਾਓ। ਜੇ ਸਮੱਸਿਆ ਜਾਰੀ ਰਹਿੰਦੀ ਹੈ, ਤਾਂ ਆਪਣੇ ਡੀਵਾਈਸ ਨੂੰ ਮੁੜ-ਸ਼ੁਰੂ ਕਰੋ।"</string>
@@ -5444,6 +5408,10 @@
     <string name="cached_apps_freezer" msgid="1057519579761550350">"ਕੈਸ਼ੇ ਕੀਤੀਆਂ ਐਪਾਂ ਦਾ ਚੱਲਣਾ ਮੁਅੱਤਲ ਕਰੋ"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"\'ਸੈਟਿੰਗਾਂ\' \'ਤੇ ਸਕ੍ਰੀਨ ਓਵਰਲੇ ਦੀ ਆਗਿਆ ਦਿਓ"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"ਉਹਨਾਂ ਐਪਾਂ ਨੂੰ ਆਗਿਆ ਦਿਓ ਜੋ \'ਸੈਟਿੰਗਾਂ\' ਸਕ੍ਰੀਨਾਂ ਨੂੰ ਓਵਰਲੇ ਕਰਨ ਲਈ ਦੂਜੀਆਂ ਐਪਾਂ ਦੇ ਉੱਪਰ ਪ੍ਰਦਰਸ਼ਿਤ ਹੋ ਸਕਦੀਆਂ ਹਨ"</string>
+    <!-- no translation found for allow_mock_modem (3832264806530479214) -->
+    <skip />
+    <!-- no translation found for allow_mock_modem_summary (9097416612748005374) -->
+    <skip />
     <string name="media_controls_title" msgid="403271085636252597">"ਮੀਡੀਆ"</string>
     <string name="media_controls_resume_title" msgid="855076860336652370">"ਮੀਡੀਆ ਪਲੇਅਰ ਨੂੰ ਪਿੰਨ ਕਰੋ"</string>
     <string name="media_controls_resume_description" msgid="3163482266454802097">"ਪਲੇਬੈਕ ਨੂੰ ਤੁਰੰਤ ਮੁੜ-ਚਾਲੂ ਕਰਨ ਲਈ, ਤਤਕਾਲ ਸੈਟਿੰਗਾਂ ਵਿੱਚ ਮੀਡੀਆ ਪਲੇਅਰ ਖੁੱਲ੍ਹਾ ਰਹਿੰਦਾ ਹੈ"</string>
@@ -5552,7 +5520,7 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"ਫ਼ੋਨ ਨੰਬਰ ਦਾਖਲ ਕਰੋ"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"ਫ਼ੋਨ ਨੰਬਰ ਮੌਜੂਦ ਨਹੀਂ ਹੈ।"</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"ਠੀਕ ਹੈ"</string>
-    <string name="enable_2g_title" msgid="8184757884636162942">"2G ਨੂੰ ਇਜਾਜ਼ਤ ਦਿਓ"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"2G ਨੂੰ ਆਗਿਆ ਦਿਓ"</string>
     <string name="enable_2g_summary" msgid="906487478332145407">"2G ਸੈਲਿਊਲਰ ਕਨੈਕਸ਼ਨਾਂ ਦੀ ਵਰਤੋਂ ਕਰੋ। ਸੰਕਟਕਾਲੀਨ ਕਾਲਾਂ ਲਈ, 2G ਹਮੇਸ਼ਾਂ ਚਾਲੂ ਹੁੰਦਾ ਹੈ।"</string>
     <string name="show_clip_access_notification" msgid="7782300987639778542">"ਕਲਿੱਪਬੋਰਡ ਪਹੁੰਚ ਦਿਖਾਓ"</string>
     <string name="show_clip_access_notification_summary" msgid="474090757777203207">"ਜਦੋਂ ਐਪਾਂ ਲਿਖਤ, ਚਿੱਤਰ ਜਾਂ ਤੁਹਾਡੇ ਵੱਲੋਂ ਕਾਪੀ ਕੀਤੀ ਹੋਰ ਸਮੱਗਰੀ ਤੱਕ ਪਹੁੰਚ ਕਰਦੀਆਂ ਹਨ, ਤਾਂ ਕੋਈ ਸੁਨੇਹਾ ਦਿਖਾਓ"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index c60cd4f..ad86507 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -144,10 +144,11 @@
     <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"Zezwól urządzeniu na komunikowanie się z urządzeniami Bluetooth w pobliżu"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"Zezwól telefonowi na komunikowanie się z urządzeniami Bluetooth w pobliżu"</string>
     <string name="bluetooth_disable_a2dp_hw_offload" msgid="5942913792817797541">"Wyłącz odciążanie sprzętu Bluetooth A2DP"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="8610420176339657720">"Uruchomić ponownie?"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8333029144800835996">"Musisz ponownie uruchomić urządzenie, by to zmienić."</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="3488695418187553566">"Zrestartuj"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="4930826928585464191">"Anuluj"</string>
+    <string name="bluetooth_disable_le_audio_hw_offload" msgid="3966022676505972908">"Wyłącz sprzętowe przejmowanie obciążenia Bluetooth LE AUDIO"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_title" msgid="6001142380445276918">"Uruchomić urządzenie ponownie?"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_message" msgid="1524373895333698779">"Aby zmienić to ustawienie, musisz ponownie uruchomić urządzenie."</string>
+    <string name="bluetooth_disable_hw_offload_dialog_confirm" msgid="5594859658551707592">"Uruchom ponownie"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel" msgid="3663690305043973720">"Anuluj"</string>
     <string name="connected_device_media_device_title" msgid="3783388247594566734">"Nośniki danych"</string>
     <string name="connected_device_call_device_title" msgid="88732390601723608">"Urządzenia telefoniczne"</string>
     <string name="connected_device_other_device_title" msgid="4652120430615729193">"Inne urządzenia"</string>
@@ -315,9 +316,9 @@
     <string name="security_settings_title" msgid="6710768415432791970">"Zabezpieczenia"</string>
     <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"Szyfrowanie i dane logowania"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"Telefon zaszyfrowany"</string>
-    <string name="decryption_settings_summary" product="default" msgid="1742645256103613503">"Telefon nie jest zaszyfrowany"</string>
+    <string name="not_encrypted_summary" product="default" msgid="2251945842585788254">"Telefon nie jest zaszyfrowany"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"Urządzenie zaszyfrowane"</string>
-    <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"Urządzenie nie jest zaszyfrowane"</string>
+    <string name="not_encrypted_summary" product="tablet" msgid="2374263654698719382">"Urządzenie nie jest zaszyfrowane"</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"Ekran blokady"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"Co pokazywać"</string>
     <string name="security_settings_summary" msgid="1627059516127354233">"Ustaw funkcję Moja lokalizacja, odblokowywanie ekranu, blokadę karty SIM, blokadę magazynu danych logowania."</string>
@@ -576,37 +577,10 @@
     <string name="fingerprint_last_delete_message" msgid="7860374760549404410">"Nie będzie można używać odcisku palca do odblokowywania telefonu i potwierdzania tożsamości w aplikacjach."</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="4104208067277655068">"Nie będzie można używać odcisku palca do odblokowywania profilu służbowego, zatwierdzania zakupów czy logowania się w aplikacjach służbowych."</string>
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"Tak, usuń"</string>
-    <string name="crypt_keeper_settings_title" msgid="4938812137822100044">"Szyfrowanie"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"Zaszyfruj tablet"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"Zaszyfruj telefon"</string>
-    <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"Zaszyfrowano"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"Możesz zaszyfrować swoje konta, ustawienia, pobrane aplikacje wraz z danymi oraz pliki multimedialne i inne. Jeśli korzystasz z szyfrowania tabletu i masz na nim ustawione blokowanie ekranu (wykorzystujesz do tego wzór, kod PIN lub hasło), po każdym uruchomieniu urządzenia konieczne będzie odblokowanie ekranu, by odszyfrować dane. Jedynym innym sposobem odszyfrowania tabletu jest przywrócenie danych fabrycznych, co powoduje usunięcie wszystkich danych.\n\nSzyfrowanie trwa co najmniej godzinę. Przed jego rozpoczęciem naładuj baterię, a w trakcie nie odłączaj tabletu od zasilania. Przerwanie procesu szyfrowania spowoduje utratę części lub wszystkich danych."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"Możesz zaszyfrować swoje konta, ustawienia, pobrane aplikacje wraz z danymi oraz pliki multimedialne i inne. Jeśli korzystasz z szyfrowania telefonu i masz na nim ustawione blokowanie ekranu (wykorzystujesz do tego wzór, kod PIN lub hasło), po każdym uruchomieniu urządzenia konieczne będzie odblokowanie ekranu, by odszyfrować dane. Jedynym innym sposobem odszyfrowania telefonu jest przywrócenie danych fabrycznych, co powoduje wymazanie wszystkich danych.\n\nSzyfrowanie trwa co najmniej godzinę. Przed jego rozpoczęciem naładuj baterię, a w trakcie nie odłączaj telefonu od zasilania. Przerwanie procesu szyfrowania spowoduje utratę części lub wszystkich danych."</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"Zaszyfruj tablet"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"Zaszyfruj telefon"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"Naładuj baterię i spróbuj ponownie."</string>
-    <string name="crypt_keeper_unplugged_text" msgid="2709721134148651329">"Podłącz ładowarkę i spróbuj ponownie."</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="1847280235529858357">"Brak kodu PIN lub hasła blokowania ekranu"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="7210616262954236042">"Przed rozpoczęciem szyfrowania musisz ustawić kod PIN lub hasło blokady ekranu."</string>
-    <string name="crypt_keeper_confirm_title" msgid="8600000209722452230">"Zaszyfrować?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="3270587498436152259">"Operacja szyfrowania jest nieodwracalna, a jej przerwanie grozi utratą danych. Szyfrowanie trwa co najmniej godzinę, a tablet zostanie w tym czasie kilkakrotnie uruchomiony ponownie."</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="3040428543349852419">"Operacja szyfrowania jest nieodwracalna, a jej przerwanie grozi utratą danych. Szyfrowanie trwa co najmniej godzinę, a telefon zostanie w tym czasie kilkakrotnie uruchomiony ponownie."</string>
-    <string name="crypt_keeper_setup_title" msgid="3339725741305796680">"Szyfrowanie"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="4417016995091289019">"Czekaj, trwa szyfrowanie tabletu. Ukończono: <xliff:g id="PERCENT">^1</xliff:g>%."</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="7902355422499500352">"Czekaj, trwa szyfrowanie telefonu. Ukończono: <xliff:g id="PERCENT">^1</xliff:g>%."</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="8348188415839917821">"Poczekaj, aż tablet zostanie zaszyfrowany. Pozostały czas: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="8556105766597855198">"Poczekaj, aż telefon zostanie zaszyfrowany. Pozostały czas: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="3832496715430327682">"Aby odblokować tablet, wyłącz go i włącz ponownie."</string>
-    <string name="crypt_keeper_force_power_cycle" product="default" msgid="5070346039522135361">"Aby odblokować telefon, wyłącz go i włącz ponownie."</string>
-    <string name="crypt_keeper_warn_wipe" msgid="8104921337301750394">"Ostrzeżenie: Twoje urządzenie zostanie wyczyszczone po <xliff:g id="COUNT">^1</xliff:g> następnych nieudanych próbach odblokowania!"</string>
-    <string name="crypt_keeper_enter_password" msgid="1274917431075529732">"Wpisz swoje hasło."</string>
-    <string name="crypt_keeper_failed_title" msgid="8173654570682244149">"Szyfrowanie zakończone niepowodzeniem"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"Szyfrowanie zostało przerwane i nie można go dokończyć. Z tego powodu dane znajdujące się w tablecie nie są już dostępne. \n\nAby dalej używać tabletu, musisz przywrócić dane fabryczne. Podczas konfigurowania po zresetowaniu będziesz mieć możliwość przywrócenia wszelkich danych, których kopia zapasowa została utworzona na koncie Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"Szyfrowanie zostało przerwane i nie można go dokończyć. Z tego powodu dane znajdujące się w telefonie nie są już dostępne. \n\nAby dalej używać telefonu, musisz przywrócić dane fabryczne. Podczas konfigurowania po zresetowaniu będziesz mieć możliwość przywrócenia wszelkich danych, których kopia zapasowa została utworzona na koncie Google."</string>
-    <string name="crypt_keeper_data_corrupt_title" msgid="5920153462176846037">"Nie udało się odszyfrować"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"Wpisane hasło jest prawidłowe, ale Twoje dane są uszkodzone. \n\nAby móc korzystać z tabletu, musisz zresetować go do ustawień fabrycznych. Następnie podczas konfigurowania urządzenia możesz przywrócić wszystkie dane, których kopię zapasową masz na koncie Google."</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"Wpisane hasło jest prawidłowe, ale Twoje dane są uszkodzone. \n\nAby móc korzystać z telefonu, musisz zresetować go do ustawień fabrycznych. Następnie podczas konfigurowania urządzenia możesz przywrócić wszystkie dane, których kopię zapasową masz na koncie Google."</string>
-    <string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"Przełącz metodę wprowadzania"</string>
+    <string name="encryption_settings_title" msgid="2848716008695618360">"Szyfrowanie"</string>
+    <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"Zaszyfruj tablet"</string>
+    <string name="encrypt_title" product="default" msgid="7337365190988321100">"Zaszyfruj telefon"</string>
+    <string name="encrypted_summary" msgid="545623487587251207">"Zaszyfrowano"</string>
     <string name="suggested_lock_settings_title" msgid="7836065447159730217">"Zabezpiecz swój telefon"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"Ustaw blokadę ekranu, by zabezpieczyć tablet"</string>
     <string name="suggested_lock_settings_summary" product="device" msgid="8479766049078378225">"Ustaw blokadę ekranu, by zabezpieczyć urządzenie"</string>
@@ -851,6 +825,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Może być również konieczne wpisanie tego kodu PIN na drugim urządzeniu."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Może być również konieczne wpisanie tego klucza na drugim urządzeniu."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Aby sparować z urządzeniem:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Upewnij się, że jest na nim wyświetlony następujący klucz:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Potwierdź, aby sparować ze skoordynowanym zestawem"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"Od:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Sparować z tym urządzeniem?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Aby sparować z urządzeniem <xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>, wpisz na nim klucz <xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, a następnie naciśnij klawisz zatwierdzania."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Zezwól na dostęp do kontaktów i historii połączeń"</string>
@@ -884,6 +859,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Nie udało się nawiązać połączenia. Spróbuj ponownie."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Szczegóły urządzenia"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Adres Bluetooth urządzenia: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Adres Bluetooth urządzenia: \n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Zapomnieć urządzenie?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Usuń powiązanie"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Odłączyć aplikację?"</string>
@@ -915,6 +891,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Zapamiętaj ustawienia"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Maksymalna liczba podłączonych urządzeń audio Bluetooth"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Wybierz maksymalną liczbę podłączonych urządzeń audio Bluetooth"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"Dziennik debugowania stosów NFC"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Zwiększ poziom rejestrowania stosów NFC"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Przesyłanie ekranu"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"odbicie lustrzane"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Wyświetlacz bezprzewodowy"</string>
@@ -1228,6 +1206,8 @@
     <string name="wifi_hotspot_maximize_compatibility_dual_ap_summary" msgid="3579549223159056533">"Ułatwia znajdowanie tego hotspota przez inne urządzenia. Zwiększa zużycie baterii."</string>
     <string name="wifi_tether_starting" msgid="8879874184033857814">"Włączam punktu dostępu…"</string>
     <string name="wifi_tether_stopping" msgid="4416492968019409188">"Wyłączam punkt dostępu…"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_title" msgid="3089432578433978073">"Tethering niedostępny"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_content" msgid="5920421547607921112">"Aby uzyskać szczegółowe informacje, skontaktuj się z operatorem"</string>
     <string name="wifi_tether_enabled_subtext" msgid="5085002421099821056">"Sieć <xliff:g id="NETWORK_SSID">%1$s</xliff:g> jest aktywna"</string>
     <string name="wifi_tether_failed_subtext" msgid="437190628041885500">"Błąd przenośnego hotspotu Wi-Fi"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7072559431286459122">"Skonfiguruj hotspot Wi-Fi"</string>
@@ -2592,11 +2572,6 @@
     <string name="enable_service_title" msgid="7231533866953706788">"Pozwolić usłudze <xliff:g id="SERVICE">%1$s</xliff:g> na pełną kontrolę nad urządzeniem?"</string>
     <string name="capabilities_list_title" msgid="1225853611983394386">"Wymagania <xliff:g id="SERVICE">%1$s</xliff:g>:"</string>
     <string name="touch_filtered_warning" msgid="4225815157460318241">"Aplikacja Ustawienia nie może zweryfikować Twojej odpowiedzi, ponieważ inna aplikacja zasłania prośbę o udzielenie uprawnień."</string>
-    <string name="enable_service_encryption_warning" msgid="931082737770453755">"Jeśli włączysz usługę <xliff:g id="SERVICE">%1$s</xliff:g>, Twoje urządzenie nie będzie korzystać z blokady ekranu, by usprawnić szyfrowanie danych."</string>
-    <string name="secure_lock_encryption_warning" msgid="669152607190123579">"Włączyłeś usługę ułatwień dostępu, więc Twoje urządzenie nie będzie korzystać z blokady ekranu, by usprawnić szyfrowanie danych."</string>
-    <string name="enable_service_pattern_reason" msgid="6832846117817938536">"Ponieważ włączenie <xliff:g id="SERVICE">%1$s</xliff:g> wpływa na szyfrowanie danych, musisz potwierdzić swój wzór."</string>
-    <string name="enable_service_pin_reason" msgid="6040417014360237703">"Ponieważ włączenie <xliff:g id="SERVICE">%1$s</xliff:g> wpływa na szyfrowanie danych, musisz potwierdzić swój PIN."</string>
-    <string name="enable_service_password_reason" msgid="6962544350351734238">"Ponieważ włączenie <xliff:g id="SERVICE">%1$s</xliff:g> wpływa na szyfrowanie danych, musisz potwierdzić swoje hasło."</string>
     <string name="accessibility_service_warning" msgid="6779187188736432618">"Usługa <xliff:g id="SERVICE">%1$s</xliff:g> prosi o pełną kontrolę nad urządzeniem. Ta usługa może odczytywać zawartość ekranu i wykonywać działania w imieniu użytkownika, który potrzebuje ułatwień dostępu. Taki poziom kontroli nie jest odpowiedni w przypadku większości aplikacji."</string>
     <string name="accessibility_service_warning_description" msgid="6573203795976134751">"Pełna kontrola jest odpowiednia dla aplikacji, które pomagają Ci radzić sobie z niepełnosprawnością, ale nie należy jej przyznawać wszystkim aplikacjom."</string>
     <string name="accessibility_service_screen_control_title" msgid="324795030658109870">"Wyświetlaj i kontroluj ekran"</string>
@@ -3183,14 +3158,6 @@
     <string name="remove_account_failed" msgid="3709502163548900644">"Ta zmiana nie jest dozwolona przez administratora"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"Nie można zsynchronizować ręcznie"</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"Synchronizacja tego elementu jest obecnie wyłączona. Aby zmienić ustawienie, tymczasowo włącz obsługę danych w tle i automatyczną synchronizację."</string>
-    <string name="enter_password" msgid="6327051330258595331">"Aby uruchomić Androida, wpisz hasło"</string>
-    <string name="enter_pin" msgid="1029287617551232681">"Aby uruchomić Androida, wpisz kod PIN"</string>
-    <string name="enter_pattern" msgid="1747316785866742960">"Aby uruchomić Androida, narysuj wzór"</string>
-    <string name="cryptkeeper_wrong_pattern" msgid="340747269176120242">"Nieprawidłowy wzór"</string>
-    <string name="cryptkeeper_wrong_password" msgid="7295607881887114486">"Nieprawidłowe hasło"</string>
-    <string name="cryptkeeper_wrong_pin" msgid="2347961593970714201">"Nieprawidłowy kod PIN"</string>
-    <string name="checking_decryption" msgid="6111642972615688237">"Sprawdzam…"</string>
-    <string name="starting_android" msgid="6694154070215356186">"Uruchamiam Androida…"</string>
     <string name="delete" msgid="8330605554706263775">"Usuń"</string>
     <string name="misc_files" msgid="6598066985800749585">"Różne pliki"</string>
     <string name="misc_files_selected_count" msgid="5597802791672749532">"wybrano <xliff:g id="NUMBER">%1$d</xliff:g> z <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -3286,8 +3253,6 @@
     <string name="data_usage_metered_yes" msgid="4262598072030135223">"Pomiar użycia danych"</string>
     <string name="data_usage_metered_no" msgid="1685828958417926268">"Użycie danych nie jest mierzone"</string>
     <string name="data_usage_disclaimer" msgid="3271450299386176770">"Operator komórkowy może obliczać ilość przesłanych danych inaczej niż urządzenie."</string>
-    <string name="cryptkeeper_emergency_call" msgid="8369322820475703306">"Połączenie alarmowe"</string>
-    <string name="cryptkeeper_return_to_call" msgid="3857250752781151232">"Powrót do połączenia"</string>
     <string name="vpn_name" msgid="3806456074909253262">"Nazwa"</string>
     <string name="vpn_type" msgid="5533202873260826663">"Typ"</string>
     <string name="vpn_server" msgid="2908816134941973935">"Adres serwera"</string>
@@ -4039,7 +4004,7 @@
     <string name="notification_assistant_security_warning_title" msgid="2972346436050925276">"Zezwolić usłudze <xliff:g id="SERVICE">%1$s</xliff:g> na dostęp do powiadomień?"</string>
     <string name="notification_assistant_security_warning_summary" msgid="4846559755787348129">"W Androidzie 12 ulepszone powiadomienia zastąpiły dotychczasowe powiadomienia adaptacyjne. Ta funkcja pokazuje sugerowane działania i odpowiedzi oraz porządkuje powiadomienia. \n\nUlepszone powiadomienia mogą czytać całą zawartość powiadomień, w tym informacje osobiste takie jak nazwy kontaktów i treść wiadomości. Funkcja może też zamykać powiadomienia oraz reagować na nie, np. odbierać połączenia telefoniczne i sterować trybem Nie przeszkadzać."</string>
     <string name="notification_listener_security_warning_title" msgid="5791700876622858363">"Zezwolić usłudze <xliff:g id="SERVICE">%1$s</xliff:g> na dostęp do powiadomień?"</string>
-    <string name="notification_listener_security_warning_summary" msgid="3668606006326629153">"Aplikacja <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> będzie mogła czytać wszystkie powiadomienia, w tym dane osobowe takie jak nazwy kontaktów i treść otrzymywanych wiadomości. Będzie też mogła odkładać oraz odrzucać powiadomienia i używać umieszczonych w nich przycisków, włączając w to odbieranie połączeń telefonicznych. \n\nDodatkowo aplikacja będzie mogła włączać i wyłączać tryb Nie przeszkadzać oraz zmieniać powiązane ustawienia."</string>
+    <string name="notification_listener_security_warning_summary" msgid="3668606006326629153">"Aplikacja <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> będzie mogła czytać wszystkie powiadomienia, w tym informacje osobiste takie jak nazwy kontaktów i treść otrzymywanych wiadomości. Będzie też mogła odkładać oraz odrzucać powiadomienia i używać umieszczonych w nich przycisków, włączając w to odbieranie połączeń telefonicznych. \n\nDodatkowo aplikacja będzie mogła włączać i wyłączać tryb Nie przeszkadzać oraz zmieniać powiązane ustawienia."</string>
     <string name="notification_listener_disable_warning_summary" msgid="8373396293802088961">"Jeśli wyłączysz dostęp do powiadomień dla aplikacji <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g>, możesz również wyłączyć opcję Nie przeszkadzać."</string>
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"Wyłącz"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"Anuluj"</string>
@@ -4914,8 +4879,6 @@
       <item quantity="one">1 aplikacja może używać nieograniczonej ilości danych</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"Pokaż więcej"</string>
-    <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"Naprawdę chcesz wyczyścić dane użytkownika i przekształcić na szyfrowanie plików?"</string>
-    <string name="button_confirm_convert_fbe" msgid="339648921918438106">"Wyczyść i przekształć"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"Zresetuj ograniczanie szybkości w usłudze ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"Zresetowano ograniczenie szybkości w usłudze ShortcutManager"</string>
     <string name="notification_suggestion_title" msgid="6309263655965785411">"Zarządzaj informacjami wyświetlanymi na ekranie blokady"</string>
@@ -5466,6 +5429,7 @@
     <string name="sim_action_yes" msgid="8076556020131395515">"Tak"</string>
     <string name="sim_action_reboot" msgid="3508948833333441538">"Uruchom ponownie"</string>
     <string name="sim_action_no_thanks" msgid="435717748384544195">"Nie"</string>
+    <string name="sim_action_cancel" msgid="2668099867029610910">"Anuluj"</string>
     <string name="sim_switch_button" msgid="1405772571706095387">"Przełącz"</string>
     <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Nie można aktywować karty SIM"</string>
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Wyjmij kartę SIM i włóż ją ponownie. Jeśli problem nie ustąpi, uruchom urządzenie ponownie."</string>
@@ -5622,6 +5586,10 @@
     <string name="cached_apps_freezer" msgid="1057519579761550350">"Zawieś wykonywanie dla aplikacji z pamięci podręcznej"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"Zezwalaj na nakładki ekranowe w ustawieniach"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Zezwalaj aplikacjom, które mogą wyświetlać się nad innymi, aby nakładały ekrany ustawień"</string>
+    <!-- no translation found for allow_mock_modem (3832264806530479214) -->
+    <skip />
+    <!-- no translation found for allow_mock_modem_summary (9097416612748005374) -->
+    <skip />
     <string name="media_controls_title" msgid="403271085636252597">"Multimedia"</string>
     <string name="media_controls_resume_title" msgid="855076860336652370">"Przypnij odtwarzacz"</string>
     <string name="media_controls_resume_description" msgid="3163482266454802097">"Aby można było szybko wznowić odtwarzanie, odtwarzacz pozostaje otwarty w Szybkich ustawieniach"</string>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 74f40f9..552f730 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -142,10 +142,11 @@
     <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"Permita que seu dispositivo se comunique com dispositivos Bluetooth nas proximidades"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"Permite que seu smartphone se comunique com dispositivos Bluetooth nas proximidades"</string>
     <string name="bluetooth_disable_a2dp_hw_offload" msgid="5942913792817797541">"Desativar descarga de hardware Bluetooth A2DP"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="8610420176339657720">"Reiniciar?"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8333029144800835996">"Reinicie o dispositivo para alterar essa configuração."</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="3488695418187553566">"Reiniciar"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="4930826928585464191">"Cancelar"</string>
+    <string name="bluetooth_disable_le_audio_hw_offload" msgid="3966022676505972908">"Desativar descarga de hardware Bluetooth LE AUDIO"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_title" msgid="6001142380445276918">"Reiniciar dispositivo?"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_message" msgid="1524373895333698779">"Reinicie o dispositivo para mudar essa configuração."</string>
+    <string name="bluetooth_disable_hw_offload_dialog_confirm" msgid="5594859658551707592">"Reiniciar"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel" msgid="3663690305043973720">"Cancelar"</string>
     <string name="connected_device_media_device_title" msgid="3783388247594566734">"Dispositivos portáteis de mídia"</string>
     <string name="connected_device_call_device_title" msgid="88732390601723608">"Dispositivos de chamada"</string>
     <string name="connected_device_other_device_title" msgid="4652120430615729193">"Outros dispositivos"</string>
@@ -309,9 +310,9 @@
     <string name="security_settings_title" msgid="6710768415432791970">"Segurança"</string>
     <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"Criptografia e credenciais"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"Smartphone criptografado"</string>
-    <string name="decryption_settings_summary" product="default" msgid="1742645256103613503">"O smartphone não está criptografado"</string>
+    <string name="not_encrypted_summary" product="default" msgid="2251945842585788254">"O smartphone não está criptografado"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"Dispositivo criptografado"</string>
-    <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"Dispositivo não criptografado"</string>
+    <string name="not_encrypted_summary" product="tablet" msgid="2374263654698719382">"Dispositivo não criptografado"</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"Tela de bloqueio"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"O que mostrar"</string>
     <string name="security_settings_summary" msgid="1627059516127354233">"Definir Meu local, desbloqueio de tela, bloqueio do chip e do armazenamento de credenciais"</string>
@@ -570,37 +571,10 @@
     <string name="fingerprint_last_delete_message" msgid="7860374760549404410">"Não será possível usar a impressão digital para desbloquear o smartphone ou confirmar sua identidade em apps."</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="4104208067277655068">"Não será possível usar a impressão digital para desbloquear seu perfil de trabalho, autorizar compras ou fazer login em apps de trabalho."</string>
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"Sim, remover"</string>
-    <string name="crypt_keeper_settings_title" msgid="4938812137822100044">"Criptografia"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"Criptografar tablet"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"Criptografar smartphone"</string>
-    <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"Criptografado"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"Você pode criptografar suas contas, configurações, apps transferidos e seus dados, mídia e outros arquivos. Após criptografar seu tablet, supondo que um bloqueio de tela tenha sido configurado (ou seja, um padrão, PIN numérico ou senha), será necessário desbloquear a tela para descriptografar o smartphone sempre que você ligá-lo. A única outra maneira de descriptografar é por meio de uma redefinição para configuração original, apagando todos os seus dados.\n\nA criptografia leva uma hora ou mais. Você deve iniciar com a bateria carregada e manter seu tablet conectado até que a criptografia seja concluída. Se você interromper o processo de criptografia, perderá alguns ou todos os seus dados."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"Você pode criptografar suas contas, configurações, apps transferidos e seus dados, mídia e outros arquivos. Após criptografar seu smartphone, supondo que um bloqueio de tela tenha sido configurado (ou seja, um padrão, PIN numérico ou senha), será necessário desbloquear a tela para descriptografar o smartphone sempre que você ligá-lo. A única outra maneira de descriptografar é por meio de uma redefinição para configuração original, apagando todos os seus dados.\n\nA criptografia leva uma hora ou mais. Você deve iniciar com a bateria carregada e manter seu smartphone conectado até que a criptografia seja concluída. Se você interromper o processo de criptografia, perderá alguns ou todos os seus dados."</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"Criptografar tablet"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"Criptografar smartphone"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"Carregue sua bateria e tente novamente."</string>
-    <string name="crypt_keeper_unplugged_text" msgid="2709721134148651329">"Conecte seu carregador e tente novamente."</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="1847280235529858357">"Não há PIN ou senha da tela de bloqueio"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="7210616262954236042">"É necessário definir um PIN ou uma senha para a tela de bloqueio antes de iniciar a criptografia."</string>
-    <string name="crypt_keeper_confirm_title" msgid="8600000209722452230">"Criptografar?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="3270587498436152259">"A operação de criptografia é irreversível e, se for interrompida, você perderá seus dados. A criptografia leva cerca de uma hora ou mais, e nesse período o tablet será reiniciado várias vezes."</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="3040428543349852419">"A operação de criptografia é irreversível e, se for interrompida, você perderá seus dados. A criptografia leva uma hora ou mais, e nesse período o telefone será reiniciado várias vezes."</string>
-    <string name="crypt_keeper_setup_title" msgid="3339725741305796680">"Criptografando"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="4417016995091289019">"Aguarde enquanto seu tablet está sendo criptografado. <xliff:g id="PERCENT">^1</xliff:g>% concluído."</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="7902355422499500352">"Aguarde enquanto seu telefone está sendo criptografado. <xliff:g id="PERCENT">^1</xliff:g>% concluído."</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="8348188415839917821">"Aguarde enquanto seu tablet é criptografado. Tempo restante: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="8556105766597855198">"Aguarde enquanto seu telefone é criptografado. Tempo restante: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="3832496715430327682">"Para desbloquear seu tablet, desligue-o e ligue-o novamente."</string>
-    <string name="crypt_keeper_force_power_cycle" product="default" msgid="5070346039522135361">"Para desbloquear seu smartphone, desligue-o e ligue-o novamente."</string>
-    <string name="crypt_keeper_warn_wipe" msgid="8104921337301750394">"Aviso: o dispositivo será apagado após mais <xliff:g id="COUNT">^1</xliff:g> tentativas fracassadas de ser desbloqueado!"</string>
-    <string name="crypt_keeper_enter_password" msgid="1274917431075529732">"Digite sua senha"</string>
-    <string name="crypt_keeper_failed_title" msgid="8173654570682244149">"Falha na criptografia"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"A criptografia foi interrompida e não pode ser concluída. Por esse motivo, os dados em seu tablet não podem ser acessados. \n\n Para continuar usando seu tablet, é necessário restaurar as configurações originais. Quando você configurar seu tablet após a restauração, poderá recuperar todos os dados que foram salvos em backup em sua Conta do Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"A criptografia foi interrompida e não pode ser concluída. Por esse motivo, os dados em seu telefone não podem mais ser acessados. \n\nPara continuar usando seu telefone, é necessário restaurar as configurações originais. Quando você configurar seu telefone após a restauração, poderá recuperar todos os dados que foram salvos em backup em sua Conta do Google."</string>
-    <string name="crypt_keeper_data_corrupt_title" msgid="5920153462176846037">"Falha na descriptografia"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"A senha digitada está correta, mas os dados estão corrompidos. \n\nPara retomar o uso do seu tablet, é necessário redefinir para as configurações originais. Quando você configurar seu tablet após a redefinição, poderá restaurar todos os dados que foram salvos em backup na sua Conta do Google."</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"A senha digitada está correta, mas os dados estão corrompidos. \n\nPara retomar o uso do seu smartphone, é necessário redefinir para as configurações originais. Quando você configurar seu smartphone após a redefinição, poderá restaurar todos os dados que foram salvos em backup na sua Conta do Google."</string>
-    <string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"Alterar o método de entrada"</string>
+    <string name="encryption_settings_title" msgid="2848716008695618360">"Criptografia"</string>
+    <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"Criptografar tablet"</string>
+    <string name="encrypt_title" product="default" msgid="7337365190988321100">"Criptografar smartphone"</string>
+    <string name="encrypted_summary" msgid="545623487587251207">"Criptografado"</string>
     <string name="suggested_lock_settings_title" msgid="7836065447159730217">"Proteger seu smartphone"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"Definir bloqueio de tela para proteger o tablet"</string>
     <string name="suggested_lock_settings_summary" product="device" msgid="8479766049078378225">"Definir bloqueio de tela para proteger o dispositivo"</string>
@@ -819,6 +793,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Talvez seja necessário digitar este PIN no outro dispositivo."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Talvez seja necessário digitar esta senha no outro dispositivo."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Para parear com:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Verifique se ele está mostrando a seguinte senha:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Confirme para parear com o conjunto coordenado"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"De:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Parear com este dispositivo?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Para parear com:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Digite no dispositivo:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>. Em seguida, pressione Voltar ou Entrar."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Permitir o acesso aos seus contatos e seu histórico de chamadas"</string>
@@ -852,6 +827,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Não foi possível conectar. Tente novamente."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Detalhes do dispositivo"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Endereço Bluetooth do dispositivo: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Endereço Bluetooth do dispositivo:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Esquecer dispositivo?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Remover associação"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Desconectar o app?"</string>
@@ -883,6 +859,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Lembrar configurações"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Número máximo de dispositivos de áudio Bluetooth conectados"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Selecione o número máximo de dispositivos de áudio Bluetooth conectados"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"Registro de depuração da pilha NFC"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Aumentar o nível de registros da pilha NFC"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Transmitir"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"espelho"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Ativar tela sem fio"</string>
@@ -1190,6 +1168,8 @@
     <string name="wifi_hotspot_maximize_compatibility_dual_ap_summary" msgid="3579549223159056533">"Ajuda outros dispositivos a encontrarem esse ponto de acesso. Maior uso da bateria."</string>
     <string name="wifi_tether_starting" msgid="8879874184033857814">"Ativando o ponto de acesso..."</string>
     <string name="wifi_tether_stopping" msgid="4416492968019409188">"Desativando o ponto de acesso..."</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_title" msgid="3089432578433978073">"Tethering indisponível"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_content" msgid="5920421547607921112">"Entre em contato com sua operadora para saber mais"</string>
     <string name="wifi_tether_enabled_subtext" msgid="5085002421099821056">"A rede <xliff:g id="NETWORK_SSID">%1$s</xliff:g> está ativa"</string>
     <string name="wifi_tether_failed_subtext" msgid="437190628041885500">"Erro de ponto de acesso Wi-Fi portátil"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7072559431286459122">"Configurar ponto de acesso Wi-Fi"</string>
@@ -2061,8 +2041,8 @@
     <string name="ask_compatibility" msgid="8388397595148476565">"Perguntar ao iniciar"</string>
     <string name="enable_compatibility" msgid="1163387233622859712">"Dimensionar app"</string>
     <string name="unknown" msgid="8192160131923461175">"Desconhecido"</string>
-    <string name="sort_order_alpha" msgid="3400680865280266582">"Classificar por nome"</string>
-    <string name="sort_order_size" msgid="7731928486199737223">"Classificar por tamanho"</string>
+    <string name="sort_order_alpha" msgid="3400680865280266582">"Ordenar por nome"</string>
+    <string name="sort_order_size" msgid="7731928486199737223">"Ordenar por tamanho"</string>
     <string name="sort_order_recent_notification" msgid="1496198895330443073">"Mais recentes"</string>
     <string name="sort_order_frequent_notification" msgid="4063700985742284794">"Mais frequentes"</string>
     <string name="show_running_services" msgid="8666008279959853318">"Mostrar serviços em exec."</string>
@@ -2124,7 +2104,7 @@
     <string name="app_ops_never_used" msgid="9038133162371204506">"(Nunca usado)"</string>
     <string name="no_default_apps" msgid="8966319676910104570">"Nenhum app padrão."</string>
     <string name="storageuse_settings_title" msgid="3125650750657988194">"Uso do armazenamento"</string>
-    <string name="storageuse_settings_summary" msgid="5001621552305431831">"Visualizar armazenamento usado pelos apps"</string>
+    <string name="storageuse_settings_summary" msgid="5001621552305431831">"Ver armazenamento usado pelos apps"</string>
     <string name="service_restarting" msgid="5104563288155809226">"Reiniciando"</string>
     <string name="cached" msgid="5379485147573438201">"Processo em segundo plano em cache"</string>
     <string name="no_running_services" msgid="9079738069349859373">"Nada em execução."</string>
@@ -2257,7 +2237,7 @@
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7268758525344468364">"Sempre permitir que <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> crie widgets e acesse os dados"</string>
     <string name="usage_stats_label" msgid="6523644917803320085">"Estatísticas de uso"</string>
     <string name="testing_usage_stats" msgid="4660643799010906365">"Estatísticas de uso"</string>
-    <string name="display_order_text" msgid="7120394778684605892">"Classificar por:"</string>
+    <string name="display_order_text" msgid="7120394778684605892">"Ordenar por:"</string>
     <string name="app_name_label" msgid="3809910527680143673">"App"</string>
     <string name="last_time_used_label" msgid="2639712813493534074">"Última utilização"</string>
     <string name="usage_time_label" msgid="9105343335151559883">"Tempo de uso"</string>
@@ -2536,11 +2516,6 @@
     <string name="enable_service_title" msgid="7231533866953706788">"Permitir que <xliff:g id="SERVICE">%1$s</xliff:g> tenha controle total do seu dispositivo?"</string>
     <string name="capabilities_list_title" msgid="1225853611983394386">"<xliff:g id="SERVICE">%1$s</xliff:g> precisa:"</string>
     <string name="touch_filtered_warning" msgid="4225815157460318241">"Como um app está ocultando uma solicitação de permissão, as configurações não podem confirmar sua resposta."</string>
-    <string name="enable_service_encryption_warning" msgid="931082737770453755">"Se <xliff:g id="SERVICE">%1$s</xliff:g> for ativado, o dispositivo não usará o bloqueio de tela para melhorar a criptografia de dados."</string>
-    <string name="secure_lock_encryption_warning" msgid="669152607190123579">"Uma vez que o serviço de acessibilidade foi ativado, seu dispositivo não usará o bloqueio de tela para melhorar a criptografia de dados."</string>
-    <string name="enable_service_pattern_reason" msgid="6832846117817938536">"A ativação do <xliff:g id="SERVICE">%1$s</xliff:g> afeta a criptografia de dados. Confirme seu padrão."</string>
-    <string name="enable_service_pin_reason" msgid="6040417014360237703">"A ativação do <xliff:g id="SERVICE">%1$s</xliff:g> afeta a criptografia de dados. Confirme seu PIN."</string>
-    <string name="enable_service_password_reason" msgid="6962544350351734238">"A ativação do <xliff:g id="SERVICE">%1$s</xliff:g> afeta a criptografia de dados. Confirme sua senha."</string>
     <string name="accessibility_service_warning" msgid="6779187188736432618">"<xliff:g id="SERVICE">%1$s</xliff:g> está solicitando controle total deste dispositivo. O serviço pode ler a tela e realizar ações em nome de usuários com necessidades especiais. Esse nível de controle não é adequado para a maioria dos apps."</string>
     <string name="accessibility_service_warning_description" msgid="6573203795976134751">"O controle total é adequado para apps que ajudam você com as necessidades de acessibilidade, mas não para a maioria dos apps."</string>
     <string name="accessibility_service_screen_control_title" msgid="324795030658109870">"Ver e controlar tela"</string>
@@ -3105,14 +3080,6 @@
     <string name="remove_account_failed" msgid="3709502163548900644">"Esta alteração não é permitida pelo administrador"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"Não é possível sincronizar manualmente"</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"A sincronização para o item está desativada no momento. Para alterar essa configuração, ative os dados de segundo plano e a sincronização automática temporariamente."</string>
-    <string name="enter_password" msgid="6327051330258595331">"Para iniciar o Android, digite sua senha"</string>
-    <string name="enter_pin" msgid="1029287617551232681">"Para iniciar o Android, digite seu PIN"</string>
-    <string name="enter_pattern" msgid="1747316785866742960">"Para iniciar o Android, desenhe seu padrão"</string>
-    <string name="cryptkeeper_wrong_pattern" msgid="340747269176120242">"Padrão incorreto"</string>
-    <string name="cryptkeeper_wrong_password" msgid="7295607881887114486">"Senha incorreta"</string>
-    <string name="cryptkeeper_wrong_pin" msgid="2347961593970714201">"PIN incorreto"</string>
-    <string name="checking_decryption" msgid="6111642972615688237">"Verificando..."</string>
-    <string name="starting_android" msgid="6694154070215356186">"Iniciando o Android..."</string>
     <string name="delete" msgid="8330605554706263775">"Excluir"</string>
     <string name="misc_files" msgid="6598066985800749585">"Arquivos variados"</string>
     <string name="misc_files_selected_count" msgid="5597802791672749532">"selecionados <xliff:g id="NUMBER">%1$d</xliff:g> de <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -3208,8 +3175,6 @@
     <string name="data_usage_metered_yes" msgid="4262598072030135223">"Limitada"</string>
     <string name="data_usage_metered_no" msgid="1685828958417926268">"Ilimitada"</string>
     <string name="data_usage_disclaimer" msgid="3271450299386176770">"O cálculo da operadora poderá ser diferente de seu dispositivo."</string>
-    <string name="cryptkeeper_emergency_call" msgid="8369322820475703306">"Chamada de emergência"</string>
-    <string name="cryptkeeper_return_to_call" msgid="3857250752781151232">"Retornar à chamada"</string>
     <string name="vpn_name" msgid="3806456074909253262">"Nome"</string>
     <string name="vpn_type" msgid="5533202873260826663">"Tipo"</string>
     <string name="vpn_server" msgid="2908816134941973935">"Endereço do servidor"</string>
@@ -4014,7 +3979,7 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> categorias</item>
     </plurals>
     <string name="no_channels" msgid="4716199078612071915">"Este app não postou nenhuma notificação"</string>
-    <string name="app_settings_link" msgid="6725453466705333311">"Configurações adicionais no app"</string>
+    <string name="app_settings_link" msgid="6725453466705333311">"Configurações avançadas no app"</string>
     <string name="notification_screen_summary" msgid="5984915275134654822">"Histórico de notificações, balões, mensagens enviadas recentemente"</string>
     <string name="app_notification_listing_summary_zero" msgid="2988400013221120744">"Ativadas para todos os apps"</string>
     <plurals name="app_notification_listing_summary_others" formatted="false" msgid="1506127395400503717">
@@ -4475,8 +4440,8 @@
     <string name="memory_details" msgid="6133226869214421347">"Detalhes"</string>
     <string name="memory_use_summary" msgid="3915964794146424142">"<xliff:g id="SIZE">%1$s</xliff:g> de memória média usada nas últimas três horas"</string>
     <string name="no_memory_use_summary" msgid="6708111974923274436">"Nenhuma memória foi usada nas últimas três horas"</string>
-    <string name="sort_avg_use" msgid="4416841047669186903">"Classificar por uso médio"</string>
-    <string name="sort_max_use" msgid="3370552820889448484">"Classificar por uso máximo"</string>
+    <string name="sort_avg_use" msgid="4416841047669186903">"Ordenar por uso médio"</string>
+    <string name="sort_max_use" msgid="3370552820889448484">"Ordenar por uso máximo"</string>
     <string name="memory_performance" msgid="5448274293336927570">"Desempenho"</string>
     <string name="total_memory" msgid="5244174393008910567">"Memória total"</string>
     <string name="average_used" msgid="690235917394070169">"Média usada (%)"</string>
@@ -4766,8 +4731,6 @@
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> apps podem usar dados ilimitados</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"Ver mais"</string>
-    <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"Quer mesmo limpar dados do usuário e converter em criptografia de arquivos?"</string>
-    <string name="button_confirm_convert_fbe" msgid="339648921918438106">"Limpar e converter…"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"Redefinir limite de taxa do ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"O limite de taxa do ShortcutManager foi redefinido"</string>
     <string name="notification_suggestion_title" msgid="6309263655965785411">"Controlar informações na tela de bloqueio"</string>
@@ -5294,6 +5257,7 @@
     <string name="sim_action_yes" msgid="8076556020131395515">"Sim"</string>
     <string name="sim_action_reboot" msgid="3508948833333441538">"Reiniciar"</string>
     <string name="sim_action_no_thanks" msgid="435717748384544195">"Agora não"</string>
+    <string name="sim_action_cancel" msgid="2668099867029610910">"Cancelar"</string>
     <string name="sim_switch_button" msgid="1405772571706095387">"Mudar"</string>
     <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Não foi possível ativar o chip"</string>
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Remova o chip e insira-o novamente. Se o problema continuar, reinicie o dispositivo."</string>
@@ -5446,6 +5410,10 @@
     <string name="cached_apps_freezer" msgid="1057519579761550350">"Suspender execução para apps em cache"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"Permitir sobreposições de tela no app Configurações"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Permitir que apps que podem ser sobrepostos a outros sejam abertos sobre telas de configuração"</string>
+    <!-- no translation found for allow_mock_modem (3832264806530479214) -->
+    <skip />
+    <!-- no translation found for allow_mock_modem_summary (9097416612748005374) -->
+    <skip />
     <string name="media_controls_title" msgid="403271085636252597">"Mídia"</string>
     <string name="media_controls_resume_title" msgid="855076860336652370">"Fixar player de mídia"</string>
     <string name="media_controls_resume_description" msgid="3163482266454802097">"Para retomar a reprodução rapidamente, o player de mídia fica aberto nas Configurações rápidas"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 3229e98..f152194 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -24,8 +24,8 @@
     <string name="confirmation_turn_on" msgid="2979094011928347665">"Ativar"</string>
     <string name="device_info_default" msgid="1406619232867343310">"Desconhecido"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="1646187747875476269">
-      <item quantity="one">Está agora a <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> passos de se tornar um programador.</item>
       <item quantity="other">Está agora a <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> passos de se tornar um programador.</item>
+      <item quantity="one">Está agora a <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> passos de se tornar um programador.</item>
     </plurals>
     <string name="show_dev_on" msgid="2840850085134853754">"Agora é um programador!"</string>
     <string name="show_dev_already" msgid="7041756429707644630">"Não é necessário, já é um programador."</string>
@@ -142,10 +142,11 @@
     <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"Autorize o dispositivo a comunicar com dispositivos Bluetooth próximos."</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"Autorize o telemóvel a comunicar com dispositivos Bluetooth próximos."</string>
     <string name="bluetooth_disable_a2dp_hw_offload" msgid="5942913792817797541">"Desat. descarga hardware Bluetooth A2DP"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="8610420176339657720">"Reiniciar disposit.?"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8333029144800835996">"Tem de reiniciar o dispositivo para alterar esta definição."</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="3488695418187553566">"Reiniciar"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="4930826928585464191">"Cancelar"</string>
+    <string name="bluetooth_disable_le_audio_hw_offload" msgid="3966022676505972908">"Desativar descarga de hardware Bluetooth LE AUDIO"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_title" msgid="6001142380445276918">"Reiniciar dispositivo?"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_message" msgid="1524373895333698779">"Tem de reiniciar o dispositivo para alterar esta definição."</string>
+    <string name="bluetooth_disable_hw_offload_dialog_confirm" msgid="5594859658551707592">"Reiniciar"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel" msgid="3663690305043973720">"Cancelar"</string>
     <string name="connected_device_media_device_title" msgid="3783388247594566734">"Dispositivos multimédia"</string>
     <string name="connected_device_call_device_title" msgid="88732390601723608">"Dispositivos de chamada"</string>
     <string name="connected_device_other_device_title" msgid="4652120430615729193">"Outros dispositivos"</string>
@@ -208,8 +209,8 @@
     <string name="locale_remove_menu" msgid="3521546263421387474">"Remover"</string>
     <string name="add_a_language" msgid="2126220398077503271">"Adicionar um idioma"</string>
     <plurals name="dlg_remove_locales_title" formatted="false" msgid="2845515796732609837">
-      <item quantity="one">Remover o idioma selecionado?</item>
       <item quantity="other">Remover os idiomas selecionados?</item>
+      <item quantity="one">Remover o idioma selecionado?</item>
     </plurals>
     <string name="dlg_remove_locales_message" msgid="8110560091134252067">"O texto será apresentado noutro idioma."</string>
     <string name="dlg_remove_locales_error_title" msgid="5875503658221562572">"Não é possível remover todos os idiomas"</string>
@@ -298,8 +299,8 @@
     <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Utilizar a localização"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Desativada"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
-      <item quantity="one">Ativada – <xliff:g id="COUNT_0">%1$d</xliff:g> app tem acesso à localização</item>
       <item quantity="other">Ativada – <xliff:g id="COUNT_1">%1$d</xliff:g> apps têm acesso à localização</item>
+      <item quantity="one">Ativada – <xliff:g id="COUNT_0">%1$d</xliff:g> app tem acesso à localização</item>
     </plurals>
     <string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"A carregar…"</string>
     <string name="location_settings_footer_general" msgid="1040507068701188821">"As apps com a autorização Dispositivos próximos podem determinar a posição relativa dos dispositivos ligados."</string>
@@ -309,9 +310,9 @@
     <string name="security_settings_title" msgid="6710768415432791970">"Segurança"</string>
     <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"Encriptação/credenciais"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"Dados do telemóvel encriptados"</string>
-    <string name="decryption_settings_summary" product="default" msgid="1742645256103613503">"Telemóvel não encriptado."</string>
+    <string name="not_encrypted_summary" product="default" msgid="2251945842585788254">"Telemóvel não encriptado"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"Dispositivo encriptado"</string>
-    <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"Dispositivo não encriptado."</string>
+    <string name="not_encrypted_summary" product="tablet" msgid="2374263654698719382">"Dispositivo não encriptado"</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"Ecrã de bloqueio"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"O que apresentar"</string>
     <string name="security_settings_summary" msgid="1627059516127354233">"Definir A minha localização, desbloqueio do ecrã, bloqueio do cartão SIM, bloqueio do armazenamento de credenciais"</string>
@@ -402,8 +403,8 @@
     <string name="fingerprint_add_title" msgid="1837610443487902050">"Adicionar impressão digital"</string>
     <string name="fingerprint_enable_keyguard_toggle_title" msgid="5451094461919440992">"bloqueio de ecrã"</string>
     <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="6897454766137108776">
-      <item quantity="one">Impressão digital adicionada</item>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> impressões digitais adicionadas</item>
+      <item quantity="one">Impressão digital adicionada</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"Configure a sua impressão digital"</string>
@@ -568,37 +569,10 @@
     <string name="fingerprint_last_delete_message" msgid="7860374760549404410">"Não poderá utilizar a sua impressão digital para desbloquear o telemóvel ou validar a sua identidade nas apps."</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="4104208067277655068">"Não poderá utilizar a sua impressão digital para desbloquear o perfil de trabalho, autorizar compras ou iniciar sessão nas apps de trabalho."</string>
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"Sim, remover"</string>
-    <string name="crypt_keeper_settings_title" msgid="4938812137822100044">"Encriptação"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"Encriptar tablet"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"Encriptar telemóvel"</string>
-    <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"Encriptado"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"Pode encriptar as suas contas, definições, aplicações transferidas e respetivos dados, multimédia e outros ficheiros. Depois de encriptar o tablet, partindo do princípio de que configurou um bloqueio de ecrã (isto é, um padrão, um PIN numérico ou uma palavra-passe), terá de desbloquear o ecrã para desencriptar o tablet sempre que o ligar. A única outra forma de desencriptar é efetuar uma reposição de dados de fábrica, ao apagar todos os dados.\n\nA encriptação demora uma hora ou mais. Tem de iniciar com a bateria carregada e manter o tablet ligado à eletricidade ao longo do processo. Se o interromper, perderá alguns ou todos os dados."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"Pode encriptar as suas contas, definições, aplicações transferidas e respetivos dados, multimédia e outros ficheiros. Depois de encriptar o telemóvel, partindo do princípio de que configurou um bloqueio de ecrã (isto é, um padrão, um PIN numérico ou uma palavra-passe), terá de desbloquear o ecrã para desencriptar o telemóvel sempre que o ligar. A única outra forma de desencriptar é efetuar uma reposição de dados de fábrica, ao apagar todos os dados.\n\nA encriptação demora uma hora ou mais. Tem de iniciar com a bateria carregada e manter o telemóvel ligado à eletricidade ao longo do processo. Se o interromper, perderá alguns ou todos os dados."</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"Encriptar tablet"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"Encriptar telemóvel"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"Carregue a bateria e tente novamente."</string>
-    <string name="crypt_keeper_unplugged_text" msgid="2709721134148651329">"Ligue o carregador e tente novamente."</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="1847280235529858357">"Sem PIN nem palavra-passe de bloqueio de ecrã"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="7210616262954236042">"É necessário configurar um PIN ou palavra-passe de bloqueio de ecrã antes de iniciar a encriptação."</string>
-    <string name="crypt_keeper_confirm_title" msgid="8600000209722452230">"Encriptar?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="3270587498436152259">"A operação de encriptação é irreversível e, se a interromper, perderá dados. A encriptação demora uma hora ou mais, durante a qual o tablet reiniciará várias vezes."</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="3040428543349852419">"A operação de encriptação é irreversível e, se a interromper, perderá dados. A encriptação demora uma hora ou mais, durante a qual o telemóvel reiniciará várias vezes."</string>
-    <string name="crypt_keeper_setup_title" msgid="3339725741305796680">"Encriptação"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="4417016995091289019">"Aguarde enquanto o tablet está a ser encriptado. <xliff:g id="PERCENT">^1</xliff:g>% concluído."</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="7902355422499500352">"Aguarde enquanto o telemóvel está a ser encriptado. <xliff:g id="PERCENT">^1</xliff:g>% concluído."</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="8348188415839917821">"Aguarde enquanto o tablet está a ser encriptado. Tempo restante: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="8556105766597855198">"Aguarde enquanto o telemóvel está a ser encriptado. Tempo restante: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="3832496715430327682">"Para desbloquear o tablet, desligue-o e volte a ligá-lo."</string>
-    <string name="crypt_keeper_force_power_cycle" product="default" msgid="5070346039522135361">"Para desbloquear o telemóvel, desligue-o e volte a ligá-lo."</string>
-    <string name="crypt_keeper_warn_wipe" msgid="8104921337301750394">"Aviso: O seu dispositivo será apagado após mais <xliff:g id="COUNT">^1</xliff:g> tentativa(s) falhada(s) de desbloqueio!"</string>
-    <string name="crypt_keeper_enter_password" msgid="1274917431075529732">"Introduza a palavra-passe"</string>
-    <string name="crypt_keeper_failed_title" msgid="8173654570682244149">"Encriptação sem êxito"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"A encriptação foi interrompida e não é possível concluí-la. Como resultado, os dados no tablet já não estão acessíveis. \n\nPara voltar a utilizar o tablet, é necessário efetuar uma reposição para os valores de fábrica. Quando configurar o tablet após a reposição, poderá restaurar todos os dados dos quais tenha cópias de segurança na Conta Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"A encriptação foi interrompida e não é possível concluí-la. Como resultado, os dados no seu telemóvel já não estão acessíveis. \n\nPara voltar a utilizar o telemóvel, é necessário efetuar uma reposição para os valores de fábrica. Quando configurar o telemóvel após a reposição, poderá restaurar todos os dados dos quais tenha cópias de segurança na sua Conta Google."</string>
-    <string name="crypt_keeper_data_corrupt_title" msgid="5920153462176846037">"Desencriptação sem êxito"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"A palavra-passe introduzida está correta mas, infelizmente, os dados estão corrompidos. \n\nPara continuar a utilizar o tablet, é necessário efetuar uma reposição de fábrica. Quando configurar o tablet após a reposição, terá a oportunidade de restaurar quaisquer dados da cópia de segurança da sua Conta Google."</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"A palavra-passe introduzida está correta mas, infelizmente, os dados estão corrompidos. \n\nPara continuar a utilizar o telemóvel, é necessário efetuar uma reposição de fábrica. Quando configurar o telemóvel após a reposição, terá a oportunidade de restaurar quaisquer dados da cópia de segurança da sua Conta Google."</string>
-    <string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"Alternar o método de introdução"</string>
+    <string name="encryption_settings_title" msgid="2848716008695618360">"Encriptação"</string>
+    <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"Encriptar tablet"</string>
+    <string name="encrypt_title" product="default" msgid="7337365190988321100">"Encriptar telemóvel"</string>
+    <string name="encrypted_summary" msgid="545623487587251207">"Encriptado"</string>
     <string name="suggested_lock_settings_title" msgid="7836065447159730217">"Proteger o telemóvel"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"Definir o bloqueio de ecrã para proteger o tablet"</string>
     <string name="suggested_lock_settings_summary" product="device" msgid="8479766049078378225">"Definir o bloqueio de ecrã para proteger o dispositivo"</string>
@@ -732,21 +706,21 @@
     <string name="lock_failed_attempts_now_wiping_profile" msgid="3171880997211568208">"Demasiadas tentativas incorretas. Este perfil de trabalho e os respetivos dados serão eliminados."</string>
     <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="170155081899679669">"Ignorar"</string>
     <plurals name="lockpassword_password_too_short" formatted="false" msgid="2192234965414232157">
-      <item quantity="one">Tem de incluir, pelo menos, <xliff:g id="COUNT_0">%d</xliff:g> caráter.</item>
       <item quantity="other">Tem de ter, pelo menos, <xliff:g id="COUNT_1">%d</xliff:g> carateres.</item>
+      <item quantity="one">Tem de incluir, pelo menos, <xliff:g id="COUNT_0">%d</xliff:g> caráter.</item>
     </plurals>
     <plurals name="lockpassword_pin_too_short" formatted="false" msgid="6817086810898414162">
-      <item quantity="one">O PIN tem de incluir, pelo menos, <xliff:g id="COUNT_0">%d</xliff:g> dígito</item>
       <item quantity="other">O PIN tem de incluir, pelo menos, <xliff:g id="COUNT_1">%d</xliff:g> dígitos</item>
+      <item quantity="one">O PIN tem de incluir, pelo menos, <xliff:g id="COUNT_0">%d</xliff:g> dígito</item>
     </plurals>
     <string name="lockpassword_continue_label" msgid="2507983991979547816">"Continuar"</string>
     <plurals name="lockpassword_password_too_long" formatted="false" msgid="8118091957172967677">
-      <item quantity="one">Tem de ter menos de <xliff:g id="NUMBER_0">%d</xliff:g> caráter.</item>
       <item quantity="other">Tem de ter menos de <xliff:g id="NUMBER_1">%d</xliff:g> carateres.</item>
+      <item quantity="one">Tem de ter menos de <xliff:g id="NUMBER_0">%d</xliff:g> caráter.</item>
     </plurals>
     <plurals name="lockpassword_pin_too_long" formatted="false" msgid="8706992338720310765">
-      <item quantity="one">Tem de ter menos de <xliff:g id="NUMBER_0">%d</xliff:g> dígito.</item>
       <item quantity="other">Tem de ter menos de <xliff:g id="NUMBER_1">%d</xliff:g> dígitos.</item>
+      <item quantity="one">Tem de ter menos de <xliff:g id="NUMBER_0">%d</xliff:g> dígito.</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"O gestor do dispositivo não permite utilizar um PIN recente"</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Não pode incluir um caráter inválido"</string>
@@ -754,32 +728,32 @@
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Tem de incluir, pelo menos, um dígito"</string>
     <string name="lockpassword_password_requires_symbol" msgid="6178512486154701321">"Tem de incluir, pelo menos, um símbolo"</string>
     <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="2385916409676839024">
-      <item quantity="one">Tem de incluir, pelo menos, 1 letra</item>
       <item quantity="other">Tem de incluir, pelo menos, <xliff:g id="COUNT">%d</xliff:g> letras</item>
+      <item quantity="one">Tem de incluir, pelo menos, 1 letra</item>
     </plurals>
     <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="2057467885488612701">
-      <item quantity="one">Tem de incluir, pelo menos, 1 letra minúscula</item>
       <item quantity="other">Tem de incluir, pelo menos, <xliff:g id="COUNT">%d</xliff:g> letras minúsculas</item>
+      <item quantity="one">Tem de incluir, pelo menos, 1 letra minúscula</item>
     </plurals>
     <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="4541266279643052025">
-      <item quantity="one">Tem de incluir, pelo menos, 1 letra maiúscula</item>
       <item quantity="other">Tem de incluir, pelo menos, <xliff:g id="COUNT">%d</xliff:g> letras maiúsculas</item>
+      <item quantity="one">Tem de incluir, pelo menos, 1 letra maiúscula</item>
     </plurals>
     <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="70617964591376248">
-      <item quantity="one">Tem de incluir, pelo menos, 1 dígito numérico</item>
       <item quantity="other">Tem de incluir, pelo menos, <xliff:g id="COUNT">%d</xliff:g> dígitos numéricos</item>
+      <item quantity="one">Tem de incluir, pelo menos, 1 dígito numérico</item>
     </plurals>
     <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="7981236881269921943">
-      <item quantity="one">Tem de incluir, pelo menos, 1 símbolo especial</item>
       <item quantity="other">Tem de incluir, pelo menos, <xliff:g id="COUNT">%d</xliff:g> símbolos especiais</item>
+      <item quantity="one">Tem de incluir, pelo menos, 1 símbolo especial</item>
     </plurals>
     <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="1567877061888948467">
-      <item quantity="one">Tem de incluir, pelo menos, 1 caráter que não seja uma letra</item>
       <item quantity="other">Tem de incluir, pelo menos, <xliff:g id="COUNT">%d</xliff:g> carateres que não sejam letras</item>
+      <item quantity="one">Tem de incluir, pelo menos, 1 caráter que não seja uma letra</item>
     </plurals>
     <plurals name="lockpassword_password_requires_nonnumerical" formatted="false" msgid="5056743974888384475">
-      <item quantity="one">Tem de incluir, pelo menos, 1 caráter que não seja um número.</item>
       <item quantity="other">Tem de incluir, pelo menos, <xliff:g id="COUNT">%d</xliff:g> carateres que não sejam números.</item>
+      <item quantity="one">Tem de incluir, pelo menos, 1 caráter que não seja um número.</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"O admin. do disp. não permite a utilização de uma palavra-passe recente"</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Não é permitida uma sequência de dígitos ascendente, descendente ou repetida"</string>
@@ -793,15 +767,15 @@
     <string name="manage_device_admin" msgid="1044620606203916275">"Apps de administração do dispositivo"</string>
     <string name="number_of_device_admins_none" msgid="152926922020437312">"Sem apps ativas"</string>
     <plurals name="number_of_device_admins" formatted="false" msgid="2528735319390151989">
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> app ativa</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> aplicações ativas</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> app ativa</item>
     </plurals>
     <string name="manage_trust_agents" msgid="6410149930029992356">"Agentes fidedignos"</string>
     <string name="disabled_because_no_backup_security" msgid="4998095356607488854">"Para utilizar, defina primeiro um bloqueio de ecrã"</string>
     <string name="manage_trust_agents_summary" msgid="6423843123607674286">"Nenhum"</string>
     <plurals name="manage_trust_agents_summary_on" formatted="false" msgid="5438047398376802735">
-      <item quantity="one">1 agente fidedigno ativo</item>
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> agentes fidedignos ativos</item>
+      <item quantity="one">1 agente fidedigno ativo</item>
     </plurals>
     <string name="bluetooth_quick_toggle_title" msgid="5955341060378240781">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5257744297562880017">"Ativar Bluetooth"</string>
@@ -817,6 +791,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Poderá também ter de introduzir este PIN no outro aparelho."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Poderá também ter de introduzir a chave de acesso no outro aparelho."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Para sincronizar com: &lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Verifique se apresenta esta chave de acesso: &lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Confirme para sincronizar com o conjunto coordenado"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"De: &lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt; Sincronizar com este aparelho?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Para sincronizar com:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Introduza no mesmo:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g> e, em seguida, prima Enter."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Permitir o acesso aos contactos e ao histórico de chamadas"</string>
@@ -850,6 +825,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Não foi possível ligar. Tente novamente."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Detalhes do dispositivo"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Endereço Bluetooth do dispositivo: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Endereço Bluetooth do dispositivo:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Pretende esquecer o dispositivo?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Remover associação"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Pretende desassociar a app?"</string>
@@ -881,6 +857,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Memorizar definições"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Máximo de dispositivos de áudio Bluetooth associados"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Selecione o número máximo de dispositivos de áudio Bluetooth associados."</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"Registo de depuração de pilha NFC"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Aumente o nível de registo de pilha NFC"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Transmitir"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"espelhar"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Ativar display sem fios"</string>
@@ -1112,16 +1090,16 @@
     <string name="wifi_forget_dialog_title" msgid="4363829200968563164">"Esqueceu-se da rede?"</string>
     <string name="wifi_forget_dialog_message" msgid="8419499588321940243">"Todas as palavras-passe para esta rede serão eliminadas."</string>
     <plurals name="wifi_saved_access_points_summary" formatted="false" msgid="2802436466732147888">
-      <item quantity="one">1 rede</item>
       <item quantity="other">%d redes</item>
+      <item quantity="one">1 rede</item>
     </plurals>
     <plurals name="wifi_saved_passpoint_access_points_summary" formatted="false" msgid="5802057518058840450">
-      <item quantity="one">1 subscrição</item>
       <item quantity="other">%d subscrições</item>
+      <item quantity="one">1 subscrição</item>
     </plurals>
     <plurals name="wifi_saved_all_access_points_summary" formatted="false" msgid="5125849180309374451">
-      <item quantity="one">1 rede e subscrição</item>
       <item quantity="other">%d redes e subscrições</item>
+      <item quantity="one">1 rede e subscrição</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="1234150304285575798">"Wi-Fi Avançada"</string>
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
@@ -1188,6 +1166,8 @@
     <string name="wifi_hotspot_maximize_compatibility_dual_ap_summary" msgid="3579549223159056533">"Ajuda outros dispositivos a encontrar esta zona Wi-Fi. Aumenta a utilização da bateria."</string>
     <string name="wifi_tether_starting" msgid="8879874184033857814">"A ativar zona Wi-Fi..."</string>
     <string name="wifi_tether_stopping" msgid="4416492968019409188">"A desativar zona Wi-Fi..."</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_title" msgid="3089432578433978073">"Ligação (à Internet) via telemóvel indisponível"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_content" msgid="5920421547607921112">"Contacte o seu operador para obter mais detalhes"</string>
     <string name="wifi_tether_enabled_subtext" msgid="5085002421099821056">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> está ativa"</string>
     <string name="wifi_tether_failed_subtext" msgid="437190628041885500">"Erro da zona Wi-Fi portátil"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7072559431286459122">"Configurar ponto de acesso Wi-Fi"</string>
@@ -1465,8 +1445,8 @@
     <string name="sim_preferred_message" msgid="6004009449266648351">"O <xliff:g id="NEW_SIM">%1$s</xliff:g> é o único cartão SIM no dispositivo. Pretende utilizar este cartão SIM para os dados móveis, as chamadas e as mensagens SMS?"</string>
     <string name="wrong_pin_code_pukked" msgid="3414172752791445033">"Código PIN do cartão SIM incorreto. Tem de contactar o seu operador para desbloquear o dispositivo."</string>
     <plurals name="wrong_pin_code" formatted="false" msgid="4054088588731305475">
-      <item quantity="one">Código PIN incorreto. Tem mais <xliff:g id="NUMBER_0">%d</xliff:g> tentativa antes de ter de contactar operador p/ desbloquear dispos.</item>
       <item quantity="other">Código PIN do cartão SIM incorreto. Tem mais <xliff:g id="NUMBER_1">%d</xliff:g> tentativas.</item>
+      <item quantity="one">Código PIN incorreto. Tem mais <xliff:g id="NUMBER_0">%d</xliff:g> tentativa antes de ter de contactar operador p/ desbloquear dispos.</item>
     </plurals>
     <string name="wrong_pin_code_one" msgid="6924852214263071441">"Código PIN do SIM incorreto. Tem mais uma tentativa antes de ter de contactar o operador para desbloquear o dispositivo."</string>
     <string name="pin_failed" msgid="3726505565797352255">"Falha ao introduzir o PIN do cartão SIM!"</string>
@@ -1836,8 +1816,8 @@
     <string name="location_app_level_permissions" msgid="907206607664629759">"Autorizações de localização das apps"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"A localização está desativada"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
-      <item quantity="one"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_0">%1$d</xliff:g> de <xliff:g id="TOTAL_LOCATION_APP_COUNT_1">%2$d</xliff:g> apps tem acesso à localização</item>
       <item quantity="other"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> de <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> apps têm acesso à localização</item>
+      <item quantity="one"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_0">%1$d</xliff:g> de <xliff:g id="TOTAL_LOCATION_APP_COUNT_1">%2$d</xliff:g> apps tem acesso à localização</item>
     </plurals>
     <string name="location_category_recent_location_access" msgid="2558063524482178146">"Acesso recente"</string>
     <string name="location_recent_location_access_see_all" msgid="4203102419355323325">"Ver tudo"</string>
@@ -2012,8 +1992,8 @@
     <string name="install_applications_title" msgid="7890233747559108106">"Permit. todas as fontes app"</string>
     <string name="recent_app_category_title" msgid="189758417804427533">"Apps abertas recentemente"</string>
     <plurals name="see_all_apps_title" formatted="false" msgid="6864581406735745400">
-      <item quantity="one">Ver todas as apps</item>
       <item quantity="other">Ver todas as %1$d apps</item>
+      <item quantity="one">Ver todas as apps</item>
     </plurals>
     <string name="forgot_password_title" msgid="3967873480875239885">"Contacte o seu administrador de TI"</string>
     <string name="forgot_password_text" msgid="2583194470767613163">"Pode ajudar a repor o seu PIN, padrão ou palavra-passe."</string>
@@ -2032,8 +2012,8 @@
     <string name="clear_cache_btn_text" msgid="8597272828928143723">"Limpar cache"</string>
     <string name="cache_size_label" msgid="313456088966822757">"Cache"</string>
     <plurals name="uri_permissions_text" formatted="false" msgid="8212425823423508096">
-      <item quantity="one">1 item</item>
       <item quantity="other">%d itens</item>
+      <item quantity="one">1 item</item>
     </plurals>
     <string name="clear_uri_btn_text" msgid="4828117421162495134">"Limpar acesso"</string>
     <string name="controls_label" msgid="8671492254263626383">"Controlos"</string>
@@ -2441,8 +2421,8 @@
     <string name="accessibility_hearingaid_pair_instructions_message" msgid="8913409742121315657">"Para sincronizar os aparelhos auditivos, localize os dispositivos no ecrã seguinte e toque nos mesmos. Certifique-se de que os aparelhos auditivos estão no modo de sincronização."</string>
     <string name="accessibility_hearingaid_active_device_summary" msgid="509703438222873967">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ativo"</string>
     <plurals name="show_number_hearingaid_count" formatted="false" msgid="776000580683647556">
-      <item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g> aparelho auditivo guardado.</item>
       <item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> aparelhos auditivos guardados.</item>
+      <item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g> aparelho auditivo guardado.</item>
     </plurals>
     <string name="accessibility_audio_adjustment_title" msgid="1332113739136802997">"Ajuste de áudio"</string>
     <string name="accessibility_summary_shortcut_enabled" msgid="4030427268146752644">"Atalho ativado"</string>
@@ -2474,20 +2454,20 @@
     <string name="reduce_bright_colors_intensity_end_label" msgid="1422600205484299860">"Mais claro"</string>
     <string name="reduce_bright_colors_persist_preference_title" msgid="4368829654993343354">"Manter após reiniciar o dispositivo"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_short_delay" formatted="false" msgid="5354221071353645263">
-      <item quantity="one">Curto (<xliff:g id="CLICK_DELAY_LABEL_0">%1$s</xliff:g> segundo)</item>
       <item quantity="other">Curto (<xliff:g id="CLICK_DELAY_LABEL_1">%1$s</xliff:g> segundos)</item>
+      <item quantity="one">Curto (<xliff:g id="CLICK_DELAY_LABEL_0">%1$s</xliff:g> segundo)</item>
     </plurals>
     <plurals name="accessibilty_autoclick_preference_subtitle_medium_delay" formatted="false" msgid="1550891909800510628">
-      <item quantity="one">Médio (<xliff:g id="CLICK_DELAY_LABEL_0">%1$s</xliff:g> segundo)</item>
       <item quantity="other">Médio (<xliff:g id="CLICK_DELAY_LABEL_1">%1$s</xliff:g> segundos)</item>
+      <item quantity="one">Médio (<xliff:g id="CLICK_DELAY_LABEL_0">%1$s</xliff:g> segundo)</item>
     </plurals>
     <plurals name="accessibilty_autoclick_preference_subtitle_long_delay" formatted="false" msgid="2230755548820485984">
-      <item quantity="one">Longo (<xliff:g id="CLICK_DELAY_LABEL_0">%1$s</xliff:g> segundo)</item>
       <item quantity="other">Longo (<xliff:g id="CLICK_DELAY_LABEL_1">%1$s</xliff:g> segundos)</item>
+      <item quantity="one">Longo (<xliff:g id="CLICK_DELAY_LABEL_0">%1$s</xliff:g> segundo)</item>
     </plurals>
     <plurals name="accessibilty_autoclick_delay_unit_second" formatted="false" msgid="4537791441118261556">
-      <item quantity="one"><xliff:g id="CLICK_DELAY_LABEL_0">%1$s</xliff:g> segundo</item>
       <item quantity="other"><xliff:g id="CLICK_DELAY_LABEL_2">%1$s</xliff:g> segundos</item>
+      <item quantity="one"><xliff:g id="CLICK_DELAY_LABEL_0">%1$s</xliff:g> segundo</item>
     </plurals>
     <string name="accessibility_vibration_summary" msgid="27904038683405084">"Toque <xliff:g id="SUMMARY_RING">%1$s</xliff:g>, notificação <xliff:g id="SUMMARY_NOTIFICATION">%2$s</xliff:g>, resposta tátil <xliff:g id="SUMMARY_TOUCH">%3$s</xliff:g>"</string>
     <string name="accessibility_vibration_summary_off" msgid="7776105450117095736">"Toque e notificação definidos como Desativada"</string>
@@ -2534,11 +2514,6 @@
     <string name="enable_service_title" msgid="7231533866953706788">"Permitir que o serviço <xliff:g id="SERVICE">%1$s</xliff:g> tenha controlo total sobre o seu dispositivo?"</string>
     <string name="capabilities_list_title" msgid="1225853611983394386">"<xliff:g id="SERVICE">%1$s</xliff:g> necessita de:"</string>
     <string name="touch_filtered_warning" msgid="4225815157460318241">"Uma vez que uma aplicação está a ocultar um pedido de autorização, as Definições não conseguem validar a sua resposta."</string>
-    <string name="enable_service_encryption_warning" msgid="931082737770453755">"Se ativar o <xliff:g id="SERVICE">%1$s</xliff:g>, o dispositivo não utilizará o bloqueio de ecrã para otimizar a encriptação de dados."</string>
-    <string name="secure_lock_encryption_warning" msgid="669152607190123579">"Uma vez que ativou um serviço de acessibilidade, o dispositivo não utilizará o bloqueio de ecrã para otimizar a encriptação de dados."</string>
-    <string name="enable_service_pattern_reason" msgid="6832846117817938536">"Uma vez que ligar <xliff:g id="SERVICE">%1$s</xliff:g> afeta a encriptação de dados, o utilizador tem de confirmar o seu padrão."</string>
-    <string name="enable_service_pin_reason" msgid="6040417014360237703">"Uma vez que ligar <xliff:g id="SERVICE">%1$s</xliff:g> afeta a encriptação de dados, o utilizador tem de confirmar o seu PIN."</string>
-    <string name="enable_service_password_reason" msgid="6962544350351734238">"Uma vez que ligar <xliff:g id="SERVICE">%1$s</xliff:g> afeta a encriptação de dados, o utilizador tem de confirmar a sua palavra-passe."</string>
     <string name="accessibility_service_warning" msgid="6779187188736432618">"O serviço <xliff:g id="SERVICE">%1$s</xliff:g> está a solicitar o controlo total deste dispositivo. O serviço pode ler o ecrã e agir em nome de utilizadores com necessidades de acessibilidade. Este nível de controlo não é adequado para a maioria das aplicações."</string>
     <string name="accessibility_service_warning_description" msgid="6573203795976134751">"O controlo total é adequado para aplicações que ajudam nas necessidades de acessibilidade, mas não para a maioria das aplicações."</string>
     <string name="accessibility_service_screen_control_title" msgid="324795030658109870">"Ver e controlar o ecrã"</string>
@@ -2577,12 +2552,12 @@
     <string name="print_settings" msgid="8519810615863882491">"Impressão"</string>
     <string name="print_settings_summary_no_service" msgid="6721731154917653862">"Desativado"</string>
     <plurals name="print_settings_summary" formatted="false" msgid="1034273609054146099">
-      <item quantity="one">1 serviço de impressão ativado</item>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> serviços de impressão ativados</item>
+      <item quantity="one">1 serviço de impressão ativado</item>
     </plurals>
     <plurals name="print_jobs_summary" formatted="false" msgid="3933688846338306536">
-      <item quantity="one">1 tarefa de impressão</item>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> tarefas de impressão</item>
+      <item quantity="one">1 tarefa de impressão</item>
     </plurals>
     <string name="print_settings_title" msgid="7680498284751129935">"Serviços de impressão"</string>
     <string name="print_no_services_installed" msgid="7554057966540602692">"Nenhum serviço instalado"</string>
@@ -2689,24 +2664,24 @@
     <string name="battery_tip_dialog_message" product="device" msgid="3896805213768863874">"Uma vez que tem utilizado o dispositivo mais do que o habitual, pode ficar sem bateria mais cedo do que o esperado.\n\nApps que utilizam mais bateria:"</string>
     <string name="battery_tip_dialog_message_footer" msgid="986542164372177504">"Inclui atividade em segundo plano de potência elevada"</string>
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="3108195491484891588">
-      <item quantity="one">Restringir %1$d app</item>
       <item quantity="other">Restringir %1$d apps</item>
+      <item quantity="one">Restringir %1$d app</item>
     </plurals>
     <plurals name="battery_tip_restrict_handled_title" formatted="false" msgid="5862649927574803958">
-      <item quantity="one">%1$s aplicação restringida recentemente</item>
       <item quantity="other">%2$d aplicações restringidas recentemente</item>
+      <item quantity="one">%1$s aplicação restringida recentemente</item>
     </plurals>
     <plurals name="battery_tip_restrict_summary" formatted="false" msgid="3328499737453686910">
-      <item quantity="one">%1$s aplicação tem uma utilização elevada da bateria em segundo plano.</item>
       <item quantity="other">%2$d aplicações têm uma utilização elevada da bateria em segundo plano.</item>
+      <item quantity="one">%1$s aplicação tem uma utilização elevada da bateria em segundo plano.</item>
     </plurals>
     <plurals name="battery_tip_restrict_handled_summary" formatted="false" msgid="3036853535034350991">
-      <item quantity="one">Não é possível executar esta aplicação em segundo plano.</item>
       <item quantity="other">Não é possível executar estas aplicações em segundo plano.</item>
+      <item quantity="one">Não é possível executar esta aplicação em segundo plano.</item>
     </plurals>
     <plurals name="battery_tip_restrict_app_dialog_title" formatted="false" msgid="7897944678619251740">
-      <item quantity="one">Restringir a app?</item>
       <item quantity="other">Restringir %1$d aplicações?</item>
+      <item quantity="one">Restringir a app?</item>
     </plurals>
     <string name="battery_tip_restrict_app_dialog_message" msgid="137856003724730751">"Para poupar bateria, impeça que a aplicação <xliff:g id="APP">%1$s</xliff:g> consuma bateria em segundo plano. Esta aplicação poderá não funcionar corretamente e as notificações poderão sofrer atrasos."</string>
     <string name="battery_tip_restrict_apps_less_than_5_dialog_message" msgid="5894648804112181324">"Para poupar bateria, impeça estas aplicações de consumir bateria em segundo plano. As aplicações restringidas poderão não funcionar corretamente e as notificações poderão sofrer atrasos.\n\nApps:"</string>
@@ -2725,8 +2700,8 @@
     <string name="smart_battery_footer" msgid="8407121907452993645">"Quando o Battery Manager deteta a existência de aplicações a consumir a bateria rapidamente, tem a opção de restringir estas aplicações. As aplicações restringidas poderão não funcionar corretamente e as notificações poderão sofrer atrasos."</string>
     <string name="restricted_app_title" msgid="6585080822121007436">"Apps restritas"</string>
     <plurals name="restricted_app_summary" formatted="false" msgid="6059772951505411003">
-      <item quantity="one">Limitar a utilização da bateria para %1$d app</item>
       <item quantity="other">Limiar a utilização da bateria para %1$d apps</item>
+      <item quantity="one">Limitar a utilização da bateria para %1$d app</item>
     </plurals>
     <string name="restricted_app_time_summary" msgid="3097721884155913252">"Restrita <xliff:g id="TIME">%1$s</xliff:g>."</string>
     <string name="restricted_app_detail_footer" msgid="3495725286882138803">"A utilização da bateria em segundo plano é restrita nestas apps. Podem não funcionar conforme esperado e as notificações podem sofrer atrasos."</string>
@@ -2736,8 +2711,8 @@
     <string name="battery_manager_summary_unsupported" msgid="7334173707292807964">"Detetar quando as apps consomem rapidamente a bateria"</string>
     <string name="battery_manager_off" msgid="673547668722420924">"Desativado"</string>
     <plurals name="battery_manager_app_restricted" formatted="false" msgid="6714534362166394848">
-      <item quantity="one">%1$d app restrita</item>
       <item quantity="other">%1$d apps restritas</item>
+      <item quantity="one">%1$d app restrita</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small><font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
     <string name="battery_missing_message" msgid="400958471814422770">"Ocorreu um problema ao ler o medidor da bateria."</string>
@@ -3003,8 +2978,8 @@
     <string name="remove_credential_management_app_dialog_title" msgid="5713525435104706772">"Pretende remover esta app?"</string>
     <string name="remove_credential_management_app_dialog_message" msgid="7739474298063646935">"Esta app não gere certificados, mas permanece no dispositivo. Quaisquer certificados instalados pela app serão desinstalados."</string>
     <plurals name="number_of_urls" formatted="false" msgid="403979258551655023">
-      <item quantity="one"><xliff:g id="NUMBER_0">%d</xliff:g> URL</item>
       <item quantity="other"><xliff:g id="NUMBER_1">%d</xliff:g> URLs</item>
+      <item quantity="one"><xliff:g id="NUMBER_0">%d</xliff:g> URL</item>
     </plurals>
     <string name="emergency_tone_title" msgid="6673118505206685168">"Sinal para marcação de emergência"</string>
     <string name="emergency_tone_summary" msgid="2519776254708767388">"Definir o comportamento quando é efetuada uma chamada de emergência"</string>
@@ -3051,8 +3026,8 @@
     <string name="notification_history_snooze" msgid="3980568893290512257">"Suspensas"</string>
     <string name="notification_history_dismiss" msgid="6180321217375722918">"Ignoradas recentemente"</string>
     <plurals name="notification_history_count" formatted="false" msgid="1859304685071321991">
-      <item quantity="one"><xliff:g id="NUMBER_0">%d</xliff:g> notificação</item>
       <item quantity="other"><xliff:g id="NUMBER_1">%d</xliff:g> notificações</item>
+      <item quantity="one"><xliff:g id="NUMBER_0">%d</xliff:g> notificação</item>
     </plurals>
     <string name="sound_category_call_ringtone_vibrate_title" msgid="9090693401915654528">"Toque e vibração das chamadas"</string>
     <string name="wifi_setup_detail" msgid="2012898800571616422">"Detalhes da rede"</string>
@@ -3103,14 +3078,6 @@
     <string name="remove_account_failed" msgid="3709502163548900644">"O gestor não permite esta alteração"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"Não é possível sincronizar manualmente"</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"A sincronização deste item está atualmente desativada. Para alterar esta definição, ative temporariamente os dados de segundo plano e a sincronização automática."</string>
-    <string name="enter_password" msgid="6327051330258595331">"Para iniciar o Android, introduza a palavra-passe"</string>
-    <string name="enter_pin" msgid="1029287617551232681">"Para iniciar o Android, introduza o PIN"</string>
-    <string name="enter_pattern" msgid="1747316785866742960">"Para iniciar o Android, desenhe o padrão"</string>
-    <string name="cryptkeeper_wrong_pattern" msgid="340747269176120242">"Padrão incorreto"</string>
-    <string name="cryptkeeper_wrong_password" msgid="7295607881887114486">"Palavra-passe incorreta"</string>
-    <string name="cryptkeeper_wrong_pin" msgid="2347961593970714201">"PIN incorreto"</string>
-    <string name="checking_decryption" msgid="6111642972615688237">"A verificar…"</string>
-    <string name="starting_android" msgid="6694154070215356186">"A iniciar o Android..."</string>
     <string name="delete" msgid="8330605554706263775">"Eliminar"</string>
     <string name="misc_files" msgid="6598066985800749585">"Ficheiros diversos"</string>
     <string name="misc_files_selected_count" msgid="5597802791672749532">"selecionado(s) <xliff:g id="NUMBER">%1$d</xliff:g> de <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -3206,8 +3173,6 @@
     <string name="data_usage_metered_yes" msgid="4262598072030135223">"Acesso limitado"</string>
     <string name="data_usage_metered_no" msgid="1685828958417926268">"Acesso ilimitado"</string>
     <string name="data_usage_disclaimer" msgid="3271450299386176770">"A contagem de dados do operador pode ser diferente da do seu dispositivo."</string>
-    <string name="cryptkeeper_emergency_call" msgid="8369322820475703306">"Chamada de emergência"</string>
-    <string name="cryptkeeper_return_to_call" msgid="3857250752781151232">"Regressar à chamada"</string>
     <string name="vpn_name" msgid="3806456074909253262">"Nome"</string>
     <string name="vpn_type" msgid="5533202873260826663">"Tipo"</string>
     <string name="vpn_server" msgid="2908816134941973935">"Endereço do servidor"</string>
@@ -3302,21 +3267,21 @@
     <string name="ssl_ca_cert_warning" msgid="3898387588657346106">"A rede pode ser monitorizada"</string>
     <string name="done_button" msgid="6269449526248267">"Concluído"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="5491460811755938449">
-      <item quantity="one">Confiar ou remover o certificado</item>
       <item quantity="other">Confiar ou remover os certificados</item>
+      <item quantity="one">Confiar ou remover o certificado</item>
     </plurals>
     <plurals name="ssl_ca_cert_info_message_device_owner" formatted="false" msgid="2788832560436163252">
-      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> instalou uma autoridade de certificação no seu dispositivo que pode permitir monitorizar a atividade na rede do dispositivo, incluindo emails, aplicações e Websites seguros.\n\nPara mais informações acerca deste certificado, contacte o gestor.</item>
       <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> instalou autoridades de certificação no seu dispositivo que podem permitir monitorizar a atividade na rede do dispositivo, incluindo emails, aplicações e Websites seguros.\n\nPara mais informações acerca destes certificados, contacte o gestor.</item>
+      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> instalou uma autoridade de certificação no seu dispositivo que pode permitir monitorizar a atividade na rede do dispositivo, incluindo emails, aplicações e Websites seguros.\n\nPara mais informações acerca deste certificado, contacte o gestor.</item>
     </plurals>
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="3989916958347169622">
-      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> instalou uma autoridade de certificação para o seu perfil de trabalho que pode permitir monitorizar a atividade na rede de trabalho, incluindo emails, aplicações e Websites seguros.\n\nPara mais informações acerca deste certificado, contacte o gestor.</item>
       <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> instalou autoridades de certificação para o seu perfil de trabalho que podem permitir monitorizar a atividade na rede de trabalho, incluindo emails, aplicações e Websites seguros.\n\nPara mais informações acerca destes certificados, contacte o gestor.</item>
+      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> instalou uma autoridade de certificação para o seu perfil de trabalho que pode permitir monitorizar a atividade na rede de trabalho, incluindo emails, aplicações e Websites seguros.\n\nPara mais informações acerca deste certificado, contacte o gestor.</item>
     </plurals>
     <string name="ssl_ca_cert_warning_message" msgid="4374052724815563051">"A sua atividade de rede, incluindo emails, aplicações e Sites seguros, pode ser monitorizada por terceiros.\n\nIsto é possível através de uma credencial fidedigna instalada no seu dispositivo."</string>
     <plurals name="ssl_ca_cert_settings_button" formatted="false" msgid="125941406175485894">
-      <item quantity="one">Verificar certificado</item>
       <item quantity="other">Verificar certificados</item>
+      <item quantity="one">Verificar certificado</item>
     </plurals>
     <string name="user_settings_title" msgid="6550866465409807877">"Vários utilizadores"</string>
     <string name="user_settings_footer_text" product="device" msgid="7523914344521302179">"Partilhe o seu dispositivo ao adicionar novos utilizadores. Cada utilizador tem um espaço pessoal no dispositivo, onde pode guardar ecrãs principais personalizados, contas, aplicações, definições e muito mais."</string>
@@ -3377,7 +3342,7 @@
     <string name="nfc_payment_app_and_desc" msgid="2607417639227030398">"<xliff:g id="APP">%1$s</xliff:g> – <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="nfc_payment_use_default" msgid="788899906312142803">"Utilizar predefinição"</string>
     <string name="nfc_payment_favor_default" msgid="4508491832174644772">"Sempre"</string>
-    <string name="nfc_payment_favor_open" msgid="8554643344050373346">"Exceto enquanto outra app de pagamento está aberta"</string>
+    <string name="nfc_payment_favor_open" msgid="8554643344050373346">"Exceto enquanto outra app de pagamentos está aberta"</string>
     <string name="nfc_payment_pay_with" msgid="3001320460566523453">"Num terminal sem contacto, pague com:"</string>
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Como pagar num terminal"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Configure uma aplicação de pagamento. Em seguida, basta aproximar a parte de trás do telemóvel a um terminal com o símbolo de pagamento sem contacto."</string>
@@ -3496,8 +3461,8 @@
     <string name="sim_selection_channel_title" msgid="3193666315607572484">"Seleção de SIM"</string>
     <string name="dashboard_title" msgid="5660733037244683387">"Definições"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="6585075562837786847">
-      <item quantity="one">Mostrar %d item oculto</item>
       <item quantity="other">Mostrar %d itens ocultos</item>
+      <item quantity="one">Mostrar %d item oculto</item>
     </plurals>
     <string name="network_dashboard_title" msgid="788543070557731240">"Rede e Internet"</string>
     <string name="network_dashboard_summary_mobile" msgid="7750924671970583670">"Móvel, Wi‑Fi, zona Wi-Fi"</string>
@@ -3654,7 +3619,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Ativar sons"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Legendas instantâneas"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Multimédia com legendas automáticas"</string>
-    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Nenhum}=1{1 horário definido}one{# horário(s) definido(s)}other{# horários definidos}}"</string>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Nenhum}=1{1 horário definido}other{# horários definidos}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Não incomodar"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Receber notificações apenas de pessoas e apps importantes"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Limite as interrupções"</string>
@@ -3725,9 +3690,9 @@
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Ativado"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Perguntar sempre"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Até desativar"</string>
-    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 hora}one{# hora(s)}other{# horas}}"</string>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 minuto}one{# minuto(s)}other{# minutos}}"</string>
-    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Desativado}=1{Desativado/1 horário pode ser ativado automaticamente}one{Desativado/# horário(s) pode(m) ser ativado(s) automaticamente}other{Desativado/# horários podem ser ativados automaticamente}}"</string>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 hora}other{# horas}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 minuto}other{# minutos}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Desativado}=1{Desativado/1 horário pode ser ativado automaticamente}other{Desativado/# horários podem ser ativados automaticamente}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"O que pode interromper o modo Não incomodar"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Pessoas"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Apps"</string>
@@ -3874,8 +3839,8 @@
     <string name="manage_conversations" msgid="4440289604887824337">"Gerir conversas"</string>
     <string name="priority_conversation_count_zero" msgid="3862289535537564713">"Nenhuma conversa com prioridade"</string>
     <plurals name="priority_conversation_count" formatted="false" msgid="4229447176780862649">
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> conversa com prioridade</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> conversas com prioridade</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> conversa com prioridade</item>
     </plurals>
     <string name="important_conversations" msgid="1233893707189659401">"Conversas com prioridade"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"Aparecem na parte superior da secção de conversas e surgem como balões flutuantes."</string>
@@ -3917,12 +3882,12 @@
     <string name="notification_app_switch_label" msgid="4422902423925084193">"Todas as notificações da app <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
     <string name="default_notification_assistant" msgid="243718059890346442">"Notificações adaptáveis"</string>
     <plurals name="notifications_sent_daily" formatted="false" msgid="1479283620504341566">
-      <item quantity="one">~<xliff:g id="NUMBER_0">%d</xliff:g> notificação por dia</item>
       <item quantity="other">~<xliff:g id="NUMBER_1">%d</xliff:g> notificações por dia</item>
+      <item quantity="one">~<xliff:g id="NUMBER_0">%d</xliff:g> notificação por dia</item>
     </plurals>
     <plurals name="notifications_sent_weekly" formatted="false" msgid="4913443431857170519">
-      <item quantity="one">~<xliff:g id="NUMBER_0">%d</xliff:g> notificação por semana</item>
       <item quantity="other">~<xliff:g id="NUMBER_1">%d</xliff:g> notificações por semana</item>
+      <item quantity="one">~<xliff:g id="NUMBER_0">%d</xliff:g> notificação por semana</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"Nunca"</string>
     <string name="manage_notification_access_title" msgid="6481256069087219982">"Notificações do dispositivo e de apps"</string>
@@ -3930,8 +3895,8 @@
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"O acesso às notificações do perfil de trabalho está bloqueado"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"As aplicações não podem ler notificações"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
-      <item quantity="one">%d aplicação pode ler notificações</item>
       <item quantity="other">%d aplicações podem ler notificações</item>
+      <item quantity="one">%d aplicação pode ler notificações</item>
     </plurals>
     <string name="notification_assistant_title" msgid="5889201903272393099">"Notificações melhoradas"</string>
     <string name="notification_assistant_summary" msgid="1957783114840908887">"Obtenha sugestões de ações, respostas e muito mais"</string>
@@ -3992,8 +3957,8 @@
     <string name="interact_across_profiles_consent_dialog_permissions_summary" msgid="995051542847604039">"Esta app pode utilizar as autorizações da sua app pessoal <xliff:g id="NAME">%1$s</xliff:g>, como o acesso à localização, o armazenamento ou os contactos."</string>
     <string name="interact_across_profiles_number_of_connected_apps_none" msgid="8573289199942092964">"Não existem apps associadas"</string>
     <plurals name="interact_across_profiles_number_of_connected_apps" formatted="false" msgid="6991750455661974772">
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> app associada</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> apps associadas</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> app associada</item>
     </plurals>
     <string name="interact_across_profiles_install_work_app_title" msgid="2821669067014436056">"Para associar estas apps, instale a app <xliff:g id="NAME">%1$s</xliff:g> no seu perfil de trabalho"</string>
     <string name="interact_across_profiles_install_personal_app_title" msgid="4790651223324866344">"Para associar estas apps, instale a app <xliff:g id="NAME">%1$s</xliff:g> no seu perfil pessoal"</string>
@@ -4008,20 +3973,20 @@
     <string name="notification_channels" msgid="1502969522886493799">"Categorias"</string>
     <string name="notification_channels_other" msgid="18159805343647908">"Outra"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="483490958130993160">
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> categoria</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> categorias</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> categoria</item>
     </plurals>
     <string name="no_channels" msgid="4716199078612071915">"Esta aplicação não publicou notificações"</string>
     <string name="app_settings_link" msgid="6725453466705333311">"Definições adicionais na aplicação"</string>
     <string name="notification_screen_summary" msgid="5984915275134654822">"Histórico de notificações, balões, enviadas recentemente"</string>
     <string name="app_notification_listing_summary_zero" msgid="2988400013221120744">"Ativadas para todas as apps"</string>
     <plurals name="app_notification_listing_summary_others" formatted="false" msgid="1506127395400503717">
-      <item quantity="one">Desativadas para <xliff:g id="COUNT_0">%d</xliff:g> aplicação</item>
       <item quantity="other">Desativadas para <xliff:g id="COUNT_1">%d</xliff:g> aplicações</item>
+      <item quantity="one">Desativadas para <xliff:g id="COUNT_0">%d</xliff:g> aplicação</item>
     </plurals>
     <plurals name="deleted_channels" formatted="false" msgid="5963473421547029532">
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> categoria eliminada</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> categorias eliminadas</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> categoria eliminada</item>
     </plurals>
     <string name="notification_toggle_on" msgid="1624283327379059003">"Ativado"</string>
     <string name="notification_toggle_off" msgid="3295373308338024844">"Desativadas"</string>
@@ -4093,7 +4058,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Todas as conversas"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Conversas com prioridade"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Nenhuma"</string>
-    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Nenhuma}=1{1 conversa}one{# conversa(s)}other{# conversas}}"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Nenhuma}=1{1 conversa}other{# conversas}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Quem pode interromper"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Chamadas"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Chamadas"</string>
@@ -4102,7 +4067,7 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Para garantir que as chamadas permitidas emitem som, verifique se o dispositivo está definido para tocar"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"As chamadas recebidas são bloqueadas no horário \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\". Pode ajustar as definições para permitir que os seus amigos, a sua família ou outras pessoas o contactem."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Contactos com estrela"</string>
-    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Nenhum}=1{{contact_1}}=2{{contact_1} e {contact_2}}=3{{contact_1}, {contact_2} e {contact_3}}one{{contact_1}, {contact_2} e mais #}other{{contact_1}, {contact_2} e mais #}}"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Nenhum}=1{{contact_1}}=2{{contact_1} e {contact_2}}=3{{contact_1}, {contact_2} e {contact_3}}other{{contact_1}, {contact_2} e mais #}}"</string>
     <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"(Sem nome)"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Mensagens"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"mensagens"</string>
@@ -4112,7 +4077,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"Para \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\", as mensagens recebidas estão bloqueadas. Pode ajustar as definições para permitir que os seus amigos, família ou outras pessoas o contactem."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Recebe todas as mensagens"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Recebe todas as chamadas"</string>
-    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Nenhum}=1{1 contacto}one{# contacto(s)}other{# contactos}}"</string>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Nenhum}=1{1 contacto}other{# contactos}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Qualquer pessoa"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Contactos"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Contactos com estrela"</string>
@@ -4150,13 +4115,13 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Todas as notificações"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Algumas notificações"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"As pessoas selecionadas podem continuar a entrar em contacto consigo, mesmo que não permita que as apps interrompam."</string>
-    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Nenhuma app pode interromper}=1{A app {app_1} pode interromper}=2{As apps {app_1} e {app_2} podem interromper}=3{As apps {app_1}, {app_2} e {app_3} podem interromper}one{As apps {app_1}, {app_2} e mais # podem interromper}other{As apps {app_1}, {app_2} e mais # podem interromper}}"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Nenhuma app pode interromper}=1{A app {app_1} pode interromper}=2{As apps {app_1} e {app_2} podem interromper}=3{As apps {app_1}, {app_2} e {app_3} podem interromper}other{As apps {app_1}, {app_2} e mais # podem interromper}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Apps"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Todas as notificações"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Algumas notificações"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Notificações que podem interromper"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Permitir todas as notificações"</string>
-    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Nada pode interromper}=1{O som de {sound_category_1} pode interromper}=2{Os sons de {sound_category_1} e {sound_category_2} podem interromper}=3{Os sons de {sound_category_1}, {sound_category_2} e {sound_category_3} podem interromper}one{Os sons de {sound_category_1}, {sound_category_2} e mais # podem interromper}other{Os sons de {sound_category_1}, {sound_category_2} e mais # podem interromper}}"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Nada pode interromper}=1{O som de {sound_category_1} pode interromper}=2{Os sons de {sound_category_1} e {sound_category_2} podem interromper}=3{Os sons de {sound_category_1}, {sound_category_2} e {sound_category_3} podem interromper}other{Os sons de {sound_category_1}, {sound_category_2} e mais # podem interromper}}"</string>
     <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Nada pode interromper"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Ninguém pode interromper"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Algumas pessoas podem interromper"</string>
@@ -4181,12 +4146,12 @@
     <string name="zen_mode_end_time_next_day_summary_format" msgid="419683704068360804">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> do dia seguinte"</string>
     <string name="zen_mode_summary_alarms_only_indefinite" msgid="910047326128154945">"Alterar para alarmes apenas, indefinidamente"</string>
     <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="1900512966361163390">
-      <item quantity="one">Alterar para alarmes apenas durante um minuto até à(s) <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
       <item quantity="other">Alterar para alarmes apenas durante <xliff:g id="DURATION">%1$d</xliff:g> minutos (até à(s) <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Alterar para alarmes apenas durante um minuto até à(s) <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
     </plurals>
     <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="955991428001659124">
-      <item quantity="one">Alterar para alarmes apenas durante uma hora até à(s) <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
       <item quantity="other">Alterar para alarmes apenas durante <xliff:g id="DURATION">%1$d</xliff:g> horas até à(s) <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Alterar para alarmes apenas durante uma hora até à(s) <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"Alterar para alarmes apenas, até <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="722093064250082317">"Alterar para interromper sempre"</string>
@@ -4260,20 +4225,20 @@
     <string name="app_launch_add_link" msgid="8622558044530305811">"Adicionar link"</string>
     <string name="app_launch_footer" msgid="4521865035105622557">"Uma app pode validar os links para serem abertos automaticamente na app."</string>
     <plurals name="app_launch_verified_links_title" formatted="false" msgid="3945301449178587783">
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> link validado</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> links validados</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> link validado</item>
     </plurals>
     <plurals name="app_launch_verified_links_message" formatted="false" msgid="1209292155940482111">
-      <item quantity="one">Este link é validado e aberto automaticamente nesta app.</item>
       <item quantity="other">Estes links são validados e abertos automaticamente nesta app.</item>
+      <item quantity="one">Este link é validado e aberto automaticamente nesta app.</item>
     </plurals>
     <string name="app_launch_dialog_ok" msgid="1446157681861409861">"OK"</string>
     <string name="app_launch_verified_links_info_description" msgid="7514750232467132117">"Mostrar lista de links validados"</string>
     <string name="app_launch_checking_links_title" msgid="6119228853554114201">"A verificar outros links suportados…"</string>
     <string name="app_launch_dialog_cancel" msgid="6961071841814898663">"Cancelar"</string>
     <plurals name="app_launch_supported_links_title" formatted="false" msgid="8579323750839397568">
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> link suportado</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> links suportados</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> link suportado</item>
     </plurals>
     <string name="app_launch_supported_links_add" msgid="3271247750388016131">"Adicionar"</string>
     <string name="app_launch_supported_links_subtext" msgid="4268004019469184113">"Abre na app <xliff:g id="APP_LABEL">%s</xliff:g>"</string>
@@ -4297,20 +4262,20 @@
     <string name="notification_summary_level" msgid="4074326972839105652">"Nível %d"</string>
     <string name="notification_summary_channel" msgid="8459033623057872803">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> • <xliff:g id="GROUP_NAME">%2$s</xliff:g>"</string>
     <plurals name="notifications_categories_off" formatted="false" msgid="1385401442703692986">
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> categoria desativada.</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> categorias desativadas.</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> categoria desativada.</item>
     </plurals>
     <plurals name="permissions_summary" formatted="false" msgid="5015472550875144481">
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> autorização concedida</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> autorizações concedidas</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> autorização concedida</item>
     </plurals>
     <plurals name="runtime_permissions_summary" formatted="false" msgid="2091022049141391855">
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> de <xliff:g id="COUNT_1">%d</xliff:g> autorização concedida</item>
       <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> de <xliff:g id="COUNT_3">%d</xliff:g> autorizações concedidas</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> de <xliff:g id="COUNT_1">%d</xliff:g> autorização concedida</item>
     </plurals>
     <plurals name="runtime_permissions_additional_count" formatted="false" msgid="5888624648943937645">
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> permissão adicional</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> permissões adicionais</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> permissão adicional</item>
     </plurals>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="7456745929035665029">"Nenhuma permissão concedida"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7174876170116073356">"Nenhuma permissão solicitada"</string>
@@ -4319,8 +4284,8 @@
     <string name="permissions_usage_summary" msgid="6784310472062516454">"Mostrar as apps que utilizaram autorizações recentemente"</string>
     <string name="unused_apps" msgid="4566272194756830656">"Apps não utilizadas"</string>
     <plurals name="unused_apps_summary" formatted="false" msgid="3827583582750975783">
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> app não utilizada</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> apps não utilizadas</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> app não utilizada</item>
     </plurals>
     <string name="unused_apps_switch" msgid="419282628373205038">"Remover autorizações e libertar espaço"</string>
     <string name="filter_all_apps" msgid="6645539744080251371">"Todas as apps"</string>
@@ -4346,15 +4311,15 @@
     <string name="domain_urls_summary_some" msgid="1197692164421314523">"Abrir <xliff:g id="DOMAIN">%s</xliff:g> e outros URLs"</string>
     <string name="domain_urls_apps_summary_off" msgid="2534980824850890416">"Nenhum aplicação abre links compatíveis"</string>
     <plurals name="domain_urls_apps_summary_on" formatted="false" msgid="7864816862441985323">
-      <item quantity="one">Uma aplicação que abre links compatíveis</item>
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> aplicações que abrem links compatíveis</item>
+      <item quantity="one">Uma aplicação que abre links compatíveis</item>
     </plurals>
     <string name="app_link_open_always" msgid="9167065494930657503">"Permitir que a app abra links suportados"</string>
     <string name="app_link_open_ask" msgid="2422450109908936371">"Perguntar sempre"</string>
     <string name="app_link_open_never" msgid="5299808605386052350">"Não permitir que a app abra links"</string>
     <plurals name="app_link_open_always_summary" formatted="false" msgid="1816161439007251694">
-      <item quantity="one">A app refere que consegue processar <xliff:g id="COUNT_0">%d</xliff:g> link.</item>
       <item quantity="other">A app refere que consegue processar <xliff:g id="COUNT_1">%d</xliff:g> links.</item>
+      <item quantity="one">A app refere que consegue processar <xliff:g id="COUNT_0">%d</xliff:g> link.</item>
     </plurals>
     <string name="open_supported_links_footer" msgid="3188808142432787933">"A app refere que consegue processar os seguintes links:"</string>
     <string name="default_apps_title" msgid="6943471331817718664">"Predefinição"</string>
@@ -4395,12 +4360,12 @@
     <string name="show_all_apps" msgid="4490719452453223082">"Mostrar utilização total do dispositivo"</string>
     <string name="hide_extra_apps" msgid="7313907836289865123">"Mostrar utilização de apps"</string>
     <plurals name="power_high_usage_summary" formatted="false" msgid="573433136005336970">
-      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> aplicação está a apresentar um comportamento anormal</item>
       <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> aplicações estão a apresentar um comportamento anormal</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> aplicação está a apresentar um comportamento anormal</item>
     </plurals>
     <plurals name="power_high_usage_title" formatted="false" msgid="8013115866788425817">
-      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> a consumir rapidamente a bateria</item>
       <item quantity="other">Aplicações a consumir rapidamente a bateria</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> a consumir rapidamente a bateria</item>
     </plurals>
     <string name="high_power_filter_on" msgid="447849271630431531">"Não otimizada"</string>
     <string name="high_power_on" msgid="8778058701270819268">"Não otimizada"</string>
@@ -4481,8 +4446,8 @@
     <string name="free_memory" msgid="439783742246854785">"Disponível"</string>
     <string name="memory_usage_apps" msgid="5776108502569850579">"Memória utilizada pelas aplicações"</string>
     <plurals name="memory_usage_apps_summary" formatted="false" msgid="1355637088533572208">
-      <item quantity="one">1 aplicação utilizou a memória nos(as) últimos(as) <xliff:g id="DURATION_0">%2$s</xliff:g></item>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> aplicações utilizaram a memória nos(as) últimos(as) <xliff:g id="DURATION_1">%2$s</xliff:g></item>
+      <item quantity="one">1 aplicação utilizou a memória nos(as) últimos(as) <xliff:g id="DURATION_0">%2$s</xliff:g></item>
     </plurals>
     <string name="running_frequency" msgid="7260225121706316639">"Frequência"</string>
     <string name="memory_maximum_usage" msgid="2047013391595835607">"Utilização máxima"</string>
@@ -4559,8 +4524,8 @@
     <string name="data_usage_summary_format" msgid="6844301859713164522">"<xliff:g id="AMOUNT">%1$s</xliff:g> dos dados utilizados"</string>
     <string name="data_usage_wifi_format" msgid="7644390582649568117">"<xliff:g id="AMOUNT">^1</xliff:g> utilizado em Wi‑Fi"</string>
     <plurals name="notification_summary" formatted="false" msgid="7638388920823212470">
-      <item quantity="one">Desativadas para 1 aplicação</item>
       <item quantity="other">Desativadas para <xliff:g id="COUNT">%d</xliff:g> aplicações</item>
+      <item quantity="one">Desativadas para 1 aplicação</item>
     </plurals>
     <string name="notification_summary_none" msgid="9179312319023988089">"Ativadas para todas as apps"</string>
     <string name="apps_summary" msgid="4007416751775414252">"<xliff:g id="COUNT">%1$d</xliff:g> aplicações instaladas"</string>
@@ -4627,12 +4592,12 @@
     <string name="suggestions_summary" msgid="1709710458908440469">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="suggestions_more_title" msgid="240124526378997009">"Mais <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <plurals name="suggestions_collapsed_title" formatted="false" msgid="5023679825210836444">
-      <item quantity="one">1 sugestão</item>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> sugestões</item>
+      <item quantity="one">1 sugestão</item>
     </plurals>
     <plurals name="suggestions_collapsed_summary" formatted="false" msgid="3789011332018516832">
-      <item quantity="one">Mais 1 sugestão</item>
       <item quantity="other">Mais <xliff:g id="COUNT">%1$d</xliff:g> sugestões</item>
+      <item quantity="one">Mais 1 sugestão</item>
     </plurals>
     <string name="suggestion_remove" msgid="6753986344585367776">"Remover"</string>
     <string name="color_temperature" msgid="8256912135746305176">"Temperatura da cor fria"</string>
@@ -4660,8 +4625,8 @@
     <string name="billing_cycle_fragment_summary" msgid="6346655500491631357">"Mensalmente no dia <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="network_restrictions" msgid="8385824604048229846">"Restrições de rede"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="3875128958788008975">
-      <item quantity="one">1 restrição</item>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> restrições</item>
+      <item quantity="one">1 restrição</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"A contagem de dados do operador pode ser diferente da contagem do dispositivo"</string>
     <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Exclui dados utilizados por redes de operadores"</string>
@@ -4675,8 +4640,8 @@
     <string name="configure" msgid="1499586749829665889">"Configurar"</string>
     <string name="data_usage_other_apps" msgid="5649047093607329537">"Outras aplicações incluídas na utilização"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="3316296488378947221">
-      <item quantity="one">1 aplicação autorizada a utilizar dados sem restrições quando a Poupança de dados está ativada</item>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> aplicações autorizadas a utilizar dados sem restrições quando a Poupança de dados está ativada</item>
+      <item quantity="one">1 aplicação autorizada a utilizar dados sem restrições quando a Poupança de dados está ativada</item>
     </plurals>
     <string name="data_usage_title" msgid="4039024073687469094">"Dados principais"</string>
     <string name="data_usage_wifi_title" msgid="1060495519280456926">"Dados de Wi-Fi"</string>
@@ -4687,8 +4652,8 @@
     <string name="data_usage_chart_brief_content_description" msgid="5548074070258881530">"Gráfico que mostra a utilização de dados entre <xliff:g id="START_DATE">%1$s</xliff:g> e <xliff:g id="END_DATE">%2$s</xliff:g>."</string>
     <string name="data_usage_chart_no_data_content_description" msgid="5481968839079467231">"Não existem dados para este intervalo de datas."</string>
     <plurals name="billing_cycle_days_left" formatted="false" msgid="661792524671718753">
-      <item quantity="one">%d dia restante</item>
       <item quantity="other">%d dias restantes</item>
+      <item quantity="one">%d dia restante</item>
     </plurals>
     <string name="billing_cycle_none_left" msgid="1694844019159277504">"Sem tempo restante"</string>
     <string name="billing_cycle_less_than_one_day_left" msgid="1210202399053992163">"Resta menos de 1 dia."</string>
@@ -4760,12 +4725,10 @@
     <string name="overlay_toast_failed_to_apply" msgid="4839587811338164960">"Falha ao aplicar a sobreposição."</string>
     <string name="special_access" msgid="1767980727423395147">"Acesso especial a apps"</string>
     <plurals name="special_access_summary" formatted="false" msgid="4995506406763570815">
-      <item quantity="one">1 app pode utilizar dados sem restrições</item>
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> apps podem utilizar dados sem restrições</item>
+      <item quantity="one">1 app pode utilizar dados sem restrições</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"Veja mais"</string>
-    <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"Pretende mesmo limpar os dados do utilizador e converter para a encriptação de ficheiros?"</string>
-    <string name="button_confirm_convert_fbe" msgid="339648921918438106">"Limpar e converter"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"Repor o limite de taxa do ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"O limite de taxa do ShortcutManager foi reposto"</string>
     <string name="notification_suggestion_title" msgid="6309263655965785411">"Controlar as informações no ecrã de bloqueio"</string>
@@ -4800,16 +4763,16 @@
     <string name="cross_profile_calendar_title" msgid="7570277841490216947">"Calendário de vários perfis"</string>
     <string name="cross_profile_calendar_summary" msgid="8856185206722860069">"Mostrar eventos de trabalho no calendário pessoal"</string>
     <plurals name="hours" formatted="false" msgid="1853396353451635458">
-      <item quantity="one">1 hora</item>
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> horas</item>
+      <item quantity="one">1 hora</item>
     </plurals>
     <plurals name="minutes" formatted="false" msgid="6244503272924425418">
-      <item quantity="one">1 minuto</item>
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minutos</item>
+      <item quantity="one">1 minuto</item>
     </plurals>
     <plurals name="seconds" formatted="false" msgid="4237020272336995370">
-      <item quantity="one">1 segundo</item>
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> segundos</item>
+      <item quantity="one">1 segundo</item>
     </plurals>
     <string name="automatic_storage_manager_settings" msgid="519158151463974656">"Gerir o armazenamento"</string>
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"Para ajudar a libertar espaço de armazenamento, o gestor de armazenamento remove cópias de segurança de fotos e vídeos do dispositivo."</string>
@@ -4939,16 +4902,16 @@
     <string name="enterprise_privacy_enterprise_installed_packages" msgid="9114143640515900082">"Apps instaladas"</string>
     <string name="enterprise_privacy_apps_count_estimation_info" msgid="7959907857710107792">"O número de aplicações é uma estimativa. Pode não incluir as aplicações instaladas fora da Play Store."</string>
     <plurals name="enterprise_privacy_number_packages_lower_bound" formatted="false" msgid="5403847001419529018">
-      <item quantity="one">No mínimo, <xliff:g id="COUNT_0">%d</xliff:g> aplicação</item>
       <item quantity="other">No mínimo, <xliff:g id="COUNT_1">%d</xliff:g> aplicações</item>
+      <item quantity="one">No mínimo, <xliff:g id="COUNT_0">%d</xliff:g> aplicação</item>
     </plurals>
     <string name="enterprise_privacy_location_access" msgid="8023838718108456971">"Autoriz. de Localização"</string>
     <string name="enterprise_privacy_microphone_access" msgid="7242958026470143653">"Autorizações do microfone"</string>
     <string name="enterprise_privacy_camera_access" msgid="7685460535880069016">"Autorizações da câmara"</string>
     <string name="enterprise_privacy_enterprise_set_default_apps" msgid="7498546659083996300">"Apps predefinidas"</string>
     <plurals name="enterprise_privacy_number_packages" formatted="false" msgid="8568544906431825430">
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> aplicação</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> aplicações</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> aplicação</item>
     </plurals>
     <string name="enterprise_privacy_input_method" msgid="3278314982700662246">"Teclado predefinido"</string>
     <string name="enterprise_privacy_input_method_name" msgid="2974859490559054584">"Definido como <xliff:g id="APP_LABEL">%s</xliff:g>"</string>
@@ -4960,16 +4923,16 @@
     <string name="enterprise_privacy_ca_certs_personal" msgid="1516422660828485795">"Credenciais fidedignas no seu perfil pessoal"</string>
     <string name="enterprise_privacy_ca_certs_work" msgid="4318941788592655561">"Credenciais fidedignas no seu perfil de trabalho"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="6459725295322004179">
-      <item quantity="one">No mínimo, <xliff:g id="COUNT_0">%d</xliff:g> certificado da AC</item>
       <item quantity="other">No mínimo, <xliff:g id="COUNT_1">%d</xliff:g> certificados da AC</item>
+      <item quantity="one">No mínimo, <xliff:g id="COUNT_0">%d</xliff:g> certificado da AC</item>
     </plurals>
     <string name="enterprise_privacy_lock_device" msgid="464054894363899866">"O gestor pode bloquear o dispositivo e repor a palavra-passe"</string>
     <string name="enterprise_privacy_wipe_device" msgid="869589182352244591">"O gestor pode eliminar todos os dados do dispositivo"</string>
     <string name="enterprise_privacy_failed_password_wipe_device" msgid="7045164901334821226">"Tentativas de introdução da palavra-passe falhadas antes da eliminação de todos os dados do dispositivo"</string>
     <string name="enterprise_privacy_failed_password_wipe_work" msgid="2537582942554484170">"Tentativas de introdução da palavra-passe falhadas antes da eliminação de todos os dados do perfil de trabalho"</string>
     <plurals name="enterprise_privacy_number_failed_password_wipe" formatted="false" msgid="8811973918944217791">
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> tentativa</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> tentativas</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> tentativa</item>
     </plurals>
     <string name="do_disclosure_generic" msgid="3067459392402324538">"Este dispositivo é gerido pela sua entidade."</string>
     <string name="do_disclosure_with_name" msgid="867544298924410766">"Este dispositivo é gerido por <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
@@ -4984,19 +4947,19 @@
     <string name="financed_privacy_failed_password_wipe_device" msgid="8777230427603977667">"Tentativas de introdução da palavra-passe falhadas antes da eliminação dos dados do dispositivo"</string>
     <string name="financed_privacy_header" msgid="7215645340918406124">"O seu fornecedor de crédito pode alterar as definições e instalar software neste dispositivo.\n\nPara saber mais, contacte o seu fornecedor de crédito."</string>
     <plurals name="default_camera_app_title" formatted="false" msgid="8112432929729136399">
-      <item quantity="one">Aplicação de câmara</item>
       <item quantity="other">Aplicações de câmara</item>
+      <item quantity="one">Aplicação de câmara</item>
     </plurals>
     <string name="default_calendar_app_title" msgid="1870095225089706093">"Aplicação de calendário"</string>
     <string name="default_contacts_app_title" msgid="7740028900741944569">"Aplicação de contactos"</string>
     <plurals name="default_email_app_title" formatted="false" msgid="8338194872609410234">
-      <item quantity="one">Aplicação de cliente de email</item>
       <item quantity="other">Aplicações de cliente de email</item>
+      <item quantity="one">Aplicação de cliente de email</item>
     </plurals>
     <string name="default_map_app_title" msgid="7569231732944853320">"Aplicação de mapas"</string>
     <plurals name="default_phone_app_title" formatted="false" msgid="4222188821845826493">
-      <item quantity="one">Aplicação de telefone</item>
       <item quantity="other">Aplicações de telefone</item>
+      <item quantity="one">Aplicação de telefone</item>
     </plurals>
     <string name="app_names_concatenation_template_2" msgid="8320181646458855457">"<xliff:g id="FIRST_APP_NAME">%1$s</xliff:g>, <xliff:g id="SECOND_APP_NAME">%2$s</xliff:g>"</string>
     <string name="app_names_concatenation_template_3" msgid="7019703249717854148">"<xliff:g id="FIRST_APP_NAME">%1$s</xliff:g>, <xliff:g id="SECOND_APP_NAME">%2$s</xliff:g>, <xliff:g id="THIRD_APP_NAME">%3$s</xliff:g>"</string>
@@ -5032,8 +4995,8 @@
     <string name="autofill_app" msgid="7595308061826307921">"Preenchimento automático"</string>
     <string name="autofill_passwords" msgid="6708057251459761083">"Palavras-passe"</string>
     <plurals name="autofill_passwords_count" formatted="false" msgid="7715009165029452622">
-      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> palavra-passe</item>
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> palavras-passe</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> palavra-passe</item>
     </plurals>
     <string name="autofill_keywords" msgid="8598763328489346438">"automático, preenchimento, preenchimento automático, palavra-passe"</string>
     <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;Certifique-se de que confia nesta app&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=O Preenchimento automático do Google&gt;%1$s&lt;/xliff:g&gt; utiliza o que está no ecrã para determinar o que pode ser preenchido automaticamente."</string>
@@ -5212,8 +5175,8 @@
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Perguntar sempre"</string>
     <string name="mobile_network_summary_add_a_network" msgid="9079866102827526779">"Adicionar uma rede"</string>
     <plurals name="mobile_network_summary_count" formatted="false" msgid="5173633860800230925">
-      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> SIM</item>
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> SIMs</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> SIM</item>
     </plurals>
     <string name="default_for_calls" msgid="2788950217176988034">"Predefinição para chamadas"</string>
     <string name="default_for_sms" msgid="1316988329407434771">"Predefinição para SMS"</string>
@@ -5292,6 +5255,7 @@
     <string name="sim_action_yes" msgid="8076556020131395515">"Sim"</string>
     <string name="sim_action_reboot" msgid="3508948833333441538">"Reiniciar"</string>
     <string name="sim_action_no_thanks" msgid="435717748384544195">"Não, obrigado"</string>
+    <string name="sim_action_cancel" msgid="2668099867029610910">"Cancelar"</string>
     <string name="sim_switch_button" msgid="1405772571706095387">"Mudar"</string>
     <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Não é possível ativar o SIM"</string>
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Remova o SIM e insira-o novamente. Se o problema continuar, reinicie o dispositivo."</string>
@@ -5306,7 +5270,7 @@
     <string name="dsds_notification_after_suw_title" msgid="3738898232310273982">"Configure o seu outro SIM"</string>
     <string name="dsds_notification_after_suw_text" msgid="1287357774676361084">"Escolha o SIM ativo ou utilize 2 SIMs em simultâneo."</string>
     <string name="choose_sim_title" msgid="4804689675237716286">"Escolha um número para utilizar"</string>
-    <string name="choose_sim_text" msgid="4356662002583501647">"{count,plural, =1{Está disponível 1 número neste dispositivo, mas apenas pode utilizar um de cada vez}=2{Estão disponíveis 2 números neste dispositivo, mas apenas pode utilizar um de cada vez}one{Está(ão) disponível(is) # número(s) neste dispositivo, mas apenas pode utilizar um de cada vez}other{Estão disponíveis # números neste dispositivo, mas apenas pode utilizar um de cada vez}}"</string>
+    <string name="choose_sim_text" msgid="4356662002583501647">"{count,plural, =1{Está disponível 1 número neste dispositivo, mas apenas pode utilizar um de cada vez}=2{Estão disponíveis 2 números neste dispositivo, mas apenas pode utilizar um de cada vez}other{Estão disponíveis # números neste dispositivo, mas apenas pode utilizar um de cada vez}}"</string>
     <string name="choose_sim_activating" msgid="9035902671985449448">"A ativar<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
     <string name="choose_sim_could_not_activate" msgid="2154564459842291617">"Não foi possível ativar neste momento"</string>
     <string name="choose_sim_item_summary_unknown" msgid="7854314795485227568">"Número desconhecido"</string>
@@ -5360,13 +5324,13 @@
     <string name="permission_bar_chart_title" msgid="2493212904955611441">"Utilização das autorizações nas últimas 24 horas"</string>
     <string name="permission_bar_chart_details" msgid="5816698018592357088">"Ver tudo no painel de controlo"</string>
     <plurals name="permission_bar_chart_label" formatted="false" msgid="4853396794340896078">
-      <item quantity="one">1 aplicação</item>
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> aplicações</item>
+      <item quantity="one">1 aplicação</item>
     </plurals>
     <string name="accessibility_usage_title" msgid="9190967143518779145">"Utilização da acessibilidade"</string>
     <plurals name="accessibility_usage_summary" formatted="false" msgid="6910643986958263005">
-      <item quantity="one">1 aplicação tem acesso total ao seu dispositivo.</item>
       <item quantity="other"><xliff:g id="SERVICE_COUNT">%1$d</xliff:g> aplicações têm acesso total ao seu dispositivo.</item>
+      <item quantity="one">1 aplicação tem acesso total ao seu dispositivo.</item>
     </plurals>
     <string name="media_output_panel_title" msgid="5920946795078065159">"Saída do interruptor"</string>
     <string name="media_output_panel_summary_of_playing_device" msgid="6998758947764222915">"A reproduzir atualmente no dispositivo <xliff:g id="DEVICE_NAME">%1$s</xliff:g>…"</string>
@@ -5444,6 +5408,10 @@
     <string name="cached_apps_freezer" msgid="1057519579761550350">"Suspenda a execução para as apps em cache"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"Permitir sobreposições de ecrãs nas Definições"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Permita que as apps que se podem sobrepor a outras apps se sobreponham a ecrãs de Definições"</string>
+    <!-- no translation found for allow_mock_modem (3832264806530479214) -->
+    <skip />
+    <!-- no translation found for allow_mock_modem_summary (9097416612748005374) -->
+    <skip />
     <string name="media_controls_title" msgid="403271085636252597">"Multimédia"</string>
     <string name="media_controls_resume_title" msgid="855076860336652370">"Fixar leitor de multimédia"</string>
     <string name="media_controls_resume_description" msgid="3163482266454802097">"Para retomar rapidamente a reprodução, o leitor de multimédia mantém-se aberto nas Definições rápidas"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 74f40f9..552f730 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -142,10 +142,11 @@
     <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"Permita que seu dispositivo se comunique com dispositivos Bluetooth nas proximidades"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"Permite que seu smartphone se comunique com dispositivos Bluetooth nas proximidades"</string>
     <string name="bluetooth_disable_a2dp_hw_offload" msgid="5942913792817797541">"Desativar descarga de hardware Bluetooth A2DP"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="8610420176339657720">"Reiniciar?"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8333029144800835996">"Reinicie o dispositivo para alterar essa configuração."</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="3488695418187553566">"Reiniciar"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="4930826928585464191">"Cancelar"</string>
+    <string name="bluetooth_disable_le_audio_hw_offload" msgid="3966022676505972908">"Desativar descarga de hardware Bluetooth LE AUDIO"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_title" msgid="6001142380445276918">"Reiniciar dispositivo?"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_message" msgid="1524373895333698779">"Reinicie o dispositivo para mudar essa configuração."</string>
+    <string name="bluetooth_disable_hw_offload_dialog_confirm" msgid="5594859658551707592">"Reiniciar"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel" msgid="3663690305043973720">"Cancelar"</string>
     <string name="connected_device_media_device_title" msgid="3783388247594566734">"Dispositivos portáteis de mídia"</string>
     <string name="connected_device_call_device_title" msgid="88732390601723608">"Dispositivos de chamada"</string>
     <string name="connected_device_other_device_title" msgid="4652120430615729193">"Outros dispositivos"</string>
@@ -309,9 +310,9 @@
     <string name="security_settings_title" msgid="6710768415432791970">"Segurança"</string>
     <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"Criptografia e credenciais"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"Smartphone criptografado"</string>
-    <string name="decryption_settings_summary" product="default" msgid="1742645256103613503">"O smartphone não está criptografado"</string>
+    <string name="not_encrypted_summary" product="default" msgid="2251945842585788254">"O smartphone não está criptografado"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"Dispositivo criptografado"</string>
-    <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"Dispositivo não criptografado"</string>
+    <string name="not_encrypted_summary" product="tablet" msgid="2374263654698719382">"Dispositivo não criptografado"</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"Tela de bloqueio"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"O que mostrar"</string>
     <string name="security_settings_summary" msgid="1627059516127354233">"Definir Meu local, desbloqueio de tela, bloqueio do chip e do armazenamento de credenciais"</string>
@@ -570,37 +571,10 @@
     <string name="fingerprint_last_delete_message" msgid="7860374760549404410">"Não será possível usar a impressão digital para desbloquear o smartphone ou confirmar sua identidade em apps."</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="4104208067277655068">"Não será possível usar a impressão digital para desbloquear seu perfil de trabalho, autorizar compras ou fazer login em apps de trabalho."</string>
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"Sim, remover"</string>
-    <string name="crypt_keeper_settings_title" msgid="4938812137822100044">"Criptografia"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"Criptografar tablet"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"Criptografar smartphone"</string>
-    <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"Criptografado"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"Você pode criptografar suas contas, configurações, apps transferidos e seus dados, mídia e outros arquivos. Após criptografar seu tablet, supondo que um bloqueio de tela tenha sido configurado (ou seja, um padrão, PIN numérico ou senha), será necessário desbloquear a tela para descriptografar o smartphone sempre que você ligá-lo. A única outra maneira de descriptografar é por meio de uma redefinição para configuração original, apagando todos os seus dados.\n\nA criptografia leva uma hora ou mais. Você deve iniciar com a bateria carregada e manter seu tablet conectado até que a criptografia seja concluída. Se você interromper o processo de criptografia, perderá alguns ou todos os seus dados."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"Você pode criptografar suas contas, configurações, apps transferidos e seus dados, mídia e outros arquivos. Após criptografar seu smartphone, supondo que um bloqueio de tela tenha sido configurado (ou seja, um padrão, PIN numérico ou senha), será necessário desbloquear a tela para descriptografar o smartphone sempre que você ligá-lo. A única outra maneira de descriptografar é por meio de uma redefinição para configuração original, apagando todos os seus dados.\n\nA criptografia leva uma hora ou mais. Você deve iniciar com a bateria carregada e manter seu smartphone conectado até que a criptografia seja concluída. Se você interromper o processo de criptografia, perderá alguns ou todos os seus dados."</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"Criptografar tablet"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"Criptografar smartphone"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"Carregue sua bateria e tente novamente."</string>
-    <string name="crypt_keeper_unplugged_text" msgid="2709721134148651329">"Conecte seu carregador e tente novamente."</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="1847280235529858357">"Não há PIN ou senha da tela de bloqueio"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="7210616262954236042">"É necessário definir um PIN ou uma senha para a tela de bloqueio antes de iniciar a criptografia."</string>
-    <string name="crypt_keeper_confirm_title" msgid="8600000209722452230">"Criptografar?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="3270587498436152259">"A operação de criptografia é irreversível e, se for interrompida, você perderá seus dados. A criptografia leva cerca de uma hora ou mais, e nesse período o tablet será reiniciado várias vezes."</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="3040428543349852419">"A operação de criptografia é irreversível e, se for interrompida, você perderá seus dados. A criptografia leva uma hora ou mais, e nesse período o telefone será reiniciado várias vezes."</string>
-    <string name="crypt_keeper_setup_title" msgid="3339725741305796680">"Criptografando"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="4417016995091289019">"Aguarde enquanto seu tablet está sendo criptografado. <xliff:g id="PERCENT">^1</xliff:g>% concluído."</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="7902355422499500352">"Aguarde enquanto seu telefone está sendo criptografado. <xliff:g id="PERCENT">^1</xliff:g>% concluído."</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="8348188415839917821">"Aguarde enquanto seu tablet é criptografado. Tempo restante: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="8556105766597855198">"Aguarde enquanto seu telefone é criptografado. Tempo restante: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="3832496715430327682">"Para desbloquear seu tablet, desligue-o e ligue-o novamente."</string>
-    <string name="crypt_keeper_force_power_cycle" product="default" msgid="5070346039522135361">"Para desbloquear seu smartphone, desligue-o e ligue-o novamente."</string>
-    <string name="crypt_keeper_warn_wipe" msgid="8104921337301750394">"Aviso: o dispositivo será apagado após mais <xliff:g id="COUNT">^1</xliff:g> tentativas fracassadas de ser desbloqueado!"</string>
-    <string name="crypt_keeper_enter_password" msgid="1274917431075529732">"Digite sua senha"</string>
-    <string name="crypt_keeper_failed_title" msgid="8173654570682244149">"Falha na criptografia"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"A criptografia foi interrompida e não pode ser concluída. Por esse motivo, os dados em seu tablet não podem ser acessados. \n\n Para continuar usando seu tablet, é necessário restaurar as configurações originais. Quando você configurar seu tablet após a restauração, poderá recuperar todos os dados que foram salvos em backup em sua Conta do Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"A criptografia foi interrompida e não pode ser concluída. Por esse motivo, os dados em seu telefone não podem mais ser acessados. \n\nPara continuar usando seu telefone, é necessário restaurar as configurações originais. Quando você configurar seu telefone após a restauração, poderá recuperar todos os dados que foram salvos em backup em sua Conta do Google."</string>
-    <string name="crypt_keeper_data_corrupt_title" msgid="5920153462176846037">"Falha na descriptografia"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"A senha digitada está correta, mas os dados estão corrompidos. \n\nPara retomar o uso do seu tablet, é necessário redefinir para as configurações originais. Quando você configurar seu tablet após a redefinição, poderá restaurar todos os dados que foram salvos em backup na sua Conta do Google."</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"A senha digitada está correta, mas os dados estão corrompidos. \n\nPara retomar o uso do seu smartphone, é necessário redefinir para as configurações originais. Quando você configurar seu smartphone após a redefinição, poderá restaurar todos os dados que foram salvos em backup na sua Conta do Google."</string>
-    <string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"Alterar o método de entrada"</string>
+    <string name="encryption_settings_title" msgid="2848716008695618360">"Criptografia"</string>
+    <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"Criptografar tablet"</string>
+    <string name="encrypt_title" product="default" msgid="7337365190988321100">"Criptografar smartphone"</string>
+    <string name="encrypted_summary" msgid="545623487587251207">"Criptografado"</string>
     <string name="suggested_lock_settings_title" msgid="7836065447159730217">"Proteger seu smartphone"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"Definir bloqueio de tela para proteger o tablet"</string>
     <string name="suggested_lock_settings_summary" product="device" msgid="8479766049078378225">"Definir bloqueio de tela para proteger o dispositivo"</string>
@@ -819,6 +793,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Talvez seja necessário digitar este PIN no outro dispositivo."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Talvez seja necessário digitar esta senha no outro dispositivo."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Para parear com:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Verifique se ele está mostrando a seguinte senha:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Confirme para parear com o conjunto coordenado"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"De:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Parear com este dispositivo?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Para parear com:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Digite no dispositivo:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>. Em seguida, pressione Voltar ou Entrar."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Permitir o acesso aos seus contatos e seu histórico de chamadas"</string>
@@ -852,6 +827,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Não foi possível conectar. Tente novamente."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Detalhes do dispositivo"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Endereço Bluetooth do dispositivo: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Endereço Bluetooth do dispositivo:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Esquecer dispositivo?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Remover associação"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Desconectar o app?"</string>
@@ -883,6 +859,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Lembrar configurações"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Número máximo de dispositivos de áudio Bluetooth conectados"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Selecione o número máximo de dispositivos de áudio Bluetooth conectados"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"Registro de depuração da pilha NFC"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Aumentar o nível de registros da pilha NFC"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Transmitir"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"espelho"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Ativar tela sem fio"</string>
@@ -1190,6 +1168,8 @@
     <string name="wifi_hotspot_maximize_compatibility_dual_ap_summary" msgid="3579549223159056533">"Ajuda outros dispositivos a encontrarem esse ponto de acesso. Maior uso da bateria."</string>
     <string name="wifi_tether_starting" msgid="8879874184033857814">"Ativando o ponto de acesso..."</string>
     <string name="wifi_tether_stopping" msgid="4416492968019409188">"Desativando o ponto de acesso..."</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_title" msgid="3089432578433978073">"Tethering indisponível"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_content" msgid="5920421547607921112">"Entre em contato com sua operadora para saber mais"</string>
     <string name="wifi_tether_enabled_subtext" msgid="5085002421099821056">"A rede <xliff:g id="NETWORK_SSID">%1$s</xliff:g> está ativa"</string>
     <string name="wifi_tether_failed_subtext" msgid="437190628041885500">"Erro de ponto de acesso Wi-Fi portátil"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7072559431286459122">"Configurar ponto de acesso Wi-Fi"</string>
@@ -2061,8 +2041,8 @@
     <string name="ask_compatibility" msgid="8388397595148476565">"Perguntar ao iniciar"</string>
     <string name="enable_compatibility" msgid="1163387233622859712">"Dimensionar app"</string>
     <string name="unknown" msgid="8192160131923461175">"Desconhecido"</string>
-    <string name="sort_order_alpha" msgid="3400680865280266582">"Classificar por nome"</string>
-    <string name="sort_order_size" msgid="7731928486199737223">"Classificar por tamanho"</string>
+    <string name="sort_order_alpha" msgid="3400680865280266582">"Ordenar por nome"</string>
+    <string name="sort_order_size" msgid="7731928486199737223">"Ordenar por tamanho"</string>
     <string name="sort_order_recent_notification" msgid="1496198895330443073">"Mais recentes"</string>
     <string name="sort_order_frequent_notification" msgid="4063700985742284794">"Mais frequentes"</string>
     <string name="show_running_services" msgid="8666008279959853318">"Mostrar serviços em exec."</string>
@@ -2124,7 +2104,7 @@
     <string name="app_ops_never_used" msgid="9038133162371204506">"(Nunca usado)"</string>
     <string name="no_default_apps" msgid="8966319676910104570">"Nenhum app padrão."</string>
     <string name="storageuse_settings_title" msgid="3125650750657988194">"Uso do armazenamento"</string>
-    <string name="storageuse_settings_summary" msgid="5001621552305431831">"Visualizar armazenamento usado pelos apps"</string>
+    <string name="storageuse_settings_summary" msgid="5001621552305431831">"Ver armazenamento usado pelos apps"</string>
     <string name="service_restarting" msgid="5104563288155809226">"Reiniciando"</string>
     <string name="cached" msgid="5379485147573438201">"Processo em segundo plano em cache"</string>
     <string name="no_running_services" msgid="9079738069349859373">"Nada em execução."</string>
@@ -2257,7 +2237,7 @@
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7268758525344468364">"Sempre permitir que <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> crie widgets e acesse os dados"</string>
     <string name="usage_stats_label" msgid="6523644917803320085">"Estatísticas de uso"</string>
     <string name="testing_usage_stats" msgid="4660643799010906365">"Estatísticas de uso"</string>
-    <string name="display_order_text" msgid="7120394778684605892">"Classificar por:"</string>
+    <string name="display_order_text" msgid="7120394778684605892">"Ordenar por:"</string>
     <string name="app_name_label" msgid="3809910527680143673">"App"</string>
     <string name="last_time_used_label" msgid="2639712813493534074">"Última utilização"</string>
     <string name="usage_time_label" msgid="9105343335151559883">"Tempo de uso"</string>
@@ -2536,11 +2516,6 @@
     <string name="enable_service_title" msgid="7231533866953706788">"Permitir que <xliff:g id="SERVICE">%1$s</xliff:g> tenha controle total do seu dispositivo?"</string>
     <string name="capabilities_list_title" msgid="1225853611983394386">"<xliff:g id="SERVICE">%1$s</xliff:g> precisa:"</string>
     <string name="touch_filtered_warning" msgid="4225815157460318241">"Como um app está ocultando uma solicitação de permissão, as configurações não podem confirmar sua resposta."</string>
-    <string name="enable_service_encryption_warning" msgid="931082737770453755">"Se <xliff:g id="SERVICE">%1$s</xliff:g> for ativado, o dispositivo não usará o bloqueio de tela para melhorar a criptografia de dados."</string>
-    <string name="secure_lock_encryption_warning" msgid="669152607190123579">"Uma vez que o serviço de acessibilidade foi ativado, seu dispositivo não usará o bloqueio de tela para melhorar a criptografia de dados."</string>
-    <string name="enable_service_pattern_reason" msgid="6832846117817938536">"A ativação do <xliff:g id="SERVICE">%1$s</xliff:g> afeta a criptografia de dados. Confirme seu padrão."</string>
-    <string name="enable_service_pin_reason" msgid="6040417014360237703">"A ativação do <xliff:g id="SERVICE">%1$s</xliff:g> afeta a criptografia de dados. Confirme seu PIN."</string>
-    <string name="enable_service_password_reason" msgid="6962544350351734238">"A ativação do <xliff:g id="SERVICE">%1$s</xliff:g> afeta a criptografia de dados. Confirme sua senha."</string>
     <string name="accessibility_service_warning" msgid="6779187188736432618">"<xliff:g id="SERVICE">%1$s</xliff:g> está solicitando controle total deste dispositivo. O serviço pode ler a tela e realizar ações em nome de usuários com necessidades especiais. Esse nível de controle não é adequado para a maioria dos apps."</string>
     <string name="accessibility_service_warning_description" msgid="6573203795976134751">"O controle total é adequado para apps que ajudam você com as necessidades de acessibilidade, mas não para a maioria dos apps."</string>
     <string name="accessibility_service_screen_control_title" msgid="324795030658109870">"Ver e controlar tela"</string>
@@ -3105,14 +3080,6 @@
     <string name="remove_account_failed" msgid="3709502163548900644">"Esta alteração não é permitida pelo administrador"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"Não é possível sincronizar manualmente"</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"A sincronização para o item está desativada no momento. Para alterar essa configuração, ative os dados de segundo plano e a sincronização automática temporariamente."</string>
-    <string name="enter_password" msgid="6327051330258595331">"Para iniciar o Android, digite sua senha"</string>
-    <string name="enter_pin" msgid="1029287617551232681">"Para iniciar o Android, digite seu PIN"</string>
-    <string name="enter_pattern" msgid="1747316785866742960">"Para iniciar o Android, desenhe seu padrão"</string>
-    <string name="cryptkeeper_wrong_pattern" msgid="340747269176120242">"Padrão incorreto"</string>
-    <string name="cryptkeeper_wrong_password" msgid="7295607881887114486">"Senha incorreta"</string>
-    <string name="cryptkeeper_wrong_pin" msgid="2347961593970714201">"PIN incorreto"</string>
-    <string name="checking_decryption" msgid="6111642972615688237">"Verificando..."</string>
-    <string name="starting_android" msgid="6694154070215356186">"Iniciando o Android..."</string>
     <string name="delete" msgid="8330605554706263775">"Excluir"</string>
     <string name="misc_files" msgid="6598066985800749585">"Arquivos variados"</string>
     <string name="misc_files_selected_count" msgid="5597802791672749532">"selecionados <xliff:g id="NUMBER">%1$d</xliff:g> de <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -3208,8 +3175,6 @@
     <string name="data_usage_metered_yes" msgid="4262598072030135223">"Limitada"</string>
     <string name="data_usage_metered_no" msgid="1685828958417926268">"Ilimitada"</string>
     <string name="data_usage_disclaimer" msgid="3271450299386176770">"O cálculo da operadora poderá ser diferente de seu dispositivo."</string>
-    <string name="cryptkeeper_emergency_call" msgid="8369322820475703306">"Chamada de emergência"</string>
-    <string name="cryptkeeper_return_to_call" msgid="3857250752781151232">"Retornar à chamada"</string>
     <string name="vpn_name" msgid="3806456074909253262">"Nome"</string>
     <string name="vpn_type" msgid="5533202873260826663">"Tipo"</string>
     <string name="vpn_server" msgid="2908816134941973935">"Endereço do servidor"</string>
@@ -4014,7 +3979,7 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> categorias</item>
     </plurals>
     <string name="no_channels" msgid="4716199078612071915">"Este app não postou nenhuma notificação"</string>
-    <string name="app_settings_link" msgid="6725453466705333311">"Configurações adicionais no app"</string>
+    <string name="app_settings_link" msgid="6725453466705333311">"Configurações avançadas no app"</string>
     <string name="notification_screen_summary" msgid="5984915275134654822">"Histórico de notificações, balões, mensagens enviadas recentemente"</string>
     <string name="app_notification_listing_summary_zero" msgid="2988400013221120744">"Ativadas para todos os apps"</string>
     <plurals name="app_notification_listing_summary_others" formatted="false" msgid="1506127395400503717">
@@ -4475,8 +4440,8 @@
     <string name="memory_details" msgid="6133226869214421347">"Detalhes"</string>
     <string name="memory_use_summary" msgid="3915964794146424142">"<xliff:g id="SIZE">%1$s</xliff:g> de memória média usada nas últimas três horas"</string>
     <string name="no_memory_use_summary" msgid="6708111974923274436">"Nenhuma memória foi usada nas últimas três horas"</string>
-    <string name="sort_avg_use" msgid="4416841047669186903">"Classificar por uso médio"</string>
-    <string name="sort_max_use" msgid="3370552820889448484">"Classificar por uso máximo"</string>
+    <string name="sort_avg_use" msgid="4416841047669186903">"Ordenar por uso médio"</string>
+    <string name="sort_max_use" msgid="3370552820889448484">"Ordenar por uso máximo"</string>
     <string name="memory_performance" msgid="5448274293336927570">"Desempenho"</string>
     <string name="total_memory" msgid="5244174393008910567">"Memória total"</string>
     <string name="average_used" msgid="690235917394070169">"Média usada (%)"</string>
@@ -4766,8 +4731,6 @@
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> apps podem usar dados ilimitados</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"Ver mais"</string>
-    <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"Quer mesmo limpar dados do usuário e converter em criptografia de arquivos?"</string>
-    <string name="button_confirm_convert_fbe" msgid="339648921918438106">"Limpar e converter…"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"Redefinir limite de taxa do ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"O limite de taxa do ShortcutManager foi redefinido"</string>
     <string name="notification_suggestion_title" msgid="6309263655965785411">"Controlar informações na tela de bloqueio"</string>
@@ -5294,6 +5257,7 @@
     <string name="sim_action_yes" msgid="8076556020131395515">"Sim"</string>
     <string name="sim_action_reboot" msgid="3508948833333441538">"Reiniciar"</string>
     <string name="sim_action_no_thanks" msgid="435717748384544195">"Agora não"</string>
+    <string name="sim_action_cancel" msgid="2668099867029610910">"Cancelar"</string>
     <string name="sim_switch_button" msgid="1405772571706095387">"Mudar"</string>
     <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Não foi possível ativar o chip"</string>
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Remova o chip e insira-o novamente. Se o problema continuar, reinicie o dispositivo."</string>
@@ -5446,6 +5410,10 @@
     <string name="cached_apps_freezer" msgid="1057519579761550350">"Suspender execução para apps em cache"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"Permitir sobreposições de tela no app Configurações"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Permitir que apps que podem ser sobrepostos a outros sejam abertos sobre telas de configuração"</string>
+    <!-- no translation found for allow_mock_modem (3832264806530479214) -->
+    <skip />
+    <!-- no translation found for allow_mock_modem_summary (9097416612748005374) -->
+    <skip />
     <string name="media_controls_title" msgid="403271085636252597">"Mídia"</string>
     <string name="media_controls_resume_title" msgid="855076860336652370">"Fixar player de mídia"</string>
     <string name="media_controls_resume_description" msgid="3163482266454802097">"Para retomar a reprodução rapidamente, o player de mídia fica aberto nas Configurações rápidas"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 229096e..68c23dd 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -143,10 +143,11 @@
     <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"Permiteți dispozitivului să comunice cu dispozitivele Bluetooth din apropiere"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"Permiteți telefonului să comunice cu dispozitivele Bluetooth din apropiere"</string>
     <string name="bluetooth_disable_a2dp_hw_offload" msgid="5942913792817797541">"Dezactivați descărcarea prin hardware cu Bluetooth A2DP"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="8610420176339657720">"Reporniți dispoz.?"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8333029144800835996">"Trebuie să reporniți dispozitivul pentru a modifica setarea."</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="3488695418187553566">"Reporniți"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="4930826928585464191">"Anulați"</string>
+    <string name="bluetooth_disable_le_audio_hw_offload" msgid="3966022676505972908">"Dezactivați descărcarea prin hardware cu Bluetooth LE AUDIO"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_title" msgid="6001142380445276918">"Reporniți dispozitivul?"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_message" msgid="1524373895333698779">"Trebuie să reporniți dispozitivul pentru a modifica setarea."</string>
+    <string name="bluetooth_disable_hw_offload_dialog_confirm" msgid="5594859658551707592">"Reporniți"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel" msgid="3663690305043973720">"Anulați"</string>
     <string name="connected_device_media_device_title" msgid="3783388247594566734">"Dispozitive media"</string>
     <string name="connected_device_call_device_title" msgid="88732390601723608">"Dispozitive de apel"</string>
     <string name="connected_device_other_device_title" msgid="4652120430615729193">"Alte dispozitive"</string>
@@ -312,9 +313,9 @@
     <string name="security_settings_title" msgid="6710768415432791970">"Securitate"</string>
     <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"Criptare și date de conectare"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"Telefon criptat"</string>
-    <string name="decryption_settings_summary" product="default" msgid="1742645256103613503">"Telefonul nu este criptat"</string>
+    <string name="not_encrypted_summary" product="default" msgid="2251945842585788254">"Telefonul nu este criptat"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"Dispozitiv criptat"</string>
-    <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"Dispozitivul nu este criptat"</string>
+    <string name="not_encrypted_summary" product="tablet" msgid="2374263654698719382">"Dispozitivul nu este criptat"</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"Ecran de blocare"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"Ce se afișează"</string>
     <string name="security_settings_summary" msgid="1627059516127354233">"Setați Locația mea, deblocarea ecranului, blocarea cardului SIM, blocarea stocării acreditărilor"</string>
@@ -574,37 +575,10 @@
     <string name="fingerprint_last_delete_message" msgid="7860374760549404410">"Nu veți putea să folosiți amprenta pentru a vă debloca telefonul sau pentru a vă confirma identitatea în aplicații."</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="4104208067277655068">"Nu veți putea să folosiți amprenta ca să deblocați profilul de serviciu, să autorizați achiziții sau să vă conectați la aplicațiile pentru lucru."</string>
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"Da, eliminați"</string>
-    <string name="crypt_keeper_settings_title" msgid="4938812137822100044">"Criptare"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"Criptați tableta"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"Criptați telefonul"</string>
-    <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"Criptat"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"Puteți să vă criptați conturile, setările, aplicațiile descărcate și datele acestora, conținutul media și alte fișiere. După criptarea tabletei, presupunând că ați setat blocarea ecranului (un șablon sau un PIN numeric ori o parolă), va trebui să deblocați ecranul pentru a decripta tableta de fiecare dată când o porniți. Singura alternativă de decriptare constă în a reveni la setările din fabrică, ceea ce vă șterge toate datele.\n\nCriptarea durează cel puțin o oră. Trebuie să începeți cu o baterie încărcată și să țineți tableta conectată pe tot parcursul procesului. Dacă îl întrerupeți, veți pierde o parte din date sau chiar toate datele."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"Puteți să vă criptați conturile, setările, aplicațiile descărcate și datele acestora, conținutul media și alte fișiere. După criptarea telefonului, presupunând că ați setat blocarea ecranului (un șablon sau un PIN numeric ori o parolă), va trebui să deblocați ecranul pentru a decripta telefonul de fiecare dată când îl porniți. Singura alternativă de decriptare constă în a reveni la setările din fabrică, ceea ce vă șterge toate datele\n\nCriptarea durează cel puțin o oră. Trebuie să începeți cu o baterie încărcată și să țineți telefonul conectat pe tot parcursul procesului. Dacă îl întrerupeți, veți pierde o parte din date sau chiar toate datele."</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"Criptați tableta"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"Criptați telefonul"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"Încărcați bateria și încercați din nou."</string>
-    <string name="crypt_keeper_unplugged_text" msgid="2709721134148651329">"Conectați încărcătorul și încercați din nou."</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="1847280235529858357">"Nu există un cod PIN sau o parolă pentru blocarea ecranului"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="7210616262954236042">"Trebuie să setați un cod PIN sau o parolă pentru blocarea ecranului înainte de a începe criptarea."</string>
-    <string name="crypt_keeper_confirm_title" msgid="8600000209722452230">"Criptați?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="3270587498436152259">"Operația de criptare este ireversibilă și întreruperea ei va duce la pierderea datelor. Criptarea durează cel puțin o oră, timp în care tableta se va reporni de mai multe ori."</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="3040428543349852419">"Operația de criptare este ireversibilă și întreruperea ei va duce la pierderea datelor. Criptarea durează cel puțin o oră, timp în care telefonul se va reporni de mai multe ori."</string>
-    <string name="crypt_keeper_setup_title" msgid="3339725741305796680">"Criptare"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="4417016995091289019">"Așteptați criptarea tabletei. Finalizat <xliff:g id="PERCENT">^1</xliff:g>%."</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="7902355422499500352">"Așteptați criptarea telefonului. Finalizat <xliff:g id="PERCENT">^1</xliff:g>%."</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="8348188415839917821">"Așteptați criptarea tabletei. Finalizat în <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="8556105766597855198">"Așteptați criptarea telefonului. Finalizat în <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="3832496715430327682">"Pentru a debloca tableta, opriți-o și reporniți-o."</string>
-    <string name="crypt_keeper_force_power_cycle" product="default" msgid="5070346039522135361">"Pentru a debloca telefonul, opriți-l și reporniți-l."</string>
-    <string name="crypt_keeper_warn_wipe" msgid="8104921337301750394">"Avertisment: datele de pe dispozitiv vor fi șterse după încă <xliff:g id="COUNT">^1</xliff:g> încercări nereușite de deblocare!"</string>
-    <string name="crypt_keeper_enter_password" msgid="1274917431075529732">"Introduceți parola"</string>
-    <string name="crypt_keeper_failed_title" msgid="8173654570682244149">"Criptare nereușită"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"Criptarea a fost întreruptă și nu se poate finaliza. Prin urmare, datele de pe tableta dvs. nu mai sunt accesibile. \n\nPentru a relua utilizarea tabletei, trebuie să reveniți la setările din fabrică. Când configurați tableta după resetare, veți putea restabili toate datele pentru care ați creat copii de rezervă în Contul Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"Criptarea a fost întreruptă și nu se poate finaliza. Prin urmare, datele de pe telefonul dvs. nu mai sunt accesibile. \n\nPentru a relua utilizarea telefonului, trebuie să reveniți la setările din fabrică. Când configurați telefonul după resetare, veți putea restabili toate datele pentru care ați creat copii de rezervă în Contul Google."</string>
-    <string name="crypt_keeper_data_corrupt_title" msgid="5920153462176846037">"Decriptarea nu a reușit"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"Parola pe care ați introdus-o este corectă, dar, din păcate, datele sunt deteriorate. \n\nPentru a relua utilizarea tabletei, trebuie să reveniți la setările din fabrică. Când vă configurați tableta după resetare, veți putea să restabiliți toate datele care au backup în Contul Google."</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"Parola pe care ați introdus-o este corectă, dar, din păcate, datele sunt deteriorate. \n\nPentru a relua utilizarea telefonului, trebuie să reveniți la setările din fabrică. Când vă configurați telefonul după resetare, veți putea să restabiliți toate datele care au backup în Contul Google."</string>
-    <string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"Comutați metoda de introducere"</string>
+    <string name="encryption_settings_title" msgid="2848716008695618360">"Criptare"</string>
+    <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"Criptați tableta"</string>
+    <string name="encrypt_title" product="default" msgid="7337365190988321100">"Criptați telefonul"</string>
+    <string name="encrypted_summary" msgid="545623487587251207">"Criptat"</string>
     <string name="suggested_lock_settings_title" msgid="7836065447159730217">"Securizați telefonul"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"Setați blocarea ecranului pentru a proteja tableta"</string>
     <string name="suggested_lock_settings_summary" product="device" msgid="8479766049078378225">"Setați blocarea ecranului pentru a proteja dispozitivul"</string>
@@ -836,6 +810,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Ar putea fi necesar, de asemenea, să introduceți acest cod PIN pe celălalt dispozitiv."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Ar putea fi necesar, de asemenea, să introduceți această parolă pe celălalt dispozitiv."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Pentru asocierea cu:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;asigurați-vă că se afișează această cheie de acces:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Confirmați pentru a asocia cu setul coordonat"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"De la:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Asociați cu acest dispozitiv?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Pentru împerecherea cu:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Introduceți pe acesta:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, apoi apăsați tasta Return sau Enter."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Permiteți accesul la agendă și la istoricul apelurilor"</string>
@@ -869,6 +844,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Nu s-a putut conecta. Încercați din nou."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Detalii despre dispozitiv"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Adresa Bluetooth a dispozitivului: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Adresa Bluetooth a dispozitivului: \n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Eliminați dispozitivul?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Eliminați asocierea"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Deconectați aplicația?"</string>
@@ -900,6 +876,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Rețineți setările"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Numărul maxim de dispozitive audio Bluetooth conectate"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Selectați numărul maxim de dispozitive audio Bluetooth conectate"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"Jurnalul de remediere a erorilor pentru stiva NFC"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Măriți nivelul de înregistrare pentru stiva NFC"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Proiectare"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"oglindă"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Activați ecranul wireless"</string>
@@ -1210,6 +1188,8 @@
     <string name="wifi_hotspot_maximize_compatibility_dual_ap_summary" msgid="3579549223159056533">"Ajută alte dispozitive să găsească acest hotspot. Mărește utilizarea bateriei."</string>
     <string name="wifi_tether_starting" msgid="8879874184033857814">"Se activează hotspotul..."</string>
     <string name="wifi_tether_stopping" msgid="4416492968019409188">"Se dezactivează hotspotul..."</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_title" msgid="3089432578433978073">"Tetheringul nu este disponibil"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_content" msgid="5920421547607921112">"Contactați operatorul pentru detalii"</string>
     <string name="wifi_tether_enabled_subtext" msgid="5085002421099821056">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> este activ"</string>
     <string name="wifi_tether_failed_subtext" msgid="437190628041885500">"Eroare de hotspot Wi-Fi portabil"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7072559431286459122">"Configurați hotspotul Wi-Fi"</string>
@@ -2565,11 +2545,6 @@
     <string name="enable_service_title" msgid="7231533866953706788">"Permiteți serviciului <xliff:g id="SERVICE">%1$s</xliff:g> să aibă control total asupra dispozitivului dvs.?"</string>
     <string name="capabilities_list_title" msgid="1225853611983394386">"<xliff:g id="SERVICE">%1$s</xliff:g> are funcțiile:"</string>
     <string name="touch_filtered_warning" msgid="4225815157460318241">"Deoarece o aplicație acoperă o solicitare de permisiune, Setările nu vă pot verifica răspunsul."</string>
-    <string name="enable_service_encryption_warning" msgid="931082737770453755">"Dacă activați <xliff:g id="SERVICE">%1$s</xliff:g>, dispozitivul nu va utiliza blocarea ecranului pentru a îmbunătăți criptarea datelor."</string>
-    <string name="secure_lock_encryption_warning" msgid="669152607190123579">"Pentru că ați activat un serviciu de accesibilitate, dispozitivul nu va utiliza blocarea ecranului pentru a îmbunătăți criptarea datelor."</string>
-    <string name="enable_service_pattern_reason" msgid="6832846117817938536">"Deoarece activarea serviciului <xliff:g id="SERVICE">%1$s</xliff:g> afectează criptarea datelor, trebuie să confirmați modelul."</string>
-    <string name="enable_service_pin_reason" msgid="6040417014360237703">"Deoarece activarea serviciului <xliff:g id="SERVICE">%1$s</xliff:g> afectează criptarea datelor, trebuie să confirmați codul PIN."</string>
-    <string name="enable_service_password_reason" msgid="6962544350351734238">"Deoarece activarea serviciului <xliff:g id="SERVICE">%1$s</xliff:g> afectează criptarea datelor, trebuie să confirmați parola."</string>
     <string name="accessibility_service_warning" msgid="6779187188736432618">"<xliff:g id="SERVICE">%1$s</xliff:g> solicită control total asupra acestui dispozitiv. Serviciul poate citi ecranul și poate acționa în numele utilizatorilor cu nevoi de accesibilitate. Acest nivel de control nu este adecvat pentru majoritatea aplicațiilor."</string>
     <string name="accessibility_service_warning_description" msgid="6573203795976134751">"Controlul total este adecvat pentru aplicații care vă ajută cu accesibilitatea, însă nu pentru majoritatea aplicaților."</string>
     <string name="accessibility_service_screen_control_title" msgid="324795030658109870">"Vă vede și vă controlează ecranul"</string>
@@ -3145,14 +3120,6 @@
     <string name="remove_account_failed" msgid="3709502163548900644">"Această modificare nu este permisă de administratorul dvs."</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"Sincronizarea manuală nu este posibilă"</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"În prezent, sincronizarea pentru acest element este dezactivată. Pentru a schimba această setare, activați temporar datele de fundal și sincronizarea automată."</string>
-    <string name="enter_password" msgid="6327051330258595331">"Pentru a lansa sistemul de operare Android, introduceți parola"</string>
-    <string name="enter_pin" msgid="1029287617551232681">"Pentru a lansa sistemul de operare Android, introduceți codul PIN"</string>
-    <string name="enter_pattern" msgid="1747316785866742960">"Pentru a lansa sistemul de operare Android, desenați șablonul"</string>
-    <string name="cryptkeeper_wrong_pattern" msgid="340747269176120242">"Model greșit"</string>
-    <string name="cryptkeeper_wrong_password" msgid="7295607881887114486">"Parolă greșită"</string>
-    <string name="cryptkeeper_wrong_pin" msgid="2347961593970714201">"Cod PIN greșit"</string>
-    <string name="checking_decryption" msgid="6111642972615688237">"Se verifică..."</string>
-    <string name="starting_android" msgid="6694154070215356186">"Se pornește Android..."</string>
     <string name="delete" msgid="8330605554706263775">"Ștergeți"</string>
     <string name="misc_files" msgid="6598066985800749585">"Fișiere diverse"</string>
     <string name="misc_files_selected_count" msgid="5597802791672749532">"au fost selectate <xliff:g id="NUMBER">%1$d</xliff:g> din <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -3248,8 +3215,6 @@
     <string name="data_usage_metered_yes" msgid="4262598072030135223">"Contorizată"</string>
     <string name="data_usage_metered_no" msgid="1685828958417926268">"Necontorizată"</string>
     <string name="data_usage_disclaimer" msgid="3271450299386176770">"Datele pot fi contorizate diferit la operator și pe dispozitiv."</string>
-    <string name="cryptkeeper_emergency_call" msgid="8369322820475703306">"Apel de urgență"</string>
-    <string name="cryptkeeper_return_to_call" msgid="3857250752781151232">"Reveniți la apel"</string>
     <string name="vpn_name" msgid="3806456074909253262">"Nume"</string>
     <string name="vpn_type" msgid="5533202873260826663">"Tip"</string>
     <string name="vpn_server" msgid="2908816134941973935">"Adresă server"</string>
@@ -4841,8 +4806,6 @@
       <item quantity="one">1 aplicație poate folosi date nerestricționate</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"Vedeți mai multe"</string>
-    <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"Sigur doriți să ștergeți datele utilizatorului și să faceți conversia la criptarea bazată pe sistemul de fișiere?"</string>
-    <string name="button_confirm_convert_fbe" msgid="339648921918438106">"Ștergeți și convertiți"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"Resetați limitarea frecvenței pentru ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"Limitarea frecvenței pentru ShortcutManager a fost resetată"</string>
     <string name="notification_suggestion_title" msgid="6309263655965785411">"Controlați informațiile de pe ecranul de blocare"</string>
@@ -5381,6 +5344,7 @@
     <string name="sim_action_yes" msgid="8076556020131395515">"Da"</string>
     <string name="sim_action_reboot" msgid="3508948833333441538">"Reporniți"</string>
     <string name="sim_action_no_thanks" msgid="435717748384544195">"Nu, mulțumesc"</string>
+    <string name="sim_action_cancel" msgid="2668099867029610910">"Anulați"</string>
     <string name="sim_switch_button" msgid="1405772571706095387">"Schimbați"</string>
     <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Nu se poate activa SIM-ul"</string>
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Scoateți SIM-ul și introduceți-l din nou. Dacă problema persistă, reporniți dispozitivul."</string>
@@ -5535,6 +5499,10 @@
     <string name="cached_apps_freezer" msgid="1057519579761550350">"Suspendați execuția pentru aplicațiile din cache"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"Permiteți suprapunerile pe ecrane din Setări"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Permiteți aplicații care se pot afișa deasupra altora prin suprapunerea pe ecranele de Setări"</string>
+    <!-- no translation found for allow_mock_modem (3832264806530479214) -->
+    <skip />
+    <!-- no translation found for allow_mock_modem_summary (9097416612748005374) -->
+    <skip />
     <string name="media_controls_title" msgid="403271085636252597">"Media"</string>
     <string name="media_controls_resume_title" msgid="855076860336652370">"Fixați playerul media"</string>
     <string name="media_controls_resume_description" msgid="3163482266454802097">"Pentru a relua rapid redarea, playerul media rămâne deschis în Setări rapide"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 1e128ee..4c8347d 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -144,10 +144,11 @@
     <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"Разрешить устройству обмениваться данными с другими устройствами Bluetooth."</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"Разрешить телефону обмениваться данными с другими устройствами Bluetooth."</string>
     <string name="bluetooth_disable_a2dp_hw_offload" msgid="5942913792817797541">"Отключить аппаратную разгрузку профиля Bluetooth A2DP"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="8610420176339657720">"Требуется перезапуск"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8333029144800835996">"Чтобы изменить эту настройку, перезапустите устройство."</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="3488695418187553566">"Перезапуск"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="4930826928585464191">"Отмена"</string>
+    <string name="bluetooth_disable_le_audio_hw_offload" msgid="3966022676505972908">"Отключить аппаратную разгрузку профиля Bluetooth LE AUDIO"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_title" msgid="6001142380445276918">"Перезапустить устройство?"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_message" msgid="1524373895333698779">"Чтобы изменить эту настройку, перезапустите устройство."</string>
+    <string name="bluetooth_disable_hw_offload_dialog_confirm" msgid="5594859658551707592">"Перезапустить"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel" msgid="3663690305043973720">"Отмена"</string>
     <string name="connected_device_media_device_title" msgid="3783388247594566734">"Медиаустройства"</string>
     <string name="connected_device_call_device_title" msgid="88732390601723608">"Устройства для совершения звонков"</string>
     <string name="connected_device_other_device_title" msgid="4652120430615729193">"Другие устройства"</string>
@@ -315,9 +316,9 @@
     <string name="security_settings_title" msgid="6710768415432791970">"Безопасность"</string>
     <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"Шифрование и учетные данные"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"Телефон зашифрован"</string>
-    <string name="decryption_settings_summary" product="default" msgid="1742645256103613503">"Шифрование не включено"</string>
+    <string name="not_encrypted_summary" product="default" msgid="2251945842585788254">"Шифрование не включено"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"Устройство зашифровано"</string>
-    <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"Шифрование не включено"</string>
+    <string name="not_encrypted_summary" product="tablet" msgid="2374263654698719382">"Шифрование не включено"</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"Заблокированный экран"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"Что показывать"</string>
     <string name="security_settings_summary" msgid="1627059516127354233">"Настройка функции \"Мое местоположение\", разблокировка экрана и блокировка хранилища регистрационных данных"</string>
@@ -488,7 +489,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"Удалить"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"Коснитесь сканера отпечатков"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"Прикладывайте палец к сканеру и удерживайте, пока не почувствуете вибрацию."</string>
-    <string name="security_settings_udfps_enroll_start_message" msgid="5032954588171487566">"Поместите палец на сканер и не убирайте его, пока не ощутите вибрацию."</string>
+    <string name="security_settings_udfps_enroll_start_message" msgid="5032954588171487566">"Приложите палец к сканеру и не убирайте его, пока не почувствуете вибрацию."</string>
     <string name="security_settings_fingerprint_enroll_udfps_title" msgid="6665610134560896895">"Нажмите на сканер отпечатка пальца и удерживайте"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"Коснитесь несколько раз"</string>
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"Ещё раз"</string>
@@ -497,7 +498,7 @@
     <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"Нажимайте и удерживайте значок каждый раз, когда он перемещается. Так отпечаток пальца будет более точным."</string>
     <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"Коснитесь датчика и удерживайте его подушечкой пальца"</string>
     <string name="security_settings_udfps_enroll_edge_title" msgid="6137605344819152477">"Осталось отсканировать края пальца"</string>
-    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"Наклоните палец вбок, нажмите и удерживайте датчик. Затем поменяйте положение пальца и повторите действия."</string>
+    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"Наклоните палец набок, нажмите на датчик и удерживайте. Затем наклоните палец на другой бок и повторите действия."</string>
     <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"Так отпечаток пальца будет более точным"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Процент выполнения задачи по добавлению отпечатка пальца: <xliff:g id="PERCENTAGE">%d</xliff:g>."</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Отпечаток добавлен"</string>
@@ -576,37 +577,10 @@
     <string name="fingerprint_last_delete_message" msgid="7860374760549404410">"Вы больше не сможете использовать отпечаток пальца для разблокировки телефона и подтверждения своей личности в приложениях."</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="4104208067277655068">"Вы больше не сможете использовать отпечаток пальца для разблокировки рабочего профиля, подтверждения покупок и входа в рабочие приложения."</string>
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"Удалить"</string>
-    <string name="crypt_keeper_settings_title" msgid="4938812137822100044">"Шифрование"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"Зашифровать данные"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"Зашифровать данные"</string>
-    <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"Данные зашифрованы"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"Вы можете зашифровать свои аккаунты, настройки, скачанные приложения и их данные, а также медиаданные и другие файлы на устройстве. После этого для расшифровки вам будет необходимо при каждом включении устройства разблокировать экран, если настроена его блокировка (графический ключ, PIN-код или пароль). Другой способ расшифровки – это сбросить настройки телефона, в результате чего все данные будут удалены.\n\nОбычно шифрование данных занимает около часа или более. Перед процедурой полностью зарядите батарею и не отключайте зарядное устройство, пока шифрование не завершится. Если прервать процесс, все данные или их часть будет утеряна."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"Вы можете зашифровать свои аккаунты, настройки, скачанные приложения и их данные, а также медиаданные и другие файлы на устройстве. После этого для расшифровки вам будет необходимо при каждом включении устройства разблокировать экран, если настроена его блокировка (графический ключ, PIN-код или пароль). Другой способ расшифровки – это сбросить настройки телефона, в результате чего все данные будут удалены.\n\nОбычно шифрование данных занимает около часа или более. Перед процедурой полностью зарядите батарею и не отключайте зарядное устройство, пока шифрование не завершится. Если прервать процесс, все данные или их часть будет утеряна."</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"Зашифровать данные"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"Зашифровать данные"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"Зарядите батарею и повторите попытку."</string>
-    <string name="crypt_keeper_unplugged_text" msgid="2709721134148651329">"Подключите зарядное устройство и повторите попытку."</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="1847280235529858357">"Не указан PIN-код или пароль блокировки экрана"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="7210616262954236042">"Перед шифрованием необходимо задать PIN-код или пароль блокировки экрана."</string>
-    <string name="crypt_keeper_confirm_title" msgid="8600000209722452230">"Выполнить шифрование?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="3270587498436152259">"Если прервать шифрование, данные будут потеряны. Операция займет не менее часа. Устройство будет перезагружено несколько раз."</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="3040428543349852419">"Если прервать шифрование, данные будут потеряны. Операция займет не менее часа. Устройство будет перезагружено несколько раз."</string>
-    <string name="crypt_keeper_setup_title" msgid="3339725741305796680">"Шифрование"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="4417016995091289019">"Дождитесь завершения шифрования планшета. Выполнено: <xliff:g id="PERCENT">^1</xliff:g> %."</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="7902355422499500352">"Дождитесь завершения шифрования телефона. Выполнено: <xliff:g id="PERCENT">^1</xliff:g> %."</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="8348188415839917821">"Шифрование завершится через <xliff:g id="DURATION">^1</xliff:g>."</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="8556105766597855198">"Шифрование завершится через <xliff:g id="DURATION">^1</xliff:g>."</string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="3832496715430327682">"Чтобы разблокировать планшетный ПК, выключите его и снова включите."</string>
-    <string name="crypt_keeper_force_power_cycle" product="default" msgid="5070346039522135361">"Чтобы разблокировать телефон, выключите его и снова включите."</string>
-    <string name="crypt_keeper_warn_wipe" msgid="8104921337301750394">"Внимание! Осталось попыток: <xliff:g id="COUNT">^1</xliff:g>. Если вам не удастся выполнить авторизацию, память устройства будет очищена."</string>
-    <string name="crypt_keeper_enter_password" msgid="1274917431075529732">"Введите пароль"</string>
-    <string name="crypt_keeper_failed_title" msgid="8173654570682244149">"Сбой шифрования"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"Данные на вашем планшетном ПК больше недоступны из-за того, что шифрование было прервано. \n\nЧтобы дальше использовать устройство, нужно сбросить настройки. После этого вы сможете восстановить все данные, для которых в аккаунте Google были созданы резервные копии."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"Данные на вашем телефоне больше недоступны из-за того, что шифрование было прервано. \n\nЧтобы дальше использовать устройство, нужно сбросить настройки. После этого вы сможете восстановить все данные, для которых в аккаунте Google были созданы резервные копии."</string>
-    <string name="crypt_keeper_data_corrupt_title" msgid="5920153462176846037">"Не удалось расшифровать"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"Вы ввели правильный пароль, но данные на планшете повреждены.\n\nЧтобы продолжить работу, выполните возврат к заводским настройкам. После этого вы сможете восстановить данные, резервная копия которых хранится в вашем аккаунте Google."</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"Вы ввели правильный пароль, но данные на телефоне повреждены.\n\nЧтобы продолжить работу, выполните возврат к заводским настройкам. После этого вы сможете восстановить данные, резервная копия которых хранится в вашем аккаунте Google."</string>
-    <string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"Сменить способ ввода"</string>
+    <string name="encryption_settings_title" msgid="2848716008695618360">"Шифрование"</string>
+    <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"Зашифровать данные"</string>
+    <string name="encrypt_title" product="default" msgid="7337365190988321100">"Зашифровать данные"</string>
+    <string name="encrypted_summary" msgid="545623487587251207">"Зашифровано"</string>
     <string name="suggested_lock_settings_title" msgid="7836065447159730217">"Защитите телефон"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"Для защиты планшета настройте блокировку экрана."</string>
     <string name="suggested_lock_settings_summary" product="device" msgid="8479766049078378225">"Для защиты устройства настройте блокировку экрана."</string>
@@ -851,6 +825,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Возможно, потребуется ввести PIN-код на другом устройстве."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Возможно, потребуется ввести ключ доступа на другом устройстве."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Для подключения к устройству&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;на нем должен отображаться этот код доступа:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Подтвердите, чтобы подключиться к координированному набору."</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"Запрос от: &lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Подключиться к этому устройству?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Для подключения к устройству <xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> введите на нем код <xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, а затем нажмите клавишу Return или Enter."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Разрешить доступ к контактам и журналу звонков"</string>
@@ -884,6 +859,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Ошибка подключения. Повторите попытку."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Об устройстве"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Адрес Bluetooth этого устройства: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Адрес Bluetooth этого устройства: \n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Удалить устройство?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Удалить связь"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Отключить приложение?"</string>
@@ -915,6 +891,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Запомнить настройки"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Максимальное количество подключенных Bluetooth-аудиоустройств"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Укажите максимальное количество подключенных Bluetooth-аудиоустройств"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"Журнал отладки стека NFC"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Ведение подробного журнала стека NFC"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Трансляция"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"дублирование"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Включить"</string>
@@ -1228,6 +1206,8 @@
     <string name="wifi_hotspot_maximize_compatibility_dual_ap_summary" msgid="3579549223159056533">"Позволяет другим устройствам находить эту точку доступа. При этом батарея разряжается быстрее."</string>
     <string name="wifi_tether_starting" msgid="8879874184033857814">"Включение точки доступа…"</string>
     <string name="wifi_tether_stopping" msgid="4416492968019409188">"Выключение точки доступа…"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_title" msgid="3089432578433978073">"Режим модема недоступен"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_content" msgid="5920421547607921112">"За подробными сведениями обращайтесь к оператору связи."</string>
     <string name="wifi_tether_enabled_subtext" msgid="5085002421099821056">"Сеть <xliff:g id="NETWORK_SSID">%1$s</xliff:g> активна"</string>
     <string name="wifi_tether_failed_subtext" msgid="437190628041885500">"Ошибка подключения к точке доступа"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7072559431286459122">"Настройка точки доступа Wi-Fi"</string>
@@ -2592,11 +2572,6 @@
     <string name="enable_service_title" msgid="7231533866953706788">"Разрешить сервису \"<xliff:g id="SERVICE">%1$s</xliff:g>\" контролировать ваше устройство?"</string>
     <string name="capabilities_list_title" msgid="1225853611983394386">"<xliff:g id="SERVICE">%1$s</xliff:g> будет:"</string>
     <string name="touch_filtered_warning" msgid="4225815157460318241">"Невозможно принять ваше согласие, поскольку запрос скрыт другим приложением."</string>
-    <string name="enable_service_encryption_warning" msgid="931082737770453755">"Если включить службу \"<xliff:g id="SERVICE">%1$s</xliff:g>\", блокировка экрана будет отключена и надежность защиты зашифрованных данных снизится."</string>
-    <string name="secure_lock_encryption_warning" msgid="669152607190123579">"Поскольку включена служба специальных возможностей, блокировка экрана будет отключена и надежность защиты зашифрованных данных может быть снижена."</string>
-    <string name="enable_service_pattern_reason" msgid="6832846117817938536">"Включение сервиса <xliff:g id="SERVICE">%1$s</xliff:g> затронет шифрование данных, поэтому необходимо ввести графический ключ."</string>
-    <string name="enable_service_pin_reason" msgid="6040417014360237703">"Включение сервиса <xliff:g id="SERVICE">%1$s</xliff:g> затронет шифрование данных, поэтому необходимо ввести PIN-код."</string>
-    <string name="enable_service_password_reason" msgid="6962544350351734238">"Включение сервиса <xliff:g id="SERVICE">%1$s</xliff:g> затронет шифрование данных, поэтому необходимо ввести пароль."</string>
     <string name="accessibility_service_warning" msgid="6779187188736432618">"<xliff:g id="SERVICE">%1$s</xliff:g> запрашивает полный доступ к устройству. Сервис может считывать данные с экрана и действовать от имени пользователей, которым требуются специальные возможности. Этот уровень доступа не подходит для большинства приложений."</string>
     <string name="accessibility_service_warning_description" msgid="6573203795976134751">"Полный контроль нужен приложениям для реализации специальных возможностей и не нужен большинству остальных."</string>
     <string name="accessibility_service_screen_control_title" msgid="324795030658109870">"Просмотр и контроль экрана"</string>
@@ -3183,14 +3158,6 @@
     <string name="remove_account_failed" msgid="3709502163548900644">"Это действие запрещено администратором"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"Не удалось синхронизировать данные"</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"Синхронизация отключена. Чтобы включить ее, временно разрешите передачу данных в фоновом режиме и автоматическую синхронизацию."</string>
-    <string name="enter_password" msgid="6327051330258595331">"Чтобы запустить Android, введите пароль"</string>
-    <string name="enter_pin" msgid="1029287617551232681">"Чтобы запустить Android, введите PIN-код"</string>
-    <string name="enter_pattern" msgid="1747316785866742960">"Чтобы запустить Android, введите графический ключ"</string>
-    <string name="cryptkeeper_wrong_pattern" msgid="340747269176120242">"Неверный графический ключ"</string>
-    <string name="cryptkeeper_wrong_password" msgid="7295607881887114486">"Неверный пароль"</string>
-    <string name="cryptkeeper_wrong_pin" msgid="2347961593970714201">"Неверный PIN-код."</string>
-    <string name="checking_decryption" msgid="6111642972615688237">"Проверка…"</string>
-    <string name="starting_android" msgid="6694154070215356186">"Запуск Android…"</string>
     <string name="delete" msgid="8330605554706263775">"Удалить"</string>
     <string name="misc_files" msgid="6598066985800749585">"Разное"</string>
     <string name="misc_files_selected_count" msgid="5597802791672749532">"Выбрано: <xliff:g id="NUMBER">%1$d</xliff:g> из <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -3286,8 +3253,6 @@
     <string name="data_usage_metered_yes" msgid="4262598072030135223">"Сеть с тарификацией трафика"</string>
     <string name="data_usage_metered_no" msgid="1685828958417926268">"Сеть без тарификации трафика"</string>
     <string name="data_usage_disclaimer" msgid="3271450299386176770">"Статистика оператора связи может отличаться от статистики устройства."</string>
-    <string name="cryptkeeper_emergency_call" msgid="8369322820475703306">"Вызов службы экстренной помощи"</string>
-    <string name="cryptkeeper_return_to_call" msgid="3857250752781151232">"Вернуться к вызову"</string>
     <string name="vpn_name" msgid="3806456074909253262">"Название"</string>
     <string name="vpn_type" msgid="5533202873260826663">"Тип"</string>
     <string name="vpn_server" msgid="2908816134941973935">"Адрес сервера"</string>
@@ -3695,9 +3660,9 @@
     <string name="keywords_default_payment_app" msgid="5162298193637362104">"оплата, по умолчанию"</string>
     <string name="keywords_ambient_display" msgid="3149287105145443697">"входящее уведомление"</string>
     <string name="keywords_hotspot_tethering" msgid="3688439689671232627">"USB-модем, Bluetooth-модем, точка доступа Wi-Fi"</string>
-    <string name="keywords_touch_vibration" msgid="1125291201902251273">"осязание, вибрировать, экран, чувствительность"</string>
-    <string name="keywords_ring_vibration" msgid="1736301626537417541">"осязание, вибрация, телефон, звонок, чувствительность, вызов"</string>
-    <string name="keywords_notification_vibration" msgid="9162262178415439951">"осязание, вибрация, чувствительность"</string>
+    <string name="keywords_touch_vibration" msgid="1125291201902251273">"виброотклик, вибрировать, экран, чувствительность"</string>
+    <string name="keywords_ring_vibration" msgid="1736301626537417541">"виброотклик, вибрация, телефон, звонок, чувствительность, вызов"</string>
+    <string name="keywords_notification_vibration" msgid="9162262178415439951">"виброотклик, вибрация, чувствительность"</string>
     <string name="keywords_battery_saver_sticky" msgid="1646191718840975110">"энергосбережение, постоянная экономия заряда, батарея"</string>
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"программа, расписание, режим энергосбережения, экономия заряда, батарея, автоматически, процент"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, расширенный вызов, звонки по сети 4g"</string>
@@ -4914,8 +4879,6 @@
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> приложения без ограничений мобильного интернета</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"Ещё"</string>
-    <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"Удалить пользовательские данные и перейти к шифрованию?"</string>
-    <string name="button_confirm_convert_fbe" msgid="339648921918438106">"Очистить и перейти"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"Сброс счетчиков ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"Готово"</string>
     <string name="notification_suggestion_title" msgid="6309263655965785411">"Выберите параметры для информации на заблоки­­рованном экране"</string>
@@ -5466,6 +5429,7 @@
     <string name="sim_action_yes" msgid="8076556020131395515">"Да"</string>
     <string name="sim_action_reboot" msgid="3508948833333441538">"Перезапустить"</string>
     <string name="sim_action_no_thanks" msgid="435717748384544195">"Нет, спасибо"</string>
+    <string name="sim_action_cancel" msgid="2668099867029610910">"Отмена"</string>
     <string name="sim_switch_button" msgid="1405772571706095387">"Переключиться"</string>
     <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Не удалось активировать SIM-карту"</string>
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Извлеките и снова вставьте SIM-карту. Если проблема не исчезнет, перезапустите устройство."</string>
@@ -5597,8 +5561,8 @@
     <string name="lockscreen_privacy_not_secure" msgid="3251276389681975912">"Сначала необходимо настроить блокировку экрана"</string>
     <string name="power_menu_long_press_for_assist" msgid="2016813721240777737">"Запускать Ассистента долгим нажатием"</string>
     <string name="power_menu_long_press_for_assist_summary" msgid="8251928804984560312">"Нажмите и удерживайте кнопку питания для запуска Ассистента"</string>
-    <string name="power_menu_power_volume_up_hint" msgid="1733051433583045623">"Меню кнопки питания и экстренных вызовов\nЧтобы его открыть, одновременно нажмите кнопки питания и увеличения громкости."</string>
-    <string name="power_menu_power_prevent_ringing_hint" msgid="5786494894009727654">"Отключение звука звонка\nБыстрый запуск функции доступен в меню регулировки громкости."</string>
+    <string name="power_menu_power_volume_up_hint" msgid="1733051433583045623">"Меню кнопки питания и экстренных вызовов:\nЧтобы его открыть, одновременно нажмите кнопки питания и увеличения громкости."</string>
+    <string name="power_menu_power_prevent_ringing_hint" msgid="5786494894009727654">"Отключение звука звонка:\nБыстрый запуск функции доступен в меню регулировки громкости."</string>
     <string name="power_menu_long_press_for_assist_sensitivity_title" msgid="1626808509158422185">"Длительность нажатия и удержания"</string>
     <string name="power_menu_long_press_for_assist_sensitivity_summary" msgid="7550610071666801935">"Настройте чувствительность, выбрав длительность нажатия и удержания кнопки питания."</string>
     <string name="power_menu_long_press_for_assist_sensitivity_low_label" msgid="3430099983480845635">"Быстро"</string>
@@ -5622,6 +5586,10 @@
     <string name="cached_apps_freezer" msgid="1057519579761550350">"Приостановить работу кешированных приложений"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"Разрешить экранный оверлей в настройках"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Разрешить приложениям, которые могут показываться поверх других, накладываться на экраны настроек"</string>
+    <!-- no translation found for allow_mock_modem (3832264806530479214) -->
+    <skip />
+    <!-- no translation found for allow_mock_modem_summary (9097416612748005374) -->
+    <skip />
     <string name="media_controls_title" msgid="403271085636252597">"Медиа"</string>
     <string name="media_controls_resume_title" msgid="855076860336652370">"Закрепить медиапроигрыватель"</string>
     <string name="media_controls_resume_description" msgid="3163482266454802097">"Медиапроигрыватель остается открытым в Быстрых настройках, чтобы вы могли легко продолжить воспроизведение"</string>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index 3b8aa8e..1176dea 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -142,10 +142,11 @@
     <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"ඔබගේ උපාංගයට අවට බ්ලූටූත් උපාංග සමඟ සන්නිවේදනයට ඉඩ දෙන්න"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"ඔබගේ දුරකථනයට අවට බ්ලූටූත් උපාංග සමඟ සන්නිවේදනයට ඉඩ දෙන්න"</string>
     <string name="bluetooth_disable_a2dp_hw_offload" msgid="5942913792817797541">"බ්ලූටූත් A2DP දෘඪාංග ඕෆ්ලෝඩ් අබල කරන්න"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="8610420176339657720">"උපාංගය නැවත අරඹන්නද?"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8333029144800835996">"මෙම සැකසීම වෙනස් කිරීමට ඔබ ඔබේ උපාංගය නැවත ඇරඹීම අවශ්‍යයි."</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="3488695418187553566">"යළි අරඹන්න"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="4930826928585464191">"අවලංගු කර."</string>
+    <string name="bluetooth_disable_le_audio_hw_offload" msgid="3966022676505972908">"බ්ලූටූත් LE AUDIO දෘඪාංග ඕෆ්ලෝඩ් අබල කරන්න"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_title" msgid="6001142380445276918">"උපාංගය යළි අරඹන්නද?"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_message" msgid="1524373895333698779">"මෙම සැකසීම වෙනස් කිරීමට ඔබ ඔබගේ උපාංගය යළි ඇරඹීමට අවශ්‍යයි."</string>
+    <string name="bluetooth_disable_hw_offload_dialog_confirm" msgid="5594859658551707592">"යළි අරඹන්න"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel" msgid="3663690305043973720">"අවලංගු කරන්න"</string>
     <string name="connected_device_media_device_title" msgid="3783388247594566734">"මාධ්‍ය උපාංග"</string>
     <string name="connected_device_call_device_title" msgid="88732390601723608">"ඇමතුම් උපාංග"</string>
     <string name="connected_device_other_device_title" msgid="4652120430615729193">"වෙනත් උපාංග"</string>
@@ -309,9 +310,9 @@
     <string name="security_settings_title" msgid="6710768415432791970">"ආරක්ෂාව"</string>
     <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"සංකේතනය සහ අක්තපත්‍ර"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"දුරකතනය සංකේතනය කර ඇත"</string>
-    <string name="decryption_settings_summary" product="default" msgid="1742645256103613503">"දුරකතනය සංකේතනය කර නැත"</string>
+    <string name="not_encrypted_summary" product="default" msgid="2251945842585788254">"දුරකථනය සංකේතනය කර නැත"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"උපාංගය සංකේතිතයි"</string>
-    <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"උපාංගය සංකේතනය කර නැත"</string>
+    <string name="not_encrypted_summary" product="tablet" msgid="2374263654698719382">"උපාංගය සංකේතනය කර නැත"</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"අගුලු තිරය"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"පෙන්වන දේ"</string>
     <string name="security_settings_summary" msgid="1627059516127354233">"මගේ ස්ථානය, තිර අගුළු ඇරීම, SIM පත් අගුල, අක්තපත්‍ර ආචයන අගුල සකසන්න"</string>
@@ -568,37 +569,10 @@
     <string name="fingerprint_last_delete_message" msgid="7860374760549404410">"ඔබගේ දුරකථනය අගුලු හැරීමට හෝ යෙදුම්වල ඒ ඔබ බව තහවුරු කිරීමට ඔබගේ ඇඟිලි සලකුණ භාවිත කිරීමට ඔබට නොහැකි වනු ඇත."</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="4104208067277655068">"ඔබට ඔබගේ කාර්යාල පැතිකඩ අගුලු හැරීමට, මිලදී ගැනීම්වලට අවසර දීමට, හෝ කාර්යාල යෙදුම්වලට පිරීමට ඔබගේ ඇඟිලි සලකුණ භාවිත කළ නොහැකි වනු ඇත."</string>
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"ඔව්, ඉවත් කරන්න"</string>
-    <string name="crypt_keeper_settings_title" msgid="4938812137822100044">"සංකේතනය"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"කේතන වගුව"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"දුරකථනය සංකේතනය කිරීම"</string>
-    <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"සංකේතිත"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"ඔබගේ ගිණුම්, සැකසීම්, බාගන්නා ලද යෙදුම් සහ ඒවගේ දත්ත, මාධ්‍යය, සහ වෙනත් ගොනු. ඔබගේ ටැබ්ලට්ය ඔබ සංකේතනය කළ පසු, ඔබ තිර අඟුළු දැමීමක් සකසා තිබේ යැයි උපකල්පනය කරමින් (එය, රටාවක් හෝ සංඛ්‍යාත්මක PIN හෝ මුරපදය), ඔබ ටැබ්ලට්ය පණගන්වන සැමවිටම එය විසංකේතනය කිරීමට ඔබට තිරය අගුළු ඇරීමට සිදුවේ. විසංකේතනය කිරීමට ඇති වෙනත් ක්‍රමය කර්මාන්තශාලා දත්ත යළි පිහිටුම සිදු කිරීමය පමණයි, එයින් ඔබගේ සියලුම දත්ත මැකේ.\n\nසංකේතනය කිරීමට පැයක් හෝ ඊට වැඩියෙන් ගත වේ. ඔබ අරෝපිත බැටරියක් සමඟ ආරම්භ කිරීමට අවශ්‍යය සහ ක්‍රියාවලිය පුරා ඔබගේ ටැබ්ලට්ය පේනු ගතව තැබිය යුතුය. ඔබ බාධා කළේ නම්, ඔබගේ දත්ත වලින් සමහරක් හෝ සියල්ලම නැති විය හැක."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"ඔබගේ ගිණුම්, සැකසීම්, බාගන්නා ලද යෙදුම් සහ ඒවගේ දත්ත, මාධ්‍යය, සහ වෙනත් ගොනු. ඔබගේ දුරකථනය ඔබ සංකේතනය කළ පසු, ඔබ තිර අඟුළු දැමීමක් සකසා තිබේ යැයි උපකල්පනය කරමින් (එය, රටාවක් හෝ සංඛ්‍යාත්මක PIN හෝ මුරපදය), ඔබ දුරකථනය පණගන්වන සැමවිටම එය විසංකේතනය කිරීමට ඔබට තිරය අගුළු ඇරීමට සිදුවේ. විසංකේතනය කිරීමට ඇති වෙනත් ක්‍රමය කර්මාන්තශාලා දත්ත යළි පිහිටුම සිදු කිරීමය පමණයි, එයින් ඔබගේ සියලුම දත්ත මැකේ.\n\nසංකේතනය කිරීමට පැයක් හෝ ඊට වැඩියෙන් ගත වේ. ඔබ අරෝපිත බැටරියක් සමඟ ආරම්භ කිරීමට අවශ්‍යය සහ ක්‍රියාවලිය පුරා ඔබගේ දුරකථනය පේනු ගතව තැබිය යුතුය. ඔබ බාධා කළේ නම්, ඔබගේ දත්ත වලින් සමහරක් හෝ සියල්ලම නැති විය හැක."</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"ටැබ්ලටය සංකේතනය කරන්න"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"දුරකථනය සංකේතනය කිරීම"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"ඔබගේ බැටරිය ආරෝපණය කර නැවත උත්සාහ කරන්න."</string>
-    <string name="crypt_keeper_unplugged_text" msgid="2709721134148651329">"ඔබගේ චාලකය පේනු ගත කර නැවත උත්සාහ කරන්න."</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="1847280235529858357">"අගුළු තිර PIN හෝ මුරපදයක් නොමැත"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="7210616262954236042">"සංකේතනය ඇරඹීමට පෙර තිර අගුලු PIN හෝ මුරපදයක් සැකසීමට අවශ්‍යයි."</string>
-    <string name="crypt_keeper_confirm_title" msgid="8600000209722452230">"සංකේතනය කරන්නද?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="3270587498436152259">"මෙම සංකේතන මෙහෙයුම ප්‍රතිනම්‍ය නොවන අතර ඔබ එය බාධා කරොත් දත්ත නැති වනු ඇත. සංකේතනයට පැයක් හෝ ඊට වඩා කාලයක් ගත වන අතර, ඒ අතරතුරේදී ටැබ්ලටය කිහිප වතාවක් නැවත පටන් ගනු ඇත."</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="3040428543349852419">"මෙම සංකේතන මෙහෙයුම ප්‍රතිනම්‍ය නොවන අතර ඔබ එය බාධා කරොත් දත්ත නැති වනු ඇත. සංකේතනයට පැයක් හෝ ඊට වඩා කාලයක් ගත වන අතර, ඒ අතරතුරේදී දුරකථනය කිහිප වතාවක් නැවත පටන් ගනු ඇත."</string>
-    <string name="crypt_keeper_setup_title" msgid="3339725741305796680">"සංකේතනය වෙමින්"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="4417016995091289019">"ඔබගේ ටැබ්ලටය සංකේතනය වන අතරතුර රැඳී සිටින්න. <xliff:g id="PERCENT">^1</xliff:g>% සම්පූර්ණයි."</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="7902355422499500352">"ඔබගේ දුරකථනය සංකේතනය වන අතරතුර රැඳී සිටින්න. <xliff:g id="PERCENT">^1</xliff:g>% සම්පූර්ණයි."</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="8348188415839917821">"ඔබගේ ටැබ්ලටය සංකේතිත වන තෙක් රැදී සිටින්න. ඉතිරි කාලය: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="8556105766597855198">"ඔබගේ දුරකථනය සංකේතිත වන තෙක් රැදී සිටින්න. ඉතිරි කාලය: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="3832496715430327682">"ඔබේ තල පරිගණකය අගුලු හැරීමට, එය අක්‍රිය කර අනතුරුව සක්‍රිය කරන්න."</string>
-    <string name="crypt_keeper_force_power_cycle" product="default" msgid="5070346039522135361">"ඔබේ දුරකථනය අගුලු හැරීමට, එය අක්‍රිය කර අනතුරුව සක්‍රිය කරන්න."</string>
-    <string name="crypt_keeper_warn_wipe" msgid="8104921337301750394">"අවවාදය: ඔබගේ උපාංගය අඟුල ඇරීමට අවස්ථා <xliff:g id="COUNT">^1</xliff:g> වඩා අසාර්ථක වූ හොත් එය පිසදමන්න!"</string>
-    <string name="crypt_keeper_enter_password" msgid="1274917431075529732">"ඔබගේ මුරපදය ටයිප් කරන්න"</string>
-    <string name="crypt_keeper_failed_title" msgid="8173654570682244149">"සංකේතනය අසාර්ථකයි"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"සංකේතනයට බාධා වී ඇති අතර සම්පූර්ණ කළ නොහැකි විය. ප්‍රතිඑලයක් ලෙස, ඔබගේ ටැබ්ලටයේ තිබූ දත්ත තවත් ප්‍රවේශ කළ නොහැක. \n\n ටැබ්ලටය නැවත භාවිතා කිරීම ඇරඹීමට, ඔබ කර්මාන්තශාලා යළි පිහිටුමක් කළ යුතුය. යළි සැකසීමට පසු ඔබගේ ටැබ්ලටය සකසන විට, ඔබගේ Google ගිණුම වෙත උපස්ථ කළ ඕනෑම දත්තයක් ප්‍රතිස්ථාපනය කිරීමට අවස්ථාව ඔබට ඇත."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"සංකේතනයට බාධා වූ අතර අවසන් කළ නොහැක. ප්‍රතිඵලයක් ලෙස, ඔබගේ දුරකථනයේ දත්ත තවදුරටත් ප්‍රවේශනය කළ නොහැක. \n\nඔබගේ දුරකථන භාවිතා කර යළි ආරම්භ කිරීමට, ඔබ නිෂ්පාදන දත්ත යළි පිහිටීමක් කළ යුතුය. ඔබ යළි පිහිටුමෙන් පසු දුරකථනය සකසන විට, ඔබ විසින් Google ගිණුම වෙත උපස්ථ කළ ඕනෑම දත්තයක් යළි ස්ථාපනය කිරීමට ඔබට අවස්තාවක් ලැබෙනු ඇත."</string>
-    <string name="crypt_keeper_data_corrupt_title" msgid="5920153462176846037">"විසංකේතනය අසාර්ථකයි"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"ඔබ ඇතුළු කළ මුරපදය නිවැරදිය, නමුත් ඔබගේ දත්ත අවලංගු වී තිබේ. \n\nඔබගේ ටැබ්ලටය නැවත ආරම්භ කිරීමට, කර්මාන්ත ශාලා යළි පිහිටු වීමක් කිරීමට ඔබට සිදුවේ, යළි පිහිටු වීමෙන් පසු ඔබගේ ටැබ්ලටය ඔබ නැවත සකස් කරන විට, ඔබගේ Google ගිණුමට උපස්ථ කළ ඕනෑම දත්තයක් ප්‍රතිස්ථාපනය කිරීමට ඔබට අවස්ථාවක් තිබේ."</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"ඔබ ඇතුළු කළ මුරපදය නිවැරදිය, නමුත් ඔබගේ දත්ත අවලංගු වී තිබේ. \n\nඔබගේ දුරකථනය නැවත ආරම්භ කිරීමට, කර්මාන්ත ශාලා යළි පිහිටු වීමක් කිරීමට ඔබට සිදුවේ, යළි පිහිටු වීමෙන් පසු ඔබගේ දුරකථනය ඔබ නැවත සකස් කරන විට, ඔබගේ Google ගිණුමට උපස්ථ කළ ඕනෑම දත්තයක් ප්‍රතිස්ථාපනය කිරීමට ඔබට අවස්ථාවක් තිබේ."</string>
-    <string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"ආදාන ක්‍රමය මාරු කරන්න"</string>
+    <string name="encryption_settings_title" msgid="2848716008695618360">"සංකේතනය"</string>
+    <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"ටැබ්ලටය සංකේතනය කිරීම"</string>
+    <string name="encrypt_title" product="default" msgid="7337365190988321100">"දුරකථනය සංකේතනය කිරීම"</string>
+    <string name="encrypted_summary" msgid="545623487587251207">"සංකේතිත"</string>
     <string name="suggested_lock_settings_title" msgid="7836065447159730217">"ඔබගේ දුරකථනය සුරක්ෂිත කරන්න"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"ටැබ්ලටය ආරක්ෂා කිරීම සඳහා තිර අගුල සකසන්න"</string>
     <string name="suggested_lock_settings_summary" product="device" msgid="8479766049078378225">"උපාංගය ආරක්ෂා කිරීම සඳහා තිර අගුල සකසන්න"</string>
@@ -817,6 +791,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"ඔබට මෙම PIN එක අනෙක් උපාංගයේ ටයිප් කිරීමට සිදුවනු ඇත."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"ඔබට මෙම මුරයතුර අනෙක් උපාංගයේ ටයිප් කිරීමට සිදුවනු ඇත."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;සමග යුගල කිරීමට&lt;br&gt;එය මෙම මුර යතුර පෙන්වන්නේදැයි තහවුරු කර ගන්න:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"සම්බන්ධීකරණය කළ කට්ටලය සමඟ යුගල කිරීම තහවුරු කරන්න"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"වෙතින්:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;මෙම උපාංගය සමඟ යුගල කරන්නද?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>: සමඟ යුගල කිරීමට එය මත <xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>: ටයිප් කරන්න, ඉන්පසු Return හෝ Enter ඔබන්න."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"ඔබගේ සම්බන්ධතා සහ ඇමතුම් ඉතිහාසය වෙත ප්‍රවේශ විමට ඉඩ දෙන්න"</string>
@@ -850,6 +825,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"සම්බන්ධ වීමට නොහැකි විය. නැවත උත්සාහ කරන්න."</string>
     <string name="device_details_title" msgid="1155622417516195481">"උපාංග විස්තර"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"උපාංගයේ බ්ලූටූත් ලිපිනය: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"උපාංගයේ බ්ලූටූත් ලිපිනය:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"උපාංගය අමතකද?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"සම්බන්ධය ඉවත් කරන්න"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"යෙදුම විසන්ධි කරන්නද?"</string>
@@ -881,6 +857,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"සැකසීම් මතක තබාගන්න"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"උපරිම සම්බන්ධිත බ්ලූටූත් ශ්‍රව්‍ය උපාංග"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"සම්බන්ධිත බ්ලූටූත් ශ්‍රව්‍ය උපාංග උපරිම ගණන තෝරන්න"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"NFC අට්ටි නිදොසීම් ලොගය"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"NFC අට්ටි ලොග මට්ටම වැඩි කරන්න"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Cast"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"දර්පණය"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"රැහැන් රහිත දර්ශනය සබල කරන්න"</string>
@@ -1188,6 +1166,8 @@
     <string name="wifi_hotspot_maximize_compatibility_dual_ap_summary" msgid="3579549223159056533">"මෙම හොට්ස්පොට් සොයා ගැනීමට වෙනත් උපාංගවලට උදව් කරයි. බැටරි භාවිතය වැඩි කරයි."</string>
     <string name="wifi_tether_starting" msgid="8879874184033857814">"හොට්ස්පොට් සක්‍රිය කරමින්..."</string>
     <string name="wifi_tether_stopping" msgid="4416492968019409188">"හොට්ස්පොට් අක්‍රිය කරමින්…"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_title" msgid="3089432578433978073">"ටෙදරින් නොමැත"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_content" msgid="5920421547607921112">"විස්තර සඳහා ඔබගේ වාහකය අමතන්න"</string>
     <string name="wifi_tether_enabled_subtext" msgid="5085002421099821056">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> සක්‍රීයයි"</string>
     <string name="wifi_tether_failed_subtext" msgid="437190628041885500">"ජංගම Wi-Fi හොට්ස්පොට් දෝෂය"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7072559431286459122">"Wi-Fi හොට්ස්පොට් එක සකසන්න"</string>
@@ -2534,11 +2514,6 @@
     <string name="enable_service_title" msgid="7231533866953706788">"<xliff:g id="SERVICE">%1$s</xliff:g> හට ඔබේ උපාංගයේ සම්පූර්ණ පාලනය තබා ගැනීමට ඉඩ දෙන්නද?"</string>
     <string name="capabilities_list_title" msgid="1225853611983394386">"<xliff:g id="SERVICE">%1$s</xliff:g> හට අවශ්‍යයි:"</string>
     <string name="touch_filtered_warning" msgid="4225815157460318241">"යෙදුම අවසර ඉල්ලීමක් කරන නිසා, සැකසීම් හට ඔබගේ ප්‍රතිචාරය සත්‍යාපනය කළ නොහැක."</string>
-    <string name="enable_service_encryption_warning" msgid="931082737770453755">"ඔබ <xliff:g id="SERVICE">%1$s</xliff:g> සක්‍රිය කළේ නම්, දත්ත සංකේතනය වැඩි කිරීමට ඔබගේ උපාංගයට අගුළු තීරයක් භාවිතා කිරීමට අවශ්‍ය නැත."</string>
-    <string name="secure_lock_encryption_warning" msgid="669152607190123579">"ඔබ ප්‍රවේශතා සේවාව සක්‍රිය කළ නිසා, දත්ත සංකේතනය වැඩි කිරීමට ඔබගේ උපාංගයට අගුළු තීරයක් භාවිතා කිරීමට අවශ්‍ය නැත."</string>
-    <string name="enable_service_pattern_reason" msgid="6832846117817938536">"<xliff:g id="SERVICE">%1$s</xliff:g> බලපාන දත්ත සංකේතනය ක්‍රියාත්මක කරන නිසා, ඔබගේ රටාව ඔබට සහතික කිරීමට අවශ්‍යය."</string>
-    <string name="enable_service_pin_reason" msgid="6040417014360237703">"<xliff:g id="SERVICE">%1$s</xliff:g> බලපාන දත්ත සංකේතනය ක්‍රියාත්මක කරන නිසා, ඔබගේ PIN එක ඔබට සහතික කිරීමට අවශ්‍යය."</string>
-    <string name="enable_service_password_reason" msgid="6962544350351734238">"<xliff:g id="SERVICE">%1$s</xliff:g> බලපාන දත්ත සංකේතනය ක්‍රියාත්මක කරන නිසා, ඔබගේ මුරපදය ඔබට සහතික කිරීමට අවශ්‍යය."</string>
     <string name="accessibility_service_warning" msgid="6779187188736432618">"<xliff:g id="SERVICE">%1$s</xliff:g> මෙම උපාංගයේ සම්පූර්ණ පාලනය ඉල්ලමින්. සේවාවට තිරය කියවීමට සහ ප්‍රවේශ්‍යතා අවශ්‍යතා ඇති පරිශීලකයන් වෙනුවෙන් ක්‍රියා කිරීමට හැකිය. මෙම මට්ටමේ පාලනය බොහොමයක් යෙදුම් සඳහා සුදුසු නැත."</string>
     <string name="accessibility_service_warning_description" msgid="6573203795976134751">"පූර්ණ පාලනය ඔබට ප්‍රවේශ්‍යතා අවශ්‍යතා සමඟ උදවු කරන යෙදුම් සඳහා සුදුසු වන නමුත් බොහෝ යෙදුම් සඳහා සුදුසු නොවේ."</string>
     <string name="accessibility_service_screen_control_title" msgid="324795030658109870">"තිරය බලන්න සහ පාලන කරන්න"</string>
@@ -3103,14 +3078,6 @@
     <string name="remove_account_failed" msgid="3709502163548900644">"ඔබගේ පරිපාලක විසින් මෙම වෙනස් කිරීමට ඉඩ නොදේ"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"අතින් සමමුහුර්ත කළ නොහැක"</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"මෙම අයිතමය සඳහා සමමුර්ත කිරීම දැනට අබල කර ඇත. මෙම සැකසීම් වෙනස් කිරීමට, තාවකාලිකව පසුබිම් දත්ත සහ ස්වයංක්‍රිය සමමුහුර්තකරණය සක්‍රිය කරන්න."</string>
-    <string name="enter_password" msgid="6327051330258595331">"Android ආරම්භ කිරීමට, ඔබගේ මුරපදය ඇතුළු කරන්න"</string>
-    <string name="enter_pin" msgid="1029287617551232681">"Android ආරම්භ කිරීමට, ඔබගේ PIN එක ඇතුළු කරන්න"</string>
-    <string name="enter_pattern" msgid="1747316785866742960">"Android ආරම්භ කිරීමට, ඔබගේ රටාව අදින්න"</string>
-    <string name="cryptkeeper_wrong_pattern" msgid="340747269176120242">"වැරදි රටාවකි"</string>
-    <string name="cryptkeeper_wrong_password" msgid="7295607881887114486">"වැරදි මුරපදය"</string>
-    <string name="cryptkeeper_wrong_pin" msgid="2347961593970714201">"PIN එක වැරදියි"</string>
-    <string name="checking_decryption" msgid="6111642972615688237">"පරික්ෂා කරමින්..."</string>
-    <string name="starting_android" msgid="6694154070215356186">"Android ආරම්භ කරමින්..."</string>
     <string name="delete" msgid="8330605554706263775">"මකන්න"</string>
     <string name="misc_files" msgid="6598066985800749585">"විවිධ ගොනු"</string>
     <string name="misc_files_selected_count" msgid="5597802791672749532">"<xliff:g id="TOTAL">%2$d</xliff:g> වලින් තෝරා ගත් <xliff:g id="NUMBER">%1$d</xliff:g>"</string>
@@ -3206,8 +3173,6 @@
     <string name="data_usage_metered_yes" msgid="4262598072030135223">"මනිනු ලැබේ"</string>
     <string name="data_usage_metered_no" msgid="1685828958417926268">"මනිනු නොලැබේ"</string>
     <string name="data_usage_disclaimer" msgid="3271450299386176770">"ඔබගේ උපාංගයේ වාහක දත්ත ගිණුම් ගත කිරීම ඇතැම් විට වැර දේ."</string>
-    <string name="cryptkeeper_emergency_call" msgid="8369322820475703306">"හදිසි ඇමතුම්"</string>
-    <string name="cryptkeeper_return_to_call" msgid="3857250752781151232">"ඇමතුමට නැවත යන්න"</string>
     <string name="vpn_name" msgid="3806456074909253262">"නම‍"</string>
     <string name="vpn_type" msgid="5533202873260826663">"වර්ගය"</string>
     <string name="vpn_server" msgid="2908816134941973935">"සේවාදායක ලිපිනය"</string>
@@ -4764,8 +4729,6 @@
       <item quantity="other">යෙදුම් <xliff:g id="COUNT">%d</xliff:g>කට සීමා නොකළ දත්ත භාවිතා කළ හැක</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"තවත් බලන්න"</string>
-    <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"සැබවින්ම පරිශීලක දත්ත මකා ගොනු සංකේතනයට පරිවර්තනය කරන්නද?"</string>
-    <string name="button_confirm_convert_fbe" msgid="339648921918438106">"මකා පරිවර්තනය කරන්න"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"ShortcutManager අගය-සීමා කිරීම යළි සකසන්න"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"ShortcutManager අගය-සීමා කිරීම යළි සකසා ඇත"</string>
     <string name="notification_suggestion_title" msgid="6309263655965785411">"අගුලු තිරය මත පාලන තොරතුරු"</string>
@@ -5292,6 +5255,7 @@
     <string name="sim_action_yes" msgid="8076556020131395515">"ඔව්"</string>
     <string name="sim_action_reboot" msgid="3508948833333441538">"යළි අරඹන්න"</string>
     <string name="sim_action_no_thanks" msgid="435717748384544195">"එපා, ස්තුතියි"</string>
+    <string name="sim_action_cancel" msgid="2668099867029610910">"අවලංගු කරන්න"</string>
     <string name="sim_switch_button" msgid="1405772571706095387">"මාරු වන්න"</string>
     <string name="dsds_activation_failure_title" msgid="4467364110584914794">"SIM එක සක්‍රිය කිරීමට නොහැකිය"</string>
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"SIM එක ඉවත් කර එය නැවත ඇතුළු කරන්න. ප්‍රශ්නය දිගටම පැවතුණහොත්, ඔබේ උපාංගය යළි ආරම්භ කරන්න."</string>
@@ -5444,6 +5408,10 @@
     <string name="cached_apps_freezer" msgid="1057519579761550350">"කෑෂ් කළ යෙදුම් සඳහා ක්‍රියාත්මක කිරීම අතහිටුවන්න"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"සැකසීම්වලට තිර උඩැතිරි ඉඩ දෙන්න"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"වෙනත් යෙදුම් ඉහළින් සංදර්ශනය කළ හැකි යෙදුම්වලට සැකසීම් තිර වසාලීමට ඉඩ දෙන්න"</string>
+    <!-- no translation found for allow_mock_modem (3832264806530479214) -->
+    <skip />
+    <!-- no translation found for allow_mock_modem_summary (9097416612748005374) -->
+    <skip />
     <string name="media_controls_title" msgid="403271085636252597">"මාධ්‍ය"</string>
     <string name="media_controls_resume_title" msgid="855076860336652370">"මාධ්‍ය වාදකය අමුණන්න"</string>
     <string name="media_controls_resume_description" msgid="3163482266454802097">"පසුධාවනය ඉක්මනින් නැවත ධාවනය ආරම්භ කිරීමට, ඉක්මන් සැකසීම් තුළ මාධ්‍ය වාදකය විවෘතව පවතී"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 3f699fc..95ae9a0 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -144,10 +144,11 @@
     <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"Povoľte zariadeniu komunikovať so zariadeniami Bluetooth nablízku"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"Povoľte telefónu komunikovať so zariadeniami Bluetooth nablízku"</string>
     <string name="bluetooth_disable_a2dp_hw_offload" msgid="5942913792817797541">"Zakázať hardvérové zníženie záťaže Bluetooth (A2DP)"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="8610420176339657720">"Reštartovať?"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8333029144800835996">"Ak chcete zmeniť nastavenie, musíte reštartovať zariadenie."</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="3488695418187553566">"Reštartovať"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="4930826928585464191">"Zrušiť"</string>
+    <string name="bluetooth_disable_le_audio_hw_offload" msgid="3966022676505972908">"Deaktivácia zníženia zaťaženia hardvéru LE AUDIO s rozhraním Bluetooth"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_title" msgid="6001142380445276918">"Chcete zariadenie reštartovať?"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_message" msgid="1524373895333698779">"Ak chcete zmeniť toto nastavenie, musíte reštartovať zariadenie."</string>
+    <string name="bluetooth_disable_hw_offload_dialog_confirm" msgid="5594859658551707592">"Reštartovať"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel" msgid="3663690305043973720">"Zrušiť"</string>
     <string name="connected_device_media_device_title" msgid="3783388247594566734">"Mediálne zariadenia"</string>
     <string name="connected_device_call_device_title" msgid="88732390601723608">"Zariadenia na telefonovanie"</string>
     <string name="connected_device_other_device_title" msgid="4652120430615729193">"Iné zariadenia"</string>
@@ -315,9 +316,9 @@
     <string name="security_settings_title" msgid="6710768415432791970">"Zabezpečenie"</string>
     <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"Šifrovanie a poverenia"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"Telefón zašifrovaný"</string>
-    <string name="decryption_settings_summary" product="default" msgid="1742645256103613503">"Telefón nie je šifrovaný"</string>
+    <string name="not_encrypted_summary" product="default" msgid="2251945842585788254">"Telefón nie je šifrovaný"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"Zariadenie je šifrované"</string>
-    <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"Zariadenie nie je šifrované"</string>
+    <string name="not_encrypted_summary" product="tablet" msgid="2374263654698719382">"Zariadenie nie je šifrované"</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"Uzamknutá obrazovka"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"Čo zobrazovať"</string>
     <string name="security_settings_summary" msgid="1627059516127354233">"Moja poloha, odomknutie obrazovky, zámok SIM, zámok úložiska poverení"</string>
@@ -578,37 +579,10 @@
     <string name="fingerprint_last_delete_message" msgid="7860374760549404410">"Nebudete môcť odomykať telefón ani overovať svoju totožnosť v aplikáciách odtlačkom prsta."</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="4104208067277655068">"Nebudete môcť odomykať pracovný profil, schvaľovať nákupy ani sa prihlasovať do pracovných aplikácií odtlačkom prsta."</string>
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"Áno, odstrániť"</string>
-    <string name="crypt_keeper_settings_title" msgid="4938812137822100044">"Šifrovanie"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"Šifrovať tablet"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"Šifrovať telefón"</string>
-    <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"Šifrované"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"Svoje účty, nastavenia, stiahnuté aplikácie a ich dáta, médiá a ďalšie súbory môžete zašifrovať. Ak tablet zašifrujete a nastavili ste zámku obrazovky (bezpečnostný vzor, číselný kód PIN alebo heslo), bude potrebné ho pri každom zapnutí dešifrovať odomknutím obrazovky. Jediným ďalším spôsobom dešifrovania je obnovenie výrobných nastavení, ktorým vymažete všetky svoje dáta.\n\nŠifrovanie trvá hodinu alebo dlhšie. Šifrovanie je potrebné začať s plne nabitou batériou a počas šifrovania je potrebné nechať tablet pripojený k zdroju napájania. Ak šifrovanie prerušíte, prídete o niektoré alebo všetky svoje dáta."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"Svoje účty, nastavenia, stiahnuté aplikácie a ich dáta, médiá a ďalšie súbory môžete zašifrovať. Ak telefón zašifrujete a nastavili ste zámku obrazovky (bezpečnostný vzor, číselný kód PIN alebo heslo), bude potrebné ho pri každom zapnutí dešifrovať odomknutím obrazovky. Jediným ďalším spôsobom dešifrovania je obnovenie výrobných nastavení, ktorým vymažete všetky svoje dáta.\n\nŠifrovanie trvá hodinu alebo dlhšie. Šifrovanie je potrebné začať s plne nabitou batériou a počas šifrovania je potrebné nechať telefón pripojený k zdroju napájania. Ak šifrovanie prerušíte, prídete o niektoré alebo všetky svoje dáta."</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"Šifrovať tablet"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"Šifrovať telefón"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"Nabite batériu a skúste to znova."</string>
-    <string name="crypt_keeper_unplugged_text" msgid="2709721134148651329">"Zapojte nabíjačku a skúste to znova."</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="1847280235529858357">"Chýba heslo alebo kód PIN na odomknutie obrazovky"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="7210616262954236042">"Pred spustením šifrovania musíte nastaviť kód PIN alebo heslo zámky obrazovky."</string>
-    <string name="crypt_keeper_confirm_title" msgid="8600000209722452230">"Šifrovať?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="3270587498436152259">"Operácia šifrovania je nevratná a ak ju prerušíte, prídete o dáta. Šifrovanie môže trvať viac ako hodinu. Tablet sa počas tejto doby niekoľkokrát reštartuje."</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="3040428543349852419">"Operácia šifrovania je nevratná a ak ju prerušíte, prídete o dáta. Šifrovanie môže trvať viac ako hodinu. Telefón sa počas tejto doby niekoľkokrát reštartuje."</string>
-    <string name="crypt_keeper_setup_title" msgid="3339725741305796680">"Šifrovanie"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="4417016995091289019">"Čakajte na dokončenie procesu šifrovania tabletu. Dokončené: <xliff:g id="PERCENT">^1</xliff:g>%."</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="7902355422499500352">"Čakajte na dokončenie šifrovania telefónu. Dokončené: <xliff:g id="PERCENT">^1</xliff:g>%."</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="8348188415839917821">"Počkajte na dokončenie šifrovania tabletu. Zostávajúci čas: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="8556105766597855198">"Počkajte na dokončenie šifrovania telefónu. Zostávajúci čas: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="3832496715430327682">"Ak chcete odomknúť svoj tablet, vypnite ho a potom ho zapnite."</string>
-    <string name="crypt_keeper_force_power_cycle" product="default" msgid="5070346039522135361">"Ak chcete odomknúť svoj telefón, vypnite ho a potom ho zapnite."</string>
-    <string name="crypt_keeper_warn_wipe" msgid="8104921337301750394">"Upozornenie: Po viac ako <xliff:g id="COUNT">^1</xliff:g> neúspešných pokusoch o odomknutie bude vaše zariadenie vymazané!"</string>
-    <string name="crypt_keeper_enter_password" msgid="1274917431075529732">"Zadajte svoje heslo"</string>
-    <string name="crypt_keeper_failed_title" msgid="8173654570682244149">"Šifrovanie bolo neúspešné"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"Šifrovanie bolo prerušené a nedá sa dokončiť. Výsledkom je, že údaje vo vašom tablete už nie sú k dispozícii. \n\nAk chcete ďalej používať svoj tablet, musíte obnoviť jeho výrobné nastavenia. Po ich obnovení budete mať počas nastavovania tabletu príležitosť obnoviť všetky údaje, ktoré sa zálohovali do vášho účtu Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"Šifrovanie bolo prerušené a nedá sa dokončiť. Výsledkom je, že údaje vo vašom telefóne už nie sú k dispozícii. \n\nAk chcete ďalej používať svoj telefón, musíte obnoviť jeho výrobné nastavenia. Po ich obnovení budete mať počas nastavovania telefónu príležitosť obnoviť všetky údaje, ktoré boli zálohované vo vašom účte Google."</string>
-    <string name="crypt_keeper_data_corrupt_title" msgid="5920153462176846037">"Dešifrovanie sa nepodarilo"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"Zadané heslo je správne, avšak údaje sú poškodené. \n\nAk chcete ďalej používať svoj tablet, musíte obnoviť jeho výrobné nastavenia. Po ich obnovení budete mať počas nastavovania tabletu príležitosť obnoviť všetky údaje, ktoré boli zálohované vo vašom účte Google."</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"Zadané heslo je správne, avšak údaje sú poškodené. \n\nAk chcete ďalej používať svoj telefón, musíte obnoviť jeho výrobné nastavenia. Po ich obnovení budete mať počas nastavovania telefónu príležitosť obnoviť všetky údaje, ktoré boli zálohované vo vašom účte Google."</string>
-    <string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"Prepnúť metódu vstupu"</string>
+    <string name="encryption_settings_title" msgid="2848716008695618360">"Šifrovanie"</string>
+    <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"Šifrovať tablet"</string>
+    <string name="encrypt_title" product="default" msgid="7337365190988321100">"Šifrovať telefón"</string>
+    <string name="encrypted_summary" msgid="545623487587251207">"Šifrované"</string>
     <string name="suggested_lock_settings_title" msgid="7836065447159730217">"Zabezpečenie telefónu"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"Nastavenie zámky obrazovky na ochranu tabletu"</string>
     <string name="suggested_lock_settings_summary" product="device" msgid="8479766049078378225">"Nastavenie zámky obrazovky na ochranu zariadenia"</string>
@@ -853,6 +827,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Tento kód PIN bude možno treba zadať aj na druhom zariadení."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Tento prístupový kľúč možno bude potrebné zadať aj v druhom zariadení."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Párovanie so zariadením:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Uistite sa, že zobrazuje tento prístupový kľúč:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Potvrďte párovanie s koordinovanou skupinou"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"Zo zariadenia:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Párovať s týmto zariadením?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Ak chcete svoje zariadenie spárovať so zariadením <xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>, zadajte na ňom kód <xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g> a stlačte kláves Enter."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Povoliť prístup ku kontaktom a histórii hovorov"</string>
@@ -886,6 +861,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Nepodarilo sa pripojiť. Skúste to znova."</string>
     <string name="device_details_title" msgid="1155622417516195481">"O zariadení"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Adresa Bluetooth zariadenia: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Adresa zariadenia Bluetooth:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Zabudnúť zariadenie?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Odstrániť spojenie"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Chcete aplikáciu odpojiť?"</string>
@@ -917,6 +893,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Zapamätať nastavenia"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Maximálny počet pripojených zvukových zariadení Bluetooth"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Výber maximálneho počtu pripojených zvukových zariadení Bluetooth"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"Denník ladenia zásobníka NFC"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Zvýšiť úroveň zapisovania zásobníka NFC"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Prenos"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"zrkadlenie"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Povoliť bezdrôtové zobrazenie"</string>
@@ -1230,6 +1208,8 @@
     <string name="wifi_hotspot_maximize_compatibility_dual_ap_summary" msgid="3579549223159056533">"Pomáha ostatným zariadeniam nájsť tento hotspot. Zvýši sa spotreba batérie."</string>
     <string name="wifi_tether_starting" msgid="8879874184033857814">"Prebieha zapínanie hotspotu..."</string>
     <string name="wifi_tether_stopping" msgid="4416492968019409188">"Prebieha vypínanie hotspotu..."</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_title" msgid="3089432578433978073">"Zdieľanie dátového pripojenia nie je k dispozícii"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_content" msgid="5920421547607921112">"Podrobnosti vám poskytne operátor"</string>
     <string name="wifi_tether_enabled_subtext" msgid="5085002421099821056">"Sieť <xliff:g id="NETWORK_SSID">%1$s</xliff:g> je aktívna"</string>
     <string name="wifi_tether_failed_subtext" msgid="437190628041885500">"Chyba hotspotu siete Wi‑Fi"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7072559431286459122">"Nastaviť hotspot Wi‑Fi"</string>
@@ -2594,11 +2574,6 @@
     <string name="enable_service_title" msgid="7231533866953706788">"Chcete povoliť službe <xliff:g id="SERVICE">%1$s</xliff:g> úplnú kontrolu nad zariadením?"</string>
     <string name="capabilities_list_title" msgid="1225853611983394386">"<xliff:g id="SERVICE">%1$s</xliff:g> potrebuje:"</string>
     <string name="touch_filtered_warning" msgid="4225815157460318241">"Nastavenia nemôžu overiť vašu odpoveď, pretože určitá aplikácia blokuje žiadosť o povolenie."</string>
-    <string name="enable_service_encryption_warning" msgid="931082737770453755">"Ak zapnete službu <xliff:g id="SERVICE">%1$s</xliff:g>, vaše zariadenie nepoužije zámku obrazovky na zvýšenie miery šifrovania údajov."</string>
-    <string name="secure_lock_encryption_warning" msgid="669152607190123579">"Keďže ste zapli služby dostupnosti, vaše zariadenie nepoužije zámku obrazovky na zvýšenie miery šifrovania údajov."</string>
-    <string name="enable_service_pattern_reason" msgid="6832846117817938536">"Keďže zapnutie služby <xliff:g id="SERVICE">%1$s</xliff:g> ovplyvňuje šifrovanie údajov, musíte potvrdiť svoj vzor."</string>
-    <string name="enable_service_pin_reason" msgid="6040417014360237703">"Keďže zapnutie služby <xliff:g id="SERVICE">%1$s</xliff:g> ovplyvňuje šifrovanie údajov, musíte potvrdiť svoj kód PIN."</string>
-    <string name="enable_service_password_reason" msgid="6962544350351734238">"Keďže zapnutie služby <xliff:g id="SERVICE">%1$s</xliff:g> ovplyvňuje šifrovanie údajov, musíte potvrdiť svoje heslo."</string>
     <string name="accessibility_service_warning" msgid="6779187188736432618">"Služba <xliff:g id="SERVICE">%1$s</xliff:g> vyžaduje úplnú kontrolu nad týmto zariadením. Táto služba môže čítať obrazovku a konať v mene používateľov, ktorí vyžadujú funkcie dostupnosti. Pre väčšinu aplikácií nie je táto úroveň kontroly primeraná."</string>
     <string name="accessibility_service_warning_description" msgid="6573203795976134751">"Úplná kontrola je vhodná pre aplikácie, ktoré vám pomáhajú s dostupnosťou, ale nie pre väčšinu aplikácií."</string>
     <string name="accessibility_service_screen_control_title" msgid="324795030658109870">"Zobrazenie a ovládanie obrazovky"</string>
@@ -3185,14 +3160,6 @@
     <string name="remove_account_failed" msgid="3709502163548900644">"Správca túto zmenu zakázal"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"Nie je možné ručne synchronizovať"</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"Synchronizácia tejto položky je momentálne zakázaná. Ak chcete toto nastavenie zmeniť, dočasne zapnite dátové prenosy na pozadí a automatickú synchronizáciu."</string>
-    <string name="enter_password" msgid="6327051330258595331">"Ak chcete spustiť Android, zadajte heslo."</string>
-    <string name="enter_pin" msgid="1029287617551232681">"Ak chcete spustiť Android, zadajte číslo PIN."</string>
-    <string name="enter_pattern" msgid="1747316785866742960">"Ak chcete spustiť Android, nakreslite vzor."</string>
-    <string name="cryptkeeper_wrong_pattern" msgid="340747269176120242">"Nesprávny vzor"</string>
-    <string name="cryptkeeper_wrong_password" msgid="7295607881887114486">"Nesprávne heslo"</string>
-    <string name="cryptkeeper_wrong_pin" msgid="2347961593970714201">"Nesprávny kód PIN"</string>
-    <string name="checking_decryption" msgid="6111642972615688237">"Kontroluje sa…"</string>
-    <string name="starting_android" msgid="6694154070215356186">"Spúšťa sa systém Android..."</string>
     <string name="delete" msgid="8330605554706263775">"Odstrániť"</string>
     <string name="misc_files" msgid="6598066985800749585">"Rôzne súbory"</string>
     <string name="misc_files_selected_count" msgid="5597802791672749532">"vybraté: <xliff:g id="NUMBER">%1$d</xliff:g> z <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -3288,8 +3255,6 @@
     <string name="data_usage_metered_yes" msgid="4262598072030135223">"Merané"</string>
     <string name="data_usage_metered_no" msgid="1685828958417926268">"Nemerané"</string>
     <string name="data_usage_disclaimer" msgid="3271450299386176770">"Účtovanie dát operátorom sa môže líšiť od údajov zariadenia."</string>
-    <string name="cryptkeeper_emergency_call" msgid="8369322820475703306">"Tiesňové volanie"</string>
-    <string name="cryptkeeper_return_to_call" msgid="3857250752781151232">"Späť na hovor"</string>
     <string name="vpn_name" msgid="3806456074909253262">"Názov"</string>
     <string name="vpn_type" msgid="5533202873260826663">"Typ"</string>
     <string name="vpn_server" msgid="2908816134941973935">"Adresa servera"</string>
@@ -4916,8 +4881,6 @@
       <item quantity="one">Neobmedzené dáta môže používať 1 aplikácia</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"Zobraziť viac"</string>
-    <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"Naozaj chcete vymazať údaje používateľa a konvertovať na šifrovanie súborov?"</string>
-    <string name="button_confirm_convert_fbe" msgid="339648921918438106">"Vymazať a konvertovať"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"Resetovať obmedzovanie frekvencie žiadostí v službe ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"Obmedzovanie frekvencie žiadostí v službe ShortcutManager bolo resetované"</string>
     <string name="notification_suggestion_title" msgid="6309263655965785411">"Ovládajte informácie na uzamknutej obrazovke"</string>
@@ -5468,6 +5431,7 @@
     <string name="sim_action_yes" msgid="8076556020131395515">"Áno"</string>
     <string name="sim_action_reboot" msgid="3508948833333441538">"Reštartovať"</string>
     <string name="sim_action_no_thanks" msgid="435717748384544195">"Nie, vďaka"</string>
+    <string name="sim_action_cancel" msgid="2668099867029610910">"Zrušiť"</string>
     <string name="sim_switch_button" msgid="1405772571706095387">"Prepnúť"</string>
     <string name="dsds_activation_failure_title" msgid="4467364110584914794">"SIM kartu sa nepodarilo aktivovať"</string>
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Vyberte SIM kartu a znova ju vložte. Ak bude problém pretrvávať, reštartujte zariadenie."</string>
@@ -5624,6 +5588,10 @@
     <string name="cached_apps_freezer" msgid="1057519579761550350">"Pozastaviť spúšťanie aplikácií z vyrovnávacej pamäte"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"Povoliť prekrývajúce prvky v Nastaveniach"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Povoliť aplikáciám, ktoré sa môžu zobraziť cez iné aplikácie, prekrývanie obrazoviek Nastavení"</string>
+    <!-- no translation found for allow_mock_modem (3832264806530479214) -->
+    <skip />
+    <!-- no translation found for allow_mock_modem_summary (9097416612748005374) -->
+    <skip />
     <string name="media_controls_title" msgid="403271085636252597">"Médiá"</string>
     <string name="media_controls_resume_title" msgid="855076860336652370">"Pripnúť prehrávač médií"</string>
     <string name="media_controls_resume_description" msgid="3163482266454802097">"Prehrávač médií zostane otvorený v rýchlych nastaveniach, aby bolo možné rýchlo obnoviť prehrávanie"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index a4f7683..faf53cd 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -144,10 +144,11 @@
     <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"Omogočite napravi, da komunicira z napravami Bluetooth v bližini"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"Omogočite telefonu, da komunicira z napravami Bluetooth v bližini"</string>
     <string name="bluetooth_disable_a2dp_hw_offload" msgid="5942913792817797541">"Onemogoči prelaganje s strojne opreme za A2DP za Bluetooth"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="8610420176339657720">"Vnovični zagon?"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8333029144800835996">"Če želite spremeniti to nastavitev, znova zaženite napravo."</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="3488695418187553566">"Nov zagon"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="4930826928585464191">"Prekliči"</string>
+    <string name="bluetooth_disable_le_audio_hw_offload" msgid="3966022676505972908">"Onemogoči prelaganje na strojno opremo za Bluetooth LE AUDIO"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_title" msgid="6001142380445276918">"Vnovični zagon?"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_message" msgid="1524373895333698779">"Če želite spremeniti to nastavitev, znova zaženite napravo."</string>
+    <string name="bluetooth_disable_hw_offload_dialog_confirm" msgid="5594859658551707592">"Zaženi znova"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel" msgid="3663690305043973720">"Prekliči"</string>
     <string name="connected_device_media_device_title" msgid="3783388247594566734">"Predstavnostne naprave"</string>
     <string name="connected_device_call_device_title" msgid="88732390601723608">"Klicne naprave"</string>
     <string name="connected_device_other_device_title" msgid="4652120430615729193">"Druge naprave"</string>
@@ -302,10 +303,10 @@
     <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Uporabi lokacijo"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Izklopljeno"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
-      <item quantity="one">Vklopljeno – dostop do lokacije ima <xliff:g id="COUNT_1">%1$d</xliff:g> aplikacija</item>
-      <item quantity="two">Vklopljeno – dostop do lokacije imata <xliff:g id="COUNT_1">%1$d</xliff:g> aplikaciji</item>
-      <item quantity="few">Vklopljeno – dostop do lokacije imajo <xliff:g id="COUNT_1">%1$d</xliff:g> aplikacije</item>
-      <item quantity="other">Vklopljeno – dostop do lokacije ima <xliff:g id="COUNT_1">%1$d</xliff:g> aplikacij</item>
+      <item quantity="one">Vklopljeno – dostop do lokacije ima <xliff:g id="COUNT_1">%1$d</xliff:g> aplikacija.</item>
+      <item quantity="two">Vklopljeno – dostop do lokacije imata <xliff:g id="COUNT_1">%1$d</xliff:g> aplikaciji.</item>
+      <item quantity="few">Vklopljeno – dostop do lokacije imajo <xliff:g id="COUNT_1">%1$d</xliff:g> aplikacije.</item>
+      <item quantity="other">Vklopljeno – dostop do lokacije ima <xliff:g id="COUNT_1">%1$d</xliff:g> aplikacij.</item>
     </plurals>
     <string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"Nalaganje …"</string>
     <string name="location_settings_footer_general" msgid="1040507068701188821">"Aplikacije z dovoljenjem za naprave v bližini lahko določijo relativno lokacijo povezanih naprav."</string>
@@ -315,9 +316,9 @@
     <string name="security_settings_title" msgid="6710768415432791970">"Varnost"</string>
     <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"Šifriranje in poverilnice"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"Telefon je šifriran"</string>
-    <string name="decryption_settings_summary" product="default" msgid="1742645256103613503">"Telefon ni šifriran"</string>
+    <string name="not_encrypted_summary" product="default" msgid="2251945842585788254">"Telefon ni šifriran"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"Naprava je šifrirana"</string>
-    <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"Naprava ni šifrirana"</string>
+    <string name="not_encrypted_summary" product="tablet" msgid="2374263654698719382">"Naprava ni šifrirana"</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"Zaklenjen zaslon"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"Kaj naj bo prikazano"</string>
     <string name="security_settings_summary" msgid="1627059516127354233">"Nastavi Mojo lokacijo, odklepanje zaslona, zaklepanje kartice SIM, zaklepanje shrambe poverilnic"</string>
@@ -578,37 +579,10 @@
     <string name="fingerprint_last_delete_message" msgid="7860374760549404410">"Za odklepanje telefona ali potrditev identitete v aplikacijah ne boste mogli uporabljati prstnega odtisa."</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="4104208067277655068">"Za odklepanje delovnega profila, odobritev nakupov ali prijavo v delovne aplikacije ne boste mogli uporabljati prstnega odtisa."</string>
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"Da, odstrani"</string>
-    <string name="crypt_keeper_settings_title" msgid="4938812137822100044">"Šifriranje"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"Šifriraj tablični računalnik"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"Šifriranje telefona"</string>
-    <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"Šifrirano"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"Šifrirate lahko račune, nastavitve, prenesene aplikacije in njihove podatke, predstavnosti in druge datoteke. Če ste nastavili zaklepanje zaslona (z vzorcem, številsko kodo PIN ali geslom), boste morali po šifriranju tabličnega računalnika ob vsakem vklopu odkleniti zaslon, če boste želeli tablični računalnik dešifrirati. Edini drugi način dešifriranja tabličnega računalnika je, da ga ponastavite na tovarniške nastavitve, s čemer izbrišete vse podatke.\n\nŠifriranje traja najmanj eno uro. Ko začnete šifriranje, naj bo baterija napolnjena, tablični računalnik pa naj bo med celotnim postopkom priklopljen na električno omrežje. Če postopek prekinete, boste izgubili nekatere ali vse podatke."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"Šifrirate lahko račune, nastavitve, prenesene aplikacije in njihove podatke, predstavnosti in druge datoteke. Če ste nastavili zaklepanje zaslona (z vzorcem, številsko kodo PIN ali geslom), boste morali po šifriranju telefona ob vsakem vklopu odkleniti zaslon, če boste želeli telefon dešifrirati. Edini drugi način dešifriranja je, da telefon ponastavite na tovarniške nastavitve, s čemer izbrišete vse podatke.\n\nŠifriranje traja najmanj eno uro. Ko začnete šifriranje, naj bo baterija napolnjena, telefon pa naj bo med celotnim postopkom priklopljen na električno omrežje. Če postopek prekinete, boste izgubili nekatere ali vse podatke."</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"Šifriraj tablični računalnik"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"Šifriraj telefon"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"Napolnite baterijo in poskusite znova."</string>
-    <string name="crypt_keeper_unplugged_text" msgid="2709721134148651329">"Priključite polnilnik in poskusite znova."</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="1847280235529858357">"Ni kode PIN ali gesla za zaklepanje zaslona"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="7210616262954236042">"Preden lahko začnete s šifriranjem, morate nastaviti kodo PIN ali geslo za zaklepanje zaslona."</string>
-    <string name="crypt_keeper_confirm_title" msgid="8600000209722452230">"Želite šifrirati?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="3270587498436152259">"Šifriranja ne morete razveljaviti ali prekiniti, ker lahko izgubite podatke. Šifriranje traja eno uro ali več in v tem času se bo tablični računalnik večkrat znova zagnal."</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="3040428543349852419">"Šifriranja ne morete razveljaviti ali prekiniti, ker lahko izgubite podatke. Šifriranje traja eno uro ali več in v tem času se bo telefon večkrat znova zagnal."</string>
-    <string name="crypt_keeper_setup_title" msgid="3339725741305796680">"Šifriranje"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="4417016995091289019">"Počakajte, tablični računalnik se šifrira. Dokončano: <xliff:g id="PERCENT">^1</xliff:g>%."</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="7902355422499500352">"Počakajte, telefon se šifrira. Dokončano: <xliff:g id="PERCENT">^1</xliff:g>%."</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="8348188415839917821">"Počakajte, poteka šifriranje tabličnega računalnika. Preostane še: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="8556105766597855198">"Počakajte, poteka šifriranje telefona. Preostane še: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="3832496715430327682">"Če želite odkleniti tablični računalnik, ga izklopite in nato vklopite."</string>
-    <string name="crypt_keeper_force_power_cycle" product="default" msgid="5070346039522135361">"Če želite odkleniti telefon, ga izklopite in nato vklopite."</string>
-    <string name="crypt_keeper_warn_wipe" msgid="8104921337301750394">"Opozorilo: Podatki v napravi bodo izbrisani po še toliko neuspešnih poskusih odklepanja: <xliff:g id="COUNT">^1</xliff:g>."</string>
-    <string name="crypt_keeper_enter_password" msgid="1274917431075529732">"Vnesite geslo"</string>
-    <string name="crypt_keeper_failed_title" msgid="8173654570682244149">"Šifriranje ni uspelo"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"Šifriranje je bilo prekinjeno in ga ni mogoče končati, zato podatki v tabličnem računalniku niso več dostopni. \n\nČe želite tablični računalnik spet uporabljati, ga morate ponastaviti na tovarniške nastavitve. Ko ga po ponastavitvi spet nastavite, boste lahko obnovili vse podatke, ki so bili varnostno kopirani v račun Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"Šifriranje je bilo prekinjeno in ga ni mogoče končati, zato podatki v telefonu niso več dostopni. \n\nČe želite telefon ponovno uporabljati, ga morate ponastaviti na tovarniške nastavitve. Ko ga po ponastavitvi ponovno nastavite, boste lahko obnovili vse podatke, ki so bili varnostno kopirani v račun Google."</string>
-    <string name="crypt_keeper_data_corrupt_title" msgid="5920153462176846037">"Dešifriranje ni uspelo"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"Vnesli ste pravilno geslo, vendar so podatki poškodovani. \n\nČe želite še naprej uporabljati tablični računalnik, ga morate ponastaviti na tovarniške nastavitve. Ko boste po ponastavitvi nastavljali tablični računalnik, boste lahko obnovili morebitne podatke, ki so bili varnostno kopirani v račun Google."</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"Vnesli ste pravilno geslo, vendar so podatki poškodovani. \n\nČe želite še naprej uporabljati telefon, ga morate ponastaviti na tovarniške nastavitve. Ko boste po ponastavitvi nastavljali telefon, boste lahko obnovili morebitne podatke, ki so bili varnostno kopirani v račun Google."</string>
-    <string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"Preklopite način vnosa"</string>
+    <string name="encryption_settings_title" msgid="2848716008695618360">"Šifriranje"</string>
+    <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"Šifriraj tablični računalnik"</string>
+    <string name="encrypt_title" product="default" msgid="7337365190988321100">"Šifriraj telefon"</string>
+    <string name="encrypted_summary" msgid="545623487587251207">"Šifrirano"</string>
     <string name="suggested_lock_settings_title" msgid="7836065447159730217">"Zaščitite telefon"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"Nastavite zaklepanje zaslona, da zaščitite tablico"</string>
     <string name="suggested_lock_settings_summary" product="device" msgid="8479766049078378225">"Nastavite zaklepanje zaslona, da zaščitite napravo"</string>
@@ -853,6 +827,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Ta PIN boste morda morali vnesti tudi v drugi napravi."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Geslo boste morda morali vnesti tudi v drugi napravi."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Če želite seznaniti z napravo:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Prikazano mora biti to geslo:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Potrdite seznanjanje s kompletom naprav"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"Od:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Ali se želite povezati s to napravo?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Če želite vzpostaviti povezavo z napravo:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>V njej vnesite:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g> in pritisnite Return ali Enter."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Dovoli dostop do stikov in zgodovine klicev"</string>
@@ -886,6 +861,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Povezave ni bilo mogoče vzpostaviti. Poskusite znova."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Podrobnosti o napravi"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Naslov Bluetooth naprave: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Naslov Bluetooth naprave:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Želite, da vaša naprava pozabi seznanjeno napravo?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Odstrani povezavo"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Želite prekiniti povezavo z aplikacijo?"</string>
@@ -917,6 +893,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Zapomni si nastavitve"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Največje dovoljeno število povezanih zvočnih naprav Bluetooth"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Izberite največje dovoljeno število povezanih zvočnih naprav Bluetooth"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"Dnevnik odpravljanja napak sklada NFC"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Povečaj raven zapisovanja dnevnika za sklad NFC"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Predvajanje"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"zrcaljenje"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Omogočanje brezžičnega zaslona"</string>
@@ -1230,6 +1208,8 @@
     <string name="wifi_hotspot_maximize_compatibility_dual_ap_summary" msgid="3579549223159056533">"Drugim napravam pomaga najti to dostopno točko. Poveča porabo energije baterije."</string>
     <string name="wifi_tether_starting" msgid="8879874184033857814">"Vklop dostopne točke  ..."</string>
     <string name="wifi_tether_stopping" msgid="4416492968019409188">"Izklop dostopne točke ..."</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_title" msgid="3089432578433978073">"Internetna povezava prek mobilnega telefona ni na voljo"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_content" msgid="5920421547607921112">"Za podrobnejše informacije se obrnite na operaterja."</string>
     <string name="wifi_tether_enabled_subtext" msgid="5085002421099821056">"Povezava <xliff:g id="NETWORK_SSID">%1$s</xliff:g> je aktivna"</string>
     <string name="wifi_tether_failed_subtext" msgid="437190628041885500">"Napaka prenosne dostopne točke Wi-Fi"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7072559431286459122">"Nastavitev dostopne točke Wi-Fi"</string>
@@ -2594,11 +2574,6 @@
     <string name="enable_service_title" msgid="7231533866953706788">"Ali storitvi »<xliff:g id="SERVICE">%1$s</xliff:g>« dovolite popoln nadzor nad svojo napravo?"</string>
     <string name="capabilities_list_title" msgid="1225853611983394386">"<xliff:g id="SERVICE">%1$s</xliff:g> mora:"</string>
     <string name="touch_filtered_warning" msgid="4225815157460318241">"Ker aplikacija zakriva zahtevo za dovoljenje, z nastavitvami ni mogoče preveriti vašega odziva."</string>
-    <string name="enable_service_encryption_warning" msgid="931082737770453755">"Če vklopite storitev <xliff:g id="SERVICE">%1$s</xliff:g>, vaša naprava ne bo uporabljala zaklepanja zaslona za izboljšanje šifriranja podatkov."</string>
-    <string name="secure_lock_encryption_warning" msgid="669152607190123579">"Vaša naprava ne bo uporabljala zaklepanja zaslona za izboljšanje šifriranja podatkov, ker ste vklopili storitev za ljudi s posebnimi potrebami."</string>
-    <string name="enable_service_pattern_reason" msgid="6832846117817938536">"Ker vklop storitve <xliff:g id="SERVICE">%1$s</xliff:g> vpliva na šifriranje podatkov, morate potrditi vzorec."</string>
-    <string name="enable_service_pin_reason" msgid="6040417014360237703">"Ker vklop storitve <xliff:g id="SERVICE">%1$s</xliff:g> vpliva na šifriranje podatkov, morate potrditi kodo PIN."</string>
-    <string name="enable_service_password_reason" msgid="6962544350351734238">"Ker vklop storitve <xliff:g id="SERVICE">%1$s</xliff:g> vpliva na šifriranje podatkov, morate potrditi geslo."</string>
     <string name="accessibility_service_warning" msgid="6779187188736432618">"<xliff:g id="SERVICE">%1$s</xliff:g> zahteva popoln nadzor nad to napravo. Storitev lahko prebere zaslon in deluje v imenu uporabnikov s posebnimi potrebami. Ta raven nadzora za večino aplikacij ni primerna."</string>
     <string name="accessibility_service_warning_description" msgid="6573203795976134751">"Popoln nadzor je ustrezen za aplikacije, ki vam pomagajo pri funkcijah za ljudi s posebnimi potrebami, vendar ne za večino aplikacij."</string>
     <string name="accessibility_service_screen_control_title" msgid="324795030658109870">"Ogledovanje in upravljanje zaslona"</string>
@@ -3185,14 +3160,6 @@
     <string name="remove_account_failed" msgid="3709502163548900644">"Skrbnik ne dovoli te spremembe"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"Ročna sinhronizacija ni mogoča"</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"Sinhronizacija za ta element je trenutno onemogočena. Če želite spremeniti nastavitev, vklopite podatke v ozadju in samodejno sinhronizacijo."</string>
-    <string name="enter_password" msgid="6327051330258595331">"Če želite zagnati Android, vnesite geslo"</string>
-    <string name="enter_pin" msgid="1029287617551232681">"Če želite zagnati Android, vnesite PIN"</string>
-    <string name="enter_pattern" msgid="1747316785866742960">"Če želite zagnati Android, narišite vzorec"</string>
-    <string name="cryptkeeper_wrong_pattern" msgid="340747269176120242">"Napačen vzorec"</string>
-    <string name="cryptkeeper_wrong_password" msgid="7295607881887114486">"Napačno geslo"</string>
-    <string name="cryptkeeper_wrong_pin" msgid="2347961593970714201">"Napačna koda PIN"</string>
-    <string name="checking_decryption" msgid="6111642972615688237">"Preverjanje ..."</string>
-    <string name="starting_android" msgid="6694154070215356186">"Zagon Androida ..."</string>
     <string name="delete" msgid="8330605554706263775">"Izbriši"</string>
     <string name="misc_files" msgid="6598066985800749585">"Razne datoteke"</string>
     <string name="misc_files_selected_count" msgid="5597802791672749532">"izbrano: <xliff:g id="NUMBER">%1$d</xliff:g> od <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -3288,8 +3255,6 @@
     <string name="data_usage_metered_yes" msgid="4262598072030135223">"Omejen prenos podatkov"</string>
     <string name="data_usage_metered_no" msgid="1685828958417926268">"Z neomejenim prenosom podatkov"</string>
     <string name="data_usage_disclaimer" msgid="3271450299386176770">"Operaterjeve meritve porabe podatkov so morda drugačne kot v napravi."</string>
-    <string name="cryptkeeper_emergency_call" msgid="8369322820475703306">"Klic v sili"</string>
-    <string name="cryptkeeper_return_to_call" msgid="3857250752781151232">"Nazaj na klic"</string>
     <string name="vpn_name" msgid="3806456074909253262">"Ime"</string>
     <string name="vpn_type" msgid="5533202873260826663">"Vrsta"</string>
     <string name="vpn_server" msgid="2908816134941973935">"Naslov strežnika"</string>
@@ -4916,8 +4881,6 @@
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> aplikacijam je dovoljen neomejen prenos podatkov.</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"Prikaži več"</string>
-    <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"Ali želite res izbrisati uporabniške podatke in preklopiti na šifriranje podatkov?"</string>
-    <string name="button_confirm_convert_fbe" msgid="339648921918438106">"Izbriši in preklopi"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"Ponastavitev omejevanja hitrosti za ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"Omejevanje hitrosti za ShortcutManager je ponastavljeno"</string>
     <string name="notification_suggestion_title" msgid="6309263655965785411">"Upravljanje podatkov na zaklenjenem zaslonu"</string>
@@ -5468,6 +5431,7 @@
     <string name="sim_action_yes" msgid="8076556020131395515">"Da"</string>
     <string name="sim_action_reboot" msgid="3508948833333441538">"Znova zaženi"</string>
     <string name="sim_action_no_thanks" msgid="435717748384544195">"Ne, hvala"</string>
+    <string name="sim_action_cancel" msgid="2668099867029610910">"Prekliči"</string>
     <string name="sim_switch_button" msgid="1405772571706095387">"Preklopi"</string>
     <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Kartice SIM ni mogoče aktivirati"</string>
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Kartico SIM odstranite in jo znova vstavite. Če s tem ne odpravite težave, znova zaženite napravo."</string>
@@ -5624,6 +5588,10 @@
     <string name="cached_apps_freezer" msgid="1057519579761550350">"Ustavitev izvajanja za predpomnjene aplikacije"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"Dovoli prekrivanje zaslonov z nastavitvami"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Dovoli aplikacijam, ki lahko prekrivajo druge aplikacije, prekrivanje zaslonov v aplikaciji Nastavitve."</string>
+    <!-- no translation found for allow_mock_modem (3832264806530479214) -->
+    <skip />
+    <!-- no translation found for allow_mock_modem_summary (9097416612748005374) -->
+    <skip />
     <string name="media_controls_title" msgid="403271085636252597">"Predstavnost"</string>
     <string name="media_controls_resume_title" msgid="855076860336652370">"Pripni predvajalnik predstavnosti"</string>
     <string name="media_controls_resume_description" msgid="3163482266454802097">"Predvajalnik predstavnosti ostane odprt v hitrih nastavitvah, da je omogočeno hitro nadaljevanje predvajanja."</string>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index a39ba5f..233f083 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -142,10 +142,11 @@
     <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"Lejo që pajisja jote të komunikojë me pajisjet me Bluetooth në afërsi"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"Lejo që telefoni yt të komunikojë me pajisjet me Bluetooth në afërsi"</string>
     <string name="bluetooth_disable_a2dp_hw_offload" msgid="5942913792817797541">"Çaktivizo shkarkimin e harduerit të Bluetooth A2DP"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="8610420176339657720">"Të riniset pajisja?"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8333029144800835996">"Duhet të rinisësh pajisjen tënde për të ndryshuar këtë cilësim."</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="3488695418187553566">"Rinis"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="4930826928585464191">"Anulo"</string>
+    <string name="bluetooth_disable_le_audio_hw_offload" msgid="3966022676505972908">"Çaktivizo shkarkimin e harduerit të Bluetooth LE AUDIO"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_title" msgid="6001142380445276918">"Të riniset pajisja?"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_message" msgid="1524373895333698779">"Duhet të rinisësh pajisjen tënde për të ndryshuar këtë cilësim."</string>
+    <string name="bluetooth_disable_hw_offload_dialog_confirm" msgid="5594859658551707592">"Rinis"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel" msgid="3663690305043973720">"Anulo"</string>
     <string name="connected_device_media_device_title" msgid="3783388247594566734">"Pajisjet për median"</string>
     <string name="connected_device_call_device_title" msgid="88732390601723608">"Pajisjet për telefonata"</string>
     <string name="connected_device_other_device_title" msgid="4652120430615729193">"Pajisjet e tjera"</string>
@@ -309,9 +310,9 @@
     <string name="security_settings_title" msgid="6710768415432791970">"Siguria"</string>
     <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"Enkriptimi dhe kredencialet"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"Telefoni është i enkriptuar"</string>
-    <string name="decryption_settings_summary" product="default" msgid="1742645256103613503">"Telefoni nuk është i enkriptuar"</string>
+    <string name="not_encrypted_summary" product="default" msgid="2251945842585788254">"Telefoni nuk është i enkriptuar"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"Pajisja është e enkriptuar"</string>
-    <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"Pajisja nuk është e enkriptuar"</string>
+    <string name="not_encrypted_summary" product="tablet" msgid="2374263654698719382">"Pajisja nuk është e enkriptuar"</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"Ekrani i kyçjes"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"Çfarë të shfaqet"</string>
     <string name="security_settings_summary" msgid="1627059516127354233">"Cakto \"Vendndodhjen time\", shkyçjen e ekranit, kyçjen e kartës SIM, kyçjen e hapësirës ruajtëse të kredencialeve"</string>
@@ -568,37 +569,10 @@
     <string name="fingerprint_last_delete_message" msgid="7860374760549404410">"Nuk do të jesh në gjendje të përdorësh gjurmën e gishtit për të shkyçur telefonin tënd ose për të verifikuar që je ti në aplikacione."</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="4104208067277655068">"Nuk do të jesh në gjendje të përdorësh gjurmën e gishtit për të shkyçur profilin tënd të punës, për të autorizuar blerje ose për t\'u identifikuar në aplikacionet e punës."</string>
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"Po, hiqi"</string>
-    <string name="crypt_keeper_settings_title" msgid="4938812137822100044">"Enkriptimi"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"Enkripto tabletin"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"Enkripto telefonin"</string>
-    <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"I enkriptuar"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"Mund të enkriptosh llogaritë e tua, cilësimet, aplikacionet e shkarkuara dhe të dhënat e tyre, klipet \"media\" (muzikë e fotografi) si dhe skedarë të tjerë. Pasi të kesh enkriptuar tabletin, do të të nevojitet një kod PIN numerik apo fjalëkalim që të shkyçësh ekranin për ta deshifruar atë çdo herë që e ndez. E vetmja mënyrë tjetër për të deshifruar tabletin është rivendosja në gjendje fabrike, duke spastruar të gjitha të dhënat.\n\nEnkriptimi zgjat një orë ose më shumë. Kur të fillosh, sigurohu të kesh baterinë e karikuar dhe ta mbash tabletin në prizë gjatë gjithë procesit. Nëse e ndërpret, do të humbësh disa nga të dhënat ose të gjitha."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"Mund të enkriptosh llogaritë e tua, cilësimet, aplikacionet e shkarkuara dhe të dhënat e tyre, klipet \"media\" (muzikë e fotografi) si dhe skedarë të tjerë. Pasi ta kesh enkriptuar telefonin, do të të nevojitet një kod PIN numerik apo fjalëkalim që të shkyçësh ekranin e për ta deshifruar atë çdo herë që e ndez. E vetmja mënyrë tjetër për të deshifruar telefonin është rivendosja në gjendje fabrike, duke spastruar të gjitha të dhënat.\n\nEnkriptimi zgjat një orë ose më shumë. Kur të fillosh, sigurohu të kesh baterinë e karikuar dhe ta mbash telefonin në prizë gjatë gjithë procesit. Nëse e ndërpret, do të humbësh disa nga të dhënat ose të gjitha."</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"Enkripto tabletin"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"Enkripto telefonin"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"Ngarko baterinë dhe provo përsëri."</string>
-    <string name="crypt_keeper_unplugged_text" msgid="2709721134148651329">"Vëre karikuesin në prizë dhe provo përsëri."</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="1847280235529858357">"Nuk ka një kod PIN ose fjalëkalim të ekranit të kyçjes"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="7210616262954236042">"Duhet të caktosh një PIN të ekranit të kyçjes ose një fjalëkalim para se të mund të nisësh enkriptimin."</string>
-    <string name="crypt_keeper_confirm_title" msgid="8600000209722452230">"Të enkriptohet?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="3270587498436152259">"Operacioni i enkriptimit është i pakthyeshëm dhe nëse e ndërpret, do të humbësh të dhënat. Enkriptimi zgjat një orë ose më shumë, kohë gjatë të cilës tableti do të riniset disa herë."</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="3040428543349852419">"Operacioni i enkriptimit është i pakthyeshëm dhe nëse e ndërpret, do të humbësh të dhënat. Enkriptimi zgjat një orë ose më shumë, kohë gjatë të cilës telefoni do të riniset disa herë."</string>
-    <string name="crypt_keeper_setup_title" msgid="3339725741305796680">"Po enkripton"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="4417016995091289019">"Prit ndërsa tableti po enkriptohet. <xliff:g id="PERCENT">^1</xliff:g>% të përfunduara."</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="7902355422499500352">"Prit ndërsa telefoni po enkriptohet. <xliff:g id="PERCENT">^1</xliff:g>% e përfunduar."</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="8348188415839917821">"Prit ndërsa tableti enkriptohet. Koha e mbetur: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="8556105766597855198">"Prit ndërsa telefoni po enkriptohet. Koha e mbetur: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="3832496715430327682">"Për të shkyçur tabletin, fike dhe pastaj ndize."</string>
-    <string name="crypt_keeper_force_power_cycle" product="default" msgid="5070346039522135361">"Për të shkyçur telefonin, fike dhe më pas ndize."</string>
-    <string name="crypt_keeper_warn_wipe" msgid="8104921337301750394">"Paralajmërim! Pajisja jote do të fshihet pas <xliff:g id="COUNT">^1</xliff:g> përpjekjeve të tjera të dështuara për shkyçje!"</string>
-    <string name="crypt_keeper_enter_password" msgid="1274917431075529732">"Shkruaj fjalëkalimin tënd"</string>
-    <string name="crypt_keeper_failed_title" msgid="8173654570682244149">"Enkriptimi ishte i pasuksesshëm"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"Enkriptimi u ndërpre dhe nuk mund të përfundojë. Si rezultat, nuk është më e mundur qasja te të dhënat në tablet. \n\nPër të rifilluar përdorimin e tabletit, duhet të kryesh një rivendosje në gjendje fabrike. Kur ta konfigurosh tabletin pas rivendosjes, do të kesh mundësinë për të restauruar çdo të dhënë që është rezervuar në llogarinë e Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"Enkriptimi u ndërpre dhe nuk mund të përfundojë. Si rezultat, nuk është më e mundur qasja te të dhënat në telefon. \n\nPër të rifilluar përdorimin e telefonit, duhet të kryesh një rivendosje në gjendje fabrike. Kur ta konfigurosh telefonin pas rivendosjes, do të kesh mundësinë për të restauruar çdo të dhënë që është rezervuar në llogarinë e Google."</string>
-    <string name="crypt_keeper_data_corrupt_title" msgid="5920153462176846037">"Dekriptimi ishte i pasuksesshëm"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"Fjalëkalimi që fute është i saktë, por fatkeqësisht të dhënat e tua janë të dëmtuara. \n\nPër të rifilluar përdorimin e tabletit, duhet të kryesh një vendosje në gjendje fabrike. Pas kësaj, do të kesh mundësinë për të restauruar çdo të dhënë që është rezervuar në llogarinë e Google."</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"Fjalëkalimi që fute është i saktë, por fatkeqësisht të dhënat e tua janë të dëmtuara. \n\nPër të rifilluar përdorimin e telefonit, duhet të kryesh një vendosje në gjendje fabrike. Pas kësaj, do të kesh mundësinë për të restauruar çdo të dhënë që është rezervuar në llogarinë e Google."</string>
-    <string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"Ndërro metodën e hyrjes"</string>
+    <string name="encryption_settings_title" msgid="2848716008695618360">"Enkriptimi"</string>
+    <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"Enkripto tabletin"</string>
+    <string name="encrypt_title" product="default" msgid="7337365190988321100">"Enkripto telefonin"</string>
+    <string name="encrypted_summary" msgid="545623487587251207">"Enkriptuar"</string>
     <string name="suggested_lock_settings_title" msgid="7836065447159730217">"Siguro telefonin tënd"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"Cakto kyçjen e ekranit për të mbrojtur tabletin"</string>
     <string name="suggested_lock_settings_summary" product="device" msgid="8479766049078378225">"Cakto kyçjen e ekranit për të mbrojtur pajisjen"</string>
@@ -817,6 +791,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Mund të duhet gjithashtu ta shkruash këtë kod PIN në pajisjen tjetër."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Mund të duhet gjithashtu ta shkruash këtë çelës kalimi në pajisjen tjetër."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Për ta çiftuar me:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;sigurohu që të tregojë këtë çelës kalimi:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Konfirmo për të çiftuar me grupin e koordinuar"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"Nga:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Të çiftohet me këtë pajisje?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Për ta çiftuar me:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Shkruaj në të:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g> dhe më pas shtyp Kthehu ose Hyr."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Lejo qasjen te kontaktet dhe historiku i telefonatave"</string>
@@ -850,6 +825,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Nuk mund të lidhej. Provo përsëri."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Detajet e pajisjes"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Adresa e Bluetooth-it e pajisjes: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Adresa e Bluetooth-it e pajisjes:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Të harrohet pajisja?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Hiq lidhjen"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Të shkëputet aplikacioni?"</string>
@@ -881,6 +857,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Kujto cilësimet"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Numri maksimal i pajisjeve të lidhura audio me Bluetooth"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Zgjidh numrin maksimal të pajisjeve të lidhura audio me Bluetooth"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"Evidenca e korrigjimit të grumbullit të NFC-së"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Rrit nivelin e regjistrimit të grumbullit të NFC-së"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Transmetimi"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"pasqyro"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Aktivizo ekranin pa tel"</string>
@@ -1188,6 +1166,8 @@
     <string name="wifi_hotspot_maximize_compatibility_dual_ap_summary" msgid="3579549223159056533">"I ndihmon pajisjet e tjera të gjejnë këtë zonë të qasjes për internet. Rrit përdorimin e baterisë."</string>
     <string name="wifi_tether_starting" msgid="8879874184033857814">"Po aktivizon zonën e qasjes..."</string>
     <string name="wifi_tether_stopping" msgid="4416492968019409188">"Po çaktivizon zonën e qasjes..."</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_title" msgid="3089432578433978073">"Ndarja e internetit nuk ofrohet"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_content" msgid="5920421547607921112">"Kontakto me operatorin celular për detaje"</string>
     <string name="wifi_tether_enabled_subtext" msgid="5085002421099821056">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> është aktiv"</string>
     <string name="wifi_tether_failed_subtext" msgid="437190628041885500">"Gabim në zonën e lirë të qasjes Wi-Fi"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7072559431286459122">"Konfiguro zonën e qasjes Wi‑Fi"</string>
@@ -2534,11 +2514,6 @@
     <string name="enable_service_title" msgid="7231533866953706788">"Të lejohet \"<xliff:g id="SERVICE">%1$s</xliff:g>\" që të ketë kontroll të plotë të pajisjes sate?"</string>
     <string name="capabilities_list_title" msgid="1225853611983394386">"\"<xliff:g id="SERVICE">%1$s</xliff:g>\" ka nevojë të:"</string>
     <string name="touch_filtered_warning" msgid="4225815157460318241">"Duke qenë se një aplikacion po bllokon një kërkesë për leje, \"Cilësimet\" nuk mund të verifikojnë përgjigjen tënde."</string>
-    <string name="enable_service_encryption_warning" msgid="931082737770453755">"Nëse aktivizon <xliff:g id="SERVICE">%1$s</xliff:g>, pajisja nuk do të përdorë kyçjen e ekranit për të rritur enkriptimin e të dhënave."</string>
-    <string name="secure_lock_encryption_warning" msgid="669152607190123579">"Për shkak se ke aktivizuar shërbimin e qasshmërisë, pajisja jote nuk do të përdorë kyçen e ekranit për përmirësimin e enkriptimit të të dhënave."</string>
-    <string name="enable_service_pattern_reason" msgid="6832846117817938536">"Meqenëse aktivizimi i <xliff:g id="SERVICE">%1$s</xliff:g> ndikon në enkriptimin e të dhënave, duhet të konfirmosh motivin tënd."</string>
-    <string name="enable_service_pin_reason" msgid="6040417014360237703">"Duke qenë se aktivizimi i <xliff:g id="SERVICE">%1$s</xliff:g> ndikon në enkriptimin e të dhënave, duhet të konfirmosh kodin PIN."</string>
-    <string name="enable_service_password_reason" msgid="6962544350351734238">"Meqenëse aktivizimi i <xliff:g id="SERVICE">%1$s</xliff:g> ndikon në enkriptimin e të dhënave, duhet të konfirmosh fjalëkalimin tënd."</string>
     <string name="accessibility_service_warning" msgid="6779187188736432618">"<xliff:g id="SERVICE">%1$s</xliff:g> po kërkon kontroll të plotë të kësaj pajisjeje. Shërbimi mund të lexojë ekranin dhe të veprojë në emër të përdoruesve me nevoja qasshmërie. Ky nivel kontrolli nuk është i përshtatshëm për shumicën e aplikacioneve."</string>
     <string name="accessibility_service_warning_description" msgid="6573203795976134751">"Kontrolli i plotë është i përshtatshëm për aplikacionet që të ndihmojnë me nevojat e qasshmërisë, por jo për shumicën e aplikacioneve."</string>
     <string name="accessibility_service_screen_control_title" msgid="324795030658109870">"Shiko dhe kontrollo ekranin"</string>
@@ -3103,14 +3078,6 @@
     <string name="remove_account_failed" msgid="3709502163548900644">"Ky ndryshim nuk lejohet nga administratori yt"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"Nuk mund të sinkronizojë manualisht"</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"Sinkronizimi për këtë artikull është aktualisht i çaktivizuar. Për ta ndryshuar këtë cilësim, aktivizo përkohësisht të dhënat në sfond dhe sinkronizimin automatik."</string>
-    <string name="enter_password" msgid="6327051330258595331">"Për të nisur Androidin, fut fjalëkalimin"</string>
-    <string name="enter_pin" msgid="1029287617551232681">"Për të nisur Androidin, fut kodin PIN"</string>
-    <string name="enter_pattern" msgid="1747316785866742960">"Për të nisur Androidin, vizato motivin tënd"</string>
-    <string name="cryptkeeper_wrong_pattern" msgid="340747269176120242">"Motivi është i gabuar"</string>
-    <string name="cryptkeeper_wrong_password" msgid="7295607881887114486">"Fjalëkalim i gabuar"</string>
-    <string name="cryptkeeper_wrong_pin" msgid="2347961593970714201">"Kod PIN i gabuar"</string>
-    <string name="checking_decryption" msgid="6111642972615688237">"Po kontrollon..."</string>
-    <string name="starting_android" msgid="6694154070215356186">"Po nis Android..."</string>
     <string name="delete" msgid="8330605554706263775">"Fshi"</string>
     <string name="misc_files" msgid="6598066985800749585">"Skedarë të ndryshëm"</string>
     <string name="misc_files_selected_count" msgid="5597802791672749532">"u zgjodhën <xliff:g id="NUMBER">%1$d</xliff:g> nga <xliff:g id="TOTAL">%2$d</xliff:g> në total"</string>
@@ -3206,8 +3173,6 @@
     <string name="data_usage_metered_yes" msgid="4262598072030135223">"Me matje"</string>
     <string name="data_usage_metered_no" msgid="1685828958417926268">"Pa matje"</string>
     <string name="data_usage_disclaimer" msgid="3271450299386176770">"Llogaritja e të dhënave nga operatori mund të ndryshojë nga ajo e pajisjes tënde."</string>
-    <string name="cryptkeeper_emergency_call" msgid="8369322820475703306">"Telefonata e urgjencës"</string>
-    <string name="cryptkeeper_return_to_call" msgid="3857250752781151232">"Kthehu te telefonata"</string>
     <string name="vpn_name" msgid="3806456074909253262">"Emri"</string>
     <string name="vpn_type" msgid="5533202873260826663">"Lloji"</string>
     <string name="vpn_server" msgid="2908816134941973935">"Adresa e serverit"</string>
@@ -4764,8 +4729,6 @@
       <item quantity="one">1 aplikacion mund të përdorë të dhëna të pakufizuara</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"Shiko më shumë"</string>
-    <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"Të pastrohen vërtet të dhënat e përdoruesit dhe të konvertohen tek enkriptimi i skedarit?"</string>
-    <string name="button_confirm_convert_fbe" msgid="339648921918438106">"Pastro dhe konverto"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"Rivendos kufizimin e normës së ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"Është rivendosur kufizimi i normës së ShortcutManager"</string>
     <string name="notification_suggestion_title" msgid="6309263655965785411">"Informacioni i kontrollit në ekranin e kyçjes"</string>
@@ -5292,6 +5255,7 @@
     <string name="sim_action_yes" msgid="8076556020131395515">"Po"</string>
     <string name="sim_action_reboot" msgid="3508948833333441538">"Rinis"</string>
     <string name="sim_action_no_thanks" msgid="435717748384544195">"Jo, faleminderit"</string>
+    <string name="sim_action_cancel" msgid="2668099867029610910">"Anulo"</string>
     <string name="sim_switch_button" msgid="1405772571706095387">"Ndërro"</string>
     <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Karta SIM nuk mund të aktivizohet"</string>
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Hiq kartën SIM dhe fute përsëri. Nëse problemi vazhdon, rinise pajisjen."</string>
@@ -5444,6 +5408,10 @@
     <string name="cached_apps_freezer" msgid="1057519579761550350">"Pezullo ekzekutimin për aplikacionet në memorien specifike"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"Lejo mbivendosjet e ekranit te \"Cilësimet\""</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Lejo aplikacionet të cilat mund të shfaqen mbi aplikacione të tjera të mbivendosen mbi ekranet e \"Cilësimeve\""</string>
+    <!-- no translation found for allow_mock_modem (3832264806530479214) -->
+    <skip />
+    <!-- no translation found for allow_mock_modem_summary (9097416612748005374) -->
+    <skip />
     <string name="media_controls_title" msgid="403271085636252597">"Media"</string>
     <string name="media_controls_resume_title" msgid="855076860336652370">"Gozhdo luajtësin e medias"</string>
     <string name="media_controls_resume_description" msgid="3163482266454802097">"Për të rifilluar shpejt luajtjen, luajtësi i medias qëndron i hapur te \"Cilësimet e shpejta\""</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 218cbc9..3446113 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -143,10 +143,11 @@
     <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"Омогућите уређају да комуницира са Bluetooth уређајима у близини"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"Омогућите телефону да комуницира са Bluetooth уређајима у близини"</string>
     <string name="bluetooth_disable_a2dp_hw_offload" msgid="5942913792817797541">"Онемогући Bluetooth A2DP хардверско растерећење"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="8610420176339657720">"Рестартујете уређај?"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8333029144800835996">"Рестартујте уређај да бисте променили ово подешавање."</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="3488695418187553566">"Рестартуј"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="4930826928585464191">"Откажи"</string>
+    <string name="bluetooth_disable_le_audio_hw_offload" msgid="3966022676505972908">"Онемогући Bluetooth LE AUDIO хардверско растерећење"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_title" msgid="6001142380445276918">"Желите да рестартујете уређај?"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_message" msgid="1524373895333698779">"Рестартујте уређај да бисте променили ово подешавање."</string>
+    <string name="bluetooth_disable_hw_offload_dialog_confirm" msgid="5594859658551707592">"Рестартуј"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel" msgid="3663690305043973720">"Откажи"</string>
     <string name="connected_device_media_device_title" msgid="3783388247594566734">"Медијски уређаји"</string>
     <string name="connected_device_call_device_title" msgid="88732390601723608">"Уређаји за позивање"</string>
     <string name="connected_device_other_device_title" msgid="4652120430615729193">"Други уређаји"</string>
@@ -312,9 +313,9 @@
     <string name="security_settings_title" msgid="6710768415432791970">"Безбедност"</string>
     <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"Шифровање и акредитиви"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"Телефон је шифрован"</string>
-    <string name="decryption_settings_summary" product="default" msgid="1742645256103613503">"Телефон није шифрован"</string>
+    <string name="not_encrypted_summary" product="default" msgid="2251945842585788254">"Телефон није шифрован"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"Уређај је шифрован"</string>
-    <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"Уређај није шифрован"</string>
+    <string name="not_encrypted_summary" product="tablet" msgid="2374263654698719382">"Уређај није шифрован"</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"Закључани екран"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"Шта се приказује"</string>
     <string name="security_settings_summary" msgid="1627059516127354233">"Подешавање Моје локације, откључавања екрана, закључавања SIM картице и закључавања акредитива складишта"</string>
@@ -572,37 +573,10 @@
     <string name="fingerprint_last_delete_message" msgid="7860374760549404410">"Нећете моћи да користите отисак прста да бисте откључавали телефон или верификовали идентитет у апликацијама."</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="4104208067277655068">"Нећете моћи да користите отисак прста за откључавање пословног профила, овлашћивање куповина или пријављивање у пословне апликације."</string>
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"Да, уклони"</string>
-    <string name="crypt_keeper_settings_title" msgid="4938812137822100044">"Шифровање"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"Шифруј таблет"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"Шифровање телефона"</string>
-    <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"Шифровано"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"Можете да шифрујете налоге, подешавања, преузете апликације и њихове податке, медије и друге датотеке. Када шифрујете таблет, а под претпоставком да сте подесили закључавање екрана (то јест, шаблон, нумерички PIN или лозинку), треба да откључате екран да бисте дешифровали таблет сваки пут када га укључите. Једини други начин да дешифрујете уређај је да обавите ресетовање на фабричка подешавања, чиме ћете избрисати све податке.\n\nШифровање траје сат времена или више. Морате да почнете са напуњеном батеријом и да не искључујете таблет из пуњача током целог тог процеса. Ако прекинете тај процес, изгубићете све податке или неке од њих."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"Можете да шифрујете налоге, подешавања, преузете апликације и њихове податке, медије и друге датотеке. Када шифрујете телефон, а под претпоставком да сте подесили закључавање екрана (то јест, шаблон, нумерички PIN или лозинку), треба да откључате екран да бисте дешифровали телефон сваки пут када га укључите. Једини други начин да дешифрујете уређај је да обавите ресетовање на фабричка подешавања, чиме ћете избрисати све податке.\n\nШифровање траје сат времена или више. Морате да почнете са напуњеном батеријом и да не искључујете телефон из пуњача током целог тог процеса. Ако прекинете тај процес, изгубићете све податке или неке од њих."</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"Шифруј таблет"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"Шифруј телефон"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"Напуните батерију и покушајте поново."</string>
-    <string name="crypt_keeper_unplugged_text" msgid="2709721134148651329">"Укључите пуњач и покушајте поново."</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="1847280235529858357">"Нема PIN-а или лозинке за закључавање екрана"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="7210616262954236042">"Потребно је да подесите PIN или лозинку за закључавање екрана да бисте могли да започнете шифровање."</string>
-    <string name="crypt_keeper_confirm_title" msgid="8600000209722452230">"Желите ли да шифрујете?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="3270587498436152259">"Операција шифровања је неопозива и уколико је прекинете, изгубићете податке. Шифровање траје један сат или дуже и у том периоду таблет ће се поново покренути неколико пута."</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="3040428543349852419">"Операција шифровања је неопозива и уколико је прекинете, изгубићете податке. Шифровање траје један сат или дуже и у том периоду телефон ће се поново покренути неколико пута."</string>
-    <string name="crypt_keeper_setup_title" msgid="3339725741305796680">"Шифровање"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="4417016995091289019">"Сачекајте да се таблет шифрује. Довршено је <xliff:g id="PERCENT">^1</xliff:g>%."</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="7902355422499500352">"Сачекајте да се телефон шифрује. Довршено је <xliff:g id="PERCENT">^1</xliff:g>%."</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="8348188415839917821">"Сачекајте док се таблет шифрује. Преостало време: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="8556105766597855198">"Сачекајте док се телефон шифрује. Преостало време: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="3832496715430327682">"Да бисте откључали таблет, искључите га, па га поново укључите."</string>
-    <string name="crypt_keeper_force_power_cycle" product="default" msgid="5070346039522135361">"Да бисте откључали телефон, искључите га, па га поново укључите."</string>
-    <string name="crypt_keeper_warn_wipe" msgid="8104921337301750394">"Упозорење: Подаци са уређаја ће бити обрисани ако не успете да га откључате још <xliff:g id="COUNT">^1</xliff:g> пута!"</string>
-    <string name="crypt_keeper_enter_password" msgid="1274917431075529732">"Унесите лозинку"</string>
-    <string name="crypt_keeper_failed_title" msgid="8173654570682244149">"Шифровање није успело"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"Шифровање је прекинуто и не може да се доврши. Као последица тога, подаци на таблету више нису доступни. \n\n Да бисте наставили да користите таблет, треба да га ресетујете. Када га подесите након ресетовања на фабричка подешавања, имаћете прилику да вратите све податке за које сте направили резервне копије на Google налогу."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"Шифровање је прекинуто и не може да се доврши. Као последица тога, подаци на телефону више нису доступни. \n\nДа бисте наставили да користите телефон, треба да га ресетујете. Када га подесите након ресетовања на фабричка подешавања, имаћете прилику да вратите све податке за које сте направили резервне копије на Google налогу."</string>
-    <string name="crypt_keeper_data_corrupt_title" msgid="5920153462176846037">"Дешифровање није успело"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"Лозинка коју сте унели је тачна, али, нажалост, подаци су оштећени. \n\nДа бисте наставили да користите таблет, треба да обавите ресетовање на фабричка подешавања. Током подешавања таблета после ресетовања моћи ћете да вратите све податке чија резервна копија постоји на Google налогу."</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"Лозинка коју сте унели је тачна, али, нажалост, подаци су оштећени. \n\nДа бисте наставили да користите телефон, треба да обавите ресетовање на фабричка подешавања. Током подешавања телефона после ресетовања моћи ћете да вратите све податке чија резервна копија постоји на Google налогу."</string>
-    <string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"Пребаци методе уноса"</string>
+    <string name="encryption_settings_title" msgid="2848716008695618360">"Шифровање"</string>
+    <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"Шифруј таблет"</string>
+    <string name="encrypt_title" product="default" msgid="7337365190988321100">"Шифруј телефон"</string>
+    <string name="encrypted_summary" msgid="545623487587251207">"Шифровано"</string>
     <string name="suggested_lock_settings_title" msgid="7836065447159730217">"Заштитите телефон"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"Подесите закључавање екрана да бисте заштитили таблет"</string>
     <string name="suggested_lock_settings_summary" product="device" msgid="8479766049078378225">"Подесите закључавање екрана да бисте заштитили уређај"</string>
@@ -834,6 +808,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Можда ће бити потребно да унесете овај PIN и на другом уређају."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Можда ће бити потребно да унесете овај приступни кôд и на другом уређају."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Да бисте се упарили са уређајем:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Уверите се да приказује овај приступни кôд:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Потврдите ради упаривања са координисаним скупом"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"Са уређаја:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Желите ли да се упарите са тим уређајем?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"За упаривање са уређајем:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Унесите на њему:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, а затим притисните Return или Enter."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Дозволи приступ контактима и историји позива"</string>
@@ -867,6 +842,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Повезивање није успело. Покушајте поново."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Детаљи о уређају"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Bluetooth адреса уређаја: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Bluetooth адреса уређаја:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Желите ли да заборавите уређај?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Уклони повезивање"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Желите да прекинете везу са апликацијом?"</string>
@@ -898,6 +874,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Запамти подешавања"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Максималан број повезаних Bluetooth аудио уређаја"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Изаберите максимални број повезаних Bluetooth аудио уређаја"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"Евиденција отклањања грешака за NFC групу"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Повећајте ниво евиденције за NFC групу"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Пребацивање"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"пресликати"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Омогући бежични приказ"</string>
@@ -1208,6 +1186,8 @@
     <string name="wifi_hotspot_maximize_compatibility_dual_ap_summary" msgid="3579549223159056533">"Помаже другим уређајима да пронађу овај хотспот. Повећава потрошњу батерије."</string>
     <string name="wifi_tether_starting" msgid="8879874184033857814">"Укључивање хотспота…"</string>
     <string name="wifi_tether_stopping" msgid="4416492968019409188">"Искључивање хотспота..."</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_title" msgid="3089432578433978073">"Привезивање је недоступно"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_content" msgid="5920421547607921112">"Обратите се мобилном оператеру за детаље"</string>
     <string name="wifi_tether_enabled_subtext" msgid="5085002421099821056">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> је активан"</string>
     <string name="wifi_tether_failed_subtext" msgid="437190628041885500">"Грешка преносног Wi‑Fi хотспота"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7072559431286459122">"Подеси WiFi хотспот"</string>
@@ -2563,11 +2543,6 @@
     <string name="enable_service_title" msgid="7231533866953706788">"Желите ли да дозволите да <xliff:g id="SERVICE">%1$s</xliff:g> има потпуну контролу над уређајем?"</string>
     <string name="capabilities_list_title" msgid="1225853611983394386">"<xliff:g id="SERVICE">%1$s</xliff:g> треба:"</string>
     <string name="touch_filtered_warning" msgid="4225815157460318241">"Пошто апликација скрива захтев за дозволу, Подешавања не могу да верификују одговор."</string>
-    <string name="enable_service_encryption_warning" msgid="931082737770453755">"Ако укључите <xliff:g id="SERVICE">%1$s</xliff:g>, уређај неће користити закључавање екрана да би побољшао шифровање података."</string>
-    <string name="secure_lock_encryption_warning" msgid="669152607190123579">"Пошто сте укључили услугу приступачности, уређај неће користити закључавање екрана да би побољшао шифровање података."</string>
-    <string name="enable_service_pattern_reason" msgid="6832846117817938536">"Пошто укључивање услуге <xliff:g id="SERVICE">%1$s</xliff:g> утиче на шифровање података, треба да потврдите шаблон."</string>
-    <string name="enable_service_pin_reason" msgid="6040417014360237703">"Пошто укључивање услуге <xliff:g id="SERVICE">%1$s</xliff:g> утиче на шифровање података, треба да потврдите PIN."</string>
-    <string name="enable_service_password_reason" msgid="6962544350351734238">"Пошто укључивање услуге <xliff:g id="SERVICE">%1$s</xliff:g> утиче на шифровање података, треба да потврдите лозинку."</string>
     <string name="accessibility_service_warning" msgid="6779187188736432618">"<xliff:g id="SERVICE">%1$s</xliff:g> тражи потпуну контролу над овим уређајем. Услуга може да чита садржај са екрана и да обавља разне задатке за кориснике услуга приступачности. Овај ниво контроле није одговарајући за већину апликација."</string>
     <string name="accessibility_service_warning_description" msgid="6573203795976134751">"Потпуна контрола је примерена за апликације које вам помажу код услуга приступачности, али не и за већину апликација."</string>
     <string name="accessibility_service_screen_control_title" msgid="324795030658109870">"Прегледај и контролиши екран"</string>
@@ -3143,14 +3118,6 @@
     <string name="remove_account_failed" msgid="3709502163548900644">"Администратор не дозвољава ову промену"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"Ручно синхронизовање није могуће"</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"Синхронизација за ову ставку је тренутно онемогућена. Да бисте променили ово подешавање, привремено укључите позадинске податке и аутоматску синхронизацију."</string>
-    <string name="enter_password" msgid="6327051330258595331">"Да бисте покренули Android, унесите лозинку"</string>
-    <string name="enter_pin" msgid="1029287617551232681">"Да бисте покренули Android, унесите PIN"</string>
-    <string name="enter_pattern" msgid="1747316785866742960">"Да бисте покренули Android, нацртајте шаблон"</string>
-    <string name="cryptkeeper_wrong_pattern" msgid="340747269176120242">"Погрешан шаблон"</string>
-    <string name="cryptkeeper_wrong_password" msgid="7295607881887114486">"Погрешна лозинка"</string>
-    <string name="cryptkeeper_wrong_pin" msgid="2347961593970714201">"Погрешан PIN"</string>
-    <string name="checking_decryption" msgid="6111642972615688237">"Проверава се..."</string>
-    <string name="starting_android" msgid="6694154070215356186">"Покрећемо Android..."</string>
     <string name="delete" msgid="8330605554706263775">"Избриши"</string>
     <string name="misc_files" msgid="6598066985800749585">"Разне датотеке"</string>
     <string name="misc_files_selected_count" msgid="5597802791672749532">"изабрано је <xliff:g id="NUMBER">%1$d</xliff:g> од <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -3246,8 +3213,6 @@
     <string name="data_usage_metered_yes" msgid="4262598072030135223">"Са ограничењем"</string>
     <string name="data_usage_metered_no" msgid="1685828958417926268">"Без ограничења"</string>
     <string name="data_usage_disclaimer" msgid="3271450299386176770">"Обрачун података код мобилног оператера се можда разликује од вашег уређаја."</string>
-    <string name="cryptkeeper_emergency_call" msgid="8369322820475703306">"Хитан позив"</string>
-    <string name="cryptkeeper_return_to_call" msgid="3857250752781151232">"Назад на позив"</string>
     <string name="vpn_name" msgid="3806456074909253262">"Назив"</string>
     <string name="vpn_type" msgid="5533202873260826663">"Тип"</string>
     <string name="vpn_server" msgid="2908816134941973935">"Адреса сервера"</string>
@@ -4832,15 +4797,13 @@
     <string name="display_cutout_emulation_keywords" msgid="4506580703807358127">"изрезана слика за екран, урез"</string>
     <string name="overlay_option_device_default" msgid="7986355499809313848">"Подразумевано подешавање за уређај"</string>
     <string name="overlay_toast_failed_to_apply" msgid="4839587811338164960">"Примена преклопног елемента није успела"</string>
-    <string name="special_access" msgid="1767980727423395147">"Посебан приступ апликацији"</string>
+    <string name="special_access" msgid="1767980727423395147">"Посебан приступ апликација"</string>
     <plurals name="special_access_summary" formatted="false" msgid="4995506406763570815">
       <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> апликација може да користи неограничену количину података</item>
       <item quantity="few"><xliff:g id="COUNT">%d</xliff:g> апликације могу да користе неограничену количину података</item>
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> апликација може да користи неограничену количину података</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"Прикажи још"</string>
-    <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"Желите ли стварно да избришете податке корисника и да конвертујете у шифровање датотека?"</string>
-    <string name="button_confirm_convert_fbe" msgid="339648921918438106">"Избриши и конвертуј"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"Ресетуј ограничавање броја у ShortcutManager-у"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"Ограничавање броја у ShortcutManager-у је ресетовано"</string>
     <string name="notification_suggestion_title" msgid="6309263655965785411">"Контролишите информације на закључаном екрану"</string>
@@ -5379,6 +5342,7 @@
     <string name="sim_action_yes" msgid="8076556020131395515">"Да"</string>
     <string name="sim_action_reboot" msgid="3508948833333441538">"Рестартуј"</string>
     <string name="sim_action_no_thanks" msgid="435717748384544195">"Не, хвала"</string>
+    <string name="sim_action_cancel" msgid="2668099867029610910">"Откажи"</string>
     <string name="sim_switch_button" msgid="1405772571706095387">"Пређи"</string>
     <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Активирање SIM картице није успело"</string>
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Уклоните SIM картицу, па је ставите поново. Ако се проблем и даље јавља, рестартујте уређај."</string>
@@ -5408,7 +5372,7 @@
     <string name="erasing_sim" msgid="7877703231075699139">"SIM се брише…"</string>
     <string name="erase_sim_fail_title" msgid="2024446702985862427">"Брисање SIM-а није успело"</string>
     <string name="erase_sim_fail_text" msgid="7870804401227483131">"Овај SIM не може да се обрише због грешке.\n\nРестартујте уређај и пробајте поново."</string>
-    <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Повежите се са уређајем"</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>
     <string name="network_connection_timeout_dialog_ok" msgid="6022675321823723755">"Пробај поново"</string>
@@ -5533,6 +5497,10 @@
     <string name="cached_apps_freezer" msgid="1057519579761550350">"Суспендуј извршење за кеширане апликације"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"Дозволи прекривање садржаја екрана Подешавања"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Апликације које могу да се приказују преко других апликација прекривају садржај екрана Подешавања"</string>
+    <!-- no translation found for allow_mock_modem (3832264806530479214) -->
+    <skip />
+    <!-- no translation found for allow_mock_modem_summary (9097416612748005374) -->
+    <skip />
     <string name="media_controls_title" msgid="403271085636252597">"Медији"</string>
     <string name="media_controls_resume_title" msgid="855076860336652370">"Закачи медија плејер"</string>
     <string name="media_controls_resume_description" msgid="3163482266454802097">"Да бисте брзо наставили репродукцију, медија плејер остаје отворен у Брзим подешавањима"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 82526a6..fe8724f 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -142,10 +142,11 @@
     <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"Tillåt att enheten kommunicerar med Bluetooth-enheter i närheten"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"Tillåt att mobilen kommunicerar med Bluetooth-enheter i närheten"</string>
     <string name="bluetooth_disable_a2dp_hw_offload" msgid="5942913792817797541">"Inaktivera maskinvaruavlastning för Bluetooth (A2DP)"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="8610420176339657720">"Vill du starta om enheten?"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8333029144800835996">"Du måste starta om enheten för att ändra den här inställningen."</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="3488695418187553566">"Starta om"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="4930826928585464191">"Avbryt"</string>
+    <string name="bluetooth_disable_le_audio_hw_offload" msgid="3966022676505972908">"Inaktivera avlastning av maskinvara för Bluetooth LE AUDIO"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_title" msgid="6001142380445276918">"Vill du starta om enheten?"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_message" msgid="1524373895333698779">"Du måste starta om enheten för att ändra den här inställningen."</string>
+    <string name="bluetooth_disable_hw_offload_dialog_confirm" msgid="5594859658551707592">"Starta om"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel" msgid="3663690305043973720">"Avbryt"</string>
     <string name="connected_device_media_device_title" msgid="3783388247594566734">"Medieenheter"</string>
     <string name="connected_device_call_device_title" msgid="88732390601723608">"Telefonenheter"</string>
     <string name="connected_device_other_device_title" msgid="4652120430615729193">"Andra enheter"</string>
@@ -309,9 +310,9 @@
     <string name="security_settings_title" msgid="6710768415432791970">"Säkerhet"</string>
     <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"Kryptering och användaruppgifter"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"Mobilen är krypterad"</string>
-    <string name="decryption_settings_summary" product="default" msgid="1742645256103613503">"Mobilen är inte krypterad"</string>
+    <string name="not_encrypted_summary" product="default" msgid="2251945842585788254">"Telefonen är inte krypterad"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"Enheten har krypterats"</string>
-    <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"Enheten är inte krypterad"</string>
+    <string name="not_encrypted_summary" product="tablet" msgid="2374263654698719382">"Enheten är inte krypterad"</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"Låsskärm"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"Vad som ska visas"</string>
     <string name="security_settings_summary" msgid="1627059516127354233">"Ställ in Min plats, skärmupplåsning, lås för SIM-kort och lås för uppgiftslagring"</string>
@@ -393,7 +394,7 @@
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="2071065435536235622">"Använd ansiktet för att låsa upp telefonen och för autentisering i appar, t.ex. när du loggar in i appar eller godkänner köp.\n\nTänk på detta:\nBara ett ansikte i taget kan vara konfigurerat. Radera det nuvarande ansiktet innan du lägger till ett nytt.\n\nOm du tittar på telefonen kan du oavsiktligt låsa upp den.\n\nAndra kan låsa upp telefonen om de håller upp den mot ditt ansikte, även om du inte har ögonen öppna.\n\nTelefonen kanske kan låsas upp av någon som är mycket lik dig, till exempel ett syskon."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2899669764446232715">"Vill du radera ansiktsmodellen?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="916131485988121592">"Ansiktsmodellen raderas permanent på ett säkert sätt.\n\nEfter borttagningen behöver du pinkod, lösenord eller mönster för att låsa upp telefonen och för autentisering i appar."</string>
-    <string name="security_settings_face_settings_remove_dialog_details_convenience" msgid="475568135197468990">"Ansiktsmodellen raderas permanent på ett säkert sätt.\n\nEfter borttagningen behöver du pinkod, lösenord eller grafiskt lösenord för att låsa upp telefonen."</string>
+    <string name="security_settings_face_settings_remove_dialog_details_convenience" msgid="475568135197468990">"Ansiktsmodellen raderas permanent på ett säkert sätt.\n\nEfter borttagningen behöver du pinkod, lösenord eller mönster för att låsa upp telefonen."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="8284262560781442403">"Lås upp telefonen med ansiktslås"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2484965173528415458">"Fingeravtryck"</string>
     <string name="security_settings_work_fingerprint_preference_title" msgid="2076006873519745979">"Fingeravtr. för jobbet"</string>
@@ -481,7 +482,7 @@
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"Tryck på sensorn"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"Lägg fingret på sensorn och ta bort det när du känner en vibration"</string>
     <string name="security_settings_udfps_enroll_start_message" msgid="5032954588171487566">"Håll fingret på sensorn tills du känner en vibration"</string>
-    <string name="security_settings_fingerprint_enroll_udfps_title" msgid="6665610134560896895">"Tryck länge på fingeravtryckssensorn"</string>
+    <string name="security_settings_fingerprint_enroll_udfps_title" msgid="6665610134560896895">"Håll fingret på sensorn"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"Lyft och tryck sedan igen"</string>
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"En gång till"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"Följ ikonen för fingeravtryck"</string>
@@ -568,37 +569,10 @@
     <string name="fingerprint_last_delete_message" msgid="7860374760549404410">"Du kan inte låsa upp telefonen eller verifiera din identitet i appar med ditt fingeravtryck."</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="4104208067277655068">"Då kan du inte låsa upp jobbprofilen, auktorisera köp eller logga in i jobbappar med ditt fingeravtryck."</string>
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"Ja, ta bort"</string>
-    <string name="crypt_keeper_settings_title" msgid="4938812137822100044">"Kryptering"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"Kryptera surfplattan"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"Kryptera telefonen"</string>
-    <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"Krypterad"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"Du kan kryptera dina konton, inställningar, nedladdade appar och deras data, mediefiler och övriga filer. Om du har konfigurerat ett skärmlås (det vill säga ett mönster, en pinkod eller ett lösenord) och krypterar surfplattan måste du dekryptera den genom att låsa upp skärmen varje gång du slår på den. Det går inte att dekryptera den på något annat sätt utom genom att återställa standardinställningarna, vilket raderar all data.\n\n Krypteringen tar minst en timme. Du måste börja med batteriet laddat och låta surfplattan vara ansluten till ett strömuttag under hela processen. Om du avbryter kommer vissa eller alla data att försvinna."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"Du kan kryptera dina konton, inställningar, nedladdade appar och deras data, mediefiler och övriga filer. Om du har konfigurerat ett skärmlås (det vill säga ett mönster, en pinkod eller ett lösenord) och krypterar telefonen måste du dekryptera den genom att låsa upp skärmen varje gång du slår på den. Det går inte att dekryptera den på något annat sätt utom genom att återställa standardinställningarna, vilket raderar all data.\n\n Krypteringen tar minst en timme. Du måste börja med batteriet laddat och låta telefonen vara ansluten till ett strömuttag under hela processen. Om du avbryter kommer vissa eller alla data att försvinna."</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"Kryptera surfplattan"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"Kryptera telefonen"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"Ladda batteriet och försök igen."</string>
-    <string name="crypt_keeper_unplugged_text" msgid="2709721134148651329">"Anslut laddaren och försök igen."</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="1847280235529858357">"PIN-kod eller lösenord saknas för skärmlåset"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="7210616262954236042">"Du måste ange en PIN-kod eller ett lösenord för skärmlåset innan du påbörjar krypteringen."</string>
-    <string name="crypt_keeper_confirm_title" msgid="8600000209722452230">"Vill du kryptera?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="3270587498436152259">"Krypteringen kan inte ångras och om du avbryter den kan data försvinna. Det kan ta en timme eller mer och under tiden startas surfplattan om flera gånger."</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="3040428543349852419">"Krypteringen kan inte ångras och om du avbryter den kan data försvinna. Det kan ta en timme eller mer och under tiden startas mobilen om flera gånger."</string>
-    <string name="crypt_keeper_setup_title" msgid="3339725741305796680">"Krypterar"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="4417016995091289019">"Vänta medan surfplattan krypteras. <xliff:g id="PERCENT">^1</xliff:g> % klart."</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="7902355422499500352">"Vänta medan mobilen krypteras. <xliff:g id="PERCENT">^1</xliff:g> % klart."</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="8348188415839917821">"Vänta tills surfplattan har krypterats. Återstående tid: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="8556105766597855198">"Vänta tills mobilen har krypterats. Återstående tid: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="3832496715430327682">"Lås upp surfplattan genom att stänga av och slå på den."</string>
-    <string name="crypt_keeper_force_power_cycle" product="default" msgid="5070346039522135361">"Lås upp mobilen genom att stänga av och slå på den."</string>
-    <string name="crypt_keeper_warn_wipe" msgid="8104921337301750394">"Varning! Efter <xliff:g id="COUNT">^1</xliff:g> misslyckade upplåsningsförsök till raderas data på enheten."</string>
-    <string name="crypt_keeper_enter_password" msgid="1274917431075529732">"Ange ditt lösenord"</string>
-    <string name="crypt_keeper_failed_title" msgid="8173654570682244149">"Krypteringen misslyckades"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"Krypteringen avbröts och kan inte slutföras. Data på surfplattan är därför inte tillgängliga längre.\n\n Om du vill fortsätta använda surfplattan måste du återställa standardinställningarna. När du konfigurerar surfplattan efter återställningen kan du välja att återställa alla data som du har säkerhetskopierat i ditt Google-konto."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"Krypteringen avbröts och kan inte slutföras. Data på mobilen är därför inte tillgängliga längre.\n\nOm du vill fortsätta använda mobilen måste du återställa standardinställningarna. När du konfigurerar enheten efter återställningen kan du välja att återställa alla data som du har säkerhetskopierat i ditt Google-konto."</string>
-    <string name="crypt_keeper_data_corrupt_title" msgid="5920153462176846037">"Dekrypteringen misslyckades"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"Lösenordet du angav är korrekt, men dina data har korrumperats. \n\nOm du vill fortsätta använda surfplattan måste du återställa standardinställningarna. När du har konfigurerat surfplattan efter återställningen har du möjlighet att återställa alla data som har säkerhetskopierats i ditt Google-konto."</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"Lösenordet du angav är korrekt, men dina data har korrumperats. \n\nOm du vill fortsätta använda mobilen måste du återställa standardinställningarna. När du har konfigurerat mobilen efter återställningen har du möjlighet att återställa alla data som har säkerhetskopierats i ditt Google-konto."</string>
-    <string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"Växla inmatningsmetod"</string>
+    <string name="encryption_settings_title" msgid="2848716008695618360">"Kryptering"</string>
+    <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"Kryptera surfplattan"</string>
+    <string name="encrypt_title" product="default" msgid="7337365190988321100">"Kryptera telefonen"</string>
+    <string name="encrypted_summary" msgid="545623487587251207">"Krypterad"</string>
     <string name="suggested_lock_settings_title" msgid="7836065447159730217">"Skydda mobilen"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"Skydda surfplattan genom att ställa in skärmlås"</string>
     <string name="suggested_lock_settings_summary" product="device" msgid="8479766049078378225">"Skydda enheten genom att ställa in skärmlås"</string>
@@ -817,6 +791,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Du kan också behöva ange PIN-koden på den andra enheten."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Du kan också behöva ange lösenordet på den andra enheten."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Om du vill koppla med:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt; måste lösenordet &lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt; visas i den"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Bekräfta för att parkoppla med koordinerat set"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"Från:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Vill du koppla den till enheten?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Koppla till:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Skriv:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g> och tryck sedan på Retur."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Tillåt åtkomst till kontakter och sökhistorik"</string>
@@ -850,6 +825,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Det gick inte att ansluta. Försök igen."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Enhetsinformation"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Enhetens Bluetooth-adress: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Enhetens Bluetooth-adress:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Vill du glömma enheten?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Ta bort kopplingen"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Vill du koppla från appen?"</string>
@@ -881,6 +857,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Kom ihåg inställningarna"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Maxantal för ljudenheter anslutna via Bluetooth"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Välj ett maxantal för ljudenheter anslutna via Bluetooth"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"Felsökningslogg för NFC-stack"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Öka loggningsnivå för NFC-stack"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Casta"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"spegling"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Aktivera wifi-skärmdelning"</string>
@@ -1188,6 +1166,8 @@
     <string name="wifi_hotspot_maximize_compatibility_dual_ap_summary" msgid="3579549223159056533">"Underlättar för andra enheter att hitta surfzonen. Ökar batteriförbrukningen."</string>
     <string name="wifi_tether_starting" msgid="8879874184033857814">"Aktiverar surfzon ..."</string>
     <string name="wifi_tether_stopping" msgid="4416492968019409188">"Surfzon inaktiveras ..."</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_title" msgid="3089432578433978073">"Internetdelning är inte tillgängligt"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_content" msgid="5920421547607921112">"Kontakta operatören för mer information"</string>
     <string name="wifi_tether_enabled_subtext" msgid="5085002421099821056">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> är aktiv"</string>
     <string name="wifi_tether_failed_subtext" msgid="437190628041885500">"Fel på mobil wifi-surfzon"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7072559431286459122">"Konfigurera surfzon via wifi"</string>
@@ -1925,13 +1905,13 @@
     <string name="lockpassword_reenter_your_profile_password_header" msgid="3812040127714827685">"Ange lösenordet för jobbet igen"</string>
     <string name="lockpassword_confirm_your_work_password_header" msgid="4647071231702288305">"Ange lösenordet för jobbprofilen"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="4037701363240138651">"Bekräfta mönster"</string>
-    <string name="lockpassword_confirm_your_work_pattern_header" msgid="2668883108969165844">"Ange det grafiska lösenordet"</string>
+    <string name="lockpassword_confirm_your_work_pattern_header" msgid="2668883108969165844">"Ange mönstret"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="2241722970567131308">"Ange din pinkod igen"</string>
     <string name="lockpassword_reenter_your_profile_pin_header" msgid="2890233614560435538">"Ange pinkoden för jobbet igen"</string>
     <string name="lockpassword_confirm_your_work_pin_header" msgid="4229765521391960255">"Ange pinkoden för jobbprofilen"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="2100071354970605232">"Lösenorden matchar inte"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="1103699575489401030">"PIN-koderna matchar inte"</string>
-    <string name="lockpassword_draw_your_pattern_again_header" msgid="1045638030120803622">"Rita det grafiska lösenordet igen"</string>
+    <string name="lockpassword_draw_your_pattern_again_header" msgid="1045638030120803622">"Rita mönstret igen"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="5669348379247148696">"Upplåsningsalternativ"</string>
     <string name="lockpassword_password_set_toast" msgid="6615759749393973795">"Lösenordet angavs"</string>
     <string name="lockpassword_pin_set_toast" msgid="5415783847198570890">"PIN-koden angavs"</string>
@@ -1943,24 +1923,24 @@
     <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4038476475293734905">"Skapa ett mönster för fingeravtrycks- eller ansiktslås"</string>
     <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="9086039918921009380">"Skapa en pinkod för ansiktslås eller fingeravtryckslås"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Har du glömt lösenordet?"</string>
-    <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Har du glömt det grafiska lösenordet?"</string>
+    <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Har du glömt mönstret?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"Har du glömt pinkoden?"</string>
-    <string name="lockpassword_confirm_your_pattern_generic" msgid="7692794426682501482">"Ange det grafiska lösenordet för enheten om du vill fortsätta"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="7692794426682501482">"Ange mönstret för enheten om du vill fortsätta"</string>
     <string name="lockpassword_confirm_your_pin_generic" msgid="9206928587904701094">"Ange pinkoden för enheten om du vill fortsätta"</string>
     <string name="lockpassword_confirm_your_password_generic" msgid="2616127423884477152">"Ange lösenordet för enheten om du vill fortsätta"</string>
-    <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="9110305410672321714">"Ange det grafiska lösenordet för jobbprofilen om du vill fortsätta"</string>
+    <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="9110305410672321714">"Ange mönstret för jobbprofilen om du vill fortsätta"</string>
     <string name="lockpassword_confirm_your_pin_generic_profile" msgid="6524208128570235127">"Ange pinkoden för jobbprofilen om du vill fortsätta"</string>
     <string name="lockpassword_confirm_your_password_generic_profile" msgid="5918738487760814147">"Ange lösenordet för jobbprofilen om du vill fortsätta"</string>
-    <string name="lockpassword_strong_auth_required_device_pattern" msgid="113817518413715557">"Använd det grafiska lösenordet för enheten för att öka säkerheten"</string>
+    <string name="lockpassword_strong_auth_required_device_pattern" msgid="113817518413715557">"Använd mönstret för enheten för att öka säkerheten"</string>
     <string name="lockpassword_strong_auth_required_device_pin" msgid="9163822166411129815">"Ange enhetens pinkod för att öka säkerheten"</string>
     <string name="lockpassword_strong_auth_required_device_password" msgid="8310047427464299337">"Ange enhetens lösenord för att öka säkerheten."</string>
-    <string name="lockpassword_strong_auth_required_work_pattern" msgid="6803652050512161140">"Använd det grafiska lösenordet för jobbprofilen för att öka säkerheten"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="6803652050512161140">"Använd mönstret för jobbprofilen för att öka säkerheten"</string>
     <string name="lockpassword_strong_auth_required_work_pin" msgid="4208510396448713500">"Ange pinkoden för jobbprofilen för att öka säkerheten"</string>
     <string name="lockpassword_strong_auth_required_work_password" msgid="6119482061429323090">"Ange lösenordet för jobbprofilen för att öka säkerheten"</string>
-    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6351784282865851482">"Mobilen återställdes till standardinställningarna. Ange det tidigare grafiska lösenordet."</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6351784282865851482">"Mobilen återställdes till standardinställningarna. Ange det tidigare mönstret."</string>
     <string name="lockpassword_confirm_your_pin_details_frp" msgid="2128795640346033349">"Mobilen återställdes till standardinställningarna. Ange den tidigare pinkoden."</string>
     <string name="lockpassword_confirm_your_password_details_frp" msgid="4031863562975125016">"Mobilen återställdes till standardinställningarna. Ange det tidigare lösenordet."</string>
-    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="5641858015891896427">"Bekräfta det grafiska lösenordet"</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="5641858015891896427">"Bekräfta mönstret"</string>
     <string name="lockpassword_confirm_your_pin_header_frp" msgid="8285647793164729982">"Bekräfta pinkoden"</string>
     <string name="lockpassword_confirm_your_password_header_frp" msgid="7932240547542564033">"Bekräfta lösenordet"</string>
     <string name="lockpassword_invalid_pin" msgid="7530854476819820600">"Fel pinkod"</string>
@@ -1973,7 +1953,7 @@
     <string name="lockpattern_recording_intro_footer" msgid="2656868858594487197">"Tryck på Menu om du vill ha hjälp."</string>
     <string name="lockpattern_recording_inprogress" msgid="7268008332694009191">"Lyft fingret när du är klar"</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3351522018450593723">"Anslut minst <xliff:g id="NUMBER">%d</xliff:g> punkter. Försök igen."</string>
-    <string name="lockpattern_pattern_entered_header" msgid="7709618312713127249">"Det grafiska lösenordet har registrerats"</string>
+    <string name="lockpattern_pattern_entered_header" msgid="7709618312713127249">"Mönstret har registrerats"</string>
     <string name="lockpattern_need_to_confirm" msgid="6489499109451714360">"Rita ditt grafiska lösenord igen för att bekräfta"</string>
     <string name="lockpattern_pattern_confirmed_header" msgid="2969990617475456153">"Ditt nya grafiska lösenord"</string>
     <string name="lockpattern_confirm_button_text" msgid="6122815520373044089">"Bekräfta"</string>
@@ -1984,7 +1964,7 @@
     <string name="lockpattern_settings_enable_title" msgid="7401197111303283723">"Begär mönster"</string>
     <string name="lockpattern_settings_enable_summary" msgid="1116467204475387886">"Måste rita mönster för att låsa upp skärmen"</string>
     <string name="lockpattern_settings_enable_visible_pattern_title" msgid="3340969054395584754">"Gör mönster synligt"</string>
-    <string name="lockpattern_settings_enable_visible_pattern_title_profile" msgid="5138189101808127489">"Gör det grafiska lösenordet för profilen synligt"</string>
+    <string name="lockpattern_settings_enable_visible_pattern_title_profile" msgid="5138189101808127489">"Gör mönstret för profilen synligt"</string>
     <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="2273374883831956787">"Vibrera vid tryck"</string>
     <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="1638619728773344099">"Strömbrytaren låses direkt"</string>
     <string name="lockpattern_settings_power_button_instantly_locks_summary" msgid="2202430156268094229">"Utom när den hålls olåst av <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g>"</string>
@@ -2016,7 +1996,7 @@
       <item quantity="one">Visa alla appar</item>
     </plurals>
     <string name="forgot_password_title" msgid="3967873480875239885">"Kontakta IT-administratören"</string>
-    <string name="forgot_password_text" msgid="2583194470767613163">"Administratören kan hjälpa dig att återställa pinkoden, lösenordet eller det grafiska lösenordet"</string>
+    <string name="forgot_password_text" msgid="2583194470767613163">"Administratören kan hjälpa dig att återställa pinkoden, lösenordet eller mönstret"</string>
     <string name="install_all_warning" product="tablet" msgid="7010749217925069520">"Surfplattan och dina personliga uppgifter är mer sårbara när attackerna kommer från okända appar. Genom att installera appar från den här källan accepterar du att du är ansvarig för eventuella skador på surfplattan eller förlust av data som kan uppstå när du använder dessa appar."</string>
     <string name="install_all_warning" product="default" msgid="652516435709047343">"Mobilen och dina personliga uppgifter är mer sårbara när attackerna kommer från okända appar. Genom att installera appar från den här källan accepterar du att du är ansvarig för eventuella skador på mobilen eller förlust av data som kan uppstå när du använder dessa appar."</string>
     <string name="install_all_warning" product="device" msgid="2348262609815354500">"Enheten och dina personliga uppgifter är mer sårbara när attackerna kommer från okända appar. Genom att installera appar från den här källan accepterar du att du är ansvarig för eventuella skador på enheten eller förlust av data som kan uppstå när du använder dessa appar."</string>
@@ -2534,11 +2514,6 @@
     <string name="enable_service_title" msgid="7231533866953706788">"Vill du tillåta att <xliff:g id="SERVICE">%1$s</xliff:g> har fullständig kontroll över enheten?"</string>
     <string name="capabilities_list_title" msgid="1225853611983394386">"<xliff:g id="SERVICE">%1$s</xliff:g> behöver:"</string>
     <string name="touch_filtered_warning" msgid="4225815157460318241">"Svaret kan inte verifieras av Inställningar, eftersom en app skymmer en begäran om behörighet."</string>
-    <string name="enable_service_encryption_warning" msgid="931082737770453755">"Om du aktiverar <xliff:g id="SERVICE">%1$s</xliff:g> används inte skärmlåset för att förbättra datakryptering på enheten."</string>
-    <string name="secure_lock_encryption_warning" msgid="669152607190123579">"Eftersom du har aktiverat en tillgänglighetstjänst används inte skärmlåset för att förbättra datakryptering på enheten."</string>
-    <string name="enable_service_pattern_reason" msgid="6832846117817938536">"Eftersom datakrypteringen påverkas om du aktiverar <xliff:g id="SERVICE">%1$s</xliff:g> måste du bekräfta ditt grafiska lösenord."</string>
-    <string name="enable_service_pin_reason" msgid="6040417014360237703">"Eftersom datakrypteringen påverkas om du aktiverar <xliff:g id="SERVICE">%1$s</xliff:g> måste du bekräfta din pinkod."</string>
-    <string name="enable_service_password_reason" msgid="6962544350351734238">"Eftersom datakrypteringen påverkas om du aktiverar <xliff:g id="SERVICE">%1$s</xliff:g> måste du bekräfta ditt lösenord."</string>
     <string name="accessibility_service_warning" msgid="6779187188736432618">"<xliff:g id="SERVICE">%1$s</xliff:g> begär fullständig kontroll över den här enheten. Tjänsten kan läsa på skärmen och utföra åtgärder åt användare med behov av tillgänglighet. Den här kontrollnivån är olämplig för de flesta appar."</string>
     <string name="accessibility_service_warning_description" msgid="6573203795976134751">"Fullständig kontroll lämpar sig för appar med tillgänglighetsfunktioner, men är inte lämplig för de flesta appar."</string>
     <string name="accessibility_service_screen_control_title" msgid="324795030658109870">"Visa och styra skärmen"</string>
@@ -3103,14 +3078,6 @@
     <string name="remove_account_failed" msgid="3709502163548900644">"Administratören tillåter inte den här ändringen"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"Det går inte att synkronisera manuellt"</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"Synkronisering är inaktiverad för det här objektet. Om du vill ändra inställningen aktiverar du bakgrundsdata och automatisk synkronisering tillfälligt."</string>
-    <string name="enter_password" msgid="6327051330258595331">"Starta Android genom att ange ditt lösenord"</string>
-    <string name="enter_pin" msgid="1029287617551232681">"Starta Android genom att ange din pinkod"</string>
-    <string name="enter_pattern" msgid="1747316785866742960">"Starta Android genom att rita ditt grafiska lösenord"</string>
-    <string name="cryptkeeper_wrong_pattern" msgid="340747269176120242">"Fel mönster"</string>
-    <string name="cryptkeeper_wrong_password" msgid="7295607881887114486">"Fel lösenord"</string>
-    <string name="cryptkeeper_wrong_pin" msgid="2347961593970714201">"Fel pinkod"</string>
-    <string name="checking_decryption" msgid="6111642972615688237">"Kontrollerar …"</string>
-    <string name="starting_android" msgid="6694154070215356186">"Android startas ..."</string>
     <string name="delete" msgid="8330605554706263775">"Ta bort"</string>
     <string name="misc_files" msgid="6598066985800749585">"Misc-filer"</string>
     <string name="misc_files_selected_count" msgid="5597802791672749532">"<xliff:g id="NUMBER">%1$d</xliff:g> av <xliff:g id="TOTAL">%2$d</xliff:g> har valts"</string>
@@ -3206,8 +3173,6 @@
     <string name="data_usage_metered_yes" msgid="4262598072030135223">"Med datapriser"</string>
     <string name="data_usage_metered_no" msgid="1685828958417926268">"Utan datapriser"</string>
     <string name="data_usage_disclaimer" msgid="3271450299386176770">"Operatörens dataredovisning kan skilja sig från din enhets dataredovisning."</string>
-    <string name="cryptkeeper_emergency_call" msgid="8369322820475703306">"Nödsamtal"</string>
-    <string name="cryptkeeper_return_to_call" msgid="3857250752781151232">"Tillbaka till samtal"</string>
     <string name="vpn_name" msgid="3806456074909253262">"Namn"</string>
     <string name="vpn_type" msgid="5533202873260826663">"Typ"</string>
     <string name="vpn_server" msgid="2908816134941973935">"Serveradress"</string>
@@ -4224,13 +4189,13 @@
     <string name="encryption_interstitial_header" msgid="4418014339568737685">"Säker start"</string>
     <string name="encryption_continue_button" msgid="3591796237625134622">"Fortsätt"</string>
     <string name="encryption_interstitial_message_pin" msgid="1413575143234269985">"Du kan skydda enheten ytterligare genom att kräva att pinkoden måste anges när den startas. Innan enheten startar går det inte att ta emot samtal, meddelanden eller aviseringar, inklusive alarm. \n\nDetta gör det lättare att skydda data på borttappade eller stulna enheter. Vill du att pinkoden ska krävas när enheten startar?"</string>
-    <string name="encryption_interstitial_message_pattern" msgid="726550613252236854">"Du kan skydda enheten ytterligare genom att kräva att det grafiska lösenordet måste anges när den startas. Innan enheten startar går det inte att ta emot samtal, meddelanden eller aviseringar, inklusive alarm. \n\nDetta gör det lättare att skydda data på borttappade eller stulna enheter. Vill du att det grafiska lösenordet ska krävas när enheten startar?"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="726550613252236854">"Du kan skydda enheten ytterligare genom att kräva att mönstret måste anges när den startas. Innan enheten startar går det inte att ta emot samtal, meddelanden eller aviseringar, inklusive alarm. \n\nDetta gör det lättare att skydda data på borttappade eller stulna enheter. Vill du att mönstret ska krävas när enheten startar?"</string>
     <string name="encryption_interstitial_message_password" msgid="6051054565294909975">"Du kan skydda enheten ytterligare genom att kräva att lösenordet måste anges när den startas. Innan enheten startar går det inte att ta emot samtal, meddelanden eller aviseringar, inklusive alarm. \n\nDetta gör det lättare att skydda data på borttappade eller stulna enheter. Vill du att lösenordet ska krävas när enheten startar?"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="7152770518093102916">"Förutom att använda fingeravtryck kan du skydda enheten ytterligare genom att kräva att pinkoden måste anges när den startas. Innan enheten startar går det inte att ta emot samtal, meddelanden eller aviseringar, inklusive alarm.\n\nDetta gör det lättare att skydda data på borttappade eller stulna enheter. Vill du att pinkoden ska krävas när enheten startar?"</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="6257856552043740490">"Förutom att använda fingeravtryck kan du skydda enheten ytterligare genom att kräva att det grafiska lösenordet måste anges när den startas. Innan enheten startar går det inte att ta emot samtal, meddelanden eller aviseringar, inklusive alarm.\n\nDetta gör det lättare att skydda data på borttappade eller stulna enheter. Vill du att det grafiska lösenordet ska krävas när enheten startar?"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="6257856552043740490">"Förutom att använda fingeravtryck kan du skydda enheten ytterligare genom att kräva att mönstret måste anges när den startas. Innan enheten startar går det inte att ta emot samtal, meddelanden eller aviseringar, inklusive alarm.\n\nDetta gör det lättare att skydda data på borttappade eller stulna enheter. Vill du att mönstret ska krävas när enheten startar?"</string>
     <string name="encryption_interstitial_message_password_for_fingerprint" msgid="7710804822643612867">"Förutom att låsa upp enheten med fingeravtryck kan du skydda den med ett lösenord som måste anges vid start. Enheten kan inte ta emot samtal, meddelanden eller aviseringar (inklusive alarm) innan den har startats.\n\nDetta gör det lättare att skydda data på borttappade eller stulna enheter. Vill du att lösenordet ska krävas när enheten startas?"</string>
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Förutom att låsa upp enheten med ditt ansikte kan du skydda enheten ytterligare genom att kräva att pinkoden måste anges när den startas. Enheten kan inte ta emot samtal, meddelanden eller aviseringar (inklusive alarm) innan den har startats.\n\nDetta gör det lättare att skydda data på borttappade eller stulna enheter. Vill du att pinkoden ska krävas när enheten startar?"</string>
-    <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Förutom att låsa upp enheten med ditt ansikte kan du skydda enheten ytterligare genom att kräva att det grafiska lösenordet måste anges när den startas. Enheten kan inte ta emot samtal, meddelanden eller aviseringar (inklusive alarm) innan den har startats.\n\nDetta gör det lättare att skydda data på borttappade eller stulna enheter. Vill du att det grafiska lösenordet ska krävas när enheten startar?"</string>
+    <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Förutom att låsa upp enheten med ditt ansikte kan du skydda enheten ytterligare genom att kräva att mönstret måste anges när den startas. Enheten kan inte ta emot samtal, meddelanden eller aviseringar (inklusive alarm) innan den har startats.\n\nDetta gör det lättare att skydda data på borttappade eller stulna enheter. Vill du att mönstret ska krävas när enheten startar?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Förutom att låsa upp enheten med ditt ansikte kan du skydda enheten ytterligare genom att kräva att lösenordet måste anges när den startas. Enheten kan inte ta emot samtal, meddelanden eller aviseringar (inklusive alarm) innan den har startats.\n\nDetta gör det lättare att skydda data på borttappade eller stulna enheter. Vill du att lösenordet ska krävas när enheten startar?"</string>
     <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Förutom att låsa upp enheten med biometri kan du skydda den med pinkoden som måste anges vid start. Innan enheten startar går det inte att ta emot samtal, meddelanden eller aviseringar, inklusive alarm.\n\nDetta gör det lättare att skydda data på borttappade eller stulna enheter. Vill du att pinkoden ska krävas när enheten startar?"</string>
     <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Förutom att låsa upp enheten med biometri kan du skydda den med ett mönster som måste anges vid start. Innan enheten startar går det inte att ta emot samtal, meddelanden eller aviseringar, inklusive alarm.\n\nDetta gör det lättare att skydda data på borttappade eller stulna enheter. Vill du att mönster ska krävas när enheten startar?"</string>
@@ -4764,8 +4729,6 @@
       <item quantity="one">1 app får använda obegränsad data</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"Visa mer"</string>
-    <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"Vill du ta bort användardata och konvertera till filkryptering?"</string>
-    <string name="button_confirm_convert_fbe" msgid="339648921918438106">"Rensa och konvertera"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"Återställ anropsbegränsning för ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"Anropsbegränsningen för ShortcutManager har återställts"</string>
     <string name="notification_suggestion_title" msgid="6309263655965785411">"Kontrolluppgifter på låsskärm"</string>
@@ -5292,6 +5255,7 @@
     <string name="sim_action_yes" msgid="8076556020131395515">"Ja"</string>
     <string name="sim_action_reboot" msgid="3508948833333441538">"Starta om"</string>
     <string name="sim_action_no_thanks" msgid="435717748384544195">"Nej tack"</string>
+    <string name="sim_action_cancel" msgid="2668099867029610910">"Avbryt"</string>
     <string name="sim_switch_button" msgid="1405772571706095387">"Byt"</string>
     <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Det gick inte att aktivera SIM-kortet"</string>
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Ta ut SIM-kortet och sätt i det igen. Starta om enheten om problemet kvarstår."</string>
@@ -5444,6 +5408,10 @@
     <string name="cached_apps_freezer" msgid="1057519579761550350">"Hindra körning av cachelagrade appar"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"Tillåt skärmöverlagring på Inställningar"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Tillåt att appar som får visas ovanpå andra appar överlagras på skärmar med inställningar"</string>
+    <!-- no translation found for allow_mock_modem (3832264806530479214) -->
+    <skip />
+    <!-- no translation found for allow_mock_modem_summary (9097416612748005374) -->
+    <skip />
     <string name="media_controls_title" msgid="403271085636252597">"Media"</string>
     <string name="media_controls_resume_title" msgid="855076860336652370">"Fäst mediespelare"</string>
     <string name="media_controls_resume_description" msgid="3163482266454802097">"Mediespelaren förblir öppen i snabbinställningarna så att du snabbt kan återuppta uppspelningen"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index e5b5f64..726a645 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -142,10 +142,11 @@
     <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"Ruhusu kifaa chako kiwasiliane na vifaa vya karibu vya Bluetooth"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"Ruhusu simu yako iwasiliane na vifaa vilivyo karibu vyenye Bluetooth"</string>
     <string name="bluetooth_disable_a2dp_hw_offload" msgid="5942913792817797541">"Zima upakiaji wa maunzi kwa Bluetooth A2DP"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="8610420176339657720">"Utazima kisha uwashe?"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8333029144800835996">"Washa upya kifaa chako ili ubadilishe mipangilio."</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="3488695418187553566">"Zima kisha uwashe"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="4930826928585464191">"Ghairi"</string>
+    <string name="bluetooth_disable_le_audio_hw_offload" msgid="3966022676505972908">"Zima kishusha maunzi cha Bluetooth LE AUDIO"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_title" msgid="6001142380445276918">"Ungependa Kuzima kisha Uwashe Kifaa?"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_message" msgid="1524373895333698779">"Unahitaji uwashe upya kifaa chako ili ubadilishe mipangilio hii."</string>
+    <string name="bluetooth_disable_hw_offload_dialog_confirm" msgid="5594859658551707592">"Zima kisha uwashe"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel" msgid="3663690305043973720">"Ghairi"</string>
     <string name="connected_device_media_device_title" msgid="3783388247594566734">"Vifaa vya kuhifadhia data"</string>
     <string name="connected_device_call_device_title" msgid="88732390601723608">"Vifaa vya kupiga simu"</string>
     <string name="connected_device_other_device_title" msgid="4652120430615729193">"Vifaa vingine"</string>
@@ -309,9 +310,9 @@
     <string name="security_settings_title" msgid="6710768415432791970">"Usalama"</string>
     <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"Vitambulisho na usimbaji fiche"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"Simu imesimbwa kwa njia fiche"</string>
-    <string name="decryption_settings_summary" product="default" msgid="1742645256103613503">"Simu haijasimbwa"</string>
+    <string name="not_encrypted_summary" product="default" msgid="2251945842585788254">"Simu haijasimbwa kwa njia fiche"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"Kifaa kimesimbwa kwa njia fiche"</string>
-    <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"Kifaa hakijasimbwa"</string>
+    <string name="not_encrypted_summary" product="tablet" msgid="2374263654698719382">"Kifaa hakijasimbwa kwa njia fiche"</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"Skrini iliyofungwa"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"Cha kuonyesha"</string>
     <string name="security_settings_summary" msgid="1627059516127354233">"Weka Mahali Pangu, fungua skrini, funga SIM kadi, funga hifadhi ya hati tambulishi"</string>
@@ -568,37 +569,10 @@
     <string name="fingerprint_last_delete_message" msgid="7860374760549404410">"Hutaweza kutumia alama ya kidole chako kufungua simu yako au kuthibitisha kuwa ni wewe katika programu."</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="4104208067277655068">"Hutaweza kutumia alama ya kidole chako kufungua wasifu wako wa kazini, kuidhinisha ununuzi au kuingia katika akaunti za programu za kazini."</string>
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"Ndiyo, ondoa"</string>
-    <string name="crypt_keeper_settings_title" msgid="4938812137822100044">"Usimbaji fiche"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"Simba kompyuta kibao kwa njia fiche"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"Simba simu"</string>
-    <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"Imesimbwa"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"Unaweza kusimba akaunti zako, mipangilio, programu zilizopakuliwa na data husika, maudhui na faili nyingine kwa njia fiche. Baada ya kusimba kompyuta kibao yako kwa njia fiche, tukichukulia kwamba tayari umechagua njia ya kufunga skrini (yaani kwa mchoro au PIN au nenosiri), itabidi ufungue skrini ili uondoe msimbo wa njia fiche kwenye kompyuta kibao yako kila unapoiwasha. Njia nyingine pekee ya kuondoa msimbo wa njia fiche ni kurejesha mipangilio ambayo kompyuta yako ilitoka nayo kiwandani, hatua itakayofuta data yako yote.\n\nUsimbaji fiche huchukua saa moja au zaidi. Lazima uanze betri ikiwa imejaa chaji na uweke kompyuta yako kwenye chaji muda wote mchakato utakapokuwa ukiendelea. Ukikatisha, utapoteza baadhi au data yako yote."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"Unaweza kusimba akaunti zako, mipangilio, programu zilizopakuliwa na data husika, maudhui na faili nyingine kwa njia fiche. Baada ya kusimba simu yako kwa njia fiche, tukichukulia kwamba tayari umechagua njia ya kufunga skrini (yaani kwa mchoro au PIN au nenosiri), itabidi ufungue skrini ili uondoe msimbo wa njia fiche kwenye simu yako kila unapoiwasha. Njia nyingine pekee ya kuondoa msimbo wa njia fiche ni kurejesha mipangilio ambayo simu yako ilitoka nayo kiwandani, hatua itakayofuta data yako yote.\n\nUsimbaji fiche huchukua saa moja au zaidi. Lazima uanze betri ikiwa imejaa chaji na uweke simu yako kwenye chaji muda wote mchakato utakapokuwa ukiendelea. Ukikatisha, utapoteza baadhi au data yako yote."</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"Simba kompyuta kibao kwa njia fiche"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"Simba fiche simu"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"Tafadhali chaji betri yako kisha ujaribu tena."</string>
-    <string name="crypt_keeper_unplugged_text" msgid="2709721134148651329">"Tafadhali weka chaja yako kisha ujaribu tena."</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="1847280235529858357">"Hakuna PIN ya kufunga skrini au nenosiri"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="7210616262954236042">"Unahitaji kuweka PIN au nenosiri la kufunga skrini kabla kuanza usimbaji fiche."</string>
-    <string name="crypt_keeper_confirm_title" msgid="8600000209722452230">"Simba?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="3270587498436152259">"Uendeshaji usimbaji fiche hauwezi kutenduliwa na ukiukatiza, utapoteza data. Usimbaji fiche huchukua saa moja au zaidi, wakati huo kompyuta kibao itajiwasha mara kadhaa."</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="3040428543349852419">"Uendeshaji usimbaji fiche hauwezi kutenduliwa na ukiukatiza, utapoteza data. Usimbaji fiche huchukua saa moja au zaidi, wakati huo simu itajiwasha mara kadhaa."</string>
-    <string name="crypt_keeper_setup_title" msgid="3339725741305796680">"Inasimba fiche"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="4417016995091289019">"Tafadhali subiri wakati huku kompyuta yako inasimba.Asilimia <xliff:g id="PERCENT">^1</xliff:g> imekamilika."</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="7902355422499500352">"Tafadhali subiri wakati simu yako inasimba. Asilimia <xliff:g id="PERCENT">^1</xliff:g> imekamilika."</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="8348188415839917821">"Tafadhali subiri wakati kompyuta yako kibao inasimbwa kwa njia fiche. Muda uliosalia: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="8556105766597855198">"Tafadhali subiri wakati simu yako inasimbwa kwa njia fiche. Muda uliosalia: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="3832496715430327682">"Ili ufungue komputa kibao yako, izime na kisha uwashe."</string>
-    <string name="crypt_keeper_force_power_cycle" product="default" msgid="5070346039522135361">"Ili ufungue simu yako, izime na kisha uwashe."</string>
-    <string name="crypt_keeper_warn_wipe" msgid="8104921337301750394">"Onyo: Data iliyomo kwenye kifaa chako itafutwa baada ya kushindikana kwa majaribio <xliff:g id="COUNT">^1</xliff:g> zaidi ya kukifungua!"</string>
-    <string name="crypt_keeper_enter_password" msgid="1274917431075529732">"Andika nenosiri yako"</string>
-    <string name="crypt_keeper_failed_title" msgid="8173654570682244149">"Usimbaji fiche haujafanikiwa"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"Usimbaji fiche umekatizwa na hautakamilika. Kutokana na hayo, data kwenye kompyuta yako kibao haiwezi kupatikana. \n\n Ili kuendelee kutumia kompyuta yako kibao, unahitaji kurejesha mipangilio ambayo ilitoka nayo kiwandani. Ukiiwasha kompyuta yako kibao baadaye, utakuwa na fursa ya kuirejesha data yoyote iliyokuwa na nakala rudufu kwenye Akaunti yako ya Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"Usimbaji fiche umekatizwa na haukukamilika. Kutokana na hayo, data kwenye simu yako haiwezi kuonekana. \n\n Ili uendelee kutumia simu yako, utahitaji kurejesha mipangilio ambayo simu ilitoka nayo kiwandani. Utakapowasha simu yako baadaye, utakuwa na nafasi ya kurejesha data yoyote ambayo nakala yake ilikuwa imehifadhiwa katika Akaunti yako ya Google."</string>
-    <string name="crypt_keeper_data_corrupt_title" msgid="5920153462176846037">"Msimbo wa njia fiche haukuondolewa"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"Nenosiri uliloandika ni sahihi, lakini kwa bahati mbaya data yako ina hitilafu. \n\nIli uendelee kutumia kompyuta yako kibao, unahitaji kurejesha mipangilio iliyotoka nayo kiwandani. Wakati wa kuweka mipangilio mipya baada ya kurejesha ile ya kiwandani, utakuwa na nafasi ya kurejesha data yoyote ambayo nakala yake ilikuwa imehifadhiwa katika Akaunti yako ya Google."</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"Nenosiri uliloweka ni sahihi, lakini kwa bahati mbaya data yako ina hitilafu. \n\nIli uendelee kutumia simu yako, unahitaji kurejesha mipangilio iliyotoka nayo kiwandani. Wakati wa kuweka mipangilio kwenye simu yako baada ya kurejesha ile ya kiwandani, utakuwa na nafasi ya kurejesha data yoyote ambayo nakala yake ilikuwa imehifadhiwa katika Akaunti yako ya Google."</string>
-    <string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"Kubadili mbinu ya kuingiza data"</string>
+    <string name="encryption_settings_title" msgid="2848716008695618360">"Usimbaji fiche"</string>
+    <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"Simba kompyuta kibao kwa njia fiche"</string>
+    <string name="encrypt_title" product="default" msgid="7337365190988321100">"Simba simu kwa njia fiche"</string>
+    <string name="encrypted_summary" msgid="545623487587251207">"Imesimbwa kwa njia fiche"</string>
     <string name="suggested_lock_settings_title" msgid="7836065447159730217">"Linda simu yako"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"Weka mbinu ya kufunga skrini ili ulinde kompyuta kibao"</string>
     <string name="suggested_lock_settings_summary" product="device" msgid="8479766049078378225">"Weka mbinu ya kufunga skrini ili ulinde kifaa chako"</string>
@@ -817,6 +791,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Unawezahitaji pia kucharaza PIN hii kwenye kifaa kingine."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Unaweza pia kuhitaji kucharaza nenosiri hili kwenye kifaa kingine."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Ili kuoanisha na :&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;hakikisha inaonyesha nenosiri hili:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Thibitisha ili uoanishe na seti inayolengwa"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"From:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Llinganisha na kifaa hiki?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Kulinganisha na: <xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g> <xliff:g id="DEVICE_NAME">%1$s</xliff:g> <xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> Andika: <xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g> <xliff:g id="PASSKEY">%2$s</xliff:g> <xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, kisha bonyeza Rejea au Ingiza."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Ruhusu ufikiaji wa anwani na historia ya simu ulizopiga"</string>
@@ -850,6 +825,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Imeshindwa kuunganisha. Jaribu tena."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Maelezo ya kifaa"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Anwani ya Bluetooth ya kifaa chako: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Anwani ya Bluetooth ya kifaa:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Ungependa kusahau kifaa?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Ondoa uhusiano"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Ungependa kutenganisha programu?"</string>
@@ -881,6 +857,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Kumbuka mipangilio"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Kima cha juu zaidi cha vifaa vya sauti vya Bluetooth vilivyounganishwa"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Chagua kima cha juu zaidi cha vifaa vya sauti vya Bluetooth vilivyounganishwa"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"Kumbukumbu ya utatuzi wa rafu za NFC"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Ongeza kiwango cha kuweka kumbukumbu ya rafu za NFC"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Tuma"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"kioo"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Washa kuonyesha skrini bila kutumia waya"</string>
@@ -1188,6 +1166,8 @@
     <string name="wifi_hotspot_maximize_compatibility_dual_ap_summary" msgid="3579549223159056533">"Husaidia vifaa vingine kupata mtandao pepe huu. Huongeza matumizi ya betri."</string>
     <string name="wifi_tether_starting" msgid="8879874184033857814">"Inawezesha mtandaopepe…"</string>
     <string name="wifi_tether_stopping" msgid="4416492968019409188">"Inazima intaneti..."</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_title" msgid="3089432578433978073">"Kipengele cha kusambaza mtandao hakipatikani"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_content" msgid="5920421547607921112">"Wasiliana na mtoa huduma wako ili upate maelezo"</string>
     <string name="wifi_tether_enabled_subtext" msgid="5085002421099821056">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> inatumika"</string>
     <string name="wifi_tether_failed_subtext" msgid="437190628041885500">"Hitilafu ya mtandaopepe wa Wi-Fi"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7072559431286459122">"Weka intaneti ya Wi-Fi ya kusambazwa"</string>
@@ -2534,11 +2514,6 @@
     <string name="enable_service_title" msgid="7231533866953706788">"Ungependa kuruhusu <xliff:g id="SERVICE">%1$s</xliff:g> iwe na udhibiti kamili wa kifaa chako?"</string>
     <string name="capabilities_list_title" msgid="1225853611983394386">"<xliff:g id="SERVICE">%1$s</xliff:g> inahitaji:"</string>
     <string name="touch_filtered_warning" msgid="4225815157460318241">"Kwa sababu programu yako inazuia ombi la ruhusa, Mipangilio haiwezi kuthibitisha majibu yako."</string>
-    <string name="enable_service_encryption_warning" msgid="931082737770453755">"Ukiwasha <xliff:g id="SERVICE">%1$s</xliff:g>, kifaa chako hakitatumia kufunga skrini yako ili kuboresha usimbaji wa data kwa njia fiche."</string>
-    <string name="secure_lock_encryption_warning" msgid="669152607190123579">"Kwa sababu umewasha huduma ya ufikiaji, kifaa chako hakitatumia kufunga skrini yako ili kuboresha usimbaji wa data kwa njia fiche."</string>
-    <string name="enable_service_pattern_reason" msgid="6832846117817938536">"Kwa sababu kuwasha <xliff:g id="SERVICE">%1$s</xliff:g> huathiri usimbaji wa data kwa njia fiche, unahitaji kuthibitisha mchoro wako."</string>
-    <string name="enable_service_pin_reason" msgid="6040417014360237703">"Kwa sababu kuwasha <xliff:g id="SERVICE">%1$s</xliff:g> huathiri usimbaji wa data kwa njia fiche, unahitaji kuthibitisha PIN yako."</string>
-    <string name="enable_service_password_reason" msgid="6962544350351734238">"Kwa sababu kuwasha <xliff:g id="SERVICE">%1$s</xliff:g> huathiri usimbaji wa data kwa njia fiche, unahitaji kuthibitisha nenosiri lako."</string>
     <string name="accessibility_service_warning" msgid="6779187188736432618">"<xliff:g id="SERVICE">%1$s</xliff:g> inaomba udhibiti kamili wa kifaa hiki. Huduma hii inaweza kusoma skrini na ichukue hatua kwa niaba ya watumiaji walio na matatizo ya kuona au kusikia. Kiwango hiki cha udhibiti hakifai kwa programu nyingi."</string>
     <string name="accessibility_service_warning_description" msgid="6573203795976134751">"Udhibiti kamili unafaa kwa programu zinazokusaidia kwa mahitaji ya ufikivu, ila si kwa programu nyingi."</string>
     <string name="accessibility_service_screen_control_title" msgid="324795030658109870">"Kuangalia na kudhibiti skrini"</string>
@@ -3103,14 +3078,6 @@
     <string name="remove_account_failed" msgid="3709502163548900644">"Mabadiliko haya hayaruhusiwi na msimamizi wako"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"Huwezi kusawazisha mwenyewe"</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"Kwa sasa usawazishaji wa kipengee hiki umezimwa. Kubadilisha mpangilio huu, washa kwa muda data ya usuli na usawazishaji kiotomatiki."</string>
-    <string name="enter_password" msgid="6327051330258595331">"Ili uwashe Android, weka nenosiri lako"</string>
-    <string name="enter_pin" msgid="1029287617551232681">"Ili uwashe Android, weka PIN yako"</string>
-    <string name="enter_pattern" msgid="1747316785866742960">"Ili uwashe Android, chora mchoro wako"</string>
-    <string name="cryptkeeper_wrong_pattern" msgid="340747269176120242">"Mchoro huo si sahihi"</string>
-    <string name="cryptkeeper_wrong_password" msgid="7295607881887114486">"Nenosiri Lisilo sahihi"</string>
-    <string name="cryptkeeper_wrong_pin" msgid="2347961593970714201">"PIN uliyoweka si sahihi"</string>
-    <string name="checking_decryption" msgid="6111642972615688237">"Inakagua..."</string>
-    <string name="starting_android" msgid="6694154070215356186">"Inawasha Android..."</string>
     <string name="delete" msgid="8330605554706263775">"Futa"</string>
     <string name="misc_files" msgid="6598066985800749585">"Faili Nyinginezo"</string>
     <string name="misc_files_selected_count" msgid="5597802791672749532">"Imechaguliwa <xliff:g id="NUMBER">%1$d</xliff:g> juu ya <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -3206,8 +3173,6 @@
     <string name="data_usage_metered_yes" msgid="4262598072030135223">"Mtandao unaopima data"</string>
     <string name="data_usage_metered_no" msgid="1685828958417926268">"Mtandao haupimi data"</string>
     <string name="data_usage_disclaimer" msgid="3271450299386176770">"Hesabu ya data ya mtoa huduma huenda ikatofautiana na ya kifaa chako."</string>
-    <string name="cryptkeeper_emergency_call" msgid="8369322820475703306">"Simu ya dharura"</string>
-    <string name="cryptkeeper_return_to_call" msgid="3857250752781151232">"Rudi kwa kupiga simu"</string>
     <string name="vpn_name" msgid="3806456074909253262">"Jina"</string>
     <string name="vpn_type" msgid="5533202873260826663">"Aina"</string>
     <string name="vpn_server" msgid="2908816134941973935">"Anwani ya seva"</string>
@@ -4412,7 +4377,7 @@
     <string name="battery_summary" msgid="2491764359695671207">"Imetumia <xliff:g id="PERCENTAGE">%1$s</xliff:g> tangu mwisho ilipojazwa chaji"</string>
     <string name="battery_summary_24hr" msgid="7656033283282656551">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> imetumika katika saa 24 zilizopita"</string>
     <string name="no_battery_summary" msgid="5769159953384122003">"Betri haijatumika tangu mwisho ilipojazwa chaji"</string>
-    <string name="no_battery_summary_24hr" msgid="6280079526797873842">"Hakuna matumizi ya betri katika saa 24 zilizopita"</string>
+    <string name="no_battery_summary_24hr" msgid="6280079526797873842">"Betri haijatumika katika saa 24 zilizopita"</string>
     <string name="app_notification_preferences" msgid="2004680717999108725">"Mipangilio ya programu"</string>
     <string name="system_ui_settings" msgid="936169564323330967">"Onyesha Kipokea Ishara cha SystemUI"</string>
     <string name="additional_permissions" msgid="4656871347558988462">"Ruhusa za ziada"</string>
@@ -4764,8 +4729,6 @@
       <item quantity="one">Programu 1 inaweza kutumia data bila kudhibitiwa</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"Angalia zaidi"</string>
-    <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"Una uhakika kuwa unataka futa data ya mtumiaji na kugeuza kuwa usimbaji fiche wa faili?"</string>
-    <string name="button_confirm_convert_fbe" msgid="339648921918438106">"Futa na ugeuze"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"Weka upya mipangilio ya udhibiti wa ukadiriaji katika Kidhibiti cha Njia za Mkato"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"Imeweka upya mipangilio ya udhibiti wa ukadiriaji katika Kidhibiti cha Njia za Mkato"</string>
     <string name="notification_suggestion_title" msgid="6309263655965785411">"Dhibiti maelezo kwenye skrini iliyofungwa"</string>
@@ -5293,6 +5256,7 @@
     <string name="sim_action_yes" msgid="8076556020131395515">"Ndiyo"</string>
     <string name="sim_action_reboot" msgid="3508948833333441538">"Zima kisha uwashe"</string>
     <string name="sim_action_no_thanks" msgid="435717748384544195">"Hapana"</string>
+    <string name="sim_action_cancel" msgid="2668099867029610910">"Ghairi"</string>
     <string name="sim_switch_button" msgid="1405772571706095387">"Badilisha"</string>
     <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Imeshindwa kuanza kutumia SIM"</string>
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Ondoa SIM na uiweke tena. Iwapo tatizo litaendelea, zima kisha uwashe kifaa chako."</string>
@@ -5445,6 +5409,10 @@
     <string name="cached_apps_freezer" msgid="1057519579761550350">"Simamisha utekelezaji kwa programu zilizowekwa kwenye akiba"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"Ruhusu programu zinazowekelewa juu ya nyingine kwenye Mipangilio"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Ruhusu programu zinazoweza kuonyeshwa juu ya programu nyingine ziwekelewe juu ya skrini za Mipangilio"</string>
+    <!-- no translation found for allow_mock_modem (3832264806530479214) -->
+    <skip />
+    <!-- no translation found for allow_mock_modem_summary (9097416612748005374) -->
+    <skip />
     <string name="media_controls_title" msgid="403271085636252597">"Maudhui"</string>
     <string name="media_controls_resume_title" msgid="855076860336652370">"Bandika kicheza faili za sauti na video"</string>
     <string name="media_controls_resume_description" msgid="3163482266454802097">"Ili uendelee kucheza kwa haraka, kicheza faili za sauti na video hubaki kikiwa kimefunguliwa kila wakati katika Mipangilio ya Haraka"</string>
diff --git a/res/values-sw600dp-land/dimens.xml b/res/values-sw600dp-land/dimens.xml
index afdcd0e..4e4a1d3 100755
--- a/res/values-sw600dp-land/dimens.xml
+++ b/res/values-sw600dp-land/dimens.xml
@@ -19,12 +19,6 @@
     <dimen name="screen_margin_top">72dip</dimen>
     <dimen name="screen_margin_bottom">48dip</dimen>
 
-    <!-- CryptKeeper top margin for password/pin screen -->
-    <dimen name="crypt_keeper_password_top_margin">116dip</dimen>
-
-    <!-- CryptKeeper top margin for pattern screen -->
-    <dimen name="crypt_keeper_pattern_top_margin">128dip</dimen>
-
     <dimen name="captioning_preview_height">150dp</dimen>
 
     <dimen name="confirm_credentials_top_padding">20dp</dimen>
diff --git a/res/values-sw600dp/bools.xml b/res/values-sw600dp/bools.xml
index 6443cc7..1454800 100644
--- a/res/values-sw600dp/bools.xml
+++ b/res/values-sw600dp/bools.xml
@@ -17,8 +17,5 @@
 <resources>
     <!-- Whether there is a silent mode checkbox  -->
     <bool name="has_silent_mode">false</bool>
-
-    <!-- CryptKeeper allow rotation -->
-    <bool name="crypt_keeper_allow_rotation">true</bool>
 </resources>
 
diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml
index b357758..db1fbbc 100755
--- a/res/values-sw600dp/dimens.xml
+++ b/res/values-sw600dp/dimens.xml
@@ -23,24 +23,11 @@
     <dimen name="screen_margin_bottom">48dip</dimen>
     <dimen name="content_margin_left">16dip</dimen>
     <dimen name="description_margin_top">26dip</dimen>
-    <dimen name="crypt_clock_size">120sp</dimen>
 
     <!-- ActionBar contentInsetStart -->
     <dimen name="actionbar_contentInsetStart">24dp</dimen>
     <dimen name="actionbar_subsettings_contentInsetStart">80dp</dimen>
 
-    <!-- CryptKeeper top margin for password/pin screen -->
-    <dimen name="crypt_keeper_password_top_margin">256dip</dimen>
-
-    <!-- CryptKeeper top margin for pattern screen -->
-    <dimen name="crypt_keeper_pattern_top_margin">256dip</dimen>
-
-    <!-- CryptKeeper separation between status and pattern -->
-    <dimen name="crypt_keeper_pattern_separator">100dip</dimen>
-
-    <!-- CryptKeeper password/pin width -->
-    <dimen name="crypt_keeper_password_width">512dip</dimen>
-
     <!-- SwitchBar margin start / end -->
     <dimen name="switchbar_margin_start">24dp</dimen>
     <dimen name="switchbar_margin_end">24dp</dimen>
diff --git a/res/values-ta/arrays.xml b/res/values-ta/arrays.xml
index fb62e80..c949563 100644
--- a/res/values-ta/arrays.xml
+++ b/res/values-ta/arrays.xml
@@ -259,7 +259,7 @@
     <item msgid="5612873260709742213">"ஆடியோவை இயக்கு"</item>
     <item msgid="2027206403725749996">"கிளிப்போர்டைப் படி"</item>
     <item msgid="5643742956725663156">"கிளிப்போர்ட்டை மாற்று"</item>
-    <item msgid="7362845549479684378">"மீடியா பொத்தான்கள்"</item>
+    <item msgid="7362845549479684378">"மீடியா பட்டன்கள்"</item>
     <item msgid="3843484466100107397">"ஆடியோவை மையப்படுத்து"</item>
     <item msgid="617344340943430125">"முதன்மை ஒலியளவு"</item>
     <item msgid="1249691739381713634">"குரல் ஒலியளவு"</item>
@@ -326,7 +326,7 @@
     <item msgid="1444183972646890539">"ஆடியோவை இயக்கு"</item>
     <item msgid="4337542044275236638">"கிளிப்போர்டைப் படி"</item>
     <item msgid="2681224211796661809">"கிளிப்போர்ட்டை மாற்று"</item>
-    <item msgid="4479361062226474111">"மீடியா பொத்தான்கள்"</item>
+    <item msgid="4479361062226474111">"மீடியா பட்டன்கள்"</item>
     <item msgid="5651140069431283570">"ஆடியோவை மையப்படுத்து"</item>
     <item msgid="745291221457314879">"முதன்மை ஒலியளவு"</item>
     <item msgid="4722479281326245754">"குரல் ஒலியளவு"</item>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 727ec7b..f31431f 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -142,10 +142,11 @@
     <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"அருகிலுள்ள புளூடூத் சாதனங்களுடன் தொடர்புகொள்ள, உங்கள் சாதனத்தை அனுமதிக்கவும்"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"அருகிலுள்ள புளூடூத் சாதனங்களுடன் தொடர்புகொள்ள, உங்கள் மொபைலை அனுமதிக்கவும்"</string>
     <string name="bluetooth_disable_a2dp_hw_offload" msgid="5942913792817797541">"புளூடூத் A2DP வன்பொருள் ஆஃப்லோடை முடக்கு"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="8610420176339657720">"மீண்டும் தொடங்கவா?"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8333029144800835996">"இந்த அமைப்பை மாற்ற, சாதனத்தை மீண்டும் தொடங்க வேண்டும்."</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="3488695418187553566">"தொடங்கு"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="4930826928585464191">"வேண்டாம்"</string>
+    <string name="bluetooth_disable_le_audio_hw_offload" msgid="3966022676505972908">"புளூடூத் LE AUDIO ஹார்டுவேர் ஆஃப்லோடை முடக்கு"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_title" msgid="6001142380445276918">"சாதனத்தை மீண்டும் தொடங்கவா?"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_message" msgid="1524373895333698779">"இந்த அமைப்பை மாற்ற சாதனத்தை மீண்டும் தொடங்க வேண்டும்."</string>
+    <string name="bluetooth_disable_hw_offload_dialog_confirm" msgid="5594859658551707592">"மீண்டும் தொடங்கு"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel" msgid="3663690305043973720">"ரத்துசெய்"</string>
     <string name="connected_device_media_device_title" msgid="3783388247594566734">"மீடியா சாதனங்கள்"</string>
     <string name="connected_device_call_device_title" msgid="88732390601723608">"அழைப்பதற்கான சாதனங்கள்"</string>
     <string name="connected_device_other_device_title" msgid="4652120430615729193">"பிற சாதனங்கள்"</string>
@@ -309,9 +310,9 @@
     <string name="security_settings_title" msgid="6710768415432791970">"பாதுகாப்பு"</string>
     <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"என்கிரிப்ஷன் &amp; அனுமதிச் சான்றுகள்"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"ஃபோன் என்கிரிப்ட் செய்யப்பட்டது"</string>
-    <string name="decryption_settings_summary" product="default" msgid="1742645256103613503">"மொபைல் என்கிரிப்ட் செய்யப்படவில்லை"</string>
+    <string name="not_encrypted_summary" product="default" msgid="2251945842585788254">"மொபைல் என்க்ரிப்ட் செய்யப்படவில்லை"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"சாதனம் என்கிரிப்ட் செய்யப்பட்டது"</string>
-    <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"சாதனம் என்கிரிப்ட் செய்யப்படவில்லை"</string>
+    <string name="not_encrypted_summary" product="tablet" msgid="2374263654698719382">"சாதனம் என்க்ரிப்ட் செய்யப்படவில்லை"</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"லாக் ஸ்கிரீன்"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"எதைக் காட்ட வேண்டும்"</string>
     <string name="security_settings_summary" msgid="1627059516127354233">"எனது இருப்பிடம், திரை அன்லாக், சிம் கார்டு பூட்டு, அனுமதிச் சான்று சேமிப்பக பூட்டு ஆகியவற்றை அமைக்கவும்"</string>
@@ -568,37 +569,10 @@
     <string name="fingerprint_last_delete_message" msgid="7860374760549404410">"மொபைலை அன்லாக் செய்யவோ நீங்கள்தான் என்பதை ஆப்ஸில் உறுதிப்படுத்தவோ உங்கள் கைரேகையைப் பயன்படுத்த முடியாது."</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="4104208067277655068">"பணிக் கணக்கை அன்லாக் செய்யவோ பர்ச்சேஸ்களை அங்கீகரிக்கவோ பணி ஆப்ஸில் உள்நுழையவோ உங்கள் கைரேகையைப் பயன்படுத்த முடியாது."</string>
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"ஆம், அகற்று"</string>
-    <string name="crypt_keeper_settings_title" msgid="4938812137822100044">"என்க்ரிப்ட்"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"டேப்லெட்டை என்க்ரிப்ட் செய்"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"மொபைலை என்க்ரிப்ட் செய்"</string>
-    <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"என்க்ரிப்ட் செய்யப்பட்டது"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"உங்கள் கணக்குகள், அமைப்புகள், பதிவிறக்கிய ஆப்ஸ் மற்றும் அவற்றின் தரவு, மீடியா மற்றும் பிற ஃபைல்கள்  என அனைத்தையும் என்க்ரிப்ட் செய்யலாம். உங்கள் டேப்லெட்டை என்க்ரிப்ட் செய்த பிறகு, திரைப்பூட்டை (அதாவது பேட்டர்ன் அல்லது பின் அல்லது கடவுச்சொல்) அமைத்திருந்தால், ஒவ்வொரு முறையும் டேப்லெட்டை இயக்கும்போது குறிநீக்குவதற்கு திரையை அன்லாக் செய்ய வேண்டும். உங்களின் எல்லா தரவையும் அழித்து, ஆரம்ப நிலைக்கு மீட்டமைப்பதே குறிநீக்குவதற்கான மற்றொரு வழியாகும்.\n\nஎன்க்ரிப்ட் செய்வதற்கு ஒரு மணிநேரம் அல்லது அதற்கு மேல் ஆகலாம். சார்ஜ் செய்த பேட்டரியுடன் தொடங்கி, செயல் முடியும் வரை சார்ஜ் ஆகும் நிலையிலேயே வைக்கவும். செயலில் குறுக்கிட்டால், உங்கள் தரவில் சிலவற்றை அல்லது மொத்தத்தையும் இழப்பீர்கள்."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"உங்கள் கணக்குகள், அமைப்புகள், பதிவிறக்கிய ஆப்ஸ் மற்றும் அவற்றின் தரவு, மீடியா மற்றும் பிற ஃபைல்கள்  என அனைத்தையும் என்க்ரிப்ட் செய்யலாம். உங்கள் மொபைலை என்க்ரிப்ட் செய்த பிறகு, திரைப்பூட்டை (அதாவது பேட்டர்ன் அல்லது பின் அல்லது கடவுச்சொல்) அமைத்திருந்தால், ஒவ்வொரு முறையும் மொபைலை இயக்கும்போது குறிநீக்குவதற்கு திரையை அன்லாக் செய்ய வேண்டும். உங்களின் எல்லா தரவையும் அழித்து, ஆரம்ப நிலைக்கு மீட்டமைப்பதே குறிநீக்குவதற்கான மற்றொரு வழியாகும்.\n\nஎன்க்ரிப்ட் செய்வதற்கு ஒரு மணிநேரம் அல்லது அதற்கு மேல் ஆகலாம். சார்ஜ் செய்த பேட்டரியுடன் தொடங்கி, செயல் முடியும் வரை சார்ஜ் ஆகும் நிலையிலேயே வைக்கவும். செயலில் குறுக்கிட்டால், உங்கள் தரவில் சிலவற்றை அல்லது மொத்தத்தையும் இழப்பீர்கள்."</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"டேப்லெட்டை என்க்ரிப்ட் செய்"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"மொபைலை என்க்ரிப்ட் செய்"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"உங்கள் பேட்டரியை சார்ஜ் செய்து மீண்டும் முயற்சிக்கவும்."</string>
-    <string name="crypt_keeper_unplugged_text" msgid="2709721134148651329">"உங்கள் சார்ஜரை செருகி, மீண்டும் முயற்சிக்கவும்."</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="1847280235529858357">"லாக் ஸ்கிரீன் பின் அல்லது கடவுச்சொல் இல்லை"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="7210616262954236042">"முறைமையாக்கத்தைத் தொடங்குவதற்கு முன் லாக் ஸ்கிரீனுக்கான பின் அல்லது கடவுச்சொல்லை அமைக்க வேண்டும்."</string>
-    <string name="crypt_keeper_confirm_title" msgid="8600000209722452230">"என்க்ரிப்ட் செய்யவா?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="3270587498436152259">"முறைமையாக்கச் செயல்முறையானது திரும்பப்பெற முடியாததாகும், நீங்கள் அதில் குறுக்கிட்டால், தரவை இழக்க நேரிடும். என்க்ரிப்ட் செய்ய ஒரு மணிநேரம் அல்லது அதற்கு அதிகமான நேரம் எடுக்கும், அப்போது டேப்லெட் பலமுறை மீண்டும் தொடங்கலாம்."</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="3040428543349852419">"முறைமையாக்கச் செயல்முறையானது திரும்பப்பெற முடியாததாகும், நீங்கள் அதில் குறுக்கிட்டால், தரவை இழக்க நேரிடும். என்க்ரிப்ட் செய்ய ஒரு மணிநேரம் அல்லது அதற்கு அதிகமான நேரம் எடுக்கும், அப்போது தொலைபேசி பலமுறை மீண்டும் தொடங்கலாம்."</string>
-    <string name="crypt_keeper_setup_title" msgid="3339725741305796680">"என்க்ரிப்ட் செய்யப்படுகிறது"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="4417016995091289019">"உங்கள் டேப்லெட் என்க்ரிப்ட் செய்யப்படுகிறது, காத்திருக்கவும். <xliff:g id="PERCENT">^1</xliff:g>% முடிந்தது."</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="7902355422499500352">"உங்கள் மொபைல் என்க்ரிப்ட் செய்யப்படுகிறது, காத்திருக்கவும். <xliff:g id="PERCENT">^1</xliff:g>% முடிந்தது."</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="8348188415839917821">"டேப்லெட் குறியாக்கப்படும் வரை காத்திருக்கவும். மீதமுள்ள நேரம்: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="8556105766597855198">"ஃபோன் குறியாக்கப்படும் வரை காத்திருக்கவும். மீதமுள்ள நேரம்: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="3832496715430327682">"டேப்லெட்டை அன்லாக் செய்ய, அதை முடக்கி, பின் இயக்கவும்."</string>
-    <string name="crypt_keeper_force_power_cycle" product="default" msgid="5070346039522135361">"மொபைலை அன்லாக் செய்ய, அதை முடக்கி, பின் இயக்கவும்."</string>
-    <string name="crypt_keeper_warn_wipe" msgid="8104921337301750394">"எச்சரிக்கை: சாதனத்தைத் திறப்பதற்கான <xliff:g id="COUNT">^1</xliff:g> முயற்சிகளும் தோல்வி அடைந்தால், சாதனத்தின் தரவு அழிக்கப்படும்!"</string>
-    <string name="crypt_keeper_enter_password" msgid="1274917431075529732">"உங்கள் கடவுச்சொல்லை உள்ளிடவும்"</string>
-    <string name="crypt_keeper_failed_title" msgid="8173654570682244149">"என்க்ரிப்ட் தோல்வி"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"முறைமையாக்கத்தில் குறுக்கீடு ஏற்பட்டது, இதனால் நிறைவுசெய்ய முடியாது. இதன் விளைவாக, உங்கள் டேப்லெட்டில் உள்ள தரவை இனிமேல் அணுக முடியாது. \n\nஉங்கள் டேப்லெட்டைத் தொடர்ந்து பயன்படுத்த ஆரம்பநிலை மீட்டமைவைச் செயல்படுத்த வேண்டும். மீட்டமைவிற்குப் பிறகு உங்கள் டேப்லெட்டை அமைக்கும்போது, உங்கள் Google கணக்கில் காப்புப் பிரதியெடுக்கப்பட்ட எந்தத் தரவையும் மீட்டமைப்பதற்கான வாய்ப்பைப் பெறுவீர்கள்."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"முறைமையாக்கத்தில் குறுக்கீடு ஏற்பட்டது, மேலும் நிறைவுசெய்ய முடியாது. இதன் விளைவாக உங்கள் தொலைபேசியில் உள்ள தரவை இனிமேல் அணுக முடியாது. \n\nஉங்கள் தொலைபேசியைப் பயன்படுத்தி மீண்டும் தொடங்குவதற்கு ஆரம்பநிலை மீட்டமைவைச் செயல்படுத்த வேண்டும். மீட்டமைவிற்குப் பிறகு உங்கள் தொலைபேசியை அமைக்கும்போது, உங்கள் Google கணக்கில் காப்புப் பிரதியெடுக்கப்பட்ட எந்தத் தரவையும் மீட்டமைப்பதற்கான வாய்ப்பைப் பெறுவீர்கள்."</string>
-    <string name="crypt_keeper_data_corrupt_title" msgid="5920153462176846037">"குறிவிலக்கம் தோல்வி"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"சரியான கடவுச்சொல்லை உள்ளிட்டீர்கள், ஆனால் எதிர்பாராதவிதமாக உங்கள் தரவு சிதைந்துவிட்டது. \n\nடேப்லெட்டை மீண்டும் பயன்படுத்த, ஆரம்பநிலை மீட்டமைவைச் செயல்படுத்தவும். மீட்டமைத்த பின் டேப்லெட்டை அமைக்கும் போது, உங்கள் Google கணக்கில் காப்புப் பிரதி எடுக்கப்பட்ட எந்தத் தரவையும் நீங்கள் மீட்டெடுக்க முடியும்."</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"சரியான கடவுச்சொல்லை உள்ளிட்டீர்கள், ஆனால் எதிர்பாராதவிதமாக உங்கள் தரவு சிதைந்துவிட்டது. \n\nமொபைலை மீண்டும் பயன்படுத்த, ஆரம்பநிலை மீட்டமைவைச் செயல்படுத்தவும். மீட்டமைத்த பின் மொபைலை அமைக்கும் போது, Google கணக்கில் காப்புப் பிரதி எடுக்கப்பட்ட எந்தத் தரவையும் நீங்கள் மீட்டெடுக்க முடியும்."</string>
-    <string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"உள்ளீட்டு முறையை மாற்று"</string>
+    <string name="encryption_settings_title" msgid="2848716008695618360">"என்க்ரிப்ஷன்"</string>
+    <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"டேப்லெட்டை என்க்ரிப்ட் செய்யுங்கள்"</string>
+    <string name="encrypt_title" product="default" msgid="7337365190988321100">"மொபைலை என்க்ரிப்ட் செய்யுங்கள்"</string>
+    <string name="encrypted_summary" msgid="545623487587251207">"என்க்ரிப்ட் செய்யப்பட்டது"</string>
     <string name="suggested_lock_settings_title" msgid="7836065447159730217">"உங்கள் மொபைலைப் பாதுகாக்கவும்"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"டேப்லெட்டைப் பாதுகாக்க, திரைப் பூட்டை அமைக்கவும்"</string>
     <string name="suggested_lock_settings_summary" product="device" msgid="8479766049078378225">"சாதனத்தைப் பாதுகாக்க, திரைப் பூட்டை அமைக்கவும்"</string>
@@ -817,6 +791,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"பின்னை வேறொரு சாதனத்திலும் உள்ளிட வேண்டியிருக்கலாம்."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"நீங்கள் இந்தக் கடவுச்சொல்லை வேறொரு சாதனத்திலும் உள்ளிட வேண்டியிருக்கலாம்."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"பின்வருவதுடன் இணைக்கவும்:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;இது, இந்தக் கடவுச்சொல்லைக் காட்டுகிறது என்பதை உறுதிப்படுத்தவும்:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"ஒருங்கிணைக்கப்பட்ட தொகுப்பில் உள்ள சாதனங்களுடன் இணைப்பதை உறுதிசெய்துகொள்ளுங்கள்"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"பின்வருவதில் இருந்து:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;இந்தச் சாதனத்தை இணைக்கவா?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"இதனுடன் இணைக்க:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>இதை உள்ளிடவும்:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, Return அல்லது Enter ஐ அழுத்தவும்."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"உங்கள் தொடர்புகள் மற்றும் அழைப்புப் பதிவை அணுக அனுமதிக்கவும்"</string>
@@ -850,6 +825,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"இணைக்க முடியவில்லை. மீண்டும் முயலவும்."</string>
     <string name="device_details_title" msgid="1155622417516195481">"சாதன விவரங்கள்"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"சாதனத்தின் புளூடூத் முகவரி: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"சாதனத்தின் புளூடூத் முகவரி:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"சாதனத்தை அகற்றவா?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"இணைப்பை அகற்றும்"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"ஆப்ஸைத் துண்டிக்கவா?"</string>
@@ -881,6 +857,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"அமைப்புகளை நினைவில்கொள்"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"இணைத்துள்ள புளூடூத் ஆடியோ சாதனங்களின் அதிகபட்ச எண்ணிக்கை"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"இணைத்துள்ள புளூடூத் ஆடியோ சாதனங்களின் அதிகபட்ச எண்ணிக்கையைத் தேர்ந்தெடுக்கவும்"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"NFC அடுக்கின் பிழைதிருத்த பதிவு"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"NFC அடுக்கின் நுழைவு அளவை அதிகரிக்கும்"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Cast"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"பிரதிபலித்தல்"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"வயர்லெஸ் காட்சியை இயக்கு"</string>
@@ -1188,6 +1166,8 @@
     <string name="wifi_hotspot_maximize_compatibility_dual_ap_summary" msgid="3579549223159056533">"இந்த ஹாட்ஸ்பாட்டைப் பிற சாதனங்கள் கண்டறிய உதவும். பேட்டரி உபயோகத்தை அதிகரிக்கும்."</string>
     <string name="wifi_tether_starting" msgid="8879874184033857814">"ஹாட்ஸ்பாட்டை இயக்குகிறது…"</string>
     <string name="wifi_tether_stopping" msgid="4416492968019409188">"ஹாட்ஸ்பாட்டை முடக்குகிறது…"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_title" msgid="3089432578433978073">"இணைப்பு முறை கிடைக்கவில்லை"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_content" msgid="5920421547607921112">"விவரங்களுக்கு மொபைல் நிறுவனத்தைத் தொடர்புகொள்ளவும்"</string>
     <string name="wifi_tether_enabled_subtext" msgid="5085002421099821056">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> செயலில் உள்ளது"</string>
     <string name="wifi_tether_failed_subtext" msgid="437190628041885500">"போர்ட்டபில் வைஃபை ஹாட்ஸ்பாட் பிழை"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7072559431286459122">"வைஃபை ஹாட்ஸ்பாட்டை அமை"</string>
@@ -2227,7 +2207,7 @@
     <string name="user_dict_settings_edit_dialog_title" msgid="316493656442362284">"வார்த்தையைத் திருத்து"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="4909198741914531509">"திருத்து"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="651550824433043545">"நீக்கு"</string>
-    <string name="user_dict_settings_empty_text" msgid="86562873609647919">"பயனர் அகராதியில் எந்தச் சொற்களும் இல்லை. சொல்லைச் சேர்க்க, சேர் (+) பொத்தானைத் தட்டவும்."</string>
+    <string name="user_dict_settings_empty_text" msgid="86562873609647919">"பயனர் அகராதியில் எந்தச் சொற்களும் இல்லை. சொல்லைச் சேர்க்க, சேர் (+) பட்டனைத் தட்டவும்."</string>
     <string name="user_dict_settings_all_languages" msgid="8563387437755363526">"எல்லா மொழிகளுக்கும்"</string>
     <string name="user_dict_settings_more_languages" msgid="5378870726809672319">"மேலும் மொழிகள்..."</string>
     <string name="testing" msgid="6294172343766732037">"சோதனை"</string>
@@ -2534,11 +2514,6 @@
     <string name="enable_service_title" msgid="7231533866953706788">"உங்கள் சாதனத்தை முழுமையாகக் கட்டுப்படுத்த <xliff:g id="SERVICE">%1$s</xliff:g> சேவையை அனுமதிக்கவா?"</string>
     <string name="capabilities_list_title" msgid="1225853611983394386">"<xliff:g id="SERVICE">%1$s</xliff:g> செய்வது:"</string>
     <string name="touch_filtered_warning" msgid="4225815157460318241">"அனுமதிக் கோரிக்கையை ஆப்ஸ் மறைப்பதால், அமைப்புகளால் உங்கள் பதிலைச் சரிபார்க்க முடியாது."</string>
-    <string name="enable_service_encryption_warning" msgid="931082737770453755">"<xliff:g id="SERVICE">%1$s</xliff:g>ஐ இயக்கினால், தரவு மறையாக்கத்தை மேம்படுத்த சாதனம் திரைப் பூட்டைப் பயன்படுத்தாது."</string>
-    <string name="secure_lock_encryption_warning" msgid="669152607190123579">"அணுகல்தன்மை சேவையை இயக்கியுள்ளதால், தரவு மறையாக்கத்தை மேம்படுத்த சாதனம் திரைப் பூட்டைப் பயன்படுத்தாது."</string>
-    <string name="enable_service_pattern_reason" msgid="6832846117817938536">"<xliff:g id="SERVICE">%1$s</xliff:g> சேவையை இயக்குவது தரவுக் குறியாக்கத்தைப் பாதிக்கும் என்பதால், வடிவத்தை நீங்கள் உறுதிப்படுத்த வேண்டும்."</string>
-    <string name="enable_service_pin_reason" msgid="6040417014360237703">"<xliff:g id="SERVICE">%1$s</xliff:g> சேவையை இயக்குவது தரவுக் குறியாக்கத்தைப் பாதிக்கும் என்பதால், பின்னை நீங்கள் உறுதிப்படுத்த வேண்டும்."</string>
-    <string name="enable_service_password_reason" msgid="6962544350351734238">"<xliff:g id="SERVICE">%1$s</xliff:g> சேவையை இயக்குவது தரவுக் குறியாக்கத்தைப் பாதிக்கும் என்பதால், கடவுச்சொல்லை நீங்கள் உறுதிப்படுத்த வேண்டும்."</string>
     <string name="accessibility_service_warning" msgid="6779187188736432618">"இந்தச் சாதனத்திற்கான முழுக் கட்டுப்பாட்டையும் <xliff:g id="SERVICE">%1$s</xliff:g> கோருகிறது. இந்தச் சேவை உங்கள் திரையில் தோன்றுவதைப் படித்து, பயனர்களுக்குத் தேவையான அணுகல்களைப் பெற அவர்களின் சார்பில் செயல்படும். இப்போதுள்ள கட்டுப்பாடு பெரும்பாலான ஆப்ஸுக்குப் பொருந்தவில்லை."</string>
     <string name="accessibility_service_warning_description" msgid="6573203795976134751">"உங்களுக்கு உதவக்கூடிய ஆப்ஸுக்குக் தேவையான அணுகல்தன்மையை அளித்து முழுக் கட்டுப்பாட்டையும் அளிக்கலாம், ஆனால் பெரும்பாலான ஆப்ஸுக்கு இது பொருந்தாது."</string>
     <string name="accessibility_service_screen_control_title" msgid="324795030658109870">"திரையைப் பார்த்தலும் நிர்வகித்தலும்"</string>
@@ -2669,8 +2644,8 @@
     <string name="battery_tip_summary_summary" product="tablet" msgid="5063158368808711973">"டேப்லெட்டில் பின்னணி பேட்டரி உபயோகம் வழக்கமான முறையில் உள்ளது"</string>
     <string name="battery_tip_summary_summary" product="device" msgid="4242899844618910548">"சாதனத்தில் பின்னணி பேட்டரி உபயோகம் வழக்கமான முறையில் உள்ளது"</string>
     <string name="battery_tip_low_battery_title" msgid="4155239078744100997">"குறைவான பேட்டரி அளவு"</string>
-    <string name="battery_tip_low_battery_summary" msgid="2629633757244297436">"பேட்டரி நிலையை நீட்டிக்க பேட்டரி சேமிப்பானை இயக்குக"</string>
-    <string name="battery_tip_smart_battery_title" msgid="8925025450214912325">"பேட்டரி நிலையை மேம்படுத்துதல்"</string>
+    <string name="battery_tip_low_battery_summary" msgid="2629633757244297436">"பேட்டரி ஆயுளை நீட்டிக்க பேட்டரி சேமிப்பானை இயக்குக"</string>
+    <string name="battery_tip_smart_battery_title" msgid="8925025450214912325">"பேட்டரி ஆயுளை மேம்படுத்துதல்"</string>
     <string name="battery_tip_smart_battery_summary" msgid="3592965553502362965">"பேட்டரி நிர்வாகியை ஆன் செய்யவும்"</string>
     <string name="battery_tip_early_heads_up_title" msgid="4411387863476629452">"பேட்டரி சேமிப்பானை ஆன் செய்யவும்"</string>
     <string name="battery_tip_early_heads_up_summary" msgid="578523794827443977">"வழக்கத்தைவிட, பேட்டரி வேகமாகத் தீர்ந்துவிடக்கூடும்"</string>
@@ -2876,7 +2851,7 @@
     <string name="battery_saver_auto_routine_summary" msgid="3913145448299472628">"உங்கள் பேட்டரி தீர்ந்துபோகும் நிலையில் இருக்கும்போது வழக்கமான அடுத்த ரீசார்ஜுக்கு முன்பு பேட்டரி சேமிப்பான் ஆன் செய்யப்படும்."</string>
     <string name="battery_saver_auto_percentage_summary" msgid="6190884450723824287">"<xliff:g id="PERCENT">%1$s</xliff:g> ஆக இருக்கும்போது ஆன் செய்யப்படும்"</string>
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"பேட்டரி சேமிப்பு திட்டமிடல்"</string>
-    <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"பேட்டரி நிலையை நீட்டிக்கும்"</string>
+    <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"பேட்டரி ஆயுளை நீட்டிக்கும்"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"சார்ஜ் ஆனதும் ஆஃப் செய்"</string>
     <string name="battery_saver_sticky_description_new" product="default" msgid="492221102651829607">"<xliff:g id="NUMBER">^1</xliff:g><xliff:g id="UNIT">%</xliff:g>க்கு மேல் மொபைல் சார்ஜ் ஆனதும் பேட்டரி சேமிப்பான் ஆஃப் ஆகிவிடும்"</string>
     <string name="battery_saver_sticky_description_new" product="tablet" msgid="4566426833434375284">"<xliff:g id="NUMBER">^1</xliff:g><xliff:g id="UNIT">%</xliff:g>க்கு மேல் டேப்லெட் சார்ஜ் ஆகும்போது பேட்டரி சேமிப்பான் ஆஃப் ஆகிவிடும்"</string>
@@ -2961,7 +2936,7 @@
     <string name="vpn_settings_single_insecure_multiple_total" msgid="6107225844641301139">"<xliff:g id="VPN_COUNT">%d</xliff:g> பாதுகாப்பாக இல்லை"</string>
     <string name="vpn_settings_multiple_insecure_multiple_total" msgid="1706236062478680488">"<xliff:g id="VPN_COUNT">%d</xliff:g> பாதுகாப்பாக இல்லை"</string>
     <string name="adaptive_connectivity_title" msgid="7464959640138428192">"சூழல்சார் இணைப்புநிலை"</string>
-    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"உங்கள் நெட்வொர்க் இணைப்புகளைத் தானாக நிர்வகிப்பதன் மூலம் பேட்டரி நிலையை நீட்டிப்பதோடு சாதனச் செயல்திறனையும் மேம்படுத்தும்"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"உங்கள் நெட்வொர்க் இணைப்புகளைத் தானாக நிர்வகிப்பதன் மூலம் பேட்டரி ஆயுளை நீட்டிப்பதோடு சாதனச் செயல்திறனையும் மேம்படுத்தும்"</string>
     <string name="adaptive_connectivity_switch_on" msgid="3653067561620745493">"ஆன்"</string>
     <string name="adaptive_connectivity_switch_off" msgid="5076172560836115265">"ஆஃப்"</string>
     <string name="credentials_title" msgid="7535942196886123656">"அனுமதிச் சான்று சேமிப்பகம்"</string>
@@ -3025,7 +3000,7 @@
     <string name="backup_erase_dialog_title" msgid="5892431263348766484"></string>
     <string name="backup_erase_dialog_message" msgid="2250872501409574331">"உங்கள் வைஃபை கடவுச்சொற்கள், புத்தகக்குறிகள், பிற அமைப்புகள் மற்றும் ஆப்ஸ் டேட்டாவைக் காப்புப் பிரதியெடுப்பதை நிறுத்துவதுடன், Google சேவையகங்களில் உள்ள எல்லா நகல்களையும் அழித்துவிட வேண்டுமா?"</string>
     <string name="fullbackup_erase_dialog_message" msgid="2379053988557486162">"சாதனத் தரவையும் (வைஃபை கடவுச்சொற்கள் மற்றும் அழைப்பு பதிவு போன்றவை) ஆப்ஸ் டேட்டாவையும் (பயன்பாடுகளில் சேமிக்கப்பட்டிருக்கும் அமைப்புகள் மற்றும் ஃபைல்கள்  போன்றவை) காப்புப் பிரதி எடுப்பதை நிறுத்தி, தொலைநிலை சேவையகங்களில் உள்ள எல்லா நகல்களையும் அழிக்கவா?"</string>
-    <string name="fullbackup_data_summary" msgid="971587401251601473">"சாதனத் தரவையும் (வைஃபை கடவுச்சொற்கள், அழைப்பு பதிவு போன்றவை) ஆப்ஸ் டேட்டாவையும் (ஆப்ஸ்களில் சேமிக்கப்பட்டிருக்கும் அமைப்புகள், ஃபைல்கள்  போன்றவை) தொலைநிலையில் தானாகக் காப்புப் பிரதி எடுக்கும்.\n\nதானியங்கு காப்புப் பிரதியை இயக்கும் போது, சாதனம் மற்றும் ஆப்ஸ் டேட்டாவானது குறிப்பிட்ட கால இடைவெளியில் தொலைநிலையில் சேமிக்கப்படும். ஆப்ஸ் டேட்டா என்பது, தொடர்புகள், செய்திகள், படங்கள் போன்ற மிகவும் முக்கிய தரவு உட்பட, ஆப்ஸ் சேமித்த (டெவெலப்பர் அமைப்புகளைப் பொறுத்து) எந்தத் தரவாகவும் இருக்கலாம்."</string>
+    <string name="fullbackup_data_summary" msgid="971587401251601473">"சாதனத் தரவையும் (வைஃபை கடவுச்சொற்கள், அழைப்பு பதிவு போன்றவை) ஆப்ஸ் டேட்டாவையும் (ஆப்ஸ்களில் சேமிக்கப்பட்டிருக்கும் அமைப்புகள், ஃபைல்கள்  போன்றவை) தொலைநிலையில் தானாகக் காப்புப் பிரதி எடுக்கும்.\n\nதானியங்கு காப்புப் பிரதியை இயக்கும் போது, சாதனம் மற்றும் ஆப்ஸ் டேட்டாவானது குறிப்பிட்ட கால இடைவெளியில் தொலைநிலையில் சேமிக்கப்படும். ஆப்ஸ் டேட்டா என்பது, தொடர்புகள், செய்திகள், படங்கள் போன்ற மிகவும் பாதுகாக்கப்பட வேண்டிய தனிப்பட்ட தரவு உட்பட, ஆப்ஸ் சேமித்த (டெவெலப்பர் அமைப்புகளைப் பொறுத்து) எந்தத் தரவாகவும் இருக்கலாம்."</string>
     <string name="device_admin_settings_title" msgid="31392408594557070">"சாதன நிர்வாகி அமைப்புகள்"</string>
     <string name="active_device_admin_msg" msgid="7744106305636543184">"சாதன நிர்வாகி ஆப்ஸ்"</string>
     <string name="remove_device_admin" msgid="3143059558744287259">"இந்தச் சாதன நிர்வாகி ஆப்ஸை முடக்கு"</string>
@@ -3103,14 +3078,6 @@
     <string name="remove_account_failed" msgid="3709502163548900644">"உங்கள் நிர்வாகி இந்த மாற்றத்தை அனுமதிக்கவில்லை"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"கைமுறையாக ஒத்திசைக்க முடியாது"</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"இந்த உருப்படிக்கான ஒத்திசைவு தற்போது முடக்கப்பட்டுள்ளது. இந்த அமைப்பை மாற்ற, பின்புல டேட்டா உபயோகம் மற்றும் தன்னியக்க ஒத்திசைவைத் தற்காலிகமாக இயக்கவும்."</string>
-    <string name="enter_password" msgid="6327051330258595331">"Androidஐத் தொடங்க, கடவுச்சொல்லை உள்ளிடவும்"</string>
-    <string name="enter_pin" msgid="1029287617551232681">"Androidஐத் தொடங்க, PINஐ உள்ளிடவும்"</string>
-    <string name="enter_pattern" msgid="1747316785866742960">"Androidஐத் தொடங்க, வடிவத்தை வரையவும்"</string>
-    <string name="cryptkeeper_wrong_pattern" msgid="340747269176120242">"தவறான பேட்டர்ன்"</string>
-    <string name="cryptkeeper_wrong_password" msgid="7295607881887114486">"தவறான கடவுச்சொல்"</string>
-    <string name="cryptkeeper_wrong_pin" msgid="2347961593970714201">"தவறான பின்"</string>
-    <string name="checking_decryption" msgid="6111642972615688237">"சரிபார்க்கிறது..."</string>
-    <string name="starting_android" msgid="6694154070215356186">"Android தொடங்குகிறது…"</string>
     <string name="delete" msgid="8330605554706263775">"நீக்கு"</string>
     <string name="misc_files" msgid="6598066985800749585">"மற்ற ஃபைல்கள்"</string>
     <string name="misc_files_selected_count" msgid="5597802791672749532">"<xliff:g id="TOTAL">%2$d</xliff:g> இல் <xliff:g id="NUMBER">%1$d</xliff:g> தேர்ந்தெடுக்கப்பட்டது"</string>
@@ -3206,8 +3173,6 @@
     <string name="data_usage_metered_yes" msgid="4262598072030135223">"கட்டண நெட்வொர்க்"</string>
     <string name="data_usage_metered_no" msgid="1685828958417926268">"கட்டணம் குறைவான நெட்வொர்க்"</string>
     <string name="data_usage_disclaimer" msgid="3271450299386176770">"மொபைல் நிறுவனம் கணக்கிடும் டேட்டா அளவும், சாதனம் கணக்கிடும் டேட்டா அளவும் மாறுபடலாம்."</string>
-    <string name="cryptkeeper_emergency_call" msgid="8369322820475703306">"அவசர அழைப்பு"</string>
-    <string name="cryptkeeper_return_to_call" msgid="3857250752781151232">"அழைப்பிற்குத் திரும்பு"</string>
     <string name="vpn_name" msgid="3806456074909253262">"பெயர்"</string>
     <string name="vpn_type" msgid="5533202873260826663">"வகை"</string>
     <string name="vpn_server" msgid="2908816134941973935">"சேவையக முகவரி"</string>
@@ -4495,7 +4460,7 @@
     <string name="ignore_optimizations_on" msgid="6865583039303804932">"மேம்படுத்த வேண்டாம்"</string>
     <string name="ignore_optimizations_off" msgid="9186557038453586295">"Optimize"</string>
     <string name="ignore_optimizations_on_desc" msgid="1280043916460939932">"பேட்டரியை மிக விரைவாகத் தீர்த்துவிடக்கூடும். பின்னணியில் பேட்டரியைப் பயன்படுத்துவதிலிருந்து, ஆப்ஸ் இனி தடுக்கப்படாது."</string>
-    <string name="ignore_optimizations_off_desc" msgid="3324571675983286177">"பேட்டரி அதிக நேரம் நீடிப்பதற்காகப் பரிந்துரைக்கப்படுகிறது"</string>
+    <string name="ignore_optimizations_off_desc" msgid="3324571675983286177">"பேட்டரியின் ஆயுளை நீடிப்பதற்காகப் பரிந்துரைக்கப்படுகிறது"</string>
     <string name="ignore_optimizations_title" msgid="3464172726254542889">"பேட்டரி மேம்படுத்தல்களைத் தவிர்க்க, <xliff:g id="APP">%s</xliff:g>ஐ அனுமதிக்கவா?"</string>
     <string name="app_list_preference_none" msgid="1635406344616653756">"ஏதுமில்லை"</string>
     <string name="work_profile_usage_access_warning" msgid="3477719910927319122">"இந்த ஆப்ஸின் உபயோக அணுகலை முடக்குவதால், பணிக் கணக்கில் உள்ள பயன்பாடுகளுக்கான டேட்டா உபயோகத்தைக் கண்காணிப்பதிலிருந்து உங்கள் நிர்வாகியைத் தடுக்க முடியாது"</string>
@@ -4764,8 +4729,6 @@
       <item quantity="one">1 ஆப்ஸால் எல்லா தகவலையும் பயன்படுத்த முடியும்</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"மேலும் காட்டு"</string>
-    <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"பயனர் தரவை அழித்து, ஃபைல் முறைமையாக்கத்திற்கு மாற்ற வேண்டுமா?"</string>
-    <string name="button_confirm_convert_fbe" msgid="339648921918438106">"அழித்து, மாற்று"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"ShortcutManager இன் ரேட் லிமிட்டிங்கை மீட்டமை"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"ShortcutManager இன் ரேட் லிமிட்டிங் மீட்டமைக்கப்பட்டது"</string>
     <string name="notification_suggestion_title" msgid="6309263655965785411">"லாக் ஸ்கிரீனில் தகவலைக் கட்டுப்படுத்தவும்"</string>
@@ -4788,7 +4751,7 @@
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"ஆதரவளிக்கப்பட்ட ஆப்ஸும் டார்க் தீமிற்கு மாறும்"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"சரி"</string>
     <string name="dark_theme_slice_title" msgid="4684222119481114062">"டார்க் தீம்மை முயல்க"</string>
-    <string name="dark_theme_slice_subtitle" msgid="5555724345330434268">"பேட்டரி நிலையை நீட்டிக்க உதவும்"</string>
+    <string name="dark_theme_slice_subtitle" msgid="5555724345330434268">"பேட்டரி ஆயுளை நீட்டிக்க உதவும்"</string>
     <string name="quick_settings_developer_tiles" msgid="7336007844525766623">"விரைவு அமைப்புகளின் டெவெலப்பர் கட்டங்கள்"</string>
     <string name="adb_authorization_timeout_title" msgid="6996844506783749754">"adb அங்கீகரிப்பு நேர முடிவை முடக்குதல்"</string>
     <string name="adb_authorization_timeout_summary" msgid="409931540424019778">"இயல்பான (7 நாட்கள்) அல்லது பயனர் உள்ளமைத்த (குறைந்தபட்சம் 1 நாள்) நேரத்திற்குள் மீண்டும் இணைப்பிற்கு வராத சிஸ்டங்களுக்கான adb அங்கீகரிப்புகளைத் தானாக ரத்துசெய்தல் முடக்கப்படும்."</string>
@@ -5121,9 +5084,9 @@
     <string name="media_output_switching" msgid="7488216595474868546">"மாற்றுகிறது…"</string>
     <string name="take_call_on_title" msgid="1159417893879946757">"அழைப்புகளை எதில் எடுப்பது?"</string>
     <string name="cannot_change_apn_toast" msgid="296540724089240405">"இந்த APNனை மாற்ற இயலாது."</string>
-    <string name="battery_suggestion_title" product="tablet" msgid="1525940496459255289">"டேப்லெட்டின் பேட்டரி நிலையை மேம்படுத்தவும்"</string>
-    <string name="battery_suggestion_title" product="device" msgid="2280773774080720377">"சாதனத்தின் பேட்டரி நிலையை மேம்படுத்தவும்"</string>
-    <string name="battery_suggestion_title" product="default" msgid="4811554469047272537">"மொபைலின் பேட்டரி நிலையை மேம்படுத்தவும்"</string>
+    <string name="battery_suggestion_title" product="tablet" msgid="1525940496459255289">"டேப்லெட்டின் பேட்டரி ஆயுளை மேம்படுத்தவும்"</string>
+    <string name="battery_suggestion_title" product="device" msgid="2280773774080720377">"சாதனத்தின் பேட்டரி ஆயுளை மேம்படுத்தவும்"</string>
+    <string name="battery_suggestion_title" product="default" msgid="4811554469047272537">"மொபைலின் பேட்டரி ஆயுளை மேம்படுத்தவும்"</string>
     <string name="battery_suggestion_summary" msgid="8186720080540016197"></string>
     <string name="gesture_prevent_ringing_screen_title" msgid="8293094715267769349">"ரிங் ஆவதைத் தடு"</string>
     <string name="gesture_prevent_ringing_title" msgid="5978577898997523581">"பவர் பட்டனையும் ஒலி அதிகரிப்பதற்கான பட்டனையும் சேர்த்து அழுத்தும்போது"</string>
@@ -5292,6 +5255,7 @@
     <string name="sim_action_yes" msgid="8076556020131395515">"ஆம்"</string>
     <string name="sim_action_reboot" msgid="3508948833333441538">"மீண்டும் தொடங்கு"</string>
     <string name="sim_action_no_thanks" msgid="435717748384544195">"வேண்டாம்"</string>
+    <string name="sim_action_cancel" msgid="2668099867029610910">"ரத்துசெய்"</string>
     <string name="sim_switch_button" msgid="1405772571706095387">"மாற்று"</string>
     <string name="dsds_activation_failure_title" msgid="4467364110584914794">"சிம்மை இயக்க முடியவில்லை"</string>
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"சிம்மை அகற்றிவிட்டு மீண்டும் செருகவும். சிக்கல் தொடரும்பட்சத்தில் சாதனத்தை மீண்டும் தொடங்கவும்."</string>
@@ -5444,6 +5408,10 @@
     <string name="cached_apps_freezer" msgid="1057519579761550350">"தற்காலிக சேமிப்பக ஆப்ஸின் செயல்பாட்டை நிறுத்துதல்"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"அமைப்புகளில் திரை மேலடுக்கை அனுமதித்தல்"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"அமைப்புகள் திரைகளுக்கு மேலாகக் காட்டுவதற்கு மற்ற ஆப்ஸில் டிஸ்ப்ளே செய்யப்படக்கூடிய ஆப்ஸை அனுமதிக்கும்"</string>
+    <!-- no translation found for allow_mock_modem (3832264806530479214) -->
+    <skip />
+    <!-- no translation found for allow_mock_modem_summary (9097416612748005374) -->
+    <skip />
     <string name="media_controls_title" msgid="403271085636252597">"மீடியா"</string>
     <string name="media_controls_resume_title" msgid="855076860336652370">"மீடியா பிளேயரைப் பின் செய்தல்"</string>
     <string name="media_controls_resume_description" msgid="3163482266454802097">"வீடியோவின் இயக்கத்தை விரைவாகத் தொடங்க, விரைவு அமைப்புகளில் மீடியா பிளேயரைத் திறந்து வைத்திருக்கும்"</string>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 5e76149..364d376 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -92,7 +92,7 @@
     <string name="bluetooth_is_disconnect_question" msgid="777406775955421784">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>ను డిస్‌కనెక్ట్ చేయాలా?"</string>
     <string name="bluetooth_broadcasting" msgid="6379176741690311973">"ప్రసారం"</string>
     <string name="bluetooth_device" msgid="2217973503732544291">"పేరులేని బ్లూటూత్ పరికరం"</string>
-    <string name="progress_scanning" msgid="2564746192843011826">"శోధించడం"</string>
+    <string name="progress_scanning" msgid="2564746192843011826">"సెర్చ్ చేయడం"</string>
     <string name="bluetooth_no_devices_found" msgid="7704539337219953182">"సమీపంలో బ్లూటూత్ పరికరాలేవీ దొరకలేదు."</string>
     <string name="bluetooth_notif_ticker" msgid="209515545257862858">"బ్లూటూత్ జత చేయడానికి రిక్వెస్ట్‌"</string>
     <string name="bluetooth_notif_title" msgid="1196532269131348647">"జత చేయడానికి రిక్వెస్ట్‌"</string>
@@ -142,10 +142,11 @@
     <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"సమీపంలోని బ్లూటూత్ పరికరాలతో కమ్యూనికేట్ చేయడం కోసం మీ పరికరాన్ని అనుమతించండి"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"సమీపంలోని బ్లూటూత్ పరికరాలతో కమ్యూనికేట్ చేయడం కోసం మీ ఫోన్‌ని అనుమతించండి"</string>
     <string name="bluetooth_disable_a2dp_hw_offload" msgid="5942913792817797541">"బ్లూటూత్ A2DP హార్డ్‌వేర్ ఆఫ్‌లోడ్‌ని డిజేబుల్ చేయి"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="8610420176339657720">"పరికరాన్ని మళ్లీ ప్రారంభించాలా?"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8333029144800835996">"మీరు ఈ సెట్టింగ్‌ను మార్చడానికి మీ పరికరాన్ని మళ్లీ ప్రారంభించాలి."</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="3488695418187553566">"మళ్లీ ప్రారంభించు"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="4930826928585464191">"రద్దు చేయి"</string>
+    <string name="bluetooth_disable_le_audio_hw_offload" msgid="3966022676505972908">"బ్లూటూత్ LE ఆడియో హార్డ్‌వేర్ ఆఫ్‌లోడ్‌ను డిజేబుల్ చేయండి"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_title" msgid="6001142380445276918">"పరికరాన్ని రీస్టార్ట్ చేయాలా?"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_message" msgid="1524373895333698779">"మీరు ఈ సెట్టింగ్‌ను మార్చడానికి మీ పరికరాన్ని రీస్టార్ట్ చేయాలి."</string>
+    <string name="bluetooth_disable_hw_offload_dialog_confirm" msgid="5594859658551707592">"రీస్టార్ట్ చేయండి"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel" msgid="3663690305043973720">"రద్దు చేయండి"</string>
     <string name="connected_device_media_device_title" msgid="3783388247594566734">"మీడియా పరికరాలు"</string>
     <string name="connected_device_call_device_title" msgid="88732390601723608">"కాల్ పరికరాలు"</string>
     <string name="connected_device_other_device_title" msgid="4652120430615729193">"ఇతర పరికరాలు"</string>
@@ -309,9 +310,9 @@
     <string name="security_settings_title" msgid="6710768415432791970">"సెక్యూరిటీ"</string>
     <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"ఎన్‌క్రిప్షన్ &amp; ఆధారాలు"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"ఫోన్ ఎన్‌క్రిప్ట్ చేయబడింది"</string>
-    <string name="decryption_settings_summary" product="default" msgid="1742645256103613503">"ఫోన్ ఎన్‌క్రిప్ట్ చేయబడలేదు"</string>
-    <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"డివైజ్ గుప్తీకరించబడింది"</string>
-    <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"పరికరం ఎన్‌క్రిప్ట్ చేయబడలేదు"</string>
+    <string name="not_encrypted_summary" product="default" msgid="2251945842585788254">"ఫోన్ ఎన్‌క్రిప్ట్ చేయబడలేదు"</string>
+    <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"డివైజ్ ఎన్‌క్రిప్ట్ చేయబడింది"</string>
+    <string name="not_encrypted_summary" product="tablet" msgid="2374263654698719382">"పరికరం ఎన్‌క్రిప్ట్ చేయబడలేదు"</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"లాక్ స్క్రీన్"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"వేటిని చూపాలి"</string>
     <string name="security_settings_summary" msgid="1627059516127354233">"నా లొకేషన్, స్క్రీన్ అన్‌లాక్‌ను, సిమ్ కార్డు లాక్‌ను, ఆధారాల స్టోరేజ్ లాక్‌ను సెట్ చేయి"</string>
@@ -568,37 +569,10 @@
     <string name="fingerprint_last_delete_message" msgid="7860374760549404410">"మీ ఫోన్‌ను అన్‌లాక్ చేయడానికి లేదా యాప్‌లలో ఉండేది మీరేనని వెరిఫై చేయడానికి మీరు మీ వేలిముద్రను ఉపయోగించలేరు."</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="4104208067277655068">"మీ వర్క్ ప్రొఫైల్‌ను అన్‌లాక్ చేయడానికి, కొనుగోళ్లను ప్రమాణీకరించడానికి లేదా వర్క్ యాప్‌లకు సైన్ ఇన్ చేయడానికి మీరు మీ వేలిముద్రను ఉపయోగించలేరు."</string>
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"అవును, తీసివేయి"</string>
-    <string name="crypt_keeper_settings_title" msgid="4938812137822100044">"ఎన్‌క్రిప్షన్"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"టాబ్లెట్‌ను గుప్తీకరించండి"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"ఫోన్‌ను ఎన్‌క్రిప్ట్ చేయండి"</string>
-    <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"ఎన్‌క్రిప్ట్ చేయబడింది"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"మీరు మీ ఖాతాలను, సెట్టింగ్‌లను, డౌన్‌లోడ్ చేసిన యాప్‌లను మరియు వాటి డేటాను, మీడియాను మరియు ఇతర ఫైళ్లను గుప్తీకరించవచ్చు. మీరు మీ టాబ్లెట్‍ను గుప్తీకరించిన తర్వాత ఒకవేళ స్క్రీన్ లాక్‌ను సెటప్ చేసినట్లయితే (అంటే, ఆకృతి లేదా సంఖ్యాత్మక పిన్‌ లేదా పాస్‌వర్డ్), టాబ్లెట్‌ను పవర్ ఆన్ చేసే ప్రతిసారి దాన్ని డీక్రిప్ట్ చేయడానికి స్క్రీన్‍ను అన్‌లాక్ చేయాలి. డీక్రిప్ట్ చేయడానికి గల ఇంకొక మార్గం ఫ్యాక్టరీ డేటా రీసెట్‌ను అమలు చేయడం మాత్రమే, అలా చేస్తే మీ మొత్తం డేటా తొలగించబడుతుంది.\n\nగుప్తీకరణకు ఒక గంట లేదా అంతకంటే ఎక్కువ సమయం పడుతుంది. మీరు తప్పనిసరిగా ఛార్జ్ చేసిన బ్యాటరీతో ప్రారంభించాలి మరియు ప్రాసెస్ అంతటా మీ టాబ్లెట్‌ను ప్లగిన్ చేసి ఉంచాలి. మీరు అంతరాయం కలిగిస్తే, మీ డేటాలో కొంత భాగాన్ని లేదా అంతటినీ కోల్పోతారు"</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"మీరు మీ ఖాతాలను, సెట్టింగ్‌లను, డౌన్‌లోడ్ చేసిన యాప్‌లను మరియు వాటి డేటాను, మీడియాను మరియు ఇతర ఫైళ్లను గుప్తీకరించవచ్చు. మీరు మీ ఫోన్‌ను గుప్తీకరించిన తర్వాత ఒకవేళ స్క్రీన్ లాక్‌ను సెటప్ చేసినట్లయితే (అంటే, ఆకృతి లేదా సంఖ్యాత్మక పిన్‌ లేదా పాస్‌వర్డ్), ఫోన్‌ను పవర్ ఆన్ చేసే ప్రతిసారి దాన్ని డీక్రిప్ట్ చేయడానికి స్క్రీన్‍ను అన్‌లాక్ చేయాలి. డీక్రిప్ట్ చేయడానికి గల ఇంకొక మార్గం ఫ్యాక్టరీ డేటా రీసెట్‌ను అమలు చేయడం మాత్రమే, అలా చేస్తే మీ మొత్తం డేటా తొలగించబడుతుంది.\n\nగుప్తీకరణకు ఒక గంట లేదా అంతకంటే ఎక్కువ సమయం పడుతుంది. మీరు తప్పనిసరిగా ఛార్జ్ చేసిన బ్యాటరీతో ప్రారంభించాలి మరియు ప్రాసెస్ అంతటా మీ ఫోన్‌ను ప్లగిన్ చేసి ఉంచాలి. మీరు అంతరాయం కలిగిస్తే, మీ డేటాలో కొంత భాగాన్ని లేదా అంతటినీ కోల్పోతారు."</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"టాబ్లెట్‌ను ఎన్‌క్రిప్ట్ చేయి"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"ఫోన్‌ను ఎన్‌క్రిప్ట్ చేయి"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"మీ బ్యాటరీని ఛార్జ్ చేసి, మళ్లీ ప్రయత్నించండి."</string>
-    <string name="crypt_keeper_unplugged_text" msgid="2709721134148651329">"మీ ఛార్జర్‌ను ప్లగిన్ చేసి, మళ్లీ ప్రయత్నించండి."</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="1847280235529858357">"లాక్ స్క్రీన్ పిన్‌ లేదా పాస్‌వర్డ్ లేదు"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="7210616262954236042">"మీరు గుప్తీకరణను ప్రారంభించడానికి ముందు లాక్ స్క్రీన్ పిన్‌ లేదా పాస్‌వర్డ్‌ను సెట్ చేయాల్సి ఉంటుంది."</string>
-    <string name="crypt_keeper_confirm_title" msgid="8600000209722452230">"గుప్తీకరించాలా?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="3270587498436152259">"ఎన్‌క్రిప్షన్ చర్య స్థిరమైనది మరియు మీరు దీనికి అంతరాయం కలిగిస్తే, డేటాను కోల్పోతారు. ఎన్‌క్రిప్షన్‌కు గంట లేదా అంతకంటే ఎక్కువ సమయం పడుతుంది, ఈ సమయంలో టాబ్లెట్ అనేకసార్లు పునఃప్రారంభించబడుతుంది."</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="3040428543349852419">"ఎన్‌క్రిప్షన్ చర్య తిరిగి రద్దు చేయలేనిది మరియు మీరు దీనికి అంతరాయం కలిగిస్తే, డేటాను కోల్పోతారు. ఎన్‌క్రిప్షన్‌కు గంట లేదా అంతకంటే ఎక్కువ సమయం పడుతుంది, ఈ సమయంలో ఫోన్ అనేకసార్లు పునఃప్రారంభించబడుతుంది."</string>
-    <string name="crypt_keeper_setup_title" msgid="3339725741305796680">"గుప్తీకరిస్తోంది"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="4417016995091289019">"మీ టాబ్లెట్ గుప్తీకరించబడుతున్నప్పుడు వేచి ఉండండి. <xliff:g id="PERCENT">^1</xliff:g>% పూర్తయింది."</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="7902355422499500352">"మీ ఫోన్ గుప్తీకరించబడుతున్నప్పుడు వేచి ఉండండి. <xliff:g id="PERCENT">^1</xliff:g>% పూర్తయింది."</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="8348188415839917821">"మీ టాబ్లెట్ గుప్తీకరించబడుతున్నప్పుడు వేచి ఉండండి. మిగిలి ఉన్న సమయం: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="8556105766597855198">"మీ ఫోన్ గుప్తీకరించబడుతున్నప్పుడు వేచి ఉండండి. మిగిలి ఉన్న సమయం: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="3832496715430327682">"మీ టాబ్లెట్‌ను అన్‌లాక్ చేయడానికి దాన్ని ఆఫ్ చేసి, ఆపై ఆన్ చేయండి."</string>
-    <string name="crypt_keeper_force_power_cycle" product="default" msgid="5070346039522135361">"మీ ఫోన్‌ను అన్‌లాక్ చేయడానికి దాన్ని ఆఫ్ చేసి, ఆపై ఆన్ చేయండి."</string>
-    <string name="crypt_keeper_warn_wipe" msgid="8104921337301750394">"హెచ్చరిక: మీరు అన్‌లాక్ చేయడానికి చేసే ప్రయత్నాల్లో మరో <xliff:g id="COUNT">^1</xliff:g> సార్లు విఫలమైతే మీ పరికరం తొలగించబడుతుంది!"</string>
-    <string name="crypt_keeper_enter_password" msgid="1274917431075529732">"మీ పాస్‌వర్డ్‌ను టైప్ చేయండి"</string>
-    <string name="crypt_keeper_failed_title" msgid="8173654570682244149">"ఎన్‌క్రిప్షన్ విఫలమైంది"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"గుప్తీకరణకు అంతరాయం ఏర్పడింది మరియు పూర్తి చేయడం సాధ్యం కాదు. దీని ఫలితంగా, మీ టాబ్లెట్‌లోని డేటాకు ఇకపై యాక్సెస్ ఉండదు. \n\n మీ టాబ్లెట్‌ను ఉపయోగించడాన్ని పునఃప్రారంభించడానికి, మీరు ఫ్యాక్టరీ రీసెట్‌ను అమలు చేయాల్సి ఉంటుంది. మీరు రీసెట్ తర్వాత మీ టాబ్లెట్‌ను సెటప్ చేసేటప్పుడు, మీరు మీ Google ఖాతాకు బ్యాకప్ చేయబడిన ఏదైనా డేటాను పునరుద్ధరించడానికి మీకు అవకాశం ఉంటుంది."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"ఎన్‌క్రిప్షన్ ఆటంకపరచబడింది అందువల్ల పూర్తి చేయడం సాధ్యం కాదు. ఫలితంగా, మీ ఫోన్‌లోని డేటాకు ఇకపై యాక్సెస్ ఉండదు. \n\nమీ ఫోన్‌ను ఉపయోగించడాన్ని పునఃప్రారంభించడానికి, మీరు ఫ్యాక్టరీ రీసెట్‌ను అమలు చేయాల్సి ఉంటుంది. మీరు రీసెట్ తర్వాత మీ ఫోన్‌ను సెటప్ చేసేటప్పుడు, మీ Google ఖాతాకు బ్యాకప్ చేయబడిన ఏదైనా డేటాను పునరుద్ధరించడానికి మీకు అవకాశం ఉంటుంది."</string>
-    <string name="crypt_keeper_data_corrupt_title" msgid="5920153462176846037">"డిక్రిప్షన్ విజయవంతం కాలేదు"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"మీరు నమోదు చేసిన పాస్‌వర్డ్ సరైనది, కానీ దురదృష్టవశాత్తూ మీ డేటా పాడైంది. \n\nమీ టాబ్లెట్‌ను ఉపయోగించడం పునఃప్రారంభించడానికి, మీరు ఫ్యాక్టరీ రీసెట్‌ను అమలు చేయాలి. మీరు రీసెట్ చేసిన తర్వాత మీ టాబ్లెట్‌ను సెటప్ చేసినప్పుడు, మీ Google ఖాతాకు బ్యాకప్ చేసిన ఏదైనా డేటాను పునరుద్ధరించుకునే అవకాశం మీకు అందించబడుతుంది."</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"మీరు నమోదు చేసిన పాస్‌వర్డ్ సరైనది, కానీ దురదృష్టవశాత్తూ మీ డేటా పాడైంది. \n\nమీ ఫోన్‌ను ఉపయోగించడం పునఃప్రారంభించడానికి, మీరు ఫ్యాక్టరీ రీసెట్‌ను అమలు చేయాలి. మీరు రీసెట్ చేసిన తర్వాత మీ ఫోన్‌ను సెటప్ చేసినప్పుడు, మీ Google ఖాతాకు బ్యాకప్ చేసిన ఏదైనా డేటాను పునరుద్ధరించుకునే అవకాశం మీకు అందించబడుతుంది."</string>
-    <string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"ఇన్‌పుట్ పద్ధతిని మార్చు"</string>
+    <string name="encryption_settings_title" msgid="2848716008695618360">"ఎన్‌క్రిప్షన్"</string>
+    <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"టాబ్లెట్‌ను ఎన్‌క్రిప్ట్ చేయండి"</string>
+    <string name="encrypt_title" product="default" msgid="7337365190988321100">"ఫోన్‌ను ఎన్‌క్రిప్ట్ చేయండి"</string>
+    <string name="encrypted_summary" msgid="545623487587251207">"ఎన్‌క్రిప్ట్ చేయబడింది"</string>
     <string name="suggested_lock_settings_title" msgid="7836065447159730217">"మీ ఫోన్‌ను సురక్షితం చేయండి"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"టాబ్లెట్‌ను రక్షించడానికి స్క్రీన్ లాక్‌ను సెట్ చేయండి"</string>
     <string name="suggested_lock_settings_summary" product="device" msgid="8479766049078378225">"పరికరాన్ని రక్షించడానికి స్క్రీన్ లాక్‌ని సెట్ చేయండి"</string>
@@ -817,6 +791,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"మీరు ఈ పిన్‌ను ఇతర డివైజ్‌లలో కూడా టైప్ చేయాల్సి రావచ్చు."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"మీరు ఈ పాస్‌కీని ఇతర పరికరంలో కూడా టైప్ చేయాల్సి రావచ్చు."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"దీనితో జత చేయడానికి:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;ఇది ఈ పాస్‌కీని చూపుతోందని నిర్ధారించుకోండి:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"కోఆర్డినేటెడ్ సెట్‌తో పెయిర్ చేయడానికి నిర్ధారించండి"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"దీని నుండి:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;ఈ పరికరంతో జత చేయాలా?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"దీనితో జత చేయడానికి:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>దీనిలో టైప్ చేయండి:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, ఆపై తిరిగి వెళ్లు లేదా Enter నొక్కండి."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"మీ కాంటాక్ట్‌లకు, కాల్ హిస్టరీకి యాక్సెస్‌ను అనుమతించండి"</string>
@@ -850,6 +825,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"కనెక్ట్ చేయడం సాధ్యం కాలేదు. మళ్లీ ప్రయత్నించండి."</string>
     <string name="device_details_title" msgid="1155622417516195481">"పరికర వివరాలు"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"పరికర బ్లూటూత్ అడ్రస్: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"పరికర బ్లూటూత్ అడ్రస్:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"పరికరాన్ని మర్చిపోవాలా?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"అనుబంధాన్ని తీసివేయి"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"యాప్‌ను డిస్‌కనెక్ట్ చేయాలా?"</string>
@@ -881,6 +857,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"సెట్టింగ్‌లను గుర్తుంచుకో"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"గరిష్ఠంగా కనెక్ట్ అయిన బ్లూటూత్ ఆడియో పరికరాలు"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"గరిష్ఠ సంఖ్యలో కనెక్ట్ అయిన బ్లూటూత్ ఆడియో పరికరాలను ఎంచుకోండి"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"NFC స్ట్యాక్ డీబగ్ లాగ్"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"NFC స్ట్యాక్ లాగింగ్ స్థాయిని పెంచండి"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"ప్రసారం చేయండి"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"మిర్రర్"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"వైర్‌లెస్ ప్రదర్శనను ప్రారంభించు"</string>
@@ -897,7 +875,7 @@
     <string name="wifi_band_24ghz" msgid="7322286660245127384">"2.4 GHz"</string>
     <string name="wifi_band_5ghz" msgid="7995204987245404797">"5 GHz"</string>
     <string name="wifi_band_6ghz" msgid="8166833829829455339">"6 GHz"</string>
-    <string name="wifi_sign_in_button_text" msgid="8483892122845654850">"సైన్ ఇన్ చేయి"</string>
+    <string name="wifi_sign_in_button_text" msgid="8483892122845654850">"సైన్ ఇన్ చేయండి"</string>
     <string name="wifi_venue_website_button_text" msgid="7749360432667175030">"సైట్‌ను తెరవండి"</string>
     <string name="wifi_time_remaining" msgid="8503606272869846170">"<xliff:g id="REMAINING_TIME">%1$s</xliff:g> మిగిలి ఉంది"</string>
     <string name="wifi_expiry_time" msgid="5419758551129267624">"<xliff:g id="EXPIRY_TIME">%1$s</xliff:g>న గడువు ముగుస్తుంది"</string>
@@ -1179,7 +1157,7 @@
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"ఇతర పరికరాలు <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>కు కనెక్ట్ కావచ్చు"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"హాట్‌స్పాట్ పాస్‌వర్డ్‌"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"AP బ్యాండ్"</string>
-    <string name="wifi_hotspot_footer_info_regular" msgid="6620216295510397461">"మీ ఇతర పరికరాల కోసం Wi-Fi నెట్‌వర్క్‌ని సృష్టించడానికి హాట్‌స్పాట్‌ని ఉపయోగించండి. హాట్‌స్పాట్ అనేది మీ మొబైల్ డేటా కనెక్షన్‌ని ఉపయోగించి ఇంటర్నెట్‌ని అందిస్తుంది. అదనపు మొబైల్ డేటా ఛార్జీలు చెల్లించాల్సి రావచ్చు."</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="6620216295510397461">"మీ ఇతర పరికరాల కోసం Wi-Fi నెట్‌వర్క్‌ని క్రియేట్ చేయడానికి హాట్‌స్పాట్‌ని ఉపయోగించండి. హాట్‌స్పాట్ అనేది మీ మొబైల్ డేటా కనెక్షన్‌ని ఉపయోగించి ఇంటర్నెట్‌ని అందిస్తుంది. అదనపు మొబైల్ డేటా ఛార్జీలు చెల్లించాల్సి రావచ్చు."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="3813311942370920903">"యాప్‌లు సమీప పరికరాలతో కంటెంట్‌ని షేర్ చేయడం కోసం హాట్‌స్పాట్‌ని సృష్టించవచ్చు."</string>
     <string name="wifi_hotspot_auto_off_title" msgid="8855711787485504882">"హాట్‌స్పాట్‌ను ఆటోమేటిక్‌గా ఆఫ్ చేయి"</string>
     <string name="wifi_hotspot_auto_off_summary" msgid="8283656069997871354">"పరికరాలేవీ కనెక్ట్ చేసి లేనప్పుడు"</string>
@@ -1188,6 +1166,8 @@
     <string name="wifi_hotspot_maximize_compatibility_dual_ap_summary" msgid="3579549223159056533">"ఈ హాట్‌స్పాట్‌ను కనుగొనడానికి ఇతర పరికరాలకు సహాయపడుతుంది. ఇది బ్యాటరీ వినియోగం పెరిగేలా చేస్తుంది."</string>
     <string name="wifi_tether_starting" msgid="8879874184033857814">"హాట్‌స్పాట్‌ను ప్రారంభిస్తోంది…"</string>
     <string name="wifi_tether_stopping" msgid="4416492968019409188">"హాట్‌స్పాట్‌ను ఆపివేస్తోంది…"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_title" msgid="3089432578433978073">"టెథరింగ్ అందుబాటులో లేదు"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_content" msgid="5920421547607921112">"వివరాల కోసం మీ క్యారియర్‌ను కాంటాక్ట్ చేయండి"</string>
     <string name="wifi_tether_enabled_subtext" msgid="5085002421099821056">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> సక్రియంగా ఉంది"</string>
     <string name="wifi_tether_failed_subtext" msgid="437190628041885500">"పోర్టబుల్ Wi‑Fi హాట్‌స్పాట్ ఎర్రర్"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7072559431286459122">"Wi‑Fi హాట్‌స్పాట్‌ను సెటప్ చేయండి"</string>
@@ -1248,7 +1228,7 @@
     <string name="incoming_call_volume_title" msgid="8445408274513654261">"రింగ్‌టోన్"</string>
     <string name="notification_volume_title" msgid="328053763590888609">"నోటిఫికేషన్"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1798481722572489141">"నోటిఫికేషన్‌ల కోసం ఇన్‌కమింగ్ కాల్ వాల్యూమ్‌ను ఉపయోగించు"</string>
-    <string name="home_work_profile_not_supported" msgid="2605589489324241338">"కార్యాలయ ప్రొఫైల్‌లకు మద్దతు ఇవ్వదు"</string>
+    <string name="home_work_profile_not_supported" msgid="2605589489324241338">"కార్యాలయ ప్రొఫైళ్లకు మద్దతు ఇవ్వదు"</string>
     <string name="notification_sound_dialog_title" msgid="7431891669251806266">"నోటిఫికేషన్ ఆటోమేటిక్ సౌండ్"</string>
     <string name="media_volume_title" msgid="5209147840160985178">"మీడియా"</string>
     <string name="media_volume_summary" msgid="4671324482655564873">"సంగీతం మరియు వీడియోల కోసం వాల్యూమ్‌ను సెట్ చేయి"</string>
@@ -1570,7 +1550,7 @@
     <string name="sd_ejecting_title" msgid="1641122369013595273">"అన్‌మౌంట్ చేస్తోంది"</string>
     <string name="sd_ejecting_summary" msgid="861928572729341132">"అన్‌మౌంట్ ప్రోగ్రెస్‌లో ఉంది"</string>
     <string name="storage_low_title" msgid="8002650511493419567">"నిల్వ స్థలం అయిపోతోంది"</string>
-    <string name="storage_low_summary" msgid="7341022293583384506">"సమకాలీకరించడం వంటి కొన్ని సిస్టమ్ కార్యాచరణలు సరిగ్గా పని చేయకపోవచ్చు. యాప్‌లు లేదా మీడియా కంటెంట్ వంటి అంశాలను తొలగించడం లేదా అన్‌పిన్ చేయడం ద్వారా స్థలాన్ని ఖాళీ చేయడానికి ప్రయత్నించండి."</string>
+    <string name="storage_low_summary" msgid="7341022293583384506">"సింక్ చేయడం వంటి కొన్ని సిస్టమ్ కార్యాచరణలు సరిగ్గా పని చేయకపోవచ్చు. యాప్‌లు లేదా మీడియా కంటెంట్ వంటి అంశాలను తొలగించడం లేదా అన్‌పిన్ చేయడం ద్వారా స్థలాన్ని ఖాళీ చేయడానికి ప్రయత్నించండి."</string>
     <string name="storage_menu_rename" msgid="8549835371429159336">"పేరు మార్చు"</string>
     <string name="storage_menu_mount" msgid="4760531872302820569">"మౌంట్ చేయి"</string>
     <string name="storage_menu_unmount" msgid="8171552487742912282">"తొలగించు"</string>
@@ -2052,7 +2032,7 @@
     <string name="clear_user_data_text" msgid="6773186434260397947">"స్టోరేజ్‌ను క్లియర్ చేయండి"</string>
     <string name="app_factory_reset" msgid="8974044931667015201">"అప్‌డేట్‌లను అన్‌ఇన్‌స్టాల్ చేయండి"</string>
     <string name="auto_launch_enable_text" msgid="8912714475823807798">"మీరు ఎంచుకున్న కొన్ని యాక్టివిటీలు ఈ యాప్‌లో ఆటోమేటిక్‌గా తెరవబడతాయి."</string>
-    <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"మీరు విడ్జెట్‌లను సృష్టించడానికి మరియు వాటి డేటాను యాక్సెస్ చేయడానికి ఈ యాప్‌ను ఎంచుకున్నారు."</string>
+    <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"మీరు విడ్జెట్‌లను క్రియేట్ చేయడానికి మరియు వాటి డేటాను యాక్సెస్ చేయడానికి ఈ యాప్‌ను ఎంచుకున్నారు."</string>
     <string name="auto_launch_disable_text" msgid="502648841250936209">"ఆటోమేటిక్ ఆప్ష‌న్‌లు ఏవీ సెట్ చేయ‌‌లేదు."</string>
     <string name="clear_activities" msgid="488089228657585700">"ఆటోమేటిక్ సెట్టింగ్ ప్రాధాన్యతలను క్లియర్ చేయండి"</string>
     <string name="screen_compatibility_text" msgid="5915767835411020274">"ఈ యాప్ మీ స్క్రీన్ కోసం రూపొందించబడి ఉండకపోవచ్చు. మీరు దీన్ని మీ స్క్రీన్‌కు ఎలా సర్దుబాటు చేయాలనేదాన్ని ఇక్కడ నియంత్రించవచ్చు."</string>
@@ -2378,7 +2358,7 @@
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"పెద్ద మౌస్ పాయింటర్"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"యానిమేషన్‌లను తీసివేయండి"</string>
     <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"మోనో ఆడియో"</string>
-    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"ఆడియో ప్లే చేసేటప్పుడు ఛానెల్‌లను మిళితం చేస్తుంది"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"ఆడియో ప్లే చేసేటప్పుడు ఛానెళ్లను మిళితం చేస్తుంది"</string>
     <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"ఆడియో బ్యాలెన్స్"</string>
     <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"ఎడమ"</string>
     <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"కుడి"</string>
@@ -2534,11 +2514,6 @@
     <string name="enable_service_title" msgid="7231533866953706788">"మీ పరికరాన్ని పూర్తిగా కంట్రోల్ చేయడానికి, <xliff:g id="SERVICE">%1$s</xliff:g>‌ను అనుమతించాలా?"</string>
     <string name="capabilities_list_title" msgid="1225853611983394386">"<xliff:g id="SERVICE">%1$s</xliff:g> ఇవి చేయాల్సి ఉంటుంది:"</string>
     <string name="touch_filtered_warning" msgid="4225815157460318241">"అనుమతి రిక్వెస్ట్‌కు ఒక యాప్ అడ్డు తగులుతున్నందున సెట్టింగ్‌లు మీ ప్రతిస్పందనను ధృవీకరించలేకపోయాయి."</string>
-    <string name="enable_service_encryption_warning" msgid="931082737770453755">"మీరు <xliff:g id="SERVICE">%1$s</xliff:g>ని ఆన్ చేస్తే, డేటా గుప్తీకరణను మెరుగుపరచడానికి మీ పరికరం మీ స్క్రీన్ లాక్‌ను ఉపయోగించదు."</string>
-    <string name="secure_lock_encryption_warning" msgid="669152607190123579">"మీరు యాక్సెస్ సేవను ఆన్ చేసినందున, డేటా గుప్తీకరణను మెరుగుపరచడానికి మీ పరికరం మీ స్క్రీన్ లాక్‌ను ఉపయోగించదు."</string>
-    <string name="enable_service_pattern_reason" msgid="6832846117817938536">"<xliff:g id="SERVICE">%1$s</xliff:g>ని ఆన్‌ చేయడం వలన డేటా ఎన్‌క్రిప్షన్ ప్రభావితమవుతుంది, కనుక మీరు మీ నమూనాను నిర్ధారించడం అవసరం."</string>
-    <string name="enable_service_pin_reason" msgid="6040417014360237703">"<xliff:g id="SERVICE">%1$s</xliff:g>ని ఆన్‌ చేయడం వలన డేటా ఎన్‌క్రిప్షన్ ప్రభావితమవుతుంది, కనుక మీరు మీ పిన్‌ను నిర్ధారించడం అవసరం."</string>
-    <string name="enable_service_password_reason" msgid="6962544350351734238">"<xliff:g id="SERVICE">%1$s</xliff:g>ని ఆన్‌ చేయడం వలన డేటా ఎన్‌క్రిప్షన్ ప్రభావితమవుతుంది, కనుక మీరు మీ పాస్‌వర్డ్‌ను నిర్ధారించడం అవసరం."</string>
     <string name="accessibility_service_warning" msgid="6779187188736432618">"<xliff:g id="SERVICE">%1$s</xliff:g> ఈ పరికరం యొక్క పూర్తి నియంత్రణను కోరుతుంది. ఈ సేవ స్క్రీన్‌పై కనిపించే అంశాలను చదవగలదు, అదేవిధంగా వినియోగదారుల తరపున యాక్సెసిబిలిటీ చర్యలను తీసుకోగలదు. ఈ స్థాయి నియంత్రణ చాలా వ‌ర‌కు యాప్‌లకు సరికాదు."</string>
     <string name="accessibility_service_warning_description" msgid="6573203795976134751">"అవసరమైన యాక్సెసిబిలిటీ కోసం యాప్‌లకు పూర్తి కంట్రోల్ ఇవ్వడం తగిన పనే అయినా, అన్ని యాప్‌లకు అలా ఇవ్వడం సరికాదు."</string>
     <string name="accessibility_service_screen_control_title" msgid="324795030658109870">"స్క్రీన్‌ను చూసి, కంట్రోల్ చేయడం"</string>
@@ -3058,7 +3033,7 @@
     <string name="wifi_setup_detail" msgid="2012898800571616422">"నెట్‌వర్క్ వివరాలు"</string>
     <string name="accessibility_sync_enabled" msgid="5308864640407050209">"సింక్‌ ప్రారంభించబడింది"</string>
     <string name="accessibility_sync_disabled" msgid="5507600126380593611">"సింక్‌ నిలిపివేయబడింది"</string>
-    <string name="accessibility_sync_in_progress" msgid="3229428197779196660">"ఇప్పుడు సమకాలీకరిస్తోంది"</string>
+    <string name="accessibility_sync_in_progress" msgid="3229428197779196660">"ఇప్పుడు సింక్ చేస్తోంది"</string>
     <string name="accessibility_sync_error" msgid="7248490045013170437">"సింక్‌ ఎర్రర్."</string>
     <string name="sync_failed" msgid="3806495232114684984">"సింక్‌ విఫలమైంది"</string>
     <string name="sync_active" msgid="5787407579281739975">"సింక్‌ సక్రియంగా ఉంది"</string>
@@ -3079,12 +3054,12 @@
     <string name="sync_disabled" msgid="1636223106968593391">"సింక్‌ ఆఫ్‌లో ఉంది"</string>
     <string name="sync_error" msgid="846923369794727644">"సింక్‌ ఎర్రర్"</string>
     <string name="last_synced" msgid="1527008461298110443">"చివరిగా సింక్‌ చేసినది <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
-    <string name="sync_in_progress" msgid="6200093151211458977">"ఇప్పుడు సమకాలీకరిస్తోంది…"</string>
+    <string name="sync_in_progress" msgid="6200093151211458977">"ఇప్పుడు సింక్ చేస్తోంది…"</string>
     <string name="settings_backup" msgid="5357973563989458049">"బ్యాకప్ సెట్టింగ్‌లు"</string>
     <string name="settings_backup_summary" msgid="6803046376335724034">"నా సెట్టింగ్‌లను బ్యాకప్ చేయి"</string>
     <string name="sync_menu_sync_now" msgid="3948443642329221882">"ఇప్పుడే సింక్ చేయి"</string>
     <string name="sync_menu_sync_cancel" msgid="2422994461106269813">"సింక్‌ను రద్దు చేయి"</string>
-    <string name="sync_one_time_sync" msgid="8114337154112057462">"ఇప్పుడే సమకాలీకరించడానికి నొక్కండి<xliff:g id="LAST_SYNC_TIME">
+    <string name="sync_one_time_sync" msgid="8114337154112057462">"ఇప్పుడే సింక్ చేయడానికి నొక్కండి<xliff:g id="LAST_SYNC_TIME">
 %1$s</xliff:g>"</string>
     <string name="sync_gmail" msgid="228561698646018808">"Gmail"</string>
     <string name="sync_calendar" msgid="4603704438090387251">"Calendar"</string>
@@ -3101,16 +3076,8 @@
     <string name="really_remove_account_message" product="default" msgid="1217810840427479274">"ఈ ఖాతాను తీసివేస్తే, దానికి సంబంధించిన SMSలు, కాంటాక్ట్‌లతో సహా ఇతర డేటా మొత్తం ఈ ఫోన్ నుండి తొలగించబడుతుంది!"</string>
     <string name="really_remove_account_message" product="device" msgid="5241756807386611084">"ఈ ఖాతాను తీసివేయడం వలన, దీనికి సంబంధించిన అన్ని మెసేజ్‌లు, కాంటాక్ట్‌లతో సహా ఇతర డేటా మొత్తం పరికరం నుండి తొలగించబడుతుంది!"</string>
     <string name="remove_account_failed" msgid="3709502163548900644">"ఈ మార్పును మీ నిర్వాహకులు అనుమతించలేదు"</string>
-    <string name="cant_sync_dialog_title" msgid="2613000568881139517">"మాన్యువల్‌గా సమకాలీకరించడం సాధ్యపడదు"</string>
+    <string name="cant_sync_dialog_title" msgid="2613000568881139517">"మాన్యువల్‌గా సింక్ చేయడం సాధ్యపడదు"</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"ఈ అంశం యొక్క సింక్‌ ప్రస్తుతం నిలిపివేయబడింది. ఈ సెట్టింగ్‌ను మార్చడానికి, నేపథ్య డేటాను మరియు ఆటోమేటిక్‌ సింక్‌ను తాత్కాలికంగా ప్రారంభించండి."</string>
-    <string name="enter_password" msgid="6327051330258595331">"Androidని ప్రారంభించడానికి, మీ పాస్‌వర్డ్‌ని నమోదు చేయండి"</string>
-    <string name="enter_pin" msgid="1029287617551232681">"Androidని ప్రారంభించడానికి, మీ పిన్‌ను నమోదు చేయండి"</string>
-    <string name="enter_pattern" msgid="1747316785866742960">"Androidని ప్రారంభించడానికి, మీ నమూనాను గీయండి"</string>
-    <string name="cryptkeeper_wrong_pattern" msgid="340747269176120242">"ఆకృతి తప్పు"</string>
-    <string name="cryptkeeper_wrong_password" msgid="7295607881887114486">"పాస్‌వర్డ్ తప్పు"</string>
-    <string name="cryptkeeper_wrong_pin" msgid="2347961593970714201">"పిన్ తప్పు"</string>
-    <string name="checking_decryption" msgid="6111642972615688237">"తనిఖీ చేస్తున్నాము..."</string>
-    <string name="starting_android" msgid="6694154070215356186">"Androidని ప్రారంభిస్తున్నాము..."</string>
     <string name="delete" msgid="8330605554706263775">"తొలగించు"</string>
     <string name="misc_files" msgid="6598066985800749585">"నానావిధమైన ఫైళ్లు"</string>
     <string name="misc_files_selected_count" msgid="5597802791672749532">"<xliff:g id="TOTAL">%2$d</xliff:g>లో <xliff:g id="NUMBER">%1$d</xliff:g> ఎంచుకోబడ్డాయి"</string>
@@ -3206,8 +3173,6 @@
     <string name="data_usage_metered_yes" msgid="4262598072030135223">"లెక్కించబడే నెట్‌వర్క్"</string>
     <string name="data_usage_metered_no" msgid="1685828958417926268">"గణించబడదు"</string>
     <string name="data_usage_disclaimer" msgid="3271450299386176770">"క్యారియర్ డేటా లెక్కింపు మీ పరికరాన్ని బట్టి మారవచ్చు."</string>
-    <string name="cryptkeeper_emergency_call" msgid="8369322820475703306">"అత్యవసర కాల్"</string>
-    <string name="cryptkeeper_return_to_call" msgid="3857250752781151232">"కాల్‌కు తిరిగి వెళ్లు"</string>
     <string name="vpn_name" msgid="3806456074909253262">"పేరు"</string>
     <string name="vpn_type" msgid="5533202873260826663">"రకం"</string>
     <string name="vpn_server" msgid="2908816134941973935">"సర్వర్ అడ్రస్"</string>
@@ -3322,7 +3287,7 @@
     <string name="user_settings_footer_text" product="device" msgid="7523914344521302179">"కొత్త వినియోగదారులను జోడించడం ద్వారా మీ పరికరాన్ని షేర్ చేయండి. మీ పరికరంలోని అనుకూల హోమ్ స్క్రీన్‌లు, ఖాతాలు, యాప్‌ల సెట్టింగ్‌లు మరియు మరిన్నింటి కోసం ప్రతి వినియోగదారుకి వ్యక్తిగత స్థలం ఉంటుంది."</string>
     <string name="user_settings_footer_text" product="tablet" msgid="3730074318510244552">"కొత్త వినియోగదారులను జోడించడం ద్వారా మీ టాబ్లెట్‌ని షేర్ చేయండి. మీ టాబ్లెట్‌లోని అనుకూల హోమ్ స్క్రీన్‌లు, ఖాతాలు, యాప్‌ల సెట్టింగ్‌లు మరియు మరిన్నింటి కోసం ప్రతి వినియోగదారుకి వ్యక్తిగత స్థలం ఉంటుంది."</string>
     <string name="user_settings_footer_text" product="default" msgid="4420915712050349125">"కొత్త యూజర్‌లను జోడించడం ద్వారా మీ ఫోన్‌ను షేర్ చేయండి. మీ ఫోన్‌లో అనుకూల హోమ్ స్క్రీన్‌లు, ఖాతాలు, యాప్‌ల సెట్టింగ్‌లతో పాటు మరిన్నింటి కోసం ప్రతి యూజర్‌కు వ్యక్తిగత స్థలం ఉంటుంది."</string>
-    <string name="user_list_title" msgid="1387379079186123404">"వినియోగదారులు &amp; ప్రొఫైల్‌లు"</string>
+    <string name="user_list_title" msgid="1387379079186123404">"వినియోగదారులు &amp; ప్రొఫైళ్లు"</string>
     <string name="user_add_user_or_profile_menu" msgid="305851380425838287">"వినియోగదారు లేదా ప్రొఫైల్‌ను జోడించు"</string>
     <string name="user_add_user_menu" msgid="6395904234221724625">"యూజర్‌ను జోడించు"</string>
     <string name="user_summary_restricted_profile" msgid="451650609582185813">"పరిమితం చేయబడిన ప్రొఫైల్"</string>
@@ -3334,7 +3299,7 @@
     <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>
-    <string name="user_cannot_add_accounts_message" msgid="2351326078338805337">"పరిమిత ప్రొఫైల్‌లు ఖాతాలను జోడించడం సాధ్యపడదు"</string>
+    <string name="user_cannot_add_accounts_message" msgid="2351326078338805337">"పరిమిత ప్రొఫైళ్లు ఖాతాలను జోడించడం సాధ్యపడదు"</string>
     <string name="user_remove_user_menu" msgid="2183714948094429367">"ఈ పరికరం నుండి <xliff:g id="USER_NAME">%1$s</xliff:g>ని తొలగించు"</string>
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"లాక్ స్క్రీన్ సెట్టింగ్‌లు"</string>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"లాక్ స్క్రీన్ నుండి యూజ‌ర్‌ల‌ను జోడించండి"</string>
@@ -3518,7 +3483,7 @@
     <string name="app_and_notification_dashboard_summary" msgid="8047683010984186106">"ఇటీవలి యాప్‌లు, ఆటోమేటిక్ యాప్‌లు"</string>
     <string name="notification_settings_work_profile" msgid="6076211850526353975">"కార్యాలయ ప్రొఫైల్‌లో ఉన్న యాప్‌లకు సంబంధించి నోటిఫికేషన్ యాక్సెస్ అందుబాటులో లేదు."</string>
     <string name="account_dashboard_title" msgid="8228773251948253914">"పాస్‌వర్డ్‌లు &amp; ఖాతాలు"</string>
-    <string name="account_dashboard_default_summary" msgid="1730719656099599488">"పాస్‌వర్డ్‌లు, ఆటోఫిల్, సింక్ చేసిన ఖాతాలు సేవ్ చేయబడ్డాయి"</string>
+    <string name="account_dashboard_default_summary" msgid="1730719656099599488">"సేవ్ చేయ‌బ‌డిన పాస్‌వ‌ర్డ్‌లు, ఆటోఫిల్, సింక్ చేసిన ఖాతాలు"</string>
     <string name="app_default_dashboard_title" msgid="4071015747629103216">"ఆటోమేటిక్ యాప్‌లు"</string>
     <string name="system_dashboard_summary" msgid="7400745270362833832">"భాషలు, సంజ్ఞలు, సమయం, బ్యాకప్"</string>
     <string name="search_results_title" msgid="3360639917793022533">"సెట్టింగ్‌లు"</string>
@@ -3539,7 +3504,7 @@
     <string name="keywords_display" msgid="874738809280751745">"స్క్రీన్, టచ్‌స్క్రీన్"</string>
     <string name="keywords_display_brightness_level" msgid="850742707616318056">"స్క్రీన్ ప్రకాశాన్ని తగ్గించు, టచ్‌స్క్రీన్, బ్యాటరీ, ప్రకాశవంతం"</string>
     <string name="keywords_display_night_display" msgid="4711054330804250058">"స్క్రీన్ ప్రకాశాన్ని తగ్గించు, రాత్రి, వంచు, రాత్రి షిఫ్ట్, ప్రకాశవంతం, స్క్రీన్ రంగు, రంగు"</string>
-    <string name="keywords_display_wallpaper" msgid="8478137541939526564">"నేపథ్యం, వ్యక్తిగతీకరించు, డిస్‌ప్లేని అనుకూలీకరించు"</string>
+    <string name="keywords_display_wallpaper" msgid="8478137541939526564">"నేపథ్యం, వ్యక్తిగతీకరించు, డిస్‌ప్లేని అనుకూలంగా మార్చండి"</string>
     <string name="keywords_display_font_size" msgid="3593317215149813183">"టెక్స్ట్ సైజ్"</string>
     <string name="keywords_display_cast_screen" msgid="2572331770299149370">"ప్రొజెక్ట్, ప్రసారం, స్క్రీన్ మిర్రరింగ్, స్క్రీన్ షేరింగ్, మిర్రరింగ్, షేర్ స్క్రీన్, స్క్రీన్ ప్రసారం"</string>
     <string name="keywords_storage" msgid="3004667910133021783">"స్పేస్, డిస్క్, హార్డ్ డ్రైవ్, పరికర వినియోగం"</string>
@@ -3599,7 +3564,7 @@
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"స్క్రీన్, లాక్ సమయం, గడువు ముగింపు, లాక్‌స్క్రీన్"</string>
     <string name="keywords_storage_settings" msgid="6018856193950281898">"మెమరీ, కాష్, డేటా, తొలగించు, క్లియర్ చేయి, ఖాళీ, స్థలం"</string>
     <string name="keywords_bluetooth_settings" msgid="2588159530959868188">"కనెక్ట్ అయింది, పరికరం, హెడ్‌ఫోన్‌లు, హెడ్‌సెట్, స్పీకర్, వైర్‌లెస్, జత చేయి, ఇయర్‌బడ్‌లు, సంగీతం, మీడియా"</string>
-    <string name="keywords_wallpaper" msgid="7332890404629446192">"బ్యాక్‌గ్రౌండ్, రూపం, గ్రిడ్, అనుకూలీకరించు, వ్యక్తిగతీకరించు"</string>
+    <string name="keywords_wallpaper" msgid="7332890404629446192">"బ్యాక్‌గ్రౌండ్, రూపం, గ్రిడ్, అనుకూలంగా మార్చండి, వ్యక్తిగతీకరించు"</string>
     <string name="keywords_styles" msgid="5291614313348476068">"చిహ్నం, యాస, రంగు"</string>
     <string name="keywords_assist_input" msgid="3086289530227075593">"ఆటోమేటిక్, అసిస్టెంట్"</string>
     <string name="keywords_default_payment_app" msgid="5162298193637362104">"పేమెంట్, ఆటోమేటిక్"</string>
@@ -3936,7 +3901,7 @@
     <string name="notification_assistant_title" msgid="5889201903272393099">"మెరుగైన నోటిఫికేషన్‌లు"</string>
     <string name="notification_assistant_summary" msgid="1957783114840908887">"సూచించిన చర్యలు, రిప్లయిలు, అలాగే మరిన్ని పొందండి"</string>
     <string name="no_notification_assistant" msgid="2533323397091834096">"ఏమీ లేవు"</string>
-    <string name="no_notification_listeners" msgid="2839354157349636000">"ఇన్‌స్టాల్ చేసిన అనువర్తనాలేవీ నోటిఫికేషన్ యాక్సెస్‌ను అభ్యర్థించలేదు."</string>
+    <string name="no_notification_listeners" msgid="2839354157349636000">"ఇన్‌స్టాల్ చేసిన అనువర్తనాలేవీ నోటిఫికేషన్ యాక్సెస్‌ను రిక్వెస్ట్ చేయలేదు."</string>
     <string name="notification_access_detail_switch" msgid="46386786409608330">"నోటిఫికేషన్ యాక్సెస్‌ను అనుమతించు"</string>
     <string name="notification_assistant_security_warning_title" msgid="2972346436050925276">"<xliff:g id="SERVICE">%1$s</xliff:g> కోసం నోటిఫికేషన్ యాక్సెస్ అనుమతించాలా?"</string>
     <string name="notification_assistant_security_warning_summary" msgid="4846559755787348129">"Android 12లో Android అనుకూల నోటిఫికేషన్‌లను, \'మెరుగైన నోటిఫికేషన్‌లు\' రీప్లేస్ చేశాయి. ఈ ఫీచర్, సూచించిన చర్యలను, రిప్లయిలను చూపించి, మీ నోటిఫికేషన్‌లను ఆర్గనైజ్ చేస్తుంది. \n\nకాంటాక్ట్ పేర్లు, మెసేజ్‌లు లాంటి వ్యక్తిగత సమాచారంతో సహా నోటిఫికేషన్ కంటెంట్‌ను \'మెరుగైన నోటిఫికేషన్‌లు\' యాక్సెస్ చేయవచ్చు. ఫోన్ కాల్స్‌కు సమాధానమివ్వడం, \'అంతరాయం కలిగించవద్దు\' ఆప్షన్‌ను కంట్రోల్ చేయడం లాంటి నోటిఫికేషన్‌లను విస్మరించడం లేదా ప్రతిస్పందించడం కూడా ఈ ఫీచర్ చేయగలదు."</string>
@@ -3977,7 +3942,7 @@
     <string name="interact_across_profiles_summary_allowed" msgid="1365881452153799092">"కనెక్ట్ అయ్యింది"</string>
     <string name="interact_across_profiles_summary_not_allowed" msgid="5802674212788171790">"కనెక్ట్ చేయబడలేదు"</string>
     <string name="interact_across_profiles_empty_text" msgid="419061031064397168">"కనెక్ట్ చేసిన యాప్‌లు ఏవీ లేవు"</string>
-    <string name="interact_across_profiles_keywords" msgid="5996472773111665049">"కార్యాలయ మరియు వ్యక్తిగత ప్రొఫైల్‌ల మధ్య క్రాస్ ప్రొఫైల్"</string>
+    <string name="interact_across_profiles_keywords" msgid="5996472773111665049">"కార్యాలయ మరియు వ్యక్తిగత ప్రొఫైళ్ల మధ్య క్రాస్ ప్రొఫైల్"</string>
     <string name="interact_across_profiles_app_detail_title" msgid="7776184211173575648">"కనెక్టెడ్ వర్క్ &amp; పర్సనల్ యాప్స్"</string>
     <string name="interact_across_profiles_switch_enabled" msgid="7294719120282287495">"కనెక్ట్ చేశారు"</string>
     <string name="interact_across_profiles_switch_disabled" msgid="4312196170211463988">"ఈ యాప్‌లను కనెక్ట్ చేయండి"</string>
@@ -4000,7 +3965,7 @@
     <string name="interact_across_profiles_install_app_summary" msgid="7715324358034968657">"యాప్‌ను పొందడానికి ట్యాప్ చేయండి"</string>
     <string name="manage_zen_access_title" msgid="1562322900340107269">"అంతరాయం కలిగించవద్దు యాక్సెస్"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"\'అంతరాయం కలిగించవద్దు\' ఫీచర్‌ను అనుమతించు"</string>
-    <string name="zen_access_empty_text" msgid="3779921853282293080">"ఇన్‌స్టాల్ చేసిన యాప్‌లేవీ అంతరాయం కలిగించవద్దు యాక్సెస్ అభ్యర్థించలేదు"</string>
+    <string name="zen_access_empty_text" msgid="3779921853282293080">"ఇన్‌స్టాల్ చేసిన యాప్‌లేవీ అంతరాయం కలిగించవద్దు యాక్సెస్ రిక్వెస్ట్ చేయలేదు"</string>
     <string name="loading_notification_apps" msgid="5139471829295287945">"అప్లికేషన్‌లను లోడ్ చేస్తోంది…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"మీ అభ్యర్ధన మేరకు Android, ఈ పరికరంలో ఈ యాప్ యొక్క నోటిఫికేషన్‌లను కనిపించకుండా బ్లాక్ చేస్తోంది"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"మీ అభ్యర్ధన మేరకు Android, ఈ పరికరంలో ఈ వర్గం యొక్క నోటిఫికేషన్‌లను కనిపించకుండా బ్లాక్ చేస్తోంది"</string>
@@ -4529,7 +4494,7 @@
     <string name="write_settings_title" msgid="3011034187823288557">"సిస్టమ్ సెట్టింగ్‌లు సవరించగలవు"</string>
     <string name="write_system_settings" msgid="5555707701419757421">"సిస్టమ్ సెట్టింగ్‌లను మార్చడం"</string>
     <string name="permit_write_settings" msgid="3113056800709924871">"సిస్టమ్ సెట్టింగ్‌ల ఎడిట్‌ను అనుమతించండి"</string>
-    <string name="write_settings_description" msgid="1474881759793261146">"ఈ అనుమతి సిస్టమ్ సెట్టింగ్‌లను సవరించడానికి యాప్‌ను అనుమతిస్తుంది."</string>
+    <string name="write_settings_description" msgid="1474881759793261146">"ఈ అనుమతి సిస్టమ్ సెట్టింగ్‌లను ఎడిట్ చేయడానికి యాప్‌ను అనుమతిస్తుంది."</string>
     <string name="write_settings_on" msgid="8533286548451191112">"అవును"</string>
     <string name="write_settings_off" msgid="1781103034490679144">"లేదు"</string>
     <string name="external_source_switch_title" msgid="101571983954849473">"ఈ సోర్స్ నుండి అనుమతించండి"</string>
@@ -4571,7 +4536,7 @@
     <string name="display_dashboard_summary" msgid="1599453894989339454">"ముదురు రంగు రూపం, ఫాంట్ సైజ్, బ్రైట్‌నెస్"</string>
     <string name="display_summary_example" msgid="4275121979039344438">"10 నిమిషాలు ఇన్‌యాక్టివ్ తర్వాత నిద్రావస్థకు వెళుతుంది"</string>
     <string name="memory_summary" msgid="8221954450951651735">"సగటున <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g>లో <xliff:g id="USED_MEMORY">%1$s</xliff:g> మెమరీ వినియోగించబడింది"</string>
-    <string name="users_summary" msgid="8473589474976307510">"<xliff:g id="USER_NAME">%1$s</xliff:g>గా సైన్ ఇన్ చేశారు"</string>
+    <string name="users_summary" msgid="8473589474976307510">"<xliff:g id="USER_NAME">%1$s</xliff:g>‌గా సైన్ ఇన్ చేశారు"</string>
     <string name="payment_summary" msgid="5513009140568552693">"<xliff:g id="APP_NAME">%1$s</xliff:g> ఆటోమేటిక్‌గా ఉంది"</string>
     <string name="backup_disabled" msgid="4503062265560959320">"బ్యాకప్ నిలిపివేయబడింది"</string>
     <string name="android_version_summary" msgid="7818952662015042768">"Android <xliff:g id="VERSION">%1$s</xliff:g>కు అప్‌డేట్ చేయబడింది"</string>
@@ -4739,7 +4704,7 @@
     <string name="notification_log_details_badge" msgid="648647240928645446">"బ్యాడ్జ్‌ని చూపవచ్చు"</string>
     <string name="notification_log_details_content_intent" msgid="2768423554375629089">"ఇంటెంట్"</string>
     <string name="notification_log_details_delete_intent" msgid="8296434571041573503">"తొలగింపు ఇంటెంట్"</string>
-    <string name="notification_log_details_full_screen_intent" msgid="4151243693072002296">"పూర్తి స్క్రీన్ ఇంటెంట్"</string>
+    <string name="notification_log_details_full_screen_intent" msgid="4151243693072002296">"ఫుల్-స్క్రీన్‌ ఇంటెంట్"</string>
     <string name="notification_log_details_actions" msgid="2269605330470905236">"చర్యలు"</string>
     <string name="notification_log_details_title" msgid="8365761340979164197">"శీర్షిక"</string>
     <string name="notification_log_details_remoteinput" msgid="264204203044885921">"రిమోట్ ఇన్‌పుట్‌లు"</string>
@@ -4764,8 +4729,6 @@
       <item quantity="one">1 యాప్, అపరిమిత డేటాను ఉపయోగించగలదు</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"మరిన్ని చూడండి"</string>
-    <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"నిజంగా వినియోగదారు డేటాను తొలగించి, ఫైల్ గుప్తీకరణకు మార్చాలా?"</string>
-    <string name="button_confirm_convert_fbe" msgid="339648921918438106">"తొలగించి, మార్చు"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"షార్ట్‌కట్‌ మేనేజర్ రేట్-పరిమిత ప్రక్రియను రీసెట్ చేయండి"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"షార్ట్‌కట్‌ నిర్వాహికి రేట్-పరిమిత ప్రక్రియను రీసెట్ చేయబడింది"</string>
     <string name="notification_suggestion_title" msgid="6309263655965785411">"లాక్ స్క్రీన్‌పై నియంత్రణ సమాచారం"</string>
@@ -4773,7 +4736,7 @@
     <string name="page_tab_title_summary" msgid="7188875610123234454">"అన్నీ"</string>
     <string name="page_tab_title_support" msgid="3235725053332345773">"చిట్కాలు &amp; సపోర్ట్"</string>
     <string name="developer_smallest_width" msgid="632354817870920911">"అతితక్కువ వెడల్పు"</string>
-    <string name="premium_sms_none" msgid="8737045049886416739">"ఇన్‌స్టాల్ చేసిన యాప్‌లు ఏవీ ప్రీమియం SMS యాక్సెస్‌ను అభ్యర్థించలేదు"</string>
+    <string name="premium_sms_none" msgid="8737045049886416739">"ఇన్‌స్టాల్ చేసిన యాప్‌లు ఏవీ ప్రీమియం SMS యాక్సెస్‌ను రిక్వెస్ట్ చేయలేదు"</string>
     <string name="premium_sms_warning" msgid="2192300872411073324">"ప్రీమియం SMSతో మీకు డబ్బు ఖర్చు కావచ్చు, ఈ ఛార్జీ మీ క్యారియర్ బిల్లుల్లో విధించబడుతుంది. మీరు ఒక యాప్‌నకు అనుమతిని అందిస్తే, ఆ యాప్‌ను ఉపయోగించి ప్రీమియం SMSను పంపగలరు."</string>
     <string name="premium_sms_access" msgid="5605970342699013212">"ప్రీమియం SMS యాక్సెస్"</string>
     <string name="bluetooth_disabled" msgid="835838280837359514">"ఆఫ్"</string>
@@ -4797,7 +4760,7 @@
     <string name="managed_profile_settings_title" msgid="3400923723423564217">"ఆఫీస్ ప్రొఫైల్ సెట్టింగ్‌లు"</string>
     <string name="managed_profile_contact_search_title" msgid="6562061740814513737">"వ్యక్తిగత యాప్‌లలో వర్క్ డైరెక్టరీ కాంటాక్ట్‌ల కోసం సెర్చ్ చేయండి"</string>
     <string name="managed_profile_contact_search_summary" msgid="4974727886709219105">"మీ సెర్చ్‌లు, ఇన్‌కమింగ్ కాల్స్ మీ IT అడ్మిన్‌కు కనిపించవచ్చు"</string>
-    <string name="cross_profile_calendar_title" msgid="7570277841490216947">"క్యాలెండర్‌లో ఇతర-ప్రొఫైల్‌లను కూడా చూపు"</string>
+    <string name="cross_profile_calendar_title" msgid="7570277841490216947">"క్యాలెండర్‌లో ఇతర-ప్రొఫైళ్లను కూడా చూపు"</string>
     <string name="cross_profile_calendar_summary" msgid="8856185206722860069">"మీ వ్యక్తిగత క్యాలెండర్‌లో కార్యాలయానికి సంబంధించిన ఈవెంట్‌లను చూపుతుంది"</string>
     <plurals name="hours" formatted="false" msgid="1853396353451635458">
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> గంటలు</item>
@@ -5292,6 +5255,7 @@
     <string name="sim_action_yes" msgid="8076556020131395515">"అవును"</string>
     <string name="sim_action_reboot" msgid="3508948833333441538">"రీస్టార్ట్ చేయి"</string>
     <string name="sim_action_no_thanks" msgid="435717748384544195">"వద్దు, ధన్యవాదాలు"</string>
+    <string name="sim_action_cancel" msgid="2668099867029610910">"రద్దు చేయి"</string>
     <string name="sim_switch_button" msgid="1405772571706095387">"స్విచ్ చేయి"</string>
     <string name="dsds_activation_failure_title" msgid="4467364110584914794">"SIMను యాక్టివేట్ చేయడం సాధ్యం కాదు"</string>
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"SIMను తీసివేసి, తిరిగి ఇన్‌సర్ట్ చేయండి. సమస్య ఇంకా కొనసాగితే, మీ పరికరాన్ని రీస్టార్ట్ చేయండి."</string>
@@ -5444,6 +5408,10 @@
     <string name="cached_apps_freezer" msgid="1057519579761550350">"కాష్ చేయబడిన యాప్‌ల కోసం అమలును సస్పెండ్ చేయండి"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"సెట్టింగ్‌లలో స్క్రీన్ ఓవర్‌లేలను అనుమతించండి"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"సెట్టింగ్‌లలోకి వెళ్లి, ఇతర యాప్‌లపై స్క్రీన్ ఓవర్‌లే పద్ధతిలో కనిపించదగ్గ యాప్‌లకు అనుమతినివ్వండి"</string>
+    <!-- no translation found for allow_mock_modem (3832264806530479214) -->
+    <skip />
+    <!-- no translation found for allow_mock_modem_summary (9097416612748005374) -->
+    <skip />
     <string name="media_controls_title" msgid="403271085636252597">"మీడియా"</string>
     <string name="media_controls_resume_title" msgid="855076860336652370">"మీడియా ప్లేయర్‌ను పిన్ చేయండి"</string>
     <string name="media_controls_resume_description" msgid="3163482266454802097">"ప్లేబ్యాక్‌ను త్వరగా కొనసాగించడానికి, త్వరిత సెట్టింగ్‌లలో మీడియా ప్లేయర్‌ను తెరిచి ఉంచండి"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 44d61dd..e1079ef 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -142,10 +142,11 @@
     <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"อนุญาตให้อุปกรณ์สื่อสารกับอุปกรณ์บลูทูธใกล้เคียง"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"อนุญาตให้โทรศัพท์สื่อสารกับอุปกรณ์บลูทูธใกล้เคียง"</string>
     <string name="bluetooth_disable_a2dp_hw_offload" msgid="5942913792817797541">"ปิดใช้การลดภาระฮาร์ดแวร์บลูทูธ A2DP"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="8610420176339657720">"รีสตาร์ทอุปกรณ์ใช่ไหม"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8333029144800835996">"คุณต้องรีสตาร์ทอุปกรณ์เพื่อเปลี่ยนการตั้งค่านี้"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="3488695418187553566">"รีสตาร์ท"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="4930826928585464191">"ยกเลิก"</string>
+    <string name="bluetooth_disable_le_audio_hw_offload" msgid="3966022676505972908">"ปิดใช้การลดภาระฮาร์ดแวร์ Bluetooth LE AUDIO"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_title" msgid="6001142380445276918">"รีสตาร์ทอุปกรณ์ใช่ไหม"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_message" msgid="1524373895333698779">"คุณต้องรีสตาร์ทอุปกรณ์เพื่อเปลี่ยนการตั้งค่านี้"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_confirm" msgid="5594859658551707592">"รีสตาร์ท"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel" msgid="3663690305043973720">"ยกเลิก"</string>
     <string name="connected_device_media_device_title" msgid="3783388247594566734">"อุปกรณ์สื่อ"</string>
     <string name="connected_device_call_device_title" msgid="88732390601723608">"อุปกรณ์สำหรับโทร"</string>
     <string name="connected_device_other_device_title" msgid="4652120430615729193">"อุปกรณ์อื่นๆ"</string>
@@ -309,9 +310,9 @@
     <string name="security_settings_title" msgid="6710768415432791970">"ความปลอดภัย"</string>
     <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"การเข้ารหัสและข้อมูลเข้าสู่ระบบ"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"โทรศัพท์ที่เข้ารหัส"</string>
-    <string name="decryption_settings_summary" product="default" msgid="1742645256103613503">"โทรศัพท์ไม่ได้เข้ารหัส"</string>
+    <string name="not_encrypted_summary" product="default" msgid="2251945842585788254">"โทรศัพท์ไม่ได้เข้ารหัส"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"อุปกรณ์ที่เข้ารหัส"</string>
-    <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"อุปกรณ์ไม่ได้เข้ารหัส"</string>
+    <string name="not_encrypted_summary" product="tablet" msgid="2374263654698719382">"อุปกรณ์ไม่ได้เข้ารหัส"</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"หน้าจอล็อก"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"สิ่งที่จะแสดง"</string>
     <string name="security_settings_summary" msgid="1627059516127354233">"ตั้งค่าตำแหน่งของฉัน ปลดล็อกหน้าจอ ล็อกซิมการ์ด ล็อกที่เก็บข้อมูลเข้าสู่ระบบ"</string>
@@ -488,7 +489,7 @@
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"ยกนิ้วมือเรื่อยๆ เพื่อเพิ่มส่วนอื่นๆ ของลายนิ้วมือ"</string>
     <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"แตะค้างไว้ทุกครั้งที่ไอคอนลายนิ้วมือเคลื่อนไหว การทำเช่นนี้จะช่วยให้บันทึกลายนิ้วมือของคุณได้มากขึ้น"</string>
     <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"วางปลายนิ้วลงบนเซ็นเซอร์"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="6137605344819152477">"สุดท้าย ใช้ปลายนิ้วของคุณ"</string>
+    <string name="security_settings_udfps_enroll_edge_title" msgid="6137605344819152477">"สุดท้าย ใช้ขอบนิ้วของคุณ"</string>
     <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"วางด้านข้างของนิ้วค้างไว้บนเซ็นเซอร์ จากนั้นเปลี่ยนข้าง"</string>
     <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"การทำเช่นนี้จะช่วยให้บันทึกลายนิ้วมือของคุณได้มากขึ้น"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"กำลังลงทะเบียนลายนิ้วมือ <xliff:g id="PERCENTAGE">%d</xliff:g> เปอร์เซ็นต์"</string>
@@ -568,37 +569,10 @@
     <string name="fingerprint_last_delete_message" msgid="7860374760549404410">"คุณจะไม่สามารถใช้ลายนิ้วมือเพื่อปลดล็อกโทรศัพท์หรือยืนยันว่าเป็นคุณในแอป"</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="4104208067277655068">"คุณจะไม่สามารถใช้ลายนิ้วมือเพื่อปลดล็อกโปรไฟล์งาน ให้สิทธิ์การซื้อ หรือลงชื่อเข้าใช้แอปงาน"</string>
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"ใช่ นำออกเลย"</string>
-    <string name="crypt_keeper_settings_title" msgid="4938812137822100044">"การเข้ารหัส"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"เข้ารหัสความปลอดภัยให้แท็บเล็ต"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"เข้ารหัสโทรศัพท์"</string>
-    <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"มีการเข้ารหัส"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"คุณสามารถเข้ารหัสความปลอดภัยให้บัญชี การตั้งค่า แอปที่ดาวน์โหลดและข้อมูลของแอปนั้น สื่อ และไฟล์อื่นๆ หลังจากที่คุณเข้ารหัสความปลอดภัยให้แท็บเล็ตแล้ว ในกรณีที่คุณตั้งค่าล็อกหน้าจอไว้ (ที่เป็นรูปแบบ, PIN ตัวเลข หรือรหัสผ่าน) คุณจะต้องปลดล็อกหน้าจอเพื่อถอดรหัสแท็บเล็ตทุกครั้งที่เปิดเครื่อง วิธีการถอดรหัสอีกวิธีหนึ่งคือการรีเซ็ตข้อมูลเป็นค่าเริ่มต้น ซึ่งจะลบข้อมูลทั้งหมด\n\nการเข้ารหัสความปลอดภัยจะใช้เวลาอย่างน้อย 1 ชั่วโมง คุณต้องดำเนินการเมื่อแท็บเล็ตมีแบตเตอรี่ที่ชาร์จแล้วและเสียบปลั๊กไว้ตลอดขั้นตอนนี้ หากคุณขัดจังหวะการทำงาน ข้อมูลบางส่วนหรือทั้งหมดจะหายไป"</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"คุณสามารถเข้ารหัสความปลอดภัยให้บัญชี การตั้งค่า แอปที่ดาวน์โหลดและข้อมูลของแอปนั้น สื่อ และไฟล์อื่นๆ หลังจากที่คุณเข้ารหัสความปลอดภัยแล้ว ในกรณีที่คุณตั้งค่าล็อกหน้าจอไว้ (ที่เป็นรูปแบบ, PIN ตัวเลข หรือรหัสผ่าน) คุณจะต้องปลดล็อกหน้าจอเพื่อถอดรหัสโทรศัพท์ทุกครั้งที่เปิดเครื่อง วิธีการถอดรหัสอีกวิธีหนึ่งคือการรีเซ็ตข้อมูลเป็นค่าเริ่มต้น ซึ่งจะลบข้อมูลทั้งหมด\n\nการเข้ารหัสความปลอดภัยจะใช้เวลาอย่างน้อย 1 ชั่วโมง คุณต้องดำเนินการเมื่อโทรศัพท์มีแบตเตอรี่ที่ชาร์จแล้วและเสียบปลั๊กไว้ตลอดขั้นตอนนี้ หากคุณขัดจังหวะการทำงาน ข้อมูลบางส่วนหรือทั้งหมดจะหายไป"</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"เข้ารหัสความปลอดภัยให้แท็บเล็ต"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"เข้ารหัสโทรศัพท์"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"ชาร์จแบตเตอรี่และลองอีกครั้ง"</string>
-    <string name="crypt_keeper_unplugged_text" msgid="2709721134148651329">"เสียบที่ชาร์จของคุณ แล้วลองอีกครั้ง"</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="1847280235529858357">"ไม่มี PIN หรือรหัสผ่านล็อกหน้าจอ"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="7210616262954236042">"คุณต้องตั้งค่า PIN หรือรหัสผ่านสำหรับการล็อกหน้าจอก่อนจึงจะเริ่มการเข้ารหัสความปลอดภัยได้"</string>
-    <string name="crypt_keeper_confirm_title" msgid="8600000209722452230">"เข้ารหัสความปลอดภัยไหม"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="3270587498436152259">"การเข้ารหัสนี้ไม่สามารถย้อนกลับได้และข้อมูลจะสูญหายหากการดำเนินการหยุดชะงัก การเข้ารหัสจะใช้เวลาอย่างน้อยหนึ่งชั่วโมง โดยในระหว่างนั้น แท็บเล็ตจะรีสตาร์ทหลายครั้ง"</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="3040428543349852419">"การเข้ารหัสความปลอดภัยนี้ไม่สามารถย้อนกลับได้และข้อมูลจะสูญหายหากการดำเนินการหยุดชะงัก การเข้ารหัสจะใช้เวลาอย่างน้อยหนึ่งชั่วโมง โดยในระหว่างนั้น โทรศัพท์จะรีสตาร์ทหลายครั้ง"</string>
-    <string name="crypt_keeper_setup_title" msgid="3339725741305796680">"กำลังเข้ารหัสความปลอดภัย"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="4417016995091289019">"รอสักครู่ขณะกำลังเข้ารหัสความปลอดภัยให้แท็บเล็ตของคุณ เสร็จสมบูรณ์ไปแล้ว <xliff:g id="PERCENT">^1</xliff:g>"</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="7902355422499500352">"รอสักครู่ขณะกำลังเข้ารหัสความปลอดภัยให้คุณ เสร็จสมบูรณ์ไปแล้ว <xliff:g id="PERCENT">^1</xliff:g>%"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="8348188415839917821">"โปรดรอสักครู่ขณะเข้ารหัสความปลอดภัยให้แท็บเล็ต เหลืออีก <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="8556105766597855198">"โปรดรอสักครู่ขณะเข้ารหัสความปลอดภัย เหลืออีก <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="3832496715430327682">"ปิดแท็บเล็ตแล้วเปิดอีกครั้งเพื่อปลดล็อก"</string>
-    <string name="crypt_keeper_force_power_cycle" product="default" msgid="5070346039522135361">"ปิดโทรศัพท์แล้วเปิดอีกครั้งเพื่อปลดล็อก"</string>
-    <string name="crypt_keeper_warn_wipe" msgid="8104921337301750394">"คำเตือน: ระบบจะล้างข้อมูลในอุปกรณ์หลังจากปลดล็อกไม่สำเร็จอีก <xliff:g id="COUNT">^1</xliff:g> ครั้ง!"</string>
-    <string name="crypt_keeper_enter_password" msgid="1274917431075529732">"พิมพ์รหัสผ่านของคุณ"</string>
-    <string name="crypt_keeper_failed_title" msgid="8173654570682244149">"การเข้ารหัสความปลอดภัยไม่สำเร็จ"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"การเข้ารหัสความปลอดภัยถูกขัดจังหวะและไม่สามารถดำเนินการให้เสร็จสิ้น คุณจึงไม่สามารถเข้าถึงข้อมูลในแท็บเล็ตได้อีกต่อไป\n\nในการใช้งานแท็บเล็ตต่อ คุณต้องรีเซ็ตข้อมูลเป็นค่าเริ่มต้น เมื่อคุณตั้งค่าแท็บเล็ตหลังจากรีเซ็ตแล้ว คุณจะสามารถกู้คืนข้อมูลทั้งหมดที่มีการสำรองไว้ในบัญชี Google ของคุณได้"</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"การเข้ารหัสความปลอดภัยถูกขัดจังหวะและไม่สามารถดำเนินการให้เสร็จสิ้น คุณจึงไม่สามารถเข้าถึงข้อมูลในโทรศัพท์ได้อีกต่อไป\n\nในการใช้งานโทรศัพท์ต่อ คุณต้องรีเซ็ตข้อมูลเป็นค่าเริ่มต้น เมื่อคุณตั้งค่าโทรศัพท์หลังจากรีเซ็ตแล้ว คุณจะสามารถกู้คืนข้อมูลทั้งหมดที่มีการสำรองไว้ในบัญชี Google ของคุณได้"</string>
-    <string name="crypt_keeper_data_corrupt_title" msgid="5920153462176846037">"การถอดรหัสล้มเหลว"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"รหัสผ่านที่คุณป้อนถูกต้อง แต่ปรากฏว่ามีข้อมูลเสียหาย \n\nหากต้องการใช้แท็บเล็ตต่อ คุณต้องรีเซ็ตเครื่องเป็นค่าเริ่มต้น เมื่อคุณตั้งค่าแท็บเล็ตหลังรีเซ็ตแล้ว คุณจะสามารถคืนค่าข้อมูลที่ได้สำรองไว้ในบัญชี Google ได้"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"รหัสผ่านที่คุณป้อนถูกต้อง แต่ปรากฏว่ามีข้อมูลเสียหาย \n\nหากต้องการใช้โทรศัพท์ต่อ คุณต้องรีเซ็ตเครื่องเป็นค่าเริ่มต้น เมื่อคุณตั้งค่าโทรศัพท์หลังรีเซ็ตแล้ว คุณจะสามารถคืนค่าข้อมูลที่ได้สำรองไว้ในบัญชี Google ได้"</string>
-    <string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"สลับวิธีการป้อนข้อมูล"</string>
+    <string name="encryption_settings_title" msgid="2848716008695618360">"การเข้ารหัส"</string>
+    <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"เข้ารหัสแท็บเล็ต"</string>
+    <string name="encrypt_title" product="default" msgid="7337365190988321100">"เข้ารหัสโทรศัพท์"</string>
+    <string name="encrypted_summary" msgid="545623487587251207">"เข้ารหัสแล้ว"</string>
     <string name="suggested_lock_settings_title" msgid="7836065447159730217">"ป้องกันโทรศัพท์ของคุณ"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"ตั้งค่าล็อกหน้าจอเพื่อปกป้องแท็บเล็ต"</string>
     <string name="suggested_lock_settings_summary" product="device" msgid="8479766049078378225">"ตั้งค่าล็อกหน้าจอเพื่อปกป้องอุปกรณ์"</string>
@@ -817,6 +791,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"คุณอาจจำเป็นต้องพิมพ์รหัส PIN นี้ลงในอุปกรณ์อีกเครื่องหนึ่งด้วยเช่นกัน"</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"คุณอาจจำเป็นต้องพิมพ์รหัสผ่านนี้ลงในอุปกรณ์อีกเครื่องหนึ่งด้วยเช่นกัน"</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"หากต้องการจับคู่กับ:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;ตรวจสอบให้แน่ใจว่าอุปกรณ์แสดงรหัสผ่านนี้:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"ยืนยันการจับคู่กับชุดที่ทำงานร่วมกัน"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"จาก:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;จับคู่กับอุปกรณ์นี้หรือไม่"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"ในการจับคู่กับ: <xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> ให้พิมพ์: <xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g> แล้วกด Return หรือ Enter"</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"ให้สิทธิ์เข้าถึงรายชื่อติดต่อและประวัติการโทร"</string>
@@ -837,7 +812,7 @@
     <string name="bluetooth_preference_found_media_devices" msgid="830061195998352840">"อุปกรณ์ที่ใช้ได้"</string>
     <string name="bluetooth_preference_no_found_devices" msgid="1331122763066030155">"ไม่พบอุปกรณ์"</string>
     <string name="bluetooth_device_context_connect" msgid="4913860372216815855">"เชื่อมต่อ"</string>
-    <string name="bluetooth_device_context_disconnect" msgid="4464167389972513232">"ตัดการเชื่อมต่อ"</string>
+    <string name="bluetooth_device_context_disconnect" msgid="4464167389972513232">"ยกเลิกการเชื่อมต่อ"</string>
     <string name="bluetooth_device_context_pair_connect" msgid="2406032703622371826">"จับคู่อุปกรณ์และเชื่อมต่อ"</string>
     <string name="bluetooth_device_context_unpair" msgid="7525735305244087162">"เลิกจับคู่อุปกรณ์"</string>
     <string name="bluetooth_device_context_disconnect_unpair" msgid="2001359431289794561">"ตัดการเชื่อมต่อและเลิกจับคู่อุปกรณ์"</string>
@@ -850,6 +825,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"ไม่สามารถเชื่อมต่อ โปรดลองอีกครั้ง"</string>
     <string name="device_details_title" msgid="1155622417516195481">"รายละเอียดอุปกรณ์"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"ที่อยู่บลูทูธของอุปกรณ์: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"ที่อยู่บลูทูธของอุปกรณ์: \n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"ไม่จำอุปกรณ์ใช่ไหม"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"นำการเชื่อมโยงออก"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"ยกเลิกการเชื่อมต่อแอปใช่ไหม"</string>
@@ -881,6 +857,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"จำการตั้งค่า"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"จำนวนอุปกรณ์เสียงบลูทูธที่เชื่อมต่อสูงสุด"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"เลือกจำนวนสูงสุดสำหรับอุปกรณ์เสียงบลูทูธที่เชื่อมต่อ"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"บันทึกการแก้ไขข้อบกพร่องของสแต็ก NFC"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"เพิ่มระดับการบันทึกสแต็ก NFC"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"แคสต์"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"มิเรอร์"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"เปิดใช้การแสดงผลแบบไร้สาย"</string>
@@ -1188,6 +1166,8 @@
     <string name="wifi_hotspot_maximize_compatibility_dual_ap_summary" msgid="3579549223159056533">"ช่วยให้อุปกรณ์อื่นพบฮอตสปอตนี้ เพิ่มการใช้งานแบตเตอรี่"</string>
     <string name="wifi_tether_starting" msgid="8879874184033857814">"กำลังเปิดฮอตสปอต…"</string>
     <string name="wifi_tether_stopping" msgid="4416492968019409188">"กำลังปิดฮอตสปอต…"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_title" msgid="3089432578433978073">"ไม่มีบริการเชื่อมต่ออินเทอร์เน็ตผ่านมือถือ"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_content" msgid="5920421547607921112">"โปรดติดต่อสอบถามรายละเอียดจากผู้ให้บริการ"</string>
     <string name="wifi_tether_enabled_subtext" msgid="5085002421099821056">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> ใช้งานอยู่"</string>
     <string name="wifi_tether_failed_subtext" msgid="437190628041885500">"ข้อผิดพลาดของ WiFi ฮอตสปอตแบบพกพา"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7072559431286459122">"ตั้งค่า WiFi ฮอตสปอต"</string>
@@ -1341,7 +1321,7 @@
     <string name="adaptive_sleep_summary_no_permission" msgid="5822591289468803691">"ฟีเจอร์การจดจ่อที่หน้าจอต้องมีสิทธิ์เข้าถึงกล้อง แตะเพื่อจัดการสิทธิ์สำหรับบริการปรับอุปกรณ์ตามการใช้งานของผู้ใช้"</string>
     <string name="adaptive_sleep_manage_permission_button" msgid="1404510197847664846">"จัดการสิทธิ์"</string>
     <string name="adaptive_sleep_description" msgid="1835321775327187860">"ป้องกันไม่ให้หน้าจอปิดหากคุณกำลังดูอยู่"</string>
-    <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"การจดจ่อที่หน้าจอใช้กล้องหน้าเพื่อดูว่ามีใครกำลังดูหน้าจออยู่หรือไม่ ฟีเจอร์นี้จะทำงานในอุปกรณ์และจะไม่มีการเก็บหรือส่งรูปภาพไปให้ Google"</string>
+    <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"การจดจ่อที่หน้าจอใช้กล้องหน้าเพื่อดูว่ามีใครกำลังดูหน้าจออยู่ไหม ฟีเจอร์นี้จะทำงานในอุปกรณ์และจะไม่มีการเก็บหรือส่งรูปภาพไปให้ Google"</string>
     <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"เปิดฟีเจอร์การจดจ่อที่หน้าจอ"</string>
     <string name="adaptive_sleep_contextual_slice_summary" msgid="2993867044745446094">"เปิดหน้าจอค้างไว้เมื่อดูหน้าจออยู่"</string>
     <string name="auto_rotate_camera_lock_title" msgid="5369003176695105872">"กล้องถ่ายรูปล็อกอยู่"</string>
@@ -1392,7 +1372,7 @@
     <string name="dark_ui_summary_on_auto_mode_custom" msgid="2526935680241734784">"จะปิดโดยอัตโนมัติในเวลา <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_activation_on_custom" msgid="1889379402860316125">"เปิดจนถึง <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_activation_off_custom" msgid="2192932161592759607">"ปิดจนถึง <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="dark_ui_text" msgid="4392646155331126666">"ธีมมืดใช้พื้นหลังสีดำเพื่อช่วยให้แบตเตอรี่ของคุณใช้งานได้นานขึ้นในหน้าจอบางรุ่น ธีมมืดจะกำหนดเวลารอในการเปิดหน้าจอไว้ก่อนที่จะดับลง"</string>
+    <string name="dark_ui_text" msgid="4392646155331126666">"ธีมมืดใช้พื้นหลังสีดำเพื่อช่วยให้แบตเตอรี่ของคุณใช้งานได้นานขึ้นในหน้าจอบางรุ่น กำหนดการของธีมมืดรอที่จะเปิดใช้จนกระทั่งหน้าจอดับลง"</string>
     <string name="screen_timeout" msgid="7709947617767439410">"ระยะหมดเวลาหน้าจอ"</string>
     <string name="screen_timeout_title" msgid="785134393520893049">"หน้าจอปิด"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"หลังจากไม่ได้ทำงานเป็นเวลา <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
@@ -2534,11 +2514,6 @@
     <string name="enable_service_title" msgid="7231533866953706788">"อนุญาตให้ \"<xliff:g id="SERVICE">%1$s</xliff:g>\" ควบคุมอุปกรณ์อย่างเต็มที่ไหม"</string>
     <string name="capabilities_list_title" msgid="1225853611983394386">"<xliff:g id="SERVICE">%1$s</xliff:g> ต้องการที่จะ"</string>
     <string name="touch_filtered_warning" msgid="4225815157460318241">"เนื่องจากแอปหนึ่งได้บดบังคำขอสิทธิ์ ระบบจึงไม่สามารถยืนยันคำตอบของคุณสำหรับการตั้งค่าได้"</string>
-    <string name="enable_service_encryption_warning" msgid="931082737770453755">"หากคุณเปิด <xliff:g id="SERVICE">%1$s</xliff:g> อุปกรณ์ของคุณจะไม่ใช้ล็อกหน้าจอเพื่อปรับปรุงการเข้ารหัสข้อมูล"</string>
-    <string name="secure_lock_encryption_warning" msgid="669152607190123579">"เนื่องจากคุณเปิดบริการความสามารถในการเข้าถึง อุปกรณ์ของคุณจะไม่ใช้ล็อกหน้าจอเพื่อปรับปรุงการเข้ารหัสข้อมูล"</string>
-    <string name="enable_service_pattern_reason" msgid="6832846117817938536">"คุณต้องยืนยันรูปแบบ เนื่องจากการเปิด <xliff:g id="SERVICE">%1$s</xliff:g> จะส่งผลต่อการเข้ารหัสข้อมูล"</string>
-    <string name="enable_service_pin_reason" msgid="6040417014360237703">"คุณต้องยืนยัน PIN เนื่องจากการเปิด <xliff:g id="SERVICE">%1$s</xliff:g> จะส่งผลต่อการเข้ารหัสข้อมูล"</string>
-    <string name="enable_service_password_reason" msgid="6962544350351734238">"คุณต้องยืนยันรหัสผ่าน เนื่องจากการเปิด <xliff:g id="SERVICE">%1$s</xliff:g> จะส่งผลต่อการเข้ารหัสข้อมูล"</string>
     <string name="accessibility_service_warning" msgid="6779187188736432618">"<xliff:g id="SERVICE">%1$s</xliff:g> กำลังขอควบคุมอุปกรณ์นี้โดยสมบูรณ์ บริการนี้จะอ่านหน้าจอและดำเนินการในนามของผู้ใช้ที่ต้องการการช่วยเหลือพิเศษได้ การควบคุมระดับนี้ไม่เหมาะสำหรับแอปส่วนใหญ่"</string>
     <string name="accessibility_service_warning_description" msgid="6573203795976134751">"การควบคุมอย่างเต็มที่เหมาะสำหรับแอปที่ช่วยคุณในเรื่องความต้องการความช่วยเหลือพิเศษแต่ไม่เหมาะสำหรับแอปส่วนใหญ่"</string>
     <string name="accessibility_service_screen_control_title" msgid="324795030658109870">"ดูและควบคุมหน้าจอ"</string>
@@ -3082,7 +3057,7 @@
     <string name="sync_in_progress" msgid="6200093151211458977">"กำลังซิงค์อยู่ในขณะนี้…"</string>
     <string name="settings_backup" msgid="5357973563989458049">"สำรองข้อมูลการตั้งค่า"</string>
     <string name="settings_backup_summary" msgid="6803046376335724034">"สำรองข้อมูลการตั้งค่า"</string>
-    <string name="sync_menu_sync_now" msgid="3948443642329221882">"ซิงค์เดี๋ยวนี้"</string>
+    <string name="sync_menu_sync_now" msgid="3948443642329221882">"ซิงค์เลย"</string>
     <string name="sync_menu_sync_cancel" msgid="2422994461106269813">"ยกเลิกการซิงค์"</string>
     <string name="sync_one_time_sync" msgid="8114337154112057462">"แตะเพื่อซิงค์เลย<xliff:g id="LAST_SYNC_TIME">
 %1$s</xliff:g>"</string>
@@ -3103,14 +3078,6 @@
     <string name="remove_account_failed" msgid="3709502163548900644">"ผู้ดูแลระบบไม่อนุญาตให้ทำการเปลี่ยนแปลงนี้"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"ซิงค์ด้วยตนเองไม่ได้"</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"รายการนี้ปิดการซิงค์อยู่ หากต้องการเปลี่ยนการตั้งค่า ให้เปิดอินเทอร์เน็ตที่ใช้งานอยู่เบื้องหลังและการซิงค์อัตโนมัติชั่วคราว"</string>
-    <string name="enter_password" msgid="6327051330258595331">"ป้อนรหัสผ่านเพื่อเริ่มต้นใช้งาน Android"</string>
-    <string name="enter_pin" msgid="1029287617551232681">"ป้อน PIN เพื่อเริ่มต้นใช้งาน Android"</string>
-    <string name="enter_pattern" msgid="1747316785866742960">"วาดรูปแบบเพื่อเริ่มต้นใช้งาน Android"</string>
-    <string name="cryptkeeper_wrong_pattern" msgid="340747269176120242">"รูปแบบไม่ถูกต้อง"</string>
-    <string name="cryptkeeper_wrong_password" msgid="7295607881887114486">"รหัสผ่านไม่ถูกต้อง"</string>
-    <string name="cryptkeeper_wrong_pin" msgid="2347961593970714201">"PIN ไม่ถูกต้อง"</string>
-    <string name="checking_decryption" msgid="6111642972615688237">"กำลังตรวจสอบ…"</string>
-    <string name="starting_android" msgid="6694154070215356186">"กำลังเริ่มต้น Android…"</string>
     <string name="delete" msgid="8330605554706263775">"ลบ"</string>
     <string name="misc_files" msgid="6598066985800749585">"ไฟล์เบ็ดเตล็ด"</string>
     <string name="misc_files_selected_count" msgid="5597802791672749532">"เลือก <xliff:g id="NUMBER">%1$d</xliff:g> จาก <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -3171,10 +3138,10 @@
     <string name="data_usage_app_restrict_dialog_title" msgid="5383874438677899255">"ต้องการจำกัดอินเทอร์เน็ตที่ใช้งานอยู่เบื้องหลังหรือไม่"</string>
     <string name="data_usage_app_restrict_dialog" msgid="5534272311979978297">"ฟีเจอร์นี้อาจทำให้แอปพลิเคชันที่ต้องอาศัยอินเทอร์เน็ตที่ใช้งานอยู่เบื้องหลังหยุดทำงานเมื่อมีแต่เครือข่ายมือถือเท่านั้นที่ใช้งานได้\n\nคุณสามารถดูการควบคุมการใช้งานข้อมูลที่เหมาะสมกว่านี้ได้ในการตั้งค่าที่มีอยู่ภายในแอปพลิเคชัน"</string>
     <string name="data_usage_restrict_denied_dialog" msgid="8599940395497268584">"คุณสามารถจำกัดอินเทอร์เน็ตที่ใช้งานอยู่เบื้องหลังได้เมื่อคุณได้ตั้งค่าขีดจำกัดอินเทอร์เน็ตมือถือไว้เท่านั้น"</string>
-    <string name="data_usage_auto_sync_on_dialog_title" msgid="2048411447974361181">"เปิดซิงค์ข้อมูลอัตโนมัติหรือไม่"</string>
+    <string name="data_usage_auto_sync_on_dialog_title" msgid="2048411447974361181">"เปิดซิงค์ข้อมูลอัตโนมัติไหม"</string>
     <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="6387714350903085918">"การเปลี่ยนแปลงใดๆ ที่คุณทำกับบัญชีของคุณบนเว็บจะมีการคัดลอกไปยังแท็บเล็ตโดยอัตโนมัติ\n\nบางบัญชีอาจคัดลอกการเปลี่ยนแปลงที่คุณทำบนแท็บเล็ตไปยังเว็บโดยอัตโนมัติ นี่คือการทำงานของบัญชี Google"</string>
     <string name="data_usage_auto_sync_on_dialog" product="default" msgid="6457107552266187107">"การเปลี่ยนแปลงใดๆ ที่คุณทำกับบัญชีของคุณบนเว็บจะมีการคัดลอกไปยังโทรศัพท์โดยอัตโนมัติ\n\nบางบัญชีอาจคัดลอกการเปลี่ยนแปลงที่คุณทำบนโทรศัพท์ไปยังเว็บโดยอัตโนมัติ นี่คือการทำงานของบัญชี Google"</string>
-    <string name="data_usage_auto_sync_off_dialog_title" msgid="1783917145440587470">"ปิดซิงค์ข้อมูลอัตโนมัติหรือไม่"</string>
+    <string name="data_usage_auto_sync_off_dialog_title" msgid="1783917145440587470">"ปิดซิงค์ข้อมูลอัตโนมัติไหม"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="6523112583569674837">"การกระทำดังกล่าวจะเป็นการประหยัดปริมาณการใช้อินเทอร์เน็ตและแบตเตอรี่ แต่คุณจะต้องซิงค์แต่ละบัญชีด้วยตนเองเพื่อรวบรวมข้อมูลล่าสุด และคุณจะไม่ได้รับการแจ้งเตือนเมื่อมีการอัปเดต"</string>
     <string name="data_usage_cycle_editor_title" msgid="2019035830921480941">"วันที่รีเซ็ตรอบการใช้"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="1026234456777365545">"วันที่ของแต่ละเดือน:"</string>
@@ -3206,8 +3173,6 @@
     <string name="data_usage_metered_yes" msgid="4262598072030135223">"แบบจำกัดปริมาณ"</string>
     <string name="data_usage_metered_no" msgid="1685828958417926268">"ไม่มีการจำกัดปริมาณ"</string>
     <string name="data_usage_disclaimer" msgid="3271450299386176770">"การทำบัญชีข้อมูลผู้ให้บริการอาจแตกต่างจากอุปกรณ์ของคุณ"</string>
-    <string name="cryptkeeper_emergency_call" msgid="8369322820475703306">"หมายเลขฉุกเฉิน"</string>
-    <string name="cryptkeeper_return_to_call" msgid="3857250752781151232">"กลับสู่การโทร"</string>
     <string name="vpn_name" msgid="3806456074909253262">"ชื่อ"</string>
     <string name="vpn_type" msgid="5533202873260826663">"ประเภท"</string>
     <string name="vpn_server" msgid="2908816134941973935">"ที่อยู่เซิร์ฟเวอร์"</string>
@@ -3338,7 +3303,7 @@
     <string name="user_remove_user_menu" msgid="2183714948094429367">"ลบ <xliff:g id="USER_NAME">%1$s</xliff:g> จากอุปกรณ์นี้"</string>
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"การตั้งค่าหน้าจอล็อก"</string>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"เพิ่มผู้ใช้จากหน้าจอล็อก"</string>
-    <string name="user_confirm_remove_self_title" msgid="926265330805361832">"ลบตัวคุณเองหรือไม่"</string>
+    <string name="user_confirm_remove_self_title" msgid="926265330805361832">"ลบตัวคุณเองไหม"</string>
     <string name="user_confirm_remove_title" msgid="3626559103278006002">"ลบผู้ใช้รายนี้ใช่ไหม"</string>
     <string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"นำโปรไฟล์นี้ออกใช่ไหม"</string>
     <string name="work_profile_confirm_remove_title" msgid="6229618888167176036">"นำโปรไฟล์งานออกใช่ไหม"</string>
@@ -3512,7 +3477,7 @@
     <string name="connected_devices_dashboard_android_auto_no_nfc_summary" msgid="2532811870469405527">"บลูทูธ, Android Auto, โหมดขับรถ"</string>
     <string name="connected_devices_dashboard_android_auto_no_driving_mode_summary" msgid="6426996842202276640">"บลูทูธ Android Auto NFC"</string>
     <string name="connected_devices_dashboard_android_auto_no_nfc_no_driving_mode" msgid="1672426693308438634">"บลูทูธ, Android Auto"</string>
-    <string name="nfc_and_payment_settings_payment_off_nfc_off_summary" msgid="7132040463607801625">"ใช้ไม่ได้เพราะ NFC ปิดอยู่"</string>
+    <string name="nfc_and_payment_settings_payment_off_nfc_off_summary" msgid="7132040463607801625">"ใช้งานไม่ได้เพราะ NFC ปิดอยู่"</string>
     <string name="nfc_and_payment_settings_no_payment_installed_summary" msgid="4879818114908207465">"หากต้องการใช้งาน ให้ติดตั้งแอปการชำระเงินก่อนเป็นอันดับแรก"</string>
     <string name="app_and_notification_dashboard_title" msgid="2861781687031832943">"แอปและการแจ้งเตือน"</string>
     <string name="app_and_notification_dashboard_summary" msgid="8047683010984186106">"แอปล่าสุด แอปเริ่มต้น"</string>
@@ -3624,7 +3589,7 @@
     <string name="remote_media_volume_option_title" msgid="8760846743943305764">"ระดับเสียงเมื่อแคสต์"</string>
     <string name="call_volume_option_title" msgid="1461105986437268924">"ระดับเสียงการโทร"</string>
     <string name="alarm_volume_option_title" msgid="6398641749273697140">"ระดับเสียงปลุก"</string>
-    <string name="ring_volume_option_title" msgid="1520802026403038560">"ระดับเสียงเสียงเรียกเข้าและการแจ้งเตือน"</string>
+    <string name="ring_volume_option_title" msgid="1520802026403038560">"ระดับเสียงเรียกเข้าและการแจ้งเตือน"</string>
     <string name="notification_volume_option_title" msgid="4838818791683615978">"ระดับเสียงของการแจ้งเตือน"</string>
     <string name="ringtone_title" msgid="3271453110387368088">"เสียงเรียกเข้า"</string>
     <string name="notification_ringtone_title" msgid="6924501621312095512">"เสียงแจ้งเตือนเริ่มต้น"</string>
@@ -3803,7 +3768,7 @@
     <string name="bubbles_feature_education" msgid="4088275802688887634">"การแจ้งเตือนบางรายการและเนื้อหาอื่นอาจแสดงเป็นลูกโป่งในหน้าจอได้ แตะลูกโป่งเพื่อเปิด ลากลูกโป่งลงไปที่ด้านล่างของหน้าจอเพื่อปิด"</string>
     <string name="bubbles_app_toggle_title" msgid="5319021259954576150">"บับเบิล"</string>
     <string name="bubbles_conversation_app_link" msgid="5468779786387915337">"การตั้งค่าบับเบิลทั้งหมด"</string>
-    <string name="bubbles_conversation_toggle_title" msgid="5225039214083311316">"ทำบับเบิลกับการสนทนานี้"</string>
+    <string name="bubbles_conversation_toggle_title" msgid="5225039214083311316">"แสดงการสนทนานี้เป็นบับเบิ้ล"</string>
     <string name="bubbles_conversation_toggle_summary" msgid="720229032254323578">"แสดงไอคอนแบบลอยที่ด้านบนสุดของแอป"</string>
     <string name="bubbles_app_toggle_summary" msgid="1574515698567947948">"อนุญาตให้ \"<xliff:g id="APP_NAME">%1$s</xliff:g>\" แสดงการแจ้งเตือนบางรายการเป็นบับเบิล"</string>
     <string name="bubbles_feature_disabled_dialog_title" msgid="1794193899792284007">"เปิดบับเบิลของอุปกรณ์ไหม"</string>
@@ -4764,8 +4729,6 @@
       <item quantity="one">ใช้อินเทอร์เน็ตได้ไม่จำกัด 1 แอป</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"ดูเพิ่มเติม"</string>
-    <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"ต้องการล้างข้อมูลผู้ใช้และแปลงเป็นการเข้ารหัสไฟล์จริงๆ ใช่ไหม"</string>
-    <string name="button_confirm_convert_fbe" msgid="339648921918438106">"ล้างข้อมูลและแปลง"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"รีเซ็ตการจำกัดอัตราของ ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"รีเซ็ตการจำกัดอัตราของ ShortcutManager แล้ว"</string>
     <string name="notification_suggestion_title" msgid="6309263655965785411">"ควบคุมข้อมูลในหน้าจอล็อก"</string>
@@ -4835,11 +4798,11 @@
     <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="emergency_settings_preference_title" msgid="6183455153241187148">"ความปลอดภัยและกรณีฉุกเฉิน"</string>
-    <string name="emergency_dashboard_summary" msgid="401033951074039302">"SOS ฉุกเฉิน ข้อมูลทางการแพทย์ การแจ้งเตือน"</string>
+    <string name="emergency_dashboard_summary" msgid="401033951074039302">"SOS ฉุกเฉิน, ข้อมูลทางการแพทย์, การแจ้งเตือน"</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>
+    <string name="legacy_navigation_summary" msgid="5905301067778326433">"กลับไปที่หน้าแรกและสลับแอปโดยใช้ปุ่มที่ด้านล่างของหน้าจอ"</string>
     <string name="keywords_system_navigation" msgid="3131782378486554934">"การนำทางของระบบ, การนำทางแบบ 2 ปุ่ม, การนำทางแบบ 3 ปุ่ม, การนำทางด้วยท่าทางสัมผัส, เลื่อน"</string>
     <string name="gesture_not_supported_dialog_message" msgid="5316512246119347889">"ใช้ไม่ได้กับแอปหน้าแรกเริ่มต้นของคุณ <xliff:g id="DEFAULT_HOME_APP">%s</xliff:g>"</string>
     <string name="gesture_not_supported_positive_button" msgid="7909969459977021893">"สลับแอปหน้าแรกเริ่มต้น"</string>
@@ -4892,7 +4855,7 @@
     <string name="emergency_gesture_call_for_help_dialog_title" msgid="8901271205171421201">"หมายเลขสำหรับโทรขอความช่วยเหลือ"</string>
     <string name="emergency_gesture_call_for_help_summary" msgid="6552830427932669221">"<xliff:g id="PHONE_NUMBER">%1$s</xliff:g> แตะเพื่อเปลี่ยน"</string>
     <string name="emergency_gesture_number_override_notes" msgid="233018570696200402">"หากคุณป้อนหมายเลขที่ไม่ใช่หมายเลขฉุกเฉิน\n • ต้องปลดล็อกอุปกรณ์เพื่อใช้ SOS ฉุกเฉิน\n • อาจไม่มีผู้รับสาย"</string>
-    <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"ใช้ลายนิ้วมือแสดงการแจ้งเตือน"</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"ปัดสแกนลายนิ้วมือแสดงการแจ้งเตือน"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"ปัดสแกนลายนิ้วมือ"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"ในการตรวจสอบการแจ้งเตือน ให้ปัดนิ้วลงผ่านเซ็นเซอร์ลายนิ้วมือที่ด้านหลังโทรศัพท์"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="8642092907817554454">"ในการตรวจสอบการแจ้งเตือน ให้เลื่อนนิ้วลงผ่านเซ็นเซอร์ลายนิ้วมือที่ด้านหลังแท็บเล็ต"</string>
@@ -5292,6 +5255,7 @@
     <string name="sim_action_yes" msgid="8076556020131395515">"ใช่"</string>
     <string name="sim_action_reboot" msgid="3508948833333441538">"รีสตาร์ท"</string>
     <string name="sim_action_no_thanks" msgid="435717748384544195">"ไม่เป็นไร"</string>
+    <string name="sim_action_cancel" msgid="2668099867029610910">"ยกเลิก"</string>
     <string name="sim_switch_button" msgid="1405772571706095387">"เปลี่ยน"</string>
     <string name="dsds_activation_failure_title" msgid="4467364110584914794">"เปิดใช้งานซิมไม่ได้"</string>
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"ถอดซิมออกแล้วใส่กลับเข้าไปอีกครั้ง หากยังพบปัญหาอยู่ ให้รีสตาร์ทอุปกรณ์"</string>
@@ -5417,7 +5381,7 @@
     <string name="power_menu_summary_long_press_for_assist_disabled_with_power_menu" msgid="5165714995895517816">"กดค้างเพื่อแสดงเมนูเปิด/ปิด"</string>
     <string name="power_menu_summary_long_press_for_assist_disabled_no_action" msgid="2831598484771657432">"การกดค้างปิดใช้อยู่"</string>
     <string name="lockscreen_privacy_not_secure" msgid="3251276389681975912">"หากต้องการใช้ ให้ตั้งค่าการล็อกหน้าจอก่อน"</string>
-    <string name="power_menu_long_press_for_assist" msgid="2016813721240777737">"กดค้างไว้เพื่อรับบริการ Assistant"</string>
+    <string name="power_menu_long_press_for_assist" msgid="2016813721240777737">"กดค้างไว้เพื่อเปิดใช้งาน Assistant"</string>
     <string name="power_menu_long_press_for_assist_summary" msgid="8251928804984560312">"เรียกให้ Assistant ทำงานโดยกดปุ่มเปิด/ปิดค้างไว้"</string>
     <string name="power_menu_power_volume_up_hint" msgid="1733051433583045623">"เมนูเปิด/ปิดและกรณีฉุกเฉิน\nกดปุ่มเปิด/ปิดและปุ่มเพิ่มระดับเสียงพร้อมกัน"</string>
     <string name="power_menu_power_prevent_ringing_hint" msgid="5786494894009727654">"ป้องกันการส่งเสียง\nมีทางลัดให้ใช้ในเมนูระดับเสียง"</string>
@@ -5444,6 +5408,10 @@
     <string name="cached_apps_freezer" msgid="1057519579761550350">"ระงับการดำเนินการสำหรับแอปที่แคชไว้"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"อนุญาตการซ้อนทับบนหน้าจอในการตั้งค่า"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"อนุญาตแอปที่แสดงเหนือแอปอื่นๆ ได้เพื่อวางซ้อนหน้าจอการตั้งค่า"</string>
+    <!-- no translation found for allow_mock_modem (3832264806530479214) -->
+    <skip />
+    <!-- no translation found for allow_mock_modem_summary (9097416612748005374) -->
+    <skip />
     <string name="media_controls_title" msgid="403271085636252597">"สื่อ"</string>
     <string name="media_controls_resume_title" msgid="855076860336652370">"ปักหมุดโปรแกรมเล่นสื่อ"</string>
     <string name="media_controls_resume_description" msgid="3163482266454802097">"โปรแกรมเล่นสื่อจะยังเปิดอยู่ในการตั้งค่าด่วนเพื่อกลับมาเล่นต่อได้โดยเร็ว"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 0589f55..0e3d030 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -142,10 +142,11 @@
     <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"Pinapayagan ang iyong device na makipag-ugnayan sa mga kalapit na Bluetooth device"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"Pinapayagan ang iyong teleponong makipag-ugnayan sa mga kalapit na Bluetooth device"</string>
     <string name="bluetooth_disable_a2dp_hw_offload" msgid="5942913792817797541">"I-disable ang Bluetooth A2DP hardware offload"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="8610420176339657720">"I-restart Ito?"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8333029144800835996">"Kailangan mong i-restart ang device para mabago ang setting."</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="3488695418187553566">"I-restart"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="4930826928585464191">"Kanselahin"</string>
+    <string name="bluetooth_disable_le_audio_hw_offload" msgid="3966022676505972908">"I-disable ang Bluetooth LE AUDIO hardware offload"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_title" msgid="6001142380445276918">"I-restart ang Device?"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_message" msgid="1524373895333698779">"Kailangan mong i-restart ang iyong device para mabago ang setting na ito."</string>
+    <string name="bluetooth_disable_hw_offload_dialog_confirm" msgid="5594859658551707592">"I-restart"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel" msgid="3663690305043973720">"Kanselahin"</string>
     <string name="connected_device_media_device_title" msgid="3783388247594566734">"Mga media device"</string>
     <string name="connected_device_call_device_title" msgid="88732390601723608">"Mga device sa pagtawag"</string>
     <string name="connected_device_other_device_title" msgid="4652120430615729193">"Iba pang device"</string>
@@ -309,9 +310,9 @@
     <string name="security_settings_title" msgid="6710768415432791970">"Seguridad"</string>
     <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"Pag-encrypt at mga kredensyal"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"Naka-encrypt ang telepono"</string>
-    <string name="decryption_settings_summary" product="default" msgid="1742645256103613503">"Hindi naka-encrypt ang telepono"</string>
+    <string name="not_encrypted_summary" product="default" msgid="2251945842585788254">"Hindi naka-encrypt ang telepono"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"Device ay naka-encrypt"</string>
-    <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"Hindi naka-encrypt ang device"</string>
+    <string name="not_encrypted_summary" product="tablet" msgid="2374263654698719382">"Hindi naka-encrypt ang device"</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"Lock screen"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"Ang ipapakita"</string>
     <string name="security_settings_summary" msgid="1627059516127354233">"Itakda ang Aking Lokasyon, pag-unlock ng screen, lock ng SIM card, lock ng storage ng kredensyal"</string>
@@ -488,7 +489,7 @@
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Iangat nang iangat ang iyong daliri para idagdag ang iba\'t ibang bahagi ng fingerprint mo"</string>
     <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"Pindutin nang matagal sa tuwing gagalaw ang icon ng fingerprint. Makakatulong itong mas makuha ang iyong fingerprint."</string>
     <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"Ilagay ang tip ng iyong daliri sa sensor"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="6137605344819152477">"Panghuli, gamitin ang mga dulo ng iyong daliri"</string>
+    <string name="security_settings_udfps_enroll_edge_title" msgid="6137605344819152477">"Panghuli, gamitin ang mga edge ng iyong daliri"</string>
     <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"Ilagay ang gilid ng iyong fingerprint sa sensor nang matagal, pagkatapos ay ang kabilang gilid"</string>
     <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"Makakatulong itong mas makuha ang iyong fingerprint"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Pag-enroll ng fingerprint: <xliff:g id="PERCENTAGE">%d</xliff:g> porsyento"</string>
@@ -568,37 +569,10 @@
     <string name="fingerprint_last_delete_message" msgid="7860374760549404410">"Hindi mo magagamit ang iyong fingerprint para i-unlock ang telepono mo o i-verify na ikaw ito sa mga app."</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="4104208067277655068">"Hindi mo magagamit ang iyong fingerprint para i-unlock ang profile mo sa trabaho, magpahintulot ng mga pagbili, o mag-sign in sa mga app para sa trabaho."</string>
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"Oo, alisin"</string>
-    <string name="crypt_keeper_settings_title" msgid="4938812137822100044">"Pag-encrypt"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"I-encrypt ang tablet"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"I-encrypt ang telepono"</string>
-    <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"Naka-encrypt"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"Maaari mong i-encrypt ang iyong mga account, setting, na-download na app at ang data ng mga ito, media at iba pang mga file. Pagkatapos mong i-encrypt ang iyong telepono, ipagpalagay na nag-set up ka ng isang screen lock (iyon ay, isang pattern o numerong PIN o password), kakailanganin mong i-unlock ang screen upang ma-decrypt ang tablet sa bawat pagkakataon na io-on mo ito. Ang tanging iba pang paraan upang mag-decrypt ay magsagawa ng pag-reset ng factory data, na bubura sa lahat ng iyong data.\n\nUmaabot ng isang oras o higit pa ang pag-encrypt. Dapat kang magsimula nang may charge ang baterya at panatilihing nakasaksak ang iyong tablet sa kahabaan ng proseso. Kung pipigilan mo ito, mawawala sa iyo ang ilan sa o lahat ng iyong data"</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"Maaari mong i-encrypt ang iyong mga account, setting, na-download na app at ang data ng mga ito, media at iba pang mga file. Pagkatapos mong i-encrypt ang iyong telepono, ipagpalagay na nag-set up ka ng isang screen lock (iyon ay, isang pattern o numerong PIN o password), kakailanganin mong i-unlock ang screen upang ma-decrypt ang telepono sa bawat pagkakataon na io-on mo ito. Ang tanging iba pang paraan upang mag-decrypt ay magsagawa ng pag-reset ng factory data, na bubura sa lahat ng iyong data.\n\nUmaabot ng isang oras o higit pa ang pag-encrypt. Dapat kang magsimula nang may charge ang baterya at panatilihing nakasaksak ang iyong telepono sa kahabaan ng proseso. Kung pipigilan mo ito, mawawala ang ilan sa o lahat ng iyong data."</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"I-encrypt ang tablet"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"I-encrypt ang telepono"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"I-charge ang iyong baterya at subukang muli."</string>
-    <string name="crypt_keeper_unplugged_text" msgid="2709721134148651329">"I-plug in ang iyong charger at subukang muli."</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="1847280235529858357">"Walang PIN o password sa pag-screen lock"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="7210616262954236042">"Kailangan mong magtakda ng PIN o password ng lock screen bago ka makakapagsimula sa pag-encrypt."</string>
-    <string name="crypt_keeper_confirm_title" msgid="8600000209722452230">"I-encrypt?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="3270587498436152259">"Hindi na mababawi ang pagpapatakbo ng pag-encrypt at kung aantalahin mo ito, maiwawala mo ang data. Tumatagal ang pag-encrypt nang isang oras o higit pa, kung kailan magre-restart ang tablet nang ilang beses."</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="3040428543349852419">"Hindi na mababawi ang pagpapatakbo ng pag-encrypt at kung aantalahin mo ito, mawawalan ka ng data. Tumatagal ang pag-encrypt nang isang oras o higit pa, kung kailan magre-restart ang telepono nang ilang beses."</string>
-    <string name="crypt_keeper_setup_title" msgid="3339725741305796680">"Pag-encrypt"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="4417016995091289019">"Maghintay habang ine-encrypt ang iyong tablet. <xliff:g id="PERCENT">^1</xliff:g>% (na) kumpleto."</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="7902355422499500352">"Maghintay habang ine-encrypt ang iyong telepono. <xliff:g id="PERCENT">^1</xliff:g>% (na) kumpleto."</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="8348188415839917821">"Maghintay habang ine-encrypt ang iyong tablet. Natitirang oras: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="8556105766597855198">"Maghintay habang ine-encrypt ang iyong telepono. Natitirang oras: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="3832496715430327682">"Upang i-unlock ang iyong tablet, i-off ito at pagkatapos ay i-on."</string>
-    <string name="crypt_keeper_force_power_cycle" product="default" msgid="5070346039522135361">"Upang i-unlock ang iyong telepono, i-off ito at pagkatapos ay i-on."</string>
-    <string name="crypt_keeper_warn_wipe" msgid="8104921337301750394">"Babala: Mabubura ang iyong device pagkatapos ng <xliff:g id="COUNT">^1</xliff:g> pang hindi matagumpay na pagsubok na mag-unlock!"</string>
-    <string name="crypt_keeper_enter_password" msgid="1274917431075529732">"I-type ang iyong password"</string>
-    <string name="crypt_keeper_failed_title" msgid="8173654570682244149">"Hindi matagumpay ang pag-encrypt"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"Nagambala at hindi makumpleto ang pag-encrypt. Bilang resulta, hindi na maa-access ang data sa iyong telepono. \n\nUpang patuloy na magamit ang iyong tablet, kailangan mong magsagawa ng factory reset. Kapag na-set up mo ang iyong tablet pagkatapos ng pag-reset, magkakaroon ka ng pagkakataong magbalik ng anumang data na na-back up sa iyong Google Account."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"Nagambala at hindi makumpleto ang pag-encrypt. Bilang resulta, hindi na maa-access ang data sa iyong telepono. \n\nUpang patuloy na magamit ang iyong telepono, kailangan mong magsagawa ng factory reset. Kapag na-set up mo ang iyong telepono pagkatapos ng pag-reset, magkakaraoon ka ng pagkakataong magbalik ng anumang data na na-back up sa iyong Google Account."</string>
-    <string name="crypt_keeper_data_corrupt_title" msgid="5920153462176846037">"Hindi matagumpay ang pag-decrypt"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"Tama ang password na inilagay mo, ngunit sa kasamaang-palad ay sira ang iyong data. \n\nUpang maipagpatuloy ang paggamit sa iyong tablet, kailangan mong magsagawa ng factory reset. Kapag na-set up mo ang iyong tablet pagkatapos ng pag-reset, magkakaroon ka ng pagkakataong ipanumbalik ang anumang data na na-back up sa iyong Google Account."</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"Tama ang password na inilagay mo, ngunit sa kasamaang-palad ay sira ang iyong data. \n\nUpang maipagpatuloy ang paggamit sa iyong telepono, kailangan mong magsagawa ng factory reset. Kapag na-set up mo ang iyong telepono pagkatapos ng pag-reset, magkakaroon ka ng pagkakataong ipanumbalik ang anumang data na na-back up sa iyong Google Account."</string>
-    <string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"Magpalit ng pamamaraan ng pag-input"</string>
+    <string name="encryption_settings_title" msgid="2848716008695618360">"Pag-encrypt"</string>
+    <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"I-encrypt ang tablet"</string>
+    <string name="encrypt_title" product="default" msgid="7337365190988321100">"I-encrypt ang telepono"</string>
+    <string name="encrypted_summary" msgid="545623487587251207">"Naka-encrypt"</string>
     <string name="suggested_lock_settings_title" msgid="7836065447159730217">"I-secure ang iyong telepono"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"Magtakda ng lock ng screen para protektahan ang tablet"</string>
     <string name="suggested_lock_settings_summary" product="device" msgid="8479766049078378225">"Magtakda ng lock ng screen para protektahan ang device"</string>
@@ -817,6 +791,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Maaari mo ring kailanganing i-type ang PIN na ito sa isa pang device."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Maaari mo ring kailanganing i-type ang passkey na ito sa iba pang device."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Upang makipagpares sa:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Tiyaking ipinapakita nito ang passkey na ito:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Kumpirmahin para ipares sa coordinated na set"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"Mula sa:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Makipagpares sa device na ito?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Upang ipares sa:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Mag-type dito:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, pagkatapos ay pindutin ang Return o Enter."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Payagan ang access sa iyong mga contact at history ng tawag"</string>
@@ -850,6 +825,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Hindi makakonekta. Subukang muli."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Mga detalye ng device"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Bluetooth address ng device: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Address ng bluetooth ng device:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Kalimutan ang device?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Alisin ang asosasyon"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"I-diskonekta ang App?"</string>
@@ -881,6 +857,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Tandaan ang mga setting"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Maximum na nakakonektang mga Bluetooth audio device"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Piliin ang maximum na bilang ng mga nakakonektang Bluetooth audio device"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"Log ng pag-debug ng stack ng NFC"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Pataasin ang antas ng pag-log ng stack ng NFC"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"I-cast"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"mirror"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"I-enable ang wireless display"</string>
@@ -1188,6 +1166,8 @@
     <string name="wifi_hotspot_maximize_compatibility_dual_ap_summary" msgid="3579549223159056533">"Nakakatulong sa iba pang device na mahanap ang hotspot na ito. Pinapalakas ang paggamit ng baterya."</string>
     <string name="wifi_tether_starting" msgid="8879874184033857814">"Pag-on sa hotspot…"</string>
     <string name="wifi_tether_stopping" msgid="4416492968019409188">"Pag-off sa hotspot…"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_title" msgid="3089432578433978073">"Hindi available ang pag-tether"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_content" msgid="5920421547607921112">"Makipag-ugnayan sa iyong carrier para sa mga detalye"</string>
     <string name="wifi_tether_enabled_subtext" msgid="5085002421099821056">"Aktibo ang <xliff:g id="NETWORK_SSID">%1$s</xliff:g>"</string>
     <string name="wifi_tether_failed_subtext" msgid="437190628041885500">"Error sa portable na Wi-Fi hotspot"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7072559431286459122">"I-set up ang Wi-Fi hotspot"</string>
@@ -2534,11 +2514,6 @@
     <string name="enable_service_title" msgid="7231533866953706788">"Bigyan ang <xliff:g id="SERVICE">%1$s</xliff:g> ng ganap na kontrol sa iyong device?"</string>
     <string name="capabilities_list_title" msgid="1225853611983394386">"Kailangan ng <xliff:g id="SERVICE">%1$s</xliff:g> na:"</string>
     <string name="touch_filtered_warning" msgid="4225815157460318241">"Dahil pinipigilan ng isang app ang kahilingan ng pahintulot, hindi ma-verify ng Mga Setting ang iyong tugon."</string>
-    <string name="enable_service_encryption_warning" msgid="931082737770453755">"Kung io-on mo ang <xliff:g id="SERVICE">%1$s</xliff:g>, hindi gagamitin ng iyong device ang lock ng iyong screen upang pahusayin ang pag-encrypt ng data."</string>
-    <string name="secure_lock_encryption_warning" msgid="669152607190123579">"Dahil nag-on ka ng serbisyo sa accessibility, hindi gagamitin ng iyong device ang lock ng iyong screen upang pahusayin ang pag-encrypt ng data."</string>
-    <string name="enable_service_pattern_reason" msgid="6832846117817938536">"Dahil nakakaapekto ang pag-o-on ng <xliff:g id="SERVICE">%1$s</xliff:g> sa pag-encrypt ng data, kailangan mong kumpirmahin ang iyong pattern."</string>
-    <string name="enable_service_pin_reason" msgid="6040417014360237703">"Dahil nakakaapekto ang pag-o-on ng <xliff:g id="SERVICE">%1$s</xliff:g> sa pag-encrypt ng data, kailangan mong kumpirmahin ang iyong PIN."</string>
-    <string name="enable_service_password_reason" msgid="6962544350351734238">"Dahil nakakaapekto ang pag-o-on ng <xliff:g id="SERVICE">%1$s</xliff:g> sa pag-encrypt ng data, kailangan mong kumpirmahin ang iyong password."</string>
     <string name="accessibility_service_warning" msgid="6779187188736432618">"Humihiling ang <xliff:g id="SERVICE">%1$s</xliff:g> ng ganap na kontrol sa device na ito. Maaaring basahin ng serbisyo ang screen at kumilos sa ngalan ng mga user na may mga pangangailangan sa accessibility. Hindi naaangkop ang ganitong antas ng kontrol para sa karamihan ng mga app."</string>
     <string name="accessibility_service_warning_description" msgid="6573203795976134751">"Naaangkop ang ganap na kontrol sa mga app na tumutulong sa mga pangangailangan mo sa accessibility, pero hindi sa karamihan ng mga app."</string>
     <string name="accessibility_service_screen_control_title" msgid="324795030658109870">"Tingnan at kontrolin ang screen"</string>
@@ -3103,14 +3078,6 @@
     <string name="remove_account_failed" msgid="3709502163548900644">"Hindi pinapahintulutan ng iyong admin ang pagbabagong ito"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"Hindi makapag-sync nang manual"</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"Kasalukuyang naka-disable ang pag-sync para sa item na ito. Upang baguhin ang setting na ito, pansamantalang i-on ang data ng background at awtomatikong pag-sync."</string>
-    <string name="enter_password" msgid="6327051330258595331">"Upang magsimula sa Android, ilagay ang iyong password"</string>
-    <string name="enter_pin" msgid="1029287617551232681">"Upang magsimula sa Android, ilagay ang iyong PIN"</string>
-    <string name="enter_pattern" msgid="1747316785866742960">"Upang magsimula sa Android, iguhit ang iyong pattern"</string>
-    <string name="cryptkeeper_wrong_pattern" msgid="340747269176120242">"Maling Pattern"</string>
-    <string name="cryptkeeper_wrong_password" msgid="7295607881887114486">"Maling Password"</string>
-    <string name="cryptkeeper_wrong_pin" msgid="2347961593970714201">"Maling PIN"</string>
-    <string name="checking_decryption" msgid="6111642972615688237">"Sinusuri…"</string>
-    <string name="starting_android" msgid="6694154070215356186">"Sinisimulan ang Android…"</string>
     <string name="delete" msgid="8330605554706263775">"I-delete"</string>
     <string name="misc_files" msgid="6598066985800749585">"Misc na mga file"</string>
     <string name="misc_files_selected_count" msgid="5597802791672749532">"pinili <xliff:g id="NUMBER">%1$d</xliff:g> sa <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -3206,8 +3173,6 @@
     <string name="data_usage_metered_yes" msgid="4262598072030135223">"Nakametro"</string>
     <string name="data_usage_metered_no" msgid="1685828958417926268">"Hindi nakametro"</string>
     <string name="data_usage_disclaimer" msgid="3271450299386176770">"Maaaring iba ang accounting ng data ng carrier kumpara sa iyong device"</string>
-    <string name="cryptkeeper_emergency_call" msgid="8369322820475703306">"Emergency na tawag"</string>
-    <string name="cryptkeeper_return_to_call" msgid="3857250752781151232">"Balikan ang tawag"</string>
     <string name="vpn_name" msgid="3806456074909253262">"Pangalan"</string>
     <string name="vpn_type" msgid="5533202873260826663">"Uri"</string>
     <string name="vpn_server" msgid="2908816134941973935">"Address ng server"</string>
@@ -4764,8 +4729,6 @@
       <item quantity="other">May <xliff:g id="COUNT">%d</xliff:g> na app na maaaring gumamit ng walang limitasyong data</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"Tumingin pa"</string>
-    <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"Talagang i-wipe ang data ng user at i-convert sa pag-encrypt ng file?"</string>
-    <string name="button_confirm_convert_fbe" msgid="339648921918438106">"I-wipe at i-convert"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"I-reset ang ShortcutManager na naglilimita ng rate"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"Na-reset na ang ShortcutManager na naglilimita ng rate"</string>
     <string name="notification_suggestion_title" msgid="6309263655965785411">"Kontrolin ang impormasyon sa lock screen"</string>
@@ -5292,6 +5255,7 @@
     <string name="sim_action_yes" msgid="8076556020131395515">"Oo"</string>
     <string name="sim_action_reboot" msgid="3508948833333441538">"I-restart"</string>
     <string name="sim_action_no_thanks" msgid="435717748384544195">"Huwag na lang"</string>
+    <string name="sim_action_cancel" msgid="2668099867029610910">"Kanselahin"</string>
     <string name="sim_switch_button" msgid="1405772571706095387">"Lumipat"</string>
     <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Hindi ma-activate ang SIM"</string>
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Alisin ang SIM at ilagay ito ulit. Kung magpapatuloy ang problema, i-restart ang iyong device."</string>
@@ -5444,6 +5408,10 @@
     <string name="cached_apps_freezer" msgid="1057519579761550350">"Suspindihin: pag-execute para sa naka-cache na app"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"Payagan ang pag-overlay sa screen sa Mga Setting"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Payagang mag-overlay sa mga screen ng Mga Setting ang mga app na puwedeng lumabas sa ibabaw ng ibang app"</string>
+    <!-- no translation found for allow_mock_modem (3832264806530479214) -->
+    <skip />
+    <!-- no translation found for allow_mock_modem_summary (9097416612748005374) -->
+    <skip />
     <string name="media_controls_title" msgid="403271085636252597">"Media"</string>
     <string name="media_controls_resume_title" msgid="855076860336652370">"I-pin ang media player"</string>
     <string name="media_controls_resume_description" msgid="3163482266454802097">"Para mabilis na maipagpatuloy ang pag-playback, mananatiling bukas ang media player sa Mga Mabilisang Setting"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 267be61..e7bd9a5 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -142,10 +142,11 @@
     <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"Cihazınızın yakındaki Bluetooth cihazlarıyla iletişim kurmasına izin verin"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"Telefonunuzun yakındaki Bluetooth cihazlarıyla iletişim kurmasına izin verin"</string>
     <string name="bluetooth_disable_a2dp_hw_offload" msgid="5942913792817797541">"Bluetooth A2DP donanım yükünü devre dışı bırak"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="8610420176339657720">"Cihaz Yeniden Başlatılsın mı?"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8333029144800835996">"Bu ayarı değiştirmek için cihazınızı yeniden başlatın."</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="3488695418187553566">"Yeniden başlat"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="4930826928585464191">"İptal"</string>
+    <string name="bluetooth_disable_le_audio_hw_offload" msgid="3966022676505972908">"Bluetooth LE AUDIO donanım yükünü devre dışı bırakın"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_title" msgid="6001142380445276918">"Cihaz Yeniden Başlatılsın mı?"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_message" msgid="1524373895333698779">"Bu ayarı değiştirmek için cihazınızı yeniden başlatın."</string>
+    <string name="bluetooth_disable_hw_offload_dialog_confirm" msgid="5594859658551707592">"Yeniden başlat"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel" msgid="3663690305043973720">"İptal"</string>
     <string name="connected_device_media_device_title" msgid="3783388247594566734">"Medya cihazları"</string>
     <string name="connected_device_call_device_title" msgid="88732390601723608">"Cihazları ara"</string>
     <string name="connected_device_other_device_title" msgid="4652120430615729193">"Diğer cihazlar"</string>
@@ -309,9 +310,9 @@
     <string name="security_settings_title" msgid="6710768415432791970">"Güvenlik"</string>
     <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"Şifreleme ve kimlik bilgileri"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"Telefon şifrelendi"</string>
-    <string name="decryption_settings_summary" product="default" msgid="1742645256103613503">"Telefon şifrelenmedi"</string>
+    <string name="not_encrypted_summary" product="default" msgid="2251945842585788254">"Telefon şifrelenmedi"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"Cihaz şifrelendi"</string>
-    <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"Cihaz şifrelenmedi"</string>
+    <string name="not_encrypted_summary" product="tablet" msgid="2374263654698719382">"Cihaz şifrelenmedi"</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"Kilit ekranı"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"Ne göstermeli?"</string>
     <string name="security_settings_summary" msgid="1627059516127354233">"Konumum, ekran kil. açma, SIM kart kil., kim. bilg. dep.kilidini ayarla"</string>
@@ -480,7 +481,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"Sil"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"Sensöre dokunun"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"Parmağınızı sensörün üzerine koyun ve bir titreşim hissettiğinizde kaldırın"</string>
-    <string name="security_settings_udfps_enroll_start_message" msgid="5032954588171487566">"Bir titreşim hissedene kadar parmak izinizi sensörün üzerinde tutun"</string>
+    <string name="security_settings_udfps_enroll_start_message" msgid="5032954588171487566">"Bir titreşim hissedene kadar parmak izinizi sensörün üzerinde düz tutun"</string>
     <string name="security_settings_fingerprint_enroll_udfps_title" msgid="6665610134560896895">"Parmak izi sensörüne dokunup basılı tutun"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"Kaldırın, tekrar dokunun"</string>
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"Bir kez daha"</string>
@@ -568,37 +569,10 @@
     <string name="fingerprint_last_delete_message" msgid="7860374760549404410">"Telefonunuzun kilidini açmak veya uygulamalarda kimliğinizi doğrulamak için parmak izinizi kullanamazsınız."</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="4104208067277655068">"İş profilinizin kilidini açmak, satın alma işlemlerini yetkilendirmek veya iş uygulamalarında oturum açmak için parmak izinizi kullanamazsınız."</string>
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"Evet, kaldır"</string>
-    <string name="crypt_keeper_settings_title" msgid="4938812137822100044">"Şifreleme"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"Tableti şifrele"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"Telefonu şifrele"</string>
-    <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"Şifreli"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"Hesaplarınızı, ayarlarınızı, indirilen uygulamalarınızı ve bunlara ilişkin veriler, medya dosyaları ile diğer dosyaları şifreleyebilirsiniz. Tabletinizi şifreledikten sonra, bir kilit ekranı (yani bir desen veya sayısal PIN ya da şifre) oluşturduğunuz varsayılırsa, tabletinizi her açtığınızda şifresini çözmek için ekran kilidini açmanız gerekecektir. Bunun dışında şifreyi çözmenin tek yolu fabrika verilerine sıfırlama işlemi yapmaktır (tüm verileriniz silinir).\n\nŞifreleme bir saat veya daha fazla sürebilir. Şifreleme işlemine şarj olmuş bir pille başlamalı ve tüm işlem boyunca tableti şarj cihazına takılı olarak tutmalısınız. İşlemi yarıda keserseniz verilerinizin bir bölümünü veya tamamını kaybedersiniz."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"Hesaplarınızı, ayarlarınızı, indirilen uygulamalarınızı ve bunlara ilişkin veriler, medya dosyaları ile diğer dosyaları şifreleyebilirsiniz. Telefonunuzu şifreledikten sonra, bir kilit ekranı (yani bir desen veya sayısal PIN ya da şifre) oluşturduğunuz varsayılırsa, telefonunuzu her açtığınızda şifresini çözmek için ekran kilidini açmanız gerekecektir. Bunun dışında şifreyi çözmenin tek yolu fabrika verilerine sıfırlama işlemi yapmaktır (tüm verileriniz silinir).\n\nŞifreleme bir saat veya daha fazla sürebilir. Şifreleme işlemine şarj olmuş bir pille başlamalı ve tüm işlem boyunca telefonu şarj cihazına takılı olarak tutmalısınız. İşlemi yarıda keserseniz verilerinizin bir bölümünü veya tamamını kaybedersiniz."</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"Tableti şifrele"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"Telefonu şifrele"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"Pilinizi şarj edip tekrar deneyin."</string>
-    <string name="crypt_keeper_unplugged_text" msgid="2709721134148651329">"Şarj cihazınızı takıp tekrar deneyin."</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="1847280235529858357">"Ekran kilitleme PIN\'i veya şifresi yok"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="7210616262954236042">"Şifrelemeyi başlatabilmek için öncelikle ekran kilitleme PIN\'i veya şifresi ayarlamanız gerekir."</string>
-    <string name="crypt_keeper_confirm_title" msgid="8600000209722452230">"Şifrelensin mi?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="3270587498436152259">"Şifreleme işlemi geri döndürülemez ve şifreleme sırasında işlemi durdurursanız veri kaybedersiniz. Şifreleme bir saat veya daha fazla sürebilir ve tablet bu süre içinde birkaç kez yeniden başlatılır."</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="3040428543349852419">"Şifreleme işlemi geri döndürülemez ve şifreleme sırasında işlemi durdurursanız veri kaybedersiniz. Şifreleme bir saat veya daha fazla sürebilir ve telefon bu süre içinde birkaç kez yeniden başlatılır."</string>
-    <string name="crypt_keeper_setup_title" msgid="3339725741305796680">"Şifreleniyor"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="4417016995091289019">"Tabletiniz şifrelenirken lütfen bekleyin. %<xliff:g id="PERCENT">^1</xliff:g> tamamlandı."</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="7902355422499500352">"Telefonunuz şifrelenirken lütfen bekleyin. %<xliff:g id="PERCENT">^1</xliff:g> tamamlandı."</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="8348188415839917821">"Tabletiniz şifrelenirken bekleyin. Kalan süre: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="8556105766597855198">"Telefonunuz şifrelenirken bekleyin. Kalan süre: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="3832496715430327682">"Tabletinizin kilidini açmak için tableti kapatıp tekrar açın."</string>
-    <string name="crypt_keeper_force_power_cycle" product="default" msgid="5070346039522135361">"Telefonunuzun kilidini açmak için telefonu kapatıp tekrar açın."</string>
-    <string name="crypt_keeper_warn_wipe" msgid="8104921337301750394">"Uyarı: Cihazınız, <xliff:g id="COUNT">^1</xliff:g> kez daha başarısız kilit açma denemesinden sonra silinecek!"</string>
-    <string name="crypt_keeper_enter_password" msgid="1274917431075529732">"Şifrenizi yazın"</string>
-    <string name="crypt_keeper_failed_title" msgid="8173654570682244149">"Şifreleme başarısız oldu"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"Şifreleme kesildi ve tamamlanamıyor. Bu durum nedeniyle tabletinizdeki verilere artık erişilemiyor.\n\nTabletinizi kullanmaya devam edebilmek için, fabrika ayarlarına sıfırlama işlemi gerçekleştirmeniz gerekir. Sıfırlama işleminden sonra tabletinizin kurulumunu yaptığınızda, Google Hesabınıza yedeklenen tüm verileri geri yükleme fırsatınız olacaktır."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"Şifreleme kesildi ve tamamlanamıyor. Bu durum nedeniyle telefonunuzdaki verilere artık erişilemiyor.\n\nTelefonunuz kullanmaya devam edebilmek için, fabrika ayarlarına sıfırlama işlemi gerçekleştirmeniz gerekir. Sıfırlama işleminden sonra telefonunuzun kurulumunu yaptığınızda, Google Hesabınıza yedeklenen tüm verileri geri yükleme fırsatınız olacaktır."</string>
-    <string name="crypt_keeper_data_corrupt_title" msgid="5920153462176846037">"Şifre çözülemedi"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"Girdiğiniz şifre doğru, ancak ne yazık ki verileriniz bozulmuş. \n\nTabletinizi kullanmaya devam etmek için fabrika ayarlarına sıfırlama işlemi yapmanız gerekiyor. Sıfırlama işleminden sonra tabletinizin kurulumunu yaparken Google Hesabınıza yedeklenmiş tüm verileri geri yükleme fırsatınız olacaktır."</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"Girdiğiniz şifre doğru, ancak ne yazık ki verileriniz bozulmuş. \n\nTelefonunuzu kullanmaya devam etmek için fabrika ayarlarına sıfırlama işlemi yapmanız gerekiyor. Sıfırlama işleminden sonra telefonunuzun kurulumunu yaparken Google Hesabınıza yedeklenmiş tüm verileri geri yükleme fırsatınız olacaktır."</string>
-    <string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"Giriş yöntemini değiştir"</string>
+    <string name="encryption_settings_title" msgid="2848716008695618360">"Şifreleme"</string>
+    <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"Tableti şifrele"</string>
+    <string name="encrypt_title" product="default" msgid="7337365190988321100">"Telefonu şifrele"</string>
+    <string name="encrypted_summary" msgid="545623487587251207">"Şifreli"</string>
     <string name="suggested_lock_settings_title" msgid="7836065447159730217">"Telefonunuzun güvenliğini sağlayın"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"Tableti korumak için ekran kilidini ayarlayın"</string>
     <string name="suggested_lock_settings_summary" product="device" msgid="8479766049078378225">"Cihazı korumak için ekran kilidini ayarlayın"</string>
@@ -817,6 +791,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Bu PIN\'i diğer cihazda da yazmanız gerekebilir."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Bu parolayı diğer cihazda da girmeniz gerekebilir."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Şu cihazla eşlemek için:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Şu parolanın göründüğünden emin olun:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Koordine grupla eşlemeyi onaylayın"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"Kaynak:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Bu cihaz ile eşlensin mi?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> ile eşlemek için cihaz üzerinde <xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g> yazarak Return veya Enter tuşuna basın."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Kişilerime ve çağrı geçmişime erişime izin ver"</string>
@@ -850,6 +825,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Bağlanılamadı. Tekrar deneyin."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Cihaz ayrıntıları"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Cihazın Bluetooth adresi: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Cihazın Bluetooth adresi:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Cihaz unutulsun mu?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"İlişkilendirmeyi kaldır"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Uygulamanın Bağlantısı Kesilsin Mi?"</string>
@@ -881,6 +857,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Ayarları anımsa"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Maksimum sayıda bağlı Bluetooth ses cihazı"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Maksimum sayıda bağlı Bluetooth ses cihazı seç"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"NFC yığını hata ayıklama günlüğü"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"NFC yığını günlük kaydı seviyesini artırın"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Yayınlama"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"ayna"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Kablosuz görüntülemeyi etkinleştir"</string>
@@ -1188,6 +1166,8 @@
     <string name="wifi_hotspot_maximize_compatibility_dual_ap_summary" msgid="3579549223159056533">"Diğer cihazların bu hotspot\'ı bulmasına yardımcı olur. Pil kullanımını artırır."</string>
     <string name="wifi_tether_starting" msgid="8879874184033857814">"Hotspot açılıyor…"</string>
     <string name="wifi_tether_stopping" msgid="4416492968019409188">"Hotspot kapatılıyor…"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_title" msgid="3089432578433978073">"Tethering kullanılamıyor"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_content" msgid="5920421547607921112">"Ayrıntılı bilgiler için operatörünüzle iletişime geçin"</string>
     <string name="wifi_tether_enabled_subtext" msgid="5085002421099821056">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> etkin durumda"</string>
     <string name="wifi_tether_failed_subtext" msgid="437190628041885500">"Taşınabilir Kablosuz hotspot"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7072559431286459122">"Kablosuz hotspot kurulumu yap"</string>
@@ -2534,11 +2514,6 @@
     <string name="enable_service_title" msgid="7231533866953706788">"<xliff:g id="SERVICE">%1$s</xliff:g> hizmetinin cihazınızı tamamen kontrol etmesine izin veriyor musunuz?"</string>
     <string name="capabilities_list_title" msgid="1225853611983394386">"<xliff:g id="SERVICE">%1$s</xliff:g> şunları gerektiriyor:"</string>
     <string name="touch_filtered_warning" msgid="4225815157460318241">"Bir uygulama bir izin isteğinin anlaşılmasını engellediğinden, Ayarlar, yanıtınızı doğrulayamıyor."</string>
-    <string name="enable_service_encryption_warning" msgid="931082737770453755">"<xliff:g id="SERVICE">%1$s</xliff:g> hizmetini açarsanız cihazınız veri şifrelemeyi geliştirmek için ekran kilidinizi kullanmaz."</string>
-    <string name="secure_lock_encryption_warning" msgid="669152607190123579">"Bir erişilebilirlik hizmetini açtığınız için cihazınız veri şifrelemeyi geliştirmek üzere ekran kilidinizi kullanmayacak."</string>
-    <string name="enable_service_pattern_reason" msgid="6832846117817938536">"<xliff:g id="SERVICE">%1$s</xliff:g> hizmetini etkinleştirmek veri şifrelemesini etkileyeceğinden deseninizi doğrulamanız gerekmektedir."</string>
-    <string name="enable_service_pin_reason" msgid="6040417014360237703">"<xliff:g id="SERVICE">%1$s</xliff:g> hizmetini etkinleştirmek veri şifrelemesini etkileyeceğinden PIN\'inizi doğrulamanız gerekmektedir."</string>
-    <string name="enable_service_password_reason" msgid="6962544350351734238">"<xliff:g id="SERVICE">%1$s</xliff:g> hizmetini etkinleştirmek veri şifrelemesini etkileyeceğinden şifrenizi doğrulamanız gerekmektedir."</string>
     <string name="accessibility_service_warning" msgid="6779187188736432618">"<xliff:g id="SERVICE">%1$s</xliff:g>, bu cihazın tam kontrolünü istiyor. Hizmet, ekranı okuyabilir ve erişilebilirlik gereksinimleri olan kullanıcıların adına hareket edebilir. Bu kontrol düzeyi, çoğu uygulama için uygun değildir."</string>
     <string name="accessibility_service_warning_description" msgid="6573203795976134751">"Erişebilirlik ihtiyaçlarınıza yardımcı olan uygulamalara tam kontrol verilmesi uygundur ancak diğer pek çok uygulama için uygun değildir."</string>
     <string name="accessibility_service_screen_control_title" msgid="324795030658109870">"Ekranı görüntüleme ve kontrol etme"</string>
@@ -3103,14 +3078,6 @@
     <string name="remove_account_failed" msgid="3709502163548900644">"Yöneticiniz bu değişikliğe izin vermiyor"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"El ile senkronize edilemez"</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"Bu öğe için senkronizasyon şu anda devre dışı bırakılmış durumdadır. Bu ayarı değiştirmek için geçici olarak arka plan verilerini ve otomatik senkronizasyonu açın."</string>
-    <string name="enter_password" msgid="6327051330258595331">"Android\'i başlatmak için şifrenizi girin"</string>
-    <string name="enter_pin" msgid="1029287617551232681">"Android\'i başlatmak için PIN\'inizi girin"</string>
-    <string name="enter_pattern" msgid="1747316785866742960">"Android\'i başlatmak için deseninizi çizin"</string>
-    <string name="cryptkeeper_wrong_pattern" msgid="340747269176120242">"Yanlış Desen"</string>
-    <string name="cryptkeeper_wrong_password" msgid="7295607881887114486">"Yanlış Şifre"</string>
-    <string name="cryptkeeper_wrong_pin" msgid="2347961593970714201">"Yanlış PIN"</string>
-    <string name="checking_decryption" msgid="6111642972615688237">"Kontrol ediliyor…"</string>
-    <string name="starting_android" msgid="6694154070215356186">"Android başlatılıyor..."</string>
     <string name="delete" msgid="8330605554706263775">"Sil"</string>
     <string name="misc_files" msgid="6598066985800749585">"Çeşitli dosyalar"</string>
     <string name="misc_files_selected_count" msgid="5597802791672749532">"toplam <xliff:g id="TOTAL">%2$d</xliff:g> dosyadan <xliff:g id="NUMBER">%1$d</xliff:g> tanesi seçildi"</string>
@@ -3206,8 +3173,6 @@
     <string name="data_usage_metered_yes" msgid="4262598072030135223">"Sayaçlı"</string>
     <string name="data_usage_metered_no" msgid="1685828958417926268">"Sınırsız"</string>
     <string name="data_usage_disclaimer" msgid="3271450299386176770">"Operatörünüzün veri hesaplaması, cihazınızınkinden farklı olabilir."</string>
-    <string name="cryptkeeper_emergency_call" msgid="8369322820475703306">"Acil durum araması"</string>
-    <string name="cryptkeeper_return_to_call" msgid="3857250752781151232">"Çağrıya dön"</string>
     <string name="vpn_name" msgid="3806456074909253262">"Ad"</string>
     <string name="vpn_type" msgid="5533202873260826663">"Tür"</string>
     <string name="vpn_server" msgid="2908816134941973935">"Sunucu adresi"</string>
@@ -3520,7 +3485,7 @@
     <string name="account_dashboard_title" msgid="8228773251948253914">"Şifreler ve hesaplar"</string>
     <string name="account_dashboard_default_summary" msgid="1730719656099599488">"Kayıtlı şifreler, otomatik doldurma, senkronize edilen hesaplar"</string>
     <string name="app_default_dashboard_title" msgid="4071015747629103216">"Varsayılan uygulamalar"</string>
-    <string name="system_dashboard_summary" msgid="7400745270362833832">"Diller, hareketler, saat, yedek"</string>
+    <string name="system_dashboard_summary" msgid="7400745270362833832">"Diller, hareketler, saat, yedekleme"</string>
     <string name="search_results_title" msgid="3360639917793022533">"Ayarlar"</string>
     <string name="keywords_wifi" msgid="8156528242318351490">"kablosuz, ağ bağlantısı, internet, kablosuz bağlantı, veri"</string>
     <string name="keywords_wifi_notify_open_networks" msgid="6580896556389306636">"Kablosuz ağ bildirimi, kablosuz bağlantı bildirimi"</string>
@@ -4764,8 +4729,6 @@
       <item quantity="one">1 uygulama sınırsız veri kullanabilir</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"Daha fazla göster"</string>
-    <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"Kullanıcı verilerinin silinmesini ve dosya şifrelemesine dönüştürülmesini gerçekten istiyor musunuz?"</string>
-    <string name="button_confirm_convert_fbe" msgid="339648921918438106">"Sil ve dönüştür"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"ShortcutManager hız sınırlamasını sıfırla"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"ShortcutManager hız sınırlaması sıfırlandı"</string>
     <string name="notification_suggestion_title" msgid="6309263655965785411">"Kilit ekranınızdaki bilgileri kontrol edin"</string>
@@ -5292,6 +5255,7 @@
     <string name="sim_action_yes" msgid="8076556020131395515">"Evet"</string>
     <string name="sim_action_reboot" msgid="3508948833333441538">"Yeniden başlat"</string>
     <string name="sim_action_no_thanks" msgid="435717748384544195">"Hayır, teşekkürler"</string>
+    <string name="sim_action_cancel" msgid="2668099867029610910">"İptal"</string>
     <string name="sim_switch_button" msgid="1405772571706095387">"Geç"</string>
     <string name="dsds_activation_failure_title" msgid="4467364110584914794">"SIM etkinleştirilemiyor"</string>
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"SIM\'i çıkarıp tekrar yerleştirmeyi deneyin. Sorun devam ederse cihazınızı yeniden başlatın."</string>
@@ -5444,6 +5408,10 @@
     <string name="cached_apps_freezer" msgid="1057519579761550350">"Önbelleğe alınan uygulamalarda yürütmeyi askıya al"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"Ayarların üzerinde ekran yer paylaşımına izin ver"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Diğer uygulamaların üzerinde görüntülenebilecek uygulamaların Ayarlar ekranlarıyla yer paylaşımlı olarak gösterilmesine izin verir"</string>
+    <!-- no translation found for allow_mock_modem (3832264806530479214) -->
+    <skip />
+    <!-- no translation found for allow_mock_modem_summary (9097416612748005374) -->
+    <skip />
     <string name="media_controls_title" msgid="403271085636252597">"Medya"</string>
     <string name="media_controls_resume_title" msgid="855076860336652370">"Medya oynatıcıyı sabitle"</string>
     <string name="media_controls_resume_description" msgid="3163482266454802097">"Medya oynatıcı, oynatmayı hızlıca devam ettirmek için Hızlı Ayarlar\'da açık kalır"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index d63be1d..be21b3c 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -144,10 +144,11 @@
     <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"Дозвольте пристрою обмінюватися даними з пристроями Bluetooth поруч"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"Дозвольте телефону обмінюватися даними з пристроями Bluetooth поруч"</string>
     <string name="bluetooth_disable_a2dp_hw_offload" msgid="5942913792817797541">"Вимкнути розвантаження Bluetooth A2DP"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="8610420176339657720">"Перезапустити?"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8333029144800835996">"Щоб змінити це налаштування, перезапустіть пристрій."</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="3488695418187553566">"Перезапустити"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="4930826928585464191">"Скасувати"</string>
+    <string name="bluetooth_disable_le_audio_hw_offload" msgid="3966022676505972908">"Вимкнути розвантаження Bluetooth LE AUDIO"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_title" msgid="6001142380445276918">"Перезапустити?"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_message" msgid="1524373895333698779">"Щоб змінити це налаштування, перезапустіть пристрій."</string>
+    <string name="bluetooth_disable_hw_offload_dialog_confirm" msgid="5594859658551707592">"Перезапустити"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel" msgid="3663690305043973720">"Скасувати"</string>
     <string name="connected_device_media_device_title" msgid="3783388247594566734">"Носії"</string>
     <string name="connected_device_call_device_title" msgid="88732390601723608">"Пристрої для дзвінків"</string>
     <string name="connected_device_other_device_title" msgid="4652120430615729193">"Інші пристрої"</string>
@@ -315,9 +316,9 @@
     <string name="security_settings_title" msgid="6710768415432791970">"Безпека"</string>
     <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"Шифрування й облікові дані"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"Телефон зашифровано"</string>
-    <string name="decryption_settings_summary" product="default" msgid="1742645256103613503">"Телефон не зашифровано"</string>
+    <string name="not_encrypted_summary" product="default" msgid="2251945842585788254">"Телефон не зашифровано"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"Пристрій зашифровано"</string>
-    <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"Пристрій не зашифровано"</string>
+    <string name="not_encrypted_summary" product="tablet" msgid="2374263654698719382">"Пристрій не зашифровано"</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"Заблокований екран"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"Що показувати"</string>
     <string name="security_settings_summary" msgid="1627059516127354233">"Устан. Моє місцезн., розблок. екрана, блок. SIM-карти, сховища обл. даних"</string>
@@ -576,37 +577,10 @@
     <string name="fingerprint_last_delete_message" msgid="7860374760549404410">"Ви не зможете розблоковувати телефон або підтверджувати особу в додатках за допомогою відбитка пальця."</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="4104208067277655068">"Ви не зможете розблоковувати робочий профіль, дозволяти покупки та заходити в робочі додатки за допомогою відбитка пальця."</string>
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"Так, видалити"</string>
-    <string name="crypt_keeper_settings_title" msgid="4938812137822100044">"Шифрування"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"Шифрувати пристрій"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"Шифрувати телефон"</string>
-    <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"Зашифровано"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"Ви можете шифрувати свої облікові записи, налаштування, завантажені додатки та їх дані, медіа-файли й інші файли. Якщо ви встановили блокування екрана (тобто ключ, числовий PIN-код або пароль) і зашифрували планшет, для його розшифрування потрібно буде розблоковувати екран під час кожного ввімкнення планшета. Розшифрувати планшет також можна шляхом відновлення заводських налаштувань, але в такому випадку буде стерто всі дані.\n\nШифрування триває не менше години. Перш ніж почати шифрування, переконайтеся, що акумулятор заряджено. Не можна відключати планшет до завершення процесу. Якщо перервати шифрування, буде втрачено деякі або всі дані."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"Ви можете шифрувати свої облікові записи, налаштування, завантажені додатки та їх дані, медіа-файли й інші файли. Якщо ви встановили блокування екрана (тобто ключ, числовий PIN-код або пароль) і зашифрували телефон, для його розшифрування потрібно буде розблоковувати екран під час кожного ввімкнення телефона. Розшифрувати телефон також можна шляхом відновлення заводських налаштувань, але в такому випадку буде стерто всі дані.\n\nШифрування триває не менше години. Перш ніж почати шифрування, переконайтеся, що акумулятор заряджено. Не можна відключати телефон до завершення процесу. Якщо перервати шифрування, буде втрачено деякі або всі дані."</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"Шифрувати пристрій"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"Шифрувати телефон"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"Зарядіть акумулятор і повторіть спробу."</string>
-    <string name="crypt_keeper_unplugged_text" msgid="2709721134148651329">"Підключіть зарядний пристрій і повторіть спробу."</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="1847280235529858357">"Потрібно ввести PIN-код або пароль для блокування екрана"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="7210616262954236042">"Щоб почати шифрування, потрібно встановити PIN-код або пароль для блокування екрана."</string>
-    <string name="crypt_keeper_confirm_title" msgid="8600000209722452230">"Зашифрувати?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="3270587498436152259">"Якщо перервати шифрування, ви втратите дані. Шифрування триває не менше години. Ваш планшет перезавантажиться кілька разів."</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="3040428543349852419">"Якщо перервати шифрування, ви втратите дані. Шифрування триває не менше години. Ваш телефон перезавантажиться кілька разів."</string>
-    <string name="crypt_keeper_setup_title" msgid="3339725741305796680">"Шифрування"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="4417016995091289019">"Зачекайте, поки ваш планшетний ПК зашифрується. Виконано: <xliff:g id="PERCENT">^1</xliff:g>%."</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="7902355422499500352">"Зачекайте, поки ваш телефон зашифрується. Виконано <xliff:g id="PERCENT">^1</xliff:g>%."</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="8348188415839917821">"Зачекайте, поки ваш планшет буде зашифровано. Залишилося часу: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="8556105766597855198">"Зачекайте, поки ваш телефон буде зашифровано. Залишилося часу: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="3832496715430327682">"Щоб розблокувати планшет, вимкніть його, а потім знову ввімкніть."</string>
-    <string name="crypt_keeper_force_power_cycle" product="default" msgid="5070346039522135361">"Щоб розблокувати телефон, вимкніть його, а потім знову ввімкніть."</string>
-    <string name="crypt_keeper_warn_wipe" msgid="8104921337301750394">"Застереження. Після кількох невдалих спроб (<xliff:g id="COUNT">^1</xliff:g>) розблокувати пристрій із нього буде стерто всі дані."</string>
-    <string name="crypt_keeper_enter_password" msgid="1274917431075529732">"Введіть пароль"</string>
-    <string name="crypt_keeper_failed_title" msgid="8173654570682244149">"Шифрування не виконано"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"Шифрування перервано, його неможливо закінчити. Як наслідок, дані на планшетному ПК більше не доступні. \n\nЩоб знову користуватися планшетним ПК, потрібно відновити заводські налаштування. Налаштовуючи планшетний ПК після відновлення, ви матимете можливість відновити будь-які дані, резервні копії яких було збережено у вашому обліковому записі Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"Шифрування перервано, його неможливо закінчити. Як наслідок, дані на телефоні більше не доступні. \n\nЩоб знову користуватися телефоном, потрібно відновити заводські налаштування. Налаштовуючи телефон після відновлення, ви матимете можливість відновити будь-які дані, резервні копії яких було збережено у вашому обліковому записі Google."</string>
-    <string name="crypt_keeper_data_corrupt_title" msgid="5920153462176846037">"Помилка дешифрування"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"Ви ввели правильний пароль, але ваші дані пошкоджено. \n\nЩоб знову користуватися планшетом, відновіть заводські налаштування. Після цього ви зможете відновити на планшеті всі дані, які зберігаються у вашому обліковому записі Google."</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"Ви ввели правильний пароль, але ваші дані пошкоджено. \n\nЩоб знову користуватися телефоном, відновіть заводські налаштування. Після цього ви зможете відновити на телефоні всі дані, які зберігаються у вашому обліковому записі Google."</string>
-    <string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"Переключити метод введення"</string>
+    <string name="encryption_settings_title" msgid="2848716008695618360">"Шифрування"</string>
+    <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"Шифрувати планшет"</string>
+    <string name="encrypt_title" product="default" msgid="7337365190988321100">"Шифрувати телефон"</string>
+    <string name="encrypted_summary" msgid="545623487587251207">"Зашифровано"</string>
     <string name="suggested_lock_settings_title" msgid="7836065447159730217">"Захистіть телефон"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"Налаштуйте блокування екрана, щоб захистити планшет"</string>
     <string name="suggested_lock_settings_summary" product="device" msgid="8479766049078378225">"Налаштуйте блокування екрана, щоб захистити пристрій"</string>
@@ -851,6 +825,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Також потрібно ввести цей PIN-код на іншому пристрої."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Також потрібно ввести цей ключ доступу на іншому пристрої."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Щоб створити пару з пристроєм:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Переконайтеся, що відображається цей ключ доступу:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Підтвердьте, щоб підключатися до набору узгоджених пристроїв"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"Від пристрою:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Створити пару з цим пристроєм?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Щоб створити пару з пристроєм: <xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> Введіть на ньому: <xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, а потім натисніть \"Повернутися\" або \"Ввійти\"."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Дозволити доступ до контактів та історії викликів"</string>
@@ -884,6 +859,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Не вдалося під’єднатися. Повторіть спробу."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Про пристрій"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Адреса Bluetooth пристрою: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Адреса Bluetooth пристрою:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Забути пристрій?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Вилучити зв’язок"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Від’єднати додаток?"</string>
@@ -915,6 +891,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Запам\'ятати налашт."</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Максимальна кількість підключених аудіопристроїв Bluetooth"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Вибрати максимальну кількість підключених аудіопристроїв Bluetooth"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"Журнал налагодження стеку NFC"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Підвищити рівень реєстрації в журналі стеку NFC"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Трансляція"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"дзеркалювання"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Увімкнути бездротовий екран"</string>
@@ -1228,6 +1206,8 @@
     <string name="wifi_hotspot_maximize_compatibility_dual_ap_summary" msgid="3579549223159056533">"Допомагає іншим пристроям знаходити цю точку доступу. Підвищує використання заряду акумулятора."</string>
     <string name="wifi_tether_starting" msgid="8879874184033857814">"Увімкнення точки доступу…"</string>
     <string name="wifi_tether_stopping" msgid="4416492968019409188">"Вимкнення точки доступу…"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_title" msgid="3089432578433978073">"Використання телефона як модема недоступне"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_content" msgid="5920421547607921112">"Щоб дізнатися більше, зверніться до свого оператора мобільного зв’язку"</string>
     <string name="wifi_tether_enabled_subtext" msgid="5085002421099821056">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> активовано"</string>
     <string name="wifi_tether_failed_subtext" msgid="437190628041885500">"Помилка портативної точки доступу Wi‑Fi"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7072559431286459122">"Налаштувати точку доступу Wi‑Fi"</string>
@@ -2592,11 +2572,6 @@
     <string name="enable_service_title" msgid="7231533866953706788">"Надати сервісу <xliff:g id="SERVICE">%1$s</xliff:g> повний доступ до вашого пристрою?"</string>
     <string name="capabilities_list_title" msgid="1225853611983394386">"Службі <xliff:g id="SERVICE">%1$s</xliff:g> потрібно:"</string>
     <string name="touch_filtered_warning" msgid="4225815157460318241">"Вашу відповідь не видно в Налаштуваннях, оскільки інший додаток загороджує запит на дозвіл."</string>
-    <string name="enable_service_encryption_warning" msgid="931082737770453755">"Якщо ви ввімкнете службу <xliff:g id="SERVICE">%1$s</xliff:g>, дані на пристрої не захищатимуться екраном блокування."</string>
-    <string name="secure_lock_encryption_warning" msgid="669152607190123579">"Оскільки ви ввімкнули службу доступності, дані на пристрої не захищатимуться екраном блокування."</string>
-    <string name="enable_service_pattern_reason" msgid="6832846117817938536">"Оскільки ввімкнення служби <xliff:g id="SERVICE">%1$s</xliff:g> впливає на шифрування даних, потрібно підтвердити ключ."</string>
-    <string name="enable_service_pin_reason" msgid="6040417014360237703">"Оскільки ввімкнення служби <xliff:g id="SERVICE">%1$s</xliff:g> впливає на шифрування даних, потрібно підтвердити PIN-код."</string>
-    <string name="enable_service_password_reason" msgid="6962544350351734238">"Оскільки ввімкнення служби <xliff:g id="SERVICE">%1$s</xliff:g> впливає на шифрування даних, потрібно підтвердити пароль."</string>
     <string name="accessibility_service_warning" msgid="6779187188736432618">"Сервіс <xliff:g id="SERVICE">%1$s</xliff:g> просить повний доступ до цього пристрою. Він може переглядати вміст на екрані й виконувати дії від імені користувачів з особливими потребами. Такий рівень доступу не призначений для більшості додатків."</string>
     <string name="accessibility_service_warning_description" msgid="6573203795976134751">"Повний доступ доречний для додатків, які надають спеціальні можливості, але його не варто відкривати для більшості інших додатків."</string>
     <string name="accessibility_service_screen_control_title" msgid="324795030658109870">"Перегляд і контроль екрана"</string>
@@ -3183,14 +3158,6 @@
     <string name="remove_account_failed" msgid="3709502163548900644">"Ця дія заборонена адміністратором"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"Неможливо синхронізувати вручну"</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"Синхронізацію для цього елемента зараз вимкнено. Щоб змінити це налаштування, тимчасово ввімкніть фонові дані й автоматичну синхронізацію."</string>
-    <string name="enter_password" msgid="6327051330258595331">"Введіть пароль, щоб запустити пристрій Android"</string>
-    <string name="enter_pin" msgid="1029287617551232681">"Введіть PIN-код, щоб запустити пристрій Android"</string>
-    <string name="enter_pattern" msgid="1747316785866742960">"Намалюйте ключ, щоб запустити пристрій Android"</string>
-    <string name="cryptkeeper_wrong_pattern" msgid="340747269176120242">"Неправильний ключ"</string>
-    <string name="cryptkeeper_wrong_password" msgid="7295607881887114486">"Неправильний пароль"</string>
-    <string name="cryptkeeper_wrong_pin" msgid="2347961593970714201">"Неправильний PIN-код"</string>
-    <string name="checking_decryption" msgid="6111642972615688237">"Перевірка…"</string>
-    <string name="starting_android" msgid="6694154070215356186">"Запуск Android…"</string>
     <string name="delete" msgid="8330605554706263775">"Видалити"</string>
     <string name="misc_files" msgid="6598066985800749585">"Різні файли"</string>
     <string name="misc_files_selected_count" msgid="5597802791672749532">"вибрано <xliff:g id="NUMBER">%1$d</xliff:g> з <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -3286,8 +3253,6 @@
     <string name="data_usage_metered_yes" msgid="4262598072030135223">"З тарифікацією трафіку"</string>
     <string name="data_usage_metered_no" msgid="1685828958417926268">"Без тарифікації трафіку"</string>
     <string name="data_usage_disclaimer" msgid="3271450299386176770">"Ваш оператор може по-іншому вимірювати статистику використання даних."</string>
-    <string name="cryptkeeper_emergency_call" msgid="8369322820475703306">"Аварійний виклик"</string>
-    <string name="cryptkeeper_return_to_call" msgid="3857250752781151232">"Повернутися до дзвінка"</string>
     <string name="vpn_name" msgid="3806456074909253262">"Назва"</string>
     <string name="vpn_type" msgid="5533202873260826663">"Тип"</string>
     <string name="vpn_server" msgid="2908816134941973935">"Адреса сервера"</string>
@@ -4914,8 +4879,6 @@
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> додатка з необмеженим доступом до даних</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"Показати більше"</string>
-    <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"Стерти дані користувача та конвертувати в зашифрований файл?"</string>
-    <string name="button_confirm_convert_fbe" msgid="339648921918438106">"Стерти та конвертувати"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"Скинути обмеження швидкості в ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"Обмеження швидкості в ShortcutManager скинуто"</string>
     <string name="notification_suggestion_title" msgid="6309263655965785411">"Керуйте інформацією на заблокованому екрані"</string>
@@ -5466,6 +5429,7 @@
     <string name="sim_action_yes" msgid="8076556020131395515">"Так"</string>
     <string name="sim_action_reboot" msgid="3508948833333441538">"Перезапустити"</string>
     <string name="sim_action_no_thanks" msgid="435717748384544195">"Ні, дякую"</string>
+    <string name="sim_action_cancel" msgid="2668099867029610910">"Скасувати"</string>
     <string name="sim_switch_button" msgid="1405772571706095387">"Вибрати"</string>
     <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Не вдається активувати SIM-карту"</string>
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Вийміть SIM-карту та вставте її знову. Якщо проблема не зникне, перезапустіть пристрій."</string>
@@ -5622,6 +5586,10 @@
     <string name="cached_apps_freezer" msgid="1057519579761550350">"Призупинити кешовані додатки"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"Дозволити показ поверх інших вікон у налаштуваннях"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Дозволити додаткам, що можуть показуватися поверх інших додатків, накладатися на екрани налаштувань"</string>
+    <!-- no translation found for allow_mock_modem (3832264806530479214) -->
+    <skip />
+    <!-- no translation found for allow_mock_modem_summary (9097416612748005374) -->
+    <skip />
     <string name="media_controls_title" msgid="403271085636252597">"Медіа"</string>
     <string name="media_controls_resume_title" msgid="855076860336652370">"Закріпити медіапрогравач"</string>
     <string name="media_controls_resume_description" msgid="3163482266454802097">"Щоб швидко відновлювати відтворення, медіапрогравач залишається відкритим у швидких налаштуваннях"</string>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index d50bbd8..a5fc440 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -142,10 +142,11 @@
     <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"اپنے آلہ کو قریبی بلوٹوتھ آلات سے مواصلت کرنے کی اجازت دیں"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"اپنے فون کو قریبی بلوٹوتھ آلات سے مواصلت کرنے کی اجازت دیں"</string>
     <string name="bluetooth_disable_a2dp_hw_offload" msgid="5942913792817797541">"‏Bluetooth A2DP ہارڈ ویئر آف لوڈ بند کریں"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="8610420176339657720">"آلہ ریسٹارٹ کریں؟"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8333029144800835996">"یہ ترتیب تبدیل کرنے کیلئے آپ کو اپنا آلہ ریسٹارٹ کرنا ہوگا۔"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="3488695418187553566">"ری سٹارٹ"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="4930826928585464191">"منسوخ کریں"</string>
+    <string name="bluetooth_disable_le_audio_hw_offload" msgid="3966022676505972908">"‏بلوٹوتھ LE AUDIO ہارڈویئر آف لوڈ کو غیر فعال کریں"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_title" msgid="6001142380445276918">"آلہ ری سٹارٹ کریں؟"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_message" msgid="1524373895333698779">"یہ ترتیب تبدیل کرنے کیلئے آپ کو اپنا آلہ ری سٹارٹ کرنا ہوگا۔"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_confirm" msgid="5594859658551707592">"ری سٹارٹ کریں"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel" msgid="3663690305043973720">"منسوخ کریں"</string>
     <string name="connected_device_media_device_title" msgid="3783388247594566734">"میڈیا آلات"</string>
     <string name="connected_device_call_device_title" msgid="88732390601723608">"کال آلات"</string>
     <string name="connected_device_other_device_title" msgid="4652120430615729193">"دیگر آلات"</string>
@@ -309,9 +310,9 @@
     <string name="security_settings_title" msgid="6710768415432791970">"سیکیورٹی"</string>
     <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"مرموز کاری اور اسناد"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"فون مرموز کیا گيا"</string>
-    <string name="decryption_settings_summary" product="default" msgid="1742645256103613503">"فون مرموز کردہ نہیں ہے"</string>
+    <string name="not_encrypted_summary" product="default" msgid="2251945842585788254">"فون مرموز کردہ نہیں ہے"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"آلہ کی مرموز کاری ہو گئی"</string>
-    <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"آلہ مرموز کردہ نہیں ہے"</string>
+    <string name="not_encrypted_summary" product="tablet" msgid="2374263654698719382">"آلہ مرموز کردہ نہیں ہے"</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"مقفل اسکرین"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"کیا دکھانا ہے"</string>
     <string name="security_settings_summary" msgid="1627059516127354233">"‏میرا مقام، اسکرین اَن لاک، SIM کارڈ لاک، اسناد کے اسٹوریج کا لاک سیٹ کریں"</string>
@@ -568,37 +569,10 @@
     <string name="fingerprint_last_delete_message" msgid="7860374760549404410">"اپنا فون غیر مقفل کرنے یا ایپس میں اپنی توثیق کرنے کے لیے اپنے فنگر پرنٹ کا استعمال نہیں کر پائیں گے۔"</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="4104208067277655068">"آپ اپنی دفتری پروفائل کو غیر مقفل کرنے، خریداریوں کی اجازت دینے یا ورک ایپس میں سائن ان کرنے کے لیے اپنے فنگر پرنٹ کا استعمال نہیں کر پائیں گے۔"</string>
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"جی ہاں، ہٹائیں"</string>
-    <string name="crypt_keeper_settings_title" msgid="4938812137822100044">"مرموز کاری"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"ٹیبلٹ کی مرموز کاری کریں"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"فون کی مرموز کاری کریں"</string>
-    <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"مرموز کاری کردہ"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"‏آپ اپنے اکاؤنٹس، ترتیبات، ڈاؤن لوڈ کردہ ایپس اور ان کا ڈیٹا، میڈیا اور دوسری فائلیں مرموز کر سکتے ہیں۔ اپنا ٹیبلیٹ مرموز کر لینے کے بعد، یہ فرض کرتے ہوئے کہ آپ نے ایک اسکرین لاک (یعنی پیٹرن یا عددی PIN یا پاس ورڈ) سیٹ کرلیا ہے، آپ کو ہر دفعہ ٹیبلیٹ کا پاور آن کرنے پر اسے غیر موموز کرنے کیلئے اسکرین کو غیر مقفل کرنا ہوگا۔ غیر مرموز کرنے کا دوسرا واحد طریقہ یہ ہے کہ اپنے سبھی ڈیٹا کو حذف کرتے ہوئے فیکٹری ڈیٹا ری سیٹ کو انجام دیا جائے۔\n\nمرموز کرنے میں ایک گھنٹہ یا زیادہ وقت لگتا ہے۔ آپ کو ایک چارج شدہ بیٹری سے شروعات کرنی ہوگی اور اس پوری کارروائی کے دوران اپنے ٹیبلیٹ کو پلگ ان رکھیں۔ اگر آپ اس میں خلل ڈالتے ہیں تو آپ اپنے کچھ یا سبھی ڈیٹا سے محروم ہو جائیں گے۔"</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"‏آپ اپنے اکاؤنٹس، ترتیبات، ڈاؤن لوڈ کردہ ایپس اور ان کا ڈیٹا، میڈیا اور دوسری فائلیں مرموز کر سکتے ہیں۔ اپنا فون مرموز کر لینے کے بعد، یہ فرض کرتے ہوئے کہ آپ نے ایک اسکرین لاک (یعنی پیٹرن یا عددی PIN یا پاس ورڈ) سیٹ کرلیا ہے، آپ کو ہر دفعہ فون کا پاور آن کرنے پر اسے غیر موموز کرنے کیلئے اسکرین کو غیر مقفل کرنا ہوگا۔ غیر مرموز کرنے کا دوسرا واحد طریقہ یہ ہے کہ اپنے سبھی ڈیٹا کو حذف کرتے ہوئے فیکٹری ڈیٹا ری سیٹ کو انجام دیا جائے۔\n\nمرموز کرنے میں ایک گھنٹہ یا زیادہ وقت لگتا ہے۔ آپ کو ایک چارج شدہ بیٹری سے شروعات کرنی ہوگی اور اس پوری کارروائی کے دوران اپنے فون کو پلگ ان رکھیں۔ اگر آپ اس میں خلل ڈالتے ہیں تو آپ اپنے کچھ یا سبھی ڈیٹا سے محروم ہو جائیں گے۔"</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"ٹیبلٹ کی مرموز کاری کریں"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"فون کی مرموز کاری کریں"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"اپنی بیٹری چارج کریں اور دوبارہ کوشش کریں۔"</string>
-    <string name="crypt_keeper_unplugged_text" msgid="2709721134148651329">"اپنا چارجر لگائیں اور دوبارہ کوشش کریں۔"</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="1847280235529858357">"‏کوئی لاک اسکرین PIN یا پاس ورڈ نہیں ہے"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="7210616262954236042">"‏اس سے پہلے کہ آپ مرموز کاری شروع کر سکیں آپ کو اسکرین مقفل کرنے کا ایک PIN یا پاس ورڈ سیٹ کرنا ہوتا ہے۔"</string>
-    <string name="crypt_keeper_confirm_title" msgid="8600000209722452230">"مرموز کریں؟"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="3270587498436152259">"مرموز کاری کا عمل ناقابل واپسی ہے اور اگر آپ اس میں خلل ڈالتے ہیں تو آپ ڈیٹا سے محروم ہوجائیں گے۔ مرموز کاری میں ایک گھنٹہ یا زیادہ وقت لگتا ہے، جس کے دوران فون کئی بار ری سٹارٹ ہوگا۔"</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="3040428543349852419">"مرموز کاری کا عمل ناقابل واپسی ہے اور اگر آپ اس میں خلل ڈالتے ہیں تو آپ ڈیٹا سے محروم ہوجائیں گے۔ مرموز کاری میں ایک گھنٹہ یا زیادہ وقت لگتا ہے، جس کے دوران فون کئی بار ری سٹارٹ ہوگا۔"</string>
-    <string name="crypt_keeper_setup_title" msgid="3339725741305796680">"مرموز کاری ہو رہی ہے"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="4417016995091289019">"اپنے ٹیبلٹ کی مرموز کاری کے وقت انتظار کریں۔<xliff:g id="PERCENT">^1</xliff:g>% مکمل۔"</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="7902355422499500352">"اپنے فون کی مرموز کاری کے وقت انتظار کریں۔ <xliff:g id="PERCENT">^1</xliff:g>% مکمل۔"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="8348188415839917821">"اپنے ٹیبلیٹ کی مرموز کاری کے وقت انتظار کریں۔ باقی وقت: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="8556105766597855198">"اپنے فون کی مرموز کاری کے وقت انتظار کریں۔ باقی وقت: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="3832496715430327682">"اپنا ٹیبلیٹ غیر مقفل کرنے کیلئے، اسے آف اور پھر آن کریں۔"</string>
-    <string name="crypt_keeper_force_power_cycle" product="default" msgid="5070346039522135361">"اپنا فون غیر مقفل کرنے کیلئے، اسے آف اور پھر آن کریں۔"</string>
-    <string name="crypt_keeper_warn_wipe" msgid="8104921337301750394">"وارننگ: غیر مقفل کیے جانے کی <xliff:g id="COUNT">^1</xliff:g> مزید ناکام کوششوں کے بعد آپ کا آلہ صاف کر دیا جائے گا!"</string>
-    <string name="crypt_keeper_enter_password" msgid="1274917431075529732">"اپنا پاس ورڈ ٹائپ کریں"</string>
-    <string name="crypt_keeper_failed_title" msgid="8173654570682244149">"مرموز کاری ناکام ہوگئی"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"‏مرموز کاری میں خلل پیدا ہوگیا تھا اور یہ مکمل نہیں ہوسکتی ہے۔ نتیجے کے طور پر، آپ کے ٹیبلٹ پر موجود ڈیٹا مزید قابل رسائی نہیں ہے۔\n \n اپنے ٹیبلٹ کا استعمال دوبارہ شروع کرنے کیلئے، آپ کو ایک فیکٹری ری سیٹ انجام دینے کی ضرورت ہے۔ ری سیٹ کے بعد اپنا ٹیبلٹ سیٹ اپ کرنے پر، آپ کو کوئی بھی ایسا ڈیٹا بحال کرنے کا ایک موقع ملے گا جس کا بیک اپ آپ کے Google اکاؤنٹ میں لیا گیا تھا۔"</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"‏مرموز کاری میں خلل پیدا ہوگیا تھا اور یہ مکمل نہیں ہوسکتی ہے۔ نتیجے کے طور پر، آپ کے فون پر موجود ڈیٹا مزید قابل رسائی نہیں ہے۔\n\nاپنے فون کا استعمال دوبارہ شروع کرنے کیلئے، آپ کو ایک فیکٹری ری سیٹ انجام دینے کی ضرورت ہے۔ ری سیٹ کے بعد جب آپ اپنا فون سیٹ اپ کریں گے تو آپ کو کوئی بھی ایسا ڈیٹا بحال کرنے کا ایک موقع ملے گا جس کا بیک اپ آپ کے Google اکاؤنٹ میں لیا گیا تھا۔"</string>
-    <string name="crypt_keeper_data_corrupt_title" msgid="5920153462176846037">"غیر مرموزکاری ناکام ہوگئی"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"‏آپ کا درج کردہ پاس ورڈ درست ہے لیکن بدقسمتی سے آپ کا ڈیٹا خراب ہے۔ ‎\n\n‎اپنا ٹیبلٹ دوبارہ استعمال کرنا شروع کرنے کیلئے آپ کو فیکٹری ری سیٹ انجام دینے کی ضرورت ہے۔ ری سیٹ کے بعد اپنا ٹیبلٹ سیٹ اپ کر لینے پر، آپ کو کوئی بھی ایسا ڈیٹا بحال کرنے کا ایک موقع ملے گا جس کا بیک اپ آپ کے Google اکاؤنٹ میں لیا گیا تھا۔"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"‏آپ کا درج کردہ پاس ورڈ درست ہے لیکن بدقسمتی سے آپ کا ڈیٹا خراب ہے۔ ‎\n\n‎اپنا فون دوبارہ استعمال کرنا شروع کرنے کیلئے آپ کو فیکٹری ری سیٹ انجام دینے کی ضرورت ہے۔ ری سیٹ کے بعد اپنا فون سیٹ اپ کر لینے پر، آپ کو کوئی بھی ایسا ڈیٹا بحال کرنے کا ایک موقع ملے گا جس کا بیک اپ آپ کے Google اکاؤنٹ میں لیا گیا تھا۔"</string>
-    <string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"اندراج کا طریقہ سوئچ کریں"</string>
+    <string name="encryption_settings_title" msgid="2848716008695618360">"مرموز کاری"</string>
+    <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"ٹیبلیٹ کی مرموز کاری کریں"</string>
+    <string name="encrypt_title" product="default" msgid="7337365190988321100">"فون کی مرموز کاری کریں"</string>
+    <string name="encrypted_summary" msgid="545623487587251207">"مرموز کردہ"</string>
     <string name="suggested_lock_settings_title" msgid="7836065447159730217">"اپنے فون کو محفوظ بنائیں"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"ٹیبلیٹ کی حفاظت کرنے کیلئے اسکرین لاک سیٹ کریں"</string>
     <string name="suggested_lock_settings_summary" product="device" msgid="8479766049078378225">"آلہ کی حفاظت کرنے کیلئے اسکرین لاک سیٹ کریں"</string>
@@ -817,6 +791,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"‏آپ کو دوسرے آلہ پر بھی یہ PIN ٹائپ کرنے کی ضرورت پڑ سکتی ہے۔"</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"آپ کو دیگر آلہ پر بھی اس پاس کلید کو ٹائپ کرنے کی ضرورت ہو سکتی ہے۔"</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"‏اس کے ساتھ جوڑا بنانے کیلئے:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;اس بات کو یقینی بنائیں کہ یہ اس پاس کلید کو دکھا رہا ہے:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"مربوط سیٹ کے ساتھ جوڑا بنانے کی تصدیق کریں"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"‏منجانب:‎&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;‎اس آلہ کے ساتھ جوڑا بنائیں؟"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"اس کے ساتھ جوڑا بنانے کیلئے:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>اس پر ٹائپ کریں:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, پھر واپس جائیں یا انٹر کریں کو دبائیں۔"</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"اپنے رابطوں اور کال کی سرگزشت تک رسائی کی اجازت دیں"</string>
@@ -850,6 +825,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"منسلک نہیں ہو سکا۔ دوبارہ کوشش کریں۔"</string>
     <string name="device_details_title" msgid="1155622417516195481">"آلہ کی تفصیلات"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"آلے کا بلوٹوتھ پتہ: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"آلے کا بلوٹوتھ پتہ:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"آلہ بھولنا ہے؟"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"وابستگی ہٹائیں"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"ایپ کو غیر منسلک کریں؟"</string>
@@ -881,6 +857,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"ترتیبات کو یاد رکھیں"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"زیادہ سے زیادہ منسلک بلوٹوتھ آڈیو آلات"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"منسلک بلوٹوتھ آڈیو آلات کی زیادہ سے زیادہ تعداد منتخب کریں"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"‏NFC انبار ڈیبگ لاگ"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"‏NFC انبار کا لاگ ان لیول بڑھائیں"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"کاسٹ کریں"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"مرر"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"وائرلیس ڈسپلے فعال کریں"</string>
@@ -1188,6 +1166,8 @@
     <string name="wifi_hotspot_maximize_compatibility_dual_ap_summary" msgid="3579549223159056533">"دیگر آلات کی اس ہاٹ اسپاٹ کو تلاش کرنے میں مدد کرتا ہے۔ بیٹری کے استعمال میں اضافہ کرتا ہے۔"</string>
     <string name="wifi_tether_starting" msgid="8879874184033857814">"ہاٹ اسپاٹ آن ہو رہا ہے…"</string>
     <string name="wifi_tether_stopping" msgid="4416492968019409188">"ہاٹ اسپاٹ آف ہو رہا ہے…"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_title" msgid="3089432578433978073">"ٹیدرنگ دستیاب نہیں ہے"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_content" msgid="5920421547607921112">"تفاصیل کے لیے اپنے کیریئر سے رابطہ کریں"</string>
     <string name="wifi_tether_enabled_subtext" msgid="5085002421099821056">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> فعال ہے"</string>
     <string name="wifi_tether_failed_subtext" msgid="437190628041885500">"‏پورٹیبل Wi‑Fi ہاٹ اسپاٹ میں خرابی"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7072559431286459122">"‏Wi‑Fi ہاٹ اسپاٹ کو ترتیب دیں"</string>
@@ -2534,11 +2514,6 @@
     <string name="enable_service_title" msgid="7231533866953706788">"<xliff:g id="SERVICE">%1$s</xliff:g> کو آپ کے آلے کا مکمل کنٹرول حاصل کرنے کی اجازت دیں؟"</string>
     <string name="capabilities_list_title" msgid="1225853611983394386">"<xliff:g id="SERVICE">%1$s</xliff:g> کو ضرورت ہے:"</string>
     <string name="touch_filtered_warning" msgid="4225815157460318241">"چونکہ ایک ایپ اجازت کی درخواست کو مبہم کر رہی ہے، لہذا ترتیبات آپ کے جواب کی توثیق نہیں کر سکتی ہے۔"</string>
-    <string name="enable_service_encryption_warning" msgid="931082737770453755">"اگر آپ <xliff:g id="SERVICE">%1$s</xliff:g> کو آن کرتے ہیں تو آپ کا آلہ ڈیٹا کی مرموزکاری کو بڑھانے کیلئے آپ کی اسکرین کا قفل استعمال نہیں کرے گا۔"</string>
-    <string name="secure_lock_encryption_warning" msgid="669152607190123579">"چونکہ آپ نے ایکسیسبیلٹی کی ایک سروس کو آن کیا ہے لہذا آپ کا آلہ ڈیٹا کی مرموزکاری کو بڑھانے کیلئے آپ کی اسکرین کا قفل استعمال نہیں کرے گا۔"</string>
-    <string name="enable_service_pattern_reason" msgid="6832846117817938536">"کیونکہ <xliff:g id="SERVICE">%1$s</xliff:g> کو آن کرنے سے ڈیٹا کی مرموز کاری پر اثر پڑتا ہے، آپ کو اپنے پیٹرن کی توثیق کرنے کی ضرورت ہے۔"</string>
-    <string name="enable_service_pin_reason" msgid="6040417014360237703">"‏کیونکہ <xliff:g id="SERVICE">%1$s</xliff:g> کو آن کرنے سے ڈیٹا کی مرموز کاری پر اثر پڑتا ہے، آپ کو اپنے PIN کی توثیق کرنے کی ضرورت ہے۔"</string>
-    <string name="enable_service_password_reason" msgid="6962544350351734238">"کیونکہ <xliff:g id="SERVICE">%1$s</xliff:g> کو آن کرنے سے ڈیٹا کی مرموز کاری پر اثر پڑتا ہے، آپ کو اپنے پاس ورڈ کی توثیق کرنے کی ضرورت ہے۔"</string>
     <string name="accessibility_service_warning" msgid="6779187188736432618">"<xliff:g id="SERVICE">%1$s</xliff:g> نے اس آلہ پر مکمل کنٹرول کی درخواست کی ہے۔ یہ سروس اسکرین کو پڑھ سکتی ہے اور مع ایکسیسبیلٹی کی ضروریات کے صارفین کے جانب سے کارروائی کر سکتی ہے۔ زیادہ تر اپپس کے لیے اس لیول کا کنٹرول مناسب نہیں ہے۔"</string>
     <string name="accessibility_service_warning_description" msgid="6573203795976134751">"مکمل کنٹرول ان ایپس کے لیے مناسب ہے جو ایکسیسبیلٹی کی ضروریات میں آپ کی مدد کرتی ہیں، لیکن زیادہ تر ایپس کیلئے مناسب نہیں۔"</string>
     <string name="accessibility_service_screen_control_title" msgid="324795030658109870">"اسکرین کو دیکھیں اور کنٹرول کریں"</string>
@@ -3103,14 +3078,6 @@
     <string name="remove_account_failed" msgid="3709502163548900644">"آپ کے منتظم کی طرف سے اس تبدیلی کی اجازت نہیں ہے"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"دستی طور پر مطابقت پذیری نہيں کر سکتے"</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"اس آئٹم کیلئے مطابقت پذیری فی الحال غیر فعال ہے۔ اس ترتیب کو تبدیل کرنے کیلئے، عارضی طور پر پس منظر ڈیٹا اور خود کار مطابقت پذیری کو آن کریں۔"</string>
-    <string name="enter_password" msgid="6327051330258595331">"‏Android کو شروع کرنے کیلئے، اپنا پاس ورڈ درج کریں"</string>
-    <string name="enter_pin" msgid="1029287617551232681">"‏Android کو شروع کرنے کیلئے، اپنا PIN درج کریں"</string>
-    <string name="enter_pattern" msgid="1747316785866742960">"‏Android کو شروع کرنے کیلئے، اپنا پیٹرن ڈرا کریں"</string>
-    <string name="cryptkeeper_wrong_pattern" msgid="340747269176120242">"غلط پیٹرن"</string>
-    <string name="cryptkeeper_wrong_password" msgid="7295607881887114486">"غلط پاس ورڈ"</string>
-    <string name="cryptkeeper_wrong_pin" msgid="2347961593970714201">"‏غلط PIN"</string>
-    <string name="checking_decryption" msgid="6111642972615688237">"چیک کیا جا رہا ہے…"</string>
-    <string name="starting_android" msgid="6694154070215356186">"‏Android شروع کیا جا رہا ہے…"</string>
     <string name="delete" msgid="8330605554706263775">"حذف کریں"</string>
     <string name="misc_files" msgid="6598066985800749585">"متفرق فائلیں"</string>
     <string name="misc_files_selected_count" msgid="5597802791672749532">"<xliff:g id="NUMBER">%1$d</xliff:g> از <xliff:g id="TOTAL">%2$d</xliff:g> کو منتخب کیا گیا"</string>
@@ -3206,8 +3173,6 @@
     <string name="data_usage_metered_yes" msgid="4262598072030135223">"میٹرڈ ہے"</string>
     <string name="data_usage_metered_no" msgid="1685828958417926268">"میٹرڈ نہیں ہے"</string>
     <string name="data_usage_disclaimer" msgid="3271450299386176770">"کیریئر ڈیٹا کا حساب آپ کے آلہ سے مختلف ہو سکتا ہے۔"</string>
-    <string name="cryptkeeper_emergency_call" msgid="8369322820475703306">"ہنگامی کال"</string>
-    <string name="cryptkeeper_return_to_call" msgid="3857250752781151232">"کال پر واپس جائیں"</string>
     <string name="vpn_name" msgid="3806456074909253262">"نام"</string>
     <string name="vpn_type" msgid="5533202873260826663">"قسم"</string>
     <string name="vpn_server" msgid="2908816134941973935">"سرور کا پتہ"</string>
@@ -4764,8 +4729,6 @@
       <item quantity="one">1 ایپ غیر محدود ڈیٹا کا استعمال کر سکتی ہے</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"مزید دیکھیں"</string>
-    <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"صارف کا ڈیٹا واقعی صاف کریں اور فائل مرموز کاری میں بدلیں؟"</string>
-    <string name="button_confirm_convert_fbe" msgid="339648921918438106">"صاف کریں اور بدلیں"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"‏ShortcutManager کی شرح محدود بندی ری سیٹ کریں"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"‏ShortcutManager کی شرح محدود بندی ری سیٹ ہو گئی"</string>
     <string name="notification_suggestion_title" msgid="6309263655965785411">"مقفل اسکرین پر معلومات کنٹرول کریں"</string>
@@ -5292,6 +5255,7 @@
     <string name="sim_action_yes" msgid="8076556020131395515">"ہاں"</string>
     <string name="sim_action_reboot" msgid="3508948833333441538">"ری سٹارٹ کریں"</string>
     <string name="sim_action_no_thanks" msgid="435717748384544195">"نہیں شکریہ"</string>
+    <string name="sim_action_cancel" msgid="2668099867029610910">"منسوخ کریں"</string>
     <string name="sim_switch_button" msgid="1405772571706095387">"سوئچ کریں"</string>
     <string name="dsds_activation_failure_title" msgid="4467364110584914794">"‏SIM کو فعال نہیں کیا جا سکتا"</string>
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"‏SIM نکال کر دوبارہ داخل کریں۔ مسئلے کے برقرار رہنے پر اپنا آلہ ری اسٹارٹ کریں۔"</string>
@@ -5444,6 +5408,10 @@
     <string name="cached_apps_freezer" msgid="1057519579761550350">"کیشڈ ایپس کے ليے ایگزیکیوشن معطل کریں"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"ترتیبات پر اسکرین اوورلیز کو اجازت دیتا ہے"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"ایسی ایپس کو اجازت دیں جو ترتیبات کی اسکرینز کو ایک دوسرے پر چڑھانے کے لیے دوسرے ایپس پر ڈسپلے کر سکتی ہیں"</string>
+    <!-- no translation found for allow_mock_modem (3832264806530479214) -->
+    <skip />
+    <!-- no translation found for allow_mock_modem_summary (9097416612748005374) -->
+    <skip />
     <string name="media_controls_title" msgid="403271085636252597">"میڈیا"</string>
     <string name="media_controls_resume_title" msgid="855076860336652370">"میڈیا پلیئر کو پن کریں"</string>
     <string name="media_controls_resume_description" msgid="3163482266454802097">"پلے بیک کو فوری طور پر دوبارہ شروع کرنے کے لیے میڈیا پلیئر فوری ترتیبات میں کھلا رہتا ہے"</string>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 6973cdd..4a75e0c 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -142,10 +142,11 @@
     <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"Qurilmaga yaqin-atrofdagi Bluetooth qurilmalar bilan ma’lumotlarni almashishi uchun ruxsat berish"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"Telefonga yaqin-atrofdagi Bluetooth qurilmalar bilan ma’lumotlarni almashishi uchun ruxsat berish"</string>
     <string name="bluetooth_disable_a2dp_hw_offload" msgid="5942913792817797541">"Bluetooth A2DP apparat yukini kamaytirish funksiyasini faolsizlantirish"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="8610420176339657720">"Qurilma qayta ishga tushirilsinmi?"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8333029144800835996">"O‘zgartirish uchun qurilmangizni qayta ishga tushiring."</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="3488695418187553566">"Qaytadan"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="4930826928585464191">"Bekor"</string>
+    <string name="bluetooth_disable_le_audio_hw_offload" msgid="3966022676505972908">"Bluetooth LE AUDIO qurilmasini tushirishni faolsizlantiring"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_title" msgid="6001142380445276918">"Qurilma qayta ishga tushirilsinmi?"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_message" msgid="1524373895333698779">"Bu sozlamani oʻzgartirish uchun qurilmani qayta ishga tushiring."</string>
+    <string name="bluetooth_disable_hw_offload_dialog_confirm" msgid="5594859658551707592">"Qayta yoqish"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel" msgid="3663690305043973720">"Bekor qilish"</string>
     <string name="connected_device_media_device_title" msgid="3783388247594566734">"Media qurilmalar"</string>
     <string name="connected_device_call_device_title" msgid="88732390601723608">"Chaqiruv qurilmalari"</string>
     <string name="connected_device_other_device_title" msgid="4652120430615729193">"Boshqa qurilmalar"</string>
@@ -309,9 +310,9 @@
     <string name="security_settings_title" msgid="6710768415432791970">"Xavfsizlik"</string>
     <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"Shifrlash va hisobga oid axborot"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"Telefon shifrlangan"</string>
-    <string name="decryption_settings_summary" product="default" msgid="1742645256103613503">"Telefon shifrlanmagan"</string>
+    <string name="not_encrypted_summary" product="default" msgid="2251945842585788254">"Telefon shifrlanmagan"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"Qurilma shifrlangan"</string>
-    <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"Qurilma shifrlanmagan"</string>
+    <string name="not_encrypted_summary" product="tablet" msgid="2374263654698719382">"Qurilma shifrlanmagan"</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"Ekran qulfi"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"Nimalar chiqsin"</string>
     <string name="security_settings_summary" msgid="1627059516127354233">"Joylashuv va xavfsizlik sozlamalari"</string>
@@ -480,7 +481,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"O‘chirish"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"Sensorga tegining"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"Barmoqni skanerga tekkizib, tebranishni his qilguncha bosib turing"</string>
-    <string name="security_settings_udfps_enroll_start_message" msgid="5032954588171487566">"Tebranish sezilgunga qadar barmoqni sensor ustida tutib turing"</string>
+    <string name="security_settings_udfps_enroll_start_message" msgid="5032954588171487566">"Barmoqni tebranish sezilguniga qadar sensorga bosib turing"</string>
     <string name="security_settings_fingerprint_enroll_udfps_title" msgid="6665610134560896895">"Barmoq izi sensorini bosib turing"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"Bir necha marta tekkizing"</string>
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"Yana bir marta"</string>
@@ -488,7 +489,7 @@
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Barmoq izingizni butunlay skanerlash uchun uni biroz suring"</string>
     <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"Har safar barmoq izi belgisi harakatlanganda bosib turing. Bu barmoq izingizning toʻliq yozib olinishiga yordam beradi."</string>
     <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"Barmogʻingiz uchini sensorga joylang"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="6137605344819152477">"Endi barmoqlaringiz chetlarini skanerlash kerak"</string>
+    <string name="security_settings_udfps_enroll_edge_title" msgid="6137605344819152477">"Endi barmoq chetlarini skanerlang"</string>
     <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"Barmoq izingizning yonlarini sensorga joylashtiring va tutib turing, keyin boshqa yonga almashtiring"</string>
     <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"Bu barmoq izingizning toʻliq yozib olinishiga yordam beradi"</string>
     <!-- String.format failed for translation -->
@@ -570,37 +571,10 @@
     <string name="fingerprint_last_delete_message" msgid="7860374760549404410">"Telefonni qulfdan chiqarish yoki ilovalarda hisob tekshiruvi uchun barmoq izidan foydalana olmay qolasiz."</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="4104208067277655068">"Ishchi profilingizni qulfdan chiqarish, xaridlarni amalga oshirish yoki ish uchun ilovalarga kirish uchun barmoq izingizdan foydalana olmay qolasiz"</string>
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"Ha, olib tashlansin"</string>
-    <string name="crypt_keeper_settings_title" msgid="4938812137822100044">"Shifrlash"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"Planshetni shifrlash"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"Telefonni shifrlash"</string>
-    <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"Shifrlangan"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"Siz hisoblar, sozlamalar, yuklab olingan ilovalar va ularga tegishli ma’lumotlar, media va boshqa fayllarni shifrlashingiz mumkin. Planshetingizni shifrlagandan so‘ng, unga ekran qulfi (grafik kalit, raqamli PIN-kod yoki oddiy paroldan birini o‘rnatish mumkin) o‘rnatilgan deb hisoblasak, har safar planshet yoqilganda uning shifrini yechish uchun ekranni qulfdan chiqarish lozim bo‘ladi. Shifrni yechishning boshqa yagona yo‘li qurilmani dastlabki holatga qaytarishdir. Bunda, undagi barcha ma’lumotlar o‘chib ketadi.\n\nShifrlash bir soat yoki undan ko‘proq vaqt olishi mumkin. Bunda, batareya to‘liq quvvatlangan bo‘lishi hamda jarayon davomida planshet elektr toki manbayiga ulangan bo‘lishi lozim. Agar shifrlash jarayoni uzilib qolsa, ma’lumotlaringizni qisman yoki butunlay yo‘qotishingiz mumkin."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"Siz hisoblar, sozlamalar, yuklab olingan ilovalar va ularga tegishli ma’lumotlar, media va boshqa fayllarni shifrlashingiz mumkin. Telefoningizni shifrlagandan so‘ng, unga ekran qulfi (grafik kalit, raqamli PIN-kod yoki oddiy paroldan birini o‘rnatish mumkin) o‘rnatilgan deb hisoblasak, har safar telefon yoqilganda uning shifrini yechish uchun ekranni qulfdan chiqarish lozim bo‘ladi. Shifrni yechishning boshqa yagona yo‘li qurilmani dastlabki holatga qaytarishdir. Bunda, undagi barcha ma’lumotlar o‘chib ketadi.\n\nShifrlash bir soat yoki undan ko‘proq vaqt olishi mumkin. Bunda, batareya to‘liq quvvatlangan bo‘lishi hamda jarayon davomida telefon elektr toki manbayiga ulangan bo‘lishi lozim. Agar shifrlash jarayoni uzilib qolsa, ma’lumotlaringizni qisman yoki butunlay yo‘qotishingiz mumkin."</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"Planshetni shifrlash"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"Telefonni shifrlash"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"Batareyani quvvatlantirib keyin yana urinib ko‘ring."</string>
-    <string name="crypt_keeper_unplugged_text" msgid="2709721134148651329">"Quvvatlagichni ulab yana urinib ko‘ring."</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="1847280235529858357">"Ekran qulfi PIN kodi yoki parol yo‘q"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="7210616262954236042">"Shifrlashni boshlashdan oldin, ekran qulfi uchun PIN-kod yoki parol o‘rnatish lozim."</string>
-    <string name="crypt_keeper_confirm_title" msgid="8600000209722452230">"Shifrlansinmi?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="3270587498436152259">"Boshlangan shifrlash amaliyotini orqaga qaytarib bo‘lmaydi va agar uning jarayoni uzilsa, ma‘lumotlaringiz o‘chirib yuboriladi. Shifrlash jarayoni bir soat yoki ko‘proq vaqtni talab qiladi va uning davomida planshet bir necha marta o‘chib yoqiladi."</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="3040428543349852419">"Boshlangan shifrlash amaliyotini orqaga qaytarib bo‘lmaydi va agar uning jarayoni uzilsa, ma‘lumotlaringiz o‘chirib yuboriladi. Shifrlash jarayoni bir soat yoki ko‘proq vaqtni talab qiladi va uning davomida telefon bir necha marta o‘chib yoqiladi."</string>
-    <string name="crypt_keeper_setup_title" msgid="3339725741305796680">"Shifrlanyapti"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="4417016995091289019">"Planshet shifrlanishini kuting. <xliff:g id="PERCENT">^1</xliff:g>% bajarildi."</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="7902355422499500352">"Telefoningiz shifrlanishini kuting. <xliff:g id="PERCENT">^1</xliff:g>% bajarildi."</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="8348188415839917821">"Planshetingiz shifrlanmoqda. Iltimos, kuting. Qolgan vaqt: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="8556105766597855198">"Telefoningiz shifrlanmoqda. Iltimos, kuting. Qolgan vaqt: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="3832496715430327682">"Planshetingizni qulfdan chiqarish uchun uni o‘chirib, keyin qayta yoqing."</string>
-    <string name="crypt_keeper_force_power_cycle" product="default" msgid="5070346039522135361">"Telefoningizni qulfdan chiqarish uchun uni o‘chirib, keyin qayta yoqing."</string>
-    <string name="crypt_keeper_warn_wipe" msgid="8104921337301750394">"Ogohlantirish: Agar yana <xliff:g id="COUNT">^1</xliff:g> marta muvaffaqiyatsiz urinish qilsangiz, qurilmangiz ma’lumotlari o‘chirib tashlanadi!"</string>
-    <string name="crypt_keeper_enter_password" msgid="1274917431075529732">"Parolingizni tering"</string>
-    <string name="crypt_keeper_failed_title" msgid="8173654570682244149">"Shifrlanmadi"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"Shifrlash jarayoni uzildi va uning ishini yakunlashning imkoni yo‘q. Natijada, planshetingizdagi ma‘lumotga yana kirishning imkoni bo‘lmaydi.  \n\n Planshetdan yana foydalana olish uchun, uni dastlabki sozlamalarga qaytarish lozim. Planshetingizni asl sozlamalariga qaytargandan so‘ng, uni sozlashni boshlaganingizda Google hisobingizga zaxiralangan har qanday ma‘lumotlar nusxasini tiklash imkoniyatiga ega bo‘lasiz."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"Shifrlash jarayoni uzildi va uning ishini yakunlashning imkoni yo‘q. Natijada, telefoningizdagi ma‘lumotga yana kirishning imkoni bo‘lmaydi. \n\nTelefondan yana foydalana olish uchun, uni dastlabki sozlamalarga qaytarish lozim. Telefoningizni asl sozlamalariga qaytargandan so‘ng, uni sozlashni boshlaganingizda, Google hisobingizga zaxiralangan har qanday ma‘lumotlar nusxasini tiklash imkoniyatiga ega bo‘lasiz."</string>
-    <string name="crypt_keeper_data_corrupt_title" msgid="5920153462176846037">"Shifrni yechib bo‘lmadi"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"Siz kiritgan parol to‘g‘ri, biroq planshetdagi ma’lumotlar shikastlangan.\n\nPlanshetdan foydalanishda davom etish uchun uning zavod sozlamalarini tiklashingiz lozim. Shundan so‘ng, Google hisobingizga zaxiralangan barcha ma’lumotlaringizni qayta tiklab olishingiz mumkin bo‘ladi."</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"Siz kiritgan parol to‘g‘ri, biroq telefondagi ma’lumotlar shikastlangan.\n\nTelefondan foydalanishda davom etish uchun uning zavod sozlamalarini tiklashingiz lozim. Shundan so‘ng, Google hisobingizga zaxiralangan barcha ma’lumotlaringizni qayta tiklab olishingiz mumkin bo‘ladi."</string>
-    <string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"Matn kiritish usulini almashtirish"</string>
+    <string name="encryption_settings_title" msgid="2848716008695618360">"Shifrlash"</string>
+    <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"Planshetni shifrlash"</string>
+    <string name="encrypt_title" product="default" msgid="7337365190988321100">"Telefonni shifrlash"</string>
+    <string name="encrypted_summary" msgid="545623487587251207">"Shifrlangan"</string>
     <string name="suggested_lock_settings_title" msgid="7836065447159730217">"Telefoningizni himoyalang"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"Planshetni himoyalash uchun ekran qulfini sozlang"</string>
     <string name="suggested_lock_settings_summary" product="device" msgid="8479766049078378225">"Qurilmani himoyalash uchun ekran qulfini sozlang"</string>
@@ -819,6 +793,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Ushbu PIN kodni boshqa qurilmada ham terish lozim bo‘lishi mumkin."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Shuningdek, bu kirish kalitini ikkinchi qurilmada kiritishingiz talab qilinishi mumkin."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;br&gt;&lt;b&gt;bilan biriktirish uchun,&lt;/b&gt;&lt;br&gt;&lt;br&gt;unda mana bu kalit so‘z ko‘rsatilayotganligini tekshiring:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Sozlangan toʻplamga ulanishni tasdiqlang"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>dan so‘rov&lt;/b&gt;&lt;br&gt;&lt;br&gt;Ushbu qurilma bilan biriktirilsinmi?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>bilan biriktirish uchun, uni ekranida:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g> terib, Return yoki Enter tugmalarini bosing."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Kontakt va chaqiruvlar tarixiga ruxsat berish"</string>
@@ -852,6 +827,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Ulanilmadi. Qaytadan urining."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Qurilma tafsilotlari"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Qurilmaning Bluetooth manzili: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Qurilmaning Bluetooth manzili:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Qurilma unutilsinmi?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Birikmani olib tashlash"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Ilova uzilsinmi?"</string>
@@ -883,6 +859,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Sozlamalarni eslab qolish"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Maksimum ulangan Bluetooth audio qurilmalar"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Maksimum nechta Bluetooth audio qurilma ulash mumkinligi belgilang"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"Nfc steklarida uchraydigan nosozliklarni tuzatish jurnali"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Nfc steklarini jurnalga yozish darajasini oshirish"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Translatsiya"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"koʻzgu"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Simsiz monitorni yoqish"</string>
@@ -1190,6 +1168,8 @@
     <string name="wifi_hotspot_maximize_compatibility_dual_ap_summary" msgid="3579549223159056533">"Boshqa qurilmalarga bu hotspotni topishda yordam beradi. Batareya tezroq sarflanadi."</string>
     <string name="wifi_tether_starting" msgid="8879874184033857814">"Ulanish nuqtasi yoqilmoqda…"</string>
     <string name="wifi_tether_stopping" msgid="4416492968019409188">"Ulanish nuqtasi o‘chirilmoqda…"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_title" msgid="3089432578433978073">"Modem rejimi ishlamaydi"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_content" msgid="5920421547607921112">"Tafsilotlar uchun aloqa operatoringizga murojaat qiling"</string>
     <string name="wifi_tether_enabled_subtext" msgid="5085002421099821056">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> faol"</string>
     <string name="wifi_tether_failed_subtext" msgid="437190628041885500">"Wi‑Fi ulanish nuqtasi bilan bog‘liq xato"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7072559431286459122">"Wi‑Fi ulanish nuqtasini sozlash"</string>
@@ -2536,11 +2516,6 @@
     <string name="enable_service_title" msgid="7231533866953706788">"<xliff:g id="SERVICE">%1$s</xliff:g> xizmatiga qurilmangizni boshqarish uchun toʻliq ruxsat berilsinmi?"</string>
     <string name="capabilities_list_title" msgid="1225853611983394386">"<xliff:g id="SERVICE">%1$s</xliff:g>:"</string>
     <string name="touch_filtered_warning" msgid="4225815157460318241">"Ilova ruxsatnoma so‘roviga xalaqit qilayotgani tufayli, “Sozlamalar” ilovasi javobingizni tekshira olmaydi."</string>
-    <string name="enable_service_encryption_warning" msgid="931082737770453755">"Agar <xliff:g id="SERVICE">%1$s</xliff:g> xizmatini yoqsangiz, qurilmangiz ma’lumotlarni shifrlashni kuchaytirish uchun ekran qulfidan foydalanmaydi."</string>
-    <string name="secure_lock_encryption_warning" msgid="669152607190123579">"Maxsus imkoniyatlar xizmati yoqilganligi tufayli qurilmangiz ma’lumotlarni shifrlashni kuchaytirish uchun ekran qulfidan foydalanmaydi."</string>
-    <string name="enable_service_pattern_reason" msgid="6832846117817938536">"“<xliff:g id="SERVICE">%1$s</xliff:g>” xizmatini yoqish ma’lumotlarni shifrlashga ta’sir qilgani bois chizmali parolingizni tasdiqlashingiz lozim."</string>
-    <string name="enable_service_pin_reason" msgid="6040417014360237703">"“<xliff:g id="SERVICE">%1$s</xliff:g>” xizmatini yoqish ma’lumotlarni shifrlashga ta’sir qilgani bois PIN-kodingizni tasdiqlashingiz lozim."</string>
-    <string name="enable_service_password_reason" msgid="6962544350351734238">"“<xliff:g id="SERVICE">%1$s</xliff:g>” xizmatini yoqish ma’lumotlarni shifrlashga ta’sir qilgani bois parolingizni tasdiqlashingiz lozim."</string>
     <string name="accessibility_service_warning" msgid="6779187188736432618">"<xliff:g id="SERVICE">%1$s</xliff:g> bu qurilmaning toʻliq boshqaruvini talab qilmoqda. Xizmat ekrandagilarni oʻqishi va maxsus imkoniyatlarga ehtiyoji bor foydalanuvchilar nomidan harakat qilishi mumkin. Boshqaruvning bu darajasi ayrim ilovalargagina mos keladi."</string>
     <string name="accessibility_service_warning_description" msgid="6573203795976134751">"Toʻliq nazorat maxsus imkoniyatlar bilan ishlovchi ilovalar uchun mos, lekin barcha ilovalar uchun emas."</string>
     <string name="accessibility_service_screen_control_title" msgid="324795030658109870">"Ekranni ochish va boshqarish"</string>
@@ -3105,14 +3080,6 @@
     <string name="remove_account_failed" msgid="3709502163548900644">"Bu o‘zgarishni amalga oshirish uchun administrator ruxsat bermagan"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"Qo‘lbola sinxronlanmadi"</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"Ushbu narsani sinxronlash hozir o‘chirilgan. Bu sozlamani o‘zgartirish uchun vaqtincha fonda trafik yuklashni yoqib, keyin avtomatik sinx-lashga o‘ting."</string>
-    <string name="enter_password" msgid="6327051330258595331">"Androidni ishga tushirish uchun parolni kiriting"</string>
-    <string name="enter_pin" msgid="1029287617551232681">"Androidni ishga tushirish uchun PIN kodni kiriting"</string>
-    <string name="enter_pattern" msgid="1747316785866742960">"Androidni ishga tushirish uchun chizmali parolni chizing"</string>
-    <string name="cryptkeeper_wrong_pattern" msgid="340747269176120242">"Grafik kalit xato"</string>
-    <string name="cryptkeeper_wrong_password" msgid="7295607881887114486">"Parol noto‘g‘ri"</string>
-    <string name="cryptkeeper_wrong_pin" msgid="2347961593970714201">"PIN kod xato"</string>
-    <string name="checking_decryption" msgid="6111642972615688237">"Tekshirilmoqda…"</string>
-    <string name="starting_android" msgid="6694154070215356186">"Android ishga tushmoqda…"</string>
     <string name="delete" msgid="8330605554706263775">"O‘chirish"</string>
     <string name="misc_files" msgid="6598066985800749585">"Boshqa fayllar"</string>
     <string name="misc_files_selected_count" msgid="5597802791672749532">"Tanlandi: <xliff:g id="NUMBER">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -3208,8 +3175,6 @@
     <string name="data_usage_metered_yes" msgid="4262598072030135223">"Trafik hisoblanadigan tarmoq"</string>
     <string name="data_usage_metered_no" msgid="1685828958417926268">"Bepul"</string>
     <string name="data_usage_disclaimer" msgid="3271450299386176770">"Aloqa operatorining hisob-kitobi qurilmanikidan farq qilishi mumkin."</string>
-    <string name="cryptkeeper_emergency_call" msgid="8369322820475703306">"Favqulodda chaqiruv"</string>
-    <string name="cryptkeeper_return_to_call" msgid="3857250752781151232">"Suhbatga qaytish"</string>
     <string name="vpn_name" msgid="3806456074909253262">"Tarmoq nomi"</string>
     <string name="vpn_type" msgid="5533202873260826663">"Turi"</string>
     <string name="vpn_server" msgid="2908816134941973935">"Server manzili"</string>
@@ -4766,8 +4731,6 @@
       <item quantity="one">1 ta ilova uchun trafik cheklanmagan</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"Yana"</string>
-    <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"Foydalanuvchi ma’lumotlari o‘chirib tashlanib, shifrlashga o‘tilsinmi?"</string>
-    <string name="button_confirm_convert_fbe" msgid="339648921918438106">"O‘chirib tashlash va o‘girish"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"ShortcutManager hisoblagichini qaytadan boshlash"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"ShortcutManager hisoblagichi qaytadan boshlandi"</string>
     <string name="notification_suggestion_title" msgid="6309263655965785411">"Ekran qulfida chiqadigan axborotlarni boshqaring"</string>
@@ -5294,6 +5257,7 @@
     <string name="sim_action_yes" msgid="8076556020131395515">"Ha"</string>
     <string name="sim_action_reboot" msgid="3508948833333441538">"Qayta yoqish"</string>
     <string name="sim_action_no_thanks" msgid="435717748384544195">"Kerak emas"</string>
+    <string name="sim_action_cancel" msgid="2668099867029610910">"Bekor qilish"</string>
     <string name="sim_switch_button" msgid="1405772571706095387">"Almashtirish"</string>
     <string name="dsds_activation_failure_title" msgid="4467364110584914794">"SIM karta faollashmadi"</string>
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"SIM kartani chiqarib olib, qaytadan soling. Agar muammo davom etsa, qurilmangizni qayta ishga tushiring."</string>
@@ -5446,6 +5410,10 @@
     <string name="cached_apps_freezer" msgid="1057519579761550350">"Keshdagi ilovalar ishga tushirilishini bloklash"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"Sozlamalar orqali ustki ilovalarga ruxsat berish"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Boshqa ilovalar ustidan ochiladigan ilovalarga ruxsat berish"</string>
+    <!-- no translation found for allow_mock_modem (3832264806530479214) -->
+    <skip />
+    <!-- no translation found for allow_mock_modem_summary (9097416612748005374) -->
+    <skip />
     <string name="media_controls_title" msgid="403271085636252597">"Media"</string>
     <string name="media_controls_resume_title" msgid="855076860336652370">"Media pleyerni mahkamlash"</string>
     <string name="media_controls_resume_description" msgid="3163482266454802097">"Ijroga tez qaytish, media pleyer Tezkor sozlamalarda chiqadi"</string>
@@ -5554,7 +5522,7 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Telefon raqamini kiriting"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Telefon raqami kiritilmagan."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
-    <string name="enable_2g_title" msgid="8184757884636162942">"2G tarmoqqa ruxsat bering"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"2G uchun ruxsat"</string>
     <string name="enable_2g_summary" msgid="906487478332145407">"2G mobil internetidan foydalaning. Favqulodda chaqiruvlar uchun 2G doim yoniq turadi."</string>
     <string name="show_clip_access_notification" msgid="7782300987639778542">"Vaqtinchalik xotiraga kirish haqida ogohlantirish"</string>
     <string name="show_clip_access_notification_summary" msgid="474090757777203207">"Ilovalar siz nusxa olgan matn, rasmlar yoki boshqa kontentdan foydalanganda xabar chiqarish"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 8e055c8..1fddfd5 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -142,10 +142,11 @@
     <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"Cho phép thiết bị kết nối với các thiết bị Bluetooth ở gần"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"Cho phép điện thoại kết nối với các thiết bị Bluetooth ở gần"</string>
     <string name="bluetooth_disable_a2dp_hw_offload" msgid="5942913792817797541">"Tắt giảm tải cho phần cứng Bluetooth A2DP"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="8610420176339657720">"Khởi động lại thiết bị?"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8333029144800835996">"Bạn cần khởi động lại thiết bị để thay đổi cài đặt này."</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="3488695418187553566">"Khởi động lại"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="4930826928585464191">"Hủy"</string>
+    <string name="bluetooth_disable_le_audio_hw_offload" msgid="3966022676505972908">"Tắt chế độ giảm tải phần cứng Bluetooth LE AUDIO"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_title" msgid="6001142380445276918">"Khởi động lại thiết bị?"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_message" msgid="1524373895333698779">"Bạn cần khởi động lại thiết bị để thay đổi chế độ cài đặt này."</string>
+    <string name="bluetooth_disable_hw_offload_dialog_confirm" msgid="5594859658551707592">"Bắt đầu lại"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel" msgid="3663690305043973720">"Huỷ"</string>
     <string name="connected_device_media_device_title" msgid="3783388247594566734">"Thiết bị truyền thông"</string>
     <string name="connected_device_call_device_title" msgid="88732390601723608">"Thiết bị gọi điện"</string>
     <string name="connected_device_other_device_title" msgid="4652120430615729193">"Thiết bị khác"</string>
@@ -309,9 +310,9 @@
     <string name="security_settings_title" msgid="6710768415432791970">"Bảo mật"</string>
     <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"Mã hóa và thông tin xác thực"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"Đã mã hóa điện thoại"</string>
-    <string name="decryption_settings_summary" product="default" msgid="1742645256103613503">"Điện thoại không được mã hóa"</string>
+    <string name="not_encrypted_summary" product="default" msgid="2251945842585788254">"Điện thoại chưa được mã hoá"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"Thiết bị được mã hóa"</string>
-    <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"Thiết bị không được mã hóa"</string>
+    <string name="not_encrypted_summary" product="tablet" msgid="2374263654698719382">"Thiết bị chưa được mã hoá"</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"Màn hình khóa"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"Nội dung hiển thị"</string>
     <string name="security_settings_summary" msgid="1627059516127354233">"Đặt Vị trí của tôi, mở khóa màn hình, khóa thẻ SIM, khóa bộ nhớ thông tin xác thực"</string>
@@ -480,7 +481,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"Xóa"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"Chạm vào cảm biến"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"Đặt ngón tay lên cảm biến và nhấc lên sau khi cảm thấy rung"</string>
-    <string name="security_settings_udfps_enroll_start_message" msgid="5032954588171487566">"Giữ thẳng ngón tay trên cảm biến cho đến khi bạn cảm thấy rung"</string>
+    <string name="security_settings_udfps_enroll_start_message" msgid="5032954588171487566">"Áp vân tay vào cảm biến cho đến khi bạn cảm thấy rung"</string>
     <string name="security_settings_fingerprint_enroll_udfps_title" msgid="6665610134560896895">"Chạm và giữ cảm biến vân tay"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"Nhấc ngón tay lên rồi chạm lại"</string>
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"Vui lòng chạm lần nữa"</string>
@@ -570,37 +571,10 @@
     <string name="fingerprint_last_delete_message" msgid="7860374760549404410">"Bạn sẽ không thể dùng vân tay để mở khóa điện thoại hoặc xác minh danh tính của mình trong các ứng dụng."</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="4104208067277655068">"Bạn sẽ không thể dùng vân tay để mở khóa hồ sơ công việc, ủy quyền mua hàng hay đăng nhập vào các ứng dụng công việc."</string>
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"Có, xóa"</string>
-    <string name="crypt_keeper_settings_title" msgid="4938812137822100044">"Mã hóa"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"Mã hóa máy tính bảng"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"Mã hóa điện thoại"</string>
-    <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"Đã mã hóa"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"Bạn có thể mã hóa tài khoản, cài đặt, ứng dụng đã tải xuống và dữ liệu ứng dụng, phương tiện cũng như các tệp khác của mình. Sau khi mã hóa máy tính bảng, giả định rằng bạn đã thiết lập khóa màn hình (tức là một hình mẫu hay mã PIN hoặc mật khẩu dạng số), bạn cần phải mở khóa màn hình để giải mã máy tính bảng mỗi khi bật lên. Cách giải mã khác duy nhất là đặt lại về dữ liệu gốc, thao tác này sẽ xóa tất cả dữ liệu của bạn.\n\nQuá trình mã hóa mất ít nhất một giờ. Bạn phải bắt đầu bằng việc sạc pin và cắm máy tính bảng cho đến khi quá trình mã hóa hoàn tất. Nếu làm gián đoạn quá trình mã hóa, bạn sẽ mất một vài hoặc tất cả dữ liệu của mình"</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"Bạn có thể mã hóa tài khoản, cài đặt, ứng dụng đã tải xuống và dữ liệu ứng dụng, phương tiện cũng như các tệp khác của mình. Sau khi mã hóa điện thoại, giả định rằng bạn đã thiết lập khóa màn hình (tức là một hình mẫu hay mã PIN hoặc mật khẩu dạng số), bạn cần phải mở khóa màn hình để giải mã điện thoại mỗi khi bật lên. Cách giải mã khác duy nhất là đặt lại về dữ liệu gốc, thao tác này sẽ xóa tất cả dữ liệu của bạn.\n\nQuá trình mã hóa mất ít nhất một giờ. Bạn phải bắt đầu bằng việc sạc pin và cắm điện thoại cho đến khi quá trình mã hóa hoàn tất. Nếu làm gián đoạn quá trình mã hóa, bạn sẽ mất một vài hoặc tất cả dữ liệu của mình."</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"Mã hóa máy tính bảng"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"Mã hóa điện thoại"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"Vui lòng sạc pin và thử lại."</string>
-    <string name="crypt_keeper_unplugged_text" msgid="2709721134148651329">"Vui lòng cắm bộ sạc của bạn và thử lại."</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="1847280235529858357">"Không có mật khẩu hoặc PIN khóa màn hình"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="7210616262954236042">"Bạn cần đặt mã PIN hoặc mật khẩu khóa màn hình trước khi có thể bắt đầu quá trình mã hóa."</string>
-    <string name="crypt_keeper_confirm_title" msgid="8600000209722452230">"Mã hóa?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="3270587498436152259">"Tác vụ mã hóa không thể hoàn nguyên được và nếu bạn làm gián đoạn tác vụ này, bạn sẽ mất dữ liệu. Quá trình mã hóa diễn ra ít nhất một tiếng, trong thời gian này máy tính bảng sẽ khởi động lại nhiều lần."</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="3040428543349852419">"Tác vụ mã hóa không thể hoàn nguyên được và nếu bạn làm gián đoạn tác vụ này, bạn sẽ mất dữ liệu. Quá trình mã hóa diễn ra ít nhất một tiếng, trong thời gian này điện thoại sẽ khởi động lại nhiều lần."</string>
-    <string name="crypt_keeper_setup_title" msgid="3339725741305796680">"Đang mã hóa"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="4417016995091289019">"Vui lòng đợi trong khi máy tính bảng của bạn được mã hóa. Hoàn tất <xliff:g id="PERCENT">^1</xliff:g>%."</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="7902355422499500352">"Vui lòng đợi trong khi điện thoại của bạn được mã hóa. Hoàn tất <xliff:g id="PERCENT">^1</xliff:g>%."</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="8348188415839917821">"Chờ trong khi máy tính bảng của bạn đang được mã hóa. Thời gian còn lại: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="8556105766597855198">"Chờ trong khi điện thoại của bạn đang được mã hóa. Thời gian còn lại: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="3832496715430327682">"Để mở khóa máy tính bảng của bạn, hãy tắt rồi bật máy tính bảng."</string>
-    <string name="crypt_keeper_force_power_cycle" product="default" msgid="5070346039522135361">"Để mở khóa điện thoại của bạn, hãy tắt rồi bật điện thoại."</string>
-    <string name="crypt_keeper_warn_wipe" msgid="8104921337301750394">"Cảnh báo: Thiết bị của bạn sẽ bị xóa sau <xliff:g id="COUNT">^1</xliff:g> lần mở khóa không thành công nữa!"</string>
-    <string name="crypt_keeper_enter_password" msgid="1274917431075529732">"Nhập mật khẩu của bạn"</string>
-    <string name="crypt_keeper_failed_title" msgid="8173654570682244149">"Mã hóa không thành công"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"Quá trình mã hóa đã bị gián đoạn và không thể hoàn tất. Do đó, dữ liệu trên máy tính bảng của bạn không còn có thể truy cập được. \n\n Để tiếp tục sử dụng máy tính bảng của mình, bạn cần đặt lại về cài đặt ban đầu. Khi bạn thiết lập máy tính bảng sau khi đặt lại, bạn sẽ có cơ hội khôi phục mọi dữ liệu được sao lưu vào Tài khoản Google của mình."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"Quá trình mã hóa bị gián đoạn và không thể hoàn tất. Do đó, dữ liệu trên điện thoại của bạn không còn có thể truy cập được. \n\nĐể tiếp tục sử dụng điện thoại của mình, bạn cần đặt lại về cài đặt ban đầu. Khi bạn thiết lập điện thoại sau khi đặt lại, bạn sẽ có cơ hội khôi phục mọi dữ liệu được sao lưu vào Tài khoản Google của mình."</string>
-    <string name="crypt_keeper_data_corrupt_title" msgid="5920153462176846037">"Giải mã không thành công"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"Mật khẩu bạn nhập đúng nhưng rất tiếc dữ liệu của bạn bị hỏng. \n\nĐể tiếp tục sử dụng máy tính bảng của mình, bạn cần khôi phục cài đặt gốc. Khi thiết lập máy tính bảng sau khi đặt lại, bạn sẽ có cơ hội khôi phục mọi dữ liệu đã được sao lưu vào Tài khoản Google của mình."</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"Mật khẩu bạn nhập đúng nhưng rất tiếc dữ liệu của bạn bị hỏng. \n\nĐể tiếp tục sử dụng điện thoại của mình, bạn cần khôi phục cài đặt gốc. Khi thiết lập điện thoại sau khi đặt lại, bạn sẽ có cơ hội khôi phục mọi dữ liệu đã được sao lưu vào Tài khoản Google của mình."</string>
-    <string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"Chuyển phương thức nhập"</string>
+    <string name="encryption_settings_title" msgid="2848716008695618360">"Mã hoá"</string>
+    <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"Mã hoá máy tính bảng"</string>
+    <string name="encrypt_title" product="default" msgid="7337365190988321100">"Mã hoá điện thoại"</string>
+    <string name="encrypted_summary" msgid="545623487587251207">"Đã mã hoá"</string>
     <string name="suggested_lock_settings_title" msgid="7836065447159730217">"Bảo mật điện thoại của bạn"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"Đặt phương thức khóa màn hình để bảo vệ máy tính bảng"</string>
     <string name="suggested_lock_settings_summary" product="device" msgid="8479766049078378225">"Đặt phương thức khóa màn hình để bảo vệ thiết bị"</string>
@@ -819,6 +793,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Bạn cũng có thể cần nhập mã PIN này trên thiết bị khác."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Bạn cũng có thể cần nhập mã xác nhận này trên thiết bị khác."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Để ghép nối với:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Hãy đảm bảo thiết bị đang hiển thị mã xác nhận này:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Xác nhận ghép nối với bộ thiết bị"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"Từ:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Ghép nối với thiết bị này?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Để ghép nối với:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Hãy nhập trên thiết bị:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g> rồi nhấn Quay lại hoặc Enter."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Cho phép truy cập vào danh bạ và nhật ký cuộc gọi của bạn"</string>
@@ -852,6 +827,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Không thể kết nối. Hãy thử lại."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Chi tiết thiết bị"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Địa chỉ Bluetooth của thiết bị: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Địa chỉ Bluetooth của thiết bị:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Xóa thiết bị"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Hủy liên kết"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Ngắt kết nối ứng dụng?"</string>
@@ -883,6 +859,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Nhớ cài đặt"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Số thiết bị âm thanh được kết nối qua Bluetooth tối đa"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Chọn số thiết bị âm thanh được kết nối qua Bluetooth tối đa"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"Nhật ký gỡ lỗi của ngăn xếp NFC"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Tăng cấp độ ghi nhật ký của ngăn xếp NFC"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Truyền"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"phản chiếu"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Bật hiển thị không dây"</string>
@@ -1005,7 +983,7 @@
     <string name="rx_wifi_speed" msgid="5167966079215111232">"Tốc độ nhận"</string>
     <string name="wifi_speed" msgid="6562147734565434513">"Tốc độ liên kết"</string>
     <string name="wifi_frequency" msgid="3120998420184702834">"Tần số"</string>
-    <string name="wifi_ip_address" msgid="8903577251845268209">"Địa chỉa IP"</string>
+    <string name="wifi_ip_address" msgid="8903577251845268209">"Địa chỉ IP"</string>
     <string name="passpoint_label" msgid="6513669696739302866">"Đã lưu thông qua"</string>
     <string name="passpoint_content" msgid="5219226173518418335">"Thông tin xác thực <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="wifi_eap_method" msgid="3776009521349381742">"Phương pháp EAP"</string>
@@ -1190,6 +1168,8 @@
     <string name="wifi_hotspot_maximize_compatibility_dual_ap_summary" msgid="3579549223159056533">"Giúp các thiết bị khác tìm thấy điểm phát sóng này. Làm tăng mức sử dụng pin."</string>
     <string name="wifi_tether_starting" msgid="8879874184033857814">"Đang bật điểm phát sóng…"</string>
     <string name="wifi_tether_stopping" msgid="4416492968019409188">"Đang tắt điểm phát sóng…"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_title" msgid="3089432578433978073">"Không dùng được tính năng chia sẻ Internet"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_content" msgid="5920421547607921112">"Hãy liên hệ với nhà cung cấp dịch vụ của bạn để biết thông tin chi tiết"</string>
     <string name="wifi_tether_enabled_subtext" msgid="5085002421099821056">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> đang hiện hoạt"</string>
     <string name="wifi_tether_failed_subtext" msgid="437190628041885500">"Lỗi điểm phát sóng Wi‑Fi di động"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7072559431286459122">"Thiết lập điểm phát sóng Wi‑Fi"</string>
@@ -2536,11 +2516,6 @@
     <string name="enable_service_title" msgid="7231533866953706788">"Cho phép <xliff:g id="SERVICE">%1$s</xliff:g> có toàn quyền kiểm soát thiết bị của bạn?"</string>
     <string name="capabilities_list_title" msgid="1225853611983394386">"<xliff:g id="SERVICE">%1$s</xliff:g> cần:"</string>
     <string name="touch_filtered_warning" msgid="4225815157460318241">"Vì ứng dụng đang che khuất yêu cầu cấp quyền, Cài đặt không thể xác minh câu trả lời của bạn."</string>
-    <string name="enable_service_encryption_warning" msgid="931082737770453755">"Nếu bạn bật <xliff:g id="SERVICE">%1$s</xliff:g>, thiết bị của bạn sẽ không sử dụng khóa màn hình để cải tiến việc mã hóa dữ liệu."</string>
-    <string name="secure_lock_encryption_warning" msgid="669152607190123579">"Vì bạn đã bật dịch vụ hỗ trợ tiếp cận, thiết bị của bạn sẽ không sử dụng khóa màn hình để cải tiến việc mã hóa dữ liệu."</string>
-    <string name="enable_service_pattern_reason" msgid="6832846117817938536">"Vì bật <xliff:g id="SERVICE">%1$s</xliff:g> ảnh hưởng đến mã hóa dữ liệu, bạn cần phải xác nhận hình của mình."</string>
-    <string name="enable_service_pin_reason" msgid="6040417014360237703">"Vì bật <xliff:g id="SERVICE">%1$s</xliff:g> ảnh hướng đến mã hóa dữ liệu, bạn cần phải xác nhận mã PIN của mình."</string>
-    <string name="enable_service_password_reason" msgid="6962544350351734238">"Vì bật <xliff:g id="SERVICE">%1$s</xliff:g> ảnh hưởng đến mã hóa dữ liệu, bạn cần phải xác nhận mật khẩu của mình."</string>
     <string name="accessibility_service_warning" msgid="6779187188736432618">"<xliff:g id="SERVICE">%1$s</xliff:g> đang yêu cầu toàn quyền kiểm soát thiết bị này. Dịch vụ này có thể đọc màn hình và hành động thay mặt cho người dùng có nhu cầu về hỗ trợ tiếp cận. Mức độ kiểm soát này không phù hợp với hầu hết các ứng dụng."</string>
     <string name="accessibility_service_warning_description" msgid="6573203795976134751">"Bạn chỉ nên cấp toàn quyền kiểm soát cho những ứng dụng trợ giúp mình khi cần hỗ trợ tiếp cận, chứ không nên cấp cho hầu hết các ứng dụng."</string>
     <string name="accessibility_service_screen_control_title" msgid="324795030658109870">"Xem và điều khiển màn hình"</string>
@@ -3105,14 +3080,6 @@
     <string name="remove_account_failed" msgid="3709502163548900644">"Quản trị viên của bạn không cho phép thực hiện thay đổi này"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"Không thể đồng bộ hóa theo cách thủ công"</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"Đồng bộ hóa cho mục này hiện đã bị vô hiệu hóa. Để thay đổi cài đặt này, hãy tạm thời bật dữ liệu nền và đồng bộ hóa tự động."</string>
-    <string name="enter_password" msgid="6327051330258595331">"Để bắt đầu sử dụng thiết bị Android, hãy nhập mật khẩu của bạn"</string>
-    <string name="enter_pin" msgid="1029287617551232681">"Để bắt đầu sử dụng thiết bị Android, hãy nhập mã PIN của bạn"</string>
-    <string name="enter_pattern" msgid="1747316785866742960">"Để bắt đầu sử dụng thiết bị Android, hãy vẽ hình mẫu của bạn"</string>
-    <string name="cryptkeeper_wrong_pattern" msgid="340747269176120242">"Hình mở khóa không chính xác"</string>
-    <string name="cryptkeeper_wrong_password" msgid="7295607881887114486">"Mật khẩu sai"</string>
-    <string name="cryptkeeper_wrong_pin" msgid="2347961593970714201">"Mã PIN sai"</string>
-    <string name="checking_decryption" msgid="6111642972615688237">"Đang kiểm tra…"</string>
-    <string name="starting_android" msgid="6694154070215356186">"Đang khởi động Android…"</string>
     <string name="delete" msgid="8330605554706263775">"Xóa"</string>
     <string name="misc_files" msgid="6598066985800749585">"Tệp khác"</string>
     <string name="misc_files_selected_count" msgid="5597802791672749532">"đã chọn <xliff:g id="NUMBER">%1$d</xliff:g> trong tổng số <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -3208,8 +3175,6 @@
     <string name="data_usage_metered_yes" msgid="4262598072030135223">"Đo lượng dữ liệu"</string>
     <string name="data_usage_metered_no" msgid="1685828958417926268">"Không đo lượng dữ liệu"</string>
     <string name="data_usage_disclaimer" msgid="3271450299386176770">"Cách tính dữ liệu của nhà mạng có thể khác với thiết bị của bạn."</string>
-    <string name="cryptkeeper_emergency_call" msgid="8369322820475703306">"Cuộc gọi khẩn cấp"</string>
-    <string name="cryptkeeper_return_to_call" msgid="3857250752781151232">"Quay lại cuộc gọi"</string>
     <string name="vpn_name" msgid="3806456074909253262">"Tên"</string>
     <string name="vpn_type" msgid="5533202873260826663">"Loại"</string>
     <string name="vpn_server" msgid="2908816134941973935">"Địa chỉ máy chủ"</string>
@@ -4374,7 +4339,7 @@
     <string name="default_phone_title" msgid="7616730756650803827">"Ứng dụng điện thoại"</string>
     <string name="default_app" msgid="445053777504688596">"(Mặc định)"</string>
     <string name="system_app" msgid="1863291702508355041">"(Hệ thống)"</string>
-    <string name="system_default_app" msgid="2647834628622214931">"(Mặc định của hệ thống)"</string>
+    <string name="system_default_app" msgid="2647834628622214931">"(Theo chế độ mặc định của hệ thống)"</string>
     <string name="apps_storage" msgid="643866814746927111">"Bộ nhớ ứng dụng"</string>
     <string name="usage_access" msgid="5487993885373893282">"Truy cập dữ liệu sử dụng"</string>
     <string name="permit_usage_access" msgid="179630895262172674">"Cho phép truy cập dữ liệu sử dụng"</string>
@@ -4766,8 +4731,6 @@
       <item quantity="one">1 ứng dụng có thể sử dụng dữ liệu không bị hạn chế</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"Xem thêm"</string>
-    <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"Bạn có thực sự muốn xóa dữ liệu người dùng và chuyển đổi sang mã hóa tệp không?"</string>
-    <string name="button_confirm_convert_fbe" msgid="339648921918438106">"Xóa và chuyển đổi"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"Đặt lại giới hạn tốc độ trong ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"Đã đặt lại giới hạn tốc độ trong ShortcutManager"</string>
     <string name="notification_suggestion_title" msgid="6309263655965785411">"Kiểm soát thông tin trên màn hình khóa"</string>
@@ -5294,6 +5257,7 @@
     <string name="sim_action_yes" msgid="8076556020131395515">"Có"</string>
     <string name="sim_action_reboot" msgid="3508948833333441538">"Khởi động lại"</string>
     <string name="sim_action_no_thanks" msgid="435717748384544195">"Không, cảm ơn"</string>
+    <string name="sim_action_cancel" msgid="2668099867029610910">"Hủy"</string>
     <string name="sim_switch_button" msgid="1405772571706095387">"Chuyển"</string>
     <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Không thể kích hoạt SIM"</string>
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Hãy tháo SIM rồi lắp lại. Nếu vấn đề vẫn xảy ra, vui lòng khởi động lại thiết bị."</string>
@@ -5409,7 +5373,7 @@
     <string name="bug_report_handler_picker_footer_text" msgid="4935758328366585673">"Xác định ứng dụng nào xử lý phím tắt Báo cáo lỗi trên thiết bị của bạn."</string>
     <string name="personal_profile_app_subtext" msgid="5586060806997067676">"Cá nhân"</string>
     <string name="work_profile_app_subtext" msgid="5043419461440127879">"Cơ quan"</string>
-    <string name="system_default_app_subtext" msgid="5212055189703164839">"Giá trị mặc định của hệ thống"</string>
+    <string name="system_default_app_subtext" msgid="5212055189703164839">"Theo chế độ mặc định của hệ thống"</string>
     <string name="select_invalid_bug_report_handler_toast_text" msgid="8857326334015386692">"Lựa chọn này không còn hợp lệ nữa. Hãy thử lại."</string>
     <string name="quick_controls_lower" msgid="6675573610027367819">"tùy chọn điều khiển thiết bị"</string>
     <string name="cards_passes_sentence" msgid="1866311782387946944">"Thẻ và vé"</string>
@@ -5446,6 +5410,10 @@
     <string name="cached_apps_freezer" msgid="1057519579761550350">"Tạm ngưng thực thi cho các ứng dụng được lưu vào bộ nhớ đệm"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"Cho phép phủ lên màn hình Cài đặt"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Những ứng dụng có thể hiển thị bên trên các ứng dụng khác sẽ được phép phủ lên màn hình Cài đặt"</string>
+    <!-- no translation found for allow_mock_modem (3832264806530479214) -->
+    <skip />
+    <!-- no translation found for allow_mock_modem_summary (9097416612748005374) -->
+    <skip />
     <string name="media_controls_title" msgid="403271085636252597">"Nội dung nghe nhìn"</string>
     <string name="media_controls_resume_title" msgid="855076860336652370">"Ghim trình phát nội dung nghe nhìn"</string>
     <string name="media_controls_resume_description" msgid="3163482266454802097">"Để nhanh chóng tiếp tục phát, trình phát nội dung nghe nhìn sẽ luôn mở trong phần Cài đặt nhanh"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 3a2aa12..70d17a6 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -142,10 +142,11 @@
     <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"允许您的设备与附近的蓝牙设备进行通信"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"允许您的手机与附近的蓝牙设备进行通信"</string>
     <string name="bluetooth_disable_a2dp_hw_offload" msgid="5942913792817797541">"停用蓝牙 A2DP 硬件卸载"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="8610420176339657720">"要重启设备吗?"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8333029144800835996">"您需要重启设备才能让这项设置更改生效。"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="3488695418187553566">"重启"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="4930826928585464191">"取消"</string>
+    <string name="bluetooth_disable_le_audio_hw_offload" msgid="3966022676505972908">"停用蓝牙 LE 音频硬件分流"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_title" msgid="6001142380445276918">"要重启设备吗?"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_message" msgid="1524373895333698779">"您需要重启设备才能让这项设置更改生效。"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_confirm" msgid="5594859658551707592">"重启"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel" msgid="3663690305043973720">"取消"</string>
     <string name="connected_device_media_device_title" msgid="3783388247594566734">"媒体设备"</string>
     <string name="connected_device_call_device_title" msgid="88732390601723608">"通话设备"</string>
     <string name="connected_device_other_device_title" msgid="4652120430615729193">"其他设备"</string>
@@ -309,9 +310,9 @@
     <string name="security_settings_title" msgid="6710768415432791970">"安全"</string>
     <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"加密与凭据"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"手机已加密"</string>
-    <string name="decryption_settings_summary" product="default" msgid="1742645256103613503">"手机未加密"</string>
+    <string name="not_encrypted_summary" product="default" msgid="2251945842585788254">"手机未加密"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"设备已加密"</string>
-    <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"设备未加密"</string>
+    <string name="not_encrypted_summary" product="tablet" msgid="2374263654698719382">"设备未加密"</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"锁定屏幕"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"要显示的内容"</string>
     <string name="security_settings_summary" msgid="1627059516127354233">"设置我的位置、屏幕解锁、SIM 卡锁定和凭据存储锁定"</string>
@@ -568,37 +569,10 @@
     <string name="fingerprint_last_delete_message" msgid="7860374760549404410">"您将无法使用指纹来解锁手机或在应用中验证自己的身份。"</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="4104208067277655068">"您将无法使用指纹来解锁自己的工作资料、对购买交易进行授权或登录工作应用。"</string>
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"是,移除"</string>
-    <string name="crypt_keeper_settings_title" msgid="4938812137822100044">"加密"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"加密平板电脑"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"加密手机"</string>
-    <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"已加密"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"您可以对自己的帐号、设置、下载的应用及其数据、媒体和其他文件进行加密。加密平板电脑后,如果您设置了屏幕锁定(即图案、数字PIN码或密码),那么您必须在每次开机时解锁屏幕,才能将平板电脑解密。除此之外,唯一的解密方法就是恢复出厂设置,但这会清除您所有的数据。\n\n加密过程至少需要1个小时的时间。在开始加密之前,您必须先将电池充满电,并让平板电脑在整个加密过程中保持电源接通状态。如果加密过程出现中断,您将丢失部分或所有数据。"</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"您可以对自己的帐号、设置、下载的应用及其数据、媒体和其他文件进行加密。加密手机后,如果您设置了屏幕锁定(即图案、数字PIN码或密码),那么您必须在每次开机时解锁屏幕,才能将手机解密。除此之外,唯一的解密方法就是恢复出厂设置,但这会清除您所有的数据。\n\n加密过程至少需要1个小时的时间。在开始加密之前,您必须先将电池充满电,并让手机在整个加密过程中保持电源接通状态。如果加密过程出现中断,您将丢失部分或所有数据。"</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"加密平板电脑"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"加密手机"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"请为电池充电,然后重试。"</string>
-    <string name="crypt_keeper_unplugged_text" msgid="2709721134148651329">"请插上充电器,然后重试。"</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="1847280235529858357">"没有锁屏PIN码或密码"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="7210616262954236042">"您需要先设置锁屏 PIN 码或密码,才能开始加密。"</string>
-    <string name="crypt_keeper_confirm_title" msgid="8600000209722452230">"要加密吗?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="3270587498436152259">"加密操作无法撤消,如果您中断该过程,则会丢失数据。加密过程需要1小时或更长时间,在此期间,平板电脑会重新启动数次。"</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="3040428543349852419">"加密操作无法撤消,如果您中断该过程,则会丢失数据。加密过程需要1小时或更长时间,在此期间,手机会重新启动数次。"</string>
-    <string name="crypt_keeper_setup_title" msgid="3339725741305796680">"正在加密"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="4417016995091289019">"正在加密您的平板电脑(已完成 <xliff:g id="PERCENT">^1</xliff:g>%),请耐心等待。"</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="7902355422499500352">"正在加密您的手机(已完成 <xliff:g id="PERCENT">^1</xliff:g>%),请耐心等待。"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="8348188415839917821">"您的平板电脑正在加密,请耐心等待。剩余时间:<xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="8556105766597855198">"您的手机正在加密,请耐心等待。剩余时间:<xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="3832496715430327682">"要解锁您的平板电脑,请将其关机然后再重启。"</string>
-    <string name="crypt_keeper_force_power_cycle" product="default" msgid="5070346039522135361">"要解锁您的手机,请将其关机然后再重启。"</string>
-    <string name="crypt_keeper_warn_wipe" msgid="8104921337301750394">"警告:如果解锁尝试再失败<xliff:g id="COUNT">^1</xliff:g>次,您的设备将被清空!"</string>
-    <string name="crypt_keeper_enter_password" msgid="1274917431075529732">"键入密码"</string>
-    <string name="crypt_keeper_failed_title" msgid="8173654570682244149">"加密失败"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"加密过程中断,无法完成。因此,您已无法再使用平板电脑上的数据。\n\n要继续使用您的平板电脑,您需要恢复出厂设置。恢复出厂设置后对平板电脑进行设置时,您可以将之前备份到Google帐号的所有数据恢复到平板电脑中。"</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"加密过程中断,无法完成。因此,您已无法再使用手机上的数据。\n\n要继续使用您的手机,您需要恢复出厂设置。恢复出厂设置后对手机进行设置时,您可以将之前备份到Google帐号的所有数据恢复到手机中。"</string>
-    <string name="crypt_keeper_data_corrupt_title" msgid="5920153462176846037">"解密失败"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"您输入的密码正确无误,但遗憾的是,您的数据已损坏。\n\n要继续使用您的平板电脑,您需要将其恢复出厂设置。对恢复出厂设置后的平板电脑进行设置时,您可以恢复之前备份到 Google 帐号的任何数据。"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"您输入的密码正确无误,但遗憾的是,您的数据已损坏。\n\n要继续使用您的手机,您需要将其恢复出厂设置。对恢复出厂设置后的手机进行设置时,您可以恢复之前备份到 Google 帐号的任何数据。"</string>
-    <string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"切换输入法"</string>
+    <string name="encryption_settings_title" msgid="2848716008695618360">"加密"</string>
+    <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"加密平板电脑"</string>
+    <string name="encrypt_title" product="default" msgid="7337365190988321100">"加密手机"</string>
+    <string name="encrypted_summary" msgid="545623487587251207">"已加密"</string>
     <string name="suggested_lock_settings_title" msgid="7836065447159730217">"保护手机的安全"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"设置屏幕锁定方式以保护平板电脑"</string>
     <string name="suggested_lock_settings_summary" product="device" msgid="8479766049078378225">"设置屏幕锁定方式以保护设备"</string>
@@ -817,6 +791,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"您可能还需要在另一设备上输入此PIN码。"</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"您可能还需要在另一台设备上输入此密钥。"</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"要与以下设备配对:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;请确保其显示的配对密钥为:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"确认与协调组配对"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"来自:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;要与此设备配对吗?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"要与 <xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> 设备配对,请在该设备上键入:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>,然后按回车键。"</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"允许访问您的通讯录和通话记录"</string>
@@ -850,6 +825,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"无法连接,请重试。"</string>
     <string name="device_details_title" msgid="1155622417516195481">"设备详细信息"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"设备的蓝牙地址:<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"设备的蓝牙地址:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"要与该设备取消配对吗?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"取消关联"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"要取消与该应用的关联吗?"</string>
@@ -881,6 +857,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"记住设置"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"已连接蓝牙音频设备的数量上限"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"选择已连接蓝牙音频设备的数量上限"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"NFC 堆栈调试日志"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"提高 NFC 堆栈记录等级"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"投射"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"镜像"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"开启无线显示"</string>
@@ -1188,6 +1166,8 @@
     <string name="wifi_hotspot_maximize_compatibility_dual_ap_summary" msgid="3579549223159056533">"这有助于其他设备发现此热点,但会增加耗电量。"</string>
     <string name="wifi_tether_starting" msgid="8879874184033857814">"正在打开热点..."</string>
     <string name="wifi_tether_stopping" msgid="4416492968019409188">"正在关闭热点..."</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_title" msgid="3089432578433978073">"网络共享不可用"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_content" msgid="5920421547607921112">"请联系您的运营商了解详情"</string>
     <string name="wifi_tether_enabled_subtext" msgid="5085002421099821056">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> 已连接"</string>
     <string name="wifi_tether_failed_subtext" msgid="437190628041885500">"便携式WLAN热点错误"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7072559431286459122">"设置WLAN热点"</string>
@@ -2534,11 +2514,6 @@
     <string name="enable_service_title" msgid="7231533866953706788">"要允许<xliff:g id="SERVICE">%1$s</xliff:g>完全控制您的设备吗?"</string>
     <string name="capabilities_list_title" msgid="1225853611983394386">"“<xliff:g id="SERVICE">%1$s</xliff:g>”需要:"</string>
     <string name="touch_filtered_warning" msgid="4225815157460318241">"由于某个应用遮挡了权限请求界面,因此“设置”应用无法验证您的回应。"</string>
-    <string name="enable_service_encryption_warning" msgid="931082737770453755">"如果您开启 <xliff:g id="SERVICE">%1$s</xliff:g>,您的设备将无法使用屏幕锁定来增强数据加密。"</string>
-    <string name="secure_lock_encryption_warning" msgid="669152607190123579">"由于您已开启无障碍服务,因此您的设备将无法使用屏幕锁定来增强数据加密。"</string>
-    <string name="enable_service_pattern_reason" msgid="6832846117817938536">"由于开启 <xliff:g id="SERVICE">%1$s</xliff:g> 会影响数据加密,因此您需要确认您的解锁图案。"</string>
-    <string name="enable_service_pin_reason" msgid="6040417014360237703">"由于开启 <xliff:g id="SERVICE">%1$s</xliff:g> 会影响数据加密,因此您需要确认您的 PIN 码。"</string>
-    <string name="enable_service_password_reason" msgid="6962544350351734238">"由于开启 <xliff:g id="SERVICE">%1$s</xliff:g> 会影响数据加密,因此您需要确认您的密码。"</string>
     <string name="accessibility_service_warning" msgid="6779187188736432618">"<xliff:g id="SERVICE">%1$s</xliff:g>正在请求完全控制此设备。该服务可以读取屏幕内容,并代表有无障碍需求的用户进行操作。这种控制级别不适合大多数应用。"</string>
     <string name="accessibility_service_warning_description" msgid="6573203795976134751">"对于能满足您的无障碍功能需求的应用,可授予其完全控制权限;但对大部分应用来说,都不适合授予此权限。"</string>
     <string name="accessibility_service_screen_control_title" msgid="324795030658109870">"查看和控制屏幕"</string>
@@ -3103,14 +3078,6 @@
     <string name="remove_account_failed" msgid="3709502163548900644">"您的管理员不允许进行这项更改"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"无法手动同步"</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"此项内容的同步功能目前未开启。要更改此设置,请暂时开启后台流量和自动同步功能。"</string>
-    <string name="enter_password" msgid="6327051330258595331">"要启动Android,请输入您的密码"</string>
-    <string name="enter_pin" msgid="1029287617551232681">"要启动Android,请输入您的PIN码"</string>
-    <string name="enter_pattern" msgid="1747316785866742960">"要启动Android,请绘制您的解锁图案"</string>
-    <string name="cryptkeeper_wrong_pattern" msgid="340747269176120242">"图案错误"</string>
-    <string name="cryptkeeper_wrong_password" msgid="7295607881887114486">"密码错误"</string>
-    <string name="cryptkeeper_wrong_pin" msgid="2347961593970714201">"PIN 码错误"</string>
-    <string name="checking_decryption" msgid="6111642972615688237">"正在检查…"</string>
-    <string name="starting_android" msgid="6694154070215356186">"正在启动 Android…"</string>
     <string name="delete" msgid="8330605554706263775">"删除"</string>
     <string name="misc_files" msgid="6598066985800749585">"其他文件"</string>
     <string name="misc_files_selected_count" msgid="5597802791672749532">"已选择 <xliff:g id="NUMBER">%1$d</xliff:g> 个,共 <xliff:g id="TOTAL">%2$d</xliff:g> 个"</string>
@@ -3206,8 +3173,6 @@
     <string name="data_usage_metered_yes" msgid="4262598072030135223">"按流量计费"</string>
     <string name="data_usage_metered_no" msgid="1685828958417926268">"不按流量计费"</string>
     <string name="data_usage_disclaimer" msgid="3271450299386176770">"运营商的流量计算方式可能与您设备的计算方式不同。"</string>
-    <string name="cryptkeeper_emergency_call" msgid="8369322820475703306">"紧急呼救"</string>
-    <string name="cryptkeeper_return_to_call" msgid="3857250752781151232">"返回通话"</string>
     <string name="vpn_name" msgid="3806456074909253262">"名称"</string>
     <string name="vpn_type" msgid="5533202873260826663">"类型"</string>
     <string name="vpn_server" msgid="2908816134941973935">"服务器地址"</string>
@@ -3938,10 +3903,10 @@
     <string name="no_notification_assistant" msgid="2533323397091834096">"无"</string>
     <string name="no_notification_listeners" msgid="2839354157349636000">"没有任何已安装的应用请求通知使用权。"</string>
     <string name="notification_access_detail_switch" msgid="46386786409608330">"授予通知使用权"</string>
-    <string name="notification_assistant_security_warning_title" msgid="2972346436050925276">"要向<xliff:g id="SERVICE">%1$s</xliff:g>授予通知使用权吗?"</string>
+    <string name="notification_assistant_security_warning_title" msgid="2972346436050925276">"要向“<xliff:g id="SERVICE">%1$s</xliff:g>”授予通知使用权吗?"</string>
     <string name="notification_assistant_security_warning_summary" msgid="4846559755787348129">"在 Android 12 中,增强型通知功能取代了 Android 自适应通知功能。增强型通知功能可以显示建议的操作和回复,并可将通知整理得井井有条。\n\n增强型通知功能可以访问通知内容,包括联系人名称和消息等个人信息。该功能还可以关闭或响应通知,例如接听来电以及控制勿扰模式。"</string>
-    <string name="notification_listener_security_warning_title" msgid="5791700876622858363">"要向<xliff:g id="SERVICE">%1$s</xliff:g>授予通知使用权吗?"</string>
-    <string name="notification_listener_security_warning_summary" msgid="3668606006326629153">"“<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g>”将可读取所有通知(包括联系人姓名和您收到的消息内容等个人信息),而且还能暂停/关闭通知或触发通知中的按钮(包括接听来电)。\n\n该应用因此还能开启或关闭“勿扰”模式,并可以更改相关设置。"</string>
+    <string name="notification_listener_security_warning_title" msgid="5791700876622858363">"要向“<xliff:g id="SERVICE">%1$s</xliff:g>”授予通知使用权吗?"</string>
+    <string name="notification_listener_security_warning_summary" msgid="3668606006326629153">"“<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g>”将可读取所有通知(包括联系人姓名和您收到的消息正文等个人信息),而且还能暂停/关闭通知或触发通知中的操作按钮(包括接听来电)。\n\n另外,此应用还将能开启或关闭勿扰模式,以及更改相关设置。"</string>
     <string name="notification_listener_disable_warning_summary" msgid="8373396293802088961">"如果您停用<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g>的通知使用权,勿扰模式的使用权可能也会遭到停用。"</string>
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"停用"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"取消"</string>
@@ -4764,8 +4729,6 @@
       <item quantity="one">1 个应用可以无限量使用流量</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"查看更多"</string>
-    <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"您真的要清除用户数据并转换为文件加密吗?"</string>
-    <string name="button_confirm_convert_fbe" msgid="339648921918438106">"清除并转换"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"重置 ShortcutManager 调用频率限制"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"已重置 ShortcutManager 调用频率限制"</string>
     <string name="notification_suggestion_title" msgid="6309263655965785411">"控制锁定屏幕上显示的信息"</string>
@@ -5292,6 +5255,7 @@
     <string name="sim_action_yes" msgid="8076556020131395515">"是"</string>
     <string name="sim_action_reboot" msgid="3508948833333441538">"重启"</string>
     <string name="sim_action_no_thanks" msgid="435717748384544195">"不用了"</string>
+    <string name="sim_action_cancel" msgid="2668099867029610910">"取消"</string>
     <string name="sim_switch_button" msgid="1405772571706095387">"切换"</string>
     <string name="dsds_activation_failure_title" msgid="4467364110584914794">"无法激活 SIM 卡"</string>
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"请取出 SIM 卡,然后重新插入。如果问题仍然存在,请重启您的设备。"</string>
@@ -5444,6 +5408,10 @@
     <string name="cached_apps_freezer" msgid="1057519579761550350">"暂停执行已缓存的应用"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"允许在“设置”上重叠显示"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"允许可在其他应用上层显示的应用重叠显示在“设置”屏幕上"</string>
+    <!-- no translation found for allow_mock_modem (3832264806530479214) -->
+    <skip />
+    <!-- no translation found for allow_mock_modem_summary (9097416612748005374) -->
+    <skip />
     <string name="media_controls_title" msgid="403271085636252597">"媒体"</string>
     <string name="media_controls_resume_title" msgid="855076860336652370">"固定媒体播放器"</string>
     <string name="media_controls_resume_description" msgid="3163482266454802097">"为了方便您快速恢复播放,媒体播放器会在“快捷设置”中保持打开状态"</string>
@@ -5553,7 +5521,7 @@
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"缺少电话号码。"</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"确定"</string>
     <string name="enable_2g_title" msgid="8184757884636162942">"允许启用 2G"</string>
-    <string name="enable_2g_summary" msgid="906487478332145407">"使用 2G 移动网络连接。拨打紧急电话时,2G 网络将始终保持开启状态。"</string>
+    <string name="enable_2g_summary" msgid="906487478332145407">"使用 2G 移动网络连接。您始终都能通过 2G 网络拨打紧急电话。"</string>
     <string name="show_clip_access_notification" msgid="7782300987639778542">"显示剪贴板访问通知"</string>
     <string name="show_clip_access_notification_summary" msgid="474090757777203207">"系统会在应用访问您复制的文字、图片或其他内容时显示一条消息"</string>
     <string name="all_apps" msgid="3054120149509114789">"所有应用"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 5ebad90..65462ca 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -142,10 +142,11 @@
     <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"允許您的裝置與附近的藍牙裝置通訊"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"允許您的手機與附近的藍牙裝置通訊"</string>
     <string name="bluetooth_disable_a2dp_hw_offload" msgid="5942913792817797541">"停用藍牙 A2DP 硬件卸載功能"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="8610420176339657720">"要重新啟動裝置嗎?"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8333029144800835996">"您需要重新啟動裝置,才可變更此設定。"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="3488695418187553566">"重新啟動"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="4930826928585464191">"取消"</string>
+    <string name="bluetooth_disable_le_audio_hw_offload" msgid="3966022676505972908">"停用藍牙 LE AUDIO 硬件卸載功能"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_title" msgid="6001142380445276918">"要重新啟動裝置嗎?"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_message" msgid="1524373895333698779">"您需要重新啟動裝置,才可變更此設定。"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_confirm" msgid="5594859658551707592">"重新開始"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel" msgid="3663690305043973720">"取消"</string>
     <string name="connected_device_media_device_title" msgid="3783388247594566734">"媒體裝置"</string>
     <string name="connected_device_call_device_title" msgid="88732390601723608">"通話裝置"</string>
     <string name="connected_device_other_device_title" msgid="4652120430615729193">"其他裝置"</string>
@@ -298,8 +299,8 @@
     <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"使用位置"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"關閉"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
-      <item quantity="other">開 - <xliff:g id="COUNT_1">%1$d</xliff:g> 個應用程式可存取位置資訊</item>
-      <item quantity="one">開 - <xliff:g id="COUNT_0">%1$d</xliff:g> 個應用程式可存取位置資訊</item>
+      <item quantity="other">已開啟 - <xliff:g id="COUNT_1">%1$d</xliff:g> 個應用程式可存取位置資訊</item>
+      <item quantity="one">已開啟 - <xliff:g id="COUNT_0">%1$d</xliff:g> 個應用程式可存取位置資訊</item>
     </plurals>
     <string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"正在載入…"</string>
     <string name="location_settings_footer_general" msgid="1040507068701188821">"應用程式如可存取附近的裝置,就能判斷已連接裝置的相對位置。"</string>
@@ -309,9 +310,9 @@
     <string name="security_settings_title" msgid="6710768415432791970">"安全性"</string>
     <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"加密和憑證"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"手機已加密"</string>
-    <string name="decryption_settings_summary" product="default" msgid="1742645256103613503">"手機未加密"</string>
+    <string name="not_encrypted_summary" product="default" msgid="2251945842585788254">"手機未加密"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"裝置已加密"</string>
-    <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"裝置未加密"</string>
+    <string name="not_encrypted_summary" product="tablet" msgid="2374263654698719382">"裝置未加密"</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"上鎖畫面"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"顯示內容"</string>
     <string name="security_settings_summary" msgid="1627059516127354233">"設定我的位置、畫面解鎖、SIM 卡鎖定、認證儲存空間鎖定"</string>
@@ -488,7 +489,7 @@
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"手指重覆按壓,記錄指紋各個部分"</string>
     <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"每次指紋圖示移動時按住。此操作可擷取您更完整的指紋。"</string>
     <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"將指尖放在感應器上"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="6137605344819152477">"最後,請將手指邊緣放上感應器"</string>
+    <string name="security_settings_udfps_enroll_edge_title" msgid="6137605344819152477">"最後記錄手指邊緣指紋"</string>
     <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"將指紋一側放在感應器上並按住,然後轉換另一側"</string>
     <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"此操作可擷取您更完整的指紋"</string>
     <!-- String.format failed for translation -->
@@ -570,37 +571,10 @@
     <string name="fingerprint_last_delete_message" msgid="7860374760549404410">"您將無法使用指紋解鎖或在應用程式中驗證您的身分。"</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="4104208067277655068">"您將無法使用指紋解鎖工作設定檔、授權購物,或登入工作應用程式。"</string>
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"是,移除"</string>
-    <string name="crypt_keeper_settings_title" msgid="4938812137822100044">"加密"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"對平板電腦進行加密"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"將手機加密"</string>
-    <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"已加密"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"您的帳戶、設定、已下載應用程式及其資料、媒體和其他檔案皆可加密。將平板電腦加密後,系統會套用螢幕鎖定 (即解鎖圖案、數字 PIN 或密碼),您必須在每次開機時解除螢幕鎖定,才能將平板電腦解密。除此之外,唯一的解密方法是將平板電腦回復原廠設定,清除其中所有資料。\n\n加密程序可能需要一個多小時才能完成。開始執行加密程序前,電池必須充滿,而平板電腦在加密過程中必須全程連接電源。如果中斷程序,您將遺失部分或所有資料"</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"您的帳戶、設定、已下載應用程式及其資料、媒體和其他檔案皆可加密。將手機加密後,系統會套用螢幕鎖定 (即解鎖圖案、數字 PIN 或密碼),您必須在每次開機時解除螢幕鎖定,才能將手機解密。除此之外,唯一的解密方法是將手機回復原廠設定,清除其中所有資料。\n\n加密程序可能需要一個多小時才能完成。開始執行加密程序前,電池必須充滿,而手機在加密過程中必須全程連接電源。如果中斷程序,您將遺失部分或所有資料。"</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"對平板電腦加密"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"將手機加密"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"請將電池充電,然後再試一次。"</string>
-    <string name="crypt_keeper_unplugged_text" msgid="2709721134148651329">"請插上充電器,然後再試一次。"</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="1847280235529858357">"沒有鎖定螢幕的 PIN 或密碼"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="7210616262954236042">"您必須先設定鎖定螢幕的 PIN 或密碼,才能開始加密。"</string>
-    <string name="crypt_keeper_confirm_title" msgid="8600000209722452230">"加密?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="3270587498436152259">"您無法取消加密操作,如果過程中斷,將會失去資料。加密程序需時 1 個小時或以上,您的平板電腦會在過程中重新啟動數次。"</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="3040428543349852419">"您無法取消加密操作,如果過程中斷,將會失去資料。加密程序需時 1 個小時或以上,您的手機會在過程中重新啟動數次。"</string>
-    <string name="crypt_keeper_setup_title" msgid="3339725741305796680">"加密中"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="4417016995091289019">"平板電腦正在進行加密,請稍候 (已完成 <xliff:g id="PERCENT">^1</xliff:g>%)。"</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="7902355422499500352">"手機正在進行加密,請稍候 (已完成 <xliff:g id="PERCENT">^1</xliff:g>%)。"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="8348188415839917821">"平板電腦加密作業正在進行中,請稍候 (剩餘時間:<xliff:g id="DURATION">^1</xliff:g>)"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="8556105766597855198">"手機加密作業正在進行中,請稍候 (剩餘時間:<xliff:g id="DURATION">^1</xliff:g>)"</string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="3832496715430327682">"如要解鎖您的平板電腦,請先將其關閉再開啟。"</string>
-    <string name="crypt_keeper_force_power_cycle" product="default" msgid="5070346039522135361">"如要解鎖您的手機,請先將其關閉再開啟。"</string>
-    <string name="crypt_keeper_warn_wipe" msgid="8104921337301750394">"警告:解鎖嘗試次數只剩 <xliff:g id="COUNT">^1</xliff:g> 次!如果持續失敗,您的裝置將被清除。"</string>
-    <string name="crypt_keeper_enter_password" msgid="1274917431075529732">"輸入密碼"</string>
-    <string name="crypt_keeper_failed_title" msgid="8173654570682244149">"加密失敗"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"加密程序中斷且未完成,因此您無法再存取平板電腦上的資料。\n\n如要繼續使用平板電腦,您必須恢復原廠設定。完成重設後,您可以在設定平板電腦時,還原先前備份至「Google 帳戶」的資料。"</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"加密程序中斷且未完成,因此您無法再存取手機上的資料。\n\n如要繼續使用手機,您必須恢復原廠設定。完成重設後,您可以在設定手機時,還原先前備份至「Google 帳戶」的資料。"</string>
-    <string name="crypt_keeper_data_corrupt_title" msgid="5920153462176846037">"解密失敗"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"您輸入的密碼正確,不過您的數據已損毀。\n\n如要繼續使用,您必須將平板電腦恢復原廠設定。經過重設後,您可以在設定平板電腦時將早前備份到個人 Google 帳戶的數據全部還原。"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"您輸入的密碼正確,不過您的數據已損毀。\n\n如要繼續使用,您必須將手機恢復原廠設定。經過重設後,您可以在設定手機時將早前備份到個人 Google 帳戶的數據全部還原。"</string>
-    <string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"切換輸入法"</string>
+    <string name="encryption_settings_title" msgid="2848716008695618360">"加密"</string>
+    <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"將平板電腦加密"</string>
+    <string name="encrypt_title" product="default" msgid="7337365190988321100">"將手機加密"</string>
+    <string name="encrypted_summary" msgid="545623487587251207">"已加密"</string>
     <string name="suggested_lock_settings_title" msgid="7836065447159730217">"保護手機安全"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"設定螢幕鎖定以保護平板電腦"</string>
     <string name="suggested_lock_settings_summary" product="device" msgid="8479766049078378225">"設定螢幕鎖定以保護裝置"</string>
@@ -819,6 +793,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"您可能也必須在另一部裝置上輸入這個 PIN 碼。"</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"您可能也必須在另一部裝置上輸入這個密碼金鑰。"</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"如要與下列裝置配對:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;請確認該裝置是否顯示下列密碼金鑰:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"確認與協調組合配對"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"來自:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;要與這部裝置配對嗎?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"如要與 <xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> 配對,請在該裝置上輸入:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>,然後按 Return 或 Enter 鍵。"</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"允許存取您的聯絡人和通話記錄"</string>
@@ -852,6 +827,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"無法連線,請再試一次。"</string>
     <string name="device_details_title" msgid="1155622417516195481">"裝置詳情"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"裝置的藍牙位址:<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"裝置的藍牙位址:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"要忘記裝置嗎?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"移除關聯"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"要解除連結應用程式嗎?"</string>
@@ -883,6 +859,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"記住設定"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"連接藍牙音訊裝置的數量上限"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"選取已連接藍牙音訊裝置的數量上限"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"NFC 堆疊偵錯記錄"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"提高 NFC 堆疊記錄等級"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"投放"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"鏡像"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"啟用無線螢幕分享"</string>
@@ -1190,6 +1168,8 @@
     <string name="wifi_hotspot_maximize_compatibility_dual_ap_summary" msgid="3579549223159056533">"協助其他裝置尋找此熱點。這會增加電池用量。"</string>
     <string name="wifi_tether_starting" msgid="8879874184033857814">"正在開啟熱點…"</string>
     <string name="wifi_tether_stopping" msgid="4416492968019409188">"正在關閉熱點…"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_title" msgid="3089432578433978073">"不支援網絡共享功能"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_content" msgid="5920421547607921112">"詳情請聯絡流動網絡供應商"</string>
     <string name="wifi_tether_enabled_subtext" msgid="5085002421099821056">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> 使用中"</string>
     <string name="wifi_tether_failed_subtext" msgid="437190628041885500">"可攜式 Wi-Fi 熱點發生錯誤"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7072559431286459122">"設定 Wi-Fi 熱點"</string>
@@ -2537,11 +2517,6 @@
     <string name="enable_service_title" msgid="7231533866953706788">"要允許 <xliff:g id="SERVICE">%1$s</xliff:g> 完全控制您的裝置嗎?"</string>
     <string name="capabilities_list_title" msgid="1225853611983394386">"「<xliff:g id="SERVICE">%1$s</xliff:g>」需要:"</string>
     <string name="touch_filtered_warning" msgid="4225815157460318241">"由於有應用程式阻礙權限請求,「設定」無法驗證您的回覆。"</string>
-    <string name="enable_service_encryption_warning" msgid="931082737770453755">"如果您開啟<xliff:g id="SERVICE">%1$s</xliff:g>,您的裝置將不能透過螢幕鎖定加強資料加密。"</string>
-    <string name="secure_lock_encryption_warning" msgid="669152607190123579">"因為您已開啟無障礙功能,您的裝置將不能透過螢幕鎖定加強資料加密。"</string>
-    <string name="enable_service_pattern_reason" msgid="6832846117817938536">"開啟 <xliff:g id="SERVICE">%1$s</xliff:g> 將影響您的資料加密強度,因此您需要確認解鎖圖案。"</string>
-    <string name="enable_service_pin_reason" msgid="6040417014360237703">"開啟 <xliff:g id="SERVICE">%1$s</xliff:g> 將影響您的資料加密強度,因此您需要確認 PIN。"</string>
-    <string name="enable_service_password_reason" msgid="6962544350351734238">"開啟 <xliff:g id="SERVICE">%1$s</xliff:g> 將影響您的資料加密強度,因此您需要確認密碼。"</string>
     <string name="accessibility_service_warning" msgid="6779187188736432618">"<xliff:g id="SERVICE">%1$s</xliff:g>正在要求完全控制此裝置。此服務可以讀取畫面,並代表需要使用無障礙功能的使用者執行動作。這種程度的控制不適用於大部分應用程式。"</string>
     <string name="accessibility_service_warning_description" msgid="6573203795976134751">"為您提供所需無障礙功能的應用程式有權完全控制您的裝置,但大部分應用程式均沒有此權限。"</string>
     <string name="accessibility_service_screen_control_title" msgid="324795030658109870">"查看和控制螢幕"</string>
@@ -3106,14 +3081,6 @@
     <string name="remove_account_failed" msgid="3709502163548900644">"您的管理員不允許這項變更"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"無法手動同步處理"</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"這個項目的同步處理功能已停用。如要更改此設定,請暫時開啟背景資料與自動同步處理功能。"</string>
-    <string name="enter_password" msgid="6327051330258595331">"如要啟動 Android,請輸入密碼"</string>
-    <string name="enter_pin" msgid="1029287617551232681">"如要啟動 Android,請輸入您的 PIN"</string>
-    <string name="enter_pattern" msgid="1747316785866742960">"如要啟動 Android,請畫出解鎖圖案"</string>
-    <string name="cryptkeeper_wrong_pattern" msgid="340747269176120242">"圖形不對"</string>
-    <string name="cryptkeeper_wrong_password" msgid="7295607881887114486">"密碼錯誤"</string>
-    <string name="cryptkeeper_wrong_pin" msgid="2347961593970714201">"PIN 錯誤"</string>
-    <string name="checking_decryption" msgid="6111642972615688237">"正在檢查…"</string>
-    <string name="starting_android" msgid="6694154070215356186">"正在啟動 Android…"</string>
     <string name="delete" msgid="8330605554706263775">"刪除"</string>
     <string name="misc_files" msgid="6598066985800749585">"其他檔案"</string>
     <string name="misc_files_selected_count" msgid="5597802791672749532">"已選取 <xliff:g id="NUMBER">%1$d</xliff:g> 個,共 <xliff:g id="TOTAL">%2$d</xliff:g> 個"</string>
@@ -3209,8 +3176,6 @@
     <string name="data_usage_metered_yes" msgid="4262598072030135223">"按用量收費"</string>
     <string name="data_usage_metered_no" msgid="1685828958417926268">"非按用量收費"</string>
     <string name="data_usage_disclaimer" msgid="3271450299386176770">"流動網絡供應商的數據計算方式可能與裝置有所不同。"</string>
-    <string name="cryptkeeper_emergency_call" msgid="8369322820475703306">"緊急電話"</string>
-    <string name="cryptkeeper_return_to_call" msgid="3857250752781151232">"返回通話"</string>
     <string name="vpn_name" msgid="3806456074909253262">"名稱"</string>
     <string name="vpn_type" msgid="5533202873260826663">"類型"</string>
     <string name="vpn_server" msgid="2908816134941973935">"伺服器位址"</string>
@@ -4767,8 +4732,6 @@
       <item quantity="one">1 個應用程式可使用無限數據</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"查看更多"</string>
-    <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"您確定要清除使用者資料並轉換為加密檔案嗎?"</string>
-    <string name="button_confirm_convert_fbe" msgid="339648921918438106">"清除並轉換"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"重設 ShortcutManager 的速率限制"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"已重設 ShortcutManager 的速率限制"</string>
     <string name="notification_suggestion_title" msgid="6309263655965785411">"控制上鎖畫面上顯示的資料"</string>
@@ -5295,6 +5258,7 @@
     <string name="sim_action_yes" msgid="8076556020131395515">"是"</string>
     <string name="sim_action_reboot" msgid="3508948833333441538">"重新開始"</string>
     <string name="sim_action_no_thanks" msgid="435717748384544195">"不用了,謝謝"</string>
+    <string name="sim_action_cancel" msgid="2668099867029610910">"取消"</string>
     <string name="sim_switch_button" msgid="1405772571706095387">"切換"</string>
     <string name="dsds_activation_failure_title" msgid="4467364110584914794">"無法啟用 SIM 卡"</string>
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"請移除 SIM 卡再重新插入。如果問題持續發生,請重新啟動裝置。"</string>
@@ -5447,6 +5411,10 @@
     <string name="cached_apps_freezer" msgid="1057519579761550350">"暫停執行快取應用程式"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"允許在「設定」上顯示重疊式畫面"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"允許可以在其他應用程式上顯示内容的應用程式重疊「設定」畫面"</string>
+    <!-- no translation found for allow_mock_modem (3832264806530479214) -->
+    <skip />
+    <!-- no translation found for allow_mock_modem_summary (9097416612748005374) -->
+    <skip />
     <string name="media_controls_title" msgid="403271085636252597">"媒體"</string>
     <string name="media_controls_resume_title" msgid="855076860336652370">"固定媒體播放器"</string>
     <string name="media_controls_resume_description" msgid="3163482266454802097">"如要快速恢復播放,請讓「快速設定」中的媒體播放器保持開啟"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 57c09d1..dea2850 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -142,10 +142,11 @@
     <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"允許你的裝置與附近的藍牙裝置進行通訊"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"允許你的手機與附近的藍牙裝置進行通訊"</string>
     <string name="bluetooth_disable_a2dp_hw_offload" msgid="5942913792817797541">"停用藍牙 A2DP 硬體卸載"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="8610420176339657720">"要重新啟動裝置嗎?"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8333029144800835996">"你必須重新啟動裝置才能變更這項設定。"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="3488695418187553566">"重新啟動"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="4930826928585464191">"取消"</string>
+    <string name="bluetooth_disable_le_audio_hw_offload" msgid="3966022676505972908">"停用藍牙低功耗音訊硬體卸載"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_title" msgid="6001142380445276918">"要重新啟動裝置嗎?"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_message" msgid="1524373895333698779">"你必須重新啟動裝置才能變更這項設定。"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_confirm" msgid="5594859658551707592">"重新啟動"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel" msgid="3663690305043973720">"取消"</string>
     <string name="connected_device_media_device_title" msgid="3783388247594566734">"媒體裝置"</string>
     <string name="connected_device_call_device_title" msgid="88732390601723608">"通話裝置"</string>
     <string name="connected_device_other_device_title" msgid="4652120430615729193">"其他裝置"</string>
@@ -309,9 +310,9 @@
     <string name="security_settings_title" msgid="6710768415432791970">"安全性"</string>
     <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"加密和憑證"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"電話已加密"</string>
-    <string name="decryption_settings_summary" product="default" msgid="1742645256103613503">"手機未經加密處理"</string>
+    <string name="not_encrypted_summary" product="default" msgid="2251945842585788254">"手機未加密保護"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"裝置已加密"</string>
-    <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"裝置未經加密處理"</string>
+    <string name="not_encrypted_summary" product="tablet" msgid="2374263654698719382">"裝置未加密保護"</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"螢幕鎖定畫面"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"要顯示的項目"</string>
     <string name="security_settings_summary" msgid="1627059516127354233">"設定我的位置、畫面解鎖、SIM 卡鎖定、認證儲存空間鎖定"</string>
@@ -570,37 +571,10 @@
     <string name="fingerprint_last_delete_message" msgid="7860374760549404410">"你將無法使用指紋解鎖手機或在應用程式中驗證身分。"</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="4104208067277655068">"你將無法使用指紋解鎖工作資料夾、授權購買交易,或是登入工作應用程式。"</string>
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"是,移除"</string>
-    <string name="crypt_keeper_settings_title" msgid="4938812137822100044">"加密"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"加密保護平板電腦"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"加密保護手機"</string>
-    <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"已加密"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"你可以對自己的帳戶、設定、下載的應用程式及其資料、媒體和其他檔案進行加密。加密平板電腦後,如果你設定了螢幕鎖定 (即圖案、PIN 或密碼),那麼你必須在每次開機時解鎖螢幕,才能將平板電腦解密。除此之外,唯一的解密方法是將平板電腦恢復原廠設定,但這會清除你所有的資料。\n\n加密過程至少需要1個小時的時間。開始執行加密程序前,你必須先將電池充飽,並讓平板電腦在加密過程中全程連接電源。如果中斷程序,你將遺失部分或所有資料。"</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"你可以對自己的帳戶、設定、下載的應用程式及其資料、媒體和其他檔案進行加密。加密手機後,如果你設定了螢幕鎖定 (即圖案、PIN 或密碼),那麼你必須在每次開機時解鎖螢幕,才能將手機解密。除此之外,唯一的解密方法是將手機恢復原廠設定,但這會清除你所有的資料。\n\n加密過程至少需要1個小時的時間。開始執行加密程序前,你必須先將電池充飽,並讓手機在加密過程中全程連接電源。如果中斷程序,你將遺失部分或所有資料。"</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"加密保護平板電腦"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"加密保護手機"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"將電池充電,然後再試一次。"</string>
-    <string name="crypt_keeper_unplugged_text" msgid="2709721134148651329">"連接充電器,再試一次。"</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="1847280235529858357">"沒有鎖定螢幕的 PIN 或密碼"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="7210616262954236042">"你必須先設定鎖定螢幕的 PIN 或密碼,才能開始加密。"</string>
-    <string name="crypt_keeper_confirm_title" msgid="8600000209722452230">"加密?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="3270587498436152259">"你無法取消加密操作,如果過程中斷,資料將會遺失。加密過程可能需要 1 個小時以上的時間,你的平板電腦會在過程中重新啟動數次。"</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="3040428543349852419">"你無法取消加密操作,如果過程中斷,資料將會遺失。加密過程可能需要 1 個小時以上的時間,你的手機會在過程中重新啟動數次。"</string>
-    <string name="crypt_keeper_setup_title" msgid="3339725741305796680">"加密中"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="4417016995091289019">"平板電腦正在進行加密,請稍候 (已完成 <xliff:g id="PERCENT">^1</xliff:g>%)。"</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="7902355422499500352">"正在對手機加密,請稍候 (已完成 <xliff:g id="PERCENT">^1</xliff:g>%)。"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="8348188415839917821">"平板電腦加密作業正在進行中,請稍候 (剩餘時間:<xliff:g id="DURATION">^1</xliff:g>)"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="8556105766597855198">"手機加密作業正在進行中,請稍候 (剩餘時間:<xliff:g id="DURATION">^1</xliff:g>)"</string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="3832496715430327682">"如要將平板電腦解除鎖定,請關閉平板電腦後再開機。"</string>
-    <string name="crypt_keeper_force_power_cycle" product="default" msgid="5070346039522135361">"如要將手機解除鎖定,請關閉手機後再開機。"</string>
-    <string name="crypt_keeper_warn_wipe" msgid="8104921337301750394">"警告:解鎖嘗試次數還剩 <xliff:g id="COUNT">^1</xliff:g> 次!如果持續失敗,你的裝置將會遭到清除。"</string>
-    <string name="crypt_keeper_enter_password" msgid="1274917431075529732">"輸入密碼"</string>
-    <string name="crypt_keeper_failed_title" msgid="8173654570682244149">"加密失敗"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"加密過程中斷,無法完成,因此你再也不能存取平板電腦上的資料。\n\n如要恢復使用平板電腦,請先將平板電腦重設回原廠設定。完成重設後,你可以在設定平板電腦時,將先前備份至「Google 帳戶」的資料全部還原。"</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"加密過程中斷,無法完成,因此你再也不能存取手機上的資料。\n\n如要恢復使用手機,請先將手機重設回原廠設定。完成重設後,你可以在設定手機時,將先前備份至「Google 帳戶」的資料全部還原。"</string>
-    <string name="crypt_keeper_data_corrupt_title" msgid="5920153462176846037">"解密失敗"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"你所輸入的密碼正確,但你的資料已毀損。\n\n如要繼續使用平板電腦,請將該裝置重設為原廠設定。重設完成後,當你對平板電腦進行設定時,可以將備份在個人 Google 帳戶中的資料全部還原。"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"你所輸入的密碼正確,但你的資料已毀損。\n\n如要繼續使用手機,請將該裝置重設為原廠設定。重設完成後,當你對手機進行設定時,可以將備份在個人 Google 帳戶中的資料全部還原。"</string>
-    <string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"切換輸入法"</string>
+    <string name="encryption_settings_title" msgid="2848716008695618360">"加密"</string>
+    <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"加密保護平板電腦"</string>
+    <string name="encrypt_title" product="default" msgid="7337365190988321100">"加密保護手機"</string>
+    <string name="encrypted_summary" msgid="545623487587251207">"已加密"</string>
     <string name="suggested_lock_settings_title" msgid="7836065447159730217">"保護手機安全"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"設定螢幕鎖定以保護平板電腦"</string>
     <string name="suggested_lock_settings_summary" product="device" msgid="8479766049078378225">"設定螢幕鎖定以保護裝置"</string>
@@ -819,6 +793,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"你可能也必須在另一個裝置上輸入這個 PIN。"</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"你可能也必須在另一個裝置上輸入這個密碼金鑰。"</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"如要與下列裝置配對:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;請確認該裝置是否顯示下列密碼金鑰:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"確認與協同組配對"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"來自:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;要與這個裝置配對嗎?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"如要與 <xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> 配對,請輸入:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>,然後按下 [返回] 或 [輸入]。"</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"允許存取你的聯絡人和通話記錄"</string>
@@ -852,6 +827,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"無法連線,請再試一次。"</string>
     <string name="device_details_title" msgid="1155622417516195481">"裝置詳細資料"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"裝置的藍牙位址:<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"裝置的藍牙位址:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"要移除裝置嗎?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"移除關聯"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"要解除連結應用程式嗎?"</string>
@@ -883,6 +859,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"記住設定"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"已連線藍牙音訊裝置的數量上限"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"選取已連線藍牙音訊裝置的數量上限"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"NFC 堆疊偵錯記錄"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"提高 NFC 堆疊記錄等級"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"投放"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"鏡像"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"啟用無線螢幕分享"</string>
@@ -1190,6 +1168,8 @@
     <string name="wifi_hotspot_maximize_compatibility_dual_ap_summary" msgid="3579549223159056533">"讓其他裝置較容易找到這個無線基地台。請注意,開啟這項設定會增加電池用量。"</string>
     <string name="wifi_tether_starting" msgid="8879874184033857814">"正在開啟無線基地台…"</string>
     <string name="wifi_tether_stopping" msgid="4416492968019409188">"正在關閉無線基地台…"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_title" msgid="3089432578433978073">"不支援網路共用功能"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_content" msgid="5920421547607921112">"如要瞭解詳情,請洽詢你的電信業者"</string>
     <string name="wifi_tether_enabled_subtext" msgid="5085002421099821056">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> 使用中"</string>
     <string name="wifi_tether_failed_subtext" msgid="437190628041885500">"可攜式 Wi-Fi 無線基地台發生錯誤"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7072559431286459122">"設定 Wi-Fi 無線基地台"</string>
@@ -2536,11 +2516,6 @@
     <string name="enable_service_title" msgid="7231533866953706788">"要將裝置的完整控制權授予「<xliff:g id="SERVICE">%1$s</xliff:g>」嗎?"</string>
     <string name="capabilities_list_title" msgid="1225853611983394386">"「<xliff:g id="SERVICE">%1$s</xliff:g>」需要執行下列動作:"</string>
     <string name="touch_filtered_warning" msgid="4225815157460318241">"權限要求遭到其他應用程式畫面遮掩,因此「設定」無法驗證你的回應。"</string>
-    <string name="enable_service_encryption_warning" msgid="931082737770453755">"如果你開啟 <xliff:g id="SERVICE">%1$s</xliff:g>,你的裝置將無法使用螢幕鎖定加強資料加密。"</string>
-    <string name="secure_lock_encryption_warning" msgid="669152607190123579">"你已開啟無障礙服務,因此你的裝置無法使用螢幕鎖定加強資料加密。"</string>
-    <string name="enable_service_pattern_reason" msgid="6832846117817938536">"開啟 <xliff:g id="SERVICE">%1$s</xliff:g> 將影響資料加密,因此你必須畫出解鎖圖案。"</string>
-    <string name="enable_service_pin_reason" msgid="6040417014360237703">"開啟 <xliff:g id="SERVICE">%1$s</xliff:g> 將影響資料加密,因此你必須輸入 PIN。"</string>
-    <string name="enable_service_password_reason" msgid="6962544350351734238">"開啟 <xliff:g id="SERVICE">%1$s</xliff:g> 將影響資料加密,因此你必須輸入密碼。"</string>
     <string name="accessibility_service_warning" msgid="6779187188736432618">"<xliff:g id="SERVICE">%1$s</xliff:g>要求這個裝置的完整控制權。如果你授予相關權限,該服務就能讀取畫面內容及執行動作,以協助需要無障礙服務的使用者。這個等級的控制權不適用於大多數應用程式。"</string>
     <string name="accessibility_service_warning_description" msgid="6573203795976134751">"如果你有無障礙服務需求,可以將完整控制權授予具有相關功能的應用程式,但請勿將完整控制權授予大多數的應用程式。"</string>
     <string name="accessibility_service_screen_control_title" msgid="324795030658109870">"查看及控制螢幕"</string>
@@ -3105,14 +3080,6 @@
     <string name="remove_account_failed" msgid="3709502163548900644">"你的管理員不允許這項變更"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"無法手動同步處理"</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"這個項目的同步處理功能已停用。如要變更這項設定,請暫時開啟背景資料與自動同步處理功能。"</string>
-    <string name="enter_password" msgid="6327051330258595331">"如要啟動 Android,請輸入你的密碼"</string>
-    <string name="enter_pin" msgid="1029287617551232681">"如要啟動 Android,請輸入你的 PIN"</string>
-    <string name="enter_pattern" msgid="1747316785866742960">"如要啟動 Android,請畫出解鎖圖案"</string>
-    <string name="cryptkeeper_wrong_pattern" msgid="340747269176120242">"圖案錯誤"</string>
-    <string name="cryptkeeper_wrong_password" msgid="7295607881887114486">"密碼錯誤"</string>
-    <string name="cryptkeeper_wrong_pin" msgid="2347961593970714201">"PIN 碼錯誤"</string>
-    <string name="checking_decryption" msgid="6111642972615688237">"檢查中…"</string>
-    <string name="starting_android" msgid="6694154070215356186">"正在啟動 Android…"</string>
     <string name="delete" msgid="8330605554706263775">"刪除"</string>
     <string name="misc_files" msgid="6598066985800749585">"其他檔案"</string>
     <string name="misc_files_selected_count" msgid="5597802791672749532">"已選取 <xliff:g id="NUMBER">%1$d</xliff:g> 個,共 <xliff:g id="TOTAL">%2$d</xliff:g> 個"</string>
@@ -3208,8 +3175,6 @@
     <string name="data_usage_metered_yes" msgid="4262598072030135223">"計量付費"</string>
     <string name="data_usage_metered_no" msgid="1685828958417926268">"非按傳輸量計費"</string>
     <string name="data_usage_disclaimer" msgid="3271450299386176770">"電信業者與裝置的數據計算方式可能有所不同。"</string>
-    <string name="cryptkeeper_emergency_call" msgid="8369322820475703306">"緊急電話"</string>
-    <string name="cryptkeeper_return_to_call" msgid="3857250752781151232">"返回通話"</string>
     <string name="vpn_name" msgid="3806456074909253262">"名稱"</string>
     <string name="vpn_type" msgid="5533202873260826663">"類型"</string>
     <string name="vpn_server" msgid="2908816134941973935">"伺服器位址"</string>
@@ -4766,8 +4731,6 @@
       <item quantity="one">1 個應用程式不受數據用量限制</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"查看更多項目"</string>
-    <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"確定要清除使用者資料並轉換改用加密檔案嗎?"</string>
-    <string name="button_confirm_convert_fbe" msgid="339648921918438106">"清除並轉換"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"重設 ShortcutManager 速率限制"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"已重設 ShortcutManager 速率限制"</string>
     <string name="notification_suggestion_title" msgid="6309263655965785411">"控制鎖定畫面上顯示的資訊"</string>
@@ -5294,6 +5257,7 @@
     <string name="sim_action_yes" msgid="8076556020131395515">"是"</string>
     <string name="sim_action_reboot" msgid="3508948833333441538">"重新啟動"</string>
     <string name="sim_action_no_thanks" msgid="435717748384544195">"不用了,謝謝"</string>
+    <string name="sim_action_cancel" msgid="2668099867029610910">"取消"</string>
     <string name="sim_switch_button" msgid="1405772571706095387">"切換"</string>
     <string name="dsds_activation_failure_title" msgid="4467364110584914794">"無法啟用 SIM 卡"</string>
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"請移除 SIM 卡再重新插入,如果問題持續發生,請重新啟動裝置。"</string>
@@ -5446,6 +5410,10 @@
     <string name="cached_apps_freezer" msgid="1057519579761550350">"暫停執行快取的應用程式"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"允許應用程式可重疊顯示在「設定」畫面上"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"允許可顯示在其他應用程式上的應用程式重疊顯示在「設定」畫面上"</string>
+    <!-- no translation found for allow_mock_modem (3832264806530479214) -->
+    <skip />
+    <!-- no translation found for allow_mock_modem_summary (9097416612748005374) -->
+    <skip />
     <string name="media_controls_title" msgid="403271085636252597">"媒體"</string>
     <string name="media_controls_resume_title" msgid="855076860336652370">"固定媒體播放器"</string>
     <string name="media_controls_resume_description" msgid="3163482266454802097">"讓快速設定中的媒體播放器保持開啟狀態,以便快速繼續播放"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 703b34e..3210b44 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -142,10 +142,11 @@
     <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"Vumela idivayisi yakho ukuxhumana namadivayisi aseduze e-Bluetooth"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"Vumela ifoni yakho ukuxhumana namadivayisi aseduze e-Bluetooth"</string>
     <string name="bluetooth_disable_a2dp_hw_offload" msgid="5942913792817797541">"Khubaza i-Bluetooth A2DP hardware offload"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="8610420176339657720">"Qalisa kabusha idivayisi?"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8333029144800835996">"Udinga ukuqalisa kabusha idivayisi yakho ukushintsha lesi silungiselelo."</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="3488695418187553566">"Qala kabusha"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="4930826928585464191">"Khansela"</string>
+    <string name="bluetooth_disable_le_audio_hw_offload" msgid="3966022676505972908">"Khubaza ukulayishwa kwehadiwe ye-Bluetooth LE AUDIO"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_title" msgid="6001142380445276918">"Qalisa kabusha idivayisi?"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_message" msgid="1524373895333698779">"Udinga ukuqalisa kabusha idivayisi yakho ukushintsha leli sethingi."</string>
+    <string name="bluetooth_disable_hw_offload_dialog_confirm" msgid="5594859658551707592">"Qala kabusha"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel" msgid="3663690305043973720">"Khansela"</string>
     <string name="connected_device_media_device_title" msgid="3783388247594566734">"Amadivayisi emidiya"</string>
     <string name="connected_device_call_device_title" msgid="88732390601723608">"Shayela amadivayisi"</string>
     <string name="connected_device_other_device_title" msgid="4652120430615729193">"Amanye amadivayisi"</string>
@@ -309,9 +310,9 @@
     <string name="security_settings_title" msgid="6710768415432791970">"Ukuphepha"</string>
     <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"Ukubethela nokuqinisekisa"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"Ifoni ibethelwe"</string>
-    <string name="decryption_settings_summary" product="default" msgid="1742645256103613503">"Ifoni ayibetheliwe"</string>
+    <string name="not_encrypted_summary" product="default" msgid="2251945842585788254">"Ifoni ayibetheliwe"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"Idivayisi ibethelwe"</string>
-    <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"Idivayisi ayibetheliwe"</string>
+    <string name="not_encrypted_summary" product="tablet" msgid="2374263654698719382">"Idivayisi ayibetheliwe"</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"Khiya isikrini"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"Yini engaboniswa"</string>
     <string name="security_settings_summary" msgid="1627059516127354233">"Setha Indawo Yami, ukuvula isikrini, ukuvala ikhadi le-SIM, ukuvala isitoreji sokuqinisekisa"</string>
@@ -568,37 +569,10 @@
     <string name="fingerprint_last_delete_message" msgid="7860374760549404410">"Ngeke uze ukwazi ukusebenzisa isigxivizo sakho seminwe ukuze uvule ifoni yakho noma uqinisekise ukuthi unguwe kuma-app."</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="4104208067277655068">"Ngeke ukwazi ukusebenzisa isigxivizo sakho seminwe ukuze uvule iphrofayela yakho yomsebenzi, ugunyaze ukuthenga, noma ungene ngemvume kuma-app omsebenzi."</string>
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"Yebo, susa"</string>
-    <string name="crypt_keeper_settings_title" msgid="4938812137822100044">"Ukubethelwa"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"Bethela ithebhulethi"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"Bethela ifoni"</string>
-    <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"Betheliwe"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"Ungabethela ama-akhawunti wakho, izilungiselelo, izinhlelo zokusebenza ezilandiwe nedatha yakhona, imidiya, namanye amafayela. Ngemva kokubethela ithebhulethi yakho, ngokucabangela ukuthi usethe ukukhiya kwesikrini (okungukuthi, iphethini noma iphinikhodi yenombolo noma iphasiwedi), uzodinga ukuvula isikrini ukuze ususe ukubethela ithebhulethi ngaso sonke isikhathi uma uyivula. Enye indlela kuphela ukwenza ukusetha kabusha idatha kwefekthri, ukususa yonke idatha yakho.\n\nUkubethela kuthatha ihora noma ngaphezulu. Kufanele uqale ngebhethri elishajiwe futhi ugcine ithebhulethi yakho ixhunyiwe kuyo yonke inqubo. Uma uyiphazamisa, uzolahlekelwa ngenye noma yonke idatha yakho."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"Ungabethela ama-akhawunti wakho, izilungiselelo, izinhlelo zokusebenza ezilandiwe nedatha yakhona, imidiya, namanye amafayela. Ngemva kokubethela ifoni yakho, ngokucabangela ukuthi usethe ukukhiya kwesikrini (okungukuthi, iphethini noma iphinikhodi yenombolo noma iphasiwedi), uzodinga ukuvula isikrini ukuze ususe ukubethela ifoni ngaso sonke isikhathi uma uyivula. Enye indlela kuphela ukwenza ukusetha kabusha idatha kwefekthri, ukususa yonke idatha yakho.\n\nUkubethela kuthatha ihora noma ngaphezulu. Kufanele uqale ngebhethri elishajiwe futhi ugcine ifoni yakho ixhunyiwe kuyo yonke inqubo. Uma uyiphazamisa, uzolahlekelwa ngenye noma yonke idatha yakho."</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"Bethela ithebhulethi"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"Bethela ifoni"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"Sicela ushaje ibhethri yakho bese uzama futhi."</string>
-    <string name="crypt_keeper_unplugged_text" msgid="2709721134148651329">"Sicela uxhume ishaja yakho bese uzama futhi."</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="1847280235529858357">"Ayikho i-PIN yokuvala isikrini noma iphasiwedi"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="7210616262954236042">"Udinga ukusetha i-PIN yokukhiya isikrini noma iphasiwedi ngaphambi kokuqala ukubhala ngakhodi."</string>
-    <string name="crypt_keeper_confirm_title" msgid="8600000209722452230">"Bhala ngekhodi?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="3270587498436152259">"Umsebenzi wokubhala ngekhodi awubuyiseleki emuva futhi uma uwuphazamisa, uzolahlekelwa idatha. Ukubhala ngekhodi kuthatha ihora noma ngaphezulu, phakathi kwesikhathi lapho ikhomyutha izoqala kabusha kambalwa."</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="3040428543349852419">"Umsebenzi wokubhala ngekhodi awubuyiseleki emuva futhi uma uwuphazamisa, uzolahlekelwa idatha. Ukubhala ngekhodi kuthatha ihora noma ngaphezulu, phakathi kwesikhathi lapho ucingo lizoqala kabusha kambalwa."</string>
-    <string name="crypt_keeper_setup_title" msgid="3339725741305796680">"Iyabethelwa"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="4417016995091289019">"Sicela ulinde ngenkathi ithebhulethi yakho ibhalwa ngemfihlo. <xliff:g id="PERCENT">^1</xliff:g>% okuphelile."</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="7902355422499500352">"Sicela ulinde ngenkathi ifoni ihlelwa ngokubhala ngokufihlekileyo <xliff:g id="PERCENT">^1</xliff:g> % iqedile."</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="8348188415839917821">"Linda ngenkathi ithebulethi yakho ibhalwa ngekhodi. Isikhathi esisele: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="8556105766597855198">"Linda ngenkathi ifoni yakho ibhalwa ngekhodi. Isikhathi esisele: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="3832496715430327682">"Ukuze uvule ithebulethi yakho, ivale bese uyayivula."</string>
-    <string name="crypt_keeper_force_power_cycle" product="default" msgid="5070346039522135361">"Ukuze uvule ifoni yakho, ivale bese uyayivula."</string>
-    <string name="crypt_keeper_warn_wipe" msgid="8104921337301750394">"Isexwayiso: Idivayisi yakho izosulwa ngemuva kwemizamo ehlulekayo engaphezu kwengu-<xliff:g id="COUNT">^1</xliff:g> ukuze ivulwe!"</string>
-    <string name="crypt_keeper_enter_password" msgid="1274917431075529732">"Thayipha iphasiwedi yakho"</string>
-    <string name="crypt_keeper_failed_title" msgid="8173654570682244149">"Ubhala ngokufihlekileyo akuphumelelanga"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"Ukubethela kuphazamisekile futhi ngeke kusaphela. Ngenxa yalokho, akusafinyeleleki kwidatha ekuthebhulethi yakho. \n\nUkuze uphinde usebenzise ithebhulethi yakho, kufanele isethwe kabusha. Uma ususetha ithebhulethi yakho emuva kokuba isethwe kabusha, uzothola ithuba lokubuyisa nanoma iyiphi idatha eyayilondolozwe kwi-akhawunti yakho yakwa-Google.."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"Ukubhelake bumfihlo kuphazamisekile futhi ngeke kusaphela. Ngenxa yalokho, akusafinyeleleki kwidatha esocingweni lwakho. \n\nUkuze uphinde usebenzise ucingo lwakho, kufanele lusethwe kabusha endaweni yokukhanda. Uma ususetha ucingo lwakho emva kokuba lusethwe kabusha, uzothola ithuba lokubuyisa nanoma iyiphi idatha eyayilondolozwe kwi-akhawunti yakho yakwa-Google."</string>
-    <string name="crypt_keeper_data_corrupt_title" msgid="5920153462176846037">"Ukususa ukubethela kuphumelele"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"Iphasiwedi oyifakile ilungile, kodwa ngeshwa idatha yakho yonakele. \n\nUkuze uqhubeke usebenzise ithebhulethi yakho, udinga ukwenza ukusetha kwefekthri. Uma usetha ithebhulethi yakho ngemva kokusetha kabusha, uzothola ithuba lokubuyisa idatha yakho ebekade yenziwe isipele ku-Akhawunti yakho ye-Google."</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"Iphasiwedi oyifakile ilungile, kodwa ngeshwa idatha yakho yonakele.\n\nUkuze uqalise kabusha usebenzisa ifoni yakho, kuzomele wenze ukusetha kabusha kwasekuqaleni. Uma usetha ifoni yakho ngemuva kokusetha kabusha, uzoba nethuba lokubuyisela noma iyiphi idatha eye yenziwa isipele ku-Akhawunti yakho ye-Google."</string>
-    <string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"Shintsha indlela yokufaka"</string>
+    <string name="encryption_settings_title" msgid="2848716008695618360">"Ukubethelwa"</string>
+    <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"Bethela ithebhulethi"</string>
+    <string name="encrypt_title" product="default" msgid="7337365190988321100">"Bethela ifoni"</string>
+    <string name="encrypted_summary" msgid="545623487587251207">"Betheliwe"</string>
     <string name="suggested_lock_settings_title" msgid="7836065447159730217">"Vikela ifoni yakho"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"Setha ukukhiya isikrini ukuze uvikele ithebulethi"</string>
     <string name="suggested_lock_settings_summary" product="device" msgid="8479766049078378225">"Setha ukukhiya kwesikrini ukuze uvikele idivayisi"</string>
@@ -817,6 +791,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Kungenzeka futhi udinge ukufaka le-PIN kwenye idivaysi."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Kungadingeka ufake lokhiye wokudlula kwenye idivayisi."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Ukuhambisa ngokubili:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Qinisekisa ukuthi ibonisa ukhiye wokungena:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Qinisekisa ukuze ubhangqe nesethi ehlanganisiwe"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"Kusuka ku:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Beka eceleni namanye amadivayisi?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Ukubhangqa ne:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Thayipha kuyona:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, bese ucindezela inkinobho uBuyisela noma uNgena."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Vumela ukufinyelela koxhumana nabo nomlando wekholi"</string>
@@ -850,6 +825,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Ayikwazanga ukuxhuma. Zama futhi."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Imininingwane yedivayisi"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Ikheli le-Bluetooth yedivayisi: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Ikheli le-Bluetooth yedivayisi: \n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Khohlwa idivayisi?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Susa ukuhambisana"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Nqamula i-App?"</string>
@@ -881,6 +857,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Khumbula izilungiselelo"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Amadivayisi omsindo e-Bluetooth axhumekile"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Khetha inombolo enkulu yamadivayisi omsindo we-Bluetooth axhumekile"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"Ilogu yokususa iphutha lezitaki ze-NFC"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Khuphula ileveli yokungena yezitaki ze-NFC"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Abalingisi"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"isibuko"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Nika amandla ukubukeka okungenantambo "</string>
@@ -1188,6 +1166,8 @@
     <string name="wifi_hotspot_maximize_compatibility_dual_ap_summary" msgid="3579549223159056533">"Kusiza amanye amadivayisi athole le-hotspot. Ikhuphula ukusetshenziswa kwebhethri."</string>
     <string name="wifi_tether_starting" msgid="8879874184033857814">"Ivula i-hotspot…"</string>
     <string name="wifi_tether_stopping" msgid="4416492968019409188">"Ivala i-hotspot…"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_title" msgid="3089432578433978073">"Ukusebenzisa ifoni njengemodemu akutholakali"</string>
+    <string name="wifi_tether_carrier_unsupport_dialog_content" msgid="5920421547607921112">"Xhumana nenkampani yakho yenethiwekhi mayelana nemininingwane."</string>
     <string name="wifi_tether_enabled_subtext" msgid="5085002421099821056">"I-<xliff:g id="NETWORK_SSID">%1$s</xliff:g> iyasebenza"</string>
     <string name="wifi_tether_failed_subtext" msgid="437190628041885500">"Iphutha le-Wi-Fi hotspot ephathekayo"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7072559431286459122">"Setha i-Wi-Fi hotspot"</string>
@@ -2535,11 +2515,6 @@
     <string name="enable_service_title" msgid="7231533866953706788">"Vumela i-<xliff:g id="SERVICE">%1$s</xliff:g> ukuthola ukulawula okuphelele kwedivayisi yakho?"</string>
     <string name="capabilities_list_title" msgid="1225853611983394386">"<xliff:g id="SERVICE">%1$s</xliff:g> idinga :"</string>
     <string name="touch_filtered_warning" msgid="4225815157460318241">"Ngoba uhlelo lokusebenza lusitha isicelo semvume, Izilungiselelo azikwazi ukuqinisekisa impendulo yakho."</string>
-    <string name="enable_service_encryption_warning" msgid="931082737770453755">"Uma uvula i-<xliff:g id="SERVICE">%1$s</xliff:g>, idivayisi yakho ngeke isebenzise ukukhiya kwakho kwesikrini sakho ukuthuthukisa ukubethelwa kwedatha."</string>
-    <string name="secure_lock_encryption_warning" msgid="669152607190123579">"Ngoba uvule isevisi yokufinyelela, idivayisi yakho ngeke isebenzise ukukhiya kwakho kwesikrini ukuthuthukisa ukubethelwa kwedatha."</string>
-    <string name="enable_service_pattern_reason" msgid="6832846117817938536">"Ngoba ukuvula i-<xliff:g id="SERVICE">%1$s</xliff:g> kuthinta ukubethelwa kwedatha, udinga ukuqinisekisa iphethini yakho."</string>
-    <string name="enable_service_pin_reason" msgid="6040417014360237703">"Ngoba ukuvula i-<xliff:g id="SERVICE">%1$s</xliff:g> kuthinta ukubethelwa kwedatha, udinga ukuqinisekisa iphinikhodi yakho."</string>
-    <string name="enable_service_password_reason" msgid="6962544350351734238">"Ngoba ukuvula i-<xliff:g id="SERVICE">%1$s</xliff:g> kuthinta ukubethelwa kwedatha, udinga ukuqinisekisa iphasiwedi yakho."</string>
     <string name="accessibility_service_warning" msgid="6779187188736432618">"<xliff:g id="SERVICE">%1$s</xliff:g> icela ukulawula okuphelele kwale divayisi. Isevisi ingafunda isikrini futhi isebenze engxenyeni yabasebenzisi abanezidingo zokufinyelela. Le leveli yokulawula ayiqondile kuzinhlelo zokusebenza eziningi."</string>
     <string name="accessibility_service_warning_description" msgid="6573203795976134751">"Ukulawula okugcwele kulungele izinhlelo zokusebenza ezikusiza ngezidingo zokufinyelela, kodwa hhayi izinhlelo zokusebenza eziningi."</string>
     <string name="accessibility_service_screen_control_title" msgid="324795030658109870">"Buka futhi ulawule isikrini"</string>
@@ -3104,14 +3079,6 @@
     <string name="remove_account_failed" msgid="3709502163548900644">"Lolu shintsho aluvunyelwe umlawuli wakho"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"Ayikwazi ukuvumelanisa ngesandla"</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"Ukuvumelanisa kwalentwana kuvimbelwe okwamanje. Ukushintsha okukhethwayo kwakho, vula idatha yasemuva nokuvumelanisa okuzenzakalelayo."</string>
-    <string name="enter_password" msgid="6327051330258595331">"Ukuze uqale i-Android, faka iphasiwedi yakho"</string>
-    <string name="enter_pin" msgid="1029287617551232681">"Ukuze uqale i-Android, faka iphinikhodi yakho"</string>
-    <string name="enter_pattern" msgid="1747316785866742960">"Ukuze uqale i-Android, dweba iphethini yakho"</string>
-    <string name="cryptkeeper_wrong_pattern" msgid="340747269176120242">"Iphethini engalungile"</string>
-    <string name="cryptkeeper_wrong_password" msgid="7295607881887114486">"Iphasiwedi engalungile"</string>
-    <string name="cryptkeeper_wrong_pin" msgid="2347961593970714201">"Iphinikhodi engalungile"</string>
-    <string name="checking_decryption" msgid="6111642972615688237">"Iyahlola..."</string>
-    <string name="starting_android" msgid="6694154070215356186">"Iqalisa i-Android..."</string>
     <string name="delete" msgid="8330605554706263775">"Susa"</string>
     <string name="misc_files" msgid="6598066985800749585">"Amafayela axubene"</string>
     <string name="misc_files_selected_count" msgid="5597802791672749532">"kukhethwe <xliff:g id="NUMBER">%1$d</xliff:g> kokuyi <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -3207,8 +3174,6 @@
     <string name="data_usage_metered_yes" msgid="4262598072030135223">"Kulinganisiwe"</string>
     <string name="data_usage_metered_no" msgid="1685828958417926268">"Akulinganisiwe"</string>
     <string name="data_usage_disclaimer" msgid="3271450299386176770">"Ukubalwa kwedatha yenkampani kungahluka kudivayisi yakho."</string>
-    <string name="cryptkeeper_emergency_call" msgid="8369322820475703306">"Ikholi ephuthmayo"</string>
-    <string name="cryptkeeper_return_to_call" msgid="3857250752781151232">"Buyela ekholini"</string>
     <string name="vpn_name" msgid="3806456074909253262">"Igama"</string>
     <string name="vpn_type" msgid="5533202873260826663">"Uhlobo"</string>
     <string name="vpn_server" msgid="2908816134941973935">"Ikheli leseva"</string>
@@ -4765,8 +4730,6 @@
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> izinhlelo zokusebenza zingasebenzisa idatha engakhawulelwe</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"Bona okwengeziwe"</string>
-    <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"Sula ngempela idatha yomsebenzisi uphinde uguqulele ekubetheleni ifayela?"</string>
-    <string name="button_confirm_convert_fbe" msgid="339648921918438106">"Sula uphinde uguqule"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"Setha kabusha ukukhawulela kokulinganisela kwe-ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"Ukukhawulela kokulinganisela kwe-ShortcutManager kusethwe kabusha"</string>
     <string name="notification_suggestion_title" msgid="6309263655965785411">"Lawula ulwazi ekukhiyeni isikrini"</string>
@@ -5293,6 +5256,7 @@
     <string name="sim_action_yes" msgid="8076556020131395515">"Yebo"</string>
     <string name="sim_action_reboot" msgid="3508948833333441538">"Qala kabusha"</string>
     <string name="sim_action_no_thanks" msgid="435717748384544195">"Cha ngiyabonga"</string>
+    <string name="sim_action_cancel" msgid="2668099867029610910">"Khansela"</string>
     <string name="sim_switch_button" msgid="1405772571706095387">"Shintsha"</string>
     <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Akukwazi ukwenza i-SIM isebenze"</string>
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Khipha i-SIM yakho bese uyifake futhi. Inkinga iyaqhubeka, qala kabusha idivayisi yakho."</string>
@@ -5445,6 +5409,10 @@
     <string name="cached_apps_freezer" msgid="1057519579761550350">"Misa okwesikhashana ukukhishwa kwezinhlelo zokusebenza ezenziwe inqolobane"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"Vumela ukumbozwa kwesikrini kokuthi Amasethingi"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Vumela izinhlelo zokusebenza ezingabonisa ngaphezulu kwezinye izinhlelo zokusebenza ukumboza izikrini zokuthi Amasethingi"</string>
+    <!-- no translation found for allow_mock_modem (3832264806530479214) -->
+    <skip />
+    <!-- no translation found for allow_mock_modem_summary (9097416612748005374) -->
+    <skip />
     <string name="media_controls_title" msgid="403271085636252597">"Imidiya"</string>
     <string name="media_controls_resume_title" msgid="855076860336652370">"Phina i-media player"</string>
     <string name="media_controls_resume_description" msgid="3163482266454802097">"Ukuze uqalise kabusha ngokushesha ukudlala, i-media player ihlala ivuliwe Kumasethingi asheshayo"</string>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 9de420e..fef8419 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -17,11 +17,6 @@
 <resources
     xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
 
-    <color name="crypt_keeper_clock_background">#ff9a9a9a</color>
-    <color name="crypt_keeper_clock_foreground">#ff666666</color>
-    <color name="crypt_keeper_clock_am_pm">#ff9a9a9a</color>
-    <color name="crypt_keeper_password_background">#70606060</color>
-
     <color name="divider_color">#20ffffff</color>
     <color name="title_color">@android:color/holo_blue_light</color>
     <color name="setup_wizard_wifi_color_dark">#89ffffff</color>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 2468db6..f225150 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -41,8 +41,6 @@
     <dimen name="balance_seekbar_center_marker_height">14dp</dimen>
     <dimen name="balance_seekbar_center_marker_width">1dp</dimen>
 
-    <dimen name="crypt_clock_size">100sp</dimen>
-
     <dimen name="divider_height">3dip</dimen>
     <dimen name="divider_margin_top">6dip</dimen>
     <dimen name="divider_margin_bottom">7dip</dimen>
@@ -154,27 +152,6 @@
     <dimen name="wifi_assistant_image_top">32dp</dimen>
     <dimen name="wifi_assistant_image_start">24dp</dimen>
 
-    <!-- CryptKeeper top margin for password/pin screen -->
-    <dimen name="crypt_keeper_password_top_margin">88dip</dimen>
-
-    <!-- CryptKeeper top margin for pattern screen -->
-    <dimen name="crypt_keeper_pattern_top_margin">88dip</dimen>
-
-    <!-- CryptKeeper password/pin width -->
-    <dimen name="crypt_keeper_password_width">280dip</dimen>
-
-    <!-- CryptKeeper emergency call button dimensions -->
-    <dimen name="crypt_keeper_emergency_call_space_above">16dip</dimen>
-
-    <!-- CryptKeeper edit text ime icon padding -->
-    <dimen name="crypt_keeper_edit_text_ime_padding">8dip</dimen>
-
-    <!-- CryptKeeper pattern margin on phone -->
-    <dimen name="crypt_keeper_pattern_margin">8dip</dimen>
-
-    <!-- CryptKeeper pattern size for tablet -->
-    <dimen name="crypt_keeper_pattern_size">354dip</dimen>
-
     <!-- SIM Dialog Margin top -->
     <dimen name="sim_dialog_margin_top">8dip</dimen>
     <!-- SIM Dialog Margin bottom -->
@@ -415,6 +392,13 @@
     <dimen name="advanced_bluetooth_battery_height">27.5dp</dimen>
     <dimen name="advanced_bluetooth_battery_right_margin">-4dp</dimen>
 
+    <!-- Header layout of LE audio bluetooth device at bluretooth device detalis -->
+    <dimen name="le_bluetooth_battery_top_margin">5dp</dimen>
+    <dimen name="le_bluetooth_battery_start_margin">10dp</dimen>
+    <dimen name="le_bluetooth_summary_drawable_padding">6dp</dimen>
+    <dimen name="le_bluetooth_summary_start_margin">20dp</dimen>
+    <dimen name="le_bluetooth_summary_padding">1.5dp</dimen>
+
     <!-- Developer option bluetooth settings dialog -->
     <dimen name="developer_option_dialog_margin_start">8dp</dimen>
     <dimen name="developer_option_dialog_margin_top">8dp</dimen>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 300b3a4..019ac70 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -329,14 +329,16 @@
 
     <!-- UI debug setting: Disable Bluetooth A2DP hardware offload [CHAR LIMIT=none] -->
     <string name="bluetooth_disable_a2dp_hw_offload">Disable Bluetooth A2DP hardware offload</string>
-    <!-- UI debug setting: Disable Bluetooth A2DP hardware offload [CHAR LIMIT=none] -->
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title">Restart Device?</string>
-    <!-- UI debug setting: Disable Bluetooth A2DP hardware offload [CHAR LIMIT=none] -->
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message">You need to restart your device to change this setting.</string>
-    <!-- UI debug setting: Disable Bluetooth A2DP hardware offload [CHAR LIMIT=none] -->
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm">Restart</string>
-    <!-- UI debug setting: Disable Bluetooth A2DP hardware offload [CHAR LIMIT=none] -->
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel">Cancel</string>
+    <!-- UI debug setting: Disable Bluetooth LE AUDIO hardware offload [CHAR LIMIT=none] -->
+    <string name="bluetooth_disable_le_audio_hw_offload">Disable Bluetooth LE AUDIO hardware offload</string>
+    <!-- UI debug setting: Disable Bluetooth hardware offload [CHAR LIMIT=none] -->
+    <string name="bluetooth_disable_hw_offload_dialog_title">Restart Device?</string>
+    <!-- UI debug setting: Disable Bluetooth hardware offload [CHAR LIMIT=none] -->
+    <string name="bluetooth_disable_hw_offload_dialog_message">You need to restart your device to change this setting.</string>
+    <!-- UI debug setting: Disable Bluetooth hardware offload [CHAR LIMIT=none] -->
+    <string name="bluetooth_disable_hw_offload_dialog_confirm">Restart</string>
+    <!-- UI debug setting: Disable Bluetooth hardware offload [CHAR LIMIT=none] -->
+    <string name="bluetooth_disable_hw_offload_dialog_cancel">Cancel</string>
 
     <!-- Title for Bluetooth device group with media capability group [CHAR LIMIT=none]-->
     <string name="connected_device_media_device_title">Media devices</string>
@@ -700,12 +702,12 @@
     <string name="security_settings_title">Security</string>
     <!-- Security Settings screen setting option title for the item to take you to the encryption and credential screen -->
     <string name="encryption_and_credential_settings_title">Encryption &amp; credentials</string>
-    <!-- Security Settings screen Encryption and crendential summary -->
+    <!-- Security Settings screen Encryption and credential summary -->
     <string name="encryption_and_credential_settings_summary" product="default">Phone encrypted</string>
-    <string name="decryption_settings_summary" product="default">Phone not encrypted</string>
-    <!-- Security Settings screen Encryption and crendential summary -->
+    <string name="not_encrypted_summary" product="default">Phone not encrypted</string>
+    <!-- Security Settings screen Encryption and credential summary -->
     <string name="encryption_and_credential_settings_summary" product="tablet">Device encrypted</string>
-    <string name="decryption_settings_summary" product="tablet">Device not encrypted</string>
+    <string name="not_encrypted_summary" product="tablet">Device not encrypted</string>
     <!-- Screen title for a list of settings controlling what to show on user's lockscreen [CHAR LIMIT=60] -->
     <string name="lockscreen_settings_title">Lock screen</string>
     <!-- Category title for the settings that control what lockscreen shows. [CHAR LIMIT=30] -->
@@ -1243,135 +1245,15 @@
     <string name="fingerprint_last_delete_confirm">Yes, remove</string>
 
     <!-- Title of the preferences category for preference items to control encryption -->
-    <string name="crypt_keeper_settings_title">Encryption</string>
+    <string name="encryption_settings_title">Encryption</string>
 
     <!-- Title of the preferences item to control encryption -->
-    <string name="crypt_keeper_encrypt_title" product="tablet">Encrypt tablet</string>
+    <string name="encrypt_title" product="tablet">Encrypt tablet</string>
     <!-- Title of the preferences item to control encryption -->
-    <string name="crypt_keeper_encrypt_title" product="default">Encrypt phone</string>
+    <string name="encrypt_title" product="default">Encrypt phone</string>
 
     <!-- Summary of the preferences item to control encryption, when encryption is active -->
-    <string name="crypt_keeper_encrypted_summary">Encrypted</string>
-
-    <!-- Informational text in the first confirmation screen before starting device encryption -->
-    <string name="crypt_keeper_desc" product="tablet">
-    You can encrypt your accounts, settings, downloaded apps and their data,
-    media, and other files. After you encrypt your tablet, assuming you\u2019ve set up a screen lock
-    (that is, a pattern or numeric PIN or password), you\u2019ll need to unlock the screen to decrypt
-    the tablet every time you power it on. The only other way to decrypt is to perform a factory
-    data reset, erasing all your data.\n\nEncryption takes an hour or more. You must start with
-    a charged battery and keep your tablet plugged in throughout the process. If you interrupt it,
-    you\u2019ll lose some or all of your data</string>
-    <!-- Informational text in the first confirmation screen before starting device encryption -->
-    <string name="crypt_keeper_desc" product="default">
-    You can encrypt your accounts, settings, downloaded apps and their data,
-    media, and other files. After you encrypt your phone, assuming you\u2019ve set up a screen lock
-    (that is, a pattern or numeric PIN or password), you\u2019ll need to unlock the screen to decrypt
-    the phone every time you power it on. The only other way to decrypt is to perform a factory
-    data reset, erasing all your data.\n\nEncryption takes an hour or more. You must start with
-    a charged battery and keep your phone plugged in throughout the process. If you interrupt it,
-    you\u2019ll lose some or all of your data.</string>
-
-    <!-- Button text to start encryption process -->
-    <string name="crypt_keeper_button_text" product="tablet">Encrypt tablet</string>
-    <!-- Button text to start encryption process -->
-    <string name="crypt_keeper_button_text" product="default">Encrypt phone</string>
-
-    <!-- Warning string that will be displayed when encryption cannot be started -->
-    <string name="crypt_keeper_low_charge_text">Charge your battery and try again.</string>
-    <!-- Warning string that will be displayed when encryption cannot be started -->
-    <string name="crypt_keeper_unplugged_text">Plug in your charger and try again.</string>
-
-    <!-- Dialog title, shown when encryption cannot proceed because a PIN/Password is needed -->
-    <string name="crypt_keeper_dialog_need_password_title">No lock screen PIN or password</string>
-    <!-- Dialog message, shown when encryption cannot proceed because a PIN/Password is needed -->
-    <string name="crypt_keeper_dialog_need_password_message">You need to set a lock screen PIN or
-    password before you can start encryption.</string>
-
-    <!-- Title of the final confirmation screen before starting device encryption -->
-    <string name="crypt_keeper_confirm_title">Encrypt?</string>
-    <!-- Warning text in the final confirmation screen before starting device encryption -->
-    <string name="crypt_keeper_final_desc" product="tablet">
-    The encryption operation is irreversible and if you interrupt it, you\u2019ll lose data.
-    Encryption takes an hour or more, during which the tablet will restart several times.
-    </string>
-    <!-- Warning text in the final confirmation screen before starting device encryption -->
-    <string name="crypt_keeper_final_desc" product="default">
-    The encryption operation is irreversible and if you interrupt it, you\u2019ll lose data.
-    Encryption takes an hour or more, during which the phone will restart several times.
-    </string>
-
-    <!-- Title of the progress screen while encrypting the device -->
-    <string name="crypt_keeper_setup_title">Encrypting</string>
-
-    <!-- Informational text on the progress screen while encrypting the device -->
-    <string name="crypt_keeper_setup_description" product="tablet">Wait while your tablet
-    is being encrypted. <xliff:g id="percent" example="50">^1</xliff:g>% complete.</string>
-    <!-- Informational text on the progress screen while encrypting the device -->
-    <string name="crypt_keeper_setup_description" product="default">Wait while your phone
-    is being encrypted. <xliff:g id="percent" example="50">^1</xliff:g>% complete.</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet">Wait while your tablet
-    is being encrypted. Time remaining: <xliff:g id="duration" example="1:23">^1</xliff:g></string>
-    <string name="crypt_keeper_setup_time_remaining" product="default">Wait while your phone
-    is being encrypted. Time remaining: <xliff:g id="duration" example="1:23">^1</xliff:g></string>
-
-    <string name="crypt_keeper_force_power_cycle" product="tablet">To unlock your tablet, turn it off and then on.</string>
-    <string name="crypt_keeper_force_power_cycle" product="default">To unlock your phone, turn it off and then on.</string>
-
-
-    <!-- Warn user their device will be wiped if they make x more failed attempts -->
-    <string name="crypt_keeper_warn_wipe">Warning: Your device will be wiped after
-    <xliff:g id="count" example="7">^1</xliff:g> more failed attempts to be unlocked!
-    </string>
-
-    <!-- Informational text on the password entry screen prompting the user for their password -->
-    <string name="crypt_keeper_enter_password">Type your password</string>
-
-    <!-- Title of the encryption screen when encrypting the device failed -->
-    <string name="crypt_keeper_failed_title">Encryption unsuccessful</string>
-
-    <!-- Informational text when encryption fails -->
-    <string name="crypt_keeper_failed_summary" product="tablet">
-      Encryption was interrupted and can\u2019t complete. As a result, the data on
-      your tablet is no longer accessible.
-      \n\n
-      To resume using your tablet, you need to perform a factory reset.
-      When you set up your tablet after the reset, you\u2019ll have an opportunity
-      to restore any data that was backed up to your Google Account.
-    </string>
-
-    <!-- Informational text when encryption fails -->
-    <string name="crypt_keeper_failed_summary" product="default">
-      Encryption was interrupted and can\u2019t complete. As a result, the data on
-      your phone is no longer accessible.
-      \n\nTo resume using your phone, you need to perform a factory reset.
-      When you set up your phone after the reset, you\u2019ll have an opportunity
-      to restore any data that was backed up to your Google Account.
-    </string>
-
-    <!-- Title of the encryption screen when decrypting the device failed -->
-    <string name="crypt_keeper_data_corrupt_title">Decryption unsuccessful</string>
-
-    <!-- Informational text when encryption fails -->
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet">
-      The password you entered is correct, but unfortunately your data is
-      corrupt.
-      \n\nTo resume using your tablet, you need to perform a factory reset.
-      When you set up your tablet after the reset, you\u2019ll have an opportunity
-      to restore any data that was backed up to your Google Account.
-    </string>
-
-    <!-- Informational text when encryption fails -->
-    <string name="crypt_keeper_data_corrupt_summary" product="default">
-      The password you entered is correct, but unfortunately your data is
-      corrupt.
-      \n\nTo resume using your phone, you need to perform a factory reset.
-      When you set up your phone after the reset, you\u2019ll have an opportunity
-      to restore any data that was backed up to your Google Account.
-    </string>
-
-    <!-- Image button description to switch input method -->
-    <string name="crypt_keeper_switch_input_method">Switch input method</string>
+    <string name="encrypted_summary">Encrypted</string>
 
     <!-- Unlock Picker Settings --><skip />
 
@@ -1826,6 +1708,9 @@
     <!-- Message for confirmation of passkey to complete pairing. [CHAR LIMIT=NONE] -->
     <string name="bluetooth_confirm_passkey_msg">To pair with:&lt;br>&lt;b><xliff:g id="device_name">%1$s</xliff:g>&lt;/b>&lt;br>&lt;br>Make sure it is showing this passkey:&lt;br>&lt;b><xliff:g id="passkey">%2$s</xliff:g>&lt;/b></string>
 
+    <!-- Pairing dialog text to remind user the pairing including all of the devices in a coordinated set. [CHAR LIMIT=NONE] -->
+    <string name="bluetooth_paring_group_msg">Confirm to pair with the coordinated set</string>
+
     <!-- Message when bluetooth incoming pairing request for (2.1 devices) dialog is showing -->
     <string name="bluetooth_incoming_pairing_msg">From:&lt;br>&lt;b><xliff:g id="device_name">%1$s</xliff:g>&lt;/b>&lt;br>&lt;br>Pair with this device?</string>
 
@@ -1903,6 +1788,8 @@
     <string name="device_details_title">Device details</string>
     <!-- Title of the item to show device MAC address -->
     <string name="bluetooth_device_mac_address">Device\'s Bluetooth address: <xliff:g id="address">%1$s</xliff:g></string>
+    <!-- Title of the items to show multuple devices MAC address [CHAR LIMIT=NONE]-->
+    <string name="bluetooth_multuple_devices_mac_address">Device\'s Bluetooth address:\n<xliff:g id="address">%1$s</xliff:g></string>
     <!-- Bluetooth device details. The title of a confirmation dialog for unpairing a paired device. [CHAR LIMIT=60] -->
     <string name="bluetooth_unpair_dialog_title">Forget device?</string>
     <!-- Content Description for companion device app associations removal button [CHAR LIMIT=28]-->
@@ -1974,6 +1861,11 @@
     <!-- Bluetooth developer settings: Maximum number of connected audio devices -->
     <string name="bluetooth_max_connected_audio_devices_dialog_title">Select maximum number of connected Bluetooth audio devices</string>
 
+    <!-- Nfc developer settings: The title of the setting. [CHAR LIMIT=60] -->
+    <string name="nfc_stack_debuglog_title">NFC stack debug log</string>
+    <!-- Nfc developer settings: The description of the setting. -->
+    <string name="nfc_stack_debuglog_summary">Increase NFC stack logging level</string>
+
     <!-- Wifi Display settings. The title of the screen. [CHAR LIMIT=40] -->
     <string name="wifi_display_settings_title">Cast</string>
     <!-- Wifi Display settings. The keywords of the setting. [CHAR LIMIT=NONE] -->
@@ -2634,6 +2526,10 @@
     <string name="wifi_tether_starting">Turning hotspot on\u2026</string>
     <!-- Summary text when turning hotspot off -->
     <string name="wifi_tether_stopping">Turning off hotspot\u2026</string>
+    <!-- Dialog title text when carrier does not support tethering -->
+    <string name="wifi_tether_carrier_unsupport_dialog_title">Tethering unavailable</string>
+    <!-- Dialog content text when carrier does not support tethering -->
+    <string name="wifi_tether_carrier_unsupport_dialog_content">Contact your carrier for details</string>
     <!-- Subtext for wifi tether checkbox on success -->
     <string name="wifi_tether_enabled_subtext"><xliff:g id="network_ssid">%1$s</xliff:g> is active</string>
     <!-- Subtext for wifi tether checkbox on failure -->
@@ -5810,30 +5706,6 @@
          can't verify user consent. [CHAR LIMIT=NONE] -->
     <string name="touch_filtered_warning">Because an app is obscuring a permission request, Settings
         can’t verify your response.</string>
-    <!-- Warning that the device data will not be encrypted with password or PIN if
-        enabling an accessibility service and there is a secure lock setup. [CHAR LIMIT=NONE] -->
-    <string name="enable_service_encryption_warning">If you turn on <xliff:g id="service"
-        example="TalkBack">%1$s</xliff:g>, your device won’t use your screen lock to enhance
-        data encryption.</string>
-    <!-- Warning that the device data will not be encrypted with password or PIN if
-         choosing a secure lock and there is an enabled accessibility service. [CHAR LIMIT=NONE] -->
-    <string name="secure_lock_encryption_warning">Because you\u2019ve turned on an accessibility service,
-        your device won’t use your screen lock to enhance data encryption.</string>
-
-    <!-- Message to the users to enter their pattern before enabling an accessibility service. [CHAR LIMIT=NONE] -->
-    <string name="enable_service_pattern_reason">Because turning on <xliff:g id="service"
-        example="TalkBack">%1$s</xliff:g> affects data encryption, you need to confirm your pattern.
-    </string>
-
-    <!-- Message to the users to enter their PIN before enabling an accessibility service. [CHAR LIMIT=NONE] -->
-    <string name="enable_service_pin_reason">Because turning on <xliff:g id="service"
-        example="TalkBack">%1$s</xliff:g> affects data encryption, you need to confirm your PIN.
-    </string>
-
-    <!-- Message to the users to enter their password before enabling an accessibility service. [CHAR LIMIT=NONE] -->
-    <string name="enable_service_password_reason">Because turning on <xliff:g id="service"
-        example="TalkBack">%1$s</xliff:g> affects data encryption, you need to confirm your password.
-    </string>
 
     <!-- Warning that explains that accessibility services have a lot of access to user data [CHAR LIMIT=NONE] -->
     <string name="accessibility_service_warning"><xliff:g id="service"
@@ -7132,26 +7004,6 @@
     <!-- Messaage shown in dialog when you can't manually sync -->
     <string name="cant_sync_dialog_message">Sync for this item is currently disabled. To change this setting, temporarily turn on background data and automatic sync.</string>
 
-    <!-- This is displayed to the user when the device needs to be decrypted -->
-    <string name="enter_password">To start Android, enter your password</string>
-    <!-- Informational text on the pin entry screen prompting the user for their pin -->
-    <string name="enter_pin">To start Android, enter your PIN</string>
-    <!-- Informational text on the pattern entry screen prompting the user for their pattern -->
-    <string name="enter_pattern">To start Android, draw your pattern</string>
-
-    <!-- Message shown when user enters wrong pattern -->
-    <string name="cryptkeeper_wrong_pattern">Wrong Pattern</string>
-    <!-- Message shown when user enters wrong password -->
-    <string name="cryptkeeper_wrong_password">Wrong Password</string>
-    <!-- Message shown when user enters wrong PIN -->
-    <string name="cryptkeeper_wrong_pin">Wrong PIN</string>
-
-    <!-- Shown when a password has been entered, and we're checking it -->
-    <string name="checking_decryption">Checking\u2026</string>
-    <!-- Shown when password is correct, and we're starting Android -->
-    <string name="starting_android">Starting Android\u2026</string>
-
-
     <!-- the following are for Settings Storage screen -->
     <!-- Menu item/button 'delete' -->
     <string name="delete">Delete</string>
@@ -7365,11 +7217,6 @@
     <!-- Disclaimer string for data usage measured by device. [CHAR LIMIT=80] -->
     <string name="data_usage_disclaimer">Carrier data accounting may differ from your device.</string>
 
-    <!-- Button at the bottom of the CryptKeeper screen to make an emergency call. -->
-    <string name="cryptkeeper_emergency_call">Emergency call</string>
-    <!-- Button at the bottom of the CryptKeeper screen that lets the user return to a call -->
-    <string name="cryptkeeper_return_to_call">Return to call</string>
-
     <!-- Input label for the name of a VPN profile. [CHAR LIMIT=40] -->
     <string name="vpn_name">Name</string>
     <!-- Input label for the type of a VPN profile. [CHAR LIMIT=40] -->
@@ -8107,11 +7954,17 @@
     <!-- Checkbox to always use for calls.  [CHAR LIMIT=40] -->
     <string name="sim_calls_always_use">Always use this for calls</string>
     <!-- Message for selecting sim for data in settings.  [CHAR LIMIT=40] -->
-    <string name="select_sim_for_data">Select a SIM for data</string>
+    <string name="select_sim_for_data">Choose SIM for mobile data</string>
     <!-- Message for selecting sim for SMS in settings.  [CHAR LIMIT=40] -->
     <string name="select_sim_for_sms">Select a SIM for SMS</string>
     <!-- Message for switching data SIM; switching takes a while -->
     <string name="data_switch_started">Switching data SIM, this may take up to a minute\u2026</string>
+    <!-- Title for selecting specific sim for data in settings.  [CHAR LIMIT=40] -->
+    <string name="select_specific_sim_for_data_title">Use <xliff:g id="new_sim" example="carrierA">%1$s</xliff:g> for mobile data?</string>
+    <!-- Message for selecting specific sim for data in settings.  [CHAR LIMIT=NONE] -->
+    <string name="select_specific_sim_for_data_msg">If you switch to <xliff:g id="new_sim" example="carrierA">%1$s</xliff:g>, <xliff:g id="old_sim" example="carrierB">%2$s</xliff:g> will no longer be used for mobile data.</string>
+    <!-- Button on a selecting specific sim dialog to confirm data in settings.  [CHAR LIMIT=40] -->
+    <string name="select_specific_sim_for_data_button">Use <xliff:g id="new_sim" example="carrierA">%1$s</xliff:g></string>
     <!-- Message for selecting sim for call in settings.  [CHAR LIMIT=40] -->
     <string name="select_sim_for_calls">Call with</string>
     <!-- Title for selecting a SIM card.  [CHAR LIMIT=40] -->
@@ -11551,11 +11404,6 @@
     <!-- Title for the See more preference item in Special app access settings [CHAR LIMIT=30] -->
     <string name="special_access_more">See more</string>
 
-    <!-- Developer option to convert to file encryption - final warning -->
-    <string name="confirm_convert_to_fbe_warning">Really wipe user data and convert to file encryption?</string>
-    <!-- Developer option to convert to file encryption - final button -->
-    <string name="button_confirm_convert_fbe">Wipe and convert</string>
-
     <!-- Reset rate-limiting in the system service ShortcutManager.  "ShortcutManager" is the name of a system service and not translatable.
     If the word "rate-limit" is hard to translate, use "Reset ShortcutManager API call limit" as the source text, which means
     the same thing in this context.
@@ -12895,18 +12743,26 @@
     <string name="sim_action_switch_sub_dialog_title">Switch to <xliff:g id="carrier_name" example="Google Fi">%1$s</xliff:g>?</string>
     <!-- Title of confirmation dialog asking the user if they want to switch to the SIM card. [CHAR_LIMIT=NONE] -->
     <string name="sim_action_switch_psim_dialog_title">Switch to using SIM card?</string>
+    <!-- Title of confirmation dialog asking the user if they want to switch subscription. [CHAR_LIMIT=NONE] -->
+    <string name="sim_action_switch_sub_dialog_mep_title">Use <xliff:g id="carrier_name" example="Google Fi">%1$s</xliff:g>?</string>
     <!-- Body text of confirmation dialog for switching subscription that involves switching SIM slots. Indicates that only one SIM can be active at a time. Also that switching will not cancel the user's mobile service plan. [CHAR_LIMIT=NONE] -->
     <string name="sim_action_switch_sub_dialog_text">Only one SIM can be active at a time.\n\nSwitching to <xliff:g id="to_carrier_name" example="Google Fi">%1$s</xliff:g> won\u2019t cancel your <xliff:g id="from_carrier_name" example="Sprint">%2$s</xliff:g> service.</string>
     <!-- Body text of confirmation dialog for switching subscription between two eSIM profiles. Indicates that only one downloaded SIM can be active at a time. Also that switching will not cancel the user's mobile service plan. [CHAR_LIMIT=NONE] -->
     <string name="sim_action_switch_sub_dialog_text_downloaded">Only one downloaded SIM can be active at a time.\n\nSwitching to <xliff:g id="to_carrier_name" example="Google Fi">%1$s</xliff:g> won\u2019t cancel your <xliff:g id="from_carrier_name" example="Sprint">%2$s</xliff:g> service.</string>
     <!-- Body text of confirmation dialog for switching subscription between two eSIM profiles. Indicates that only one SIM can be active at a time. Also that switching will not cancel the user's mobile service plan. [CHAR_LIMIT=NONE] -->
     <string name="sim_action_switch_sub_dialog_text_single_sim">Only one SIM can be active at a time.\n\nSwitching won\u2019t cancel your <xliff:g id="to_carrier_name" example="Google Fi">%1$s</xliff:g> service.</string>
+    <!-- Body text of confirmation dialog for switching subscription between two eSIM profiles. Indicates that only one downloaded SIM can be active at a time. Also that switching will not cancel the user's mobile service plan. [CHAR_LIMIT=NONE] -->
+    <string name="sim_action_switch_sub_dialog_mep_text">You can use 2 SIMs at a time. To use <xliff:g id="carrier_name" example="Google Fi">%1$s</xliff:g>, turn off another SIM.</string>
     <!-- Text of confirm button in the confirmation dialog asking the user if they want to switch subscription. [CHAR_LIMIT=NONE] -->
     <string name="sim_action_switch_sub_dialog_confirm">Switch to <xliff:g id="carrier_name" example="Google Fi">%1$s</xliff:g></string>
+    <!-- Text of carrier list item in the mep confirmation dialog asking the user if they want to turn off the carrier. [CHAR_LIMIT=NONE] -->
+    <string name="sim_action_switch_sub_dialog_carrier_list_item_for_turning_off">Turn off <xliff:g id="carrier_name" example="Google Fi">%1$s</xliff:g></string>
+    <!-- Text of carrier list item in the mep confirmation dialog asking the user if they want to turn off the carrier. [CHAR_LIMIT=NONE] -->
+    <string name="sim_action_switch_sub_dialog_info_outline_for_turning_off">Turning off a SIM won\u2019t cancel your service</string>
     <!-- Status message indicating the device is in the process of disconnecting from one mobile network and immediately connecting to another. [CHAR_LIMIT=NONE] -->
     <string name="sim_action_enabling_sim_without_carrier_name">Connecting to network&#8230;</string>
     <!-- Text of progress dialog indicating the subscription switch is in progress. [CHAR_LIMIT=NONE] -->
-    <string name="sim_action_switch_sub_dialog_progress">Switching to <xliff:g id="carrier_name" example="Google Fi">%1$s</xliff:g></string>
+    <string name="sim_action_switch_sub_dialog_progress">Switching to <xliff:g id="carrier_name" example="Google Fi">%1$s</xliff:g> for calls and messages&#8230;</string>
     <!-- Title of error message indicating that the device could not disconnect from one mobile network and immediately connect to another. [CHAR_LIMIT=NONE] -->
     <string name="sim_action_enable_sim_fail_title">Can\u2019t switch carrier</string>
     <!-- Body text of error message indicating the device could not disconnect from one mobile network and immediately connect to another, due to an unspecified issue. [CHAR_LIMIT=NONE] -->
@@ -12937,6 +12793,8 @@
     <string name="sim_action_reboot">Restart</string>
     <!-- Button on a dialog to reject SIM operations. [CHAR LIMIT=30] -->
     <string name="sim_action_no_thanks">No thanks</string>
+    <!-- Button text to cancel operations proposed by a sim operation dialog [CHAR LIMIT=20] -->
+    <string name="sim_action_cancel">Cancel</string>
     <!-- Button which will disconnect the user from one mobile network and immediately connect to another. [CHAR LIMIT=30] -->
     <string name="sim_switch_button">Switch</string>
     <!-- Title of DSDS activation failure dialog [CHAR LIMIT=40] -->
@@ -13327,6 +13185,11 @@
     <!-- Summary for allowing screen overlays on Settings app. [CHAR LIMIT=NONE]-->
     <string name="overlay_settings_summary">Allow apps that can display over other apps to overlay Settings screens</string>
 
+    <!-- Developer settings: Title for allowing mock modem service for testing. [CHAR LIMIT=50]-->
+    <string name="allow_mock_modem">Allow Mock Modem</string>
+    <!-- Developer settings: Summary for allowing mock modem service. [CHAR LIMIT=NONE]-->
+    <string name="allow_mock_modem_summary">Allow this device to run Mock Modem service for instrumentation testing. Do not enable this during normal usage of the phone</string>
+
     <!-- Title for media control settings [CHAR LIMIT=50]-->
     <string name="media_controls_title">Media</string>
     <!-- Title of toggle to enable or disable the media resumption feature in quick settings [CHAR LIMIT=50]-->
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 8402dec..afa13a1 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -198,10 +198,6 @@
         <item name="android:activityOpenExitAnimation">@anim/confirm_credential_open_exit</item>
     </style>
 
-    <style name="CryptKeeperBlankTheme" parent="@android:style/Theme.Material.NoActionBar">
-        <item name="android:background">#ff000000</item>
-    </style>
-
     <style name="SetupWizardButton.Negative" parent="@style/SudGlifButton.Secondary">
         <!-- Negative margin to offset for padding of the button itself. We want the label to be
              aligned with the text above it -->
@@ -281,14 +277,6 @@
         <item name="android:textSize">24sp</item>
     </style>
 
-    <style name="TextAppearance.CryptKeeper_PasswordEntry" parent="android:TextAppearance.DeviceDefault">
-        <item name="android:gravity">center_horizontal</item>
-        <item name="android:background">@null</item>
-        <item name="android:textCursorDrawable">@null</item>
-        <item name="android:singleLine">true</item>
-        <item name="android:imeOptions">flagForceAscii|actionDone</item>
-    </style>
-
     <style name="TextAppearance.Medium" parent="@android:style/TextAppearance.DeviceDefault.Medium"/>
     <style name="TextAppearance.Small" parent="@android:style/TextAppearance.DeviceDefault.Small"/>
     <style name="TextAppearance.Switch"
@@ -926,4 +914,25 @@
            parent="@*android:style/TextAppearance.DeviceDefault">
         <item name="android:textColor">?android:attr/textColorSecondary</item>
     </style>
+
+    <style name="TextAppearance.SimConfirmDialogList" parent="@style/TextAppearance.DialogMessage"/>
+
+    <style name="TextAppearance.SimConfirmDialogList.Summary">
+        <item name="android:textAppearance">?android:attr/textAppearanceSmall</item>
+    </style>
+
+    <style name="SimConfirmDialog.OutlineButton" parent="@android:style/Widget.Material.Button">
+        <item name="android:layout_marginStart">8dp</item>
+        <item name="android:layout_height">36dp</item>
+        <item name="android:minWidth">0dp</item>
+        <item name="android:textSize">14sp</item>
+        <item name="android:lineHeight">20sp</item>
+        <item name="android:fontFamily">@*android:string/config_bodyFontFamilyMedium</item>
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
+        <item name="android:background">@drawable/sim_confirm_dialog_btn_outline</item>
+    </style>
+
+    <style name="SimConfirmDialog.ButtonBarStyle" parent="@android:style/Widget.Material.ButtonBar">
+        <item name="android:paddingEnd">8dp</item>
+    </style>
 </resources>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index d65c1b3..3328b6c 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -117,15 +117,6 @@
         <item name="android:minWidth">@dimen/min_tap_target_size</item>
     </style>
 
-    <style name="Theme.CryptKeeper" parent="@android:style/Theme.Material.NoActionBar">
-        <item name="android:windowTranslucentStatus">false</item>
-        <item name="android:windowTranslucentNavigation">false</item>
-        <item name="android:windowDrawsSystemBarBackgrounds">false</item>
-        <item name="android:background">@android:color/black</item>
-
-        <item name="*android:lockPatternStyle">@style/LockPatternStyle</item>
-    </style>
-
     <style name="ThemeOverlay.AlertDialog" parent="@android:style/ThemeOverlay.Material.Dialog.Alert">
         <item name="android:windowSoftInputMode">adjustResize</item>
     </style>
@@ -151,6 +142,13 @@
         <item name="buttonBarButtonStyle">@*android:style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog</item>
     </style>
 
+
+    <style name="Theme.AlertDialog.SimConfirmDialog">
+        <item name="buttonBarStyle">@style/SimConfirmDialog.ButtonBarStyle</item>
+        <item name="buttonBarButtonStyle">@style/SimConfirmDialog.OutlineButton</item>
+        <item name="android:textAllCaps">false</item>
+    </style>
+
     <style name="Theme.ConfirmDeviceCredentials" parent="Theme.SubSettings">
         <item name="confirmDeviceCredentialsSideMargin">@dimen/confirm_credentials_side_margin</item>
         <item name="confirmDeviceCredentialsTopMargin">@dimen/confirm_credentials_top_margin</item>
diff --git a/res/xml/bluetooth_device_details_fragment.xml b/res/xml/bluetooth_device_details_fragment.xml
index 9df1955..34599f7 100644
--- a/res/xml/bluetooth_device_details_fragment.xml
+++ b/res/xml/bluetooth_device_details_fragment.xml
@@ -34,6 +34,14 @@
         settings:searchable="false"
         settings:controller="com.android.settings.bluetooth.AdvancedBluetoothDetailsHeaderController"/>
 
+    <com.android.settingslib.widget.LayoutPreference
+        android:key="le_audio_bluetooth_device_header"
+        android:layout="@layout/le_audio_bt_entity_header"
+        android:selectable="false"
+        settings:allowDividerBelow="true"
+        settings:searchable="false"
+        settings:controller="com.android.settings.bluetooth.LeAudioBluetoothDetailsHeaderController"/>
+
     <com.android.settingslib.widget.ActionButtonsPreference
         android:key="action_buttons"
         settings:allowDividerBelow="true"/>
diff --git a/res/xml/development_settings.xml b/res/xml/development_settings.xml
index 6213516..0d03149 100644
--- a/res/xml/development_settings.xml
+++ b/res/xml/development_settings.xml
@@ -88,12 +88,6 @@
             android:summary="@string/runningservices_settings_summary"
             android:fragment="com.android.settings.applications.RunningServices" />
 
-        <Preference
-            android:key="convert_to_file_encryption"
-            android:title="@string/convert_to_file_encryption"
-            android:summary="@string/convert_to_file_encryption_enabled"
-            android:fragment="com.android.settings.applications.ConvertToFbe" />
-
         <com.android.settings.development.ColorModePreference
             android:key="picture_color_mode"
             android:title="@string/picture_color_mode"
@@ -252,6 +246,11 @@
             android:title="@string/force_high_refresh_rate_toggle"
             android:summary="@string/force_high_refresh_rate_desc" />
 
+        <SwitchPreference
+            android:key="allow_mock_modem"
+            android:title="@string/allow_mock_modem"
+            android:summary="@string/allow_mock_modem_summary" />
+
     </PreferenceCategory>
 
     <PreferenceCategory
@@ -309,14 +308,13 @@
             android:summary="@string/bluetooth_disable_absolute_volume_summary" />
 
         <SwitchPreference
-            android:key="bluetooth_gabeldorsche_enable"
-            android:title="@string/bluetooth_enable_gabeldorsche"
-            android:summary="@string/bluetooth_enable_gabeldorsche_summary" />
-
-        <SwitchPreference
             android:key="bluetooth_disable_a2dp_hw_offload"
             android:title="@string/bluetooth_disable_a2dp_hw_offload" />
 
+        <SwitchPreference
+            android:key="bluetooth_disable_le_audio_hw_offload"
+            android:title="@string/bluetooth_disable_le_audio_hw_offload" />
+
         <ListPreference
             android:key="bluetooth_select_avrcp_version"
             android:title="@string/bluetooth_select_avrcp_version_string"
@@ -382,6 +380,11 @@
             android:entries="@array/bluetooth_max_connected_audio_devices"
             android:entryValues="@array/bluetooth_max_connected_audio_devices_values" />
 
+        <SwitchPreference
+            android:key="nfc_stack_debuglog_enabled"
+            android:title="@string/nfc_stack_debuglog_title"
+            android:summary="@string/nfc_stack_debuglog_summary" />
+
     </PreferenceCategory>
 
     <PreferenceCategory
diff --git a/res/xml/encryption_and_credential.xml b/res/xml/encryption_and_credential.xml
index f107b58..1f5b005 100644
--- a/res/xml/encryption_and_credential.xml
+++ b/res/xml/encryption_and_credential.xml
@@ -21,12 +21,11 @@
 
     <PreferenceCategory
         android:key="encryption_and_credentials_status_category"
-        android:title="@string/crypt_keeper_settings_title">
+        android:title="@string/encryption_settings_title">
 
         <Preference
             android:key="encryption_and_credentials_encryption_status"
-            android:title="@string/crypt_keeper_encrypt_title"
-            android:fragment="com.android.settings.security.CryptKeeperSettings"
+            android:title="@string/encrypt_title"
             android:summary="@string/summary_placeholder" />
 
     </PreferenceCategory>
diff --git a/src/com/android/settings/CryptKeeper.java b/src/com/android/settings/CryptKeeper.java
deleted file mode 100644
index 7e75ee2..0000000
--- a/src/com/android/settings/CryptKeeper.java
+++ /dev/null
@@ -1,1034 +0,0 @@
-/*
- * Copyright (C) 2011 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.Activity;
-import android.app.StatusBarManager;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.ActivityInfo;
-import android.content.pm.PackageManager;
-import android.content.res.Resources.NotFoundException;
-import android.media.AudioManager;
-import android.os.AsyncTask;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.IBinder;
-import android.os.Message;
-import android.os.PowerManager;
-import android.os.RemoteException;
-import android.os.ServiceManager;
-import android.os.UserHandle;
-import android.os.storage.IStorageManager;
-import android.os.storage.StorageManager;
-import android.provider.Settings;
-import android.sysprop.VoldProperties;
-import android.telecom.TelecomManager;
-import android.telephony.TelephonyManager;
-import android.text.Editable;
-import android.text.TextUtils;
-import android.text.TextWatcher;
-import android.text.format.DateUtils;
-import android.util.Log;
-import android.view.KeyEvent;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.View.OnKeyListener;
-import android.view.View.OnTouchListener;
-import android.view.WindowManager;
-import android.view.inputmethod.EditorInfo;
-import android.view.inputmethod.InputMethodInfo;
-import android.view.inputmethod.InputMethodManager;
-import android.view.inputmethod.InputMethodSubtype;
-import android.widget.Button;
-import android.widget.ImeAwareEditText;
-import android.widget.ProgressBar;
-import android.widget.TextView;
-
-import com.android.internal.widget.LockPatternUtils;
-import com.android.internal.widget.LockPatternView;
-import com.android.internal.widget.LockPatternView.Cell;
-import com.android.internal.widget.LockPatternView.DisplayMode;
-
-import java.util.List;
-
-/**
- * Settings screens to show the UI flows for encrypting/decrypting the device.
- *
- * This may be started via adb for debugging the UI layout, without having to go through
- * encryption flows everytime. It should be noted that starting the activity in this manner
- * is only useful for verifying UI-correctness - the behavior will not be identical.
- * <pre>
- * $ adb shell pm enable com.android.settings/.CryptKeeper
- * $ adb shell am start \
- *     -e "com.android.settings.CryptKeeper.DEBUG_FORCE_VIEW" "progress" \
- *     -n com.android.settings/.CryptKeeper
- * </pre>
- */
-public class CryptKeeper extends Activity implements TextView.OnEditorActionListener,
-        OnKeyListener, OnTouchListener, TextWatcher {
-    private static final String TAG = "CryptKeeper";
-
-    private static final String DECRYPT_STATE = "trigger_restart_framework";
-
-    /** Message sent to us to indicate encryption update progress. */
-    private static final int MESSAGE_UPDATE_PROGRESS = 1;
-    /** Message sent to us to indicate alerting the user that we are waiting for password entry */
-    private static final int MESSAGE_NOTIFY = 2;
-
-    // Constants used to control policy.
-    private static final int MAX_FAILED_ATTEMPTS = 30;
-    private static final int COOL_DOWN_ATTEMPTS = 10;
-
-    // Intent action for launching the Emergency Dialer activity.
-    static final String ACTION_EMERGENCY_DIAL = "com.android.phone.EmergencyDialer.DIAL";
-
-    // Debug Intent extras so that this Activity may be started via adb for debugging UI layouts
-    private static final String EXTRA_FORCE_VIEW =
-            "com.android.settings.CryptKeeper.DEBUG_FORCE_VIEW";
-    private static final String FORCE_VIEW_PROGRESS = "progress";
-    private static final String FORCE_VIEW_ERROR = "error";
-    private static final String FORCE_VIEW_PASSWORD = "password";
-
-    private static final String STATE_COOLDOWN = "cooldown";
-
-    /** When encryption is detected, this flag indicates whether or not we've checked for errors. */
-    private boolean mValidationComplete;
-    private boolean mValidationRequested;
-    /** A flag to indicate that the volume is in a bad state (e.g. partially encrypted). */
-    private boolean mEncryptionGoneBad;
-    /** If gone bad, should we show encryption failed (false) or corrupt (true)*/
-    private boolean mCorrupt;
-    /** A flag to indicate when the back event should be ignored */
-    /** When set, blocks unlocking. Set every COOL_DOWN_ATTEMPTS attempts, only cleared
-        by power cycling phone. */
-    private boolean mCooldown = false;
-
-    PowerManager.WakeLock mWakeLock;
-    private ImeAwareEditText mPasswordEntry;
-    private LockPatternView mLockPatternView;
-    /** Number of calls to {@link #notifyUser()} to ignore before notifying. */
-    private int mNotificationCountdown = 0;
-    /** Number of calls to {@link #notifyUser()} before we release the wakelock */
-    private int mReleaseWakeLockCountdown = 0;
-    private int mStatusString = R.string.enter_password;
-
-    // how long we wait to clear a wrong pattern
-    private static final int WRONG_PATTERN_CLEAR_TIMEOUT_MS = 1500;
-
-    // how long we wait to clear a right pattern
-    private static final int RIGHT_PATTERN_CLEAR_TIMEOUT_MS = 500;
-
-    // When the user enters a short pin/password, run this to show an error,
-    // but don't count it against attempts.
-    private final Runnable mFakeUnlockAttemptRunnable = new Runnable() {
-        @Override
-        public void run() {
-            handleBadAttempt(1 /* failedAttempt */);
-        }
-    };
-
-    // TODO: this should be tuned to match minimum decryption timeout
-    private static final int FAKE_ATTEMPT_DELAY = 1000;
-
-    private final Runnable mClearPatternRunnable = new Runnable() {
-        @Override
-        public void run() {
-            mLockPatternView.clearPattern();
-        }
-    };
-
-    /**
-     * Used to propagate state through configuration changes (e.g. screen rotation)
-     */
-    private static class NonConfigurationInstanceState {
-        final PowerManager.WakeLock wakelock;
-
-        NonConfigurationInstanceState(PowerManager.WakeLock _wakelock) {
-            wakelock = _wakelock;
-        }
-    }
-
-    private class DecryptTask extends AsyncTask<String, Void, Integer> {
-        private void hide(int id) {
-            View view = findViewById(id);
-            if (view != null) {
-                view.setVisibility(View.GONE);
-            }
-        }
-
-        @Override
-        protected void onPreExecute() {
-            super.onPreExecute();
-            beginAttempt();
-        }
-
-        @Override
-        protected Integer doInBackground(String... params) {
-            final IStorageManager service = getStorageManager();
-            try {
-                return service.decryptStorage(params[0]);
-            } catch (Exception e) {
-                Log.e(TAG, "Error while decrypting...", e);
-                return -1;
-            }
-        }
-
-        @Override
-        protected void onPostExecute(Integer failedAttempts) {
-            if (failedAttempts == 0) {
-                // The password was entered successfully. Simply do nothing
-                // and wait for the service restart to switch to surfacefligner
-                if (mLockPatternView != null) {
-                    mLockPatternView.removeCallbacks(mClearPatternRunnable);
-                    mLockPatternView.postDelayed(mClearPatternRunnable, RIGHT_PATTERN_CLEAR_TIMEOUT_MS);
-                }
-                final TextView status = (TextView) findViewById(R.id.status);
-                status.setText(R.string.starting_android);
-                hide(R.id.passwordEntry);
-                hide(R.id.switch_ime_button);
-                hide(R.id.lockPattern);
-                hide(R.id.owner_info);
-                hide(R.id.emergencyCallButton);
-            } else if (failedAttempts == MAX_FAILED_ATTEMPTS) {
-                // Factory reset the device.
-                Intent intent = new Intent(Intent.ACTION_FACTORY_RESET);
-                intent.setPackage("android");
-                intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
-                intent.putExtra(Intent.EXTRA_REASON, "CryptKeeper.MAX_FAILED_ATTEMPTS");
-                sendBroadcast(intent);
-            } else if (failedAttempts == -1) {
-                // Right password, but decryption failed. Tell user bad news ...
-                setContentView(R.layout.crypt_keeper_progress);
-                showFactoryReset(true);
-                return;
-            } else {
-                handleBadAttempt(failedAttempts);
-            }
-        }
-    }
-
-    private void beginAttempt() {
-        final TextView status = (TextView) findViewById(R.id.status);
-        status.setText(R.string.checking_decryption);
-    }
-
-    private void handleBadAttempt(Integer failedAttempts) {
-        // Wrong entry. Handle pattern case.
-        if (mLockPatternView != null) {
-            mLockPatternView.setDisplayMode(DisplayMode.Wrong);
-            mLockPatternView.removeCallbacks(mClearPatternRunnable);
-            mLockPatternView.postDelayed(mClearPatternRunnable, WRONG_PATTERN_CLEAR_TIMEOUT_MS);
-        }
-        if ((failedAttempts % COOL_DOWN_ATTEMPTS) == 0) {
-            mCooldown = true;
-            // No need to setBackFunctionality(false) - it's already done
-            // at this point.
-            cooldown();
-        } else {
-            final TextView status = (TextView) findViewById(R.id.status);
-
-            int remainingAttempts = MAX_FAILED_ATTEMPTS - failedAttempts;
-            if (remainingAttempts < COOL_DOWN_ATTEMPTS) {
-                CharSequence warningTemplate = getText(R.string.crypt_keeper_warn_wipe);
-                CharSequence warning = TextUtils.expandTemplate(warningTemplate,
-                        Integer.toString(remainingAttempts));
-                status.setText(warning);
-            } else {
-                int passwordType = StorageManager.CRYPT_TYPE_PASSWORD;
-                try {
-                    final IStorageManager service = getStorageManager();
-                    passwordType = service.getPasswordType();
-                } catch (Exception e) {
-                    Log.e(TAG, "Error calling mount service " + e);
-                }
-
-                if (passwordType == StorageManager.CRYPT_TYPE_PIN) {
-                    status.setText(R.string.cryptkeeper_wrong_pin);
-                } else if (passwordType == StorageManager.CRYPT_TYPE_PATTERN) {
-                    status.setText(R.string.cryptkeeper_wrong_pattern);
-                } else {
-                    status.setText(R.string.cryptkeeper_wrong_password);
-                }
-            }
-
-            if (mLockPatternView != null) {
-                mLockPatternView.setDisplayMode(DisplayMode.Wrong);
-                mLockPatternView.setEnabled(true);
-            }
-
-            // Reenable the password entry
-            if (mPasswordEntry != null) {
-                mPasswordEntry.setEnabled(true);
-                mPasswordEntry.scheduleShowSoftInput();
-                setBackFunctionality(true);
-            }
-        }
-    }
-
-    private class ValidationTask extends AsyncTask<Void, Void, Boolean> {
-        int state;
-
-        @Override
-        protected Boolean doInBackground(Void... params) {
-            final IStorageManager service = getStorageManager();
-            try {
-                Log.d(TAG, "Validating encryption state.");
-                state = service.getEncryptionState();
-                if (state == StorageManager.ENCRYPTION_STATE_NONE) {
-                    Log.w(TAG, "Unexpectedly in CryptKeeper even though there is no encryption.");
-                    return true; // Unexpected, but fine, I guess...
-                }
-                return state == StorageManager.ENCRYPTION_STATE_OK;
-            } catch (RemoteException e) {
-                Log.w(TAG, "Unable to get encryption state properly");
-                return true;
-            }
-        }
-
-        @Override
-        protected void onPostExecute(Boolean result) {
-            mValidationComplete = true;
-            if (Boolean.FALSE.equals(result)) {
-                Log.w(TAG, "Incomplete, or corrupted encryption detected. Prompting user to wipe.");
-                mEncryptionGoneBad = true;
-                mCorrupt = state == StorageManager.ENCRYPTION_STATE_ERROR_CORRUPT;
-            } else {
-                Log.d(TAG, "Encryption state validated. Proceeding to configure UI");
-            }
-            setupUi();
-        }
-    }
-
-    private final Handler mHandler = new Handler() {
-        @Override
-        public void handleMessage(Message msg) {
-            switch (msg.what) {
-            case MESSAGE_UPDATE_PROGRESS:
-                updateProgress();
-                break;
-
-            case MESSAGE_NOTIFY:
-                notifyUser();
-                break;
-            }
-        }
-    };
-
-    private AudioManager mAudioManager;
-    /** The status bar where back/home/recent buttons are shown. */
-    private StatusBarManager mStatusBar;
-
-    /** All the widgets to disable in the status bar */
-    final private static int sWidgetsToDisable = StatusBarManager.DISABLE_EXPAND
-            | StatusBarManager.DISABLE_NOTIFICATION_ICONS
-            | StatusBarManager.DISABLE_NOTIFICATION_ALERTS
-            | StatusBarManager.DISABLE_HOME
-            | StatusBarManager.DISABLE_SEARCH
-            | StatusBarManager.DISABLE_RECENT;
-
-    protected static final int MIN_LENGTH_BEFORE_REPORT = LockPatternUtils.MIN_LOCK_PATTERN_SIZE;
-
-    /** @return whether or not this Activity was started for debugging the UI only. */
-    private boolean isDebugView() {
-        return getIntent().hasExtra(EXTRA_FORCE_VIEW);
-    }
-
-    /** @return whether or not this Activity was started for debugging the specific UI view only. */
-    private boolean isDebugView(String viewType /* non-nullable */) {
-        return viewType.equals(getIntent().getStringExtra(EXTRA_FORCE_VIEW));
-    }
-
-    /**
-     * Notify the user that we are awaiting input. Currently this sends an audio alert.
-     */
-    private void notifyUser() {
-        if (mNotificationCountdown > 0) {
-            --mNotificationCountdown;
-        } else if (mAudioManager != null) {
-            try {
-                // Play the standard keypress sound at full volume. This should be available on
-                // every device. We cannot play a ringtone here because media services aren't
-                // available yet. A DTMF-style tone is too soft to be noticed, and might not exist
-                // on tablet devices. The idea is to alert the user that something is needed: this
-                // does not have to be pleasing.
-                mAudioManager.playSoundEffect(AudioManager.FX_KEYPRESS_STANDARD, 100);
-            } catch (Exception e) {
-                Log.w(TAG, "notifyUser: Exception while playing sound: " + e);
-            }
-        }
-        // Notify the user again in 5 seconds.
-        mHandler.removeMessages(MESSAGE_NOTIFY);
-        mHandler.sendEmptyMessageDelayed(MESSAGE_NOTIFY, 5 * 1000);
-
-        if (mWakeLock.isHeld()) {
-            if (mReleaseWakeLockCountdown > 0) {
-                --mReleaseWakeLockCountdown;
-            } else {
-                mWakeLock.release();
-            }
-        }
-    }
-
-    /**
-     * Ignore back events from this activity always - there's nowhere to go back
-     * to
-     */
-    @Override
-    public void onBackPressed() {
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        // If we are not encrypted or encrypting, get out quickly.
-        final String state = VoldProperties.decrypt().orElse("");
-        if (!isDebugView() && ("".equals(state) || DECRYPT_STATE.equals(state))) {
-            disableCryptKeeperComponent(this);
-            // Typically CryptKeeper is launched as the home app.  We didn't
-            // want to be running, so need to finish this activity.  We can count
-            // on the activity manager re-launching the new home app upon finishing
-            // this one, since this will leave the activity stack empty.
-            // NOTE: This is really grungy.  I think it would be better for the
-            // activity manager to explicitly launch the crypt keeper instead of
-            // home in the situation where we need to decrypt the device
-            finish();
-            return;
-        }
-
-        try {
-            if (getResources().getBoolean(R.bool.crypt_keeper_allow_rotation)) {
-                setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);
-            }
-        } catch (NotFoundException e) {
-        }
-
-        // Disable the status bar, but do NOT disable back because the user needs a way to go
-        // from keyboard settings and back to the password screen.
-        mStatusBar = (StatusBarManager) getSystemService(Context.STATUS_BAR_SERVICE);
-        mStatusBar.disable(sWidgetsToDisable);
-
-        if (savedInstanceState != null) {
-            mCooldown = savedInstanceState.getBoolean(STATE_COOLDOWN);
-        }
-
-        setAirplaneModeIfNecessary();
-        mAudioManager = (AudioManager) getSystemService(Context.AUDIO_SERVICE);
-        // Check for (and recover) retained instance data
-        final Object lastInstance = getLastNonConfigurationInstance();
-        if (lastInstance instanceof NonConfigurationInstanceState) {
-            NonConfigurationInstanceState retained = (NonConfigurationInstanceState) lastInstance;
-            mWakeLock = retained.wakelock;
-            Log.d(TAG, "Restoring wakelock from NonConfigurationInstanceState");
-        }
-    }
-
-    @Override
-    public void  onSaveInstanceState(Bundle savedInstanceState) {
-        savedInstanceState.putBoolean(STATE_COOLDOWN, mCooldown);
-    }
-
-    /**
-     * Note, we defer the state check and screen setup to onStart() because this will be
-     * re-run if the user clicks the power button (sleeping/waking the screen), and this is
-     * especially important if we were to lose the wakelock for any reason.
-     */
-    @Override
-    public void onStart() {
-        super.onStart();
-        setupUi();
-    }
-
-    /**
-     * Initializes the UI based on the current state of encryption.
-     * This is idempotent - calling repeatedly will simply re-initialize the UI.
-     */
-    private void setupUi() {
-        if (mEncryptionGoneBad || isDebugView(FORCE_VIEW_ERROR)) {
-            setContentView(R.layout.crypt_keeper_progress);
-            showFactoryReset(mCorrupt);
-            return;
-        }
-
-        final String progress = VoldProperties.encrypt_progress().orElse("");
-        if (!"".equals(progress) || isDebugView(FORCE_VIEW_PROGRESS)) {
-            setContentView(R.layout.crypt_keeper_progress);
-            encryptionProgressInit();
-        } else if (mValidationComplete || isDebugView(FORCE_VIEW_PASSWORD)) {
-            new AsyncTask<Void, Void, Void>() {
-                int passwordType = StorageManager.CRYPT_TYPE_PASSWORD;
-                String owner_info;
-                boolean pattern_visible;
-                boolean password_visible;
-
-                @Override
-                public Void doInBackground(Void... v) {
-                    try {
-                        final IStorageManager service = getStorageManager();
-                        passwordType = service.getPasswordType();
-                        owner_info = service.getField(StorageManager.OWNER_INFO_KEY);
-                        pattern_visible = !("0".equals(service.getField(StorageManager.PATTERN_VISIBLE_KEY)));
-                        password_visible = !("0".equals(service.getField(StorageManager.PASSWORD_VISIBLE_KEY)));
-                    } catch (Exception e) {
-                        Log.e(TAG, "Error calling mount service " + e);
-                    }
-
-                    return null;
-                }
-
-                @Override
-                public void onPostExecute(java.lang.Void v) {
-                    Settings.System.putInt(getContentResolver(), Settings.System.TEXT_SHOW_PASSWORD,
-                                  password_visible ? 1 : 0);
-
-                    if (passwordType == StorageManager.CRYPT_TYPE_PIN) {
-                        setContentView(R.layout.crypt_keeper_pin_entry);
-                        mStatusString = R.string.enter_pin;
-                    } else if (passwordType == StorageManager.CRYPT_TYPE_PATTERN) {
-                        setContentView(R.layout.crypt_keeper_pattern_entry);
-                        setBackFunctionality(false);
-                        mStatusString = R.string.enter_pattern;
-                    } else {
-                        setContentView(R.layout.crypt_keeper_password_entry);
-                        mStatusString = R.string.enter_password;
-                    }
-                    final TextView status = (TextView) findViewById(R.id.status);
-                    status.setText(mStatusString);
-
-                    final TextView ownerInfo = (TextView) findViewById(R.id.owner_info);
-                    ownerInfo.setText(owner_info);
-                    ownerInfo.setSelected(true); // Required for marquee'ing to work
-
-                    passwordEntryInit();
-
-                    findViewById(android.R.id.content).setSystemUiVisibility(View.STATUS_BAR_DISABLE_BACK);
-
-                    if (mLockPatternView != null) {
-                        mLockPatternView.setInStealthMode(!pattern_visible);
-                    }
-                    if (mCooldown) {
-                        // in case we are cooling down and coming back from emergency dialler
-                        setBackFunctionality(false);
-                        cooldown();
-                    }
-
-                }
-            }.execute();
-        } else if (!mValidationRequested) {
-            // We're supposed to be encrypted, but no validation has been done.
-            new ValidationTask().execute((Void[]) null);
-            mValidationRequested = true;
-        }
-    }
-
-    @Override
-    public void onStop() {
-        super.onStop();
-        mHandler.removeMessages(MESSAGE_UPDATE_PROGRESS);
-        mHandler.removeMessages(MESSAGE_NOTIFY);
-    }
-
-    /**
-     * Reconfiguring, so propagate the wakelock to the next instance.  This runs between onStop()
-     * and onDestroy() and only if we are changing configuration (e.g. rotation).  Also clears
-     * mWakeLock so the subsequent call to onDestroy does not release it.
-     */
-    @Override
-    public Object onRetainNonConfigurationInstance() {
-        NonConfigurationInstanceState state = new NonConfigurationInstanceState(mWakeLock);
-        Log.d(TAG, "Handing wakelock off to NonConfigurationInstanceState");
-        mWakeLock = null;
-        return state;
-    }
-
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-
-        if (mWakeLock != null) {
-            Log.d(TAG, "Releasing and destroying wakelock");
-            mWakeLock.release();
-            mWakeLock = null;
-        }
-    }
-
-    /**
-     * Start encrypting the device.
-     */
-    private void encryptionProgressInit() {
-        // Accquire a partial wakelock to prevent the device from sleeping. Note
-        // we never release this wakelock as we will be restarted after the device
-        // is encrypted.
-        Log.d(TAG, "Encryption progress screen initializing.");
-        if (mWakeLock == null) {
-            Log.d(TAG, "Acquiring wakelock.");
-            PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
-            mWakeLock = pm.newWakeLock(PowerManager.FULL_WAKE_LOCK, TAG);
-            mWakeLock.acquire();
-        }
-
-        ((ProgressBar) findViewById(R.id.progress_bar)).setIndeterminate(true);
-        // Ignore all back presses from now, both hard and soft keys.
-        setBackFunctionality(false);
-        // Start the first run of progress manually. This method sets up messages to occur at
-        // repeated intervals.
-        updateProgress();
-    }
-
-    /**
-     * Show factory reset screen allowing the user to reset their phone when
-     * there is nothing else we can do
-     * @param corrupt true if userdata is corrupt, false if encryption failed
-     *        partway through
-     */
-    private void showFactoryReset(final boolean corrupt) {
-        // Hide the encryption-bot to make room for the "factory reset" button
-        findViewById(R.id.encroid).setVisibility(View.GONE);
-
-        // Show the reset button, failure text, and a divider
-        final Button button = (Button) findViewById(R.id.factory_reset);
-        button.setVisibility(View.VISIBLE);
-        button.setOnClickListener(new OnClickListener() {
-                @Override
-            public void onClick(View v) {
-                // Factory reset the device.
-                Intent intent = new Intent(Intent.ACTION_FACTORY_RESET);
-                intent.setPackage("android");
-                intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
-                intent.putExtra(Intent.EXTRA_REASON,
-                        "CryptKeeper.showFactoryReset() corrupt=" + corrupt);
-                sendBroadcast(intent);
-            }
-        });
-
-        // Alert the user of the failure.
-        if (corrupt) {
-            ((TextView) findViewById(R.id.title)).setText(R.string.crypt_keeper_data_corrupt_title);
-            ((TextView) findViewById(R.id.status)).setText(R.string.crypt_keeper_data_corrupt_summary);
-        } else {
-            ((TextView) findViewById(R.id.title)).setText(R.string.crypt_keeper_failed_title);
-            ((TextView) findViewById(R.id.status)).setText(R.string.crypt_keeper_failed_summary);
-        }
-
-        final View view = findViewById(R.id.bottom_divider);
-        // TODO(viki): Why would the bottom divider be missing in certain layouts? Investigate.
-        if (view != null) {
-            view.setVisibility(View.VISIBLE);
-        }
-    }
-
-    private void updateProgress() {
-        final String state = VoldProperties.encrypt_progress().orElse("");
-
-        if ("error_partially_encrypted".equals(state)) {
-            showFactoryReset(false);
-            return;
-        }
-
-        // Get status as percentage first
-        CharSequence status = getText(R.string.crypt_keeper_setup_description);
-        int percent = 0;
-        try {
-            // Force a 50% progress state when debugging the view.
-            percent = isDebugView() ? 50 : Integer.parseInt(state);
-        } catch (Exception e) {
-            Log.w(TAG, "Error parsing progress: " + e.toString());
-        }
-        String progress = Integer.toString(percent);
-
-        // Now try to get status as time remaining and replace as appropriate
-        Log.v(TAG, "Encryption progress: " + progress);
-        try {
-            int time = VoldProperties.encrypt_time_remaining().get();
-            if (time >= 0) {
-                // Round up to multiple of 10 - this way display is less jerky
-                time = (time + 9) / 10 * 10;
-                progress = DateUtils.formatElapsedTime(time);
-                status = getText(R.string.crypt_keeper_setup_time_remaining);
-            }
-        } catch (Exception e) {
-            // Will happen if no time etc - show percentage
-        }
-
-        final TextView tv = (TextView) findViewById(R.id.status);
-        if (tv != null) {
-            tv.setText(TextUtils.expandTemplate(status, progress));
-        }
-
-        // Check the progress every 1 seconds
-        mHandler.removeMessages(MESSAGE_UPDATE_PROGRESS);
-        mHandler.sendEmptyMessageDelayed(MESSAGE_UPDATE_PROGRESS, 1000);
-    }
-
-    /** Insist on a power cycle to force the user to waste time between retries.
-     *
-     * Call setBackFunctionality(false) before calling this. */
-    private void cooldown() {
-        // Disable the password entry.
-        if (mPasswordEntry != null) {
-            mPasswordEntry.setEnabled(false);
-        }
-        if (mLockPatternView != null) {
-            mLockPatternView.setEnabled(false);
-        }
-
-        final TextView status = (TextView) findViewById(R.id.status);
-        status.setText(R.string.crypt_keeper_force_power_cycle);
-    }
-
-    /**
-     * Sets the back status: enabled or disabled according to the parameter.
-     * @param isEnabled true if back is enabled, false otherwise.
-     */
-    private final void setBackFunctionality(boolean isEnabled) {
-        if (isEnabled) {
-            mStatusBar.disable(sWidgetsToDisable);
-        } else {
-            mStatusBar.disable(sWidgetsToDisable | StatusBarManager.DISABLE_BACK);
-        }
-    }
-
-    private void fakeUnlockAttempt(View postingView) {
-        beginAttempt();
-        postingView.postDelayed(mFakeUnlockAttemptRunnable, FAKE_ATTEMPT_DELAY);
-    }
-
-    protected LockPatternView.OnPatternListener mChooseNewLockPatternListener =
-        new LockPatternView.OnPatternListener() {
-
-        @Override
-        public void onPatternStart() {
-            mLockPatternView.removeCallbacks(mClearPatternRunnable);
-        }
-
-        @Override
-        public void onPatternCleared() {
-        }
-
-        @Override
-        public void onPatternDetected(List<LockPatternView.Cell> pattern) {
-            mLockPatternView.setEnabled(false);
-            if (pattern.size() >= MIN_LENGTH_BEFORE_REPORT) {
-                new DecryptTask().execute(new String(LockPatternUtils.patternToByteArray(pattern)));
-            } else {
-                // Allow user to make as many of these as they want.
-                fakeUnlockAttempt(mLockPatternView);
-            }
-        }
-
-        @Override
-        public void onPatternCellAdded(List<Cell> pattern) {
-        }
-     };
-
-     private void passwordEntryInit() {
-        // Password/pin case
-        mPasswordEntry = (ImeAwareEditText) findViewById(R.id.passwordEntry);
-        if (mPasswordEntry != null){
-            mPasswordEntry.setOnEditorActionListener(this);
-            mPasswordEntry.requestFocus();
-            // Become quiet when the user interacts with the Edit text screen.
-            mPasswordEntry.setOnKeyListener(this);
-            mPasswordEntry.setOnTouchListener(this);
-            mPasswordEntry.addTextChangedListener(this);
-        }
-
-        // Pattern case
-        mLockPatternView = (LockPatternView) findViewById(R.id.lockPattern);
-        if (mLockPatternView != null) {
-            mLockPatternView.setOnPatternListener(mChooseNewLockPatternListener);
-        }
-
-        // Disable the Emergency call button if the device has no voice telephone capability
-        if (!getTelephonyManager().isVoiceCapable()) {
-            final View emergencyCall = findViewById(R.id.emergencyCallButton);
-            if (emergencyCall != null) {
-                Log.d(TAG, "Removing the emergency Call button");
-                emergencyCall.setVisibility(View.GONE);
-            }
-        }
-
-        final View imeSwitcher = findViewById(R.id.switch_ime_button);
-        final InputMethodManager imm = (InputMethodManager) getSystemService(
-                Context.INPUT_METHOD_SERVICE);
-        if (imeSwitcher != null && hasMultipleEnabledIMEsOrSubtypes(imm, false)) {
-            imeSwitcher.setVisibility(View.VISIBLE);
-            imeSwitcher.setOnClickListener(new OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    imm.showInputMethodPickerFromSystem(false /* showAuxiliarySubtypes */,
-                            v.getDisplay().getDisplayId());
-                }
-            });
-        }
-
-        // We want to keep the screen on while waiting for input. In minimal boot mode, the device
-        // is completely non-functional, and we want the user to notice the device and enter a
-        // password.
-        if (mWakeLock == null) {
-            Log.d(TAG, "Acquiring wakelock.");
-            final PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
-            if (pm != null) {
-                mWakeLock = pm.newWakeLock(PowerManager.FULL_WAKE_LOCK, TAG);
-                mWakeLock.acquire();
-                // Keep awake for 10 minutes - if the user hasn't been alerted by then
-                // best not to just drain their battery
-                mReleaseWakeLockCountdown = 96; // 96 * 5 secs per click + 120 secs before we show this = 600
-            }
-        }
-
-        // Make sure that the IME is shown when everything becomes ready.
-        if (mLockPatternView == null && !mCooldown) {
-            getWindow().setSoftInputMode(
-                                WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE);
-            if (mPasswordEntry != null) {
-                mPasswordEntry.scheduleShowSoftInput();
-            }
-        }
-
-        updateEmergencyCallButtonState();
-        // Notify the user in 120 seconds that we are waiting for him to enter the password.
-        mHandler.removeMessages(MESSAGE_NOTIFY);
-        mHandler.sendEmptyMessageDelayed(MESSAGE_NOTIFY, 120 * 1000);
-
-        // Dismiss secure & non-secure keyguards while this screen is showing.
-        getWindow().addFlags(WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD
-                | WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
-    }
-
-    /**
-     * Method adapted from com.android.inputmethod.latin.Utils
-     *
-     * @param imm The input method manager
-     * @param shouldIncludeAuxiliarySubtypes
-     * @return true if we have multiple IMEs to choose from
-     */
-    private boolean hasMultipleEnabledIMEsOrSubtypes(InputMethodManager imm,
-            final boolean shouldIncludeAuxiliarySubtypes) {
-        final List<InputMethodInfo> enabledImis = imm.getEnabledInputMethodList();
-
-        // Number of the filtered IMEs
-        int filteredImisCount = 0;
-
-        for (InputMethodInfo imi : enabledImis) {
-            // We can return true immediately after we find two or more filtered IMEs.
-            if (filteredImisCount > 1) return true;
-            final List<InputMethodSubtype> subtypes =
-                    imm.getEnabledInputMethodSubtypeList(imi, true);
-            // IMEs that have no subtypes should be counted.
-            if (subtypes.isEmpty()) {
-                ++filteredImisCount;
-                continue;
-            }
-
-            int auxCount = 0;
-            for (InputMethodSubtype subtype : subtypes) {
-                if (subtype.isAuxiliary()) {
-                    ++auxCount;
-                }
-            }
-            final int nonAuxCount = subtypes.size() - auxCount;
-
-            // IMEs that have one or more non-auxiliary subtypes should be counted.
-            // If shouldIncludeAuxiliarySubtypes is true, IMEs that have two or more auxiliary
-            // subtypes should be counted as well.
-            if (nonAuxCount > 0 || (shouldIncludeAuxiliarySubtypes && auxCount > 1)) {
-                ++filteredImisCount;
-                continue;
-            }
-        }
-
-        return filteredImisCount > 1
-        // imm.getEnabledInputMethodSubtypeList(null, false) will return the current IME's enabled
-        // input method subtype (The current IME should be LatinIME.)
-                || imm.getEnabledInputMethodSubtypeList(null, false).size() > 1;
-    }
-
-    private IStorageManager getStorageManager() {
-        final IBinder service = ServiceManager.getService("mount");
-        if (service != null) {
-            return IStorageManager.Stub.asInterface(service);
-        }
-        return null;
-    }
-
-    @Override
-    public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-        if (actionId == EditorInfo.IME_NULL || actionId == EditorInfo.IME_ACTION_DONE) {
-            // Get the password
-            final String password = v.getText().toString();
-
-            if (TextUtils.isEmpty(password)) {
-                return true;
-            }
-
-            // Now that we have the password clear the password field.
-            v.setText(null);
-
-            // Disable the password entry and back keypress while checking the password. These
-            // we either be re-enabled if the password was wrong or after the cooldown period.
-            mPasswordEntry.setEnabled(false);
-            setBackFunctionality(false);
-
-            if (password.length() >= LockPatternUtils.MIN_LOCK_PASSWORD_SIZE) {
-                new DecryptTask().execute(password);
-            } else {
-                // Allow user to make as many of these as they want.
-                fakeUnlockAttempt(mPasswordEntry);
-            }
-
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Set airplane mode on the device if it isn't an LTE device.
-     * Full story: In minimal boot mode, we cannot save any state. In particular, we cannot save
-     * any incoming SMS's. So SMSs that are received here will be silently dropped to the floor.
-     * That is bad. Also, we cannot receive any telephone calls in this state. So to avoid
-     * both these problems, we turn the radio off. However, on certain networks turning on and
-     * off the radio takes a long time. In such cases, we are better off leaving the radio
-     * running so the latency of an E911 call is short.
-     * The behavior after this is:
-     * 1. Emergency dialing: the emergency dialer has logic to force the device out of
-     *    airplane mode and restart the radio.
-     * 2. Full boot: we read the persistent settings from the previous boot and restore the
-     *    radio to whatever it was before it restarted. This also happens when rebooting a
-     *    phone that has no encryption.
-     */
-    private final void setAirplaneModeIfNecessary() {
-        if (!getTelephonyManager().isLteCdmaEvdoGsmWcdmaEnabled()) {
-            Log.d(TAG, "Going into airplane mode.");
-            Settings.Global.putInt(getContentResolver(), Settings.Global.AIRPLANE_MODE_ON, 1);
-            final Intent intent = new Intent(Intent.ACTION_AIRPLANE_MODE_CHANGED);
-            intent.putExtra("state", true);
-            sendBroadcastAsUser(intent, UserHandle.ALL);
-        }
-    }
-
-    /**
-     * Code to update the state of, and handle clicks from, the "Emergency call" button.
-     *
-     * This code is mostly duplicated from the corresponding code in
-     * LockPatternUtils and LockPatternKeyguardView under frameworks/base.
-     */
-    private void updateEmergencyCallButtonState() {
-        final Button emergencyCall = (Button) findViewById(R.id.emergencyCallButton);
-        // The button isn't present at all in some configurations.
-        if (emergencyCall == null)
-            return;
-
-        if (isEmergencyCallCapable()) {
-            emergencyCall.setVisibility(View.VISIBLE);
-            emergencyCall.setOnClickListener(new View.OnClickListener() {
-                    @Override
-
-                    public void onClick(View v) {
-                        takeEmergencyCallAction();
-                    }
-                });
-        } else {
-            emergencyCall.setVisibility(View.GONE);
-            return;
-        }
-
-        int textId;
-        if (getTelecomManager().isInCall()) {
-            // Show "return to call"
-            textId = R.string.cryptkeeper_return_to_call;
-        } else {
-            textId = R.string.cryptkeeper_emergency_call;
-        }
-        emergencyCall.setText(textId);
-    }
-
-    private boolean isEmergencyCallCapable() {
-        return getTelephonyManager().isVoiceCapable();
-    }
-
-    private void takeEmergencyCallAction() {
-        TelecomManager telecomManager = getTelecomManager();
-        if (telecomManager.isInCall()) {
-            telecomManager.showInCallScreen(false /* showDialpad */);
-        } else {
-            launchEmergencyDialer();
-        }
-    }
-
-
-    private void launchEmergencyDialer() {
-        final Intent intent = new Intent(ACTION_EMERGENCY_DIAL);
-        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK
-                        | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
-        setBackFunctionality(true);
-        startActivity(intent);
-    }
-
-    private TelephonyManager getTelephonyManager() {
-        return (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE);
-    }
-
-    private TelecomManager getTelecomManager() {
-        return (TelecomManager) getSystemService(Context.TELECOM_SERVICE);
-    }
-
-    /**
-     * Listen to key events so we can disable sounds when we get a keyinput in EditText.
-     */
-    private void delayAudioNotification() {
-        mNotificationCountdown = 20;
-    }
-
-    @Override
-    public boolean onKey(View v, int keyCode, KeyEvent event) {
-        delayAudioNotification();
-        return false;
-    }
-
-    @Override
-    public boolean onTouch(View v, MotionEvent event) {
-        delayAudioNotification();
-        return false;
-    }
-
-    @Override
-    public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-        return;
-    }
-
-    @Override
-    public void onTextChanged(CharSequence s, int start, int before, int count) {
-        delayAudioNotification();
-    }
-
-    @Override
-    public void afterTextChanged(Editable s) {
-        return;
-    }
-
-    private static void disableCryptKeeperComponent(Context context) {
-        PackageManager pm = context.getPackageManager();
-        ComponentName name = new ComponentName(context, CryptKeeper.class);
-        Log.d(TAG, "Disabling component " + name);
-        pm.setComponentEnabledSetting(name, PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
-                PackageManager.DONT_KILL_APP);
-    }
-}
diff --git a/src/com/android/settings/CryptKeeperConfirm.java b/src/com/android/settings/CryptKeeperConfirm.java
deleted file mode 100644
index 49d027b..0000000
--- a/src/com/android/settings/CryptKeeperConfirm.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- * Copyright (C) 2011 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.annotation.Nullable;
-import android.app.Activity;
-import android.app.StatusBarManager;
-import android.app.settings.SettingsEnums;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.IBinder;
-import android.os.ServiceManager;
-import android.os.UserHandle;
-import android.os.storage.IStorageManager;
-import android.provider.Settings;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-
-import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.core.InstrumentedFragment;
-
-import java.util.Arrays;
-import java.util.Locale;
-
-public class CryptKeeperConfirm extends InstrumentedFragment {
-
-    private static final String TAG = "CryptKeeperConfirm";
-
-    @Override
-    public int getMetricsCategory() {
-        return SettingsEnums.CRYPT_KEEPER_CONFIRM;
-    }
-
-    public static class Blank extends Activity {
-        private Handler mHandler = new Handler();
-
-        @Override
-        public void onCreate(Bundle savedInstanceState) {
-            super.onCreate(savedInstanceState);
-
-            setContentView(R.layout.crypt_keeper_blank);
-
-            if (Utils.isMonkeyRunning()) {
-                finish();
-            }
-
-            StatusBarManager sbm = (StatusBarManager) getSystemService(Context.STATUS_BAR_SERVICE);
-            sbm.disable(StatusBarManager.DISABLE_EXPAND
-                    | StatusBarManager.DISABLE_NOTIFICATION_ICONS
-                    | StatusBarManager.DISABLE_NOTIFICATION_ALERTS
-                    | StatusBarManager.DISABLE_SYSTEM_INFO
-                    | StatusBarManager.DISABLE_HOME
-                    | StatusBarManager.DISABLE_SEARCH
-                    | StatusBarManager.DISABLE_RECENT
-                    | StatusBarManager.DISABLE_BACK);
-
-            // Post a delayed message in 700 milliseconds to enable encryption.
-            // NOTE: The animation on this activity is set for 500 milliseconds
-            // I am giving it a little extra time to complete.
-            mHandler.postDelayed(new Runnable() {
-                public void run() {
-                    IBinder service = ServiceManager.getService("mount");
-                    if (service == null) {
-                        Log.e("CryptKeeper", "Failed to find the mount service");
-                        finish();
-                        return;
-                    }
-
-                    IStorageManager storageManager = IStorageManager.Stub.asInterface(service);
-                    try {
-                        Bundle args = getIntent().getExtras();
-                        // TODO(b/120484642): Update vold to accept a password as a byte array
-                        byte[] passwordBytes = args.getByteArray("password");
-                        String password = passwordBytes != null ? new String(passwordBytes) : null;
-                        Arrays.fill(passwordBytes, (byte) 0);
-                        storageManager.encryptStorage(args.getInt("type", -1),
-                                password);
-                    } catch (Exception e) {
-                        Log.e("CryptKeeper", "Error while encrypting...", e);
-                    }
-                }
-            }, 700);
-        }
-    }
-
-    private View mContentView;
-    private Button mFinalButton;
-    private Button.OnClickListener mFinalClickListener = new Button.OnClickListener() {
-
-        public void onClick(View v) {
-            if (Utils.isMonkeyRunning()) {
-                return;
-            }
-
-            /* WARNING - nasty hack!
-               Settings for the lock screen are not available to the crypto
-               screen (CryptKeeper) at boot. We duplicate the ones that
-               CryptKeeper needs to the crypto key/value store when they are
-               modified (see LockPatternUtils).
-               However, prior to encryption, the crypto key/value store is not
-               persisted across reboots, thus modified settings are lost to
-               CryptKeeper.
-               In order to make sure CryptKeeper had the correct settings after
-               first encrypting, we thus need to rewrite them, which ensures the
-               crypto key/value store is up to date. On encryption, this store
-               is then persisted, and the settings will be there on future
-               reboots.
-             */
-
-            // 1. The owner info.
-            LockPatternUtils utils = new LockPatternUtils(getActivity());
-            utils.setVisiblePatternEnabled(
-                    utils.isVisiblePatternEnabled(UserHandle.USER_SYSTEM),
-                    UserHandle.USER_SYSTEM);
-            if (utils.isOwnerInfoEnabled(UserHandle.USER_SYSTEM)) {
-                utils.setOwnerInfo(utils.getOwnerInfo(UserHandle.USER_SYSTEM),
-                                   UserHandle.USER_SYSTEM);
-            }
-            int value = Settings.System.getInt(getContext().getContentResolver(),
-                                               Settings.System.TEXT_SHOW_PASSWORD,
-                                               1);
-            utils.setVisiblePasswordEnabled(value != 0, UserHandle.USER_SYSTEM);
-
-            Intent intent = new Intent(getActivity(), Blank.class);
-            intent.putExtras(getArguments());
-            startActivity(intent);
-
-            // 2. The system locale.
-            try {
-                IBinder service = ServiceManager.getService("mount");
-                IStorageManager storageManager = IStorageManager.Stub.asInterface(service);
-                storageManager.setField("SystemLocale", Locale.getDefault().toLanguageTag());
-            } catch (Exception e) {
-                Log.e(TAG, "Error storing locale for decryption UI", e);
-            }
-        }
-    };
-
-    private void establishFinalConfirmationState() {
-        mFinalButton = (Button) mContentView.findViewById(R.id.execute_encrypt);
-        mFinalButton.setOnClickListener(mFinalClickListener);
-    }
-
-    @Override
-    public void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        getActivity().setTitle(R.string.crypt_keeper_confirm_title);
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-            Bundle savedInstanceState) {
-        mContentView = inflater.inflate(R.layout.crypt_keeper_confirm, null);
-        establishFinalConfirmationState();
-        return mContentView;
-    }
-}
diff --git a/src/com/android/settings/IccLockSettings.java b/src/com/android/settings/IccLockSettings.java
index e89e84b..71eb0f2 100644
--- a/src/com/android/settings/IccLockSettings.java
+++ b/src/com/android/settings/IccLockSettings.java
@@ -587,6 +587,7 @@
                 .inflate(com.android.internal.R.layout.transient_notification, null);
         final TextView tv = (TextView) v.findViewById(com.android.internal.R.id.message);
         tv.setText(errorMessage);
+        tv.setSingleLine(false);
 
         final WindowManager.LayoutParams params = new WindowManager.LayoutParams();
         final Configuration config = v.getContext().getResources().getConfiguration();
diff --git a/src/com/android/settings/ResetNetworkConfirm.java b/src/com/android/settings/ResetNetworkConfirm.java
index f79bdb2..eff487b 100644
--- a/src/com/android/settings/ResetNetworkConfirm.java
+++ b/src/com/android/settings/ResetNetworkConfirm.java
@@ -138,7 +138,7 @@
             if (btManager != null) {
                 BluetoothAdapter btAdapter = btManager.getAdapter();
                 if (btAdapter != null) {
-                    btAdapter.factoryReset();
+                    btAdapter.clearBluetooth();
                 }
             }
 
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index 7154081..287ac85 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -199,7 +199,6 @@
     public static class BatterySaverScheduleSettingsActivity extends SettingsActivity { /* empty */ }
     public static class AccountSyncSettingsActivity extends SettingsActivity { /* empty */ }
     public static class AccountSyncSettingsInAddAccountActivity extends SettingsActivity { /* empty */ }
-    public static class CryptKeeperSettingsActivity extends SettingsActivity { /* empty */ }
     public static class DeviceAdminSettingsActivity extends SettingsActivity { /* empty */ }
     public static class DataUsageSummaryActivity extends SettingsActivity { /* empty */ }
     public static class MobileDataUsageListActivity extends SettingsActivity { /* empty */ }
@@ -324,4 +323,6 @@
      * Activity for AppDashboard.
      */
     public static class AppDashboardActivity extends SettingsActivity {}
+
+    public static class AdaptiveBrightnessActivity extends SettingsActivity { /* empty */ }
 }
diff --git a/src/com/android/settings/SettingsDumpService.java b/src/com/android/settings/SettingsDumpService.java
index 7e37e32..38987f5 100644
--- a/src/com/android/settings/SettingsDumpService.java
+++ b/src/com/android/settings/SettingsDumpService.java
@@ -35,6 +35,7 @@
 import androidx.annotation.VisibleForTesting;
 
 import com.android.settings.applications.ProcStatsData;
+import com.android.settings.datausage.lib.DataUsageLib;
 import com.android.settings.fuelgauge.batterytip.AnomalyConfigJobService;
 import com.android.settingslib.net.DataUsageController;
 
@@ -109,14 +110,8 @@
         if (telephonyManager.isDataCapable()) {
             JSONArray array = new JSONArray();
             for (SubscriptionInfo info : manager.getAvailableSubscriptionInfoList()) {
-                telephonyManager = telephonyManager
-                        .createForSubscriptionId(info.getSubscriptionId());
-                String subscriberId = telephonyManager.getSubscriberId();
-                // The null subscriberId means that no any mobile/carrier network will be matched.
-                // Using old API: buildTemplateMobileAll for the null subscriberId to avoid NPE.
-                NetworkTemplate template = subscriberId != null
-                        ? NetworkTemplate.buildTemplateCarrierMetered(subscriberId)
-                        : NetworkTemplate.buildTemplateMobileAll(subscriberId);
+                NetworkTemplate template = DataUsageLib.getMobileTemplateForSubId(
+                        telephonyManager, info.getSubscriptionId());
                 final JSONObject usage = dumpDataUsage(template, controller);
                 usage.put("subId", info.getSubscriptionId());
                 array.put(usage);
@@ -125,12 +120,12 @@
         }
         if (packageManager.hasSystemFeature(FEATURE_WIFI)) {
             obj.put("wifi", dumpDataUsage(
-                    NetworkTemplate.buildTemplateWifi(
-                    NetworkTemplate.WIFI_NETWORKID_ALL, null /* subscriberId */), controller));
+                    new NetworkTemplate.Builder(NetworkTemplate.MATCH_WIFI).build(), controller));
         }
 
         if (packageManager.hasSystemFeature(FEATURE_ETHERNET)) {
-            obj.put("ethernet", dumpDataUsage(NetworkTemplate.buildTemplateEthernet(), controller));
+            obj.put("ethernet", dumpDataUsage(new NetworkTemplate.Builder(
+                    NetworkTemplate.MATCH_ETHERNET).build(), controller));
         }
         return obj;
     }
diff --git a/src/com/android/settings/TetherSettings.java b/src/com/android/settings/TetherSettings.java
index 1a21b55..da21729 100644
--- a/src/com/android/settings/TetherSettings.java
+++ b/src/com/android/settings/TetherSettings.java
@@ -34,19 +34,19 @@
 import android.hardware.usb.UsbManager;
 import android.net.ConnectivityManager;
 import android.net.EthernetManager;
+import android.net.IpConfiguration;
 import android.net.TetheringManager;
 import android.net.wifi.WifiManager;
 import android.os.Bundle;
 import android.os.Environment;
 import android.os.Handler;
-import android.os.HandlerExecutor;
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.provider.SearchIndexableResource;
-import android.text.TextUtils;
 import android.util.FeatureFlagUtils;
 import android.util.Log;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.VisibleForTesting;
 import androidx.preference.Preference;
 import androidx.preference.SwitchPreference;
@@ -63,6 +63,7 @@
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashSet;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicReference;
 
@@ -98,7 +99,6 @@
     private BroadcastReceiver mTetherChangeReceiver;
 
     private String[] mBluetoothRegexs;
-    private String mEthernetRegex;
     private AtomicReference<BluetoothPan> mBluetoothPan = new AtomicReference<>();
 
     private Handler mHandler = new Handler();
@@ -107,6 +107,7 @@
     private EthernetManager mEm;
     private TetheringEventCallback mTetheringEventCallback;
     private EthernetListener mEthernetListener;
+    private final HashSet<String> mAvailableInterfaces = new HashSet<>();
 
     private WifiTetherPreferenceController mWifiTetherPreferenceController;
 
@@ -173,17 +174,17 @@
         mDataSaverBackend.addListener(this);
 
         mCm = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
-        mEm = (EthernetManager) getSystemService(Context.ETHERNET_SERVICE);
         mTm = (TetheringManager) getSystemService(Context.TETHERING_SERVICE);
+        // Some devices do not have available EthernetManager. In that case getSystemService will
+        // return null.
+        mEm = mContext.getSystemService(EthernetManager.class);
 
         mUsbRegexs = mTm.getTetherableUsbRegexs();
         mBluetoothRegexs = mTm.getTetherableBluetoothRegexs();
-        mEthernetRegex = mContext.getResources().getString(
-                com.android.internal.R.string.config_ethernet_iface_regex);
 
         final boolean usbAvailable = mUsbRegexs.length != 0;
         final boolean bluetoothAvailable = adapter != null && mBluetoothRegexs.length != 0;
-        final boolean ethernetAvailable = !TextUtils.isEmpty(mEthernetRegex);
+        final boolean ethernetAvailable = (mEm != null);
 
         if (!usbAvailable || Utils.isMonkeyRunning()) {
             getPreferenceScreen().removePreference(mUsbTether);
@@ -324,14 +325,14 @@
 
         mStartTetheringCallback = new OnStartTetheringCallback(this);
         mTetheringEventCallback = new TetheringEventCallback();
-        mTm.registerTetheringEventCallback(new HandlerExecutor(mHandler), mTetheringEventCallback);
+        mTm.registerTetheringEventCallback(r -> mHandler.post(r), mTetheringEventCallback);
 
         mMassStorageActive = Environment.MEDIA_SHARED.equals(Environment.getExternalStorageState());
         registerReceiver();
 
         mEthernetListener = new EthernetListener();
         if (mEm != null)
-            mEm.addListener(mEthernetListener);
+            mEm.addInterfaceStateListener(r -> mHandler.post(r), mEthernetListener);
 
         updateUsbState();
         updateBluetoothAndEthernetState();
@@ -347,11 +348,10 @@
         getActivity().unregisterReceiver(mTetherChangeReceiver);
         mTm.unregisterTetheringEventCallback(mTetheringEventCallback);
         if (mEm != null)
-            mEm.removeListener(mEthernetListener);
+            mEm.removeInterfaceStateListener(mEthernetListener);
         mTetherChangeReceiver = null;
         mStartTetheringCallback = null;
         mTetheringEventCallback = null;
-        mEthernetListener = null;
     }
 
     @VisibleForTesting
@@ -484,11 +484,11 @@
         boolean isTethered = false;
 
         for (String s : available) {
-            if (s.matches(mEthernetRegex)) isAvailable = true;
+            if (mAvailableInterfaces.contains(s)) isAvailable = true;
         }
 
         for (String s : tethered) {
-            if (s.matches(mEthernetRegex)) isTethered = true;
+            if (mAvailableInterfaces.contains(s)) isTethered = true;
         }
 
         if (DEBUG) {
@@ -499,7 +499,7 @@
         if (isTethered) {
             mEthernetTether.setEnabled(!mDataSaverEnabled);
             mEthernetTether.setChecked(true);
-        } else if (isAvailable || (mEm != null && mEm.isAvailable())) {
+        } else if (mAvailableInterfaces.size() > 0) {
             mEthernetTether.setEnabled(!mDataSaverEnabled);
             mEthernetTether.setChecked(false);
         } else {
@@ -601,9 +601,9 @@
                         keys.add(KEY_ENABLE_BLUETOOTH_TETHERING);
                     }
 
-                    final boolean ethernetAvailable = !TextUtils.isEmpty(
-                            context.getResources().getString(
-                                    com.android.internal.R.string.config_ethernet_iface_regex));
+                    final EthernetManager em =
+                            context.getSystemService(EthernetManager.class);
+                    final boolean ethernetAvailable = (em != null);
                     if (!ethernetAvailable) {
                         keys.add(KEY_ENABLE_ETHERNET_TETHERING);
                     }
@@ -647,9 +647,15 @@
         }
     }
 
-    private final class EthernetListener implements EthernetManager.Listener {
-        public void onAvailabilityChanged(String iface, boolean isAvailable) {
-            mHandler.post(() -> updateBluetoothAndEthernetState());
+    private final class EthernetListener implements EthernetManager.InterfaceStateListener {
+        public void onInterfaceStateChanged(@NonNull String iface, int state, int role,
+                @NonNull IpConfiguration configuration) {
+            if (state == EthernetManager.STATE_LINK_UP) {
+                mAvailableInterfaces.add(iface);
+            } else {
+                mAvailableInterfaces.remove(iface);
+            }
+            updateBluetoothAndEthernetState();
         }
     }
 }
diff --git a/src/com/android/settings/accessibility/AccessibilityServiceWarning.java b/src/com/android/settings/accessibility/AccessibilityServiceWarning.java
index dcf7897..93ec8030 100644
--- a/src/com/android/settings/accessibility/AccessibilityServiceWarning.java
+++ b/src/com/android/settings/accessibility/AccessibilityServiceWarning.java
@@ -23,7 +23,6 @@
 import android.content.Context;
 import android.content.DialogInterface;
 import android.graphics.drawable.Drawable;
-import android.os.storage.StorageManager;
 import android.text.BidiFormatter;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
@@ -86,16 +85,6 @@
         return ad;
     }
 
-    /**
-     * Returns whether the device is encrypted with legacy full disk encryption. Newer devices
-     * should be using File Based Encryption.
-     *
-     * @return true if device is encrypted
-     */
-    private static boolean isFullDiskEncrypted() {
-        return StorageManager.isNonDefaultBlockEncrypted();
-    }
-
     private static View createEnableDialogContentView(Context context,
             @NonNull AccessibilityServiceInfo info, View.OnClickListener listener,
             UninstallActionPerformer performer) {
@@ -105,17 +94,6 @@
         View content = inflater.inflate(R.layout.enable_accessibility_service_dialog_content,
                 null);
 
-        TextView encryptionWarningView = (TextView) content.findViewById(
-                R.id.encryption_warning);
-        if (isFullDiskEncrypted()) {
-            String text = context.getString(R.string.enable_service_encryption_warning,
-                    getServiceName(context, info));
-            encryptionWarningView.setText(text);
-            encryptionWarningView.setVisibility(View.VISIBLE);
-        } else {
-            encryptionWarningView.setVisibility(View.GONE);
-        }
-
         final Drawable icon;
         if (info.getResolveInfo().getIconResource() == 0) {
             icon = ContextCompat.getDrawable(context, R.drawable.ic_accessibility_generic);
diff --git a/src/com/android/settings/accessibility/OWNERS b/src/com/android/settings/accessibility/OWNERS
index ba03055..a0fe42b 100644
--- a/src/com/android/settings/accessibility/OWNERS
+++ b/src/com/android/settings/accessibility/OWNERS
@@ -1,4 +1,5 @@
 # Default reviewers for this and subdirectories.
+menghanli@google.com
 pweaver@google.com
 zork@google.com
 
diff --git a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
index bd63406..6dd1217 100644
--- a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
@@ -21,9 +21,7 @@
 import static com.android.settings.accessibility.PreferredShortcuts.retrieveUserShortcutType;
 
 import android.accessibilityservice.AccessibilityServiceInfo;
-import android.app.Activity;
 import android.app.Dialog;
-import android.app.admin.DevicePolicyManager;
 import android.app.settings.SettingsEnums;
 import android.content.BroadcastReceiver;
 import android.content.ComponentName;
@@ -38,9 +36,6 @@
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
-import android.os.UserHandle;
-import android.os.storage.StorageManager;
-import android.provider.Settings;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.Menu;
@@ -51,11 +46,9 @@
 
 import androidx.annotation.Nullable;
 
-import com.android.internal.widget.LockPatternUtils;
 import com.android.settings.R;
 import com.android.settings.accessibility.AccessibilityUtil.UserShortcutType;
 import com.android.settings.overlay.FeatureFactory;
-import com.android.settings.password.ConfirmDeviceCredentialActivity;
 import com.android.settingslib.accessibility.AccessibilityUtils;
 
 import java.util.List;
@@ -66,8 +59,6 @@
         ToggleFeaturePreferenceFragment {
 
     private static final String TAG = "ToggleAccessibilityServicePreferenceFragment";
-    private static final int ACTIVITY_REQUEST_CONFIRM_CREDENTIAL_FOR_WEAKER_ENCRYPTION = 1;
-    private LockPatternUtils mLockPatternUtils;
     private AtomicBoolean mIsDialogShown = new AtomicBoolean(/* initialValue= */ false);
 
     private static final String EMPTY_STRING = "";
@@ -106,7 +97,6 @@
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        mLockPatternUtils = new LockPatternUtils(getPrefContext());
     }
 
     @Override
@@ -243,33 +233,8 @@
                 .contains(mComponentName);
     }
 
-    /**
-     * Return whether the device is encrypted with legacy full disk encryption. Newer devices
-     * should be using File Based Encryption.
-     *
-     * @return true if device is encrypted
-     */
-    private boolean isFullDiskEncrypted() {
-        return StorageManager.isNonDefaultBlockEncrypted();
-    }
-
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        if (requestCode == ACTIVITY_REQUEST_CONFIRM_CREDENTIAL_FOR_WEAKER_ENCRYPTION) {
-            if (resultCode == Activity.RESULT_OK) {
-                handleConfirmServiceEnabled(/* confirmed= */ true);
-                // The user confirmed that they accept weaker encryption when
-                // enabling the accessibility service, so change encryption.
-                // Since we came here asynchronously, check encryption again.
-                if (isFullDiskEncrypted()) {
-                    mLockPatternUtils.clearEncryptionPassword();
-                    Settings.Global.putInt(getContentResolver(),
-                            Settings.Global.REQUIRE_PASSWORD_TO_DECRYPT, 0);
-                }
-            } else {
-                handleConfirmServiceEnabled(/* confirmed= */ false);
-            }
-        }
     }
 
     private void registerPackageRemoveReceiver() {
@@ -321,23 +286,6 @@
         onPreferenceToggled(mPreferenceKey, confirmed);
     }
 
-    private String createConfirmCredentialReasonMessage() {
-        int resId = R.string.enable_service_password_reason;
-        switch (mLockPatternUtils.getKeyguardStoredPasswordQuality(UserHandle.myUserId())) {
-            case DevicePolicyManager.PASSWORD_QUALITY_SOMETHING: {
-                resId = R.string.enable_service_pattern_reason;
-            }
-            break;
-            case DevicePolicyManager.PASSWORD_QUALITY_NUMERIC:
-            case DevicePolicyManager.PASSWORD_QUALITY_NUMERIC_COMPLEX: {
-                resId = R.string.enable_service_pin_reason;
-            }
-            break;
-        }
-        return getString(resId, getAccessibilityServiceInfo().getResolveInfo()
-                .loadLabel(getPackageManager()));
-    }
-
     @Override
     public void onSwitchChanged(Switch switchView, boolean isChecked) {
         if (isChecked != isAccessibilityServiceEnabled()) {
@@ -461,20 +409,11 @@
     }
 
     private void onAllowButtonFromEnableToggleClicked() {
-        if (isFullDiskEncrypted()) {
-            final String title = createConfirmCredentialReasonMessage();
-            final Intent intent = ConfirmDeviceCredentialActivity.createIntent(title, /* details= */
-                    null);
-            startActivityForResult(intent,
-                    ACTIVITY_REQUEST_CONFIRM_CREDENTIAL_FOR_WEAKER_ENCRYPTION);
-        } else {
-            handleConfirmServiceEnabled(/* confirmed= */ true);
-            if (isServiceSupportAccessibilityButton()) {
-                mIsDialogShown.set(false);
-                showPopupDialog(DialogEnums.LAUNCH_ACCESSIBILITY_TUTORIAL);
-            }
+        handleConfirmServiceEnabled(/* confirmed= */ true);
+        if (isServiceSupportAccessibilityButton()) {
+            mIsDialogShown.set(false);
+            showPopupDialog(DialogEnums.LAUNCH_ACCESSIBILITY_TUTORIAL);
         }
-
         mDialog.dismiss();
     }
 
diff --git a/src/com/android/settings/applications/ConfirmConvertToFbe.java b/src/com/android/settings/applications/ConfirmConvertToFbe.java
deleted file mode 100644
index 35ddc6b..0000000
--- a/src/com/android/settings/applications/ConfirmConvertToFbe.java
+++ /dev/null
@@ -1,55 +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.applications;
-
-import android.app.settings.SettingsEnums;
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-
-import com.android.settings.R;
-import com.android.settings.SettingsPreferenceFragment;
-
-public class ConfirmConvertToFbe extends SettingsPreferenceFragment {
-    static final String TAG = "ConfirmConvertToFBE";
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                Bundle savedInstanceState) {
-        View rootView = inflater.inflate(R.layout.confirm_convert_fbe, null);
-
-        final Button button = (Button) rootView.findViewById(R.id.button_confirm_convert_fbe);
-        button.setOnClickListener(new View.OnClickListener() {
-            public void onClick(View v) {
-                Intent intent = new Intent(Intent.ACTION_FACTORY_RESET);
-                intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
-                intent.setPackage("android");
-                intent.putExtra(Intent.EXTRA_REASON, "convert_fbe");
-                getActivity().sendBroadcast(intent);
-            }
-        });
-
-        return rootView;
-    }
-
-    @Override
-    public int getMetricsCategory() {
-        return SettingsEnums.CONVERT_FBE_CONFIRM;
-    }
-}
diff --git a/src/com/android/settings/applications/ConvertToFbe.java b/src/com/android/settings/applications/ConvertToFbe.java
deleted file mode 100644
index d470011..0000000
--- a/src/com/android/settings/applications/ConvertToFbe.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.applications;
-
-import android.annotation.Nullable;
-import android.app.Activity;
-import android.app.settings.SettingsEnums;
-import android.content.Intent;
-import android.content.res.Resources;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-
-import com.android.settings.R;
-import com.android.settings.core.InstrumentedFragment;
-import com.android.settings.core.SubSettingLauncher;
-import com.android.settings.password.ChooseLockSettingsHelper;
-
-/* Class to prompt for conversion of userdata to file based encryption
- */
-public class ConvertToFbe extends InstrumentedFragment {
-    static final String TAG = "ConvertToFBE";
-    private static final int KEYGUARD_REQUEST = 55;
-
-    private boolean runKeyguardConfirmation(int request) {
-        Resources res = getActivity().getResources();
-        final ChooseLockSettingsHelper.Builder builder =
-                new ChooseLockSettingsHelper.Builder(getActivity(), this);
-        return builder.setRequestCode(request)
-                .setTitle(res.getText(R.string.convert_to_file_encryption))
-                .show();
-    }
-
-    @Override
-    public void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        getActivity().setTitle(R.string.convert_to_file_encryption);
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-            Bundle savedInstanceState) {
-        View rootView = inflater.inflate(R.layout.convert_fbe, null);
-
-        final Button button = rootView.findViewById(R.id.button_convert_fbe);
-        button.setOnClickListener(v -> {
-            if (!runKeyguardConfirmation(KEYGUARD_REQUEST)) {
-                convert();
-            }
-        });
-
-        return rootView;
-    }
-
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-
-        if (requestCode != KEYGUARD_REQUEST) {
-            return;
-        }
-
-        // If the user entered a valid keyguard credential, start the conversion
-        // process
-        if (resultCode == Activity.RESULT_OK) {
-            convert();
-        }
-    }
-
-    private void convert() {
-        new SubSettingLauncher(getContext())
-                .setDestination(ConfirmConvertToFbe.class.getName())
-                .setTitleRes(R.string.convert_to_file_encryption)
-                .setSourceMetricsCategory(getMetricsCategory())
-                .launch();
-    }
-
-    @Override
-    public int getMetricsCategory() {
-        return SettingsEnums.CONVERT_FBE;
-    }
-}
diff --git a/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceController.java b/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceController.java
index f321d72..6a254cb 100644
--- a/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceController.java
+++ b/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceController.java
@@ -17,6 +17,7 @@
 package com.android.settings.applications.appinfo;
 
 import android.content.Context;
+import android.net.NetworkStats;
 import android.net.NetworkTemplate;
 import android.os.Bundle;
 import android.text.format.DateUtils;
@@ -136,13 +137,13 @@
 
     private static NetworkTemplate getTemplate(Context context) {
         if (DataUsageUtils.hasReadyMobileRadio(context)) {
-            return NetworkTemplate.buildTemplateMobileWildcard();
+            return new NetworkTemplate.Builder(NetworkTemplate.MATCH_MOBILE).setMeteredness(
+                    NetworkStats.METERED_YES).build();
         }
         if (DataUsageUtils.hasWifiRadio(context)) {
-            return NetworkTemplate.buildTemplateWifi(NetworkTemplate.WIFI_NETWORKID_ALL,
-                    null /* subscriberId */);
+            return new NetworkTemplate.Builder(NetworkTemplate.MATCH_WIFI).build();
         }
-        return NetworkTemplate.buildTemplateEthernet();
+        return new NetworkTemplate.Builder(NetworkTemplate.MATCH_ETHERNET).build();
     }
 
     @VisibleForTesting
diff --git a/src/com/android/settings/applications/appinfo/OWNERS b/src/com/android/settings/applications/appinfo/OWNERS
new file mode 100644
index 0000000..cd6abb8
--- /dev/null
+++ b/src/com/android/settings/applications/appinfo/OWNERS
@@ -0,0 +1,5 @@
+# just for per-app locale settings review
+allenwtsu@google.com
+danielwbhuang@google.com
+goldmanj@google.com
+tomhsu@google.com
diff --git a/src/com/android/settings/applications/specialaccess/DefaultPaymentSettingsPreferenceController.java b/src/com/android/settings/applications/specialaccess/DefaultPaymentSettingsPreferenceController.java
index 2f03c3d..763a500 100644
--- a/src/com/android/settings/applications/specialaccess/DefaultPaymentSettingsPreferenceController.java
+++ b/src/com/android/settings/applications/specialaccess/DefaultPaymentSettingsPreferenceController.java
@@ -82,7 +82,7 @@
                         PackageManager.FEATURE_NFC_HOST_CARD_EMULATION)) {
             return UNSUPPORTED_ON_DEVICE;
         }
-        if (!mUserManager.isAdminUser()) {
+        if (mUserManager.isGuestUser()) {
             return DISABLED_FOR_USER;
         }
         if (mNfcAdapter == null) {
diff --git a/src/com/android/settings/biometrics/OWNERS b/src/com/android/settings/biometrics/OWNERS
index 021e89d..99dd654 100644
--- a/src/com/android/settings/biometrics/OWNERS
+++ b/src/com/android/settings/biometrics/OWNERS
@@ -1,6 +1,10 @@
 # Default reviewers for this and subdirectories.
 curtislb@google.com
+graciecheng@google.com
+ilyamaty@google.com
 jaggies@google.com
+jbolinger@google.com
+joshmccloskey@google.com
 kchyn@google.com
 yukl@google.com
 
diff --git a/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdater.java b/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdater.java
index 27d63bf..14c20f1 100644
--- a/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdater.java
+++ b/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdater.java
@@ -70,9 +70,10 @@
             if (DBG) {
                 Log.d(TAG, "isFilterMatched() current audio profile : " + currentAudioProfile);
             }
-            // If device is Hearing Aid, it is compatible with HFP and A2DP.
+            // If device is Hearing Aid or LE Audio, it is compatible with HFP and A2DP.
             // It would show in Available Devices group.
-            if (cachedDevice.isConnectedHearingAidDevice()) {
+            if (cachedDevice.isConnectedHearingAidDevice()
+                    || cachedDevice.isConnectedLeAudioDevice()) {
                 return true;
             }
             // According to the current audio profile type,
diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsHeaderController.java b/src/com/android/settings/bluetooth/BluetoothDetailsHeaderController.java
index 9f5e78e..9c7aa58 100644
--- a/src/com/android/settings/bluetooth/BluetoothDetailsHeaderController.java
+++ b/src/com/android/settings/bluetooth/BluetoothDetailsHeaderController.java
@@ -16,6 +16,7 @@
 
 package com.android.settings.bluetooth;
 
+import android.bluetooth.BluetoothProfile;
 import android.content.Context;
 import android.graphics.drawable.Drawable;
 import android.text.TextUtils;
@@ -53,7 +54,10 @@
 
     @Override
     public boolean isAvailable() {
-        return !Utils.isAdvancedDetailsHeader(mCachedDevice.getDevice());
+        boolean hasLeAudio = mCachedDevice.getConnectableProfiles()
+                .stream()
+                .anyMatch(profile -> profile.getProfileId() == BluetoothProfile.LE_AUDIO);
+        return !Utils.isAdvancedDetailsHeader(mCachedDevice.getDevice()) && !hasLeAudio;
     }
 
     @Override
diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressController.java b/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressController.java
index dda247e..d80512e 100644
--- a/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressController.java
+++ b/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressController.java
@@ -16,6 +16,7 @@
 
 package com.android.settings.bluetooth;
 
+import android.bluetooth.BluetoothCsipSetCoordinator;
 import android.content.Context;
 
 import androidx.preference.PreferenceFragmentCompat;
@@ -45,13 +46,23 @@
     protected void init(PreferenceScreen screen) {
         mFooterPreference = screen.findPreference(KEY_DEVICE_DETAILS_FOOTER);
         mFooterPreference.setTitle(mContext.getString(
-                R.string.bluetooth_device_mac_address, mCachedDevice.getAddress()));
+                R.string.bluetooth_device_mac_address, mCachedDevice.getIdentityAddress()));
     }
 
     @Override
     protected void refresh() {
-        mFooterPreference.setTitle(mContext.getString(
-                R.string.bluetooth_device_mac_address, mCachedDevice.getAddress()));
+        if (mCachedDevice.getGroupId() != BluetoothCsipSetCoordinator.GROUP_ID_INVALID) {
+            StringBuilder title = new StringBuilder(mContext.getString(
+                    R.string.bluetooth_multuple_devices_mac_address,
+                            mCachedDevice.getIdentityAddress()));
+            for (CachedBluetoothDevice member: mCachedDevice.getMemberDevice()) {
+                title.append("\n").append(member.getIdentityAddress());
+            }
+            mFooterPreference.setTitle(title);
+        } else {
+            mFooterPreference.setTitle(mContext.getString(
+                    R.string.bluetooth_device_mac_address, mCachedDevice.getIdentityAddress()));
+        }
     }
 
     @Override
diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsProfilesController.java b/src/com/android/settings/bluetooth/BluetoothDetailsProfilesController.java
index aacf41f..b57ea92 100644
--- a/src/com/android/settings/bluetooth/BluetoothDetailsProfilesController.java
+++ b/src/com/android/settings/bluetooth/BluetoothDetailsProfilesController.java
@@ -16,10 +16,12 @@
 
 package com.android.settings.bluetooth;
 
+import android.bluetooth.BluetoothCsipSetCoordinator;
 import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothProfile;
 import android.content.Context;
 import android.text.TextUtils;
+import android.util.Log;
 
 import androidx.annotation.VisibleForTesting;
 import androidx.preference.Preference;
@@ -31,6 +33,7 @@
 import com.android.settings.R;
 import com.android.settingslib.bluetooth.A2dpProfile;
 import com.android.settingslib.bluetooth.CachedBluetoothDevice;
+import com.android.settingslib.bluetooth.LeAudioProfile;
 import com.android.settingslib.bluetooth.LocalBluetoothManager;
 import com.android.settingslib.bluetooth.LocalBluetoothProfile;
 import com.android.settingslib.bluetooth.LocalBluetoothProfileManager;
@@ -39,7 +42,10 @@
 import com.android.settingslib.bluetooth.PbapServerProfile;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * This class adds switches for toggling the individual profiles that a Bluetooth device
@@ -48,8 +54,11 @@
 public class BluetoothDetailsProfilesController extends BluetoothDetailsController
         implements Preference.OnPreferenceClickListener,
         LocalBluetoothProfileManager.ServiceListener {
+    private static final String TAG = "BtDetailsProfilesCtrl";
+
     private static final String KEY_PROFILES_GROUP = "bluetooth_profiles";
     private static final String KEY_BOTTOM_PREFERENCE = "bottom_preference";
+    private static final String HEADSET_CLIENT = "HEADSET_CLIENT";
     private static final int ORDINAL = 99;
 
     @VisibleForTesting
@@ -58,6 +67,9 @@
     private LocalBluetoothManager mManager;
     private LocalBluetoothProfileManager mProfileManager;
     private CachedBluetoothDevice mCachedDevice;
+    private List<CachedBluetoothDevice> mAllOfCachedDevices;
+    private Map<String, List<CachedBluetoothDevice>> mProfileDeviceMap =
+            new HashMap<String, List<CachedBluetoothDevice>>();
 
     @VisibleForTesting
     PreferenceCategory mProfilesContainer;
@@ -68,6 +80,7 @@
         mManager = manager;
         mProfileManager = mManager.getProfileManager();
         mCachedDevice = device;
+        mAllOfCachedDevices = getAllOfCachedBluetoothDevices();
         lifecycle.addObserver(this);
     }
 
@@ -100,11 +113,66 @@
 
     /**
      * Refreshes the state for an existing SwitchPreference for a profile.
+     * If the LeAudio profile is enabled on the LeAudio devices, then the SwitchPreferences of
+     * A2dp profile and Hfp profile are graied out.
      */
     private void refreshProfilePreference(SwitchPreference profilePref,
             LocalBluetoothProfile profile) {
         BluetoothDevice device = mCachedDevice.getDevice();
-        profilePref.setEnabled(!mCachedDevice.isBusy());
+        boolean isLeAudioEnabled = false;
+        if (profile instanceof A2dpProfile || HEADSET_CLIENT.equals(profile.toString())) {
+            LocalBluetoothProfile leAudio = mProfileManager.getLeAudioProfile();
+            if (leAudio != null) {
+                List<CachedBluetoothDevice> leAudioDeviceList = mProfileDeviceMap.get(
+                        leAudio.toString());
+                if (leAudioDeviceList != null
+                        && leAudioDeviceList.stream()
+                        .anyMatch(item -> leAudio.isEnabled(item.getDevice()))) {
+                    isLeAudioEnabled = true;
+                }
+            }
+            if (isLeAudioEnabled) {
+                // If the LeAudio profile is enabled on the LeAudio devices, then the
+                // SwitchPreferences of A2dp profile and Hfp profile are graied out.
+                profilePref.setEnabled(false);
+            } else {
+                List<CachedBluetoothDevice> deviceList = mProfileDeviceMap.get(
+                        profile.toString());
+                boolean isBusy = deviceList != null
+                        && deviceList.stream().anyMatch(item -> item.isBusy());
+                profilePref.setEnabled(!isBusy);
+            }
+        } else if (profile instanceof LeAudioProfile) {
+            List<CachedBluetoothDevice> leAudioDeviceList = mProfileDeviceMap.get(
+                    profile.toString());
+            boolean isLeAudioProfileEnable =
+                    leAudioDeviceList != null && leAudioDeviceList.stream().anyMatch(
+                            item -> profile.isEnabled(item.getDevice()));
+            boolean isBusy = leAudioDeviceList != null
+                    && leAudioDeviceList.stream().anyMatch(item -> item.isBusy());
+            if (isLeAudioProfileEnable && !isBusy) {
+                LocalBluetoothProfile a2dp = mProfileManager.getA2dpProfile();
+                LocalBluetoothProfile hfp = mProfileManager.getHfpClientProfile();
+                // If the LeAudio profile is enabled on the LeAudio devices, then the
+                // SwitchPreferences of A2dp profile and Hfp profile are graied out.
+                if (a2dp != null) {
+                    SwitchPreference pref = mProfilesContainer.findPreference(a2dp.toString());
+                    if (pref != null) {
+                        pref.setEnabled(false);
+                    }
+                }
+                if (hfp != null) {
+                    SwitchPreference pref = mProfilesContainer.findPreference(hfp.toString());
+                    if (pref != null) {
+                        pref.setEnabled(false);
+                    }
+                }
+            }
+            profilePref.setEnabled(!isBusy);
+        } else {
+            profilePref.setEnabled(!mCachedDevice.isBusy());
+        }
+
         if (profile instanceof MapProfile) {
             profilePref.setChecked(device.getMessageAccessPermission()
                     == BluetoothDevice.ACCESS_ALLOWED);
@@ -127,7 +195,7 @@
                     highQualityPref.setVisible(true);
                     highQualityPref.setTitle(a2dp.getHighQualityAudioOptionLabel(device));
                     highQualityPref.setChecked(a2dp.isHighQualityAudioEnabled(device));
-                    highQualityPref.setEnabled(!mCachedDevice.isBusy());
+                    highQualityPref.setEnabled(!mCachedDevice.isBusy() && !isLeAudioEnabled);
                 } else {
                     highQualityPref.setVisible(false);
                 }
@@ -148,6 +216,12 @@
         if (profile instanceof MapProfile) {
             bluetoothDevice.setMessageAccessPermission(BluetoothDevice.ACCESS_ALLOWED);
         }
+
+        if (profile instanceof LeAudioProfile) {
+            enableLeAudioProfile(profile);
+            return;
+        }
+
         profile.setEnabled(bluetoothDevice, true);
     }
 
@@ -155,8 +229,14 @@
      * Helper method to disable a profile for a device
      */
     private void disableProfile(LocalBluetoothProfile profile) {
+        if (profile instanceof LeAudioProfile) {
+            disableLeAudioProfile(profile);
+            return;
+        }
+
         final BluetoothDevice bluetoothDevice = mCachedDevice.getDevice();
         profile.setEnabled(bluetoothDevice, false);
+
         if (profile instanceof MapProfile) {
             bluetoothDevice.setMessageAccessPermission(BluetoothDevice.ACCESS_REJECTED);
         } else if (profile instanceof PbapServerProfile) {
@@ -190,14 +270,33 @@
         return true;
     }
 
-
     /**
      * Helper to get the list of connectable and special profiles.
      */
     private List<LocalBluetoothProfile> getProfiles() {
-        List<LocalBluetoothProfile> result = mCachedDevice.getConnectableProfiles();
-        final BluetoothDevice device = mCachedDevice.getDevice();
+        List<LocalBluetoothProfile> result = new ArrayList<LocalBluetoothProfile>();
+        mProfileDeviceMap.clear();
+        if (mAllOfCachedDevices == null || mAllOfCachedDevices.isEmpty()) {
+            return result;
+        }
+        for (CachedBluetoothDevice cachedItem : mAllOfCachedDevices) {
+            List<LocalBluetoothProfile> tmpResult = cachedItem.getConnectableProfiles();
+            for (LocalBluetoothProfile profile : tmpResult) {
+                if (mProfileDeviceMap.containsKey(profile.toString())) {
+                    mProfileDeviceMap.get(profile.toString()).add(cachedItem);
+                    Log.d(TAG, "getProfiles: " + profile.toString() + " add device "
+                            + cachedItem.getDevice().getAnonymizedAddress());
+                } else {
+                    List<CachedBluetoothDevice> tmpCachedDeviceList =
+                            new ArrayList<CachedBluetoothDevice>();
+                    tmpCachedDeviceList.add(cachedItem);
+                    mProfileDeviceMap.put(profile.toString(), tmpCachedDeviceList);
+                    result.add(profile);
+                }
+            }
+        }
 
+        final BluetoothDevice device = mCachedDevice.getDevice();
         final int pbapPermission = device.getPhonebookAccessPermission();
         // Only provide PBAP cabability if the client device has requested PBAP.
         if (pbapPermission != BluetoothDevice.ACCESS_UNKNOWN) {
@@ -210,10 +309,93 @@
         if (mapPermission != BluetoothDevice.ACCESS_UNKNOWN) {
             result.add(mapProfile);
         }
-
+        Log.d(TAG, "getProfiles:result:" + result);
         return result;
     }
 
+    private List<CachedBluetoothDevice> getAllOfCachedBluetoothDevices() {
+        List<CachedBluetoothDevice> cachedBluetoothDevices = new ArrayList<>();
+        if (mCachedDevice == null) {
+            return cachedBluetoothDevices;
+        }
+        cachedBluetoothDevices.add(mCachedDevice);
+        if (mCachedDevice.getGroupId() != BluetoothCsipSetCoordinator.GROUP_ID_INVALID) {
+            for (CachedBluetoothDevice member : mCachedDevice.getMemberDevice()) {
+                cachedBluetoothDevices.add(member);
+            }
+        }
+        return cachedBluetoothDevices;
+    }
+
+    /**
+     * When user disable the Le Audio profile, the system needs to do two things.
+     * 1) Disable the Le Audio profile for each of the Le Audio devices.
+     * 2) Enable the A2dp profile and Hfp profile for the associated device. The system can't
+     * enable the A2dp profile and Hfp profile if the Le Audio profile is enabled.
+     *
+     * @param profile the LeAudio profile
+     */
+    private void disableLeAudioProfile(LocalBluetoothProfile profile) {
+        if (profile == null || mProfileDeviceMap.get(profile.toString()) == null) {
+            Log.e(TAG, "There is no the LE profile or no device in mProfileDeviceMap. Do nothing.");
+            return;
+        }
+        for (CachedBluetoothDevice leAudioDevice : mProfileDeviceMap.get(profile.toString())) {
+            profile.setEnabled(leAudioDevice.getDevice(), false);
+        }
+
+        LocalBluetoothProfile a2dp = mProfileManager.getA2dpProfile();
+        LocalBluetoothProfile hfp = mProfileManager.getHfpClientProfile();
+        if (a2dp != null && mProfileDeviceMap.get(a2dp.toString()) != null) {
+            for (CachedBluetoothDevice a2dpDevice : mProfileDeviceMap.get(a2dp.toString())) {
+                if (!a2dp.isEnabled(a2dpDevice.getDevice())) {
+                    a2dp.setEnabled(a2dpDevice.getDevice(), true);
+                }
+            }
+        }
+        if (hfp != null && mProfileDeviceMap.get(hfp.toString()) != null) {
+            for (CachedBluetoothDevice hfpDevice : mProfileDeviceMap.get(hfp.toString())) {
+                if (!hfp.isEnabled(hfpDevice.getDevice())) {
+                    hfp.setEnabled(hfpDevice.getDevice(), true);
+                }
+            }
+        }
+    }
+
+    /**
+     * When user enable the Le Audio profile, the system needs to do two things.
+     * 1) Disable the A2dp profile and Hfp profile for the associated device. The system can't
+     * enable the Le Audio if the A2dp profile and Hfp profile are enabled.
+     * 2) Enable the Le Audio profile for each of the Le Audio devices.
+     *
+     * @param profile the LeAudio profile
+     */
+    private void enableLeAudioProfile(LocalBluetoothProfile profile) {
+        if (profile == null || mProfileDeviceMap.get(profile.toString()) == null) {
+            Log.e(TAG, "There is no the LE profile or no device in mProfileDeviceMap. Do nothing.");
+            return;
+        }
+        LocalBluetoothProfile a2dp = mProfileManager.getA2dpProfile();
+        LocalBluetoothProfile hfp = mProfileManager.getHfpClientProfile();
+        if (a2dp != null && mProfileDeviceMap.get(a2dp.toString()) != null) {
+            for (CachedBluetoothDevice a2dpDevice : mProfileDeviceMap.get(a2dp.toString())) {
+                if (a2dp.isEnabled(a2dpDevice.getDevice())) {
+                    a2dp.setEnabled(a2dpDevice.getDevice(), false);
+                }
+            }
+        }
+        if (hfp != null && mProfileDeviceMap.get(hfp.toString()) != null) {
+            for (CachedBluetoothDevice hfpDevice : mProfileDeviceMap.get(hfp.toString())) {
+                if (hfp.isEnabled(hfpDevice.getDevice())) {
+                    hfp.setEnabled(hfpDevice.getDevice(), false);
+                }
+            }
+        }
+        for (CachedBluetoothDevice leAudioDevice : mProfileDeviceMap.get(profile.toString())) {
+            profile.setEnabled(leAudioDevice.getDevice(), true);
+        }
+    }
+
     /**
      * This is a helper method to be called after adding a Preference for a profile. If that
      * profile happened to be A2dp and the device supports high quality audio, it will add a
@@ -243,17 +425,34 @@
 
     @Override
     public void onPause() {
-        super.onPause();
+        for (CachedBluetoothDevice item : mAllOfCachedDevices) {
+            item.unregisterCallback(this);
+        }
         mProfileManager.removeServiceListener(this);
     }
 
     @Override
     public void onResume() {
-        super.onResume();
+        for (CachedBluetoothDevice item : mAllOfCachedDevices) {
+            item.registerCallback(this);
+        }
         mProfileManager.addServiceListener(this);
     }
 
     @Override
+    public void onDeviceAttributesChanged() {
+        for (CachedBluetoothDevice item : mAllOfCachedDevices) {
+            item.unregisterCallback(this);
+        }
+        mAllOfCachedDevices = getAllOfCachedBluetoothDevices();
+        for (CachedBluetoothDevice item : mAllOfCachedDevices) {
+            item.registerCallback(this);
+        }
+
+        super.onDeviceAttributesChanged();
+    }
+
+    @Override
     public void onServiceConnected() {
         refresh();
     }
diff --git a/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java b/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java
index 4980ba3..425d1c4 100644
--- a/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java
+++ b/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java
@@ -117,6 +117,7 @@
             return;
         }
         use(AdvancedBluetoothDetailsHeaderController.class).init(mCachedDevice);
+        use(LeAudioBluetoothDetailsHeaderController.class).init(mCachedDevice, mManager);
 
         final BluetoothFeatureProvider featureProvider = FeatureFactory.getFactory(
                 context).getBluetoothFeatureProvider(context);
diff --git a/src/com/android/settings/bluetooth/BluetoothPairingController.java b/src/com/android/settings/bluetooth/BluetoothPairingController.java
index ca3dda6..c70a56a 100644
--- a/src/com/android/settings/bluetooth/BluetoothPairingController.java
+++ b/src/com/android/settings/bluetooth/BluetoothPairingController.java
@@ -28,6 +28,7 @@
 
 import com.android.settings.R;
 import com.android.settings.bluetooth.BluetoothPairingDialogFragment.BluetoothPairingDialogListener;
+import com.android.settingslib.bluetooth.CachedBluetoothDevice;
 import com.android.settingslib.bluetooth.LocalBluetoothManager;
 import com.android.settingslib.bluetooth.LocalBluetoothProfile;
 
@@ -64,6 +65,7 @@
     private String mDeviceName;
     private LocalBluetoothProfile mPbapClientProfile;
     private boolean mPbapAllowed;
+    private boolean mIsCoordinatedSetMember;
 
     /**
      * Creates an instance of a BluetoothPairingController.
@@ -90,6 +92,10 @@
         mDeviceName = mBluetoothManager.getCachedDeviceManager().getName(mDevice);
         mPbapClientProfile = mBluetoothManager.getProfileManager().getPbapClientProfile();
         mPasskeyFormatted = formatKey(mPasskey);
+        final CachedBluetoothDevice cachedDevice =
+                mBluetoothManager.getCachedDeviceManager().findDevice(mDevice);
+        mIsCoordinatedSetMember = cachedDevice != null
+                ? cachedDevice.isCoordinatedSetMemberDevice() : false;
     }
 
     @Override
@@ -156,6 +162,15 @@
     }
 
     /**
+     * A method for querying if the bluetooth device is a LE coordinated set member device.
+     *
+     * @return - A boolean indicating if the device is a CSIP supported device.
+     */
+    public boolean isCoordinatedSetMemberDevice() {
+        return mIsCoordinatedSetMember;
+    }
+
+    /**
      * A method for querying if the bluetooth device has a profile already set up on this device.
      *
      * @return - A boolean indicating if the device has previous knowledge of a profile for this
@@ -420,7 +435,7 @@
      */
     public void onCancel() {
         Log.d(TAG, "Pairing dialog canceled");
-        mDevice.cancelPairing();
+        mDevice.cancelBondProcess();
     }
 
     /**
diff --git a/src/com/android/settings/bluetooth/BluetoothPairingDialogFragment.java b/src/com/android/settings/bluetooth/BluetoothPairingDialogFragment.java
index d38302d..9e36247 100644
--- a/src/com/android/settings/bluetooth/BluetoothPairingDialogFragment.java
+++ b/src/com/android/settings/bluetooth/BluetoothPairingDialogFragment.java
@@ -344,6 +344,9 @@
             pairingViewContent.setVisibility(View.VISIBLE);
             pairingViewContent.setText(mPairingController.getPairingContent());
         }
+        final TextView messagePairingSet = (TextView) view.findViewById(R.id.pairing_group_message);
+        messagePairingSet.setVisibility(mPairingController.isCoordinatedSetMemberDevice()
+                ? View.VISIBLE : View.GONE);
         return view;
     }
 
diff --git a/src/com/android/settings/bluetooth/BluetoothPairingRequest.java b/src/com/android/settings/bluetooth/BluetoothPairingRequest.java
index 993f584..6b80256 100644
--- a/src/com/android/settings/bluetooth/BluetoothPairingRequest.java
+++ b/src/com/android/settings/bluetooth/BluetoothPairingRequest.java
@@ -16,12 +16,16 @@
 
 package com.android.settings.bluetooth;
 
+import android.bluetooth.BluetoothCsipSetCoordinator;
 import android.bluetooth.BluetoothDevice;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.os.PowerManager;
 import android.os.UserHandle;
+import android.text.TextUtils;
+
+import com.android.settingslib.bluetooth.LocalBluetoothManager;
 
 /**
  * BluetoothPairingRequest is a receiver for any Bluetooth pairing request. It
@@ -34,36 +38,55 @@
     @Override
     public void onReceive(Context context, Intent intent) {
         String action = intent.getAction();
-        if (action == null || !action.equals(BluetoothDevice.ACTION_PAIRING_REQUEST)) {
+        if (action == null) {
             return;
         }
 
-        PowerManager powerManager = context.getSystemService(PowerManager.class);
         BluetoothDevice device = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
-        int pairingVariant = intent.getIntExtra(BluetoothDevice.EXTRA_PAIRING_VARIANT,
-                BluetoothDevice.ERROR);
-        String deviceAddress = device != null ? device.getAddress() : null;
-        String deviceName = device != null ? device.getName() : null;
-        boolean shouldShowDialog = LocalBluetoothPreferences.shouldShowDialogInForeground(
-                context, deviceAddress, deviceName);
+        final LocalBluetoothManager mBluetoothManager = Utils.getLocalBtManager(context);
+        if (TextUtils.equals(action, BluetoothDevice.ACTION_PAIRING_REQUEST)) {
+            PowerManager powerManager = context.getSystemService(PowerManager.class);
+            int pairingVariant = intent.getIntExtra(BluetoothDevice.EXTRA_PAIRING_VARIANT,
+                    BluetoothDevice.ERROR);
+            String deviceAddress = device != null ? device.getAddress() : null;
+            String deviceName = device != null ? device.getName() : null;
+            boolean shouldShowDialog = LocalBluetoothPreferences.shouldShowDialogInForeground(
+                    context, deviceAddress, deviceName);
 
-        // Skips consent pairing dialog if the device was recently associated with CDM
-        if (pairingVariant == BluetoothDevice.PAIRING_VARIANT_CONSENT
-                && device.canBondWithoutDialog()) {
-            device.setPairingConfirmation(true);
-        } else if (powerManager.isInteractive() && shouldShowDialog) {
-            // Since the screen is on and the BT-related activity is in the foreground,
-            // just open the dialog
-            // convert broadcast intent into activity intent (same action string)
-            Intent pairingIntent = BluetoothPairingService.getPairingDialogIntent(context, intent,
-                    BluetoothDevice.EXTRA_PAIRING_INITIATOR_FOREGROUND);
+            // Skips consent pairing dialog if the device was recently associated with CDM
+            if (pairingVariant == BluetoothDevice.PAIRING_VARIANT_CONSENT
+                    && (device.canBondWithoutDialog()
+                    || mBluetoothManager.getCachedDeviceManager().isOngoingPairByCsip(device))) {
+                device.setPairingConfirmation(true);
+            } else if (powerManager.isInteractive() && shouldShowDialog) {
+                // Since the screen is on and the BT-related activity is in the foreground,
+                // just open the dialog
+                // convert broadcast intent into activity intent (same action string)
+                Intent pairingIntent = BluetoothPairingService.getPairingDialogIntent(context,
+                        intent, BluetoothDevice.EXTRA_PAIRING_INITIATOR_FOREGROUND);
 
-            context.startActivityAsUser(pairingIntent, UserHandle.CURRENT);
-        } else {
-            // Put up a notification that leads to the dialog
-            intent.setClass(context, BluetoothPairingService.class);
-            intent.setAction(BluetoothDevice.ACTION_PAIRING_REQUEST);
-            context.startServiceAsUser(intent, UserHandle.CURRENT);
+                context.startActivityAsUser(pairingIntent, UserHandle.CURRENT);
+            } else {
+                // Put up a notification that leads to the dialog
+                intent.setClass(context, BluetoothPairingService.class);
+                intent.setAction(BluetoothDevice.ACTION_PAIRING_REQUEST);
+                context.startServiceAsUser(intent, UserHandle.CURRENT);
+            }
+        } else if (TextUtils.equals(action,
+                BluetoothCsipSetCoordinator.ACTION_CSIS_SET_MEMBER_AVAILABLE)) {
+            if (device == null) {
+                return;
+            }
+
+            final int groupId = intent.getIntExtra(BluetoothCsipSetCoordinator.EXTRA_CSIS_GROUP_ID,
+                    BluetoothCsipSetCoordinator.GROUP_ID_INVALID);
+            if (groupId == BluetoothCsipSetCoordinator.GROUP_ID_INVALID) {
+                return;
+            }
+
+            if (mBluetoothManager.getCachedDeviceManager().shouldPairByCsip(device, groupId)) {
+                device.createBond(BluetoothDevice.TRANSPORT_LE);
+            }
         }
     }
 }
diff --git a/src/com/android/settings/bluetooth/BluetoothPairingService.java b/src/com/android/settings/bluetooth/BluetoothPairingService.java
index bc5dc66..9883e61 100644
--- a/src/com/android/settings/bluetooth/BluetoothPairingService.java
+++ b/src/com/android/settings/bluetooth/BluetoothPairingService.java
@@ -98,7 +98,7 @@
             } else if (action.equals(ACTION_DISMISS_PAIRING)) {
                 Log.d(TAG, "Notification cancel " + " (" +
                         mDevice.getName() + ")");
-                mDevice.cancelPairing();
+                mDevice.cancelBondProcess();
             } else {
                 int bondState = intent.getIntExtra(BluetoothDevice.EXTRA_BOND_STATE,
                         BluetoothDevice.ERROR);
@@ -144,7 +144,7 @@
             createPairingNotification(intent);
         } else if (TextUtils.equals(action, ACTION_DISMISS_PAIRING)) {
             Log.d(TAG, "Notification cancel " + " (" + mDevice.getName() + ")");
-            mDevice.cancelPairing();
+            mDevice.cancelBondProcess();
             mNm.cancel(NOTIFICATION_ID);
             stopSelf();
         } else if (TextUtils.equals(action, ACTION_PAIRING_DIALOG)) {
diff --git a/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdater.java b/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdater.java
index fc1b9b7..d1c45b6 100644
--- a/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdater.java
+++ b/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdater.java
@@ -70,9 +70,10 @@
             if (DBG) {
                 Log.d(TAG, "isFilterMatched() current audio profile : " + currentAudioProfile);
             }
-            // If device is Hearing Aid, it is compatible with HFP and A2DP.
+            // If device is Hearing Aid or LE Audio, it is compatible with HFP and A2DP.
             // It would not show in Connected Devices group.
-            if (cachedDevice.isConnectedHearingAidDevice()) {
+            if (cachedDevice.isConnectedHearingAidDevice()
+                    || cachedDevice.isConnectedLeAudioDevice()) {
                 return false;
             }
             // According to the current audio profile type,
diff --git a/src/com/android/settings/bluetooth/DevicePickerFragment.java b/src/com/android/settings/bluetooth/DevicePickerFragment.java
index 602b79b..e8adac0 100644
--- a/src/com/android/settings/bluetooth/DevicePickerFragment.java
+++ b/src/com/android/settings/bluetooth/DevicePickerFragment.java
@@ -107,6 +107,8 @@
     @Override
     public void onStart() {
         super.onStart();
+        mLocalManager.getCachedDeviceManager().clearNonBondedDevices();
+        removeAllDevices();
         addCachedDevices();
         mSelectedDevice = null;
         if (mScanAllowed) {
diff --git a/src/com/android/settings/bluetooth/LeAudioBluetoothDetailsHeaderController.java b/src/com/android/settings/bluetooth/LeAudioBluetoothDetailsHeaderController.java
new file mode 100644
index 0000000..7b74f77
--- /dev/null
+++ b/src/com/android/settings/bluetooth/LeAudioBluetoothDetailsHeaderController.java
@@ -0,0 +1,327 @@
+/*
+ * Copyright (C) 2022 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.bluetooth;
+
+import android.bluetooth.BluetoothCsipSetCoordinator;
+import android.bluetooth.BluetoothLeAudio;
+import android.bluetooth.BluetoothProfile;
+import android.content.Context;
+import android.graphics.PorterDuff;
+import android.graphics.PorterDuffColorFilter;
+import android.graphics.drawable.Drawable;
+import android.os.Handler;
+import android.os.Looper;
+import android.util.Log;
+import android.util.Pair;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.fuelgauge.BatteryMeterView;
+import com.android.settingslib.bluetooth.BluetoothUtils;
+import com.android.settingslib.bluetooth.CachedBluetoothDevice;
+import com.android.settingslib.bluetooth.LeAudioProfile;
+import com.android.settingslib.bluetooth.LocalBluetoothManager;
+import com.android.settingslib.bluetooth.LocalBluetoothProfileManager;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+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.widget.LayoutPreference;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * This class adds a header with device name and status (connected/disconnected, etc.).
+ */
+public class LeAudioBluetoothDetailsHeaderController extends BasePreferenceController implements
+        LifecycleObserver, OnStart, OnStop, OnDestroy, CachedBluetoothDevice.Callback {
+    private static final String TAG = "LeAudioBtHeaderCtrl";
+    private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
+
+    @VisibleForTesting
+    static final int LEFT_DEVICE_ID =
+            BluetoothLeAudio.AUDIO_LOCATION_FRONT_LEFT
+                    | BluetoothLeAudio.AUDIO_LOCATION_BACK_LEFT
+                    | BluetoothLeAudio.AUDIO_LOCATION_FRONT_LEFT_OF_CENTER
+                    | BluetoothLeAudio.AUDIO_LOCATION_SIDE_LEFT
+                    | BluetoothLeAudio.AUDIO_LOCATION_TOP_FRONT_LEFT
+                    | BluetoothLeAudio.AUDIO_LOCATION_TOP_BACK_LEFT
+                    | BluetoothLeAudio.AUDIO_LOCATION_TOP_SIDE_LEFT
+                    | BluetoothLeAudio.AUDIO_LOCATION_BOTTOM_FRONT_LEFT
+                    | BluetoothLeAudio.AUDIO_LOCATION_FRONT_LEFT_WIDE
+                    | BluetoothLeAudio.AUDIO_LOCATION_LEFT_SURROUND;
+
+    @VisibleForTesting
+    static final int RIGHT_DEVICE_ID =
+            BluetoothLeAudio.AUDIO_LOCATION_FRONT_RIGHT
+                    | BluetoothLeAudio.AUDIO_LOCATION_BACK_RIGHT
+                    | BluetoothLeAudio.AUDIO_LOCATION_FRONT_RIGHT_OF_CENTER
+                    | BluetoothLeAudio.AUDIO_LOCATION_SIDE_RIGHT
+                    | BluetoothLeAudio.AUDIO_LOCATION_TOP_FRONT_RIGHT
+                    | BluetoothLeAudio.AUDIO_LOCATION_TOP_BACK_RIGHT
+                    | BluetoothLeAudio.AUDIO_LOCATION_TOP_SIDE_RIGHT
+                    | BluetoothLeAudio.AUDIO_LOCATION_BOTTOM_FRONT_RIGHT
+                    | BluetoothLeAudio.AUDIO_LOCATION_FRONT_RIGHT_WIDE
+                    | BluetoothLeAudio.AUDIO_LOCATION_RIGHT_SURROUND;
+
+    @VisibleForTesting
+    static final int INVALID_RESOURCE_ID = -1;
+
+    @VisibleForTesting
+    LayoutPreference mLayoutPreference;
+    private CachedBluetoothDevice mCachedDevice;
+    @VisibleForTesting
+    Handler mHandler = new Handler(Looper.getMainLooper());
+    @VisibleForTesting
+    boolean mIsRegisterCallback = false;
+
+    private LocalBluetoothProfileManager mProfileManager;
+
+    public LeAudioBluetoothDetailsHeaderController(Context context, String prefKey) {
+        super(context, prefKey);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        if (mCachedDevice == null || mProfileManager == null) {
+            return CONDITIONALLY_UNAVAILABLE;
+        }
+        boolean hasLeAudio = mCachedDevice.getConnectableProfiles()
+                .stream()
+                .anyMatch(profile -> profile.getProfileId() == BluetoothProfile.LE_AUDIO);
+
+        return !Utils.isAdvancedDetailsHeader(mCachedDevice.getDevice()) && hasLeAudio
+                ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        mLayoutPreference = screen.findPreference(getPreferenceKey());
+        mLayoutPreference.setVisible(isAvailable());
+    }
+
+    @Override
+    public void onStart() {
+        if (!isAvailable()) {
+            return;
+        }
+        mIsRegisterCallback = true;
+        mCachedDevice.registerCallback(this);
+        refresh();
+    }
+
+    @Override
+    public void onStop() {
+        if (!mIsRegisterCallback) {
+            return;
+        }
+        mCachedDevice.unregisterCallback(this);
+        mIsRegisterCallback = false;
+    }
+
+    @Override
+    public void onDestroy() {
+    }
+
+    public void init(CachedBluetoothDevice cachedBluetoothDevice,
+            LocalBluetoothManager bluetoothManager) {
+        mCachedDevice = cachedBluetoothDevice;
+        mProfileManager = bluetoothManager.getProfileManager();
+    }
+
+    @VisibleForTesting
+    void refresh() {
+        if (mLayoutPreference == null || mCachedDevice == null) {
+            return;
+        }
+        final ImageView imageView = mLayoutPreference.findViewById(R.id.entity_header_icon);
+        if (imageView != null) {
+            final Pair<Drawable, String> pair =
+                    BluetoothUtils.getBtRainbowDrawableWithDescription(mContext, mCachedDevice);
+            imageView.setImageDrawable(pair.first);
+            imageView.setContentDescription(pair.second);
+        }
+
+        final TextView title = mLayoutPreference.findViewById(R.id.entity_header_title);
+        if (title != null) {
+            title.setText(mCachedDevice.getName());
+        }
+        final TextView summary = mLayoutPreference.findViewById(R.id.entity_header_summary);
+        if (summary != null) {
+            summary.setText(mCachedDevice.getConnectionSummary(true /* shortSummary */));
+        }
+
+        if (!mCachedDevice.isConnected() || mCachedDevice.isBusy()) {
+            hideAllOfBatteryLayouts();
+            return;
+        }
+
+        updateBatteryLayout();
+    }
+
+    @VisibleForTesting
+    Drawable createBtBatteryIcon(Context context, int level) {
+        final BatteryMeterView.BatteryMeterDrawable drawable =
+                new BatteryMeterView.BatteryMeterDrawable(context,
+                        context.getColor(R.color.meter_background_color),
+                        context.getResources().getDimensionPixelSize(
+                                R.dimen.advanced_bluetooth_battery_meter_width),
+                        context.getResources().getDimensionPixelSize(
+                                R.dimen.advanced_bluetooth_battery_meter_height));
+        drawable.setBatteryLevel(level);
+        drawable.setColorFilter(new PorterDuffColorFilter(
+                com.android.settings.Utils.getColorAttrDefaultColor(context,
+                        android.R.attr.colorControlNormal),
+                PorterDuff.Mode.SRC));
+        return drawable;
+    }
+
+    private int getBatteryTitleResource(int deviceId) {
+        if (deviceId == LEFT_DEVICE_ID) {
+            return R.id.bt_battery_left_title;
+        }
+        if (deviceId == RIGHT_DEVICE_ID) {
+            return R.id.bt_battery_right_title;
+        }
+        Log.d(TAG, "No resource id. The deviceId is " + deviceId);
+        return INVALID_RESOURCE_ID;
+    }
+
+    private int getBatterySummaryResource(int deviceId) {
+        if (deviceId == LEFT_DEVICE_ID) {
+            return R.id.bt_battery_left_summary;
+        }
+        if (deviceId == RIGHT_DEVICE_ID) {
+            return R.id.bt_battery_right_summary;
+        }
+        Log.d(TAG, "No resource id. The deviceId is " + deviceId);
+        return INVALID_RESOURCE_ID;
+    }
+
+    private void hideAllOfBatteryLayouts() {
+        // hide the case
+        updateBatteryLayout(R.id.bt_battery_case_title, R.id.bt_battery_case_summary,
+                BluetoothUtils.META_INT_ERROR);
+        // hide the left
+        updateBatteryLayout(R.id.bt_battery_left_title, R.id.bt_battery_left_summary,
+                BluetoothUtils.META_INT_ERROR);
+        // hide the right
+        updateBatteryLayout(R.id.bt_battery_right_title, R.id.bt_battery_right_summary,
+                BluetoothUtils.META_INT_ERROR);
+    }
+
+    private List<CachedBluetoothDevice> getAllOfLeAudioDevices() {
+        if (mCachedDevice == null) {
+            return null;
+        }
+        List<CachedBluetoothDevice> leAudioDevices = new ArrayList<>();
+        leAudioDevices.add(mCachedDevice);
+        if (mCachedDevice.getGroupId() != BluetoothCsipSetCoordinator.GROUP_ID_INVALID) {
+            for (CachedBluetoothDevice member : mCachedDevice.getMemberDevice()) {
+                leAudioDevices.add(member);
+            }
+        }
+        return leAudioDevices;
+    }
+
+    private void updateBatteryLayout() {
+        // Init the battery layouts.
+        hideAllOfBatteryLayouts();
+        final List<CachedBluetoothDevice> leAudioDevices = getAllOfLeAudioDevices();
+        LeAudioProfile leAudioProfile = mProfileManager.getLeAudioProfile();
+        if (leAudioDevices == null || leAudioDevices.isEmpty()) {
+            Log.e(TAG, "There is no LeAudioProfile.");
+            return;
+        }
+
+        if (!leAudioProfile.isEnabled(mCachedDevice.getDevice())) {
+            Log.d(TAG, "Show the legacy battery style if the LeAudio is not enabled.");
+            final TextView summary = mLayoutPreference.findViewById(R.id.entity_header_summary);
+            if (summary != null) {
+                summary.setText(mCachedDevice.getConnectionSummary());
+            }
+            return;
+        }
+
+        for (CachedBluetoothDevice cachedDevice : leAudioDevices) {
+            int deviceId = leAudioProfile.getAudioLocation(cachedDevice.getDevice());
+            Log.d(TAG, "LeAudioDevices:" + cachedDevice.getDevice().getAnonymizedAddress()
+                    + ", deviceId:" + deviceId);
+
+            if (deviceId == BluetoothLeAudio.AUDIO_LOCATION_INVALID) {
+                Log.d(TAG, "The device does not support the AUDIO_LOCATION.");
+                return;
+            }
+            boolean isLeft = (deviceId & LEFT_DEVICE_ID) != 0;
+            boolean isRight = (deviceId & RIGHT_DEVICE_ID) != 0;
+            boolean isLeftRight = isLeft && isRight;
+            // The LE device updates the BatteryLayout
+            if (isLeftRight) {
+                Log.d(TAG, "Show the legacy battery style if the device id is left+right.");
+                final TextView summary = mLayoutPreference.findViewById(R.id.entity_header_summary);
+                if (summary != null) {
+                    summary.setText(mCachedDevice.getConnectionSummary());
+                }
+            } else if (isLeft) {
+                updateBatteryLayout(getBatteryTitleResource(LEFT_DEVICE_ID),
+                        getBatterySummaryResource(LEFT_DEVICE_ID), cachedDevice.getBatteryLevel());
+            } else if (isRight) {
+                updateBatteryLayout(getBatteryTitleResource(RIGHT_DEVICE_ID),
+                        getBatterySummaryResource(RIGHT_DEVICE_ID), cachedDevice.getBatteryLevel());
+            } else {
+                Log.d(TAG, "The device id is other Audio Location. Do nothing.");
+            }
+        }
+    }
+
+    private void updateBatteryLayout(int titleResId, int summaryResId, int batteryLevel) {
+        final TextView batteryTitleView = mLayoutPreference.findViewById(titleResId);
+        final TextView batterySummaryView = mLayoutPreference.findViewById(summaryResId);
+        if (batteryTitleView == null || batterySummaryView == null) {
+            Log.e(TAG, "updateBatteryLayout: No TextView");
+            return;
+        }
+        if (batteryLevel != BluetoothUtils.META_INT_ERROR) {
+            batteryTitleView.setVisibility(View.VISIBLE);
+            batterySummaryView.setVisibility(View.VISIBLE);
+            batterySummaryView.setText(
+                    com.android.settings.Utils.formatPercentage(batteryLevel));
+            batterySummaryView.setCompoundDrawablesRelativeWithIntrinsicBounds(
+                    createBtBatteryIcon(mContext, batteryLevel), /* top */ null,
+                    /* end */ null, /* bottom */ null);
+        } else {
+            Log.d(TAG, "updateBatteryLayout: Hide it if it doesn't have battery information.");
+            batteryTitleView.setVisibility(View.GONE);
+            batterySummaryView.setVisibility(View.GONE);
+        }
+    }
+
+    @Override
+    public void onDeviceAttributesChanged() {
+        if (mCachedDevice != null) {
+            refresh();
+        }
+    }
+}
diff --git a/src/com/android/settings/bluetooth/OWNERS b/src/com/android/settings/bluetooth/OWNERS
index 5e716e1..52017a8 100644
--- a/src/com/android/settings/bluetooth/OWNERS
+++ b/src/com/android/settings/bluetooth/OWNERS
@@ -2,5 +2,6 @@
 hughchen@google.com
 timhypeng@google.com
 siyuanh@google.com
+robertluo@google.com
 
 # Emergency approvers in case the above are not available
diff --git a/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdater.java b/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdater.java
index dab4f23..f5bc279 100644
--- a/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdater.java
+++ b/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdater.java
@@ -65,7 +65,7 @@
             removePreferenceIfNecessary(bluetoothDevices, cachedManager);
             for (BluetoothDevice device : bluetoothDevices) {
                 final CachedBluetoothDevice cachedDevice = cachedManager.findDevice(device);
-                if (cachedDevice != null) {
+                if (cachedDevice != null && !cachedManager.isSubDevice(device)) {
                     update(cachedDevice);
                 }
             }
diff --git a/src/com/android/settings/connecteddevice/OWNERS b/src/com/android/settings/connecteddevice/OWNERS
new file mode 100644
index 0000000..a5fe957
--- /dev/null
+++ b/src/com/android/settings/connecteddevice/OWNERS
@@ -0,0 +1,6 @@
+# Default reviewers for this and subdirectories.
+hughchen@google.com
+timhypeng@google.com
+robertluo@google.com
+
+# Emergency approvers in case the above are not available
diff --git a/src/com/android/settings/connecteddevice/usb/OWNERS b/src/com/android/settings/connecteddevice/usb/OWNERS
index add985c..66bf468 100644
--- a/src/com/android/settings/connecteddevice/usb/OWNERS
+++ b/src/com/android/settings/connecteddevice/usb/OWNERS
@@ -1,3 +1,6 @@
 # Default reviewers for this and subdirectories.
 zhangjerry@google.com
 badhri@google.com
+hughchen@google.com
+timhypeng@google.com
+robertluo@google.com
diff --git a/src/com/android/settings/connecteddevice/usb/UsbBackend.java b/src/com/android/settings/connecteddevice/usb/UsbBackend.java
index 244818f..7f3a598 100644
--- a/src/com/android/settings/connecteddevice/usb/UsbBackend.java
+++ b/src/com/android/settings/connecteddevice/usb/UsbBackend.java
@@ -41,7 +41,10 @@
  */
 public class UsbBackend {
 
-    static final int PD_ROLE_SWAP_TIMEOUT_MS = 3000;
+    // extend this value from 3s to 4s because of switching data role
+    // in USB driver side takes about 3s in some devices, plus the usb
+    // port change event dispatching time, 3s is not enough.
+    static final int PD_ROLE_SWAP_TIMEOUT_MS = 4000;
     static final int NONPD_ROLE_SWAP_TIMEOUT_MS = 15000;
 
     private final boolean mFileTransferRestricted;
diff --git a/src/com/android/settings/connecteddevice/usb/UsbDetailsTranscodeMtpController.java b/src/com/android/settings/connecteddevice/usb/UsbDetailsTranscodeMtpController.java
index bbaaa31..c440499 100644
--- a/src/com/android/settings/connecteddevice/usb/UsbDetailsTranscodeMtpController.java
+++ b/src/com/android/settings/connecteddevice/usb/UsbDetailsTranscodeMtpController.java
@@ -77,6 +77,12 @@
     public boolean onPreferenceClick(Preference preference) {
         SystemProperties.set(TRANSCODE_MTP_SYS_PROP_KEY,
                 Boolean.toString(mSwitchPreference.isChecked()));
+
+        final long previousFunctions = mUsbBackend.getCurrentFunctions();
+        // Toggle the MTP connection to reload file sizes for files shared via MTP clients
+        mUsbBackend.setCurrentFunctions(previousFunctions & ~UsbManager.FUNCTION_MTP);
+        mUsbBackend.setCurrentFunctions(previousFunctions);
+
         return true;
     }
 
diff --git a/src/com/android/settings/core/gateway/SettingsGateway.java b/src/com/android/settings/core/gateway/SettingsGateway.java
index 804f856..2cf9255 100644
--- a/src/com/android/settings/core/gateway/SettingsGateway.java
+++ b/src/com/android/settings/core/gateway/SettingsGateway.java
@@ -86,6 +86,7 @@
 import com.android.settings.deviceinfo.aboutphone.MyDeviceInfoFragment;
 import com.android.settings.deviceinfo.firmwareversion.FirmwareVersionSettings;
 import com.android.settings.deviceinfo.legal.ModuleLicensesDashboard;
+import com.android.settings.display.AutoBrightnessSettings;
 import com.android.settings.display.NightDisplaySettings;
 import com.android.settings.display.SmartAutoRotatePreferenceFragment;
 import com.android.settings.display.darkmode.DarkModeSettingsFragment;
@@ -143,7 +144,6 @@
 import com.android.settings.print.PrintJobSettingsFragment;
 import com.android.settings.print.PrintSettingsFragment;
 import com.android.settings.privacy.PrivacyDashboardFragment;
-import com.android.settings.security.CryptKeeperSettings;
 import com.android.settings.security.LockscreenDashboardFragment;
 import com.android.settings.security.SecuritySettings;
 import com.android.settings.shortcut.CreateShortcut;
@@ -239,7 +239,6 @@
             PickupGestureSettings.class.getName(),
             DoubleTwistGestureSettings.class.getName(),
             SystemNavigationGestureSettings.class.getName(),
-            CryptKeeperSettings.class.getName(),
             DataUsageSummary.class.getName(),
             DreamSettings.class.getName(),
             UserSettings.class.getName(),
@@ -323,7 +322,8 @@
             NetworkProviderSettings.class.getName(),
             NetworkSelectSettings.class.getName(),
             AlarmsAndRemindersDetails.class.getName(),
-            MediaManagementAppsDetails.class.getName()
+            MediaManagementAppsDetails.class.getName(),
+            AutoBrightnessSettings.class.getName()
     };
 
     public static final String[] SETTINGS_FOR_RESTRICTED = {
@@ -355,6 +355,8 @@
             Settings.ConfigureNotificationSettingsActivity.class.getName(),
             Settings.ManageApplicationsActivity.class.getName(),
             Settings.PaymentSettingsActivity.class.getName(),
+            // Home page > Display
+            Settings.AdaptiveBrightnessActivity.class.getName(),
             // Home page > Security & screen lock
             Settings.LocationSettingsActivity.class.getName(),
             // Home page > System
diff --git a/src/com/android/settings/datausage/BillingCyclePreferenceController.java b/src/com/android/settings/datausage/BillingCyclePreferenceController.java
index 2f144cb..9592c5e 100644
--- a/src/com/android/settings/datausage/BillingCyclePreferenceController.java
+++ b/src/com/android/settings/datausage/BillingCyclePreferenceController.java
@@ -17,7 +17,6 @@
 package com.android.settings.datausage;
 
 import android.content.Context;
-import android.net.INetworkStatsService;
 import android.net.NetworkPolicyManager;
 import android.net.NetworkTemplate;
 import android.os.INetworkManagementService;
@@ -51,8 +50,6 @@
         TemplatePreference.NetworkServices services = new TemplatePreference.NetworkServices();
         services.mNetworkService = INetworkManagementService.Stub.asInterface(
                 ServiceManager.getService(Context.NETWORKMANAGEMENT_SERVICE));
-        services.mStatsService = INetworkStatsService.Stub.asInterface(
-                ServiceManager.getService(Context.NETWORK_STATS_SERVICE));
         services.mPolicyManager = mContext.getSystemService(NetworkPolicyManager.class);
         services.mPolicyEditor = new NetworkPolicyEditor(services.mPolicyManager);
         services.mTelephonyManager = mContext.getSystemService(TelephonyManager.class);
diff --git a/src/com/android/settings/datausage/ChartDataUsagePreference.java b/src/com/android/settings/datausage/ChartDataUsagePreference.java
index 0577e9c..12fb03b 100644
--- a/src/com/android/settings/datausage/ChartDataUsagePreference.java
+++ b/src/com/android/settings/datausage/ChartDataUsagePreference.java
@@ -17,13 +17,13 @@
 import android.content.Context;
 import android.content.res.Resources;
 import android.net.NetworkPolicy;
-import android.net.TrafficStats;
 import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
 import android.text.format.DateUtils;
 import android.text.format.Formatter;
 import android.text.style.ForegroundColorSpan;
 import android.util.AttributeSet;
+import android.util.DataUnit;
 import android.util.SparseIntArray;
 
 import androidx.annotation.VisibleForTesting;
@@ -46,7 +46,7 @@
 
     // The resolution we show on the graph so that we can squash things down to ints.
     // Set to half a meg for now.
-    private static final long RESOLUTION = TrafficStats.MB_IN_BYTES / 2;
+    private static final long RESOLUTION = DataUnit.MEBIBYTES.toBytes(1) / 2;
 
     private final int mWarningColor;
     private final int mLimitColor;
diff --git a/src/com/android/settings/datausage/CycleAdapter.java b/src/com/android/settings/datausage/CycleAdapter.java
index 74d27be..1292d00 100644
--- a/src/com/android/settings/datausage/CycleAdapter.java
+++ b/src/com/android/settings/datausage/CycleAdapter.java
@@ -13,14 +13,17 @@
  */
 package com.android.settings.datausage;
 
+import android.annotation.NonNull;
+import android.app.usage.NetworkStats;
 import android.content.Context;
 import android.net.NetworkPolicy;
 import android.net.NetworkPolicyManager;
-import android.net.NetworkStatsHistory;
 import android.text.format.DateUtils;
 import android.util.Pair;
+import android.util.Range;
 import android.widget.AdapterView;
 
+import com.android.net.module.util.NetworkStatsUtils;
 import com.android.settings.Utils;
 import com.android.settingslib.net.ChartData;
 import com.android.settingslib.net.NetworkCycleData;
@@ -62,9 +65,43 @@
         return 0;
     }
 
+    protected static long getTotalBytesForTimeRange(List<NetworkStats.Bucket> stats,
+            Range<Long> range) {
+        long bytes = 0L;
+        for (NetworkStats.Bucket bucket : stats) {
+            final Range<Long> bucketSpan = new Range<>(
+                    bucket.getStartTimeStamp(), bucket.getEndTimeStamp());
+            // Only record bytes that overlapped with the given time range. For partially
+            // overlapped bucket, record rational bytes assuming the traffic is uniform
+            // distributed within the bucket.
+            try {
+                final Range<Long> overlapped = range.intersect(bucketSpan);
+                final long totalOfBucket = bucket.getRxBytes() + bucket.getTxBytes();
+                bytes += NetworkStatsUtils.multiplySafeByRational(totalOfBucket,
+                        overlapped.getUpper() - overlapped.getLower(),
+                        bucketSpan.getUpper() - bucketSpan.getLower());
+            } catch (IllegalArgumentException e) {
+                // Range disjoint, ignore.
+                continue;
+            }
+        }
+        return bytes;
+    }
+
+    @NonNull
+    private Range getTimeRangeOf(@NonNull List<NetworkStats.Bucket> stats) {
+        long start = Long.MAX_VALUE;
+        long end = Long.MIN_VALUE;
+        for (NetworkStats.Bucket bucket : stats) {
+            start = Math.min(start, bucket.getStartTimeStamp());
+            end = Math.max(end, bucket.getEndTimeStamp());
+        }
+        return new Range(start, end);
+    }
+
     /**
      * Rebuild list based on {@link NetworkPolicy} and available
-     * {@link NetworkStatsHistory} data. Always selects the newest item,
+     * {@link List<NetworkStats.Bucket>} data. Always selects the newest item,
      * updating the inspection range on chartData.
      */
     @Deprecated
@@ -75,19 +112,20 @@
         clear();
 
         final Context context = getContext();
-        NetworkStatsHistory.Entry entry = null;
 
-        long historyStart = Long.MAX_VALUE;
-        long historyEnd = Long.MIN_VALUE;
-        if (chartData != null) {
-            historyStart = chartData.network.getStart();
-            historyEnd = chartData.network.getEnd();
+        long historyStart;
+        long historyEnd;
+        try {
+            final Range<Long> historyTimeRange = getTimeRangeOf(chartData.network);
+            historyStart = historyTimeRange.getLower();
+            historyEnd = historyTimeRange.getUpper();
+        } catch (IllegalArgumentException e) {
+            // Empty history.
+            final long now = System.currentTimeMillis();
+            historyStart = now;
+            historyEnd = now + 1;
         }
 
-        final long now = System.currentTimeMillis();
-        if (historyStart == Long.MAX_VALUE) historyStart = now;
-        if (historyEnd == Long.MIN_VALUE) historyEnd = now + 1;
-
         boolean hasCycles = false;
         if (policy != null) {
             final Iterator<Pair<ZonedDateTime, ZonedDateTime>> it = NetworkPolicyManager
@@ -99,8 +137,9 @@
 
                 final boolean includeCycle;
                 if (chartData != null) {
-                    entry = chartData.network.getValues(cycleStart, cycleEnd, entry);
-                    includeCycle = (entry.rxBytes + entry.txBytes) > 0;
+                    final long bytesInCycle = getTotalBytesForTimeRange(chartData.network,
+                            new Range<>(cycleStart, cycleEnd));
+                    includeCycle = bytesInCycle > 0;
                 } else {
                     includeCycle = true;
                 }
@@ -120,8 +159,9 @@
 
                 final boolean includeCycle;
                 if (chartData != null) {
-                    entry = chartData.network.getValues(cycleStart, cycleEnd, entry);
-                    includeCycle = (entry.rxBytes + entry.txBytes) > 0;
+                    final long bytesInCycle = getTotalBytesForTimeRange(chartData.network,
+                            new Range<>(cycleStart, cycleEnd));
+                    includeCycle = bytesInCycle > 0;
                 } else {
                     includeCycle = true;
                 }
diff --git a/src/com/android/settings/datausage/DataUsageBaseFragment.java b/src/com/android/settings/datausage/DataUsageBaseFragment.java
index 299ce43..eee3228 100644
--- a/src/com/android/settings/datausage/DataUsageBaseFragment.java
+++ b/src/com/android/settings/datausage/DataUsageBaseFragment.java
@@ -15,7 +15,6 @@
 package com.android.settings.datausage;
 
 import android.content.Context;
-import android.net.INetworkStatsService;
 import android.net.NetworkPolicy;
 import android.net.NetworkPolicyManager;
 import android.os.Bundle;
@@ -44,8 +43,6 @@
 
         services.mNetworkService = INetworkManagementService.Stub.asInterface(
                 ServiceManager.getService(Context.NETWORKMANAGEMENT_SERVICE));
-        services.mStatsService = INetworkStatsService.Stub.asInterface(
-                ServiceManager.getService(Context.NETWORK_STATS_SERVICE));
         services.mPolicyManager = (NetworkPolicyManager) context
                 .getSystemService(Context.NETWORK_POLICY_SERVICE);
 
diff --git a/src/com/android/settings/datausage/DataUsageList.java b/src/com/android/settings/datausage/DataUsageList.java
index cd033e3..6beb3d8 100644
--- a/src/com/android/settings/datausage/DataUsageList.java
+++ b/src/com/android/settings/datausage/DataUsageList.java
@@ -14,11 +14,9 @@
 
 package com.android.settings.datausage;
 
+import static android.app.usage.NetworkStats.Bucket.UID_REMOVED;
+import static android.app.usage.NetworkStats.Bucket.UID_TETHERING;
 import static android.net.NetworkPolicyManager.POLICY_REJECT_METERED_BACKGROUND;
-import static android.net.NetworkStatsHistory.FIELD_RX_BYTES;
-import static android.net.NetworkStatsHistory.FIELD_TX_BYTES;
-import static android.net.TrafficStats.UID_REMOVED;
-import static android.net.TrafficStats.UID_TETHERING;
 
 import android.app.Activity;
 import android.app.ActivityManager;
@@ -91,7 +89,6 @@
     private static final String KEY_APPS_GROUP = "apps_group";
     private static final String KEY_TEMPLATE = "template";
     private static final String KEY_APP = "app";
-    private static final String KEY_FIELDS = "fields";
 
     @VisibleForTesting
     static final int LOADER_CHART_DATA = 2;
@@ -299,7 +296,6 @@
         final Bundle args = new Bundle();
         args.putParcelable(KEY_TEMPLATE, template);
         args.putParcelable(KEY_APP, null);
-        args.putInt(KEY_FIELDS, FIELD_RX_BYTES | FIELD_TX_BYTES);
         return args;
     }
 
diff --git a/src/com/android/settings/datausage/DataUsagePreference.java b/src/com/android/settings/datausage/DataUsagePreference.java
index 644ea9b..0ed0ad3 100644
--- a/src/com/android/settings/datausage/DataUsagePreference.java
+++ b/src/com/android/settings/datausage/DataUsagePreference.java
@@ -53,7 +53,7 @@
         mTemplate = template;
         mSubId = subId;
         final DataUsageController controller = getDataUsageController();
-        if (mTemplate.isMatchRuleMobile()) {
+        if (mTemplate.getMatchRule() == NetworkTemplate.MATCH_MOBILE) {
             setTitle(R.string.app_cellular_data_usage);
         } else {
             final DataUsageController.DataUsageInfo usageInfo =
@@ -78,13 +78,14 @@
         final SubSettingLauncher launcher;
         args.putParcelable(DataUsageList.EXTRA_NETWORK_TEMPLATE, mTemplate);
         args.putInt(DataUsageList.EXTRA_SUB_ID, mSubId);
-        args.putInt(DataUsageList.EXTRA_NETWORK_TYPE, mTemplate.isMatchRuleMobile()
-            ? ConnectivityManager.TYPE_MOBILE : ConnectivityManager.TYPE_WIFI);
+        args.putInt(DataUsageList.EXTRA_NETWORK_TYPE, mTemplate.getMatchRule()
+                == NetworkTemplate.MATCH_MOBILE
+                ? ConnectivityManager.TYPE_MOBILE : ConnectivityManager.TYPE_WIFI);
         launcher = new SubSettingLauncher(getContext())
             .setArguments(args)
             .setDestination(DataUsageList.class.getName())
             .setSourceMetricsCategory(SettingsEnums.PAGE_UNKNOWN);
-        if (mTemplate.isMatchRuleMobile()) {
+        if (mTemplate.getMatchRule() == NetworkTemplate.MATCH_MOBILE) {
             launcher.setTitleRes(R.string.app_cellular_data_usage);
         } else {
             launcher.setTitleRes(mTitleRes);
diff --git a/src/com/android/settings/datausage/DataUsageSummary.java b/src/com/android/settings/datausage/DataUsageSummary.java
index a4396a2..abcc45f 100644
--- a/src/com/android/settings/datausage/DataUsageSummary.java
+++ b/src/com/android/settings/datausage/DataUsageSummary.java
@@ -183,15 +183,15 @@
     void addWifiSection() {
         TemplatePreferenceCategory category = (TemplatePreferenceCategory)
                 inflatePreferences(R.xml.data_usage_wifi);
-        category.setTemplate(
-                NetworkTemplate.buildTemplateWifi(NetworkTemplate.WIFI_NETWORKID_ALL,
-                null /* subscriberId */), 0, services);
+        category.setTemplate(new NetworkTemplate.Builder(NetworkTemplate.MATCH_WIFI).build(),
+                0, services);
     }
 
     private void addEthernetSection() {
         TemplatePreferenceCategory category = (TemplatePreferenceCategory)
                 inflatePreferences(R.xml.data_usage_ethernet);
-        category.setTemplate(NetworkTemplate.buildTemplateEthernet(), 0, services);
+        category.setTemplate(new NetworkTemplate.Builder(NetworkTemplate.MATCH_ETHERNET).build(),
+                0, services);
     }
 
     private Preference inflatePreferences(int resId) {
diff --git a/src/com/android/settings/datausage/DataUsageSummaryPreference.java b/src/com/android/settings/datausage/DataUsageSummaryPreference.java
index 260a6da..b6e533b 100644
--- a/src/com/android/settings/datausage/DataUsageSummaryPreference.java
+++ b/src/com/android/settings/datausage/DataUsageSummaryPreference.java
@@ -225,8 +225,7 @@
     static void launchWifiDataUsage(Context context) {
         final Bundle args = new Bundle(1);
         args.putParcelable(DataUsageList.EXTRA_NETWORK_TEMPLATE,
-                NetworkTemplate.buildTemplateWifi(NetworkTemplate.WIFI_NETWORKID_ALL,
-                null /* subscriberId */));
+                new NetworkTemplate.Builder(NetworkTemplate.MATCH_WIFI).build());
         args.putInt(DataUsageList.EXTRA_NETWORK_TYPE, ConnectivityManager.TYPE_WIFI);
         final SubSettingLauncher launcher = new SubSettingLauncher(context)
                 .setArguments(args)
@@ -369,8 +368,7 @@
     protected long getHistoricalUsageLevel() {
         final DataUsageController controller = new DataUsageController(getContext());
         return controller.getHistoricalUsageLevel(
-                NetworkTemplate.buildTemplateWifi(NetworkTemplate.WIFI_NETWORKID_ALL,
-                null /* subscriberId */));
+                new NetworkTemplate.Builder(NetworkTemplate.MATCH_WIFI).build());
     }
 
     @VisibleForTesting
diff --git a/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java b/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java
index ac1e1ad..1b3b47a 100644
--- a/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java
+++ b/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java
@@ -138,8 +138,7 @@
             mDefaultTemplate = DataUsageLib.getMobileTemplate(context, subscriptionId);
         } else if (DataUsageUtils.hasWifiRadio(context)) {
             mDataUsageTemplate = R.string.wifi_data_template;
-            mDefaultTemplate = NetworkTemplate.buildTemplateWifi(
-                    NetworkTemplate.WIFI_NETWORKID_ALL, null /* subscriberId */);
+            mDefaultTemplate = new NetworkTemplate.Builder(NetworkTemplate.MATCH_WIFI).build();
         } else {
             mDataUsageTemplate = R.string.ethernet_data_template;
             mDefaultTemplate = DataUsageUtils.getDefaultTemplate(context, subscriptionId);
diff --git a/src/com/android/settings/datausage/DataUsageUtils.java b/src/com/android/settings/datausage/DataUsageUtils.java
index fae53ec..5227284 100644
--- a/src/com/android/settings/datausage/DataUsageUtils.java
+++ b/src/com/android/settings/datausage/DataUsageUtils.java
@@ -184,10 +184,9 @@
         if (SubscriptionManager.isValidSubscriptionId(defaultSubId) && hasMobileData(context)) {
             return DataUsageLib.getMobileTemplate(context, defaultSubId);
         } else if (hasWifiRadio(context)) {
-            return NetworkTemplate.buildTemplateWifi(NetworkTemplate.WIFI_NETWORKID_ALL,
-                    null /* subscriberId */);
+            return new NetworkTemplate.Builder(NetworkTemplate.MATCH_WIFI).build();
         } else {
-            return NetworkTemplate.buildTemplateEthernet();
+            return new NetworkTemplate.Builder(NetworkTemplate.MATCH_ETHERNET).build();
         }
     }
 
diff --git a/src/com/android/settings/datausage/TemplatePreference.java b/src/com/android/settings/datausage/TemplatePreference.java
index 158c3b6..43dda0a 100644
--- a/src/com/android/settings/datausage/TemplatePreference.java
+++ b/src/com/android/settings/datausage/TemplatePreference.java
@@ -14,7 +14,6 @@
 
 package com.android.settings.datausage;
 
-import android.net.INetworkStatsService;
 import android.net.NetworkPolicyManager;
 import android.net.NetworkTemplate;
 import android.os.INetworkManagementService;
@@ -30,7 +29,6 @@
 
     class NetworkServices {
         INetworkManagementService mNetworkService;
-        INetworkStatsService mStatsService;
         NetworkPolicyManager mPolicyManager;
         TelephonyManager mTelephonyManager;
         SubscriptionManager mSubscriptionManager;
diff --git a/src/com/android/settings/datausage/WifiDataUsageSummaryPreferenceController.java b/src/com/android/settings/datausage/WifiDataUsageSummaryPreferenceController.java
index 0551fc2..9d3054e 100644
--- a/src/com/android/settings/datausage/WifiDataUsageSummaryPreferenceController.java
+++ b/src/com/android/settings/datausage/WifiDataUsageSummaryPreferenceController.java
@@ -26,6 +26,8 @@
 import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.net.DataUsageController;
 
+import java.util.Set;
+
 /**
  * The controller displays a data usage chart for the specified Wi-Fi network.
  */
@@ -52,7 +54,8 @@
         final DataUsageSummaryPreference mPreference = (DataUsageSummaryPreference) preference;
         // TODO(b/126299427): Currently gets data usage of whole Wi-Fi networks, but should get
         //  specified one.
-        final NetworkTemplate template = NetworkTemplate.buildTemplateWifi(mNetworkId);
+        final NetworkTemplate template = new NetworkTemplate.Builder(NetworkTemplate.MATCH_WIFI)
+                .setWifiNetworkKeys(Set.of(mNetworkId)).build();
         final DataUsageController.DataUsageInfo info = mDataUsageController.getDataUsageInfo(
                 template);
         mDataInfoController.updateDataLimit(info, mPolicyEditor.getPolicy(template));
diff --git a/src/com/android/settings/datausage/lib/DataUsageLib.java b/src/com/android/settings/datausage/lib/DataUsageLib.java
index 830f1ca..1ca5eff 100644
--- a/src/com/android/settings/datausage/lib/DataUsageLib.java
+++ b/src/com/android/settings/datausage/lib/DataUsageLib.java
@@ -17,15 +17,19 @@
 package com.android.settings.datausage.lib;
 
 import android.content.Context;
+import android.net.NetworkStats;
 import android.net.NetworkTemplate;
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
 import android.util.Log;
 
+import androidx.annotation.NonNull;
+
 import com.android.internal.util.ArrayUtils;
 
 import java.util.List;
+import java.util.Set;
 
 /**
  * Lib class for data usage
@@ -68,15 +72,37 @@
             return mobileTemplate;
         }
 
-        return NetworkTemplate.normalize(mobileTemplate, mergedSubscriberIds);
+        return normalizeMobileTemplate(mobileTemplate, mergedSubscriberIds);
     }
 
-    private static NetworkTemplate getMobileTemplateForSubId(
+    private static NetworkTemplate normalizeMobileTemplate(
+            @NonNull NetworkTemplate template, @NonNull String[] mergedSet) {
+        if (template.getSubscriberIds().isEmpty()) return template;
+        // The input template should have at most 1 subscriberId.
+        final String subscriberId = template.getSubscriberIds().iterator().next();
+
+        if (Set.of(mergedSet).contains(subscriberId)) {
+            // Requested template subscriber is part of the merge group; return
+            // a template that matches all merged subscribers.
+            return new NetworkTemplate.Builder(template.getMatchRule())
+                    .setSubscriberIds(Set.of(mergedSet))
+                    .setMeteredness(template.getMeteredness()).build();
+        }
+
+        return template;
+    }
+
+    public static NetworkTemplate getMobileTemplateForSubId(
             TelephonyManager telephonyManager, int subId) {
-        // The null subscriberId means that no any mobile/carrier network will be matched.
-        // Using old API: buildTemplateMobileAll for the null subscriberId to avoid NPE.
+        // Create template that matches any mobile network when the subscriberId is null.
         String subscriberId = telephonyManager.getSubscriberId(subId);
-        return subscriberId != null ? NetworkTemplate.buildTemplateCarrierMetered(subscriberId)
-                : NetworkTemplate.buildTemplateMobileAll(subscriberId);
+        return subscriberId != null
+                ? new NetworkTemplate.Builder(NetworkTemplate.MATCH_CARRIER)
+                .setSubscriberIds(Set.of(subscriberId))
+                .setMeteredness(NetworkStats.METERED_YES)
+                .build()
+                : new NetworkTemplate.Builder(NetworkTemplate.MATCH_MOBILE)
+                        .setMeteredness(NetworkStats.METERED_YES)
+                        .build();
     }
 }
diff --git a/src/com/android/settings/datetime/timezone/OWNERS b/src/com/android/settings/datetime/timezone/OWNERS
index 7ad770a..b61f975 100644
--- a/src/com/android/settings/datetime/timezone/OWNERS
+++ b/src/com/android/settings/datetime/timezone/OWNERS
@@ -1,6 +1,6 @@
 # Default reviewers for this and subdirectories.
 vichang@google.com
-nfuller@google.com
+mingaleev@google.com
 
 # Emergency approvers in case the above are not available
 narayan@google.com
diff --git a/src/com/android/settings/datetime/timezone/TimeZoneInfo.java b/src/com/android/settings/datetime/timezone/TimeZoneInfo.java
index f74614d..f9e819c 100644
--- a/src/com/android/settings/datetime/timezone/TimeZoneInfo.java
+++ b/src/com/android/settings/datetime/timezone/TimeZoneInfo.java
@@ -151,7 +151,7 @@
         public TimeZoneInfo format(TimeZone timeZone) {
             String canonicalZoneId = getCanonicalZoneId(timeZone);
             final TimeZoneNames timeZoneNames = mTimeZoneFormat.getTimeZoneNames();
-            final java.util.TimeZone javaTimeZone = java.util.TimeZone.getTimeZone(canonicalZoneId);
+            final java.util.TimeZone javaTimeZone = toJavaTimeZone(canonicalZoneId);
             final CharSequence gmtOffset = ZoneGetter.getGmtOffsetText(mTimeZoneFormat, mLocale,
                 javaTimeZone, mNow);
             return new TimeZoneInfo.Builder(timeZone)
@@ -165,15 +165,24 @@
                     .setGmtOffset(gmtOffset)
                     .build();
         }
+    }
 
-        private static String getCanonicalZoneId(TimeZone timeZone) {
-            final String id = timeZone.getID();
-            final String canonicalId = TimeZone.getCanonicalID(id);
-            if (canonicalId != null) {
-                return canonicalId;
-            }
-            return id;
+    /* package-private */ java.util.TimeZone getJavaTimeZone() {
+        String canonicalZoneId = getCanonicalZoneId(mTimeZone);
+        return toJavaTimeZone(canonicalZoneId);
+    }
+
+    private static java.util.TimeZone toJavaTimeZone(String canonicalZoneId) {
+        return java.util.TimeZone.getTimeZone(canonicalZoneId);
+    }
+
+    private static String getCanonicalZoneId(TimeZone timeZone) {
+        final String id = timeZone.getID();
+        final String canonicalId = TimeZone.getCanonicalID(id);
+        if (canonicalId != null) {
+            return canonicalId;
         }
+        return id;
     }
 
 }
diff --git a/src/com/android/settings/datetime/timezone/TimeZoneInfoPreferenceController.java b/src/com/android/settings/datetime/timezone/TimeZoneInfoPreferenceController.java
index 80cefb6..c6ac328 100644
--- a/src/com/android/settings/datetime/timezone/TimeZoneInfoPreferenceController.java
+++ b/src/com/android/settings/datetime/timezone/TimeZoneInfoPreferenceController.java
@@ -20,17 +20,17 @@
 import android.icu.text.DateFormat;
 import android.icu.text.DisplayContext;
 import android.icu.text.SimpleDateFormat;
-import android.icu.util.BasicTimeZone;
 import android.icu.util.Calendar;
 import android.icu.util.TimeZone;
-import android.icu.util.TimeZoneTransition;
 
 import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
 
 import com.android.settings.R;
 import com.android.settings.core.BasePreferenceController;
 
+import java.time.Instant;
+import java.time.zone.ZoneOffsetTransition;
+import java.time.zone.ZoneRules;
 import java.util.Date;
 
 public class TimeZoneInfoPreferenceController extends BasePreferenceController {
@@ -86,11 +86,11 @@
             return mContext.getString(R.string.zone_info_footer_no_dst, offsetAndName);
         }
 
-        final TimeZoneTransition nextDstTransition = findNextDstTransition(timeZone);
-        if (nextDstTransition == null) {
-            return null;
+        final ZoneOffsetTransition nextDstTransition = findNextDstTransition(item);
+        if (nextDstTransition == null) { // No future transition
+            return mContext.getString(R.string.zone_info_footer_no_dst, offsetAndName);
         }
-        final boolean toDst = nextDstTransition.getTo().getDSTSavings() != 0;
+        final boolean toDst = getDSTSavings(timeZone, nextDstTransition.getInstant()) != 0;
         String timeType = toDst ? item.getDaylightName() : item.getStandardName();
         if (timeType == null) {
             // Fall back to generic "summer time" and "standard time" if the time zone has no
@@ -101,26 +101,37 @@
 
         }
         final Calendar transitionTime = Calendar.getInstance(timeZone);
-        transitionTime.setTimeInMillis(nextDstTransition.getTime());
+        transitionTime.setTimeInMillis(nextDstTransition.getInstant().toEpochMilli());
         final String date = mDateFormat.format(transitionTime);
         return SpannableUtil.getResourcesText(mContext.getResources(),
                 R.string.zone_info_footer, offsetAndName, timeType, date);
     }
 
-    private TimeZoneTransition findNextDstTransition(TimeZone timeZone) {
-        if (!(timeZone instanceof BasicTimeZone)) {
-            return null;
-        }
-        final BasicTimeZone basicTimeZone = (BasicTimeZone) timeZone;
-        TimeZoneTransition transition = basicTimeZone.getNextTransition(
-                mDate.getTime(), /* inclusive */ false);
-        do {
-            if (transition.getTo().getDSTSavings() != transition.getFrom().getDSTSavings()) {
+    private ZoneOffsetTransition findNextDstTransition(TimeZoneInfo timeZoneInfo) {
+        TimeZone timeZone = timeZoneInfo.getTimeZone();
+        ZoneRules zoneRules = timeZoneInfo.getJavaTimeZone().toZoneId().getRules();
+
+        Instant from = mDate.toInstant();
+
+        ZoneOffsetTransition transition;
+        while (true) { // Find next transition with different DST offsets
+            transition = zoneRules.nextTransition(from);
+            if (transition == null) {
                 break;
             }
-            transition = basicTimeZone.getNextTransition(
-                    transition.getTime(), /*inclusive */ false);
-        } while (transition != null);
+            Instant to = transition.getInstant();
+            if (getDSTSavings(timeZone, from) != getDSTSavings(timeZone, to)) {
+                break;
+            }
+            from = to;
+        }
+
         return transition;
     }
+
+    private static int getDSTSavings(TimeZone timeZone, Instant instant) {
+        int[] offsets = new int[2];
+        timeZone.getOffset(instant.toEpochMilli(), false /* local time */, offsets);
+        return offsets[1];
+    }
 }
diff --git a/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceController.java b/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceController.java
index 88dda29..7514577 100644
--- a/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceController.java
+++ b/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceController.java
@@ -17,9 +17,12 @@
 package com.android.settings.development;
 
 import android.bluetooth.BluetoothA2dp;
+import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothCodecConfig;
 import android.bluetooth.BluetoothCodecStatus;
 import android.bluetooth.BluetoothDevice;
+import android.bluetooth.BluetoothManager;
+import android.bluetooth.BluetoothProfile;
 import android.content.Context;
 
 import androidx.annotation.VisibleForTesting;
@@ -34,6 +37,8 @@
 import com.android.settingslib.core.lifecycle.events.OnDestroy;
 import com.android.settingslib.development.DeveloperOptionsPreferenceController;
 
+import java.util.List;
+
 public abstract class AbstractBluetoothA2dpPreferenceController extends
         DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
         PreferenceControllerMixin, BluetoothServiceConnectionListener, LifecycleObserver,
@@ -48,11 +53,15 @@
     private final String[] mListValues;
     private final String[] mListSummaries;
 
+    @VisibleForTesting
+    BluetoothAdapter mBluetoothAdapter;
+
     public AbstractBluetoothA2dpPreferenceController(Context context, Lifecycle lifecycle,
             BluetoothA2dpConfigStore store) {
         super(context);
 
         mBluetoothA2dpConfigStore = store;
+        mBluetoothAdapter = context.getSystemService(BluetoothManager.class).getAdapter();
         mListValues = getListValues();
         mListSummaries = getListSummaries();
 
@@ -82,13 +91,11 @@
 
         final BluetoothCodecConfig codecConfig = mBluetoothA2dpConfigStore.createCodecConfig();
         synchronized (mBluetoothA2dpConfigStore) {
-            if (mBluetoothA2dp != null) {
-                BluetoothDevice activeDevice = mBluetoothA2dp.getActiveDevice();
-                if (activeDevice == null) {
-                    return false;
-                }
-                setCodecConfigPreference(activeDevice, codecConfig);
+            BluetoothDevice activeDevice = getA2dpActiveDevice();
+            if (activeDevice == null) {
+                return false;
             }
+            setCodecConfigPreference(activeDevice, codecConfig);
         }
         // Because the setting is not persisted into permanent storage, we cannot call update state
         // here to update the preference.
@@ -106,7 +113,7 @@
 
     @Override
     public void updateState(Preference preference) {
-        BluetoothDevice activeDevice = mBluetoothA2dp.getActiveDevice();
+        BluetoothDevice activeDevice = getA2dpActiveDevice();
         if (activeDevice == null || getCodecConfig(activeDevice) == null || mPreference == null) {
             return;
         }
@@ -184,7 +191,7 @@
     void setCodecConfigPreference(BluetoothDevice device,
             BluetoothCodecConfig config) {
         BluetoothDevice bluetoothDevice =
-                (device != null) ? device : mBluetoothA2dp.getActiveDevice();
+                (device != null) ? device : getA2dpActiveDevice();
         if (bluetoothDevice == null) {
             return;
         }
@@ -195,7 +202,7 @@
     BluetoothCodecConfig getCodecConfig(BluetoothDevice device) {
         if (mBluetoothA2dp != null) {
             BluetoothDevice bluetoothDevice =
-                    (device != null) ? device : mBluetoothA2dp.getActiveDevice();
+                    (device != null) ? device : getA2dpActiveDevice();
             if (bluetoothDevice == null) {
                 return null;
             }
@@ -206,4 +213,13 @@
         }
         return null;
     }
+
+    private BluetoothDevice getA2dpActiveDevice() {
+        if (mBluetoothAdapter == null) {
+            return null;
+        }
+        List<BluetoothDevice> activeDevices =
+                mBluetoothAdapter.getActiveDevices(BluetoothProfile.A2DP);
+        return (activeDevices.size() > 0) ? activeDevices.get(0) : null;
+    }
 }
diff --git a/src/com/android/settings/development/AdbDeviceDetailsFingerprintController.java b/src/com/android/settings/development/AdbDeviceDetailsFingerprintController.java
index b9c2d43..3aa92f1 100644
--- a/src/com/android/settings/development/AdbDeviceDetailsFingerprintController.java
+++ b/src/com/android/settings/development/AdbDeviceDetailsFingerprintController.java
@@ -73,7 +73,7 @@
         final CharSequence titleFormat = mContext.getText(
                 R.string.adb_device_fingerprint_title_format);
         mFingerprintPref.setTitle(String.format(
-                titleFormat.toString(), mPairedDevice.getGuid()));
+                titleFormat.toString(), mPairedDevice.guid));
         mFingerprintCategory.addPreference(mFingerprintPref);
     }
 }
diff --git a/src/com/android/settings/development/AdbDeviceDetailsHeaderController.java b/src/com/android/settings/development/AdbDeviceDetailsHeaderController.java
index a4e79ea..7830bb9 100644
--- a/src/com/android/settings/development/AdbDeviceDetailsHeaderController.java
+++ b/src/com/android/settings/development/AdbDeviceDetailsHeaderController.java
@@ -81,7 +81,7 @@
 
         mEntityHeaderController
                 .setIcon(mContext.getDrawable(com.android.internal.R.drawable.ic_bt_laptop))
-                .setLabel(mPairedDevice.getDeviceName())
+                .setLabel(mPairedDevice.name)
                 .done(mFragment.getActivity(), true);
     }
 }
diff --git a/src/com/android/settings/development/AdbPairedDevicePreference.java b/src/com/android/settings/development/AdbPairedDevicePreference.java
index a82a949..5d30428 100644
--- a/src/com/android/settings/development/AdbPairedDevicePreference.java
+++ b/src/com/android/settings/development/AdbPairedDevicePreference.java
@@ -77,8 +77,8 @@
 
     static void setTitle(AdbPairedDevicePreference preference,
                          PairDevice pairedDevice) {
-        preference.setTitle(pairedDevice.getDeviceName());
-        preference.setSummary(pairedDevice.isConnected()
+        preference.setTitle(pairedDevice.name);
+        preference.setSummary(pairedDevice.connected
                 ? preference.getContext().getText(R.string.adb_wireless_device_connected_summary)
                 : "");
     }
diff --git a/src/com/android/settings/development/BluetoothA2dpConfigStore.java b/src/com/android/settings/development/BluetoothA2dpConfigStore.java
index 0b154d2..7fd7b13 100644
--- a/src/com/android/settings/development/BluetoothA2dpConfigStore.java
+++ b/src/com/android/settings/development/BluetoothA2dpConfigStore.java
@@ -71,10 +71,16 @@
     }
 
     public BluetoothCodecConfig createCodecConfig() {
-        return new BluetoothCodecConfig(mCodecType, mCodecPriority,
-                mSampleRate, mBitsPerSample,
-                mChannelMode, mCodecSpecific1Value,
-                mCodecSpecific2Value, mCodecSpecific3Value,
-                mCodecSpecific4Value);
+        return new BluetoothCodecConfig.Builder()
+                .setCodecType(mCodecType)
+                .setCodecPriority(mCodecPriority)
+                .setSampleRate(mSampleRate)
+                .setBitsPerSample(mBitsPerSample)
+                .setChannelMode(mChannelMode)
+                .setCodecSpecific1(mCodecSpecific1Value)
+                .setCodecSpecific2(mCodecSpecific2Value)
+                .setCodecSpecific3(mCodecSpecific3Value)
+                .setCodecSpecific4(mCodecSpecific4Value)
+                .build();
     }
 }
diff --git a/src/com/android/settings/development/BluetoothA2dpHwOffloadPreferenceController.java b/src/com/android/settings/development/BluetoothA2dpHwOffloadPreferenceController.java
index 95e663b..2ffa11b 100644
--- a/src/com/android/settings/development/BluetoothA2dpHwOffloadPreferenceController.java
+++ b/src/com/android/settings/development/BluetoothA2dpHwOffloadPreferenceController.java
@@ -16,9 +16,12 @@
 
 package com.android.settings.development;
 
+import static com.android.settings.development.BluetoothLeAudioHwOffloadPreferenceController.LE_AUDIO_OFFLOAD_DISABLED_PROPERTY;
+
 import android.content.Context;
 import android.os.SystemProperties;
 
+import androidx.annotation.VisibleForTesting;
 import androidx.preference.Preference;
 import androidx.preference.SwitchPreference;
 
@@ -34,6 +37,9 @@
     static final String A2DP_OFFLOAD_DISABLED_PROPERTY = "persist.bluetooth.a2dp_offload.disabled";
     static final String A2DP_OFFLOAD_SUPPORTED_PROPERTY = "ro.bluetooth.a2dp_offload.supported";
 
+    @VisibleForTesting
+    boolean mChanged = false;
+
     public BluetoothA2dpHwOffloadPreferenceController(Context context,
             DevelopmentSettingsDashboardFragment fragment) {
         super(context);
@@ -47,7 +53,8 @@
 
     @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
-        BluetoothA2dpHwOffloadRebootDialog.show(mFragment, this);
+        BluetoothHwOffloadRebootDialog.show(mFragment);
+        mChanged = true;
         return false;
     }
 
@@ -85,10 +92,26 @@
         return offloadSupported ? !offloadDisabled : true;
     }
 
-    public void onA2dpHwDialogConfirmed() {
+    /**
+     * Called when the HwOffloadDialog confirm is clicked.
+     */
+    public void onHwOffloadDialogConfirmed() {
+        if (!mChanged) {
+            return;
+        }
         final boolean offloadDisabled =
                 SystemProperties.getBoolean(A2DP_OFFLOAD_DISABLED_PROPERTY, false);
         SystemProperties.set(A2DP_OFFLOAD_DISABLED_PROPERTY, Boolean.toString(!offloadDisabled));
+        if (offloadDisabled) {
+            SystemProperties.set(LE_AUDIO_OFFLOAD_DISABLED_PROPERTY,
+                    Boolean.toString(!offloadDisabled));
+        }
     }
 
+    /**
+     * Called when the HwOffloadDialog cancel is clicked.
+     */
+    public void onHwOffloadDialogCanceled() {
+        mChanged = false;
+    }
 }
diff --git a/src/com/android/settings/development/BluetoothGabeldorschePreferenceController.java b/src/com/android/settings/development/BluetoothGabeldorschePreferenceController.java
deleted file mode 100644
index f5c30f5..0000000
--- a/src/com/android/settings/development/BluetoothGabeldorschePreferenceController.java
+++ /dev/null
@@ -1,73 +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.development;
-
-import android.content.Context;
-import android.provider.DeviceConfig;
-
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-import androidx.preference.SwitchPreference;
-
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.development.DeveloperOptionsPreferenceController;
-
-/**
- * Preference controller for Bluetooth Gabeldorche feature
- */
-public class BluetoothGabeldorschePreferenceController extends
-        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
-        PreferenceControllerMixin {
-
-    private static final String BLUETOOTH_GABELDORSCHE_KEY =
-            "bluetooth_gabeldorsche_enable";
-
-    @VisibleForTesting
-    static final String CURRENT_GD_FLAG = "INIT_gd_scanning";
-
-    public BluetoothGabeldorschePreferenceController(Context context) {
-        super(context);
-    }
-
-    @Override
-    public String getPreferenceKey() {
-        return BLUETOOTH_GABELDORSCHE_KEY;
-    }
-
-    @Override
-    public boolean onPreferenceChange(Preference preference, Object newValue) {
-        final boolean isEnabled = (Boolean) newValue;
-        DeviceConfig.setProperty(DeviceConfig.NAMESPACE_BLUETOOTH,
-                CURRENT_GD_FLAG, isEnabled ? "true" : "false", false /* makeDefault */);
-        return true;
-    }
-
-    @Override
-    public void updateState(Preference preference) {
-        final boolean isEnabled = DeviceConfig.getBoolean(
-                DeviceConfig.NAMESPACE_BLUETOOTH, CURRENT_GD_FLAG, false /* default */);
-        ((SwitchPreference) mPreference).setChecked(isEnabled);
-    }
-
-    @Override
-    protected void onDeveloperOptionsSwitchDisabled() {
-        super.onDeveloperOptionsSwitchDisabled();
-        DeviceConfig.setProperty(DeviceConfig.NAMESPACE_BLUETOOTH,
-                CURRENT_GD_FLAG, null, false /* makeDefault */);
-        ((SwitchPreference) mPreference).setChecked(false);
-    }
-}
diff --git a/src/com/android/settings/development/BluetoothA2dpHwOffloadRebootDialog.java b/src/com/android/settings/development/BluetoothHwOffloadRebootDialog.java
similarity index 60%
rename from src/com/android/settings/development/BluetoothA2dpHwOffloadRebootDialog.java
rename to src/com/android/settings/development/BluetoothHwOffloadRebootDialog.java
index 95ef019..389103e 100644
--- a/src/com/android/settings/development/BluetoothA2dpHwOffloadRebootDialog.java
+++ b/src/com/android/settings/development/BluetoothHwOffloadRebootDialog.java
@@ -28,17 +28,23 @@
 import com.android.settings.R;
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
 
-public class BluetoothA2dpHwOffloadRebootDialog extends InstrumentedDialogFragment
+/**
+ * The a2dp and LE audio offload switch should reboot the device to take effect, the dialog is
+ * to ask the user to reboot the device after a2dp or LE audio offload user preference changed
+ */
+public class BluetoothHwOffloadRebootDialog extends InstrumentedDialogFragment
         implements DialogInterface.OnClickListener {
 
-    public static final String TAG = "BluetoothA2dpHwOffloadReboot";
+    public static final String TAG = "BluetoothHwOffloadReboot";
 
-    public static void show(DevelopmentSettingsDashboardFragment host,
-            BluetoothA2dpHwOffloadPreferenceController controller) {
+    /**
+     * The function to show the HwOffloadReboot Dialog.
+     */
+    public static void show(DevelopmentSettingsDashboardFragment host) {
         final FragmentManager manager = host.getActivity().getSupportFragmentManager();
         if (manager.findFragmentByTag(TAG) == null) {
-            final BluetoothA2dpHwOffloadRebootDialog dialog =
-                    new BluetoothA2dpHwOffloadRebootDialog();
+            final BluetoothHwOffloadRebootDialog dialog =
+                    new BluetoothHwOffloadRebootDialog();
             dialog.setTargetFragment(host, 0 /* requestCode */);
             dialog.show(manager, TAG);
         }
@@ -52,33 +58,44 @@
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
         return new AlertDialog.Builder(getActivity())
-                .setMessage(R.string.bluetooth_disable_a2dp_hw_offload_dialog_message)
-                .setTitle(R.string.bluetooth_disable_a2dp_hw_offload_dialog_title)
+                .setMessage(R.string.bluetooth_disable_hw_offload_dialog_message)
+                .setTitle(R.string.bluetooth_disable_hw_offload_dialog_title)
                 .setPositiveButton(
-                        R.string.bluetooth_disable_a2dp_hw_offload_dialog_confirm, this)
+                        R.string.bluetooth_disable_hw_offload_dialog_confirm, this)
                 .setNegativeButton(
-                        R.string.bluetooth_disable_a2dp_hw_offload_dialog_cancel, this)
+                        R.string.bluetooth_disable_hw_offload_dialog_cancel, this)
                 .create();
     }
 
     @Override
     public void onClick(DialogInterface dialog, int which) {
-        final OnA2dpHwDialogConfirmedListener host =
-                (OnA2dpHwDialogConfirmedListener) getTargetFragment();
+        final OnHwOffloadDialogListener host =
+                (OnHwOffloadDialogListener) getTargetFragment();
         if (host == null) {
             return;
         }
         if (which == DialogInterface.BUTTON_POSITIVE) {
-            host.onA2dpHwDialogConfirmed();
+            host.onHwOffloadDialogConfirmed();
             PowerManager pm = getContext().getSystemService(PowerManager.class);
             pm.reboot(null);
+        } else {
+            host.onHwOffloadDialogCanceled();
         }
     }
 
-    public interface OnA2dpHwDialogConfirmedListener {
+    /**
+     * The interface for the HsOffloadDialogListener to provide the action as the
+     * confirmed or canceled clicked.
+     */
+    public interface OnHwOffloadDialogListener {
         /**
          * Called when the user presses reboot on the warning dialog.
          */
-        void onA2dpHwDialogConfirmed();
+        void onHwOffloadDialogConfirmed();
+
+        /**
+         * Called when the user presses cancel on the warning dialog.
+         */
+        void onHwOffloadDialogCanceled();
     }
 }
diff --git a/src/com/android/settings/development/BluetoothLeAudioHwOffloadPreferenceController.java b/src/com/android/settings/development/BluetoothLeAudioHwOffloadPreferenceController.java
new file mode 100644
index 0000000..911b62d
--- /dev/null
+++ b/src/com/android/settings/development/BluetoothLeAudioHwOffloadPreferenceController.java
@@ -0,0 +1,127 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development;
+
+import static com.android.settings.development.BluetoothA2dpHwOffloadPreferenceController.A2DP_OFFLOAD_SUPPORTED_PROPERTY;
+
+import android.content.Context;
+import android.os.SystemProperties;
+
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.SwitchPreference;
+
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
+/**
+ * Preference controller to control Bluetooth LE audio offload
+ */
+public class BluetoothLeAudioHwOffloadPreferenceController
+        extends DeveloperOptionsPreferenceController
+        implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
+
+    private static final String PREFERENCE_KEY = "bluetooth_disable_le_audio_hw_offload";
+    private final DevelopmentSettingsDashboardFragment mFragment;
+
+    static final String LE_AUDIO_OFFLOAD_DISABLED_PROPERTY =
+            "persist.bluetooth.leaudio_offload.disabled";
+    static final String LE_AUDIO_OFFLOAD_SUPPORTED_PROPERTY =
+            "ro.bluetooth.leaudio_offload.supported";
+
+    @VisibleForTesting
+    boolean mChanged = false;
+
+    public BluetoothLeAudioHwOffloadPreferenceController(Context context,
+            DevelopmentSettingsDashboardFragment fragment) {
+        super(context);
+        mFragment = fragment;
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return PREFERENCE_KEY;
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        BluetoothHwOffloadRebootDialog.show(mFragment);
+        mChanged = true;
+        return false;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        final boolean offloadSupported =
+                SystemProperties.getBoolean(A2DP_OFFLOAD_SUPPORTED_PROPERTY, false)
+                && SystemProperties.getBoolean(LE_AUDIO_OFFLOAD_SUPPORTED_PROPERTY, false);
+        if (offloadSupported) {
+            final boolean offloadDisabled =
+                    SystemProperties.getBoolean(LE_AUDIO_OFFLOAD_DISABLED_PROPERTY, true);
+            ((SwitchPreference) mPreference).setChecked(offloadDisabled);
+        } else {
+            mPreference.setEnabled(false);
+            ((SwitchPreference) mPreference).setChecked(true);
+        }
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        super.onDeveloperOptionsSwitchDisabled();
+        final boolean offloadSupported =
+                SystemProperties.getBoolean(A2DP_OFFLOAD_SUPPORTED_PROPERTY, false)
+                && SystemProperties.getBoolean(LE_AUDIO_OFFLOAD_SUPPORTED_PROPERTY, false);
+        if (offloadSupported) {
+            ((SwitchPreference) mPreference).setChecked(true);
+            SystemProperties.set(LE_AUDIO_OFFLOAD_DISABLED_PROPERTY, "true");
+        }
+    }
+
+    /**
+     * Check if the le audio offload setting is default value.
+     */
+    public boolean isDefaultValue() {
+        final boolean offloadSupported =
+                SystemProperties.getBoolean(A2DP_OFFLOAD_SUPPORTED_PROPERTY, false)
+                && SystemProperties.getBoolean(LE_AUDIO_OFFLOAD_SUPPORTED_PROPERTY, false);
+        final boolean offloadDisabled =
+                    SystemProperties.getBoolean(LE_AUDIO_OFFLOAD_DISABLED_PROPERTY, false);
+        return offloadSupported ? offloadDisabled : true;
+    }
+
+    /**
+     * Called when the HwOffloadDialog confirm is clicked.
+     */
+    public void onHwOffloadDialogConfirmed() {
+        if (!mChanged) {
+            return;
+        }
+
+        final boolean offloadDisabled =
+                SystemProperties.getBoolean(LE_AUDIO_OFFLOAD_DISABLED_PROPERTY,
+                false);
+        SystemProperties.set(LE_AUDIO_OFFLOAD_DISABLED_PROPERTY,
+                Boolean.toString(!offloadDisabled));
+    }
+
+    /**
+     * Called when the HwOffloadDialog cancel is clicked.
+     */
+    public void onHwOffloadDialogCanceled() {
+        mChanged = false;
+    }
+}
diff --git a/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceController.java b/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceController.java
index ee6af1c..bd8169a 100644
--- a/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceController.java
+++ b/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceController.java
@@ -17,6 +17,8 @@
 package com.android.settings.development;
 
 import android.content.Context;
+import android.content.pm.PackageManager;
+import android.content.res.Resources;
 import android.os.SystemProperties;
 
 import androidx.annotation.VisibleForTesting;
@@ -38,12 +40,20 @@
     static final String MAX_CONNECTED_AUDIO_DEVICES_PROPERTY =
             "persist.bluetooth.maxconnectedaudiodevices";
 
-    private final int mDefaultMaxConnectedAudioDevices;
+    private int mDefaultMaxConnectedAudioDevices = 0;
 
     public BluetoothMaxConnectedAudioDevicesPreferenceController(Context context) {
         super(context);
-        mDefaultMaxConnectedAudioDevices = mContext.getResources().getInteger(
-                com.android.internal.R.integer.config_bluetooth_max_connected_audio_devices);
+
+        try {
+            Resources res = context.getPackageManager().getResourcesForApplication(
+                    "com.android.bluetooth");
+            mDefaultMaxConnectedAudioDevices = res.getInteger(res.getIdentifier(
+                    "config_bluetooth_max_connected_audio_devices",
+                    "integer", "com.android.bluetooth"));
+        } catch (PackageManager.NameNotFoundException e) {
+            e.printStackTrace();
+        }
     }
 
     @Override
diff --git a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
index fbab1fd..d554e0b 100644
--- a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
+++ b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
@@ -79,7 +79,7 @@
 public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFragment
         implements OnMainSwitchChangeListener, OemUnlockDialogHost, AdbDialogHost,
         AdbClearKeysDialogHost, LogPersistDialogHost,
-        BluetoothA2dpHwOffloadRebootDialog.OnA2dpHwDialogConfirmedListener,
+        BluetoothHwOffloadRebootDialog.OnHwOffloadDialogListener,
         AbstractBluetoothPreferenceController.Callback {
 
     private static final String TAG = "DevSettingsDashboard";
@@ -287,12 +287,16 @@
             if (isChecked) {
                 EnableDevelopmentSettingWarningDialog.show(this /* host */);
             } else {
-                final BluetoothA2dpHwOffloadPreferenceController controller =
+                final BluetoothA2dpHwOffloadPreferenceController a2dpController =
                         getDevelopmentOptionsController(
                                 BluetoothA2dpHwOffloadPreferenceController.class);
-                // If A2DP hardware offload isn't default value, we must reboot after disable
+                final BluetoothLeAudioHwOffloadPreferenceController leAudioController =
+                        getDevelopmentOptionsController(
+                                BluetoothLeAudioHwOffloadPreferenceController.class);
+                // If hardware offload isn't default value, we must reboot after disable
                 // developer options. Show a dialog for the user to confirm.
-                if (controller == null || controller.isDefaultValue()) {
+                if ((a2dpController == null || a2dpController.isDefaultValue())
+                        && (leAudioController == null || leAudioController.isDefaultValue())) {
                     disableDeveloperOptions();
                 } else {
                     DisableDevSettingsDialogFragment.show(this /* host */);
@@ -352,10 +356,27 @@
     }
 
     @Override
-    public void onA2dpHwDialogConfirmed() {
-        final BluetoothA2dpHwOffloadPreferenceController controller =
+    public void onHwOffloadDialogConfirmed() {
+        final BluetoothA2dpHwOffloadPreferenceController a2dpController =
                 getDevelopmentOptionsController(BluetoothA2dpHwOffloadPreferenceController.class);
-        controller.onA2dpHwDialogConfirmed();
+        a2dpController.onHwOffloadDialogConfirmed();
+
+        final BluetoothLeAudioHwOffloadPreferenceController leAudioController =
+                getDevelopmentOptionsController(
+                    BluetoothLeAudioHwOffloadPreferenceController.class);
+        leAudioController.onHwOffloadDialogConfirmed();
+    }
+
+    @Override
+    public void onHwOffloadDialogCanceled() {
+        final BluetoothA2dpHwOffloadPreferenceController a2dpController =
+                getDevelopmentOptionsController(BluetoothA2dpHwOffloadPreferenceController.class);
+        a2dpController.onHwOffloadDialogCanceled();
+
+        final BluetoothLeAudioHwOffloadPreferenceController leAudioController =
+                getDevelopmentOptionsController(
+                    BluetoothLeAudioHwOffloadPreferenceController.class);
+        leAudioController.onHwOffloadDialogCanceled();
     }
 
     @Override
@@ -477,7 +498,6 @@
         controllers.add(new HdcpCheckingPreferenceController(context));
         controllers.add(new BluetoothSnoopLogPreferenceController(context));
         controllers.add(new OemUnlockPreferenceController(context, activity, fragment));
-        controllers.add(new FileEncryptionPreferenceController(context));
         controllers.add(new PictureColorModePreferenceController(context, lifecycle));
         controllers.add(new WebViewAppPreferenceController(context));
         controllers.add(new CoolColorTemperaturePreferenceController(context));
@@ -491,6 +511,7 @@
         controllers.add(new BugReportInPowerPreferenceController(context));
         controllers.add(new AutomaticSystemServerHeapDumpPreferenceController(context));
         controllers.add(new MockLocationAppPreferenceController(context, fragment));
+        controllers.add(new MockModemPreferenceController(context));
         controllers.add(new DebugViewAttributesPreferenceController(context));
         controllers.add(new SelectDebugAppPreferenceController(context, fragment));
         controllers.add(new WaitForDebuggerPreferenceController(context));
@@ -510,11 +531,12 @@
         controllers.add(new TetheringHardwareAccelPreferenceController(context));
         controllers.add(new BluetoothDeviceNoNamePreferenceController(context));
         controllers.add(new BluetoothAbsoluteVolumePreferenceController(context));
-        controllers.add(new BluetoothGabeldorschePreferenceController(context));
         controllers.add(new BluetoothAvrcpVersionPreferenceController(context));
         controllers.add(new BluetoothMapVersionPreferenceController(context));
         controllers.add(new BluetoothA2dpHwOffloadPreferenceController(context, fragment));
+        controllers.add(new BluetoothLeAudioHwOffloadPreferenceController(context, fragment));
         controllers.add(new BluetoothMaxConnectedAudioDevicesPreferenceController(context));
+        controllers.add(new NfcStackDebugLogPreferenceController(context));
         controllers.add(new ShowTapsPreferenceController(context));
         controllers.add(new PointerLocationPreferenceController(context));
         controllers.add(new ShowSurfaceUpdatesPreferenceController(context));
diff --git a/src/com/android/settings/development/DisableDevSettingsDialogFragment.java b/src/com/android/settings/development/DisableDevSettingsDialogFragment.java
index 803030e..5db2ed4 100644
--- a/src/com/android/settings/development/DisableDevSettingsDialogFragment.java
+++ b/src/com/android/settings/development/DisableDevSettingsDialogFragment.java
@@ -56,15 +56,15 @@
 
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
-        // Reuse the same text of disable_a2dp_hw_offload_dialog.
+        // Reuse the same text of disable_hw_offload_dialog.
         // The text is generic enough to be used for turning off Dev options.
         return new AlertDialog.Builder(getActivity())
-                .setMessage(R.string.bluetooth_disable_a2dp_hw_offload_dialog_message)
-                .setTitle(R.string.bluetooth_disable_a2dp_hw_offload_dialog_title)
+                .setMessage(R.string.bluetooth_disable_hw_offload_dialog_message)
+                .setTitle(R.string.bluetooth_disable_hw_offload_dialog_title)
                 .setPositiveButton(
-                        R.string.bluetooth_disable_a2dp_hw_offload_dialog_confirm, this)
+                        R.string.bluetooth_disable_hw_offload_dialog_confirm, this)
                 .setNegativeButton(
-                        R.string.bluetooth_disable_a2dp_hw_offload_dialog_cancel, this)
+                        R.string.bluetooth_disable_hw_offload_dialog_cancel, this)
                 .create();
     }
 
diff --git a/src/com/android/settings/development/FileEncryptionPreferenceController.java b/src/com/android/settings/development/FileEncryptionPreferenceController.java
deleted file mode 100644
index 82a58ba..0000000
--- a/src/com/android/settings/development/FileEncryptionPreferenceController.java
+++ /dev/null
@@ -1,85 +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.development;
-
-import android.content.Context;
-import android.os.RemoteException;
-import android.os.ServiceManager;
-import android.os.storage.IStorageManager;
-import android.text.TextUtils;
-import android.sysprop.CryptoProperties;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-
-import com.android.settings.R;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.development.DeveloperOptionsPreferenceController;
-
-public class FileEncryptionPreferenceController extends DeveloperOptionsPreferenceController
-        implements PreferenceControllerMixin {
-
-    private static final String KEY_CONVERT_FBE = "convert_to_file_encryption";
-    private static final String KEY_STORAGE_MANAGER = "mount";
-
-    private final IStorageManager mStorageManager;
-
-    public FileEncryptionPreferenceController(Context context) {
-        super(context);
-
-        mStorageManager = getStorageManager();
-    }
-
-    @Override
-    public boolean isAvailable() {
-        if (mStorageManager == null) {
-            return false;
-        }
-
-        try {
-            return mStorageManager.isConvertibleToFBE();
-        } catch (RemoteException e) {
-            return false;
-        }
-    }
-
-    @Override
-    public String getPreferenceKey() {
-        return KEY_CONVERT_FBE;
-    }
-
-    @Override
-    public void updateState(Preference preference) {
-        if (CryptoProperties.type().orElse(CryptoProperties.type_values.NONE) !=
-            CryptoProperties.type_values.FILE) {
-            return;
-        }
-
-        mPreference.setEnabled(false);
-        mPreference.setSummary(
-                mContext.getResources().getString(R.string.convert_to_file_encryption_done));
-    }
-
-    private IStorageManager getStorageManager() {
-        try {
-            return IStorageManager.Stub.asInterface(
-                    ServiceManager.getService(KEY_STORAGE_MANAGER));
-        } catch (VerifyError e) {
-            // Used for tests since Robolectric cannot initialize this class.
-            return null;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/com/android/settings/development/MockModemPreferenceController.java b/src/com/android/settings/development/MockModemPreferenceController.java
new file mode 100644
index 0000000..655f157
--- /dev/null
+++ b/src/com/android/settings/development/MockModemPreferenceController.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development;
+
+import android.content.Context;
+import android.os.SystemProperties;
+import android.util.Log;
+
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.SwitchPreference;
+
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
+/**
+ * PreferenceController for MockModem
+ */
+public class MockModemPreferenceController extends
+        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
+        PreferenceControllerMixin {
+
+    private static final String TAG = "MockModemPreferenceController";
+    private static final String ALLOW_MOCK_MODEM_KEY =
+            "allow_mock_modem";
+    @VisibleForTesting
+    static final String ALLOW_MOCK_MODEM_PROPERTY =
+            "persist.radio.allow_mock_modem";
+
+    public MockModemPreferenceController(Context context) {
+        super(context);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return ALLOW_MOCK_MODEM_KEY;
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        final boolean isEnabled = (Boolean) newValue;
+        try {
+            SystemProperties.set(ALLOW_MOCK_MODEM_PROPERTY,
+                    isEnabled ? "true" : "false");
+        } catch (RuntimeException e) {
+            Log.e(TAG, "Fail to set radio system property: " + e.getMessage());
+        }
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        try {
+            final boolean isEnabled = SystemProperties.getBoolean(
+                    ALLOW_MOCK_MODEM_PROPERTY, false /* default */);
+            ((SwitchPreference) mPreference).setChecked(isEnabled);
+        } catch (RuntimeException e) {
+            Log.e(TAG, "Fail to get radio system property: " + e.getMessage());
+        }
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        super.onDeveloperOptionsSwitchDisabled();
+        try {
+            SystemProperties.set(ALLOW_MOCK_MODEM_PROPERTY, "false");
+            ((SwitchPreference) mPreference).setChecked(false);
+        } catch (RuntimeException e) {
+            Log.e(TAG, "Fail to set radio system property: " + e.getMessage());
+        }
+    }
+}
diff --git a/src/com/android/settings/development/NfcStackDebugLogPreferenceController.java b/src/com/android/settings/development/NfcStackDebugLogPreferenceController.java
new file mode 100644
index 0000000..a3cab25
--- /dev/null
+++ b/src/com/android/settings/development/NfcStackDebugLogPreferenceController.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development;
+
+import android.content.Context;
+import android.os.SystemProperties;
+import android.util.Log;
+
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.SwitchPreference;
+
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
+public class NfcStackDebugLogPreferenceController extends
+        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
+        PreferenceControllerMixin {
+
+    private static final String NFC_STACK_DEBUGLOG_ENABLED_KEY =
+            "nfc_stack_debuglog_enabled";
+    @VisibleForTesting
+    static final String NFC_STACK_DEBUGLOG_ENABLED_PROPERTY =
+            "persist.nfc.debug_enabled";
+
+    public NfcStackDebugLogPreferenceController(Context context) {
+        super(context);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return NFC_STACK_DEBUGLOG_ENABLED_KEY;
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        final boolean isEnabled = (Boolean) newValue;
+        try {
+            SystemProperties.set(NFC_STACK_DEBUGLOG_ENABLED_PROPERTY,
+                    isEnabled ? "true" : "false");
+        } catch (RuntimeException e) {
+            Log.e(TAG, "Fail to set nfc system property: " + e.getMessage());
+        }
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        try {
+            final boolean isEnabled = SystemProperties.getBoolean(
+                    NFC_STACK_DEBUGLOG_ENABLED_PROPERTY, false /* default */);
+            ((SwitchPreference) mPreference).setChecked(isEnabled);
+        } catch (RuntimeException e) {
+            Log.e(TAG, "Fail to get nfc system property: " + e.getMessage());
+        }
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        super.onDeveloperOptionsSwitchDisabled();
+        try {
+            SystemProperties.set(NFC_STACK_DEBUGLOG_ENABLED_PROPERTY, "false");
+            ((SwitchPreference) mPreference).setChecked(false);
+        } catch (RuntimeException e) {
+            Log.e(TAG, "Fail to set nfc system property: " + e.getMessage());
+        }
+    }
+}
diff --git a/src/com/android/settings/development/WirelessDebuggingFragment.java b/src/com/android/settings/development/WirelessDebuggingFragment.java
index 47d4e52..fecdbfa 100644
--- a/src/com/android/settings/development/WirelessDebuggingFragment.java
+++ b/src/com/android/settings/development/WirelessDebuggingFragment.java
@@ -24,6 +24,7 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.debug.AdbManager;
+import android.debug.FingerprintAndPairDevice;
 import android.debug.IAdbManager;
 import android.debug.PairDevice;
 import android.os.Build;
@@ -314,8 +315,12 @@
             mAdbManager = IAdbManager.Stub.asInterface(ServiceManager.getService(
                     Context.ADB_SERVICE));
             try {
-                Map<String, PairDevice> newList = mAdbManager.getPairedDevices();
-                updatePairedDevicePreferences(newList);
+                FingerprintAndPairDevice[] newList = mAdbManager.getPairedDevices();
+                Map<String, PairDevice> newMap = new HashMap<>();
+                for (FingerprintAndPairDevice pair : newList) {
+                    newMap.put(pair.keyFingerprint, pair.device);
+                }
+                updatePairedDevicePreferences(newMap);
                 mConnectionPort = mAdbManager.getAdbWirelessPort();
                 if (mConnectionPort > 0) {
                     Log.i(TAG, "onEnabled(): connect_port=" + mConnectionPort);
@@ -434,7 +439,7 @@
             case FORGET_ACTION:
                 try {
                     p = (PairDevice) data.getParcelableExtra(PAIRED_DEVICE_EXTRA);
-                    mAdbManager.unpairDevice(p.getGuid());
+                    mAdbManager.unpairDevice(p.guid);
                 } catch (RemoteException e) {
                     Log.e(TAG, "Unable to forget the device");
                 }
diff --git a/src/com/android/settings/development/bluetooth/AbstractBluetoothDialogPreferenceController.java b/src/com/android/settings/development/bluetooth/AbstractBluetoothDialogPreferenceController.java
index d66b8d8..62bcffb 100644
--- a/src/com/android/settings/development/bluetooth/AbstractBluetoothDialogPreferenceController.java
+++ b/src/com/android/settings/development/bluetooth/AbstractBluetoothDialogPreferenceController.java
@@ -30,6 +30,8 @@
 import com.android.settings.development.BluetoothA2dpConfigStore;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
+import java.util.List;
+
 /**
  * Abstract class for Bluetooth A2DP config dialog controller in developer option.
  */
@@ -82,7 +84,7 @@
         }
         writeConfigurationValues(index);
         final BluetoothCodecConfig codecConfig = mBluetoothA2dpConfigStore.createCodecConfig();
-        BluetoothDevice activeDevice = mBluetoothA2dp.getActiveDevice();
+        BluetoothDevice activeDevice = getA2dpActiveDevice();
         if (activeDevice != null) {
             bluetoothA2dp.setCodecConfigPreference(activeDevice, codecConfig);
         }
@@ -151,7 +153,7 @@
         if (bluetoothA2dp == null) {
             return null;
         }
-        BluetoothDevice activeDevice = bluetoothA2dp.getActiveDevice();
+        BluetoothDevice activeDevice = getA2dpActiveDevice();
         if (activeDevice == null) {
             Log.d(TAG, "Unable to get current codec config. No active device.");
             return null;
@@ -170,13 +172,13 @@
      *
      * @return Array of {@link BluetoothCodecConfig}.
      */
-    protected BluetoothCodecConfig[] getSelectableConfigs(BluetoothDevice device) {
+    protected List<BluetoothCodecConfig> getSelectableConfigs(BluetoothDevice device) {
         final BluetoothA2dp bluetoothA2dp = mBluetoothA2dp;
         if (bluetoothA2dp == null) {
             return null;
         }
         BluetoothDevice bluetoothDevice =
-                (device != null) ? device : bluetoothA2dp.getActiveDevice();
+                (device != null) ? device : getA2dpActiveDevice();
         if (bluetoothDevice == null) {
             return null;
         }
@@ -193,16 +195,12 @@
      * @return {@link BluetoothCodecConfig}.
      */
     protected BluetoothCodecConfig getSelectableByCodecType(int codecTypeValue) {
-        BluetoothDevice activeDevice = mBluetoothA2dp.getActiveDevice();
+        BluetoothDevice activeDevice = getA2dpActiveDevice();
         if (activeDevice == null) {
             Log.d(TAG, "Unable to get selectable config. No active device.");
             return null;
         }
-        final BluetoothCodecConfig[] configs = getSelectableConfigs(activeDevice);
-        if (configs == null) {
-            Log.d(TAG, "Unable to get selectable config. Selectable configs is empty.");
-            return null;
-        }
+        final List<BluetoothCodecConfig> configs = getSelectableConfigs(activeDevice);
         for (BluetoothCodecConfig config : configs) {
             if (config.getCodecType() == codecTypeValue) {
                 return config;
@@ -219,14 +217,20 @@
      */
     public void onHDAudioEnabled(boolean enabled) {}
 
-    static int getHighestCodec(BluetoothCodecConfig[] configs) {
+    static int getHighestCodec(BluetoothA2dp bluetoothA2dp, BluetoothDevice activeDevice,
+            List<BluetoothCodecConfig> configs) {
         if (configs == null) {
             Log.d(TAG, "Unable to get highest codec. Configs are empty");
             return BluetoothCodecConfig.SOURCE_CODEC_TYPE_INVALID;
         }
+        // If HD audio is not enabled, SBC is the only one available codec.
+        if (bluetoothA2dp.isOptionalCodecsEnabled(activeDevice)
+                != BluetoothA2dp.OPTIONAL_CODECS_PREF_ENABLED) {
+            return BluetoothCodecConfig.SOURCE_CODEC_TYPE_SBC;
+        }
         for (int i = 0; i < CODEC_TYPES.length; i++) {
-            for (int j = 0; j < configs.length; j++) {
-                if ((configs[j].getCodecType() == CODEC_TYPES[i])) {
+            for (BluetoothCodecConfig config : configs) {
+                if (config.getCodecType() == CODEC_TYPES[i]) {
                     return CODEC_TYPES[i];
                 }
             }
diff --git a/src/com/android/settings/development/bluetooth/AbstractBluetoothPreferenceController.java b/src/com/android/settings/development/bluetooth/AbstractBluetoothPreferenceController.java
index 6735115..d3fab67 100644
--- a/src/com/android/settings/development/bluetooth/AbstractBluetoothPreferenceController.java
+++ b/src/com/android/settings/development/bluetooth/AbstractBluetoothPreferenceController.java
@@ -17,8 +17,14 @@
 package com.android.settings.development.bluetooth;
 
 import android.bluetooth.BluetoothA2dp;
+import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothDevice;
+import android.bluetooth.BluetoothManager;
+import android.bluetooth.BluetoothProfile;
 import android.content.Context;
 
+import androidx.annotation.VisibleForTesting;
+
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.development.BluetoothA2dpConfigStore;
 import com.android.settings.development.BluetoothServiceConnectionListener;
@@ -27,6 +33,8 @@
 import com.android.settingslib.core.lifecycle.events.OnDestroy;
 import com.android.settingslib.development.DeveloperOptionsPreferenceController;
 
+import java.util.List;
+
 /**
  * Abstract class for Bluetooth A2DP config controller in developer option.
  */
@@ -36,12 +44,16 @@
 
     protected volatile BluetoothA2dp mBluetoothA2dp;
 
+    @VisibleForTesting
+    BluetoothAdapter mBluetoothAdapter;
+
     public AbstractBluetoothPreferenceController(Context context, Lifecycle lifecycle,
                                                  BluetoothA2dpConfigStore store) {
         super(context);
         if (lifecycle != null) {
             lifecycle.addObserver(this);
         }
+        mBluetoothAdapter = context.getSystemService(BluetoothManager.class).getAdapter();
     }
 
     @Override
@@ -82,4 +94,13 @@
          */
         void onBluetoothHDAudioEnabled(boolean enabled);
     }
+
+    protected BluetoothDevice getA2dpActiveDevice() {
+        if (mBluetoothAdapter == null) {
+            return null;
+        }
+        List<BluetoothDevice> activeDevices =
+                mBluetoothAdapter.getActiveDevices(BluetoothProfile.A2DP);
+        return (activeDevices.size() > 0) ? activeDevices.get(0) : null;
+    }
 }
diff --git a/src/com/android/settings/development/bluetooth/BluetoothCodecDialogPreferenceController.java b/src/com/android/settings/development/bluetooth/BluetoothCodecDialogPreferenceController.java
index 6b243c6..a65a1ba 100644
--- a/src/com/android/settings/development/bluetooth/BluetoothCodecDialogPreferenceController.java
+++ b/src/com/android/settings/development/bluetooth/BluetoothCodecDialogPreferenceController.java
@@ -69,7 +69,7 @@
         if (bluetoothA2dp == null) {
             return index;
         }
-        final BluetoothDevice activeDevice = bluetoothA2dp.getActiveDevice();
+        final BluetoothDevice activeDevice = getA2dpActiveDevice();
         if (activeDevice == null) {
             Log.d(TAG, "Unable to get selectable index. No Active Bluetooth device");
             return index;
@@ -77,7 +77,7 @@
         // Check HD audio is enabled, display the available list.
         if (bluetoothA2dp.isOptionalCodecsEnabled(activeDevice)
                 == BluetoothA2dp.OPTIONAL_CODECS_PREF_ENABLED) {
-            BluetoothCodecConfig[] configs = getSelectableConfigs(activeDevice);
+            List<BluetoothCodecConfig> configs = getSelectableConfigs(activeDevice);
             if (configs != null) {
                 return getIndexFromConfig(configs);
             }
@@ -93,8 +93,9 @@
         int codecPriorityValue = BluetoothCodecConfig.CODEC_PRIORITY_DEFAULT;
         switch (index) {
             case 0:
-                codecTypeValue = getHighestCodec(getSelectableConfigs(
-                    mBluetoothA2dp.getActiveDevice()));
+                final BluetoothDevice activeDevice = getA2dpActiveDevice();
+                codecTypeValue = getHighestCodec(mBluetoothA2dp, activeDevice,
+                        getSelectableConfigs(activeDevice));
                 codecPriorityValue = BluetoothCodecConfig.CODEC_PRIORITY_HIGHEST;
                 break;
             case 1:
@@ -147,10 +148,15 @@
         mCallback.onBluetoothCodecChanged();
     }
 
-    private List<Integer> getIndexFromConfig(BluetoothCodecConfig[] configs) {
+    @Override
+    public void onHDAudioEnabled(boolean enabled) {
+        writeConfigurationValues(/* index= */ 0);
+    }
+
+    private List<Integer> getIndexFromConfig(List<BluetoothCodecConfig> configs) {
         List<Integer> indexArray = new ArrayList<>();
-        for (int i = 0; i < configs.length; i++) {
-            indexArray.add(convertCfgToBtnIndex(configs[i].getCodecType()));
+        for (BluetoothCodecConfig config : configs) {
+            indexArray.add(convertCfgToBtnIndex(config.getCodecType()));
         }
         return indexArray;
     }
diff --git a/src/com/android/settings/development/bluetooth/BluetoothHDAudioPreferenceController.java b/src/com/android/settings/development/bluetooth/BluetoothHDAudioPreferenceController.java
index d4ca4e5..8092194 100644
--- a/src/com/android/settings/development/bluetooth/BluetoothHDAudioPreferenceController.java
+++ b/src/com/android/settings/development/bluetooth/BluetoothHDAudioPreferenceController.java
@@ -52,7 +52,7 @@
             mPreference.setEnabled(false);
             return;
         }
-        final BluetoothDevice activeDevice = bluetoothA2dp.getActiveDevice();
+        final BluetoothDevice activeDevice = getA2dpActiveDevice();
         if (activeDevice == null) {
             Log.e(TAG, "Active device is null. To disable HD audio button");
             mPreference.setEnabled(false);
@@ -84,7 +84,7 @@
         final int prefValue = enabled
                 ? BluetoothA2dp.OPTIONAL_CODECS_PREF_ENABLED
                 : BluetoothA2dp.OPTIONAL_CODECS_PREF_DISABLED;
-        BluetoothDevice activeDevice = bluetoothA2dp.getActiveDevice();
+        BluetoothDevice activeDevice = getA2dpActiveDevice();
         if (activeDevice == null) {
             mPreference.setEnabled(false);
             return true;
diff --git a/src/com/android/settings/development/compat/PlatformCompatDashboard.java b/src/com/android/settings/development/compat/PlatformCompatDashboard.java
index c617e17..f8cbf21 100644
--- a/src/com/android/settings/development/compat/PlatformCompatDashboard.java
+++ b/src/com/android/settings/development/compat/PlatformCompatDashboard.java
@@ -31,6 +31,7 @@
 import android.os.Bundle;
 import android.os.RemoteException;
 import android.os.ServiceManager;
+import android.text.TextUtils;
 import android.util.ArraySet;
 
 import androidx.annotation.VisibleForTesting;
@@ -66,6 +67,8 @@
 
     private AndroidBuildClassifier mAndroidBuildClassifier = new AndroidBuildClassifier();
 
+    private boolean mShouldStartAppPickerOnResume = true;
+
     @VisibleForTesting
     String mSelectedApp;
 
@@ -98,13 +101,67 @@
     }
 
     @Override
-    public void onActivityCreated(Bundle savedInstanceState) {
-        super.onActivityCreated(savedInstanceState);
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
         try {
             mChanges = getPlatformCompat().listUIChanges();
         } catch (RemoteException e) {
             throw new RuntimeException("Could not list changes!", e);
         }
+        if (icicle != null) {
+            mShouldStartAppPickerOnResume = false;
+            mSelectedApp = icicle.getString(COMPAT_APP);
+        }
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (requestCode == REQUEST_COMPAT_CHANGE_APP) {
+            mShouldStartAppPickerOnResume = false;
+            switch (resultCode) {
+                case Activity.RESULT_OK:
+                    mSelectedApp = data.getAction();
+                    break;
+                case Activity.RESULT_CANCELED:
+                    if (TextUtils.isEmpty(mSelectedApp)) {
+                        finish();
+                    }
+                    break;
+                case AppPicker.RESULT_NO_MATCHING_APPS:
+                    mSelectedApp = null;
+                    break;
+            }
+            return;
+        }
+        super.onActivityResult(requestCode, resultCode, data);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        if (isFinishingOrDestroyed()) {
+            return;
+        }
+        if (!mShouldStartAppPickerOnResume) {
+            if (TextUtils.isEmpty(mSelectedApp)) {
+                new AlertDialog.Builder(getContext())
+                        .setTitle(R.string.platform_compat_dialog_title_no_apps)
+                        .setMessage(R.string.platform_compat_dialog_text_no_apps)
+                        .setPositiveButton(R.string.okay, (dialog, which) -> finish())
+                        .setOnDismissListener(dialog -> finish())
+                        .setCancelable(false)
+                        .show();
+                return;
+            }
+            try {
+                final ApplicationInfo applicationInfo = getApplicationInfo();
+                addPreferences(applicationInfo);
+                return;
+            } catch (PackageManager.NameNotFoundException e) {
+                mShouldStartAppPickerOnResume = true;
+                mSelectedApp = null;
+            }
+        }
         startAppPicker();
     }
 
@@ -114,31 +171,6 @@
         outState.putString(COMPAT_APP, mSelectedApp);
     }
 
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        if (requestCode == REQUEST_COMPAT_CHANGE_APP) {
-            if (resultCode == Activity.RESULT_OK) {
-                mSelectedApp = data.getAction();
-                try {
-                    final ApplicationInfo applicationInfo = getApplicationInfo();
-                    addPreferences(applicationInfo);
-                } catch (PackageManager.NameNotFoundException e) {
-                    startAppPicker();
-                }
-            } else if (resultCode == AppPicker.RESULT_NO_MATCHING_APPS) {
-                new AlertDialog.Builder(getContext())
-                        .setTitle(R.string.platform_compat_dialog_title_no_apps)
-                        .setMessage(R.string.platform_compat_dialog_text_no_apps)
-                        .setPositiveButton(R.string.okay, (dialog, which) -> finish())
-                        .setOnDismissListener(dialog -> finish())
-                        .setCancelable(false)
-                        .show();
-            }
-            return;
-        }
-        super.onActivityResult(requestCode, resultCode, data);
-    }
-
     private void addPreferences(ApplicationInfo applicationInfo) {
         getPreferenceScreen().removeAll();
         getPreferenceScreen().addPreference(createAppPreference(applicationInfo));
diff --git a/src/com/android/settings/deviceinfo/MigrateEstimateTask.java b/src/com/android/settings/deviceinfo/MigrateEstimateTask.java
index 03e2b04..4b22412 100644
--- a/src/com/android/settings/deviceinfo/MigrateEstimateTask.java
+++ b/src/com/android/settings/deviceinfo/MigrateEstimateTask.java
@@ -21,7 +21,6 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.UserInfo;
-import android.net.TrafficStats;
 import android.os.AsyncTask;
 import android.os.UserHandle;
 import android.os.UserManager;
@@ -29,6 +28,7 @@
 import android.os.storage.VolumeInfo;
 import android.text.format.DateUtils;
 import android.text.format.Formatter;
+import android.util.DataUnit;
 import android.util.Log;
 
 import java.io.IOException;
@@ -42,7 +42,7 @@
     /**
      * Assume roughly a Class 10 card.
      */
-    private static final long SPEED_ESTIMATE_BPS = 10 * TrafficStats.MB_IN_BYTES;
+    private static final long SPEED_ESTIMATE_BPS = DataUnit.MEBIBYTES.toBytes(10);
 
     private final Context mContext;
 
diff --git a/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDetailPreferenceController.java b/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDetailPreferenceController.java
index d6cf442..880843e 100644
--- a/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDetailPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDetailPreferenceController.java
@@ -75,7 +75,7 @@
 
     @Override
     public CharSequence getSummary() {
-        return Build.VERSION.RELEASE_OR_CODENAME;
+        return Build.VERSION.RELEASE_OR_PREVIEW_DISPLAY;
     }
 
     @Override
diff --git a/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceController.java b/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceController.java
index eefa1f9..6cf02a0 100644
--- a/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceController.java
@@ -34,6 +34,6 @@
 
     @Override
     public CharSequence getSummary() {
-        return Build.VERSION.RELEASE_OR_CODENAME;
+        return Build.VERSION.RELEASE_OR_PREVIEW_DISPLAY;
     }
 }
diff --git a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
index 0fba6dc..2cf523f 100644
--- a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
+++ b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
@@ -637,7 +637,7 @@
                 final List<UiccCardInfo> infos = getTelephonyManager().getUiccCardsInfo();
 
                 for (UiccCardInfo info : infos) {
-                    if (info.getSlotIndex() == pSlotId) {
+                    if (info.getPhysicalSlotIndex() == pSlotId) {
                         if (info.isEuicc()) {
                             shouldHaveEid = true;
                             eid = info.getEid();
diff --git a/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java b/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java
index fd9ae8c..ee0c9e7 100644
--- a/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java
@@ -24,12 +24,12 @@
 import android.content.pm.PackageManager;
 import android.content.res.TypedArray;
 import android.graphics.drawable.Drawable;
-import android.net.TrafficStats;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.os.storage.VolumeInfo;
+import android.util.DataUnit;
 import android.util.Log;
 import android.util.SparseArray;
 import android.widget.Toast;
@@ -389,7 +389,8 @@
                 attributedSize -= otherData.duplicateCodeSize;
             }
 
-            final long systemSize = Math.max(TrafficStats.GB_IN_BYTES, mUsedBytes - attributedSize);
+            final long systemSize = Math.max(DataUnit.GIBIBYTES.toBytes(1),
+                    mUsedBytes - attributedSize);
             mSystemPreference.setStorageSize(systemSize, mTotalSize);
         }
 
diff --git a/src/com/android/settings/deviceinfo/storage/StorageUtils.java b/src/com/android/settings/deviceinfo/storage/StorageUtils.java
index 9b52fe8..22ad854 100644
--- a/src/com/android/settings/deviceinfo/storage/StorageUtils.java
+++ b/src/com/android/settings/deviceinfo/storage/StorageUtils.java
@@ -219,7 +219,7 @@
         public Dialog onCreateDialog(Bundle savedInstanceState) {
             return new AlertDialog.Builder(getActivity())
                     .setMessage(getContext().getString(R.string.storage_detail_dialog_system,
-                            Build.VERSION.RELEASE_OR_CODENAME))
+                            Build.VERSION.RELEASE_OR_PREVIEW_DISPLAY))
                     .setPositiveButton(android.R.string.ok, null)
                     .create();
         }
diff --git a/src/com/android/settings/dream/OWNERS b/src/com/android/settings/dream/OWNERS
new file mode 100644
index 0000000..56e1b39
--- /dev/null
+++ b/src/com/android/settings/dream/OWNERS
@@ -0,0 +1 @@
+lusilva@google.com
\ No newline at end of file
diff --git a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverScheduleSeekBarController.java b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverScheduleSeekBarController.java
index 52f52bc..173d946 100644
--- a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverScheduleSeekBarController.java
+++ b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverScheduleSeekBarController.java
@@ -55,7 +55,7 @@
     public BatterySaverScheduleSeekBarController(Context context) {
         mContext = context;
         mSeekBarPreference = new SeekBarPreference(context);
-        mSeekBarPreference.setLayoutResource(R.layout.battery_saver_schedule_percentage_seekbar);
+        mSeekBarPreference.setLayoutResource(R.layout.preference_widget_seekbar_settings);
         mSeekBarPreference.setIconSpaceReserved(false);
         mSeekBarPreference.setOnPreferenceChangeListener(this);
         mSeekBarPreference.setContinuousUpdates(true);
diff --git a/src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardController.java b/src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardController.java
index 25d1cda..e5bd449 100644
--- a/src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardController.java
+++ b/src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardController.java
@@ -54,8 +54,8 @@
     private boolean mIsExpanded;
 
     public ConditionContextualCardController(Context context) {
-        mContext = context;
-        mConditionManager = new ConditionManager(context.getApplicationContext(), this);
+        mContext = context.getApplicationContext();
+        mConditionManager = new ConditionManager(mContext, this);
         mConditionManager.startMonitoringStateChange();
     }
 
diff --git a/src/com/android/settings/localepicker/OWNERS b/src/com/android/settings/localepicker/OWNERS
new file mode 100644
index 0000000..12ab32f
--- /dev/null
+++ b/src/com/android/settings/localepicker/OWNERS
@@ -0,0 +1,7 @@
+allenwtsu@google.com

+calvinpan@google.com

+danielwbhuang@google.com

+goldmanj@google.com

+jamescflin@google.com

+joshhou@google.com

+tomhsu@google.com
\ No newline at end of file
diff --git a/src/com/android/settings/network/EnableMultiSimSidecar.java b/src/com/android/settings/network/EnableMultiSimSidecar.java
index 4a32433..aefd55f 100644
--- a/src/com/android/settings/network/EnableMultiSimSidecar.java
+++ b/src/com/android/settings/network/EnableMultiSimSidecar.java
@@ -24,6 +24,7 @@
 import android.provider.Settings;
 import android.telephony.CarrierConfigManager;
 import android.telephony.TelephonyManager;
+import android.telephony.UiccPortInfo;
 import android.telephony.UiccSlotInfo;
 import android.util.ArraySet;
 import android.util.Log;
@@ -62,23 +63,23 @@
                 @Override
                 public void onReceive(Context context, Intent intent) {
                     int readySimsCount = getReadySimsCount();
-                    int activeSlotsCount = getActiveSlotsCount();
-                    // If the number of ready SIM count and active slots equal to the number of SIMs
+                    int activePortsCount = getActivePortsCount();
+                    // If the number of ready SIM count and active ports equal to the number of SIMs
                     // need to be activated, the device is successfully switched to multiple active
                     // SIM mode.
-                    if (readySimsCount == mNumOfActiveSim && activeSlotsCount == mNumOfActiveSim) {
+                    if (readySimsCount == mNumOfActiveSim && activePortsCount == mNumOfActiveSim) {
                         Log.i(
                                 TAG,
-                                String.format("%d slots are active and ready.", mNumOfActiveSim));
+                                String.format("%d ports are active and ready.", mNumOfActiveSim));
                         mSimCardStateChangedLatch.countDown();
                         return;
                     }
                     Log.i(
                             TAG,
                             String.format(
-                                    "%d slots are active and %d SIMs are ready. Keep waiting until"
+                                    "%d ports are active and %d SIMs are ready. Keep waiting until"
                                             + " timeout.",
-                                    activeSlotsCount, readySimsCount));
+                                    activePortsCount, readySimsCount));
                 }
             };
 
@@ -162,19 +163,22 @@
         return readyCardsCount;
     }
 
-    // Get active slots count from {@code TelephonyManager#getUiccSlotsInfo}.
-    private int getActiveSlotsCount() {
+    // Get active port count from {@code TelephonyManager#getUiccSlotsInfo}.
+    private int getActivePortsCount() {
         UiccSlotInfo[] slotsInfo = mTelephonyManager.getUiccSlotsInfo();
         if (slotsInfo == null) {
             return 0;
         }
-        int activeSlots = 0;
+        int activePorts = 0;
         for (UiccSlotInfo slotInfo : slotsInfo) {
-            if (slotInfo != null && slotInfo.getIsActive()) {
-                activeSlots++;
+            for (UiccPortInfo portInfo : slotInfo.getPorts()) {
+                if (slotInfo != null && portInfo.isActive()) {
+                    activePorts++;
+                }
             }
+
         }
-        return activeSlots;
+        return activePorts;
     }
 
     /** Returns a list of active removable logical slot ids. */
@@ -185,8 +189,10 @@
         }
         Set<Integer> activeRemovableLogicalSlotIds = new ArraySet<>();
         for (UiccSlotInfo info : infos) {
-            if (info != null && info.getIsActive() && info.isRemovable()) {
-                activeRemovableLogicalSlotIds.add(info.getLogicalSlotIdx());
+            for (UiccPortInfo portInfo :info.getPorts()) {
+                if (info != null && portInfo.isActive() && info.isRemovable()) {
+                    activeRemovableLogicalSlotIds.add(portInfo.getLogicalSlotIndex());
+                }
             }
         }
         return activeRemovableLogicalSlotIds;
diff --git a/src/com/android/settings/network/EraseEuiccDataController.java b/src/com/android/settings/network/EraseEuiccDataController.java
index 7d71096..b1f964b 100644
--- a/src/com/android/settings/network/EraseEuiccDataController.java
+++ b/src/com/android/settings/network/EraseEuiccDataController.java
@@ -17,6 +17,7 @@
 package com.android.settings.network;
 
 import android.content.Context;
+import android.content.pm.PackageManager;
 import android.text.TextUtils;
 
 import androidx.preference.Preference;
@@ -50,6 +51,8 @@
 
     @Override
     public int getAvailabilityStatus() {
-        return AVAILABLE_UNSEARCHABLE;
+        return mContext.getPackageManager().hasSystemFeature(
+                PackageManager.FEATURE_TELEPHONY_EUICC) ? AVAILABLE_UNSEARCHABLE
+                : UNSUPPORTED_ON_DEVICE;
     }
 }
diff --git a/src/com/android/settings/network/EthernetTetherPreferenceController.java b/src/com/android/settings/network/EthernetTetherPreferenceController.java
index 06cd6a7..58c1fd2 100644
--- a/src/com/android/settings/network/EthernetTetherPreferenceController.java
+++ b/src/com/android/settings/network/EthernetTetherPreferenceController.java
@@ -21,53 +21,63 @@
 import android.net.TetheringManager;
 import android.os.Handler;
 import android.os.Looper;
-import android.text.TextUtils;
 
 import androidx.lifecycle.Lifecycle;
 import androidx.lifecycle.OnLifecycleEvent;
 
 import com.android.internal.annotations.VisibleForTesting;
 
+import java.util.HashSet;
+
 /**
  * This controller helps to manage the switch state and visibility of ethernet tether switch
  * preference.
  */
 public final class EthernetTetherPreferenceController extends TetherBasePreferenceController {
 
-    private final String mEthernetRegex;
+    private final HashSet<String> mAvailableInterfaces = new HashSet<>();
     private final EthernetManager mEthernetManager;
+
     @VisibleForTesting
-    EthernetManager.Listener mEthernetListener;
+    EthernetManager.InterfaceStateListener mEthernetListener;
 
     public EthernetTetherPreferenceController(Context context, String preferenceKey) {
         super(context, preferenceKey);
-        mEthernetRegex = context.getString(
-                com.android.internal.R.string.config_ethernet_iface_regex);
-        mEthernetManager = (EthernetManager) context.getSystemService(Context.ETHERNET_SERVICE);
+        mEthernetManager = context.getSystemService(EthernetManager.class);
     }
 
     @OnLifecycleEvent(Lifecycle.Event.ON_START)
     public void onStart() {
-        mEthernetListener = new EthernetManager.Listener() {
-            @Override
-            public void onAvailabilityChanged(String iface, boolean isAvailable) {
-                new Handler(Looper.getMainLooper()).post(() -> updateState(mPreference));
+        mEthernetListener = (iface, state, role, configuration) -> {
+            if (state == EthernetManager.STATE_LINK_UP) {
+                mAvailableInterfaces.add(iface);
+            } else {
+                mAvailableInterfaces.remove(iface);
             }
+            updateState(mPreference);
         };
-        mEthernetManager.addListener(mEthernetListener);
+        final Handler handler = new Handler(Looper.getMainLooper());
+        // Executor will execute to post the updateState event to a new handler which is created
+        // from the main looper when the {@link EthernetManager.Listener.onAvailabilityChanged}
+        // is triggerd.
+        if (mEthernetManager != null) {
+            mEthernetManager.addInterfaceStateListener(r -> handler.post(r), mEthernetListener);
+        }
     }
 
     @OnLifecycleEvent(Lifecycle.Event.ON_STOP)
     public void onStop() {
-        mEthernetManager.removeListener(mEthernetListener);
-        mEthernetListener = null;
+        if (mEthernetManager != null) {
+            mEthernetManager.removeInterfaceStateListener(mEthernetListener);
+        }
     }
 
     @Override
     public boolean shouldEnable() {
+        ensureRunningOnMainLoopThread();
         String[] available = mTm.getTetherableIfaces();
         for (String s : available) {
-            if (s.matches(mEthernetRegex)) {
+            if (mAvailableInterfaces.contains(s)) {
                 return true;
             }
         }
@@ -76,11 +86,19 @@
 
     @Override
     public boolean shouldShow() {
-        return !TextUtils.isEmpty(mEthernetRegex);
+        return mEthernetManager != null;
     }
 
     @Override
     public int getTetherType() {
         return TetheringManager.TETHERING_ETHERNET;
     }
+
+    private void ensureRunningOnMainLoopThread() {
+        if (Looper.getMainLooper().getThread() != Thread.currentThread()) {
+            throw new IllegalStateException(
+                    "Not running on main loop thread: "
+                            + Thread.currentThread().getName());
+        }
+    }
 }
diff --git a/src/com/android/settings/network/InternetResetHelper.java b/src/com/android/settings/network/InternetResetHelper.java
index d6c5476..253cf56 100644
--- a/src/com/android/settings/network/InternetResetHelper.java
+++ b/src/com/android/settings/network/InternetResetHelper.java
@@ -204,7 +204,7 @@
     protected void resumePreferences() {
         if (mIsRecoveryReady && mMobileNetworkController != null) {
             Log.d(TAG, "Resume the Mobile Network controller");
-            mMobileNetworkController.hidePreference(false /* hide */, false /* immediately */);
+            mMobileNetworkController.hidePreference(false /* hide */, true /* immediately */);
         }
         if (mIsWifiReady && mWifiTogglePreferences != null) {
             Log.d(TAG, "Resume the Wi-Fi preferences");
diff --git a/src/com/android/settings/network/NetworkProviderSettings.java b/src/com/android/settings/network/NetworkProviderSettings.java
index aedb299..c03238c 100644
--- a/src/com/android/settings/network/NetworkProviderSettings.java
+++ b/src/com/android/settings/network/NetworkProviderSettings.java
@@ -302,9 +302,8 @@
         mAddWifiNetworkPreference = new AddWifiNetworkPreference(getPrefContext());
         mDataUsagePreference = findPreference(PREF_KEY_DATA_USAGE);
         mDataUsagePreference.setVisible(DataUsageUtils.hasWifiRadio(getContext()));
-        mDataUsagePreference.setTemplate(
-                NetworkTemplate.buildTemplateWifi(NetworkTemplate.WIFI_NETWORKID_ALL,
-                null /* subscriberId */), 0 /*subId*/, null /*service*/);
+        mDataUsagePreference.setTemplate(new NetworkTemplate.Builder(NetworkTemplate.MATCH_WIFI)
+                        .build(), 0 /*subId*/, null /*service*/);
         mResetInternetPreference = findPreference(PREF_KEY_RESET_INTERNET);
         if (mResetInternetPreference != null) {
             mResetInternetPreference.setVisible(false);
diff --git a/src/com/android/settings/network/PrivateDnsModeDialogPreference.java b/src/com/android/settings/network/PrivateDnsModeDialogPreference.java
index 1c3fc76..442af38 100644
--- a/src/com/android/settings/network/PrivateDnsModeDialogPreference.java
+++ b/src/com/android/settings/network/PrivateDnsModeDialogPreference.java
@@ -189,6 +189,8 @@
         if (linkInfo.isActionable()) {
             helpTextView.setText(AnnotationSpan.linkify(
                     context.getText(R.string.private_dns_help_message), linkInfo));
+        } else {
+            helpTextView.setText("");
         }
     }
 
diff --git a/src/com/android/settings/network/SubscriptionUtil.java b/src/com/android/settings/network/SubscriptionUtil.java
index 2d60778..c77a294 100644
--- a/src/com/android/settings/network/SubscriptionUtil.java
+++ b/src/com/android/settings/network/SubscriptionUtil.java
@@ -87,8 +87,8 @@
         if (slotInfo == null)  {
             return false;
         }
-        return !slotInfo.getIsEuicc() && !slotInfo.getIsActive() &&
-                slotInfo.getCardStateInfo() == CARD_STATE_INFO_PRESENT;
+        return !slotInfo.getIsEuicc() && !slotInfo.getPorts().stream().findFirst().get()
+                .isActive() && slotInfo.getCardStateInfo() == CARD_STATE_INFO_PRESENT;
     }
 
     /**
@@ -179,7 +179,8 @@
             // verify if subscription is inserted within slot
             for (UiccSlotInfo slotInfo : slotsInfo) {
                 if ((slotInfo != null) && (!slotInfo.getIsEuicc())
-                        && (slotInfo.getLogicalSlotIdx() == subInfo.getSimSlotIndex())) {
+                        && (slotInfo.getPorts().stream().findFirst().get().getLogicalSlotIndex()
+                        == subInfo.getSimSlotIndex())) {
                     return true;
                 }
             }
@@ -576,7 +577,7 @@
             if (!cardInfo.isRemovable()
                     || cardInfo.getCardId() == TelephonyManager.UNSUPPORTED_CARD_ID) {
                 Log.i(TAG, "Skip embedded card or invalid cardId on slot: "
-                        + cardInfo.getSlotIndex());
+                        + cardInfo.getPhysicalSlotIndex());
                 continue;
             }
             Log.i(TAG, "Target removable cardId :" + cardInfo.getCardId());
diff --git a/src/com/android/settings/network/SwitchSlotSidecar.java b/src/com/android/settings/network/SwitchSlotSidecar.java
index cffb23f..abf8842 100644
--- a/src/com/android/settings/network/SwitchSlotSidecar.java
+++ b/src/com/android/settings/network/SwitchSlotSidecar.java
@@ -19,6 +19,7 @@
 import android.annotation.IntDef;
 import android.app.FragmentManager;
 import android.os.Bundle;
+import android.telephony.SubscriptionInfo;
 import android.util.Log;
 
 import com.android.settings.AsyncTaskSidecar;
@@ -41,11 +42,14 @@
     })
     private @interface Command {
         int SWITCH_TO_REMOVABLE_SIM = 0;
+        int SWITCH_TO_EUICC_SIM = 1;
     }
 
     static class Param {
         @Command int command;
         int slotId;
+        int port;
+        SubscriptionInfo removedSubInfo;
     }
 
     static class Result {
@@ -65,13 +69,24 @@
     }
 
     /** Starts switching to the removable slot. */
-    public void runSwitchToRemovableSlot(int id) {
+    public void runSwitchToRemovableSlot(int id, SubscriptionInfo removedSubInfo) {
         Param param = new Param();
         param.command = Command.SWITCH_TO_REMOVABLE_SIM;
         param.slotId = id;
+        param.removedSubInfo = removedSubInfo;
+        param.port = 0;
         super.run(param);
     }
 
+    /** Starts switching to the removable slot. */
+    public void runSwitchToEuiccSlot(int id, int port, SubscriptionInfo removedSubInfo) {
+        Param param = new Param();
+        param.command = Command.SWITCH_TO_EUICC_SIM;
+        param.slotId = id;
+        param.removedSubInfo = removedSubInfo;
+        param.port = port;
+        super.run(param);
+    }
     /**
      * Returns the exception thrown during the execution of a command. Will be null in any state
      * other than {@link State#SUCCESS}, and may be null in that state if there was not an error.
@@ -91,7 +106,14 @@
         try {
             switch (param.command) {
                 case Command.SWITCH_TO_REMOVABLE_SIM:
-                    UiccSlotUtil.switchToRemovableSlot(param.slotId, getContext());
+                    Log.i(TAG, "Start to switch to removable slot.");
+                    UiccSlotUtil.switchToRemovableSlot(getContext(), param.slotId,
+                            param.removedSubInfo);
+                    break;
+                case Command.SWITCH_TO_EUICC_SIM:
+                    Log.i(TAG, "Start to switch to euicc slot.");
+                    UiccSlotUtil.switchToEuiccSlot(getContext(), param.slotId, param.port,
+                            param.removedSubInfo);
                     break;
                 default:
                     Log.e(TAG, "Wrong command.");
diff --git a/src/com/android/settings/network/SwitchToEuiccSubscriptionSidecar.java b/src/com/android/settings/network/SwitchToEuiccSubscriptionSidecar.java
index 6e6142f..888e5b2 100644
--- a/src/com/android/settings/network/SwitchToEuiccSubscriptionSidecar.java
+++ b/src/com/android/settings/network/SwitchToEuiccSubscriptionSidecar.java
@@ -18,17 +18,32 @@
 
 import android.app.FragmentManager;
 import android.app.PendingIntent;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
+import android.telephony.UiccCardInfo;
+import android.telephony.UiccSlotMapping;
+import android.telephony.euicc.EuiccManager;
+import android.util.Log;
 
 import com.android.settings.SidecarFragment;
 import com.android.settings.network.telephony.EuiccOperationSidecar;
 
+import java.util.Collection;
+import java.util.List;
+import java.util.stream.Collectors;
+
 /** 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 TAG = "SwitchToEuiccSidecar";
     private static final String ACTION_SWITCH_TO_SUBSCRIPTION =
             "com.android.settings.network.SWITCH_TO_SUBSCRIPTION";
+    private static final int ESIM_SLOT_ID = 1;
 
     private PendingIntent mCallbackIntent;
+    private int mSubId;
+    private int mPort;
+    private SubscriptionInfo mRemovedSubInfo;
+    private boolean mIsDuringSimSlotMapping;
 
     /** Returns a SwitchToEuiccSubscriptionSidecar sidecar instance. */
     public static SwitchToEuiccSubscriptionSidecar get(FragmentManager fm) {
@@ -46,10 +61,130 @@
         return mCallbackIntent;
     }
 
+    @Override
+    public void onStateChange(SidecarFragment fragment) {
+        if (fragment == mSwitchSlotSidecar) {
+            onSwitchSlotSidecarStateChange();
+        } else {
+            Log.wtf(TAG, "Received state change from a sidecar not expected.");
+        }
+    }
+
     /** Starts calling EuiccManager#switchToSubscription to enable/disable the eSIM profile. */
+    // ToDo: delete this api and refactor the related code.
     public void run(int subscriptionId) {
         setState(State.RUNNING, Substate.UNUSED);
         mCallbackIntent = createCallbackIntent();
         mEuiccManager.switchToSubscription(subscriptionId, mCallbackIntent);
     }
+
+    /**
+     * Starts calling EuiccManager#switchToSubscription to enable/disable the eSIM profile.
+     *
+     * @param subscriptionId the esim's subscriptionId.
+     * @param port the esim's portId. If user wants to inactivate esim, then user must to assign the
+     *             the port. If user wants to activate esim, then the port can be -1.
+     * @param removedSubInfo if the all of slots have sims, it should remove the one of active sim.
+     *                       If the removedSubInfo is null, then use the default value.
+     *                       The default value is the esim slot and portId 0.
+     */
+    public void run(int subscriptionId, int port, SubscriptionInfo removedSubInfo) {
+        setState(State.RUNNING, Substate.UNUSED);
+        mCallbackIntent = createCallbackIntent();
+        mSubId = subscriptionId;
+        // To check whether the esim slot's port is active. If yes, skip setSlotMapping. If no,
+        // set this slot+port into setSimSlotMapping.
+        mPort = (port < 0) ? getTargetPortId(removedSubInfo) : port;
+        mRemovedSubInfo = removedSubInfo;
+        Log.i(TAG, "The SubId is " + mSubId + ". The port is " + mPort);
+
+        if (mTelephonyManager.isMultiSimEnabled() && removedSubInfo != null
+                && removedSubInfo.isEmbedded()) {
+            // In DSDS mode+MEP, if the replaced esim is active, then it should be disabled esim
+            // profile before changing SimSlotMapping process.
+            // Use INVALID_SUBSCRIPTION_ID to disable the esim profile.
+            // The SimSlotMapping is ready, then to execute activate/inactivate esim.
+            mIsDuringSimSlotMapping = true;
+            mEuiccManager.switchToSubscription(SubscriptionManager.INVALID_SUBSCRIPTION_ID, mPort,
+                    mCallbackIntent);
+        } else {
+            mSwitchSlotSidecar.runSwitchToEuiccSlot(getTargetSlot(), mPort, removedSubInfo);
+        }
+    }
+
+    private int getTargetPortId(SubscriptionInfo removedSubInfo) {
+        if (!mTelephonyManager.isMultiSimEnabled() || !isMultipleEnabledProfilesSupported()) {
+            // In the 'SS mode' or 'DSDS+no MEP', the port is 0.
+            return 0;
+        }
+
+        // In the 'DSDS+MEP', if the removedSubInfo is esim, then the port is
+        // removedSubInfo's port.
+        if (removedSubInfo != null && removedSubInfo.isEmbedded()) {
+            return removedSubInfo.getPortIndex();
+        }
+
+        // In DSDS+MEP mode, the removedSubInfo is psim or is null, it means the this esim need
+        // another port in the esim slot.
+        // To find another esim's port and value is from 0;
+        int port = 0;
+        Collection<UiccSlotMapping> uiccSlotMappings = mTelephonyManager.getSimSlotMapping();
+        for (UiccSlotMapping uiccSlotMapping :
+                uiccSlotMappings.stream()
+                        .filter(
+                                uiccSlotMapping -> uiccSlotMapping.getPhysicalSlotIndex()
+                                        == getTargetSlot())
+                        .collect(Collectors.toList())) {
+            if (uiccSlotMapping.getPortIndex() == port) {
+                port++;
+            }
+        }
+        return port;
+    }
+
+    private int getTargetSlot() {
+        return ESIM_SLOT_ID;
+    }
+
+    private void onSwitchSlotSidecarStateChange() {
+        switch (mSwitchSlotSidecar.getState()) {
+            case State.SUCCESS:
+                mSwitchSlotSidecar.reset();
+                Log.i(TAG, "Successfully SimSlotMapping. Start to enable/disable esim");
+                switchToSubscription();
+                break;
+            case State.ERROR:
+                mSwitchSlotSidecar.reset();
+                Log.i(TAG, "Failed to set SimSlotMapping");
+                setState(State.ERROR, Substate.UNUSED);
+                break;
+        }
+    }
+
+    private boolean isMultipleEnabledProfilesSupported() {
+        List<UiccCardInfo> cardInfos = mTelephonyManager.getUiccCardsInfo();
+        if (cardInfos == null) {
+            Log.w(TAG, "UICC cards info list is empty.");
+            return false;
+        }
+        return cardInfos.stream().anyMatch(
+                cardInfo -> cardInfo.isMultipleEnabledProfilesSupported());
+    }
+
+    private void switchToSubscription() {
+        // The SimSlotMapping is ready, then to execute activate/inactivate esim.
+        mEuiccManager.switchToSubscription(mSubId, mPort, mCallbackIntent);
+    }
+
+    @Override
+    protected void onActionReceived() {
+        if (getResultCode() == EuiccManager.EMBEDDED_SUBSCRIPTION_RESULT_OK
+                && mIsDuringSimSlotMapping) {
+            // Continue to switch the SimSlotMapping, after the esim is disabled.
+            mIsDuringSimSlotMapping = false;
+            mSwitchSlotSidecar.runSwitchToEuiccSlot(getTargetSlot(), mPort, mRemovedSubInfo);
+        } else {
+            super.onActionReceived();
+        }
+    }
 }
diff --git a/src/com/android/settings/network/SwitchToRemovableSlotSidecar.java b/src/com/android/settings/network/SwitchToRemovableSlotSidecar.java
index 132a2fd..9b9c0dd 100644
--- a/src/com/android/settings/network/SwitchToRemovableSlotSidecar.java
+++ b/src/com/android/settings/network/SwitchToRemovableSlotSidecar.java
@@ -31,15 +31,14 @@
  */
 public class SwitchToRemovableSlotSidecar extends EuiccOperationSidecar
         implements SidecarFragment.Listener {
-
-    private static final String TAG = "DisableSubscriptionAndSwitchSlotSidecar";
+    private static final String TAG = "SwitchRemovableSidecar";
     private static final String ACTION_DISABLE_SUBSCRIPTION_AND_SWITCH_SLOT =
             "disable_subscription_and_switch_slot_sidecar";
 
     // Stateless members.
     private SwitchToEuiccSubscriptionSidecar mSwitchToSubscriptionSidecar;
-    private SwitchSlotSidecar mSwitchSlotSidecar;
     private int mPhysicalSlotId;
+    private SubscriptionInfo mRemovedSubInfo;
 
     /** Returns a SwitchToRemovableSlotSidecar sidecar instance. */
     public static SwitchToRemovableSlotSidecar get(FragmentManager fm) {
@@ -51,20 +50,17 @@
         super.onCreate(savedInstanceState);
         mSwitchToSubscriptionSidecar =
                 SwitchToEuiccSubscriptionSidecar.get(getChildFragmentManager());
-        mSwitchSlotSidecar = SwitchSlotSidecar.get(getChildFragmentManager());
     }
 
     @Override
     public void onResume() {
         super.onResume();
         mSwitchToSubscriptionSidecar.addListener(this);
-        mSwitchSlotSidecar.addListener(this);
     }
 
     @Override
     public void onPause() {
         mSwitchToSubscriptionSidecar.removeListener(this);
-        mSwitchSlotSidecar.removeListener(this);
         super.onPause();
     }
 
@@ -90,18 +86,52 @@
      *
      * @param physicalSlotId removable physical SIM slot ID.
      */
+    // ToDo: delete this api and refactor the related code.
     public void run(int physicalSlotId) {
         mPhysicalSlotId = physicalSlotId;
         SubscriptionManager subscriptionManager =
                 getContext().getSystemService(SubscriptionManager.class);
         if (SubscriptionUtil.getActiveSubscriptions(subscriptionManager).stream()
                 .anyMatch(SubscriptionInfo::isEmbedded)) {
+            // In SS mode, the esim is active, then inactivate the esim.
             Log.i(TAG, "There is an active eSIM profile. Disable the profile first.");
             // Use INVALID_SUBSCRIPTION_ID to disable the only active profile.
-            mSwitchToSubscriptionSidecar.run(SubscriptionManager.INVALID_SUBSCRIPTION_ID);
+            mSwitchToSubscriptionSidecar.run(SubscriptionManager.INVALID_SUBSCRIPTION_ID, 0, null);
         } else {
             Log.i(TAG, "There is no active eSIM profiles. Start to switch to removable slot.");
-            mSwitchSlotSidecar.runSwitchToRemovableSlot(mPhysicalSlotId);
+            mSwitchSlotSidecar.runSwitchToRemovableSlot(mPhysicalSlotId, null);
+        }
+    }
+
+    /**
+     * Starts switching to the removable slot.
+     *
+     * @param physicalSlotId removable physical SIM slot ID.
+     * @param removedSubInfo if the all of slots have sims, it should remove the one of active sim.
+     *                       If the removedSubInfo is null, then use the default value.
+     *                       The default value is the removable physical SIM slot and portId 0.
+     */
+    public void run(int physicalSlotId, SubscriptionInfo removedSubInfo) {
+        mPhysicalSlotId = physicalSlotId;
+        mRemovedSubInfo = removedSubInfo;
+        SubscriptionManager subscriptionManager =
+                getContext().getSystemService(SubscriptionManager.class);
+        if (!mTelephonyManager.isMultiSimEnabled()
+                && SubscriptionUtil.getActiveSubscriptions(subscriptionManager).stream().anyMatch(
+                SubscriptionInfo::isEmbedded)) {
+            // In SS mode, the esim is active, then inactivate the esim.
+            Log.i(TAG, "There is an active eSIM profile. Disable the profile first.");
+            // Use INVALID_SUBSCRIPTION_ID to disable the only active profile.
+            mSwitchToSubscriptionSidecar.run(SubscriptionManager.INVALID_SUBSCRIPTION_ID, 0, null);
+        } else if (mTelephonyManager.isMultiSimEnabled() && mRemovedSubInfo != null) {
+            // In DSDS mode+MEP, if the replaced esim is active, then it should be disabled esim
+            // profile before changing SimSlotMapping process.
+            // Use INVALID_SUBSCRIPTION_ID to disable the esim profile.
+            mSwitchToSubscriptionSidecar.run(SubscriptionManager.INVALID_SUBSCRIPTION_ID,
+                    mRemovedSubInfo.getPortIndex(), null);
+        } else {
+            Log.i(TAG, "Start to switch to removable slot.");
+            mSwitchSlotSidecar.runSwitchToRemovableSlot(mPhysicalSlotId, mRemovedSubInfo);
         }
     }
 
@@ -109,10 +139,9 @@
         switch (mSwitchToSubscriptionSidecar.getState()) {
             case State.SUCCESS:
                 mSwitchToSubscriptionSidecar.reset();
-                Log.i(
-                        TAG,
+                Log.i(TAG,
                         "Successfully disabled eSIM profile. Start to switch to Removable slot.");
-                mSwitchSlotSidecar.runSwitchToRemovableSlot(mPhysicalSlotId);
+                mSwitchSlotSidecar.runSwitchToRemovableSlot(mPhysicalSlotId, mRemovedSubInfo);
                 break;
             case State.ERROR:
                 mSwitchToSubscriptionSidecar.reset();
diff --git a/src/com/android/settings/network/TetherProvisioningCarrierDialogActivity.java b/src/com/android/settings/network/TetherProvisioningCarrierDialogActivity.java
new file mode 100644
index 0000000..2506229
--- /dev/null
+++ b/src/com/android/settings/network/TetherProvisioningCarrierDialogActivity.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2022 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.Activity;
+import android.app.AlertDialog;
+import android.content.DialogInterface;
+import android.os.Bundle;
+
+import com.android.settings.R;
+
+/**
+ * To show a dialog to indicate tethering is unsupported by carrier.
+ */
+public class TetherProvisioningCarrierDialogActivity extends Activity {
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        new AlertDialog.Builder(this)
+                .setTitle(R.string.wifi_tether_carrier_unsupport_dialog_title)
+                .setMessage(R.string.wifi_tether_carrier_unsupport_dialog_content)
+                .setCancelable(false)
+                .setPositiveButton(android.R.string.yes, new DialogInterface.OnClickListener() {
+                    public void onClick(DialogInterface dialog, int which) {
+                        dialog.cancel();
+                        finish();
+                    }
+                })
+                .show();
+    }
+}
+
diff --git a/src/com/android/settings/network/UiccSlotUtil.java b/src/com/android/settings/network/UiccSlotUtil.java
index 6113f5a..8938cdb 100644
--- a/src/com/android/settings/network/UiccSlotUtil.java
+++ b/src/com/android/settings/network/UiccSlotUtil.java
@@ -19,8 +19,10 @@
 import android.annotation.IntDef;
 import android.content.Context;
 import android.provider.Settings;
+import android.telephony.SubscriptionInfo;
 import android.telephony.TelephonyManager;
 import android.telephony.UiccSlotInfo;
+import android.telephony.UiccSlotMapping;
 import android.util.Log;
 
 import com.android.settingslib.utils.ThreadUtils;
@@ -29,17 +31,21 @@
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
+import java.util.ArrayList;
+import java.util.Collection;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 
+// ToDo: to do the refactor for renaming
 public class UiccSlotUtil {
 
     private static final String TAG = "UiccSlotUtil";
 
     private static final long DEFAULT_WAIT_AFTER_SWITCH_TIMEOUT_MILLIS = 25 * 1000L;
-    ;
 
     public static final int INVALID_PHYSICAL_SLOT_ID = -1;
+    public static final int INVALID_PORT_ID = -1;
 
     /**
      * Mode for switching to eSIM slot which decides whether there is cleanup process, e.g.
@@ -47,9 +53,9 @@
      */
     @Retention(RetentionPolicy.SOURCE)
     @IntDef({
-        SwitchingEsimMode.NO_CLEANUP,
-        SwitchingEsimMode.ASYNC_CLEANUP,
-        SwitchingEsimMode.SYNC_CLEANUP
+            SwitchingEsimMode.NO_CLEANUP,
+            SwitchingEsimMode.ASYNC_CLEANUP,
+            SwitchingEsimMode.SYNC_CLEANUP
     })
     public @interface SwitchingEsimMode {
         /** No cleanup process after switching to eSIM slot */
@@ -76,44 +82,108 @@
      * Switches to the removable slot. It waits for SIM_STATE_LOADED after switch. If slotId is
      * INVALID_PHYSICAL_SLOT_ID, the method will use the first detected inactive removable slot.
      *
-     * @param slotId the physical removable slot id.
+     * @param slotId  the physical removable slot id.
      * @param context the application context.
      * @throws UiccSlotsException if there is an error.
      */
+    //ToDo: delete this api and refactor the related code.
     public static synchronized void switchToRemovableSlot(int slotId, Context context)
             throws UiccSlotsException {
+        switchToRemovableSlot(context, slotId, null);
+    }
+
+    /**
+     * Switches to the removable slot. It waits for SIM_STATE_LOADED after switch. If slotId is
+     * INVALID_PHYSICAL_SLOT_ID, the method will use the first detected inactive removable slot.
+     *
+     * @param slotId  the physical removable slot id.
+     * @param context the application context.
+     * @param removedSubInfo In the DSDS+MEP mode, if the all of slots have sims, it should
+     *                        remove the one of active sim.
+     *                       If the removedSubInfo is null, then use the default value.
+     *                       The default value is the esim slot and portId 0.
+     * @throws UiccSlotsException if there is an error.
+     */
+    public static synchronized void switchToRemovableSlot(Context context, int slotId,
+            SubscriptionInfo removedSubInfo) throws UiccSlotsException {
         if (ThreadUtils.isMainThread()) {
             throw new IllegalThreadStateException(
                     "Do not call switchToRemovableSlot on the main thread.");
         }
         TelephonyManager telMgr = context.getSystemService(TelephonyManager.class);
-        if (telMgr.isMultiSimEnabled()) {
-            // If this device supports multiple active slots, don't mess with TelephonyManager.
-            Log.i(TAG, "Multiple active slots supported. Not calling switchSlots.");
-            return;
-        }
-        UiccSlotInfo[] slots = telMgr.getUiccSlotsInfo();
-        if (slotId == INVALID_PHYSICAL_SLOT_ID) {
-            for (int i = 0; i < slots.length; i++) {
-                if (slots[i].isRemovable()
-                        && !slots[i].getIsActive()
-                        && slots[i].getCardStateInfo() != UiccSlotInfo.CARD_STATE_INFO_ERROR
-                        && slots[i].getCardStateInfo() != UiccSlotInfo.CARD_STATE_INFO_RESTRICTED) {
-                    performSwitchToRemovableSlot(i, context);
-                    return;
-                }
-            }
-        } else {
-            if (slotId >= slots.length || !slots[slotId].isRemovable()) {
-                throw new UiccSlotsException("The given slotId is not a removable slot: " + slotId);
-            }
-            if (!slots[slotId].getIsActive()) {
-                performSwitchToRemovableSlot(slotId, context);
-            }
-        }
+        int inactiveRemovableSlot = getInactiveRemovableSlot(telMgr.getUiccSlotsInfo(), slotId);
+        performSwitchToSlot(telMgr,
+                prepareUiccSlotMappingsForRemovableSlot(telMgr.getSimSlotMapping(),
+                        inactiveRemovableSlot, removedSubInfo, telMgr.isMultiSimEnabled()),
+                context);
     }
 
-    private static void performSwitchToRemovableSlot(int slotId, Context context)
+    /**
+     * Switches to the Euicc slot. It waits for SIM_STATE_LOADED after switch.
+     *
+     * @param context the application context.
+     * @param slotId the Euicc slot id.
+     * @param port the Euicc slot port id.
+     * @param removedSubInfo In the DSDS+MEP mode, if the all of slots have sims, it should
+     *                       remove the one of active sim.
+     *                       If the removedSubInfo is null, then it uses the default value.
+     *                       The default value is the esim slot and portId 0.
+     * @throws UiccSlotsException if there is an error.
+     */
+    public static synchronized void switchToEuiccSlot(Context context, int slotId, int port,
+            SubscriptionInfo removedSubInfo) throws UiccSlotsException {
+        if (ThreadUtils.isMainThread()) {
+            throw new IllegalThreadStateException(
+                    "Do not call switchToRemovableSlot on the main thread.");
+        }
+        TelephonyManager telMgr = context.getSystemService(TelephonyManager.class);
+        Collection<UiccSlotMapping> uiccSlotMappings = telMgr.getSimSlotMapping();
+        Log.i(TAG, "The SimSlotMapping: " + uiccSlotMappings);
+
+        if (isTargetSlotActive(uiccSlotMappings, slotId, port)) {
+            Log.i(TAG, "The slot is active, then the sim can enable directly.");
+            return;
+        }
+
+        Collection<UiccSlotMapping> newUiccSlotMappings = new ArrayList<>();
+        if (!telMgr.isMultiSimEnabled()) {
+            // In the 'SS mode', the port is 0.
+            newUiccSlotMappings.add(new UiccSlotMapping(port, slotId, 0));
+        } else {
+            // DSDS+MEP
+            // The target slot+port is not active, but the all of logical slots are full. It
+            // needs to replace one of logical slots.
+            int removedSlot =
+                    (removedSubInfo != null) ? removedSubInfo.getSimSlotIndex() : slotId;
+            int removedPort = (removedSubInfo != null) ? removedSubInfo.getPortIndex() : 0;
+            Log.i(TAG,
+                    String.format("Start to set SimSlotMapping from slot%d-port%d to slot%d-port%d",
+                            slotId, port, removedSlot, removedPort));
+            newUiccSlotMappings =
+                    uiccSlotMappings.stream().map(uiccSlotMapping -> {
+                        if (uiccSlotMapping.getPhysicalSlotIndex() == removedSlot
+                                && uiccSlotMapping.getPortIndex() == removedPort) {
+                            return new UiccSlotMapping(port, slotId,
+                                    uiccSlotMapping.getLogicalSlotIndex());
+                        }
+                        return uiccSlotMapping;
+                    }).collect(Collectors.toList());
+        }
+
+        Log.i(TAG, "The SimSlotMapping: " + newUiccSlotMappings);
+        performSwitchToSlot(telMgr, newUiccSlotMappings, context);
+    }
+
+    private static boolean isTargetSlotActive(Collection<UiccSlotMapping> uiccSlotMappings,
+            int slotId, int port) {
+        return uiccSlotMappings.stream()
+                .anyMatch(
+                        uiccSlotMapping -> uiccSlotMapping.getPhysicalSlotIndex() == slotId
+                                && uiccSlotMapping.getPortIndex() == port);
+    }
+
+    private static void performSwitchToSlot(TelephonyManager telMgr,
+            Collection<UiccSlotMapping> uiccSlotMappings, Context context)
             throws UiccSlotsException {
         CarrierConfigChangedReceiver receiver = null;
         long waitingTimeMillis =
@@ -125,7 +195,7 @@
             CountDownLatch latch = new CountDownLatch(1);
             receiver = new CarrierConfigChangedReceiver(latch);
             receiver.registerOn(context);
-            switchSlots(context, slotId);
+            telMgr.setSimSlotMapping(uiccSlotMappings);
             latch.await(waitingTimeMillis, TimeUnit.MILLISECONDS);
         } catch (InterruptedException e) {
             Thread.currentThread().interrupt();
@@ -138,22 +208,80 @@
     }
 
     /**
-     * Changes the logical slot to physical slot mapping. OEM should override this to provide
-     * device-specific implementation if the device supports switching slots.
-     *
-     * @param context the application context.
-     * @param physicalSlots List of physical slot ids in the order of logical slots.
+     * @param slots  The UiccSlotInfo list.
+     * @param slotId The physical removable slot id.
+     * @return The inactive physical removable slot id. If the physical removable slot id is
+     * active, then return -1.
+     * @throws UiccSlotsException if there is an error.
      */
-    private static void switchSlots(Context context, int... physicalSlots)
+    private static int getInactiveRemovableSlot(UiccSlotInfo[] slots, int slotId)
             throws UiccSlotsException {
-        TelephonyManager telMgr = context.getSystemService(TelephonyManager.class);
-        if (telMgr.isMultiSimEnabled()) {
-            // If this device supports multiple active slots, don't mess with TelephonyManager.
-            Log.i(TAG, "Multiple active slots supported. Not calling switchSlots.");
-            return;
+        if (slots == null) {
+            throw new UiccSlotsException("UiccSlotInfo is null");
         }
-        if (!telMgr.switchSlots(physicalSlots)) {
-            throw new UiccSlotsException("Failed to switch slots");
+        if (slotId == INVALID_PHYSICAL_SLOT_ID) {
+            for (int i = 0; i < slots.length; i++) {
+                if (slots[i].isRemovable()
+                        && !slots[i].getPorts().stream().findFirst().get().isActive()
+                        && slots[i].getCardStateInfo() != UiccSlotInfo.CARD_STATE_INFO_ERROR
+                        && slots[i].getCardStateInfo() != UiccSlotInfo.CARD_STATE_INFO_RESTRICTED) {
+                    return i;
+                }
+            }
+        } else {
+            if (slotId >= slots.length || !slots[slotId].isRemovable()) {
+                throw new UiccSlotsException("The given slotId is not a removable slot: " + slotId);
+            }
+            if (!slots[slotId].getPorts().stream().findFirst().get().isActive()) {
+                return slotId;
+            }
         }
+        return INVALID_PHYSICAL_SLOT_ID;
+    }
+
+    private static Collection<UiccSlotMapping> prepareUiccSlotMappingsForRemovableSlot(
+            Collection<UiccSlotMapping> uiccSlotMappings, int slotId,
+            SubscriptionInfo removedSubInfo, boolean isMultiSimEnabled) {
+        if (slotId == INVALID_PHYSICAL_SLOT_ID
+                || uiccSlotMappings.stream().anyMatch(uiccSlotMapping ->
+                        uiccSlotMapping.getPhysicalSlotIndex() == slotId
+                                && uiccSlotMapping.getPortIndex() == 0)) {
+            // The slot is invalid slot id, then to skip this.
+            // The slot is active, then the sim can enable directly.
+            return uiccSlotMappings;
+        }
+
+        Collection<UiccSlotMapping> newUiccSlotMappings = new ArrayList<>();
+        if (!isMultiSimEnabled) {
+            // In the 'SS mode', the port is 0.
+            newUiccSlotMappings.add(new UiccSlotMapping(0, slotId, 0));
+        } else if (removedSubInfo != null) {
+            // DSDS+MEP
+            // The target slot+port is not active, but the all of logical slots are full. It
+            // needs to replace one of logical slots.
+            Log.i(TAG,
+                    String.format("Start to set SimSlotMapping from slot%d-port%d to slot%d-port%d",
+                            slotId, 0, removedSubInfo.getSimSlotIndex(),
+                            removedSubInfo.getPortIndex()));
+            newUiccSlotMappings =
+                    uiccSlotMappings.stream().map(uiccSlotMapping -> {
+                        if (uiccSlotMapping.getPhysicalSlotIndex()
+                                == removedSubInfo.getSimSlotIndex()
+                                && uiccSlotMapping.getPortIndex()
+                                == removedSubInfo.getPortIndex()) {
+                            return new UiccSlotMapping(0, slotId,
+                                    uiccSlotMapping.getLogicalSlotIndex());
+                        }
+                        return uiccSlotMapping;
+                    }).collect(Collectors.toList());
+        } else {
+            // DSDS+no MEP
+            // The removable slot should be in UiccSlotMapping.
+            newUiccSlotMappings = uiccSlotMappings;
+            Log.i(TAG, "The removedSubInfo is null");
+        }
+
+        Log.i(TAG, "The SimSlotMapping: " + newUiccSlotMappings);
+        return newUiccSlotMappings;
     }
 }
diff --git a/src/com/android/settings/network/apn/ApnEditor.java b/src/com/android/settings/network/apn/ApnEditor.java
index 03db1b8..926c77e 100644
--- a/src/com/android/settings/network/apn/ApnEditor.java
+++ b/src/com/android/settings/network/apn/ApnEditor.java
@@ -149,6 +149,7 @@
     private String[] mReadOnlyApnFields;
     private boolean mReadOnlyApn;
     private Uri mCarrierUri;
+    private boolean mIsCarrierIdApn;
 
     /**
      * APN types for data connections.  These are usage categories for an APN
@@ -227,7 +228,8 @@
             Telephony.Carriers.MVNO_TYPE,   // 21
             Telephony.Carriers.MVNO_MATCH_DATA,  // 22
             Telephony.Carriers.EDITED_STATUS,   // 23
-            Telephony.Carriers.USER_EDITABLE    //24
+            Telephony.Carriers.USER_EDITABLE,   // 24
+            Telephony.Carriers.CARRIER_ID       // 25
     };
 
     private static final int ID_INDEX = 0;
@@ -262,6 +264,7 @@
     private static final int MVNO_MATCH_DATA_INDEX = 22;
     private static final int EDITED_INDEX = 23;
     private static final int USER_EDITABLE_INDEX = 24;
+    private static final int CARRIER_ID_INDEX = 25;
 
     @Override
     public void onCreate(Bundle icicle) {
@@ -312,6 +315,9 @@
         } else {
             mApnData = new ApnData(sProjection.length);
         }
+        final int carrierId = mApnData.getInteger(CARRIER_ID_INDEX,
+                TelephonyManager.UNKNOWN_CARRIER_ID);
+        mIsCarrierIdApn = (carrierId > TelephonyManager.UNKNOWN_CARRIER_ID);
 
         final boolean isUserEdited = mApnData.getInteger(EDITED_INDEX,
                 Telephony.Carriers.USER_EDITED) == Telephony.Carriers.USER_EDITED;
@@ -326,6 +332,10 @@
         } else if (!ArrayUtils.isEmpty(mReadOnlyApnFields)) {
             disableFields(mReadOnlyApnFields);
         }
+        // Make sure that a user cannot break carrier id APN matching
+        if (mIsCarrierIdApn) {
+            disableFieldsForCarrieridApn();
+        }
 
         for (int i = 0; i < getPreferenceScreen().getPreferenceCount(); i++) {
             getPreferenceScreen().getPreference(i).setOnPreferenceChangeListener(this);
@@ -517,6 +527,16 @@
         mMvnoMatchData.setEnabled(false);
     }
 
+    /**
+     * Disables fields for a carrier id APN to avoid breaking the match criteria
+     */
+    private void disableFieldsForCarrieridApn() {
+        mMcc.setEnabled(false);
+        mMnc.setEnabled(false);
+        mMvnoType.setEnabled(false);
+        mMvnoMatchData.setEnabled(false);
+    }
+
     @Override
     public int getMetricsCategory() {
         return SettingsEnums.APN_EDITOR;
@@ -1150,11 +1170,15 @@
         final String apn = checkNotSet(mApn.getText());
         final String mcc = checkNotSet(mMcc.getText());
         final String mnc = checkNotSet(mMnc.getText());
-
+        boolean doNotCheckMccMnc = mIsCarrierIdApn && TextUtils.isEmpty(mcc)
+                && TextUtils.isEmpty(mnc);
         if (TextUtils.isEmpty(name)) {
             errorMsg = getResources().getString(R.string.error_name_empty);
         } else if (TextUtils.isEmpty(apn)) {
             errorMsg = getResources().getString(R.string.error_apn_empty);
+        } else if (doNotCheckMccMnc) {
+            Log.d(TAG, "validateApnData: carrier id APN does not have mcc/mnc defined");
+            // no op, skip mcc mnc null check
         } else if (mcc == null || mcc.length() != 3) {
             errorMsg = getResources().getString(R.string.error_mcc_not3);
         } else if ((mnc == null || (mnc.length() & 0xFFFE) != 2)) {
diff --git a/src/com/android/settings/network/apn/ApnSettings.java b/src/com/android/settings/network/apn/ApnSettings.java
index 4df2e5e..dbd4ae0 100755
--- a/src/com/android/settings/network/apn/ApnSettings.java
+++ b/src/com/android/settings/network/apn/ApnSettings.java
@@ -322,6 +322,8 @@
         final StringBuilder where =
                 new StringBuilder("NOT (type='ia' AND (apn=\"\" OR apn IS NULL)) AND "
                 + "user_visible!=0");
+        // Remove Emergency type, users should not mess with that
+        where.append(" AND NOT (type='emergency')");
 
         if (mHideImsApn) {
             where.append(" AND NOT (type='ims')");
diff --git a/src/com/android/settings/network/helper/QuerySimSlotIndex.java b/src/com/android/settings/network/helper/QuerySimSlotIndex.java
index b70a148..ee53f94 100644
--- a/src/com/android/settings/network/helper/QuerySimSlotIndex.java
+++ b/src/com/android/settings/network/helper/QuerySimSlotIndex.java
@@ -17,14 +17,16 @@
 
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
+import android.telephony.UiccPortInfo;
 import android.telephony.UiccSlotInfo;
 
 import java.util.Arrays;
 import java.util.concurrent.Callable;
 import java.util.concurrent.atomic.AtomicIntegerArray;
+import java.util.stream.IntStream;
 
 /**
- * This is a Callable class which query slot index within device
+ * This is a Callable class which query logical slot index within device
  */
 public class QuerySimSlotIndex implements Callable<AtomicIntegerArray> {
     private static final String TAG = "QuerySimSlotIndex";
@@ -58,30 +60,32 @@
             return new AtomicIntegerArray(0);
         }
         int slotIndexFilter = mOnlySlotWithSim ? 0 : SubscriptionManager.INVALID_SIM_SLOT_INDEX;
+
         return new AtomicIntegerArray(Arrays.stream(slotInfo)
-                .filter(slot -> filterSlot(slot))
-                .mapToInt(slot -> mapToSlotIndex(slot))
+                .flatMapToInt(slot -> mapToLogicalSlotIndex(slot))
                 .filter(slotIndex -> (slotIndex >= slotIndexFilter))
                 .toArray());
     }
 
-    protected boolean filterSlot(UiccSlotInfo slotInfo) {
+    protected IntStream mapToLogicalSlotIndex(UiccSlotInfo slotInfo) {
+        if (slotInfo == null) {
+            return IntStream.of(SubscriptionManager.INVALID_SIM_SLOT_INDEX);
+        }
+        if (slotInfo.getCardStateInfo() == UiccSlotInfo.CARD_STATE_INFO_ABSENT) {
+            return IntStream.of(SubscriptionManager.INVALID_SIM_SLOT_INDEX);
+        }
+        return slotInfo.getPorts().stream()
+                .filter(port -> filterPort(port))
+                .mapToInt(port -> port.getLogicalSlotIndex());
+    }
+
+    protected boolean filterPort(UiccPortInfo uiccPortInfo) {
         if (mDisabledSlotsIncluded) {
             return true;
         }
-        if (slotInfo == null) {
+        if (uiccPortInfo == null) {
             return false;
         }
-        return slotInfo.getIsActive();
-    }
-
-    protected int mapToSlotIndex(UiccSlotInfo slotInfo) {
-        if (slotInfo == null) {
-            return SubscriptionManager.INVALID_SIM_SLOT_INDEX;
-        }
-        if (slotInfo.getCardStateInfo() == UiccSlotInfo.CARD_STATE_INFO_ABSENT) {
-            return SubscriptionManager.INVALID_SIM_SLOT_INDEX;
-        }
-        return slotInfo.getLogicalSlotIdx();
+        return uiccPortInfo.isActive();
     }
 }
\ No newline at end of file
diff --git a/src/com/android/settings/network/telephony/AlertDialogFragment.java b/src/com/android/settings/network/telephony/AlertDialogFragment.java
index 5940789..aaccc2d 100644
--- a/src/com/android/settings/network/telephony/AlertDialogFragment.java
+++ b/src/com/android/settings/network/telephony/AlertDialogFragment.java
@@ -16,13 +16,14 @@
 
 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 androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.FragmentActivity;
+
 /** Fragment to show an alert dialog which only has the positive button. */
 public class AlertDialogFragment extends BaseDialogFragment
         implements DialogInterface.OnClickListener {
@@ -37,13 +38,13 @@
      * @param title
      * @param msg
      */
-    public static void show(Activity activity, String title, String msg) {
+    public static void show(FragmentActivity 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);
+        fragment.show(activity.getSupportFragmentManager(), TAG);
     }
 
     @Override
@@ -55,7 +56,7 @@
         if (!TextUtils.isEmpty(getArguments().getString(ARG_MSG))) {
             builder.setMessage(getArguments().getString(ARG_MSG));
         }
-        return builder.show();
+        return builder.create();
     }
 
     @Override
diff --git a/src/com/android/settings/network/telephony/BaseDialogFragment.java b/src/com/android/settings/network/telephony/BaseDialogFragment.java
index 7da3259..0465cef 100644
--- a/src/com/android/settings/network/telephony/BaseDialogFragment.java
+++ b/src/com/android/settings/network/telephony/BaseDialogFragment.java
@@ -17,11 +17,11 @@
 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;
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.Fragment;
 
 /**
  * Base dialog fragment class with the functionality to make a fragment or an activity as a listener
diff --git a/src/com/android/settings/network/telephony/ConfirmDialogFragment.java b/src/com/android/settings/network/telephony/ConfirmDialogFragment.java
index 1ba99c5..6352180 100644
--- a/src/com/android/settings/network/telephony/ConfirmDialogFragment.java
+++ b/src/com/android/settings/network/telephony/ConfirmDialogFragment.java
@@ -16,13 +16,24 @@
 
 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;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.ListView;
+import android.widget.TextView;
+
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.FragmentActivity;
+
+import com.android.settings.R;
+
+import java.util.ArrayList;
 
 /** Fragment to show a confirm dialog. The caller should implement onConfirmListener. */
 public class ConfirmDialogFragment extends BaseDialogFragment
@@ -32,22 +43,27 @@
     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";
+    private static final String ARG_LIST = "list";
 
     /**
      * 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.
+         * @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.
+         * @param itemPosition It is the position of item, if user selects one of the list item.
+         *                     If the user select "cancel" or the dialog does not have list, then
+         *                     the value is -1.
          */
-        void onConfirm(int tag, boolean confirmed);
+        void onConfirm(int tag, boolean confirmed, int itemPosition);
     }
 
     /** Displays a confirmation dialog which has confirm and cancel buttons. */
     public static <T> void show(
-            Activity activity,
+            FragmentActivity activity,
             Class<T> callbackInterfaceClass,
             int tagInCaller,
             String title,
@@ -62,7 +78,29 @@
         arguments.putString(ARG_NEG_BUTTON_STRING, negButtonString);
         setListener(activity, null, callbackInterfaceClass, tagInCaller, arguments);
         fragment.setArguments(arguments);
-        fragment.show(activity.getFragmentManager(), TAG);
+        fragment.show(activity.getSupportFragmentManager(), TAG);
+    }
+
+    /** Displays a confirmation dialog which has confirm and cancel buttons and carrier list.*/
+    public static <T> void show(
+            FragmentActivity activity,
+            Class<T> callbackInterfaceClass,
+            int tagInCaller,
+            String title,
+            String msg,
+            String posButtonString,
+            String negButtonString,
+            ArrayList<String> list) {
+        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);
+        arguments.putStringArrayList(ARG_LIST, list);
+        setListener(activity, null, callbackInterfaceClass, tagInCaller, arguments);
+        fragment.setArguments(arguments);
+        fragment.show(activity.getSupportFragmentManager(), TAG);
     }
 
     @Override
@@ -71,37 +109,87 @@
         String message = getArguments().getString(ARG_MSG);
         String posBtnString = getArguments().getString(ARG_POS_BUTTON_STRING);
         String negBtnString = getArguments().getString(ARG_NEG_BUTTON_STRING);
+        ArrayList<String> list = getArguments().getStringArrayList(ARG_LIST);
 
-        Log.i("Showing dialog with title = %s", title);
-        AlertDialog.Builder builder =
-                new AlertDialog.Builder(getContext())
-                        .setTitle(title)
-                        .setPositiveButton(posBtnString, this)
-                        .setNegativeButton(negBtnString, this);
+        Log.i(TAG, "Showing dialog with title =" + title);
+        AlertDialog.Builder builder = new AlertDialog.Builder(getContext())
+                .setPositiveButton(posBtnString, this)
+                .setNegativeButton(negBtnString, this);
 
-        if (!TextUtils.isEmpty(message)) {
-            builder.setMessage(message);
+        if (list != null && !list.isEmpty()) {
+            Log.i(TAG, "list =" + list.toString());
+
+            View content = LayoutInflater.from(getContext()).inflate(
+                    R.layout.sim_confirm_dialog_multiple_enabled_profiles_supported, null);
+
+            if (!TextUtils.isEmpty(title)) {
+                View titleView = LayoutInflater.from(getContext()).inflate(
+                        R.layout.sim_confirm_dialog_title_multiple_enabled_profiles_supported,
+                        null);
+                TextView titleTextView = titleView.findViewById(R.id.title);
+                titleTextView.setText(title);
+                builder.setCustomTitle(titleTextView);
+            }
+            TextView dialogMessage = content.findViewById(R.id.msg);
+            if (!TextUtils.isEmpty(message) && dialogMessage != null) {
+                dialogMessage.setText(message);
+            }
+
+            final ArrayAdapter<String> arrayAdapterItems = new ArrayAdapter<String>(
+                    getContext(),
+                    R.layout.sim_confirm_dialog_item_multiple_enabled_profiles_supported, list);
+            final ListView lvItems = content.findViewById(R.id.carrier_list);
+            if (lvItems != null) {
+                lvItems.setAdapter(arrayAdapterItems);
+                lvItems.setChoiceMode(ListView.CHOICE_MODE_NONE);
+                lvItems.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+                    @Override
+                    public void onItemClick(AdapterView<?> parent, View view, int position,
+                            long id) {
+                        Log.i(TAG, "list onClick =" + position);
+                        Log.i(TAG, "list item =" + list.get(position));
+
+                        if (position == list.size() - 1) {
+                            // user select the "cancel" item;
+                            informCaller(false, -1);
+                        } else {
+                            informCaller(true, position);
+                        }
+                    }
+                });
+            }
+            builder.setView(content);
+        } else {
+            if (!TextUtils.isEmpty(title)) {
+                builder.setTitle(title);
+            }
+            if (!TextUtils.isEmpty(message)) {
+                builder.setMessage(message);
+            }
         }
-        AlertDialog dialog = builder.show();
+
+        AlertDialog dialog = builder.create();
         dialog.setCanceledOnTouchOutside(false);
         return dialog;
     }
 
     @Override
     public void onClick(DialogInterface dialog, int which) {
-        informCaller(which == DialogInterface.BUTTON_POSITIVE);
+        Log.i(TAG, "dialog onClick =" + which);
+
+        informCaller(which == DialogInterface.BUTTON_POSITIVE, -1);
     }
 
     @Override
     public void onCancel(DialogInterface dialog) {
-        informCaller(false);
+        informCaller(false, -1);
     }
 
-    private void informCaller(boolean confirmed) {
+    private void informCaller(boolean confirmed, int itemPosition) {
         OnConfirmListener listener = getListener(OnConfirmListener.class);
         if (listener == null) {
             return;
         }
-        listener.onConfirm(getTagInCaller(), confirmed);
+        listener.onConfirm(getTagInCaller(), confirmed, itemPosition);
     }
 }
diff --git a/src/com/android/settings/network/telephony/DeleteEuiccSubscriptionDialogActivity.java b/src/com/android/settings/network/telephony/DeleteEuiccSubscriptionDialogActivity.java
index f429f8b..8247f63 100644
--- a/src/com/android/settings/network/telephony/DeleteEuiccSubscriptionDialogActivity.java
+++ b/src/com/android/settings/network/telephony/DeleteEuiccSubscriptionDialogActivity.java
@@ -96,7 +96,7 @@
     }
 
     @Override
-    public void onConfirm(int tag, boolean confirmed) {
+    public void onConfirm(int tag, boolean confirmed, int itemPosition) {
         if (!confirmed) {
             finish();
             return;
diff --git a/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java b/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java
index 25e0ae0..aa58663 100644
--- a/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java
+++ b/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java
@@ -23,9 +23,11 @@
 import android.os.PersistableBundle;
 import android.telephony.CarrierConfigManager;
 import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyCallback;
 import android.telephony.TelephonyManager;
 import android.util.Log;
 
+import androidx.annotation.VisibleForTesting;
 import androidx.lifecycle.Lifecycle;
 import androidx.lifecycle.LifecycleObserver;
 import androidx.lifecycle.OnLifecycleEvent;
@@ -59,16 +61,25 @@
     private CarrierConfigManager mCarrierConfigManager;
     private PreferenceEntriesBuilder mBuilder;
     private SubscriptionsChangeListener mSubscriptionsListener;
+    private int mCallState = TelephonyManager.CALL_STATE_IDLE;
+    private PhoneCallStateTelephonyCallback mTelephonyCallback;
 
     public EnabledNetworkModePreferenceController(Context context, String key) {
         super(context, key);
         mSubscriptionsListener = new SubscriptionsChangeListener(context, this);
         mCarrierConfigManager = mContext.getSystemService(CarrierConfigManager.class);
+        if (mTelephonyCallback == null) {
+            mTelephonyCallback = new PhoneCallStateTelephonyCallback();
+        }
     }
 
     @Override
     public int getAvailabilityStatus(int subId) {
         boolean visible;
+        if (!isCallStateIdle()) {
+            return AVAILABLE_UNSEARCHABLE;
+        }
+
         final PersistableBundle carrierConfig = mCarrierConfigManager.getConfigForSubId(subId);
         if (subId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
             visible = false;
@@ -87,23 +98,28 @@
 
         return visible ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
     }
+    protected boolean isCallStateIdle() {
+        return mCallState == TelephonyManager.CALL_STATE_IDLE;
+    }
 
     @OnLifecycleEvent(ON_START)
     public void onStart() {
         mSubscriptionsListener.start();
-        if (mAllowedNetworkTypesListener == null) {
+        if (mAllowedNetworkTypesListener == null || mTelephonyCallback == null) {
             return;
         }
         mAllowedNetworkTypesListener.register(mContext, mSubId);
+        mTelephonyCallback.register(mTelephonyManager, mSubId);
     }
 
     @OnLifecycleEvent(ON_STOP)
     public void onStop() {
         mSubscriptionsListener.stop();
-        if (mAllowedNetworkTypesListener == null) {
+        if (mAllowedNetworkTypesListener == null || mTelephonyCallback == null) {
             return;
         }
         mAllowedNetworkTypesListener.unregister(mContext, mSubId);
+        mTelephonyCallback.unregister();
     }
 
     @Override
@@ -125,6 +141,7 @@
         listPreference.setEntryValues(mBuilder.getEntryValues());
         listPreference.setValue(Integer.toString(mBuilder.getSelectedEntryValue()));
         listPreference.setSummary(mBuilder.getSummary());
+        listPreference.setEnabled(isCallStateIdle());
     }
 
     @Override
@@ -157,7 +174,6 @@
                         updatePreference();
                     });
         }
-
         lifecycle.addObserver(this);
     }
 
@@ -828,6 +844,43 @@
 
     }
 
+    @VisibleForTesting
+    class PhoneCallStateTelephonyCallback extends TelephonyCallback implements
+            TelephonyCallback.CallStateListener {
+
+        private TelephonyManager mTelephonyManager;
+
+        @Override
+        public void onCallStateChanged(int state) {
+            Log.d(LOG_TAG, "onCallStateChanged:" + state);
+            mCallState = state;
+            mBuilder.updateConfig();
+            updatePreference();
+        }
+
+        public void register(TelephonyManager telephonyManager, int subId) {
+            mTelephonyManager = telephonyManager;
+
+            // 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.registerTelephonyCallback(
+                    mContext.getMainExecutor(), mTelephonyCallback);
+        }
+
+        public void unregister() {
+            mCallState = TelephonyManager.CALL_STATE_IDLE;
+            if (mTelephonyManager != null) {
+                mTelephonyManager.unregisterTelephonyCallback(this);
+            }
+        }
+    }
+
+    @VisibleForTesting
+    PhoneCallStateTelephonyCallback getTelephonyCallback() {
+        return mTelephonyCallback;
+    }
+
     @Override
     public void onAirplaneModeChanged(boolean airplaneModeEnabled) {
     }
diff --git a/src/com/android/settings/network/telephony/Enhanced4gBasePreferenceController.java b/src/com/android/settings/network/telephony/Enhanced4gBasePreferenceController.java
index 5ea7c20..12612d6 100644
--- a/src/com/android/settings/network/telephony/Enhanced4gBasePreferenceController.java
+++ b/src/com/android/settings/network/telephony/Enhanced4gBasePreferenceController.java
@@ -77,9 +77,6 @@
             mTelephonyCallback = new PhoneCallStateTelephonyCallback();
         }
 
-        if (mSubId == subId) {
-            return this;
-        }
         mSubId = subId;
         final PersistableBundle carrierConfig = getCarrierConfigForSubId(subId);
         if (carrierConfig == null) {
@@ -136,7 +133,7 @@
 
     @Override
     public void onStart() {
-        if (!isModeMatched() || (mTelephonyCallback == null)) {
+        if (mTelephonyCallback == null) {
             return;
         }
         mTelephonyCallback.register(mContext, mSubId);
diff --git a/src/com/android/settings/network/telephony/EuiccOperationSidecar.java b/src/com/android/settings/network/telephony/EuiccOperationSidecar.java
index 0ee6d95..c5a699c 100644
--- a/src/com/android/settings/network/telephony/EuiccOperationSidecar.java
+++ b/src/com/android/settings/network/telephony/EuiccOperationSidecar.java
@@ -24,10 +24,12 @@
 import android.content.IntentFilter;
 import android.os.Bundle;
 import android.os.SystemClock;
+import android.telephony.TelephonyManager;
 import android.telephony.euicc.EuiccManager;
 import android.util.Log;
 
 import com.android.settings.SidecarFragment;
+import com.android.settings.network.SwitchSlotSidecar;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -37,7 +39,8 @@
  * 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 {
+public abstract class EuiccOperationSidecar extends SidecarFragment
+        implements SidecarFragment.Listener{
     private static final String TAG = "EuiccOperationSidecar";
     private static final int REQUEST_CODE = 0;
     private static final String EXTRA_OP_ID = "op_id";
@@ -45,6 +48,9 @@
             new AtomicInteger((int) SystemClock.elapsedRealtime());
 
     protected EuiccManager mEuiccManager;
+    protected TelephonyManager mTelephonyManager;
+    protected SwitchSlotSidecar mSwitchSlotSidecar;
+
 
     private int mResultCode;
     private int mDetailedCode;
@@ -107,6 +113,8 @@
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         mEuiccManager = getContext().getSystemService(EuiccManager.class);
+        mTelephonyManager = getContext().getSystemService(TelephonyManager.class);
+        mSwitchSlotSidecar = SwitchSlotSidecar.get(getChildFragmentManager());
 
         getContext()
                 .getApplicationContext()
@@ -118,11 +126,41 @@
     }
 
     @Override
+    public void onResume() {
+        super.onResume();
+        mSwitchSlotSidecar.addListener(this);
+    }
+
+    @Override
+    public void onPause() {
+        mSwitchSlotSidecar.removeListener(this);
+        super.onPause();
+    }
+
+    @Override
     public void onDestroy() {
         getContext().getApplicationContext().unregisterReceiver(mReceiver);
         super.onDestroy();
     }
 
+    @Override
+    public void onStateChange(SidecarFragment fragment) {
+        if (fragment == mSwitchSlotSidecar) {
+            switch (mSwitchSlotSidecar.getState()) {
+                case State.SUCCESS:
+                    mSwitchSlotSidecar.reset();
+                    Log.i(TAG, "mSwitchSlotSidecar SUCCESS");
+                    break;
+                case State.ERROR:
+                    mSwitchSlotSidecar.reset();
+                    Log.i(TAG, "mSwitchSlotSidecar ERROR");
+                    break;
+            }
+        } else {
+            Log.wtf(TAG, "Received state change from a sidecar not expected.");
+        }
+    }
+
     public int getResultCode() {
         return mResultCode;
     }
diff --git a/src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragment.java b/src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragment.java
index 5f20894..ec48c82 100644
--- a/src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragment.java
+++ b/src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragment.java
@@ -184,7 +184,10 @@
         phoneTitle.setVisibility(info.isOpportunistic() ? View.GONE : View.VISIBLE);
 
         final TextView phoneNumber = view.findViewById(R.id.number_value);
-        phoneNumber.setText(DeviceInfoUtils.getBidiFormattedPhoneNumber(getContext(), info));
+        final String pn = DeviceInfoUtils.getBidiFormattedPhoneNumber(getContext(), info);
+        if (!TextUtils.isEmpty(pn)) {
+            phoneNumber.setText(pn);
+        }
     }
 
     @Override
diff --git a/src/com/android/settings/network/telephony/SubscriptionActionDialogActivity.java b/src/com/android/settings/network/telephony/SubscriptionActionDialogActivity.java
index 7ff0d9a..288f1ac 100644
--- a/src/com/android/settings/network/telephony/SubscriptionActionDialogActivity.java
+++ b/src/com/android/settings/network/telephony/SubscriptionActionDialogActivity.java
@@ -16,12 +16,13 @@
 
 package com.android.settings.network.telephony;
 
-import android.app.Activity;
 import android.os.Bundle;
 import android.telephony.SubscriptionManager;
 
+import androidx.fragment.app.FragmentActivity;
+
 /** The base class for subscription action dialogs */
-public class SubscriptionActionDialogActivity extends Activity {
+public class SubscriptionActionDialogActivity extends FragmentActivity {
 
     private static final String TAG = "SubscriptionActionDialogActivity";
     // Arguments
diff --git a/src/com/android/settings/network/telephony/ToggleSubscriptionDialogActivity.java b/src/com/android/settings/network/telephony/ToggleSubscriptionDialogActivity.java
index 0064e6c..cc2986d 100644
--- a/src/com/android/settings/network/telephony/ToggleSubscriptionDialogActivity.java
+++ b/src/com/android/settings/network/telephony/ToggleSubscriptionDialogActivity.java
@@ -23,9 +23,11 @@
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
+import android.telephony.UiccCardInfo;
 import android.telephony.UiccSlotInfo;
 import android.text.TextUtils;
 import android.util.Log;
+import android.view.View;
 
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.settings.R;
@@ -39,7 +41,9 @@
 
 import com.google.common.collect.ImmutableList;
 
+import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /** This dialog activity handles both eSIM and pSIM subscriptions enabling and disabling. */
 public class ToggleSubscriptionDialogActivity extends SubscriptionActionDialogActivity
@@ -54,8 +58,15 @@
     private static final int DIALOG_TAG_ENABLE_SIM_CONFIRMATION = 2;
     private static final int DIALOG_TAG_ENABLE_DSDS_CONFIRMATION = 3;
     private static final int DIALOG_TAG_ENABLE_DSDS_REBOOT_CONFIRMATION = 4;
+    private static final int DIALOG_TAG_ENABLE_SIM_CONFIRMATION_MEP = 5;
+
     // Number of SIMs for DSDS
     private static final int NUM_OF_SIMS_FOR_DSDS = 2;
+    // Support RTL mode
+    private static final String LINE_BREAK = "\n";
+    private static final int LINE_BREAK_OFFSET_ONE = 1;
+    private static final int LINE_BREAK_OFFSET_TWO = 2;
+    private static final String RTL_MARK = "\u200F";
 
     /**
      * Returns an intent of ToggleSubscriptionDialogActivity.
@@ -78,11 +89,12 @@
     private boolean mEnable;
     private boolean mIsEsimOperation;
     private TelephonyManager mTelMgr;
+    private boolean isRtlMode;
+    private List<SubscriptionInfo> mActiveSubInfos;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-
         Intent intent = getIntent();
         int subId = intent.getIntExtra(ARG_SUB_ID, SubscriptionManager.INVALID_SUBSCRIPTION_ID);
         mTelMgr = getSystemService(TelephonyManager.class);
@@ -100,6 +112,7 @@
             return;
         }
 
+        mActiveSubInfos = SubscriptionUtil.getActiveSubscriptions(mSubscriptionManager);
         mSubInfo = SubscriptionUtil.getSubById(mSubscriptionManager, subId);
         mIsEsimOperation = mSubInfo != null && mSubInfo.isEmbedded();
         mSwitchToEuiccSubscriptionSidecar =
@@ -107,6 +120,9 @@
         mSwitchToRemovableSlotSidecar = SwitchToRemovableSlotSidecar.get(getFragmentManager());
         mEnableMultiSimSidecar = EnableMultiSimSidecar.get(getFragmentManager());
         mEnable = intent.getBooleanExtra(ARG_enable, true);
+        isRtlMode = getResources().getConfiguration().getLayoutDirection()
+                == View.LAYOUT_DIRECTION_RTL;
+        Log.i(TAG, "isMultipleEnabledProfilesSupported():" + isMultipleEnabledProfilesSupported());
 
         if (savedInstanceState == null) {
             if (mEnable) {
@@ -145,7 +161,7 @@
     }
 
     @Override
-    public void onConfirm(int tag, boolean confirmed) {
+    public void onConfirm(int tag, boolean confirmed, int itemPosition) {
         if (!confirmed
                 && tag != DIALOG_TAG_ENABLE_DSDS_CONFIRMATION
                 && tag != DIALOG_TAG_ENABLE_DSDS_REBOOT_CONFIRMATION) {
@@ -153,14 +169,16 @@
             return;
         }
 
+        SubscriptionInfo removedSubInfo = null;
         switch (tag) {
             case DIALOG_TAG_DISABLE_SIM_CONFIRMATION:
                 if (mIsEsimOperation) {
                     Log.i(TAG, "Disabling the eSIM profile.");
                     showProgressDialog(
                             getString(R.string.privileged_action_disable_sub_dialog_progress));
+                    int port = mSubInfo != null ? mSubInfo.getPortIndex() : 0;
                     mSwitchToEuiccSubscriptionSidecar.run(
-                            SubscriptionManager.INVALID_SUBSCRIPTION_ID);
+                            SubscriptionManager.INVALID_SUBSCRIPTION_ID, port, null);
                     return;
                 }
                 Log.i(TAG, "Disabling the pSIM profile.");
@@ -192,6 +210,11 @@
                 SimActivationNotifier.setShowSimSettingsNotification(this, true);
                 mTelMgr.switchMultiSimConfig(NUM_OF_SIMS_FOR_DSDS);
                 break;
+            case DIALOG_TAG_ENABLE_SIM_CONFIRMATION_MEP:
+                if (itemPosition != -1) {
+                    removedSubInfo = (mActiveSubInfos != null) ? mActiveSubInfos.get(itemPosition)
+                            : null;
+                }
             case DIALOG_TAG_ENABLE_SIM_CONFIRMATION:
                 Log.i(TAG, "User confirmed to enable the subscription.");
                 if (mIsEsimOperation) {
@@ -200,12 +223,15 @@
                                     R.string.sim_action_switch_sub_dialog_progress,
                                     SubscriptionUtil.getUniqueSubscriptionDisplayName(
                                             mSubInfo, this)));
-                    mSwitchToEuiccSubscriptionSidecar.run(mSubInfo.getSubscriptionId());
+                    mSwitchToEuiccSubscriptionSidecar.run(mSubInfo.getSubscriptionId(),
+                            UiccSlotUtil.INVALID_PORT_ID,
+                            removedSubInfo);
                     return;
                 }
                 showProgressDialog(
                         getString(R.string.sim_action_enabling_sim_without_carrier_name));
-                mSwitchToRemovableSlotSidecar.run(UiccSlotUtil.INVALID_PHYSICAL_SLOT_ID);
+                mSwitchToRemovableSlotSidecar.run(UiccSlotUtil.INVALID_PHYSICAL_SLOT_ID,
+                        removedSubInfo);
                 break;
             default:
                 Log.e(TAG, "Unrecognized confirmation dialog tag: " + tag);
@@ -216,8 +242,7 @@
     private void handleSwitchToEuiccSubscriptionSidecarStateChange() {
         switch (mSwitchToEuiccSubscriptionSidecar.getState()) {
             case SidecarFragment.State.SUCCESS:
-                Log.i(
-                        TAG,
+                Log.i(TAG,
                         String.format(
                                 "Successfully %s the eSIM profile.",
                                 mEnable ? "enable" : "disable"));
@@ -226,8 +251,7 @@
                 finish();
                 break;
             case SidecarFragment.State.ERROR:
-                Log.i(
-                        TAG,
+                Log.i(TAG,
                         String.format(
                                 "Failed to %s the eSIM profile.", mEnable ? "enable" : "disable"));
                 mSwitchToEuiccSubscriptionSidecar.reset();
@@ -281,7 +305,8 @@
         if (mIsEsimOperation) {
             Log.i(TAG, "DSDS enabled, start to enable profile: " + mSubInfo.getSubscriptionId());
             // For eSIM operations, we simply switch to the selected eSIM profile.
-            mSwitchToEuiccSubscriptionSidecar.run(mSubInfo.getSubscriptionId());
+            mSwitchToEuiccSubscriptionSidecar.run(mSubInfo.getSubscriptionId(),
+                    UiccSlotUtil.INVALID_PORT_ID, null);
             return;
         }
 
@@ -296,10 +321,8 @@
             mSubscriptionManager.setUiccApplicationsEnabled(mSubInfo.getSubscriptionId(), mEnable);
             finish();
         } else {
-            Log.i(
-                    TAG,
-                    "The device does not support toggling pSIM. It is enough to just "
-                            + "enable the removable slot.");
+            Log.i(TAG, "The device does not support toggling pSIM. It is enough to just "
+                    + "enable the removable slot.");
         }
     }
 
@@ -310,7 +333,10 @@
             showEnableDsdsConfirmDialog();
             return;
         }
-        if (!mIsEsimOperation && mTelMgr.isMultiSimEnabled()) {
+        if (!mIsEsimOperation && mTelMgr.isMultiSimEnabled()
+                && isRemovableSimEnabled()) {
+            // This case is for switching on psim when device is not multiple enable profile
+            // supported.
             Log.i(TAG, "Toggle on pSIM, no dialog displayed.");
             handleTogglePsimAction();
             finish();
@@ -338,7 +364,7 @@
                 getString(R.string.sim_action_restart_title),
                 getString(R.string.sim_action_enable_dsds_text),
                 getString(R.string.sim_action_reboot),
-                getString(R.string.cancel));
+                getString(R.string.sim_action_cancel));
     }
 
     /* Displays the SIM toggling confirmation dialog. */
@@ -359,32 +385,61 @@
                 title,
                 null,
                 getString(R.string.yes),
-                getString(R.string.cancel));
+                getString(R.string.sim_action_cancel));
     }
 
     private void showEnableSimConfirmDialog() {
-        List<SubscriptionInfo> activeSubs =
-                SubscriptionUtil.getActiveSubscriptions(mSubscriptionManager);
-        SubscriptionInfo activeSub = activeSubs.isEmpty() ? null : activeSubs.get(0);
-        if (activeSub == null) {
+        if (mActiveSubInfos == null || mActiveSubInfos.isEmpty()) {
             Log.i(TAG, "No active subscriptions available.");
             showNonSwitchSimConfirmDialog();
             return;
         }
-        Log.i(TAG, "Found active subscription.");
-        boolean isBetweenEsim = mIsEsimOperation && activeSub.isEmbedded();
-        if (mTelMgr.isMultiSimEnabled() && !isBetweenEsim) {
+        Log.i(TAG, "mActiveSubInfos:" + mActiveSubInfos);
+
+        boolean isSwitchingBetweenEsims = mIsEsimOperation
+                && mActiveSubInfos.stream().anyMatch(activeSubInfo -> activeSubInfo.isEmbedded());
+        boolean isMultiSimEnabled = mTelMgr.isMultiSimEnabled();
+        if (isMultiSimEnabled
+                && !isMultipleEnabledProfilesSupported()
+                && !isSwitchingBetweenEsims) {
+            // Showing the "no switch dialog" for below cases.
+            // DSDS mode + no MEP +
+            //     (there is the active psim -> esim switch on => active (psim + esim))
             showNonSwitchSimConfirmDialog();
             return;
         }
+
+        if (isMultiSimEnabled && isMultipleEnabledProfilesSupported()) {
+            if (mActiveSubInfos.size() < NUM_OF_SIMS_FOR_DSDS) {
+                // The sim can add into device directly, so showing the "no switch dialog".
+                // DSDS + MEP + (active sim < NUM_OF_SIMS_FOR_DSDS)
+                showNonSwitchSimConfirmDialog();
+            } else {
+                // The all of slots have sim, it needs to show the "MEP switch dialog".
+                // DSDS + MEP + two active sims
+                showMepSwitchSimConfirmDialog();
+            }
+            return;
+        }
+
+        // Showing the "switch dialog" for below cases.
+        // case1: SS mode + psim switch on from esim.
+        // case2: SS mode + esim switch from psim.
+        // case3: DSDS mode + No MEP + esim switch on from another esim.
+        SubscriptionInfo activeSub =
+                (isMultiSimEnabled && isSwitchingBetweenEsims)
+                        ? mActiveSubInfos.stream()
+                                .filter(activeSubInfo -> activeSubInfo.isEmbedded())
+                                .findFirst().get()
+                        : mActiveSubInfos.get(0);
         ConfirmDialogFragment.show(
                 this,
                 ConfirmDialogFragment.OnConfirmListener.class,
                 DIALOG_TAG_ENABLE_SIM_CONFIRMATION,
                 getSwitchSubscriptionTitle(),
-                getSwitchDialogBodyMsg(activeSub, isBetweenEsim),
+                getSwitchDialogBodyMsg(activeSub, isSwitchingBetweenEsims),
                 getSwitchDialogPosBtnText(),
-                getString(android.R.string.cancel));
+                getString(R.string.sim_action_cancel));
     }
 
     private void showNonSwitchSimConfirmDialog() {
@@ -395,7 +450,36 @@
                 getEnableSubscriptionTitle(),
                 null /* msg */,
                 getString(R.string.yes),
-                getString(android.R.string.cancel));
+                getString(R.string.sim_action_cancel));
+    }
+
+    private void showMepSwitchSimConfirmDialog() {
+        Log.i(TAG, "showMepSwitchSimConfirmDialog");
+        final CharSequence displayName = SubscriptionUtil.getUniqueSubscriptionDisplayName(
+                mSubInfo, this);
+        String title = getString(R.string.sim_action_switch_sub_dialog_mep_title, displayName);
+        final StringBuilder switchDialogMsg = new StringBuilder();
+        switchDialogMsg.append(
+                getString(R.string.sim_action_switch_sub_dialog_mep_text, displayName));
+        if (isRtlMode) {
+            /* There are two lines of message in the dialog, and the RTL symbols must be added
+             * before and after each sentence, so use the line break symbol to find the position.
+             * (Each message are all with two line break symbols)
+             */
+            switchDialogMsg.insert(0, RTL_MARK)
+                    .insert(switchDialogMsg.indexOf(LINE_BREAK) - LINE_BREAK_OFFSET_ONE, RTL_MARK)
+                    .insert(switchDialogMsg.indexOf(LINE_BREAK) + LINE_BREAK_OFFSET_TWO, RTL_MARK)
+                    .insert(switchDialogMsg.length(), RTL_MARK);
+        }
+        ConfirmDialogFragment.show(
+                this,
+                ConfirmDialogFragment.OnConfirmListener.class,
+                DIALOG_TAG_ENABLE_SIM_CONFIRMATION_MEP,
+                title,
+                switchDialogMsg.toString(),
+                null,
+                null,
+                getSwitchDialogBodyList());
     }
 
     private String getSwitchDialogPosBtnText() {
@@ -429,21 +513,47 @@
                 mSubInfo, this);
         final CharSequence activeSubName = SubscriptionUtil.getUniqueSubscriptionDisplayName(
                 activeSub, this);
+        final StringBuilder switchDialogMsg = new StringBuilder();
         if (betweenEsim && mIsEsimOperation) {
-            return getString(
+            switchDialogMsg.append(getString(
                     R.string.sim_action_switch_sub_dialog_text_downloaded,
                     subInfoName,
-                    activeSubName);
+                    activeSubName));
         } else if (mIsEsimOperation) {
-            return getString(
+            switchDialogMsg.append(getString(
                     R.string.sim_action_switch_sub_dialog_text,
                     subInfoName,
-                    activeSubName);
+                    activeSubName));
         } else {
-            return getString(
+            switchDialogMsg.append(getString(
                     R.string.sim_action_switch_sub_dialog_text_single_sim,
-                    activeSubName);
+                    activeSubName));
         }
+        if (isRtlMode) {
+            /* There are two lines of message in the dialog, and the RTL symbols must be added
+             * before and after each sentence, so use the line break symbol to find the position.
+             * (Each message are all with two line break symbols)
+             */
+            switchDialogMsg.insert(0, RTL_MARK)
+                    .insert(switchDialogMsg.indexOf(LINE_BREAK) - LINE_BREAK_OFFSET_ONE, RTL_MARK)
+                    .insert(switchDialogMsg.indexOf(LINE_BREAK) + LINE_BREAK_OFFSET_TWO, RTL_MARK)
+                    .insert(switchDialogMsg.length(), RTL_MARK);
+        }
+        return switchDialogMsg.toString();
+    }
+
+    private ArrayList<String> getSwitchDialogBodyList() {
+        ArrayList<String> list = new ArrayList<String>(mActiveSubInfos.stream()
+                .map(subInfo -> {
+                    CharSequence subInfoName = SubscriptionUtil.getUniqueSubscriptionDisplayName(
+                            subInfo, this);
+                    return getString(
+                            R.string.sim_action_switch_sub_dialog_carrier_list_item_for_turning_off,
+                            subInfoName);
+                })
+                .collect(Collectors.toList()));
+        list.add(getString(R.string.sim_action_cancel));
+        return list;
     }
 
     private boolean isDsdsConditionSatisfied() {
@@ -455,16 +565,7 @@
             Log.i(TAG, "Hardware does not support DSDS.");
             return false;
         }
-        ImmutableList<UiccSlotInfo> slotInfos = UiccSlotUtil.getSlotInfos(mTelMgr);
-        boolean isRemovableSimEnabled =
-                slotInfos.stream()
-                        .anyMatch(
-                                slot ->
-                                        slot != null
-                                                && slot.isRemovable()
-                                                && slot.getIsActive()
-                                                && slot.getCardStateInfo()
-                                                        == UiccSlotInfo.CARD_STATE_INFO_PRESENT);
+        boolean isRemovableSimEnabled = isRemovableSimEnabled();
         if (mIsEsimOperation && isRemovableSimEnabled) {
             Log.i(TAG, "eSIM operation and removable SIM is enabled. DSDS condition satisfied.");
             return true;
@@ -473,13 +574,36 @@
                 SubscriptionUtil.getActiveSubscriptions(mSubscriptionManager).stream()
                         .anyMatch(SubscriptionInfo::isEmbedded);
         if (!mIsEsimOperation && isEsimProfileEnabled) {
-            Log.i(
-                    TAG,
-                    "Removable SIM operation and eSIM profile is enabled. DSDS condition"
-                        + " satisfied.");
+            Log.i(TAG, "Removable SIM operation and eSIM profile is enabled. DSDS condition"
+                    + " satisfied.");
             return true;
         }
         Log.i(TAG, "DSDS condition not satisfied.");
         return false;
     }
+
+    private boolean isRemovableSimEnabled() {
+        ImmutableList<UiccSlotInfo> slotInfos = UiccSlotUtil.getSlotInfos(mTelMgr);
+        boolean isRemovableSimEnabled =
+                slotInfos.stream()
+                        .anyMatch(
+                                slot -> slot != null
+                                        && slot.isRemovable()
+                                        && slot.getPorts().stream().anyMatch(
+                                                port -> port.isActive())
+                                        && slot.getCardStateInfo()
+                                                == UiccSlotInfo.CARD_STATE_INFO_PRESENT);
+        Log.i(TAG, "isRemovableSimEnabled: " + isRemovableSimEnabled);
+        return isRemovableSimEnabled;
+    }
+
+    private boolean isMultipleEnabledProfilesSupported() {
+        List<UiccCardInfo> cardInfos = mTelMgr.getUiccCardsInfo();
+        if (cardInfos == null) {
+            Log.w(TAG, "UICC cards info list is empty.");
+            return false;
+        }
+        return cardInfos.stream().anyMatch(
+                cardInfo -> cardInfo.isMultipleEnabledProfilesSupported());
+    }
 }
diff --git a/src/com/android/settings/nfc/NfcPaymentPreferenceController.java b/src/com/android/settings/nfc/NfcPaymentPreferenceController.java
index 9d3673d..edb12dd 100644
--- a/src/com/android/settings/nfc/NfcPaymentPreferenceController.java
+++ b/src/com/android/settings/nfc/NfcPaymentPreferenceController.java
@@ -20,6 +20,7 @@
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.nfc.NfcAdapter;
+import android.os.UserManager;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -127,7 +128,10 @@
     public CharSequence getSummary() {
         final PaymentAppInfo defaultApp = mPaymentBackend.getDefaultApp();
         if (defaultApp != null) {
-            return defaultApp.label;
+            UserManager um = mContext.createContextAsUser(
+                    defaultApp.userHandle, /*flags=*/0).getSystemService(UserManager.class);
+
+            return defaultApp.label + " (" + um.getUserName() + ")";
         } else {
             return mContext.getText(R.string.nfc_payment_default_not_set);
         }
@@ -218,12 +222,15 @@
             }
 
             // Prevent checked callback getting called on recycled views
+            UserManager um = mContext.createContextAsUser(
+                    appInfo.userHandle, /*flags=*/0).getSystemService(UserManager.class);
+
             holder.radioButton.setOnCheckedChangeListener(null);
             holder.radioButton.setChecked(appInfo.isDefault);
-            holder.radioButton.setContentDescription(appInfo.label);
+            holder.radioButton.setContentDescription(appInfo.label + " (" + um.getUserName() + ")");
             holder.radioButton.setOnCheckedChangeListener(this);
             holder.radioButton.setTag(appInfo);
-            holder.radioButton.setText(appInfo.label);
+            holder.radioButton.setText(appInfo.label + " (" + um.getUserName() + ")");
             return convertView;
         }
 
@@ -245,7 +252,8 @@
 
         private void makeDefault(PaymentAppInfo appInfo) {
             if (!appInfo.isDefault) {
-                mPaymentBackend.setDefaultPaymentApp(appInfo.componentName);
+                mPaymentBackend.setDefaultPaymentApp(appInfo.componentName,
+                        appInfo.userHandle.getIdentifier());
             }
             final Dialog dialog = mPreference.getDialog();
             if (dialog != null) {
diff --git a/src/com/android/settings/nfc/PaymentBackend.java b/src/com/android/settings/nfc/PaymentBackend.java
index a87855e..542c95b 100644
--- a/src/com/android/settings/nfc/PaymentBackend.java
+++ b/src/com/android/settings/nfc/PaymentBackend.java
@@ -16,11 +16,10 @@
 
 package com.android.settings.nfc;
 
+import android.app.ActivityManager;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.pm.PackageManager;
-import android.content.res.Resources;
-import android.graphics.drawable.Drawable;
 import android.nfc.NfcAdapter;
 import android.nfc.cardemulation.ApduServiceInfo;
 import android.nfc.cardemulation.CardEmulation;
@@ -28,6 +27,7 @@
 import android.os.Looper;
 import android.os.Message;
 import android.os.UserHandle;
+import android.os.UserManager;
 import android.provider.Settings;
 import android.provider.Settings.SettingNotFoundException;
 
@@ -49,6 +49,15 @@
         boolean isDefault;
         public ComponentName componentName;
         public ComponentName settingsComponent;
+        public UserHandle userHandle;
+    }
+
+    /**
+     * ComponentName of the payment application and the userId that it belongs to.
+     */
+    public static class PaymentInfo {
+        public ComponentName componentName;
+        public int userId;
     }
 
     private final Context mContext;
@@ -79,40 +88,55 @@
 
     public void refresh() {
         PackageManager pm = mContext.getPackageManager();
-        List<ApduServiceInfo> serviceInfos =
-                mCardEmuManager.getServices(CardEmulation.CATEGORY_PAYMENT);
-        ArrayList<PaymentAppInfo> appInfos = new ArrayList<PaymentAppInfo>();
+        ArrayList<PaymentAppInfo> appInfosAllProfiles = new ArrayList<PaymentAppInfo>();
 
-        if (serviceInfos == null) {
-            makeCallbacks();
-            return;
-        }
+        UserManager um = mContext.createContextAsUser(
+                UserHandle.of(ActivityManager.getCurrentUser()), /*flags=*/0)
+                .getSystemService(UserManager.class);
+        List<UserHandle> userHandles = um.getEnabledProfiles();
 
-        ComponentName defaultAppName = getDefaultPaymentApp();
+        PaymentInfo defaultAppName = getDefaultPaymentApp();
         PaymentAppInfo foundDefaultApp = null;
-        for (ApduServiceInfo service : serviceInfos) {
-            PaymentAppInfo appInfo = new PaymentAppInfo();
-            appInfo.label = service.loadLabel(pm);
-            if (appInfo.label == null) {
-                appInfo.label = service.loadAppLabel(pm);
+        for (UserHandle uh : userHandles) {
+            List<ApduServiceInfo> serviceInfosByProfile =
+                    mCardEmuManager.getServices(CardEmulation.CATEGORY_PAYMENT, uh.getIdentifier());
+            if (serviceInfosByProfile == null) continue;
+
+            ArrayList<PaymentAppInfo> appInfos = new ArrayList<PaymentAppInfo>();
+
+            for (ApduServiceInfo service : serviceInfosByProfile) {
+                PaymentAppInfo appInfo = new PaymentAppInfo();
+                appInfo.userHandle = uh;
+                appInfo.label = service.loadLabel(pm);
+                if (appInfo.label == null) {
+                    appInfo.label = service.loadAppLabel(pm);
+                }
+                if (defaultAppName == null) {
+                    appInfo.isDefault = false;
+                } else {
+                    appInfo.isDefault =
+                            service.getComponent().equals(defaultAppName.componentName)
+                            && defaultAppName.userId == uh.getIdentifier();
+                }
+                if (appInfo.isDefault) {
+                    foundDefaultApp = appInfo;
+                }
+                appInfo.componentName = service.getComponent();
+                String settingsActivity = service.getSettingsActivityName();
+                if (settingsActivity != null) {
+                    appInfo.settingsComponent = new ComponentName(
+                            appInfo.componentName.getPackageName(),
+                            settingsActivity);
+                } else {
+                    appInfo.settingsComponent = null;
+                }
+                appInfo.description = service.getDescription();
+
+                appInfos.add(appInfo);
             }
-            appInfo.isDefault = service.getComponent().equals(defaultAppName);
-            if (appInfo.isDefault) {
-                foundDefaultApp = appInfo;
-            }
-            appInfo.componentName = service.getComponent();
-            String settingsActivity = service.getSettingsActivityName();
-            if (settingsActivity != null) {
-                appInfo.settingsComponent = new ComponentName(
-                        appInfo.componentName.getPackageName(),
-                        settingsActivity);
-            } else {
-                appInfo.settingsComponent = null;
-            }
-            appInfo.description = service.getDescription();
-            appInfos.add(appInfo);
+            appInfosAllProfiles.addAll(appInfos);
         }
-        mAppInfos = appInfos;
+        mAppInfos = appInfosAllProfiles;
         mDefaultAppInfo = foundDefaultApp;
         makeCallbacks();
     }
@@ -141,21 +165,44 @@
 
     boolean isForegroundMode() {
         try {
-            return Settings.Secure.getInt(mContext.getContentResolver(),
-                    Settings.Secure.NFC_PAYMENT_FOREGROUND) != 0;
+            return Settings.Secure.getIntForUser(mContext.getContentResolver(),
+                    Settings.Secure.NFC_PAYMENT_FOREGROUND, UserHandle.myUserId()) != 0;
         } catch (SettingNotFoundException e) {
             return false;
         }
     }
 
     void setForegroundMode(boolean foreground) {
-        Settings.Secure.putInt(mContext.getContentResolver(),
-                Settings.Secure.NFC_PAYMENT_FOREGROUND, foreground ? 1 : 0);
+        UserManager um = mContext.createContextAsUser(
+                UserHandle.of(UserHandle.myUserId()), /*flags=*/0)
+                .getSystemService(UserManager.class);
+        List<UserHandle> userHandles = um.getEnabledProfiles();
+        for (UserHandle uh : userHandles) {
+            Settings.Secure.putIntForUser(mContext.getContentResolver(),
+                    Settings.Secure.NFC_PAYMENT_FOREGROUND, foreground ? 1 : 0, uh.getIdentifier());
+        }
     }
 
-    ComponentName getDefaultPaymentApp() {
-        String componentString = Settings.Secure.getString(mContext.getContentResolver(),
-                Settings.Secure.NFC_PAYMENT_DEFAULT_COMPONENT);
+    PaymentInfo getDefaultPaymentApp() {
+        UserManager um = mContext.createContextAsUser(
+                UserHandle.of(ActivityManager.getCurrentUser()), /*flags=*/0)
+                .getSystemService(UserManager.class);
+        List<UserHandle> userHandles = um.getEnabledProfiles();
+        for (UserHandle uh : userHandles) {
+            ComponentName defaultApp = getDefaultPaymentApp(uh.getIdentifier());
+            if (defaultApp != null) {
+                PaymentInfo appInfo = new PaymentInfo();
+                appInfo.userId = uh.getIdentifier();
+                appInfo.componentName = defaultApp;
+                return appInfo;
+            }
+        }
+        return null;
+    }
+
+    ComponentName getDefaultPaymentApp(int userId) {
+        String componentString = Settings.Secure.getStringForUser(mContext.getContentResolver(),
+                Settings.Secure.NFC_PAYMENT_DEFAULT_COMPONENT, userId);
         if (componentString != null) {
             return ComponentName.unflattenFromString(componentString);
         } else {
@@ -164,9 +211,29 @@
     }
 
     public void setDefaultPaymentApp(ComponentName app) {
-        Settings.Secure.putString(mContext.getContentResolver(),
-                Settings.Secure.NFC_PAYMENT_DEFAULT_COMPONENT,
-                app != null ? app.flattenToString() : null);
+        setDefaultPaymentApp(app, UserHandle.myUserId());
+    }
+
+    /**
+     *  Set Nfc default payment application
+     */
+    public void setDefaultPaymentApp(ComponentName app, int userId) {
+        UserManager um = mContext.createContextAsUser(
+                UserHandle.of(ActivityManager.getCurrentUser()), /*flags=*/0)
+                .getSystemService(UserManager.class);
+        List<UserHandle> userHandles = um.getEnabledProfiles();
+
+        for (UserHandle uh : userHandles) {
+            if (uh.getIdentifier() == userId) {
+                Settings.Secure.putStringForUser(mContext.getContentResolver(),
+                        Settings.Secure.NFC_PAYMENT_DEFAULT_COMPONENT,
+                        app != null ? app.flattenToString() : null, uh.getIdentifier());
+            } else {
+                Settings.Secure.putStringForUser(mContext.getContentResolver(),
+                        Settings.Secure.NFC_PAYMENT_DEFAULT_COMPONENT,
+                        null, uh.getIdentifier());
+            }
+        }
         refresh();
     }
 
diff --git a/src/com/android/settings/nfc/PaymentDefaultDialog.java b/src/com/android/settings/nfc/PaymentDefaultDialog.java
index d5a86a8..75746ce 100644
--- a/src/com/android/settings/nfc/PaymentDefaultDialog.java
+++ b/src/com/android/settings/nfc/PaymentDefaultDialog.java
@@ -21,12 +21,14 @@
 import android.content.Intent;
 import android.nfc.cardemulation.CardEmulation;
 import android.os.Bundle;
+import android.os.UserHandle;
 import android.util.Log;
 
 import com.android.internal.app.AlertActivity;
 import com.android.internal.app.AlertController;
 import com.android.settings.R;
 import com.android.settings.nfc.PaymentBackend.PaymentAppInfo;
+import com.android.settings.nfc.PaymentBackend.PaymentInfo;
 
 import java.util.List;
 
@@ -39,7 +41,7 @@
     private static final int PAYMENT_APP_MAX_CAPTION_LENGTH = 40;
 
     private PaymentBackend mBackend;
-    private ComponentName mNewDefault;
+    private PaymentInfo mNewDefault;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -56,9 +58,14 @@
         ComponentName component = intent.getParcelableExtra(
                 CardEmulation.EXTRA_SERVICE_COMPONENT);
         String category = intent.getStringExtra(CardEmulation.EXTRA_CATEGORY);
+        UserHandle userHandle = intent.getParcelableExtra(Intent.EXTRA_USER);
+        if (userHandle == null) {
+            userHandle = UserHandle.CURRENT;
+        }
+        int userId = userHandle.getIdentifier();
 
         setResult(RESULT_CANCELED);
-        if (!buildDialog(component, category)) {
+        if (!buildDialog(component, category, userId)) {
             finish();
         }
 
@@ -68,7 +75,7 @@
     public void onClick(DialogInterface dialog, int which) {
         switch (which) {
             case BUTTON_POSITIVE:
-                mBackend.setDefaultPaymentApp(mNewDefault);
+                mBackend.setDefaultPaymentApp(mNewDefault.componentName, mNewDefault.userId);
                 setResult(RESULT_OK);
                 break;
             case BUTTON_NEGATIVE:
@@ -76,7 +83,7 @@
         }
     }
 
-    private boolean buildDialog(ComponentName component, String category) {
+    private boolean buildDialog(ComponentName component, String category, int userId) {
         if (component == null || category == null) {
             Log.e(TAG, "Component or category are null");
             return false;
@@ -93,10 +100,12 @@
 
         List<PaymentAppInfo> services = mBackend.getPaymentAppInfos();
         for (PaymentAppInfo service : services) {
-            if (component.equals(service.componentName)) {
+            // check if userId matches
+            if (component.equals(service.componentName)
+                    && service.userHandle.getIdentifier() == userId) {
                 requestedPaymentApp = service;
             }
-            if (service.isDefault) {
+            if (service.isDefault && service.userHandle.getIdentifier() == userId) {
                 defaultPaymentApp = service;
             }
         }
@@ -107,13 +116,17 @@
         }
 
         // Get current mode and default component
-        ComponentName defaultComponent = mBackend.getDefaultPaymentApp();
-        if (defaultComponent != null && defaultComponent.equals(component)) {
+        PaymentInfo defaultComponent = mBackend.getDefaultPaymentApp();
+        if (defaultComponent != null && defaultComponent.componentName.equals(component)
+                && defaultComponent.userId == userId) {
             Log.e(TAG, "Component " + component + " is already default.");
             return false;
         }
 
-        mNewDefault = component;
+        mNewDefault = new PaymentInfo();
+        mNewDefault.componentName = component;
+        mNewDefault.userId = userId;
+
         // Compose dialog; get
         final AlertController.AlertParams p = mAlertParams;
         if (defaultPaymentApp == null) {
diff --git a/src/com/android/settings/notification/OWNERS b/src/com/android/settings/notification/OWNERS
index edf266e..a2ae9ce 100644
--- a/src/com/android/settings/notification/OWNERS
+++ b/src/com/android/settings/notification/OWNERS
@@ -1,4 +1,5 @@
 # Default reviewers for this and subdirectories.
-asc@google.com
+beverlyt@google.com
 dsandler@android.com
-juliacr@google.com
\ No newline at end of file
+juliacr@google.com
+yurilin@google.com
\ No newline at end of file
diff --git a/src/com/android/settings/notification/history/NotificationStation.java b/src/com/android/settings/notification/history/NotificationStation.java
index fa3a7b2..3ed8cdf 100644
--- a/src/com/android/settings/notification/history/NotificationStation.java
+++ b/src/com/android/settings/notification/history/NotificationStation.java
@@ -640,7 +640,7 @@
                     .append(' ')
                     .append(bold(getString(R.string.notification_log_details_ashmem)))
                     .append(delim)
-                    .append(String.valueOf(p.getBlobAshmemSize()))
+                    .append(String.valueOf(p.getOpenAshmemSize()))
                     .append("\n");
         }
         return sb;
diff --git a/src/com/android/settings/password/ChooseLockGeneric.java b/src/com/android/settings/password/ChooseLockGeneric.java
index a1826ba..2d6f6b0 100644
--- a/src/com/android/settings/password/ChooseLockGeneric.java
+++ b/src/com/android/settings/password/ChooseLockGeneric.java
@@ -614,7 +614,6 @@
                 disableUnusablePreferences();
                 updatePreferenceText();
                 updateCurrentPreference();
-                updatePreferenceSummaryIfNeeded();
             } else if (!isRecreatingActivity) {
                 // Don't start the activity again if we are recreated for configuration change
                 updateUnlockMethodAndFinish(quality, false, true /* chooseLockSkipped */);
@@ -715,13 +714,6 @@
             }
         }
 
-        private void setPreferenceSummary(ScreenLockType lock, @StringRes int summary) {
-            Preference preference = findPreference(lock.preferenceKey);
-            if (preference != null) {
-                preference.setSummary(summary);
-            }
-        }
-
         private void updateCurrentPreference() {
             String currentKey = getKeyForCurrent();
             Preference preference = findPreference(currentKey);
@@ -764,28 +756,6 @@
             }
         }
 
-        private void updatePreferenceSummaryIfNeeded() {
-            // On a default block encrypted device with accessibility, add a warning
-            // that your data is not credential encrypted
-            if (!StorageManager.isBlockEncrypted()) {
-                return;
-            }
-
-            if (StorageManager.isNonDefaultBlockEncrypted()) {
-                return;
-            }
-
-            if (AccessibilityManager.getInstance(getActivity()).getEnabledAccessibilityServiceList(
-                    AccessibilityServiceInfo.FEEDBACK_ALL_MASK).isEmpty()) {
-                return;
-            }
-
-            setPreferenceSummary(ScreenLockType.PATTERN, R.string.secure_lock_encryption_warning);
-            setPreferenceSummary(ScreenLockType.PIN, R.string.secure_lock_encryption_warning);
-            setPreferenceSummary(ScreenLockType.PASSWORD, R.string.secure_lock_encryption_warning);
-            setPreferenceSummary(ScreenLockType.MANAGED, R.string.secure_lock_encryption_warning);
-        }
-
         protected Intent getLockManagedPasswordIntent(LockscreenCredential password) {
             return mManagedPasswordProvider.createIntent(false, password);
         }
diff --git a/src/com/android/settings/password/ChooseLockSettingsHelper.java b/src/com/android/settings/password/ChooseLockSettingsHelper.java
index 77fcbed..e4d52ba 100644
--- a/src/com/android/settings/password/ChooseLockSettingsHelper.java
+++ b/src/com/android/settings/password/ChooseLockSettingsHelper.java
@@ -44,7 +44,6 @@
 
     private static final String TAG = "ChooseLockSettingsHelper";
 
-    public static final String EXTRA_KEY_TYPE = "type";
     public static final String EXTRA_KEY_PASSWORD = "password";
     public static final String EXTRA_KEY_RETURN_CREDENTIALS = "return_credentials";
     // Force the verifyCredential path instead of checkCredential path. This will be removed
@@ -191,7 +190,7 @@
         /**
          * @param returnCredentials if true, puts the following credentials into intent for
          *                          onActivityResult with the following keys:
-         *                          {@link #EXTRA_KEY_TYPE}, {@link #EXTRA_KEY_PASSWORD},
+         *                          {@link #EXTRA_KEY_PASSWORD},
          *                          {@link #EXTRA_KEY_CHALLENGE_TOKEN},
          *                          {@link #EXTRA_KEY_GK_PW_HANDLE}
          *                          Note that if this is true, this can only be called internally.
diff --git a/src/com/android/settings/password/ConfirmLockPassword.java b/src/com/android/settings/password/ConfirmLockPassword.java
index de32f13..2c90e55 100644
--- a/src/com/android/settings/password/ConfirmLockPassword.java
+++ b/src/com/android/settings/password/ConfirmLockPassword.java
@@ -29,7 +29,6 @@
 import android.os.Looper;
 import android.os.SystemClock;
 import android.os.UserManager;
-import android.os.storage.StorageManager;
 import android.text.Editable;
 import android.text.InputType;
 import android.text.TextUtils;
@@ -445,11 +444,6 @@
                         public void onChecked(boolean matched, int timeoutMs) {
                             mPendingLockCheck = null;
                             if (matched && isInternalActivity() && mReturnCredentials) {
-                                // TODO: get rid of EXTRA_KEY_TYPE, since EXTRA_KEY_PASSWORD already
-                                // distinguishes beteween PIN and password.
-                                intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_TYPE,
-                                                mIsAlpha ? StorageManager.CRYPT_TYPE_PASSWORD
-                                                         : StorageManager.CRYPT_TYPE_PIN);
                                 intent.putExtra(
                                         ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD, credential);
                             }
diff --git a/src/com/android/settings/password/ConfirmLockPattern.java b/src/com/android/settings/password/ConfirmLockPattern.java
index ec5efcf..674660e 100644
--- a/src/com/android/settings/password/ConfirmLockPattern.java
+++ b/src/com/android/settings/password/ConfirmLockPattern.java
@@ -26,7 +26,6 @@
 import android.os.CountDownTimer;
 import android.os.SystemClock;
 import android.os.UserManager;
-import android.os.storage.StorageManager;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
@@ -506,8 +505,6 @@
                             public void onChecked(boolean matched, int timeoutMs) {
                                 mPendingLockCheck = null;
                                 if (matched && isInternalActivity() && mReturnCredentials) {
-                                    intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_TYPE,
-                                                    StorageManager.CRYPT_TYPE_PATTERN);
                                     intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD,
                                                     pattern);
                                 }
diff --git a/src/com/android/settings/password/OWNERS b/src/com/android/settings/password/OWNERS
index cac6e3f..3b2013b 100644
--- a/src/com/android/settings/password/OWNERS
+++ b/src/com/android/settings/password/OWNERS
@@ -1,7 +1,12 @@
 # Default reviewers for this and subdirectories.
+curtislb@google.com
+graciecheng@google.com
+ilyamaty@google.com
 jaggies@google.com
+jbolinger@google.com
+joshmccloskey@google.com
 kchyn@google.com
 paulcrowley@google.com
 rubinxu@google.com
 
-# Emergency approvers in case the above are not available
\ No newline at end of file
+# Emergency approvers in case the above are not available
diff --git a/src/com/android/settings/security/CryptKeeperSettings.java b/src/com/android/settings/security/CryptKeeperSettings.java
deleted file mode 100644
index 4fc17fb..0000000
--- a/src/com/android/settings/security/CryptKeeperSettings.java
+++ /dev/null
@@ -1,229 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.security;
-
-import android.app.Activity;
-import android.app.admin.DevicePolicyManager;
-import android.app.settings.SettingsEnums;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.res.Resources;
-import android.os.BatteryManager;
-import android.os.Bundle;
-import android.os.UserHandle;
-import android.os.storage.StorageManager;
-import android.text.TextUtils;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-
-import androidx.appcompat.app.AlertDialog;
-import androidx.preference.Preference;
-
-import com.android.internal.widget.LockPatternUtils;
-import com.android.internal.widget.LockscreenCredential;
-import com.android.settings.CryptKeeperConfirm;
-import com.android.settings.R;
-import com.android.settings.SettingsActivity;
-import com.android.settings.core.InstrumentedPreferenceFragment;
-import com.android.settings.password.ChooseLockSettingsHelper;
-import com.android.settings.password.ConfirmLockPattern;
-
-public class CryptKeeperSettings extends InstrumentedPreferenceFragment {
-    private static final String TAG = "CryptKeeper";
-    private static final String TYPE = "type";
-    private static final String PASSWORD = "password";
-
-    private static final int KEYGUARD_REQUEST = 55;
-
-    // Minimum battery charge level (in percent) to launch encryption.  If the battery charge is
-    // lower than this, encryption should not be activated.
-    private static final int MIN_BATTERY_LEVEL = 80;
-
-    private View mContentView;
-    private Button mInitiateButton;
-    private View mPowerWarning;
-    private View mBatteryWarning;
-    private IntentFilter mIntentFilter;
-
-    private BroadcastReceiver mIntentReceiver = new BroadcastReceiver() {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            String action = intent.getAction();
-            if (action.equals(Intent.ACTION_BATTERY_CHANGED)) {
-                final int level = intent.getIntExtra(BatteryManager.EXTRA_LEVEL, 0);
-                final int plugged = intent.getIntExtra(BatteryManager.EXTRA_PLUGGED, 0);
-                final int invalidCharger = intent.getIntExtra(
-                    BatteryManager.EXTRA_INVALID_CHARGER, 0);
-
-                final boolean levelOk = level >= MIN_BATTERY_LEVEL;
-                final boolean pluggedOk =
-                    ((plugged & BatteryManager.BATTERY_PLUGGED_ANY) != 0) &&
-                     invalidCharger == 0;
-
-                // Update UI elements based on power/battery status
-                mInitiateButton.setEnabled(levelOk && pluggedOk);
-                mPowerWarning.setVisibility(pluggedOk ? View.GONE : View.VISIBLE );
-                mBatteryWarning.setVisibility(levelOk ? View.GONE : View.VISIBLE);
-            }
-        }
-    };
-
-    /**
-     * If the user clicks to begin the reset sequence, we next require a
-     * keyguard confirmation if the user has currently enabled one.  If there
-     * is no keyguard available, we prompt the user to set a password.
-     */
-    private Button.OnClickListener mInitiateListener = new Button.OnClickListener() {
-        @Override
-        public void onClick(View v) {
-            if (!runKeyguardConfirmation(KEYGUARD_REQUEST)) {
-                // TODO replace (or follow) this dialog with an explicit launch into password UI
-                new AlertDialog.Builder(getActivity())
-                    .setTitle(R.string.crypt_keeper_dialog_need_password_title)
-                    .setMessage(R.string.crypt_keeper_dialog_need_password_message)
-                    .setPositiveButton(android.R.string.ok, null)
-                    .create()
-                    .show();
-            }
-        }
-    };
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedState) {
-        mContentView = inflater.inflate(R.layout.crypt_keeper_settings, null);
-
-        mIntentFilter = new IntentFilter();
-        mIntentFilter.addAction(Intent.ACTION_BATTERY_CHANGED);
-
-        mInitiateButton = (Button) mContentView.findViewById(R.id.initiate_encrypt);
-        mInitiateButton.setOnClickListener(mInitiateListener);
-        mInitiateButton.setEnabled(false);
-
-        mPowerWarning = mContentView.findViewById(R.id.warning_unplugged);
-        mBatteryWarning = mContentView.findViewById(R.id.warning_low_charge);
-
-        return mContentView;
-    }
-
-    @Override
-    public int getMetricsCategory() {
-        return SettingsEnums.CRYPT_KEEPER;
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        getActivity().registerReceiver(mIntentReceiver, mIntentFilter);
-    }
-
-    @Override
-    public void onPause() {
-        super.onPause();
-        getActivity().unregisterReceiver(mIntentReceiver);
-    }
-
-    /**
-     * If encryption is already started, and this launched via a "start encryption" intent,
-     * then exit immediately - it's already up and running, so there's no point in "starting" it.
-     */
-    @Override
-    public void onActivityCreated(Bundle savedInstanceState) {
-        super.onActivityCreated(savedInstanceState);
-        Activity activity = getActivity();
-        Intent intent = activity.getIntent();
-        if (DevicePolicyManager.ACTION_START_ENCRYPTION.equals(intent.getAction())) {
-            DevicePolicyManager dpm = (DevicePolicyManager)
-                    activity.getSystemService(Context.DEVICE_POLICY_SERVICE);
-            if (dpm != null) {
-                int status = dpm.getStorageEncryptionStatus();
-                if (status != DevicePolicyManager.ENCRYPTION_STATUS_INACTIVE) {
-                    // There is nothing to do here, so simply finish() (which returns to caller)
-                    activity.finish();
-                }
-            }
-        }
-        activity.setTitle(R.string.crypt_keeper_encrypt_title);
-    }
-
-    /**
-     * Keyguard validation is run using the standard {@link ConfirmLockPattern}
-     * component as a subactivity
-     * @param request the request code to be returned once confirmation finishes
-     * @return true if confirmation launched
-     */
-    private boolean runKeyguardConfirmation(int request) {
-        final LockPatternUtils utils = new LockPatternUtils(getActivity());
-        if (utils.getKeyguardStoredPasswordQuality(UserHandle.myUserId())
-                == DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED) {
-            showFinalConfirmation(StorageManager.CRYPT_TYPE_DEFAULT, "".getBytes());
-            return true;
-        }
-
-        final Resources res = getActivity().getResources();
-        final ChooseLockSettingsHelper.Builder builder =
-                new ChooseLockSettingsHelper.Builder(getActivity(), this);
-        return builder.setRequestCode(request)
-                .setTitle(res.getText(R.string.crypt_keeper_encrypt_title))
-                .setReturnCredentials(true)
-                .show();
-    }
-
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-
-        if (requestCode != KEYGUARD_REQUEST) {
-            return;
-        }
-
-        // If the user entered a valid keyguard trace, present the final
-        // confirmation prompt; otherwise, go back to the initial state.
-        if (resultCode == Activity.RESULT_OK && data != null) {
-            int type = data.getIntExtra(ChooseLockSettingsHelper.EXTRA_KEY_TYPE, -1);
-            LockscreenCredential password = data.getParcelableExtra(
-                    ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD);
-            if (password != null && !password.isNone()) {
-                showFinalConfirmation(type, password.getCredential());
-            }
-        }
-    }
-
-    private void showFinalConfirmation(int type, byte[] password) {
-        Preference preference = new Preference(getPreferenceManager().getContext());
-        preference.setFragment(CryptKeeperConfirm.class.getName());
-        preference.setTitle(R.string.crypt_keeper_confirm_title);
-        addEncryptionInfoToPreference(preference, type, password);
-        ((SettingsActivity) getActivity()).onPreferenceStartFragment(null, preference);
-    }
-
-    private void addEncryptionInfoToPreference(Preference preference, int type, byte[] password) {
-        Activity activity = getActivity();
-        DevicePolicyManager dpm = (DevicePolicyManager)
-                activity.getSystemService(Context.DEVICE_POLICY_SERVICE);
-        if (dpm.getDoNotAskCredentialsOnBoot()) {
-            preference.getExtras().putInt(TYPE, StorageManager.CRYPT_TYPE_DEFAULT);
-            preference.getExtras().putByteArray(PASSWORD, "".getBytes());
-        } else {
-            preference.getExtras().putInt(TYPE, type);
-            preference.getExtras().putByteArray(PASSWORD, password);
-        }
-    }
-}
diff --git a/src/com/android/settings/security/EncryptionStatusPreferenceController.java b/src/com/android/settings/security/EncryptionStatusPreferenceController.java
index 322be10..d835798 100644
--- a/src/com/android/settings/security/EncryptionStatusPreferenceController.java
+++ b/src/com/android/settings/security/EncryptionStatusPreferenceController.java
@@ -55,15 +55,9 @@
     public void updateState(Preference preference) {
         final boolean encryptionEnabled = LockPatternUtils.isDeviceEncryptionEnabled();
         if (encryptionEnabled) {
-            if (TextUtils.equals(getPreferenceKey(), PREF_KEY_ENCRYPTION_DETAIL_PAGE)) {
-                preference.setFragment(null);
-            }
-            preference.setSummary(R.string.crypt_keeper_encrypted_summary);
+            preference.setSummary(R.string.encrypted_summary);
         } else {
-            if (TextUtils.equals(getPreferenceKey(), PREF_KEY_ENCRYPTION_DETAIL_PAGE)) {
-                preference.setFragment(CryptKeeperSettings.class.getName());
-            }
-            preference.setSummary(R.string.decryption_settings_summary);
+            preference.setSummary(R.string.not_encrypted_summary);
         }
 
     }
diff --git a/src/com/android/settings/sim/DsdsDialogActivity.java b/src/com/android/settings/sim/DsdsDialogActivity.java
index 62a6995..7d9a43b 100644
--- a/src/com/android/settings/sim/DsdsDialogActivity.java
+++ b/src/com/android/settings/sim/DsdsDialogActivity.java
@@ -85,7 +85,7 @@
     }
 
     @Override
-    public void onConfirm(int tag, boolean confirmed) {
+    public void onConfirm(int tag, boolean confirmed, int itemPosition) {
         if (!confirmed) {
             Log.i(TAG, "User cancel the dialog to enable DSDS.");
             startChooseSimActivity();
diff --git a/src/com/android/settings/sim/SelectSpecificDataSimDialogFragment.java b/src/com/android/settings/sim/SelectSpecificDataSimDialogFragment.java
new file mode 100644
index 0000000..f5c2406
--- /dev/null
+++ b/src/com/android/settings/sim/SelectSpecificDataSimDialogFragment.java
@@ -0,0 +1,172 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.sim;
+
+import android.app.Dialog;
+import android.app.settings.SettingsEnums;
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.LinearLayout;
+import android.widget.ListView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
+import androidx.appcompat.app.AlertDialog;
+
+import com.android.settings.R;
+import com.android.settings.network.SubscriptionUtil;
+
+import java.util.List;
+
+/**
+ * Presents a dialog asking the user if they want to switch the data to another sim
+ */
+public class SelectSpecificDataSimDialogFragment extends SimDialogFragment implements
+        DialogInterface.OnClickListener {
+    private static final String TAG = "PreferredSimDialogFrag";
+
+    private SubscriptionInfo mSubscriptionInfo;
+
+    /**
+     * @return the dialog fragment.
+     */
+    public static SelectSpecificDataSimDialogFragment newInstance() {
+        final SelectSpecificDataSimDialogFragment
+                fragment = new SelectSpecificDataSimDialogFragment();
+        final Bundle args = initArguments(SimDialogActivity.DATA_PICK,
+                R.string.select_specific_sim_for_data_title);
+        fragment.setArguments(args);
+        return fragment;
+    }
+
+    @NonNull
+    @Override
+    public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
+        final AlertDialog dialog = new AlertDialog.Builder(getContext())
+                .setNegativeButton(R.string.sim_action_no_thanks, null)
+                .create();
+        updateDialog(dialog);
+        return dialog;
+    }
+
+    @Override
+    public void onClick(DialogInterface dialog, int buttonClicked) {
+        if (buttonClicked != DialogInterface.BUTTON_POSITIVE) {
+            return;
+        }
+        final SimDialogActivity activity = (SimDialogActivity) getActivity();
+        final SubscriptionInfo info = getTargetSubscriptionInfo();
+        if (info != null) {
+            activity.onSubscriptionSelected(getDialogType(), info.getSubscriptionId());
+        }
+    }
+
+    private SubscriptionInfo getNonDefaultDataSubscriptionInfo(SubscriptionInfo dds) {
+        List<SubscriptionInfo> subInfos = getSubscriptionManager().getActiveSubscriptionInfoList();
+        if (subInfos == null || dds == null) {
+            return null;
+        }
+        return subInfos.stream().filter(subinfo -> subinfo != dds).findFirst().orElse(null);
+    }
+
+    private SubscriptionInfo getDefaultDataSubId() {
+        return getSubscriptionManager().getDefaultDataSubscriptionInfo();
+    }
+
+    private void updateDialog(AlertDialog dialog) {
+        Log.d(TAG, "Dialog updated, dismiss status: " + mWasDismissed);
+        if (mWasDismissed) {
+            return;
+        }
+
+        SubscriptionInfo activeSubInfo = getDefaultDataSubId();
+        SubscriptionInfo newSubInfo = getNonDefaultDataSubscriptionInfo(activeSubInfo);
+
+        if (newSubInfo == null || activeSubInfo == null) {
+            dismiss();
+            return;
+        }
+
+        setTargetSubscriptionInfo(newSubInfo);
+
+        CharSequence newDataCarrierName = SubscriptionUtil.getUniqueSubscriptionDisplayName(
+                newSubInfo, getContext());
+        CharSequence currentDataCarrierName = SubscriptionUtil.getUniqueSubscriptionDisplayName(
+                activeSubInfo, getContext());
+
+        String positive = getContext().getString(
+                R.string.select_specific_sim_for_data_button, newDataCarrierName);
+        String message = getContext().getString(R.string.select_specific_sim_for_data_msg,
+                newDataCarrierName, currentDataCarrierName);
+
+        View content = LayoutInflater.from(getContext()).inflate(
+                R.layout.sim_confirm_dialog_multiple_enabled_profiles_supported, null);
+        TextView dialogMessage = content.findViewById(R.id.msg);
+        if (!TextUtils.isEmpty(message) && dialogMessage != null) {
+            dialogMessage.setText(message);
+        }
+
+        final ListView lvItems = content.findViewById(R.id.carrier_list);
+        if (lvItems != null) {
+            lvItems.setVisibility(View.GONE);
+        }
+        final LinearLayout infoOutline = content.findViewById(R.id.info_outline_layout);
+        if (infoOutline != null) {
+            infoOutline.setVisibility(View.GONE);
+        }
+        dialog.setView(content);
+
+        View titleView = LayoutInflater.from(getContext()).inflate(
+                R.layout.sim_confirm_dialog_title_multiple_enabled_profiles_supported, null);
+        TextView titleTextView = titleView.findViewById(R.id.title);
+        titleTextView.setText(getContext().getString(getTitleResId(), newDataCarrierName));
+
+        dialog.setCustomTitle(titleTextView);
+        dialog.setButton(AlertDialog.BUTTON_POSITIVE, positive, this);
+    }
+
+    private void setTargetSubscriptionInfo(SubscriptionInfo subInfo) {
+        mSubscriptionInfo = subInfo;
+    }
+
+    private SubscriptionInfo getTargetSubscriptionInfo() {
+        return mSubscriptionInfo;
+    }
+
+    @Override
+    public void updateDialog() {
+        updateDialog((AlertDialog) getDialog());
+    }
+
+    @VisibleForTesting
+    protected SubscriptionManager getSubscriptionManager() {
+        return getContext().getSystemService(SubscriptionManager.class);
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return SettingsEnums.DIALOG_PREFERRED_SIM_PICKER;
+    }
+}
diff --git a/src/com/android/settings/sim/SimDialogActivity.java b/src/com/android/settings/sim/SimDialogActivity.java
index e5457ae..1125e1f 100644
--- a/src/com/android/settings/sim/SimDialogActivity.java
+++ b/src/com/android/settings/sim/SimDialogActivity.java
@@ -95,15 +95,16 @@
     private SimDialogFragment createFragment(int dialogType) {
         switch (dialogType) {
             case DATA_PICK:
-                return SimListDialogFragment.newInstance(dialogType, R.string.select_sim_for_data,
-                        false /* includeAskEveryTime */);
+                return getDataPickDialogFramgent();
             case CALLS_PICK:
                 return CallsSimListDialogFragment.newInstance(dialogType,
                         R.string.select_sim_for_calls,
-                        true /* includeAskEveryTime */);
+                        true /* includeAskEveryTime */,
+                        false /* isCancelItemShowed */);
             case SMS_PICK:
                 return SimListDialogFragment.newInstance(dialogType, R.string.select_sim_for_sms,
-                        true /* includeAskEveryTime */);
+                        true /* includeAskEveryTime */,
+                        false /* isCancelItemShowed */);
             case PREFERRED_PICK:
                 if (!getIntent().hasExtra(PREFERRED_SIM)) {
                     throw new IllegalArgumentException("Missing required extra " + PREFERRED_SIM);
@@ -111,12 +112,23 @@
                 return PreferredSimDialogFragment.newInstance();
             case SMS_PICK_FOR_MESSAGE:
                 return SimListDialogFragment.newInstance(dialogType, R.string.select_sim_for_sms,
-                        false /* includeAskEveryTime */);
+                        false /* includeAskEveryTime */,
+                        false /* isCancelItemShowed */);
             default:
                 throw new IllegalArgumentException("Invalid dialog type " + dialogType + " sent.");
         }
     }
 
+    private SimDialogFragment getDataPickDialogFramgent() {
+        if (SubscriptionManager.getDefaultDataSubscriptionId()
+                == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
+            return SimListDialogFragment.newInstance(DATA_PICK, R.string.select_sim_for_data,
+                    false /* includeAskEveryTime */,
+                    true /* isCancelItemShowed */);
+        }
+        return SelectSpecificDataSimDialogFragment.newInstance();
+    }
+
     public void onSubscriptionSelected(int dialogType, int subId) {
         if (getSupportFragmentManager().findFragmentByTag(Integer.toString(dialogType)) == null) {
             Log.w(TAG, "onSubscriptionSelected ignored because stored fragment was null");
@@ -160,8 +172,10 @@
         final TelephonyManager telephonyManager = getSystemService(
                 TelephonyManager.class).createForSubscriptionId(subId);
         subscriptionManager.setDefaultDataSubId(subId);
-        telephonyManager.setDataEnabled(true);
-        Toast.makeText(this, R.string.data_switch_started, Toast.LENGTH_LONG).show();
+        if (subId != SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
+            telephonyManager.setDataEnabled(true);
+            Toast.makeText(this, R.string.data_switch_started, Toast.LENGTH_LONG).show();
+        }
     }
 
     private void setDefaultCallsSubId(final int subId) {
diff --git a/src/com/android/settings/sim/SimListDialogFragment.java b/src/com/android/settings/sim/SimListDialogFragment.java
index 2681d7b..629a087 100644
--- a/src/com/android/settings/sim/SimListDialogFragment.java
+++ b/src/com/android/settings/sim/SimListDialogFragment.java
@@ -29,7 +29,7 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
-import android.widget.ImageView;
+import android.widget.ListView;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
@@ -38,7 +38,6 @@
 import androidx.appcompat.app.AlertDialog;
 
 import com.android.settings.R;
-import com.android.settings.Utils;
 import com.android.settings.network.SubscriptionUtil;
 
 import java.util.ArrayList;
@@ -52,16 +51,19 @@
         DialogInterface.OnClickListener {
     private static final String TAG = "SimListDialogFragment";
     protected static final String KEY_INCLUDE_ASK_EVERY_TIME = "include_ask_every_time";
+    protected static final String KEY_SHOW_CANCEL_ITEM = "show_cancel_item";
+    private static final int LIST_VIEW_DIVIDER_LINE_WEIGHT = 2;
 
     protected SelectSubscriptionAdapter mAdapter;
     @VisibleForTesting
     List<SubscriptionInfo> mSubscriptions;
 
     public static SimListDialogFragment newInstance(int dialogType, int titleResId,
-            boolean includeAskEveryTime) {
+            boolean includeAskEveryTime, boolean isCancelItemShowed) {
         final SimListDialogFragment fragment = new SimListDialogFragment();
         final Bundle args = initArguments(dialogType, titleResId);
         args.putBoolean(KEY_INCLUDE_ASK_EVERY_TIME, includeAskEveryTime);
+        args.putBoolean(KEY_SHOW_CANCEL_ITEM, isCancelItemShowed);
         fragment.setArguments(args);
         return fragment;
     }
@@ -72,12 +74,20 @@
         mSubscriptions = new ArrayList<>();
 
         final AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
-        builder.setTitle(getTitleResId());
+        View titleView = LayoutInflater.from(getContext()).inflate(
+                R.layout.sim_confirm_dialog_title_multiple_enabled_profiles_supported, null);
+        TextView titleTextView = titleView.findViewById(R.id.title);
+        titleTextView.setText(getContext().getString(getTitleResId()));
+        builder.setCustomTitle(titleTextView);
 
         mAdapter = new SelectSubscriptionAdapter(builder.getContext(), mSubscriptions);
-
         setAdapter(builder);
-        final Dialog dialog = builder.create();
+
+        final AlertDialog dialog = builder.create();
+        ListView listView = dialog.getListView();
+        if (listView != null) {
+            listView.setDividerHeight(LIST_VIEW_DIVIDER_LINE_WEIGHT);
+        }
         updateDialog();
         return dialog;
     }
@@ -112,10 +122,22 @@
             }
             return;
         }
-        if (getArguments().getBoolean(KEY_INCLUDE_ASK_EVERY_TIME)) {
-            final List<SubscriptionInfo> tmp = new ArrayList<>(currentSubscriptions.size() + 1);
-            tmp.add(null);
+        boolean includeAskEveryTime = getArguments().getBoolean(KEY_INCLUDE_ASK_EVERY_TIME);
+        boolean isCancelItemShowed = getArguments().getBoolean(KEY_SHOW_CANCEL_ITEM);
+        if (includeAskEveryTime || isCancelItemShowed) {
+            int arraySize = currentSubscriptions.size()
+                    + (includeAskEveryTime ? 1 : 0)
+                    + (isCancelItemShowed ? 1 : 0);
+            final List<SubscriptionInfo> tmp = new ArrayList<>(arraySize);
+            if (includeAskEveryTime) {
+                // add the value of 'AskEveryTime' item
+                tmp.add(null);
+            }
             tmp.addAll(currentSubscriptions);
+            if (isCancelItemShowed) {
+                // add the value of 'Cancel' item
+                tmp.add(null);
+            }
             currentSubscriptions = tmp;
         }
         if (currentSubscriptions.equals(mSubscriptions)) {
@@ -177,19 +199,23 @@
 
             final TextView title = convertView.findViewById(R.id.title);
             final TextView summary = convertView.findViewById(R.id.summary);
-            final ImageView icon = convertView.findViewById(R.id.icon);
 
             if (sub == null) {
-                title.setText(R.string.sim_calls_ask_first_prefs_title);
-                summary.setText("");
-                icon.setImageDrawable(mContext.getDrawable(R.drawable.ic_feedback_24dp));
-                icon.setImageTintList(
-                        Utils.getColorAttr(mContext, android.R.attr.textColorSecondary));
+                if (position == 0) {
+                    title.setText(R.string.sim_calls_ask_first_prefs_title);
+                } else {
+                    title.setText(R.string.sim_action_cancel);
+                }
+                summary.setVisibility(View.GONE);
             } else {
                 title.setText(SubscriptionUtil.getUniqueSubscriptionDisplayName(sub, mContext));
-                summary.setText(isMdnProvisioned(sub.getNumber()) ? sub.getNumber() : "");
-                icon.setImageBitmap(sub.createIconBitmap(mContext));
-
+                String phoneNumber = isMdnProvisioned(sub.getNumber()) ? sub.getNumber() : "";
+                if (!TextUtils.isEmpty(phoneNumber)) {
+                    summary.setVisibility(View.VISIBLE);
+                    summary.setText(phoneNumber);
+                } else {
+                    summary.setVisibility(View.GONE);
+                }
             }
             return convertView;
         }
diff --git a/src/com/android/settings/sim/SwitchToEsimConfirmDialogActivity.java b/src/com/android/settings/sim/SwitchToEsimConfirmDialogActivity.java
index 385deff..be2fa2d 100644
--- a/src/com/android/settings/sim/SwitchToEsimConfirmDialogActivity.java
+++ b/src/com/android/settings/sim/SwitchToEsimConfirmDialogActivity.java
@@ -101,7 +101,7 @@
     }
 
     @Override
-    public void onConfirm(int tag, boolean confirmed) {
+    public void onConfirm(int tag, boolean confirmed, int itemPosition) {
         if (!confirmed) {
             AlertDialogFragment.show(
                     this,
diff --git a/src/com/android/settings/sim/receivers/SimSlotChangeHandler.java b/src/com/android/settings/sim/receivers/SimSlotChangeHandler.java
index fe44389..e0bc9cd 100644
--- a/src/com/android/settings/sim/receivers/SimSlotChangeHandler.java
+++ b/src/com/android/settings/sim/receivers/SimSlotChangeHandler.java
@@ -164,14 +164,12 @@
 
     private void handleSimInsert(UiccSlotInfo removableSlotInfo) {
         Log.i(TAG, "Handle SIM inserted.");
-
         if (!isSuwFinished(mContext)) {
             Log.i(TAG, "Still in SUW. Handle SIM insertion after SUW is finished");
             setSuwRemovableSlotAction(mContext, LAST_USER_ACTION_IN_SUW_INSERT);
             return;
         }
-
-        if (removableSlotInfo.getIsActive()) {
+        if (removableSlotInfo.getPorts().stream().findFirst().get().isActive()) {
             Log.i(TAG, "The removable slot is already active. Do nothing.");
             return;
         }
@@ -213,7 +211,8 @@
 
         List<SubscriptionInfo> groupedEmbeddedSubscriptions = getGroupedEmbeddedSubscriptions();
 
-        if (groupedEmbeddedSubscriptions.size() == 0 || !removableSlotInfo.getIsActive()) {
+        if (groupedEmbeddedSubscriptions.size() == 0 || !removableSlotInfo.getPorts().stream()
+                .findFirst().get().isActive()) {
             Log.i(TAG, "eSIM slot is active or no subscriptions exist. Do nothing.");
             return;
         }
diff --git a/src/com/android/settings/sim/receivers/SimSlotChangeReceiver.java b/src/com/android/settings/sim/receivers/SimSlotChangeReceiver.java
index f2c7c65..f144c6b 100644
--- a/src/com/android/settings/sim/receivers/SimSlotChangeReceiver.java
+++ b/src/com/android/settings/sim/receivers/SimSlotChangeReceiver.java
@@ -20,6 +20,7 @@
 import android.content.Intent;
 import android.telephony.TelephonyManager;
 import android.telephony.UiccCardInfo;
+import android.telephony.UiccPortInfo;
 import android.telephony.UiccSlotInfo;
 import android.telephony.euicc.EuiccManager;
 import android.text.TextUtils;
@@ -116,9 +117,11 @@
             if (cardInfo == null) {
                 continue;
             }
-            if (!TextUtils.isEmpty(slotInfo.getCardId())
-                    || !TextUtils.isEmpty(cardInfo.getIccId())) {
-                isAllCardStringsEmpty = false;
+            for (UiccPortInfo portInfo : cardInfo.getPorts()) {
+                if (!TextUtils.isEmpty(slotInfo.getCardId())
+                        || !TextUtils.isEmpty(portInfo.getIccId())) {
+                    isAllCardStringsEmpty = false;
+                }
             }
         }
 
@@ -139,7 +142,7 @@
             return null;
         }
         return cardInfos.stream()
-                .filter(info -> info.getSlotIndex() == physicalSlotIndex)
+                .filter(info -> info.getPhysicalSlotIndex() == physicalSlotIndex)
                 .findFirst()
                 .orElse(null);
     }
diff --git a/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceController.java b/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceController.java
index d9d8737..15f47cf 100644
--- a/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceController.java
+++ b/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceController.java
@@ -16,7 +16,7 @@
 
 package com.android.settings.sound;
 
-import static android.bluetooth.IBluetoothHearingAid.HI_SYNC_ID_INVALID;
+import static android.bluetooth.BluetoothHearingAid.HI_SYNC_ID_INVALID;
 
 import android.bluetooth.BluetoothDevice;
 import android.content.Context;
diff --git a/src/com/android/settings/system/SystemUpdatePreferenceController.java b/src/com/android/settings/system/SystemUpdatePreferenceController.java
index 92819d6..b2a22ff 100644
--- a/src/com/android/settings/system/SystemUpdatePreferenceController.java
+++ b/src/com/android/settings/system/SystemUpdatePreferenceController.java
@@ -89,7 +89,7 @@
     @Override
     public CharSequence getSummary() {
         CharSequence summary = mContext.getString(R.string.android_version_summary,
-                Build.VERSION.RELEASE_OR_CODENAME);
+                Build.VERSION.RELEASE_OR_PREVIEW_DISPLAY);
         final FutureTask<Bundle> bundleFutureTask = new FutureTask<>(
                 // Put the API call in a future to avoid StrictMode violation.
                 () -> mUpdateManager.retrieveSystemUpdateInfo());
diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index 4c7be58..7f41f36 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -190,6 +190,8 @@
 
     // Worker thread used for WifiPickerTracker work
     private HandlerThread mWorkerThread;
+    private Handler mMainHandler;
+    private Handler mWorkerHandler;
 
     @VisibleForTesting
     WifiPickerTracker mWifiPickerTracker;
@@ -271,9 +273,8 @@
         mStatusMessagePreference = findPreference(PREF_KEY_STATUS_MESSAGE);
         mDataUsagePreference = findPreference(PREF_KEY_DATA_USAGE);
         mDataUsagePreference.setVisible(DataUsageUtils.hasWifiRadio(getContext()));
-        mDataUsagePreference.setTemplate(
-                NetworkTemplate.buildTemplateWifi(NetworkTemplate.WIFI_NETWORKID_ALL,
-                null /* subscriberId */), 0 /*subId*/, null /*service*/);
+        mDataUsagePreference.setTemplate(new NetworkTemplate.Builder(
+                NetworkTemplate.MATCH_WIFI).build(), 0 /*subId*/, null /*service*/);
     }
 
     @Override
@@ -291,11 +292,13 @@
                 return SystemClock.elapsedRealtime();
             }
         };
+
+        mMainHandler = new Handler(Looper.getMainLooper());
+        mWorkerHandler = mWorkerThread.getThreadHandler();
         mWifiPickerTracker = FeatureFactory.getFactory(context)
                 .getWifiTrackerLibProvider()
                 .createWifiPickerTracker(getSettingsLifecycle(), context,
-                        new Handler(Looper.getMainLooper()),
-                        mWorkerThread.getThreadHandler(),
+                        mMainHandler, mWorkerHandler,
                         elapsedRealtimeClock,
                         MAX_SCAN_AGE_MILLIS,
                         SCAN_INTERVAL_MILLIS,
@@ -367,6 +370,10 @@
         if (mWifiEnabler != null) {
             mWifiEnabler.teardownSwitchController();
         }
+
+        // remove all msg and callback in main handler and worker handler
+        mMainHandler.removeCallbacksAndMessages(null);
+        mWorkerHandler.removeCallbacksAndMessages(null);
         mWorkerThread.quit();
 
         super.onDestroyView();
@@ -651,7 +658,7 @@
     /** Called when the state of Wifi has changed. */
     @Override
     public void onWifiStateChanged() {
-        if (mIsRestricted) {
+        if (mIsRestricted || isFinishingOrDestroyed()) {
             return;
         }
         final int wifiState = mWifiPickerTracker.getWifiState();
@@ -689,6 +696,10 @@
 
     @Override
     public void onWifiEntriesChanged() {
+        if (isFinishingOrDestroyed()) {
+            return;
+        }
+
         if (mIsWifiEntryListStale) {
             mIsWifiEntryListStale = false;
             updateWifiEntryPreferences();
diff --git a/src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragment.java b/src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragment.java
index d8bdf32..528fbc3 100644
--- a/src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragment.java
+++ b/src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragment.java
@@ -168,10 +168,18 @@
                     break;
 
                 case MESSAGE_SCAN_ZXING_WIFI_FORMAT_SUCCESS:
+                    final Context context = getContext();
+                    if (context == null) {
+                        // Context may be null if the message is received after the Activity has
+                        // been destroyed
+                        Log.d(TAG, "Scan success but context is null");
+                        return;
+                    }
+
                     // We may get 2 WifiConfiguration if the QR code has no password in it,
                     // one for open network and one for enhanced open network.
                     final WifiManager wifiManager =
-                            getContext().getSystemService(WifiManager.class);
+                            context.getSystemService(WifiManager.class);
                     final WifiNetworkConfig qrCodeWifiNetworkConfig =
                             (WifiNetworkConfig)msg.obj;
                     final List<WifiConfiguration> qrCodeWifiConfigurations =
diff --git a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
index a926360..435c3e9 100644
--- a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
+++ b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
@@ -47,6 +47,7 @@
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.EditText;
 import android.widget.Toast;
 
@@ -199,7 +200,10 @@
     }
 
     @Override
-    public void onActivityCreated(Bundle savedInstanceState) {
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        final View root = super.onCreateView(inflater, container, savedInstanceState);
+
         final Activity activity = getActivity();
         if (mWifiP2pManager == null) {
             mWifiP2pManager = (WifiP2pManager) getSystemService(Context.WIFI_P2P_SERVICE);
@@ -332,8 +336,7 @@
                 }
             }
         };
-
-        super.onActivityCreated(savedInstanceState);
+        return root;
     }
 
     @Override
@@ -353,6 +356,7 @@
             mWifiP2pManager.requestDeviceInfo(mChannel, WifiP2pSettings.this);
             mIsIgnoreInitConnectionInfoCallback = false;
             mWifiP2pManager.requestNetworkInfo(mChannel, networkInfo -> {
+                if (mChannel == null) return;
                 mWifiP2pManager.requestConnectionInfo(mChannel, wifip2pinfo -> {
                     if (!mIsIgnoreInitConnectionInfoCallback) {
                         if (networkInfo.isConnected()) {
diff --git a/src/com/android/settings/wifi/qrcode/QrCamera.java b/src/com/android/settings/wifi/qrcode/QrCamera.java
index 3865eb1..d07c543 100644
--- a/src/com/android/settings/wifi/qrcode/QrCamera.java
+++ b/src/com/android/settings/wifi/qrcode/QrCamera.java
@@ -124,6 +124,7 @@
         }
         if (mCamera != null) {
             mCamera.stopPreview();
+            releaseCamera();
         }
     }
 
diff --git a/tests/robotests/assets/exempt_not_implementing_index_provider b/tests/robotests/assets/exempt_not_implementing_index_provider
index d4a1c2e..6a1a1ff 100644
--- a/tests/robotests/assets/exempt_not_implementing_index_provider
+++ b/tests/robotests/assets/exempt_not_implementing_index_provider
@@ -15,7 +15,6 @@
 com.android.settings.applications.appinfo.WriteSettingsDetails
 com.android.settings.applications.AppLaunchSettings
 com.android.settings.applications.AppStorageSettings
-com.android.settings.applications.ConfirmConvertToFbe
 com.android.settings.applications.ProcessStatsDetail
 com.android.settings.applications.ProcessStatsSummary
 com.android.settings.applications.ProcessStatsUi
diff --git a/tests/robotests/src/com/android/settings/AllInOneTetherSettingsTest.java b/tests/robotests/src/com/android/settings/AllInOneTetherSettingsTest.java
index cd33663..01ec42e 100644
--- a/tests/robotests/src/com/android/settings/AllInOneTetherSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/AllInOneTetherSettingsTest.java
@@ -33,8 +33,10 @@
 
 import android.content.Context;
 import android.net.ConnectivityManager;
+import android.net.EthernetManager;
 import android.net.TetheringManager;
 import android.net.wifi.SoftApConfiguration;
+import android.net.wifi.WifiManager;
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.util.FeatureFlagUtils;
@@ -43,7 +45,6 @@
 import androidx.preference.PreferenceScreen;
 
 import com.android.settings.core.FeatureFlags;
-import com.android.settings.testutils.shadow.ShadowWifiManager;
 import com.android.settings.wifi.tether.WifiTetherAutoOffPreferenceController;
 import com.android.settings.wifi.tether.WifiTetherSecurityPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -55,14 +56,12 @@
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
 import org.robolectric.util.ReflectionHelpers;
 
 import java.util.ArrayList;
 import java.util.List;
 
 @RunWith(RobolectricTestRunner.class)
-@Config(shadows = {ShadowWifiManager.class})
 public class AllInOneTetherSettingsTest {
     private static final String[] WIFI_REGEXS = {"wifi_regexs"};
     private static final String[] USB_REGEXS = {"usb_regexs"};
@@ -73,6 +72,8 @@
     private AllInOneTetherSettings mAllInOneTetherSettings;
 
     @Mock
+    private WifiManager mWifiManager;
+    @Mock
     private ConnectivityManager mConnectivityManager;
     @Mock
     private TetheringManager mTetheringManager;
@@ -84,16 +85,20 @@
     private PreferenceScreen mPreferenceScreen;
     @Mock
     private PreferenceGroup mWifiTetherGroup;
+    @Mock
+    private EthernetManager mEthernetManager;
 
     @Before
     public void setUp() {
         mContext = spy(RuntimeEnvironment.application);
 
         MockitoAnnotations.initMocks(this);
+        doReturn(mWifiManager).when(mContext).getSystemService(WifiManager.class);
         doReturn(mConnectivityManager)
                 .when(mContext).getSystemService(Context.CONNECTIVITY_SERVICE);
         doReturn(mTetheringManager)
                 .when(mContext).getSystemService(Context.TETHERING_SERVICE);
+        doReturn(mEthernetManager).when(mContext).getSystemService(EthernetManager.class);
         doReturn(WIFI_REGEXS).when(mTetheringManager).getTetherableWifiRegexs();
         doReturn(USB_REGEXS).when(mTetheringManager).getTetherableUsbRegexs();
         doReturn(BT_REGEXS).when(mTetheringManager).getTetherableBluetoothRegexs();
diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilityHearingAidPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilityHearingAidPreferenceControllerTest.java
index 0b739f4..f09d2f3 100644
--- a/tests/robotests/src/com/android/settings/accessibility/AccessibilityHearingAidPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilityHearingAidPreferenceControllerTest.java
@@ -193,7 +193,7 @@
     private void setupBluetoothEnvironment() {
         ShadowBluetoothUtils.sLocalBluetoothManager = mLocalBluetoothManager;
         mLocalBluetoothManager = Utils.getLocalBtManager(mContext);
-        mBluetoothManager = new BluetoothManager(mContext);
+        mBluetoothManager = mContext.getSystemService(BluetoothManager.class);
         mBluetoothAdapter = mBluetoothManager.getAdapter();
         when(mLocalBluetoothManager.getCachedDeviceManager()).thenReturn(mCachedDeviceManager);
         when(mLocalBluetoothManager.getProfileManager()).thenReturn(mLocalBluetoothProfileManager);
diff --git a/tests/robotests/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderControllerTest.java
index 31687c6..6087ef2 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderControllerTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderControllerTest.java
@@ -99,6 +99,7 @@
         mController.mBluetoothAdapter = mBluetoothAdapter;
         when(mCachedDevice.getDevice()).thenReturn(mBluetoothDevice);
         when(mCachedDevice.getAddress()).thenReturn(MAC_ADDRESS);
+        when(mCachedDevice.getIdentityAddress()).thenReturn(MAC_ADDRESS);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdaterTest.java b/tests/robotests/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdaterTest.java
index 924e246..3cdff6e 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdaterTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdaterTest.java
@@ -235,6 +235,32 @@
     }
 
     @Test
+    public void onProfileConnectionStateChanged_leAudioDeviceConnected_notInCall_addsPreference() {
+        mAudioManager.setMode(AudioManager.MODE_NORMAL);
+        when(mBluetoothDeviceUpdater
+                .isDeviceConnected(any(CachedBluetoothDevice.class))).thenReturn(true);
+        when(mCachedBluetoothDevice.isConnectedLeAudioDevice()).thenReturn(true);
+
+        mBluetoothDeviceUpdater.onProfileConnectionStateChanged(mCachedBluetoothDevice,
+                BluetoothProfile.STATE_CONNECTED, BluetoothProfile.LE_AUDIO);
+
+        verify(mBluetoothDeviceUpdater).addPreference(mCachedBluetoothDevice);
+    }
+
+    @Test
+    public void onProfileConnectionStateChanged_leAudioDeviceConnected_inCall_addsPreference() {
+        mAudioManager.setMode(AudioManager.MODE_IN_CALL);
+        when(mBluetoothDeviceUpdater
+                .isDeviceConnected(any(CachedBluetoothDevice.class))).thenReturn(true);
+        when(mCachedBluetoothDevice.isConnectedLeAudioDevice()).thenReturn(true);
+
+        mBluetoothDeviceUpdater.onProfileConnectionStateChanged(mCachedBluetoothDevice,
+                BluetoothProfile.STATE_CONNECTED, BluetoothProfile.LE_AUDIO);
+
+        verify(mBluetoothDeviceUpdater).addPreference(mCachedBluetoothDevice);
+    }
+
+    @Test
     public void onProfileConnectionStateChanged_deviceDisconnected_removePreference() {
         mBluetoothDeviceUpdater.onProfileConnectionStateChanged(mCachedBluetoothDevice,
                 BluetoothProfile.STATE_DISCONNECTED, BluetoothProfile.A2DP);
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java
index 6401388..08f7084 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java
@@ -76,7 +76,7 @@
         when(mFragment.getPreferenceScreen()).thenReturn(mScreen);
         mLifecycleOwner = () -> mLifecycle;
         mLifecycle = spy(new Lifecycle(mLifecycleOwner));
-        mBluetoothManager = new BluetoothManager(mContext);
+        mBluetoothManager = mContext.getSystemService(BluetoothManager.class);
         mBluetoothAdapter = mBluetoothManager.getAdapter();
     }
 
@@ -155,6 +155,7 @@
         mDevice = mBluetoothAdapter.getRemoteDevice(config.getAddress());
         when(mCachedDevice.getDevice()).thenReturn(mDevice);
         when(mCachedDevice.getAddress()).thenReturn(config.getAddress());
+        when(mCachedDevice.getIdentityAddress()).thenReturn(config.getAddress());
     }
 
     /**
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java
index ce41a8d..fac8b58 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java
@@ -89,6 +89,7 @@
         when(fragmentManager.beginTransaction()).thenReturn(mFragmentTransaction);
 
         when(mCachedDevice.getAddress()).thenReturn(TEST_ADDRESS);
+        when(mCachedDevice.getIdentityAddress()).thenReturn(TEST_ADDRESS);
         Bundle args = new Bundle();
         args.putString(BluetoothDeviceDetailsFragment.KEY_DEVICE_ADDRESS, TEST_ADDRESS);
         mFragment.setArguments(args);
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingControllerTest.java
index 6da9bf4..88e15eb 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingControllerTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingControllerTest.java
@@ -24,6 +24,7 @@
 import android.bluetooth.BluetoothDevice;
 import android.content.Context;
 import android.content.Intent;
+import android.os.Parcel;
 
 import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;
 
@@ -40,12 +41,22 @@
 @Config(shadows = {ShadowBluetoothAdapter.class})
 public class BluetoothPairingControllerTest {
     private final BluetoothClass mBluetoothClass =
-            new BluetoothClass(BluetoothClass.Device.AUDIO_VIDEO_HANDSFREE);
+            createBtClass(BluetoothClass.Device.AUDIO_VIDEO_HANDSFREE);
     @Mock
     private BluetoothDevice mBluetoothDevice;
     private Context mContext;
     private BluetoothPairingController mBluetoothPairingController;
 
+    private BluetoothClass createBtClass(int deviceClass) {
+        Parcel p = Parcel.obtain();
+        p.writeInt(deviceClass);
+        p.setDataPosition(0); // reset position of parcel before passing to constructor
+
+        BluetoothClass bluetoothClass = BluetoothClass.CREATOR.createFromParcel(p);
+        p.recycle();
+        return bluetoothClass;
+    }
+
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDetailTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDetailTest.java
index ea841fa..bac868f 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDetailTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDetailTest.java
@@ -305,6 +305,7 @@
         when(cachedDevice.isConnected()).thenReturn(true);
         when(cachedDevice.getDevice()).thenReturn(device2);
         when(cachedDevice.getAddress()).thenReturn(TEST_DEVICE_ADDRESS_B);
+        when(cachedDevice.getIdentityAddress()).thenReturn(TEST_DEVICE_ADDRESS_B);
 
         mFragment.onProfileConnectionStateChanged(cachedDevice, BluetoothProfile.A2DP,
                 BluetoothAdapter.STATE_CONNECTED);
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDialogTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDialogTest.java
index be733ec..a53e693 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDialogTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDialogTest.java
@@ -427,6 +427,34 @@
         userEntryDialogExistingTextTest("test");
     }
 
+    @Test
+    public void groupPairing_setMemberDevice_showsMessageHint() {
+        // set the correct dialog type
+        when(controller.getDialogType()).thenReturn(BluetoothPairingController.CONFIRMATION_DIALOG);
+        when(controller.isCoordinatedSetMemberDevice()).thenReturn(true);
+
+        // build the fragment
+        BluetoothPairingDialogFragment frag = makeFragment();
+
+        // verify message is what we expect it to be and is visible
+        TextView message = frag.getmDialog().findViewById(R.id.pairing_group_message);
+        assertThat(message.getVisibility()).isEqualTo(View.VISIBLE);
+    }
+
+    @Test
+    public void groupPairing_nonSetMemberDevice_hidesMessageHint() {
+        // set the correct dialog type
+        when(controller.getDialogType()).thenReturn(BluetoothPairingController.CONFIRMATION_DIALOG);
+        when(controller.isCoordinatedSetMemberDevice()).thenReturn(false);
+
+        // build the fragment
+        BluetoothPairingDialogFragment frag = makeFragment();
+
+        // verify message is what we expect it to be and is visible
+        TextView message = frag.getmDialog().findViewById(R.id.pairing_group_message);
+        assertThat(message.getVisibility()).isEqualTo(View.GONE);
+    }
+
     // Runs a test simulating the user entry dialog type in a situation like device rotation, where
     // the dialog fragment gets created and we already have some existing text entered into the
     // pin field.
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingServiceTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingServiceTest.java
index e73b447..3194e55 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingServiceTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingServiceTest.java
@@ -106,7 +106,7 @@
 
         mBluetoothPairingService.onStartCommand(intent, /* flags */ 0, /* startId */ 0);
 
-        verify(mDevice).cancelPairing();
+        verify(mDevice).cancelBondProcess();
         verify(mNm).cancel(mBluetoothPairingService.NOTIFICATION_ID);
     }
 
diff --git a/tests/robotests/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdaterTest.java b/tests/robotests/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdaterTest.java
index ea91fed..98f1fe3 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdaterTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdaterTest.java
@@ -235,6 +235,33 @@
     }
 
     @Test
+    public void onProfileConnectionStateChanged_leAudioDeviceConnected_inCall_removesPreference() {
+        mAudioManager.setMode(AudioManager.MODE_IN_CALL);
+        when(mBluetoothDeviceUpdater
+                .isDeviceConnected(any(CachedBluetoothDevice.class))).thenReturn(true);
+        when(mCachedBluetoothDevice.isConnectedLeAudioDevice()).thenReturn(true);
+
+        mBluetoothDeviceUpdater.onProfileConnectionStateChanged(mCachedBluetoothDevice,
+                BluetoothProfile.STATE_CONNECTED, BluetoothProfile.LE_AUDIO);
+
+        verify(mBluetoothDeviceUpdater).removePreference(mCachedBluetoothDevice);
+    }
+
+    @Test
+    public void onProfileConnectionStateChanged_leAudioDeviceConnected_notInCall_removesPreference()
+    {
+        mAudioManager.setMode(AudioManager.MODE_NORMAL);
+        when(mBluetoothDeviceUpdater
+                .isDeviceConnected(any(CachedBluetoothDevice.class))).thenReturn(true);
+        when(mCachedBluetoothDevice.isConnectedLeAudioDevice()).thenReturn(true);
+
+        mBluetoothDeviceUpdater.onProfileConnectionStateChanged(mCachedBluetoothDevice,
+                BluetoothProfile.STATE_CONNECTED, BluetoothProfile.LE_AUDIO);
+
+        verify(mBluetoothDeviceUpdater).removePreference(mCachedBluetoothDevice);
+    }
+
+    @Test
     public void onProfileConnectionStateChanged_deviceDisconnected_removePreference() {
         mBluetoothDeviceUpdater.onProfileConnectionStateChanged(mCachedBluetoothDevice,
                 BluetoothProfile.STATE_DISCONNECTED, BluetoothProfile.A2DP);
diff --git a/tests/robotests/src/com/android/settings/bluetooth/ForgetDeviceDialogFragmentTest.java b/tests/robotests/src/com/android/settings/bluetooth/ForgetDeviceDialogFragmentTest.java
index 5c23238..9c266c1 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/ForgetDeviceDialogFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/ForgetDeviceDialogFragmentTest.java
@@ -73,6 +73,7 @@
         FakeFeatureFactory.setupForTest();
         String deviceAddress = "55:66:77:88:99:AA";
         when(mCachedDevice.getAddress()).thenReturn(deviceAddress);
+        when(mCachedDevice.getIdentityAddress()).thenReturn(deviceAddress);
         when(mCachedDevice.getDevice()).thenReturn(mBluetoothDevice);
         when(mCachedDevice.getName()).thenReturn(DEVICE_NAME);
         mFragment = spy(ForgetDeviceDialogFragment.newInstance(deviceAddress));
diff --git a/tests/robotests/src/com/android/settings/bluetooth/RemoteDeviceNameDialogFragmentTest.java b/tests/robotests/src/com/android/settings/bluetooth/RemoteDeviceNameDialogFragmentTest.java
index c8467b2..ad5b70c 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/RemoteDeviceNameDialogFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/RemoteDeviceNameDialogFragmentTest.java
@@ -62,6 +62,7 @@
 
         String deviceAddress = "55:66:77:88:99:AA";
         when(mCachedDevice.getAddress()).thenReturn(deviceAddress);
+        when(mCachedDevice.getIdentityAddress()).thenReturn(deviceAddress);
         mFragment = spy(RemoteDeviceNameDialogFragment.newInstance(mCachedDevice));
         doReturn(mCachedDevice).when(mFragment).getDevice(any());
     }
diff --git a/tests/robotests/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdaterTest.java b/tests/robotests/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdaterTest.java
index 78a7a69..da7516b 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdaterTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdaterTest.java
@@ -250,4 +250,22 @@
         verify(mBluetoothDeviceUpdater).addPreference(mCachedBluetoothDevice,
                 BluetoothDevicePreference.SortType.TYPE_NO_SORT);
     }
+
+    @Test
+    public void forceUpdate_deviceIsSubDevice_doesNothing() {
+        final List<BluetoothDevice> bluetoothDevices = new ArrayList<>();
+        bluetoothDevices.add(mBluetoothDevice);
+
+        when(mBluetoothAdapter.isEnabled()).thenReturn(true);
+        when(mBluetoothAdapter.getMostRecentlyConnectedDevices()).thenReturn(bluetoothDevices);
+        when(mBluetoothManager.getCachedDeviceManager()).thenReturn(mDeviceManager);
+        when(mDeviceManager.findDevice(mBluetoothDevice)).thenReturn(mCachedBluetoothDevice);
+        when(mDeviceManager.isSubDevice(mBluetoothDevice)).thenReturn(true);
+
+        mBluetoothDeviceUpdater.forceUpdate();
+
+        verify(mBluetoothDeviceUpdater, never()).removePreference(mCachedBluetoothDevice);
+        verify(mBluetoothDeviceUpdater, never()).addPreference(mCachedBluetoothDevice,
+                BluetoothDevicePreference.SortType.TYPE_NO_SORT);
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java b/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java
index f75b7f0..09c5734 100644
--- a/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java
@@ -18,7 +18,7 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyBoolean;
 import static org.mockito.ArgumentMatchers.anyInt;
@@ -310,8 +310,7 @@
         ReflectionHelpers.setField(mFragment, "mContext", context);
         ReflectionHelpers.setField(mFragment, "mAppItem", appItem);
         ReflectionHelpers.setField(mFragment, "mTemplate",
-                NetworkTemplate.buildTemplateWifi(NetworkTemplate.WIFI_NETWORKID_ALL,
-                null /* subscriberId */));
+                new NetworkTemplate.Builder(NetworkTemplate.MATCH_WIFI).build());
         final long end = System.currentTimeMillis();
         final long start = end - (DateUtils.WEEK_IN_MILLIS * 4);
 
@@ -336,8 +335,7 @@
         ReflectionHelpers.setField(mFragment, "mContext", context);
         ReflectionHelpers.setField(mFragment, "mAppItem", appItem);
         ReflectionHelpers.setField(mFragment, "mTemplate",
-                NetworkTemplate.buildTemplateWifi(NetworkTemplate.WIFI_NETWORKID_ALL,
-                null /* subscriberId */));
+                new NetworkTemplate.Builder(NetworkTemplate.MATCH_WIFI).build());
         final long end = System.currentTimeMillis();
         final long start = end - (DateUtils.WEEK_IN_MILLIS * 4);
 
@@ -368,8 +366,7 @@
         ReflectionHelpers.setField(mFragment, "mCycles", testCycles);
         ReflectionHelpers.setField(mFragment, "mAppItem", appItem);
         ReflectionHelpers.setField(mFragment, "mTemplate",
-                NetworkTemplate.buildTemplateWifi(NetworkTemplate.WIFI_NETWORKID_ALL,
-                null /* subscriberId */));
+                new NetworkTemplate.Builder(NetworkTemplate.MATCH_WIFI).build());
 
         final NetworkCycleDataForUidLoader loader = (NetworkCycleDataForUidLoader)
                 mFragment.mUidDataCallbacks.onCreateLoader(0 /* id */, Bundle.EMPTY /* args */);
@@ -441,8 +438,7 @@
 
         assertThat(mFragment.mTemplate.getMatchRule())
                 .isEqualTo(NetworkTemplate.MATCH_WIFI);
-        assertNull(mFragment.mTemplate.getSubscriberId());
-        assertThat(mFragment.mTemplate.getNetworkId())
-                .isEqualTo(NetworkTemplate.WIFI_NETWORKID_ALL);
+        assertTrue(mFragment.mTemplate.getSubscriberIds().isEmpty());
+        assertTrue(mFragment.mTemplate.getWifiNetworkKeys().isEmpty());
     }
 }
diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsagePreferenceTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsagePreferenceTest.java
index ff8ef93..02f683a 100644
--- a/tests/robotests/src/com/android/settings/datausage/DataUsagePreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/DataUsagePreferenceTest.java
@@ -24,6 +24,7 @@
 
 import android.content.Context;
 import android.content.Intent;
+import android.net.NetworkStats;
 import android.net.NetworkTemplate;
 
 import com.android.settingslib.net.DataUsageController;
@@ -58,8 +59,9 @@
     public void setTemplate_noDataUsage_shouldDisablePreference() {
         doReturn(0L).when(mController).getHistoricalUsageLevel(any(NetworkTemplate.class));
 
-        mPreference.setTemplate(
-                NetworkTemplate.buildTemplateMobileWildcard(), 5 /* subId */, null /* services */);
+        mPreference.setTemplate(new NetworkTemplate.Builder(NetworkTemplate.MATCH_MOBILE)
+                .setMeteredness(NetworkStats.METERED_YES).build(),
+                5 /* subId */, null /* services */);
 
         verify(mPreference).setEnabled(false);
         verify(mPreference).setIntent(null);
@@ -69,8 +71,9 @@
     public void setTemplate_hasDataUsage_shouldNotDisablePreference() {
         doReturn(200L).when(mController).getHistoricalUsageLevel(any(NetworkTemplate.class));
 
-        mPreference.setTemplate(
-                NetworkTemplate.buildTemplateMobileWildcard(), 5 /* subId */, null /* services */);
+        mPreference.setTemplate(new NetworkTemplate.Builder(NetworkTemplate.MATCH_MOBILE)
+                .setMeteredness(NetworkStats.METERED_YES).build(),
+                5 /* subId */, null /* services */);
 
         verify(mPreference, never()).setEnabled(false);
         verify(mPreference).setIntent(any(Intent.class));
diff --git a/tests/robotests/src/com/android/settings/datausage/lib/DataUsageLibTest.java b/tests/robotests/src/com/android/settings/datausage/lib/DataUsageLibTest.java
index 8d994d0..70a1a38 100644
--- a/tests/robotests/src/com/android/settings/datausage/lib/DataUsageLibTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/lib/DataUsageLibTest.java
@@ -81,8 +81,8 @@
         when(mSubscriptionManager.isActiveSubscriptionId(SUB_ID)).thenReturn(false);
 
         final NetworkTemplate networkTemplate = DataUsageLib.getMobileTemplate(mContext, SUB_ID);
-        assertThat(networkTemplate.matchesSubscriberId(SUBSCRIBER_ID)).isTrue();
-        assertThat(networkTemplate.matchesSubscriberId(SUBSCRIBER_ID_2)).isFalse();
+        assertThat(networkTemplate.getSubscriberIds().contains(SUBSCRIBER_ID)).isTrue();
+        assertThat(networkTemplate.getSubscriberIds().contains(SUBSCRIBER_ID_2)).isFalse();
     }
 
     @Test
@@ -94,8 +94,8 @@
                 .thenReturn(new String[] {SUBSCRIBER_ID});
 
         final NetworkTemplate networkTemplate = DataUsageLib.getMobileTemplate(mContext, SUB_ID);
-        assertThat(networkTemplate.matchesSubscriberId(SUBSCRIBER_ID)).isTrue();
-        assertThat(networkTemplate.matchesSubscriberId(SUBSCRIBER_ID_2)).isFalse();
+        assertThat(networkTemplate.getSubscriberIds().contains(SUBSCRIBER_ID)).isTrue();
+        assertThat(networkTemplate.getSubscriberIds().contains(SUBSCRIBER_ID_2)).isFalse();
     }
 
     @Test
@@ -107,7 +107,7 @@
                 .thenReturn(new String[] {SUBSCRIBER_ID, SUBSCRIBER_ID_2});
 
         final NetworkTemplate networkTemplate = DataUsageLib.getMobileTemplate(mContext, SUB_ID);
-        assertThat(networkTemplate.matchesSubscriberId(SUBSCRIBER_ID)).isTrue();
-        assertThat(networkTemplate.matchesSubscriberId(SUBSCRIBER_ID_2)).isTrue();
+        assertThat(networkTemplate.getSubscriberIds().contains(SUBSCRIBER_ID)).isTrue();
+        assertThat(networkTemplate.getSubscriberIds().contains(SUBSCRIBER_ID_2)).isTrue();
     }
 }
diff --git a/tests/robotests/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceControllerTest.java
index 4276407..783c2ed 100644
--- a/tests/robotests/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceControllerTest.java
@@ -73,6 +73,7 @@
         mLifecycle = new Lifecycle(mLifecycleOwner);
         mController = spy(new AbstractBluetoothA2dpPreferenceControllerImpl(mContext, mLifecycle,
                 mBluetoothA2dpConfigStore));
+        mController.mBluetoothAdapter = null;
         doReturn(mBluetoothCodecConfig).when(mController).getCodecConfig(null);
         doNothing().when(mController).setCodecConfigPreference(any(), any());
         when(mBluetoothA2dpConfigStore.createCodecConfig()).thenReturn(mBluetoothCodecConfig);
diff --git a/tests/robotests/src/com/android/settings/development/BluetoothA2dpHwOffloadPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothA2dpHwOffloadPreferenceControllerTest.java
index a1d479f..fcb3ea9 100644
--- a/tests/robotests/src/com/android/settings/development/BluetoothA2dpHwOffloadPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/BluetoothA2dpHwOffloadPreferenceControllerTest.java
@@ -18,6 +18,8 @@
 
 import static com.android.settings.development.BluetoothA2dpHwOffloadPreferenceController
         .A2DP_OFFLOAD_DISABLED_PROPERTY;
+import static com.android.settings.development.BluetoothLeAudioHwOffloadPreferenceController
+        .LE_AUDIO_OFFLOAD_DISABLED_PROPERTY;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -62,15 +64,37 @@
     }
 
     @Test
-    public void onA2dpHwDialogConfirmed_shouldChangeProperty() {
+    public void onA2dpHwDialogConfirmedAsA2dpOffloadDisabled_shouldChangeProperty() {
         SystemProperties.set(A2DP_OFFLOAD_DISABLED_PROPERTY, Boolean.toString(false));
+        mController.mChanged = true;
 
-        mController.onA2dpHwDialogConfirmed();
+        mController.onHwOffloadDialogConfirmed();
         final boolean mode = SystemProperties.getBoolean(A2DP_OFFLOAD_DISABLED_PROPERTY, false);
         assertThat(mode).isTrue();
+    }
 
-        mController.onA2dpHwDialogConfirmed();
-        final boolean mode2 = SystemProperties.getBoolean(A2DP_OFFLOAD_DISABLED_PROPERTY, false);
-        assertThat(mode2).isFalse();
+    @Test
+    public void onA2dpHwDialogConfirmedAsA2dpOffloadEnabled_shouldChangeProperty() {
+        SystemProperties.set(A2DP_OFFLOAD_DISABLED_PROPERTY, Boolean.toString(true));
+        SystemProperties.set(LE_AUDIO_OFFLOAD_DISABLED_PROPERTY, Boolean.toString(true));
+
+        mController.mChanged = true;
+
+        mController.onHwOffloadDialogConfirmed();
+        final boolean a2dpMode = SystemProperties.getBoolean(A2DP_OFFLOAD_DISABLED_PROPERTY, true);
+        final boolean leAudioMode = SystemProperties
+                .getBoolean(LE_AUDIO_OFFLOAD_DISABLED_PROPERTY, true);
+        assertThat(a2dpMode).isFalse();
+        assertThat(leAudioMode).isFalse();
+    }
+
+    @Test
+    public void onA2dpHwDialogCanceled_shouldNotChangeProperty() {
+        SystemProperties.set(A2DP_OFFLOAD_DISABLED_PROPERTY, Boolean.toString(false));
+        mController.mChanged = true;
+
+        mController.onHwOffloadDialogCanceled();
+        final boolean mode = SystemProperties.getBoolean(A2DP_OFFLOAD_DISABLED_PROPERTY, false);
+        assertThat(mode).isFalse();
     }
 }
diff --git a/tests/robotests/src/com/android/settings/development/BluetoothGabeldorschePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothGabeldorschePreferenceControllerTest.java
deleted file mode 100644
index 472a960..0000000
--- a/tests/robotests/src/com/android/settings/development/BluetoothGabeldorschePreferenceControllerTest.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.development;
-
-import static com.android.settings.development.BluetoothGabeldorschePreferenceController
-        .CURRENT_GD_FLAG;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.provider.DeviceConfig;
-
-import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(RobolectricTestRunner.class)
-public class BluetoothGabeldorschePreferenceControllerTest {
-
-    @Mock
-    private SwitchPreference mPreference;
-    @Mock
-    private PreferenceScreen mPreferenceScreen;
-
-    private BluetoothGabeldorschePreferenceController mController;
-
-    @Before
-    public void setup() {
-        MockitoAnnotations.initMocks(this);
-        Context context = RuntimeEnvironment.application;
-        mController = new BluetoothGabeldorschePreferenceController(context);
-        when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
-                .thenReturn(mPreference);
-        mController.displayPreference(mPreferenceScreen);
-    }
-
-    @Test
-    public void onPreferenceChanged_settingEnabled_shouldTurnOnBluetoothGabeldorsche() {
-        mController.onPreferenceChange(mPreference, true /* new value */);
-
-        boolean enabled = DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_BLUETOOTH,
-                CURRENT_GD_FLAG, false /* defaultValue */);
-
-        assertThat(enabled).isTrue();
-    }
-
-    @Test
-    public void onPreferenceChanged_settingDisabled_shouldTurnOffBluetoothGabeldorsche() {
-        mController.onPreferenceChange(mPreference, false /* new value */);
-
-        boolean enabled = DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_BLUETOOTH,
-                CURRENT_GD_FLAG, false /* defaultValue */);
-
-        assertThat(enabled).isFalse();
-    }
-
-    @Test
-    public void updateState_settingEnabled_preferenceShouldBeChecked() {
-        DeviceConfig.setProperty(DeviceConfig.NAMESPACE_BLUETOOTH,
-                CURRENT_GD_FLAG, "true", false /* makeDefault */);
-
-        mController.updateState(mPreference);
-
-        verify(mPreference).setChecked(true);
-    }
-
-    @Test
-    public void updateState_settingDisabled_preferenceShouldNotBeChecked() {
-        DeviceConfig.setProperty(DeviceConfig.NAMESPACE_BLUETOOTH,
-                CURRENT_GD_FLAG, "false", false /* makeDefault */);
-
-        mController.updateState(mPreference);
-
-        verify(mPreference).setChecked(false);
-    }
-
-    @Test
-    public void onDeveloperOptionsDisabled_shouldDisablePreference() {
-        mController.onDeveloperOptionsDisabled();
-
-        String configStr = DeviceConfig.getProperty(DeviceConfig.NAMESPACE_BLUETOOTH,
-                CURRENT_GD_FLAG);
-
-        assertThat(configStr).isNull();
-        verify(mPreference).setEnabled(false);
-        verify(mPreference).setChecked(false);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/development/BluetoothLeAudioHwOffloadPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothLeAudioHwOffloadPreferenceControllerTest.java
new file mode 100644
index 0000000..c82df40e
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/BluetoothLeAudioHwOffloadPreferenceControllerTest.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development;
+
+import static com.android.settings.development.BluetoothLeAudioHwOffloadPreferenceController
+        .LE_AUDIO_OFFLOAD_DISABLED_PROPERTY;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.os.SystemProperties;
+
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(RobolectricTestRunner.class)
+public class BluetoothLeAudioHwOffloadPreferenceControllerTest {
+
+    @Mock
+    private PreferenceScreen mPreferenceScreen;
+    @Mock
+    private DevelopmentSettingsDashboardFragment mFragment;
+
+    private Context mContext;
+    private SwitchPreference mPreference;
+    private BluetoothLeAudioHwOffloadPreferenceController mController;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mPreference = new SwitchPreference(mContext);
+        mController = spy(new BluetoothLeAudioHwOffloadPreferenceController(mContext, mFragment));
+        when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
+            .thenReturn(mPreference);
+        mController.displayPreference(mPreferenceScreen);
+    }
+
+    @Test
+    public void onLeAudioHwDialogConfirmedAsLeAudioOffloadDisabled_shouldChangeProperty() {
+        SystemProperties.set(LE_AUDIO_OFFLOAD_DISABLED_PROPERTY, Boolean.toString(false));
+        mController.mChanged = true;
+
+        mController.onHwOffloadDialogConfirmed();
+        final boolean mode = SystemProperties.getBoolean(LE_AUDIO_OFFLOAD_DISABLED_PROPERTY, false);
+        assertThat(mode).isTrue();
+    }
+
+    @Test
+    public void onLeAudioHwDialogConfirmedAsLeAudioOffloadEnabled_shouldChangeProperty() {
+        SystemProperties.set(LE_AUDIO_OFFLOAD_DISABLED_PROPERTY, Boolean.toString(true));
+        mController.mChanged = true;
+
+        mController.onHwOffloadDialogConfirmed();
+        final boolean mode2 = SystemProperties.getBoolean(
+                LE_AUDIO_OFFLOAD_DISABLED_PROPERTY, true);
+        assertThat(mode2).isFalse();
+    }
+
+    @Test
+    public void onLeAudioHwDialogCanceled_shouldNotChangeProperty() {
+        SystemProperties.set(LE_AUDIO_OFFLOAD_DISABLED_PROPERTY, Boolean.toString(false));
+        mController.mChanged = true;
+
+        mController.onHwOffloadDialogCanceled();
+        final boolean mode = SystemProperties.getBoolean(LE_AUDIO_OFFLOAD_DISABLED_PROPERTY, false);
+        assertThat(mode).isFalse();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceControllerTest.java
index 98dc656..72477b9 100644
--- a/tests/robotests/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceControllerTest.java
@@ -25,7 +25,9 @@
 import static org.mockito.Mockito.when;
 
 import android.content.Context;
+import android.content.pm.PackageManager;
 import android.content.res.Resources;
+
 import android.os.SystemProperties;
 
 import androidx.preference.ListPreference;
@@ -45,14 +47,12 @@
 @RunWith(RobolectricTestRunner.class)
 public class BluetoothMaxConnectedAudioDevicesPreferenceControllerTest {
 
-  private static final int TEST_MAX_CONNECTED_AUDIO_DEVICES = 3;
+  private static int TEST_MAX_CONNECTED_AUDIO_DEVICES = 5;
 
   @Mock
   private PreferenceScreen mPreferenceScreen;
   @Spy
   private Context mSpyContext = RuntimeEnvironment.application;
-  @Spy
-  private Resources mSpyResources = RuntimeEnvironment.application.getResources();
 
   private ListPreference mPreference;
   private BluetoothMaxConnectedAudioDevicesPreferenceController mController;
@@ -63,15 +63,19 @@
   @Before
   public void setup() {
     MockitoAnnotations.initMocks(this);
-    doReturn(mSpyResources).when(mSpyContext).getResources();
     // Get XML values without mock
     // Setup test list preference using XML values
     mPreference = new ListPreference(mSpyContext);
     mPreference.setEntries(R.array.bluetooth_max_connected_audio_devices);
     mPreference.setEntryValues(R.array.bluetooth_max_connected_audio_devices_values);
-    // Stub default max connected audio devices to a test controlled value
-    doReturn(TEST_MAX_CONNECTED_AUDIO_DEVICES).when(mSpyResources).getInteger(
-        com.android.internal.R.integer.config_bluetooth_max_connected_audio_devices);
+    // Retrieve default max connected audio devices to a test controlled value
+    try {
+      Resources res = mSpyContext.getPackageManager().getResourcesForApplication("com.android.bluetooth");
+      TEST_MAX_CONNECTED_AUDIO_DEVICES = res.getInteger(res.getIdentifier("config_bluetooth_max_connected_audio_devices", "integer", "com.android.bluetooth"));
+    } catch (PackageManager.NameNotFoundException e) {
+      e.printStackTrace();
+    }
+
     // Init the actual controller
     mController = new BluetoothMaxConnectedAudioDevicesPreferenceController(mSpyContext);
     // Construct preference in the controller via a mocked preference screen object
diff --git a/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java
index 2d4082b..b8f44a2 100644
--- a/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java
@@ -202,9 +202,9 @@
         assertThat(dialog).isNotNull();
         ShadowAlertDialogCompat shadowDialog = ShadowAlertDialogCompat.shadowOf(dialog);
         assertThat(shadowDialog.getTitle()).isEqualTo(
-                mContext.getString(R.string.bluetooth_disable_a2dp_hw_offload_dialog_title));
+                mContext.getString(R.string.bluetooth_disable_hw_offload_dialog_title));
         assertThat(shadowDialog.getMessage()).isEqualTo(
-                mContext.getString(R.string.bluetooth_disable_a2dp_hw_offload_dialog_message));
+                mContext.getString(R.string.bluetooth_disable_hw_offload_dialog_message));
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/development/FileEncryptionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/FileEncryptionPreferenceControllerTest.java
deleted file mode 100644
index 0784a61..0000000
--- a/tests/robotests/src/com/android/settings/development/FileEncryptionPreferenceControllerTest.java
+++ /dev/null
@@ -1,116 +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.development;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.ArgumentMatchers.anyBoolean;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.os.RemoteException;
-import android.os.storage.IStorageManager;
-import android.sysprop.CryptoProperties;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
-import com.android.settings.R;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.util.ReflectionHelpers;
-
-@RunWith(RobolectricTestRunner.class)
-public class FileEncryptionPreferenceControllerTest {
-
-    @Mock
-    private Preference mPreference;
-    @Mock
-    private PreferenceScreen mPreferenceScreen;
-    @Mock
-    private IStorageManager mStorageManager;
-
-    private Context mContext;
-    private FileEncryptionPreferenceController mController;
-
-    @Before
-    public void setup() {
-        MockitoAnnotations.initMocks(this);
-        mContext = RuntimeEnvironment.application;
-        mController = new FileEncryptionPreferenceController(mContext);
-        when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
-            .thenReturn(mPreference);
-    }
-
-    @Test
-    public void isAvailable_storageManagerNull_shouldBeFalse() {
-        ReflectionHelpers.setField(mController, "mStorageManager", null);
-
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    public void isAvailable_notConvertibleToFBE_shouldBeFalse() throws RemoteException {
-        ReflectionHelpers.setField(mController, "mStorageManager", mStorageManager);
-        when(mStorageManager.isConvertibleToFBE()).thenReturn(false);
-
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    public void isAvailable_convertibleToFBE_shouldBeTrue() throws RemoteException {
-        ReflectionHelpers.setField(mController, "mStorageManager", mStorageManager);
-        when(mStorageManager.isConvertibleToFBE()).thenReturn(true);
-
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void updateState_settingIsNotFile_shouldDoNothing() throws RemoteException {
-        ReflectionHelpers.setField(mController, "mStorageManager", mStorageManager);
-        when(mStorageManager.isConvertibleToFBE()).thenReturn(true);
-        mController.displayPreference(mPreferenceScreen);
-        CryptoProperties.type(CryptoProperties.type_values.NONE);
-
-        mController.updateState(mPreference);
-
-        verify(mPreference, never()).setEnabled(anyBoolean());
-        verify(mPreference, never()).setSummary(anyString());
-    }
-
-    @Test
-    public void updateState_settingIsFile_shouldSetSummaryAndDisablePreference()
-            throws RemoteException {
-        ReflectionHelpers.setField(mController, "mStorageManager", mStorageManager);
-        when(mStorageManager.isConvertibleToFBE()).thenReturn(true);
-        mController.displayPreference(mPreferenceScreen);
-        CryptoProperties.type(CryptoProperties.type_values.FILE);
-
-        mController.updateState(mPreference);
-
-        verify(mPreference).setEnabled(false);
-        verify(mPreference).setSummary(mContext.getString(R.string.convert_to_file_encryption_done));
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/development/bluetooth/AbstractBluetoothDialogPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/bluetooth/AbstractBluetoothDialogPreferenceControllerTest.java
index a12131d..42b889c 100644
--- a/tests/robotests/src/com/android/settings/development/bluetooth/AbstractBluetoothDialogPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/bluetooth/AbstractBluetoothDialogPreferenceControllerTest.java
@@ -20,6 +20,7 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
+import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
@@ -30,6 +31,7 @@
 import android.bluetooth.BluetoothCodecConfig;
 import android.bluetooth.BluetoothCodecStatus;
 import android.bluetooth.BluetoothDevice;
+import android.bluetooth.BluetoothProfile;
 import android.content.Context;
 
 import androidx.lifecycle.LifecycleOwner;
@@ -47,6 +49,7 @@
 import org.robolectric.RuntimeEnvironment;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 @RunWith(RobolectricTestRunner.class)
@@ -58,6 +61,8 @@
     @Mock
     private BluetoothA2dp mBluetoothA2dp;
     @Mock
+    private BluetoothAdapter mBluetoothAdapter;
+    @Mock
     private PreferenceScreen mScreen;
 
     private AbstractBluetoothDialogPreferenceController mController;
@@ -83,10 +88,15 @@
         mActiveDevice = BluetoothAdapter.getDefaultAdapter().getRemoteDevice(DEVICE_ADDRESS);
         mController = spy(new AbstractBluetoothDialogPreferenceControllerImpl(mContext, mLifecycle,
                 mBluetoothA2dpConfigStore));
+        mController.mBluetoothAdapter = mBluetoothAdapter;
         mPreference = spy(new BaseBluetoothDialogPreferenceImpl(mContext));
 
-        mCodecConfigAAC = new BluetoothCodecConfig(BluetoothCodecConfig.SOURCE_CODEC_TYPE_AAC);
-        mCodecConfigSBC = new BluetoothCodecConfig(BluetoothCodecConfig.SOURCE_CODEC_TYPE_SBC);
+        mCodecConfigAAC = new BluetoothCodecConfig.Builder()
+                .setCodecType(BluetoothCodecConfig.SOURCE_CODEC_TYPE_AAC)
+                .build();
+        mCodecConfigSBC = new BluetoothCodecConfig.Builder()
+                .setCodecType(BluetoothCodecConfig.SOURCE_CODEC_TYPE_SBC)
+                .build();
         mCodecConfigs[0] = mCodecConfigAAC;
         mCodecConfigs[1] = mCodecConfigSBC;
 
@@ -94,7 +104,8 @@
         mController.displayPreference(mScreen);
         mCurrentConfig = mController.getCurrentConfigIndex();
         when(mPreference.generateSummary(mCurrentConfig)).thenReturn(SUMMARY);
-        when(mBluetoothA2dp.getActiveDevice()).thenReturn(mActiveDevice);
+        when(mBluetoothAdapter.getActiveDevices(eq(BluetoothProfile.A2DP)))
+                .thenReturn(Arrays.asList(mActiveDevice));
     }
 
     @Test
@@ -110,7 +121,7 @@
 
     @Test
     public void onIndexUpdated_checkFlow() {
-        mCodecStatus = new BluetoothCodecStatus(mCodecConfigAAC, null, null);
+        mCodecStatus = new BluetoothCodecStatus.Builder().setCodecConfig(mCodecConfigAAC).build();
         when(mBluetoothA2dp.getCodecStatus(
             mActiveDevice)).thenReturn(mCodecStatus);
         when(mBluetoothA2dpConfigStore.createCodecConfig()).thenReturn(mCodecConfigAAC);
@@ -150,7 +161,7 @@
 
     @Test
     public void getCurrentCodecConfig_verifyConfig() {
-        mCodecStatus = new BluetoothCodecStatus(mCodecConfigAAC, null, null);
+        mCodecStatus = new BluetoothCodecStatus.Builder().setCodecConfig(mCodecConfigAAC).build();
         when(mBluetoothA2dp.getCodecStatus(
             mActiveDevice)).thenReturn(mCodecStatus);
         mController.onBluetoothServiceConnected(mBluetoothA2dp);
@@ -160,17 +171,23 @@
 
     @Test
     public void getSelectableConfigs_verifyConfig() {
-        mCodecStatus = new BluetoothCodecStatus(mCodecConfigAAC, null, mCodecConfigs);
+        mCodecStatus = new BluetoothCodecStatus.Builder()
+                .setCodecConfig(mCodecConfigAAC)
+                .setCodecsSelectableCapabilities(Arrays.asList(mCodecConfigs))
+                .build();
         when(mBluetoothA2dp.getCodecStatus(
             mActiveDevice)).thenReturn(mCodecStatus);
         mController.onBluetoothServiceConnected(mBluetoothA2dp);
 
-        assertThat(mController.getSelectableConfigs(null)).isEqualTo(mCodecConfigs);
+        assertThat(mController.getSelectableConfigs(null)).isEqualTo(Arrays.asList(mCodecConfigs));
     }
 
     @Test
     public void getSelectableByCodecType_verifyConfig() {
-        mCodecStatus = new BluetoothCodecStatus(mCodecConfigAAC, null, mCodecConfigs);
+        mCodecStatus = new BluetoothCodecStatus.Builder()
+                .setCodecConfig(mCodecConfigAAC)
+                .setCodecsSelectableCapabilities(Arrays.asList(mCodecConfigs))
+                .build();
         when(mBluetoothA2dp.getCodecStatus(
             mActiveDevice)).thenReturn(mCodecStatus);
         mController.onBluetoothServiceConnected(mBluetoothA2dp);
@@ -181,7 +198,10 @@
 
     @Test
     public void getSelectableByCodecType_unavailable() {
-        mCodecStatus = new BluetoothCodecStatus(mCodecConfigAAC, null, mCodecConfigs);
+        mCodecStatus = new BluetoothCodecStatus.Builder()
+                .setCodecConfig(mCodecConfigAAC)
+                .setCodecsSelectableCapabilities(Arrays.asList(mCodecConfigs))
+                .build();
         when(mBluetoothA2dp.getCodecStatus(
             mActiveDevice)).thenReturn(mCodecStatus);
         mController.onBluetoothServiceConnected(mBluetoothA2dp);
@@ -192,7 +212,10 @@
 
     @Test
     public void onBluetoothServiceConnected_verifyBluetoothA2dpConfigStore() {
-        mCodecStatus = new BluetoothCodecStatus(mCodecConfigAAC, null, mCodecConfigs);
+        mCodecStatus = new BluetoothCodecStatus.Builder()
+                .setCodecConfig(mCodecConfigAAC)
+                .setCodecsSelectableCapabilities(Arrays.asList(mCodecConfigs))
+                .build();
         when(mBluetoothA2dp.getCodecStatus(
             mActiveDevice)).thenReturn(mCodecStatus);
         mController.onBluetoothServiceConnected(mBluetoothA2dp);
diff --git a/tests/robotests/src/com/android/settings/development/bluetooth/BluetoothBitPerSampleDialogPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/bluetooth/BluetoothBitPerSampleDialogPreferenceControllerTest.java
index 0996ae3..dba1fbf 100644
--- a/tests/robotests/src/com/android/settings/development/bluetooth/BluetoothBitPerSampleDialogPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/bluetooth/BluetoothBitPerSampleDialogPreferenceControllerTest.java
@@ -18,6 +18,7 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
+import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -27,6 +28,7 @@
 import android.bluetooth.BluetoothCodecConfig;
 import android.bluetooth.BluetoothCodecStatus;
 import android.bluetooth.BluetoothDevice;
+import android.bluetooth.BluetoothProfile;
 import android.content.Context;
 
 import androidx.lifecycle.LifecycleOwner;
@@ -44,6 +46,7 @@
 import org.robolectric.RuntimeEnvironment;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 @RunWith(RobolectricTestRunner.class)
@@ -54,6 +57,8 @@
     @Mock
     private BluetoothA2dp mBluetoothA2dp;
     @Mock
+    private BluetoothAdapter mBluetoothAdapter;
+    @Mock
     private PreferenceScreen mScreen;
 
     private BluetoothBitPerSampleDialogPreferenceController mController;
@@ -80,25 +85,27 @@
         mPreference = new BluetoothBitPerSampleDialogPreference(mContext);
         when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
         mController.displayPreference(mScreen);
-        mCodecConfigAAC = new BluetoothCodecConfig(BluetoothCodecConfig.SOURCE_CODEC_TYPE_AAC,
-                BluetoothCodecConfig.CODEC_PRIORITY_DEFAULT,
-                BluetoothCodecConfig.SAMPLE_RATE_NONE,
-                BluetoothCodecConfig.BITS_PER_SAMPLE_16 | BluetoothCodecConfig.BITS_PER_SAMPLE_24,
-                BluetoothCodecConfig.CHANNEL_MODE_NONE,
-                0, 0, 0, 0);
-        mCodecConfigSBC = new BluetoothCodecConfig(BluetoothCodecConfig.SOURCE_CODEC_TYPE_SBC,
-                BluetoothCodecConfig.CODEC_PRIORITY_DEFAULT,
-                BluetoothCodecConfig.SAMPLE_RATE_NONE,
-                BluetoothCodecConfig.BITS_PER_SAMPLE_24,
-                BluetoothCodecConfig.CHANNEL_MODE_NONE,
-                0, 0, 0, 0);
-        when(mBluetoothA2dp.getActiveDevice()).thenReturn(mActiveDevice);
+        mController.mBluetoothAdapter = mBluetoothAdapter;
+        mCodecConfigAAC = new BluetoothCodecConfig.Builder()
+                .setCodecType(BluetoothCodecConfig.SOURCE_CODEC_TYPE_AAC)
+                .setBitsPerSample(BluetoothCodecConfig.BITS_PER_SAMPLE_16
+                                | BluetoothCodecConfig.BITS_PER_SAMPLE_24)
+                .build();
+        mCodecConfigSBC = new BluetoothCodecConfig.Builder()
+                .setCodecType(BluetoothCodecConfig.SOURCE_CODEC_TYPE_SBC)
+                .setBitsPerSample(BluetoothCodecConfig.BITS_PER_SAMPLE_24)
+                .build();
+        when(mBluetoothAdapter.getActiveDevices(eq(BluetoothProfile.A2DP)))
+                .thenReturn(Arrays.asList(mActiveDevice));
     }
 
     @Test
     public void writeConfigurationValues_selectDefault_setHighest() {
         BluetoothCodecConfig[] mCodecConfigs = {mCodecConfigAAC, mCodecConfigSBC};
-        mCodecStatus = new BluetoothCodecStatus(mCodecConfigAAC, null, mCodecConfigs);
+        mCodecStatus = new BluetoothCodecStatus.Builder()
+                .setCodecConfig(mCodecConfigAAC)
+                .setCodecsSelectableCapabilities(Arrays.asList(mCodecConfigs))
+                .build();
         when(mBluetoothA2dp.getCodecStatus(mActiveDevice)).thenReturn(mCodecStatus);
         mController.onBluetoothServiceConnected(mBluetoothA2dp);
 
@@ -127,7 +134,10 @@
     @Test
     public void getSelectableIndex_verifyList() {
         BluetoothCodecConfig[] mCodecConfigs = {mCodecConfigAAC, mCodecConfigSBC};
-        mCodecStatus = new BluetoothCodecStatus(mCodecConfigAAC, null, mCodecConfigs);
+        mCodecStatus = new BluetoothCodecStatus.Builder()
+                .setCodecConfig(mCodecConfigAAC)
+                .setCodecsSelectableCapabilities(Arrays.asList(mCodecConfigs))
+                .build();
         when(mBluetoothA2dp.getCodecStatus(mActiveDevice)).thenReturn(mCodecStatus);
         mController.onBluetoothServiceConnected(mBluetoothA2dp);
         List<Integer> indexList = new ArrayList<>();
diff --git a/tests/robotests/src/com/android/settings/development/bluetooth/BluetoothChannelModeDialogPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/bluetooth/BluetoothChannelModeDialogPreferenceControllerTest.java
index 81fb3fe..570257a 100644
--- a/tests/robotests/src/com/android/settings/development/bluetooth/BluetoothChannelModeDialogPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/bluetooth/BluetoothChannelModeDialogPreferenceControllerTest.java
@@ -18,6 +18,7 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
+import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -27,6 +28,7 @@
 import android.bluetooth.BluetoothCodecConfig;
 import android.bluetooth.BluetoothCodecStatus;
 import android.bluetooth.BluetoothDevice;
+import android.bluetooth.BluetoothProfile;
 import android.content.Context;
 
 import androidx.lifecycle.LifecycleOwner;
@@ -44,6 +46,7 @@
 import org.robolectric.RuntimeEnvironment;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 @RunWith(RobolectricTestRunner.class)
@@ -54,6 +57,8 @@
     @Mock
     private BluetoothA2dp mBluetoothA2dp;
     @Mock
+    private BluetoothAdapter mBluetoothAdapter;
+    @Mock
     private PreferenceScreen mScreen;
 
     private BluetoothChannelModeDialogPreferenceController mController;
@@ -77,28 +82,30 @@
         mActiveDevice = BluetoothAdapter.getDefaultAdapter().getRemoteDevice(DEVICE_ADDRESS);
         mController = new BluetoothChannelModeDialogPreferenceController(mContext, mLifecycle,
                 mBluetoothA2dpConfigStore);
+        mController.mBluetoothAdapter = mBluetoothAdapter;
         mPreference = new BluetoothChannelModeDialogPreference(mContext);
         when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
         mController.displayPreference(mScreen);
-        mCodecConfigAAC = new BluetoothCodecConfig(BluetoothCodecConfig.SOURCE_CODEC_TYPE_AAC,
-                BluetoothCodecConfig.CODEC_PRIORITY_DEFAULT,
-                BluetoothCodecConfig.SAMPLE_RATE_NONE,
-                BluetoothCodecConfig.BITS_PER_SAMPLE_NONE,
-                BluetoothCodecConfig.CHANNEL_MODE_STEREO,
-                0, 0, 0, 0);
-        mCodecConfigSBC = new BluetoothCodecConfig(BluetoothCodecConfig.SOURCE_CODEC_TYPE_SBC,
-                BluetoothCodecConfig.CODEC_PRIORITY_DEFAULT,
-                BluetoothCodecConfig.SAMPLE_RATE_NONE,
-                BluetoothCodecConfig.BITS_PER_SAMPLE_NONE,
-                BluetoothCodecConfig.CHANNEL_MODE_MONO | BluetoothCodecConfig.CHANNEL_MODE_STEREO,
-                0, 0, 0, 0);
-        when(mBluetoothA2dp.getActiveDevice()).thenReturn(mActiveDevice);
+        mCodecConfigAAC = new BluetoothCodecConfig.Builder()
+                .setCodecType(BluetoothCodecConfig.SOURCE_CODEC_TYPE_AAC)
+                .setChannelMode(BluetoothCodecConfig.CHANNEL_MODE_STEREO)
+                .build();
+        mCodecConfigSBC = new BluetoothCodecConfig.Builder()
+                .setCodecType(BluetoothCodecConfig.SOURCE_CODEC_TYPE_SBC)
+                .setChannelMode(BluetoothCodecConfig.CHANNEL_MODE_MONO
+                            | BluetoothCodecConfig.CHANNEL_MODE_STEREO)
+                .build();
+        when(mBluetoothAdapter.getActiveDevices(eq(BluetoothProfile.A2DP)))
+                .thenReturn(Arrays.asList(mActiveDevice));
     }
 
     @Test
     public void writeConfigurationValues_selectDefault_setHighest() {
         BluetoothCodecConfig[] mCodecConfigs = {mCodecConfigAAC, mCodecConfigSBC};
-        mCodecStatus = new BluetoothCodecStatus(mCodecConfigSBC, null, mCodecConfigs);
+        mCodecStatus = new BluetoothCodecStatus.Builder()
+                .setCodecConfig(mCodecConfigSBC)
+                .setCodecsSelectableCapabilities(Arrays.asList(mCodecConfigs))
+                .build();
         when(mBluetoothA2dp.getCodecStatus(mActiveDevice)).thenReturn(mCodecStatus);
         mController.onBluetoothServiceConnected(mBluetoothA2dp);
 
@@ -124,7 +131,10 @@
     @Test
     public void getSelectableIndex_verifyList() {
         BluetoothCodecConfig[] mCodecConfigs = {mCodecConfigAAC, mCodecConfigSBC};
-        mCodecStatus = new BluetoothCodecStatus(mCodecConfigSBC, null, mCodecConfigs);
+        mCodecStatus = new BluetoothCodecStatus.Builder()
+                .setCodecConfig(mCodecConfigSBC)
+                .setCodecsSelectableCapabilities(Arrays.asList(mCodecConfigs))
+                .build();
         when(mBluetoothA2dp.getCodecStatus(mActiveDevice)).thenReturn(mCodecStatus);
         mController.onBluetoothServiceConnected(mBluetoothA2dp);
         List<Integer> indexList = new ArrayList<>();
diff --git a/tests/robotests/src/com/android/settings/development/bluetooth/BluetoothCodecDialogPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/bluetooth/BluetoothCodecDialogPreferenceControllerTest.java
index 7dd2906..f04a80d 100644
--- a/tests/robotests/src/com/android/settings/development/bluetooth/BluetoothCodecDialogPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/bluetooth/BluetoothCodecDialogPreferenceControllerTest.java
@@ -19,6 +19,7 @@
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -28,6 +29,7 @@
 import android.bluetooth.BluetoothCodecConfig;
 import android.bluetooth.BluetoothCodecStatus;
 import android.bluetooth.BluetoothDevice;
+import android.bluetooth.BluetoothProfile;
 import android.content.Context;
 
 import androidx.lifecycle.LifecycleOwner;
@@ -44,6 +46,9 @@
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 
+import java.util.Arrays;
+import java.util.List;
+
 @RunWith(RobolectricTestRunner.class)
 public class BluetoothCodecDialogPreferenceControllerTest {
 
@@ -52,6 +57,8 @@
     @Mock
     private BluetoothA2dp mBluetoothA2dp;
     @Mock
+    private BluetoothAdapter mBluetoothAdapter;
+    @Mock
     private PreferenceScreen mScreen;
     @Mock
     private AbstractBluetoothPreferenceController.Callback mCallback;
@@ -81,33 +88,51 @@
         mActiveDevice = BluetoothAdapter.getDefaultAdapter().getRemoteDevice(DEVICE_ADDRESS);
         mController = new BluetoothCodecDialogPreferenceController(mContext, mLifecycle,
                 mBluetoothA2dpConfigStore, mCallback);
+        mController.mBluetoothAdapter = mBluetoothAdapter;
         mPreference = new BluetoothCodecDialogPreference(mContext);
         when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
         mController.displayPreference(mScreen);
-        mCodecConfigSBC = new BluetoothCodecConfig(BluetoothCodecConfig.SOURCE_CODEC_TYPE_SBC,
-                BluetoothCodecConfig.CODEC_PRIORITY_HIGHEST,
-                BluetoothCodecConfig.SAMPLE_RATE_96000 | BluetoothCodecConfig.SAMPLE_RATE_176400,
-                BluetoothCodecConfig.BITS_PER_SAMPLE_32,
-                BluetoothCodecConfig.CHANNEL_MODE_MONO | BluetoothCodecConfig.CHANNEL_MODE_STEREO,
-                0, 0, 0, 0);
-        mCodecConfigAAC = new BluetoothCodecConfig(BluetoothCodecConfig.SOURCE_CODEC_TYPE_AAC,
-                BluetoothCodecConfig.CODEC_PRIORITY_HIGHEST,
-                BluetoothCodecConfig.SAMPLE_RATE_48000 | BluetoothCodecConfig.SAMPLE_RATE_88200,
-                BluetoothCodecConfig.BITS_PER_SAMPLE_16 | BluetoothCodecConfig.BITS_PER_SAMPLE_24,
-                BluetoothCodecConfig.CHANNEL_MODE_STEREO,
-                0, 0, 0, 0);
-        mCodecConfigAPTX = new BluetoothCodecConfig(BluetoothCodecConfig.SOURCE_CODEC_TYPE_APTX);
-        mCodecConfigAPTXHD = new BluetoothCodecConfig(
-                BluetoothCodecConfig.SOURCE_CODEC_TYPE_APTX_HD);
-        mCodecConfigLDAC = new BluetoothCodecConfig(BluetoothCodecConfig.SOURCE_CODEC_TYPE_LDAC);
-        when(mBluetoothA2dp.getActiveDevice()).thenReturn(mActiveDevice);
+        mCodecConfigSBC = new BluetoothCodecConfig.Builder()
+                .setCodecType(BluetoothCodecConfig.SOURCE_CODEC_TYPE_SBC)
+                .setCodecPriority(BluetoothCodecConfig.CODEC_PRIORITY_HIGHEST)
+                .setSampleRate(BluetoothCodecConfig.SAMPLE_RATE_96000
+                        | BluetoothCodecConfig.SAMPLE_RATE_176400)
+                .setBitsPerSample(BluetoothCodecConfig.BITS_PER_SAMPLE_32)
+                .setChannelMode(BluetoothCodecConfig.CHANNEL_MODE_MONO
+                        | BluetoothCodecConfig.CHANNEL_MODE_STEREO)
+                .build();
+        mCodecConfigAAC = new BluetoothCodecConfig.Builder()
+                .setCodecType(BluetoothCodecConfig.SOURCE_CODEC_TYPE_AAC)
+                .setCodecPriority(BluetoothCodecConfig.CODEC_PRIORITY_HIGHEST)
+                .setSampleRate(BluetoothCodecConfig.SAMPLE_RATE_48000
+                        | BluetoothCodecConfig.SAMPLE_RATE_88200)
+                .setBitsPerSample(BluetoothCodecConfig.BITS_PER_SAMPLE_16
+                        | BluetoothCodecConfig.BITS_PER_SAMPLE_24)
+                .setChannelMode(BluetoothCodecConfig.CHANNEL_MODE_STEREO)
+                .build();
+        mCodecConfigAPTX = new BluetoothCodecConfig.Builder()
+                .setCodecType(BluetoothCodecConfig.SOURCE_CODEC_TYPE_APTX)
+                .build();
+        mCodecConfigAPTXHD = new BluetoothCodecConfig.Builder()
+                .setCodecType(BluetoothCodecConfig.SOURCE_CODEC_TYPE_APTX_HD)
+                .build();
+        mCodecConfigLDAC = new BluetoothCodecConfig.Builder()
+                .setCodecType(BluetoothCodecConfig.SOURCE_CODEC_TYPE_LDAC)
+                .build();
+        when(mBluetoothAdapter.getActiveDevices(eq(BluetoothProfile.A2DP)))
+                .thenReturn(Arrays.asList(mActiveDevice));
     }
 
     @Test
     public void writeConfigurationValues_selectDefault_setHighest() {
         BluetoothCodecConfig[] mCodecConfigs = {mCodecConfigAAC, mCodecConfigSBC};
-        mCodecStatus = new BluetoothCodecStatus(mCodecConfigSBC, null, mCodecConfigs);
+        mCodecStatus = new BluetoothCodecStatus.Builder()
+                .setCodecConfig(mCodecConfigSBC)
+                .setCodecsSelectableCapabilities(Arrays.asList(mCodecConfigs))
+                .build();
         when(mBluetoothA2dp.getCodecStatus(mActiveDevice)).thenReturn(mCodecStatus);
+        when(mBluetoothA2dp.isOptionalCodecsEnabled(mActiveDevice)).thenReturn(
+                BluetoothA2dp.OPTIONAL_CODECS_PREF_ENABLED);
         mController.onBluetoothServiceConnected(mBluetoothA2dp);
 
         mController.writeConfigurationValues(0);
@@ -118,7 +143,10 @@
     public void writeConfigurationValues_checkCodec() {
         BluetoothCodecConfig[] mCodecConfigs = {mCodecConfigAAC, mCodecConfigSBC, mCodecConfigAPTX,
                 mCodecConfigAPTXHD, mCodecConfigLDAC, mCodecConfigAAC, mCodecConfigSBC};
-        mCodecStatus = new BluetoothCodecStatus(mCodecConfigSBC, null, mCodecConfigs);
+        mCodecStatus = new BluetoothCodecStatus.Builder()
+                .setCodecConfig(mCodecConfigSBC)
+                .setCodecsSelectableCapabilities(Arrays.asList(mCodecConfigs))
+                .build();
         when(mBluetoothA2dp.getCodecStatus(mActiveDevice)).thenReturn(mCodecStatus);
         mController.onBluetoothServiceConnected(mBluetoothA2dp);
 
@@ -145,7 +173,10 @@
     public void writeConfigurationValues_resetHighestConfig() {
         BluetoothCodecConfig[] mCodecConfigs = {mCodecConfigAAC, mCodecConfigSBC, mCodecConfigAPTX,
                 mCodecConfigAPTXHD, mCodecConfigLDAC, mCodecConfigAAC, mCodecConfigSBC};
-        mCodecStatus = new BluetoothCodecStatus(mCodecConfigAAC, null, mCodecConfigs);
+        mCodecStatus = new BluetoothCodecStatus.Builder()
+                .setCodecConfig(mCodecConfigAAC)
+                .setCodecsSelectableCapabilities(Arrays.asList(mCodecConfigs))
+                .build();
         when(mBluetoothA2dp.getCodecStatus(mActiveDevice)).thenReturn(mCodecStatus);
         mController.onBluetoothServiceConnected(mBluetoothA2dp);
         mController.writeConfigurationValues(2);
@@ -172,4 +203,39 @@
 
         verify(mCallback).onBluetoothCodecChanged();
     }
+
+    @Test
+    public void onHDAudioEnabled_optionalCodecEnabled_setsCodecTypeAsAAC() {
+        List<BluetoothCodecConfig> mCodecConfigs = Arrays.asList(mCodecConfigAAC, mCodecConfigSBC);
+        mCodecStatus = new BluetoothCodecStatus.Builder()
+                .setCodecConfig(mCodecConfigAAC)
+                .setCodecsSelectableCapabilities(mCodecConfigs)
+                .build();
+        when(mBluetoothA2dp.getCodecStatus(mActiveDevice)).thenReturn(mCodecStatus);
+        when(mBluetoothA2dp.isOptionalCodecsEnabled(mActiveDevice)).thenReturn(
+                BluetoothA2dp.OPTIONAL_CODECS_PREF_ENABLED);
+        mController.onBluetoothServiceConnected(mBluetoothA2dp);
+
+        mController.onHDAudioEnabled(/* enabled= */ true);
+
+        verify(mBluetoothA2dpConfigStore, atLeastOnce()).setCodecType(
+                eq(BluetoothCodecConfig.SOURCE_CODEC_TYPE_AAC));
+    }
+    @Test
+    public void onHDAudioEnabled_optionalCodecDisabled_setsCodecTypeAsSBC() {
+        List<BluetoothCodecConfig> mCodecConfigs = Arrays.asList(mCodecConfigAAC, mCodecConfigSBC);
+        mCodecStatus = new BluetoothCodecStatus.Builder()
+                .setCodecConfig(mCodecConfigAAC)
+                .setCodecsSelectableCapabilities(mCodecConfigs)
+                .build();
+        when(mBluetoothA2dp.getCodecStatus(mActiveDevice)).thenReturn(mCodecStatus);
+        when(mBluetoothA2dp.isOptionalCodecsEnabled(mActiveDevice)).thenReturn(
+                BluetoothA2dp.OPTIONAL_CODECS_PREF_DISABLED);
+        mController.onBluetoothServiceConnected(mBluetoothA2dp);
+
+        mController.onHDAudioEnabled(/* enabled= */ false);
+
+        verify(mBluetoothA2dpConfigStore, atLeastOnce()).setCodecType(
+                eq(BluetoothCodecConfig.SOURCE_CODEC_TYPE_SBC));
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/development/bluetooth/BluetoothHDAudioPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/bluetooth/BluetoothHDAudioPreferenceControllerTest.java
index 60476de..72ceddf 100644
--- a/tests/robotests/src/com/android/settings/development/bluetooth/BluetoothHDAudioPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/bluetooth/BluetoothHDAudioPreferenceControllerTest.java
@@ -18,12 +18,15 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
+import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import android.bluetooth.BluetoothA2dp;
+import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
+import android.bluetooth.BluetoothProfile;
 import android.content.Context;
 
 import androidx.lifecycle.LifecycleOwner;
@@ -43,6 +46,9 @@
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowBluetoothDevice;
 
+import java.util.Arrays;
+import java.util.Collections;
+
 @RunWith(RobolectricTestRunner.class)
 @Config(shadows = {ShadowBluetoothDevice.class})
 public class BluetoothHDAudioPreferenceControllerTest {
@@ -52,6 +58,8 @@
     @Mock
     private BluetoothA2dp mBluetoothA2dp;
     @Mock
+    private BluetoothAdapter mBluetoothAdapter;
+    @Mock
     private PreferenceScreen mScreen;
     @Mock
     private AbstractBluetoothPreferenceController.Callback mCallback;
@@ -73,6 +81,7 @@
         mBluetoothA2dpConfigStore = spy(new BluetoothA2dpConfigStore());
         mController = new BluetoothHDAudioPreferenceController(mContext, mLifecycle,
                 mBluetoothA2dpConfigStore, mCallback);
+        mController.mBluetoothAdapter = mBluetoothAdapter;
         mPreference = new SwitchPreference(mContext);
         when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
         mController.displayPreference(mScreen);
@@ -81,7 +90,8 @@
 
     @Test
     public void updateState_noActiveDevice_setDisable() {
-        when(mBluetoothA2dp.getActiveDevice()).thenReturn(null);
+        when(mBluetoothAdapter.getActiveDevices(eq(BluetoothProfile.A2DP)))
+                .thenReturn(Collections.emptyList());
         mController.onBluetoothServiceConnected(mBluetoothA2dp);
         mController.updateState(mPreference);
 
@@ -90,7 +100,8 @@
 
     @Test
     public void updateState_codecSupported_setEnable() {
-        when(mBluetoothA2dp.getActiveDevice()).thenReturn(mActiveDevice);
+        when(mBluetoothAdapter.getActiveDevices(eq(BluetoothProfile.A2DP)))
+                .thenReturn(Arrays.asList(mActiveDevice));
         when(mBluetoothA2dp.isOptionalCodecsSupported(mActiveDevice)).thenReturn(
                 mBluetoothA2dp.OPTIONAL_CODECS_SUPPORTED);
         mController.onBluetoothServiceConnected(mBluetoothA2dp);
@@ -101,7 +112,8 @@
 
     @Test
     public void updateState_codecNotSupported_setDisable() {
-        when(mBluetoothA2dp.getActiveDevice()).thenReturn(mActiveDevice);
+        when(mBluetoothAdapter.getActiveDevices(eq(BluetoothProfile.A2DP)))
+                .thenReturn(Arrays.asList(mActiveDevice));
         when(mBluetoothA2dp.isOptionalCodecsSupported(mActiveDevice)).thenReturn(
                 mBluetoothA2dp.OPTIONAL_CODECS_NOT_SUPPORTED);
         mController.onBluetoothServiceConnected(mBluetoothA2dp);
@@ -112,7 +124,8 @@
 
     @Test
     public void updateState_codecSupportedAndEnabled_checked() {
-        when(mBluetoothA2dp.getActiveDevice()).thenReturn(mActiveDevice);
+        when(mBluetoothAdapter.getActiveDevices(eq(BluetoothProfile.A2DP)))
+                .thenReturn(Arrays.asList(mActiveDevice));
         when(mBluetoothA2dp.isOptionalCodecsSupported(mActiveDevice)).thenReturn(
                 mBluetoothA2dp.OPTIONAL_CODECS_SUPPORTED);
         when(mBluetoothA2dp.isOptionalCodecsEnabled(mActiveDevice)).thenReturn(
@@ -125,7 +138,8 @@
 
     @Test
     public void updateState_codecSupportedAndDisabled_notChecked() {
-        when(mBluetoothA2dp.getActiveDevice()).thenReturn(mActiveDevice);
+        when(mBluetoothAdapter.getActiveDevices(eq(BluetoothProfile.A2DP)))
+                .thenReturn(Arrays.asList(mActiveDevice));
         when(mBluetoothA2dp.isOptionalCodecsSupported(mActiveDevice)).thenReturn(
                 mBluetoothA2dp.OPTIONAL_CODECS_SUPPORTED);
         when(mBluetoothA2dp.isOptionalCodecsEnabled(mActiveDevice)).thenReturn(
@@ -138,7 +152,8 @@
 
     @Test
     public void onPreferenceChange_disable_verifyFlow() {
-        when(mBluetoothA2dp.getActiveDevice()).thenReturn(mActiveDevice);
+        when(mBluetoothAdapter.getActiveDevices(eq(BluetoothProfile.A2DP)))
+                .thenReturn(Arrays.asList(mActiveDevice));
         mController.onBluetoothServiceConnected(mBluetoothA2dp);
         final boolean enabled = false;
         mController.onPreferenceChange(mPreference, enabled);
@@ -151,7 +166,8 @@
 
     @Test
     public void onPreferenceChange_enable_verifyFlow() {
-        when(mBluetoothA2dp.getActiveDevice()).thenReturn(mActiveDevice);
+        when(mBluetoothAdapter.getActiveDevices(eq(BluetoothProfile.A2DP)))
+                .thenReturn(Arrays.asList(mActiveDevice));
         mController.onBluetoothServiceConnected(mBluetoothA2dp);
         final boolean enabled = true;
         mController.onPreferenceChange(mPreference, enabled);
diff --git a/tests/robotests/src/com/android/settings/development/bluetooth/BluetoothQualityDialogPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/bluetooth/BluetoothQualityDialogPreferenceControllerTest.java
index ef209a2..359d24e 100644
--- a/tests/robotests/src/com/android/settings/development/bluetooth/BluetoothQualityDialogPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/bluetooth/BluetoothQualityDialogPreferenceControllerTest.java
@@ -18,6 +18,7 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
+import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -27,6 +28,7 @@
 import android.bluetooth.BluetoothCodecConfig;
 import android.bluetooth.BluetoothCodecStatus;
 import android.bluetooth.BluetoothDevice;
+import android.bluetooth.BluetoothProfile;
 import android.content.Context;
 
 import androidx.lifecycle.LifecycleOwner;
@@ -43,6 +45,8 @@
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 
+import java.util.Arrays;
+
 @RunWith(RobolectricTestRunner.class)
 public class BluetoothQualityDialogPreferenceControllerTest {
 
@@ -51,6 +55,8 @@
     @Mock
     private BluetoothA2dp mBluetoothA2dp;
     @Mock
+    private BluetoothAdapter mBluetoothAdapter;
+    @Mock
     private PreferenceScreen mScreen;
 
     private BluetoothQualityDialogPreferenceController mController;
@@ -74,22 +80,22 @@
         mActiveDevice = BluetoothAdapter.getDefaultAdapter().getRemoteDevice(DEVICE_ADDRESS);
         mController = new BluetoothQualityDialogPreferenceController(mContext, mLifecycle,
                 mBluetoothA2dpConfigStore);
+        mController.mBluetoothAdapter = mBluetoothAdapter;
         mPreference = new BluetoothQualityDialogPreference(mContext);
         when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
         mController.displayPreference(mScreen);
-        mCodecConfigAAC = new BluetoothCodecConfig(BluetoothCodecConfig.SOURCE_CODEC_TYPE_AAC,
-                BluetoothCodecConfig.CODEC_PRIORITY_DEFAULT,
-                BluetoothCodecConfig.SAMPLE_RATE_48000 | BluetoothCodecConfig.SAMPLE_RATE_88200,
-                BluetoothCodecConfig.BITS_PER_SAMPLE_NONE,
-                BluetoothCodecConfig.CHANNEL_MODE_NONE,
-                0, 0, 0, 0);
-        mCodecConfigLDAC = new BluetoothCodecConfig(BluetoothCodecConfig.SOURCE_CODEC_TYPE_LDAC,
-                BluetoothCodecConfig.CODEC_PRIORITY_DEFAULT,
-                BluetoothCodecConfig.SAMPLE_RATE_96000,
-                BluetoothCodecConfig.BITS_PER_SAMPLE_NONE,
-                BluetoothCodecConfig.CHANNEL_MODE_NONE,
-                1001, 0, 0, 0);
-        when(mBluetoothA2dp.getActiveDevice()).thenReturn(mActiveDevice);
+        mCodecConfigAAC = new BluetoothCodecConfig.Builder()
+                .setCodecType(BluetoothCodecConfig.SOURCE_CODEC_TYPE_AAC)
+                .setSampleRate(BluetoothCodecConfig.SAMPLE_RATE_48000
+                        | BluetoothCodecConfig.SAMPLE_RATE_88200)
+                .build();
+        mCodecConfigLDAC = new BluetoothCodecConfig.Builder()
+                .setCodecType(BluetoothCodecConfig.SOURCE_CODEC_TYPE_LDAC)
+                .setSampleRate(BluetoothCodecConfig.SAMPLE_RATE_96000)
+                .setCodecSpecific1(1001)
+                .build();
+        when(mBluetoothAdapter.getActiveDevices(eq(BluetoothProfile.A2DP)))
+                .thenReturn(Arrays.asList(mActiveDevice));
     }
 
     @Test
@@ -116,7 +122,10 @@
     @Test
     public void updateState_codeTypeIsLDAC_enablePreference() {
         BluetoothCodecConfig[] mCodecConfigs = {mCodecConfigAAC, mCodecConfigLDAC};
-        mCodecStatus = new BluetoothCodecStatus(mCodecConfigLDAC, null, mCodecConfigs);
+        mCodecStatus = new BluetoothCodecStatus.Builder()
+                .setCodecConfig(mCodecConfigLDAC)
+                .setCodecsSelectableCapabilities(Arrays.asList(mCodecConfigs))
+                .build();
         when(mBluetoothA2dp.getCodecStatus(mActiveDevice)).thenReturn(mCodecStatus);
         mController.onBluetoothServiceConnected(mBluetoothA2dp);
         mController.updateState(mPreference);
@@ -127,7 +136,10 @@
     @Test
     public void updateState_codeTypeAAC_disablePreference() {
         BluetoothCodecConfig[] mCodecConfigs = {mCodecConfigAAC, mCodecConfigLDAC};
-        mCodecStatus = new BluetoothCodecStatus(mCodecConfigAAC, null, mCodecConfigs);
+        mCodecStatus = new BluetoothCodecStatus.Builder()
+                .setCodecConfig(mCodecConfigAAC)
+                .setCodecsSelectableCapabilities(Arrays.asList(mCodecConfigs))
+                .build();
         when(mBluetoothA2dp.getCodecStatus(mActiveDevice)).thenReturn(mCodecStatus);
         mController.onBluetoothServiceConnected(mBluetoothA2dp);
         mController.updateState(mPreference);
diff --git a/tests/robotests/src/com/android/settings/development/bluetooth/BluetoothSampleRateDialogPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/bluetooth/BluetoothSampleRateDialogPreferenceControllerTest.java
index c649fdf..fa4a79c 100644
--- a/tests/robotests/src/com/android/settings/development/bluetooth/BluetoothSampleRateDialogPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/bluetooth/BluetoothSampleRateDialogPreferenceControllerTest.java
@@ -18,6 +18,7 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
+import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -27,6 +28,7 @@
 import android.bluetooth.BluetoothCodecConfig;
 import android.bluetooth.BluetoothCodecStatus;
 import android.bluetooth.BluetoothDevice;
+import android.bluetooth.BluetoothProfile;
 import android.content.Context;
 
 import androidx.lifecycle.LifecycleOwner;
@@ -44,6 +46,7 @@
 import org.robolectric.RuntimeEnvironment;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 @RunWith(RobolectricTestRunner.class)
@@ -54,6 +57,8 @@
     @Mock
     private BluetoothA2dp mBluetoothA2dp;
     @Mock
+    private BluetoothAdapter mBluetoothAdapter;
+    @Mock
     private PreferenceScreen mScreen;
 
     private BluetoothSampleRateDialogPreferenceController mController;
@@ -78,29 +83,33 @@
         mActiveDevice = BluetoothAdapter.getDefaultAdapter().getRemoteDevice(DEVICE_ADDRESS);
         mController = spy(new BluetoothSampleRateDialogPreferenceController(mContext, mLifecycle,
                 mBluetoothA2dpConfigStore));
+        mController.mBluetoothAdapter = mBluetoothAdapter;
         mPreference = new BluetoothSampleRateDialogPreference(mContext);
         when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
         mController.displayPreference(mScreen);
-        mCodecConfigAAC = new BluetoothCodecConfig(BluetoothCodecConfig.SOURCE_CODEC_TYPE_AAC,
-                BluetoothCodecConfig.CODEC_PRIORITY_DEFAULT,
-                BluetoothCodecConfig.SAMPLE_RATE_48000 | BluetoothCodecConfig.SAMPLE_RATE_88200,
-                BluetoothCodecConfig.BITS_PER_SAMPLE_NONE,
-                BluetoothCodecConfig.CHANNEL_MODE_NONE,
-                0, 0, 0, 0);
-        mCodecConfigSBC = new BluetoothCodecConfig(BluetoothCodecConfig.SOURCE_CODEC_TYPE_SBC,
-                BluetoothCodecConfig.CODEC_PRIORITY_DEFAULT,
-                BluetoothCodecConfig.SAMPLE_RATE_96000,
-                BluetoothCodecConfig.BITS_PER_SAMPLE_NONE,
-                BluetoothCodecConfig.CHANNEL_MODE_NONE,
-                0, 0, 0, 0);
-        when(mBluetoothA2dp.getActiveDevice()).thenReturn(mActiveDevice);
+        mCodecConfigAAC = new BluetoothCodecConfig.Builder()
+                .setCodecType(BluetoothCodecConfig.SOURCE_CODEC_TYPE_AAC)
+                .setSampleRate(BluetoothCodecConfig.SAMPLE_RATE_48000
+                                | BluetoothCodecConfig.SAMPLE_RATE_88200)
+                .build();
+        mCodecConfigSBC = new BluetoothCodecConfig.Builder()
+                .setCodecType(BluetoothCodecConfig.SOURCE_CODEC_TYPE_SBC)
+                .setSampleRate(BluetoothCodecConfig.SAMPLE_RATE_96000)
+                .build();
+        when(mBluetoothAdapter.getActiveDevices(eq(BluetoothProfile.A2DP)))
+                .thenReturn(Arrays.asList(mActiveDevice));
     }
 
     @Test
     public void writeConfigurationValues_selectDefault_setHighest() {
-        mCodecConfigSBC = new BluetoothCodecConfig(BluetoothCodecConfig.SOURCE_CODEC_TYPE_SBC);
+        BluetoothCodecConfig mCodecConfigSBC = new BluetoothCodecConfig.Builder()
+                .setCodecType(BluetoothCodecConfig.SOURCE_CODEC_TYPE_SBC)
+                .build();
         BluetoothCodecConfig[] mCodecConfigs = {mCodecConfigAAC, mCodecConfigSBC};
-        mCodecStatus = new BluetoothCodecStatus(mCodecConfigAAC, null, mCodecConfigs);
+        mCodecStatus = new BluetoothCodecStatus.Builder()
+                .setCodecConfig(mCodecConfigAAC)
+                .setCodecsSelectableCapabilities(Arrays.asList(mCodecConfigs))
+                .build();
         when(mBluetoothA2dp.getCodecStatus(
             mActiveDevice)).thenReturn(mCodecStatus);
         mController.onBluetoothServiceConnected(mBluetoothA2dp);
@@ -132,8 +141,14 @@
 
     @Test
     public void getSelectableIndex_verifyList() {
-        BluetoothCodecConfig[] mCodecConfigs = {mCodecConfigAAC, mCodecConfigSBC};
-        mCodecStatus = new BluetoothCodecStatus(mCodecConfigAAC, null, mCodecConfigs);
+        List<BluetoothCodecConfig> mCodecConfigs = new ArrayList() {{
+                    add(mCodecConfigAAC);
+                    add(mCodecConfigSBC);
+                }};
+        mCodecStatus = new BluetoothCodecStatus.Builder()
+                .setCodecConfig(mCodecConfigAAC)
+                .setCodecsSelectableCapabilities(mCodecConfigs)
+                .build();
         when(mBluetoothA2dp.getCodecStatus(
             mActiveDevice)).thenReturn(mCodecStatus);
         mController.onBluetoothServiceConnected(mBluetoothA2dp);
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDetailPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDetailPreferenceControllerTest.java
index 9fca65d..2d68014 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDetailPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDetailPreferenceControllerTest.java
@@ -63,7 +63,7 @@
 
     @Test
     public void getSummary_shouldGetBuildVersion() {
-        assertThat(mController.getSummary()).isEqualTo(Build.VERSION.RELEASE_OR_CODENAME);
+        assertThat(mController.getSummary()).isEqualTo(Build.VERSION.RELEASE_OR_PREVIEW_DISPLAY);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceControllerTest.java
index 903b88b..a0f59a5 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceControllerTest.java
@@ -65,6 +65,6 @@
     public void updatePreference_shouldSetSummaryToBuildNumber() {
         mController.updateState(mPreference);
 
-        assertThat(mPreference.getSummary()).isEqualTo(Build.VERSION.RELEASE_OR_CODENAME);
+        assertThat(mPreference.getSummary()).isEqualTo(Build.VERSION.RELEASE_OR_PREVIEW_DISPLAY);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/network/EthernetTetherPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/EthernetTetherPreferenceControllerTest.java
index 8a81908..df82a67 100644
--- a/tests/robotests/src/com/android/settings/network/EthernetTetherPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/EthernetTetherPreferenceControllerTest.java
@@ -19,6 +19,7 @@
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -64,10 +65,9 @@
         mPreference = spy(SwitchPreference.class);
         when(mContext.getSystemService(Context.TETHERING_SERVICE)).thenReturn(mTetheringManager);
         when(mTetheringManager.getTetherableIfaces()).thenReturn(new String[]{ETHERNET_REGEX});
-        when(mContext.getSystemService(Context.ETHERNET_SERVICE)).thenReturn(mEthernetManager);
+        when(mContext.getSystemService(EthernetManager.class)).thenReturn(mEthernetManager);
         mController = new EthernetTetherPreferenceController(mContext, "ethernet");
         mController.setTetherEnabler(mTetherEnabler);
-        ReflectionHelpers.setField(mController, "mEthernetRegex", ETHERNET_REGEX);
         ReflectionHelpers.setField(mController, "mPreference", mPreference);
     }
 
@@ -75,7 +75,8 @@
     public void lifecycle_shouldRegisterReceiverOnStart() {
         mController.onStart();
 
-        verify(mEthernetManager).addListener(eq(mController.mEthernetListener));
+        verify(mEthernetManager).addInterfaceStateListener(any(),
+                eq(mController.mEthernetListener));
     }
 
     @Test
@@ -93,11 +94,10 @@
     @Test
     public void lifecycle_shouldUnregisterReceiverOnStop() {
         mController.onStart();
-        EthernetManager.Listener listener = mController.mEthernetListener;
+        EthernetManager.InterfaceStateListener listener = mController.mEthernetListener;
         mController.onStop();
 
-        verify(mEthernetManager).removeListener(eq(listener));
-        assertThat(mController.mEthernetListener).isNull();
+        verify(mEthernetManager).removeInterfaceStateListener(eq(listener));
     }
 
     @Test
@@ -108,8 +108,11 @@
 
     @Test
     public void shouldShow_noEthernetInterface() {
-        ReflectionHelpers.setField(mController, "mEthernetRegex", "");
-        assertThat(mController.shouldShow()).isFalse();
+        when(mContext.getSystemService(EthernetManager.class)).thenReturn(null);
+
+        final EthernetTetherPreferenceController controller =
+                new EthernetTetherPreferenceController(mContext, "ethernet");
+        assertThat(controller.shouldShow()).isFalse();
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/network/telephony/DataUsagePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/DataUsagePreferenceControllerTest.java
index 43bda4e3..a3be60d 100644
--- a/tests/robotests/src/com/android/settings/network/telephony/DataUsagePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/telephony/DataUsagePreferenceControllerTest.java
@@ -26,10 +26,10 @@
 import android.app.usage.NetworkStatsManager;
 import android.content.Context;
 import android.content.Intent;
-import android.net.TrafficStats;
 import android.provider.Settings;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
+import android.util.DataUnit;
 
 import androidx.preference.SwitchPreference;
 
@@ -128,7 +128,7 @@
     public void updateState_shouldUseIECUnit() {
         final DataUsageController.DataUsageInfo usageInfo =
                 new DataUsageController.DataUsageInfo();
-        usageInfo.usageLevel = TrafficStats.MB_IN_BYTES;
+        usageInfo.usageLevel = DataUnit.MEBIBYTES.toBytes(1);
         doReturn(usageInfo).when(mController).getDataUsageInfo(any());
 
         mController.updateState(mPreference);
diff --git a/tests/robotests/src/com/android/settings/security/EncryptionStatusPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/EncryptionStatusPreferenceControllerTest.java
index 9f0e115..970564a 100644
--- a/tests/robotests/src/com/android/settings/security/EncryptionStatusPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/security/EncryptionStatusPreferenceControllerTest.java
@@ -94,23 +94,23 @@
 
         assertThat(mPreference.getFragment()).isNull();
         assertThat(mPreference.getSummary())
-                .isEqualTo(mContext.getText(R.string.crypt_keeper_encrypted_summary));
+                .isEqualTo(mContext.getText(R.string.encrypted_summary));
     }
 
     @Test
-    public void updateSummary_unencrypted_shouldHasEncryptionFragment() {
+    public void updateSummary_unencrypted_shouldSayUnencrypted() {
         ShadowLockPatternUtils.setDeviceEncryptionEnabled(false);
 
         mController.updateState(mPreference);
 
-        final CharSequence summary = mContext.getText(R.string.decryption_settings_summary);
+        final CharSequence summary = mContext.getText(R.string.not_encrypted_summary);
         assertThat(mPreference.getSummary()).isEqualTo(summary);
         assertThat(mController.getPreferenceKey()).isNotEqualTo(PREF_KEY_ENCRYPTION_SECURITY_PAGE);
-        assertThat(mPreference.getFragment()).isEqualTo(CryptKeeperSettings.class.getName());
+        assertThat(mPreference.getFragment()).isNull();
     }
 
     @Test
-    public void updateSummary_unencrypted_securityPage_shouldNotHaveEncryptionFragment() {
+    public void updateSummary_unencrypted_securityPage_shouldSayUnencrypted() {
         mController =
                 new EncryptionStatusPreferenceController(mContext,
                         PREF_KEY_ENCRYPTION_SECURITY_PAGE);
@@ -118,9 +118,8 @@
 
         mController.updateState(mPreference);
 
-        final CharSequence summary = mContext.getText(R.string.decryption_settings_summary);
+        final CharSequence summary = mContext.getText(R.string.not_encrypted_summary);
         assertThat(mPreference.getSummary()).isEqualTo(summary);
-
-        assertThat(mPreference.getFragment()).isNotEqualTo(CryptKeeperSettings.class.getName());
+        assertThat(mPreference.getFragment()).isNull();
     }
 }
diff --git a/tests/robotests/src/com/android/settings/sim/SimListDialogFragmentTest.java b/tests/robotests/src/com/android/settings/sim/SimListDialogFragmentTest.java
index 0fefbe0..070bcb1 100644
--- a/tests/robotests/src/com/android/settings/sim/SimListDialogFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/sim/SimListDialogFragmentTest.java
@@ -53,7 +53,8 @@
         final int dialogType = DATA_PICK;
         setDialogType(dialogType);
         mFragment = spy(SimListDialogFragment.newInstance(dialogType, R.string.select_sim_for_data,
-                false /* includeAskEveryTime */));
+                false /* includeAskEveryTime */,
+                false /* isCancelItemShowed */));
         doReturn(null).when(mFragment).getCurrentSubscriptions();
         startDialog();
         verify(mFragment).dismiss();
@@ -64,7 +65,8 @@
         final int dialogType = DATA_PICK;
         setDialogType(dialogType);
         mFragment = spy(SimListDialogFragment.newInstance(dialogType, R.string.select_sim_for_data,
-                false /* includeAskEveryTime */));
+                false /* includeAskEveryTime */,
+                false /* isCancelItemShowed */));
         doReturn(Arrays.asList(mSim1, mSim2)).when(mFragment).getCurrentSubscriptions();
         // Avoid problems robolectric has with our real adapter.
         doNothing().when(mFragment).setAdapter(any());
@@ -84,7 +86,8 @@
         final int dialogType = DATA_PICK;
         setDialogType(dialogType);
         mFragment = spy(SimListDialogFragment.newInstance(dialogType, R.string.select_sim_for_data,
-                false /* includeAskEveryTime */));
+                false /* includeAskEveryTime */,
+                false /* isCancelItemShowed */));
         doReturn(Arrays.asList(mSim1, mSim2)).when(mFragment).getCurrentSubscriptions();
         // Avoid problems robolectric has with our real adapter.
         doNothing().when(mFragment).setAdapter(any());
@@ -101,7 +104,8 @@
         final int dialogType = SMS_PICK;
         setDialogType(dialogType);
         mFragment = spy(SimListDialogFragment.newInstance(dialogType, R.string.select_sim_for_sms,
-                true /* includeAskEveryTime */));
+                true /* includeAskEveryTime */,
+                false /* isCancelItemShowed */));
         doReturn(Arrays.asList(mSim1, mSim2)).when(mFragment).getCurrentSubscriptions();
         // Avoid problems robolectric has with our real adapter.
         doNothing().when(mFragment).setAdapter(any());
diff --git a/tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java
index 9c91602..c80a951 100644
--- a/tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java
@@ -137,7 +137,7 @@
         mPackageManager = Shadow.extract(mContext.getPackageManager());
         mPackageManager.setSystemFeature(PackageManager.FEATURE_BLUETOOTH, true);
 
-        mBluetoothManager = new BluetoothManager(mContext);
+        mBluetoothManager = mContext.getSystemService(BluetoothManager.class);
         mBluetoothAdapter = mBluetoothManager.getAdapter();
 
         mBluetoothDevice = spy(mBluetoothAdapter.getRemoteDevice(TEST_DEVICE_ADDRESS_1));
diff --git a/tests/robotests/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceControllerTest.java
index fec70dc..8bf0deb 100644
--- a/tests/robotests/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceControllerTest.java
@@ -129,7 +129,7 @@
         when(mLocalBluetoothProfileManager.getHeadsetProfile()).thenReturn(mHeadsetProfile);
         when(mLocalBluetoothProfileManager.getHearingAidProfile()).thenReturn(mHearingAidProfile);
 
-        mBluetoothManager = new BluetoothManager(mContext);
+        mBluetoothManager = mContext.getSystemService(BluetoothManager.class);
         mBluetoothAdapter = mBluetoothManager.getAdapter();
 
         mBluetoothDevice = spy(mBluetoothAdapter.getRemoteDevice(TEST_DEVICE_ADDRESS_1));
diff --git a/tests/robotests/src/com/android/settings/sound/MediaOutputPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/sound/MediaOutputPreferenceControllerTest.java
index f604193..5d7c364 100644
--- a/tests/robotests/src/com/android/settings/sound/MediaOutputPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/sound/MediaOutputPreferenceControllerTest.java
@@ -170,7 +170,7 @@
         when(mLocalBluetoothProfileManager.getA2dpProfile()).thenReturn(mA2dpProfile);
         when(mLocalBluetoothProfileManager.getHearingAidProfile()).thenReturn(mHearingAidProfile);
 
-        mBluetoothManager = new BluetoothManager(mContext);
+        mBluetoothManager = mContext.getSystemService(BluetoothManager.class);
         mBluetoothAdapter = mBluetoothManager.getAdapter();
 
         mBluetoothDevice = spy(mBluetoothAdapter.getRemoteDevice(TEST_DEVICE_ADDRESS_1));
diff --git a/tests/robotests/src/com/android/settings/system/SystemUpdatePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/system/SystemUpdatePreferenceControllerTest.java
index 95c95bb..61aa294 100644
--- a/tests/robotests/src/com/android/settings/system/SystemUpdatePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/system/SystemUpdatePreferenceControllerTest.java
@@ -139,7 +139,7 @@
 
         assertThat(mPreference.getSummary())
                 .isEqualTo(mContext.getString(R.string.android_version_summary,
-                        Build.VERSION.RELEASE_OR_CODENAME));
+                        Build.VERSION.RELEASE_OR_PREVIEW_DISPLAY));
     }
 
     @Test
@@ -168,4 +168,4 @@
         assertThat(mPreference.getSummary())
                 .isEqualTo(mContext.getString(R.string.android_version_pending_update_summary));
     }
-}
\ No newline at end of file
+}
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiSettingsTest.java b/tests/robotests/src/com/android/settings/wifi/WifiSettingsTest.java
index 5f2f564..abed447 100644
--- a/tests/robotests/src/com/android/settings/wifi/WifiSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiSettingsTest.java
@@ -277,6 +277,11 @@
 
     @Test
     public void onWifiEntriesChanged_shouldChangeNextButtonState() {
+        final FragmentActivity activity = mock(FragmentActivity.class);
+        doReturn(false).when(activity).isFinishing();
+        doReturn(false).when(activity).isDestroyed();
+        doReturn(activity).when(mWifiSettings).getActivity();
+
         mWifiSettings.onWifiEntriesChanged();
 
         verify(mWifiSettings).changeNextButtonState(anyBoolean());
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 796cdef..78e696d 100644
--- a/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2pSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2pSettingsTest.java
@@ -39,7 +39,7 @@
 import android.net.wifi.p2p.WifiP2pManager;
 import android.os.Bundle;
 import android.view.MenuItem;
-
+import android.view.LayoutInflater;
 import androidx.fragment.app.FragmentActivity;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
@@ -110,30 +110,30 @@
     }
 
     @Test
-    public void onActivityCreate_withNullBundle_canNotGetValue() {
-        mFragment.onActivityCreated(null);
+    public void onCreateView_withNullBundle_canNotGetValue() {
+        mFragment.onCreateView(LayoutInflater.from(mContext), null, null);
 
         assertThat(mFragment.mSelectedWifiPeer).isNull();
     }
 
     @Test
-    public void onActivityCreate_withDeviceName_shouldGetDeviceName() {
+    public void onCreateView_withDeviceName_shouldGetDeviceName() {
         final String fakeDeviceName = "fakename";
         final Bundle bundle = new Bundle();
         bundle.putString(WifiP2pSettings.SAVE_DEVICE_NAME, fakeDeviceName);
 
-        mFragment.onActivityCreated(bundle);
+        mFragment.onCreateView(LayoutInflater.from(mContext), null, bundle);
 
         assertThat(mFragment.mSavedDeviceName).isEqualTo(fakeDeviceName);
     }
 
     @Test
-    public void onActivityCreate_withGroupName_shouldGetGroupName() {
+    public void onCreateView_withGroupName_shouldGetGroupName() {
         final String fakeGroupName = "fakegroup";
         final Bundle bundle = new Bundle();
         bundle.putString(WifiP2pSettings.SAVE_SELECTED_GROUP, fakeGroupName);
 
-        mFragment.onActivityCreated(bundle);
+        mFragment.onCreateView(LayoutInflater.from(mContext), null, bundle);
 
         assertThat(mFragment.mSelectedGroupName).isEqualTo(fakeGroupName);
         assertThat(mFragment.mSavedDeviceName).isNull();
@@ -279,7 +279,7 @@
         final String fakeDeviceName = "fakeName";
         final Bundle bundle = new Bundle();
         bundle.putString(WifiP2pSettings.SAVE_DEVICE_NAME, fakeDeviceName);
-        mFragment.onActivityCreated(bundle);
+        mFragment.onCreateView(LayoutInflater.from(mContext), null, bundle);
         final Dialog dialog = mFragment.onCreateDialog(WifiP2pSettings.DIALOG_RENAME);
 
         mFragment.mRenameListener.onClick(dialog, DialogInterface.BUTTON_POSITIVE);
@@ -292,7 +292,8 @@
         final String fakeDeviceName = "wrongName***";
         final Bundle bundle = new Bundle();
         bundle.putString(WifiP2pSettings.SAVE_DEVICE_NAME, fakeDeviceName);
-        mFragment.onActivityCreated(bundle);
+        mFragment.onCreateView(LayoutInflater.from(mContext), null, bundle);
+
         final Dialog dialog = mFragment.onCreateDialog(WifiP2pSettings.DIALOG_RENAME);
 
         mFragment.mRenameListener.onClick(dialog, DialogInterface.BUTTON_POSITIVE);
@@ -394,7 +395,7 @@
         final String fakeDeviceName = "fakeName";
         final Bundle createBundle = new Bundle();
         createBundle.putString(WifiP2pSettings.SAVE_DEVICE_NAME, fakeDeviceName);
-        mFragment.onActivityCreated(createBundle);
+        mFragment.onCreateView(LayoutInflater.from(mContext), null, createBundle);
         final Bundle outBundle = new Bundle();
         final Dialog dialog = mFragment.onCreateDialog(WifiP2pSettings.DIALOG_RENAME);
 
@@ -430,7 +431,7 @@
         doReturn(groupList).when(wifiP2pGroupList).getGroupList();
         final Bundle bundle = new Bundle();
         bundle.putString(WifiP2pSettings.SAVE_SELECTED_GROUP, fakeGroupName);
-        mFragment.onActivityCreated(bundle);
+        mFragment.onCreateView(LayoutInflater.from(mContext), null, bundle);
 
         mFragment.onPersistentGroupInfoAvailable(wifiP2pGroupList);
 
@@ -503,20 +504,20 @@
     }
 
     @Test
-    public void onActivityCreate_withNullP2pManager_shouldGetP2pManagerAgain() {
-        mFragment.mChannel = null; // Reset channel to re-test onActivityCreated flow
+    public void onCreateView_withNullP2pManager_shouldGetP2pManagerAgain() {
+        mFragment.mChannel = null; // Reset channel to re-test onCreateView flow
         mFragment.mWifiP2pManager = null;
 
-        mFragment.onActivityCreated(new Bundle());
+        mFragment.onCreateView(LayoutInflater.from(mContext), null, new Bundle());
 
         assertThat(mFragment.mWifiP2pManager).isNotNull();
     }
 
     @Test
-    public void onActivityCreate_withNullChannel_shouldSetP2pManagerNull() {
+    public void onCreateView_withNullChannel_shouldSetP2pManagerNull() {
         doReturn(null).when(mWifiP2pManager).initialize(any(), any(), any());
-        mFragment.mChannel = null; // Reset channel to re-test onActivityCreated flow
-        mFragment.onActivityCreated(new Bundle());
+        mFragment.mChannel = null; // Reset channel to re-test onCreateView flow
+        mFragment.onCreateView(LayoutInflater.from(mContext), null, new Bundle());
 
         assertThat(mFragment.mWifiP2pManager).isNull();
     }
diff --git a/tests/unit/OWNERS b/tests/unit/OWNERS
index 4123742..8a7a27e 100644
--- a/tests/unit/OWNERS
+++ b/tests/unit/OWNERS
@@ -1,2 +1,2 @@
-# Additional reviewers for this and subdirectories.
-goldmanj@google.com
+# We do not guard tests - everyone is welcomed to contribute to tests.
+per-file *.java=*
\ No newline at end of file
diff --git a/tests/unit/src/com/android/settings/biometrics/OWNERS b/tests/unit/src/com/android/settings/biometrics/OWNERS
new file mode 100644
index 0000000..a257ed8
--- /dev/null
+++ b/tests/unit/src/com/android/settings/biometrics/OWNERS
@@ -0,0 +1 @@
+include /src/com/android/settings/biometrics/OWNERS
diff --git a/tests/unit/src/com/android/settings/datausage/DataUsageInfoControllerTest.java b/tests/unit/src/com/android/settings/datausage/DataUsageInfoControllerTest.java
index d770aba..b80e9d2 100644
--- a/tests/unit/src/com/android/settings/datausage/DataUsageInfoControllerTest.java
+++ b/tests/unit/src/com/android/settings/datausage/DataUsageInfoControllerTest.java
@@ -101,8 +101,7 @@
     }
 
     private NetworkPolicy getDefaultNetworkPolicy() {
-        NetworkTemplate template = NetworkTemplate.buildTemplateWifi(
-                NetworkTemplate.WIFI_NETWORKID_ALL, null /* subscriberId */);
+        NetworkTemplate template = new NetworkTemplate.Builder(NetworkTemplate.MATCH_WIFI).build();
         int cycleDay  = -1;
         String cycleTimezone = "UTC";
         long warningBytes = -1;
diff --git a/tests/unit/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java b/tests/unit/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java
index 7d814b5..b27591e 100644
--- a/tests/unit/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java
+++ b/tests/unit/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java
@@ -531,13 +531,11 @@
 
         final Bundle expect = new Bundle(1);
         expect.putParcelable(DataUsageList.EXTRA_NETWORK_TEMPLATE,
-                NetworkTemplate.buildTemplateWifi(NetworkTemplate.WIFI_NETWORKID_ALL,
-                null /* subscriberId */));
+                new NetworkTemplate.Builder(NetworkTemplate.MATCH_WIFI).build());
         final Bundle actual = startedIntent
                 .getBundleExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS);
         assertThat((NetworkTemplate) actual.getParcelable(DataUsageList.EXTRA_NETWORK_TEMPLATE))
-                .isEqualTo(NetworkTemplate.buildTemplateWifi(
-                NetworkTemplate.WIFI_NETWORKID_ALL, null /* subscriberId */));
+                .isEqualTo(new NetworkTemplate.Builder(NetworkTemplate.MATCH_WIFI).build());
 
         assertThat(startedIntent.getIntExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_TITLE_RESID, 0))
                 .isEqualTo(ResourcesUtils.getResourcesId(mContext, "string", "wifi_data_usage"));
diff --git a/tests/unit/src/com/android/settings/development/MockModemPreferenceControllerTest.java b/tests/unit/src/com/android/settings/development/MockModemPreferenceControllerTest.java
new file mode 100644
index 0000000..f811ac4
--- /dev/null
+++ b/tests/unit/src/com/android/settings/development/MockModemPreferenceControllerTest.java
@@ -0,0 +1,111 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development;
+
+import static com.android.settings.development.MockModemPreferenceController
+        .ALLOW_MOCK_MODEM_PROPERTY;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.os.Looper;
+import android.os.SystemProperties;
+
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class MockModemPreferenceControllerTest {
+
+    private Context mContext;
+    private MockModemPreferenceController mController;
+    private SwitchPreference mPreference;
+
+    @Before
+    public void setUp() {
+        mContext = ApplicationProvider.getApplicationContext();
+        mController = new MockModemPreferenceController(mContext);
+        if (Looper.myLooper() == null) {
+            Looper.prepare();
+        }
+
+        final PreferenceManager preferenceManager = new PreferenceManager(mContext);
+        final PreferenceScreen screen = preferenceManager.createPreferenceScreen(mContext);
+        mPreference = new SwitchPreference(mContext);
+        mPreference.setKey(mController.getPreferenceKey());
+        screen.addPreference(mPreference);
+        mController.displayPreference(screen);
+    }
+
+    @Test
+    public void onPreferenceChanged_settingDisabled_shouldNotAllowedMockModem() {
+        mController.onPreferenceChange(mPreference, false /* new value */);
+
+        final boolean mode = SystemProperties.getBoolean(
+                ALLOW_MOCK_MODEM_PROPERTY, false /* default */);
+
+        assertThat(mode).isFalse();
+    }
+
+    @Test
+    public void onPreferenceChanged_settingEnabled_shouldAllowMockModem() {
+        mController.onPreferenceChange(mPreference, true /* new value */);
+
+        final boolean mode = SystemProperties.getBoolean(
+                ALLOW_MOCK_MODEM_PROPERTY, false /* default */);
+
+        assertThat(mode).isTrue();
+    }
+
+    @Test
+    public void updateState_settingEnabled_preferenceShouldBeChecked() {
+        SystemProperties.set(ALLOW_MOCK_MODEM_PROPERTY,
+                Boolean.toString(true));
+
+        mController.updateState(mPreference);
+        assertThat(mPreference.isChecked()).isTrue();
+    }
+
+    @Test
+    public void updateState_settingDisabled_preferenceShouldNotBeChecked() {
+        SystemProperties.set(ALLOW_MOCK_MODEM_PROPERTY,
+                Boolean.toString(false));
+
+        mController.updateState(mPreference);
+        assertThat(mPreference.isChecked()).isFalse();
+    }
+
+    @Test
+    public void onDeveloperOptionsDisabled_shouldDisablePreference() {
+        mController.onDeveloperOptionsSwitchDisabled();
+        final boolean mode = SystemProperties.getBoolean(
+                ALLOW_MOCK_MODEM_PROPERTY,
+                false /* default */);
+
+        mController.updateState(mPreference);
+
+        assertThat(mode).isFalse();
+        assertThat(mPreference.isChecked()).isFalse();
+    }
+}
diff --git a/tests/unit/src/com/android/settings/development/NfcStackDebugLogPreferenceControllerTest.java b/tests/unit/src/com/android/settings/development/NfcStackDebugLogPreferenceControllerTest.java
new file mode 100644
index 0000000..914d01d
--- /dev/null
+++ b/tests/unit/src/com/android/settings/development/NfcStackDebugLogPreferenceControllerTest.java
@@ -0,0 +1,112 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development;
+
+import static com.android.settings.development.NfcStackDebugLogPreferenceController
+        .NFC_STACK_DEBUGLOG_ENABLED_PROPERTY;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.os.Looper;
+import android.os.SystemProperties;
+
+import androidx.preference.SwitchPreference;
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class NfcStackDebugLogPreferenceControllerTest {
+
+    private Context mContext;
+    private NfcStackDebugLogPreferenceController mController;
+    private SwitchPreference mPreference;
+
+    @Before
+    public void setUp() {
+        mContext = ApplicationProvider.getApplicationContext();
+        mController = new NfcStackDebugLogPreferenceController(mContext);
+        if (Looper.myLooper() == null) {
+            Looper.prepare();
+        }
+
+        final PreferenceManager preferenceManager = new PreferenceManager(mContext);
+        final PreferenceScreen screen = preferenceManager.createPreferenceScreen(mContext);
+        mPreference = new SwitchPreference(mContext);
+        mPreference.setKey(mController.getPreferenceKey());
+        screen.addPreference(mPreference);
+        mController.displayPreference(screen);
+    }
+
+    @Test
+    public void onPreferenceChanged_settingDisabled_shouldTurnOffNfcStackDebugLog() {
+        mController.onPreferenceChange(mPreference, false /* new value */);
+
+        final boolean mode = SystemProperties.getBoolean(
+                NFC_STACK_DEBUGLOG_ENABLED_PROPERTY, false /* default */);
+
+        assertThat(mode).isFalse();
+    }
+
+    @Test
+    public void onPreferenceChanged_settingEnabled_shouldTurnOnNfcStackDebugLog() {
+        mController.onPreferenceChange(mPreference, true /* new value */);
+
+        final boolean mode = SystemProperties.getBoolean(
+                NFC_STACK_DEBUGLOG_ENABLED_PROPERTY, false /* default */);
+
+        assertThat(mode).isTrue();
+    }
+
+    @Test
+    public void updateState_settingEnabled_preferenceShouldBeChecked() {
+        SystemProperties.set(NFC_STACK_DEBUGLOG_ENABLED_PROPERTY,
+                Boolean.toString(true));
+
+        mController.updateState(mPreference);
+        assertThat(mPreference.isChecked()).isTrue();
+    }
+
+    @Test
+    public void updateState_settingDisabled_preferenceShouldNotBeChecked() {
+        SystemProperties.set(NFC_STACK_DEBUGLOG_ENABLED_PROPERTY,
+                Boolean.toString(false));
+
+        mController.updateState(mPreference);
+        assertThat(mPreference.isChecked()).isFalse();
+    }
+
+    @Test
+    public void onDeveloperOptionsDisabled_shouldDisablePreference() {
+        mController.onDeveloperOptionsSwitchDisabled();
+        final boolean mode = SystemProperties.getBoolean(
+                NFC_STACK_DEBUGLOG_ENABLED_PROPERTY,
+                false /* default */);
+
+        mController.updateState(mPreference);
+
+        assertThat(mode).isFalse();
+        assertThat(mPreference.isChecked()).isFalse();
+    }
+}
diff --git a/tests/unit/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java b/tests/unit/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java
index 3154d22..9cd6f2d 100644
--- a/tests/unit/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java
+++ b/tests/unit/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java
@@ -55,6 +55,7 @@
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
 import android.telephony.UiccCardInfo;
+import android.telephony.UiccPortInfo;
 import android.telephony.euicc.EuiccManager;
 
 import androidx.lifecycle.LifecycleOwner;
@@ -74,6 +75,7 @@
 import org.mockito.MockitoAnnotations;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -414,17 +416,34 @@
                 false,                                  // isEuicc
                 0,                                      // cardId
                 null,                                   // eid
-                "123451234567890",                      // iccid
                 0,                                      // slotIndex
-                true);                                  // isRemovable
+                true,                                   // isRemovable
+                false,            // isMultipleEnabledProfileSupported
+                Collections.singletonList(
+                        new UiccPortInfo(
+                                "123451234567890",     // iccId
+                                0,                   // portIdx
+                                0,              // logicalSlotIdx
+                                true               // isActive
+                        )
+                ));
         uiccCardInfos.add(uiccCardInfo1);
         UiccCardInfo uiccCardInfo2 = new UiccCardInfo(
                 true,                                   // isEuicc
                 1,                                      // cardId
                 null,                                   // eid (unavailable)
-                null,                                   // iccid
                 1,                                      // slotIndex
-                false);                                 // isRemovable
+                false,                             // isRemovable
+                false,
+                Collections.singletonList(
+                        new UiccPortInfo(
+                                null,                  // iccId
+                                1,                   // portIdx
+                                1,              // logicalSlotIdx
+                                true               // isActive
+                        )
+                )
+        );
         uiccCardInfos.add(uiccCardInfo2);
         when(mTelephonyManager.getUiccCardsInfo()).thenReturn(uiccCardInfos);
 
@@ -453,17 +472,31 @@
                 true,                                   // isEuicc
                 0,                                      // cardId
                 TEST_EID_FROM_CARD,                     // eid
-                null,                                   // iccid
                 0,                                      // slotIndex
-                false);                                 // isRemovable
+                false,                                 // isRemovable
+                false,
+                Collections.singletonList(new UiccPortInfo(
+                        null,                                 // iccId
+                        0,                                  // portIdx
+                        0,                             // logicalSlotIdx
+                        true                              // isActive
+                )));
         uiccCardInfos.add(uiccCardInfo1);
         UiccCardInfo uiccCardInfo2 = new UiccCardInfo(
                 false,                                  // isEuicc
                 1,                                      // cardId
                 null,                                   // eid
-                "123451234567890",                      // iccid
                 1,                                      // slotIndex
-                true);                                  // isRemovable
+                true,                             // isRemovable
+                false,           // isMultipleEnabledProfileSupported
+                Collections.singletonList(
+                        new UiccPortInfo(
+                                "123451234567890",      // iccId
+                                1,                    // portIdx
+                                1,               // logicalSlotIdx
+                                true                // isActive
+                        )
+                ));
         uiccCardInfos.add(uiccCardInfo2);
         when(mTelephonyManager.getUiccCardsInfo()).thenReturn(uiccCardInfos);
 
@@ -493,17 +526,34 @@
                 false,                                  // isEuicc
                 0,                                      // cardId
                 null,                                   // eid
-                "123451234567890",                      // iccid
                 0,                                      // slotIndex
-                true);                                  // isRemovable
+                true,                             // isRemovable
+                false,             // isMultipleEnabledProfileSupported
+                Collections.singletonList(
+                        new UiccPortInfo(
+                                "123451234567890",       // iccId
+                                1,                     // portIdx
+                                1,                // logicalSlotIdx
+                                true                 // isActive
+                        )
+                ));
         uiccCardInfos.add(uiccCardInfo1);
         UiccCardInfo uiccCardInfo2 = new UiccCardInfo(
                 true,                                   // isEuicc
                 1,                                      // cardId
                 null,                                   // eid (unavailable)
-                null,                                   // iccid
                 1,                                      // slotIndex
-                false);                                 // isRemovable
+                false,                                 // isRemovable
+                false,             // isMultipleEnabledProfileSupported
+                Collections.singletonList(
+                        new UiccPortInfo(
+                                null,                   // iccId
+                                1,                    // portIdx
+                                1,               // logicalSlotIdx
+                                true                // isActive
+                        )
+                )
+        );
         uiccCardInfos.add(uiccCardInfo2);
         when(mTelephonyManager.getUiccCardsInfo()).thenReturn(uiccCardInfos);
 
@@ -536,17 +586,33 @@
                 false,                                  // isEuicc
                 0,                                      // cardId
                 null,                                   // eid
-                "123451234567890",                      // iccid
                 0,                                      // slotIndex
-                true);                                  // isRemovable
+                true,                                  // isRemovable
+                false,              // isMultipleEnabledProfileSupported
+                Collections.singletonList(
+                        new UiccPortInfo(
+                                "123451234567890",        // iccId
+                                0,                      // portIdx
+                                0,                 // logicalSlotIdx
+                                true                  // isActive
+                        )
+                ));
         uiccCardInfos.add(uiccCardInfo1);
         UiccCardInfo uiccCardInfo2 = new UiccCardInfo(
                 true,                                   // isEuicc
                 1,                                      // cardId
                 TEST_EID_FROM_CARD,                     // eid
-                null,                                   // iccid
                 1,                                      // slotIndex
-                false);                                 // isRemovable
+                false,                                 // isRemovable
+                false,            // isMultipleEnabledProfileSupported
+                Collections.singletonList(
+                        new UiccPortInfo(
+                                null,                  // iccId
+                                1,                   // portIdx
+                                1,              // logicalSlotIdx
+                                true               // isActive
+                        )
+                ));
         uiccCardInfos.add(uiccCardInfo2);
         when(mTelephonyManager.getUiccCardsInfo()).thenReturn(uiccCardInfos);
 
@@ -577,9 +643,17 @@
                 true,                                   // isEuicc
                 0,                                      // cardId
                 TEST_EID_FROM_CARD,                     // eid (not used)
-                null,                                   // iccid
                 0,                                      // slotIndex
-                false);                                 // isRemovable
+                false,                                 // isRemovable
+                false,            // isMultipleEnabledProfileSupported
+                Collections.singletonList(
+                        new UiccPortInfo(
+                                null,                  // iccId
+                                0,                   // portIdx
+                                0,              // logicalSlotIdx
+                                true               // isActive
+                        )
+                ));
         uiccCardInfos.add(uiccCardInfo);
         when(mTelephonyManager.getUiccCardsInfo()).thenReturn(uiccCardInfos);
 
@@ -607,9 +681,18 @@
                 true,                                   // isEuicc (eUICC slot is selected)
                 0,                                      // cardId
                 TEST_EID_FROM_CARD,                     // eid (not used)
-                null,                                   // iccid
                 0,                                      // slotIndex
-                false);                                 // isRemovable
+                false,                                 // isRemovable
+                false,               // isMultipleEnabledProfileSupported
+                Collections.singletonList(
+                        new UiccPortInfo(
+                                null,                // iccId
+                                0,                 // portIdx
+                                0,            // logicalSlotIdx
+                                true             // isActive
+                        )
+                )
+        );
         uiccCardInfos.add(uiccCardInfo);
         when(mTelephonyManager.getUiccCardsInfo()).thenReturn(uiccCardInfos);
 
@@ -639,9 +722,18 @@
                 false,                                  // isEuicc (eUICC slot is not selected)
                 0,                                      // cardId
                 null,                                   // eid
-                "123451234567890",                      // iccid
                 0,                                      // slotIndex
-                true);                                  // isRemovable
+                true,                                  // isRemovable
+                false,            // isMultipleEnabledProfileSupported
+                Collections.singletonList(
+                        new UiccPortInfo(
+                                "123451234567890",        // iccId
+                                0,                      // portIdx
+                                0,                 // logicalSlotIdx
+                                true                  // isActive
+
+                        )
+                ));
         uiccCardInfos.add(uiccCardInfo);
         when(mTelephonyManager.getUiccCardsInfo()).thenReturn(uiccCardInfos);
 
@@ -671,9 +763,17 @@
                 false,                                  // isEuicc
                 0,                                      // cardId
                 null,                                   // eid
-                "123451234567890",                      // iccid
                 0,                                      // slotIndex
-                true);                                  // isRemovable
+                true,                                  // isRemovable
+                false,           //isMultipleEnabledProfileSupported
+                Collections.singletonList(
+                        new UiccPortInfo(
+                                "123451234567890",      // iccId
+                                0,                    // portIdx
+                                0,               // logicalSlotIdx
+                                true                // isActive
+                        )
+                ));
         uiccCardInfos.add(uiccCardInfo);
         when(mTelephonyManager.getUiccCardsInfo()).thenReturn(uiccCardInfos);
 
diff --git a/tests/unit/src/com/android/settings/deviceinfo/storage/StorageAsyncLoaderTest.java b/tests/unit/src/com/android/settings/deviceinfo/storage/StorageAsyncLoaderTest.java
index 671da95..cad68e1 100644
--- a/tests/unit/src/com/android/settings/deviceinfo/storage/StorageAsyncLoaderTest.java
+++ b/tests/unit/src/com/android/settings/deviceinfo/storage/StorageAsyncLoaderTest.java
@@ -33,9 +33,9 @@
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.pm.UserInfo;
 import android.content.res.Resources;
-import android.net.TrafficStats;
 import android.os.UserHandle;
 import android.os.UserManager;
+import android.util.DataUnit;
 import android.util.SparseArray;
 
 import androidx.test.core.app.ApplicationProvider;
@@ -62,7 +62,7 @@
     private static final String PACKAGE_NAME_1 = "com.blah.test";
     private static final String PACKAGE_NAME_2 = "com.blah.test2";
     private static final String PACKAGE_NAME_3 = "com.blah.test3";
-    private static final long DEFAULT_QUOTA = 64 * TrafficStats.MB_IN_BYTES;
+    private static final long DEFAULT_QUOTA = DataUnit.MEBIBYTES.toBytes(64);
 
     @Mock
     private StorageStatsSource mSource;
diff --git a/tests/unit/src/com/android/settings/network/EnabledNetworkModePreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/EnabledNetworkModePreferenceControllerTest.java
index 81841b7..20f8a55 100644
--- a/tests/unit/src/com/android/settings/network/EnabledNetworkModePreferenceControllerTest.java
+++ b/tests/unit/src/com/android/settings/network/EnabledNetworkModePreferenceControllerTest.java
@@ -19,6 +19,7 @@
 import static androidx.lifecycle.Lifecycle.Event.ON_START;
 
 import static com.android.settings.core.BasePreferenceController.AVAILABLE;
+import static com.android.settings.core.BasePreferenceController.AVAILABLE_UNSEARCHABLE;
 import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
 import static com.android.settings.network.telephony.MobileNetworkUtils.getRafFromNetworkType;
 import static com.android.settings.network.telephony.TelephonyConstants.RadioAccessFamily.CDMA;
@@ -32,6 +33,8 @@
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
@@ -154,6 +157,30 @@
 
     @UiThreadTest
     @Test
+    public void getAvailabilityStatus_callStateIsIdle_returnAvailable() {
+        mockEnabledNetworkMode(TelephonyManagerConstants.NETWORK_MODE_NR_LTE_GSM_WCDMA);
+        mController.getTelephonyCallback().onCallStateChanged(TelephonyManager.CALL_STATE_IDLE);
+
+        mController.updateState(mPreference);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
+        assertTrue(mPreference.isEnabled());
+    }
+
+    @UiThreadTest
+    @Test
+    public void getAvailabilityStatus_duringCalling_returnAvailable() {
+        mockEnabledNetworkMode(TelephonyManagerConstants.NETWORK_MODE_NR_LTE_GSM_WCDMA);
+        mController.getTelephonyCallback().onCallStateChanged(TelephonyManager.CALL_STATE_OFFHOOK);
+
+        mController.updateState(mPreference);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE_UNSEARCHABLE);
+        assertFalse(mPreference.isEnabled());
+    }
+
+    @UiThreadTest
+    @Test
     public void updateState_LteWorldPhone_GlobalHasLte() {
         mPersistableBundle.putBoolean(CarrierConfigManager.KEY_WORLD_MODE_ENABLED_BOOL, true);
 
diff --git a/tests/unit/src/com/android/settings/network/EraseEuiccDataControllerTest.java b/tests/unit/src/com/android/settings/network/EraseEuiccDataControllerTest.java
index 879b9f7..e3fea83 100644
--- a/tests/unit/src/com/android/settings/network/EraseEuiccDataControllerTest.java
+++ b/tests/unit/src/com/android/settings/network/EraseEuiccDataControllerTest.java
@@ -26,6 +26,7 @@
 import com.android.settings.core.BasePreferenceController;
 
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -42,6 +43,7 @@
         mController = new EraseEuiccDataController(context, ERASE_EUICC_DATA_PREFERENCE_KEY);
     }
 
+    @Ignore("Will not work on devices without FEATURE_TELEPHONY_EUICC")
     @Test
     public void getAvailabilityStatus_returnAVAILABLE_UNSEARCHABLE() {
         assertThat(mController.getAvailabilityStatus())
diff --git a/tests/unit/src/com/android/settings/network/InternetResetHelperTest.java b/tests/unit/src/com/android/settings/network/InternetResetHelperTest.java
index 00ca8e1..3dbaa91 100644
--- a/tests/unit/src/com/android/settings/network/InternetResetHelperTest.java
+++ b/tests/unit/src/com/android/settings/network/InternetResetHelperTest.java
@@ -217,7 +217,7 @@
         // Show resetting preference
         assertThat(mResettingPreference.isVisible()).isTrue();
         // Show Mobile Network controller
-        verify(mMobileNetworkController).hidePreference(false /* hide */, false /* immediately*/);
+        verify(mMobileNetworkController).hidePreference(false /* hide */, true /* immediately*/);
         // Hide Wi-Fi preferences
         assertThat(mWifiTogglePreferences.isVisible()).isFalse();
         assertThat(mConnectedWifiEntryPreferences.isVisible()).isFalse();
@@ -240,7 +240,7 @@
         assertThat(mWifiEntryPreferences.isVisible()).isTrue();
         // Hide Mobile Network controller
         verify(mMobileNetworkController, never())
-                .hidePreference(false /* hide */, false /* immediately*/);
+                .hidePreference(false /* hide */, true /* immediately*/);
     }
 
     @Test
@@ -251,7 +251,7 @@
         mInternetResetHelper.resumePreferences();
 
         // Show subsystem preferences
-        verify(mMobileNetworkController).hidePreference(false, false);
+        verify(mMobileNetworkController).hidePreference(false, true);
         assertThat(mWifiTogglePreferences.isVisible()).isTrue();
         assertThat(mConnectedWifiEntryPreferences.isVisible()).isTrue();
         assertThat(mWifiEntryPreferences.isVisible()).isTrue();
diff --git a/tests/unit/src/com/android/settings/network/helper/QuerySimSlotIndexTest.java b/tests/unit/src/com/android/settings/network/helper/QuerySimSlotIndexTest.java
new file mode 100644
index 0000000..36532a1
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/helper/QuerySimSlotIndexTest.java
@@ -0,0 +1,322 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.network.helper;
+
+import static android.telephony.UiccSlotInfo.CARD_STATE_INFO_PRESENT;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.when;
+
+import android.telephony.TelephonyManager;
+import android.telephony.UiccPortInfo;
+import android.telephony.UiccSlotInfo;
+import android.util.Log;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settingslib.utils.ThreadUtils;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.Future;
+import java.util.concurrent.atomic.AtomicIntegerArray;
+
+@RunWith(AndroidJUnit4.class)
+public class QuerySimSlotIndexTest {
+    private static final String TAG = "QSSI_Test";
+
+    @Mock
+    private TelephonyManager mTelephonyManager;
+
+    Future<AtomicIntegerArray> mActiveSimSlotIndex;
+    Future<AtomicIntegerArray> mAllSimSlotIndex;
+
+    @Before
+    public void setUp() {
+        // query in background thread
+        mAllSimSlotIndex = ThreadUtils.postOnBackgroundThread(
+                new QuerySimSlotIndex(mTelephonyManager, true, true));
+        // query in background thread
+        mActiveSimSlotIndex = ThreadUtils.postOnBackgroundThread(
+                new QuerySimSlotIndex(mTelephonyManager, false, true));
+    }
+
+    @Test
+    public void allSimSlotIndexCall_nullInput_getNoneNullEmptyList() {
+        try {
+            when(mTelephonyManager.getUiccSlotsInfo()).thenReturn(null);
+            List<Integer> result = SelectableSubscriptions.atomicToList(mActiveSimSlotIndex.get());
+
+            assertThat(result.size()).isEqualTo(0);
+        } catch (Exception exception) {
+            Log.w(TAG, "Fail to request subIdList", exception);
+        }
+    }
+
+    @Test
+    public void allSimSlotIndexCall_oneSimAndActivePsim_getList() {
+        try {
+            when(mTelephonyManager.getUiccSlotsInfo()).thenReturn(oneSim_ActivePsim());
+            List<Integer> result = SelectableSubscriptions.atomicToList(mActiveSimSlotIndex.get());
+
+            assertThat(result.size()).isEqualTo(1);
+            assertThat(result.get(0)).isEqualTo(0);
+        } catch (Exception exception) {
+            Log.w(TAG, "Fail to request subIdList", exception);
+        }
+    }
+
+    @Test
+    public void allSimSlotIndexCall_oneSimAndActiveEsim_getList() {
+        try {
+            when(mTelephonyManager.getUiccSlotsInfo()).thenReturn(oneSim_ActiveEsim());
+            List<Integer> result = SelectableSubscriptions.atomicToList(mActiveSimSlotIndex.get());
+
+            assertThat(result.size()).isEqualTo(1);
+            assertThat(result.get(0)).isEqualTo(1);
+        } catch (Exception exception) {
+            Log.w(TAG, "Fail to request subIdList", exception);
+        }
+    }
+
+    @Test
+    public void allSimSlotIndexCall_twoSimsAndActivePsimActiveEsim_getList() {
+        try {
+            when(mTelephonyManager.getUiccSlotsInfo()).thenReturn(twoSims_ActivePsimActiveEsim());
+            List<Integer> result = SelectableSubscriptions.atomicToList(mActiveSimSlotIndex.get());
+
+            assertThat(result.size()).isEqualTo(2);
+            assertThat(result.get(0)).isEqualTo(0);
+            assertThat(result.get(1)).isEqualTo(1);
+        } catch (Exception exception) {
+            Log.w(TAG, "Fail to request subIdList", exception);
+        }
+    }
+
+    @Test
+    public void allSimSlotIndexCall_twoSimsAndtwoActiveEsims_getList() {
+        try {
+            when(mTelephonyManager.getUiccSlotsInfo()).thenReturn(twoSims_twoActiveEsims());
+            List<Integer> result = SelectableSubscriptions.atomicToList(mActiveSimSlotIndex.get());
+
+            assertThat(result.size()).isEqualTo(2);
+            assertThat(result.get(0)).isEqualTo(0);
+            assertThat(result.get(1)).isEqualTo(1);
+        } catch (Exception exception) {
+            Log.w(TAG, "Fail to request subIdList", exception);
+        }
+    }
+
+    @Test
+    public void allSimSlotIndexCall_twoSimsAndActivePsimInactiveEsim_getList() {
+        try {
+            when(mTelephonyManager.getUiccSlotsInfo()).thenReturn(twoSims_ActivePsimInactiveEsim());
+            List<Integer> result = SelectableSubscriptions.atomicToList(mActiveSimSlotIndex.get());
+
+            assertThat(result.size()).isEqualTo(2);
+            assertThat(result.get(0)).isEqualTo(0);
+            assertThat(result.get(1)).isEqualTo(1);
+        } catch (Exception exception) {
+            Log.w(TAG, "Fail to request subIdList", exception);
+        }
+    }
+
+    @Test
+    public void allSimSlotIndexCall_twoSimsAndActiveEsimInactivePsim_getList() {
+        try {
+            when(mTelephonyManager.getUiccSlotsInfo()).thenReturn(twoSims_ActiveEsimInactivePsim());
+            List<Integer> result = SelectableSubscriptions.atomicToList(mActiveSimSlotIndex.get());
+
+            assertThat(result.size()).isEqualTo(2);
+            assertThat(result.get(0)).isEqualTo(0);
+            assertThat(result.get(1)).isEqualTo(1);
+        } catch (Exception exception) {
+            Log.w(TAG, "Fail to request subIdList", exception);
+        }
+    }
+
+    @Test
+    public void activeSimSlotIndexCall_nullInput_getNoneNullEmptyList() {
+        try {
+            when(mTelephonyManager.getUiccSlotsInfo()).thenReturn(null);
+            List<Integer> result = SelectableSubscriptions.atomicToList(mActiveSimSlotIndex.get());
+
+            assertThat(result.size()).isEqualTo(0);
+        } catch (Exception exception) {
+            Log.w(TAG, "Fail to request subIdList", exception);
+        }
+    }
+
+    @Test
+    public void activeSimSlotIndexCall_oneSimAndActivePsim_getList() {
+        try {
+            when(mTelephonyManager.getUiccSlotsInfo()).thenReturn(oneSim_ActivePsim());
+            List<Integer> result = SelectableSubscriptions.atomicToList(mActiveSimSlotIndex.get());
+
+            assertThat(result.size()).isEqualTo(1);
+            assertThat(result.get(0)).isEqualTo(0);
+        } catch (Exception exception) {
+            Log.w(TAG, "Fail to request subIdList", exception);
+        }
+    }
+
+    @Test
+    public void activeSimSlotIndexCall_oneSimAndActiveEsim_getList() {
+        try {
+            when(mTelephonyManager.getUiccSlotsInfo()).thenReturn(oneSim_ActiveEsim());
+            List<Integer> result = SelectableSubscriptions.atomicToList(mActiveSimSlotIndex.get());
+
+            assertThat(result.size()).isEqualTo(1);
+            assertThat(result.get(0)).isEqualTo(1);
+        } catch (Exception exception) {
+            Log.w(TAG, "Fail to request subIdList", exception);
+        }
+    }
+
+    @Test
+    public void activeSimSlotIndexCall_twoSimsAndActivePsimActiveEsim_getList() {
+        try {
+            when(mTelephonyManager.getUiccSlotsInfo()).thenReturn(twoSims_ActivePsimActiveEsim());
+            List<Integer> result = SelectableSubscriptions.atomicToList(mActiveSimSlotIndex.get());
+
+            assertThat(result.size()).isEqualTo(2);
+            assertThat(result.get(0)).isEqualTo(0);
+            assertThat(result.get(1)).isEqualTo(1);
+        } catch (Exception exception) {
+            Log.w(TAG, "Fail to request subIdList", exception);
+        }
+    }
+
+    @Test
+    public void activeSimSlotIndexCall_twoSimsAndtwoActiveEsims_getList() {
+        try {
+            when(mTelephonyManager.getUiccSlotsInfo()).thenReturn(twoSims_twoActiveEsims());
+            List<Integer> result = SelectableSubscriptions.atomicToList(mActiveSimSlotIndex.get());
+
+            assertThat(result.size()).isEqualTo(2);
+            assertThat(result.get(0)).isEqualTo(0);
+            assertThat(result.get(1)).isEqualTo(1);
+        } catch (Exception exception) {
+            Log.w(TAG, "Fail to request subIdList", exception);
+        }
+    }
+
+    @Test
+    public void activeSimSlotIndexCall_twoSimsAndActivePsimInactiveEsim_getList() {
+        try {
+            when(mTelephonyManager.getUiccSlotsInfo()).thenReturn(twoSims_ActivePsimInactiveEsim());
+            List<Integer> result = SelectableSubscriptions.atomicToList(mActiveSimSlotIndex.get());
+
+            assertThat(result.size()).isEqualTo(1);
+            assertThat(result.get(0)).isEqualTo(0);
+        } catch (Exception exception) {
+            Log.w(TAG, "Fail to request subIdList", exception);
+        }
+    }
+
+    @Test
+    public void activeSimSlotIndexCall_twoSimsAndActiveEsimInactivePsim_getList() {
+        try {
+            when(mTelephonyManager.getUiccSlotsInfo()).thenReturn(twoSims_ActiveEsimInactivePsim());
+            List<Integer> result = SelectableSubscriptions.atomicToList(mActiveSimSlotIndex.get());
+
+            assertThat(result.size()).isEqualTo(1);
+            assertThat(result.get(0)).isEqualTo(1);
+        } catch (Exception exception) {
+            Log.w(TAG, "Fail to request subIdList", exception);
+        }
+    }
+
+    private UiccSlotInfo[] oneSim_ActivePsim() {
+        return new UiccSlotInfo[]{createUiccSlotInfo(false, 0, true)};
+    }
+
+    private UiccSlotInfo[] oneSim_ActiveEsim() {
+        return new UiccSlotInfo[]{createUiccSlotInfo(true, 1, true)};
+    }
+
+    private UiccSlotInfo[] twoSims_ActivePsimActiveEsim() {
+        return new UiccSlotInfo[]{
+                createUiccSlotInfo(false, 0, true),
+                createUiccSlotInfo(true, 1, true)};
+    }
+
+    private UiccSlotInfo[] twoSims_twoActiveEsims() {
+        return new UiccSlotInfo[]{
+                createUiccSlotInfoForTwoEsim(true, true)};
+    }
+
+    private UiccSlotInfo[] twoSims_ActivePsimInactiveEsim() {
+        return new UiccSlotInfo[]{
+                createUiccSlotInfo(false, 0, true),
+                createUiccSlotInfo(true, 1, false)};
+    }
+
+    private UiccSlotInfo[] twoSims_ActiveEsimInactivePsim() {
+        return new UiccSlotInfo[]{
+                createUiccSlotInfo(false, 0, false),
+                createUiccSlotInfo(true, 1, true)};
+    }
+
+    //ToDo: add more cases.
+    /*
+    private List<UiccSlotInfo> threeSims_ActivePsimTwoinactiveEsim(){
+    }
+    private List<UiccSlotInfo> threeSims_twoActiveEsimsInactivePsim(){
+    }
+    private List<UiccSlotInfo> threeSims_ActiveEsimInactivePsimInactiveEsim(){
+    }
+    private List<UiccSlotInfo> threeSims_ActivePsimActiveEsimInactiveEsim(){
+    }
+    */
+
+    private UiccSlotInfo createUiccSlotInfo(boolean isEuicc, int logicalSlotIdx,
+            boolean isActive) {
+        return new UiccSlotInfo(
+                isEuicc, /* isEuicc */
+                "123", /* cardId */
+                CARD_STATE_INFO_PRESENT, /* cardStateInfo */
+                true, /* isExtendApduSupported */
+                true, /* isRemovable */
+                Collections.singletonList(
+                        new UiccPortInfo("" /* iccId */, 0 /* portIdx */,
+                                logicalSlotIdx /* logicalSlotIdx */, isActive /* isActive */))
+        );
+    }
+
+    private UiccSlotInfo createUiccSlotInfoForTwoEsim(boolean isActiveEsim1,
+            boolean isActiveEsim2) {
+        return new UiccSlotInfo(
+                true, /* isEuicc */
+                "123", /* cardId */
+                CARD_STATE_INFO_PRESENT, /* cardStateInfo */
+                true, /* isExtendApduSupported */
+                true, /* isRemovable */
+                Arrays.asList(
+                        new UiccPortInfo("" /* iccId */, 0 /* portIdx */,
+                                0 /* logicalSlotIdx */, isActiveEsim1 /* isActive */),
+                        new UiccPortInfo("" /* iccId */, 1 /* portIdx */,
+                                1 /* logicalSlotIdx */, isActiveEsim2 /* isActive */))
+        );
+    }
+}
diff --git a/tests/unit/src/com/android/settings/notification/OWNERS b/tests/unit/src/com/android/settings/notification/OWNERS
new file mode 100644
index 0000000..a2ae9ce
--- /dev/null
+++ b/tests/unit/src/com/android/settings/notification/OWNERS
@@ -0,0 +1,5 @@
+# Default reviewers for this and subdirectories.
+beverlyt@google.com
+dsandler@android.com
+juliacr@google.com
+yurilin@google.com
\ No newline at end of file