diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 33d96b7..89d696d 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -352,7 +352,7 @@
         </activity>
 
         <activity android:name=".EnableWifiTether"
-            android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen"
+            android:theme="@style/Transparent"
             android:excludeFromRecents="true" />
 
         <activity android:name="Settings$TetherSettingsActivity"
@@ -1143,7 +1143,7 @@
         <activity android:name="SetupChooseLockGeneric"
             android:taskAffinity="com.android.wizard"
             android:theme="@style/SetupWizardDisableAppStartingTheme"
-            android:label="@string/lockpassword_choose_lock_generic_header">
+            android:label="@string/lock_settings_picker_title">
             <intent-filter>
                 <action android:name="com.android.settings.SETUP_LOCK_SCREEN" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -2037,6 +2037,14 @@
                 android:resource="@id/sim_settings" />
         </activity>
 
+        <activity android:name=".sim.SimDialogActivity"
+                android:theme="@android:style/Theme.Material.Light.Dialog.NoActionBar"
+                android:label="@string/sim_settings_title">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+            </intent-filter>
+        </activity>
+
         <provider
             android:name=".search.SettingsSearchIndexablesProvider"
             android:authorities="com.android.settings"
diff --git a/res/anim-ldrtl/slide_back_in.xml b/res/anim-ldrtl/slide_back_in.xml
new file mode 100644
index 0000000..e5ab3e5
--- /dev/null
+++ b/res/anim-ldrtl/slide_back_in.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 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.
+-->
+
+<translate xmlns:android="http://schemas.android.com/apk/res/android"
+    android:duration="@integer/setup_wizard_transition_duration"
+    android:fromXDelta="100%"
+    android:toXDelta="0%"
+    android:interpolator="@android:anim/decelerate_interpolator"/>
diff --git a/res/anim-ldrtl/slide_back_out.xml b/res/anim-ldrtl/slide_back_out.xml
new file mode 100644
index 0000000..8717f6a
--- /dev/null
+++ b/res/anim-ldrtl/slide_back_out.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 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.
+-->
+
+<translate xmlns:android="http://schemas.android.com/apk/res/android"
+    android:duration="@integer/setup_wizard_transition_duration"
+    android:fromXDelta="0%"
+    android:toXDelta="-100%"
+    android:interpolator="@android:anim/decelerate_interpolator"/>
diff --git a/res/anim-ldrtl/slide_next_in.xml b/res/anim-ldrtl/slide_next_in.xml
new file mode 100644
index 0000000..009ea9f
--- /dev/null
+++ b/res/anim-ldrtl/slide_next_in.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 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.
+-->
+
+<translate xmlns:android="http://schemas.android.com/apk/res/android"
+    android:duration="@integer/setup_wizard_transition_duration"
+    android:fromXDelta="-100%"
+    android:toXDelta="0%"
+    android:interpolator="@android:anim/decelerate_interpolator"/>
diff --git a/res/anim-ldrtl/slide_next_out.xml b/res/anim-ldrtl/slide_next_out.xml
new file mode 100644
index 0000000..b7ab2b6
--- /dev/null
+++ b/res/anim-ldrtl/slide_next_out.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 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.
+-->
+
+<translate xmlns:android="http://schemas.android.com/apk/res/android"
+    android:duration="@integer/setup_wizard_transition_duration"
+    android:fromXDelta="0%"
+    android:toXDelta="100%"
+    android:interpolator="@android:anim/decelerate_interpolator"/>
diff --git a/res/anim/slide_back_in.xml b/res/anim/slide_back_in.xml
new file mode 100644
index 0000000..009ea9f
--- /dev/null
+++ b/res/anim/slide_back_in.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 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.
+-->
+
+<translate xmlns:android="http://schemas.android.com/apk/res/android"
+    android:duration="@integer/setup_wizard_transition_duration"
+    android:fromXDelta="-100%"
+    android:toXDelta="0%"
+    android:interpolator="@android:anim/decelerate_interpolator"/>
diff --git a/res/anim/slide_back_out.xml b/res/anim/slide_back_out.xml
new file mode 100644
index 0000000..b7ab2b6
--- /dev/null
+++ b/res/anim/slide_back_out.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 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.
+-->
+
+<translate xmlns:android="http://schemas.android.com/apk/res/android"
+    android:duration="@integer/setup_wizard_transition_duration"
+    android:fromXDelta="0%"
+    android:toXDelta="100%"
+    android:interpolator="@android:anim/decelerate_interpolator"/>
diff --git a/res/anim/slide_next_in.xml b/res/anim/slide_next_in.xml
new file mode 100644
index 0000000..e5ab3e5
--- /dev/null
+++ b/res/anim/slide_next_in.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 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.
+-->
+
+<translate xmlns:android="http://schemas.android.com/apk/res/android"
+    android:duration="@integer/setup_wizard_transition_duration"
+    android:fromXDelta="100%"
+    android:toXDelta="0%"
+    android:interpolator="@android:anim/decelerate_interpolator"/>
diff --git a/res/anim/slide_next_out.xml b/res/anim/slide_next_out.xml
new file mode 100644
index 0000000..8717f6a
--- /dev/null
+++ b/res/anim/slide_next_out.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 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.
+-->
+
+<translate xmlns:android="http://schemas.android.com/apk/res/android"
+    android:duration="@integer/setup_wizard_transition_duration"
+    android:fromXDelta="0%"
+    android:toXDelta="-100%"
+    android:interpolator="@android:anim/decelerate_interpolator"/>
diff --git a/res/drawable-hdpi/setup_illustration_lock_screen.jpg b/res/drawable-hdpi/setup_illustration_lock_screen.jpg
new file mode 100644
index 0000000..db697a0
--- /dev/null
+++ b/res/drawable-hdpi/setup_illustration_lock_screen.jpg
Binary files differ
diff --git a/res/drawable-hdpi/setup_illustration_wifi.jpg b/res/drawable-hdpi/setup_illustration_wifi.jpg
new file mode 100644
index 0000000..d38551e
--- /dev/null
+++ b/res/drawable-hdpi/setup_illustration_wifi.jpg
Binary files differ
diff --git a/res/drawable-mdpi/setup_illustration_lock_screen.jpg b/res/drawable-mdpi/setup_illustration_lock_screen.jpg
new file mode 100644
index 0000000..95e2b8c
--- /dev/null
+++ b/res/drawable-mdpi/setup_illustration_lock_screen.jpg
Binary files differ
diff --git a/res/drawable-mdpi/setup_illustration_wifi.jpg b/res/drawable-mdpi/setup_illustration_wifi.jpg
new file mode 100644
index 0000000..a497bf5
--- /dev/null
+++ b/res/drawable-mdpi/setup_illustration_wifi.jpg
Binary files differ
diff --git a/res/drawable-sw600dp-hdpi/setup_illustration_lock_screen.jpg b/res/drawable-sw600dp-hdpi/setup_illustration_lock_screen.jpg
new file mode 100644
index 0000000..03cd9d9
--- /dev/null
+++ b/res/drawable-sw600dp-hdpi/setup_illustration_lock_screen.jpg
Binary files differ
diff --git a/res/drawable-hdpi/setup_illustration_wifi_wide_image.jpg b/res/drawable-sw600dp-hdpi/setup_illustration_wifi.jpg
similarity index 100%
rename from res/drawable-hdpi/setup_illustration_wifi_wide_image.jpg
rename to res/drawable-sw600dp-hdpi/setup_illustration_wifi.jpg
Binary files differ
diff --git a/res/drawable-sw600dp-mdpi/setup_illustration_lock_screen.jpg b/res/drawable-sw600dp-mdpi/setup_illustration_lock_screen.jpg
new file mode 100644
index 0000000..4a7ab38
--- /dev/null
+++ b/res/drawable-sw600dp-mdpi/setup_illustration_lock_screen.jpg
Binary files differ
diff --git a/res/drawable-mdpi/setup_illustration_wifi_wide_image.jpg b/res/drawable-sw600dp-mdpi/setup_illustration_wifi.jpg
similarity index 100%
rename from res/drawable-mdpi/setup_illustration_wifi_wide_image.jpg
rename to res/drawable-sw600dp-mdpi/setup_illustration_wifi.jpg
Binary files differ
diff --git a/res/drawable-sw600dp-xhdpi/setup_illustration_lock_screen.jpg b/res/drawable-sw600dp-xhdpi/setup_illustration_lock_screen.jpg
new file mode 100644
index 0000000..05f7725
--- /dev/null
+++ b/res/drawable-sw600dp-xhdpi/setup_illustration_lock_screen.jpg
Binary files differ
diff --git a/res/drawable-xhdpi/setup_illustration_wifi_wide_image.jpg b/res/drawable-sw600dp-xhdpi/setup_illustration_wifi.jpg
similarity index 100%
rename from res/drawable-xhdpi/setup_illustration_wifi_wide_image.jpg
rename to res/drawable-sw600dp-xhdpi/setup_illustration_wifi.jpg
Binary files differ
diff --git a/res/drawable-sw600dp-xxhdpi/setup_illustration_lock_screen.jpg b/res/drawable-sw600dp-xxhdpi/setup_illustration_lock_screen.jpg
new file mode 100644
index 0000000..da3f7d9
--- /dev/null
+++ b/res/drawable-sw600dp-xxhdpi/setup_illustration_lock_screen.jpg
Binary files differ
diff --git a/res/drawable-xxhdpi/setup_illustration_wifi_wide_image.jpg b/res/drawable-sw600dp-xxhdpi/setup_illustration_wifi.jpg
similarity index 100%
rename from res/drawable-xxhdpi/setup_illustration_wifi_wide_image.jpg
rename to res/drawable-sw600dp-xxhdpi/setup_illustration_wifi.jpg
Binary files differ
diff --git a/res/drawable-sw600dp-xxxhdpi/setup_illustration_lock_screen.jpg b/res/drawable-sw600dp-xxxhdpi/setup_illustration_lock_screen.jpg
new file mode 100644
index 0000000..fd5da99
--- /dev/null
+++ b/res/drawable-sw600dp-xxxhdpi/setup_illustration_lock_screen.jpg
Binary files differ
diff --git a/res/drawable-xxxhdpi/setup_illustration_wifi_wide_image.jpg b/res/drawable-sw600dp-xxxhdpi/setup_illustration_wifi.jpg
similarity index 100%
rename from res/drawable-xxxhdpi/setup_illustration_wifi_wide_image.jpg
rename to res/drawable-sw600dp-xxxhdpi/setup_illustration_wifi.jpg
Binary files differ
diff --git a/res/drawable-sw600dp/setup_illustration.xml b/res/drawable-sw600dp/setup_illustration.xml
new file mode 100644
index 0000000..c0e54e2
--- /dev/null
+++ b/res/drawable-sw600dp/setup_illustration.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 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.
+-->
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
+    android:autoMirrored="true">
+
+    <item>
+        <bitmap android:src="@drawable/setup_illustration_horizontal_tile"
+            android:gravity="top"
+            android:tileModeX="repeat"
+            android:tileModeY="disabled" />
+    </item>
+
+    <item android:id="@+id/illustration_image">
+        <bitmap android:src="@drawable/setup_illustration_wifi"
+            android:gravity="top|start" />
+    </item>
+
+</layer-list>
diff --git a/res/drawable-xhdpi/setup_illustration_lock_screen.jpg b/res/drawable-xhdpi/setup_illustration_lock_screen.jpg
new file mode 100644
index 0000000..b6b856e
--- /dev/null
+++ b/res/drawable-xhdpi/setup_illustration_lock_screen.jpg
Binary files differ
diff --git a/res/drawable-xhdpi/setup_illustration_wifi.jpg b/res/drawable-xhdpi/setup_illustration_wifi.jpg
new file mode 100644
index 0000000..a399c19
--- /dev/null
+++ b/res/drawable-xhdpi/setup_illustration_wifi.jpg
Binary files differ
diff --git a/res/drawable-xxhdpi/setup_illustration_lock_screen.jpg b/res/drawable-xxhdpi/setup_illustration_lock_screen.jpg
new file mode 100644
index 0000000..4cb0c63
--- /dev/null
+++ b/res/drawable-xxhdpi/setup_illustration_lock_screen.jpg
Binary files differ
diff --git a/res/drawable-nodpi/setup_illustration_wifi_image.jpg b/res/drawable-xxhdpi/setup_illustration_wifi.jpg
similarity index 100%
rename from res/drawable-nodpi/setup_illustration_wifi_image.jpg
rename to res/drawable-xxhdpi/setup_illustration_wifi.jpg
Binary files differ
diff --git a/res/drawable-xxxhdpi/setup_illustration_lock_screen.jpg b/res/drawable-xxxhdpi/setup_illustration_lock_screen.jpg
new file mode 100644
index 0000000..13821f3
--- /dev/null
+++ b/res/drawable-xxxhdpi/setup_illustration_lock_screen.jpg
Binary files differ
diff --git a/res/drawable-xxxhdpi/setup_illustration_wifi.jpg b/res/drawable-xxxhdpi/setup_illustration_wifi.jpg
new file mode 100644
index 0000000..56c19b6
--- /dev/null
+++ b/res/drawable-xxxhdpi/setup_illustration_wifi.jpg
Binary files differ
diff --git a/res/drawable/setup_illustration_wifi_wide.xml b/res/drawable/setup_illustration.xml
similarity index 71%
rename from res/drawable/setup_illustration_wifi_wide.xml
rename to res/drawable/setup_illustration.xml
index 33ee2f6..f8d96d5 100644
--- a/res/drawable/setup_illustration_wifi_wide.xml
+++ b/res/drawable/setup_illustration.xml
@@ -18,16 +18,9 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android"
     android:autoMirrored="true">
 
-    <item>
-        <bitmap android:src="@drawable/setup_illustration_horizontal_tile"
-            android:gravity="top"
-            android:tileModeX="repeat"
-            android:tileModeY="disabled" />
-    </item>
-
     <item android:id="@+id/illustration_image">
-        <bitmap android:src="@drawable/setup_illustration_wifi_wide_image"
-            android:gravity="top|start" />
+        <bitmap android:src="@drawable/setup_illustration_wifi"
+            android:gravity="fill" />
     </item>
 
-</layer-list>
\ No newline at end of file
+</layer-list>
diff --git a/res/drawable/setup_illustration_wifi.xml b/res/drawable/setup_illustration_wifi.xml
deleted file mode 100644
index 9db2f13..0000000
--- a/res/drawable/setup_illustration_wifi.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 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.
--->
-
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:autoMirrored="true"
-    android:src="@drawable/setup_illustration_wifi_image" />
diff --git a/res/layout-sw600dp-land/setup_preference.xml b/res/layout-sw600dp-land/setup_preference.xml
index 431ac29..814bc91 100644
--- a/res/layout-sw600dp-land/setup_preference.xml
+++ b/res/layout-sw600dp-land/setup_preference.xml
@@ -22,10 +22,11 @@
     android:orientation="vertical">
 
     <com.android.settings.widget.SetupWizardIllustration
+        android:id="@+id/setup_illustration"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_weight="1"
-        android:foreground="@drawable/setup_illustration_wifi_wide"
+        android:foreground="@drawable/setup_illustration"
         android:background="@drawable/setup_illustration_bg">
 
         <LinearLayout
diff --git a/res/layout-sw600dp-land/setup_template.xml b/res/layout-sw600dp-land/setup_template.xml
index 33c31a5..a58dd3d 100644
--- a/res/layout-sw600dp-land/setup_template.xml
+++ b/res/layout-sw600dp-land/setup_template.xml
@@ -21,12 +21,12 @@
     android:orientation="vertical">
 
     <com.android.settings.widget.SetupWizardIllustration
-        android:id="@+id/illustration_tablet"
+        android:id="@+id/setup_illustration"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1"
         android:background="@drawable/setup_illustration_bg"
-        android:foreground="@drawable/setup_illustration_wifi_wide">
+        android:foreground="@drawable/setup_illustration">
 
         <LinearLayout
             android:layout_width="match_parent"
diff --git a/res/layout-sw600dp/setup_preference.xml b/res/layout-sw600dp/setup_preference.xml
index 1e772d9..ec6d2ac 100644
--- a/res/layout-sw600dp/setup_preference.xml
+++ b/res/layout-sw600dp/setup_preference.xml
@@ -21,12 +21,12 @@
     android:orientation="vertical">
 
     <com.android.settings.widget.SetupWizardIllustration
-        android:id="@+id/title_area"
+        android:id="@+id/setup_illustration"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1"
         android:background="@drawable/setup_illustration_bg"
-        android:foreground="@drawable/setup_illustration_wifi_wide">
+        android:foreground="@drawable/setup_illustration">
 
         <LinearLayout
             android:layout_width="match_parent"
diff --git a/res/layout-sw600dp/setup_template.xml b/res/layout-sw600dp/setup_template.xml
index eb210b7..297e9fb 100644
--- a/res/layout-sw600dp/setup_template.xml
+++ b/res/layout-sw600dp/setup_template.xml
@@ -21,12 +21,12 @@
     android:orientation="vertical">
 
     <com.android.settings.widget.SetupWizardIllustration
-        android:id="@+id/illustration_tablet"
+        android:id="@+id/setup_illustration"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1"
         android:background="@drawable/setup_illustration_bg"
-        android:foreground="@drawable/setup_illustration_wifi_wide">
+        android:foreground="@drawable/setup_illustration">
 
         <LinearLayout
             android:layout_width="match_parent"
diff --git a/res/layout/setup_choose_lock_password.xml b/res/layout/setup_choose_lock_password.xml
index b1ac02b..59fa523 100644
--- a/res/layout/setup_choose_lock_password.xml
+++ b/res/layout/setup_choose_lock_password.xml
@@ -38,7 +38,7 @@
         android:layout_marginEnd="30dip"
         android:gravity="center"
         android:inputType="textPassword"
-        android:imeOptions="actionNext"
+        android:imeOptions="actionNext|flagNoExtractUi"
         android:textSize="24sp"
         style="@style/TextAppearance.PasswordEntry"/>
 
@@ -52,6 +52,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
+        android:visibility="gone"
         style="@style/SecurityPreferenceButtonContainer">
 
         <!-- left : cancel -->
diff --git a/res/layout/setup_choose_lock_pattern.xml b/res/layout/setup_choose_lock_pattern.xml
index 5992126..a906826 100644
--- a/res/layout/setup_choose_lock_pattern.xml
+++ b/res/layout/setup_choose_lock_pattern.xml
@@ -44,11 +44,22 @@
             android:layout_weight="4"
             android:background="@color/lock_pattern_background"/>
 
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:orientation="horizontal">
+
+        <Button android:id="@+id/retryButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/lockpattern_retry_button_text"/>
+
         <TextView android:id="@+id/footerText"
-            android:layout_width="match_parent"
-            android:layout_height="0dip"
-            android:layout_weight="1"
-            android:gravity="center"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:minHeight="50dp"
             android:textSize="14sp"/>
 
@@ -59,6 +70,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
+        android:visibility="gone"
         style="@style/SecurityPreferenceButtonContainer">
 
         <!-- left : cancel, or re-try -->
diff --git a/res/layout/setup_template.xml b/res/layout/setup_template.xml
index 7d8ffc8..0623e25 100644
--- a/res/layout/setup_template.xml
+++ b/res/layout/setup_template.xml
@@ -35,12 +35,12 @@
             android:clipChildren="false">
 
             <com.android.settings.widget.SetupWizardIllustration
-                android:id="@+id/illustration_phone"
+                android:id="@+id/setup_illustration"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:elevation="@dimen/setup_wizard_title_area_elevation"
                 android:background="@drawable/setup_illustration_bg"
-                android:foreground="@drawable/setup_illustration_wifi"
+                android:foreground="@drawable/setup_illustration"
                 android:tag="stickyContainer"
                 settings:aspectRatio="2.22">
 
@@ -58,7 +58,7 @@
                 android:id="@+id/setup_content"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_below="@id/illustration_phone"
+                android:layout_below="@id/setup_illustration"
                 android:clipChildren="false"/>
 
         </RelativeLayout>
diff --git a/res/layout/setup_wizard_header.xml b/res/layout/setup_wizard_header.xml
index c38a68d..b030ad1 100644
--- a/res/layout/setup_wizard_header.xml
+++ b/res/layout/setup_wizard_header.xml
@@ -18,12 +18,12 @@
 <com.android.settings.widget.SetupWizardIllustration
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
-    android:id="@+id/title_area"
+    android:id="@+id/setup_illustration"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@drawable/setup_illustration_bg"
     android:elevation="@dimen/setup_wizard_title_area_elevation"
-    android:foreground="@drawable/setup_illustration_wifi"
+    android:foreground="@drawable/setup_illustration"
     android:tag="stickyContainer"
     settings:aspectRatio="2.22">
 
diff --git a/res/layout/two_line_list_item.xml b/res/layout/two_line_list_item.xml
index e6a7c2b..0567bbc 100644
--- a/res/layout/two_line_list_item.xml
+++ b/res/layout/two_line_list_item.xml
@@ -18,8 +18,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:minHeight="?android:attr/listPreferredItemHeight"
-    android:paddingStart="16dip"
-    android:paddingEnd="16dip"
+    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
     android:paddingTop="8dip"
     android:paddingBottom="8dip">
     <TextView
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index b7558ed..b1838dc 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Ontkoppel?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Dit sal jou verbinding met &lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt; beëindig."</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"Jy het nie toestemming om Bluetooth-instellings te verander nie."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"Naby toestelle kan <xliff:g id="DEVICE_NAME">%1$s</xliff:g> sien met Bluetooth-instellings oop."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"Naby toestelle kan <xliff:g id="DEVICE_NAME">%1$s</xliff:g> sien met Bluetooth-instellings oop."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Ontkoppel <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Uitsaai"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Dekativeer profiel?"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Bestuur Wi-Fi, Bluetooth, vliegtuigmodus, sellulêre netwerke en VPN\'e"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Sellulêre data"</string>
     <string name="calls_title" msgid="3544471959217176768">"Oproepe"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"SMS-boodskappe"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"SMS-boodskappe"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"Laat datagebruik oor selnetwerk toe"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Laat datagebruik met swerf toe"</string>
     <string name="roaming" msgid="3596055926335478572">"Dataswerwing"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Medium tot hoë sekuriteit"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Wagwoord"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Hoë sekuriteit"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Kenmerke vir toestelbeskerming sal nie meer werk nie."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Gedeaktiveer deur administrateur, enkripsiebeleid of eiebewysberging"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Geen"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Swiep"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Verwyder ontsluitpatroon"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Verwyder ontsluit-PIN"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Verwyder ontsluitwagwoord"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"Verwyder skermslot"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Verander ontsluitpatroon"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Verander ontsluit-PIN"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Verander ontsluitwagwoord"</string>
@@ -860,6 +862,8 @@
     <string name="sim_multi_sims_summary" msgid="7018740080801483990">"Kies die SIM wat jy vir sellulêre data verkies."</string>
     <string name="sim_change_data_title" msgid="294357201685244532">"Verander data-SIM?"</string>
     <string name="sim_change_data_message" msgid="1313940695939674633">"Gebruik <xliff:g id="NEW_SIM">%1$s</xliff:g> pleks van <xliff:g id="OLD_SIM">%2$s</xliff:g> vir sellulêre data?"</string>
+    <string name="sim_preferred_title" msgid="5567909634636045268">"Verander voorkeur-SIM-kaart?"</string>
+    <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> is die enigste SIM in jou toestel. Wil jy hierdie SIM vir sellulêre data, oproepe en SMS-boodskappe gebruik?"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"Verkeerde SIM PIN-kode, jy sal nou jou diensverskaffer moet kontak om jou toestel te ontsluit."</string>
   <plurals name="wrong_pin_code">
     <item quantity="one" msgid="4840607930166101114">"Verkeerde SIM PIN-kode, jy het <xliff:g id="NUMBER">%d</xliff:g> oorblywende poging voordat jy jou diensverskaffer sal moet kontak om jou toestel te ontsluit."</item>
@@ -2332,7 +2336,8 @@
     <string name="sim_notification_title" msgid="6272913297433198340">"SIM-kaarte het verander."</string>
     <string name="sim_notification_summary" msgid="5024470200658902406">"Raak om op te stel"</string>
     <string name="sim_pref_divider" msgid="6778907671867621874">"Voorkeur-SIM vir"</string>
-    <string name="sim_calls_ask_first_prefs_title" msgid="7328134172516945288">"Vra elke keer"</string>
+    <!-- no translation found for sim_calls_ask_first_prefs_title (7941299533514115976) -->
+    <skip />
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Keuse vereis"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Instellings"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Instellings"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index b37a662..8829d15 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"ይለያይ?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"ከ:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&amp;gt ጋርያልዎትን ተያያዥ ያበቃል።"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"የብሉቱዝ ቅንብሮችን ለመለወጥ ፈቃድ የልዎትም።"</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> የብሉቱዝ ቅንብሮች ክፍት ሆኖ ሳለ አቅራቢያ ላሉ መሣሪያዎች ይታያል።"</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> የብሉቱዝ ቅንብሮች ክፍት ሆኖ ሳለ አቅራቢያ ላሉ መሣሪያዎች ይታያል።"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"የ<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ግንኙነት ይቋረጥ?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"ማሰራጨት"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"መገለጫ ይቦዝን?"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Wi‑Fi፣ ብሉቱዝ፣ የአውሮፕላን ሁነታ፣ የተንቀሳቃሽ ስልክ አውታረ መረቦችን እና VPNዎችን ያቀናብሩ"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"የተንቀሳቃሽ ስልክ ውሂብ"</string>
     <string name="calls_title" msgid="3544471959217176768">"ጥሪዎች"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"የኤስኤምኤስ መልዕክቶች"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"የኤስኤምኤስ መልዕክቶች"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"በስልክ አውታረ መረብ ላይ ውሂብ መጠቀም ፍቀድ"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"በሌላ የስልክ አውታረ መረብ መንቀሳቀስ ላይ ሳሉ የውሂብ መጠቀም ይፈቀድ"</string>
     <string name="roaming" msgid="3596055926335478572">"ውሂብ በእንቅስቃሴ ላይ"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"ከመካከለኛ እስከ ከፍተኛ ጥበቃ"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">" የይለፍ ቃል፡"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"ከፍተኛ ጥበቃ"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"የመሣሪያ ጥበቃ ባህሪዎች ከእንግዲህ አይሰሩም።"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"የምስጠራ መምሪያ ወይም ማስረጃ ማከማቻ በአስተዳዳሪ ቦዝኗል"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"ምንም"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"ማንሸራተት"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"የመክፈቻ ስርዓተ ጥለት አስወግድ"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"መክፈቻ ፒን  አስወግድ"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"የመክፈቻ ይለፍ ቃል አስወግድ"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"ማያ ገጽ ቆላፊን አስወግድ"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"መክፈቻ ስርዓት ጥለት ለውጥ"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"መክፈቻ ፒን  ለውጥ"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"መክፈቻ ይለፍ ቃል ለውጥ"</string>
@@ -860,6 +862,8 @@
     <string name="sim_multi_sims_summary" msgid="7018740080801483990">"ለተንቀሳቃሽ ስልክ ውሂብ የሚመርጡት ሲም ይምረጡ።"</string>
     <string name="sim_change_data_title" msgid="294357201685244532">"የውሂብ ሲም ይቀየር?"</string>
     <string name="sim_change_data_message" msgid="1313940695939674633">"ለተንቀሳቃሽ ስልክ ውሂብ ከ<xliff:g id="OLD_SIM">%2$s</xliff:g> ይልቅ <xliff:g id="NEW_SIM">%1$s</xliff:g>ን ይጠቀሙ?"</string>
+    <string name="sim_preferred_title" msgid="5567909634636045268">"ተመራጩ ሲም ይዘመን?"</string>
+    <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> በመሣሪያዎ ውስጥ ያለው ብቸኛ ሲም ነው። ይህን ሲም ለተንቀሳቃሽ ስልክ ውሂብ፣ ጥሪዎች እና የኤስኤምኤስ መልዕክቶች መጠቀም ይፈልጋሉ?"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"ልክ ያልሆነ የሲም ኮድ። አሁን መሳሪያዎን ለማስከፈት ድምጸ ተያያዥ ሞደምዎን ማግኘት አለብዎ።"</string>
   <plurals name="wrong_pin_code">
     <item quantity="one" msgid="4840607930166101114">"ልክ ያልሆነ የሲም ፒን ኮድ፣ መሳሪያዎን ለማስከፈት ድምጸ ተያያዥ ሞደምዎን ማግኘት ግዴታዎ ሊሆን <xliff:g id="NUMBER">%d</xliff:g> ሙከራ ይቀርዎታል።"</item>
@@ -2332,7 +2336,8 @@
     <string name="sim_notification_title" msgid="6272913297433198340">"ሲም ካርዶች ተቀይረዋል።"</string>
     <string name="sim_notification_summary" msgid="5024470200658902406">"ለማዋቀር ንካ"</string>
     <string name="sim_pref_divider" msgid="6778907671867621874">"ተመራጭ ሲም ለ"</string>
-    <string name="sim_calls_ask_first_prefs_title" msgid="7328134172516945288">"ሁልጊዜ ጠይቅ"</string>
+    <!-- no translation found for sim_calls_ask_first_prefs_title (7941299533514115976) -->
+    <skip />
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"መምረጥ ይጠየቃል"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"ቅንብሮች"</string>
     <string name="search_results_title" msgid="1796252422574886932">"ቅንብሮች"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 8a1cc3f..7a7d3a9 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"هل تريد قطع الاتصال؟"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"‏سيؤدي هذا إلى إنهاء الاتصال مع:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"ليست لديك أذونات لتغيير إعدادات بلوتوث."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> مرئي للأجهزة القريبة أثناء فتح إعدادات البلوتوث."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> مرئي للأجهزة القريبة أثناء فتح إعدادات البلوتوث."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"هل تريد فصل <xliff:g id="DEVICE_NAME">%1$s</xliff:g>؟"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"البث"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"تعطيل الملف الشخصي؟"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"‏إدارة اتصال Wi‑Fi والبلوتوث ووضع الطائرة وشبكات الجوّال والشبكات الظاهرية الخاصة"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"بيانات شبكة الجوّال"</string>
     <string name="calls_title" msgid="3544471959217176768">"المكالمات"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"‏الرسائل القصيرة SMS"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"‏الرسائل القصيرة SMS"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"السماح باستخدام بيانات شبكة الجوّال"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"السماح باستخدام بيانات التجوال"</string>
     <string name="roaming" msgid="3596055926335478572">"تجوال البيانات"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"من تأمين متوسط إلى عال"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"كلمة المرور"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"تأمين عال"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"لن تعمل ميزات حماية الجهاز بعد الآن."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"تم تعطيله من جانب المشرف أو بسبب سياسة التشفير أو وحدة تخزين بيانات الاعتماد"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"لا شيء"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"مرر سريعًا"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"إزالة نقش إلغاء التأمين"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"‏إزالة رمز PIN لإلغاء التأمين"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"إزالة كلمة مرور إلغاء التأمين"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"إزالة قفل الشاشة"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"تغيير نقش إلغاء التأمين"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"‏تغيير رمز PIN لإلغاء التأمين"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"تغيير كلمة مرور إلغاء التأمين"</string>
@@ -860,6 +862,8 @@
     <string name="sim_multi_sims_summary" msgid="7018740080801483990">"‏اختر بطاقة SIM المفضلة لبيانات الجوّال."</string>
     <string name="sim_change_data_title" msgid="294357201685244532">"‏هل تريد تغيير بطاقة SIM للبيانات؟"</string>
     <string name="sim_change_data_message" msgid="1313940695939674633">"هل تريد استخدام <xliff:g id="NEW_SIM">%1$s</xliff:g> بدلاً من <xliff:g id="OLD_SIM">%2$s</xliff:g> للبيانات الخلوية؟"</string>
+    <string name="sim_preferred_title" msgid="5567909634636045268">"‏هل تريد تحديث بطاقة SIM المفضلة؟"</string>
+    <string name="sim_preferred_message" msgid="301251431163650167">"‏<xliff:g id="NEW_SIM">%1$s</xliff:g> هي بطاقة SIM الوحيدة في جهازك. هل تريد استخدام بطاقة SIM هذه مع البيانات الخلوية والرسائل القصيرة SMS؟"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"‏رمز \"رقم التعريف الشخصي\" لبطاقة SIM غير صحيح، ويلزمك الاتصال الآن بمشغّل شبكة الجوّال لإلغاء قفل الجهاز."</string>
   <plurals name="wrong_pin_code">
     <item quantity="one" msgid="4840607930166101114">"‏رمز \"رقم التعريف الشخصي\" لبطاقة SIM غير صحيح، ويتبقى لديك محاولة واحدة (<xliff:g id="NUMBER">%d</xliff:g>) يتعين عليك بعدها الاتصال بمشغّل شبكة الجوّال لإلغاء قفل الجهاز."</item>
@@ -2332,7 +2336,7 @@
     <string name="sim_notification_title" msgid="6272913297433198340">"‏تم تغيير بطاقات SIM."</string>
     <string name="sim_notification_summary" msgid="5024470200658902406">"المس للإعداد"</string>
     <string name="sim_pref_divider" msgid="6778907671867621874">"‏بطاقة SIM المفضلة لـ"</string>
-    <string name="sim_calls_ask_first_prefs_title" msgid="7328134172516945288">"طرح السؤال كل مرة"</string>
+    <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"طرح السؤال كل مرة"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"يلزم التحديد"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"الإعدادات"</string>
     <string name="search_results_title" msgid="1796252422574886932">"الإعدادات"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 77f9c3a..c9a96e7 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Да се изключи ли?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Това ще прекрати връзката ви със:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"Нямате разрешение да променяте настройките за Bluetooth."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"При отворени настр. за Bluetooth у-вата в района ще виждат „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"При отворени настройки за Bluetooth устройствата в района ще виждат „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Да се прекрати ли връзката с/ъс <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Излъчване"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Да се деактивира ли потребит. профил?"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Управление на Wi‑Fi, Bluetooth, самолетен режим, клетъчни и виртуални частни мрежи (VPN)"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Мобилни данни"</string>
     <string name="calls_title" msgid="3544471959217176768">"Обаждания"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"SMS съобщения"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"SMS съобщения"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"Пренос на данни през клетъчната мрежа"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Пренос на данни при роуминг"</string>
     <string name="roaming" msgid="3596055926335478572">"Роуминг на данни"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Средна до висока защита"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Парола"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Висока защита"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Функциите за защита на устройството вече няма да работят."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Деакт. от админ., правила за шифроване или хранил. за идент. данни"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Няма"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Прекарване на пръст"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Премахване на фигура за отключване"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Премахване на PIN кода за отключване"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Премахване на парола за отключване"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"Премахване на заключването на екрана"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Промяна на фигурата за отключване"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Промяна на PIN кода за отключване"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Промяна на паролата за отключване"</string>
@@ -860,6 +862,8 @@
     <string name="sim_multi_sims_summary" msgid="7018740080801483990">"Изберете предпочитаната от вас SIM карта за мобилни данни."</string>
     <string name="sim_change_data_title" msgid="294357201685244532">"Да се промени ли SIM картата за данни?"</string>
     <string name="sim_change_data_message" msgid="1313940695939674633">"Да се използва ли „<xliff:g id="NEW_SIM">%1$s</xliff:g>“ вместо „<xliff:g id="OLD_SIM">%2$s</xliff:g>“ за мобилни данни?"</string>
+    <string name="sim_preferred_title" msgid="5567909634636045268">"Ще актуал. ли предпоч. за SIM?"</string>
+    <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> е единствената SIM карта в устройството ви. Искате ли да я използвате за пренос на клетъчни данни, обаждания и SMS съобщения?"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"Неправилен ПИН код за SIM картата – сега трябва да се свържете с оператора си, за да отключите устройството."</string>
   <plurals name="wrong_pin_code">
     <item quantity="one" msgid="4840607930166101114">"Неправилен ПИН код за SIM картата – остава ви <xliff:g id="NUMBER">%d</xliff:g> опит, преди да трябва да се свържете с оператора си, за да отключите устройството."</item>
@@ -2332,7 +2336,7 @@
     <string name="sim_notification_title" msgid="6272913297433198340">"SIM картите са променени."</string>
     <string name="sim_notification_summary" msgid="5024470200658902406">"Докоснете, за да настроите"</string>
     <string name="sim_pref_divider" msgid="6778907671867621874">"Предпочитана SIM карта за"</string>
-    <string name="sim_calls_ask_first_prefs_title" msgid="7328134172516945288">"Извеждане на запитване всеки път"</string>
+    <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Извеждане на запитване всеки път"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Изборът е задължителен"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Настройки"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Настройки"</string>
diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml
index dc7176c..d63ae62 100644
--- a/res/values-bn-rBD/strings.xml
+++ b/res/values-bn-rBD/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"সংযোগ বিচ্ছিন্ন করবেন?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"এটি আপনার সঙ্গে:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;\'র সংযোগ বিচ্ছিন্ন করবে"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"আপনার কাছে Bluetooth সেটিংস পরিবর্তন করার অনুমতি নেই৷"</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"Bluetooth সেটিংস খোলা থাকা অবস্থায় <xliff:g id="DEVICE_NAME">%1$s</xliff:g> কাছাকাছি ডিভাইসগুলির কাছে দৃশ্যমান।"</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"Bluetooth সেটিংস খোলা থাকা অবস্থায় <xliff:g id="DEVICE_NAME">%1$s</xliff:g> কাছাকাছি ডিভাইসগুলির কাছে দৃশ্যমান হয়৷"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> এর সংযোগ বিচ্ছিন্ন করবেন?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"সম্প্রচার করা হচ্ছে"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"প্রোফাইল অক্ষম করবেন?"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Wi‑Fi, Bluetooth, বিমান মোড, সেলুলার নেটওয়ার্ক ও VPN-গুলি পরিচালনা করুন"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"সেলুলার ডেটা"</string>
     <string name="calls_title" msgid="3544471959217176768">"কলগুলি"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"SMS বার্তাগুলি"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"SMS বার্তাগুলি"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"সেলুলার নেটওয়ার্কের মাধ্যমে ডাটা ব্যবহারের অনুমতি দিন"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"রোমিংয়ের সময় ডাটা ব্যবহারের অনুমতি দিন"</string>
     <string name="roaming" msgid="3596055926335478572">"ডেটা রোমিং"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"মাঝারি থেকে উচ্চ নিরাপত্তা"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"পাসওয়ার্ড"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"উচ্চ নিরাপত্তা"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"ডিভাইস সুরক্ষা বৈশিষ্ট্যগুলি আর কাজ করবে না৷"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"প্রশাসক, এনক্রিপশান নীতি, অথবা শংসাপত্র সঞ্চয়স্থান দ্বারা অক্ষম"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"কোনো কিছুই নয়"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"সোয়াইপ করুন"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"আনলক প্যাটার্ন সরান"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"আনলক PIN সরান"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"আনলক পাসওয়ার্ড সরান"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"স্ক্রীন লক সরান"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"আনলক প্যাটার্ন পরিবর্তন করুন"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"আনলক PIN পরিবর্তন করুন"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"আনলক পাসওয়ার্ড পরিবর্তন করুন"</string>
@@ -860,6 +862,10 @@
     <string name="sim_multi_sims_summary" msgid="7018740080801483990">"আপনি সেলুলার ডেটার জন্য যে সিম পছন্দ করছেন তা নির্বাচন করুন।"</string>
     <string name="sim_change_data_title" msgid="294357201685244532">"ডেটা SIM পরিবর্তন করবেন?"</string>
     <string name="sim_change_data_message" msgid="1313940695939674633">"সেলুলার ডেটার জন্য <xliff:g id="OLD_SIM">%2$s</xliff:g> এর পরিবর্তে <xliff:g id="NEW_SIM">%1$s</xliff:g> ব্যবহার করবেন?"</string>
+    <!-- no translation found for sim_preferred_title (5567909634636045268) -->
+    <skip />
+    <!-- no translation found for sim_preferred_message (301251431163650167) -->
+    <skip />
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"ভুল সিম PIN কোড, আপনার ডিভাইসটি আনলক করতে এখন আপনাকে অবশ্যই আপনার ক্যারিয়ারের সাথে যোগাযোগ করতে হবে৷"</string>
   <plurals name="wrong_pin_code">
     <item quantity="one" msgid="4840607930166101114">"ভুল সিম পিন কোড, আপনার কাছে আর <xliff:g id="NUMBER">%d</xliff:g>টি প্রচেষ্টা বাকি রয়েছে, তার পরে আপনার ডিভাইসটি আনলক করতে আপনাকে অবশ্যই আপনার ক্যারিয়ারের সাথে যোগাযোগ করতে হবে৷"</item>
@@ -2332,7 +2338,8 @@
     <string name="sim_notification_title" msgid="6272913297433198340">"SIM কার্ডগুলি পরিবর্তন করা হয়েছে৷"</string>
     <string name="sim_notification_summary" msgid="5024470200658902406">"সেট আপ করতে স্পর্শ করুন"</string>
     <string name="sim_pref_divider" msgid="6778907671867621874">"এর জন্য পছন্দসই SIM"</string>
-    <string name="sim_calls_ask_first_prefs_title" msgid="7328134172516945288">"প্রতিবার জিজ্ঞাসা করুন"</string>
+    <!-- no translation found for sim_calls_ask_first_prefs_title (7941299533514115976) -->
+    <skip />
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"নির্বাচন করার প্রয়োজন"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"সেটিংস"</string>
     <string name="search_results_title" msgid="1796252422574886932">"সেটিংস"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 44f135d..98214da 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Vols desconnectar-te?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Això posarà fi a la teva connexió amb:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"No tens permís per canviar la configuració del Bluetooth."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> serà visible per a dispositius propers amb la configuració de Bluetooth activada."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> serà visible per a dispositius propers mentre la configuració de Bluetooth estigui oberta."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Vols desconnectar el dispositiu <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Emissió"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Vols desactivar el perfil?"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Permet gestionar la Wi‑Fi, el Bluetooth, el mode d\'avió, les xarxes mòbils i les VPN."</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Dades mòbils"</string>
     <string name="calls_title" msgid="3544471959217176768">"Trucades"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"Missatges SMS"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"Missatges SMS"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"Permet l\'ús de dades amb la xarxa mòbil."</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Permet ús dades en itinerància"</string>
     <string name="roaming" msgid="3596055926335478572">"Itinerància de dades"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Nivell de seguretat mitjà o alt"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Contrasenya"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Nivell de seguretat alt"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Les funcions de protecció del dispositiu deixaran de funcionar."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Desactivat per administrador, política d\'encriptació o emmagatzematge de credencials"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Cap"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Fes lliscar el dit"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Elimina el patró de desbloqueig"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Elimina el PIN de desbloqueig"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Elimina la contrasenya de desbloqueig"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"Suprimeix el bloqueig de pantalla."</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Canvia el patró de desbloqueig"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Canvia el PIN de desbloqueig"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Canvia la contrasenya de desbloqueig"</string>
@@ -860,6 +862,8 @@
     <string name="sim_multi_sims_summary" msgid="7018740080801483990">"Tria la SIM que prefereixis per a les dades mòbils."</string>
     <string name="sim_change_data_title" msgid="294357201685244532">"Vols canviar la SIM de dades?"</string>
     <string name="sim_change_data_message" msgid="1313940695939674633">"Vols utilitzar la targeta <xliff:g id="NEW_SIM">%1$s</xliff:g> en comptes de la targeta <xliff:g id="OLD_SIM">%2$s</xliff:g> per a les dades mòbils?"</string>
+    <string name="sim_preferred_title" msgid="5567909634636045268">"Vols canviar la SIM preferida?"</string>
+    <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> és l\'única targeta SIM del dispositiu. Vols fer-la servir per a les dades mòbils, les trucades i els missatges SMS?"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"El codi PIN de la SIM no és correcte. Has de contactar amb l\'operador de telefonia mòbil per desbloquejar el dispositiu."</string>
   <plurals name="wrong_pin_code">
     <item quantity="one" msgid="4840607930166101114">"El codi PIN de la SIM no és correcte. Et queda <xliff:g id="NUMBER">%d</xliff:g> intent; si no l\'encertes, contacta amb l\'operador de telefonia mòbil per desbloquejar el dispositiu."</item>
@@ -2332,7 +2336,8 @@
     <string name="sim_notification_title" msgid="6272913297433198340">"S\'han canviat les targetes SIM"</string>
     <string name="sim_notification_summary" msgid="5024470200658902406">"Toca per anar a la configuració."</string>
     <string name="sim_pref_divider" msgid="6778907671867621874">"SIM preferida per a"</string>
-    <string name="sim_calls_ask_first_prefs_title" msgid="7328134172516945288">"Demana-m\'ho cada vegada"</string>
+    <!-- no translation found for sim_calls_ask_first_prefs_title (7941299533514115976) -->
+    <skip />
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Has de seleccionar una preferència."</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Configuració"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Configuració"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index ee0afef..3b636b9 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Odpojit?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Tímto způsobem ukončíte připojení k zařízení:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"Nemáte oprávnění měnit nastavení Bluetooth."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"Při otevřeném nastavení Bluetooth je zařízení <xliff:g id="DEVICE_NAME">%1$s</xliff:g> viditelné pro zařízení v okolí."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"Při otevřeném nastavení Bluetooth je zařízení <xliff:g id="DEVICE_NAME">%1$s</xliff:g> viditelné pro zařízení v okolí."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Odpojit zařízení <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Vysílání"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Deaktivovat profil?"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Správa sítí Wi-Fi, rozhraní Bluetooth, režimu Letadlo, mobilních sítí a sítí VPN"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Mobilní data"</string>
     <string name="calls_title" msgid="3544471959217176768">"Volání"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"Zprávy SMS"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"Zprávy SMS"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"Povolit využití dat přes mobilní síť"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Povolit data při roamingu"</string>
     <string name="roaming" msgid="3596055926335478572">"Datový roaming"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Střední až vysoké zabezpečení"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Heslo"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Vysoké zabezpečení"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Již nebudou fungovat funkce ochrany zařízení."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Zakázáno správcem, zásadami šifrování nebo úložištěm pověření"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Žádný"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Přejetí prstem"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Odebrat bezpečnostní gesto"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Odebrat bezpečnostní kód PIN"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Odebrat bezpečnostní heslo"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"Odstranit tento zámek"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Změna bezpečnostního gesta"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Změna bezpečnostního kódu PIN"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Změnit bezpečnostní heslo"</string>
@@ -860,6 +862,10 @@
     <string name="sim_multi_sims_summary" msgid="7018740080801483990">"Zvolte SIM kartu preferovanou pro mobilní datové přenosy."</string>
     <string name="sim_change_data_title" msgid="294357201685244532">"Změnit SIM kartu pro data?"</string>
     <string name="sim_change_data_message" msgid="1313940695939674633">"Chcete pro mobilní data namísto SIM karty <xliff:g id="OLD_SIM">%2$s</xliff:g> použít SIM kartu <xliff:g id="NEW_SIM">%1$s</xliff:g>?"</string>
+    <!-- no translation found for sim_preferred_title (5567909634636045268) -->
+    <skip />
+    <!-- no translation found for sim_preferred_message (301251431163650167) -->
+    <skip />
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"Zadali jste nesprávný kód PIN SIM karty. Nyní musíte za účelem odemknutí zařízení kontaktovat svého operátora."</string>
   <plurals name="wrong_pin_code">
     <item quantity="one" msgid="4840607930166101114">"Zadali jste nesprávný kód PIN SIM karty. Máte ještě <xliff:g id="NUMBER">%d</xliff:g> pokus, poté budete muset o odemknutí zařízení požádat svého operátora."</item>
@@ -2332,7 +2338,7 @@
     <string name="sim_notification_title" msgid="6272913297433198340">"SIM karty byly změněny."</string>
     <string name="sim_notification_summary" msgid="5024470200658902406">"Nastavte dotykem"</string>
     <string name="sim_pref_divider" msgid="6778907671867621874">"Preferovaná SIM karta pro"</string>
-    <string name="sim_calls_ask_first_prefs_title" msgid="7328134172516945288">"Pokaždé se zeptat"</string>
+    <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Pokaždé se zeptat"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Vyžadován výběr"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Nastavení"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Nastavení"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 956a1a6..2f2e6ee 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Vil du afbryde?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Dette vil afslutte din forbindelse med:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"Du har ikke tilladelse til at ændre Bluetooth-indstillinger."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> er synlig for enheder i nærheden, når Bluetooth-indstillingerne er aktiveret."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> er synlig for enheder i nærheden, når Bluetooth-indstillingerne er åbne."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Vil du afbryde <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Dataudveksling"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Vil du deaktivere profilen?"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Administrer Wi-Fi, Bluetooth, flytilstand, mobilnetværk og VPN"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Mobildata"</string>
     <string name="calls_title" msgid="3544471959217176768">"Opkald"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"Sms-beskeder"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"Sms-beskeder"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"Tillad databrug via mobilnetværk"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Tillad dataforbrug ved roaming"</string>
     <string name="roaming" msgid="3596055926335478572">"Dataroaming"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Medium til høj sikkerhed"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Adgangskode"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Høj sikkerhed"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Funktionerne til enhedsbeskyttelse vil ikke fungere længere."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Deaktiveret af administrator, kryptering eller loginlager"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Ingen"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Stryg"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Fjern mønster til at låse op"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Fjern pinkode til at låse op"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Fjern adgangskode til at låse op"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"Fjern skærmlås"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Skift mønster til at låse op"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Skift pinkode til at låse op"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Skift adgangskode til at låse op"</string>
@@ -860,6 +862,8 @@
     <string name="sim_multi_sims_summary" msgid="7018740080801483990">"Vælg det SIM-kort, du foretrækker for mobildata."</string>
     <string name="sim_change_data_title" msgid="294357201685244532">"Vil du skifte SIM-kortet for data?"</string>
     <string name="sim_change_data_message" msgid="1313940695939674633">"Vil du bruge <xliff:g id="NEW_SIM">%1$s</xliff:g> i stedet for <xliff:g id="OLD_SIM">%2$s</xliff:g> til mobildata?"</string>
+    <string name="sim_preferred_title" msgid="5567909634636045268">"Skal dit SIM-kort opdateres?"</string>
+    <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> er det eneste SIM-kort i enheden. Vil du bruge dette SIM-kort til mobildata, opkald og sms-beskeder?"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"Forkert pinkode til SIM-kort. Du skal nu kontakte dit mobilselskab for at låse din enhed op."</string>
   <plurals name="wrong_pin_code">
     <item quantity="one" msgid="4840607930166101114">"Forkert pinkode til SIM-kort. Du har <xliff:g id="NUMBER">%d</xliff:g> forsøg tilbage, før du skal kontakte dit mobilselskab for at låse din enhed op."</item>
@@ -2332,7 +2336,8 @@
     <string name="sim_notification_title" msgid="6272913297433198340">"SIM-kortene er ændret."</string>
     <string name="sim_notification_summary" msgid="5024470200658902406">"Tryk for at konfigurere"</string>
     <string name="sim_pref_divider" msgid="6778907671867621874">"Foretrukket SIM-kort til"</string>
-    <string name="sim_calls_ask_first_prefs_title" msgid="7328134172516945288">"Spørg hver gang"</string>
+    <!-- no translation found for sim_calls_ask_first_prefs_title (7941299533514115976) -->
+    <skip />
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Du har ikke valgt endnu"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Indstillinger"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Indstillinger"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index a67ae92..c0ad087 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Verbindung trennen?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Hierdurch wird die Verbindung mit&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt; getrennt."</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"Sie sind nicht zur Änderung der Bluetooth-Einstellungen berechtigt."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ist bei aktiviertem Bluetooth für Geräte in der Nähe sichtbar."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ist bei aktiviertem Bluetooth für Geräte in der Nähe sichtbar."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Verbindung mit <xliff:g id="DEVICE_NAME">%1$s</xliff:g> trennen?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Übertragung"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Profil deaktivieren?"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"WLAN, Bluetooth, Flugmodus, Mobilfunknetze und VPNs verwalten"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Mobilfunkdaten"</string>
     <string name="calls_title" msgid="3544471959217176768">"Anrufe"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"SMS"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"SMS"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"Datennutzung über Mobilfunknetz zulassen"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Datennutzung bei Roaming zulassen"</string>
     <string name="roaming" msgid="3596055926335478572">"Daten-Roaming"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Mittlere bis hohe Sicherheit"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Passwort"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Hohe Sicherheit"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Geräteschutzfunktionen funktionieren dann nicht mehr."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Von Admin, Richtlinie oder Anmeldedaten deaktiviert"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Keine"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Wischen"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Entsperrungsmuster entfernen"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Entsperrungs-PIN entfernen"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Entsperrungspasswort entfernen"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"Displaysperre entfernen"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Entsperrungsmuster ändern"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Entsperrungs-PIN ändern"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Entsperrungspasswort ändern"</string>
@@ -861,6 +863,10 @@
     <string name="sim_multi_sims_summary" msgid="7018740080801483990">"Wählen Sie Ihre bevorzugte SIM-Karte für Mobilfunkdaten aus."</string>
     <string name="sim_change_data_title" msgid="294357201685244532">"Daten-SIM ändern?"</string>
     <string name="sim_change_data_message" msgid="1313940695939674633">"<xliff:g id="NEW_SIM">%1$s</xliff:g> statt <xliff:g id="OLD_SIM">%2$s</xliff:g> für Mobilfunkdaten verwenden?"</string>
+    <!-- no translation found for sim_preferred_title (5567909634636045268) -->
+    <skip />
+    <!-- no translation found for sim_preferred_message (301251431163650167) -->
+    <skip />
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"Falscher PIN-Code der SIM-Karte. Bitte wenden Sie sich an Ihren Mobilfunkanbieter, damit er Ihr Gerät entsperrt."</string>
   <plurals name="wrong_pin_code">
     <item quantity="one" msgid="4840607930166101114">"Falscher PIN-Code der SIM-Karte. Sie haben noch <xliff:g id="NUMBER">%d</xliff:g> Versuch, bevor Sie das Gerät von Ihrem Mobilfunkanbieter entsperren lassen müssen."</item>
@@ -2333,7 +2339,8 @@
     <string name="sim_notification_title" msgid="6272913297433198340">"SIM-Karten wurden geändert"</string>
     <string name="sim_notification_summary" msgid="5024470200658902406">"Zum Einrichten tippen"</string>
     <string name="sim_pref_divider" msgid="6778907671867621874">"Bevorzugte SIM für"</string>
-    <string name="sim_calls_ask_first_prefs_title" msgid="7328134172516945288">"Jedes Mal fragen"</string>
+    <!-- no translation found for sim_calls_ask_first_prefs_title (7941299533514115976) -->
+    <skip />
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Auswahl erforderlich"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Einstellungen"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Einstellungen"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 8e6496a..cf316f6 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Αποσύνδεση;"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Θα τερματιστεί η σύνδεσή σας με τη συσκευή:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"Δεν έχετε άδεια να αλλάξετε τις ρυθμίσεις Bluetooth."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"Το <xliff:g id="DEVICE_NAME">%1$s</xliff:g> είναι ορατό σε κοντινές συσκευές όταν είναι ανοικτές οι Ρυθμίσεις Bluetooth."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"Η συσκευή <xliff:g id="DEVICE_NAME">%1$s</xliff:g> είναι ορατή σε κοντινές συσκευές όταν είναι ανοικτές οι Ρυθμίσεις Bluetooth."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Να αποσυνδεθεί η συσκευή <xliff:g id="DEVICE_NAME">%1$s</xliff:g>;"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Μετάδοση"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Απενεργοπ. προφίλ;"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Διαχείριση Wi‑Fi, Bluetooth, λειτουργίας πτήσης, δικτύων κινητής τηλεφωνίας και VPN"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Δεδομένα κινητής τηλεφωνίας"</string>
     <string name="calls_title" msgid="3544471959217176768">"Κλήσεις"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"Μηνύματα SMS"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"Μηνύματα SMS"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"Επιτρ. χρήση δεδομ. σε δίκτυο κιν. τηλ."</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Επιτρ. η χρήση δεδ. σε περιαγ."</string>
     <string name="roaming" msgid="3596055926335478572">"Περιαγωγή δεδομένων"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Μεσαίο έως υψηλό επίπεδο ασφάλειας"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Κωδικός πρόσβασης"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Υψηλό επίπεδο ασφάλειας"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Οι λειτουργίες προστασίας της συσκευής δεν θα λειτουργούν πλέον."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Απενεργοποιήθηκε λόγω διαχειριστή, πολιτικής κρυπτογράφησης ή χώρου αποθήκευσης διαπιστευτηρίων"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Κανένα"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Ολίσθηση"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Κατάργηση μοτίβου ξεκλειδώματος"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Κατάργηση αριθμού PIN ξεκλειδώματος"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Κατάργηση κωδικού πρόσβασης ξεκλειδώματος"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"Κατάργηση κλειδώματος οθόνης"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Αλλαγή μοτίβου ξεκλειδώματος"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Αλλαγή αριθμού PIN ξεκλειδώματος"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Αλλαγή κωδικού πρόσβασης ξεκλειδώματος"</string>
@@ -860,6 +862,8 @@
     <string name="sim_multi_sims_summary" msgid="7018740080801483990">"Επιλέξτε τη SIM που προτιμάτε για δεδομένα κινητής τηλεφωνίας."</string>
     <string name="sim_change_data_title" msgid="294357201685244532">"Αλλαγή SIM δεδομένων;"</string>
     <string name="sim_change_data_message" msgid="1313940695939674633">"Χρήση της κάρτας <xliff:g id="NEW_SIM">%1$s</xliff:g> αντί για την κάρτα <xliff:g id="OLD_SIM">%2$s</xliff:g> για τα δεδομένα κινητής τηλεφωνίας;"</string>
+    <string name="sim_preferred_title" msgid="5567909634636045268">"Ενημέρωση προτιμώμενης SIM;"</string>
+    <string name="sim_preferred_message" msgid="301251431163650167">"Η κάρτα <xliff:g id="NEW_SIM">%1$s</xliff:g> είναι η μοναδική κάρτα SIM στη συσκευή σας. Θέλετε να χρησιμοποιήσετε αυτήν την κάρτα SIM για δεδομένα κινητής τηλεφωνίας, κλήσεις και μηνύματα SMS;"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"Εσφαλμένος κωδικός PIN κάρτας SIM. Θα πρέπει να επικοινωνήσετε με τον πάροχο κινητής τηλεφωνίας σας για να ξεκλειδώσετε τη συσκευή σας."</string>
   <plurals name="wrong_pin_code">
     <item quantity="one" msgid="4840607930166101114">"Εσφαλμένος κωδικός PIN κάρτας SIM. Απομένει άλλη <xliff:g id="NUMBER">%d</xliff:g> προσπάθεια. Στη συνέχεια, θα πρέπει να επικοινωνήσετε με τον πάροχο κινητής τηλεφωνίας σας για να ξεκλειδώσετε τη συσκευή σας."</item>
@@ -2334,7 +2338,8 @@
     <string name="sim_notification_title" msgid="6272913297433198340">"Οι κάρτες SIM άλλαξαν."</string>
     <string name="sim_notification_summary" msgid="5024470200658902406">"Αγγίξτε για ρύθμιση"</string>
     <string name="sim_pref_divider" msgid="6778907671867621874">"Προτιμώμενη SIM για"</string>
-    <string name="sim_calls_ask_first_prefs_title" msgid="7328134172516945288">"Να γίνεται ερώτηση κάθε φορά"</string>
+    <!-- no translation found for sim_calls_ask_first_prefs_title (7941299533514115976) -->
+    <skip />
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Απαιτείται επιλογή"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Ρυθμίσεις"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Ρυθμίσεις"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 03fb041..559f793 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Disconnect?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"This will end your connection with:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"You don\'t have permission to change Bluetooth settings."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> is visible to nearby devices while Bluetooth Settings is open."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> is visible to nearby devices while Bluetooth settings is open."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Disconnect <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Broadcasting"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Disable profile?"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Manage Wi‑Fi, Bluetooth, aeroplane mode, mobile networks, &amp; VPNs"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Mobile data"</string>
     <string name="calls_title" msgid="3544471959217176768">"Calls"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"SMS Messages"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"SMS messages"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"Allow data usage over mobile network"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Allow data usage when roaming"</string>
     <string name="roaming" msgid="3596055926335478572">"Data roaming"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Medium to high security"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Password"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"High security"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Device protection features will no longer work."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Disabled by administrator, encryption policy or credential storage"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"None"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Swipe"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Remove unlock pattern"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Remove unlock PIN"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Remove unlock password"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"Remove screen lock"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Change unlock pattern"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Change unlock PIN"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Change unlock password"</string>
@@ -860,6 +862,8 @@
     <string name="sim_multi_sims_summary" msgid="7018740080801483990">"Choose the SIM that you prefer for mobile data."</string>
     <string name="sim_change_data_title" msgid="294357201685244532">"Change data SIM?"</string>
     <string name="sim_change_data_message" msgid="1313940695939674633">"Use <xliff:g id="NEW_SIM">%1$s</xliff:g> instead of <xliff:g id="OLD_SIM">%2$s</xliff:g> for mobile data?"</string>
+    <string name="sim_preferred_title" msgid="5567909634636045268">"Update preferred SIM card?"</string>
+    <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> is the only SIM in your device. Do you want to use this SIM for mobile data, calls and SMS messages?"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"Incorrect SIM PIN code; you must now contact your carrier to unlock your device."</string>
   <plurals name="wrong_pin_code">
     <item quantity="one" msgid="4840607930166101114">"Incorrect SIM PIN code; you have <xliff:g id="NUMBER">%d</xliff:g> remaining attempt/s before you must contact your carrier to unlock your device."</item>
@@ -2332,7 +2336,8 @@
     <string name="sim_notification_title" msgid="6272913297433198340">"SIM cards changed."</string>
     <string name="sim_notification_summary" msgid="5024470200658902406">"Touch to set up"</string>
     <string name="sim_pref_divider" msgid="6778907671867621874">"Preferred SIM for"</string>
-    <string name="sim_calls_ask_first_prefs_title" msgid="7328134172516945288">"Ask every time"</string>
+    <!-- no translation found for sim_calls_ask_first_prefs_title (7941299533514115976) -->
+    <skip />
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Selection required"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Settings"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Settings"</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 03fb041..559f793 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Disconnect?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"This will end your connection with:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"You don\'t have permission to change Bluetooth settings."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> is visible to nearby devices while Bluetooth Settings is open."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> is visible to nearby devices while Bluetooth settings is open."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Disconnect <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Broadcasting"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Disable profile?"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Manage Wi‑Fi, Bluetooth, aeroplane mode, mobile networks, &amp; VPNs"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Mobile data"</string>
     <string name="calls_title" msgid="3544471959217176768">"Calls"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"SMS Messages"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"SMS messages"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"Allow data usage over mobile network"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Allow data usage when roaming"</string>
     <string name="roaming" msgid="3596055926335478572">"Data roaming"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Medium to high security"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Password"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"High security"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Device protection features will no longer work."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Disabled by administrator, encryption policy or credential storage"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"None"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Swipe"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Remove unlock pattern"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Remove unlock PIN"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Remove unlock password"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"Remove screen lock"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Change unlock pattern"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Change unlock PIN"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Change unlock password"</string>
@@ -860,6 +862,8 @@
     <string name="sim_multi_sims_summary" msgid="7018740080801483990">"Choose the SIM that you prefer for mobile data."</string>
     <string name="sim_change_data_title" msgid="294357201685244532">"Change data SIM?"</string>
     <string name="sim_change_data_message" msgid="1313940695939674633">"Use <xliff:g id="NEW_SIM">%1$s</xliff:g> instead of <xliff:g id="OLD_SIM">%2$s</xliff:g> for mobile data?"</string>
+    <string name="sim_preferred_title" msgid="5567909634636045268">"Update preferred SIM card?"</string>
+    <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> is the only SIM in your device. Do you want to use this SIM for mobile data, calls and SMS messages?"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"Incorrect SIM PIN code; you must now contact your carrier to unlock your device."</string>
   <plurals name="wrong_pin_code">
     <item quantity="one" msgid="4840607930166101114">"Incorrect SIM PIN code; you have <xliff:g id="NUMBER">%d</xliff:g> remaining attempt/s before you must contact your carrier to unlock your device."</item>
@@ -2332,7 +2336,8 @@
     <string name="sim_notification_title" msgid="6272913297433198340">"SIM cards changed."</string>
     <string name="sim_notification_summary" msgid="5024470200658902406">"Touch to set up"</string>
     <string name="sim_pref_divider" msgid="6778907671867621874">"Preferred SIM for"</string>
-    <string name="sim_calls_ask_first_prefs_title" msgid="7328134172516945288">"Ask every time"</string>
+    <!-- no translation found for sim_calls_ask_first_prefs_title (7941299533514115976) -->
+    <skip />
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Selection required"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Settings"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Settings"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index f2ff63a..ad39e1c 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"¿Desconectar?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Esto pondrá fin a tu conexión con:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"No tienes permiso para cambiar la configuración de Bluetooth."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"Dispos. cercanos ven <xliff:g id="DEVICE_NAME">%1$s</xliff:g> si config. Bluetooth abierta"</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"Los dispositivos cercanos pueden ver a <xliff:g id="DEVICE_NAME">%1$s</xliff:g> si la configuración de Bluetooth está abierta."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"¿Desconectar <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Transmisión"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"¿Inhabilitar perfil?"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Administrar Wi-Fi, Bluetooth, modo de avión, redes móviles y VPN"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Datos móviles"</string>
     <string name="calls_title" msgid="3544471959217176768">"Llamadas"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"Mensajes SMS"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"Mensajes SMS"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"Permitir el uso de datos por red móvil"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Permitir usar datos en roaming"</string>
     <string name="roaming" msgid="3596055926335478572">"Roaming de datos"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Nivel de seguridad medio a alto"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Contraseña"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Nivel de seguridad alto"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Las funciones de protección del dispositivo ya no funcionarán."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Inhabilitado por administrador, política de encriptación o almacenamiento de credenciales"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Ninguna"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Deslizar"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Eliminar el patrón de desbloqueo"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Eliminar el PIN de desbloqueo"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Eliminar la contraseña de desbloqueo"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"Eliminar bloqueo de pantalla"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Cambiar patrón de desbloqueo"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Cambiar PIN de desbloqueo"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Cambiar la contraseña de desbloqueo"</string>
@@ -860,6 +862,8 @@
     <string name="sim_multi_sims_summary" msgid="7018740080801483990">"Selecciona la tarjeta SIM que prefieras para datos móviles."</string>
     <string name="sim_change_data_title" msgid="294357201685244532">"¿Cambiar SIM para datos?"</string>
     <string name="sim_change_data_message" msgid="1313940695939674633">"¿Prefieres usar <xliff:g id="NEW_SIM">%1$s</xliff:g> en vez de <xliff:g id="OLD_SIM">%2$s</xliff:g> para los datos móviles?"</string>
+    <string name="sim_preferred_title" msgid="5567909634636045268">"¿Actualizar tarjeta SIM?"</string>
+    <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> es la única SIM en el dispositivo. ¿Quieres utilizar esta SIM para datos móviles, llamadas y mensajes SMS?"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"El código PIN de la tarjeta SIM es incorrecto. Debes comunicarte con el proveedor para desbloquear el dispositivo."</string>
   <plurals name="wrong_pin_code">
     <item quantity="one" msgid="4840607930166101114">"El código PIN de la tarjeta SIM es incorrecto. Te queda <xliff:g id="NUMBER">%d</xliff:g> intento antes de que debas comunicarte con el proveedor para desbloquear el dispositivo."</item>
@@ -2332,7 +2336,8 @@
     <string name="sim_notification_title" msgid="6272913297433198340">"Tarjetas SIM modificadas"</string>
     <string name="sim_notification_summary" msgid="5024470200658902406">"Toca para configurarlas."</string>
     <string name="sim_pref_divider" msgid="6778907671867621874">"SIM preferida para"</string>
-    <string name="sim_calls_ask_first_prefs_title" msgid="7328134172516945288">"Preguntar siempre"</string>
+    <!-- no translation found for sim_calls_ask_first_prefs_title (7941299533514115976) -->
+    <skip />
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Selección requerida"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Configuración"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Configuración"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 346b01e..9051be3 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"¿Desconectar?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Finalizará la conexión con&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;."</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"No tienes permiso para cambiar los ajustes de Bluetooth."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> será visible para dispositivos cercanos mientras los ajustes de Bluetooth estén abiertos."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> será visible para dispositivos cercanos mientras los ajustes de Bluetooth estén abiertos."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"¿Desconectar <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Emisiones"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"¿Inhabilitar perfil?"</string>
@@ -181,7 +181,7 @@
     <string name="date_and_time" msgid="9062980487860757694">"Fecha y hora"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Seleccionar zona horaria"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Vista previa:"</string>
-    <string name="display_font_size_label" msgid="8941851418397475389">"Tamaño de fuente:"</string>
+    <string name="display_font_size_label" msgid="8941851418397475389">"Tamaño de la fuente:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
     <skip />
     <string name="intent_sender_sendbroadcast_text" msgid="1415735148895872715">"Enviar <xliff:g id="BROADCAST">broadcast</xliff:g>"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Administrar Wi-Fi, Bluetooth, modo avión, redes móviles y redes privadas virtuales"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Datos móviles"</string>
     <string name="calls_title" msgid="3544471959217176768">"Llamadas"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"Mensajes SMS"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"Mensajes SMS"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"Permitir uso de datos en redes móviles"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Permitir uso datos itinerancia"</string>
     <string name="roaming" msgid="3596055926335478572">"Itinerancia de datos"</string>
@@ -340,7 +340,7 @@
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Mostrar información de usuario en la pantalla de bloqueo"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Información del usuario"</string>
     <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Mostrar información de perfil en pantalla bloqueo"</string>
-    <string name="profile_info_settings_title" msgid="3518603215935346604">"Información perfil"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"Información de perfil"</string>
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Cuentas"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Ubicación"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Cuentas"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Seguridad media-alta"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Contraseña"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Seguridad alta"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Las funciones de protección del dispositivo ya no funcionarán."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Desactivado por el administrador, política de cifrado o almacenamiento de credenciales"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Ninguno"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Deslizar"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Eliminar patrón de desbloqueo"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Eliminar PIN de desbloqueo"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Eliminar contraseña de desbloqueo"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"Eliminar bloqueo de pantalla"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Cambiar patrón desbloqueo"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Cambiar PIN de desbloqueo"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Cambiar contraseña de desbloqueo"</string>
@@ -831,8 +833,8 @@
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Levantar el dispositivo para activarlo"</string>
     <string name="doze_title" msgid="2259176504273878294">"Pantalla ambiente"</string>
     <string name="doze_summary" msgid="7128970177894383698">"Activar pantalla al coger el dispositivo o recibir notificaciones"</string>
-    <string name="title_font_size" msgid="4405544325522105222">"Tamaño de fuente"</string>
-    <string name="dialog_title_font_size" msgid="2231507851258955038">"Tamaño de fuente"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Tamaño de la fuente"</string>
+    <string name="dialog_title_font_size" msgid="2231507851258955038">"Tamaño de la fuente"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Ajustes de bloqueo tarjeta SIM"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Bloqueo de tarjeta SIM"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Bloqueo de tarjeta SIM"</string>
@@ -860,6 +862,8 @@
     <string name="sim_multi_sims_summary" msgid="7018740080801483990">"Selecciona la SIM que prefieras usar para datos móviles."</string>
     <string name="sim_change_data_title" msgid="294357201685244532">"¿Cambiar SIM de datos?"</string>
     <string name="sim_change_data_message" msgid="1313940695939674633">"¿Usar <xliff:g id="NEW_SIM">%1$s</xliff:g> en lugar de <xliff:g id="OLD_SIM">%2$s</xliff:g> para datos móviles?"</string>
+    <string name="sim_preferred_title" msgid="5567909634636045268">"¿Actualizar tarjeta SIM preferida?"</string>
+    <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> es la única tarjeta SIM del dispositivo. ¿Quieres utilizar esta tarjeta SIM para datos móviles, llamadas y mensajes SMS?"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"Código PIN de la tarjeta SIM incorrecto. Debes ponerte en contacto con tu operador para desbloquear el dispositivo."</string>
   <plurals name="wrong_pin_code">
     <item quantity="one" msgid="4840607930166101114">"Código PIN de la tarjeta SIM incorrecto. Queda <xliff:g id="NUMBER">%d</xliff:g> intento para tener que ponerte en contacto con tu operador para desbloquear el dispositivo."</item>
@@ -1702,8 +1706,8 @@
     <string name="process_stats_type_foreground" msgid="7713118254089580536">"En primer plano"</string>
     <string name="process_stats_type_cached" msgid="6314925846944806511">"En caché"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Actualmente, la memoria del dispositivo es <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"Uso de RAM medio"</string>
-    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Uso de RAM máximo"</string>
+    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"Uso medio de RAM"</string>
+    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Uso máximo de RAM"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Duración"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Servicios"</string>
     <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Duración"</string>
@@ -2028,7 +2032,7 @@
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Uso de datos"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Uso datos de aplicación"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"El uso de datos determinado por el operador puede ser diferente al recuento del dispositivo."</string>
-    <string name="data_usage_app" msgid="4970478397515423303">"Uso de la aplicación"</string>
+    <string name="data_usage_app" msgid="4970478397515423303">"Uso de las aplicaciones"</string>
     <string name="data_usage_app_info_label" msgid="3409931235687866706">"INFORMACIÓN DE LA APLICACIÓN"</string>
     <string name="data_usage_cellular_data" msgid="4859424346276043677">"Datos móviles"</string>
     <string name="data_usage_data_limit" msgid="1193930999713192703">"Establecer límite de datos"</string>
@@ -2189,7 +2193,7 @@
     <string name="user_add_profile_item_summary" msgid="5931663986889138941">"Desde tu cuenta, puedes restringir el acceso a las aplicaciones y al contenido"</string>
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Usuario"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Perfil limitado"</string>
-    <string name="user_add_user_title" msgid="2108112641783146007">"¿Añadir usuario nuevo?"</string>
+    <string name="user_add_user_title" msgid="2108112641783146007">"¿Añadir nuevo usuario?"</string>
     <string name="user_add_user_message_long" msgid="718192651887726259">"Puedes crear usuarios adicionales para compartir este dispositivo con otros usuarios. Cada usuario tiene su propio espacio y puede personalizarlo con sus aplicaciones, fondos de pantalla, etc. Los usuarios también pueden modificar opciones de configuración del dispositivo, como la conexión Wi‑Fi, que afectan a todos los usuarios.\n\nAl añadir un usuario nuevo, este debe configurar su espacio.\n\nCualquier usuario puede actualizar las aplicaciones del resto de usuarios."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Al añadir un usuario nuevo, este debe configurar su espacio.\n\nCualquier usuario puede actualizar las aplicaciones del resto de usuarios."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"¿Configurar usuario ahora?"</string>
@@ -2236,7 +2240,7 @@
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Esta configuración afecta a todos los usuarios de este tablet."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Esta configuración afecta a todos los usuarios de este teléfono."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Cambiar idioma"</string>
-    <string name="global_font_change_title" msgid="1887126466191012035">"Cambiar tamaño de fuente"</string>
+    <string name="global_font_change_title" msgid="1887126466191012035">"Cambiar tamaño de la fuente"</string>
     <string name="nfc_payment_settings_title" msgid="1807298287380821613">"Tocar y pagar"</string>
     <string name="google_wallet" msgid="9122936252378589227">"Google Wallet"</string>
     <string name="nfc_payment_no_apps" msgid="2481080809791416010">"Paga con solo dar un toque"</string>
@@ -2332,7 +2336,8 @@
     <string name="sim_notification_title" msgid="6272913297433198340">"Tarjetas SIM cambiadas."</string>
     <string name="sim_notification_summary" msgid="5024470200658902406">"Toca para configurar"</string>
     <string name="sim_pref_divider" msgid="6778907671867621874">"SIM preferida para"</string>
-    <string name="sim_calls_ask_first_prefs_title" msgid="7328134172516945288">"Preguntar siempre"</string>
+    <!-- no translation found for sim_calls_ask_first_prefs_title (7941299533514115976) -->
+    <skip />
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Es necesario seleccionar una opción"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Ajustes"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Ajustes"</string>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index c2fac52..fdcdffd 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Kas katkestada ühendus?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"See lõpetab teie ühenduse seadmega:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"Teil ei ole luba Bluetoothi seadete muutmiseks."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> on lähiseadmetele nähtav, kui Bluetoothi seaded on avatud."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> on läheduses olevatele seadmetele nähtav, kui Bluetoothi seaded on avatud."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Kas katkestada ühendus seadmega <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Edastamine"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Kas profiil keelata?"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"WiFi, Bluetoothi, lennukirežiimi ja mobiilsidevõrkude ning VPN-ide haldamine"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Mobiilne andmeside"</string>
     <string name="calls_title" msgid="3544471959217176768">"Kõned"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"SMS-sõnumid"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"SMS-sõnumid"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"Luba andmekasutus mobiilsidevõrgu kaudu"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Luba andmekas. rändluse ajal"</string>
     <string name="roaming" msgid="3596055926335478572">"Andmesiderändlus"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Keskmine kuni kõrge turvalisus"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Parool"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Kõrge turvalisus"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Seadme kaitsefunktsioonid lakkavad toimimast."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Keelanud admin., krüptimiseeskiri või mand. mälu"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Puudub"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Pühkimine"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Eemalda avamismuster"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Eemalda avamise PIN-kood"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Eemalda avamise parool"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"Ekraaniluku eemaldamine"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Avamismustri muutmine"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Muuda avamise PIN-koodi"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Avamisparooli muutmine"</string>
@@ -860,6 +862,10 @@
     <string name="sim_multi_sims_summary" msgid="7018740080801483990">"Valige SIM-kaart, mida soovite eelistatult kasutada mobiilse andmeside jaoks."</string>
     <string name="sim_change_data_title" msgid="294357201685244532">"Muuta andmeside SIM-kaarti?"</string>
     <string name="sim_change_data_message" msgid="1313940695939674633">"Kas kasutada mobiilse andmeside jaoks kaardi <xliff:g id="OLD_SIM">%2$s</xliff:g> asemel kaarti <xliff:g id="NEW_SIM">%1$s</xliff:g>?"</string>
+    <!-- no translation found for sim_preferred_title (5567909634636045268) -->
+    <skip />
+    <!-- no translation found for sim_preferred_message (301251431163650167) -->
+    <skip />
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"Vale SIM-i PIN-kood, seadme avamiseks peate nüüd ühendust võtma oma operaatoriga."</string>
   <plurals name="wrong_pin_code">
     <item quantity="one" msgid="4840607930166101114">"Vale SIM-i PIN-kood, teil on jäänud veel <xliff:g id="NUMBER">%d</xliff:g> katse, enne kui peate seadme avamiseks operaatoriga ühendust võtma."</item>
@@ -2332,7 +2338,8 @@
     <string name="sim_notification_title" msgid="6272913297433198340">"SIM-kaardid on muutunud."</string>
     <string name="sim_notification_summary" msgid="5024470200658902406">"Puudutage seadistamiseks"</string>
     <string name="sim_pref_divider" msgid="6778907671867621874">"Eelistatud SIM-kaart:"</string>
-    <string name="sim_calls_ask_first_prefs_title" msgid="7328134172516945288">"Küsi iga kord"</string>
+    <!-- no translation found for sim_calls_ask_first_prefs_title (7941299533514115976) -->
+    <skip />
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Valik on tegemata"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Seaded"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Seaded"</string>
diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml
index b694bcc..7d2f6b3 100644
--- a/res/values-eu-rES/strings.xml
+++ b/res/values-eu-rES/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Deskonektatu?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Gailu honekin duzun konexioa amaituko da:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"Ez daukazu Bluetooth-ezarpenak aldatzeko baimenik."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"Bluetooth ezarpenak irekita badaude, inguruko gailuek <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ikusi ahal izango dute."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"Bluetooth konexioa aktibo badago, inguruko gailuek <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ikusi ahal izango dute."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> deskonektatu nahi duzu?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Igorpena"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Profila desgaitu?"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Kudeatu Wi‑Fi eta Bluetooth konexioak, hegaldi modua, sare mugikorrak eta VPNak"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Datu mugikorrak"</string>
     <string name="calls_title" msgid="3544471959217176768">"Deiak"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"SMS mezuak"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"SMS mezuak"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"Onartu datu mugikorrak erabiltzea"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Onartu datuak ibiltaritzan"</string>
     <string name="roaming" msgid="3596055926335478572">"Ibiltaritzako datuak"</string>
@@ -353,7 +353,7 @@
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Enkriptatu telefonoa"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Enkriptatuta"</string>
     <string name="crypt_keeper_desc" product="tablet" msgid="2876073029767953111">"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 kode 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="5573427498609458721">"Kontuak, ezarpenak, deskargatutako aplikazioak eta euren 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 kode 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_desc" product="default" msgid="5573427498609458721">"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 kode 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="1189623490604750854">"Enkriptatu tableta"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Enkriptatu telefonoa"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Kargatu bateria eta saiatu berriro."</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Segurtasun ertaina-handia"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Pasahitza"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Segurtasun handia"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Gailua babesteko eginbideek funtzionatzeari utziko diote."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Administr./Gidalerroak/Kredentz.-biltegiak desgaituta"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Bat ere ez"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Pasatu hatza"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Kendu desblokeatzeko eredua"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Kendu desblokeatzeko PINa"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Kendu desblokeatzeko pasahitza"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"Desaktibatu pantaila blokeatzeko aukera"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Aldatu desblokeatzeko eredua"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Aldatu desblokeo PINa"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Aldatu desblokeatzeko pasahitza"</string>
@@ -557,7 +559,7 @@
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi‑Fi laguntzailea"</string>
     <string name="connected_via_wfa" msgid="3805736726317410714">"Wi‑Fi laguntzailearen bidez konektatuta"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"Igorri pantaila beste gailu batera"</string>
-    <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Gaitu hari gabeko bistaratzea."</string>
+    <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Gaitu hari gabeko bistaratzea"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Ez da gailurik aurkitu inguruan."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Konektatzen"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"Konektatuta"</string>
@@ -570,7 +572,7 @@
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Izena"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Eman datuak trukatzeko baimena tabletak beste gailu bat ukitzean."</string>
-    <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Onartu datuen trukaketa telefonoak beste gailu bat ukitzen duenean"</string>
+    <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Onartu datuen trukea telefonoak beste gailu bat ukitzen duenean"</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
     <string name="android_beam_on_summary" msgid="3618057099355636830">"Aplikazioaren edukia NFC bidez transmititzeko prest"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Desaktibatuta"</string>
@@ -666,7 +668,7 @@
     <string name="wifi_ip_settings" msgid="3359331401377059481">"IP ezarpenak"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(aldatu gabea)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(zehaztugabea)"</string>
-    <string name="wifi_remembered" msgid="4955746899347821096">"Gorde egin da"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"Gordeta"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"Desgaituta"</string>
     <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"Ezin izan da konfiguratu IP helbidea"</string>
     <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Ezin izan da konektatu Wi-Fi sarera"</string>
@@ -812,11 +814,11 @@
     <string name="brightness_summary" msgid="838917350127550703">"Doitu pantailaren distira"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Distira doigarria"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimizatu pantailaren distira inguruko argitasunaren arabera"</string>
-    <string name="screen_timeout" msgid="4351334843529712571">"Inaktibo"</string>
+    <string name="screen_timeout" msgid="4351334843529712571">"Ezarri egonean moduan"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Pantaila itzaltzen da"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> inaktibo egon ondoren"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Horma-papera"</string>
-    <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Aukeratu horma-papera hemendik"</string>
+    <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Aukeratu horma-papera"</string>
     <string name="screensaver_settings_title" msgid="3349790120327233241">"Pantaila-babeslea"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Oinarrira konektatuta dagoenean edo inaktibo eta kargatzen ari denean"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Bietako edozein"</string>
@@ -860,6 +862,8 @@
     <string name="sim_multi_sims_summary" msgid="7018740080801483990">"Aukeratu datu mugikorretarako hobetsi nahi duzun SIM txartela."</string>
     <string name="sim_change_data_title" msgid="294357201685244532">"Datuetarako SIMa aldatu nahi duzu?"</string>
     <string name="sim_change_data_message" msgid="1313940695939674633">"Datu mugikorretarako <xliff:g id="NEW_SIM">%1$s</xliff:g> txartela erabili nahi duzu, <xliff:g id="OLD_SIM">%2$s</xliff:g> txartelaren ordez?"</string>
+    <string name="sim_preferred_title" msgid="5567909634636045268">"SIM txartel hobetsia eguneratu nahi duzu?"</string>
+    <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> da gailuan daukazun SIM bakarra. SIM hori erabili nahi duzu dei, testu-mezu zein datu-trafikorako?"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"SIMaren PIN kodea okerra da. Gailua desblokeatzeko, operadorearekin harremanetan jarri beharko duzu."</string>
   <plurals name="wrong_pin_code">
     <item quantity="one" msgid="4840607930166101114">"SIMaren PIN kodea okerra da. <xliff:g id="NUMBER">%d</xliff:g> saiakera geratzen zaizkizu gailua desblokeatzeko operadorearekin harremanetan jarri behar izan aurretik."</item>
@@ -911,7 +915,7 @@
     <string name="sd_memory" product="default" msgid="151871913888051515">"SD txartela"</string>
     <string name="memory_available" msgid="5052397223077021181">"Erabilgarri"</string>
     <string name="memory_available_read_only" msgid="6497534390167920206">"Erabilgarri (irakurtzeko soilik)"</string>
-    <string name="memory_size" msgid="6629067715017232195">"Tokia, guztira"</string>
+    <string name="memory_size" msgid="6629067715017232195">"Memoria, guztira"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Kalkulatzen…"</string>
     <string name="memory_apps_usage" msgid="2348501997988663688">"Aplikazioak (datuak eta multimedia-edukia)"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Multimedia-edukia"</string>
@@ -1058,7 +1062,7 @@
     <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Errorea USB bidez konexioa partekatzean"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Konexioa partekatzea (Bluetooth)"</string>
     <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="8811610320942954709">"Tabletaren Interneteko konexioa partekatzen"</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"Telefonoaren Interneteko konexioa partekatzen"</string>
+    <string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"Telefonoaren Interneteko konexioa partekatzen ari da"</string>
     <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="2730938191906597896">"Tabletaren Interneteko konexioa gailu batekin partekatzen"</string>
     <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="1666736165420290466">"Telefonoaren Interneteko konexioa gailu batekin partekatzen"</string>
     <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="1180765608259580143">"Tabletaren Interneteko konexioa <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> gailurekin partekatzen"</string>
@@ -1141,7 +1145,7 @@
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Berretsi PINa"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="6850677112663979120">"Pasahitzak ez datoz bat"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="4757532830594400147">"PINak ez datoz bat"</string>
-    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Desblokeatu hautapena"</string>
+    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Desblokeatzeko metodoa"</string>
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Pasahitza ezarri da."</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PINa ezarri da"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Eredua ezarri da."</string>
@@ -1184,7 +1188,7 @@
     <string name="install_unknown_applications_title" msgid="663831043139080992">"Google Play ez beste iturburuetako aplikazioak ere instala daitezke"</string>
     <string name="install_unknown_applications" msgid="176855644862942064">"Baimendu iturburu ezezagunetako aplikazioak instalatzea."</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Tabletak eta datu pertsonalek iturburu ezezagunetako aplikazioen erasoak jaso ditzakete. Aplikazio horiek erabiltzen badituzu, tabletari gerta dakizkiokeen kalteen edo datu-galeren erantzule bakarra zeu zarela onartzen duzu."</string>
-    <string name="install_all_warning" product="default" msgid="8113734576826384682">"Telefonoa eta datu pertsonalak iturburu ezezagunetako aplikazioen erasoak jaso ditzakete. Aplikazio horiek erabiltzen badituzu, telefonoari gerta dakizkiokeen kalteen edo datu-galeren erantzule bakarra zeu zarela onartzen duzu."</string>
+    <string name="install_all_warning" product="default" msgid="8113734576826384682">"Telefonoak eta datu pertsonalek iturburu ezezagunetako aplikazioen erasoak jaso ditzakete. Aplikazio horiek erabiltzen badituzu, telefonoari gerta dakizkiokeen kalteen edo datu-galeren erantzule bakarra zeu zarela onartzen duzu."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Ezarpen aurreratuak"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Gaitu ezarpenen aukera gehiago"</string>
     <string name="application_info_label" msgid="5736524913065714880">"Aplikazioaren informazioa"</string>
@@ -1474,7 +1478,7 @@
     <string name="widget_picker_title" msgid="9130684134213467557">"Aukeratu widgeta"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Widgeta sortu eta sarbidea baimendu?"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Widgeta sortu ondoren, <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> ostalariak bistaratzen dituen datu guztiak atzitu ahal izango ditu."</string>
-    <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Baimendu beti <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> ostalariari widgetak sortzea eta euren datuak atzitzea"</string>
+    <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Baimendu beti <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> ostalariari widgetak sortzea eta horietako datuak atzitzea"</string>
     <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g> e <xliff:g id="HOURS">%2$d</xliff:g> h <xliff:g id="MINUTES">%3$d</xliff:g> m <xliff:g id="SECONDS">%4$d</xliff:g> s"</string>
     <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> m <xliff:g id="SECONDS">%3$d</xliff:g> s"</string>
     <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g> m <xliff:g id="SECONDS">%2$d</xliff:g> s"</string>
@@ -1495,11 +1499,11 @@
     <string name="accessibility_display_title" msgid="7610175687949675162">"Bistaratzea"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"Bideo-oinak"</string>
     <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Handiagotzeko keinuak"</string>
-    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Eginbidea gaituta dagoenean, pantaila hiru aldiz saka dezakezu handiagotzeko edo txikiagotzeko.\n\nHandiagotuta dagoen bitartean, ekintza hauek egin ditzakezu:\n"<ul><li>"Mugimendu panoramikoa: arrastatu hatz bat edo gehiago pantailan zehar."</li>\n<li>"Doitu zoom-maila: atximurkatu bi hatzarekin edo gehiagorekin edo banandu hatzak elkarrengandik."</li></ul>\n\n"Hatzaren azpian duzuna aldi baterako handiago dezakezu hiru aldiz sakatuta eta sakatuta edukita. Handiagotuta dagoela, pantailaren zati desberdinak arakatzeko, arrastatu hatza. Aurreko egoerara itzultzeko, jaso hatza.\n\nOharra: handiagotzeko, edonon saka dezakezu hiru aldiz, teklatuan eta nabigazio-barran izan ezik."</string>
+    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Eginbidea gaituta dagoenean, pantaila hiru aldiz saka dezakezu handiagotzeko edo txikiagotzeko.\n\nHandiagotuta dagoen bitartean, ekintza hauek egin ditzakezu:\n"<ul><li>"Mugimendu panoramikoa: arrastatu hatz bat edo gehiago pantailan zehar."</li>\n<li>"Doitu zoom-maila: atximurkatu bi hatzarekin edo gehiagorekin edo banandu hatzak elkarrengandik."</li></ul>\n\n"Hatzaren azpian duzuna aldi baterako handiago dezakezu hiru aldiz sakatuta eta sakatuta edukita. Handiagotuta dagoela, pantailaren zati desberdinak arakatzeko, arrastatu hatza. Aurreko egoerara itzultzeko, jaso hatza.\n\nOharra: handiagotzeko, edonon egin dezakezu klik hiru aldiz, teklatuan eta nabigazio-barran izan ezik."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Erabilerraztasunaren lasterbidea"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Aktibatuta"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Desaktibatuta"</string>
-    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Eginbidea aktibatuta dagoenean, bi urrats baino ez dituzu egin beharko erabilerraztasun-eginbideak gaitzeko:\n\n1. urratsa: eduki sakatuta etengailua soinu bat entzun edo dardara nabaritu arte.\n\n2. urratsa: eduki ukituta bi hatzekin audio-berrespena entzun arte.\n\nGailuak erabiltzaile bat baino gehiago badu, gailua desblokeatu arte gai daiteke erabilerraztasuna, pantaila blokeatuko lasterbidea erabilita."</string>
+    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Eginbidea aktibatuta dagoenean, bi urrats baino ez dituzu egin beharko erabilerraztasun-eginbideak gaitzeko:\n\n1. urratsa: eduki sakatuta etengailua soinu bat entzun edo dardara nabaritu arte.\n\n2. urratsa: eduki ukituta bi hatzekin audio-berrespena entzun arte.\n\nGailuak erabiltzaile bat baino gehiago badu, pantaila blokeatuko lasterbidea erabilita gai daiteke erabilerraztasuna, gailua desblokeatzen den arte."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Testu handia"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="2567402942683463779">"Kontraste handiko testua"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Pantaila-handiagotzea"</string>
@@ -1507,7 +1511,7 @@
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Eguneratu handiagotzea aplik. batetik bestera pasatzean."</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Deiak etengailuarekin amaitzen dira"</string>
     <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Esan pasahitzak"</string>
-    <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Ukitze-iraupena luzatzea"</string>
+    <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Luze ukitzearen atzerapena"</string>
     <string name="accessibility_display_inversion_preference_title" msgid="2119647786141420802">"Kolore-alderantzikatzea"</string>
     <string name="accessibility_display_inversion_preference_subtitle" msgid="8658240868230680912">"(Esperimentala) Eragina izan dezake funtzionamenduan"</string>
     <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"Kolore-zuzenketa"</string>
@@ -1600,7 +1604,7 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"Geratzen den denbora: <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"Kargatu arteko denbora: <xliff:g id="UNTIL_CHARGED">%1$s</xliff:g>"</string>
-    <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> inguru. <xliff:g id="TIME">%2$s</xliff:g> geratzen da"</string>
+    <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> inguru. <xliff:g id="TIME">%2$s</xliff:g> geratzen d(ir)a"</string>
     <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string>
     <string name="power_charging_duration" msgid="2853265177761520490">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> guztiz kargatu arte"</string>
     <string name="power_charging_duration_ac" msgid="3969186192576594254">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> korrontearen bidez guztiz kargatu arte"</string>
@@ -1745,7 +1749,7 @@
     <string name="tts_default_synth_title" msgid="4755558388333117572">"Motor lehenetsia"</string>
     <string name="tts_default_synth_summary" msgid="6482936537135251690">"Esandako testurako erabiliko den hizketaren sintesi-motorra ezartzen du."</string>
     <string name="tts_default_rate_title" msgid="6030550998379310088">"Hizketa-abiadura"</string>
-    <string name="tts_default_rate_summary" msgid="4061815292287182801">"Testua zer abiaduran esaten den."</string>
+    <string name="tts_default_rate_summary" msgid="4061815292287182801">"Testua zer abiaduran esaten den"</string>
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Tonua"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Esandako testuaren tonuari eragiten dio"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Hizkuntza"</string>
@@ -1845,7 +1849,7 @@
     <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Ez dago babeskopiak gordetzen dituen aplikaziorik"</string>
     <string name="include_app_data_title" msgid="2829970132260278394">"Sartu aplikazioen datuak"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Leheneratze automatikoa"</string>
-    <string name="auto_restore_summary" msgid="4235615056371993807">"Aplikazioak berriro instalatzean, leheneratu babeskopia egindako ezarpenak eta datuak"</string>
+    <string name="auto_restore_summary" msgid="4235615056371993807">"Aplikazioak berriro instalatzean, leheneratu babeskopia egindako ezarpenak eta datuak."</string>
     <string name="backup_inactive_title" msgid="5355557151569037197">"Babeskopia-zerbitzua ez dago aktibo."</string>
     <string name="backup_inactive_summary" msgid="7630412094703573180">"Gailu-gidalerroak ezartzen du hau."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Tokiko babeskop. pasahitza"</string>
@@ -1855,7 +1859,7 @@
     <string name="local_backup_password_toast_confirmation_mismatch" msgid="3495167398824569524">"Pasahitz berria eta berrespena ez datoz bat"</string>
     <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"Ezin izan da babeskopiaren pasahitza ezarri"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
-    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"Wi-Fi pasahitzen, laster-marken, bestelako ezarpenen eta aplikazio-datuen babeskopiak egiteari utzi eta Google zerbitzarietako kopia guztiak ezabatu nahi dituzu?"</string>
+    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"Wi-Fi pasahitzen, laster-marken, bestelako ezarpenen eta aplikazioetako datuen babeskopiak egiteari utzi eta Google zerbitzarietako kopia guztiak ezabatu nahi dituzu?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Gailuaren administrazio-ezarpenak"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Gailu-administratzailea"</string>
     <string name="remove_device_admin" msgid="3596845261596451437">"Desaktibatu"</string>
@@ -2239,7 +2243,7 @@
     <string name="global_font_change_title" msgid="1887126466191012035">"Aldatu letra-tipoaren tamaina"</string>
     <string name="nfc_payment_settings_title" msgid="1807298287380821613">"Sakatu eta ordaindu"</string>
     <string name="google_wallet" msgid="9122936252378589227">"Google Wallet"</string>
-    <string name="nfc_payment_no_apps" msgid="2481080809791416010">"Ordaindu ukitu bakar batekin."</string>
+    <string name="nfc_payment_no_apps" msgid="2481080809791416010">"Ordaindu ukitu bakar batez"</string>
     <string name="nfc_payment_favor_foreground" msgid="8881893980929835838">"Gogoko aurreko planoko aplikazioa"</string>
     <string name="nfc_payment_learn_more" msgid="5583407773744324447">"Lortu informazio gehiago"</string>
     <string name="nfc_more_title" msgid="815910943655133280">"Gehiago…"</string>
@@ -2332,7 +2336,8 @@
     <string name="sim_notification_title" msgid="6272913297433198340">"SIM txartelak aldatu egin dira."</string>
     <string name="sim_notification_summary" msgid="5024470200658902406">"Konfiguratzeko, ukitu hau"</string>
     <string name="sim_pref_divider" msgid="6778907671867621874">"Hauetarako SIM lehenetsia"</string>
-    <string name="sim_calls_ask_first_prefs_title" msgid="7328134172516945288">"Galdetu beti"</string>
+    <!-- no translation found for sim_calls_ask_first_prefs_title (7941299533514115976) -->
+    <skip />
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Zerbait hautatu behar da"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Ezarpenak"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Ezarpenak"</string>
@@ -2387,7 +2392,7 @@
     <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Ez eten"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Telefonoaren tonu-jotzailea"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Jakinarazpenen tonu lehenetsia"</string>
-    <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Bibratu deietan ere"</string>
+    <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Egin dar-dar deietan ere"</string>
     <string name="notification_section_header" msgid="95661783916799134">"Jakinarazpena"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Jakinarazpen-argi keinukaria"</string>
     <string name="lock_screen_notifications_title" msgid="9118805570775519455">"Gailua blokeatuta dagoenean"</string>
@@ -2430,7 +2435,7 @@
     <string name="app_notification_block_title" msgid="172237877395761371">"Blokeatu"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Ez erakutsi inoiz aplikazio honen jakinarazpenak"</string>
     <string name="app_notification_priority_title" msgid="1967189807102076587">"Lehentasuna"</string>
-    <string name="app_notification_priority_summary" msgid="7513344552201639232">"Erakutsi jakinarazpenak zerrendaren goiko aldean, eta jarraitu jakinarazpenak jasotzen gailuak lehentasunezko etenaldiak bakarrik ezarrita dituenean"</string>
+    <string name="app_notification_priority_summary" msgid="7513344552201639232">"Erakutsi jakinarazpenak zerrendaren goiko aldean, eta jarraitu jakinarazpenak jasotzen gailuak lehentasun-etenaldiak bakarrik ezarrita dituenean"</string>
     <string name="app_notification_sensitive_title" msgid="7707233094233553192">"Isilpekoa"</string>
     <string name="app_notification_sensitive_summary" msgid="2505314249332316395">"Gailua blokeatuta dagoenean, ezkutatu aplikazioaren jakinarazpenetako isilpeko edukia"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Blokeatuta"</string>
@@ -2456,7 +2461,7 @@
     <string name="zen_mode_from_contacts" msgid="8751503728985572786">"Kontaktuak soilik"</string>
     <string name="zen_mode_from_starred" msgid="2168651127340381533">"Kontaktu izardunak soilik"</string>
     <string name="zen_mode_events" msgid="2456995649835437565">"Gertaerak eta abisuak"</string>
-    <string name="zen_mode_alarm_info" msgid="3195430795475795398">"Alarmak lehentasunezko etenaldiak dira beti"</string>
+    <string name="zen_mode_alarm_info" msgid="3195430795475795398">"Alarmak lehentasun-etenaldiak dira beti"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Aktibatu automatikoki"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Inoiz ez"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Gauero"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 27e9989..7ebc9fb 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"اتصال قطع شود؟"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"‏این کار اتصال شما را با این دستگاه قطع می‌کند:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;."</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"اجازه ندارید تنظیمات بلوتوث را تغییر دهید."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"هنگام باز بودن تنظیمات بلوتوث، <xliff:g id="DEVICE_NAME">%1$s</xliff:g> برای دستگاه‌های اطراف قابل مشاهده است."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"هنگام باز بودن تنظیمات بلوتوث، <xliff:g id="DEVICE_NAME">%1$s</xliff:g> برای دستگاه‌های اطراف قابل مشاهده است."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"ارتباط <xliff:g id="DEVICE_NAME">%1$s</xliff:g> قطع شود؟"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"پخش"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"غیر فعال کردن نمایه؟"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"‏مدیریت Wi-Fi، بلوتوث، حالت هواپیما، شبکه‌های تلفن همراه، و VPN"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"داده‌های شبکه تلفن همراه"</string>
     <string name="calls_title" msgid="3544471959217176768">"تماس‌ها"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"پیامک‌ها"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"پیامک‌ها"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"اجازه مصرف داده‌ از طریق شبکه تلفن همراه"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"مصرف داده هنگام رومینگ مجاز است"</string>
     <string name="roaming" msgid="3596055926335478572">"رومینگ داده"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"امنیت متوسط به بالا"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"رمز ورود"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"امنیت بالا"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"قابلیت‌های محافظت دستگاه دیگر کار نمی‌کنند."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"توسط سرپرست، سیاست رمزگذاری یا حافظه اطلاعات کاربردی غیرفعال شده است"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"هیچکدام"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"تند کشیدن"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"حذف الگوی بازگشایی قفل"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"حذف پین بازگشایی قفل"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"حذف رمز ورود بازگشایی قفل"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"برداشتن قفل صفحه"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"تغییر الگوی بازگشایی قفل"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"تغییر پین بازگشایی قفل"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"تغییر رمز ورود بازگشایی قفل"</string>
@@ -860,6 +862,8 @@
     <string name="sim_multi_sims_summary" msgid="7018740080801483990">"سیم‌کارتی را که برای داده‌های شبکه تلفن همراه ترجیح می‌دهید، انتخاب کنید."</string>
     <string name="sim_change_data_title" msgid="294357201685244532">"سیم‌کارت داده همراه تغییر کند؟"</string>
     <string name="sim_change_data_message" msgid="1313940695939674633">"از <xliff:g id="NEW_SIM">%1$s</xliff:g> به جای <xliff:g id="OLD_SIM">%2$s</xliff:g> برای داده‌های شبکه همراه استفاده می‌کنید؟"</string>
+    <string name="sim_preferred_title" msgid="5567909634636045268">"سیم‌کارت ترجیجی به‌روز شود؟"</string>
+    <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> تنها سیم‌کارت روی دستگاه شماست. می‌خواهید از این سیم‌کارت برای داده‌های شبکه تلفن همراه، تماس‌ها و پیامک استفاده کنید؟"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"کد پین سیم کارت اشتباه است، اکنون برای گشودن قفل دستگاهتان باید با شرکت مخابراتی تماس بگیرید."</string>
   <plurals name="wrong_pin_code">
     <item quantity="one" msgid="4840607930166101114">"کد پین سیم کارت اشتباه است، <xliff:g id="NUMBER">%d</xliff:g> بار دیگر می‌توانید تلاش کنید و پس از آن برای گشودن قفل دستگاهتان باید با شرکت مخابراتی تماس بگیرید."</item>
@@ -2332,7 +2336,8 @@
     <string name="sim_notification_title" msgid="6272913297433198340">"سیم‌کارت‌ها تغییر یافتند."</string>
     <string name="sim_notification_summary" msgid="5024470200658902406">"برای تنظیم لمس کنید"</string>
     <string name="sim_pref_divider" msgid="6778907671867621874">"سیم‌کارت ترجیحی برای"</string>
-    <string name="sim_calls_ask_first_prefs_title" msgid="7328134172516945288">"هر بار پرسیده شود"</string>
+    <!-- no translation found for sim_calls_ask_first_prefs_title (7941299533514115976) -->
+    <skip />
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"انتخاب مورد نیاز است"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"تنظیمات"</string>
     <string name="search_results_title" msgid="1796252422574886932">"تنظیمات"</string>
diff --git a/res/values-fi/arrays.xml b/res/values-fi/arrays.xml
index 3d8a413..4e8ca41 100644
--- a/res/values-fi/arrays.xml
+++ b/res/values-fi/arrays.xml
@@ -246,7 +246,7 @@
     <item msgid="6546959730920410907">"muokkaa puhelulokia"</item>
     <item msgid="446877710771379667">"lue kalenteria"</item>
     <item msgid="7674458294386319722">"muokkaa kalenteria"</item>
-    <item msgid="8281201165558093009">"wifi-haku"</item>
+    <item msgid="8281201165558093009">"Wi-Fi-haku"</item>
     <item msgid="8694611243479480497">"ilmoitus"</item>
     <item msgid="7776439107987345446">"soluhaku"</item>
     <item msgid="514615766544675057">"soita numeroon"</item>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 2fb0abe..7b362f0 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Katkaistaanko yhteys?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Katkaisee yhteyden laitteeseen:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"Sinulla ei ole lupaa muuttaa Bluetooth-asetuksia."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> näkyy lähellä olevissa laitteissa, kun Bluetooth-asetukset on auki."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> näkyy lähellä olevissa laitteissa, kun Bluetooth-asetukset on auki."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Katkaistaanko yhteys laitteeseen <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Lähetys"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Poistetaanko profiili?"</string>
@@ -268,7 +268,7 @@
     <string name="activity_picker_label" msgid="6295660302548177109">"Valitse toiminto"</string>
     <string name="device_info_label" msgid="6551553813651711205">"Laitteen tiedot"</string>
     <string name="battery_info_label" msgid="4132685016148679403">"Akun tiedot"</string>
-    <string name="display_label" msgid="8074070940506840792">"Ruutu"</string>
+    <string name="display_label" msgid="8074070940506840792">"Näyttö"</string>
     <string name="phone_info_label" product="tablet" msgid="7820855350955963628">"Tablet-laitteen tiedot"</string>
     <string name="phone_info_label" product="default" msgid="2127552523124277664">"Puhelimen tiedot"</string>
     <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"USB-tallennustila"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Hallinnoi Wi-Fi- ja Bluetooth-yhteyksiä, lentokonetilaa ja mobiili- ja VPN-verkkoja"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Mobiilitiedonsiirto"</string>
     <string name="calls_title" msgid="3544471959217176768">"Puhelut"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"Tekstiviestit"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"Tekstiviestit"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"Salli tiedonsiirto matkapuh.verkossa"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Salli roaming-tiedonsiirto"</string>
     <string name="roaming" msgid="3596055926335478572">"Roaming-tiedonsiirto"</string>
@@ -331,15 +331,15 @@
     <string name="lock_after_timeout" msgid="4590337686681194648">"Lukitse automaattisesti"</string>
     <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> virransäästötilan jälkeen"</string>
     <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> virransäästötilan jälkeen, paitsi kun lukitusta pitää avattuna <xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g>"</string>
-    <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Näytä omistajan tiedot lukitusruudulla"</string>
+    <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Näytä omistajan tiedot lukitusnäytöllä"</string>
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Omistajan tiedot"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Käytä widgetejä"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Järjestelmänvalvojan käytöstä poistama"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
-    <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Kirjoita tekstiä näytettäväksi lukitusruudulla."</string>
-    <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Näytä käyttäjän tiedot lukitusruudulla"</string>
+    <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Kirjoita tekstiä näytettäväksi lukitusnäytöllä."</string>
+    <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Näytä käyttäjän tiedot lukitusnäytöllä"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Käyttäjätiedot"</string>
-    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Näytä profiilin tiedot lukitusruudulla"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Näytä profiilin tiedot lukitusnäytöllä"</string>
     <string name="profile_info_settings_title" msgid="3518603215935346604">"Profiilin tiedot"</string>
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Tilit"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Sijainti"</string>
@@ -358,8 +358,8 @@
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Salaa puhelin"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Lataa akku ja yritä uudelleen."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Yhdistä laturi ja yritä uudelleen."</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Ei ruudunlukitus-PIN-koodia tai -salasanaa"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Sinun täytyy asettaa lukitusruudun PIN-koodi tai salasana ennen kuin voit aloittaa salauksen."</string>
+    <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Ei näytönlukitus-PIN-koodia tai -salasanaa"</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Sinun on asetettava lukitusnäytön PIN-koodi tai salasana ennen salauksen aloittamista."</string>
     <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"Avaa laitteen lukitus piirtämällä lukituksenpoistokuvio."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Salataanko?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Salausta ei voi peruuttaa, ja jos keskeytät sen, menetät tietoja. Salaus kestää vähintään tunnin, ja sen aikana tablet-laite käynnistyy uudelleen useita kertoja."</string>
@@ -380,12 +380,12 @@
     <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="3775740783651700375">"Kirjoittamasi salasana on oikein, mutta tiedot ovat valitettavasti vioittuneet. \n\nTehdasasetukset on palautettava, jotta voit jatkaa tablet-laitteen käyttöä. Tehdasasetusten palautuksen jälkeen voit tehdä tablet-laitteen asetukset uudelleen ja palauttaa Google-tiliisi mahdollisesti varmuuskopioidut tiedot."</string>
     <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="6898436151871328007">"Kirjoittamasi salasana on oikein, mutta tiedot ovat valitettavasti vioittuneet. \n\nTehdasasetukset on palautettava, jotta voit jatkaa puhelimen käyttöä. Tehdasasetusten palautuksen jälkeen voit tehdä puhelimen asetukset uudelleen ja palauttaa Google-tiliisi mahdollisesti varmuuskopioidut tiedot."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Vaihda syöttötapaa"</string>
-    <string name="lock_settings_picker_title" msgid="1095755849152582712">"Valitse ruudunlukitus"</string>
+    <string name="lock_settings_picker_title" msgid="1095755849152582712">"Valitse näytön lukitus"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Valitse varalukko"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Ruudun lukitus"</string>
-    <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Vaihda ruudunlukitusta"</string>
+    <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Vaihda näytön lukitus"</string>
     <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Vaihda tai poista käytöstä kuvio-, PIN-koodi- tai salasanasuojaus"</string>
-    <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Valitse ruudunlukitustapa"</string>
+    <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Valitse näytönlukitustapa"</string>
     <string name="unlock_backup_info_summary" msgid="108524727803788172">"Kun Face Unlock ei näe kasvojasi, miten haluat poistaa lukituksen?"</string>
     <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"Ei mitään"</string>
     <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Keskitason tai korkea suojaus"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Salasana"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Korkea suojaus"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Laitteen suojausominaisuudet eivät toimi enää."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Ei käytössä (järj.valv/salauskäyt./tunnuks. hall.)"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Ei mitään"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Pyyhkäisy"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Poista lukituksenpoistokuvio"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Poista lukituksen poistoon käytettävä PIN-koodi"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Poista lukituksen poiston salasana"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"Poista ruudun lukitus"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Vaihda lukituksenpoistokuvio"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Muuta lukituksen poistoon tarvittava PIN-koodi"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Vaihda lukituksen poiston salasana"</string>
@@ -580,7 +582,7 @@
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Verkkopalveluhaku"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Anna muiden laitteiden sovelluksien löytää tämän laitteen sovelluksia"</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
-    <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Ota wifi käyttöön"</string>
+    <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Ota Wi-Fi käyttöön"</string>
     <string name="wifi_settings" msgid="29722149822540994">"Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="8719175790520448014">"Wi-Fi-asetukset"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
@@ -588,14 +590,14 @@
     <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Valitse Wi‑Fi-verkko"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Valitse Wi-Fi-verkko"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Wi-Fi-yhteyttä otetaan käyttöön…"</string>
-    <string name="wifi_stopping" msgid="8952524572499500804">"Poistetaan wifi-yhteyttä käytöstä…"</string>
+    <string name="wifi_stopping" msgid="8952524572499500804">"Poistetaan Wi-Fi-yhteyttä käytöstä…"</string>
     <string name="wifi_error" msgid="3207971103917128179">"Virhe"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"Lentokonetilassa"</string>
     <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Verkkoja ei voi etsiä."</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Verkkoilmoitus"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3716818008370391253">"Ilmoita käytettävissä olevista julkisista verkoista"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Vältä huonoja yhteyksiä"</string>
-    <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"Älä käytä wifi-verkkoa, jos sillä on huono internetyhteys"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"Älä käytä Wi-Fi-verkkoa, jos sillä on huono internetyhteys"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Käytä vain verkkoja, joiden yhteyslaatu on hyvä"</string>
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"Haku aina käytettävissä"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Salli verkkojen etsiminen"</string>
@@ -604,22 +606,22 @@
     <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Salli Wi‑Fi-apurin yhdistää automaattisesti korkealaatuisiksi määritettyihin avoimiin verkkoihin"</string>
     <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Valitse apuri"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Asenna varmenteet"</string>
-    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Voit mm. parantaa Googlen ja muiden sovellusten sijaintitietojen tarkkuutta antamalla luvan etsiä wifi-verkkoja myös silloin, kun wifi ei ole käytössä. Jos et halua sallia sitä, valitse Lisäasetukset &gt; Etsiminen aina käytössä."</string>
-    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Sovellukset voivat etsiä läheisiä verkkoja vaikka wifi ei olisi käytössä. Jos et halua sallia sitä, valitse Lisäasetukset &gt; Etsiminen aina käytössä."</string>
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Voit mm. parantaa Googlen ja muiden sovellusten sijaintitietojen tarkkuutta antamalla luvan etsiä Wi-Fi-verkkoja myös silloin, kun Wi-Fi ei ole käytössä. Jos et halua sallia sitä, valitse Lisäasetukset &gt; Etsiminen aina käytössä."</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Sovellukset voivat etsiä läheisiä verkkoja vaikka Wi-Fi ei olisi käytössä. Jos et halua sallia sitä, valitse Lisäasetukset &gt; Etsiminen aina käytössä."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Älä näytä uudelleen"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Pidä wifi käytössä virransäästötilassa"</string>
+    <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Pidä Wi-Fi käytössä virransäästötilassa"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Wi‑Fi virransäästön aikana"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Asetuksen vaihtaminen epäonnistui"</string>
     <string name="wifi_suspend_efficiency_title" msgid="2338325886934703895">"Tehosta"</string>
     <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Wi-Fi-optimointi"</string>
-    <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Vähennä akun kulutusta, kun wifi on käytössä"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Vähennä akun kulutusta, kun Wi-Fi on käytössä"</string>
     <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"Rajoita Wi‑Fin akun käyttöä"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Lisää verkko"</string>
     <string name="wifi_access_points" msgid="7053990007031968609">"Wi-Fi-verkot"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS-painike"</string>
     <string name="wifi_menu_more_options" msgid="2448097861752719396">"Lisää asetuksia"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS-PIN"</string>
-    <string name="wifi_menu_p2p" msgid="7619851399250896797">"Suora wifi-yhteys"</string>
+    <string name="wifi_menu_p2p" msgid="7619851399250896797">"Suora Wi-Fi-yhteys"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Etsi"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Lisäasetukset"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Yhdistä verkkoon"</string>
@@ -627,9 +629,9 @@
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Unohda verkko"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Muokkaa verkkoa"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Kirjoita uusi NFC-tagi"</string>
-    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Näet käyt. olevat verkot, kun otat wifin käyttöön."</string>
-    <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Haetaan wifi-verkkoja…"</string>
-    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Käyttöoikeutesi eivät riitä wifi-verkon muuttamiseen."</string>
+    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Näet käyt. olevat verkot, kun otat Wi-Fin käyttöön."</string>
+    <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Haetaan Wi-Fi-verkkoja…"</string>
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Käyttöoikeutesi eivät riitä Wi-Fi-verkon muuttamiseen."</string>
     <string name="wifi_other_network" msgid="1484433183857764750">"Lisää toinen verkko"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Lisää"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Automaattiset aset. (WPS)"</string>
@@ -638,9 +640,9 @@
     <string name="wifi_wps_setup_title" msgid="8207552222481570175">"Wi‑Fi Protected Setup -asetukset"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Käynnistetään WPS:ää..."</string>
     <string name="wifi_wps_onstart_pbc" msgid="5940801028985255304">"Paina reitittimen Wi-Fi Protected Setup -painiketta. Siinä voi lukea WPS tai näkyä seuraava symboli:"</string>
-    <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"Näppäile wifi-reitittimen pin-koodi <xliff:g id="NUMBER">%1$s</xliff:g>. Asennus voi kestää kaksi minuuttia."</string>
+    <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"Näppäile Wi-Fi-reitittimen pin-koodi <xliff:g id="NUMBER">%1$s</xliff:g>. Asennus voi kestää kaksi minuuttia."</string>
     <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS onnistui. Muodostetaan yhteyttä verkkoon..."</string>
-    <string name="wifi_wps_connected" msgid="7153432445748931183">"Yhdistetty wifi-verkkoon <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_connected" msgid="7153432445748931183">"Yhdistetty Wi-Fi-verkkoon <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_wps_in_progress" msgid="3372311348221357944">"WPS on jo käynnissä ja voi kestää kaksi minuuttia"</string>
     <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS epäonnistui. Yritä uudelleen muutaman minuutin kuluttua."</string>
     <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Langattoman reitittimen suojausasetusta (WEP) ei tueta."</string>
@@ -677,7 +679,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS käytettävissä)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Anna verkkosalasana"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Ei mitään"</string>
-    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"<xliff:g id="APP_NAME">%1$s</xliff:g> haluaa parantaa sijainnin tarkkuutta ja suorittaa muita toimintoja ottamalla verkon etsinnän käyttöön, vaikka wifi-yhteys ei ole käytössä.\n\nAnnetaanko tämä lupa kaikille sovelluksille, jotka haluavat etsiä verkkoja?"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"<xliff:g id="APP_NAME">%1$s</xliff:g> haluaa parantaa sijainnin tarkkuutta ja suorittaa muita toimintoja ottamalla verkon etsinnän käyttöön, vaikka Wi-Fi-yhteys ei ole käytössä.\n\nAnnetaanko tämä lupa kaikille sovelluksille, jotka haluavat etsiä verkkoja?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Poista asetus käytöstä ylivuotovalikon lisäasetuksista."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Salli"</string>
     <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Estä"</string>
@@ -699,9 +701,9 @@
     <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Jos et määritä Wi‑Fi-asetuksia:\n\nTabletillasi ei voi muodostaa internetyhteyttä.\n\nEt saa ohjelmistopäivityksiä ennen kuin muodostat internetyhteyden.\n\nEt voi ottaa laitteen suojausominaisuuksia käyttöön tällä hetkellä."</string>
     <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Jos et määritä Wi‑Fi-asetuksia:\n\nLaitteellasi ei voi muodostaa internetyhteyttä.\n\nEt saa ohjelmistopäivityksiä ennen kuin muodostat internetyhteyden.\n\nEt voi ottaa laitteen suojausominaisuuksia käyttöön tällä hetkellä."</string>
     <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Jos et määritä Wi‑Fi-asetuksia:\n\nPuhelimellasi ei voi muodostaa internetyhteyttä.\n\nEt saa ohjelmistopäivityksiä ennen kuin muodostat internetyhteyden.\n\nEt voi ottaa laitteen suojausominaisuuksia käyttöön tällä hetkellä."</string>
-    <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Tablet-laite ei voi muodostaa yhteyttä tähän wifi-verkkoon."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Tablet-laite ei voi muodostaa yhteyttä tähän Wi-Fi-verkkoon."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"Laite ei voinut muodostaa yhteyttä tähän Wi-Fi-verkkoon."</string>
-    <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Puhelin ei voi muodostaa yhteyttä tähän wifi-verkkoon."</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Puhelin ei voi muodostaa yhteyttä tähän Wi-Fi-verkkoon."</string>
     <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"Tallennetut verkot"</string>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Wi-Fi-lisäasetukset"</string>
     <string name="wifi_setting_frequency_band_title" msgid="3655327399028584656">"Wi-Fi-taajuusalue"</string>
@@ -721,7 +723,7 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Yhdyskäytävä"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Verkon etuliitteen pituus"</string>
-    <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"Suora wifi-yhteys"</string>
+    <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"Suora Wi-Fi-yhteys"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"Laitteen tiedot"</string>
     <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Muista tämä yhteys"</string>
     <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"Etsi laitteita"</string>
@@ -737,17 +739,17 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Peruutetaanko kutsu?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Haluatko peruuttaa laitteelle <xliff:g id="PEER_NAME">%1$s</xliff:g> lähetetyn yhteydenmuodostuskutsun?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Unohdetaanko tämä ryhmä?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Kannettava wifi-hotspot"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Kannettava Wi-Fi-hotspot"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi‑Fi-hotspot"</string>
     <string name="wifi_hotspot_checkbox_text_summary" msgid="3800646230853724318">"Hanki Wi‑Fi-verkko mobiiliyhteyden kautta"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Otetaan yhteyspiste käyttöön..."</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Poistetaan yhteyspiste käytöstä..."</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Kannettava yhteyspiste <xliff:g id="NETWORK_SSID">%1$s</xliff:g> käytössä"</string>
-    <string name="wifi_tether_failed_subtext" msgid="1484941858530919002">"Kannettavan wifi-hotspotin virhe"</string>
-    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Luo wifi-hotspot"</string>
+    <string name="wifi_tether_failed_subtext" msgid="1484941858530919002">"Kannettavan Wi-Fi-hotspotin virhe"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Luo Wi-Fi-hotspot"</string>
     <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"Wi‑Fi-hotspotin määritys"</string>
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5618031116920832182">"Kann. Wi‑Fi-hotspot (AndroidAP WPA2 PSK)"</string>
-    <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> kannettava wifi-hotspot"</string>
+    <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> kannettava Wi-Fi-hotspot"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="home_settings" msgid="212375129455718176">"Etusivu"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Näyttö"</string>
@@ -801,7 +803,7 @@
     <string name="category_work" msgid="8699184680584175622">"Työ"</string>
     <string name="search_settings" msgid="1910951467596035063">"Haku"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Hallinnoi hakuasetuksia ja historiaa"</string>
-    <string name="display_settings" msgid="7965901687241669598">"Ruutu"</string>
+    <string name="display_settings" msgid="7965901687241669598">"Näyttö"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Kierrä näyttöä automaattisesti"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Vaihda suuntaa automaattisesti, kun tablet-laitetta kierretään"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Vaihda suuntaa automaattisesti, kun puhelinta käännetään"</string>
@@ -860,6 +862,8 @@
     <string name="sim_multi_sims_summary" msgid="7018740080801483990">"Valitse SIM-kortti, jota haluat käyttää mobiilitiedonsiirtoon."</string>
     <string name="sim_change_data_title" msgid="294357201685244532">"Vaihdetaanko tied.siirto-SIM?"</string>
     <string name="sim_change_data_message" msgid="1313940695939674633">"Käytetäänkö mobiilitiedonsiirtoon korttia <xliff:g id="NEW_SIM">%1$s</xliff:g> kortin <xliff:g id="OLD_SIM">%2$s</xliff:g> sijaan?"</string>
+    <string name="sim_preferred_title" msgid="5567909634636045268">"Päivitä ensisij. SIM-kortti?"</string>
+    <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> on laitteesi ainoa SIM-kortti. Haluatko käyttää korttia tiedonsiirrolle, puheluille ja tekstiviesteille?"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"Virheellinen SIM-kortin PIN-koodi. Sinun on nyt otettava yhteys operaattoriin laitteen lukituksen avaamiseksi."</string>
   <plurals name="wrong_pin_code">
     <item quantity="one" msgid="4840607930166101114">"Virheellinen SIM-kortin PIN-koodi. Sinulla on <xliff:g id="NUMBER">%d</xliff:g> yritys jäljellä, ennen kuin sinun on otettava yhteys operaattoriin laitteen lukituksen avaamiseksi."</item>
@@ -882,7 +886,7 @@
     <string name="device_status" msgid="607405385799807324">"Tila"</string>
     <string name="device_status_summary" product="tablet" msgid="3292717754497039686">"Akun ja verkon tila ja muita tietoja"</string>
     <string name="device_status_summary" product="default" msgid="2599162787451519618">"Puhelinnumero, signaali jne."</string>
-    <string name="storage_settings" msgid="4211799979832404953">"Tallentaminen"</string>
+    <string name="storage_settings" msgid="4211799979832404953">"Tallennustila"</string>
     <string name="storage_settings_title" msgid="8746016738388094064">"Tallennusasetukset"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"Poista USB-tila käytöstä, katso käytettävissä oleva tallennustila"</string>
     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"Poista SD-kortti käytöstä, näytä käytettävissä oleva tallennustila"</string>
@@ -1103,7 +1107,7 @@
     <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Paikanna GPS:n avulla"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi‑Fi- ja mobiiliverkkosijainti"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Anna sovellusten arvioida sijaintisi Googlen sijaintipalvelulla. Anonyymejä sijaintitietoja kerätään ja lähetetään Googlelle."</string>
-    <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Sijainti on määritetty wifi-yhteyden perusteella"</string>
+    <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Sijainti on määritetty Wi-Fi-yhteyden perusteella"</string>
     <string name="location_gps" msgid="8392461023569708478">"GPS-satelliitit"</string>
     <string name="location_street_level" product="tablet" msgid="1669562198260860802">"Anna sovellusten määrittää sijaintisi tablet-laitteen GPS:n avulla"</string>
     <string name="location_street_level" product="default" msgid="4617445745492014203">"Anna sovellusten määrittää sijaintisi puhelimen GPS:n avulla"</string>
@@ -1215,7 +1219,7 @@
     <string name="always_allow_bind_appwidgets_text" msgid="3368654672141202604">"Olet antanut sovellukselle oikeuden luoda widgetejä ja käyttää niiden tietoja."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"Oletuksia ei asetettu."</string>
     <string name="clear_activities" msgid="7408923511535174430">"Tyhjennä oletukset"</string>
-    <string name="screen_compatibility_text" msgid="1616155457673106022">"Tätä sovellusta ei välttämättä ole suunniteltu ruudullesi sopivaksi. Voit muuttaa asetuksia täältä."</string>
+    <string name="screen_compatibility_text" msgid="1616155457673106022">"Tätä sovellusta ei välttämättä ole suunniteltu näytöllesi sopivaksi. Voit muuttaa asetuksia täältä."</string>
     <string name="ask_compatibility" msgid="7225195569089607846">"Kysy käynnistettäessä"</string>
     <string name="enable_compatibility" msgid="5806819252068617811">"Muuta sovelluksen kokoa"</string>
     <string name="unknown" msgid="1592123443519355854">"Tuntematon"</string>
@@ -1419,7 +1423,7 @@
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Näyttönäppäimistön asetukset"</string>
     <string name="builtin_keyboard_settings_title" msgid="7688732909551116798">"Fyysinen näppäimistö"</string>
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Fyysisen näppäimistön asetukset"</string>
-    <string name="development_settings_title" msgid="215179176067683667">"Kehittäjävaihtoehdot"</string>
+    <string name="development_settings_title" msgid="215179176067683667">"Kehittäjäasetukset"</string>
     <string name="development_settings_summary" msgid="1815795401632854041">"Valitse sovellusten kehittämisasetukset"</string>
     <string name="development_settings_not_available" msgid="4308569041701535607">"Tämä käyttäjä ei voi käyttää kehittäjäasetuksia"</string>
     <string name="vpn_settings_not_available" msgid="956841430176985598">"Tämä käyttäjä ei voi käyttää VPN-asetuksia"</string>
@@ -1495,11 +1499,11 @@
     <string name="accessibility_display_title" msgid="7610175687949675162">"Näyttö"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"Tekstitykset"</string>
     <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Suurennuseleet"</string>
-    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Kun tämä ominaisuus on käytössä, voit lähentää ja loitontaa kolmoisnapauttamalla ruutua.\n\nLähennetyssä tilassa voit\n"<ul><li>"panoroida vetämällä vähintään kahta sormea ruudun poikki"</li>\n<li>"säätää lähennyksen tasoa nipistämällä vähintään kaksi sormea yhteen tai levittämällä ne erilleen."</li></ul>\n\n"Voit myös suurentaa sormesi alla olevan kohteen väliaikaisesti kolmoisnapauttamalla ja pitämällä viimeisen napautuksen ruudulla. Suurennetussa tilassa voit tutkia ruudun eri osia sormella vetämällä. Nostamalla sormen pääset takaisin edelliseen tilaan.\n\nHuomaa: suurennus kolmoisnapauttamalla toimii kaikkialla paitsi näppäimistössä ja siirtymispalkissa."</string>
+    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Kun tämä ominaisuus on käytössä, voit lähentää ja loitontaa kolmoisnapauttamalla näyttöä.\n\nLähennetyssä tilassa voit\n"<ul><li>"panoroida vetämällä vähintään kahta sormea näytön poikki"</li>\n<li>"säätää lähennyksen tasoa nipistämällä vähintään kaksi sormea yhteen tai levittämällä ne erilleen."</li></ul>\n\n"Voit myös suurentaa sormesi alla olevan kohteen väliaikaisesti kolmoisnapauttamalla ja pitämällä viimeisen napautuksen näytöllä. Suurennetussa tilassa voit tutkia näytön eri osia sormella vetämällä. Nostamalla sormen pääset takaisin edelliseen tilaan.\n\nHuomaa: suurennus kolmoisnapauttamalla toimii kaikkialla paitsi näppäimistössä ja siirtymispalkissa."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Esteettömyystilan pikakuvake"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Käytössä"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Pois käytöstä"</string>
-    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Kun tämä ominaisuus on käytössä, voit ottaa esteettömyystoiminnot käyttöön nopeasti kahden vaiheen kautta.\n\nVaihe 1: paina virtapainiketta, kunnes kuulet äänen tai tunnet värinän.\n\nVaihe 2: kosketa kahdella sormella, kunnes kuulet äänivahvistuksen.\n\nJos laitteella on useita käyttäjiä, tämän pikanäppäimen käyttö lukitusruudussa ottaa esteettömyystilan käyttöön väliaikaisesti, kunnes laitteen lukitus poistetaan."</string>
+    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Kun tämä ominaisuus on käytössä, voit ottaa esteettömyystoiminnot käyttöön nopeasti kahden vaiheen kautta.\n\nVaihe 1: paina virtapainiketta, kunnes kuulet äänen tai tunnet värinän.\n\nVaihe 2: kosketa kahdella sormella, kunnes kuulet äänivahvistuksen.\n\nJos laitteella on useita käyttäjiä, tämän pikanäppäimen käyttö lukitusnäytössä ottaa esteettömyystilan käyttöön väliaikaisesti, kunnes laitteen lukitus poistetaan."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Suuri teksti"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="2567402942683463779">"Suurikontrastinen teksti"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Näytön suurennus"</string>
@@ -1568,7 +1572,7 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Ei asennettuja palveluita"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Ei kuvausta."</string>
     <string name="settings_button" msgid="3006713718908152930">"Asetukset"</string>
-    <string name="print_settings" msgid="4742428530112487843">"Tulostetaan"</string>
+    <string name="print_settings" msgid="4742428530112487843">"Tulostus"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Tulostuspalvelut"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"Otetaanko palvelu <xliff:g id="SERVICE">%1$s</xliff:g> käyttöön?"</string>
     <string name="print_service_security_warning_summary" msgid="7567131958613064363">"Asiakirja saattaa kulkea yhden tai useamman palvelimen kautta matkalla tulostimeen."</string>
@@ -1612,7 +1616,7 @@
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> akkuvirralla"</string>
     <string name="battery_stats_duration" msgid="7464501326709469282">"<xliff:g id="TIME">%1$s</xliff:g> laturin irrottamisen jälkeen"</string>
     <string name="battery_stats_charging_label" msgid="4223311142875178785">"Ladataan"</string>
-    <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"Ruutu käytössä"</string>
+    <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"Näyttö päällä"</string>
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS käytössä"</string>
     <string name="battery_stats_wifi_running_label" msgid="1845839195549226252">"Wi-Fi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Käytössä"</string>
@@ -1627,7 +1631,7 @@
     <string name="details_subtitle" msgid="32593908269911734">"Käyttötiedot"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Säädä virrankäyttöä"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Sisältyvät paketit"</string>
-    <string name="power_screen" msgid="3023346080675904613">"Ruutu"</string>
+    <string name="power_screen" msgid="3023346080675904613">"Näyttö"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Taskulamppu"</string>
     <string name="power_wifi" msgid="1135085252964054957">"Wi-Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
@@ -1647,8 +1651,8 @@
     <string name="usage_type_data_send" msgid="8971710128438365919">"Lähetetyt mobiilipaketit"</string>
     <string name="usage_type_data_recv" msgid="5468564329333954445">"Vastaanotetut mobiilipaketit"</string>
     <string name="usage_type_radio_active" msgid="1732647857619420121">"Mobiiliradio aktiivinen"</string>
-    <string name="usage_type_data_wifi_send" msgid="1847552143597396162">"Lähetetyt wifi-paketit"</string>
-    <string name="usage_type_data_wifi_recv" msgid="5678475911549183829">"Vastaanotetut wifi-paketit"</string>
+    <string name="usage_type_data_wifi_send" msgid="1847552143597396162">"Lähetetyt Wi-Fi-paketit"</string>
+    <string name="usage_type_data_wifi_recv" msgid="5678475911549183829">"Vastaanotetut Wi-Fi-paketit"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Ääni"</string>
     <string name="usage_type_video" msgid="4295357792078579944">"Video"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Käytössäoloaika"</string>
@@ -1671,7 +1675,7 @@
     <string name="battery_desc_display" msgid="5432795282958076557">"Näytön ja taustavalon käyttämä akku"</string>
     <string name="battery_sugg_display" msgid="3370202402045141760">"Vähennä näytön kirkkautta ja/tai näytön sammumista"</string>
     <string name="battery_desc_wifi" msgid="2375567464707394131">"Wi-Fi-yhteyden käyttämä akku"</string>
-    <string name="battery_sugg_wifi" msgid="3355461362094706957">"Poista wifi käytöstä, kun sitä ei käytetä tai kun yhteys ei ole käytettävissä"</string>
+    <string name="battery_sugg_wifi" msgid="3355461362094706957">"Poista Wi-Fi käytöstä, kun sitä ei käytetä tai kun yhteys ei ole käytettävissä"</string>
     <string name="battery_desc_bluetooth" msgid="8069070756186680367">"Bluetooth-yhteyden käyttämä akun virta"</string>
     <string name="battery_sugg_bluetooth_basic" msgid="1942935021750897422">"Poista Bluetooth-yhteys käytöstä, kun et käytä sitä."</string>
     <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"Yritä yhdistää eri Bluetooth-laitteeseen."</string>
@@ -1786,7 +1790,7 @@
     <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Ensisijainen moottori"</string>
     <string name="tts_general_section_title" msgid="4402572014604490502">"Yleiset"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Virranhallinta"</string>
-    <string name="gadget_toggle_wifi" msgid="319262861956544493">"Päivitetään wifi-asetuksia"</string>
+    <string name="gadget_toggle_wifi" msgid="319262861956544493">"Päivitetään Wi-Fi-asetuksia"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Päivitetään Bluetooth-asetuksia"</string>
     <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="gadget_state_on" msgid="6909119593004937688">"käytössä"</string>
@@ -1840,7 +1844,7 @@
     <string name="backup_section_title" msgid="7952232291452882740">"Varmuuskopiointi &amp; palautus"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Henkilötiedot"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Varmuuskopioi tiedot"</string>
-    <string name="backup_data_summary" msgid="708773323451655666">"Varmuuskopioi sovelluksen tiedot, wifi-salasanat ja muut asetukset Googlen palvelimille"</string>
+    <string name="backup_data_summary" msgid="708773323451655666">"Varmuuskopioi sovelluksen tiedot, Wi-Fi-salasanat ja muut asetukset Googlen palvelimille"</string>
     <string name="backup_configure_account_title" msgid="3790872965773196615">"Varmuuskopiotili"</string>
     <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Mikään tili ei tällä hetkellä tallenna varmuuskopioituja tietoja"</string>
     <string name="include_app_data_title" msgid="2829970132260278394">"Sisällytä sovellustiedot"</string>
@@ -1855,7 +1859,7 @@
     <string name="local_backup_password_toast_confirmation_mismatch" msgid="3495167398824569524">"Uusi salasana ja vahvistus eivät täsmää"</string>
     <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"Varasalasanan asetus epäonnistui"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
-    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"Haluatko lopettaa wifi-salasanojen, kirjanmerkkien, muiden asetuksien ja sovellustietojen varmuuskopioinnin ja poistaa kaikki kopiot Googlen palvelimilta?"</string>
+    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"Haluatko lopettaa Wi-Fi-salasanojen, kirjanmerkkien, muiden asetuksien ja sovellustietojen varmuuskopioinnin ja poistaa kaikki kopiot Googlen palvelimilta?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Laitteen järjestelmänvalvoja-asetukset"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Laitteen järjestelmänvalvoja"</string>
     <string name="remove_device_admin" msgid="3596845261596451437">"Poista käytöstä"</string>
@@ -1878,9 +1882,9 @@
     <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Soittoääni ja värinä"</string>
     <string name="sound_category_system_title" msgid="1480844520622721141">"Järjestelmä"</string>
     <string name="wifi_setup_title" msgid="2970260757780025029">"Wi-Fi-asetukset"</string>
-    <string name="wifi_setup_title_editing_network" msgid="6020614644556717979">"Yhdistä wifi-verkkoon <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
-    <string name="wifi_setup_title_connecting_network" msgid="5572226790101017822">"Yhdistetään wifi-verkkoon <xliff:g id="NETWORK_NAME">%s</xliff:g>…"</string>
-    <string name="wifi_setup_title_connected_network" msgid="1608788657122010919">"Yhdistetty wifi-verkkoon <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_editing_network" msgid="6020614644556717979">"Yhdistä Wi-Fi-verkkoon <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_connecting_network" msgid="5572226790101017822">"Yhdistetään Wi-Fi-verkkoon <xliff:g id="NETWORK_NAME">%s</xliff:g>…"</string>
+    <string name="wifi_setup_title_connected_network" msgid="1608788657122010919">"Yhdistetty Wi-Fi-verkkoon <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"Lisää verkko"</string>
     <string name="wifi_setup_not_connected" msgid="6997432604664057052">"Ei yhdistetty"</string>
     <string name="wifi_setup_add_network" msgid="5939624680150051807">"Lisää verkko"</string>
@@ -1902,9 +1906,9 @@
     <string name="wifi_setup_status_connecting" msgid="4971421484401530740">"Yhdistetään…"</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="6708250000342940031">"Siirry seuraavaan vaiheeseen"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"EAP ei ole tuettu."</string>
-    <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"Et voi määrittää EAP wifi -yhteyttä asennuksen aikana. Voit määrittää yhteyden asennuksen jälkeen kohdassa Asetukset &gt; Langaton verkko ja verkot."</string>
+    <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"Et voi määrittää EAP Wi-Fi -yhteyttä asennuksen aikana. Voit määrittää yhteyden asennuksen jälkeen kohdassa Asetukset &gt; Langaton verkko ja verkot."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"Yhteyden muodostaminen voi kestää muutaman minuutin..."</string>
-    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Jatka asetuksien määrittämistä koskettamalla "<b>"Seuraava"</b>".\n\nMuodosta yhteys eri wifi-verkkoon koskettamalla "<b>"Takaisin"</b>"."</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Jatka asetuksien määrittämistä koskettamalla "<b>"Seuraava"</b>".\n\nMuodosta yhteys eri Wi-Fi-verkkoon koskettamalla "<b>"Takaisin"</b>"."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Synkronointi käytössä"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Synkronointi pois käytöstä"</string>
     <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"Synkronoidaan nyt"</string>
@@ -1985,7 +1989,7 @@
     <string name="strict_mode" msgid="1938795874357830695">"Tiukka tila käytössä"</string>
     <string name="strict_mode_summary" msgid="142834318897332338">"Vilkuta näyttöä sovellusten tehdessä pitkiä toimia"</string>
     <string name="pointer_location" msgid="6084434787496938001">"Osoittimen sijainti"</string>
-    <string name="pointer_location_summary" msgid="840819275172753713">"Ruudun peittokuva näyttää nykyiset kosketustiedot"</string>
+    <string name="pointer_location_summary" msgid="840819275172753713">"Näytön peittokuva näyttää nykyiset kosketustiedot"</string>
     <string name="show_touches" msgid="1356420386500834339">"Näytä kosketukset"</string>
     <string name="show_touches_summary" msgid="6684407913145150041">"Näytä kosketukset visuaalisesti"</string>
     <string name="show_screen_updates" msgid="5470814345876056420">"Näytä pintapäivitykset"</string>
@@ -1996,7 +2000,7 @@
     <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Näytä laitteistotasot vihreinä niiden päivittyessä"</string>
     <string name="debug_hw_overdraw" msgid="2968692419951565417">"GPU-objektien päällekkäisyys"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Poista HW-peittok. käyt."</string>
-    <string name="disable_overlays_summary" msgid="3578941133710758592">"Käytä GPU:ta ruudun koostamiseen"</string>
+    <string name="disable_overlays_summary" msgid="3578941133710758592">"Käytä GPU:ta näytön koostamiseen"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"Simuloi väriavaruus"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Ota OpenGL-jälj. käyttöön"</string>
     <string name="use_awesomeplayer" msgid="1583337008516364226">"Käytä AwesomePlayeria (vanh.)"</string>
@@ -2025,7 +2029,7 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"Taustapros. enintään"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Näytä kaikki ANR:t"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Näytä Sovellus ei vastaa -ikkuna taustasovell."</string>
-    <string name="data_usage_summary_title" msgid="3804110657238092929">"Tietojen käyttö"</string>
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"Datan käyttö"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Sovelluksen tiedonsiirto"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Operaattorin mittaustulos saattaa erota laitteesi mittaamasta."</string>
     <string name="data_usage_app" msgid="4970478397515423303">"Sovellusten käyttötiedot"</string>
@@ -2059,7 +2063,7 @@
     <string name="data_usage_disable_mobile_limit" msgid="3934211003105066167">"Aseta mob.tiedonsiirtoraja"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"Aseta 4G-tiedonsiirtoraja"</string>
     <string name="data_usage_disable_3g_limit" msgid="2558557840444266906">"Aseta 2G-3G-tiedonsiirtoraja"</string>
-    <string name="data_usage_disable_wifi_limit" msgid="1394901415264660888">"Aseta wifi-tiedons.raja"</string>
+    <string name="data_usage_disable_wifi_limit" msgid="1394901415264660888">"Aseta Wi-Fi-tiedons.raja"</string>
     <string name="data_usage_tab_wifi" msgid="481146038146585749">"Wi-Fi"</string>
     <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"Ethernet"</string>
     <string name="data_usage_tab_mobile" msgid="2084466270343460491">"Mobiili"</string>
@@ -2176,7 +2180,7 @@
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Lisää käyttäjä tai profiili"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Lisää käyttäjä"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Rajoitettu profiili"</string>
-    <string name="user_need_lock_message" msgid="2596365678651842785">"Ennen kuin voit luoda rajoitetun profiilin, määritä ruudun lukitus, joka suojelee sovelluksiasi ja henkilökohtaisia tietojasi."</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"Ennen kuin voit luoda rajoitetun profiilin, määritä näytön lukitus, joka suojelee sovelluksiasi ja henkilökohtaisia tietojasi."</string>
     <string name="user_set_lock_button" msgid="8311219392856626841">"Aseta lukitus"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Ei määritetty"</string>
     <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"Asetuksia ei ole määritetty – rajoitettu profiili"</string>
@@ -2232,7 +2236,7 @@
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Rajoitetut sovellukset"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Laajenna sovelluksen asetuksia"</string>
     <string name="home_app_uninstall_button" msgid="6808453012607962899">"Poista tämä sovellus"</string>
-    <string name="only_one_home_message" msgid="3538846733750242759">"Aloitusruudun asetukset piilotetaan, kunnes asennat toisen aloitusruutusovelluksen."</string>
+    <string name="only_one_home_message" msgid="3538846733750242759">"Aloitusnäytön asetukset piilotetaan, kunnes asennat toisen aloitusnäyttösovelluksen."</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Tämä asetus vaikuttaa kaikkiin tämän tablet-laitteen käyttäjiin."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Tämä asetus vaikuttaa kaikkiin tämän puhelimen käyttäjiin."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Vaihda kieltä"</string>
@@ -2281,7 +2285,7 @@
     <string name="app_not_supported_in_limited" msgid="913035259626149121">"Tätä sovellusta ei tueta rajoitetuissa profiileissa"</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Tämä sovellus saa käyttää tilejäsi"</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Wi-Fi- ja mobiiliverkko"</string>
-    <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Salli wifi- ja mobiiliverkkoasetuksien muokkaaminen"</string>
+    <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Salli Wi-Fi- ja mobiiliverkkoasetuksien muokkaaminen"</string>
     <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"Bluetooth"</string>
     <string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"Salli Bluetooth-parien ja -asetuksien muokkaaminen"</string>
     <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"NFC"</string>
@@ -2332,7 +2336,8 @@
     <string name="sim_notification_title" msgid="6272913297433198340">"SIM-kortteja on muutettu."</string>
     <string name="sim_notification_summary" msgid="5024470200658902406">"Määritä asetukset koskettamalla"</string>
     <string name="sim_pref_divider" msgid="6778907671867621874">"Ensisijainen SIM-kortti seuraaville toiminnoille:"</string>
-    <string name="sim_calls_ask_first_prefs_title" msgid="7328134172516945288">"Kysy aina"</string>
+    <!-- no translation found for sim_calls_ask_first_prefs_title (7941299533514115976) -->
+    <skip />
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Valinta on pakollinen"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Asetukset"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Asetukset"</string>
@@ -2340,7 +2345,7 @@
     <string name="query_hint_text" msgid="3350700807437473939">"Hakuasetukset"</string>
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Viimeisimmät haut"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Tulokset"</string>
-    <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi verkko yhteys"</string>
+    <string name="keywords_wifi" msgid="8947676711698613374">"Wi-Fi wi-fi verkko yhteys"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"tekstiviesti tekstiviestien lähetys viestit viestien lähetys"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"matkapuhelin kännykkä operaattori langaton tiedonsiirto 4g 3g 2g lte"</string>
     <string name="keywords_home" msgid="3626170808219458848">"käynnistysohjelma"</string>
@@ -2411,8 +2416,8 @@
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Pääsy ilmoituksiin"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Sovellukset eivät voi lukea ilmoituksia"</string>
   <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"Sovellus %d voi lukea ilmoituksia"</item>
-    <item quantity="other" msgid="980049191810249052">"Sovellukset %d voivat lukea ilmoituksia"</item>
+    <item quantity="one" msgid="8344183614159211585">"%d sovellus voi lukea ilmoituksia"</item>
+    <item quantity="other" msgid="980049191810249052">"%d sovellusta voi lukea ilmoituksia"</item>
   </plurals>
     <string name="no_notification_listeners" msgid="2767405417723149879">"Ilmoituskuuntelijoita ei ole asennettu."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Otetaanko <xliff:g id="SERVICE">%1$s</xliff:g> käyttöön?"</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index c6ae7c5..bcb7372 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Voulez-vous vraiment vous déconnecter?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Cette opération va mettre fin à votre connexion avec :&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"Vous n\'êtes pas autorisé à modifier les paramètres Bluetooth."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> est visible aux app prox. si param. Bluetooth ouverts"</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> est visible dans les appareils à proximité si les paramètres Bluetooth sont ouverts."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Déconnecter <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Diffusion"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Désactiver le profil?"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Gérer le Wi‑Fi, le Bluetooth, le mode Avion, les réseaux cellulaires et les RPV"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Données cellulaires"</string>
     <string name="calls_title" msgid="3544471959217176768">"Appels"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"Messages texte"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"Messages texte"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"Autoriser l\'utilisation des données sur le réseau cellulaire"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Autor. util. données en itin."</string>
     <string name="roaming" msgid="3596055926335478572">"Itinérance des données"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Sécurité moyenne à élevée"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Mot de passe"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Sécurité élevée"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Les fonctions de protection de l\'appareil ne fonctionneront plus."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Désactivé par admin., règles chiffrement ou stockage des identifiants"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Aucun"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Balayer l\'écran"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Supprimer le schéma de déverrouillage"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Supprimer le NIP de déverrouillage"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Supprimer le mot de passe de déverrouillage"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"Retirer le verrouillage de l\'écran"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Modifier le schéma"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Modifier le NIP de déverrouillage"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Modifier le mot de passe de déverrouillage"</string>
@@ -860,6 +862,10 @@
     <string name="sim_multi_sims_summary" msgid="7018740080801483990">"Sélectionnez la carte SIM que vous préférez pour les données cellulaires."</string>
     <string name="sim_change_data_title" msgid="294357201685244532">"Changer de SIM pour les données?"</string>
     <string name="sim_change_data_message" msgid="1313940695939674633">"Utiliser <xliff:g id="NEW_SIM">%1$s</xliff:g> au lieu de <xliff:g id="OLD_SIM">%2$s</xliff:g> pour les données cellulaires?"</string>
+    <!-- no translation found for sim_preferred_title (5567909634636045268) -->
+    <skip />
+    <!-- no translation found for sim_preferred_message (301251431163650167) -->
+    <skip />
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"NIP de carte SIM incorrect. Vous devez maintenant communiquer avec votre fournisseur de services pour déverrouiller votre appareil."</string>
   <plurals name="wrong_pin_code">
     <item quantity="one" msgid="4840607930166101114">"NIP de carte SIM incorrect. Il vous reste <xliff:g id="NUMBER">%d</xliff:g> tentative. Après cela, vous devrez communiquer avec votre fournisseur de services pour déverrouiller votre appareil."</item>
@@ -2332,7 +2338,8 @@
     <string name="sim_notification_title" msgid="6272913297433198340">"Les cartes SIM ont été changées."</string>
     <string name="sim_notification_summary" msgid="5024470200658902406">"Touchez pour configurer"</string>
     <string name="sim_pref_divider" msgid="6778907671867621874">"Carte SIM préférée pour"</string>
-    <string name="sim_calls_ask_first_prefs_title" msgid="7328134172516945288">"Toujours demander"</string>
+    <!-- no translation found for sim_calls_ask_first_prefs_title (7941299533514115976) -->
+    <skip />
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Veuillez indiquer votre préférence"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Paramètres"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Paramètres"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 5fa57b6..3990e03 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Déconnecter ?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Cela va mettre fin à votre connexion avec :&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"Vous n\'êtes pas autorisé à modifier les paramètres Bluetooth."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" est visible par les appareils à proximité avec le Bluetooth activé."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> est visible par les appareils à proximité avec le Bluetooth activé."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Déconnecter l\'appareil \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" ?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Diffusion"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Désactiver le profil ?"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Gérer le Wi‑Fi, le Bluetooth, le mode Avion, les réseaux mobiles et les VPN"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Données mobiles"</string>
     <string name="calls_title" msgid="3544471959217176768">"Appels"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"SMS"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"SMS"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"Autoriser conso données sur réseau mobile"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Autor. conso données en itinér."</string>
     <string name="roaming" msgid="3596055926335478572">"Itinérance des données"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Sécurité moyenne à élevée"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Mot de passe"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Sécurité élevée"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Les fonctionnalités de protection de l\'appareil ne fonctionneront plus."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Désactivé par admin., règles chiffrement ou stockage des identifiants"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Aucun"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Balayer l\'écran"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Supprimer le schéma de déverrouillage"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Supprimer le code PIN de déverrouillage"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Supprimer le mot de passe de déverrouillage"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"Supprimer le verrouillage de l\'écran"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Modifier le schéma de déverrouillage"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Modifier le code PIN de déverrouillage"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Modifier le mot de passe de déverrouillage"</string>
@@ -860,6 +862,10 @@
     <string name="sim_multi_sims_summary" msgid="7018740080801483990">"Sélectionnez la carte SIM que vous préférez pour les données mobiles."</string>
     <string name="sim_change_data_title" msgid="294357201685244532">"Modifier SIM pour données ?"</string>
     <string name="sim_change_data_message" msgid="1313940695939674633">"Utiliser \"<xliff:g id="NEW_SIM">%1$s</xliff:g>\" au lieu de \"<xliff:g id="OLD_SIM">%2$s</xliff:g>\" pour les données cellulaires ?"</string>
+    <!-- no translation found for sim_preferred_title (5567909634636045268) -->
+    <skip />
+    <!-- no translation found for sim_preferred_message (301251431163650167) -->
+    <skip />
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"Code PIN de la carte SIM incorrect. Vous devez désormais contacter votre opérateur pour déverrouiller votre appareil."</string>
   <plurals name="wrong_pin_code">
     <item quantity="one" msgid="4840607930166101114">"Code PIN de la carte SIM incorrect. Il vous reste <xliff:g id="NUMBER">%d</xliff:g> tentative. Après cela, vous devrez contacter votre opérateur pour déverrouiller votre appareil."</item>
@@ -2332,7 +2338,8 @@
     <string name="sim_notification_title" msgid="6272913297433198340">"Cartes SIM modifiées"</string>
     <string name="sim_notification_summary" msgid="5024470200658902406">"Appuyez pour procéder à la configuration."</string>
     <string name="sim_pref_divider" msgid="6778907671867621874">"Carte SIM préférée pour"</string>
-    <string name="sim_calls_ask_first_prefs_title" msgid="7328134172516945288">"Toujours demander"</string>
+    <!-- no translation found for sim_calls_ask_first_prefs_title (7941299533514115976) -->
+    <skip />
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Veuillez sélectionner une option."</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Paramètres"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Paramètres"</string>
diff --git a/res/values-gl-rES/strings.xml b/res/values-gl-rES/strings.xml
index b0f6f6b..40e68f0 100644
--- a/res/values-gl-rES/strings.xml
+++ b/res/values-gl-rES/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Desconectar?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Isto finalizará a túa conexión con:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"Non tes permiso para cambiar a configuración de Bluetooth."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> será visible para dispositivos próximos coa configuración de Bluetooth activada."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> será visible para dispositivos próximos coa configuración de Bluetooth activada."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Queres desconectar <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Difusión"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Desactivar o perfil?"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Xestiona a wifi, o Bluetooth, o modo avión, redes de telefonía móbil e VPN"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Datos móbiles"</string>
     <string name="calls_title" msgid="3544471959217176768">"Chamadas"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"Mensaxes SMS"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"Mensaxes SMS"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"Permitir o uso de datos na rede móbil"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Permitir datos en itinerancia"</string>
     <string name="roaming" msgid="3596055926335478572">"Itinerancia de datos"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Seguridade de media a alta"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Contrasinal"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Alta seguridade"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"As funcións de protección do dispositivo deixarán de funcionar."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Desactivado por admin, política encriptación ou almacenamento credenciais"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Ningunha"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Pasar o dedo"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Elimina o padrón de desbloqueo"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Elimina o PIN de desbloqueo"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Elimina o contrasinal de desbloqueo"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"Eliminar bloqueo da pantalla"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Mudar padrón desbloq."</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Cambiar PIN desbloq."</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Mudar contrasinal desbloq."</string>
@@ -860,6 +862,8 @@
     <string name="sim_multi_sims_summary" msgid="7018740080801483990">"Selecciona a SIM que prefiras para os datos móbiles."</string>
     <string name="sim_change_data_title" msgid="294357201685244532">"Queres cambiar a SIM de datos?"</string>
     <string name="sim_change_data_message" msgid="1313940695939674633">"Queres utilizar <xliff:g id="NEW_SIM">%1$s</xliff:g> en lugar de <xliff:g id="OLD_SIM">%2$s</xliff:g> para os datos móbiles?"</string>
+    <string name="sim_preferred_title" msgid="5567909634636045268">"Actualizar a SIM preferida?"</string>
+    <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> é a única tarxeta SIM do dispositivo. Queres utilizar esta tarxeta SIM para datos móbiles, chamadas e mensaxes SMS?"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"Código PIN da SIM incorrecto. Agora debes contactar co operador para desbloquear o dispositivo."</string>
   <plurals name="wrong_pin_code">
     <item quantity="one" msgid="4840607930166101114">"Código PIN da SIM incorrecto. Quédanche <xliff:g id="NUMBER">%d</xliff:g> intentos antes de que teñas que contactar co operador para desbloquear o dispositivo."</item>
@@ -2332,7 +2336,8 @@
     <string name="sim_notification_title" msgid="6272913297433198340">"Cambiáronse as tarxetas SIM."</string>
     <string name="sim_notification_summary" msgid="5024470200658902406">"Toca para configurar"</string>
     <string name="sim_pref_divider" msgid="6778907671867621874">"SIM preferida para"</string>
-    <string name="sim_calls_ask_first_prefs_title" msgid="7328134172516945288">"Preguntar sempre"</string>
+    <!-- no translation found for sim_calls_ask_first_prefs_title (7941299533514115976) -->
+    <skip />
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"É necesario seleccionar unha opción"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Configuración"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Configuración"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index f1a2f11..661421c 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"डिस्‍कनेक्‍ट करें?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"इससे &lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt; के साथ आपका कनेक्‍शन समाप्त हो जाएगा"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"आपको ब्लूटूथ सेटिंग में बदलाव करने की अनुमति नहीं है."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"ब्लूटूथ सेटिंग खुली हो तो <xliff:g id="DEVICE_NAME">%1$s</xliff:g> पास के डिवाइस में दिखता है."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"ब्लूटूथ सेटिंग खुली होने पर <xliff:g id="DEVICE_NAME">%1$s</xliff:g> आस-पास के डिवाइसों को दिखाई देता है."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> को डिस्कनेक्ट करें?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"प्रसारण"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"प्रोफ़ाइल अक्षम करें?"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"वाई-फ़ाई, ब्लूटूथ, हवाई जहाज़ मोड, सेल्युलर नेटवर्क और VPN प्रबंधित करें"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"सेल्युलर डेटा"</string>
     <string name="calls_title" msgid="3544471959217176768">"कॉल"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"SMS संदेश"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"SMS संदेश"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"सेल्युलर नेटवर्क पर डेटा उपयोग करने दें"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"रोमिंग में डेटा उपयोग करने दें"</string>
     <string name="roaming" msgid="3596055926335478572">"डेटा रोमिंग"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"मध्‍यम से उच्‍च सुरक्षा"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"पासवर्ड"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"उच्च सुरक्षा"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"डिवाइस सुरक्षा सुविधाएं अब काम नहीं करेंगी."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"व्यवस्‍थापक, एन्‍क्रिप्शन नीति, या प्रमाणिकता मेमोरी द्वारा अक्षम किया गया"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"कोई नहीं"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"स्वाइप करें"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"अनलॉक आकार निकालें"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"अनलॉक पिन निकालें"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"अनलॉक पासवर्ड निकालें"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"स्क्रीन लॉक निकालें"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"अनलॉक आकार बदलें"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"अनलॉक पिन बदलें"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"अनलॉक पासवर्ड बदलें"</string>
@@ -860,6 +862,10 @@
     <string name="sim_multi_sims_summary" msgid="7018740080801483990">"सेल्युलर डेटा के लिए अपनी पसंदीदा सिम चुनें."</string>
     <string name="sim_change_data_title" msgid="294357201685244532">"डेटा सिम बदलें?"</string>
     <string name="sim_change_data_message" msgid="1313940695939674633">"सेल्युलर डेटा के लिए <xliff:g id="OLD_SIM">%2$s</xliff:g> के बजाय <xliff:g id="NEW_SIM">%1$s</xliff:g> का उपयोग करें?"</string>
+    <!-- no translation found for sim_preferred_title (5567909634636045268) -->
+    <skip />
+    <!-- no translation found for sim_preferred_message (301251431163650167) -->
+    <skip />
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"गलत सिम पिन कोड अपने डिवाइस को अनलॉक करने के लिए अब आपको अपने वाहक से संपर्क करना होगा."</string>
   <plurals name="wrong_pin_code">
     <item quantity="one" msgid="4840607930166101114">"गलत सिम पिन कोड, अपने डिवाइस को अनलॉक करने के लिए अपने वाहक से संपर्क करने से पहले आपके पास <xliff:g id="NUMBER">%d</xliff:g> प्रयास शेष है."</item>
@@ -2332,7 +2338,8 @@
     <string name="sim_notification_title" msgid="6272913297433198340">"SIM कार्ड बदला गया."</string>
     <string name="sim_notification_summary" msgid="5024470200658902406">"सेट करने के लिए स्पर्श करें"</string>
     <string name="sim_pref_divider" msgid="6778907671867621874">"इसके लिए पसंदीदा सिम"</string>
-    <string name="sim_calls_ask_first_prefs_title" msgid="7328134172516945288">"हर समय पूछें"</string>
+    <!-- no translation found for sim_calls_ask_first_prefs_title (7941299533514115976) -->
+    <skip />
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"चयन आवश्यक है"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"सेटिंग"</string>
     <string name="search_results_title" msgid="1796252422574886932">"सेटिंग"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index ad59089..143e084 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Isključiti?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"To će prekinuti vašu vezu s uređajem:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"Nemate dopuštenje za promjenu postavki Bluetootha."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> vidljiv je obliž. uređ. dok su pos. Bluetoo. otv."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"Uređaj <xliff:g id="DEVICE_NAME">%1$s</xliff:g> vidljiv je uređajima u blizini dok su postavke Bluetootha otvorene."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Želite li prekinuti vezu s uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Emitiranje"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Onemogućiti profil?"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Upravljanje Wi-Fi-jem, Bluetoothom, načinom rada u zrakoplovu, mobilnim mrežama i VPN-ovima"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Mobilni podaci"</string>
     <string name="calls_title" msgid="3544471959217176768">"Pozivi"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"SMS poruke"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"SMS poruke"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"Dopusti mobilni prijenos podataka"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Podatkovni promet u roamingu"</string>
     <string name="roaming" msgid="3596055926335478572">"Roaming podataka"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Srednja do visoka sigurnost"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Zaporka"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Visoka sigurnost"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Značajke za zaštitu uređaja više neće funkcionirati."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Onemogućili administrator, pravila enkripcije ili pohrana vjerodajnica"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Ništa"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Prelazak prstom"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Ukloni uzorak za otključavanje"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Ukloni otključavanje PIN-a"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Ukloni zaporku za zaključavanje"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"Ukloni zaključavanje zaslona"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Izmijeni uzorak za otključavanje"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Promijeni PIN za otključavanje"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Promijeni zaporku za otključavanje"</string>
@@ -860,6 +862,10 @@
     <string name="sim_multi_sims_summary" msgid="7018740080801483990">"Odaberite SIM putem kojeg želite upotrebljavati mobilni prijenos podataka."</string>
     <string name="sim_change_data_title" msgid="294357201685244532">"Promijeniti podatkovni SIM?"</string>
     <string name="sim_change_data_message" msgid="1313940695939674633">"Želite li upotrijebiti <xliff:g id="NEW_SIM">%1$s</xliff:g> umjesto <xliff:g id="OLD_SIM">%2$s</xliff:g> za mobilne podatke?"</string>
+    <!-- no translation found for sim_preferred_title (5567909634636045268) -->
+    <skip />
+    <!-- no translation found for sim_preferred_message (301251431163650167) -->
+    <skip />
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"Netočan PIN kôd SIM kartice; sada morate kontaktirati svog mobilnog operatera da bi otključao vaš uređaj."</string>
   <plurals name="wrong_pin_code">
     <item quantity="one" msgid="4840607930166101114">"Netočan PIN kôd SIM kartice; imate još <xliff:g id="NUMBER">%d</xliff:g> pokušaj prije nego što budete morali kontaktirati svog mobilnog operatera da bi otključao vaš uređaj."</item>
@@ -2332,7 +2338,8 @@
     <string name="sim_notification_title" msgid="6272913297433198340">"SIM kartica je promijenjena."</string>
     <string name="sim_notification_summary" msgid="5024470200658902406">"Dodirnite za postavljanje"</string>
     <string name="sim_pref_divider" msgid="6778907671867621874">"Željeni SIM za"</string>
-    <string name="sim_calls_ask_first_prefs_title" msgid="7328134172516945288">"Pitaj svaki put"</string>
+    <!-- no translation found for sim_calls_ask_first_prefs_title (7941299533514115976) -->
+    <skip />
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Potreban je odabir"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Postavke"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Postavke"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 454977d..6870103 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Leválasztja?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Ezzel befejezi a kapcsolatot a következővel:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"Nincs engedélye a Bluetooth-beállítások módosítására."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> látható, ha megnyitja a Bluetooth-beállításokat."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"A(z) <xliff:g id="DEVICE_NAME">%1$s</xliff:g> látható a közeli eszközök számára, ha a Bluetooth-beállítások nyitva vannak."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Leválasztja a következőt: <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Sugárzás"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Profil tiltása?"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Wi‑Fi, Bluetooth, repülős mód, mobilhálózatok és VPN-ek kezelése"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Mobiladat-kapcsolat"</string>
     <string name="calls_title" msgid="3544471959217176768">"Hívások"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"SMS-ek"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"SMS-ek"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"Adathasználat engedélyez. mobilhálózaton"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Adatforgalom barangoláskor"</string>
     <string name="roaming" msgid="3596055926335478572">"Adatbarangolás"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Közepes/magas védelem"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Jelszó"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Magas védelem"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Az eszközvédelmi funkciók nem fognak működni."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Rendszergazda, szabályzat vagy adattár letiltotta"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Nincs"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Söprés"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Feloldási minta törlése"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Feloldó PIN-kód törlése"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Feloldási jelszó eltávolítása"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"Képernyőzár eltávolítása"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Feloldási minta módosítása"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"A feloldó PIN-kód módosítása"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Feloldási jelszó módosítása"</string>
@@ -860,6 +862,8 @@
     <string name="sim_multi_sims_summary" msgid="7018740080801483990">"Válassza ki a mobiladat-forgalom esetén preferált SIM kártyát."</string>
     <string name="sim_change_data_title" msgid="294357201685244532">"Módosítja az adat SIM kártyát?"</string>
     <string name="sim_change_data_message" msgid="1313940695939674633">"A(z) <xliff:g id="NEW_SIM">%1$s</xliff:g> kártyát szeretné használni a(z) <xliff:g id="OLD_SIM">%2$s</xliff:g> helyett mobiladatok esetén?"</string>
+    <string name="sim_preferred_title" msgid="5567909634636045268">"Frissíti a preferált SIM-et?"</string>
+    <string name="sim_preferred_message" msgid="301251431163650167">"A(z) <xliff:g id="NEW_SIM">%1$s</xliff:g> az egyetlen SIM kártya az eszközben. Ezt a kártyát szeretné használni az adatforgalom, a hívások, és SMS-forgalom lebonyolítására?"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"Helytelen PIN kód a SIM kártyához; vegye fel a kapcsolatot szolgáltatójával az eszköz feloldásához."</string>
   <plurals name="wrong_pin_code">
     <item quantity="one" msgid="4840607930166101114">"Helytelen PIN kód a SIM kártyához; még <xliff:g id="NUMBER">%d</xliff:g> próbálkozása van, mielőtt fel kellene vennie a kapcsolatot szolgáltatójával az eszköz feloldásához."</item>
@@ -2332,7 +2336,8 @@
     <string name="sim_notification_title" msgid="6272913297433198340">"SIM kártyák módosítva."</string>
     <string name="sim_notification_summary" msgid="5024470200658902406">"Érintse meg a beállításhoz"</string>
     <string name="sim_pref_divider" msgid="6778907671867621874">"Előnyben részesített SIM kártya a következőhöz:"</string>
-    <string name="sim_calls_ask_first_prefs_title" msgid="7328134172516945288">"Mindig kérdezzen rá"</string>
+    <!-- no translation found for sim_calls_ask_first_prefs_title (7941299533514115976) -->
+    <skip />
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Kiválasztás szükséges"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Beállítások"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Beállítások"</string>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index 11e349b..d385f9d 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Անջատե՞լ"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Սա կավարտի կապը &lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&amp;gt-ի հետ"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"Դուք թույլտվություն չունեք փոխելու Bluetooth կարգավորումները:"</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> տեսանելի է մոտակա սարքերի համար, եթե Bluetooth կարգավորումները միացված են:"</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>-ը տեսանելի է մոտակա սարքերի համար, եթե Bluetooth կարգավորումները միացված են:"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Անջատե՞լ <xliff:g id="DEVICE_NAME">%1$s</xliff:g>-ը:"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Հեռարձակում"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Կասեցնե՞լ պրոֆիլը:"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Կառավարել WiFi-ը, Bluetooth-ը, թռիչքային ռեժիմը, բջջային ցանցերը և VPN-ները"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Բջջային տվյալներ"</string>
     <string name="calls_title" msgid="3544471959217176768">"Զանգեր"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"SMS հաղորդագրություններ"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"SMS հաղորդագրություններ"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"Թույլատրել բջջային ցանցի միջոցով տվյալների կապի օգտագործումը"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Թույլ տալ տվյալների կապի օգտագործումը ռոումինգում"</string>
     <string name="roaming" msgid="3596055926335478572">"Տվյալների ռոումինգ"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Միջինից մինչև բարձր անվտանգություն"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Գաղտնաբառ"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Բարձր անվտանգություն"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Սարքի պաշտպանության գործառույթներն այլևս չեն գործելու:"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Կասեցված է ադմինիստրատորի, կոդավորման ծրագրի կամ վկայագրերի պահոցի կողմից"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Ոչ մեկը"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Սահահարվածել"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Հեռացնել ապակողպման կաղապարը"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Հեռացնել PIN-ի ապակողպումը"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Հեռացնել գաղտնաբառի ապակողպումը"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"Հեռացնել էկրանի փականը"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Փոխել ապակողպման կաղապարը"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Փոխել ապակողպման PIN-ը"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Փոխել ապակողպման գաղտնաբառը"</string>
@@ -555,7 +557,7 @@
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Երաժշտության և մեդիայի համար"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Հիշել կարգավորումները"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi-Fi Օգնական"</string>
-    <string name="connected_via_wfa" msgid="3805736726317410714">"Կապակցված է Wi‑Fi օգնականի միջոցով"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Կապակցված է Wi‑Fi Օգնականի միջոցով"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"Հեռակա էկրան"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Միացնել անլար էկրանը"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Մոտակայքում սարքեր չեն գտնվել:"</string>
@@ -860,6 +862,8 @@
     <string name="sim_multi_sims_summary" msgid="7018740080801483990">"Ընտրեք SIM՝ բջջային տվյալների համար:"</string>
     <string name="sim_change_data_title" msgid="294357201685244532">"Փոխե՞լ տվյալների SIMը:"</string>
     <string name="sim_change_data_message" msgid="1313940695939674633">"Բջջային տվյալների համար օգտագործե՞լ <xliff:g id="NEW_SIM">%1$s</xliff:g>-ը <xliff:g id="OLD_SIM">%2$s</xliff:g>-ի փոխարեն:"</string>
+    <string name="sim_preferred_title" msgid="5567909634636045268">"Փոխե՞լ նախընտրելի SIM քարտը:"</string>
+    <string name="sim_preferred_message" msgid="301251431163650167">"Այս սարքի վրա միակ SIM քարտը <xliff:g id="NEW_SIM">%1$s</xliff:g> է: Ցանկանո՞ւմ եք օգտագործել այս SIM-ը բջջային տվյալների փոխանցման, զանգերի և SMS հաղորդագրությունների համար:"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"SIM PIN կոդը սխալ է: Պետք է դիմեք ձեր օպերատորին՝ սարքն արգելաբացելու համար:"</string>
   <plurals name="wrong_pin_code">
     <item quantity="one" msgid="4840607930166101114">"SIM PIN կոդը սխալ է: Մնաց <xliff:g id="NUMBER">%d</xliff:g> փորձ, որից հետո պետք է դիմեք ձեր օպերատորին՝ սարքն արգելաբացելու համար:"</item>
@@ -2332,7 +2336,8 @@
     <string name="sim_notification_title" msgid="6272913297433198340">"SIM քարտերը փոխարինվել են:"</string>
     <string name="sim_notification_summary" msgid="5024470200658902406">"Հպեք՝ կարգավորելու համար"</string>
     <string name="sim_pref_divider" msgid="6778907671867621874">"Օգտագործել SIM քարտը հետևյալի համար՝"</string>
-    <string name="sim_calls_ask_first_prefs_title" msgid="7328134172516945288">"Հարցնել ամեն անգամ"</string>
+    <!-- no translation found for sim_calls_ask_first_prefs_title (7941299533514115976) -->
+    <skip />
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Ընտրեք SIM քարտը"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Կարգավորումներ"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Կարգավորումներ"</string>
diff --git a/res/values-in/arrays.xml b/res/values-in/arrays.xml
index 12cf5df..ed06375 100644
--- a/res/values-in/arrays.xml
+++ b/res/values-in/arrays.xml
@@ -521,7 +521,7 @@
     <item msgid="7438189122367820362">"Layanan (berjalan)"</item>
     <item msgid="918687422516982498">"Layanan (memulai ulang)"</item>
     <item msgid="6807727069641853029">"Penerima"</item>
-    <item msgid="6782857406100845127">"Utama"</item>
+    <item msgid="6782857406100845127">"Beranda"</item>
     <item msgid="2860945127596974299">"Aktivitas terakhir"</item>
     <item msgid="8610560843693675830">"Disimpan dalam cache (aktivitas)"</item>
     <item msgid="4338089220026248848">"Disimpan dalam cache (klien aktivitas)"</item>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 7704489..77752e9 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Putuskan sambungan?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Ini akan mengakhiri sambungan Anda dengan:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"Anda tidak memiliki izin untuk mengubah setelan Bluetooth."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> terlihat oleh perangkat di sekitar saat Setelan Bluetooth dibuka."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> terlihat oleh perangkat di sekitar saat Setelan Bluetooth dibuka."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Putuskan sambungan <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Penyiaran"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Nonaktifkan profil?"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Kelola Wi‑Fi, Bluetooth, mode pesawat, jaringan seluler, &amp; VPN"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Data seluler"</string>
     <string name="calls_title" msgid="3544471959217176768">"Panggilan telepon"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"Pesan SMS"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"Pesan SMS"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"Izinkan penggunaan data via jaringan seluler"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Gunakan data saat roaming"</string>
     <string name="roaming" msgid="3596055926335478572">"Roaming data"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Keamanan sedang hingga tinggi"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Sandi"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Keamanan tinggi"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Fitur perlindungan perangkat tidak akan berfungsi lagi."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Dinonaktifkan oleh administrator, kebijakan enkripsi, atau penyimpanan kredensial"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Tidak ada"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Gesek"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Hapus pola pembuka kunci"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Hapus PIN pembuka kunci"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Hapus sandi pembuka kunci"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"Hapus kunci layar"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Ubah pola pembuka kunci"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Ubah PIN pembuka kunci"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Ubah sandi pembuka kunci"</string>
@@ -860,6 +862,10 @@
     <string name="sim_multi_sims_summary" msgid="7018740080801483990">"Pilih SIM yang diinginkan untuk data seluler."</string>
     <string name="sim_change_data_title" msgid="294357201685244532">"Ubah SIM data?"</string>
     <string name="sim_change_data_message" msgid="1313940695939674633">"Gunakan <xliff:g id="NEW_SIM">%1$s</xliff:g> daripada <xliff:g id="OLD_SIM">%2$s</xliff:g> untuk data seluler?"</string>
+    <!-- no translation found for sim_preferred_title (5567909634636045268) -->
+    <skip />
+    <!-- no translation found for sim_preferred_message (301251431163650167) -->
+    <skip />
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"Kode PIN SIM salah, sekarang Anda harus menghubungi operator untuk membuka kunci perangkat."</string>
   <plurals name="wrong_pin_code">
     <item quantity="one" msgid="4840607930166101114">"Kode PIN SIM salah, sisa <xliff:g id="NUMBER">%d</xliff:g> percobaan sebelum Anda harus menghubungi operator untuk membuka kunci perangkat."</item>
@@ -1174,9 +1180,9 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Terlalu banyak upaya yang salah!"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Coba lagi dalam <xliff:g id="NUMBER">%d</xliff:g> detik."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"Aplikasi tidak dipasang pada ponsel Anda."</string>
-    <string name="manageapplications_settings_title" msgid="7041951105633616745">"Kelola apl"</string>
+    <string name="manageapplications_settings_title" msgid="7041951105633616745">"Kelola aplikasi"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Mengelola dan menghapus apl terpasang"</string>
-    <string name="applications_settings" msgid="1721442176406964682">"Apl"</string>
+    <string name="applications_settings" msgid="1721442176406964682">"Aplikasi"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"Kelola apl, siapkan pintasan peluncuran cepat"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Setelan apl"</string>
     <string name="install_applications" msgid="4872012136210802181">"Sumber tidak dikenal"</string>
@@ -1238,7 +1244,7 @@
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Pada kartu SD"</string>
     <string name="disabled" msgid="9206776641295849915">"Dinonaktifkan"</string>
     <string name="not_installed" msgid="2797554494953450291">"Tidak dipasang untuk pengguna ini"</string>
-    <string name="no_applications" msgid="7336588977497084921">"Tidak ada apl."</string>
+    <string name="no_applications" msgid="7336588977497084921">"Tidak ada aplikasi."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Penyimpanan internal"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Penyimpanan USB"</string>
     <string name="sd_card_storage" product="default" msgid="7623513618171928235">"Penyimpanan kartu SD"</string>
@@ -1392,7 +1398,7 @@
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Informasi telepon"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"Informasi baterai"</string>
     <string name="quick_launch_title" msgid="7904609846945905306">"Peluncuran cepat"</string>
-    <string name="quick_launch_summary" msgid="8101133819188001190">"Menyetel pintasan keyboard untuk meluncurkan apl"</string>
+    <string name="quick_launch_summary" msgid="8101133819188001190">"Menyetel pintasan keyboard untuk meluncurkan aplikasi"</string>
     <string name="quick_launch_assign_application" msgid="6240064079456617501">"Menetapkan apl"</string>
     <string name="quick_launch_no_shortcut" msgid="5998005833838278693">"Tanpa pintasan"</string>
     <string name="quick_launch_shortcut" msgid="5090405067413522300">"Telusuri + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
@@ -1400,7 +1406,7 @@
     <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"Pintasan Anda untuk <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>) akan dihapus."</string>
     <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"Oke"</string>
     <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"Batal"</string>
-    <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"Apl"</string>
+    <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"Aplikasi"</string>
     <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"Pintasan"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Masukan teks"</string>
     <string name="input_method" msgid="5434026103176856164">"Metode masukan"</string>
@@ -2019,7 +2025,7 @@
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Skala animasi transisi"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Skala durasi animator"</string>
     <string name="overlay_display_devices_title" msgid="5364176287998398539">"Menyimulasikan tampilan sekunder"</string>
-    <string name="debug_applications_category" msgid="4206913653849771549">"Apl"</string>
+    <string name="debug_applications_category" msgid="4206913653849771549">"Aplikasi"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Jangan simpan kegiatan"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Hancurkan tiap kgiatan setelah ditinggal pengguna"</string>
     <string name="app_process_limit_title" msgid="4280600650253107163">"Batas proses latar blkg"</string>
@@ -2098,7 +2104,7 @@
     <string name="data_usage_restrict_background_multiuser" product="default" msgid="4352615206362479722">"Jika Anda membatasi data seluler latar belakang, beberapa aplikasi dan layanan tidak akan bekerja kecuali Anda tersambung ke Wi‑Fi.\n\nSetelan ini memengaruhi semua pengguna di ponsel ini."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"peringatan"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="12">"batas"</font>\n<font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font></string>
-    <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Apl dihapus"</string>
+    <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Aplikasi dihapus"</string>
     <string name="data_usage_uninstalled_apps_users" msgid="7986294489899813194">"Aplikasi dan pengguna yang dihapus"</string>
     <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> diterima, <xliff:g id="SENT">%2$s</xliff:g> dikirim"</string>
     <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>: sekitar <xliff:g id="TOTAL">%1$s</xliff:g> yang digunakan."</string>
@@ -2332,7 +2338,8 @@
     <string name="sim_notification_title" msgid="6272913297433198340">"Kartu SIM diganti."</string>
     <string name="sim_notification_summary" msgid="5024470200658902406">"Sentuh untuk menyiapkan"</string>
     <string name="sim_pref_divider" msgid="6778907671867621874">"SIM pilihan untuk"</string>
-    <string name="sim_calls_ask_first_prefs_title" msgid="7328134172516945288">"Selalu tanya"</string>
+    <!-- no translation found for sim_calls_ask_first_prefs_title (7941299533514115976) -->
+    <skip />
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Perlu dipilih"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Setelan"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Setelan"</string>
diff --git a/res/values-is-rIS/strings.xml b/res/values-is-rIS/strings.xml
index 4b9a58e..f08b48f 100644
--- a/res/values-is-rIS/strings.xml
+++ b/res/values-is-rIS/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Aftengja?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Þetta slítur tengingunni við:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"Þú hefur ekki heimild til að breyta Bluetooth-stillingum."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> er sýnilegt nálægum tækjum á meðan Bluetooth-stillingar eru opnar."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> er sýnilegt nálægum tækjum á meðan Bluetooth-stillingar eru opnar."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Viltu aftengja <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Útsending"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Gera snið óvirkt?"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Stjórna Wi-Fi, Bluetooth, flugstillingu, farsímakerfum og VPN-netum"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Farsímagögn"</string>
     <string name="calls_title" msgid="3544471959217176768">"Símtöl"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"SMS-skilaboð"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"SMS-skilaboð"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"Leyfa gagnanotkun í farsímakerfi"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Leyfa gagnanotkun í reiki"</string>
     <string name="roaming" msgid="3596055926335478572">"Gagnareiki"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Miðlungs til mikið öryggi"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Aðgangsorð"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Mikið öryggi"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Eiginleikar til að vernda tæki munu ekki virka lengur."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Stjórnandi, dulkóðunarstefna eða skilríkjageymsla hefur gert óvirkt"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Ekkert"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Strjúka"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Fjarlægja opnunarmynstur"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Fjarlægja PIN-númer"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Fjarlægja aðgangsorð"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"Fjarlægja skjálás"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Breyta opnunarmynstri"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Breyta PIN-númeri"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Breyta aðgangsorði opnunar"</string>
@@ -860,6 +862,8 @@
     <string name="sim_multi_sims_summary" msgid="7018740080801483990">"Veldu hvaða SIM-kort þú vilt nota fyrir farsímagögn."</string>
     <string name="sim_change_data_title" msgid="294357201685244532">"Skipta um SIM-kort fyrir gögn?"</string>
     <string name="sim_change_data_message" msgid="1313940695939674633">"Nota <xliff:g id="NEW_SIM">%1$s</xliff:g> í stað <xliff:g id="OLD_SIM">%2$s</xliff:g> fyrir farsímagögn?"</string>
+    <string name="sim_preferred_title" msgid="5567909634636045268">"Uppfæra valið SIM-kort?"</string>
+    <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> er eina SIM-kortið í tækinu. Viltu nota þetta SIM-kort fyrir farsímagögn, símtöl og SMS?"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"Rangt PIN-númer SIM-korts. Nú þarftu að hafa samband við símafyrirtækið til að opna fyrir tækið."</string>
   <plurals name="wrong_pin_code">
     <item quantity="one" msgid="4840607930166101114">"Rangt PIN-númer SIM-korts. Þú átt <xliff:g id="NUMBER">%d</xliff:g> tilraun eftir áður en þú þarft að hafa samband við símafyrirtækið þitt til að taka tækið úr lás."</item>
@@ -2332,7 +2336,8 @@
     <string name="sim_notification_title" msgid="6272913297433198340">"Skipt um SIM-kort."</string>
     <string name="sim_notification_summary" msgid="5024470200658902406">"Snertu til að setja upp"</string>
     <string name="sim_pref_divider" msgid="6778907671867621874">"Valið SIM-kort fyrir"</string>
-    <string name="sim_calls_ask_first_prefs_title" msgid="7328134172516945288">"Spyrja í hvert skipti"</string>
+    <!-- no translation found for sim_calls_ask_first_prefs_title (7941299533514115976) -->
+    <skip />
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Val er áskilið"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Stillingar"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Stillingar"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 497d6e6..fc945c9 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Disconnettere?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Questa operazione terminerà la connessione con:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"Non sei autorizzato a modificare le impostazioni Bluetooth."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"Con Imp. Bluetooth aperte <xliff:g id="DEVICE_NAME">%1$s</xliff:g> è rilevabile da altri dispositivi vicini."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"Con le impostazioni Bluetooth aperte, <xliff:g id="DEVICE_NAME">%1$s</xliff:g> è rilevabile da altri dispositivi vicini."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Disconnetti <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Trasmissione"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Disattivare il profilo?"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Gestisci Wi‑Fi, Bluetooth, modalità aereo, reti cellulari e VPN"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Rete dati"</string>
     <string name="calls_title" msgid="3544471959217176768">"Chiamate"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"Messaggi SMS"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"Messaggi SMS"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"Consenti utilizzo di dati su rete cell."</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Consenti util. dati in roaming"</string>
     <string name="roaming" msgid="3596055926335478572">"Roaming dati"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Protezione medio-alta"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Password"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Protezione alta"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Le funzionalità di protezione del dispositivo non saranno più disponibili."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Disattivata da amministratore, norma crittografia o archivio credenziali"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Nessuno"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Fai scorrere"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Rimuovi sequenza di sblocco"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Rimuovi PIN di sblocco"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Rimuovi password di sblocco"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"Rimuovi il blocco dello schermo"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Cambia sequenza di sblocco"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Cambia PIN di sblocco"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Cambia password di sblocco"</string>
@@ -860,6 +862,8 @@
     <string name="sim_multi_sims_summary" msgid="7018740080801483990">"Scegli la SIM che preferisci per la rete dati."</string>
     <string name="sim_change_data_title" msgid="294357201685244532">"Cambiare SIM di dati?"</string>
     <string name="sim_change_data_message" msgid="1313940695939674633">"Utilizzare <xliff:g id="NEW_SIM">%1$s</xliff:g> anziché <xliff:g id="OLD_SIM">%2$s</xliff:g> per la rete dati?"</string>
+    <string name="sim_preferred_title" msgid="5567909634636045268">"Aggiornare la scheda SIM preferita?"</string>
+    <string name="sim_preferred_message" msgid="301251431163650167">"<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="4003655226832658066">"Codice PIN della SIM errato. Devi contattare l\'operatore per sbloccare il dispositivo."</string>
   <plurals name="wrong_pin_code">
     <item quantity="one" msgid="4840607930166101114">"Codice PIN della SIM errato. Hai ancora <xliff:g id="NUMBER">%d</xliff:g> tentativo a disposizione, dopodiché dovrai contattare l\'operatore per sbloccare il dispositivo."</item>
@@ -2332,7 +2336,8 @@
     <string name="sim_notification_title" msgid="6272913297433198340">"Schede SIM modificate."</string>
     <string name="sim_notification_summary" msgid="5024470200658902406">"Tocca per configurare"</string>
     <string name="sim_pref_divider" msgid="6778907671867621874">"SIM preferita per"</string>
-    <string name="sim_calls_ask_first_prefs_title" msgid="7328134172516945288">"Chiedi ogni volta"</string>
+    <!-- no translation found for sim_calls_ask_first_prefs_title (7941299533514115976) -->
+    <skip />
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Fai una scelta"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Impostazioni"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Impostazioni"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 050322a..80fcc1d 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"להתנתק?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"‏פעולה זו תסיים את החיבור עם:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"‏אין לך הרשאה לשנות את הגדרות ה-Bluetooth."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"‏<xliff:g id="DEVICE_NAME">%1$s</xliff:g> גלוי להתקנים סמוכים כאשר הגדרת Bluetooth פתוחה."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"‏<xliff:g id="DEVICE_NAME">%1$s</xliff:g> גלוי למכשירים קרובים כאשר הגדרת Bluetooth פתוחה."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"האם לנתק את <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"שידור"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"להשבית פרופיל?"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"‏נהל Wi‑Fi‏, Bluetooth, מצב טיסה, רשתות סלולריות וחיבורי VPN"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"נתונים סלולריים"</string>
     <string name="calls_title" msgid="3544471959217176768">"שיחות"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"‏הודעות SMS"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"‏הודעות SMS"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"התר שימוש בנתונים באמצעות רשת סלולרית"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"אפשר שימוש בנתונים בעת נדידה"</string>
     <string name="roaming" msgid="3596055926335478572">"נדידת נתונים"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"אבטחה בינונית עד גבוהה"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"סיסמה"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"אבטחה גבוהה"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"תכונות להגנת המכשיר יפסיקו לפעול."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"הושבת על ידי מדיניות ההצפנה של מנהל המערכת, או אחסון האישורים"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"ללא"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"החלקה"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"הסר קו ביטול נעילה"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"‏הסר PIN של ביטול נעילה"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"הסר סיסמה לביטול נעילה"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"הסר נעילת מסך"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"שנה את קו ביטול הנעילה"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"‏שנה PIN של ביטול נעילה"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"שנה סיסמת ביטול נעילה"</string>
@@ -860,6 +862,8 @@
     <string name="sim_multi_sims_summary" msgid="7018740080801483990">"‏בחר את ה-SIM המועדף לנתונים סלולריים."</string>
     <string name="sim_change_data_title" msgid="294357201685244532">"‏לשנות SIM של נתונים?"</string>
     <string name="sim_change_data_message" msgid="1313940695939674633">"להשתמש ב-<xliff:g id="NEW_SIM">%1$s</xliff:g> במקום ב-<xliff:g id="OLD_SIM">%2$s</xliff:g> עבור נתונים סלולריים?"</string>
+    <string name="sim_preferred_title" msgid="5567909634636045268">"‏האם לעדכן כרטיס SIM מועדף?"</string>
+    <string name="sim_preferred_message" msgid="301251431163650167">"‏<xliff:g id="NEW_SIM">%1$s</xliff:g> הוא ה-SIM היחיד במכשיר שלך. האם ברצונך להשתמש בו עבור נתונים סלולריים, שיחות והודעות SMS?"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"‏מספר PIN שגוי של כרטיס ה-SIM. עליך ליצור כעת קשר עם הספק על מנת לבטל את נעילת המכשיר."</string>
   <plurals name="wrong_pin_code">
     <item quantity="one" msgid="4840607930166101114">"‏מספר PIN שגוי של כרטיס ה-SIM. נותר לך ניסיון <xliff:g id="NUMBER">%d</xliff:g> נוסף לפני שיהיה עליך ליצור קשר עם הספק על מנת לבטל את נעילת המכשיר."</item>
@@ -2332,7 +2336,8 @@
     <string name="sim_notification_title" msgid="6272913297433198340">"‏כרטיסי SIM הוחלפו."</string>
     <string name="sim_notification_summary" msgid="5024470200658902406">"גע כדי להגדיר"</string>
     <string name="sim_pref_divider" msgid="6778907671867621874">"‏SIM מועדף עבור"</string>
-    <string name="sim_calls_ask_first_prefs_title" msgid="7328134172516945288">"שאל בכל פעם"</string>
+    <!-- no translation found for sim_calls_ask_first_prefs_title (7941299533514115976) -->
+    <skip />
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"יש לציין בחירה"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"הגדרות"</string>
     <string name="search_results_title" msgid="1796252422574886932">"הגדרות"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 141fa6b..65df569 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -132,7 +132,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"切断しますか？"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"この操作を行うと、次のデバイスとの接続が切断されます:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"Bluetooth設定を変更する権限がありません。"</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"Bluetooth設定により<xliff:g id="DEVICE_NAME">%1$s</xliff:g>は周辺の端末に表示されています"</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"Bluetooth設定により<xliff:g id="DEVICE_NAME">%1$s</xliff:g>は付近のデバイスに表示されています。"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>を切断しますか？"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"ブロードキャスト"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"プロフィールを無効にしますか？"</string>
@@ -292,7 +292,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Wi-Fi、Bluetooth、機内モード、モバイルネットワーク、VPNを管理する"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"モバイルデータ"</string>
     <string name="calls_title" msgid="3544471959217176768">"通話"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"SMSメッセージ"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"SMSメッセージ"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"モバイルネットワークでのデータ使用を許可"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"ローミング時にデータ使用を許可"</string>
     <string name="roaming" msgid="3596055926335478572">"データローミング"</string>
@@ -401,6 +401,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"中程度から高レベルのセキュリティ"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"パスワード"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"高レベルのセキュリティ"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"端末保護機能は利用できなくなります。"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"管理者、暗号化ポリシー、または認証情報により無効"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"なし"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"スワイプ"</string>
@@ -412,6 +413,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"ロック解除パターンを削除"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"ロック解除PINを削除"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"ロック解除パスワードを削除"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"画面ロックの解除"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"ロック解除パターンの変更"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"ロック解除PINの変更"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"ロック解除パスワードの変更"</string>
@@ -862,6 +864,10 @@
     <string name="sim_multi_sims_summary" msgid="7018740080801483990">"モバイルデータに使用するSIMを選択してください。"</string>
     <string name="sim_change_data_title" msgid="294357201685244532">"データSIMを変更しますか？"</string>
     <string name="sim_change_data_message" msgid="1313940695939674633">"モバイルデータのSIMとして<xliff:g id="OLD_SIM">%2$s</xliff:g>の代わりに<xliff:g id="NEW_SIM">%1$s</xliff:g>を使用しますか？"</string>
+    <!-- no translation found for sim_preferred_title (5567909634636045268) -->
+    <skip />
+    <!-- no translation found for sim_preferred_message (301251431163650167) -->
+    <skip />
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"SIM PINコードが無効です。お使いの端末をロック解除するには携帯通信会社にお問い合わせいただく必要があります。"</string>
   <plurals name="wrong_pin_code">
     <item quantity="one" msgid="4840607930166101114">"SIM PINコードが無効です。入力できるのはあと<xliff:g id="NUMBER">%d</xliff:g>回です。この回数を超えると、お使いの端末をロック解除するのに携帯通信会社にお問い合わせいただく必要があります。"</item>
@@ -2338,7 +2344,8 @@
     <string name="sim_notification_title" msgid="6272913297433198340">"SIMカードの変更完了"</string>
     <string name="sim_notification_summary" msgid="5024470200658902406">"タップしてセットアップ"</string>
     <string name="sim_pref_divider" msgid="6778907671867621874">"優先SIM:"</string>
-    <string name="sim_calls_ask_first_prefs_title" msgid="7328134172516945288">"その都度確認"</string>
+    <!-- no translation found for sim_calls_ask_first_prefs_title (7941299533514115976) -->
+    <skip />
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"選択してください"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"設定"</string>
     <string name="search_results_title" msgid="1796252422574886932">"設定"</string>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index 2faa78a..f3579d2 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"გავწყვიტო კავშირი?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"ეს დაასრულებს თქვენს კავშირს :&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>-თან&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"თქვენ არ გაქვთ Bluetooth-ის პარამეტრების შეცვლის ნებართვა."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ჩანს ახლომდებარე მოწყობილობებზე, როდესაც Bluetooth პარამეტრები გახსნილია."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ჩანს ახლომდებარე მოწყობილობებზე, როდესაც Bluetooth პარამეტრები გახსნილია."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"გაწყდეს კავშირი <xliff:g id="DEVICE_NAME">%1$s</xliff:g>-თან?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"მაუწყებლობა"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"გავაუქმოთ პროფილი?"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Wi-Fi, Bluetooth, თვითმფრინავის რეჟიმის, ფიჭური ქსელებისა და VPN მართვა"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"ფიჭური ინტერნეტი"</string>
     <string name="calls_title" msgid="3544471959217176768">"ზარები"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"SMS შეტყობინებები"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"SMS შეტყობინებები"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"ფიჭურ ქსელზე მობ. ინტერნეტის გამოყენება"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"როუმინგისას მობილური ინტერნეტი"</string>
     <string name="roaming" msgid="3596055926335478572">"ინტერნეტის როუმინგი"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"საშუალოდან მაღალი დონის უსაფრთხოება"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"პაროლი"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"მაღალი უსაფრთხოება"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"მოწყობილობის დაცვის ფუნქციები აღარ იმუშავებს."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Disabled by administrator, encryption policy, or credential storage"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"არც ერთი"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"გასრიალება"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"განბლოკვის ნიმუშის ამოღება"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"განბლოკვის PIN-კოდის წაშლა"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"განბლოკვის პაროლის წაშლა"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"ეკრანის დაბლოკვის ამოღება"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"გასაღების ცვლილება"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"განბლოკვის PIN-ის შეცვლა"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"განბლოკვის პაროლის შეცვლა"</string>
@@ -860,6 +862,10 @@
     <string name="sim_multi_sims_summary" msgid="7018740080801483990">"აირჩიეთ SIM ბარათი, რომელიც გსურთ ფიჭური ინტერნეტისათვის გამოიყენოთ."</string>
     <string name="sim_change_data_title" msgid="294357201685244532">"შეიცვალოს მონაცემების SIM?"</string>
     <string name="sim_change_data_message" msgid="1313940695939674633">"გსურთ მობილური ინტერნეტისთვის <xliff:g id="OLD_SIM">%2$s</xliff:g>-ის ნაცვლად <xliff:g id="NEW_SIM">%1$s</xliff:g>-ის გამოყენება?"</string>
+    <!-- no translation found for sim_preferred_title (5567909634636045268) -->
+    <skip />
+    <!-- no translation found for sim_preferred_message (301251431163650167) -->
+    <skip />
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"SIM-ის არასწორი PIN კოდი. თქვენ ახლა მოგიწევთ მოწყობილობის განსაბლოკად მიმართოთ ოპერატორს."</string>
   <plurals name="wrong_pin_code">
     <item quantity="one" msgid="4840607930166101114">"SIM-ის არასწორი PIN კოდი. თქვენ დაგრჩათ <xliff:g id="NUMBER">%d</xliff:g> მცდელობა, სანამ მოგიწევთ თქვენი მოწყობილობის განსაბლოკად ოპერატორთან დაკავშირება."</item>
@@ -2332,7 +2338,8 @@
     <string name="sim_notification_title" msgid="6272913297433198340">"სიმ-ბარათები შეიცვალა."</string>
     <string name="sim_notification_summary" msgid="5024470200658902406">"დაყენებისათვის შეეხეთ"</string>
     <string name="sim_pref_divider" msgid="6778907671867621874">"რჩეული SIM შემდეგისთვის:"</string>
-    <string name="sim_calls_ask_first_prefs_title" msgid="7328134172516945288">"მკითხე ყოველთვის"</string>
+    <!-- no translation found for sim_calls_ask_first_prefs_title (7941299533514115976) -->
+    <skip />
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"აუცილებელი არჩევანი"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"პარამეტრები"</string>
     <string name="search_results_title" msgid="1796252422574886932">"პარამეტრები"</string>
diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk-rKZ/strings.xml
index b034c1e..330854b 100644
--- a/res/values-kk-rKZ/strings.xml
+++ b/res/values-kk-rKZ/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Ажыратылсын ба?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Бұл келесі құрылғымен байланысты үзеді:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"Сізде Bluetooth параметрлерін өзгерту рұқсаты жоқ."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"Bluetooth параметрлері ашық болғанда <xliff:g id="DEVICE_NAME">%1$s</xliff:g> маңайдағы құр-ға көрінеді."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> Bluetooth параметрлері ашық болғанда маңайдағы құрылғыларға көрінеді."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ажырату керек пе?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Хабар тарату"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Профайл істен шығарылсын ба?"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Wi‑Fi, Bluetooth, ұшақ режимін, ұялы желілерді және VPN басқару"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Ұялы деректер"</string>
     <string name="calls_title" msgid="3544471959217176768">"Қоңыраулар"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"SMS хабарлары"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"SMS хабарлары"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"Ұялы желі арқылы деректерді пайдалануға рұқсат ету"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Роумингте деректерді пайдалануға рұқсат ету"</string>
     <string name="roaming" msgid="3596055926335478572">"Деректер роумингі"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Орташадан жоғарыға қауіпсіздігі"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Кілтсөз"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Жоғары қауіпсіздік"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Құрылғыны қорғау мүмкіндіктері енді жұмыс істемейді."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Әкімші, кодтау саясаты немесе растау дерекқоры арқылы өшірілген"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Ешқандай"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Жанау"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Бекітпе ашу кескінін алып тастау"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Бекітпесін ашу PIN кодын алып тастау"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Бекітпесін ашу кілтсөзін алып тастау"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"Экран бекітпесін жою"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Бекітпе ашу кескінін өзгерту"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Бекітпесін ашу PIN кодын өзгерту"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Бекітпе кілтсөзін өзгерту"</string>
@@ -860,6 +862,10 @@
     <string name="sim_multi_sims_summary" msgid="7018740080801483990">"Ұялы деректер үшін жөн көретін SIM картасын таңдаңыз."</string>
     <string name="sim_change_data_title" msgid="294357201685244532">"Деректер SIM картасы өзг-н бе?"</string>
     <string name="sim_change_data_message" msgid="1313940695939674633">"Ұялы деректер үшін <xliff:g id="OLD_SIM">%2$s</xliff:g> орнына <xliff:g id="NEW_SIM">%1$s</xliff:g> пайдалану керек пе?"</string>
+    <!-- no translation found for sim_preferred_title (5567909634636045268) -->
+    <skip />
+    <!-- no translation found for sim_preferred_message (301251431163650167) -->
+    <skip />
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"SIM PIN коды дұрыс емес қазір сізге құрылғыны ашу өтінішімен жабдықтаушыға хабарласу қажет."</string>
   <plurals name="wrong_pin_code">
     <item quantity="one" msgid="4840607930166101114">"SIM PIN коды дұрыс емес, жабдықтаушыға құрылғыны бекіту өтінішімен хабарласуға дейін <xliff:g id="NUMBER">%d</xliff:g> рет әрекеттену мүмкіндігіңіз бар."</item>
@@ -2332,7 +2338,8 @@
     <string name="sim_notification_title" msgid="6272913297433198340">"SIM cards changed."</string>
     <string name="sim_notification_summary" msgid="5024470200658902406">"Реттеу үшін түртіңіз."</string>
     <string name="sim_pref_divider" msgid="6778907671867621874">"Келесі үшін таңдаулы SIM"</string>
-    <string name="sim_calls_ask_first_prefs_title" msgid="7328134172516945288">"Әрқашан сұрау"</string>
+    <!-- no translation found for sim_calls_ask_first_prefs_title (7941299533514115976) -->
+    <skip />
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Таңдау қажет"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Параметрлер"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Параметрлер"</string>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index dd73ecc..8e47374 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"ផ្ដាច់?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"វា​នឹង​បញ្ចប់​ការ​តភ្ជាប់​​ជា​មួយ៖&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"អ្នក​មិន​មាន​សិទ្ធិ​ ដើម្បី​​ប្ដូរ​ការ​កំណត់​ប៊្លូធូស​ទេ។"</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"ឧបករណ៍នៅក្បែរអាចមើលឃើញ<xliff:g id="DEVICE_NAME">%1$s</xliff:g>ពេលការ​កំណត់ប៊្លូធូស​បានបើក។"</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> អាចមើលឃើញដោយឧបករណ៍នៅក្បែរនោះ នៅពេលដែលបើកការកំណត់ប្ល៊ូធូស។"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"ផ្ដាច់ <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"ការ​ផ្សាយ"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"បិទ​ប្រវត្តិរូប?"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"គ្រប់គ្រង​វ៉ាយហ្វាយ, ប៊្លូធូស, របៀប​ជិះ​យន្តហោះ, បណ្ដាញ​ចល័ត, &amp; VPNs"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"ទិន្នន័យ​ចល័ត"</string>
     <string name="calls_title" msgid="3544471959217176768">"ហៅ"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"សារ SMS"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"សារ SMS"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"ឲ្យការប្រើប្រាស់ទិន្នន័យ​លើបណ្ដាញ​ចល័ត"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"អនុញ្ញាតប្រើទិន្នន័យពេលរ៉ូមីង"</string>
     <string name="roaming" msgid="3596055926335478572">"រ៉ូមីង​ទិន្នន័យ"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"សុវត្ថិភាព​ពី​មធ្យម​ទៅ​ខ្ពស់"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"ពាក្យសម្ងាត់​"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"សុវត្ថិភាព​ខ្ពស់"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"លក្ខណៈពិសេសការពារឧបករណ៍មិនដំណើរការទៀតទេ។"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"បាន​បិទ​ដោយ​​អ្នក​គ្រប់គ្រង ការ​ដាក់​លេខ​កូដ​គោលនយោបាយ ឬ​ការ​ផ្ទុក​ព័ត៌មាន​សម្ងាត់"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"គ្មាន"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"អូស"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"លុប​​លំនាំ​ដោះ​សោ"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"លុប​កូដ​ PIN ដោះ​សោ"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"លុប​ពាក្យ​សម្ងាត់​ដោះ​សោ"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"យកអេក្រង់ចាក់សោចេញ"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"ប្ដូរ​លំនាំ​ដោះ​សោ"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"ប្ដូរ​កូដ​ PIN ដោះ​សោ"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"ប្ដូរ​ពាក្យសម្ងាត់​ដោះ​សោ"</string>
@@ -860,6 +862,10 @@
     <string name="sim_multi_sims_summary" msgid="7018740080801483990">"ជ្រើស​ស៊ី​ម​ដែល​អ្នក​ចូលចិត្ត​សម្រាប់​ទិន្នន័យ​ចល័ត។"</string>
     <string name="sim_change_data_title" msgid="294357201685244532">"ប្ដូរ​ស៊ីម​ទិន្នន័យ?"</string>
     <string name="sim_change_data_message" msgid="1313940695939674633">"ប្រើ <xliff:g id="NEW_SIM">%1$s</xliff:g> ជំនួស <xliff:g id="OLD_SIM">%2$s</xliff:g> សម្រាប់​ទិន្នន័យ​ចល័ត?"</string>
+    <!-- no translation found for sim_preferred_title (5567909634636045268) -->
+    <skip />
+    <!-- no translation found for sim_preferred_message (301251431163650167) -->
+    <skip />
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"លេខ​កូដ PIN ស៊ីម​មិន​ត្រឹមត្រូវ អ្នក​ត្រូវ​​ទាក់ទង​ក្រុមហ៊ុន​បញ្ជូន​របស់​អ្នក​ឥឡូវ​នេះ​ដើម្បី​ដោះ​សោ​ឧបករណ៍​របស់​អ្នក។"</string>
   <plurals name="wrong_pin_code">
     <item quantity="one" msgid="4840607930166101114">"លេខ​កូដ PIN ស៊ីម​មិន​ត្រឹមត្រូវ, អ្នក​​មាន​ <xliff:g id="NUMBER">%d</xliff:g> ការ​ព្យាយាម​ដែល​នៅ​សល់​​​​មុន​ពេល​ដែល​អ្នក​ត្រូវ​​ទាក់ទង​​ក្រុមហ៊ុន​បញ្ជូន​​ដើម្បី​ដោះ​សោ​ឧបករណ៍​របស់​អ្នក។"</item>
@@ -2332,7 +2338,8 @@
     <string name="sim_notification_title" msgid="6272913297433198340">"ស៊ីមកាតត្រូវបានប្តូរ។"</string>
     <string name="sim_notification_summary" msgid="5024470200658902406">"ប៉ះដើម្បីកំណត់"</string>
     <string name="sim_pref_divider" msgid="6778907671867621874">"ស៊ីម​ពេញ​ចិត្ត​សម្រាប់"</string>
-    <string name="sim_calls_ask_first_prefs_title" msgid="7328134172516945288">"សួរ​គ្រប់​ពេល"</string>
+    <!-- no translation found for sim_calls_ask_first_prefs_title (7941299533514115976) -->
+    <skip />
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"ជម្រើស​ដែលទាមទារ"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"ការកំណត់"</string>
     <string name="search_results_title" msgid="1796252422574886932">"ការកំណត់"</string>
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
index edde621..e292bb7 100644
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn-rIN/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"ಸಂಪರ್ಕ ಕಡಿತಗೊಳಿಸುವುದೇ?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"ಇದರೊಂದಿಗೆ ನಿಮ್ಮ ಸಂಪರ್ಕವನ್ನು ಇದು ಕೊನೆಗೊಳಿಸುತ್ತದೆ:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"ಬ್ಲೂಟೂತ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಬದಲಾಯಿಸಲು ನೀವು ಅನುಮತಿ ಹೊಂದಿಲ್ಲ."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"ಬ್ಲೂಟೂತ್‌‌ ತೆರೆದಾಗ ಸಮೀಪ ಸಾಧನಗಳಲ್ಲಿ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ಕಾಣಿಸುತ್ತದೆ."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"ಬ್ಲೂಟೂತ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳು ಮುಕ್ತವಾಗಿರುವಾಗ ಸಮೀಪದ ಸಾಧನಗಳಿಗೆ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ಗೋಚರಿಸುತ್ತದೆ."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ಸಂಪರ್ಕ ಕಡಿತಗೊಳಿಸುವುದೇ?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"ಪ್ರಸಾರ ಮಾಡಲಾಗುತ್ತಿದೆ"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"ಪ್ರೊಫೈಲ್ ಅನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸುವುದೇ?"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Wi‑Fi, ಬ್ಲೂಟೂತ್, ಏರ್‌ಪ್ಲೇನ್ ಮೋಡ್, ಸೆಲ್ಯುಲಾರ್ ನೆಟ್‌ವರ್ಕ್‌ಗಳು &amp; VPN ಗಳನ್ನು ನಿರ್ವಹಿಸಿ"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"ಸೆಲ್ಯುಲಾರ್ ಡೇಟಾ"</string>
     <string name="calls_title" msgid="3544471959217176768">"ಕರೆಗಳು"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"SMS ಸಂದೇಶಗಳು"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"SMS ಸಂದೇಶಗಳು"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"ಸೆಲ್ಯುಲಾರ್ ನೆಟ್‌ವರ್ಕ್ ಮೂಲಕ ಡೇಟಾ ಬಳಕೆ ಅನುಮತಿಸಿ"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"ರೋಮಿಂಗ್‌ನಲ್ಲಿರುವಾಗ ಡೇಟಾ ಬಳಕೆಯನ್ನು ಅನುಮತಿಸಿ"</string>
     <string name="roaming" msgid="3596055926335478572">"ಡೇಟಾ ರೋಮಿಂಗ್"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"ಮಧ್ಯಮದಿಂದ ಅಧಿಕವರೆಗೆ ಭದ್ರತೆ"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"ಪಾಸ್‌ವರ್ಡ್"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"ಅಧಿಕ ಭದ್ರತೆ"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"ಸಾಧನದ ರಕ್ಷಣೆ ವೈಶಿಷ್ಟ್ಯಗಳು ಇನ್ನು ಮುಂದೆ ಕಾರ್ಯನಿರ್ವಹಿಸುವುದಿಲ್ಲ."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"ನಿರ್ವಾಹಕ, ಎನ್‌ಕ್ರಿಪ್ಷನ್, ಅಥವಾ ರುಜುವಾತು ಸಂಗ್ರಹಣೆಯಿಂದ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"ಯಾವುದೂ ಇಲ್ಲ"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"ಸ್ವೈಪ್"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"ಅನ್‌ಲಾಕ್ ನಮೂನೆಯನ್ನು ತೆಗೆದುಹಾಕು"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"ಅನ್‌ಲಾಕ್ ಪಿನ್‌ ತೆಗೆದುಹಾಕು"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"ಅನ್‌ಲಾಕ್ ಪಾಸ್‌ವರ್ಡ್ ತೆಗೆದುಹಾಕು"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"ಪರದೆ ಲಾಕ್ ತೆಗೆದುಹಾಕಿ"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"ಅನ್‌ಲಾಕ್ ನಮೂನೆಯನ್ನು ಬದಲಾಯಿಸಿ"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"ಅನ್‌ಲಾಕ್ ಪಿನ್‌ ಬದಲಾಯಿಸಿ"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"ಅನ್‌ಲಾಕ್ ಪಾಸ್‌ವರ್ಡ್‌ ಬದಲಾಯಿಸಿ"</string>
@@ -860,6 +862,8 @@
     <string name="sim_multi_sims_summary" msgid="7018740080801483990">"ಸೆಲ್ಯುಲಾರ್ ಡೇಟಾಗೆ ನೀವು ಬಯಸುವ ಸಿಮ್‌ ಆಯ್ಕೆಮಾಡಿ."</string>
     <string name="sim_change_data_title" msgid="294357201685244532">"ಡೇಟಾ ಸಿಮ್‌ ಬದಲಾಯಿಸುವುದೇ?"</string>
     <string name="sim_change_data_message" msgid="1313940695939674633">"ಸೆಲ್ಯುಲಾರ್ ಡೇಟಾಗಾಗಿ <xliff:g id="OLD_SIM">%2$s</xliff:g> ಬದಲಿಗೆ <xliff:g id="NEW_SIM">%1$s</xliff:g> ಅನ್ನು ಬಳಸುವುದೇ?"</string>
+    <string name="sim_preferred_title" msgid="5567909634636045268">"ಪ್ರಾಶಸ್ತ್ಯದ SIM ಕಾರ್ಡ್ ನವೀಕರಿಸುವುದೇ?"</string>
+    <string name="sim_preferred_message" msgid="301251431163650167">"ನಿಮ್ಮ ಸಾಧನದಲ್ಲಿ <xliff:g id="NEW_SIM">%1$s</xliff:g> SIM ಮಾತ್ರ ಇದೆ. ಸೆಲ್ಯುಲಾರ್ ಡೇಟಾ, ಕರೆಗಳು ಮತ್ತು SMS ಸಂದೇಶಗಳಿಗೆ ನೀವು ಈ SIM ಬಳಸಬೇಕೆಂದು ಬಯಸುತ್ತೀರಾ?"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"ಸಿಮ್‌ ಪಿನ್‌ ಕೋಡ್‌ ತಪ್ಪಾಗಿದೆ ನಿಮ್ಮ ಸಾಧನವನ್ನು ಅನ್‌ಲಾಕ್‌ ಮಾಡಲು ನೀವು ಈ ಕೂಡಲೇ ನಿಮ್ಮ ವಾಹಕವನ್ನು ಸಂಪರ್ಕಿಸಬೇಕು."</string>
   <plurals name="wrong_pin_code">
     <item quantity="one" msgid="4840607930166101114">"ಸಿಮ್‌ ಪಿನ್‌ ಕೋಡ್ ತಪ್ಪಾಗಿದೆ, ನಿಮ್ಮ ಸಾಧನವನ್ನು ಅನ್‌ಲಾಕ್ ಮಾಡುವ ಸಲುವಾಗಿ ನಿಮ್ಮ ವಾಹಕವನ್ನು ನೀವು ಸಂಪರ್ಕಿಸುವುದಕ್ಕೂ ಮೊದಲು ನಿಮ್ಮಲ್ಲಿ <xliff:g id="NUMBER">%d</xliff:g> ಪ್ರಯತ್ನಗಳು ಬಾಕಿ ಉಳಿದಿವೆ."</item>
@@ -2332,7 +2336,8 @@
     <string name="sim_notification_title" msgid="6272913297433198340">"ಸಿಮ್‌ ಕಾರ್ಡ್‌ಗಳನ್ನು ಬದಲಾಯಿಸಲಾಗಿದೆ."</string>
     <string name="sim_notification_summary" msgid="5024470200658902406">"ಹೊಂದಿಸಲು ಸ್ಪರ್ಶಿಸಿ"</string>
     <string name="sim_pref_divider" msgid="6778907671867621874">"ಇದಕ್ಕಾಗಿ ಪ್ರಾಶಸ್ತ್ಯದ SIM"</string>
-    <string name="sim_calls_ask_first_prefs_title" msgid="7328134172516945288">"ಪ್ರತಿ ಬಾರಿ ಕೇಳು"</string>
+    <!-- no translation found for sim_calls_ask_first_prefs_title (7941299533514115976) -->
+    <skip />
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"ಆಯ್ಕೆ ಅಗತ್ಯವಿದೆ"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="search_results_title" msgid="1796252422574886932">"ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
diff --git a/res/values-ko/arrays.xml b/res/values-ko/arrays.xml
index 8c7ae9f..b962bf2 100644
--- a/res/values-ko/arrays.xml
+++ b/res/values-ko/arrays.xml
@@ -153,7 +153,7 @@
   <string-array name="wifi_sleep_policy_entries">
     <item msgid="3269131034472904310">"항상"</item>
     <item msgid="844721238536786870">"충전 중인 경우에만"</item>
-    <item msgid="1986753720941888596">"절전 모드로 전환 안함"</item>
+    <item msgid="1986753720941888596">"안함"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries_wifi_only">
     <item msgid="2124319326282651391">"항상"</item>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 7fdbb97..3a9a09e 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"연결을 해제하시겠습니까?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;와(과) 연결이 끊어집니다.&lt;br&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"블루투스 설정을 변경할 권한이 없습니다."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"블루투스 설정이 열려 있는 동안 <xliff:g id="DEVICE_NAME">%1$s</xliff:g>이(가) 주변의 기기에 표시됩니다."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"블루투스 설정이 열려 있는 동안 <xliff:g id="DEVICE_NAME">%1$s</xliff:g>이(가) 주변의 기기에 표시됩니다."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>을(를) 연결 해제하시겠습니까?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"브로드캐스팅"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"프로필을 사용 중지하시겠습니까?"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Wi‑Fi, 블루투스, 비행기 모드, 이동통신망 및 VPN을 관리합니다."</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"셀룰러 데이터"</string>
     <string name="calls_title" msgid="3544471959217176768">"통화"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"SMS 메시지"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"SMS 메시지"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"이동통신망 데이터 사용 허용"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"로밍 중 데이터 사용 허용"</string>
     <string name="roaming" msgid="3596055926335478572">"데이터 로밍"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"중상급 보안"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"비밀번호"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"상급 보안"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"기기 보호 기능이 더 이상 작동하지 않습니다."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"관리자, 암호화 정책 또는 자격증명 저장소로 인해 사용 중지됨"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"없음"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"스와이프"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"잠금해제 패턴 삭제"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"잠금해제 PIN 삭제"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"잠금해제 비밀번호 삭제"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"화면 잠금 삭제"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"잠금해제 패턴 변경"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"잠금해제 PIN 변경"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"잠금해제 비밀번호 변경"</string>
@@ -860,6 +862,10 @@
     <string name="sim_multi_sims_summary" msgid="7018740080801483990">"셀룰러 데이터에 사용할 SIM을 선택하세요."</string>
     <string name="sim_change_data_title" msgid="294357201685244532">"데이터 SIM을 변경하시겠습니까?"</string>
     <string name="sim_change_data_message" msgid="1313940695939674633">"모바일 네트워크 연결에 <xliff:g id="NEW_SIM">%1$s</xliff:g> 대신 <xliff:g id="OLD_SIM">%2$s</xliff:g>을(를) 사용하시겠습니까?"</string>
+    <!-- no translation found for sim_preferred_title (5567909634636045268) -->
+    <skip />
+    <!-- no translation found for sim_preferred_message (301251431163650167) -->
+    <skip />
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"SIM PIN 코드가 잘못되었습니다. 이동통신사에 문의하여 기기를 잠금 해제해야 합니다."</string>
   <plurals name="wrong_pin_code">
     <item quantity="one" msgid="4840607930166101114">"SIM PIN 코드가 잘못되었습니다. <xliff:g id="NUMBER">%d</xliff:g>회 이상 실패할 경우 이동통신사에 문의하여 기기를 잠금 해제해야 합니다."</item>
@@ -2332,7 +2338,8 @@
     <string name="sim_notification_title" msgid="6272913297433198340">"SIM 카드가 변경됨"</string>
     <string name="sim_notification_summary" msgid="5024470200658902406">"설정하려면 터치하세요."</string>
     <string name="sim_pref_divider" msgid="6778907671867621874">"다음 작업에 대하여 선호하는 SIM"</string>
-    <string name="sim_calls_ask_first_prefs_title" msgid="7328134172516945288">"항상 확인"</string>
+    <!-- no translation found for sim_calls_ask_first_prefs_title (7941299533514115976) -->
+    <skip />
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"선택 필요"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"설정"</string>
     <string name="search_results_title" msgid="1796252422574886932">"설정"</string>
diff --git a/res/values-ky-rKG/strings.xml b/res/values-ky-rKG/strings.xml
index 59bfaf3..d3c6aff 100644
--- a/res/values-ky-rKG/strings.xml
+++ b/res/values-ky-rKG/strings.xml
@@ -206,7 +206,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Ажыратылсынбы?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Бул кийинкилер менен болгон байланышты үзөт:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"Bluetooth жөндөөлөрүн өзгөртүүгө уруксатыңыз жок."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"Bluetooth жөндөөлрү ачылп тургнд жакын арадгы <xliff:g id="DEVICE_NAME">%1$s</xliff:g> түзмөк көрүнт."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"Bluetooth жөндөөлөрү ачылып турганда <xliff:g id="DEVICE_NAME">%1$s</xliff:g> жакын арадагы түзмөктөргө көрүнөт."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ажыратылсынбы?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Кеңири таратуу"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Профайлды өчүрөсүзбү?"</string>
@@ -456,7 +456,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Wi‑Fi, Bluetooth, учак режимин, уюктук тармактарды, &amp; VPN\'дерди башкаруу"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Уюктук дайындар"</string>
     <string name="calls_title" msgid="3544471959217176768">"Чалуулар"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"SMS билдирүүлөрү"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"SMS билдирүүлөр"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"Уюктук тармак ичинде дайындарды пайдаланууга мүмкүндүк берүү"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Роуминг учурунда дайындарды пайдаланууга уруксат берүү"</string>
     <!-- no translation found for roaming (3596055926335478572) -->
@@ -606,6 +606,7 @@
     <!-- no translation found for unlock_set_unlock_password_title (8775603825675090937) -->
     <skip />
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Коопсуздугу жогору"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Мындан ары түзмөктү коргоо мүмкүнчүлүктөрү иштебейт."</string>
     <!-- no translation found for unlock_set_unlock_disabled_summary (2120729867788851674) -->
     <skip />
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Жок"</string>
@@ -622,6 +623,7 @@
     <skip />
     <!-- no translation found for unlock_disable_lock_password_summary (192161194564577025) -->
     <skip />
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"Экран кулпусун алып салуу"</string>
     <!-- no translation found for unlock_change_lock_pattern_title (2044092014872741130) -->
     <skip />
     <!-- no translation found for unlock_change_lock_pin_title (806629901095938484) -->
@@ -1232,6 +1234,10 @@
     <string name="sim_multi_sims_summary" msgid="7018740080801483990">"Уюктук дайындар үчүн артыкчылыктуу SIM\'ди тандаңыз."</string>
     <string name="sim_change_data_title" msgid="294357201685244532">"Дайындар SIM\'и өзгөртүлсүнбү?"</string>
     <string name="sim_change_data_message" msgid="1313940695939674633">"Уюлдук дайындар үчүн <xliff:g id="OLD_SIM">%2$s</xliff:g> ордуна <xliff:g id="NEW_SIM">%1$s</xliff:g> колдонулсунбу?"</string>
+    <!-- no translation found for sim_preferred_title (5567909634636045268) -->
+    <skip />
+    <!-- no translation found for sim_preferred_message (301251431163650167) -->
+    <skip />
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"SIM-карта PIN-коду туура эмес. Эми түзмөктү бөгөттөн чыгарыш үчүн операторуңузга кайрылышыңыз керек."</string>
   <plurals name="wrong_pin_code">
     <item quantity="one" msgid="4840607930166101114">"SIM PIN-коду туура эмес, сизде <xliff:g id="NUMBER">%d</xliff:g> аракет калды. Болбосо, түзмөктү бөгөттөн чыгарыш үчүн операторуңузга кайрылышыңыз керек."</item>
@@ -3234,7 +3240,8 @@
     <string name="sim_notification_title" msgid="6272913297433198340">"SIM-карталар алмаштырылды."</string>
     <string name="sim_notification_summary" msgid="5024470200658902406">"Орнотуу үчүн тийиңиз"</string>
     <string name="sim_pref_divider" msgid="6778907671867621874">"Төмөнкү үчүн тандалган SIM"</string>
-    <string name="sim_calls_ask_first_prefs_title" msgid="7328134172516945288">"Чалган сайын суралсын"</string>
+    <!-- no translation found for sim_calls_ask_first_prefs_title (7941299533514115976) -->
+    <skip />
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Тандоо керек"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Жөндөөлөр"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Жөндөөлөр"</string>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index d7214d6..3199718 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"ຕັດການເຊື່ອມຕໍ່ຫຼືບໍ່?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"ນີ້ຈະເປັນການຢຸດການເຊື່ອມຕໍ່ຂອງທ່ານກັບ:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"ທ່ານ​ບໍ່​ມີ​ສິດ​ອະນຸຍາດ​ໃນ​ການ​ແກ້ໄຂ​ການ​ຕັ້ງຄ່າ Bluetooth."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ສາ​ມາດ​ເບິ່ງ​ເຫັນ​ໄດ້​ໂດຍ​ອຸ​ປະ​ກອນ​ທີ່​ຢູ່​ໃກ້​ຄຽງ​ເມື່ອ​​ເປີດ​ໃຊ້ Blueooth."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ສາ​ມາດ​ໃຫ້​ອຸ​ປະ​ກອນ​ໃກ້​ຄຽງ​ເຫັນ​ໄດ້ ໃນ​ຂະ​ນະ​ທີ່ການ​ຕັ້ງ​ຄ່າ Bluetooth ເປີດ."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"​ຕັດ​ການ​ເຊື່ອມ​ຕ​ໍ່ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ບໍ່?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"ການກະ​ຈາຍ​ສັນຍານ"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"ປິດການນຳໃຊ້ໂປຣໄຟລ໌?"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"ຈັດ​ການ Wi‑Fi, Bluetooth, ໂໝດ​ຢູ່​ໃນ​ຍົນ, ເຄືອ​ຂ່າຍ​ມື​ຖື &amp; VPNs"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"​ຂໍ້​ມູນ​ອິນ​ເຕີ​ເນັດ​ມື​ຖື"</string>
     <string name="calls_title" msgid="3544471959217176768">"​​ການ​ໂທ"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"ຂໍ້​ຄວາມ SMS"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"ຂໍ້​ຄວາມ SMS"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"​ອະ​ນຸ​ຍາດ​ໃຫ້​ນຳ​ໃຊ້​ຂໍ້​ມູນ​ຜ່ານ​ເຄືອ​ຂ່າຍ​ໂທ​ລະ​ສັບ"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"​ອະ​ນຸ​ຍາດ​ໃຫ້​ມີ​ການ​ນຳ​ໃຊ້​ຂໍ້​ມູນ​ເມື່ອ​ໂຣມ​ມິງ"</string>
     <string name="roaming" msgid="3596055926335478572">"ການໂຣມມິງຂໍ້ມູນ"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"ຄວາມປອດໄພລະດັບປານກາງຫາສູງ"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"ລະຫັດຜ່ານ"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"ຄວາມ​ປອດ​ໄພ​ສູງ​"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"ຄຸນ​ສົມ​ບັດ​ການ​ປົກ​ປ້ອງ​ອຸ​ປະ​ກອນ​ຈະ​ບໍ່​ເຮັດ​ວຽກ​ອີກ."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"ຖືກປິດການນຳໃຊ້ໂດຍຜູ່ເບິ່ງແຍງລະບົບ, ນະໂຍບາຍການເຂົ້າລະຫັດ ຫຼືບ່ອນເກັບຂໍ້ມູນຮັບຮອງ"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"ບໍ່ໃຊ້"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"ປັດ​ໄປ​ຂ້າງ"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"ລຶບຮູບແບບການປົດລັອກ"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"ລຶບລະຫັດ PIN ປົດລັອກ"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"ລຶບລະຫັດປົດລັອກ"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"ເອົາ​ລັອກ​ໜ້າ​ຈຳ​ອອກ"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"ປ່ຽນຮູບແບບການປົດລັອກ"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"ປ່ຽນລະຫັດປົດລັອກ PIN"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"ປ່ຽນລະຫັດປົດລັອກ"</string>
@@ -860,6 +862,10 @@
     <string name="sim_multi_sims_summary" msgid="7018740080801483990">"ເລືອກ SIM ທີ່​ທ່ານ​ຕ້ອງ​ການ​ໃຊ້​ສຳ​ລັບ​ຂໍ້​ມູນ​ມື​ຖື."</string>
     <string name="sim_change_data_title" msgid="294357201685244532">"​ປ່ຽນ​ຊິມ​ຂໍ້​ມູນຫຼື​ບໍ່?"</string>
     <string name="sim_change_data_message" msgid="1313940695939674633">"​ໃຊ້ <xliff:g id="NEW_SIM">%1$s</xliff:g> ​ແທນ <xliff:g id="OLD_SIM">%2$s</xliff:g> ​ສຳ​ລັບ​ຂໍ້​ມູນ​ເຄືອ​ຂ່າຍ​ໂທ​ລະ​ສັບຫຼື​ບໍ່?"</string>
+    <!-- no translation found for sim_preferred_title (5567909634636045268) -->
+    <skip />
+    <!-- no translation found for sim_preferred_message (301251431163650167) -->
+    <skip />
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"ລະຫັດ PIN ຂອງ SIM ບໍ່ຖືກຕ້ອງທ່ານຕ້ອງຕິດຕໍ່ຫາຜູ່ໃຫ້ບໍລິການຂອງທ່ານ ເພື່ອປົດລັອກອຸປະກອນຂອງທ່ານ."</string>
   <plurals name="wrong_pin_code">
     <item quantity="one" msgid="4840607930166101114">"ລະຫັດ PIN ຂອງ SIM ບໍ່ຖືກຕ້ອງ, ທ່ານສາມາດລອງໄດ້ອີກ <xliff:g id="NUMBER">%d</xliff:g> ເທື່ອກ່ອນທີ່ທ່ານຈະຕ້ອງຕິດຕໍ່ຫາຜູ່ໃຫ້ບໍລິການຂອງທ່ານ ເພື່ອປົດລັອກອຸປະກອນຂອງທ່ານ."</item>
@@ -2332,7 +2338,8 @@
     <string name="sim_notification_title" msgid="6272913297433198340">"ປ່ຽນ​ແຜ່ນ SIM ແລ້ວ."</string>
     <string name="sim_notification_summary" msgid="5024470200658902406">"ແຕະເພື່ອຕັ້ງ"</string>
     <string name="sim_pref_divider" msgid="6778907671867621874">"​ຊິມ​ທີ່​ໃຊ້​ສຳ​ລັບ"</string>
-    <string name="sim_calls_ask_first_prefs_title" msgid="7328134172516945288">"​ຖາມ​ທຸກ​ເທື່ອ"</string>
+    <!-- no translation found for sim_calls_ask_first_prefs_title (7941299533514115976) -->
+    <skip />
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"ຕ້ອງເລືອກ​ອັນໃດອັນນຶ່ງ"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"ການ​ຕັ້ງ​ຄ່າ"</string>
     <string name="search_results_title" msgid="1796252422574886932">"​ການ​ຕັ້ງ​ຄ່າ"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 1e8d484..4543030 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Atsijungti?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Tai nutrauks ryšį su:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"Neturite leidimo keisti „Bluetooth“ nustatymų."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"„<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“ matomas netol. esant. įreng., kai atidar. „Bluetooth“ nustat."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"„<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“ matomas netoliese esantiems įrenginiams, kai atidaryti „Bluetooth“ nustatymai."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Atjungti „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Transliavimas"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Neleisti profilio?"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Tvarkykite „Wi‑Fi“, „Bluetooth“, lėktuvo režimą, korinius tinklus ir VPN"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Korinio ryšio duomenys"</string>
     <string name="calls_title" msgid="3544471959217176768">"Skambučiai"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"SMS pranešimai"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"SMS pranešimai"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"Leisti duomenų naudojimą koriniu tinklu"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Leisti duom. naud. tarp. ryš."</string>
     <string name="roaming" msgid="3596055926335478572">"Tarptinklinis duomenų ryšys"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Vidutinis–aukštas saugos lygis"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Slaptažodis"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Aukštas saugos lygis"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Įrenginio apsaugos funkcijos nebeveiks."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Neleido: administr., šifrav. polit. ar įgalioj. atmint."</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Nėra"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Perbraukti"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Pašalinti atrakinimo modelį"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Pašalinti atrakinimo PIN kodą"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Pašalinti atrakinimo slaptažodį"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"Pašalinti ekrano užraktą"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Keisti atrakinimo modelį"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Pakeisti atrakinimo PIN kodą"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Pakeisti atrakinimo slaptažodį"</string>
@@ -860,6 +862,10 @@
     <string name="sim_multi_sims_summary" msgid="7018740080801483990">"Pasirinkite norimą SIM korinio ryšio duomenims."</string>
     <string name="sim_change_data_title" msgid="294357201685244532">"Keisti duomenų SIM?"</string>
     <string name="sim_change_data_message" msgid="1313940695939674633">"Korinio ryšio duomenims naudoti <xliff:g id="NEW_SIM">%1$s</xliff:g> vietoje <xliff:g id="OLD_SIM">%2$s</xliff:g>?"</string>
+    <!-- no translation found for sim_preferred_title (5567909634636045268) -->
+    <skip />
+    <!-- no translation found for sim_preferred_message (301251431163650167) -->
+    <skip />
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"Netinkamas SIM kortelės PIN kodas. Reikės susisiekti su operatoriumi, kad atrakintų įrenginį."</string>
   <plurals name="wrong_pin_code">
     <item quantity="one" msgid="4840607930166101114">"Netinkamas SIM kortelės PIN kodas. Jums liko <xliff:g id="NUMBER">%d</xliff:g> band. Paskui reikės susisiekti su operatoriumi, kad jis atrakintų įrenginį."</item>
@@ -2332,7 +2338,8 @@
     <string name="sim_notification_title" msgid="6272913297433198340">"SIM kortelės pasikeitė."</string>
     <string name="sim_notification_summary" msgid="5024470200658902406">"Jei norite nustatyti, palieskite"</string>
     <string name="sim_pref_divider" msgid="6778907671867621874">"Pageidautina SIM, skirta"</string>
-    <string name="sim_calls_ask_first_prefs_title" msgid="7328134172516945288">"Klausti kaskart"</string>
+    <!-- no translation found for sim_calls_ask_first_prefs_title (7941299533514115976) -->
+    <skip />
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Būtina pasirinkti"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Nustatymai"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Nustatymai"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 9b35b3e..de4c644 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Vai pārtraukt savienojumu?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Tiks pārtraukts savienojums ar:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"Jums nav atļaujas mainīt Bluetooth iestatījumus."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"Kamēr Bluetooth iestatījumi atvērti, ierīce <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ir redzama citām ierīcēm tuvumā."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"Kamēr Bluetooth iestatījumi atvērti, ierīce <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ir redzama citām ierīcēm tuvumā."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Vai atvienot <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Apraidīšana"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Vai atspējot profilu?"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Wi-Fi, Bluetooth, lidojuma režīma, mobilo tīklu un VPN pārvaldība"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Mobilie dati"</string>
     <string name="calls_title" msgid="3544471959217176768">"Zvani"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"Īsziņas"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"Īsziņas"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"Atļaut datu izmantošanu mobilajā tīklā"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Datu lietojums viesabonēšanā"</string>
     <string name="roaming" msgid="3596055926335478572">"Datu viesabonēšana"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Vidējs līdz augsts drošības līmenis"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Parole"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Augsts drošības līmenis"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Ierīces aizsardzības funkcijas vairs nedarbosies."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Atspēj. admin., šifr. polit. vai akred. datu krāt."</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Nav"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Vilkt"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Noņemt atbloķēšanas kombināciju"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Noņemt atbloķēšanas PIN"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Noņemt atbloķēšanas paroli"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"Noņemt ekrāna bloķēšanu"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Atbloķēšanas kombinācijas maiņa"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Mainīt atbloķēšanas PIN"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Mainīt atbloķēšanas paroli"</string>
@@ -860,6 +862,10 @@
     <string name="sim_multi_sims_summary" msgid="7018740080801483990">"Izvēlieties SIM karti, kuru izmantot mobilajiem datiem."</string>
     <string name="sim_change_data_title" msgid="294357201685244532">"Vai mainīt datu SIM karti?"</string>
     <string name="sim_change_data_message" msgid="1313940695939674633">"Vai mobilajiem datiem lietot <xliff:g id="NEW_SIM">%1$s</xliff:g>, nevis <xliff:g id="OLD_SIM">%2$s</xliff:g>?"</string>
+    <!-- no translation found for sim_preferred_title (5567909634636045268) -->
+    <skip />
+    <!-- no translation found for sim_preferred_message (301251431163650167) -->
+    <skip />
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"Nepareizs SIM kartes PIN kods. Lai atbloķētu ierīci, sazinieties ar mobilo sakaru operatoru."</string>
   <plurals name="wrong_pin_code">
     <item quantity="one" msgid="4840607930166101114">"Nepareizs SIM kartes PIN kods. Varat mēģināt vēl <xliff:g id="NUMBER">%d</xliff:g> reizi. Kļūdas gadījumā būs jāsazinās ar mobilo sakaru operatoru, lai tas atbloķētu jūsu ierīci."</item>
@@ -2332,7 +2338,8 @@
     <string name="sim_notification_title" msgid="6272913297433198340">"SIM kartes nomainītas."</string>
     <string name="sim_notification_summary" msgid="5024470200658902406">"Pieskarieties, lai iestatītu"</string>
     <string name="sim_pref_divider" msgid="6778907671867621874">"Vēlamā SIM karte šai ierīcei:"</string>
-    <string name="sim_calls_ask_first_prefs_title" msgid="7328134172516945288">"Vaicāt katru reizi"</string>
+    <!-- no translation found for sim_calls_ask_first_prefs_title (7941299533514115976) -->
+    <skip />
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Nepieciešams veikt atlasi."</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Iestatījumi"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Iestatījumi"</string>
diff --git a/res/values-mk-rMK/strings.xml b/res/values-mk-rMK/strings.xml
index 0d86773..cde4873 100644
--- a/res/values-mk-rMK/strings.xml
+++ b/res/values-mk-rMK/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Исклучи?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Ова ќе ја прекине вашата врска со:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"Немате дозвола за промена на поставките на Bluetooth."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> е видлив кога се отворени Поставки за Bluetooth."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> е видлив за уредите во близина кога се отворени Поставки за Bluetooth."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Исклучи <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Емитување"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Оневозможи профил?"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Управувајте со Wi‑Fi, Bluetooth, режим на летање со авион, мобилни мрежи и ВПН-мрежи"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Мобилни податоци"</string>
     <string name="calls_title" msgid="3544471959217176768">"Повици"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"СМС-пораки"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"СМС-пораки"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"Дозв. корист. подат. преку мобилна мрежа"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Дозв. корист. подат. во роам."</string>
     <string name="roaming" msgid="3596055926335478572">"Роаминг на податоци"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Средно до високо ниво на безбедност"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Лозинка"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Високо ниво на безбедност"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Карактеристиките за заштита на уредот повеќе нема да работат."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Оневозм. од админ., шифрир. или мемо. за акредит."</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Ниедна"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Повлечи"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Отстрани шема на отклучување"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Отстрани ПИН за отклучување"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Отстрани лозинка за отклучување"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"Отстрани заклучување на екранот"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Смени шема на отклуч."</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Промени ПИН за отклучување"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Смени лозинка за откл."</string>
@@ -860,6 +862,10 @@
     <string name="sim_multi_sims_summary" msgid="7018740080801483990">"Изберете ја СИМ-картичката што ја претпочитате за мобилни податоци."</string>
     <string name="sim_change_data_title" msgid="294357201685244532">"Да се промени СИМ за податоци?"</string>
     <string name="sim_change_data_message" msgid="1313940695939674633">"Да се користи <xliff:g id="NEW_SIM">%1$s</xliff:g> наместо <xliff:g id="OLD_SIM">%2$s</xliff:g> за мобилни податоци?"</string>
+    <!-- no translation found for sim_preferred_title (5567909634636045268) -->
+    <skip />
+    <!-- no translation found for sim_preferred_message (301251431163650167) -->
+    <skip />
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"ПИН кодот за СИМ картичката е неточен. Контактирате со вашиот оператор да го отклучи уредот."</string>
   <plurals name="wrong_pin_code">
     <item quantity="one" msgid="4840607930166101114">"Неточен ПИН за СИМ картичката, ви преостанува уште <xliff:g id="NUMBER">%d</xliff:g> обид пред да мора да контактирате со вашиот оператор за да го отклучи вашиот уред."</item>
@@ -2332,7 +2338,8 @@
     <string name="sim_notification_title" msgid="6272913297433198340">"СИМ-картичките се променети."</string>
     <string name="sim_notification_summary" msgid="5024470200658902406">"Допрете за да поставите"</string>
     <string name="sim_pref_divider" msgid="6778907671867621874">"Претпочитана СИМ-картичка за"</string>
-    <string name="sim_calls_ask_first_prefs_title" msgid="7328134172516945288">"Секогаш прашувај"</string>
+    <!-- no translation found for sim_calls_ask_first_prefs_title (7941299533514115976) -->
+    <skip />
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Потребно е да се избере"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Поставки"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Поставки"</string>
diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml
index 97ee7be..791dc70 100644
--- a/res/values-ml-rIN/strings.xml
+++ b/res/values-ml-rIN/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"വിച്ഛേദിക്കണോ?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"ഇത് ഇനിപ്പറയുന്നതുമായുള്ള നിങ്ങളുടെ കണക്ഷൻ അവസാനിപ്പിക്കും:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"ബ്ലൂടൂത്ത് ക്രമീകരണങ്ങൾ മാറ്റാൻ നിങ്ങൾക്ക് അനുമതിയില്ല."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"ബ്ലൂടൂത്ത് ക്രമീകരണങ്ങൾ തുറന്നിരിക്കുമ്പോൾ സമീപമുള്ള ഉപകരണങ്ങൾക്ക് <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ദൃശ്യമാകുന്നു."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"Bluetooth ക്രമീകരണം തുറന്നിരിക്കുമ്പോൾ വിളിപ്പാടരികെയുള്ള ഉപകരണങ്ങൾക്ക് <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ദൃശ്യമാകുന്നു."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> വിച്ഛേദിക്കണോ?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"പ്രക്ഷേപണം ചെയ്യുന്നു"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"പ്രൊഫൈൽ പ്രവർത്തനരഹിതമാക്കണോ?"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"വൈഫൈ, ബ്ലൂടൂത്ത്, ഫ്ലൈറ്റ് മോഡ്, സെല്ലുലാർ നെറ്റ്‌വർക്കുകൾ, VPN-കൾ എന്നിവ നിയന്ത്രിക്കുക"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"സെല്ലുലാർ ഡാറ്റ"</string>
     <string name="calls_title" msgid="3544471959217176768">"കോളുകൾ"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"SMS സന്ദേശങ്ങൾ"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"SMS സന്ദേശങ്ങൾ"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"സെല്ലുലാർ നെറ്റ്‌വർക്കിലൂടെ ഡാറ്റ ഉപയോഗം അനുവദിക്കുക"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"റോമിംഗിലുള്ളപ്പോൾ ഡാറ്റ ഉപയോഗം അനുവദിക്കുക"</string>
     <string name="roaming" msgid="3596055926335478572">"ഡാറ്റ റോമിംഗ്"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"ഇടത്തരം മുതൽ ഉയർന്ന സുരക്ഷ"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"പാസ്‌വേഡ്"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"ഉയർന്ന സുരക്ഷ"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"ഉപകരണ സുരക്ഷ ഫീച്ചറുകൾ ഇനി പ്രവർത്തിക്കില്ല."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"അഡ്‌മിനിസ്‌ട്രേറ്ററോ എൻക്രിപ്‌ഷൻ നയം അല്ലെങ്കിൽ ക്രെഡൻഷ്യൽ സംഭരണം ഉപയോഗിച്ചോ പ്രവർത്തനരഹിതമാക്കി"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"ഒന്നുമില്ല"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"സ്വൈപ്പുചെയ്യുക"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"അൺലോക്ക് പാറ്റേൺ നീക്കംചെയ്യുക"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"അൺലോക്ക് പിൻ നീക്കംചെയ്യുക"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"അൺലോക്ക് പാസ്‌വേഡ് നീക്കംചെയ്യുക"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"സ്‌ക്രീൻ ലോക്ക് നീക്കംചെയ്യുക"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"അൺലോക്ക് പാറ്റേൺ മാറ്റുക"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"അൺലോക്ക് പിൻ മാറ്റുക"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"അൺലോക്ക് പാസ്‌വേഡ് മാറ്റുക"</string>
@@ -860,6 +862,10 @@
     <string name="sim_multi_sims_summary" msgid="7018740080801483990">"സെല്ലുലാർ ഡാറ്റയ്‌ക്കായി നിങ്ങൾ നിർദ്ദേശിക്കുന്ന സിം തിരഞ്ഞെടുക്കുക."</string>
     <string name="sim_change_data_title" msgid="294357201685244532">"ഡാറ്റ SIM മാറ്റണോ?"</string>
     <string name="sim_change_data_message" msgid="1313940695939674633">"സെല്ലുലാർ ഡാറ്റയ്‌ക്കായി <xliff:g id="OLD_SIM">%2$s</xliff:g> എന്നതിന് പകരം <xliff:g id="NEW_SIM">%1$s</xliff:g> ഉപയോഗിക്കണോ?"</string>
+    <!-- no translation found for sim_preferred_title (5567909634636045268) -->
+    <skip />
+    <!-- no translation found for sim_preferred_message (301251431163650167) -->
+    <skip />
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"സിം പിൻ കോഡ് തെറ്റാണ്, നിങ്ങളുടെ ഉപകരണം അൺലോക്കുചെയ്യാൻ ഇപ്പോൾ നിങ്ങളുടെ കാരിയറുമായി ബന്ധപ്പെടണം."</string>
   <plurals name="wrong_pin_code">
     <item quantity="one" msgid="4840607930166101114">"തെറ്റായ സിം പിൻ കോഡ്, നിങ്ങളുടെ ഉപകരണം അൺലോക്കുചെയ്യാൻ നിങ്ങളുടെ സേവനദാതാവുമായി ബന്ധപ്പെടുന്നതിന് മുമ്പായി നിങ്ങൾക്ക് <xliff:g id="NUMBER">%d</xliff:g> ശ്രമം കൂടി ബാക്കിയുണ്ട്."</item>
@@ -2332,7 +2338,8 @@
     <string name="sim_notification_title" msgid="6272913297433198340">"SIM കാർഡുകൾ മാറ്റി."</string>
     <string name="sim_notification_summary" msgid="5024470200658902406">"സജ്ജീകരിക്കാൻ സ്‌പർശിക്കുക"</string>
     <string name="sim_pref_divider" msgid="6778907671867621874">"ഇതിനുള്ള പ്രസ്താവിത SIM"</string>
-    <string name="sim_calls_ask_first_prefs_title" msgid="7328134172516945288">"എല്ലായ്‌പ്പോഴും ചോദിക്കുക"</string>
+    <!-- no translation found for sim_calls_ask_first_prefs_title (7941299533514115976) -->
+    <skip />
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"തിരഞ്ഞെടുക്കൽ ആവശ്യമാണ്"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"ക്രമീകരണങ്ങൾ"</string>
     <string name="search_results_title" msgid="1796252422574886932">"ക്രമീകരണങ്ങൾ"</string>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index aa6dc08..e58268c 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Салгах уу?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Энэ таныг дараах холболтоос салгах болно:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"Танд Блютүүт тохиргоог өөрчлөх зөвшөөрөл байхгүй байна."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> нь Блютүүт Тохиргоо нээлттэй үед ойролцоох төхөөрөмжүүдэд харагдана."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> нь Bluetooth асаалттай үед ойрхон байгаа бусад төхөөрөмжүүдэд харагдана."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>-г салгах уу?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Цацалт"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Профайлыг идэвхгүйжүүлэх үү?"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Wi-Fi, блютүүт , нислэгийн горим, үүрэн сүлжээнүүд, &amp; VPNs-г удирдах"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Үүрэн дата"</string>
     <string name="calls_title" msgid="3544471959217176768">"Дуудлага"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"SMS Мессеж"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"SMS Мессеж"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"Үүрэн сүлжээгээр дата ашиглалтыг зөвшөөрөх"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Роуминг дээр дата ашиглалтыг зөвшөөрөх"</string>
     <string name="roaming" msgid="3596055926335478572">"Дата роуминг"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Дундажаас өндөр хамгаалалттай"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Нууц үг"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Өндөр хамгаалалттай"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Төхөөрөмжийн хамгаалалтын функцүүд цаашид ажиллахгүй."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Администратор, шифрлэлтийн бодлого, эсхүл жуухын сангаас идэвхгүйжүүлсэн"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Байхгүй"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Шудрах"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Тайлах хээг арилгах"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Тайлан PIN-г арилгана уу"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Тайлах нууц үгийг арилгах"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"Дэлгэцийн түгжээг хүчингүй болгох"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Тайлах хээг өөрчлөх"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Тайлах PIN өөрчлөх"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Тайлах нууц үгийг өөрчлөх"</string>
@@ -860,6 +862,10 @@
     <string name="sim_multi_sims_summary" msgid="7018740080801483990">"Үүрэн датад ашиглах SIM сонгох."</string>
     <string name="sim_change_data_title" msgid="294357201685244532">"SIM солих уу?"</string>
     <string name="sim_change_data_message" msgid="1313940695939674633">"Гар утасны датад зориулж <xliff:g id="NEW_SIM">%1$s</xliff:g> оронд <xliff:g id="OLD_SIM">%2$s</xliff:g>-г ашиглах уу?"</string>
+    <!-- no translation found for sim_preferred_title (5567909634636045268) -->
+    <skip />
+    <!-- no translation found for sim_preferred_message (301251431163650167) -->
+    <skip />
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"СИМ ПИН код буруу, та төхөөрөмжийн түгжээх тайлахын тулд өөрийн оператор компанитай холбоо барина уу."</string>
   <plurals name="wrong_pin_code">
     <item quantity="one" msgid="4840607930166101114">"СИМ ПИН код буруу байна, танд мобайл оператор компанитай холбогдохгүйгээр төхөөрөмжийн түгжээг тайлахад <xliff:g id="NUMBER">%d</xliff:g> оролдлого хийх боломж үлдсэн байна."</item>
@@ -2332,7 +2338,8 @@
     <string name="sim_notification_title" msgid="6272913297433198340">"SIM картуудыг өөрчилсөн байна."</string>
     <string name="sim_notification_summary" msgid="5024470200658902406">"Тохируулах бол хүрнэ үү"</string>
     <string name="sim_pref_divider" msgid="6778907671867621874">"Үндсэн SIM"</string>
-    <string name="sim_calls_ask_first_prefs_title" msgid="7328134172516945288">"Тухай бүрт асуух"</string>
+    <!-- no translation found for sim_calls_ask_first_prefs_title (7941299533514115976) -->
+    <skip />
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Сонгох шаардлагатай"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Тохиргоо"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Тохиргоо"</string>
diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr-rIN/strings.xml
index ba56249..f13951d 100644
--- a/res/values-mr-rIN/strings.xml
+++ b/res/values-mr-rIN/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"‍डिस्कनेक्ट करायचे?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"हे यासह आपले कनेक्शन समाप्त करेल:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"आपल्‍याकडे ब सेटिंग्‍ज बदलण्‍याची परवानगी नाही."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"ब सेटिंग्ज उघड्या असताना जवळपासच्या डिव्हाइसेसवर <xliff:g id="DEVICE_NAME">%1$s</xliff:g> दृश्यमान असते."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"ब्लूटुथ सेटिंग्ज उघड्या असताना जवळपासच्या डिव्हाइसेसवर <xliff:g id="DEVICE_NAME">%1$s</xliff:g> दृश्यमान असते."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> डिस्कनेक्ट करायचे?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"प्रसारण"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"प्रोफाईल अक्षम करायचे?"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"वाय-फाय, ब, विमान मोड, सेल्युलर नेटवर्क आणि VPN व्यवस्थापित करा"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"सेल्युलर डेटा"</string>
     <string name="calls_title" msgid="3544471959217176768">"कॉल"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"SMS संदेश"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"SMS संदेश"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"सेल्युलर नेटवर्कवर डेटा वापरास अनुमती द्या"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"रोमिंग करताना डेटा वापरास अनुमती द्या"</string>
     <string name="roaming" msgid="3596055926335478572">"डेटा रोमिंग"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"मध्यम ते उच्च सुरक्षा"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"संकेतशब्द"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"उच्च सुरक्षितता"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"डिव्हाइस संरक्षण वैशिष्ट्ये यापुढे कार्य करणार नाहीत."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"प्रशासकाद्वारे, कूटबद्धीकरण धोरण किंवा क्रडेन्शियल संचयनाद्वारे अक्षम केले"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"काहीही नाही"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"स्‍वाइप करा"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"नमुना अनलॉक करा काढा"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"अनलॉक पिन काढा"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"अनलॉक संकेतशब्द काढा"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"स्क्रीन लॉक काढा"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"अनलॉक नमुना बदला"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"अनलॉक पिन बदला"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"संकेतशब्द अनलॉक करा बदला"</string>
@@ -860,6 +862,10 @@
     <string name="sim_multi_sims_summary" msgid="7018740080801483990">"सेल्युलर डेटासाठी आपण प्राधान्य देता ते सिम निवडा."</string>
     <string name="sim_change_data_title" msgid="294357201685244532">"डेटा सिम बदलायचे?"</string>
     <string name="sim_change_data_message" msgid="1313940695939674633">"सेल्युलर डेटासाठी <xliff:g id="OLD_SIM">%2$s</xliff:g> ऐवजी <xliff:g id="NEW_SIM">%1$s</xliff:g> वापरायचे?"</string>
+    <!-- no translation found for sim_preferred_title (5567909634636045268) -->
+    <skip />
+    <!-- no translation found for sim_preferred_message (301251431163650167) -->
+    <skip />
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"सिम पिन कोड चुकीचा आहे आपण आता आपले डिव्‍हाइस अनलॉक करण्‍यासाठी आपल्‍या वाहकाशी संपर्क साधावा."</string>
   <plurals name="wrong_pin_code">
     <item quantity="one" msgid="4840607930166101114">"सिम पिन कोड चुकीचा आहे, आपण आपले डिव्‍हाइस अनलॉक करण्‍यासाठी आपल्‍या वाहकाशी संपर्क साधण्‍यापूर्वी आपल्‍याकडे उर्वरित <xliff:g id="NUMBER">%d</xliff:g> प्रयत्न आहेत."</item>
@@ -2332,7 +2338,8 @@
     <string name="sim_notification_title" msgid="6272913297433198340">"सिम कार्ड बदलली."</string>
     <string name="sim_notification_summary" msgid="5024470200658902406">"सेट करण्यासाठी स्पर्श करा"</string>
     <string name="sim_pref_divider" msgid="6778907671867621874">"यासाठी प्राधान्यकृत सिम"</string>
-    <string name="sim_calls_ask_first_prefs_title" msgid="7328134172516945288">"प्रत्येकवेळी विचारा"</string>
+    <!-- no translation found for sim_calls_ask_first_prefs_title (7941299533514115976) -->
+    <skip />
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"निवड आवश्यक"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"सेटिंग्ज"</string>
     <string name="search_results_title" msgid="1796252422574886932">"सेटिंग्ज"</string>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index 72bc50b..a06fb29 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Putuskan sambungan?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Tindakan ini akan menamatkan sambungan anda dengan:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"Anda tidak mempunyai kebenaran untuk menukar tetapan Bluetooth."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> blh dlihat olh prnti lain smasa Ttpan BT dibuka."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> kelihatan kepada peranti yang berhampiran semasa tetapan Bluetooth dibuka."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Putuskan sambungan <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Penyiaran"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Lumpuhkan profil?"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Urus Wi‑Fi, Bluetooth, mod pesawat, rangkaian selular &amp; VPN"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Data selular"</string>
     <string name="calls_title" msgid="3544471959217176768">"Panggilan"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"Mesej SMS"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"Mesej SMS"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"Bnrkn pgunaan data mlalui rgkian selular"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Bnrkn pgunaan data ms pryauan"</string>
     <string name="roaming" msgid="3596055926335478572">"Perayauan data"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Keselamatan sederhana ke tinggi"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Kata laluan"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Keselamatan tinggi"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Ciri-ciri perlindungan peranti tidak lagi berfungsi."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Dlumpuhkn pentadbir, dsr penyulitan/storan klayakn"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Tiada"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Leret"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Alih keluar corak buka kunci"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Alih keluar PIN buka kunci"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Alih keluar kata laluan buka kunci"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"Alih keluar kunci skrin"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Tukar corak buka kunci"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Tukar PIN buka kunci"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Tkr kta lluan bka knci"</string>
@@ -860,6 +862,10 @@
     <string name="sim_multi_sims_summary" msgid="7018740080801483990">"Pilih SIM yang anda mahu untuk data selular."</string>
     <string name="sim_change_data_title" msgid="294357201685244532">"Ubah SIM data?"</string>
     <string name="sim_change_data_message" msgid="1313940695939674633">"Gunakan <xliff:g id="NEW_SIM">%1$s</xliff:g> bukannya <xliff:g id="OLD_SIM">%2$s</xliff:g> untuk data selular?"</string>
+    <!-- no translation found for sim_preferred_title (5567909634636045268) -->
+    <skip />
+    <!-- no translation found for sim_preferred_message (301251431163650167) -->
+    <skip />
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"Kod PIN SIM tidak betul, jadi anda harus menghubungi pembawa anda untuk membuka kunci peranti."</string>
   <plurals name="wrong_pin_code">
     <item quantity="one" msgid="4840607930166101114">"Kod PIN SIM tidak betul. Anda mempunyai <xliff:g id="NUMBER">%d</xliff:g> percubaan lagi sebelum anda harus menghubungi pembawa anda untuk membuka kunci peranti."</item>
@@ -2332,7 +2338,8 @@
     <string name="sim_notification_title" msgid="6272913297433198340">"Kad SIM ditukar."</string>
     <string name="sim_notification_summary" msgid="5024470200658902406">"Sentuh untuk menyediakan"</string>
     <string name="sim_pref_divider" msgid="6778907671867621874">"SIM pilihan untuk"</string>
-    <string name="sim_calls_ask_first_prefs_title" msgid="7328134172516945288">"Tanya setiap kali"</string>
+    <!-- no translation found for sim_calls_ask_first_prefs_title (7941299533514115976) -->
+    <skip />
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Pemilihan diperlukan"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Tetapan"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Tetapan"</string>
diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml
index f943632..a06916a 100644
--- a/res/values-my-rMM/strings.xml
+++ b/res/values-my-rMM/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"ချိတ်ဆက်ခြင်းရပ်တန့်မလား?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">":&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;နှင့်ချိတ်ဆက်မှုများကို ပြီးဆုံးစေပါမည်"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"ဘလူးတုသ် ဆက်တင်များကို ပြောင်းလဲရန် သင့်ဆီမှာ ခွင့်ပြုချက် မရှိပါ။"</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"ဘလူးတုသ် ဖွင့်ထားလျှင် <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ကို အနီးရှိ ကိရိယာများ မြင်နိုင်သည်။"</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"ဘလူးတုသ် ဖွင့်ထားလျှင် <xliff:g id="DEVICE_NAME">%1$s</xliff:g> အား အနီးရှိ စက်ကိရိယာများမှ မြင်နိုင်၏။"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>ကို အဆက်ဖြတ်ရမလား?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"ထုတ်လွှင့်ခြင်း"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"ကိုယ်ရေးအချက်အလက်အား ဖျောက်မည်လား"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"ဝိုင်ဖိုင်၊ ဘလူးတုသ်၊ လေယာဉ်ပျံ မုဒ်၊ ဆယ်လူလာ ကွန်ရက်များ &amp;VPN များကို စီမံခန့်ခွဲရန်"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"ဆယ်လူလာ ဒေတာ"</string>
     <string name="calls_title" msgid="3544471959217176768">"ခေါ်ဆိုမှုများ"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"SMS စာတိုများ"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"SMS စာတိုများ"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"ဆယ်လူလာ ကွန်ရက် တစ်လျှောက် ဒေတာ သုံးစွဲမှု ခွင့်ပြုရန်"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"ရိုမင်း လုပ်ချိန်မှာ ဒေတာ သုံးစွဲမှု ခွင့်ပြုရန်"</string>
     <string name="roaming" msgid="3596055926335478572">"ကွန်ယက်ပြင်ပဒေတာအသုံးပြုခြင်း"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"အလယ်အလတ်မှ မြင့်သော လုံခြုံရေး"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"လျို့ဝှက် နံပါတ်"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"လုံခြုံရေး မြင့်မည်"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"စက်ကိရိယာကာကွယ်ရေးအင်္ဂါရပ်များ အလုပ်လုပ်မည် မဟုတ်ပါ။"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"အက်မင်၊ ပေါ်လစီ သို့ ယုံကြည်သောအကောင့်မှ ပိတ်ထားသည်"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"တစ်ခုမှမဟုတ်ပါ"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"ပွတ်ဆွဲရန်"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"ဖွင့်ရန်ပုံဖော်မှုအား ဖယ်ရှားမည်"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"သော့ဖွင့်ရန်ပင်နံပါတ်အား ဖယ်ရှားမည်"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"သော့ဖွင့်ရန်စကားဝှက်အား ဖယ်ရှားမည်"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"မှန်မျက်နှာပြင်သော့ခတ်ခြင်းအား ဖယ်ရန်"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"သော့ဖွင့်ရန်ပုံဖော်မှုအား ပြောင်းမည်"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"ပင်နံပါတ်ပြောင်းမည်"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"ဖွင့်ရန်စကားဝှက်အား ပြောင်းမည်"</string>
@@ -860,6 +862,10 @@
     <string name="sim_multi_sims_summary" msgid="7018740080801483990">"ဆယ်လူလာ ဒေတာ အတွက် သင် ပိုနှစ်သက်သည့် ဆင်းမ်ကို ရွေးရန်"</string>
     <string name="sim_change_data_title" msgid="294357201685244532">"ဒေတာ ဆင်းမ်ကို ​ပြောင်းရမလား?"</string>
     <string name="sim_change_data_message" msgid="1313940695939674633">"ဆယ်လူလာ ဒေတာအတွက် <xliff:g id="OLD_SIM">%2$s</xliff:g>အစား <xliff:g id="NEW_SIM">%1$s</xliff:g> ကို သုံးရမလား ?"</string>
+    <!-- no translation found for sim_preferred_title (5567909634636045268) -->
+    <skip />
+    <!-- no translation found for sim_preferred_message (301251431163650167) -->
+    <skip />
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"ဆင်းမ်ကဒ်၏ လျှို့ဝှက်နံပါတ် မှားနေပါသည်၊ သင်၏ စက်ပစ္စည်းကို သော့ဖွင့်ရန် ဖုန်းလိုင်းဌာနသို့ ဆက်သွယ်ရမည် ဖြစ်ပါတယ်"</string>
   <plurals name="wrong_pin_code">
     <item quantity="one" msgid="4840607930166101114">"ဆင်းမ်ကဒ်၏ လျှို့ဝှက်နံပါတ် မှားနေပါသည်၊ သင်၏ စက်ပစ္စည်းကို သော့ဖွင့်ရန်  ဖုန်းလိုင်းဌာနသို့ မဆက်သွယ်မီ သင့်တွင် <xliff:g id="NUMBER">%d</xliff:g> ခါ ကြိုးစားခွင့် ကျန်ပါသေးသည်။"</item>
@@ -2333,7 +2339,8 @@
     <string name="sim_notification_title" msgid="6272913297433198340">"ဆင်းမ်ကဒ် ပြောင်းပြီးဖြစ်၏။"</string>
     <string name="sim_notification_summary" msgid="5024470200658902406">"သတ်မှတ်ပေးရန် ထိပါ"</string>
     <string name="sim_pref_divider" msgid="6778907671867621874">"အတွက် ဦးစားပေး ဆင်းမ်"</string>
-    <string name="sim_calls_ask_first_prefs_title" msgid="7328134172516945288">"အရာတိုင်းကို မေးရန်"</string>
+    <!-- no translation found for sim_calls_ask_first_prefs_title (7941299533514115976) -->
+    <skip />
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"ရွေးချယ်ရန် လိုအပ်"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"ဆက်တင်များ"</string>
     <string name="search_results_title" msgid="1796252422574886932">"ဆက်တင်များ"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 5c00cb2..78211e3 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Vil du koble fra?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Dette vil avslutte tilkoblingen til:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"Du har ikke tillatelse til å endre Bluetooth-innstillingene."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> er synlig mens Bluetooth-innstillinger er åpen."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> er synlig mens Bluetooth-innstillinger er åpne."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Vil du koble fra <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Kringkasting"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Vil du deaktivere profilen?"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Administrer Wi-Fi, Bluetooth, flymodus, mobilnettverk og VPN"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Mobildata"</string>
     <string name="calls_title" msgid="3544471959217176768">"Anrop"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"Tekstmeldinger"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"Tekstmeldinger"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"Tillat databruk over mobilnettet"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Tillat databruk ved roaming"</string>
     <string name="roaming" msgid="3596055926335478572">"Dataroaming"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Middels til høy sikkerhet"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Passord"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Høy sikkerhet"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Funksjoner for enhetsbeskyttelse kommer ikke til å fungere lenger."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Deaktivert av admin., krypteringsregel eller legitimasjonslager"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Ingen"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Sveip"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Fjern opplåsingsmønster"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Fjern PIN-koden for opplåsing"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Fjern opplåsingspassord"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"Fjern skjermlåsen"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Endre opplåsingsmønster"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Endre PIN-koden for opplåsning"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Endre passord for opplåsning"</string>
@@ -860,6 +862,8 @@
     <string name="sim_multi_sims_summary" msgid="7018740080801483990">"Velg SIM-kortet du foretrekker for mobildata."</string>
     <string name="sim_change_data_title" msgid="294357201685244532">"Endre SIM-kort for databruk?"</string>
     <string name="sim_change_data_message" msgid="1313940695939674633">"Vil du bruke <xliff:g id="NEW_SIM">%1$s</xliff:g> i stedet for <xliff:g id="OLD_SIM">%2$s</xliff:g> for mobildata?"</string>
+    <string name="sim_preferred_title" msgid="5567909634636045268">"Oppdater foretrukket SIM-kort?"</string>
+    <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> er det eneste SIM-kortet i enheten din. Vil du bruke dette SIM-kortet for mobildata, telefonanrop og SMS-meldinger?"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"Feil PIN-kode for SIM-kortet. Du må nå kontakte operatøren din for å låse opp enheten."</string>
   <plurals name="wrong_pin_code">
     <item quantity="one" msgid="4840607930166101114">"Feil PIN-kode for SIM-kortet. Du har <xliff:g id="NUMBER">%d</xliff:g> forsøk igjen før du må kontakte operatøren din for å låse opp enheten."</item>
@@ -2332,7 +2336,8 @@
     <string name="sim_notification_title" msgid="6272913297433198340">"SIM-kortene er endret."</string>
     <string name="sim_notification_summary" msgid="5024470200658902406">"Trykk for å konfigurere"</string>
     <string name="sim_pref_divider" msgid="6778907671867621874">"Prioritert SIM-kort for"</string>
-    <string name="sim_calls_ask_first_prefs_title" msgid="7328134172516945288">"Spør hver gang"</string>
+    <!-- no translation found for sim_calls_ask_first_prefs_title (7941299533514115976) -->
+    <skip />
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Du må velge en SIM-innstilling"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Innstillinger"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Innstillinger"</string>
diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml
index a24d887..c1ef596 100644
--- a/res/values-ne-rNP/strings.xml
+++ b/res/values-ne-rNP/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"विच्छेदन गर्ने हो?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"&lt;br&gt; &lt;b&gt;: <xliff:g id="DEVICE_NAME">%1$s</xliff:g>का साथ जडान समाप्त गर्दछ &lt;/ b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"तपाईँ सँग ब्लुटुथ सेटिङ्हरू परिवर्तन गर्न अनुमति छैन।"</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"ब्लुटुथ सेटिङ् खुलामा <xliff:g id="DEVICE_NAME">%1$s</xliff:g> नजिकका उपकरणहरूमा देखिन्छ।"</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"ब्लुटुथ सेटिङहरू खुला हुँदा <xliff:g id="DEVICE_NAME">%1$s</xliff:g> लाई नजिकैका उपकरणहरू देख्न सक्नेछन्।"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>विच्छेद गर्नुहुन्छ?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"प्रसारण"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"प्रोफाइल असक्षम पार्ने हो?"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"वाइफाइ, ब्लुटुथ, हवाइजहाज मोड, सेलुलर सञ्जाल, र VPNs प्रबन्ध गर्नुहोस्"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"सेलुलर डेटा"</string>
     <string name="calls_title" msgid="3544471959217176768">"कलहरू"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"SMS सन्देशहरू"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"SMS सन्देशहरू"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"सेलुलर सञ्जालमा डेटा उपयोग गर्न अनुमति दिनुहोस्"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"रोमिङ हुँदा डेटा उपयोग अनुमति"</string>
     <string name="roaming" msgid="3596055926335478572">"डेटा रोमिङ"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"मध्यमदेखि उच्च सुरक्षा"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"पासवर्ड:"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"उच्च सुरक्षा"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"उपकरण सुरक्षा सुविधाहरूले अब उपरान्त काम गर्नेछैन।"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"प्रशासक, इन्क्रिप्सन नीति वा प्रामाणिक डेटा भण्डारणले असक्षम पारेको"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"कुनै पनि होइन"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"स्वाइप गर्नुहोस्"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"अनलक ढाँचा हटाउनुहोस्"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"अनलक PIN हटाउनुहोस्"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"अनलक पासवर्ड हटाउनुहोस्"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"स्क्रीन लक हटाउनुहोस्"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"अनलक ढाँचा बदल्नुहोस्"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"अनलक PIN परिवर्तन गर्नुहोस्"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"अनलक पासवर्ड परिवर्तन गर्नुहोस्"</string>
@@ -860,6 +862,8 @@
     <string name="sim_multi_sims_summary" msgid="7018740080801483990">"सेलुलर डेटाको लागि तपाईँको रुचिको SIM छान्नुहोस्।"</string>
     <string name="sim_change_data_title" msgid="294357201685244532">"डेटा सिम परिवर्तन गर्नुहुन्छ?"</string>
     <string name="sim_change_data_message" msgid="1313940695939674633">"सेलुलर डेटाको लागि <xliff:g id="OLD_SIM">%2$s</xliff:g> को सट्टा <xliff:g id="NEW_SIM">%1$s</xliff:g> प्रयोग गर्नुहुन्छ?"</string>
+    <string name="sim_preferred_title" msgid="5567909634636045268">"प्रमुख SIM कार्ड अपडेट गर्ने?"</string>
+    <string name="sim_preferred_message" msgid="301251431163650167">"तपाईंको उपकरणमा <xliff:g id="NEW_SIM">%1$s</xliff:g> SIM मात्र छ। के तपाईं सेलुलर डाटा, कल, र SMS सन्देशहरूका लागि यो SIM प्रयोग गर्न चाहनुहुन्छ?"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"SIM PIN कोड गलत छ तपाईंले अाफ्नो उपकरण खोल्नलाई तपाईंको वाहकसँग सम्पर्क गर्नै पर्दर्छ।"</string>
   <plurals name="wrong_pin_code">
     <item quantity="one" msgid="4840607930166101114">"SIM PIN कोड गलत छ, तपाईंले अाफ्नो उपकरण खोल्नलाई तपाईंको वाहकसँग सम्पर्क गर्नै पर्दर्छ यस अघि तपाईंसँग <xliff:g id="NUMBER">%d</xliff:g> प्रयासहरू बाँकी छ।"</item>
@@ -2332,7 +2336,8 @@
     <string name="sim_notification_title" msgid="6272913297433198340">"SIM कार्डहरू परिवर्तन गरिए।"</string>
     <string name="sim_notification_summary" msgid="5024470200658902406">"सेट अप गर्न छुनुहोस्"</string>
     <string name="sim_pref_divider" msgid="6778907671867621874">"निम्नको लागि उपयुक्त SIM"</string>
-    <string name="sim_calls_ask_first_prefs_title" msgid="7328134172516945288">"सँधै सोध्नुहोस्"</string>
+    <!-- no translation found for sim_calls_ask_first_prefs_title (7941299533514115976) -->
+    <skip />
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"छनौट आवश्यक छ"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"सेटिङहरू"</string>
     <string name="search_results_title" msgid="1796252422574886932">"सेटिङहरू"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index c2de34f..600632b 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Ontkoppelen?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Hierdoor wordt uw verbinding met:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt; verbroken"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"U heeft geen toestemming om de Bluetooth-instellingen te wijzigen."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> is zichtbaar voor apparaten in de buurt terwijl \'Bluetooth-instellingen\' is geopend."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> is zichtbaar voor apparaten in de buurt wanneer het venster \'Bluetooth-instellingen\' is geopend."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ontkoppelen?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Uitzending"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Profiel uitschakelen?"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Wifi, Bluetooth, vliegmodus, mobiele netwerken en VPN\'s beheren"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Mobiele gegevens"</string>
     <string name="calls_title" msgid="3544471959217176768">"Oproepen"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"Sms\'jes"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"Sms\'jes"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"Geg.gebruik via mobiel netwerk toestaan"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Geg.gebr. bij roaming toestaan"</string>
     <string name="roaming" msgid="3596055926335478572">"Gegevensroaming"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Gemiddelde tot zware beveiliging"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Wachtwoord"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Zware beveiliging"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Functies voor apparaatbeveiliging werken niet meer."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Uitgeschakeld door beheerder, encryptiebeleid of referentieopslag"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Geen"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Vegen"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Ontgrendelingspatroon verwijderen"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"PIN-code voor ontgrendelen verwijderen"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Ontgrendelingswachtwoord verwijderen"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"Schermvergrendeling verwijderen"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Ontgrendelingspatroon wijzigen"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"PIN-code voor ontgrendelen wijzigen"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Ontgrendelingswachtwoord wijzigen"</string>
@@ -860,6 +862,8 @@
     <string name="sim_multi_sims_summary" msgid="7018740080801483990">"Kies de simkaart die u wilt gebruiken voor mobiele gegevens."</string>
     <string name="sim_change_data_title" msgid="294357201685244532">"Sim voor gegevens wijzigen?"</string>
     <string name="sim_change_data_message" msgid="1313940695939674633">"<xliff:g id="NEW_SIM">%1$s</xliff:g> in plaats van <xliff:g id="OLD_SIM">%2$s</xliff:g> gebruiken voor mobiele gegevens?"</string>
+    <string name="sim_preferred_title" msgid="5567909634636045268">"Voorkeurs-simkaart updaten?"</string>
+    <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> is de enige simkaart in uw apparaat. Wilt u deze simkaart gebruiken voor mobiele gegevens, oproepen en sms\'jes?"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"Onjuiste pincode voor simkaart. U moet nu contact opnemen met uw provider om uw apparaat te ontgrendelen."</string>
   <plurals name="wrong_pin_code">
     <item quantity="one" msgid="4840607930166101114">"Onjuiste pincode voor simkaart. U heeft nog <xliff:g id="NUMBER">%d</xliff:g> poging over voordat u contact met uw provider moet opnemen om uw apparaat te ontgrendelen."</item>
@@ -2332,7 +2336,8 @@
     <string name="sim_notification_title" msgid="6272913297433198340">"Simkaarten gewijzigd."</string>
     <string name="sim_notification_summary" msgid="5024470200658902406">"Tik om in te stellen"</string>
     <string name="sim_pref_divider" msgid="6778907671867621874">"Voorkeurssimkaart voor"</string>
-    <string name="sim_calls_ask_first_prefs_title" msgid="7328134172516945288">"Elke keer vragen"</string>
+    <!-- no translation found for sim_calls_ask_first_prefs_title (7941299533514115976) -->
+    <skip />
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Selectie vereist"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Instellingen"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Instellingen"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index ba4156d..d8cbc1a 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Rozłączyć?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Spowoduje to zakończenie połączenia z urządzeniem:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"Nie masz uprawnień, by zmienić ustawienia Bluetootha."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> – widoczne dla urządzeń w pobliżu po otwarciu ustawień Bluetootha."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"Urządzenie <xliff:g id="DEVICE_NAME">%1$s</xliff:g> jest widoczne dla urządzeń w pobliżu, gdy są otwarte ustawienia Bluetooth."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Odłączyć urządzenie <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Transmisja"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Wyłączyć profil?"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Zarządzaj Wi‑Fi, Bluetoothem, trybem samolotowym, sieciami komórkowymi i VPN"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Komórkowa transmisja danych"</string>
     <string name="calls_title" msgid="3544471959217176768">"Połączenia"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"SMS-y"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"SMS-y"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"Zezwalaj na komórkową transmisję danych"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Transmisja danych w roamingu"</string>
     <string name="roaming" msgid="3596055926335478572">"Roaming danych"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Średni i wysoki poziom zabezpieczeń"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Hasło"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Wysoki poziom zabezpieczeń"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Funkcje chroniące urządzenie przestaną działać."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Wyłączone przez administratora lub ze względu na zasady szyfrowania albo magazyn danych logowania"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Brak"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Przesuń palcem"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Usuń wzór odblokowania"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Usuń kod PIN odblokowania"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Usuń hasło odblokowania"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"Usuń blokadę ekranu"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Zmień wzór odblokowania"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Zmień kod PIN odblokowania"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Zmień hasło odblokowania"</string>
@@ -860,6 +862,8 @@
     <string name="sim_multi_sims_summary" msgid="7018740080801483990">"Wybierz preferowaną kartę SIM do komórkowej transmisji danych."</string>
     <string name="sim_change_data_title" msgid="294357201685244532">"Zmienić kartę SIM do danych?"</string>
     <string name="sim_change_data_message" msgid="1313940695939674633">"Używać karty <xliff:g id="NEW_SIM">%1$s</xliff:g> zamiast <xliff:g id="OLD_SIM">%2$s</xliff:g> do transmisji danych komórkowych?"</string>
+    <string name="sim_preferred_title" msgid="5567909634636045268">"Zmienić preferowaną kartę SIM?"</string>
+    <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> to jedyna karta SIM w urządzeniu. Czy chcesz ją wykorzystywać do transmisji danych komórkowych, połączeń i SMS-ów?"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"Nieprawidłowy kod PIN karty SIM. Musisz teraz skontaktować się z operatorem, by odblokował Twoje urządzenie."</string>
   <plurals name="wrong_pin_code">
     <item quantity="one" msgid="4840607930166101114">"Nieprawidłowy kod PIN karty SIM. Masz jeszcze <xliff:g id="NUMBER">%d</xliff:g> próbę, zanim będziesz musiał skontaktować się z operatorem, by odblokował Twoje urządzenie."</item>
@@ -2332,7 +2336,8 @@
     <string name="sim_notification_title" msgid="6272913297433198340">"Karty SIM zostały zmienione."</string>
     <string name="sim_notification_summary" msgid="5024470200658902406">"Kliknij, by skonfigurować"</string>
     <string name="sim_pref_divider" msgid="6778907671867621874">"Karta SIM preferowana dla:"</string>
-    <string name="sim_calls_ask_first_prefs_title" msgid="7328134172516945288">"Pytaj za każdym razem"</string>
+    <!-- no translation found for sim_calls_ask_first_prefs_title (7941299533514115976) -->
+    <skip />
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Dokonaj wyboru"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Ustawienia"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Ustawienia"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 132d4b9..235dbfc 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Desligar?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Isto terminará a sua ligação com:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"Não tem autorização para alterar as definições de Bluetooth."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> é visível para dispositivos próximos enquanto Definições Bluetooth estiver aberto."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> é visível para dispositivos próximos enquanto as definições de Bluetooth estiverem abertas."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Desligar <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Difusão"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Desativar perfil?"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Gerir Wi-Fi, Bluetooth, modo de avião, redes móveis e VPNs"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Dados de rede móvel"</string>
     <string name="calls_title" msgid="3544471959217176768">"Chamadas"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"Mensagens SMS"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"Mensagens SMS"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"Perm. utilizar dados através rede móvel"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Perm. utiliz. dados em roaming"</string>
     <string name="roaming" msgid="3596055926335478572">"Roaming de dados"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Segurança média a elevada"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Palavra-passe"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Segurança elevada"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"As funcionalidades de proteção do dispositivo deixarão de funcionar."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Desativado p/ admin., política de encript. ou armazen. de credenciais"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Nenhum"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Deslizar rapidamente"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Remover padrão de desbloqueio"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Remover PIN de desbloqueio"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Remover palavra-passe de desbloqueio"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"Remover bloqueio de ecrã"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Mudar padrão de desbloqueio"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Alterar PIN de desbloqueio"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Alterar palavra-passe de desbloqueio"</string>
@@ -860,6 +862,8 @@
     <string name="sim_multi_sims_summary" msgid="7018740080801483990">"Escolha o SIM que prefere para dados móveis."</string>
     <string name="sim_change_data_title" msgid="294357201685244532">"Alterar SIM de dados?"</string>
     <string name="sim_change_data_message" msgid="1313940695939674633">"Utilizar <xliff:g id="NEW_SIM">%1$s</xliff:g> em vez de <xliff:g id="OLD_SIM">%2$s</xliff:g> para dados de telemóvel?"</string>
+    <string name="sim_preferred_title" msgid="5567909634636045268">"Atualizar o cartão SIM pref.?"</string>
+    <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> é o único SIM no seu dispositivo. Pretende utilizar este SIM para dados de telemóvel, chamadas e mensagens SMS?"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"Código PIN do cartão SIM incorreto. Tem de contactar o seu operador para desbloquear o dispositivo."</string>
   <plurals name="wrong_pin_code">
     <item quantity="one" msgid="4840607930166101114">"Código PIN do cartão SIM incorreto. Tem mais <xliff:g id="NUMBER">%d</xliff:g> tentativa antes de necessitar de contactar o seu operador para desbloquear o dispositivo."</item>
@@ -2332,7 +2336,8 @@
     <string name="sim_notification_title" msgid="6272913297433198340">"Cartões SIM alterados."</string>
     <string name="sim_notification_summary" msgid="5024470200658902406">"Toque para configurar"</string>
     <string name="sim_pref_divider" msgid="6778907671867621874">"Cartão SIM preferido para"</string>
-    <string name="sim_calls_ask_first_prefs_title" msgid="7328134172516945288">"Perguntar sempre"</string>
+    <!-- no translation found for sim_calls_ask_first_prefs_title (7941299533514115976) -->
+    <skip />
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"A seleção é necessária"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Definições"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Definições"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 154e26a..d83a0f9 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Desconectar?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Isso encerrará sua conexão com:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"Você não tem permissão para alterar as configurações de Bluetooth."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> visível p/ disp. perto com configurações de Bluetooth abertas."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> está visível para dispositivos próximos enquanto as configurações de Bluetooth estão abertas abertas."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Desconectar <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Transmissão"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Desativar perfil?"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Gerenciar Wi-Fi, Bluetooth, modo avião, redes celulares e VPNs"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Dados da rede celular"</string>
     <string name="calls_title" msgid="3544471959217176768">"Chamadas"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"Mensagens SMS"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"Mensagens SMS"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"Permitir uso de dados pela rede celular"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Permitir usar dados em roaming"</string>
     <string name="roaming" msgid="3596055926335478572">"Roaming de dados"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Segurança média a alta"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Senha"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Alta segurança"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Os recursos de proteção de dispositivos não funcionarão mais."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Des. pelo adm., pol. de cript. ou armaz. de cred."</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Nenhuma"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Deslizar"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Remover padrão de desbloqueio"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Remover PIN de desbloqueio"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Remover senha de desbloqueio"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"Remover bloqueio de tela"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Mudar padrão de desbloqueio"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Mudar PIN de desbloqueio"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Mudar senha de desbloqueio"</string>
@@ -860,6 +862,8 @@
     <string name="sim_multi_sims_summary" msgid="7018740080801483990">"Escolha o SIM preferencial para dados de redes celulares."</string>
     <string name="sim_change_data_title" msgid="294357201685244532">"Alterar SIM de dados?"</string>
     <string name="sim_change_data_message" msgid="1313940695939674633">"Usar <xliff:g id="NEW_SIM">%1$s</xliff:g> em vez de <xliff:g id="OLD_SIM">%2$s</xliff:g> para os dados da rede celular?"</string>
+    <string name="sim_preferred_title" msgid="5567909634636045268">"Atualiz. cartão SIM preferido?"</string>
+    <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> é o único cartão SIM no seu dispositivo. Deseja usar este cartão SIM para dados, chamadas e mensagens SMS do telefone celular?"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"Código PIN do SIM incorreto. Entre em contato com a operadora para desbloquear o dispositivo."</string>
   <plurals name="wrong_pin_code">
     <item quantity="one" msgid="4840607930166101114">"Código PIN do SIM incorreto. Tentativas restantes: <xliff:g id="NUMBER">%d</xliff:g>. Caso o código correto não seja digitado, será necessário entrar em contato com a operadora para desbloquear o dispositivo."</item>
@@ -2332,7 +2336,8 @@
     <string name="sim_notification_title" msgid="6272913297433198340">"Alteração em cartões SIM."</string>
     <string name="sim_notification_summary" msgid="5024470200658902406">"Tocar para configurar"</string>
     <string name="sim_pref_divider" msgid="6778907671867621874">"SIM preferido para"</string>
-    <string name="sim_calls_ask_first_prefs_title" msgid="7328134172516945288">"Perguntar sempre"</string>
+    <!-- no translation found for sim_calls_ask_first_prefs_title (7941299533514115976) -->
+    <skip />
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Seleção necessária"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Configurações"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Configurações"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index c1bee21..dd73d46 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Deconectaţi?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Astfel se va încheia conexiunea cu:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"Nu aveți permisiunea de a modifica setările Bluetooth."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> vizibil pt. disp. aprop. cât set. Bluetooth desc."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> este vizibil pentru dispozitivele din apropiere când conexiunea Bluetooth este setată la deschisă."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Deconectați <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Transmitere"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Dezactivaţi profilul?"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Gestionați Wi-Fi, funcția Bluetooth, modul Avion, rețelele mobile și VPN"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Date mobile"</string>
     <string name="calls_title" msgid="3544471959217176768">"Apeluri"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"Mesaje SMS"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"Mesaje SMS"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"Permiteți utilizarea datelor mobile"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Permiteți utiliz. date roaming"</string>
     <string name="roaming" msgid="3596055926335478572">"Roaming de date"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Nivel de securitate mediu spre ridicat"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Parolă"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Securitate ridicată"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Funcțiile de protecție a dispozitivului nu vor mai putea fi folosite."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Dezactivată de admin./politică de criptare/date de conectare"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Fără"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Glisare"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Eliminaţi modelul pentru deblocare"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Eliminaţi codul PIN de deblocare"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Eliminaţi parola de deblocare"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"Eliminați blocarea ecranului"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Schimbaţi modelul pentru deblocare"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Schimbaţi codul PIN de deblocare"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Schimbaţi parola pentru deblocare"</string>
@@ -860,6 +862,8 @@
     <string name="sim_multi_sims_summary" msgid="7018740080801483990">"Alegeți cardul SIM pe care îl preferați pentru date mobile."</string>
     <string name="sim_change_data_title" msgid="294357201685244532">"Schimbați cartela SIM de date?"</string>
     <string name="sim_change_data_message" msgid="1313940695939674633">"Utilizați <xliff:g id="NEW_SIM">%1$s</xliff:g> în loc de <xliff:g id="OLD_SIM">%2$s</xliff:g> pentru datele mobile?"</string>
+    <string name="sim_preferred_title" msgid="5567909634636045268">"Actualizați card SIM preferat?"</string>
+    <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> este singurul card SIM de pe dispozitiv. Doriți să folosiți acest card SIM pentru date mobile, pentru apeluri și pentru mesaje SMS?"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"Codul PIN pentru cardul SIM este incorect. Contactați operatorul pentru a vă debloca dispozitivul."</string>
   <plurals name="wrong_pin_code">
     <item quantity="one" msgid="4840607930166101114">"Codul PIN pentru cardul SIM este incorect. V-a mai rămas <xliff:g id="NUMBER">%d</xliff:g> încercare, după care va trebui să contactați operatorul pentru a vă debloca dispozitivul."</item>
@@ -1924,7 +1928,7 @@
     <string name="sync_automatically" msgid="1682730255435062059">"Sinc. autom. a datelor aplicaţiei"</string>
     <string name="sync_enabled" msgid="4551148952179416813">"Sinc. este ACTIVATĂ"</string>
     <string name="sync_disabled" msgid="8511659877596511991">"Sinc. este DEZACTIV."</string>
-    <string name="sync_error" msgid="5060969083117872149">"Eroare de sincroniz."</string>
+    <string name="sync_error" msgid="5060969083117872149">"Eroare de sincronizare"</string>
     <string name="last_synced" msgid="4242919465367022234">"Ultima sincronizare <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
     <string name="sync_in_progress" msgid="5151314196536070569">"Se sincronizează acum…"</string>
     <string name="settings_backup" msgid="2274732978260797031">"Setări copie de rezervă"</string>
@@ -2042,7 +2046,7 @@
     <string name="data_usage_menu_show_wifi" msgid="2296217964873872571">"Afișați Wi-Fi"</string>
     <string name="data_usage_menu_hide_wifi" msgid="7290056718050186769">"Ascundeți Wi‑Fi"</string>
     <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Afişaţi utiliz. conex. Ethernet"</string>
-    <string name="data_usage_menu_hide_ethernet" msgid="3326702187179943681">"Ascund. utiliz. Ethernet"</string>
+    <string name="data_usage_menu_hide_ethernet" msgid="3326702187179943681">"Ascunde utilizare Ethernet"</string>
     <string name="data_usage_menu_metered" msgid="6235119991372755026">"Restricții de rețea"</string>
     <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"Sincronizați automat datele"</string>
     <string name="data_usage_menu_sim_cards" msgid="6410498422797244073">"Carduri SIM"</string>
@@ -2333,7 +2337,8 @@
     <string name="sim_notification_title" msgid="6272913297433198340">"Cardurile SIM au fost schimbate."</string>
     <string name="sim_notification_summary" msgid="5024470200658902406">"Atingeți pentru a configura"</string>
     <string name="sim_pref_divider" msgid="6778907671867621874">"Cartelă SIM preferată pentru"</string>
-    <string name="sim_calls_ask_first_prefs_title" msgid="7328134172516945288">"Se întreabă de fiecare dată"</string>
+    <!-- no translation found for sim_calls_ask_first_prefs_title (7941299533514115976) -->
+    <skip />
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Selectați o opțiune"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Setări"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Setări"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index ed32212..c2887e9 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Отключиться?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Произойдет разъединение с устройством &lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"У вас нет разрешения на смену настроек Bluetooth."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"Устройства поблизости могут обнаружить <xliff:g id="DEVICE_NAME">%1$s</xliff:g>, пока открыты настройки Bluetooth."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"Устройства поблизости могут обнаружить <xliff:g id="DEVICE_NAME">%1$s</xliff:g>, пока открыты настройки Bluetooth."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Отключить <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Передача данных"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Отключить профиль?"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Настройки Wi‑Fi, Bluetooth, режима полета, мобильных сетей и VPN"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Мобильные данные"</string>
     <string name="calls_title" msgid="3544471959217176768">"Телефонные звонки"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"SMS"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"SMS"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"Разрешить использовать мобильные данные"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Передавать данные в роуминге"</string>
     <string name="roaming" msgid="3596055926335478572">"Интернет-роуминг"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Уровень безопасности от среднего до высокого"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Пароль"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Высокий уровень защиты"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Защита устройства будет отключена."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Запрещено администратором, политикой шифрования или хранилищем учетных данных"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Нет"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Провести по экрану"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Удалить графический ключ разблокировки"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Удалить ПИН-код разблокировки"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Удалить пароль разблокировки"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"Отключить блокировку экрана"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Изменить графический ключ разблокировки"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Изменить ПИН-код разблокировки"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Изменить пароль разблокировки"</string>
@@ -860,6 +862,10 @@
     <string name="sim_multi_sims_summary" msgid="7018740080801483990">"Выберите SIM-карту для мобильных данных."</string>
     <string name="sim_change_data_title" msgid="294357201685244532">"SIM-карта для передачи данных"</string>
     <string name="sim_change_data_message" msgid="1313940695939674633">"Использовать для передачи данных по мобильной сети эту SIM-карту: <xliff:g id="NEW_SIM">%1$s</xliff:g> (вместо <xliff:g id="OLD_SIM">%2$s</xliff:g>)?"</string>
+    <!-- no translation found for sim_preferred_title (5567909634636045268) -->
+    <skip />
+    <!-- no translation found for sim_preferred_message (301251431163650167) -->
+    <skip />
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"Неверный PIN-код. Обратитесь к оператору связи, чтобы разблокировать SIM-карту."</string>
   <plurals name="wrong_pin_code">
     <item quantity="one" msgid="4840607930166101114">"Неверный PIN-код. Осталось попыток: <xliff:g id="NUMBER">%d</xliff:g>. После этого SIM-карта будет заблокирована и вам придется обратиться к оператору связи."</item>
@@ -1493,7 +1499,7 @@
     <string name="accessibility_services_title" msgid="2592221829284342237">"Службы"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Система"</string>
     <string name="accessibility_display_title" msgid="7610175687949675162">"Экран"</string>
-    <string name="accessibility_captioning_title" msgid="7589266662024836291">"Титры"</string>
+    <string name="accessibility_captioning_title" msgid="7589266662024836291">"Субтитры"</string>
     <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Жесты для увеличения"</string>
     <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Эта функция позволяет увеличивать и уменьшать изображение, трижды нажав на экран.\n\nПри увеличенном масштабе можно:\n"<ul><li>"панорамировать – проведите пальцами по экрану;"</li>\n<li>"изменять масштаб – сведите или разведите пальцы."</li></ul>\n\n"Чтобы временно увеличить изображение под пальцем, трижды нажмите на экран и удерживайте его. Проведя пальцем, вы можете посмотреть на другие области экрана. Чтобы вернуть экран в прежнее состояние, уберите палец.\n\nПримечание. Тройным нажатием увеличиваются все области, кроме клавиатуры и панели навигации."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Быстрое включение"</string>
@@ -2332,7 +2338,8 @@
     <string name="sim_notification_title" msgid="6272913297433198340">"SIM-карты заменены"</string>
     <string name="sim_notification_summary" msgid="5024470200658902406">"Нажмите, чтобы настроить"</string>
     <string name="sim_pref_divider" msgid="6778907671867621874">"Использовать SIM-карту для"</string>
-    <string name="sim_calls_ask_first_prefs_title" msgid="7328134172516945288">"Спрашивать каждый раз"</string>
+    <!-- no translation found for sim_calls_ask_first_prefs_title (7941299533514115976) -->
+    <skip />
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Выберите SIM-карту"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Настройки"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Настройки"</string>
diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml
index 59048d2..034761a 100644
--- a/res/values-si-rLK/strings.xml
+++ b/res/values-si-rLK/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"විසන්ධි කරන්නද?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"මෙය &lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt; සමඟ ඔබගේ සම්බන්ධය අවසන් කරනු ඇත"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"බ්ලූටූත් සැකසීම් වෙනස් කිරීමට ඔබට අවසර නැත."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"බ්ලූටූත් සැකසීම් විවෘත කරන අතරතුර ආසන්න උපකරණ වලට <xliff:g id="DEVICE_NAME">%1$s</xliff:g> එක දර්ශනය වේ."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"බ්ලූටූත් සැකසීම් විවෘත කරන අතරතුර ආසන්න උපකරණ වලට <xliff:g id="DEVICE_NAME">%1$s</xliff:g> දර්ශනය වේ."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> විසන්ධි කරද?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"විකාශනය කරමින්"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"අක්‍රිය පැතිකඩක්ද?"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Wi-Fi, බ්ලූටූත්, අහස්යානා අකාරය, සෙලියුලර් ජාල, සහ VPN කළමණාකරණය කරන්න"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"සෙලියුලර් දත්ත"</string>
     <string name="calls_title" msgid="3544471959217176768">"ඇමතුම්"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"SMS පණිවිඩ"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"SMS පණිවිඩ"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"සෙලියුලර් ජාලය හරහා දත්ත භාවිතයට ඉඩ දෙන්න"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"රෝමිං විට දත්ත භාවිත කිරීමේ ඉඩ දෙන්න"</string>
     <string name="roaming" msgid="3596055926335478572">"දත්ත රෝමින්"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"මධ්‍යම සිට ඉහළ ආරක්ෂාව"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"මුරපදය"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"ඉහළ ආරක්ෂාව"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"උපාංග ආරක්ෂණ විශේෂාංග තව දුරටත් ක්‍රියා නොකරනු ඇත."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"පරිපාලකයා, සංකේතන ප්‍රතිපත්තිය, හෝ අක්තපත්‍ර ආචයනය මඟින් අබල කර ඇත"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"කිසිවක් නැත"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"ස්වයිප් කරන්න"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"අගුළු ඇරීමේ රටාව ඉවත් කරන්න"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"අගුළු ඇරීමේ PIN එක ඉවත් කරන්න"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"අගුළු ඇරීමේ මුරපදය ඉවත් කරන්න"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"තිර අගුල ඉවත් කරන්න"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"අගුළු ඇරීමේ රටාව වෙනස් කරන්න"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"අගුළු ඇරීමේ PIN එක වෙනස් කරන්න"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"අඟුළු හැරීමේ මුරපදය වෙනස් කරන්න"</string>
@@ -860,6 +862,10 @@
     <string name="sim_multi_sims_summary" msgid="7018740080801483990">"සෙලියුලර් දත්ත සඳහා ඔබ මනාප කරන SIM එක තෝරන්න."</string>
     <string name="sim_change_data_title" msgid="294357201685244532">"SIM දත්ත වෙනස් කරන්නද?"</string>
     <string name="sim_change_data_message" msgid="1313940695939674633">"සෙල්‍යුලර් දත්ත සඳහා <xliff:g id="OLD_SIM">%2$s</xliff:g> වෙනවට <xliff:g id="NEW_SIM">%1$s</xliff:g> භාවිතා කරන්නද?"</string>
+    <!-- no translation found for sim_preferred_title (5567909634636045268) -->
+    <skip />
+    <!-- no translation found for sim_preferred_message (301251431163650167) -->
+    <skip />
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"වැරදී SIM PIN කේතයකි, ඔබගේ දුරකතනයේ අඟුල හැරීමට ඔබගේ වාහකයා ඔබ දැන් සම්බන්ධ කරගත යුතුය."</string>
   <plurals name="wrong_pin_code">
     <item quantity="one" msgid="4840607930166101114">"වැරදී SIM PIN කේතයකි, ඔබගේ දුරකතනයේ අඟුල හැරීමට ඔබගේ වාහකයා සම්බන්ධ කරගැනීමට පෙර ඔබ සතුව තවත් උත්සාහයන් <xliff:g id="NUMBER">%d</xliff:g> ඉතිරිව ඇත."</item>
@@ -2334,7 +2340,8 @@
     <string name="sim_notification_title" msgid="6272913297433198340">"SIM කාඩ්පත් වෙනස් කෙරිණි."</string>
     <string name="sim_notification_summary" msgid="5024470200658902406">"සකස් කිරීමට ස්පර්ශ කරන්න"</string>
     <string name="sim_pref_divider" msgid="6778907671867621874">"සඳහා වඩා කැමති SIM"</string>
-    <string name="sim_calls_ask_first_prefs_title" msgid="7328134172516945288">"සෑම වේලාවකම ආසන්න"</string>
+    <!-- no translation found for sim_calls_ask_first_prefs_title (7941299533514115976) -->
+    <skip />
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"තේරීමක් අවශ්‍යයි"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"සැකසීම්"</string>
     <string name="search_results_title" msgid="1796252422574886932">"සැකසීම්"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index f102837..e440cef 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Odpojiť?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Táto akcia ukončí vaše pripojenie so zariadením:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"Nemáte povolenie na zmenu nastavení Bluetooth."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"Pri otvorených nastaveniach Bluetooth je zariadenie <xliff:g id="DEVICE_NAME">%1$s</xliff:g> viditeľné pre zariadenia v okolí."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"Pri otvorených nastaveniach Bluetooth je zariadenie <xliff:g id="DEVICE_NAME">%1$s</xliff:g> viditeľné pre zariadenia v okolí."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Odpojiť zariadenie <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Vysielanie"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Zakázať profil?"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Spravovať sieť Wi-Fi, rozhranie Bluetooth, režim v lietadle, mobilné siete a siete VPN"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Mobilné dáta"</string>
     <string name="calls_title" msgid="3544471959217176768">"Hovory"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"Správy SMS"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"Správy SMS"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"Povoliť využitie dát cez mobilnú sieť"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Povoliť využ. dát pri roamingu"</string>
     <string name="roaming" msgid="3596055926335478572">"Dátový roaming"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Stredné až vysoké zabezpečenie"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Heslo"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Vysoké zabezpečenie"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Bezpečnostné funkcie zariadenia nebudú ďalej fungovať"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Zakázané správcom, pravidlom šifrovania alebo úložiskom poverení"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Žiadne"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Prejdenie prstom"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Odstrániť bezpečnostný vzor"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Odstrániť bezpečnostný kód PIN"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Odstrániť bezpečnostné heslo"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"Odstránenie zámky obrazovky"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Zmena bezpečnostného vzoru"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Zmena bezpečnostného kódu PIN"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Zmeniť bezpečnostné heslo"</string>
@@ -860,6 +862,10 @@
     <string name="sim_multi_sims_summary" msgid="7018740080801483990">"Vyberte SIM kartu preferovanú pre mobilné dátové prenosy."</string>
     <string name="sim_change_data_title" msgid="294357201685244532">"Zmeniť SIM kartu pre dáta?"</string>
     <string name="sim_change_data_message" msgid="1313940695939674633">"Používať pre mobilné dáta kartu <xliff:g id="NEW_SIM">%1$s</xliff:g> namiesto <xliff:g id="OLD_SIM">%2$s</xliff:g>?"</string>
+    <!-- no translation found for sim_preferred_title (5567909634636045268) -->
+    <skip />
+    <!-- no translation found for sim_preferred_message (301251431163650167) -->
+    <skip />
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"Nesprávny kód PIN karty SIM. Teraz musíte kontaktovať svojho operátora, aby vám odomkol zariadenie."</string>
   <plurals name="wrong_pin_code">
     <item quantity="one" msgid="4840607930166101114">"Nesprávny kód PIN karty SIM. Zostáva vám <xliff:g id="NUMBER">%d</xliff:g> pokus, inak budete musieť kontaktovať svojho operátora, aby vám odomkol zariadenie."</item>
@@ -2332,7 +2338,8 @@
     <string name="sim_notification_title" msgid="6272913297433198340">"SIM karty boli zmenené."</string>
     <string name="sim_notification_summary" msgid="5024470200658902406">"Nastavte klepnutím"</string>
     <string name="sim_pref_divider" msgid="6778907671867621874">"Preferovaná SIM karta pre"</string>
-    <string name="sim_calls_ask_first_prefs_title" msgid="7328134172516945288">"Vždy sa opýtať"</string>
+    <!-- no translation found for sim_calls_ask_first_prefs_title (7941299533514115976) -->
+    <skip />
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Vyžaduje sa výber"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Nastavenia"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Nastavenia"</string>
@@ -2468,7 +2475,7 @@
     <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> nasledujúci deň alebo ľubovoľný predchádzajúci budík"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Upozornenia apl."</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Nastavenia upozornení"</string>
-    <string name="device_feedback" msgid="3238056036766293294">"Odoslať názor o tomto zariadení"</string>
+    <string name="device_feedback" msgid="3238056036766293294">"Odoslať spätnú vazbu k tomuto zariadení"</string>
     <string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Zadajte číslo PIN správcu"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Zapnuté"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Vypnuté"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 109f919..211e952 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Želite prekiniti povezavo?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"S tem bo prekinjena povezava z napravo:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"Nimate dovoljenja za spreminjanje nastavitev za Bluetooth."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"Naprava <xliff:g id="DEVICE_NAME">%1$s</xliff:g> je vidna napravam v bližini, ko so odprte nastavitve za Bluetooth."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"Naprava <xliff:g id="DEVICE_NAME">%1$s</xliff:g> je vidna napravam v bližini, ko so odprte nastavitve za Bluetooth."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Ali želite prekiniti povezavo z napravo <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Oddajanje"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Želite onemogočiti profil?"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Upravljanje Wi-Fi-ja, Bluetootha, načina za letalo, mobilnih omrežij in omrežij VPN"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Prenos podatkov v mob. omrež."</string>
     <string name="calls_title" msgid="3544471959217176768">"Klici"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"Sporočila SMS"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"Sporočila SMS"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"Dovoli prenos podatkov v mobil. omrežju"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Dovoli prenos podat. med gost."</string>
     <string name="roaming" msgid="3596055926335478572">"Podatkovno gostovanje"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Srednja do visoka varnost"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Geslo"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Visoka varnost"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Funkcije za zaščito naprave ne bodo več delovale."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Onem. skrbnik, šifr. pravilnik shr. poverilnic"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Brez"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Vlečenje"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Odstrani vzorec za odklepanje"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Odstrani kodo PIN za odklepanje"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Odstrani geslo za odklepanje"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"Odstrani zaklepanje zaslona"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Spremeni vzorec za odklepanje"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Spremeni kodo PIN za odklepanje"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Spremeni geslo za odklepanje"</string>
@@ -860,6 +862,10 @@
     <string name="sim_multi_sims_summary" msgid="7018740080801483990">"Izberite kartico SIM, ki jo želite uporabljati za prenos podatkov v mobilnih omrežjih."</string>
     <string name="sim_change_data_title" msgid="294357201685244532">"Druga kart. SIM za pren. pod.?"</string>
     <string name="sim_change_data_message" msgid="1313940695939674633">"Želite za prenos podatkov v mobilnih omrežjih uporabiti kartico SIM <xliff:g id="NEW_SIM">%1$s</xliff:g> namesto kartice SIM <xliff:g id="OLD_SIM">%2$s</xliff:g>?"</string>
+    <!-- no translation found for sim_preferred_title (5567909634636045268) -->
+    <skip />
+    <!-- no translation found for sim_preferred_message (301251431163650167) -->
+    <skip />
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"Napačna koda PIN kartice SIM. Zdaj se boste morali za odklenitev naprave obrniti na operaterja."</string>
   <plurals name="wrong_pin_code">
     <item quantity="one" msgid="4840607930166101114">"Napačna koda PIN kartice SIM. Na voljo imate še <xliff:g id="NUMBER">%d</xliff:g> poskus. Potem se boste morali za odklenitev naprave obrniti na operaterja."</item>
@@ -2332,7 +2338,7 @@
     <string name="sim_notification_title" msgid="6272913297433198340">"Zamenjava kartic SIM."</string>
     <string name="sim_notification_summary" msgid="5024470200658902406">"Dotaknite se za nastavitev"</string>
     <string name="sim_pref_divider" msgid="6778907671867621874">"Prednostna kartica SIM za:"</string>
-    <string name="sim_calls_ask_first_prefs_title" msgid="7328134172516945288">"Vedno vprašaj"</string>
+    <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Vedno vprašaj"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Zahtevana je izbira"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Nastavitve"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Nastavitve"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 775b9db..9b33902 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Желите ли да прекинете везу?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Овим ћете прекинути везу са уређајем:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"Немате дозволу за промену подешавања Bluetooth-а."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> је видљив уређајима у близини док су Bluetooth подешавања отворена."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> је видљив уређајима у близини док су Bluetooth подешавања отворена."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Желите ли да прекинете везу са уређајем <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Емитовање"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Желите ли да онемогућите профил?"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Управљање Wi-Fi-јем, Bluetooth-ом, режимом рада у авиону, мобилним мрежама и VPN-овима"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Подаци за мобилне уређаје"</string>
     <string name="calls_title" msgid="3544471959217176768">"Позиви"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"SMS поруке"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"SMS поруке"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"Омогућав. потрош. подат. на мобил. мрежи"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Дозволи потр. подат. у ромингу"</string>
     <string name="roaming" msgid="3596055926335478572">"Пренос подат. у ромингу"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Средњи до високог нивоа безбедности"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Лозинка"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Висок ниво безбедности"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Функције за заштиту уређаја више неће радити."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Онемогућио администратор, смернице за шифровање или складиштење акредитива"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Ништа"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Превуците"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Уклањање шаблона за откључавање"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Уклањање PIN кода за откључавање"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Уклањање лозинке за откључавање"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"Уклоните закључавање екрана"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Промена шаблона за откључавање"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Промена PIN-а за откључавање"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Промена лозинке за откључавање"</string>
@@ -860,6 +862,10 @@
     <string name="sim_multi_sims_summary" msgid="7018740080801483990">"Изаберите жељену SIM картицу за податке за мобилне уређаје."</string>
     <string name="sim_change_data_title" msgid="294357201685244532">"Променити SIM за податке?"</string>
     <string name="sim_change_data_message" msgid="1313940695939674633">"Желите ли да користите <xliff:g id="NEW_SIM">%1$s</xliff:g> уместо <xliff:g id="OLD_SIM">%2$s</xliff:g> за мобилне податке?"</string>
+    <!-- no translation found for sim_preferred_title (5567909634636045268) -->
+    <skip />
+    <!-- no translation found for sim_preferred_message (301251431163650167) -->
+    <skip />
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"Нетачан SIM PIN кôд. Сада морате да контактирате мобилног оператера да бисте откључали уређај."</string>
   <plurals name="wrong_pin_code">
     <item quantity="one" msgid="4840607930166101114">"Нетачан SIM PIN кôд. Имате још <xliff:g id="NUMBER">%d</xliff:g> покушај, а онда морате да контактирате мобилног оператера да бисте откључали уређај."</item>
@@ -2332,7 +2338,8 @@
     <string name="sim_notification_title" msgid="6272913297433198340">"SIM картице су промењене."</string>
     <string name="sim_notification_summary" msgid="5024470200658902406">"Додирните да бисте подесили"</string>
     <string name="sim_pref_divider" msgid="6778907671867621874">"Жељена SIM картица за"</string>
-    <string name="sim_calls_ask_first_prefs_title" msgid="7328134172516945288">"Увек питај"</string>
+    <!-- no translation found for sim_calls_ask_first_prefs_title (7941299533514115976) -->
+    <skip />
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Потребно је да изаберете нешто"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Подешавања"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Подешавања"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 26aa172..ff622f3 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Vill du koppla från?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Detta avslutar din anslutning till:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"Du saknar behörighet att ändra Bluetooth-inställningarna."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"Enheter i närheten kan se <xliff:g id="DEVICE_NAME">%1$s</xliff:g> när Bluetooth är på."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"Enheter i närheten kan se <xliff:g id="DEVICE_NAME">%1$s</xliff:g> när Bluetooth är på."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Vill du koppla från <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Bluetooth-sändning"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Vill du inaktivera profilen?"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Hantera Wi-Fi, Bluetooth, flygplansläge, mobilnät och VPN"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Mobildata"</string>
     <string name="calls_title" msgid="3544471959217176768">"Samtal"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"Sms"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"Sms"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"Tillåt dataanvändning via mobilnätet"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Tillåt dataanv. vid roaming"</string>
     <string name="roaming" msgid="3596055926335478572">"Dataroaming"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Medelhög till hög säkerhet"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Lösenord"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Hög säkerhet"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Enhetsskyddsfunktioner slutar att fungera."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Inaktiverad p.g.a. admin., kryptering eller uppgiftslagring"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Inget"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Dra"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Ta bort grafiskt lösenord"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Ta bort PIN-kod för upplåsning"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Ta bort lösenord för upplåsning"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"Ta bort skärmlåset"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Byt grafiskt lösenord"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Ändra PIN-kod för upplåsning"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Ändra lösenord för upplåsning"</string>
@@ -860,6 +862,8 @@
     <string name="sim_multi_sims_summary" msgid="7018740080801483990">"Välj vilket SIM-kort du föredrar för mobildata."</string>
     <string name="sim_change_data_title" msgid="294357201685244532">"Vill du ändra data-SIM?"</string>
     <string name="sim_change_data_message" msgid="1313940695939674633">"Vill du använda <xliff:g id="NEW_SIM">%1$s</xliff:g> i stället för <xliff:g id="OLD_SIM">%2$s</xliff:g> för mobildata?"</string>
+    <string name="sim_preferred_title" msgid="5567909634636045268">"Uppdatera primärt SIM-kort?"</string>
+    <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> är det enda SIM-koret i enheten. Vill du använda det här SIM-kortet för mobildata, samtal och sms?"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"Du angav fel pinkod för SIM-kortet och måste nu kontakta operatören för att låsa upp enheten."</string>
   <plurals name="wrong_pin_code">
     <item quantity="one" msgid="4840607930166101114">"Du angav fel pinkod för SIM-kortet. <xliff:g id="NUMBER">%d</xliff:g> försök återstår innan du måste kontakta operatören för att låsa upp enheten."</item>
@@ -2332,7 +2336,8 @@
     <string name="sim_notification_title" msgid="6272913297433198340">"SIM-korten har ändrats."</string>
     <string name="sim_notification_summary" msgid="5024470200658902406">"Tryck om du vill konfigurera"</string>
     <string name="sim_pref_divider" msgid="6778907671867621874">"Primärt SIM-kort för"</string>
-    <string name="sim_calls_ask_first_prefs_title" msgid="7328134172516945288">"Fråga varje gång"</string>
+    <!-- no translation found for sim_calls_ask_first_prefs_title (7941299533514115976) -->
+    <skip />
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Du måste välja något"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Inställningar"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Inställningar"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 6d70ec2..5e1fc06 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Tenganisha?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Hii ikakata muunganisho wako na:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"Huna ruhusa ya kubadilisha mipangilio ya Bluetooth."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> inaonekana kwenye vifaa vya karibu wakati Mipangilio ya Bluetooth ipo wazi."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> inaonekana kwenye vifaa vya karibu mipangilio ya Bluetooth ikiwa imefunguliwa."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Ungependa kuondoa <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Inasambaza"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Wasifu ulemazwe?"</string>
@@ -292,7 +292,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Simamia Wi-Fi, Bluetooth, hali ya ndegeni, mitandao ya simu za mkononi na VPN"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Data ya simu za mkononi"</string>
     <string name="calls_title" msgid="3544471959217176768">"Simu zilizopigwa"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"Ujumbe wa SMS"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"Ujumbe wa SMS"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"Ruhusu matumizi ya data kwenye mtandao wa simu"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Ruhusu data kwenye mitandao mingine"</string>
     <string name="roaming" msgid="3596055926335478572">"Data nje ya mtandao wa kawaida"</string>
@@ -401,6 +401,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Wastani hadi usalama wa juu"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Nenosiri"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Usalama wa juu"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Vipengele vya ulinzi wa kifaa havitaendelea kufanya kazi."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Imelemazwa na msimamizi, sera ya usimbaji fiche, au hifadhi ya stakabadhi"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Hamna"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Telezesha kidole"</string>
@@ -412,6 +413,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Ondoa umbo la kufungua"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Ondoa PIN ufunguaji"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Ondoa nenosiri la kufungua"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"Ondoa kufunga skrini"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Badilisha umbo la kufungua"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Badilisha PIN ya kufungua"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Badilisha nenosiri la kufungua"</string>
@@ -852,6 +854,8 @@
     <string name="sim_multi_sims_summary" msgid="7018740080801483990">"Chagua SIM unayopendelea kwa data ya simu za mkononi."</string>
     <string name="sim_change_data_title" msgid="294357201685244532">"Je, ungependa kubadilisha SIM ya data?"</string>
     <string name="sim_change_data_message" msgid="1313940695939674633">"Je, ungependa kutumia <xliff:g id="NEW_SIM">%1$s</xliff:g> badala ya <xliff:g id="OLD_SIM">%2$s</xliff:g> kwa data ya vifaa vya mkononi?"</string>
+    <string name="sim_preferred_title" msgid="5567909634636045268">"Badilisha SIM kadi pendwa?"</string>
+    <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> ni SIM pekee katika kifaa chako. Je, unataka kutumia SIM hii kwa data ya simu za mkononi, kupiga simu, na ujumbe wa SMS?"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"Msimbo wa PIN ya SIM usio sahihi sasa lazima uwasiliane na mtoa huduma wako ili ufungue kifaa chako."</string>
   <plurals name="wrong_pin_code">
     <item quantity="one" msgid="4840607930166101114">"Msimbo wa PIN ya SIM usio sahihi, umesalia na majaribio <xliff:g id="NUMBER">%d</xliff:g> kabla ulazimike kuwasiliana na mtoa huduma wako ili ufungue kifaa chako."</item>
@@ -867,7 +871,7 @@
     <string name="fcc_equipment_id" msgid="149114368246356737">"Kitambulisho cha Kifaa"</string>
     <string name="baseband_version" msgid="1848990160763524801">"Toleo la Baseband"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Toleo la kiini"</string>
-    <string name="build_number" msgid="3075795840572241758">"Nambari ya ujenzi"</string>
+    <string name="build_number" msgid="3075795840572241758">"Nambari ya muundo"</string>
     <string name="selinux_status" msgid="6212165375172061672">"Hali ya SELinux"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Haipatikani"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Hali"</string>
@@ -2326,7 +2330,8 @@
     <string name="sim_notification_title" msgid="6272913297433198340">"SIM kadi zimebadilishwa."</string>
     <string name="sim_notification_summary" msgid="5024470200658902406">"Gusa ili kusanidi"</string>
     <string name="sim_pref_divider" msgid="6778907671867621874">"SIM inayopendelewa kwa"</string>
-    <string name="sim_calls_ask_first_prefs_title" msgid="7328134172516945288">"Uliza kila wakati"</string>
+    <!-- no translation found for sim_calls_ask_first_prefs_title (7941299533514115976) -->
+    <skip />
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Uteuzi unahitajika"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Mipangilio"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Mipangilio"</string>
diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta-rIN/strings.xml
index 6d4979a..c5284ae 100644
--- a/res/values-ta-rIN/strings.xml
+++ b/res/values-ta-rIN/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"துண்டிக்கவா?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"இது, பின்வருவதுடனான உங்கள் இணைப்பைத் துண்டிக்கும்:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"புளுடூத் அமைப்புகளை மாற்ற உங்களுக்கு அனுமதியில்லை."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"புளுடூத் அமைப்புகள் இயக்கத்திலிருக்கும் போது, அருகிலுள்ள சாதனங்களுக்கு <xliff:g id="DEVICE_NAME">%1$s</xliff:g> தெரியும்."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"புளூடூத் அமைப்புகள் இயக்கப்பட்டிருக்கும்போது, அருகிலுள்ள சாதனங்களுக்கு <xliff:g id="DEVICE_NAME">%1$s</xliff:g> தெரியும்."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ஐ துண்டிக்கவா?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"அலைபரப்புதல்"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"சுயவிவரத்தை முடக்கவா?"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"வைஃபை, புளுடூத், விமானப் பயன்முறை, செல்லுலார் நெட்வொர்க்குகள் &amp; VPNகளை நிர்வகிக்கவும்"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"செல்லுலார் தரவு"</string>
     <string name="calls_title" msgid="3544471959217176768">"அழைப்புகள்"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"SMS செய்திகள்"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"SMS செய்திகள்"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"செல்லுலார் நெட்வொர்க் வழியாக தரவுப் பயன்பாட்டை அனுமதி"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"ரோமிங்கின் போது தரவுப் பயன்பாட்டை அனுமதி"</string>
     <string name="roaming" msgid="3596055926335478572">"தரவு ரோமிங்"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"மிதமானது முதல் அதிக பாதுகாப்பு"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"கடவுச்சொல்"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"அதிகப் பாதுகாப்பு"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"சாதனப் பாதுகாப்பு அம்சங்கள் இனி வேலை செய்யாது."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"நிர்வாகியால் முடக்கப்படும், முறைமையாக்கக் கொள்கை அல்லது நற்சான்றுக்கான சேமிப்பிடம்"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"ஏதுமில்லை"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"ஸ்வைப் செய்"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"திறப்பதற்கான வடிவத்தை அகற்று"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"திறக்கும் பின்னை அகற்று"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"திறக்கும் கடவுச்சொல்லை அகற்று"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"திரைப் பூட்டை அகற்று"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"திறப்பதற்கான வடிவத்தை மாற்று"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"திறக்கும் பின்னை மாற்று"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"திறப்பதற்கான கடவுச்சொல்லை மாற்று"</string>
@@ -860,6 +862,10 @@
     <string name="sim_multi_sims_summary" msgid="7018740080801483990">"செல்லுலார் தரவிற்கான சிம் ஐத் தேர்வுசெய்யவும்."</string>
     <string name="sim_change_data_title" msgid="294357201685244532">"தரவு சிம்மினை மாற்றவா?"</string>
     <string name="sim_change_data_message" msgid="1313940695939674633">"செல்லுலார் தரவிற்கு, <xliff:g id="OLD_SIM">%2$s</xliff:g>க்குப் பதிலாக <xliff:g id="NEW_SIM">%1$s</xliff:g>ஐப் பயன்படுத்தவா?"</string>
+    <!-- no translation found for sim_preferred_title (5567909634636045268) -->
+    <skip />
+    <!-- no translation found for sim_preferred_message (301251431163650167) -->
+    <skip />
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"சிம் பின் குறியீடு தவறானது, உங்கள் சாதனத்தைத் திறக்க, உங்கள் மொபைல் நிறுவனத்தைத் தொடர்புகொள்ள வேண்டும்."</string>
   <plurals name="wrong_pin_code">
     <item quantity="one" msgid="4840607930166101114">"சிம் பின் குறியீடு தவறானது, உங்கள் சாதனத்தைத் திறக்க, உங்கள் மொபைல் நிறுவனத்தைத் தொடர்புகொள்ளும் முன், மேலும் <xliff:g id="NUMBER">%d</xliff:g> முறை முயற்சிக்கலாம்."</item>
@@ -2332,7 +2338,8 @@
     <string name="sim_notification_title" msgid="6272913297433198340">"சிம் கார்டுகள் மாற்றப்பட்டன."</string>
     <string name="sim_notification_summary" msgid="5024470200658902406">"அமைக்கத் தொடவும்"</string>
     <string name="sim_pref_divider" msgid="6778907671867621874">"இதற்குப் பயன்படுத்த வேண்டிய SIM"</string>
-    <string name="sim_calls_ask_first_prefs_title" msgid="7328134172516945288">"ஒவ்வொரு முறையும் கேள்"</string>
+    <!-- no translation found for sim_calls_ask_first_prefs_title (7941299533514115976) -->
+    <skip />
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"தேர்வு தேவை"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"அமைப்பு"</string>
     <string name="search_results_title" msgid="1796252422574886932">"அமைப்பு"</string>
diff --git a/res/values-te-rIN/strings.xml b/res/values-te-rIN/strings.xml
index 216aced..a159707 100644
--- a/res/values-te-rIN/strings.xml
+++ b/res/values-te-rIN/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"డిస్‌కనెక్ట్ చేయాలా?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"ఇందువలన దీనితో మీరు ఏర్పాటు చేసుకున్న కనెక్షన్ ముగుస్తుంది:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"మీకు బ్లూటూత్ సెట్టింగ్‌లను మార్చడానికి అనుమతి లేదు."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"బ్లూటూత్ సెట్టింగ్‌లు తెరవబడి ఉన్నప్పుడు సమీపంలోని పరికరాలకు <xliff:g id="DEVICE_NAME">%1$s</xliff:g> కనిపిస్తుంది."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"బ్లూటూత్ సెట్టింగ్‌లను తెరిచి ఉన్నప్పుడు <xliff:g id="DEVICE_NAME">%1$s</xliff:g> సమీప పరికరాలకు కనిపిస్తుంది."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>ను డిస్‌కనెక్ట్ చేయాలా?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"ప్రసారం"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"ప్రొఫైల్‌ను నిలిపివేయాలా?"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Wi‑Fi, బ్లూటూత్, విమాన మోడ్, సెల్యులార్ నెట్‌వర్క్‌లు, &amp; VPNలను నిర్వహించండి"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"సెల్యులార్ డేటా"</string>
     <string name="calls_title" msgid="3544471959217176768">"కాల్‌లు"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"SMS సందేశాలు"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"SMS సందేశాలు"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"సెల్యు. నెట్‌వ. ద్వారా డేటా విని. అనుమతి"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"రోమింగ్‌లో డేటా వినియో. అనుమతి"</string>
     <string name="roaming" msgid="3596055926335478572">"డేటా రోమింగ్"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"మధ్యస్థం నుండి అధిక భద్రత"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"పాస్‌వర్డ్"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"అధిక భద్రత"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"పరికర రక్షణ లక్షణాలు ఇకపై పని చేయవు."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"నిర్వాహకులు, గుప్తీకరణ విధానం లేదా ఆధారాల నిల్వ ద్వారా నిలిపివేయబడింది"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"ఏదీ వద్దు"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"స్వైప్ చేయండి"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"అన్‌లాక్ నమూనాను తీసివేయండి"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"అన్‌లాక్ పిన్‌ను తీసివేయండి"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"అన్‌లాక్ పాస్‌వర్డ్‌ను తీసివేయండి"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"స్క్రీన్ లాక్‌ను తీసివేయండి"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"అన్‌లాక్ నమూనాను మార్చు"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"అన్‌లాక్ పిన్‌ను మార్చండి"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"అన్‌లాక్ పాస్‌వర్డ్‌ను మార్చు"</string>
@@ -860,6 +862,10 @@
     <string name="sim_multi_sims_summary" msgid="7018740080801483990">"సెల్యులార్ డేటా కోసం మీ ప్రాధాన్య సిమ్‌ను ఎంచుకోండి."</string>
     <string name="sim_change_data_title" msgid="294357201685244532">"డేటా SIMని మార్చాలా?"</string>
     <string name="sim_change_data_message" msgid="1313940695939674633">"సెల్యులార్ డేటా కోసం <xliff:g id="OLD_SIM">%2$s</xliff:g>కి బదులుగా <xliff:g id="NEW_SIM">%1$s</xliff:g>ని ఉపయోగించాలా?"</string>
+    <!-- no translation found for sim_preferred_title (5567909634636045268) -->
+    <skip />
+    <!-- no translation found for sim_preferred_message (301251431163650167) -->
+    <skip />
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"సిమ్ పిన్ కోడ్ చెల్లదు మీరు తప్పనిసరిగా మీ పరికరాన్ని అన్‌లాక్ చేయడానికి మీ క్యారియర్‌ను ఇప్పుడు సంప్రదించాలి."</string>
   <plurals name="wrong_pin_code">
     <item quantity="one" msgid="4840607930166101114">"సిమ్ పిన్ కోడ్ చెల్లదు, మీరు మీ పరికరాన్ని అన్‌లాక్ చేయడానికి తప్పనిసరిగా మీ క్యారియర్‌ను సంప్రదించడానికి ముందు మీకు <xliff:g id="NUMBER">%d</xliff:g> ప్రయత్నం మిగిలి ఉంది."</item>
@@ -2332,7 +2338,8 @@
     <string name="sim_notification_title" msgid="6272913297433198340">"SIM కార్డ్‌లు మార్చబడ్డాయి."</string>
     <string name="sim_notification_summary" msgid="5024470200658902406">"సెటప్ చేయడానికి తాకండి"</string>
     <string name="sim_pref_divider" msgid="6778907671867621874">"దీని కోసం ప్రాధాన్య SIM"</string>
-    <string name="sim_calls_ask_first_prefs_title" msgid="7328134172516945288">"ప్రతిసారీ అడుగు"</string>
+    <!-- no translation found for sim_calls_ask_first_prefs_title (7941299533514115976) -->
+    <skip />
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"ఎంపిక అవసరం"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"సెట్టింగ్‌లు"</string>
     <string name="search_results_title" msgid="1796252422574886932">"సెట్టింగ్‌లు"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 414b2e1..20ec426 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"ตัดการเชื่อมต่อหรือไม่"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"การดำเนินการนี้จะจบการเชื่อมต่อของคุณกับ:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"คุณไม่มีสิทธิ์ในการเปลี่ยนการตั้งค่าบลูทูธ"</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ปรากฏในอุปกรณ์ใกล้เคียงเมื่อเปิดการตั้งค่าบลูทูธ"</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"อุปกรณ์ใกล้เคียงจะสามารถมองเห็น <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ได้เมื่อเปิดการตั้งค่าบลูทูธ"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"ยกเลิกการเชื่อมต่อ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ใช่ไหม"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"การแพร่สัญญาณ"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"ปิดใช้งานโปรไฟล์หรือไม่"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"จัดการ Wi-Fi, บลูทูธ, โหมดบนเครื่องบิน, เครือข่ายมือถือ และ VPN"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"ข้อมูลมือถือ"</string>
     <string name="calls_title" msgid="3544471959217176768">"การโทร"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"ข้อความ SMS"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"ข้อความ SMS"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"อนุญาตให้ใช้ข้อมูลผ่านเครือข่ายมือถือ"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"อนุญาตให้ใช้ข้อมูลเมื่อโรมมิ่ง"</string>
     <string name="roaming" msgid="3596055926335478572">"การโรมมิ่งอินเทอร์เน็ต"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"ความปลอดภัยระดับปานกลางถึงสูง"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"รหัสผ่าน"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"ความปลอดภัยระดับสูง"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"คุณลักษณะการปกป้องอุปกรณ์จะไม่ทำงานอีกต่อไป"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"ปิดใช้งานโดยผู้ดูแลระบบ นโยบายการเข้ารหัส หรือที่จัดเก็บข้อมูลรับรอง"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"ไม่มี"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"กวาดนิ้ว"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"นำรูปแบบการปลดล็อกออก"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"นำ PIN ปลดล็อกออก"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"นำรหัสผ่านเพื่อปลดล็อกออก"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"นำการล็อกหน้าจอออก"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"เปลี่ยนรูปแบบการปลดล็อก"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"เปลี่ยน PIN สำหรับปลดล็อก"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"เปลี่ยนรหัสผ่านสำหรับปลดล็อก"</string>
@@ -860,6 +862,10 @@
     <string name="sim_multi_sims_summary" msgid="7018740080801483990">"เลือกซิมที่คุณต้องการเก็บข้อมูลมือถือ"</string>
     <string name="sim_change_data_title" msgid="294357201685244532">"เปลี่ยนซิมข้อมูลไหม"</string>
     <string name="sim_change_data_message" msgid="1313940695939674633">"ใช้ <xliff:g id="NEW_SIM">%1$s</xliff:g> แทน <xliff:g id="OLD_SIM">%2$s</xliff:g> สำหรับเก็บข้อมูลมือถือไหม"</string>
+    <!-- no translation found for sim_preferred_title (5567909634636045268) -->
+    <skip />
+    <!-- no translation found for sim_preferred_message (301251431163650167) -->
+    <skip />
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"รหัส PIN ของซิมไม่ถูกต้อง ตอนนี้คุณต้องติดต่อผู้ให้บริการเพื่อปลดล็อกอุปกรณ์ของคุณ"</string>
   <plurals name="wrong_pin_code">
     <item quantity="one" msgid="4840607930166101114">"รหัส PIN ของซิมไม่ถูกต้อง คุณสามารถพยายามได้อีก <xliff:g id="NUMBER">%d</xliff:g> ครั้งก่อนที่จะต้องติดต่อผู้ให้บริการเพื่อปลดล็อกอุปกรณ์ของคุณ"</item>
@@ -2332,7 +2338,8 @@
     <string name="sim_notification_title" msgid="6272913297433198340">"เปลี่ยนซิมการ์ดแล้ว"</string>
     <string name="sim_notification_summary" msgid="5024470200658902406">"แตะเพื่อตั้งค่า"</string>
     <string name="sim_pref_divider" msgid="6778907671867621874">"ซิมที่แนะนำสำหรับ"</string>
-    <string name="sim_calls_ask_first_prefs_title" msgid="7328134172516945288">"ถามทุกครั้ง"</string>
+    <!-- no translation found for sim_calls_ask_first_prefs_title (7941299533514115976) -->
+    <skip />
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"ต้องเลือก"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"การตั้งค่า"</string>
     <string name="search_results_title" msgid="1796252422574886932">"การตั้งค่า"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index ac59079..e377530 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Idiskonekta?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Tatapusin nito ang iyong koneksyon sa:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"Wala kang pahintulot na palitan ang mga setting ng Bluetooth."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"Nakikita ang <xliff:g id="DEVICE_NAME">%1$s</xliff:g> habang bukas ang Bluetooth Setting."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"Nakikita ang <xliff:g id="DEVICE_NAME">%1$s</xliff:g> sa mga malalapit na device habang nakabukas ang mga setting ng Bluetooth."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"I-disconnect ang <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Pagbo-broadcast"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Huwag paganahin ang profile?"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Pamahalaan ang Wi-Fi, Bluetooth, airplane mode, mga cellular network at VPN"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Cellular data"</string>
     <string name="calls_title" msgid="3544471959217176768">"Mga Tawag"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"Mga Mensaheng SMS"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"Mga mensaheng SMS"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"Payagan ang data usage over cellular network"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Payagan data usage pag roaming"</string>
     <string name="roaming" msgid="3596055926335478572">"Roaming ng data"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Katamtaman hanggang mataas na seguridad"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Password"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Mataas na seguridad"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Hindi na gagana ang mga feature sa proteksyon ng device."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Hindi pinagana ng administrator, patakaran sa pag-encrypt, o storage ng kredensyal"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Wala"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Mag-swipe"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Alisin ang naka-unlock na pattern"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Alisin ang naka-unlock na PIN"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Alisin ang password na pang-unlock"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"Alisin ang screen lock"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Baguhin ang naka-unlock na pattern"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Palitan ang PIN na pang-unlock"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Baguhin ang naka-unlock na password"</string>
@@ -860,6 +862,10 @@
     <string name="sim_multi_sims_summary" msgid="7018740080801483990">"Piliin ang SIM na mas gusto mo para sa cellular data."</string>
     <string name="sim_change_data_title" msgid="294357201685244532">"Palitan ang data SIM?"</string>
     <string name="sim_change_data_message" msgid="1313940695939674633">"Gamitin ang <xliff:g id="NEW_SIM">%1$s</xliff:g> sa halip na <xliff:g id="OLD_SIM">%2$s</xliff:g> para sa cellular data?"</string>
+    <!-- no translation found for sim_preferred_title (5567909634636045268) -->
+    <skip />
+    <!-- no translation found for sim_preferred_message (301251431163650167) -->
+    <skip />
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"Maling PIN code ng SIM, dapat ka nang makipag-ugnay sa iyong carrier upang i-unlock ang iyong device."</string>
   <plurals name="wrong_pin_code">
     <item quantity="one" msgid="4840607930166101114">"Maling PIN code ng SIM, mayroon kang <xliff:g id="NUMBER">%d</xliff:g> (na) natitirang pagsubok bago ka dapat makipag-ugnay sa iyong carrier upang i-unlock ang iyong device."</item>
@@ -2332,7 +2338,8 @@
     <string name="sim_notification_title" msgid="6272913297433198340">"Pinalitan ang SIM card."</string>
     <string name="sim_notification_summary" msgid="5024470200658902406">"Pindutin upang i-set up"</string>
     <string name="sim_pref_divider" msgid="6778907671867621874">"Ginustong SIM para sa"</string>
-    <string name="sim_calls_ask_first_prefs_title" msgid="7328134172516945288">"Magtanong palagi"</string>
+    <!-- no translation found for sim_calls_ask_first_prefs_title (7941299533514115976) -->
+    <skip />
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Kinakailangang pumili"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Mga Setting"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Mga Setting"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index b5d5977..80c13c8 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Bağlantı kesilsin mi?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Şu cihazla bağlantınız kesilecek:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"Bluetooth ayarlarını değiştirmek için izniniz yok."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> Bluetooth Ayarları açıkken yakındaki cihazlar tarafından görülebilir."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>, Bluetooth ayarları açıkken yakındaki cihazlar tarafından görülebilir."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> bağlantısı kesilsin mi?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Yayınlama"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Profil devre dışı bırakılsın mı?"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Kablosuz, Bluetooth, uçak modu, hücresel ağlar ve VPN\'leri yönetin"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Hücresel veri"</string>
     <string name="calls_title" msgid="3544471959217176768">"Çağrılar"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"SMS İletileri"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"SMS iletileri"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"Hücresel ağ üzerinden veri kullanımına izin verin"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Dolaşımda veri kullanımına izin ver"</string>
     <string name="roaming" msgid="3596055926335478572">"Veri dolaşımı"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Orta-yüksek düzey güvenlik"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Şifre"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Yüksek düzey güvenlik"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Cihaz koruma özellikleri artık çalışmayacak."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Devre dışı bırakıldı"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Hiçbiri"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Hızlıca kaydırın"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Kilit açma desenini kaldır"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Kilit açma PIN\'ini kaldır"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Kilit açma şifresini kaldır"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"Ekran kilidini kaldır"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Kilit açma desenini değiştir"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Kilit açma PIN\'ini değiştir"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Kilit açma şifresini değiştir"</string>
@@ -860,6 +862,10 @@
     <string name="sim_multi_sims_summary" msgid="7018740080801483990">"Hücresel veri için tercih ettiğiniz SIM\'i seçin."</string>
     <string name="sim_change_data_title" msgid="294357201685244532">"Veriler için SIM değiştirilsin mi?"</string>
     <string name="sim_change_data_message" msgid="1313940695939674633">"Cep telefonu verileri için <xliff:g id="OLD_SIM">%2$s</xliff:g> yerine <xliff:g id="NEW_SIM">%1$s</xliff:g> kullanılsın mı?"</string>
+    <!-- no translation found for sim_preferred_title (5567909634636045268) -->
+    <skip />
+    <!-- no translation found for sim_preferred_message (301251431163650167) -->
+    <skip />
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"Yanlış SIM PIN kodu. Cihazınızın kilidini açmak için artık operatörünüzle bağlantı kurmanız gerekiyor."</string>
   <plurals name="wrong_pin_code">
     <item quantity="one" msgid="4840607930166101114">"Yanlış SIM PIN kodu. Cihazının kilidini açmak için operatörünüzle bağlantı kurmak zorunda kalmadan önce <xliff:g id="NUMBER">%d</xliff:g> deneme hakkınız kaldı."</item>
@@ -2332,7 +2338,8 @@
     <string name="sim_notification_title" msgid="6272913297433198340">"SIM kartlar değiştirildi."</string>
     <string name="sim_notification_summary" msgid="5024470200658902406">"Ayarlamak için dokunun"</string>
     <string name="sim_pref_divider" msgid="6778907671867621874">"Şunun için tercih edilen SIM:"</string>
-    <string name="sim_calls_ask_first_prefs_title" msgid="7328134172516945288">"Her zaman sor"</string>
+    <!-- no translation found for sim_calls_ask_first_prefs_title (7941299533514115976) -->
+    <skip />
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Seçim gerekiyor"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Ayarlar"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Ayarlar"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 4ebc631..2a60770 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Від’єднатися?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Це призведе до роз’єднання з пристроєм:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"Ви не маєте дозволу змінювати налаштування Bluetooth."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> видимий для пристроїв поблизу, якщо відкрито налашт. Bluetooth."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"Пристрої поблизу можуть знайти <xliff:g id="DEVICE_NAME">%1$s</xliff:g>, якщо відкрито налаштування Bluetooth."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Відключити пристрій <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Трансляція"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Вимкнути профіль?"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Керуйте Wi-Fi, Bluetooth, режимом польоту, мобільними мережами та мережами VPN"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Мобільні дані"</string>
     <string name="calls_title" msgid="3544471959217176768">"Дзвінки"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"SMS-повідомлення"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"SMS-повідомлення"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"Передавати дані через мобільну мережу"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Передавати дані в роумінгу"</string>
     <string name="roaming" msgid="3596055926335478572">"Роумінг даних"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Рівень захисту від середнього до високого"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Пароль"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Високий рівень захисту"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Функції захисту пристрою не працюватимуть."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Вимкнено адміністратором, правилом шифрування або сховищем облікових даних"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Немає"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Провести по екрану"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Видалити ключ розблок."</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Видал. PIN розблок."</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Видаліть пароль розблок."</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"Вимкнення блокування екрана"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Змінити ключ розблокув."</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Змінити PIN розблок."</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Змінити пароль розблок."</string>
@@ -860,6 +862,8 @@
     <string name="sim_multi_sims_summary" msgid="7018740080801483990">"Виберіть SIM-карту для мобільних даних."</string>
     <string name="sim_change_data_title" msgid="294357201685244532">"Змінити SIM-карту для даних?"</string>
     <string name="sim_change_data_message" msgid="1313940695939674633">"Використовувати карту <xliff:g id="NEW_SIM">%1$s</xliff:g> замість <xliff:g id="OLD_SIM">%2$s</xliff:g> для мобільного передавання даних?"</string>
+    <string name="sim_preferred_title" msgid="5567909634636045268">"Змінити основну SIM-карту?"</string>
+    <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> – єдина SIM-карта у вашому пристрої. Використовувати її для мобільного Інтернету, дзвінків і SMS-повідомлень?"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"Неправильний PIN-код SIM-карти. Зв’яжіться зі своїм оператором, щоб розблокувати пристрій."</string>
   <plurals name="wrong_pin_code">
     <item quantity="one" msgid="4840607930166101114">"Неправильний PIN-код SIM-карти. У вас залишилась <xliff:g id="NUMBER">%d</xliff:g> спроба. Після цього потрібно буде зв’язатися з оператором, щоб розблокувати пристрій."</item>
@@ -2332,7 +2336,8 @@
     <string name="sim_notification_title" msgid="6272913297433198340">"SIM-карти змінено."</string>
     <string name="sim_notification_summary" msgid="5024470200658902406">"Торкніться, щоб налаштувати"</string>
     <string name="sim_pref_divider" msgid="6778907671867621874">"Найкраща SIM-карта для такого застосування:"</string>
-    <string name="sim_calls_ask_first_prefs_title" msgid="7328134172516945288">"Запитувати щоразу"</string>
+    <!-- no translation found for sim_calls_ask_first_prefs_title (7941299533514115976) -->
+    <skip />
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Потрібно вибрати"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Налаштування"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Налаштування"</string>
diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur-rPK/strings.xml
index 7f66c21..e6723a3 100644
--- a/res/values-ur-rPK/strings.xml
+++ b/res/values-ur-rPK/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"غیر مربوط کریں؟"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"‏یہ اس کے ساتھ آپ کے کنکشن کو ختم کر دے گا:&amp;‎lt;br&gt;&lt;‎b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;‎"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"آپ کو بلوٹوتھ ترتیبات میں تبدیلی کرنے کی اجازت نہیں ہے۔"</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> بلوٹوتھ کی ترتیبات آن ہونے پر قریبی آلات کیلئے مرئی ہے۔"</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"بلوٹوتھ ترتیبات کھلی ہونے پر <xliff:g id="DEVICE_NAME">%1$s</xliff:g> قریبی آلات کیلئے مرئی ہے۔"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> کو منقطع کریں؟"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"نشریات"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"پروفائل غیر فعال کریں؟"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"‏Wi‑Fi، بلوٹوتھ، ہوائی جہاز وضع، سیلولر نیٹ ورکس اور VPNs کا نظم کریں"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"سیلولر ڈیٹا"</string>
     <string name="calls_title" msgid="3544471959217176768">"کالز"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"‏SMS پیغامات"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"‏SMS پیغامات"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"سیلولر نیٹ ورک پر ڈیٹا استعمال کرنے دیں"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"رومنگ میں ڈیٹا استعمال کرنے کی اجازت دیں"</string>
     <string name="roaming" msgid="3596055926335478572">"ڈیٹا رومنگ"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"اوسط سے ہائی سیکیورٹی"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"پاس ورڈ"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"ہائی سیکیورٹی"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"آلہ کے تحفظ کی خصوصیات مزید کام نہیں کریں گی۔"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"منتظم، مرموز کاری کی پالیسی یا اسناد کے اسٹوریج کے ذریعے غیر فعال کردہ"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"کوئی نہیں"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"سوائپ کریں"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"غیر مقفل کرنے کا پیٹرن ہٹائیں"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"‏غیر مقفل کرنے کا PIN ہٹائیں"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"غیر مقفل کرنے کا پاس ورڈ ہٹائیں"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"اسکرین لاک ہٹائیں"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"غیر مقفل کرنے کا پیٹرن تبدیل کریں"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"‏غیر مقفل کرنے کا PIN تبدیل کریں"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"غیر مقفل کرنے کا پاس ورڈ تبدیل کریں"</string>
@@ -860,6 +862,10 @@
     <string name="sim_multi_sims_summary" msgid="7018740080801483990">"‏سیلولر ڈیٹا کیلئے اپنا ترجیحی SIM منتخب کریں۔"</string>
     <string name="sim_change_data_title" msgid="294357201685244532">"‏ڈیٹا SIM تبدیل کریں؟"</string>
     <string name="sim_change_data_message" msgid="1313940695939674633">"سیلولر ڈیٹا کیلئے <xliff:g id="OLD_SIM">%2$s</xliff:g> کی بجائے <xliff:g id="NEW_SIM">%1$s</xliff:g> استعمال کریں؟"</string>
+    <!-- no translation found for sim_preferred_title (5567909634636045268) -->
+    <skip />
+    <!-- no translation found for sim_preferred_message (301251431163650167) -->
+    <skip />
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"‏SIM کا غلط PIN اب آپ کو اپنا آلہ غیر مقفل کرنے کیلئے اپنے کیریئر سے رابطہ کرنا چاہیے۔"</string>
   <plurals name="wrong_pin_code">
     <item quantity="one" msgid="4840607930166101114">"‏SIM کا غلط PIN کوڈ، اپنے آلے کو غیر مقفل کرنے کیلئے اپنے کیریئر سے رابطہ کرنے سے پہلے آپ کے پاس <xliff:g id="NUMBER">%d</xliff:g> کوشش باقی بچی ہے۔"</item>
@@ -2332,7 +2338,8 @@
     <string name="sim_notification_title" msgid="6272913297433198340">"‏SIM کارڈز تبدیل ہوگئے۔"</string>
     <string name="sim_notification_summary" msgid="5024470200658902406">"سیٹ اپ کیلئے ٹچ کریں"</string>
     <string name="sim_pref_divider" msgid="6778907671867621874">"‏ترجیحی SIM برائے"</string>
-    <string name="sim_calls_ask_first_prefs_title" msgid="7328134172516945288">"ہر بار پوچھیں"</string>
+    <!-- no translation found for sim_calls_ask_first_prefs_title (7941299533514115976) -->
+    <skip />
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"انتخاب درکار ہے"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"ترتیبات"</string>
     <string name="search_results_title" msgid="1796252422574886932">"ترتیبات"</string>
diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml
index 93edd4f..19bb8f8 100644
--- a/res/values-uz-rUZ/strings.xml
+++ b/res/values-uz-rUZ/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Uzilsinmi?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Quyidagi qurilma bilan aloqa uziladi:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"Sizda Bluetooth sozlamalarini o‘zgartirish uchun ruxsat yo‘q."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"Bluetooth soz-lari ochilganda “<xliff:g id="DEVICE_NAME">%1$s</xliff:g>” yaqindagi quril-ga ko‘rinadi."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"Bluetooth sozlamalari ochilganda, “<xliff:g id="DEVICE_NAME">%1$s</xliff:g>” yaqin atrofdagi qurilmalarga ko‘rinadi."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> bilan aloqa uzilsinmi?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Signal uzatish"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Profil o‘chirib qo‘yilsinmi?"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Wi‑Fi, Bluetooth, parvoz rejimi, mobil tarmoq va VPN tarmoqlarni boshqarish"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Mobil internet"</string>
     <string name="calls_title" msgid="3544471959217176768">"Qo‘ng‘iroqlar"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"SMS xabarlar"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"SMS xabarlar"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"Mobil internetdan foydalanishga ruxsat"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Roumingda mob. int-dan foyd-sh"</string>
     <string name="roaming" msgid="3596055926335478572">"Ma‘lumotlar roumingi"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"O‘rtachadan yuqoriga darajasidagi xavfsizlik"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Parol"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Yuqori darajadagi xavfsizlik"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Qurilmani himoyalash funksiyalari ishlamay qoladi."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Administrator, shifrlash siyosati, yoki hisob ma‘lumotlari ombori tomonidan o‘chirib qo‘yilgan"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Bo‘sh"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Ekran bo‘ylab surish"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Chizmali parolni olib tashlash"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Qulfni ochish PIN kodini o‘chirish"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Qulfni ochish parolini o‘chirish"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"Ekran qulfini olib tashlash"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Chizmali qulfni ochishni o‘zgartirish"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Qulfdan ochish PIN kodini o‘zgartirish"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Qulfni ochish parolini o‘zgartirish"</string>
@@ -860,6 +862,10 @@
     <string name="sim_multi_sims_summary" msgid="7018740080801483990">"Mobil internetdan foydalanish uchun SIM kartani tanlang."</string>
     <string name="sim_change_data_title" msgid="294357201685244532">"Internet SIM kartasi o‘zg-mi?"</string>
     <string name="sim_change_data_message" msgid="1313940695939674633">"Mobil internet uchun <xliff:g id="OLD_SIM">%2$s</xliff:g> o‘rniga <xliff:g id="NEW_SIM">%1$s</xliff:g> ishlatilsinmi?"</string>
+    <!-- no translation found for sim_preferred_title (5567909634636045268) -->
+    <skip />
+    <!-- no translation found for sim_preferred_message (301251431163650167) -->
+    <skip />
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"SIM karta noto‘g‘ri PIN kodi. Endi siz qurilmangiz qulfini ochish uchun operatoringizga murojaat qilishingiz lozim."</string>
   <plurals name="wrong_pin_code">
     <item quantity="one" msgid="4840607930166101114">"SIM kartaning PIN kodi noto‘g‘ri terildi. Qurilmangiz qulflanib uni qulfdan ochish maqsadida operatoringizga qo‘ng‘iroq qilishdan oldin, siz yana <xliff:g id="NUMBER">%d</xliff:g> marta urinib ko‘rishingiz mumkin."</item>
@@ -2332,7 +2338,8 @@
     <string name="sim_notification_title" msgid="6272913297433198340">"SIM kartalar o‘zgartirildi."</string>
     <string name="sim_notification_summary" msgid="5024470200658902406">"Sozlash uchun bosing"</string>
     <string name="sim_pref_divider" msgid="6778907671867621874">"Quyidagi uchun afzal ko‘rilgan SIM karta"</string>
-    <string name="sim_calls_ask_first_prefs_title" msgid="7328134172516945288">"Har doim so‘ralsin"</string>
+    <!-- no translation found for sim_calls_ask_first_prefs_title (7941299533514115976) -->
+    <skip />
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Tanlash zarur"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Sozlamalar"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Sozlamalar"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index c65ef7f..162f7a1 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Ngắt kết nối?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Tác vụ này sẽ kết thúc kết nối của bạn với:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"Bạn không có quyền thay đổi cài đặt Bluetooth."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> hiển thị với t.bị lân cận khi C.đặt Bluetooth mở."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> hiển thị với thiết bị lân cận khi cài đặt Bluetooth mở."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Ngắt kết nối <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Phát sóng"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Vô hiệu hồ sơ?"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Quản lý Wi-Fi, Bluetooth, chế độ trên máy bay, mạng di động và VPN"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Dữ liệu di động"</string>
     <string name="calls_title" msgid="3544471959217176768">"Cuộc gọi"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"Tin nhắn SMS"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"Tin nhắn SMS"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"Cho phép sử dụng dữ liệu qua mạng d.động"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Cho phép SD d.liệu khi ch.vùng"</string>
     <string name="roaming" msgid="3596055926335478572">"Chuyển vùng dữ liệu"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Mức độ bảo mật từ trung bình đến cao"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Mật khẩu"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Mức độ bảo mật cao"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Tính năng bảo vệ thiết bị sẽ không còn hoạt động."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Bị vô hiệu do quản trị viên, chính sách mã hóa hoặc bộ nhớ thông tin xác thực"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Không"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Vuốt"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Xóa hình mở khóa"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Xóa mã PIN mở khóa"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Xóa mật khẩu mở khóa"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"Xóa khóa màn hình"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Thay đổi hình mở khóa"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Thay đổi mã PIN mở khóa"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Thay đổi mật khẩu mở khóa"</string>
@@ -860,6 +862,10 @@
     <string name="sim_multi_sims_summary" msgid="7018740080801483990">"Chọn SIM bạn muốn cho dữ liệu di động."</string>
     <string name="sim_change_data_title" msgid="294357201685244532">"Thay đổi SIM dữ liệu?"</string>
     <string name="sim_change_data_message" msgid="1313940695939674633">"Sử dụng <xliff:g id="NEW_SIM">%1$s</xliff:g> thay cho <xliff:g id="OLD_SIM">%2$s</xliff:g> đối với dữ liệu di động?"</string>
+    <!-- no translation found for sim_preferred_title (5567909634636045268) -->
+    <skip />
+    <!-- no translation found for sim_preferred_message (301251431163650167) -->
+    <skip />
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"Mã PIN của SIM không chính xác, bây giờ bạn phải liên hệ với nhà cung cấp dịch vụ để mở khóa thiết bị của bạn."</string>
   <plurals name="wrong_pin_code">
     <item quantity="one" msgid="4840607930166101114">"Mã PIN của SIM không chính xác, bạn còn <xliff:g id="NUMBER">%d</xliff:g> lần thử trước khi bạn phải liên hệ với nhà cung cấp dịch vụ để mở khóa thiết bị của bạn."</item>
@@ -2332,7 +2338,8 @@
     <string name="sim_notification_title" msgid="6272913297433198340">"Đã thay đổi thẻ SIM."</string>
     <string name="sim_notification_summary" msgid="5024470200658902406">"Chạm để thiết lập"</string>
     <string name="sim_pref_divider" msgid="6778907671867621874">"Thẻ SIM ưu tiên cho"</string>
-    <string name="sim_calls_ask_first_prefs_title" msgid="7328134172516945288">"Hỏi mỗi lần gọi"</string>
+    <!-- no translation found for sim_calls_ask_first_prefs_title (7941299533514115976) -->
+    <skip />
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Lựa chọn là bắt buộc"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Cài đặt"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Cài đặt"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index dbf6339..0e4dd74 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"要断开连接吗？"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"此操作将会断开您与以下设备的连接：&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"您无权更改蓝牙设置。"</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"在<xliff:g id="DEVICE_NAME">%1$s</xliff:g>上开启蓝牙设置后，附近的设备将可以检测到该设备。"</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"在<xliff:g id="DEVICE_NAME">%1$s</xliff:g>上开启蓝牙设置后，附近的设备将可以检测到该设备。"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"要断开与<xliff:g id="DEVICE_NAME">%1$s</xliff:g>的连接吗？"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"广播"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"要停用配置文件吗？"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"管理WLAN、蓝牙、飞行模式、移动网络和VPN"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"移动数据网络"</string>
     <string name="calls_title" msgid="3544471959217176768">"通话"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"短信"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"短信"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"允许使用移动数据网络"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"允许漫游时使用数据流量"</string>
     <string name="roaming" msgid="3596055926335478572">"移动数据网络漫游"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"中高等安全性"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"密码"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"高安全性"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"设备保护功能将无法再使用。"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"由于管理员、加密策略或凭据存储的要求，您无法使用此选项"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"无"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"滑动"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"删除解锁图案"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"移除解锁PIN码"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"删除解锁密码"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"解除屏幕锁定"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"更改解锁图案"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"更改解锁PIN码"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"更改解锁密码"</string>
@@ -860,6 +862,10 @@
     <string name="sim_multi_sims_summary" msgid="7018740080801483990">"选择您想在连入移动数据网络时用的SIM卡。"</string>
     <string name="sim_change_data_title" msgid="294357201685244532">"要更改用于数据网络的 SIM 卡吗？"</string>
     <string name="sim_change_data_message" msgid="1313940695939674633">"要将连入移动数据网络时用的 SIM 卡从<xliff:g id="OLD_SIM">%2$s</xliff:g>改为<xliff:g id="NEW_SIM">%1$s</xliff:g>吗？"</string>
+    <!-- no translation found for sim_preferred_title (5567909634636045268) -->
+    <skip />
+    <!-- no translation found for sim_preferred_message (301251431163650167) -->
+    <skip />
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"SIM卡PIN码不正确，您现在必须联系运营商为您解锁设备。"</string>
   <plurals name="wrong_pin_code">
     <item quantity="one" msgid="4840607930166101114">"SIM卡PIN码不正确，您还有<xliff:g id="NUMBER">%d</xliff:g>次尝试机会。如果仍然失败，则必须联系运营商帮您解锁设备。"</item>
@@ -2332,7 +2338,8 @@
     <string name="sim_notification_title" msgid="6272913297433198340">"SIM 卡已更改。"</string>
     <string name="sim_notification_summary" msgid="5024470200658902406">"触摸即可设置"</string>
     <string name="sim_pref_divider" msgid="6778907671867621874">"首选 SIM 卡"</string>
-    <string name="sim_calls_ask_first_prefs_title" msgid="7328134172516945288">"每次都询问"</string>
+    <!-- no translation found for sim_calls_ask_first_prefs_title (7941299533514115976) -->
+    <skip />
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"必须选择"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"设置"</string>
     <string name="search_results_title" msgid="1796252422574886932">"设置"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index d8d4505..890c415 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"中斷連線？"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"這樣會結束您與下列裝置的連線：&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"您沒有變更藍牙設定的權限。"</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"開啟藍牙設定時，附近的裝置可偵測到 <xliff:g id="DEVICE_NAME">%1$s</xliff:g>。"</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"開啟藍牙設定時，附近的裝置可偵測到 <xliff:g id="DEVICE_NAME">%1$s</xliff:g>。"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"解除與「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」的連結？"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"廣播"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"停用個人資料？"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"管理 Wi-Fi、藍牙、飛行模式、流動網絡和 VPN"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"流動數據"</string>
     <string name="calls_title" msgid="3544471959217176768">"通話"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"短訊"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"短訊"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"允許流動網絡數據用量"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"允許漫遊時使用數據"</string>
     <string name="roaming" msgid="3596055926335478572">"數據漫遊"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"中至高等安全性設定"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"密碼"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"高等安全性設定"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"裝置保護功能將無法使用。"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"已由管理員、加密政策或認證儲存空間停用"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"無"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"快速滑動"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"移除解鎖圖形"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"移除解鎖 PIN"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"移除解鎖密碼"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"移除螢幕鎖定"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"更改解鎖圖形"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"變更解鎖 PIN"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"變更解鎖密碼"</string>
@@ -860,6 +862,10 @@
     <string name="sim_multi_sims_summary" msgid="7018740080801483990">"選擇您要用於流動網絡的 SIM 卡。"</string>
     <string name="sim_change_data_title" msgid="294357201685244532">"要變更用於數據連線的 SIM 卡嗎？"</string>
     <string name="sim_change_data_message" msgid="1313940695939674633">"要使用 <xliff:g id="NEW_SIM">%1$s</xliff:g> 取代 <xliff:g id="OLD_SIM">%2$s</xliff:g> 用於流動數據連線嗎？"</string>
+    <!-- no translation found for sim_preferred_title (5567909634636045268) -->
+    <skip />
+    <!-- no translation found for sim_preferred_message (301251431163650167) -->
+    <skip />
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"SIM PIN 碼不正確，您現在必須聯絡流動網絡供應商為您的裝置解鎖。"</string>
   <plurals name="wrong_pin_code">
     <item quantity="one" msgid="4840607930166101114">"SIM PIN 碼不正確，您剩下 <xliff:g id="NUMBER">%d</xliff:g> 次機會輸入。如果仍然輸入錯誤，您必須聯絡流動網絡供應商為您的裝置解鎖。"</item>
@@ -2336,7 +2342,8 @@
     <string name="sim_notification_title" msgid="6272913297433198340">"SIM 卡已變更。"</string>
     <string name="sim_notification_summary" msgid="5024470200658902406">"輕觸即可設定"</string>
     <string name="sim_pref_divider" msgid="6778907671867621874">"首選 SIM 卡用於："</string>
-    <string name="sim_calls_ask_first_prefs_title" msgid="7328134172516945288">"每次都詢問"</string>
+    <!-- no translation found for sim_calls_ask_first_prefs_title (7941299533514115976) -->
+    <skip />
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"請選取偏好設定"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"設定"</string>
     <string name="search_results_title" msgid="1796252422574886932">"設定"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index c914515..cb5ed66 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"中斷連線？"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"這樣會結束您與下列裝置的連線：&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"您沒有變更藍牙設定的權限。"</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"藍牙設定開啟時，附近的裝置可偵測到「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」。"</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"藍牙設定開啟時，附近的裝置可偵測到「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」。"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"要中斷與「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」的連線嗎？"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"廣播"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"停用設定檔？"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"管理 Wi-Fi、藍牙、飛航模式、行動網路和 VPN"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"行動數據"</string>
     <string name="calls_title" msgid="3544471959217176768">"來電"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"簡訊"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"簡訊"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"允許在行動網路中使用數據服務"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"允許在漫遊時使用數據服務"</string>
     <string name="roaming" msgid="3596055926335478572">"漫遊服務"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"中高等安全性設定"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"密碼"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"高等安全性設定"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"裝置保護功能將停止運作。"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"已由管理員、加密政策或認證儲存空間停用"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"無"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"滑動"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"移除解鎖圖形"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"移除解鎖 PIN"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"移除解鎖密碼"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"移除螢幕鎖定"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"變更解鎖圖形"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"變更解鎖 PIN"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"變更解鎖密碼"</string>
@@ -860,6 +862,10 @@
     <string name="sim_multi_sims_summary" msgid="7018740080801483990">"選擇您要用於行動網路的 SIM 卡。"</string>
     <string name="sim_change_data_title" msgid="294357201685244532">"變更行動數據連線 SIM 卡？"</string>
     <string name="sim_change_data_message" msgid="1313940695939674633">"要將行動數據連線 SIM 卡從「<xliff:g id="OLD_SIM">%2$s</xliff:g>」改為「<xliff:g id="NEW_SIM">%1$s</xliff:g>」嗎？"</string>
+    <!-- no translation found for sim_preferred_title (5567909634636045268) -->
+    <skip />
+    <!-- no translation found for sim_preferred_message (301251431163650167) -->
+    <skip />
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"SIM 卡的 PIN 碼輸入錯誤，您現在必須請行動通訊業者為裝置解鎖。"</string>
   <plurals name="wrong_pin_code">
     <item quantity="one" msgid="4840607930166101114">"SIM 卡的 PIN 碼輸入錯誤，您還可以再試 <xliff:g id="NUMBER">%d</xliff:g> 次。如果仍然失敗，就必須請行動通訊業者為裝置解鎖。"</item>
@@ -2336,7 +2342,8 @@
     <string name="sim_notification_title" msgid="6272913297433198340">"SIM 卡已變更。"</string>
     <string name="sim_notification_summary" msgid="5024470200658902406">"輕觸即可設定"</string>
     <string name="sim_pref_divider" msgid="6778907671867621874">"適用於以下用途的偏好 SIM 卡"</string>
-    <string name="sim_calls_ask_first_prefs_title" msgid="7328134172516945288">"每次皆詢問"</string>
+    <!-- no translation found for sim_calls_ask_first_prefs_title (7941299533514115976) -->
+    <skip />
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"請選取偏好設定"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"設定"</string>
     <string name="search_results_title" msgid="1796252422574886932">"設定"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index bf99b95..b4cba70 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Ungaxhumeki kwi-inthanethi?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Lokhu kuzophelisa uxhumano nge:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"Awunayo imvume yokushintsha izilungiselelo ze-Bluetooth."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"I-<xliff:g id="DEVICE_NAME">%1$s</xliff:g> iyabonakala kumadivayisi aseduzane ngenkathi izilungiselelo ze-Bluetooth zivulekile."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"I-<xliff:g id="DEVICE_NAME">%1$s</xliff:g> iyabonakala kumadivayisi aseduzane ngenkathi izilungiselelo ze-Bluetooth zivulekile."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Nqamula i-<xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Ukusakaza"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Vimbela iphrofayli?"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Phatha i-Wi‑Fi, Bluetooth, imodi yendiza, amanethiwekhi weselula, nama-VPN"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Idatha yeselula"</string>
     <string name="calls_title" msgid="3544471959217176768">"Amakholi"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"Imilayezo ye-SMS"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"Imilayezo ye-SMS"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"Vumela ukusetshenziswa kwedatha ngenethiwekhi yeselula"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Vumela ukusetshenziswa kwedatha uma izula"</string>
     <string name="roaming" msgid="3596055926335478572">"Ukuzulazula kwedatha"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Ukuphepha okuphakathi nendawo kuya kokuphezulu"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Iphasiwedi"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Ukuphepha okuphezulu"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Izici zokuvikela idivayisi ngeke zisasebenza."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Khubaza umqondisi, ukubethela inqubomgomo, noma isitoreji sobuqinisekisa"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Lutho"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Swayipha"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Khipha iphathini yokuvula"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Khipha ukuvala i-PIN"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Khipha iphasiwedi yokuvula"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"Susa isikrini sokukhiya"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Shintsha iphathini yokuvula"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Shintsha i-PIN yokuvula"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Shintsha iphasiwedi yokuvula"</string>
@@ -860,6 +862,8 @@
     <string name="sim_multi_sims_summary" msgid="7018740080801483990">"Khetha i-SIM oyithandayo yedatha yeselula."</string>
     <string name="sim_change_data_title" msgid="294357201685244532">"Shintsha idatha ye-SIM?"</string>
     <string name="sim_change_data_message" msgid="1313940695939674633">"Sebenzisa i-<xliff:g id="NEW_SIM">%1$s</xliff:g> esikhundleni se-<xliff:g id="OLD_SIM">%2$s</xliff:g> kudatha yeselula?"</string>
+    <string name="sim_preferred_title" msgid="5567909634636045268">"Buyekeza ikhadi le-SIM olincamelayo?"</string>
+    <string name="sim_preferred_message" msgid="301251431163650167">"I-<xliff:g id="NEW_SIM">%1$s</xliff:g> yiyo kuphela i-SIM ekudivayisi yakho. Ingabe ufuna ukusebenzisa le-SIM kudatha yeselula, amakholi, nemilayezo ye-SMS?"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"Ikhodi yephinikhodi ye-SIM engalungile manje kumele uxhumane nenkampini yenethiwekhi yakho ukuvula idivayisi yakho."</string>
   <plurals name="wrong_pin_code">
     <item quantity="one" msgid="4840607930166101114">"Ikhodi yephinikhodi ye-SIM engalungile, unemizamo engu-<xliff:g id="NUMBER">%d</xliff:g> esele ngaphambi kokuba uxhumane nenkampini yenethiwekhi."</item>
@@ -2339,7 +2343,8 @@
     <string name="sim_notification_title" msgid="6272913297433198340">"Imodi yokuthula ishintshiwe."</string>
     <string name="sim_notification_summary" msgid="5024470200658902406">"Thinta ukuze usethe"</string>
     <string name="sim_pref_divider" msgid="6778907671867621874">"I-SIM ethandekayo ye-"</string>
-    <string name="sim_calls_ask_first_prefs_title" msgid="7328134172516945288">"Buza njalo"</string>
+    <!-- no translation found for sim_calls_ask_first_prefs_title (7941299533514115976) -->
+    <skip />
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Ukukhetha kuyadingeka"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Izilungiselelo"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Izilungiselelo"</string>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index a5abbbe..70fc4a0 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -40,6 +40,12 @@
     <color name="title_color">@android:color/holo_blue_light</color>
     <color name="setup_divider_color_dark">#33ffffff</color>
     <color name="setup_divider_color_light">#33000000</color>
+    <color name="setup_lock_pattern_view_regular_color_dark">#ffbdbdbd</color>
+    <color name="setup_lock_pattern_view_regular_color_light">@color/lock_pattern_view_regular_color</color>
+    <color name="setup_lock_pattern_view_success_color_dark">#ff84ffff</color>
+    <color name="setup_lock_pattern_view_success_color_light">@color/setup_wizard_color_accent_light</color>
+    <color name="setup_lock_pattern_view_error_color_dark">#fff44336</color>
+    <color name="setup_lock_pattern_view_error_color_light">@color/lock_pattern_view_error_color</color>
     <color name="setup_wizard_color_accent_dark">#ff00e4ff</color>
     <color name="setup_wizard_color_accent_light">#ff00828e</color>
     <color name="setup_wizard_wifi_color_dark">#ff00e4ff</color>
diff --git a/res/values/config.xml b/res/values/config.xml
index a6fd34e..f830e06 100755
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -34,4 +34,7 @@
 
     <!-- Carrier_enabled editable -->
     <bool name="config_allow_edit_carrier_enabled" translatable="false">false</bool>
+
+    <!-- The duration (in milliseconds) of activity transitions -->
+    <integer name="setup_wizard_transition_duration">300</integer>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 37239ff..74062ae 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2113,6 +2113,10 @@
     <string name="sim_change_data_title">Change data SIM?</string>
     <!-- Message confirming the user wishes to change the default data SIM from one to another.  [CHAR LIMIT=NONE] -->
     <string name="sim_change_data_message">Use <xliff:g id="new_sim">%1$s</xliff:g> instead of <xliff:g id="old_sim">%2$s</xliff:g> for cellular data?</string>
+    <!-- Title for the dialog asking to user to change the preferred SIM  [CHAR LIMIT=30] -->
+    <string name="sim_preferred_title">Update preferred SIM card?</string>
+    <!-- Message for the dialog asking to user to change the preferred SIM  [CHAR LIMIT=NONE] -->
+    <string name="sim_preferred_message"><xliff:g id="new_sim">%1$s</xliff:g> is the only SIM in your device.  Do you want to use this SIM for cellular data, calls, and SMS messages?</string>
 
     <!-- Instructions telling the user that they entered the wrong SIM PIN for the last time.
          Displayed in a dialog box.  [CHAR LIMIT=100] -->
@@ -5569,7 +5573,7 @@
     <!-- This is a divider in the SIM cards preferences that is the header of various settings where the user chooses which SIM to use for phone calls, data, and SMS messages [CHAR LIMIT=50] -->
     <string name="sim_pref_divider">Preferred SIM for</string>
     <!-- When a user chooses this "Ask first" preference for the SIM to use for phone calls, they'll be prompted to choose a SIM every time they initiate a call [CHAR LIMIT=50] -->
-    <string name="sim_calls_ask_first_prefs_title">Ask everytime</string>
+    <string name="sim_calls_ask_first_prefs_title">Ask every time</string>
     <!-- When a SIM preference hasn't been selected yet, this string is displayed as the pref summary until the user chooses a SIM subscription from the preference list [CHAR LIMIT=50] -->
     <string name="sim_selection_required_pref">Selection required</string>
 
diff --git a/res/values/themes.xml b/res/values/themes.xml
index d4875e2..f7aeb15 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -34,6 +34,7 @@
         <item name="android:colorAccent">@color/setup_wizard_color_accent_dark</item>
         <item name="android:listPreferredItemPaddingEnd">@dimen/setup_wizard_margin_sides</item>
         <item name="android:listPreferredItemPaddingStart">@dimen/setup_wizard_margin_sides</item>
+        <item name="android:windowAnimationStyle">@style/Animation.SetupWizard</item>
         <item name="android:windowBackground">?android:attr/colorBackground</item>
         <item name="android:windowSoftInputMode">adjustPan</item>
         <item name="@*android:preferencePanelStyle">@*android:style/PreferencePanel.Dialog</item>
@@ -45,6 +46,11 @@
         <item name="wifi_signal_color">@color/setup_wizard_wifi_color_dark</item>
         <item name="wifi_signal">@drawable/wifi_signal_teal</item>
         <item name="preferenceBackgroundColor">?android:attr/colorBackground</item>
+
+        <!-- LockPatternView colors -->
+        <item name="@*android:regularColor">@color/setup_lock_pattern_view_regular_color_dark</item>
+        <item name="@*android:successColor">@color/setup_lock_pattern_view_success_color_dark</item>
+        <item name="@*android:errorColor">@color/setup_lock_pattern_view_error_color_dark</item>
     </style>
 
     <style name="SetupWizardTheme.Light" parent="android:Theme.Material.Light.NoActionBar">
@@ -52,6 +58,7 @@
         <item name="android:colorAccent">@color/setup_wizard_color_accent_light</item>
         <item name="android:listPreferredItemPaddingEnd">@dimen/setup_wizard_margin_sides</item>
         <item name="android:listPreferredItemPaddingStart">@dimen/setup_wizard_margin_sides</item>
+        <item name="android:windowAnimationStyle">@style/Animation.SetupWizard</item>
         <item name="android:windowBackground">?android:attr/colorBackground</item>
         <item name="android:windowSoftInputMode">adjustPan</item>
         <item name="@*android:preferencePanelStyle">@*android:style/PreferencePanel.Dialog</item>
@@ -63,6 +70,18 @@
         <item name="wifi_signal_color">@color/setup_wizard_wifi_color_light</item>
         <item name="wifi_signal">@drawable/wifi_signal_teal</item>
         <item name="preferenceBackgroundColor">?android:attr/colorBackground</item>
+
+        <!-- LockPatternView colors -->
+        <item name="@*android:regularColor">@color/setup_lock_pattern_view_regular_color_light</item>
+        <item name="@*android:successColor">@color/setup_lock_pattern_view_success_color_light</item>
+        <item name="@*android:errorColor">@color/setup_lock_pattern_view_error_color_light</item>
+    </style>
+
+    <style name="Animation.SetupWizard" parent="@android:style/Animation.Activity">
+        <item name="android:activityOpenEnterAnimation">@anim/slide_next_in</item>
+        <item name="android:activityOpenExitAnimation">@anim/slide_next_out</item>
+        <item name="android:activityCloseEnterAnimation">@anim/slide_back_in</item>
+        <item name="android:activityCloseExitAnimation">@anim/slide_back_out</item>
     </style>
 
     <style name="Theme.WifiDialog" parent="@*android:style/Theme.Material.Dialog.Alert">
diff --git a/res/xml/location_settings.xml b/res/xml/location_settings.xml
index 994ddf1..2cd86f5 100644
--- a/res/xml/location_settings.xml
+++ b/res/xml/location_settings.xml
@@ -26,6 +26,21 @@
             settings:keywords="@string/keywords_location_mode"
             android:summary="@string/location_mode_location_off_title" />
 
+        <!-- This preference category gets removed if there is no managed profile -->
+        <PreferenceCategory
+            android:key="managed_profile_location_category"
+            android:title="@string/managed_profile_location_category">
+
+            <Preference
+                android:key="managed_profile_location_switch"
+                android:title="@string/managed_profile_location_switch_title"
+                android:summary="@string/managed_profile_location_switch_lockdown"
+                android:persistent="false"
+                android:enabled="false"
+                android:selectable="false" />
+
+        </PreferenceCategory>
+
         <PreferenceCategory
             android:key="recent_location_requests"
             android:title="@string/location_category_recent_location_requests" />
diff --git a/res/xml/sim_settings.xml b/res/xml/sim_settings.xml
index 45d8225..63e4ba4 100644
--- a/res/xml/sim_settings.xml
+++ b/res/xml/sim_settings.xml
@@ -15,13 +15,10 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    android:key="sim_cards"
     android:title="@string/sim_settings_title">
 
     <PreferenceCategory
-            android:key="sim_cards"
-            android:title="@string/sim_settings_title" />
-
-    <PreferenceCategory
             android:key="sim_activities"
             android:title="@string/sim_pref_divider" >
 
diff --git a/src/com/android/settings/ChooseLockGeneric.java b/src/com/android/settings/ChooseLockGeneric.java
index f64a9df..b289e7a 100644
--- a/src/com/android/settings/ChooseLockGeneric.java
+++ b/src/com/android/settings/ChooseLockGeneric.java
@@ -288,14 +288,30 @@
         }
 
         /***
+         * Disables preferences that are less secure than required quality. The actual
+         * implementation is in disableUnusablePreferenceImpl.
+         *
+         * @param quality the requested quality.
+         * @param allowBiometric whether to allow biometic screen lock.
+         */
+        protected void disableUnusablePreferences(final int quality,
+                MutableBoolean allowBiometric) {
+            disableUnusablePreferencesImpl(quality, allowBiometric, false /* hideDisabled */);
+        }
+
+        /***
          * Disables preferences that are less secure than required quality.
          *
          * @param quality the requested quality.
+         * @param allowBiometric whether to allow biometic screen lock.
+         * @param hideDisabled whether to hide disable screen lock options.
          */
-        private void disableUnusablePreferences(final int quality, MutableBoolean allowBiometric) {
+        protected void disableUnusablePreferencesImpl(final int quality,
+                MutableBoolean allowBiometric, boolean hideDisabled) {
             final PreferenceScreen entries = getPreferenceScreen();
-            final boolean onlyShowFallback = getActivity().getIntent()
-                    .getBooleanExtra(LockPatternUtils.LOCKSCREEN_BIOMETRIC_WEAK_FALLBACK, false);
+            final Intent intent = getActivity().getIntent();
+            final boolean onlyShowFallback = intent.getBooleanExtra(
+                    LockPatternUtils.LOCKSCREEN_BIOMETRIC_WEAK_FALLBACK, false);
             final boolean weakBiometricAvailable =
                     mChooseLockSettingsHelper.utils().isBiometricWeakInstalled();
 
@@ -326,6 +342,9 @@
                     } else if (KEY_UNLOCK_SET_PASSWORD.equals(key)) {
                         enabled = quality <= DevicePolicyManager.PASSWORD_QUALITY_COMPLEX;
                     }
+                    if (hideDisabled) {
+                        visible = visible && enabled;
+                    }
                     if (!visible || (onlyShowFallback && !allowedForFallback(key))) {
                         entries.removePreference(pref);
                     } else if (!enabled) {
diff --git a/src/com/android/settings/ChooseLockPassword.java b/src/com/android/settings/ChooseLockPassword.java
index 2c05986..fa1c678 100644
--- a/src/com/android/settings/ChooseLockPassword.java
+++ b/src/com/android/settings/ChooseLockPassword.java
@@ -24,14 +24,12 @@
 import android.app.Activity;
 import android.app.Fragment;
 import android.app.admin.DevicePolicyManager;
-import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
 import android.inputmethodservice.KeyboardView;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-import android.provider.Settings;
 import android.text.Editable;
 import android.text.InputType;
 import android.text.Selection;
@@ -416,7 +414,7 @@
             return null;
         }
 
-        private void handleNext() {
+        public void handleNext() {
             if (mDone) return;
 
             final String pin = mPasswordEntry.getText().toString();
@@ -460,6 +458,14 @@
             }
         }
 
+        protected void setNextEnabled(boolean enabled) {
+            mNextButton.setEnabled(enabled);
+        }
+
+        protected void setNextText(int text) {
+            mNextButton.setText(text);
+        }
+
         public void onClick(View v) {
             switch (v.getId()) {
                 case R.id.next_button:
@@ -502,22 +508,22 @@
                     String msg = getString(mIsAlphaMode ? R.string.lockpassword_password_too_short
                             : R.string.lockpassword_pin_too_short, mPasswordMinLength);
                     mHeaderText.setText(msg);
-                    mNextButton.setEnabled(false);
+                    setNextEnabled(false);
                 } else {
                     String error = validatePassword(password);
                     if (error != null) {
                         mHeaderText.setText(error);
-                        mNextButton.setEnabled(false);
+                        setNextEnabled(false);
                     } else {
                         mHeaderText.setText(R.string.lockpassword_press_continue);
-                        mNextButton.setEnabled(true);
+                        setNextEnabled(true);
                     }
                 }
             } else {
                 mHeaderText.setText(mIsAlphaMode ? mUiStage.alphaHint : mUiStage.numericHint);
-                mNextButton.setEnabled(length > 0);
+                setNextEnabled(length > 0);
             }
-            mNextButton.setText(mUiStage.buttonText);
+            setNextText(mUiStage.buttonText);
         }
 
         public void afterTextChanged(Editable s) {
diff --git a/src/com/android/settings/ChooseLockPattern.java b/src/com/android/settings/ChooseLockPattern.java
index 85694b1..e454ed1 100644
--- a/src/com/android/settings/ChooseLockPattern.java
+++ b/src/com/android/settings/ChooseLockPattern.java
@@ -150,6 +150,14 @@
             }
         }
 
+        protected void setRightButtonEnabled(boolean enabled) {
+            mFooterRightButton.setEnabled(enabled);
+        }
+
+        protected void setRightButtonText(int text) {
+            mFooterRightButton.setText(text);
+        }
+
         /**
          * The pattern listener that responds according to a user choosing a new
          * lock pattern.
@@ -390,43 +398,51 @@
             return RedactionInterstitial.createStartIntent(context);
         }
 
+        public void handleLeftButton() {
+            if (mUiStage.leftMode == LeftButtonMode.Retry) {
+                mChosenPattern = null;
+                mLockPatternView.clearPattern();
+                updateStage(Stage.Introduction);
+            } else if (mUiStage.leftMode == LeftButtonMode.Cancel) {
+                // They are canceling the entire wizard
+                getActivity().setResult(RESULT_FINISHED);
+                getActivity().finish();
+            } else {
+                throw new IllegalStateException("left footer button pressed, but stage of " +
+                        mUiStage + " doesn't make sense");
+            }
+        }
+
+        public void handleRightButton() {
+            if (mUiStage.rightMode == RightButtonMode.Continue) {
+                if (mUiStage != Stage.FirstChoiceValid) {
+                    throw new IllegalStateException("expected ui stage "
+                            + Stage.FirstChoiceValid + " when button is "
+                            + RightButtonMode.Continue);
+                }
+                updateStage(Stage.NeedToConfirm);
+            } else if (mUiStage.rightMode == RightButtonMode.Confirm) {
+                if (mUiStage != Stage.ChoiceConfirmed) {
+                    throw new IllegalStateException("expected ui stage " + Stage.ChoiceConfirmed
+                            + " when button is " + RightButtonMode.Confirm);
+                }
+                saveChosenPatternAndFinish();
+            } else if (mUiStage.rightMode == RightButtonMode.Ok) {
+                if (mUiStage != Stage.HelpScreen) {
+                    throw new IllegalStateException("Help screen is only mode with ok button, "
+                            + "but stage is " + mUiStage);
+                }
+                mLockPatternView.clearPattern();
+                mLockPatternView.setDisplayMode(DisplayMode.Correct);
+                updateStage(Stage.Introduction);
+            }
+        }
+
         public void onClick(View v) {
             if (v == mFooterLeftButton) {
-                if (mUiStage.leftMode == LeftButtonMode.Retry) {
-                    mChosenPattern = null;
-                    mLockPatternView.clearPattern();
-                    updateStage(Stage.Introduction);
-                } else if (mUiStage.leftMode == LeftButtonMode.Cancel) {
-                    // They are canceling the entire wizard
-                    getActivity().setResult(RESULT_FINISHED);
-                    getActivity().finish();
-                } else {
-                    throw new IllegalStateException("left footer button pressed, but stage of " +
-                        mUiStage + " doesn't make sense");
-                }
+                handleLeftButton();
             } else if (v == mFooterRightButton) {
-
-                if (mUiStage.rightMode == RightButtonMode.Continue) {
-                    if (mUiStage != Stage.FirstChoiceValid) {
-                        throw new IllegalStateException("expected ui stage " + Stage.FirstChoiceValid
-                                + " when button is " + RightButtonMode.Continue);
-                    }
-                    updateStage(Stage.NeedToConfirm);
-                } else if (mUiStage.rightMode == RightButtonMode.Confirm) {
-                    if (mUiStage != Stage.ChoiceConfirmed) {
-                        throw new IllegalStateException("expected ui stage " + Stage.ChoiceConfirmed
-                                + " when button is " + RightButtonMode.Confirm);
-                    }
-                    saveChosenPatternAndFinish();
-                } else if (mUiStage.rightMode == RightButtonMode.Ok) {
-                    if (mUiStage != Stage.HelpScreen) {
-                        throw new IllegalStateException("Help screen is only mode with ok button, but " +
-                                "stage is " + mUiStage);
-                    }
-                    mLockPatternView.clearPattern();
-                    mLockPatternView.setDisplayMode(DisplayMode.Correct);
-                    updateStage(Stage.Introduction);
-                }
+                handleRightButton();
             }
         }
 
@@ -489,8 +505,8 @@
                 mFooterLeftButton.setEnabled(stage.leftMode.enabled);
             }
 
-            mFooterRightButton.setText(stage.rightMode.text);
-            mFooterRightButton.setEnabled(stage.rightMode.enabled);
+            setRightButtonText(stage.rightMode.text);
+            setRightButtonEnabled(stage.rightMode.enabled);
 
             // same for whether the patten is enabled
             if (stage.patternEnabled) {
@@ -555,8 +571,8 @@
             final boolean required = getActivity().getIntent().getBooleanExtra(
                     EncryptionInterstitial.EXTRA_REQUIRE_PASSWORD, true);
             utils.setCredentialRequiredToDecrypt(required);
-            utils.saveLockPattern(mChosenPattern, isFallback);
             utils.setLockPatternEnabled(true);
+            utils.saveLockPattern(mChosenPattern, isFallback);
 
             if (lockVirgin) {
                 utils.setVisiblePatternEnabled(true);
diff --git a/src/com/android/settings/DataUsageSummary.java b/src/com/android/settings/DataUsageSummary.java
index 58208fa..1c17ce5 100644
--- a/src/com/android/settings/DataUsageSummary.java
+++ b/src/com/android/settings/DataUsageSummary.java
@@ -761,20 +761,25 @@
         mDataEnabledSupported = isOwner;
         mDisableAtLimitSupported = true;
 
-        // TODO: remove mobile tabs when SIM isn't ready
+        // TODO: remove mobile tabs when SIM isn't ready probably by
+        // TODO: using SubscriptionManager.getActiveSubscriptionInfoList.
+        if (LOGD) Log.d(TAG, "updateBody() isMobileTab=" + isMobileTab(currentTab));
 
         if (isMobileTab(currentTab)) {
+            if (LOGD) Log.d(TAG, "updateBody() mobile tab");
             setPreferenceTitle(mDataEnabledView, R.string.data_usage_enable_mobile);
             setPreferenceTitle(mDisableAtLimitView, R.string.data_usage_disable_mobile_limit);
             mTemplate = buildTemplateMobileAll(getActiveSubscriberId(context,getSubId(currentTab)));
             mDataEnabledSupported = isMobileDataAvailable(getSubId(currentTab));
         } else if (TAB_3G.equals(currentTab)) {
+            if (LOGD) Log.d(TAG, "updateBody() 3g tab");
             setPreferenceTitle(mDataEnabledView, R.string.data_usage_enable_3g);
             setPreferenceTitle(mDisableAtLimitView, R.string.data_usage_disable_3g_limit);
             // TODO: bind mDataEnabled to 3G radio state
             mTemplate = buildTemplateMobile3gLower(getActiveSubscriberId(context));
 
         } else if (TAB_4G.equals(currentTab)) {
+            if (LOGD) Log.d(TAG, "updateBody() 4g tab");
             setPreferenceTitle(mDataEnabledView, R.string.data_usage_enable_4g);
             setPreferenceTitle(mDisableAtLimitView, R.string.data_usage_disable_4g_limit);
             // TODO: bind mDataEnabled to 4G radio state
@@ -782,17 +787,20 @@
 
         } else if (TAB_WIFI.equals(currentTab)) {
             // wifi doesn't have any controls
+            if (LOGD) Log.d(TAG, "updateBody() wifi tab");
             mDataEnabledSupported = false;
             mDisableAtLimitSupported = false;
             mTemplate = buildTemplateWifiWildcard();
 
         } else if (TAB_ETHERNET.equals(currentTab)) {
             // ethernet doesn't have any controls
+            if (LOGD) Log.d(TAG, "updateBody() ethernet tab");
             mDataEnabledSupported = false;
             mDisableAtLimitSupported = false;
             mTemplate = buildTemplateEthernet();
 
         } else {
+            if (LOGD) Log.d(TAG, "updateBody() unknown tab");
             throw new IllegalStateException("unknown tab: " + currentTab);
         }
 
@@ -1389,12 +1397,15 @@
     @Deprecated
     private boolean isMobilePolicySplit() {
         final Context context = getActivity();
+        boolean retVal;
         if (hasReadyMobileRadio(context)) {
             final TelephonyManager tele = TelephonyManager.from(context);
-            return mPolicyEditor.isMobilePolicySplit(getActiveSubscriberId(context));
+            retVal = mPolicyEditor.isMobilePolicySplit(getActiveSubscriberId(context));
         } else {
-            return false;
+            retVal = false;
         }
+        if (LOGD) Log.d(TAG, "isMobilePolicySplit: retVal=" + retVal);
+        return retVal;
     }
 
     @Deprecated
@@ -1402,6 +1413,7 @@
         final Context context = getActivity();
         if (hasReadyMobileRadio(context)) {
             final TelephonyManager tele = TelephonyManager.from(context);
+            if (LOGD) Log.d(TAG, "setMobilePolicySplit: split=" + split);
             mPolicyEditor.setMobilePolicySplit(getActiveSubscriberId(context), split);
         }
     }
@@ -1409,12 +1421,16 @@
     private static String getActiveSubscriberId(Context context) {
         final TelephonyManager tele = TelephonyManager.from(context);
         final String actualSubscriberId = tele.getSubscriberId();
-        return SystemProperties.get(TEST_SUBSCRIBER_PROP, actualSubscriberId);
+        String retVal = SystemProperties.get(TEST_SUBSCRIBER_PROP, actualSubscriberId);
+        if (LOGD) Log.d(TAG, "getActiveSubscriberId=" + retVal + " actualSubscriberId=" + actualSubscriberId);
+        return retVal;
     }
 
     private static String getActiveSubscriberId(Context context, int subId) {
         final TelephonyManager tele = TelephonyManager.from(context);
-        return tele.getSubscriberId(subId);
+        String retVal = tele.getSubscriberId(subId);
+        if (LOGD) Log.d(TAG, "getActiveSubscriberId=" + retVal + " subId=" + subId);
+        return retVal;
     }
 
     private DataUsageChartListener mChartListener = new DataUsageChartListener() {
@@ -2367,14 +2383,23 @@
                 SubscriptionManager.from(context).getActiveSubscriptionInfoList();
         // No activated Subscriptions
         if (subInfoList == null) {
+            if (LOGD) Log.d(TAG, "hasReadyMobileRadio: subInfoList=null");
             return false;
         }
         // require both supported network and ready SIM
         boolean isReady = true;
         for (SubscriptionInfo subInfo : subInfoList) {
             isReady = isReady & tele.getSimState(subInfo.getSimSlotIndex()) == SIM_STATE_READY;
+            if (LOGD) Log.d(TAG, "hasReadyMobileRadio: subInfo=" + subInfo);
         }
-        return conn.isNetworkSupported(TYPE_MOBILE) && isReady;
+        boolean retVal = conn.isNetworkSupported(TYPE_MOBILE) && isReady;
+        if (LOGD) {
+            Log.d(TAG, "hasReadyMobileRadio:"
+                    + " conn.isNetworkSupported(TYPE_MOBILE)="
+                                            + conn.isNetworkSupported(TYPE_MOBILE)
+                    + " isReady=" + isReady);
+        }
+        return retVal;
     }
 
     /*
@@ -2390,7 +2415,11 @@
         final int slotId = SubscriptionManager.getSlotId(subId);
         final boolean isReady = tele.getSimState(slotId) == SIM_STATE_READY;
 
-        return conn.isNetworkSupported(TYPE_MOBILE) && isReady;
+        boolean retVal =  conn.isNetworkSupported(TYPE_MOBILE) && isReady;
+        if (LOGD) Log.d(TAG, "hasReadyMobileRadio: subId=" + subId
+                + " conn.isNetworkSupported(TYPE_MOBILE)=" + conn.isNetworkSupported(TYPE_MOBILE)
+                + " isReady=" + isReady);
+        return retVal;
     }
 
     /**
@@ -2616,6 +2645,8 @@
                     mTabHost.addTab(buildTabSpec(mMobileTagMap.get(subInfo.getSubscriptionId()),
                             subInfo.getDisplayName()));
                 }
+            } else {
+                if (LOGD) Log.d(TAG, "addMobileTab: subInfoList is null");
             }
         }
 
@@ -2640,17 +2671,13 @@
          * @return The map or null if no activated subscription
          */
         private Map<Integer, String> initMobileTabTag(List<SubscriptionInfo> subInfoList) {
-            final Context context = getActivity();
             Map<Integer, String> map = null;
             if (subInfoList != null) {
                 String mobileTag;
                 map = new HashMap<Integer, String>();
-                for (int i = 0; i < mTelephonyManager.getSimCount(); i++) {
-                    final SubscriptionInfo subInfo = Utils.findRecordBySlotId(context, i);
-                    mobileTag = TAB_MOBILE + i;
-                    if (subInfo != null) {
-                        map.put(subInfo.getSubscriptionId(), mobileTag);
-                    }
+                for (SubscriptionInfo subInfo : subInfoList) {
+                    mobileTag = TAB_MOBILE + String.valueOf(subInfo.getSubscriptionId());
+                    map.put(subInfo.getSubscriptionId(), mobileTag);
                 }
             }
             return map;
diff --git a/src/com/android/settings/DeviceAdminSettings.java b/src/com/android/settings/DeviceAdminSettings.java
index bc22637..334d18f 100644
--- a/src/com/android/settings/DeviceAdminSettings.java
+++ b/src/com/android/settings/DeviceAdminSettings.java
@@ -16,7 +16,6 @@
 
 package com.android.settings;
 
-import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 
 import android.app.Activity;
@@ -25,9 +24,11 @@
 import android.app.admin.DeviceAdminInfo;
 import android.app.admin.DeviceAdminReceiver;
 import android.app.admin.DevicePolicyManager;
+import android.content.BroadcastReceiver;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
+import android.content.IntentFilter;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.content.res.Resources;
@@ -49,14 +50,13 @@
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
-import java.util.Collection;
 
 public class DeviceAdminSettings extends ListFragment {
     static final String TAG = "DeviceAdminSettings";
 
-    static final int DIALOG_WARNING = 1;
     private DevicePolicyManager mDPM;
     private UserManager mUm;
 
@@ -70,6 +70,18 @@
     private String mDeviceOwnerPkg;
     private SparseArray<ComponentName> mProfileOwnerComponents = new SparseArray<ComponentName>();
 
+    private final BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            // Refresh the list, if state change has been received. It could be that checkboxes
+            // need to be updated
+            if (DevicePolicyManager.ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED.equals(
+                    intent.getAction())) {
+                updateList();
+            }
+        }
+    };
+
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
@@ -93,6 +105,10 @@
     @Override
     public void onResume() {
         super.onResume();
+        IntentFilter filter = new IntentFilter();
+        filter.addAction(DevicePolicyManager.ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED);
+        getActivity().registerReceiverAsUser(
+                mBroadcastReceiver, UserHandle.ALL, filter, null, null);
         mDeviceOwnerPkg = mDPM.getDeviceOwner();
         if (mDeviceOwnerPkg != null && !mDPM.isDeviceOwner(mDeviceOwnerPkg)) {
             mDeviceOwnerPkg = null;
@@ -107,6 +123,12 @@
         updateList();
     }
 
+    @Override
+    public void onPause() {
+        getActivity().unregisterReceiver(mBroadcastReceiver);
+        super.onPause();
+    }
+
     /**
      * Update the internal collection of available admins for all profiles associated with the
      * current user.
@@ -264,6 +286,10 @@
                     && (isDeviceOwner(info) || isProfileOwner(info))) {
                 return false;
             }
+            // Disable item if admin is being removed
+            if (isRemovingAdmin(info)) {
+                return false;
+            }
             return true;
         }
 
@@ -340,6 +366,10 @@
         return mDPM.isAdminActiveAsUser(item.getComponent(), getUserId(item));
     }
 
+    private boolean isRemovingAdmin(DeviceAdminInfo item) {
+        return mDPM.isRemovingAdmin(item.getComponent(), getUserId(item));
+    }
+
     /**
      * Add device admins to the internal collection that belong to a profile.
      *
diff --git a/src/com/android/settings/EnableWifiTether.java b/src/com/android/settings/EnableWifiTether.java
index a67250d..329d92e 100644
--- a/src/com/android/settings/EnableWifiTether.java
+++ b/src/com/android/settings/EnableWifiTether.java
@@ -38,31 +38,16 @@
         super.onCreate(icicle);
         mProvisionApp = getResources().getStringArray(
                 com.android.internal.R.array.config_mobile_hotspot_provision_app);
-        setContentView(R.layout.settings_main_dashboard);
-        startProvisioningIfNecessary();
+        startProvisioning();
     }
 
-    private static boolean isProvisioningNeeded(String[] provisionApp) {
-        if (SystemProperties.getBoolean("net.tethering.noprovisioning", false)
-                || provisionApp == null) {
-            return false;
-        }
-        return (provisionApp.length == 2);
-    }
-
-    private void startProvisioningIfNecessary() {
-
-        if (isProvisioningNeeded(mProvisionApp)) {
-            Intent closeDialog = new Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS);
-            sendBroadcast(closeDialog);
-            Intent intent = new Intent(Intent.ACTION_MAIN);
-            intent.setClassName(mProvisionApp[0], mProvisionApp[1]);
-            intent.putExtra(TETHER_CHOICE, WIFI_TETHERING);
-            startActivityForResult(intent, PROVISION_REQUEST);
-        } else {
-            enableTethering();
-            finish();
-        }
+    private void startProvisioning() {
+        Intent closeDialog = new Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS);
+        sendBroadcast(closeDialog);
+        Intent intent = new Intent(Intent.ACTION_MAIN);
+        intent.setClassName(mProvisionApp[0], mProvisionApp[1]);
+        intent.putExtra(TETHER_CHOICE, WIFI_TETHERING);
+        startActivityForResult(intent, PROVISION_REQUEST);
     }
 
     public void onActivityResult(int requestCode, int resultCode, Intent intent) {
@@ -72,8 +57,8 @@
             if (resultCode == Activity.RESULT_OK) {
                 enableTethering();
             }
+            finish();
         }
-        finish();
     }
 
     private void enableTethering() {
diff --git a/src/com/android/settings/EncryptionInterstitial.java b/src/com/android/settings/EncryptionInterstitial.java
index 554f848..dfbed77 100644
--- a/src/com/android/settings/EncryptionInterstitial.java
+++ b/src/com/android/settings/EncryptionInterstitial.java
@@ -41,7 +41,7 @@
 
 public class EncryptionInterstitial extends SettingsActivity {
 
-    private static final String EXTRA_PASSWORD_QUALITY = "extra_password_quality";
+    protected static final String EXTRA_PASSWORD_QUALITY = "extra_password_quality";
     public static final String EXTRA_REQUIRE_PASSWORD = "extra_require_password";
 
     @Override
diff --git a/src/com/android/settings/SetupChooseLockGeneric.java b/src/com/android/settings/SetupChooseLockGeneric.java
index 2894f85..42e2baa 100644
--- a/src/com/android/settings/SetupChooseLockGeneric.java
+++ b/src/com/android/settings/SetupChooseLockGeneric.java
@@ -18,11 +18,13 @@
 
 import com.android.setupwizard.navigationbar.SetupWizardNavBar;
 
+import android.app.admin.DevicePolicyManager;
 import android.content.Context;
 import android.content.Intent;
 import android.content.res.Resources;
 import android.os.Bundle;
 import android.preference.PreferenceFragment;
+import android.util.MutableBoolean;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -87,9 +89,32 @@
         @Override
         public void onViewCreated(View view, Bundle savedInstanceState) {
             super.onViewCreated(view, savedInstanceState);
+            SetupWizardUtils.setIllustration(getActivity(),
+                    R.drawable.setup_illustration_lock_screen);
             SetupWizardUtils.setHeaderText(getActivity(), getActivity().getTitle());
         }
 
+        /***
+         * Disables preferences that are less secure than required quality and shows only secure
+         * screen lock options here.
+         *
+         * @param quality the requested quality.
+         * @param allowBiometric whether to allow biometic screen lock
+         */
+        @Override
+        protected void disableUnusablePreferences(final int quality,
+                MutableBoolean allowBiometric) {
+            // At this part of the flow, the user has already indicated they want to add a pin,
+            // pattern or password, so don't show "None" or "Slide". We disable them here and set
+            // the HIDE_DISABLED flag to true to hide them. This only happens for setup wizard.
+            // We do the following max check here since the device may already have a Device Admin
+            // installed with a policy we need to honor.
+            final int newQuality = Math.max(quality,
+                    DevicePolicyManager.PASSWORD_QUALITY_SOMETHING);
+            super.disableUnusablePreferencesImpl(newQuality, allowBiometric,
+                    true /* hideDisabled */);
+        }
+
         @Override
         protected Intent getLockPasswordIntent(Context context, int quality, boolean isFallback,
                 int minLength, int maxLength, boolean requirePasswordToDecrypt,
diff --git a/src/com/android/settings/SetupChooseLockPassword.java b/src/com/android/settings/SetupChooseLockPassword.java
index ed6fab4..0c7e57f 100644
--- a/src/com/android/settings/SetupChooseLockPassword.java
+++ b/src/com/android/settings/SetupChooseLockPassword.java
@@ -47,6 +47,9 @@
         return intent;
     }
 
+    private SetupWizardNavBar mNavigationBar;
+    private SetupChooseLockPasswordFragment mFragment;
+
     @Override
     protected boolean isValidFragment(String fragmentName) {
         return SetupChooseLockPasswordFragment.class.getName().equals(fragmentName);
@@ -65,6 +68,7 @@
 
     @Override
     public void onNavigationBarCreated(SetupWizardNavBar bar) {
+        mNavigationBar = bar;
         SetupWizardUtils.setImmersiveMode(this, bar);
     }
 
@@ -75,6 +79,17 @@
 
     @Override
     public void onNavigateNext() {
+        if (mFragment != null) {
+            mFragment.handleNext();
+        }
+    }
+
+    @Override
+    public void onAttachFragment(Fragment fragment) {
+        super.onAttachFragment(fragment);
+        if (fragment instanceof SetupChooseLockPasswordFragment) {
+            mFragment = (SetupChooseLockPasswordFragment) fragment;
+        }
     }
 
     public static class SetupChooseLockPasswordFragment extends ChooseLockPasswordFragment {
@@ -91,6 +106,8 @@
         @Override
         public void onViewCreated(View view, Bundle savedInstanceState) {
             super.onViewCreated(view, savedInstanceState);
+            SetupWizardUtils.setIllustration(getActivity(),
+                    R.drawable.setup_illustration_lock_screen);
             SetupWizardUtils.setHeaderText(getActivity(), getActivity().getTitle());
         }
 
@@ -100,5 +117,17 @@
             SetupWizardUtils.copySetupExtras(getActivity().getIntent(), intent);
             return intent;
         }
+
+        @Override
+        protected void setNextEnabled(boolean enabled) {
+            SetupChooseLockPassword activity = (SetupChooseLockPassword) getActivity();
+            activity.mNavigationBar.getNextButton().setEnabled(enabled);
+        }
+
+        @Override
+        protected void setNextText(int text) {
+            SetupChooseLockPassword activity = (SetupChooseLockPassword) getActivity();
+            activity.mNavigationBar.getNextButton().setText(text);
+        }
     }
 }
diff --git a/src/com/android/settings/SetupChooseLockPattern.java b/src/com/android/settings/SetupChooseLockPattern.java
index b44dea1..7f2480b 100644
--- a/src/com/android/settings/SetupChooseLockPattern.java
+++ b/src/com/android/settings/SetupChooseLockPattern.java
@@ -26,6 +26,7 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.Button;
 
 /**
  * Setup Wizard's version of ChooseLockPattern screen. It inherits the logic and basic structure
@@ -45,6 +46,9 @@
         return intent;
     }
 
+    private SetupWizardNavBar mNavigationBar;
+    private SetupChooseLockPatternFragment mFragment;
+
     @Override
     protected boolean isValidFragment(String fragmentName) {
         return SetupChooseLockPatternFragment.class.getName().equals(fragmentName);
@@ -63,6 +67,7 @@
 
     @Override
     public void onNavigationBarCreated(SetupWizardNavBar bar) {
+        mNavigationBar = bar;
         SetupWizardUtils.setImmersiveMode(this, bar);
     }
 
@@ -73,10 +78,23 @@
 
     @Override
     public void onNavigateNext() {
+        if (mFragment != null) {
+            mFragment.handleRightButton();
+        }
+    }
+
+    @Override
+    public void onAttachFragment(Fragment fragment) {
+        super.onAttachFragment(fragment);
+        if (fragment instanceof ChooseLockPatternFragment) {
+            mFragment = (SetupChooseLockPatternFragment) fragment;
+        }
     }
 
     public static class SetupChooseLockPatternFragment extends ChooseLockPatternFragment {
 
+        private Button mRetryButton;
+
         @Override
         public View onCreateView(LayoutInflater inflater, ViewGroup container,
                 Bundle savedInstanceState) {
@@ -88,7 +106,11 @@
 
         @Override
         public void onViewCreated(View view, Bundle savedInstanceState) {
+            mRetryButton = (Button) view.findViewById(R.id.retryButton);
+            mRetryButton.setOnClickListener(this);
             super.onViewCreated(view, savedInstanceState);
+            SetupWizardUtils.setIllustration(getActivity(),
+                    R.drawable.setup_illustration_lock_screen);
             SetupWizardUtils.setHeaderText(getActivity(), getActivity().getTitle());
         }
 
@@ -98,5 +120,33 @@
             SetupWizardUtils.copySetupExtras(getActivity().getIntent(), intent);
             return intent;
         }
+
+        @Override
+        public void onClick(View v) {
+            if (v == mRetryButton) {
+                handleLeftButton();
+            } else {
+                super.onClick(v);
+            }
+        }
+
+        @Override
+        protected void setRightButtonEnabled(boolean enabled) {
+            SetupChooseLockPattern activity = (SetupChooseLockPattern) getActivity();
+            activity.mNavigationBar.getNextButton().setEnabled(enabled);
+        }
+
+        @Override
+        protected void setRightButtonText(int text) {
+            SetupChooseLockPattern activity = (SetupChooseLockPattern) getActivity();
+            activity.mNavigationBar.getNextButton().setText(text);
+        }
+
+        @Override
+        protected void updateStage(Stage stage) {
+            super.updateStage(stage);
+            // Only enable the button for retry
+            mRetryButton.setEnabled(stage == Stage.FirstChoiceValid);
+        }
     }
 }
diff --git a/src/com/android/settings/SetupEncryptionInterstitial.java b/src/com/android/settings/SetupEncryptionInterstitial.java
index 53548bd..41782da 100644
--- a/src/com/android/settings/SetupEncryptionInterstitial.java
+++ b/src/com/android/settings/SetupEncryptionInterstitial.java
@@ -18,6 +18,7 @@
 
 import com.android.setupwizard.navigationbar.SetupWizardNavBar;
 
+import android.app.admin.DevicePolicyManager;
 import android.content.Context;
 import android.content.Intent;
 import android.content.res.Resources;
@@ -93,10 +94,27 @@
             return view;
         }
 
+        private int getHeaderTextResource() {
+            final int quality = getActivity().getIntent().getIntExtra(EXTRA_PASSWORD_QUALITY, 0);
+            switch (quality) {
+                case DevicePolicyManager.PASSWORD_QUALITY_SOMETHING:
+                    return R.string.unlock_set_unlock_pattern_title;
+                case DevicePolicyManager.PASSWORD_QUALITY_NUMERIC:
+                case DevicePolicyManager.PASSWORD_QUALITY_NUMERIC_COMPLEX:
+                    return R.string.unlock_set_unlock_pin_title;
+                default:
+                    return R.string.unlock_set_unlock_password_title;
+            }
+        }
+
         @Override
         public void onViewCreated(View view, Bundle savedInstanceState) {
             super.onViewCreated(view, savedInstanceState);
-            SetupWizardUtils.setHeaderText(getActivity(), R.string.encryption_interstitial_header);
+            SetupWizardUtils.setIllustration(getActivity(),
+                    R.drawable.setup_illustration_lock_screen);
+            final int title = getHeaderTextResource();
+            getActivity().setTitle(title);
+            SetupWizardUtils.setHeaderText(getActivity(), title);
         }
     }
 }
diff --git a/src/com/android/settings/SetupRedactionInterstitial.java b/src/com/android/settings/SetupRedactionInterstitial.java
index 96f4dff..453e729 100644
--- a/src/com/android/settings/SetupRedactionInterstitial.java
+++ b/src/com/android/settings/SetupRedactionInterstitial.java
@@ -22,7 +22,6 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.res.Resources;
-import android.graphics.Color;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -96,6 +95,8 @@
         @Override
         public void onViewCreated(View view, Bundle savedInstanceState) {
             super.onViewCreated(view, savedInstanceState);
+            SetupWizardUtils.setIllustration(getActivity(),
+                    R.drawable.setup_illustration_lock_screen);
             SetupWizardUtils.setHeaderText(getActivity(), R.string.notification_section_header);
         }
     }
diff --git a/src/com/android/settings/SetupWizardUtils.java b/src/com/android/settings/SetupWizardUtils.java
index 0f54e63..3d44125 100644
--- a/src/com/android/settings/SetupWizardUtils.java
+++ b/src/com/android/settings/SetupWizardUtils.java
@@ -16,12 +16,17 @@
 
 package com.android.settings;
 
+import com.android.settings.widget.SetupWizardIllustration;
 import com.android.setupwizard.navigationbar.SetupWizardNavBar;
 
 
 import android.app.Activity;
 import android.content.Intent;
 import android.graphics.Color;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.LayerDrawable;
+import android.view.Gravity;
 import android.view.Window;
 import android.widget.TextView;
 
@@ -109,4 +114,24 @@
         toIntent.putExtra(EXTRA_USE_IMMERSIVE_MODE,
                 fromIntent.getBooleanExtra(EXTRA_USE_IMMERSIVE_MODE, false));
     }
+
+    public static void setIllustration(Activity activity, int asset) {
+        SetupWizardIllustration illustration =
+                (SetupWizardIllustration) activity.findViewById(R.id.setup_illustration);
+        if (illustration != null) {
+            Drawable drawable = activity.getDrawable(R.drawable.setup_illustration);
+            Drawable newIllustration = activity.getDrawable(asset);
+            if (drawable instanceof LayerDrawable) {
+                LayerDrawable layers = (LayerDrawable) drawable;
+                Drawable oldIllustration = layers.findDrawableByLayerId(R.id.illustration_image);
+                if (newIllustration instanceof BitmapDrawable
+                        && oldIllustration instanceof BitmapDrawable) {
+                    final int gravity = ((BitmapDrawable) oldIllustration).getGravity();
+                    ((BitmapDrawable) newIllustration).setGravity(gravity);
+                }
+                layers.setDrawableByLayerId(R.id.illustration_image, newIllustration);
+                illustration.setForeground(layers);
+            }
+        }
+    }
 }
diff --git a/src/com/android/settings/bluetooth/BluetoothPairingDialog.java b/src/com/android/settings/bluetooth/BluetoothPairingDialog.java
index fd8489b..be031ea 100755
--- a/src/com/android/settings/bluetooth/BluetoothPairingDialog.java
+++ b/src/com/android/settings/bluetooth/BluetoothPairingDialog.java
@@ -17,12 +17,14 @@
 package com.android.settings.bluetooth;
 
 import android.bluetooth.BluetoothDevice;
+import android.bluetooth.BluetoothUuid;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Bundle;
+import android.os.ParcelUuid;
 import android.text.Editable;
 import android.text.Html;
 import android.text.InputFilter;
@@ -111,6 +113,7 @@
 
         mDevice = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
         mType = intent.getIntExtra(BluetoothDevice.EXTRA_PAIRING_VARIANT, BluetoothDevice.ERROR);
+        mDevice.fetchUuidsWithSdp();
 
         switch (mType) {
             case BluetoothDevice.PAIRING_VARIANT_PIN:
@@ -318,7 +321,7 @@
         }
     }
 
-    private void allowPhonebookAccess() {
+    private void processPhonebookAccess() {
         CachedBluetoothDevice cachedDevice = mCachedDeviceManager.findDevice(mDevice);
         if (cachedDevice == null) {
             cachedDevice = mCachedDeviceManager.addDevice(
@@ -326,11 +329,14 @@
                     mBluetoothManager.getProfileManager(),
                     mDevice);
         }
-        cachedDevice.setPhonebookPermissionChoice(CachedBluetoothDevice.ACCESS_ALLOWED);
+        ParcelUuid[] uuids = mDevice.getUuids();
+        if (BluetoothUuid.containsAnyUuid(uuids, PbapServerProfile.PBAB_CLIENT_UUIDS)) {
+            cachedDevice.setPhonebookPermissionChoice(CachedBluetoothDevice.ACCESS_ALLOWED);
+        }
     }
 
     private void onPair(String value) {
-        allowPhonebookAccess();
+        processPhonebookAccess();
 
         switch (mType) {
             case BluetoothDevice.PAIRING_VARIANT_PIN:
diff --git a/src/com/android/settings/bluetooth/PbapServerProfile.java b/src/com/android/settings/bluetooth/PbapServerProfile.java
index 87e51a5..6e48b12 100755
--- a/src/com/android/settings/bluetooth/PbapServerProfile.java
+++ b/src/com/android/settings/bluetooth/PbapServerProfile.java
@@ -21,7 +21,9 @@
 import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothPbap;
 import android.bluetooth.BluetoothProfile;
+import android.bluetooth.BluetoothUuid;
 import android.content.Context;
+import android.os.ParcelUuid;
 import android.util.Log;
 
 import com.android.settings.R;
@@ -44,6 +46,13 @@
     // Order of this profile in device profiles list
     private static final int ORDINAL = 6;
 
+    // The UUIDs indicate that remote device might access pbap server
+    static final ParcelUuid[] PBAB_CLIENT_UUIDS = {
+        BluetoothUuid.HSP,
+        BluetoothUuid.Handsfree,
+        BluetoothUuid.PBAP_PCE
+    };
+
     // These callbacks run on the main thread.
     private final class PbapServiceListener
             implements BluetoothPbap.ServiceListener {
diff --git a/src/com/android/settings/deviceinfo/SimStatus.java b/src/com/android/settings/deviceinfo/SimStatus.java
index 2afdb84..2d1da40 100644
--- a/src/com/android/settings/deviceinfo/SimStatus.java
+++ b/src/com/android/settings/deviceinfo/SimStatus.java
@@ -153,7 +153,7 @@
             }
         }
 
-        mSir = mSelectableSubInfos.get(0);
+        mSir = mSelectableSubInfos.size() > 0 ? mSelectableSubInfos.get(0) : null;
         if (mSelectableSubInfos.size() > 1) {
             setContentView(R.layout.sim_information);
 
@@ -343,7 +343,7 @@
             }
         }
 
-        String rawNumber = mPhone.getLine1Number();  // may be null or empty
+        String rawNumber = mTelephonyManager.getLine1Number();  // may be null or empty
         String formattedNumber = null;
         if (!TextUtils.isEmpty(rawNumber)) {
             formattedNumber = PhoneNumberUtils.formatNumber(rawNumber);
@@ -353,9 +353,7 @@
         final String imei = mPhone.getPhoneType() == TelephonyManager.PHONE_TYPE_CDMA
                 ? mPhone.getImei() : mPhone.getDeviceId();
         setSummaryText(KEY_IMEI, imei);
-        setSummaryText(KEY_IMEI_SV,
-                ((TelephonyManager) getSystemService(TELEPHONY_SERVICE))
-                .getDeviceSoftwareVersion(/*slotId*/));
+        setSummaryText(KEY_IMEI_SV, mTelephonyManager.getDeviceSoftwareVersion(/*slotId*/));
 
         if (!mShowLatestAreaInfo) {
             removePreferenceFromScreen(KEY_LATEST_AREA_INFO);
@@ -363,33 +361,35 @@
     }
 
     private void updatePhoneInfos() {
-        final Phone phone = PhoneFactory.getPhone(SubscriptionManager.getPhoneId(
+        if (mSir != null) {
+            final Phone phone = PhoneFactory.getPhone(SubscriptionManager.getPhoneId(
                         mSir.getSubscriptionId()));
-        if (UserHandle.myUserId() == UserHandle.USER_OWNER
-                && mSir.getSubscriptionId() != SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
-            if (phone == null) {
-                Log.e(TAG, "Unable to locate a phone object for the given Subscription ID.");
-                return;
+            if (UserHandle.myUserId() == UserHandle.USER_OWNER
+                    && mSir.getSubscriptionId() != SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
+                if (phone == null) {
+                    Log.e(TAG, "Unable to locate a phone object for the given Subscription ID.");
+                    return;
+                }
+
+                mPhone = phone;
+                mPhoneStateListener = new PhoneStateListener(mSir.getSubscriptionId()) {
+                    @Override
+                    public void onDataConnectionStateChanged(int state) {
+                        updateDataState();
+                        updateNetworkType();
+                    }
+
+                    @Override
+                    public void onSignalStrengthsChanged(SignalStrength signalStrength) {
+                        updateSignalStrength(signalStrength);
+                    }
+
+                    @Override
+                    public void onServiceStateChanged(ServiceState serviceState) {
+                        updateServiceState(serviceState);
+                    }
+                };
             }
-
-            mPhone = phone;
-            mPhoneStateListener = new PhoneStateListener(mSir.getSubscriptionId()) {
-                @Override
-                public void onDataConnectionStateChanged(int state) {
-                    updateDataState();
-                    updateNetworkType();
-                }
-
-                @Override
-                public void onSignalStrengthsChanged(SignalStrength signalStrength) {
-                    updateSignalStrength(signalStrength);
-                }
-
-                @Override
-                public void onServiceStateChanged(ServiceState serviceState) {
-                    updateServiceState(serviceState);
-                }
-            };
         }
     }
     private OnTabChangeListener mTabListener = new OnTabChangeListener() {
diff --git a/src/com/android/settings/fuelgauge/BatterySaverSettings.java b/src/com/android/settings/fuelgauge/BatterySaverSettings.java
index 94620cc..e6b90a7 100644
--- a/src/com/android/settings/fuelgauge/BatterySaverSettings.java
+++ b/src/com/android/settings/fuelgauge/BatterySaverSettings.java
@@ -63,7 +63,10 @@
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
-        if (mCreated) return;
+        if (mCreated) {
+            mSwitchBar.show();
+            return;
+        }
         mCreated = true;
         addPreferencesFromResource(R.xml.battery_saver_settings);
 
diff --git a/src/com/android/settings/location/DimmableIconPreference.java b/src/com/android/settings/location/DimmableIconPreference.java
index acde1c1..f785992 100644
--- a/src/com/android/settings/location/DimmableIconPreference.java
+++ b/src/com/android/settings/location/DimmableIconPreference.java
@@ -16,10 +16,14 @@
 
 package com.android.settings.location;
 
+import android.annotation.Nullable;
 import android.content.Context;
 import android.graphics.drawable.Drawable;
 import android.preference.Preference;
+import android.text.TextUtils;
 import android.util.AttributeSet;
+import android.view.View;
+import android.widget.TextView;
 
 /**
  * A preference item that can dim the icon when it's disabled, either directly or because its parent
@@ -29,16 +33,23 @@
     private static final int ICON_ALPHA_ENABLED = 255;
     private static final int ICON_ALPHA_DISABLED = 102;
 
-    public DimmableIconPreference(Context context, AttributeSet attrs, int defStyle) {
+    private final CharSequence mContentDescription;
+
+    public DimmableIconPreference(Context context, AttributeSet attrs, int defStyle,
+            @Nullable CharSequence contentDescription) {
         super(context, attrs, defStyle);
+        mContentDescription = contentDescription;
     }
 
-    public DimmableIconPreference(Context context, AttributeSet attrs) {
+    public DimmableIconPreference(Context context, AttributeSet attrs,
+            @Nullable CharSequence contentDescription) {
         super(context, attrs);
+        mContentDescription = contentDescription;
     }
 
-    public DimmableIconPreference(Context context) {
+    public DimmableIconPreference(Context context, @Nullable CharSequence contentDescription) {
         super(context);
+        mContentDescription = contentDescription;
     }
 
     private void dimIcon(boolean dimmed) {
@@ -60,4 +71,13 @@
         dimIcon(!enabled);
         super.setEnabled(enabled);
     }
+
+    @Override
+    protected void onBindView(View view) {
+        super.onBindView(view);
+        if (!TextUtils.isEmpty(mContentDescription)) {
+            final TextView titleView = (TextView) view.findViewById(android.R.id.title);
+            titleView.setContentDescription(mContentDescription);
+        }
+    }
 }
diff --git a/src/com/android/settings/location/InjectedSetting.java b/src/com/android/settings/location/InjectedSetting.java
index 5f4440a..bb009b9 100644
--- a/src/com/android/settings/location/InjectedSetting.java
+++ b/src/com/android/settings/location/InjectedSetting.java
@@ -19,6 +19,7 @@
 import android.content.Intent;
 import android.text.TextUtils;
 import android.util.Log;
+import android.os.UserHandle;
 import com.android.internal.annotations.Immutable;
 import com.android.internal.util.Preconditions;
 
@@ -53,17 +54,23 @@
     public final int iconId;
 
     /**
+     * The user/profile associated with this setting (e.g. managed profile)
+     */
+    public final UserHandle mUserHandle;
+
+    /**
      * The activity to launch to allow the user to modify the settings value. Assumed to be in the
      * {@link #packageName} package.
      */
     public final String settingsActivity;
 
     private InjectedSetting(String packageName, String className,
-            String title, int iconId, String settingsActivity) {
+            String title, int iconId, UserHandle userHandle, String settingsActivity) {
         this.packageName = Preconditions.checkNotNull(packageName, "packageName");
         this.className = Preconditions.checkNotNull(className, "className");
         this.title = Preconditions.checkNotNull(title, "title");
         this.iconId = iconId;
+        this.mUserHandle = userHandle;
         this.settingsActivity = Preconditions.checkNotNull(settingsActivity);
     }
 
@@ -71,7 +78,7 @@
      * Returns a new instance, or null.
      */
     public static InjectedSetting newInstance(String packageName, String className,
-            String title, int iconId, String settingsActivity) {
+            String title, int iconId, UserHandle userHandle, String settingsActivity) {
         if (packageName == null || className == null ||
                 TextUtils.isEmpty(title) || TextUtils.isEmpty(settingsActivity)) {
             if (Log.isLoggable(SettingsInjector.TAG, Log.WARN)) {
@@ -81,7 +88,8 @@
             }
             return null;
         }
-        return new InjectedSetting(packageName, className, title, iconId, settingsActivity);
+        return new InjectedSetting(packageName, className, title, iconId, userHandle,
+                settingsActivity);
     }
 
     @Override
@@ -91,6 +99,7 @@
                 ", mClassName='" + className + '\'' +
                 ", label=" + title +
                 ", iconId=" + iconId +
+                ", userId=" + mUserHandle.getIdentifier() +
                 ", settingsActivity='" + settingsActivity + '\'' +
                 '}';
     }
@@ -113,6 +122,7 @@
 
         return packageName.equals(that.packageName) && className.equals(that.className)
                 && title.equals(that.title) && iconId == that.iconId
+                && mUserHandle.equals(that.mUserHandle)
                 && settingsActivity.equals(that.settingsActivity);
     }
 
@@ -122,6 +132,7 @@
         result = 31 * result + className.hashCode();
         result = 31 * result + title.hashCode();
         result = 31 * result + iconId;
+        result = 31 * result + mUserHandle.hashCode();
         result = 31 * result + settingsActivity.hashCode();
         return result;
     }
diff --git a/src/com/android/settings/location/LocationSettings.java b/src/com/android/settings/location/LocationSettings.java
index c0a13c1..ba5cd92 100644
--- a/src/com/android/settings/location/LocationSettings.java
+++ b/src/com/android/settings/location/LocationSettings.java
@@ -21,16 +21,22 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.location.SettingInjectorService;
+import android.os.Binder;
 import android.os.Bundle;
+import android.os.UserHandle;
+import android.os.UserManager;
 import android.preference.Preference;
 import android.preference.PreferenceCategory;
 import android.preference.PreferenceGroup;
 import android.preference.PreferenceScreen;
+import android.preference.SwitchPreference;
+import android.provider.Settings;
 import android.util.Log;
 import android.widget.Switch;
 
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
+import com.android.settings.Utils;
 import com.android.settings.widget.SwitchBar;
 
 import java.util.Collections;
@@ -45,6 +51,17 @@
 
     private static final String TAG = "LocationSettings";
 
+    /**
+     * Key for managed profile location preference category. Category is shown only
+     * if there is a managed profile
+     */
+    private static final String KEY_MANAGED_PROFILE_CATEGORY = "managed_profile_location_category";
+    /**
+     * Key for managed profile location preference. Note it used to be a switch pref and we had to
+     * keep the key as strings had been submitted for string freeze before the decision to
+     * demote this to a simple preference was made. TODO: Candidate for refactoring.
+     */
+    private static final String KEY_MANAGED_PROFILE_PREFERENCE = "managed_profile_location_switch";
     /** Key for preference screen "Mode" */
     private static final String KEY_LOCATION_MODE = "location_mode";
     /** Key for preference category "Recent location requests" */
@@ -55,17 +72,21 @@
     private SwitchBar mSwitchBar;
     private Switch mSwitch;
     private boolean mValidListener = false;
+    private UserHandle mManagedProfile;
+    private Preference mManagedProfilePreference;
     private Preference mLocationMode;
     private PreferenceCategory mCategoryRecentLocationRequests;
     /** Receives UPDATE_INTENT  */
     private BroadcastReceiver mReceiver;
     private SettingsInjector injector;
+    private UserManager mUm;
 
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
 
         final SettingsActivity activity = (SettingsActivity) getActivity();
+        mUm = (UserManager) activity.getSystemService(Context.USER_SERVICE);
 
         mSwitchBar = activity.getSwitchBar();
         mSwitch = mSwitchBar.getSwitch();
@@ -127,6 +148,7 @@
         addPreferencesFromResource(R.xml.location_settings);
         root = getPreferenceScreen();
 
+        setupManagedProfileCategory(root);
         mLocationMode = root.findPreference(KEY_LOCATION_MODE);
         mLocationMode.setOnPreferenceClickListener(
                 new Preference.OnPreferenceClickListener() {
@@ -155,12 +177,42 @@
             mCategoryRecentLocationRequests.addPreference(banner);
         }
 
-        addLocationServices(activity, root);
+        boolean lockdownOnLocationAccess = false;
+        // Checking if device policy has put a location access lock-down on the managed
+        // profile. If managed profile has lock-down on location access then its
+        // injected location services must not be shown.
+        if (mManagedProfile != null
+                && mUm.hasUserRestriction(UserManager.DISALLOW_SHARE_LOCATION, mManagedProfile)) {
+            lockdownOnLocationAccess = true;
+        }
+        addLocationServices(activity, root, lockdownOnLocationAccess);
 
         refreshLocationMode();
         return root;
     }
 
+    private void setupManagedProfileCategory(PreferenceScreen root) {
+        // Looking for a managed profile. If there are no managed profiles then we are removing the
+        // managed profile category.
+        mManagedProfile = Utils.getManagedProfile(mUm);
+        if (mManagedProfile == null) {
+            // There is no managed profile
+            root.removePreference(root.findPreference(KEY_MANAGED_PROFILE_CATEGORY));
+            mManagedProfilePreference = null;
+        } else {
+            mManagedProfilePreference = root.findPreference(KEY_MANAGED_PROFILE_PREFERENCE);
+            mManagedProfilePreference.setOnPreferenceClickListener(null);
+        }
+    }
+
+    private void changeManagedProfileLocationAccessStatus(boolean enabled, int summaryResId) {
+        if (mManagedProfilePreference == null) {
+            return;
+        }
+        mManagedProfilePreference.setEnabled(enabled);
+        mManagedProfilePreference.setSummary(summaryResId);
+    }
+
     /**
      * Add the settings injected by external apps into the "App Settings" category. Hides the
      * category if there are no injected settings.
@@ -168,11 +220,15 @@
      * Reloads the settings whenever receives
      * {@link SettingInjectorService#ACTION_INJECTED_SETTING_CHANGED}.
      */
-    private void addLocationServices(Context context, PreferenceScreen root) {
+    private void addLocationServices(Context context, PreferenceScreen root,
+            boolean lockdownOnLocationAccess) {
         PreferenceCategory categoryLocationServices =
                 (PreferenceCategory) root.findPreference(KEY_LOCATION_SERVICES);
         injector = new SettingsInjector(context);
-        List<Preference> locationServices = injector.getInjectedSettings();
+        // If location access is locked down by device policy then we only show injected settings
+        // for the primary profile.
+        List<Preference> locationServices = injector.getInjectedSettings(lockdownOnLocationAccess ?
+                UserHandle.myUserId() : UserHandle.USER_CURRENT);
 
         mReceiver = new BroadcastReceiver() {
             @Override
@@ -223,7 +279,7 @@
         // Restricted user can't change the location mode, so disable the master switch. But in some
         // corner cases, the location might still be enabled. In such case the master switch should
         // be disabled but checked.
-        boolean enabled = (mode != android.provider.Settings.Secure.LOCATION_MODE_OFF);
+        final boolean enabled = (mode != android.provider.Settings.Secure.LOCATION_MODE_OFF);
         // Disable the whole switch bar instead of the switch itself. If we disabled the switch
         // only, it would be re-enabled again if the switch bar is not disabled.
         mSwitchBar.setEnabled(!restricted);
@@ -240,6 +296,20 @@
                 mSwitchBar.addOnSwitchChangeListener(this);
             }
         }
+
+        if (mManagedProfilePreference != null) {
+            if (mUm.hasUserRestriction(UserManager.DISALLOW_SHARE_LOCATION, mManagedProfile)) {
+                changeManagedProfileLocationAccessStatus(false,
+                        R.string.managed_profile_location_switch_lockdown);
+            } else {
+                if (enabled) {
+                    changeManagedProfileLocationAccessStatus(true, R.string.switch_on_text);
+                } else {
+                    changeManagedProfileLocationAccessStatus(false, R.string.switch_off_text);
+                }
+            }
+        }
+
         // As a safety measure, also reloads on location mode change to ensure the settings are
         // up-to-date even if an affected app doesn't send the setting changed broadcast.
         injector.reloadStatusMessages();
diff --git a/src/com/android/settings/location/RecentLocationApps.java b/src/com/android/settings/location/RecentLocationApps.java
index 7e99725..9f2b8ab 100644
--- a/src/com/android/settings/location/RecentLocationApps.java
+++ b/src/com/android/settings/location/RecentLocationApps.java
@@ -77,35 +77,13 @@
         }
     }
 
-    /**
-     * Subclass of {@link Preference} to intercept views and allow content description to be set on
-     * them for accessibility purposes.
-     */
-    private static class AccessiblePreference extends DimmableIconPreference {
-        public CharSequence mContentDescription;
-
-        public AccessiblePreference(Context context, CharSequence contentDescription) {
-            super(context);
-            mContentDescription = contentDescription;
-        }
-
-        @Override
-        protected void onBindView(View view) {
-            super.onBindView(view);
-            if (mContentDescription != null) {
-                final TextView titleView = (TextView) view.findViewById(android.R.id.title);
-                titleView.setContentDescription(mContentDescription);
-            }
-        }
-    }
-
-    private AccessiblePreference createRecentLocationEntry(
+    private DimmableIconPreference createRecentLocationEntry(
             Drawable icon,
             CharSequence label,
             boolean isHighBattery,
             CharSequence contentDescription,
             Preference.OnPreferenceClickListener listener) {
-        AccessiblePreference pref = new AccessiblePreference(mActivity, contentDescription);
+        DimmableIconPreference pref = new DimmableIconPreference(mActivity, contentDescription);
         pref.setIcon(icon);
         pref.setTitle(label);
         if (isHighBattery) {
@@ -198,7 +176,7 @@
         int uid = ops.getUid();
         int userId = UserHandle.getUserId(uid);
 
-        AccessiblePreference preference = null;
+        DimmableIconPreference preference = null;
         try {
             IPackageManager ipm = AppGlobals.getPackageManager();
             ApplicationInfo appInfo =
@@ -215,6 +193,11 @@
             Drawable icon = mPackageManager.getUserBadgedIcon(appIcon, userHandle);
             CharSequence appLabel = mPackageManager.getApplicationLabel(appInfo);
             CharSequence badgedAppLabel = mPackageManager.getUserBadgedLabel(appLabel, userHandle);
+            if (appLabel.toString().contentEquals(badgedAppLabel)) {
+                // If badged label is not different from original then no need for it as
+                // a separate content description.
+                badgedAppLabel = null;
+            }
             preference = createRecentLocationEntry(icon,
                     appLabel, highBattery, badgedAppLabel,
                     new PackageEntryClickedListener(packageName));
diff --git a/src/com/android/settings/location/SettingsInjector.java b/src/com/android/settings/location/SettingsInjector.java
index edf67b8..f0a0ff3 100644
--- a/src/com/android/settings/location/SettingsInjector.java
+++ b/src/com/android/settings/location/SettingsInjector.java
@@ -32,11 +32,15 @@
 import android.os.Message;
 import android.os.Messenger;
 import android.os.SystemClock;
+import android.os.UserHandle;
+import android.os.UserManager;
 import android.preference.Preference;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.util.Xml;
+
 import com.android.settings.R;
+
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 
@@ -99,27 +103,29 @@
     }
 
     /**
-     * Returns a list with one {@link InjectedSetting} object for each {@link android.app.Service}
-     * that responds to {@link SettingInjectorService#ACTION_SERVICE_INTENT} and provides the
-     * expected setting metadata.
+     * Returns a list for a profile with one {@link InjectedSetting} object for each
+     * {@link android.app.Service} that responds to
+     * {@link SettingInjectorService#ACTION_SERVICE_INTENT} and provides the expected setting
+     * metadata.
      *
      * Duplicates some code from {@link android.content.pm.RegisteredServicesCache}.
      *
      * TODO: unit test
      */
-    private List<InjectedSetting> getSettings() {
+    private List<InjectedSetting> getSettings(final UserHandle userHandle) {
         PackageManager pm = mContext.getPackageManager();
         Intent intent = new Intent(SettingInjectorService.ACTION_SERVICE_INTENT);
 
+        final int profileId = userHandle.getIdentifier();
         List<ResolveInfo> resolveInfos =
-                pm.queryIntentServices(intent, PackageManager.GET_META_DATA);
+                pm.queryIntentServicesAsUser(intent, PackageManager.GET_META_DATA, profileId);
         if (Log.isLoggable(TAG, Log.DEBUG)) {
-            Log.d(TAG, "Found services: " + resolveInfos);
+            Log.d(TAG, "Found services for profile id " + profileId + ": " + resolveInfos);
         }
         List<InjectedSetting> settings = new ArrayList<InjectedSetting>(resolveInfos.size());
         for (ResolveInfo resolveInfo : resolveInfos) {
             try {
-                InjectedSetting setting = parseServiceInfo(resolveInfo, pm);
+                InjectedSetting setting = parseServiceInfo(resolveInfo, userHandle, pm);
                 if (setting == null) {
                     Log.w(TAG, "Unable to load service info " + resolveInfo);
                 } else {
@@ -132,7 +138,7 @@
             }
         }
         if (Log.isLoggable(TAG, Log.DEBUG)) {
-            Log.d(TAG, "Loaded settings: " + settings);
+            Log.d(TAG, "Loaded settings for profile id " + profileId + ": " + settings);
         }
 
         return settings;
@@ -144,8 +150,8 @@
      *
      * Duplicates some code from {@link android.content.pm.RegisteredServicesCache}.
      */
-    private static InjectedSetting parseServiceInfo(ResolveInfo service, PackageManager pm)
-            throws XmlPullParserException, IOException {
+    private static InjectedSetting parseServiceInfo(ResolveInfo service, UserHandle userHandle,
+            PackageManager pm) throws XmlPullParserException, IOException {
 
         ServiceInfo si = service.serviceInfo;
         ApplicationInfo ai = si.applicationInfo;
@@ -179,8 +185,9 @@
                         + SettingInjectorService.ATTRIBUTES_NAME + " tag");
             }
 
-            Resources res = pm.getResourcesForApplication(ai);
-            return parseAttributes(si.packageName, si.name, res, attrs);
+            Resources res = pm.getResourcesForApplicationAsUser(si.packageName,
+                    userHandle.getIdentifier());
+            return parseAttributes(si.packageName, si.name, userHandle, res, attrs);
         } catch (PackageManager.NameNotFoundException e) {
             throw new XmlPullParserException(
                     "Unable to load resources for package " + si.packageName);
@@ -194,8 +201,8 @@
     /**
      * Returns an immutable representation of the static attributes for the setting, or null.
      */
-    private static InjectedSetting parseAttributes(
-            String packageName, String className, Resources res, AttributeSet attrs) {
+    private static InjectedSetting parseAttributes(String packageName, String className,
+            UserHandle userHandle, Resources res, AttributeSet attrs) {
 
         TypedArray sa = res.obtainAttributes(attrs, android.R.styleable.SettingInjectorService);
         try {
@@ -211,7 +218,7 @@
                         + ", settingsActivity: " + settingsActivity);
             }
             return InjectedSetting.newInstance(packageName, className,
-                    title, iconId, settingsActivity);
+                    title, iconId, userHandle, settingsActivity);
         } finally {
             sa.recycle();
         }
@@ -219,13 +226,24 @@
 
     /**
      * Gets a list of preferences that other apps have injected.
+     *
+     * @param profileId Identifier of the user/profile to obtain the injected settings for or
+     *                  UserHandle.USER_CURRENT for all profiles associated with current user.
      */
-    public List<Preference> getInjectedSettings() {
-        Iterable<InjectedSetting> settings = getSettings();
+    public List<Preference> getInjectedSettings(final int profileId) {
+        final UserManager um = (UserManager) mContext.getSystemService(Context.USER_SERVICE);
+        final List<UserHandle> profiles = um.getUserProfiles();
         ArrayList<Preference> prefs = new ArrayList<Preference>();
-        for (InjectedSetting setting : settings) {
-            Preference pref = addServiceSetting(prefs, setting);
-            mSettings.add(new Setting(setting, pref));
+        final int profileCount = profiles.size();
+        for (int i = 0; i < profileCount; ++i) {
+            final UserHandle userHandle = profiles.get(i);
+            if (profileId == UserHandle.USER_CURRENT || profileId == userHandle.getIdentifier()) {
+                Iterable<InjectedSetting> settings = getSettings(userHandle);
+                for (InjectedSetting setting : settings) {
+                    Preference pref = addServiceSetting(prefs, setting);
+                    mSettings.add(new Setting(setting, pref));
+                }
+            }
         }
 
         reloadStatusMessages();
@@ -247,24 +265,46 @@
      * Adds an injected setting to the root.
      */
     private Preference addServiceSetting(List<Preference> prefs, InjectedSetting info) {
-        Preference pref = new DimmableIconPreference(mContext);
+        PackageManager pm = mContext.getPackageManager();
+        Drawable appIcon = pm.getDrawable(info.packageName, info.iconId, null);
+        Drawable icon = pm.getUserBadgedIcon(appIcon, info.mUserHandle);
+        CharSequence badgedAppLabel = pm.getUserBadgedLabel(info.title, info.mUserHandle);
+        if (info.title.contentEquals(badgedAppLabel)) {
+            // If badged label is not different from original then no need for it as
+            // a separate content description.
+            badgedAppLabel = null;
+        }
+        Preference pref = new DimmableIconPreference(mContext, badgedAppLabel);
         pref.setTitle(info.title);
         pref.setSummary(null);
-        PackageManager pm = mContext.getPackageManager();
-        Drawable icon = pm.getDrawable(info.packageName, info.iconId, null);
         pref.setIcon(icon);
-
-        // Activity to start if they click on the preference. Must start in new task to ensure
-        // that "android.settings.LOCATION_SOURCE_SETTINGS" brings user back to Settings > Location.
-        Intent settingIntent = new Intent();
-        settingIntent.setClassName(info.packageName, info.settingsActivity);
-        settingIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        pref.setIntent(settingIntent);
+        pref.setOnPreferenceClickListener(new ServiceSettingClickedListener(info));
 
         prefs.add(pref);
         return pref;
     }
 
+    private class ServiceSettingClickedListener
+            implements Preference.OnPreferenceClickListener {
+        private InjectedSetting mInfo;
+
+        public ServiceSettingClickedListener(InjectedSetting info) {
+            mInfo = info;
+        }
+
+        @Override
+        public boolean onPreferenceClick(Preference preference) {
+            // Activity to start if they click on the preference. Must start in new task to ensure
+            // that "android.settings.LOCATION_SOURCE_SETTINGS" brings user back to
+            // Settings > Location.
+            Intent settingIntent = new Intent();
+            settingIntent.setClassName(mInfo.packageName, mInfo.settingsActivity);
+            settingIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            mContext.startActivityAsUser(settingIntent, mInfo.mUserHandle);
+            return true;
+        }
+    }
+
     /**
      * Loads the setting status values one at a time. Each load starts a subclass of {@link
      * SettingInjectorService}, so to reduce memory pressure we don't want to load too many at
@@ -451,9 +491,9 @@
                 startMillis = 0;
             }
 
-            // Start the service, making sure that this is attributed to the current user rather
-            // than the system user.
-            mContext.startServiceAsUser(intent, android.os.Process.myUserHandle());
+            // Start the service, making sure that this is attributed to the user associated with
+            // the setting rather than the system user.
+            mContext.startServiceAsUser(intent, setting.mUserHandle);
         }
 
         public long getElapsedTime() {
diff --git a/src/com/android/settings/notification/ZenModeSettings.java b/src/com/android/settings/notification/ZenModeSettings.java
index 99e112c..420f974 100644
--- a/src/com/android/settings/notification/ZenModeSettings.java
+++ b/src/com/android/settings/notification/ZenModeSettings.java
@@ -23,6 +23,7 @@
 import android.app.DialogFragment;
 import android.app.FragmentManager;
 import android.app.INotificationManager;
+import android.app.NotificationManager;
 import android.app.TimePickerDialog;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -131,6 +132,7 @@
     private SwitchPreference mMessages;
     private DropDownPreference mStarred;
     private SwitchPreference mEvents;
+    private boolean mDowntimeSupported;
     private Preference mDays;
     private TimePickerPreference mStart;
     private TimePickerPreference mEnd;
@@ -227,99 +229,103 @@
         });
 
         final PreferenceCategory downtime = (PreferenceCategory) root.findPreference(KEY_DOWNTIME);
-
-        mDays = downtime.findPreference(KEY_DAYS);
-        mDays.setOnPreferenceClickListener(new OnPreferenceClickListener() {
-            @Override
-            public boolean onPreferenceClick(Preference preference) {
-                new AlertDialog.Builder(mContext)
-                        .setTitle(R.string.zen_mode_downtime_days)
-                        .setView(new ZenModeDowntimeDaysSelection(mContext, mConfig.sleepMode) {
-                              @Override
-                              protected void onChanged(String mode) {
-                                  if (mDisableListeners) return;
-                                  if (Objects.equals(mode, mConfig.sleepMode)) return;
-                                  if (DEBUG) Log.d(TAG, "days.onChanged sleepMode=" + mode);
-                                  final ZenModeConfig newConfig = mConfig.copy();
-                                  newConfig.sleepMode = mode;
-                                  setZenModeConfig(newConfig);
-                              }
-                        })
-                        .setOnDismissListener(new OnDismissListener() {
-                            @Override
-                            public void onDismiss(DialogInterface dialog) {
-                                updateDays();
-                            }
-                        })
-                        .setPositiveButton(R.string.done_button, null)
-                        .show();
-                return true;
-            }
-        });
-
-        final FragmentManager mgr = getFragmentManager();
-
-        mStart = new TimePickerPreference(mContext, mgr);
-        mStart.setKey(KEY_START_TIME);
-        mStart.setTitle(R.string.zen_mode_start_time);
-        mStart.setCallback(new TimePickerPreference.Callback() {
-            @Override
-            public boolean onSetTime(int hour, int minute) {
-                if (mDisableListeners) return true;
-                if (!ZenModeConfig.isValidHour(hour)) return false;
-                if (!ZenModeConfig.isValidMinute(minute)) return false;
-                if (hour == mConfig.sleepStartHour && minute == mConfig.sleepStartMinute) {
+        mDowntimeSupported = isDowntimeSupported(mContext);
+        if (!mDowntimeSupported) {
+            removePreference(KEY_DOWNTIME);
+        } else {
+            mDays = downtime.findPreference(KEY_DAYS);
+            mDays.setOnPreferenceClickListener(new OnPreferenceClickListener() {
+                @Override
+                public boolean onPreferenceClick(Preference preference) {
+                    new AlertDialog.Builder(mContext)
+                            .setTitle(R.string.zen_mode_downtime_days)
+                            .setView(new ZenModeDowntimeDaysSelection(mContext, mConfig.sleepMode) {
+                                  @Override
+                                  protected void onChanged(String mode) {
+                                      if (mDisableListeners) return;
+                                      if (Objects.equals(mode, mConfig.sleepMode)) return;
+                                      if (DEBUG) Log.d(TAG, "days.onChanged sleepMode=" + mode);
+                                      final ZenModeConfig newConfig = mConfig.copy();
+                                      newConfig.sleepMode = mode;
+                                      setZenModeConfig(newConfig);
+                                  }
+                            })
+                            .setOnDismissListener(new OnDismissListener() {
+                                @Override
+                                public void onDismiss(DialogInterface dialog) {
+                                    updateDays();
+                                }
+                            })
+                            .setPositiveButton(R.string.done_button, null)
+                            .show();
                     return true;
                 }
-                if (DEBUG) Log.d(TAG, "onPrefChange sleepStart h=" + hour + " m=" + minute);
-                final ZenModeConfig newConfig = mConfig.copy();
-                newConfig.sleepStartHour = hour;
-                newConfig.sleepStartMinute = minute;
-                return setZenModeConfig(newConfig);
-            }
-        });
-        downtime.addPreference(mStart);
-        mStart.setDependency(mDays.getKey());
+            });
 
-        mEnd = new TimePickerPreference(mContext, mgr);
-        mEnd.setKey(KEY_END_TIME);
-        mEnd.setTitle(R.string.zen_mode_end_time);
-        mEnd.setCallback(new TimePickerPreference.Callback() {
-            @Override
-            public boolean onSetTime(int hour, int minute) {
-                if (mDisableListeners) return true;
-                if (!ZenModeConfig.isValidHour(hour)) return false;
-                if (!ZenModeConfig.isValidMinute(minute)) return false;
-                if (hour == mConfig.sleepEndHour && minute == mConfig.sleepEndMinute) {
-                    return true;
+            final FragmentManager mgr = getFragmentManager();
+
+            mStart = new TimePickerPreference(mContext, mgr);
+            mStart.setKey(KEY_START_TIME);
+            mStart.setTitle(R.string.zen_mode_start_time);
+            mStart.setCallback(new TimePickerPreference.Callback() {
+                @Override
+                public boolean onSetTime(int hour, int minute) {
+                    if (mDisableListeners) return true;
+                    if (!ZenModeConfig.isValidHour(hour)) return false;
+                    if (!ZenModeConfig.isValidMinute(minute)) return false;
+                    if (hour == mConfig.sleepStartHour && minute == mConfig.sleepStartMinute) {
+                        return true;
+                    }
+                    if (DEBUG) Log.d(TAG, "onPrefChange sleepStart h=" + hour + " m=" + minute);
+                    final ZenModeConfig newConfig = mConfig.copy();
+                    newConfig.sleepStartHour = hour;
+                    newConfig.sleepStartMinute = minute;
+                    return setZenModeConfig(newConfig);
                 }
-                if (DEBUG) Log.d(TAG, "onPrefChange sleepEnd h=" + hour + " m=" + minute);
-                final ZenModeConfig newConfig = mConfig.copy();
-                newConfig.sleepEndHour = hour;
-                newConfig.sleepEndMinute = minute;
-                return setZenModeConfig(newConfig);
-            }
-        });
-        downtime.addPreference(mEnd);
-        mEnd.setDependency(mDays.getKey());
+            });
+            downtime.addPreference(mStart);
+            mStart.setDependency(mDays.getKey());
 
-        mDowntimeMode = (DropDownPreference) downtime.findPreference(KEY_DOWNTIME_MODE);
-        mDowntimeMode.addItem(R.string.zen_mode_downtime_mode_priority, false);
-        mDowntimeMode.addItem(R.string.zen_mode_downtime_mode_none, true);
-        mDowntimeMode.setCallback(new DropDownPreference.Callback() {
-            @Override
-            public boolean onItemSelected(int pos, Object value) {
-                if (mDisableListeners) return true;
-                final boolean sleepNone = value instanceof Boolean ? ((Boolean) value) : false;
-                if (mConfig == null || mConfig.sleepNone == sleepNone) return false;
-                final ZenModeConfig newConfig = mConfig.copy();
-                newConfig.sleepNone = sleepNone;
-                if (DEBUG) Log.d(TAG, "onPrefChange sleepNone=" + sleepNone);
-                return setZenModeConfig(newConfig);
-            }
-        });
-        mDowntimeMode.setOrder(10);  // sort at the bottom of the category
-        mDowntimeMode.setDependency(mDays.getKey());
+            mEnd = new TimePickerPreference(mContext, mgr);
+            mEnd.setKey(KEY_END_TIME);
+            mEnd.setTitle(R.string.zen_mode_end_time);
+            mEnd.setCallback(new TimePickerPreference.Callback() {
+                @Override
+                public boolean onSetTime(int hour, int minute) {
+                    if (mDisableListeners) return true;
+                    if (!ZenModeConfig.isValidHour(hour)) return false;
+                    if (!ZenModeConfig.isValidMinute(minute)) return false;
+                    if (hour == mConfig.sleepEndHour && minute == mConfig.sleepEndMinute) {
+                        return true;
+                    }
+                    if (DEBUG) Log.d(TAG, "onPrefChange sleepEnd h=" + hour + " m=" + minute);
+                    final ZenModeConfig newConfig = mConfig.copy();
+                    newConfig.sleepEndHour = hour;
+                    newConfig.sleepEndMinute = minute;
+                    return setZenModeConfig(newConfig);
+                }
+            });
+            downtime.addPreference(mEnd);
+            mEnd.setDependency(mDays.getKey());
+
+            mDowntimeMode = (DropDownPreference) downtime.findPreference(KEY_DOWNTIME_MODE);
+            mDowntimeMode.addItem(R.string.zen_mode_downtime_mode_priority, false);
+            mDowntimeMode.addItem(R.string.zen_mode_downtime_mode_none, true);
+            mDowntimeMode.setCallback(new DropDownPreference.Callback() {
+                @Override
+                public boolean onItemSelected(int pos, Object value) {
+                    if (mDisableListeners) return true;
+                    final boolean sleepNone = value instanceof Boolean ? ((Boolean) value) : false;
+                    if (mConfig == null || mConfig.sleepNone == sleepNone) return false;
+                    final ZenModeConfig newConfig = mConfig.copy();
+                    newConfig.sleepNone = sleepNone;
+                    if (DEBUG) Log.d(TAG, "onPrefChange sleepNone=" + sleepNone);
+                    return setZenModeConfig(newConfig);
+                }
+            });
+            mDowntimeMode.setOrder(10);  // sort at the bottom of the category
+            mDowntimeMode.setDependency(mDays.getKey());
+        }
 
         mAutomationCategory = (PreferenceCategory) findPreference(KEY_AUTOMATION);
         mEntry = findPreference(KEY_ENTRY);
@@ -376,6 +382,7 @@
     }
 
     private void updateEndSummary() {
+        if (!mDowntimeSupported) return;
         final int startMin = 60 * mConfig.sleepStartHour + mConfig.sleepStartMinute;
         final int endMin = 60 * mConfig.sleepEndHour + mConfig.sleepEndMinute;
         final boolean nextDay = startMin >= endMin;
@@ -399,10 +406,12 @@
         mStarred.setSelectedValue(mConfig.allowFrom);
         mEvents.setChecked(mConfig.allowEvents);
         updateStarredEnabled();
-        updateDays();
-        mStart.setTime(mConfig.sleepStartHour, mConfig.sleepStartMinute);
-        mEnd.setTime(mConfig.sleepEndHour, mConfig.sleepEndMinute);
-        mDowntimeMode.setSelectedValue(mConfig.sleepNone);
+        if (mDowntimeSupported) {
+            updateDays();
+            mStart.setTime(mConfig.sleepStartHour, mConfig.sleepStartMinute);
+            mEnd.setTime(mConfig.sleepEndHour, mConfig.sleepEndMinute);
+            mDowntimeMode.setSelectedValue(mConfig.sleepNone);
+        }
         mDisableListeners = false;
         refreshAutomationSection();
         updateEndSummary();
@@ -552,9 +561,15 @@
         mDialog = null;
     }
 
+    private static boolean isDowntimeSupported(Context context) {
+        return NotificationManager.from(context)
+                .isSystemConditionProviderEnabled(ZenModeConfig.DOWNTIME_PATH);
+    }
+
     // Enable indexing of searchable data
     public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
         new BaseSearchIndexProvider() {
+
             @Override
             public List<SearchIndexableRaw> getRawDataToIndex(Context context, boolean enabled) {
                 final SparseArray<String> keyTitles = allKeyTitles(context);
@@ -570,6 +585,19 @@
                 }
                 return result;
             }
+
+            @Override
+            public List<String> getNonIndexableKeys(Context context) {
+                final ArrayList<String> rt = new ArrayList<String>();
+                if (!isDowntimeSupported(context)) {
+                    rt.add(KEY_DOWNTIME);
+                    rt.add(KEY_DAYS);
+                    rt.add(KEY_START_TIME);
+                    rt.add(KEY_END_TIME);
+                    rt.add(KEY_DOWNTIME_MODE);
+                }
+                return rt;
+            }
         };
 
     private static class SettingPrefWithCallback extends SettingPref {
diff --git a/src/com/android/settings/sim/SimBootReceiver.java b/src/com/android/settings/sim/SimBootReceiver.java
index d3fb996..213a585 100644
--- a/src/com/android/settings/sim/SimBootReceiver.java
+++ b/src/com/android/settings/sim/SimBootReceiver.java
@@ -38,6 +38,7 @@
 import java.util.List;
 
 public class SimBootReceiver extends BroadcastReceiver {
+    private static final String TAG = "SimBootReceiver";
     private static final int SLOT_EMPTY = -1;
     private static final int NOTIFICATION_ID = 1;
     private static final String SHARED_PREFERENCES_NAME = "sim_state";
@@ -61,6 +62,9 @@
 
     private void detectChangeAndNotify() {
         final int numSlots = mTelephonyManager.getSimCount();
+        boolean notificationSent = false;
+        int numSIMsDetected = 0;
+        int lastSIMSlotDetected = -1;
 
         // Do not create notifications on single SIM devices.
         if (numSlots < 2) {
@@ -82,16 +86,32 @@
             final int lastSubId = getLastSubId(key);
 
             if (sir != null) {
+                numSIMsDetected++;
                 final int currentSubId = sir.getSubscriptionId();
                 if (lastSubId != currentSubId) {
                     createNotification(mContext);
                     setLastSubId(key, currentSubId);
+                    notificationSent = true;
                 }
+                lastSIMSlotDetected = i;
             } else if (lastSubId != SLOT_EMPTY) {
                 createNotification(mContext);
                 setLastSubId(key, SLOT_EMPTY);
+                notificationSent = true;
             }
         }
+
+        if (notificationSent) {
+            Intent intent = new Intent(mContext, SimDialogActivity.class);
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            if (numSIMsDetected == 1) {
+                intent.putExtra(SimDialogActivity.DIALOG_TYPE_KEY, SimDialogActivity.PREFERRED_PICK);
+                intent.putExtra(SimDialogActivity.PREFERRED_SIM, lastSIMSlotDetected);
+            } else {
+                intent.putExtra(SimDialogActivity.DIALOG_TYPE_KEY, SimDialogActivity.DATA_PICK);
+            }
+            mContext.startActivity(intent);
+        }
     }
 
     private int getLastSubId(String strSlotId) {
@@ -141,4 +161,5 @@
             detectChangeAndNotify();
         }
     };
+
 }
diff --git a/src/com/android/settings/sim/SimDialogActivity.java b/src/com/android/settings/sim/SimDialogActivity.java
new file mode 100644
index 0000000..cf3ccdf
--- /dev/null
+++ b/src/com/android/settings/sim/SimDialogActivity.java
@@ -0,0 +1,313 @@
+/*
+ * Copyright (C) 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.
+ */
+
+package com.android.settings.sim;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.res.Resources;
+import android.os.Bundle;
+import android.telecom.PhoneAccount;
+import android.telecom.PhoneAccountHandle;
+import android.telecom.TelecomManager;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.KeyEvent;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.ImageView;
+import android.widget.ListAdapter;
+import android.widget.TextView;
+
+import com.android.settings.R;
+import com.android.settings.Utils;
+import com.android.internal.telephony.Phone;
+import com.android.internal.telephony.PhoneFactory;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+public class SimDialogActivity extends Activity {
+    private static String TAG = "SimDialogActivity";
+
+    public static String PREFERRED_SIM = "preferred_sim";
+    public static String DIALOG_TYPE_KEY = "dialog_type";
+    public static final int INVALID_PICK = -1;
+    public static final int DATA_PICK = 0;
+    public static final int CALLS_PICK = 1;
+    public static final int SMS_PICK = 2;
+    public static final int PREFERRED_PICK = 3;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        final Bundle extras = getIntent().getExtras();
+        final int dialogType = extras.getInt(DIALOG_TYPE_KEY, INVALID_PICK);
+
+        switch (dialogType) {
+            case DATA_PICK:
+            case CALLS_PICK:
+            case SMS_PICK:
+                createDialog(this, dialogType).show();
+                break;
+            case PREFERRED_PICK:
+                displayPreferredDialog(extras.getInt(PREFERRED_SIM));
+                break;
+            default:
+                throw new IllegalArgumentException("Invalid dialog type " + dialogType + " sent.");
+        }
+
+    }
+
+    private void displayPreferredDialog(final int slotId) {
+        final Resources res = getResources();
+        final Context context = getApplicationContext();
+        final SubscriptionInfo sir = Utils.findRecordBySlotId(context, slotId);
+
+        AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(this);
+        alertDialogBuilder.setTitle(R.string.sim_preferred_title);
+        alertDialogBuilder.setMessage(res.getString(
+                    R.string.sim_preferred_message, sir.getDisplayName()));
+
+        alertDialogBuilder.setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int id) {
+                final int subId = sir.getSubscriptionId();
+                PhoneAccountHandle phoneAccountHandle = subscriptionIdToPhoneAccountHandle(subId);
+                setDefaultDataSubId(context, subId);
+                setDefaultSmsSubId(context, subId);
+                setUserSelectedOutgoingPhoneAccount(phoneAccountHandle);
+                finish();
+            }
+        });
+        alertDialogBuilder.setNegativeButton(R.string.no, new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog,int id) {
+                finish();
+            }
+        });
+
+        alertDialogBuilder.create().show();
+    }
+
+    private static void setDefaultDataSubId(final Context context, final int subId) {
+        final SubscriptionManager subscriptionManager = SubscriptionManager.from(context);
+        subscriptionManager.setDefaultDataSubId(subId);
+    }
+
+    private static void setDefaultSmsSubId(final Context context, final int subId) {
+        final SubscriptionManager subscriptionManager = SubscriptionManager.from(context);
+        subscriptionManager.setDefaultSmsSubId(subId);
+    }
+
+    private void setUserSelectedOutgoingPhoneAccount(PhoneAccountHandle phoneAccount) {
+        final TelecomManager telecomManager = TelecomManager.from(this);
+        telecomManager.setUserSelectedOutgoingPhoneAccount(phoneAccount);
+    }
+
+    private PhoneAccountHandle subscriptionIdToPhoneAccountHandle(final int subId) {
+        final TelecomManager telecomManager = TelecomManager.from(this);
+        final Iterator<PhoneAccountHandle> phoneAccounts =
+                telecomManager.getCallCapablePhoneAccounts().listIterator();
+
+        while (phoneAccounts.hasNext()) {
+            final PhoneAccountHandle phoneAccountHandle = phoneAccounts.next();
+            final PhoneAccount phoneAccount = telecomManager.getPhoneAccount(phoneAccountHandle);
+            final String phoneAccountId = phoneAccountHandle.getId();
+
+            if (phoneAccount.hasCapabilities(PhoneAccount.CAPABILITY_SIM_SUBSCRIPTION)
+                    && TextUtils.isDigitsOnly(phoneAccountId)
+                    && Integer.parseInt(phoneAccountId) == subId){
+                return phoneAccountHandle;
+            }
+        }
+
+        return null;
+    }
+
+    public Dialog createDialog(final Context context, final int id) {
+        final ArrayList<String> list = new ArrayList<String>();
+        final SubscriptionManager subscriptionManager = SubscriptionManager.from(context);
+        final List<SubscriptionInfo> subInfoList =
+            subscriptionManager.getActiveSubscriptionInfoList();
+        final int selectableSubInfoLength = subInfoList.size();
+
+        final DialogInterface.OnClickListener selectionListener =
+                new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int value) {
+
+                        final SubscriptionInfo sir;
+
+                        switch (id) {
+                            case DATA_PICK:
+                                sir = subInfoList.get(value);
+                                setDefaultDataSubId(context, sir.getSubscriptionId());
+                                break;
+                            case CALLS_PICK:
+                                final TelecomManager telecomManager =
+                                        TelecomManager.from(context);
+                                final List<PhoneAccountHandle> phoneAccountsList =
+                                        telecomManager.getCallCapablePhoneAccounts();
+                                setUserSelectedOutgoingPhoneAccount(
+                                        value < 1 ? null : phoneAccountsList.get(value - 1));
+                                break;
+                            case SMS_PICK:
+                                sir = subInfoList.get(value);
+                                setDefaultSmsSubId(context, sir.getSubscriptionId());
+                                break;
+                            default:
+                                throw new IllegalArgumentException("Invalid dialog type "
+                                        + id + " in SIM dialog.");
+                        }
+
+                        finish();
+                    }
+                };
+
+        Dialog.OnKeyListener keyListener = new Dialog.OnKeyListener() {
+            @Override
+            public boolean onKey(DialogInterface arg0, int keyCode,
+                    KeyEvent event) {
+                    if (keyCode == KeyEvent.KEYCODE_BACK) {
+                        finish();
+                    }
+                    return true;
+                }
+            };
+
+        if (id == CALLS_PICK) {
+            final TelecomManager telecomManager = TelecomManager.from(context);
+            final Iterator<PhoneAccountHandle> phoneAccounts =
+                    telecomManager.getCallCapablePhoneAccounts().listIterator();
+
+            list.add(getResources().getString(R.string.sim_calls_ask_first_prefs_title));
+            while (phoneAccounts.hasNext()) {
+                final PhoneAccount phoneAccount =
+                        telecomManager.getPhoneAccount(phoneAccounts.next());
+                list.add((String)phoneAccount.getLabel());
+            }
+        } else {
+            for (int i = 0; i < selectableSubInfoLength; ++i) {
+                final SubscriptionInfo sir = subInfoList.get(i);
+                CharSequence displayName = sir.getDisplayName();
+                if (displayName == null) {
+                    displayName = "";
+                }
+                list.add(displayName.toString());
+            }
+        }
+
+        String[] arr = list.toArray(new String[0]);
+
+        AlertDialog.Builder builder = new AlertDialog.Builder(context);
+
+        ListAdapter adapter = new SelectAccountListAdapter(
+                subInfoList,
+                builder.getContext(),
+                R.layout.select_account_list_item,
+                arr, id);
+
+        switch (id) {
+            case DATA_PICK:
+                builder.setTitle(R.string.select_sim_for_data);
+                break;
+            case CALLS_PICK:
+                builder.setTitle(R.string.select_sim_for_calls);
+                break;
+            case SMS_PICK:
+                builder.setTitle(R.string.sim_card_select_title);
+                break;
+            default:
+                throw new IllegalArgumentException("Invalid dialog type "
+                        + id + " in SIM dialog.");
+        }
+
+        Dialog dialog = builder.setAdapter(adapter, selectionListener).create();
+        dialog.setOnKeyListener(keyListener);
+
+        return dialog;
+
+    }
+
+    private class SelectAccountListAdapter extends ArrayAdapter<String> {
+        private Context mContext;
+        private int mResId;
+        private int mDialogId;
+        private final float OPACITY = 0.54f;
+        private List<SubscriptionInfo> mSubInfoList;
+
+        public SelectAccountListAdapter(List<SubscriptionInfo> subInfoList,
+                Context context, int resource, String[] arr, int dialogId) {
+            super(context, resource, arr);
+            mContext = context;
+            mResId = resource;
+            mDialogId = dialogId;
+            mSubInfoList = subInfoList;
+        }
+
+        @Override
+        public View getView(int position, View convertView, ViewGroup parent) {
+            LayoutInflater inflater = (LayoutInflater)
+                    mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+            View rowView;
+            final ViewHolder holder;
+            SubscriptionInfo sir;
+
+            if (convertView == null) {
+                // Cache views for faster scrolling
+                rowView = inflater.inflate(mResId, null);
+                holder = new ViewHolder();
+                holder.title = (TextView) rowView.findViewById(R.id.title);
+                holder.summary = (TextView) rowView.findViewById(R.id.summary);
+                holder.icon = (ImageView) rowView.findViewById(R.id.icon);
+                rowView.setTag(holder);
+            } else {
+                rowView = convertView;
+                holder = (ViewHolder) rowView.getTag();
+            }
+
+            if (mDialogId == CALLS_PICK) {
+                holder.title.setText(getItem(position));
+                holder.summary.setText("");
+                holder.icon.setImageDrawable(getResources()
+                        .getDrawable(R.drawable.ic_live_help));
+                holder.icon.setAlpha(OPACITY);
+            } else {
+                sir = mSubInfoList.get(position);
+                holder.title.setText(sir.getDisplayName());
+                holder.summary.setText(sir.getNumber());
+                holder.icon.setImageBitmap(sir.createIconBitmap(mContext));
+            }
+            return rowView;
+        }
+
+        private class ViewHolder {
+            TextView title;
+            TextView summary;
+            ImageView icon;
+        }
+    }
+}
diff --git a/src/com/android/settings/sim/SimSettings.java b/src/com/android/settings/sim/SimSettings.java
index 0fe024b..450ffff 100644
--- a/src/com/android/settings/sim/SimSettings.java
+++ b/src/com/android/settings/sim/SimSettings.java
@@ -20,6 +20,7 @@
 import android.content.Context;
 import android.content.ContentUris;
 import android.content.DialogInterface;
+import android.content.Intent;
 import android.content.res.Resources;
 import android.database.Cursor;
 import android.graphics.Paint;
@@ -29,7 +30,6 @@
 import android.net.Uri;
 import android.os.Bundle;
 import android.preference.Preference;
-import android.preference.PreferenceCategory;
 import android.preference.PreferenceScreen;
 import android.provider.SearchIndexableResource;
 import android.provider.Telephony;
@@ -117,7 +117,7 @@
     private SubscriptionInfo mCalls = null;
     private SubscriptionInfo mSMS = null;
 
-    private PreferenceCategory mSimCards = null;
+    private PreferenceScreen mSimCards = null;
 
     private SubscriptionManager mSubscriptionManager;
     private Utils mUtils;
@@ -150,14 +150,16 @@
 
         addPreferencesFromResource(R.xml.sim_settings);
 
-        mSimCards = (PreferenceCategory)findPreference(SIM_CARD_CATEGORY);
+        mSimCards = (PreferenceScreen)findPreference(SIM_CARD_CATEGORY);
 
         final int numSlots = tm.getSimCount();
         mAvailableSubInfos = new ArrayList<SubscriptionInfo>(numSlots);
         mSelectableSubInfos = new ArrayList<SubscriptionInfo>();
         for (int i = 0; i < numSlots; ++i) {
             final SubscriptionInfo sir = Utils.findRecordBySlotId(getActivity(), i);
-            mSimCards.addPreference(new SimPreference(getActivity(), sir, i));
+            SimPreference simPreference = new SimPreference(getActivity(), sir, i);
+            simPreference.setOrder(i-numSlots);
+            mSimCards.addPreference(simPreference);
             mAvailableSubInfos.add(sir);
             if (sir != null) {
                 mSelectableSubInfos.add(sir);
@@ -242,7 +244,7 @@
 
         simPref.setTitle(R.string.calls_title);
         simPref.setSummary(phoneAccount == null
-                ? getResources().getString(R.string.sim_selection_required_pref)
+                ? getResources().getString(R.string.sim_calls_ask_first_prefs_title)
                 : (String)telecomManager.getPhoneAccount(phoneAccount).getLabel());
     }
 
@@ -261,14 +263,21 @@
     @Override
     public boolean onPreferenceTreeClick(final PreferenceScreen preferenceScreen,
             final Preference preference) {
+        final Context context = getActivity();
+        Intent intent = new Intent(context, SimDialogActivity.class);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+
         if (preference instanceof SimPreference) {
             ((SimPreference)preference).createEditDialog((SimPreference)preference);
         } else if (findPreference(KEY_CELLULAR_DATA) == preference) {
-            showDialog(DATA_PICK);
+            intent.putExtra(SimDialogActivity.DIALOG_TYPE_KEY, SimDialogActivity.DATA_PICK);
+            context.startActivity(intent);
         } else if (findPreference(KEY_CALLS) == preference) {
-            showDialog(CALLS_PICK);
+            intent.putExtra(SimDialogActivity.DIALOG_TYPE_KEY, SimDialogActivity.CALLS_PICK);
+            context.startActivity(intent);
         } else if (findPreference(KEY_SMS) == preference) {
-            showDialog(SMS_PICK);
+            intent.putExtra(SimDialogActivity.DIALOG_TYPE_KEY, SimDialogActivity.SMS_PICK);
+            context.startActivity(intent);
         }
 
         return true;
@@ -407,7 +416,7 @@
             } else {
                 sir = mSelectableSubInfos.get(position);
                 holder.title.setText(sir.getDisplayName());
-                holder.summary.setText(sir.getNumber());
+                holder.summary.setText(getPhoneNumber(sir));
                 holder.icon.setImageBitmap(sir.createIconBitmap(mContext));
             }
             return rowView;
@@ -447,11 +456,11 @@
             setTitle(String.format(getResources()
                     .getString(R.string.sim_editor_title), (mSlotId + 1)));
             if (mSubInfoRecord != null) {
-                if (TextUtils.isEmpty(mSubInfoRecord.getNumber())) {
+                if (TextUtils.isEmpty(getPhoneNumber(mSubInfoRecord))) {
                    setSummary(mSubInfoRecord.getDisplayName());
                 } else {
                     setSummary(mSubInfoRecord.getDisplayName() + " - " +
-                            mSubInfoRecord.getNumber());
+                            getPhoneNumber(mSubInfoRecord));
                     setEnabled(true);
                 }
                 setIcon(new BitmapDrawable(res, (mSubInfoRecord.createIconBitmap(mContext))));
@@ -506,7 +515,7 @@
             });
 
             TextView numberView = (TextView)dialogLayout.findViewById(R.id.number);
-            final String rawNumber = mSubInfoRecord.getNumber();
+            final String rawNumber = getPhoneNumber(mSubInfoRecord);
             if (TextUtils.isEmpty(rawNumber)) {
                 numberView.setText(res.getString(com.android.internal.R.string.unknownName));
             } else {
@@ -624,6 +633,14 @@
 
     }
 
+    // Returns the line1Number. Line1number should always be read from TelephonyManager since it can
+    // be overridden for display purposes.
+    private String getPhoneNumber(SubscriptionInfo info) {
+        final TelephonyManager tm =
+            (TelephonyManager) getActivity().getSystemService(Context.TELEPHONY_SERVICE);
+        return tm.getLine1NumberForSubscriber(info.getSubscriptionId());
+    }
+
     private void log(String s) {
         Log.d(TAG, s);
     }
diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java
index b95c397..d7923ee 100644
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -573,20 +573,22 @@
                 addProfileItem.put(KEY_SUMMARY, getString(R.string.user_add_profile_item_summary));
                 data.add(addUserItem);
                 data.add(addProfileItem);
-                Dialog dlg = new AlertDialog.Builder(context)
-                        .setTitle(R.string.user_add_user_type_title)
-                        .setAdapter(new SimpleAdapter(context, data, R.layout.two_line_list_item,
-                                new String[] {KEY_TITLE, KEY_SUMMARY},
-                                new int[] {R.id.title, R.id.summary}),
-                                new DialogInterface.OnClickListener() {
-                                    public void onClick(DialogInterface dialog, int which) {
-                                        onAddUserClicked(which == 0
-                                                ? USER_TYPE_USER
-                                                : USER_TYPE_RESTRICTED_PROFILE);
-                                    }
-                                })
-                        .create();
-                return dlg;
+                AlertDialog.Builder builder = new AlertDialog.Builder(context);
+                SimpleAdapter adapter = new SimpleAdapter(builder.getContext(),
+                        data, R.layout.two_line_list_item,
+                        new String[] {KEY_TITLE, KEY_SUMMARY},
+                        new int[] {R.id.title, R.id.summary});
+                builder.setTitle(R.string.user_add_user_type_title);
+                builder.setAdapter(adapter,
+                        new DialogInterface.OnClickListener() {
+                            @Override
+                            public void onClick(DialogInterface dialog, int which) {
+                                onAddUserClicked(which == 0
+                                        ? USER_TYPE_USER
+                                        : USER_TYPE_RESTRICTED_PROFILE);
+                            }
+                        });
+                return builder.create();
             }
             case DIALOG_NEED_LOCKSCREEN: {
                 Dialog dlg = new AlertDialog.Builder(context)
diff --git a/src/com/android/settings/wifi/AccessPoint.java b/src/com/android/settings/wifi/AccessPoint.java
index 45c3a5b..1bf1a5c 100644
--- a/src/com/android/settings/wifi/AccessPoint.java
+++ b/src/com/android/settings/wifi/AccessPoint.java
@@ -595,7 +595,7 @@
      * For ephemeral connections (networkId is invalid), this returns false if the network is
      * disconnected.
      */
-    private boolean isActive() {
+    boolean isActive() {
         return mNetworkInfo != null &&
                 (networkId != WifiConfiguration.INVALID_NETWORK_ID ||
                  mNetworkInfo.getState() != State.DISCONNECTED);
@@ -617,7 +617,8 @@
         StringBuilder summary = new StringBuilder();
 
         if (isActive()) { // This is the active connection
-            summary.append(Summary.get(context, getState()));
+            summary.append(Summary.get(context, getState(),
+                    networkId == WifiConfiguration.INVALID_NETWORK_ID));
         } else if (mConfig != null
                 && mConfig.hasNoInternetAccess()) {
             summary.append(context.getString(R.string.wifi_no_internet));
diff --git a/src/com/android/settings/wifi/Summary.java b/src/com/android/settings/wifi/Summary.java
index d96d23e..123f64a 100644
--- a/src/com/android/settings/wifi/Summary.java
+++ b/src/com/android/settings/wifi/Summary.java
@@ -22,7 +22,12 @@
 import android.net.NetworkInfo.DetailedState;
 
 class Summary {
-    static String get(Context context, String ssid, DetailedState state) {
+    static String get(Context context, String ssid, DetailedState state, boolean isEphemeral) {
+        if (state == DetailedState.CONNECTED && isEphemeral && ssid == null) {
+            // Special case for connected + ephemeral networks.
+            return context.getString(R.string.connected_via_wfa);
+        }
+
         String[] formats = context.getResources().getStringArray((ssid == null)
                 ? R.array.wifi_status : R.array.wifi_status_with_ssid);
         int index = state.ordinal();
@@ -33,7 +38,7 @@
         return String.format(formats[index], ssid);
     }
 
-    static String get(Context context, DetailedState state) {
-        return get(context, null, state);
+    static String get(Context context, DetailedState state, boolean isEphemeral) {
+        return get(context, null, state, isEphemeral);
     }
 }
diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java
index b00faf1..5462d26 100644
--- a/src/com/android/settings/wifi/WifiConfigController.java
+++ b/src/com/android/settings/wifi/WifiConfigController.java
@@ -242,7 +242,8 @@
                 }
             }
 
-            if (mAccessPoint.networkId == INVALID_NETWORK_ID || mEdit) {
+            if ((mAccessPoint.networkId == INVALID_NETWORK_ID && !mAccessPoint.isActive())
+                    || mEdit) {
                 showSecurityFields();
                 showIpConfigFields();
                 showProxyFields();
@@ -266,7 +267,8 @@
                 } else {
                     if (state != null) {
                         addRow(group, R.string.wifi_status, Summary.get(mConfigUi.getContext(),
-                                state));
+                                state, mAccessPoint.networkId ==
+                                WifiConfiguration.INVALID_NETWORK_ID));
                     }
 
                     if (signalLevel != null) {
@@ -300,7 +302,7 @@
                     addRow(group, R.string.wifi_security, mAccessPoint.getSecurityString(false));
                     mView.findViewById(R.id.ip_fields).setVisibility(View.GONE);
                 }
-                if (mAccessPoint.networkId != INVALID_NETWORK_ID
+                if ((mAccessPoint.networkId != INVALID_NETWORK_ID || mAccessPoint.isActive())
                         && ActivityManager.getCurrentUser() == UserHandle.USER_OWNER) {
                     mConfigUi.setForgetButton(res.getString(R.string.wifi_forget));
                 }
diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index 9dfd201..8eab1c7 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -502,26 +502,21 @@
                 mSelectedAccessPoint = (AccessPoint) preference;
                 menu.setHeaderTitle(mSelectedAccessPoint.ssid);
                 if (mSelectedAccessPoint.getLevel() != -1) {
-                    int connectStringRes = 0;
                     if (mSelectedAccessPoint.getState() == null) {
-                        connectStringRes = R.string.wifi_menu_connect;
-                    } else if (mSelectedAccessPoint.networkId == INVALID_NETWORK_ID &&
-                            mSelectedAccessPoint.getNetworkInfo().getState()
-                                != State.DISCONNECTED) {
-                        // State is non-null (and not disconnected) but this network has no
-                        // configuration, which means it is ephemeral. Allow the user to save the
-                        // configuration permanently (but still issue this as a CONNECT command).
-                        connectStringRes = R.string.wifi_menu_remember;
-                    }
-
-                    if (connectStringRes != 0) {
-                        menu.add(Menu.NONE, MENU_ID_CONNECT, 0, connectStringRes);
+                        menu.add(Menu.NONE, MENU_ID_CONNECT, 0, R.string.wifi_menu_connect);
                     }
                 }
+
+                if (ActivityManager.getCurrentUser() == UserHandle.USER_OWNER &&
+                        (mSelectedAccessPoint.networkId != INVALID_NETWORK_ID ||
+                        (mSelectedAccessPoint.getNetworkInfo() != null &&
+                        mSelectedAccessPoint.getNetworkInfo().getState() != State.DISCONNECTED))) {
+                    // Allow forgetting a network if the current user is the owner and either the
+                    // network is saved or ephemerally connected. (In the latter case, "forget"
+                    // blacklists the network so it won't be used again, ephemerally).
+                    menu.add(Menu.NONE, MENU_ID_FORGET, 0, R.string.wifi_menu_forget);
+                }
                 if (mSelectedAccessPoint.networkId != INVALID_NETWORK_ID) {
-                    if (ActivityManager.getCurrentUser() == UserHandle.USER_OWNER) {
-                        menu.add(Menu.NONE, MENU_ID_FORGET, 0, R.string.wifi_menu_forget);
-                    }
                     menu.add(Menu.NONE, MENU_ID_MODIFY, 0, R.string.wifi_menu_modify);
 
                     if (mSelectedAccessPoint.security != AccessPoint.SECURITY_NONE) {
@@ -552,7 +547,7 @@
                 return true;
             }
             case MENU_ID_FORGET: {
-                mWifiManager.forget(mSelectedAccessPoint.networkId, mForgetListener);
+                forget();
                 return true;
             }
             case MENU_ID_MODIFY: {
@@ -571,9 +566,10 @@
     public boolean onPreferenceTreeClick(PreferenceScreen screen, Preference preference) {
         if (preference instanceof AccessPoint) {
             mSelectedAccessPoint = (AccessPoint) preference;
-            /** Bypass dialog for unsecured, unsaved networks */
+            /** Bypass dialog for unsecured, unsaved, and inactive networks */
             if (mSelectedAccessPoint.security == AccessPoint.SECURITY_NONE &&
-                    mSelectedAccessPoint.networkId == INVALID_NETWORK_ID) {
+                    mSelectedAccessPoint.networkId == INVALID_NETWORK_ID &&
+                    !mSelectedAccessPoint.isActive()) {
                 mSelectedAccessPoint.generateOpenNetworkConfig();
                 if (!savedNetworksExist) {
                     savedNetworksExist = true;
@@ -903,12 +899,19 @@
 
     /* package */ void forget() {
         if (mSelectedAccessPoint.networkId == INVALID_NETWORK_ID) {
-            // Should not happen, but a monkey seems to trigger it
-            Log.e(TAG, "Failed to forget invalid network " + mSelectedAccessPoint.getConfig());
-            return;
+            if (mSelectedAccessPoint.getNetworkInfo().getState() != State.DISCONNECTED) {
+                // Network is active but has no network ID - must be ephemeral.
+                mWifiManager.disableEphemeralNetwork(
+                        AccessPoint.convertToQuotedString(mSelectedAccessPoint.ssid));
+            } else {
+                // Should not happen, but a monkey seems to trigger it
+                Log.e(TAG, "Failed to forget invalid network " + mSelectedAccessPoint.getConfig());
+                return;
+            }
+        } else {
+            mWifiManager.forget(mSelectedAccessPoint.networkId, mForgetListener);
         }
 
-        mWifiManager.forget(mSelectedAccessPoint.networkId, mForgetListener);
 
         if (mWifiManager.isWifiEnabled()) {
             mScanner.resume();
diff --git a/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java b/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java
index bc387cb..2588309 100644
--- a/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java
+++ b/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java
@@ -285,7 +285,7 @@
         default:  // DISCONNECTED, FAILED
             if (mScreenState != SCREEN_STATE_CONNECTED &&
                     mWifiSettings.getAccessPointsCount() > 0) {
-                showDisconnectedState(Summary.get(this, state));
+                showDisconnectedState(Summary.get(this, state, false /* isEphemeral */));
             }
             break;
         }
diff --git a/src/com/android/settings/wifi/WifiStatusTest.java b/src/com/android/settings/wifi/WifiStatusTest.java
index 1b23834..dbd8eec 100644
--- a/src/com/android/settings/wifi/WifiStatusTest.java
+++ b/src/com/android/settings/wifi/WifiStatusTest.java
@@ -17,12 +17,16 @@
 package com.android.settings.wifi;
 
 import com.android.settings.R;
+
 import android.net.wifi.ScanResult;
+
 import org.apache.http.HttpResponse;
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.impl.client.DefaultHttpClient;
+
 import java.util.List;
+
 import android.app.Activity;
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -30,6 +34,7 @@
 import android.content.IntentFilter;
 import android.net.NetworkInfo;
 import android.net.wifi.SupplicantState;
+import android.net.wifi.WifiConfiguration;
 import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
 import android.os.Bundle;
@@ -40,6 +45,7 @@
 import android.view.View.OnClickListener;
 import android.widget.Button;
 import android.widget.TextView;
+
 import java.io.IOException;
 import java.net.UnknownHostException;
 
@@ -294,8 +300,9 @@
 
     private void handleNetworkStateChanged(NetworkInfo networkInfo) {
         if (mWifiManager.isWifiEnabled()) {
-            String summary = Summary.get(this, mWifiManager.getConnectionInfo().getSSID(),
-                    networkInfo.getDetailedState());
+            WifiInfo info = mWifiManager.getConnectionInfo();
+            String summary = Summary.get(this, info.getSSID(), networkInfo.getDetailedState(),
+                    info.getNetworkId() == WifiConfiguration.INVALID_NETWORK_ID);
             mNetworkState.setText(summary);
         }
     }