diff --git a/Android.mk b/Android.mk
index 425ae47..8888800 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,7 +1,7 @@
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
-LOCAL_JAVA_LIBRARIES := bouncycastle conscrypt telephony-common
+LOCAL_JAVA_LIBRARIES := bouncycastle conscrypt telephony-common ims-common
 LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4 android-support-v13 jsr305
 
 LOCAL_MODULE_TAGS := optional
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index f0b3271..99133a5 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -66,6 +66,7 @@
     <uses-permission android:name="android.permission.SET_TIME" />
     <uses-permission android:name="android.permission.ACCESS_NOTIFICATIONS" />
     <uses-permission android:name="android.permission.REBOOT" />
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.MANAGE_DEVICE_ADMINS" />
     <uses-permission android:name="android.permission.READ_SEARCH_INDEXABLES" />
     <uses-permission android:name="android.permission.OEM_UNLOCK_STATE" />
@@ -196,7 +197,8 @@
                 android:theme="@style/SetupWizardDisableAppStartingTheme"
                 android:label="@string/wifi_setup_wizard_title"
                 android:icon="@drawable/empty_icon"
-                android:clearTaskOnLaunch="true">
+                android:clearTaskOnLaunch="true"
+                android:windowSoftInputMode="adjustNothing">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="com.android.net.wifi.SETUP_WIFI_NETWORK" />
@@ -350,6 +352,16 @@
             </intent-filter>
         </activity>
 
+        <service android:name=".TetherService"
+            android:exported="true"
+            android:permission="android.permission.CONNECTIVITY_INTERNAL" />
+        <receiver
+            android:name=".HotspotOffReceiver" >
+            <intent-filter>
+                <action android:name="android.net.wifi.WIFI_AP_STATE_CHANGED" />
+            </intent-filter>
+        </receiver>
+
         <activity android:name="Settings$TetherSettingsActivity"
                 android:label="@string/tether_settings_title_all"
                 android:taskAffinity="">
@@ -692,17 +704,6 @@
                 android:value="true" />
         </activity>
 
-        <activity android:name="SettingsSafetyLegalActivity"
-                android:label="@string/settings_safetylegal_activity_title"
-                android:theme="@*android:style/Theme.Material.Light.Dialog.Alert">
-            <intent-filter>
-                <action android:name="android.settings.SAFETY" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
-                android:value="true" />
-        </activity>
-
         <activity android:name="Settings$ManageApplicationsActivity"
                 android:label="@string/applications_settings"
                 android:taskAffinity="">
@@ -1112,13 +1113,18 @@
 
         <!-- Lock screen settings -->
         <activity android:name="ConfirmDeviceCredentialActivity"
-            android:exported="true">
+            android:exported="true"
+            android:theme="@style/Transparent">
             <intent-filter>
                 <action android:name="android.app.action.CONFIRM_DEVICE_CREDENTIAL" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
 
+        <activity android:name=".SetupRedactionInterstitial"
+            android:taskAffinity="com.android.wizard"
+            android:theme="@style/SetupWizardDisableAppStartingTheme"/>
+
         <activity android:name=".notification.RedactionInterstitial"/>
 
         <activity android:name=".notification.RedactionSettingsStandalone"
@@ -1143,6 +1149,16 @@
             android:exported="false"
             android:windowSoftInputMode="stateVisible|adjustResize"/>
 
+        <activity android:name="SetupChooseLockGeneric"
+            android:taskAffinity="com.android.wizard"
+            android:theme="@style/SetupWizardDisableAppStartingTheme"
+            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" />
+            </intent-filter>
+        </activity>
+
         <activity android:name="ChooseLockGeneric"
             android:label="@string/lockpassword_choose_lock_generic_header"
             android:excludeFromRecents="true" >
@@ -1159,11 +1175,26 @@
             android:excludeFromRecents="true"
         />
 
+        <activity android:name="SetupChooseLockPattern"
+            android:exported="false"
+            android:taskAffinity="com.android.wizard"
+            android:theme="@style/SetupWizardDisableAppStartingTheme" />
+
         <activity android:name="ChooseLockPattern" android:exported="false"/>
 
+        <activity android:name="SetupChooseLockPassword"
+            android:exported="false"
+            android:taskAffinity="com.android.wizard"
+            android:theme="@style/SetupWizardDisableAppStartingTheme"
+            android:windowSoftInputMode="stateVisible|adjustResize" />
+
         <activity android:name="ChooseLockPassword" android:exported="false"
             android:windowSoftInputMode="stateVisible|adjustResize"/>
 
+        <activity android:name=".SetupEncryptionInterstitial"
+            android:taskAffinity="com.android.wizard"
+            android:theme="@style/SetupWizardDisableAppStartingTheme"/>
+
         <activity android:name=".EncryptionInterstitial"/>
 
         <!-- Runs in the phone process since it needs access to the Phone object -->
@@ -1178,6 +1209,30 @@
             </intent-filter>
         </activity>
 
+        <!-- Runs in the phone process since it needs access to the Phone object -->
+        <activity android:name=".deviceinfo.SimStatus"
+                android:label="@string/sim_status_title"
+                android:theme="@style/Theme.SubSettingsDialogWhenLarge"
+                android:process="com.android.phone">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.VOICE_LAUNCH" />
+            </intent-filter>
+        </activity>
+
+        <!-- Runs in the phone process since it needs access to the Phone object -->
+        <activity android:name=".deviceinfo.ImeiInformation"
+                android:label="@string/imei_information_title"
+                android:theme="@style/Theme.SubSettingsDialogWhenLarge"
+                android:process="com.android.phone">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.VOICE_LAUNCH" />
+            </intent-filter>
+        </activity>
+
         <activity android:name="Settings$StorageSettingsActivity"
                 android:label="@string/storage_settings_title"
                 android:taskAffinity="com.android.settings"
@@ -1964,6 +2019,12 @@
             </intent-filter>
         </receiver>
 
+        <receiver android:name=".sim.SimBootReceiver">
+            <intent-filter>
+                <action android:name="android.intent.action.BOOT_COMPLETED"></action>
+            </intent-filter>
+        </receiver>
+
         <provider
             android:name="android.support.v4.content.FileProvider"
             android:authorities="com.android.settings.files"
@@ -1988,6 +2049,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/ic_live_help.png b/res/drawable-hdpi/ic_live_help.png
new file mode 100644
index 0000000..f3548f6
--- /dev/null
+++ b/res/drawable-hdpi/ic_live_help.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_sim_card_alert_white_48dp.png b/res/drawable-hdpi/ic_sim_card_alert_white_48dp.png
new file mode 100644
index 0000000..c8fbf42
--- /dev/null
+++ b/res/drawable-hdpi/ic_sim_card_alert_white_48dp.png
Binary files differ
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-hdpi/wifi_assistant_card.png b/res/drawable-hdpi/wifi_assistant_card.png
deleted file mode 100644
index 5a7e6d1..0000000
--- a/res/drawable-hdpi/wifi_assistant_card.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/wifi_assistant_card_tablet.png b/res/drawable-hdpi/wifi_assistant_card_tablet.png
deleted file mode 100644
index d309533..0000000
--- a/res/drawable-hdpi/wifi_assistant_card_tablet.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-hdpi/wifi_assistant_card.png b/res/drawable-ldrtl-hdpi/wifi_assistant_card.png
deleted file mode 100644
index 67a93b3..0000000
--- a/res/drawable-ldrtl-hdpi/wifi_assistant_card.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-mdpi/wifi_assistant_card.png b/res/drawable-ldrtl-mdpi/wifi_assistant_card.png
deleted file mode 100644
index 578454c..0000000
--- a/res/drawable-ldrtl-mdpi/wifi_assistant_card.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-xhdpi/wifi_assistant_card.png b/res/drawable-ldrtl-xhdpi/wifi_assistant_card.png
deleted file mode 100644
index 8840a6a..0000000
--- a/res/drawable-ldrtl-xhdpi/wifi_assistant_card.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-xxhdpi/wifi_assistant_card.png b/res/drawable-ldrtl-xxhdpi/wifi_assistant_card.png
deleted file mode 100644
index 1273b73..0000000
--- a/res/drawable-ldrtl-xxhdpi/wifi_assistant_card.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-xxxhdpi/wifi_assistant_card.png b/res/drawable-ldrtl-xxxhdpi/wifi_assistant_card.png
deleted file mode 100644
index 7c7bf0a..0000000
--- a/res/drawable-ldrtl-xxxhdpi/wifi_assistant_card.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_live_help.png b/res/drawable-mdpi/ic_live_help.png
new file mode 100644
index 0000000..e958662
--- /dev/null
+++ b/res/drawable-mdpi/ic_live_help.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_sim_card_alert_white_48dp.png b/res/drawable-mdpi/ic_sim_card_alert_white_48dp.png
new file mode 100644
index 0000000..18cd7f9
--- /dev/null
+++ b/res/drawable-mdpi/ic_sim_card_alert_white_48dp.png
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-mdpi/wifi_assistant_card.png b/res/drawable-mdpi/wifi_assistant_card.png
deleted file mode 100644
index bb2114c..0000000
--- a/res/drawable-mdpi/wifi_assistant_card.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wifi_assistant_card_tablet.png b/res/drawable-mdpi/wifi_assistant_card_tablet.png
deleted file mode 100644
index 0ca411c..0000000
--- a/res/drawable-mdpi/wifi_assistant_card_tablet.png
+++ /dev/null
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/ic_live_help.png b/res/drawable-xhdpi/ic_live_help.png
new file mode 100644
index 0000000..dbbbfed
--- /dev/null
+++ b/res/drawable-xhdpi/ic_live_help.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_sim_card_alert_white_48dp.png b/res/drawable-xhdpi/ic_sim_card_alert_white_48dp.png
new file mode 100644
index 0000000..6d983b7
--- /dev/null
+++ b/res/drawable-xhdpi/ic_sim_card_alert_white_48dp.png
Binary files differ
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-xhdpi/wifi_assistant_card.png b/res/drawable-xhdpi/wifi_assistant_card.png
deleted file mode 100644
index 1f8a5b9..0000000
--- a/res/drawable-xhdpi/wifi_assistant_card.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/wifi_assistant_card_tablet.png b/res/drawable-xhdpi/wifi_assistant_card_tablet.png
deleted file mode 100644
index 570a663..0000000
--- a/res/drawable-xhdpi/wifi_assistant_card_tablet.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_live_help.png b/res/drawable-xxhdpi/ic_live_help.png
new file mode 100644
index 0000000..f2a01fe
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_live_help.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_sim_card_alert_white_48dp.png b/res/drawable-xxhdpi/ic_sim_card_alert_white_48dp.png
new file mode 100644
index 0000000..6c8dd1f
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_sim_card_alert_white_48dp.png
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-xxhdpi/wifi_assistant_card.png b/res/drawable-xxhdpi/wifi_assistant_card.png
deleted file mode 100644
index 65211cd..0000000
--- a/res/drawable-xxhdpi/wifi_assistant_card.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/wifi_assistant_card_tablet.png b/res/drawable-xxhdpi/wifi_assistant_card_tablet.png
deleted file mode 100644
index 2941b14..0000000
--- a/res/drawable-xxhdpi/wifi_assistant_card_tablet.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_live_help.png b/res/drawable-xxxhdpi/ic_live_help.png
new file mode 100644
index 0000000..00338a0
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_live_help.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_sim_card_alert_white_48dp.png b/res/drawable-xxxhdpi/ic_sim_card_alert_white_48dp.png
new file mode 100644
index 0000000..e8b6667
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_sim_card_alert_white_48dp.png
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-xxxhdpi/wifi_assistant_card.png b/res/drawable-xxxhdpi/wifi_assistant_card.png
deleted file mode 100644
index e79330b..0000000
--- a/res/drawable-xxxhdpi/wifi_assistant_card.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/wifi_assistant_card_tablet.png b/res/drawable-xxxhdpi/wifi_assistant_card_tablet.png
deleted file mode 100644
index 54120fb..0000000
--- a/res/drawable-xxxhdpi/wifi_assistant_card_tablet.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/ic_audio_alarm_24dp.xml b/res/drawable/ic_audio_alarm_24dp.xml
deleted file mode 100644
index ddfaa01..0000000
--- a/res/drawable/ic_audio_alarm_24dp.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<!--
-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.
--->
-<!-- shrink ic_audio_alarm from 32dp to 24dp using insets -->
-<inset xmlns:android="http://schemas.android.com/apk/res/android"
-        android:drawable="@*android:drawable/ic_audio_alarm"
-        android:inset="4dp"
-        />
diff --git a/res/drawable/ic_audio_vol_24dp.xml b/res/drawable/ic_audio_vol_24dp.xml
deleted file mode 100644
index ecb3a40..0000000
--- a/res/drawable/ic_audio_vol_24dp.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<!--
-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.
--->
-<!-- shrink ic_audio_vol from 32dp to 24dp using insets -->
-<inset xmlns:android="http://schemas.android.com/apk/res/android"
-        android:drawable="@*android:drawable/ic_audio_vol"
-        android:inset="4dp"
-        />
diff --git a/res/drawable/ring_notif.xml b/res/drawable/ring_notif.xml
deleted file mode 100644
index cc9da31..0000000
--- a/res/drawable/ring_notif.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<!--
-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.
--->
-<!-- shrink ic_audio_ring_notif from 32dp to 24dp using insets -->
-<inset xmlns:android="http://schemas.android.com/apk/res/android"
-        android:drawable="@*android:drawable/ic_audio_ring_notif"
-        android:inset="4dp"
-        />
-
diff --git a/res/drawable/ring_notif_mute.xml b/res/drawable/ring_notif_mute.xml
deleted file mode 100644
index fe9417d..0000000
--- a/res/drawable/ring_notif_mute.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<!--
-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.
--->
-<!-- shrink ic_audio_ring_notif_mute from 32dp to 24dp using insets -->
-<inset xmlns:android="http://schemas.android.com/apk/res/android"
-        android:drawable="@*android:drawable/ic_audio_ring_notif_mute"
-        android:inset="4dp"
-        />
diff --git a/res/drawable/ring_notif_vibrate.xml b/res/drawable/ring_notif_vibrate.xml
deleted file mode 100644
index 37113d7..0000000
--- a/res/drawable/ring_notif_vibrate.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<!--
-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.
--->
-<!-- shrink ic_audio_ring_notif_vibrate from 32dp to 24dp using insets -->
-<inset xmlns:android="http://schemas.android.com/apk/res/android"
-        android:drawable="@*android:drawable/ic_audio_ring_notif_vibrate"
-        android:inset="4dp"
-        />
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/layout-land/setup_template.xml b/res/layout-land/setup_template.xml
new file mode 100644
index 0000000..cc3402f
--- /dev/null
+++ b/res/layout-land/setup_template.xml
@@ -0,0 +1,68 @@
+<?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.
+-->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <RelativeLayout
+        android:layout_weight="1"
+        android:layout_width="match_parent"
+        android:layout_height="0dp">
+
+        <FrameLayout
+            android:id="@+id/title_area"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentTop="true"
+            android:background="@drawable/setup_illustration_bg"
+            android:elevation="@dimen/setup_wizard_title_area_elevation">
+
+            <TextView
+                android:id="@+id/title"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/wifi_setup_title"
+                style="@style/SetupTitle"/>
+        </FrameLayout>
+
+        <ScrollView
+            android:id="@+id/bottom_scroll_view"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/title_area"
+            android:layout_alignParentBottom="true"
+            android:fillViewport="true">
+
+            <FrameLayout android:id="@+id/setup_content"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:clipChildren="false"/>
+
+        </ScrollView>
+
+    </RelativeLayout>
+
+    <fragment android:name="com.android.setupwizard.navigationbar.SetupWizardNavBar"
+        android:id="@+id/navigation_bar"
+        android:layout_width="match_parent"
+        android:layout_height="56dip"
+        style="@style/setup_wizard_navbar_style"/>
+</LinearLayout>
+
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
new file mode 100644
index 0000000..a58dd3d
--- /dev/null
+++ b/res/layout-sw600dp-land/setup_template.xml
@@ -0,0 +1,74 @@
+<?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.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <com.android.settings.widget.SetupWizardIllustration
+        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">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:gravity="start|top"
+            android:weightSum="16">
+
+            <TextView
+                android:id="@+id/title"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/setup_wizard_tablet_illustration_height"
+                android:layout_weight="6"
+                android:text="@string/wifi_setup_title"
+                style="@style/SetupCardTitle"/>
+
+            <ScrollView
+                android:id="@+id/bottom_scroll_view"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_marginTop="@dimen/setup_wizard_card_land_margin_top"
+                android:layout_weight="8"
+                android:background="@drawable/setup_wizard_card_bg"
+                android:elevation="@dimen/setup_wizard_card_elevation"
+                android:fillViewport="true">
+
+                <FrameLayout android:id="@+id/setup_content"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:clipChildren="false"/>
+
+            </ScrollView>
+
+        </LinearLayout>
+
+    </com.android.settings.widget.SetupWizardIllustration>
+
+    <fragment android:name="com.android.setupwizard.navigationbar.SetupWizardNavBar"
+        android:id="@+id/navigation_bar"
+        android:layout_width="match_parent"
+        android:layout_height="56dip"
+        style="@style/setup_wizard_navbar_style"/>
+
+</LinearLayout>
+
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
new file mode 100644
index 0000000..297e9fb
--- /dev/null
+++ b/res/layout-sw600dp/setup_template.xml
@@ -0,0 +1,74 @@
+<?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.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <com.android.settings.widget.SetupWizardIllustration
+        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">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginTop="@dimen/setup_wizard_tablet_illustration_height"
+            android:orientation="vertical"
+            android:paddingStart="@dimen/setup_wizard_card_port_margin_sides"
+            android:paddingEnd="@dimen/setup_wizard_card_port_margin_sides">
+
+            <TextView
+                android:id="@+id/title"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/wifi_setup_title"
+                style="@style/SetupCardTitle"/>
+
+            <ScrollView
+                android:id="@+id/bottom_scroll_view"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:background="@drawable/setup_wizard_card_bg"
+                android:elevation="@dimen/setup_wizard_card_elevation"
+                android:fillViewport="true">
+
+                <FrameLayout
+                    android:id="@+id/setup_content"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:clipChildren="false"/>
+
+            </ScrollView>
+
+        </LinearLayout>
+
+    </com.android.settings.widget.SetupWizardIllustration>
+
+    <fragment android:name="com.android.setupwizard.navigationbar.SetupWizardNavBar"
+        android:id="@+id/navigation_bar"
+        android:layout_width="match_parent"
+        android:layout_height="56dip"
+        style="@style/setup_wizard_navbar_style"/>
+
+</LinearLayout>
+
diff --git a/res/layout/crypt_keeper_emergency_button.xml b/res/layout/crypt_keeper_emergency_button.xml
index d0004de..0b6f810 100644
--- a/res/layout/crypt_keeper_emergency_button.xml
+++ b/res/layout/crypt_keeper_emergency_button.xml
@@ -19,15 +19,21 @@
 
 <!-- Emergency call button.
      Text is set by CryptKeeper.updateEmergencyCallButtonState() -->
-<Button
+<LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/emergencyCallButton"
-    android:layout_width="wrap_content"
+    android:layout_width="match_parent"
     android:layout_height="0dp"
-    android:layout_gravity="center_horizontal"
-    android:textSize="14sp"
-    android:fontFamily="sans-serif"
-    android:textColor="#FFFFFF"
     android:layout_weight="1"
-    android:gravity="bottom"
-    style="?android:attr/borderlessButtonStyle" />
+    android:orientation="vertical"
+    android:gravity="bottom">
+    <Button
+        android:id="@+id/emergencyCallButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:textSize="14sp"
+        android:fontFamily="sans-serif"
+        android:textColor="#FFFFFF"
+        style="?android:attr/borderlessButtonStyle" />
+
+</LinearLayout>
diff --git a/res/layout/encryption_interstitial.xml b/res/layout/encryption_interstitial.xml
index 362ff82..162ad0e 100644
--- a/res/layout/encryption_interstitial.xml
+++ b/res/layout/encryption_interstitial.xml
@@ -20,8 +20,8 @@
         android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:paddingStart="@dimen/settings_side_margin"
-        android:paddingEnd="@dimen/settings_side_margin">
+        android:paddingStart="?attr/side_margin"
+        android:paddingEnd="?attr/side_margin">
 
     <TextView
             android:id="@+id/encryption_message"
diff --git a/res/layout/grid_picker_dialog.xml b/res/layout/grid_picker_dialog.xml
index a52f079..1e04188 100644
--- a/res/layout/grid_picker_dialog.xml
+++ b/res/layout/grid_picker_dialog.xml
@@ -17,16 +17,21 @@
 
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent" >
+    android:layout_height="match_parent"
+    android:paddingStart="24dp"
+    android:paddingTop="16dp"
+    android:paddingEnd="24dp">
 
     <GridView
         android:id="@android:id/list"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:columnWidth="112dp"
+        android:horizontalSpacing="16dp"
+        android:verticalSpacing="16dp"
         android:numColumns="auto_fit"
+        android:columnWidth="96dp"
         android:scrollbarStyle="insideOverlay"
-        android:stretchMode="spacingWidthUniform" />
+        android:stretchMode="columnWidth" />
 
     <!-- HACK: Setting minHeight has no effect within a dialog layout,
          so this view keeps the minimum height above 300dp. -->
diff --git a/res/layout/icc_lock_tabs.xml b/res/layout/icc_lock_tabs.xml
new file mode 100644
index 0000000..d2a4acc
--- /dev/null
+++ b/res/layout/icc_lock_tabs.xml
@@ -0,0 +1,60 @@
+<?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.
+-->
+
+<TabHost xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@android:id/tabhost"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:id="@+id/tabs_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <HorizontalScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:scrollbars="none"
+            android:fillViewport="true">
+
+            <TabWidget
+                android:id="@android:id/tabs"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                style="?android:attr/tabWidgetStyle" />
+
+        </HorizontalScrollView>
+
+        <!-- give an empty content area to make tabhost happy -->
+        <FrameLayout
+            android:id="@android:id/tabcontent"
+            android:layout_width="0dip"
+            android:layout_height="0dip" />
+
+        <ListView
+            android:id="@android:id/list"
+            android:layout_width="match_parent"
+            android:layout_height="0dip"
+            android:layout_weight="1"
+            android:clipChildren="false"
+            android:clipToPadding="false"
+            android:smoothScrollbar="false" />
+
+    </LinearLayout>
+
+</TabHost>
diff --git a/res/layout/manage_applications_apps.xml b/res/layout/manage_applications_apps.xml
index 4033d43..1e0518d 100644
--- a/res/layout/manage_applications_apps.xml
+++ b/res/layout/manage_applications_apps.xml
@@ -19,11 +19,6 @@
         android:layout_height="match_parent"
         android:orientation="vertical">
 
-    <FrameLayout android:id="@+id/pinned_header"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:visibility="gone" />
-
     <FrameLayout
               android:layout_width="match_parent"
               android:layout_height="0dp"
diff --git a/res/layout/manage_applications_content.xml b/res/layout/manage_applications_content.xml
index 364a002..db22529 100644
--- a/res/layout/manage_applications_content.xml
+++ b/res/layout/manage_applications_content.xml
@@ -25,6 +25,11 @@
     android:orientation="vertical"
     android:background="@drawable/default_preference_background">
 
+    <FrameLayout android:id="@+id/pinned_header"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:visibility="gone" />
+
     <android.support.v4.view.ViewPager
             android:id="@+id/pager"
             android:layout_width="match_parent"
diff --git a/res/layout/manage_applications_item.xml b/res/layout/manage_applications_item.xml
index e749859..5471aa9 100755
--- a/res/layout/manage_applications_item.xml
+++ b/res/layout/manage_applications_item.xml
@@ -45,7 +45,7 @@
         android:singleLine="true"
         android:ellipsize="marquee"
         android:textAppearance="@android:style/TextAppearance.Material.Subhead"
-        android:textAlignment="viewStart" />
+        android:textAlignment="viewStart"/>
 
     <CheckBox android:id="@+id/app_on_sdcard"
         android:layout_marginStart="8dip"
@@ -57,7 +57,8 @@
 
     <TextView
         android:id="@+id/app_size"
-        android:layout_width="0dip"
+        android:layout_column="1"
+        android:layout_row="1"
         android:layout_gravity="fill_horizontal|top"
         android:textAppearance="@android:style/TextAppearance.Material.Body1"
         android:textColor="?android:attr/textColorSecondary"
@@ -65,9 +66,13 @@
 
     <TextView
         android:id="@+id/app_disabled"
+        android:layout_width="0dip"
         android:layout_marginStart="8dip"
-        android:layout_gravity="top"
+        android:layout_gravity="fill_horizontal|top"
         android:textAppearance="@android:style/TextAppearance.Material.Body1"
-        android:textColor="?android:attr/textColorSecondary" />
+        android:textColor="?android:attr/textColorSecondary"
+        android:textAlignment="viewEnd"
+        android:singleLine="true"
+        android:ellipsize="marquee" />
 
 </GridLayout>
diff --git a/res/layout/manage_applications_running.xml b/res/layout/manage_applications_running.xml
index 6cacf2a..485523a 100644
--- a/res/layout/manage_applications_running.xml
+++ b/res/layout/manage_applications_running.xml
@@ -19,11 +19,6 @@
             android:layout_height="match_parent"
             android:orientation="vertical">
 
-    <FrameLayout android:id="@+id/pinned_header"
-                 android:layout_width="wrap_content"
-                 android:layout_height="wrap_content"
-                 android:visibility="gone" />
-
     <FrameLayout
               android:layout_width="match_parent"
               android:layout_height="match_parent" >
diff --git a/res/layout/master_clear.xml b/res/layout/master_clear.xml
index db62936..5ad921a 100644
--- a/res/layout/master_clear.xml
+++ b/res/layout/master_clear.xml
@@ -33,11 +33,13 @@
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:includeFontPadding="false"
                 android:textSize="18sp"
                 android:text="@string/master_clear_desc" />
             <TextView android:id="@+id/also_erases_external"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:includeFontPadding="false"
                 android:visibility="gone"
                 android:textSize="18sp"
                 android:text="@string/master_clear_desc_also_erases_external" />
@@ -55,6 +57,12 @@
                 <!-- Do not add any children here as they will be removed in the MasterClear.java
                     code. A list of accounts will be inserted programmatically. -->
             </LinearLayout>
+            <TextView android:id="@+id/other_users_present"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:visibility="gone"
+                android:textSize="18sp"
+                android:text="@string/master_clear_other_users_present" />
             <TextView android:id="@+id/erase_external_option_text"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
diff --git a/res/layout/multi_sim_dialog.xml b/res/layout/multi_sim_dialog.xml
index 4f9dd6c..46fbda8 100644
--- a/res/layout/multi_sim_dialog.xml
+++ b/res/layout/multi_sim_dialog.xml
@@ -21,7 +21,6 @@
     <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:padding="@dimen/sim_dialog_padding"
             android:orientation="vertical">
 
         <LinearLayout android:id="@+id/type"
@@ -33,19 +32,40 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="@dimen/sim_dialog_margin_top"
-                    android:paddingStart="@dimen/sim_label_padding"
-                    android:text="@string/sim_editor_name"
-                    style="?android:attr/textAppearanceMedium" />
+                    android:paddingStart="@dimen/sim_content_padding"
+                    android:text="@string/sim_editor_name" />
 
             <EditText android:id="@+id/sim_name"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:singleLine="true"
-                    android:layout_marginStart="@dimen/sim_content_padding"
+                    android:paddingStart="@dimen/sim_content_padding"
                     android:paddingBottom="@dimen/sim_dialog_margin_bottom"
-                    android:hint="@string/wifi_ssid_hint"
+                    android:hint="@string/sim_name_hint"
                     android:inputType="textNoSuggestions"
-                    android:maxLength="@integer/sim_name_length" />
+                    android:maxLength="@integer/sim_name_length"
+                    android:textColor="@android:color/black"
+                    style="?android:attr/textAppearanceMedium" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/sim_dialog_margin_top"
+                android:paddingStart="@dimen/sim_content_padding"
+                android:text="@string/color_title" />
+
+            <Spinner
+                android:id="@+id/spinner"
+                android:layout_width="@dimen/color_picker_width"
+                android:layout_height="wrap_content"
+                android:paddingStart="@dimen/sim_content_padding" />
 
         </LinearLayout>
 
@@ -58,14 +78,14 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="@dimen/sim_dialog_margin_top"
-                    android:paddingStart="@dimen/sim_label_padding"
+                    android:paddingStart="@dimen/sim_content_padding"
                     android:text="@string/sim_editor_carrier" />
 
             <TextView android:id="@+id/carrier"
                     android:textColor="@android:color/black"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:paddingStart="@dimen/sim_label_padding"
+                    android:paddingStart="@dimen/sim_content_padding"
                     android:paddingBottom="@dimen/sim_dialog_margin_bottom"
                     android:singleLine="true"
                     style="?android:attr/textAppearanceMedium" />
@@ -81,14 +101,14 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="@dimen/sim_dialog_margin_top"
-                    android:paddingStart="@dimen/sim_label_padding"
+                    android:paddingStart="@dimen/sim_content_padding"
                     android:text="@string/sim_editor_number" />
 
             <TextView android:id="@+id/number"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:paddingBottom="@dimen/sim_dialog_margin_bottom"
-                    android:paddingStart="@dimen/sim_label_padding"
+                    android:paddingStart="@dimen/sim_content_padding"
                     android:singleLine="true"
                     android:textColor="@android:color/black"
                     style="?android:attr/textAppearanceMedium" />
diff --git a/res/layout/preference_volume_slider.xml b/res/layout/preference_volume_slider.xml
new file mode 100644
index 0000000..878a710
--- /dev/null
+++ b/res/layout/preference_volume_slider.xml
@@ -0,0 +1,74 @@
+<?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.
+-->
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:gravity="center_vertical"
+    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:layout_marginTop="8dip"
+        android:layout_marginBottom="8dip">
+
+        <TextView android:id="@android:id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:textAppearance="@android:style/TextAppearance.Material.Subhead"
+            android:textColor="?android:attr/textColorPrimary"
+            android:ellipsize="marquee"
+            android:fadingEdge="horizontal" />
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="6dp">
+
+            <ImageView
+                android:id="@android:id/icon"
+                android:layout_gravity="center_vertical|start"
+                android:layout_width="24dp"
+                android:layout_height="24dp" />
+
+            <SeekBar android:id="@*android:id/seekbar"
+                android:layout_marginStart="24dp"
+                android:layout_gravity="center_vertical"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
+
+            <TextView android:id="@+id/suppression_text"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical|start"
+                android:textAlignment="viewStart"
+                android:layout_marginStart="24dp"
+                android:paddingStart="14dp"
+                android:singleLine="true"
+                android:ellipsize="end"
+                android:textAppearance="@android:style/TextAppearance.Material.Body1"
+                android:textColor="?android:attr/textColorSecondary" />
+
+        </FrameLayout>
+
+    </LinearLayout>
+
+</FrameLayout>
diff --git a/res/layout/preference_widget_sync_toggle.xml b/res/layout/preference_widget_sync_toggle.xml
index 115098b..22cd4d3 100644
--- a/res/layout/preference_widget_sync_toggle.xml
+++ b/res/layout/preference_widget_sync_toggle.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 
-<!-- Layout used by SyncStateCheckBoxPreference. This is inflated
+<!-- Layout used by SyncStateSwitchPreference. This is inflated
      inside android.R.layout.preference. -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
@@ -38,8 +38,8 @@
         android:layout_marginEnd="8dip"
         android:contentDescription="@string/sync_active" />
 
-    <CheckBox xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@android:id/checkbox"
+    <Switch xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@*android:id/switchWidget"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
diff --git a/res/layout/preset_picker_item.xml b/res/layout/preset_picker_item.xml
index 0cafd34..405b735 100644
--- a/res/layout/preset_picker_item.xml
+++ b/res/layout/preset_picker_item.xml
@@ -18,14 +18,11 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:gravity="center"
-    android:orientation="vertical"
-    android:paddingLeft="4dp"
-    android:paddingRight="4dp"
-    android:paddingTop="16dp" >
+    android:minWidth="96dp"
+    android:orientation="vertical">
 
     <FrameLayout
-        android:layout_width="96dp"
+        android:layout_width="match_parent"
         android:layout_height="96dp"
         android:background="@drawable/transparency_tileable" >
 
@@ -37,10 +34,16 @@
             android:text="@string/captioning_preview_characters" />
     </FrameLayout>
 
+    <!-- HACK: GridView doesn't perform layout properly in this configuration,
+         so we need to manually set the height to roughly two scaled lines. -->
     <TextView
         android:id="@+id/summary"
-        android:layout_width="96dp"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:gravity="center" />
+        android:ellipsize="end"
+        android:maxLines="2"
+        android:minLines="2"
+        android:gravity="top|center_horizontal"
+        android:textAppearance="@android:style/TextAppearance.Material.Body1" />
 
 </LinearLayout>
diff --git a/res/layout/radio_info.xml b/res/layout/radio_info.xml
index d81dad6..a288224 100644
--- a/res/layout/radio_info.xml
+++ b/res/layout/radio_info.xml
@@ -226,6 +226,14 @@
                 android:layout_height="wrap_content"
                 />
 
+        <!-- VoLTE provisioned -->
+        <Button android:id="@+id/volte_provisioned_flag"
+                android:textSize="14sp"
+                android:layout_marginTop="8dip"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                />
+
         <!-- SMS over IMS -->
         <Button android:id="@+id/sms_over_ims"
                 android:textSize="14sp"
diff --git a/res/layout/redaction_interstitial.xml b/res/layout/redaction_interstitial.xml
index edcf5b8..c56db11 100644
--- a/res/layout/redaction_interstitial.xml
+++ b/res/layout/redaction_interstitial.xml
@@ -20,8 +20,8 @@
         android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:paddingStart="@dimen/settings_side_margin"
-        android:paddingEnd="@dimen/settings_side_margin">
+        android:paddingStart="?attr/side_margin"
+        android:paddingEnd="?attr/side_margin">
 
     <TextView
             android:layout_width="wrap_content"
diff --git a/res/layout/screen_pinning_instructions.xml b/res/layout/screen_pinning_instructions.xml
index 22b2b37..80fec3c 100644
--- a/res/layout/screen_pinning_instructions.xml
+++ b/res/layout/screen_pinning_instructions.xml
@@ -17,14 +17,11 @@
 */
 -->
 
-<LinearLayout
+<ScrollView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/instructions_area"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:paddingStart="@dimen/screen_margin_sides"
-    android:paddingEnd="@dimen/screen_margin_sides">
+    android:layout_height="match_parent">
 
     <TextView
         android:id="@+id/screen_pinning_description"
@@ -34,6 +31,8 @@
         android:paddingTop="@dimen/screen_pinning_textview_padding"
         android:text="@string/screen_pinning_description"
         android:textAppearance="@style/TextAppearance.Medium"
+        android:paddingStart="@dimen/screen_margin_sides"
+        android:paddingEnd="@dimen/screen_margin_sides"
         />
 
-</LinearLayout>
+</ScrollView>
diff --git a/res/layout/select_account_list_item.xml b/res/layout/select_account_list_item.xml
index d80fef5..3587e55 100644
--- a/res/layout/select_account_list_item.xml
+++ b/res/layout/select_account_list_item.xml
@@ -14,23 +14,44 @@
      limitations under the License.
 -->
 
-<!-- Layout of a single item in the InCallUI Account Chooser Dialog. -->
+<!-- Layout of a single item for displaying sim cards. -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="horizontal"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:padding="4dp" >
+    android:background="?android:attr/selectableItemBackground" >
 
     <ImageView android:id="@+id/icon"
         android:layout_width="48dp"
         android:layout_height="48dp"
         android:scaleType="center" />
 
-    <TextView android:id="@+id/text"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:gravity="start|center_vertical"
-        android:layout_marginLeft="8dp"
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:orientation="vertical"
+        android:layout_marginStart="15dip"
+        android:layout_marginEnd="6dip"
+        android:layout_marginTop="6dip"
+        android:layout_marginBottom="6dip"
+        android:layout_height="wrap_content"
         android:layout_width="0dp"
-        android:layout_weight="1"
-        android:layout_height="match_parent" />
+        android:layout_weight="1" >
+        <TextView android:id="@+id/title"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:gravity="start|center_vertical"
+            android:layout_marginLeft="8dp"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:ellipsize="marquee"
+            android:fadingEdge="horizontal" />
+        <TextView android:id="@+id/summary"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:gravity="start|center_vertical"
+            android:layout_marginLeft="8dp"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/title"
+            android:textColor="?android:attr/textColorSecondary"
+            android:layout_alignStart="@id/title" />
+    </LinearLayout>
 </LinearLayout>
diff --git a/res/layout/settings_color_picker_item.xml b/res/layout/settings_color_picker_item.xml
new file mode 100644
index 0000000..c171950
--- /dev/null
+++ b/res/layout/settings_color_picker_item.xml
@@ -0,0 +1,47 @@
+<?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.
+-->
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:background="?android:attr/selectableItemBackground" >
+
+    <ImageView
+        android:id="@+id/color_icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingRight="8dp"
+        android:paddingLeft="6dp"
+        android:paddingTop="8dp"
+        android:paddingBottom="8dp"
+        android:layout_gravity="center_vertical" />
+
+    <TextView
+        android:id="@+id/color_text"
+        android:gravity="center_vertical"
+        android:layout_height="wrap_content"
+        android:layout_width="0dp"
+        android:layout_weight="1"
+        android:paddingTop="8dp"
+        android:paddingBottom="8dp"
+        android:paddingRight="8dp"
+        android:paddingLeft="8dp"
+        android:textColor="@android:color/black"
+        style="?android:attr/textAppearanceMedium" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/setup_choose_lock_password.xml b/res/layout/setup_choose_lock_password.xml
new file mode 100644
index 0000000..59fa523
--- /dev/null
+++ b/res/layout/setup_choose_lock_password.xml
@@ -0,0 +1,84 @@
+<?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.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center_horizontal"
+    android:orientation="vertical">
+
+    <!-- header text ('Enter Pin') -->
+    <TextView android:id="@+id/headerText"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:lines="2"
+        android:textAppearance="?android:attr/textAppearanceMedium"/>
+
+    <!-- Password entry field -->
+    <EditText android:id="@+id/password_entry"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:layout_marginStart="30dip"
+        android:layout_marginEnd="30dip"
+        android:gravity="center"
+        android:inputType="textPassword"
+        android:imeOptions="actionNext|flagNoExtractUi"
+        android:textSize="24sp"
+        style="@style/TextAppearance.PasswordEntry"/>
+
+    <!-- Spacer between password entry and keyboard -->
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0dip"
+        android:layout_weight="1"/>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:visibility="gone"
+        style="@style/SecurityPreferenceButtonContainer">
+
+        <!-- left : cancel -->
+        <Button android:id="@+id/cancel_button"
+            android:layout_width="0dip"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/lockpassword_cancel_label"
+            style="@style/SecurityPreferenceButton"/>
+
+        <!-- right : continue -->
+        <Button android:id="@+id/next_button"
+            android:layout_width="0dip"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/lockpassword_continue_label"
+            style="@style/SecurityPreferenceButton"/>
+
+    </LinearLayout>
+
+    <!-- Alphanumeric keyboard -->
+    <com.android.internal.widget.PasswordEntryKeyboardView android:id="@+id/keyboard"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="#00000000"
+        android:keyBackground="@*android:drawable/btn_keyboard_key_fulltrans"
+        android:visibility="gone"/>
+
+</LinearLayout>
diff --git a/res/layout/setup_choose_lock_pattern.xml b/res/layout/setup_choose_lock_pattern.xml
new file mode 100644
index 0000000..a906826
--- /dev/null
+++ b/res/layout/setup_choose_lock_pattern.xml
@@ -0,0 +1,94 @@
+<?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.
+-->
+
+<com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/topLayout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <!-- takes up all space above button bar at bottom -->
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="0dip"
+        android:layout_weight="1"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <TextView android:id="@+id/headerText"
+            android:layout_width="match_parent"
+            android:layout_height="0dip"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:minHeight="50dp"
+            android:textSize="18sp"/>
+
+        <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
+            android:layout_width="match_parent"
+            android:layout_height="0dip"
+            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="wrap_content"
+            android:layout_height="wrap_content"
+            android:minHeight="50dp"
+            android:textSize="14sp"/>
+
+    </LinearLayout>
+
+    <!-- Buttons are hidden during setup, and use the buttons in setup navigation bar instead -->
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:visibility="gone"
+        style="@style/SecurityPreferenceButtonContainer">
+
+        <!-- left : cancel, or re-try -->
+        <Button android:id="@+id/footerLeftButton"
+            android:layout_width="0dip"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/lockpattern_tutorial_cancel_label"
+            style="@style/SecurityPreferenceButton"/>
+
+        <!-- right : confirm or ok -->
+        <Button android:id="@+id/footerRightButton"
+            android:layout_width="0dip"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/lockpattern_tutorial_continue_label"
+            style="@style/SecurityPreferenceButton"/>
+
+    </LinearLayout>
+
+</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
diff --git a/res/layout/setup_template.xml b/res/layout/setup_template.xml
new file mode 100644
index 0000000..0623e25
--- /dev/null
+++ b/res/layout/setup_template.xml
@@ -0,0 +1,75 @@
+<?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.
+-->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <ScrollView
+        android:id="@+id/bottom_scroll_view"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:fillViewport="true">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:clipChildren="false">
+
+            <com.android.settings.widget.SetupWizardIllustration
+                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"
+                android:tag="stickyContainer"
+                settings:aspectRatio="2.22">
+
+                <TextView
+                    android:id="@+id/title"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:tag="sticky"
+                    android:text="@string/wifi_setup_title"
+                    style="@style/SetupTitle"/>
+
+            </com.android.settings.widget.SetupWizardIllustration>
+
+            <FrameLayout
+                android:id="@+id/setup_content"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/setup_illustration"
+                android:clipChildren="false"/>
+
+        </RelativeLayout>
+
+    </ScrollView>
+
+    <fragment android:name="com.android.setupwizard.navigationbar.SetupWizardNavBar"
+        android:id="@+id/navigation_bar"
+        android:layout_width="match_parent"
+        android:layout_height="56dip"
+        style="@style/setup_wizard_navbar_style"/>
+
+</LinearLayout>
+
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/sim_information.xml b/res/layout/sim_information.xml
new file mode 100644
index 0000000..d2a4acc
--- /dev/null
+++ b/res/layout/sim_information.xml
@@ -0,0 +1,60 @@
+<?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.
+-->
+
+<TabHost xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@android:id/tabhost"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:id="@+id/tabs_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <HorizontalScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:scrollbars="none"
+            android:fillViewport="true">
+
+            <TabWidget
+                android:id="@android:id/tabs"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                style="?android:attr/tabWidgetStyle" />
+
+        </HorizontalScrollView>
+
+        <!-- give an empty content area to make tabhost happy -->
+        <FrameLayout
+            android:id="@android:id/tabcontent"
+            android:layout_width="0dip"
+            android:layout_height="0dip" />
+
+        <ListView
+            android:id="@android:id/list"
+            android:layout_width="match_parent"
+            android:layout_height="0dip"
+            android:layout_weight="1"
+            android:clipChildren="false"
+            android:clipToPadding="false"
+            android:smoothScrollbar="false" />
+
+    </LinearLayout>
+
+</TabHost>
diff --git a/res/layout/spinner_view.xml b/res/layout/spinner_view.xml
index 88af2e2..8ab3516 100644
--- a/res/layout/spinner_view.xml
+++ b/res/layout/spinner_view.xml
@@ -18,8 +18,7 @@
         android:id="@+id/profile_spinner"
         android:layout_width="wrap_content"
         android:layout_height="@dimen/user_spinner_height"
-        android:dropDownVerticalOffset="@dimen/user_spinner_offset"
-        android:dropDownHorizontalOffset="@dimen/user_spinner_offset"
+        android:overlapAnchor="true"
         android:paddingBottom="@dimen/user_spinner_padding"
         android:paddingTop="@dimen/user_spinner_padding"
         android:paddingLeft="@dimen/user_spinner_padding" />
diff --git a/res/layout/trusted_credential.xml b/res/layout/trusted_credential.xml
index d8f315a..dae9424 100644
--- a/res/layout/trusted_credential.xml
+++ b/res/layout/trusted_credential.xml
@@ -45,8 +45,8 @@
 
     </RelativeLayout>
 
-    <!-- checkbox is invisible and not gone so that the height is consistent between tabs -->
-    <CheckBox
+    <!-- Switch is invisible and not gone so that the height is consistent between tabs -->
+    <Switch
         android:id="@+id/trusted_credential_status"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
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/layout/wifi_assistant_card.xml b/res/layout/wifi_assistant_card.xml
deleted file mode 100644
index b7ab7b9..0000000
--- a/res/layout/wifi_assistant_card.xml
+++ /dev/null
@@ -1,81 +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.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/wifi_assistant_card"
-    android:background="@android:color/transparent"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:gravity="center_vertical"
-    android:orientation="vertical">
-
-    <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="fill_parent"
-        android:layout_height="@dimen/wifi_assistant_height">
-
-        <ImageView
-            android:id="@+id/cardBackground"
-            android:background="@color/wifi_assistant_color_accent"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:src="@drawable/wifi_assistant_card" />
-
-        <TextView
-            android:id="@+id/backgroundText"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/wifi_assistant_text_padding"
-            android:gravity="start"
-            android:paddingStart="@dimen/wifi_assistant_padding_start_end"
-            android:paddingTop="@dimen/wifi_assistant_padding_top_bottom"
-            android:text="@string/wifi_assistant_intro_setup"
-            style="@style/WifiAssistantText" />
-
-    </RelativeLayout>
-
-    <TextView
-        android:id="@+id/wifi_assistant_text"
-        android:background="@android:color/transparent"
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:layout_marginBottom="@dimen/wifi_assistant_padding_top_bottom"
-        android:layout_marginTop="@dimen/wifi_assistant_padding_top_bottom"
-        android:layout_marginLeft="@dimen/wifi_assistant_padding_start_end"
-        android:layout_marginRight="@dimen/wifi_assistant_padding_start_end"
-        android:gravity="start"
-        android:textAppearance="?android:attr/textAppearanceMedium" />
-
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:background="@android:color/transparent"
-        android:layout_height="wrap_content"
-        android:layout_width="fill_parent"
-        android:gravity="end"
-        android:orientation="horizontal">
-
-        <Button
-            android:id="@+id/no_thanks_button"
-            android:text="@string/wifi_assistant_no_thanks"
-            style="@style/WifiAssistantButton.Negative" />
-
-        <Button
-            android:id="@+id/setup"
-            android:text="@string/wifi_assistant_setup"
-            style="@style/WifiAssistantButton.Positive" />
-
-    </LinearLayout>
-
-</LinearLayout>
diff --git a/res/layout/wifi_dialog.xml b/res/layout/wifi_dialog.xml
index c1fbc4f..c1d6124 100644
--- a/res/layout/wifi_dialog.xml
+++ b/res/layout/wifi_dialog.xml
@@ -64,6 +64,7 @@
                 <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:minEms="16"
                         style="@style/wifi_item_label"
                         android:text="@string/wifi_security" />
 
diff --git a/res/values-af/arrays.xml b/res/values-af/arrays.xml
index 04ba741..862babe 100644
--- a/res/values-af/arrays.xml
+++ b/res/values-af/arrays.xml
@@ -527,4 +527,12 @@
     <item msgid="4338089220026248848">"Gekas (aktiwiteitkliënt)"</item>
     <item msgid="6652164677254579050">"Gekas (leeg)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Blougroen"</item>
+    <item msgid="8332294763632946560">"Blou"</item>
+    <item msgid="2023216417616991392">"Indigo"</item>
+    <item msgid="3170497246594232819">"Pers"</item>
+    <item msgid="4608643045752965568">"Pienk"</item>
+    <item msgid="6131821495505931173">"Rooi"</item>
+  </string-array>
 </resources>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index cf2b357..30cd8b4 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>
@@ -180,7 +180,6 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s wil toegang tot jou boodskappe verkry. Gee toegang aan %2$s?"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Datum en tyd"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Kies tydsone"</string>
-    <string name="normal_date_format" msgid="7636406984925498359">"Volgens streek (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Voorskou:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Fontgrootte:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -291,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>
@@ -322,8 +321,6 @@
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Kies tydsone"</string>
     <string name="date_time_set_date_title" msgid="6928286765325608604">"Datum"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"Stel datum"</string>
-    <string name="date_time_date_format_title" msgid="3976171711988766411">"Datumformaat"</string>
-    <string name="date_time_date_format" msgid="6951498879879281102">"Kies datumformaat"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Rangskik alfabeties"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Rangskik volgens tydsone"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Datum"</string>
@@ -372,7 +369,8 @@
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Wag asseblief terwyl jou foon geënkripteer word. <xliff:g id="PERCENT">^1</xliff:g>% voltooi."</string>
     <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Wag terwyl jou tablet geënkripteer word. Oorblywende tyd: <xliff:g id="DURATION">^1</xliff:g>"</string>
     <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Wag terwyl jou foon geënkripteer word. Oorblywende tyd: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Probeer weer oor <xliff:g id="DELAY">^1</xliff:g> sekondes."</string>
+    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"Om jou tablet te ontsluit, skakel dit af en dan aan."</string>
+    <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"Om jou foon te ontsluit, skakel dit af en dan aan."</string>
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"Waarskuwing: Jou toestel sal uitgevee word na nog <xliff:g id="COUNT">^1</xliff:g> mislukte pogings om ontsluit te word!"</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Voer jou wagwoord in"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Enkripsie onsuksesvol"</string>
@@ -401,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>
@@ -412,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>
@@ -556,13 +556,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"As luidsprekerfoon"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Vir musiek en media"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Onthou instellings"</string>
-    <string name="wifi_assistant_intro_setup" msgid="4605105515416995110">"Stel\nWi‑Fi-assistent bekend"</string>
-    <string name="wifi_assistant_no_thanks" msgid="2776983751990143934">"NEE, DANKIE"</string>
-    <string name="wifi_assistant_setup" msgid="3772423650475730906">"STEL OP"</string>
-    <string name="wifi_assistant_card_message" msgid="107811647784658536">"Koppel outomaties met \'n Wi-Fi-assistent aan beskikbare netwerke."</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi‑Fi-assistent"</string>
-    <string name="wifi_assistant_title_message" msgid="6240721017579074015">"<xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> koppel jou outomaties aan die beste beskikbare Wi‑Fi"</string>
-    <string name="wifi_assistant_open_app" msgid="4803044899535675063">"MAAK PROGRAM OOP"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Gekoppel via Wi-Fi-assistent"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"Uitsaaiskerm"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Aktiveer draadlose skermdeling"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Geen nabygeleë toestelle is gekry nie."</string>
@@ -592,7 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Wi-Fi-instellings"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Stel en beheer draadlose toegangspunte"</string>
-    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Kies Wi-Fi"</string>
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Kies Wi-Fi-netwerk"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Kies Wi-Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Skakel tans Wi-Fi aan…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Skakel tans Wi-Fi af…"</string>
@@ -607,8 +602,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"Skandering altyd beskikbaar"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Laat skandering altyd toe"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Laat Google se liggingdiens en ander programme skandeer vir netwerke, selfs wanneer Wi-Fi af is"</string>
-    <string name="wifi_automatically_manage_title" msgid="6249976570008992746">"Bestuur Wi‑Fi outomaties"</string>
-    <string name="wifi_automatically_manage_summary" msgid="6952470763378312488">"Laat <xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> jou Wi‑Fi-verbinding bestuur"</string>
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Gebruik outomaties oop Wi-Fi"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Laat \'n Wi‑Fi-assistent outomaties aan oop netwerke van hoë gehalte koppel"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Kies assistent"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Installeer sertifikate"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Om akkuraatheid te verbeter en vir ander doeleindes, kan Google en ander programme dalk skandeer vir nabygeleë netwerke, selfs wanneer Wi-Fi af is. As jy nie wil hê dat dit gebeur nie, gaan na Gevorderd &gt; Skandering altyd beskikbaar."</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Programme kan dalk skandeer vir nabygeleë netwerke, selfs wanneer Wi-Fi af is. As jy nie wil hê dat dit gebeur nie, gaan na Gevorderd &gt; Skandering altyd beskikbaar."</string>
@@ -629,6 +625,7 @@
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Skandeer"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Gevorderd"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Koppel aan netwerk"</string>
+    <string name="wifi_menu_remember" msgid="8814185749388713796">"Onthou netwerk"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Vergeet netwerk"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Wysig netwerk"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Skryf na NFC-merker"</string>
@@ -673,9 +670,11 @@
     <string name="wifi_unspecified" msgid="5431501214192991253">"(ongespesifiseer)"</string>
     <string name="wifi_remembered" msgid="4955746899347821096">"Gestoor"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"Gedeaktiveer"</string>
-    <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Swak internetverbinding vermy"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP-opstelling het misluk"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"WiFi-verbinding het misluk"</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Stawingsprobleem"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Nie binne ontvangs nie"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Geen internettoegang bespeur nie, sal nie outomaties herkoppel nie."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS beskikbaar"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS beskikbaar)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Voer jou netwerkwagwoord in"</string>
@@ -699,9 +698,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"WAARSKUWING: As jy Wi-Fi oorslaan, sal jou tablet net sellulêre data vir aanvanklike aflaaie en opdaterings gebruik. Koppel aan Wi-Fi om moontlike dataheffings te vermy."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"WAARSKUWING: As jy Wi-Fi oorslaan, sal jou toestel net sellulêre data vir aanvanklike aflaaie en opdaterings gebruik. Koppel aan Wi-Fi om moontlike dataheffings te vermy."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"WAARSKUWING: As jy Wi-Fi oorslaan, sal jou foon net sellulêre data vir aanvanklike aflaaie en opdaterings gebruik. Koppel aan Wi-Fi om moontlike dataheffings te vermy."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="2393880108322835846">"WAARSKUWING: As jy Wi-Fi oorslaan, sal jou tablet nie \'n internetverbinding hê om vir enige aanvanklike aflaaie of opdaterings te gebruik nie."</string>
-    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1707391993265558787">"WAARSKUWING: As jy Wi-Fi oorslaan, sal jou toestel nie \'n internetverbinding hê om vir enige aanvanklike aflaaie of opdaterings te gebruik nie."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="1556858507920033022">"WAARSKUWING: As jy Wi-Fi oorslaan, sal jou foon nie \'n internetverbinding hê om vir enige aanvanklike aflaaie of opdaterings te gebruik nie."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"As jy Wi‑Fi oorslaan:\n\nJou tablet sal nie \'n internetverbinding hê nie.\n\nJy sal nie sagtewareopdaterings kry voordat jy aan die internet koppel nie.\n\nJy kan nie op die oomblik kenmerke vir toestelbeskerming aktiveer nie."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"As jy Wi‑Fi oorslaan:\n\nJou toestel sal nie \'n internetverbinding hê nie.\n\nJy sal nie sagtewareopdaterings kry voordat jy aan die internet koppel nie.\n\nJy kan nie op die oomblik kenmerke vir toestelbeskerming aktiveer nie."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"As jy Wi‑Fi oorslaan:\n\nJou foon sal nie \'n internetverbinding hê nie.\n\nJy sal nie sagtewareopdaterings kry voordat jy aan die internet koppel nie.\n\nJy kan nie op die oomblik kenmerke vir toestelbeskerming aktiveer nie."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Die tablet kon nie aan hierdie Wi-Fi-netwerk koppel nie."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"Die toestel kon nie aan hierdie Wi-Fi-netwerk koppel nie."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Die foon kon nie aan hierdie Wi-Fi-netwerk koppel nie."</string>
@@ -761,7 +760,6 @@
     <string name="ring_volume_title" msgid="7938706566797464165">"Luiervolume"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibreer wanneer stil"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Verstek kennisgewingklank"</string>
-    <string name="heads_up_enabled_title" msgid="1031078221910921622">"Spring op as hoë prioriteit"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Luitoon"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Kennisgewing"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Gebruik inkomendeoproep-volume vir kennisgewings"</string>
@@ -834,7 +832,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Outomatiese helderheid"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Lig op om wakker te maak"</string>
     <string name="doze_title" msgid="2259176504273878294">"Stemmingvertoning"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"Maak skerm wakker as toestel opgetel word of kennisgewings opdaag"</string>
+    <string name="doze_summary" msgid="7128970177894383698">"Maak skerm wakker wanneer jy die toestel opstel of kennisgewings ontvang"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Fontgrootte"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Lettergrootte"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM-kaart se sluitinstellings"</string>
@@ -862,6 +860,10 @@
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Kanselleer"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"Verskeie SIMs gevind"</string>
     <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>
@@ -1012,6 +1014,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Dit sal al die data uit jou tablet se "<b>"interne geheue"</b>" uitvee, insluitend: \n\n"<li>"jou Google-rekening"</li>\n" "<li>"stelsel- en programdata-instellings"</li>\n<li>"afgelaaide programme"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Dit sal al die data uit jou tablet se "<b>"interne geheue"</b>" uitvee, insluitend: \n\n"<li>"jou Google-rekening"</li>\n" "<li>"stelsel- en programdata-instellings"</li>\n<li>"afgelaaide programme"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Jy is tans aangemeld by die volgende rekeninge:\n"</string>
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Daar is ander gebruikers op hierdie toestel teenwoordig.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musiek"</li>\n<li>"Foto\'s"</li>\n<li>"Ander gebruikerdata"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Om musiek, prente en ander gebruikersdata uit te vee, moet die "<b>"USB-berging"</b>" uitgevee word."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Om musiek, prente en ander gebruikersdata uit te vee, moet die "<b>"SD-kaart"</b>" uitgevee word."</string>
@@ -1023,7 +1026,6 @@
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Stel foon terug"</string>
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Vee al jou persoonlike inligting en afgelaaide programme uit? Jy kan nie hierdie handeling ongedaan maak nie!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Vee alles uit"</string>
-    <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Teken jou ontsluitpatroon"</string>
     <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Jy moet jou ontsluitpatroon teken om \'n fabrieksterugstelling te bevestig."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Omdat die Stelsel Skoonmaak-diens nie beskikbaar was nie, is geen terugstel gedoen nie."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Stel terug?"</string>
@@ -1041,7 +1043,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"Vee USB-berging uit, wat alle lêers wat daar gestoor word, sal uitvee? Jy kan nie hierdie handeling ongedaan maak nie!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Vee SD-kaart uit, wat alle lêers wat daar gestoor word, sal uitvee? Handeling kan nie ontdoen word nie."</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Vee alles uit"</string>
-    <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Teken jou ontsluitpatroon"</string>
     <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Jy moet jou ontsluitpatroon teken om te bevestig dat jy die USB-berging wil uitvee."</string>
     <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Jy moet jou ontsluitpatroon teken om te bevestig dat jy die SD-kaart wil uitvee."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Oproepinstellings"</string>
@@ -1087,6 +1088,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Steek asseblief SIM-kaart in en herbegin"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Koppel asseblief aan die internet"</string>
     <string name="location_title" msgid="1029961368397484576">"My ligging"</string>
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Werkprofiel"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Ligging vir werkprofiel"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Deur jou maatskappy afgeskakel"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Modus"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Hoë akkuraatheid"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Batterybesparend"</string>
@@ -1124,6 +1128,7 @@
     <string name="copyright_title" msgid="865906688917260647">"Kopiereg"</string>
     <string name="license_title" msgid="1990487604356037871">"Lisensie"</string>
     <string name="terms_title" msgid="7697580845616764642">"Bepalings en voorwaardes"</string>
+    <string name="webview_license_title" msgid="2813507464175738967">"Stelsel se WebView-lisensie"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Muurpapiere"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Verskaffers van satellietbeelde:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Oopbronlisensies"</string>
@@ -1237,7 +1242,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB-berging"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Op SD-kaart"</string>
     <string name="disabled" msgid="9206776641295849915">"Gedeaktiveer"</string>
-    <string name="not_installed" msgid="1475144352069281880">"Nie geïnstalleer nie"</string>
+    <string name="not_installed" msgid="2797554494953450291">"Nie vir hierdie gebruiker geïnstalleer nie"</string>
     <string name="no_applications" msgid="7336588977497084921">"Geen programme nie"</string>
     <string name="internal_storage" msgid="1584700623164275282">"Interne berging"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB-berging"</string>
@@ -1434,8 +1439,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Skerm sal nooit slaap terwyl laai nie"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Aktiveer Bluetooth HCI-loerloglêer"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Vang alle Bluetooth HCI-pakette in \'n lêer vas"</string>
-    <string name="oem_unlock_enable" msgid="6629321276287913315">"Aktiveer OEM-ontsluit"</string>
-    <string name="oem_unlock_enable_summary" msgid="3546686263996628110">"Laat die toestel toe om OEM-ontsluit te word"</string>
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM-ontsluit"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Laat toe dat die selflaaiprogram ontsluit word"</string>
+    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Voer jou PIN in"</string>
+    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Voer jou PIN in om OEM-ontsluit te aktiveer"</string>
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Laat OEM-ontsluit toe?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"WAARSKUWING: Toestelbeskermingkenmerke sal nie op hierdie toestel werk terwyl hierdie instelling aangeskakel is nie."</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Draadlose skermsertifisering"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Aktiveer Wi-Fi-woordryke aanmelding"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Aggressiewe Wi-Fi na selfoon-oordrag"</string>
@@ -1538,6 +1547,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"Onderskrifte sal so lyk"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"Verstek"</string>
+    <string name="color_title" msgid="4258931051732243983">"Kleur"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"Verstek"</string>
     <string name="color_none" msgid="3475640044925814795">"Geen"</string>
     <string name="color_white" msgid="8045195170201590239">"Wit"</string>
@@ -1595,12 +1605,12 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"<xliff:g id="REMAIN">%1$s</xliff:g> oor"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> tot gelaai"</string>
-    <string name="power_discharging_duration" msgid="7125493014448497620">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - ongeveer <xliff:g id="TIME">%2$s</xliff:g> oor"</string>
-    <string name="power_charging" msgid="712751285832976915">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="STATE">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration" msgid="4802183864773082009">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> tot battery vol is"</string>
-    <string name="power_charging_duration_ac" msgid="3611179931297824699">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> tot batter vol is op AC"</string>
-    <string name="power_charging_duration_usb" msgid="1106605348913397583">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> tot battery vol is via USB"</string>
-    <string name="power_charging_duration_wireless" msgid="633606920144617227">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> tot battery vol is via draadloos"</string>
+    <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> – sowat <xliff:g id="TIME">%2$s</xliff:g> oor"</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> tot vol"</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> tot vol op WS"</string>
+    <string name="power_charging_duration_usb" msgid="182405645340976546">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> tot vol oor USB"</string>
+    <string name="power_charging_duration_wireless" msgid="1829295708243159464">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> tot vol vanaf draadloos"</string>
     <string name="power_usage_list_summary" msgid="2409288197839512482">"Gebruik sedert battery laas volgelaai is"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Batterygebruik sedert uitgeprop"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Batterygebruik sedert terugstelling"</string>
@@ -1617,7 +1627,6 @@
     <string name="awake" msgid="387122265874485088">"Toestel se wakkertyd"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi betyds"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi betyds"</string>
-    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Geskiedenisdetails"</string>
     <string name="details_title" msgid="3792801565213935385">"Gebruikdetails"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Gebruikdetails"</string>
@@ -1689,7 +1698,7 @@
     <string name="battery_saver" msgid="1426682272004907982">"Batteryspaarder"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Skakel outomaties aan"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Nooit"</string>
-    <string name="battery_saver_turn_on_automatically_pct" msgid="3033681629861428940">"op %1$d%% battery"</string>
+    <string name="battery_saver_turn_on_automatically_pct" msgid="7536784431655058267">"teen %1$s battery"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Proses-statistieke"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Bleeksiel-statistieke vir lopende prosesse"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Berginggebruik"</string>
@@ -1813,7 +1822,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Hardeware-geondersteun"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Net sagteware"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"Eiebewyse is nie vir hierdie gebruiker beskikbaar nie"</string>
-    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Teken jou ontsluitpatroon"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Jy moet jou ontsluitpatroon teken om eiebewysinstallasie te bevestig."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Voer die wagwoord in vir eiebewysberging."</string>
@@ -1843,6 +1851,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"Sluit programdata in"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Outomatiese teruglaai"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Wanneer \'n program weer geïnstalleer word, herstel gerugsteunde instellings en data"</string>
+    <string name="backup_inactive_title" msgid="5355557151569037197">"Rugsteundiens in onaktief."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"Dit word deur jou toestelbeleid gestel."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Werkskerm-rugsteunwagwoord"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Volle rekenaarrugsteune word nie tans beskerm nie"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Raak om die wagwoord vir volledige rekenaarrugsteune te verander of te verwyder"</string>
@@ -1952,7 +1962,11 @@
     <string name="enter_password" msgid="8035706727471334122">"Voer jou wagwoord in om Android te begin"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Voer jou PIN in om Android te begin"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Teken jou patroon om Android te begin"</string>
-    <string name="try_again" msgid="4272075051293936921">"Probeer weer."</string>
+    <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"Verkeerde patroon"</string>
+    <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"Verkeerde wagwoord"</string>
+    <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"Verkeerde PIN"</string>
+    <string name="checking_decryption" msgid="8287458611802609493">"Kontroleer tans …"</string>
+    <string name="starting_android" msgid="8581493237458496835">"Begin Android"</string>
     <string name="delete" msgid="4219243412325163003">"Vee uit"</string>
     <string name="misc_files" msgid="6720680815969643497">"Diverse lêers"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"het <xliff:g id="NUMBER">%1$d</xliff:g> gekies uit <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -1990,8 +2004,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Gebruik altyd GPU vir skermsamestelling"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"Simuleer kleurruimte"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Aktiveer OpenGL-spore"</string>
-    <string name="use_nuplayer" msgid="5699257393367904387">"Gebruik NuPlayer (proef)"</string>
-    <string name="use_nuplayer_summary" msgid="1991479067478516714">"Gebruik NuPlayer pleks van AwesomePlayer"</string>
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"Gebruik AwesomePlayer (opgeskort)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"AwesomePlayer i.p.v. NuPlayer vir mediaterugspeel"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"Deaktiveer USB-oudioroetering"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"Deaktiveer outoroetering na USB-oudiorandtoestelle"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Wys uitleg se grense"</string>
@@ -2167,7 +2181,6 @@
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Voeg gebruiker of profiel by"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Voeg gebruiker by"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Beperkte profiel"</string>
-    <string name="user_summary_managed_profile" msgid="7369539529693048111">"Werkprofiel"</string>
     <string name="user_need_lock_message" msgid="2596365678651842785">"Voordat jy \'n beperkte profiel kan skep, moet jy \'n skermslot opstel om jou programme en persoonlike data te beskerm."</string>
     <string name="user_set_lock_button" msgid="8311219392856626841">"Stel slot op"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Nie opgestel nie"</string>
@@ -2298,11 +2311,13 @@
     <string name="sim_cellular_data_unavailable_summary" msgid="3654805961942166428">"Raak om \'n data-SIM te kies"</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"Gebruik dit altyd vir oproepe"</string>
     <string name="select_sim_for_data" msgid="2366081042162853044">"Kies \'n SIM vir data"</string>
+    <string name="data_switch_started" msgid="2040761479817166311">"Wissel tans data-SIM, dit kan tot \'n minuut neem …"</string>
     <string name="select_sim_for_calls" msgid="3503094771801109334">"Bel met"</string>
     <string name="sim_select_card" msgid="211285163525563293">"Kies \'n SIM-kaart"</string>
     <string name="sim_card_number_title" msgid="7845379943474336488">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"SIM leeg"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"SIM-naam"</string>
+    <string name="sim_name_hint" msgid="7038643345238968930">"Voer SIM-naam in"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"SIM-gleuf %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Diensverskaffer"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Nommer"</string>
@@ -2312,7 +2327,6 @@
     <string name="color_purple" msgid="3888532466427762504">"Pers"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"Geen SIM-kaarte ingevoeg nie"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"SIM-status"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"SIM se verwante inligting"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"Bel terug van verstek-SIM af"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"SIM vir uitgaande oproepe"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Ander oproepinstellings"</string>
@@ -2320,8 +2334,11 @@
     <string name="preferred_network_offload_header" msgid="2321173571529106767">"Deaktiveer netnaamsending"</string>
     <string name="preferred_network_offload_footer" msgid="5857279426054744020">"Deaktivering van netwerknaamuitsendings keer dat derde partye toegang tot netwerkinligting verkry."</string>
     <string name="preferred_network_offload_popup" msgid="2252915199889604600">"Deaktivering van netwerknaamuitsending sal outomatiese koppeling aan versteekte netwerke verhinder."</string>
+    <string name="sim_signal_strength" msgid="9144010043784767984">"<xliff:g id="DBM">%1$d</xliff:g> dBm <xliff:g id="ASU">%2$d</xliff:g> asu"</string>
+    <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>
+    <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Vra elke keer"</string>
     <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>
@@ -2330,22 +2347,22 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Onlangse soektogte"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Resultate"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi Wi-Fi netwerk verbinding"</string>
-    <string name="keywords_more_default_sms_app" msgid="2744404159003574745">"teksboodskap"</string>
-    <string name="keywords_more_mobile_networks" msgid="7813380887358745769">"sellulêre selfoondiensverskaffer draadloos"</string>
+    <string name="keywords_more_default_sms_app" msgid="895656981962034647">"SMS stuur SMS boodskappe boodskapdiens"</string>
+    <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"sellulêr selfoondiensverskaffer draadloos data 4 g 3 g 2 g lte"</string>
     <string name="keywords_home" msgid="3626170808219458848">"lanseerder"</string>
     <string name="keywords_display" msgid="6709007669501628320">"skerm raakskerm"</string>
-    <string name="keywords_display_brightness_level" msgid="8636451602230815191">"demp skerm raakskerm"</string>
-    <string name="keywords_display_auto_brightness" msgid="8070218600502753102">"demp skerm raakskerm"</string>
-    <string name="keywords_display_wallpaper" msgid="4315466287469834939">"agtergrond"</string>
+    <string name="keywords_display_brightness_level" msgid="8923289340474728990">"dempskerm raakskerm battery"</string>
+    <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"dempskerm raakskerm battery"</string>
+    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"agtergrond personaliseer pasmaak skem"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"teksgrootte"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"projek"</string>
-    <string name="keywords_storage" msgid="7007275853993419928">"spasie skyf hardeskyf"</string>
-    <string name="keywords_battery" msgid="3992479295298655138">"krag"</string>
-    <string name="keywords_spell_checker" msgid="4509482591225399210">"spelling"</string>
+    <string name="keywords_storage" msgid="6572905220031852173">"spasie skyf hardeskyf toestel gebruik"</string>
+    <string name="keywords_battery" msgid="2096185085932675704">"kragverbruikheffing"</string>
+    <string name="keywords_spell_checker" msgid="6106749039734174140">"spelling woordeboek speltoetser outo-regmaak"</string>
     <string name="keywords_voice_input" msgid="3519547605812413860">"herkenner invoer spraak praat taal handvry handvry herkenning kwetsend woord oudiogeskiedenis bluetooth kopstuk"</string>
-    <string name="keywords_text_to_speech_output" msgid="8207889472282225512">"gradeer taal verstek praat praat tans"</string>
-    <string name="keywords_date_and_time" msgid="7666950126499155141">"horlosie"</string>
-    <string name="keywords_factory_data_reset" msgid="3693730656843989732">"vee uitvee"</string>
+    <string name="keywords_text_to_speech_output" msgid="392447904221657930">"omvang taal verstek praat praat tans tts toeganklikheid leser blind"</string>
+    <string name="keywords_date_and_time" msgid="2631808108134830066">"horlosie militêr"</string>
+    <string name="keywords_factory_data_reset" msgid="4355133848707691977">"vee uitvee terugstel skoonmaak verwyder"</string>
     <string name="keywords_printing" msgid="1701778563617114846">"drukker"</string>
     <string name="keywords_sounds_and_notifications" msgid="5965996187974887000">"luidspreker biep"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="2912933812460077912">"moenie moenie pla nie onderbreek onderbreking pouse"</string>
@@ -2354,7 +2371,7 @@
     <string name="keywords_location_mode" msgid="8584992704568356084">"akkuraatheid"</string>
     <string name="keywords_accounts" msgid="1957925565953357627">"rekening"</string>
     <string name="keywords_users" msgid="4673901601478559100">"beperking beperk is beperk"</string>
-    <string name="keywords_keyboard_and_ime" msgid="1103378692379215672">"teks verbinding korrek klank vibreer outo-taal gebaar stel voor voorstel tema aanstootlike woord tipe emosiekone"</string>
+    <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"teks regstelling korrek klank vibreer outomaties taal gebaar stel voor voorstel tema aanstootlik woord emosiekoon internasionaal"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"gly wagwoord patroon pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Stel Wi-Fi-NFC-merker op"</string>
     <string name="write_tag" msgid="8571858602896222537">"Skryf"</string>
@@ -2371,7 +2388,6 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Kennisgewingvolume"</string>
     <string name="zen_mode_settings_title" msgid="7014915558669122902">"Onderbrekings"</string>
     <string name="zen_mode_option_title" msgid="5061978632306007914">"Wanneer oproepe en kennisgewings opdaag"</string>
-    <string name="zen_mode_option_title_novoice" msgid="6680706009915204785">"Wanneer kennisgewings opdaag"</string>
     <string name="zen_mode_option_off" msgid="3167702608910820883">"Onderbreek altyd"</string>
     <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Laat net prioriteitonderbrekings toe"</string>
     <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Moenie onderbreek nie"</string>
@@ -2429,14 +2445,17 @@
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Klaar"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Totdat jy dit afskakel"</string>
     <string name="zen_mode_important_category" msgid="8123274463331022993">"Prioriteitonderbrekings"</string>
-    <string name="zen_mode_downtime_category" msgid="4730179065426038108">"Ontspantyd (net prioriteitonderbrekings)"</string>
+    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Aftyd"</string>
     <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Dae"</string>
     <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Geen"</string>
+    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Onderbrekings toegelaat"</string>
+    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Net prioriteit"</string>
+    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Geen"</string>
     <string name="zen_mode_automation_category" msgid="4653551005950835761">"Outomatisering"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Skakel outomaties aan"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Nooit"</string>
-    <string name="zen_mode_phone_calls" msgid="8956214416859303966">"Oproepe"</string>
+    <string name="zen_mode_calls" msgid="7051492091133751208">"Oproepe"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Boodskappe"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Oproepe/boodskappe vanaf"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Enigiemand"</string>
@@ -2450,7 +2469,9 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Weekaande"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Begintyd"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Eindigtyd"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> volgende dag"</string>
+    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> volgende dag"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> of enige wekker voor dit"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> volgende dag of enige wekker voor dit"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Programkennisgewings"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Kennisgewingsinstellings"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Stuur terugvoer oor hierdie toestel"</string>
@@ -2458,7 +2479,11 @@
     <string name="switch_on_text" msgid="1124106706920572386">"Aan"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Af"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"Skermvasspeld"</string>
-    <string name="screen_pinning_description" msgid="7091642350452605379">"As dit aangeskakel is, kan jy skermvasspeld gebruik om die aansig op die huidige skerm te hou totdat jy dit ontspeld.\n\nOm skermvasspeld te gebruik:\n\n1. Maak seker dat skermvasspeld aangeskakel is.\n\n2. Maak die skerm oop wat jy wil vasspeld.\n\n3. Raak Oorsig.\n\n4. Raak die speldikoon."</string>
+    <string name="screen_pinning_description" msgid="1137904524037468263">"Wanneer hierdie instelling aangeskakel is, kan jy skermvasspeld gebruik om die huidige skerm binne sig te hou totdat jy ontspeld.\n\nOm skermvasspeld te gebruik:\n\n1. Maak seker skermvasspeld is aangeskakel.\n\n2. Maak die skerm oop wat jy wil vasspeld.\n\n3. Raak Oorsig.\n\n4. Swiep en raak dan die vasspeldikoon."</string>
+    <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Vra ontsluitpatroon voordat jy ontspeld"</string>
+    <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Vra PIN voordat jy ontspeld"</string>
+    <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Vra wagwoord voordat jy ontspeld"</string>
+    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Sluit toestel terwyl jy ontspeld"</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Werkprofiel"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Eksperimenteel)"</string>
     <string name="display_auto_rotate_title" msgid="6176450657107806043">"Wanneer toestel gedraai word"</string>
@@ -2467,7 +2492,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Bly in landskapaansig"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Bly in huidige oriëntasie"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI-inligting"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI se relatiewe inligting"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Enkripsie"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Gaan voort"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"Jy kan hierdie toestel verder beskerm deur jou PIN te vereis voordat dit begin. Die toestel kan eers oproepe, boodskappe en kennisgewings, insluitend wekkers, ontvang nadat dit begin het. \n\nDit help om data op verlore of gesteelde toestelle te beskerm."</string>
@@ -2485,4 +2509,7 @@
     <string name="encrypt_talkback_dialog_message_pin" msgid="1890374082842868489">"Wanneer jy jou PIN invoer om hierdie toestel te begin, sal toeganklikheiddienste soos <xliff:g id="SERVICE">%1$s</xliff:g> nog nie beskikbaar wees nie."</string>
     <string name="encrypt_talkback_dialog_message_pattern" msgid="4474332516537386384">"Wanneer jy jou patroon invoer om hierdie toestel te begin, sal toeganklikheiddienste soos <xliff:g id="SERVICE">%1$s</xliff:g> nog nie beskikbaar wees nie."</string>
     <string name="encrypt_talkback_dialog_message_password" msgid="8166099418487083927">"Wanneer jy jou wagwoord invoer om hierdie toestel te begin, sal toeganklikheiddienste soos <xliff:g id="SERVICE">%1$s</xliff:g> nog nie beskikbaar wees nie."</string>
+    <string name="imei_information_title" msgid="8499085421609752290">"IMEI-inligting"</string>
+    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI se relatiewe inligting"</string>
+    <string name="slot_number" msgid="3762676044904653577">"(Gleuf<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-am-nokeys/strings.xml b/res/values-am-nokeys/strings.xml
index 26b226d..27cbc54 100644
--- a/res/values-am-nokeys/strings.xml
+++ b/res/values-am-nokeys/strings.xml
@@ -16,5 +16,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applications_settings_summary" msgid="6616938758022986257">"ትግበራዎች አዸራጅ"</string>
+    <string name="applications_settings_summary" msgid="6616938758022986257">"መተግበሪያዎች አዸራጅ"</string>
 </resources>
diff --git a/res/values-am/arrays.xml b/res/values-am/arrays.xml
index aa55a1a..28f1e1d 100644
--- a/res/values-am/arrays.xml
+++ b/res/values-am/arrays.xml
@@ -527,4 +527,12 @@
     <item msgid="4338089220026248848">"የተሸጎጠ (የእንቅስቃሴ ደንበኛ)"</item>
     <item msgid="6652164677254579050">"የተሸጎጠ (ባዶ)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"ጥቁር አረንጓዴ-ሰማያዊ"</item>
+    <item msgid="8332294763632946560">"ሰማያዊ"</item>
+    <item msgid="2023216417616991392">"ወይን ጠጅ"</item>
+    <item msgid="3170497246594232819">"ሐምራዊ"</item>
+    <item msgid="4608643045752965568">"ሮዝ"</item>
+    <item msgid="6131821495505931173">"ቀይ"</item>
+  </string-array>
 </resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 262b36f..dc13334 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>
@@ -180,7 +180,6 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s የእርስዎን መልዕክቶች ሊደርስበት ይፈልጋል። መዳረሻ ለ%2$s ይሰጥ?"</string>
     <string name="date_and_time" msgid="9062980487860757694">"ቀን እና ሰዓት"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"የጊዜ ሰቅ ምረጥ"</string>
-    <string name="normal_date_format" msgid="7636406984925498359">"የአካባቢው (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"ቅድመ-ዕይታ"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"የቁምፊ መጠን፡"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -291,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>
@@ -322,8 +321,6 @@
     <string name="date_time_set_timezone" msgid="5045627174274377814">"የሰዓት ሰቅ"</string>
     <string name="date_time_set_date_title" msgid="6928286765325608604">"ቀን"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"ውሂብ አዘጋጅ"</string>
-    <string name="date_time_date_format_title" msgid="3976171711988766411">"የቀን ቅርጸት"</string>
-    <string name="date_time_date_format" msgid="6951498879879281102">"የቀን ቅርፀት ምረጥ"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"በፊደል ተራ ለይ"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"በሰዓት ሰቅ ለይ"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"ቀን"</string>
@@ -372,7 +369,8 @@
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"እባክህ  ስልክህ እስኪመሳጠር ድረስ ጠብቅ። <xliff:g id="PERCENT">^1</xliff:g>% ተጠናቋል።"</string>
     <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"ጡባዊዎ እስኪመሰጠር ድረስ ይጠብቁ። ቀሪ ጊዜ፦ <xliff:g id="DURATION">^1</xliff:g>"</string>
     <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"ስልክዎ እስኪመሰጠር ድረስ ይጠብቁ። ቀሪ ጊዜ፦ <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"በ <xliff:g id="DELAY">^1</xliff:g>ሰከንዶች ውስጥ እንደገና ሞክር።"</string>
+    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"ጡባዊዎን ለማስከፈት ያጥፉትና ከዚያ ያብሩት።"</string>
+    <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"ስልክዎን ለማስከፈት ያጥፉትና ከዚያ ያብሩት።"</string>
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"ማስጠንቀቂያ፦ መሳሪያዎ ከ<xliff:g id="COUNT">^1</xliff:g> ተጨማሪ የመክፈት ሙከራዎች በኋላ ይጠረጋል!"</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"የይለፍቃልህን ተይብ"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"ምስጠራ ስኬታማ አልነበረም"</string>
@@ -401,7 +399,8 @@
     <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_set_unlock_disabled_summary" msgid="2120729867788851674">"የምስጠራ መምሪያ ወይም ማስረጃ ማከማቻ በአስተዳዳሪ ቦዝኗል"</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>
     <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"በፊት ገጽ መክፈቻ"</string>
@@ -412,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>
@@ -556,13 +556,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"እንደ ተናጋሪ ስልክ"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"ለሙዚቃ እና ማህደረ መረጃ"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"ቅንብሮች አስታውስ"</string>
-    <string name="wifi_assistant_intro_setup" msgid="4605105515416995110">\n"Wi Fi ረዳትን ማስተዋወቅ"</string>
-    <string name="wifi_assistant_no_thanks" msgid="2776983751990143934">"አይ፣ አመሰግናለሁ"</string>
-    <string name="wifi_assistant_setup" msgid="3772423650475730906">"ያዋቅሩ"</string>
-    <string name="wifi_assistant_card_message" msgid="107811647784658536">"በWi‑Fi ረዳት አማካኝነት ከሚገኙ አውታረ መረቦች ጋር በራስ-ሰር ይገናኙ።"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi‑Fi ረዳት"</string>
-    <string name="wifi_assistant_title_message" msgid="6240721017579074015">"<xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> በራስ-ሰር ከሚገኘው ምርጥ Wi‑Fi ጋር በራስ-ሰር ያገናኘዎታል"</string>
-    <string name="wifi_assistant_open_app" msgid="4803044899535675063">"መተግበሪያ ክፈት"</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>
@@ -592,7 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"የWi-Fi ቅንብሮች"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"አዘጋጅ&amp; የገመድ አልባ ድረስ ነጥብ አደራጅ"</string>
-    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Wi‑Fi ይምረጡ"</string>
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"የWi‑Fi አውታረ መረብ ይምረጡ"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Wi‑Fi ይምረጡ"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Wi-Fi በማብራት ላይ..."</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Wi-Fi በማጥፋት ላይ..."</string>
@@ -607,8 +602,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"መቃኘት ሁልጊዜ ይገኛል"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"ሁልጊዜ መቃኘትን ፍቀድ"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"የGoogle የአካባቢ አገልግሎትን እና ሌሎች መተግበሪያዎች አውታረ መረቦችን ለማግኘት እንዲቃኙ ያድርጓቸው፣ Wi-Fi ጠፍቶም ቢሆን እንኳን"</string>
-    <string name="wifi_automatically_manage_title" msgid="6249976570008992746">"Wi‑Fi በራስ-ሰር ያቀናብሩ"</string>
-    <string name="wifi_automatically_manage_summary" msgid="6952470763378312488">"<xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> የWi‑Fi ግንኙትዎን ያቀናብር"</string>
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"ክፍት Wi‑Fi ራስ-ሰርን ይጠቀሙ"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"ከፍተኛ ጥራት እንዳላቸው ለተረጋገጠላቸው ክፍት አውታረ መረቦች Wi-Fi ረዳት በራስ-ሰር እንዲያገናኝ ይተውት"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"ረዳት ይምረጡ"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"የእውቅና ማረጋገጫዎችን ይጫኑ"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"የአካባቢ ትክክለኛነትን ለማሻሻል እና ለሌሎች ዓላማዎች Google እና ሌሎች መተግበሪያዎች አጠገብ ያሉ አውታረ መረቦችን ሊቃኙ ይችላሉ፣ Wi-Fi ጠፍቶ ቢሆንም እንኳ። ይሄ እንዲከሰት ካልፈለጉ ወደ የላቀ &gt; መቃኘት ይሂዱ፣ ሁልጊዜ ይገኛል።"</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"መተግበሪያዎች አጠገብ ያሉ አውታረ መረቦችን ሊቃኙ ይችላሉ፣ Wi-Fi ጠፍቶ ቢሆንም እንኳ። ይሄ እንዲከሰት ካልፈለጉ ወደ የላቀ &gt; መቃኘት ይሂዱ፣ ሁልጊዜ ይገኛል።"</string>
@@ -629,6 +625,7 @@
     <string name="wifi_menu_scan" msgid="1470911530412095868">"ቃኝ"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"ከፍተኛ"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"ወደ አውታረ መረብ አያይዝ"</string>
+    <string name="wifi_menu_remember" msgid="8814185749388713796">"አውታረ መረብን አስታውስ"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"አውታረ መረብ እርሳ"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"አውታረ መረብ ቀይር"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"ወደ NFC መለያ ጻፍ"</string>
@@ -673,9 +670,11 @@
     <string name="wifi_unspecified" msgid="5431501214192991253">" (ያልተገለፀ)"</string>
     <string name="wifi_remembered" msgid="4955746899347821096">"ተቀምጧል"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"ተሰነክሏል"</string>
-    <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"ደካማ የበየነመረብ ግንኙነት አስወግድ"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"የአይ.ፒ. ውቅረት መሰናከል"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"የWiFi ግንኙነት መሰናከል"</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"የማረጋገጫ ችግር"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"በክልል ውስጥ የለም"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"ምንም የበይነ መረብ መዳረሻ ተፈልጎ አልተገኘም፣ በራስ-ሰር እንደገና እንዲገናኝ አይደረግም።"</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS አለ"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" WPS አለ"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"የአውታረ መረብ ይለፍ ቃልዎን ያስገቡ"</string>
@@ -699,9 +698,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"ማስጠንቀቂያ፦ Wi‑Fiን ከዘለሉ ጡባዊዎ ለተጀመሩ ውርዶች እና ዝማኔዎች የተንቀሳቃሽ ስልክ ውሂብ ብቻ ነው የሚጠቀመው። ሊከሰቱ የሚችሉ የውሂብ ክፍያዎችን ለማቀብ ከWi‑Fi ጋር ይገናኙ።"</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"ማስጠንቀቂያ፦ Wi‑Fiን ከዘለሉ መሣሪያዎ ለተጀመሩ ውርዶች እና ዝማኔዎች የተንቀሳቃሽ ስልክ ውሂብ ብቻ ነው የሚጠቀመው። ሊከሰቱ የሚችሉ የውሂብ ክፍያዎችን ለማቀብ ከWi‑Fi ጋር ይገናኙ።"</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"ማስጠንቀቂያ፦ Wi‑Fiን ከዘለሉ ስልክዎ ለተጀመሩ ውርዶች እና ዝማኔዎች የተንቀሳቃሽ ስልክ ውሂብ ብቻ ነው የሚጠቀመው። ሊከሰቱ የሚችሉ የውሂብ ክፍያዎችን ለማቀብ ከWi‑Fi ጋር ይገናኙ።"</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="2393880108322835846">"ማስጠንቀቂያ፦ Wi‑Fiን ከዘለሉ ጡባዊዎ ለማንኛውም የተጀመሩ ወይም ውርዶች ዝማኔዎች የሚጠቀምበት የበይነመረብ ግንኙነት አይኖረውም።"</string>
-    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1707391993265558787">"ማስጠንቀቂያ፦ Wi‑Fiን ከዘለሉ መሣሪያዎ ለማንኛውም የተጀመሩ ወይም ውርዶች ዝማኔዎች የሚጠቀምበት የበይነመረብ ግንኙነት አይኖረውም።"</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="1556858507920033022">"ማስጠንቀቂያ፦ Wi‑Fiን ከዘለሉ ስልክዎ ለማንኛውም የተጀመሩ ወይም ውርዶች ዝማኔዎች የሚጠቀምበት የበይነመረብ ግንኙነት አይኖረውም።"</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Wi‑Fiን ከዘለሉ፦\n\nየእርስዎ ጡባዊ የበይነመረብ ግንኙነት አይኖረውም።\n\nከበይነመረብ ጋር እስከሚያገናኙት ድረስ የሶፍትዌር ዝማኔዎችን አያገኙም።\n\nበዚህ ጊዜ ላይ የመሣሪያ ጥበቃ ባህሪያትን ማግበር አይችሉም።"</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Wi‑Fiን ከዘለሉ፦\n\nየእርስዎ መሣሪያ የበይነመረብ ግንኙነት አይኖረውም።\n\nከበይነመረብ ጋር እስከሚያገናኙት ድረስ የሶፍትዌር ዝማኔዎችን አያገኙም።\n\nበዚህ ጊዜ ላይ የመሣሪያ ጥበቃ ባህሪያትን ማግበር አይችሉም።"</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Wi‑Fiን ከዘለሉ፦\n\nየእርስዎ ስልክ የበይነመረብ ግንኙነት አይኖረውም።\n\nከበይነመረብ ጋር እስከሚያገናኙት ድረስ የሶፍትዌር ዝማኔዎችን አያገኙም።\n\nበዚህ ጊዜ ላይ የመሣሪያ ጥበቃ ባህሪያትን ማግበር አይችሉም።"</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"ጡባዊው ከዚህ የWi-Fi አውታረ መረብ ጋር መገናኘት አልቻለም።"</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"መሣሪያው ከዚህ የWi‑Fi አውታረ መረብ ጋር ሊገናኝ አልቻለም።"</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"ስልኩ ከዚህ የWi-Fi አውታረ መረብ ጋር መገናኘት አልቻለም።"</string>
@@ -761,7 +760,6 @@
     <string name="ring_volume_title" msgid="7938706566797464165">"የስልክ ጥሪ ድምፅ"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"ፀጥ ሲል ንዘር"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"ነባሪ የማሳወቂያ ድምጽ"</string>
-    <string name="heads_up_enabled_title" msgid="1031078221910921622">"ከፍተኛ ትኩረት ያለው ከሆነ ብቅ አድርግ"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"የስልክ ጥሪ ድምፅ"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"ማሳወቂያ"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"ለማሳወቂያዎች የገቢ ጥሪ ድምፅን ተጠቀም"</string>
@@ -834,7 +832,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"ራስ ሰርብሩህነት"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"ለማንቃት ያንሱ"</string>
     <string name="doze_title" msgid="2259176504273878294">"ከባቢያዊ ማሳያ"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"መሣሪያው ካለበት ሲነሳ ወይም ማሳወቂያዎች ሲመጡ ማያ ገጽ አንቃ"</string>
+    <string name="doze_summary" msgid="7128970177894383698">"መሣሪያ ሲያነሱ ወይም ማሳወቂያዎችን ሲቀብለኡ ማያ ገጽ ያብሩ"</string>
     <string name="title_font_size" msgid="4405544325522105222">"የቁምፊ መጠን"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"የቅርጸ ቁምፊ መጠን"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"የSIM ካርድ ቆልፍ ቅንብሮች"</string>
@@ -862,6 +860,10 @@
     <string name="sim_enter_cancel" msgid="6240422158517208036">"ይቅር"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"በርካታ ሲሞች ተገኝተዋል"</string>
     <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>
@@ -1012,6 +1014,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"ይህ ከእርስዎ ጡባዊ "<b>"ውስጣዊ ማከማቻ"</b>" የሚከተሉትን ጨምሮ:\n\n"<li>"የእርስዎ  Google መለያ"</li>\n<li>"ሥርዓት እና መተግበሪያ ውሂብ እና ቅንብሮች"</li>\n<li>"የወረዱ መተግበሪያዎች"</li>" ላይ ያሉ ሁሉንም ውሂብ ይሰርዛል።"</string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"ይህ ከእርስዎ ጡባዊ "<b>"ውስጣዊ ማከማቻ"</b>" የሚከተሉትን ጨምሮ:\n\n"<li>"የእርስዎ  Google መለያ"</li>\n<li>"ሥርዓት እና መተግበሪያ ውሂብ እና ቅንብሮች"</li>\n<li>"የወረዱ መተግበሪያዎች"</li>" ላይ ያሉ ሁሉንም ውሂብ ይሰርዛል።"</string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n" እርስዎ በአሁን ጊዜ የሚከተለው መለያዎች ውስጥ ገብተዋል፡\n"</string>
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"በዚህ መሣሪያ ላይ ያሉ ሌሎች ተጠቃሚዎች አሉ።\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"ሙዚቃ"</li>\n<li>"ፎቶዎች"</li>\n<li>"ሌላ የተጠቃሚ ውሂብ"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">"ሙዚቃ፣ ምስሎች፣ እና ሌላ ተጠቃሚ ውሂብ \n\nለማጥራት፣"<b>"USBማከማቻ"</b>" መጥፋት ያስፈልገዋል።"</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n" ሙዚቃ፣ ምስሎች፣ እና ሌላ ተጠቃሚ ውሂብ ለማጥራት፣"<b>" የSD ካርድ "</b>"መጥፋት ያስፈልገዋል።"</string>
@@ -1023,7 +1026,6 @@
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"ስልክ ድጋሚ አስጀምር"</string>
     <string name="master_clear_final_desc" msgid="7209547812233487345">"ሁሉም የእርስዎ የግል መረጃ እና የወረዱ መተግበሪያዎች ይሰረዙ? ይህን እርማጃ መቀልበስ አይችሉም!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"ሁሉንም አጥፋ"</string>
-    <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"የራስዎን ቁልፍ መክፈቻ ስርዓተጥለት ይሳሉ"</string>
     <string name="master_clear_gesture_explanation" msgid="826193821455182780">"የፋብሪካ ውሂብ ዳግም ለማስጀምር መፈለግዎን ለማረጋገጥ የእርስዎን መክፈቻ ስርዓተ ጥለት መሳል ያስፈልግዎታል።"</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"የስርዓቱ አገልግሎት አጽዳ ስላልተገኘ ዳግም ለማስጀመር ምንም አልተከናወነም።"</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"ዳግም ይቀናበር?"</string>
@@ -1041,7 +1043,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"USB ማከማቻ አጥፋ፣ እዚያ የተከማቹ ፋይሎች ሁሉ ይሰረዙ? እርምጃውን መመለስ አትችልም!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"SD ካርድ አጥፋ፣ እዚያ የተከማቹ ፋይሎች ሁሉ ይሰረዙ? እርምጃውን መመለስ አትችልም!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"ሁሉንም አጥፋ"</string>
-    <string name="media_format_gesture_prompt" msgid="3109349468816856670">"የራስዎን ቁልፍ መክፈቻ ስርዓተጥለት ይሳሉ"</string>
     <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"የ USB ካርዱን ማከማቻ ለማጥፋት መፈለግዎን ለማረጋገጥ የእርስዎን መክፈቻ ስርዓተ ጥለት መሳል አለብዎ።"</string>
     <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"የ SD ካርዱን ለማጥፋት መፈለግህን ለማረጋገጥ የአንተን መክፈቻ ስርዓተ ጥለት መሳል አለብህ።"</string>
     <string name="call_settings_title" msgid="5188713413939232801">"የጥሪ ቅንብሮች"</string>
@@ -1087,6 +1088,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"እባክዎ SIM ካርድ ያስገቡና ዳግም ያስጀምሩ"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"እባክዎ ከበይነ መረብ ጋር ያገናኙ"</string>
     <string name="location_title" msgid="1029961368397484576">"የእኔ  ሥፍራ"</string>
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"የስራ መገለጫ"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"የስራ መገለጫ አካባቢ"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"በኩባንያዎ በኩል ጠፍቷል"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"ሁነታ"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"ከፍተኛ ትክክለኝነት"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"የባትሪ ኃይል ቁጠባ"</string>
@@ -1124,6 +1128,7 @@
     <string name="copyright_title" msgid="865906688917260647">"የቅጂ መብት"</string>
     <string name="license_title" msgid="1990487604356037871">"ፍቃድ"</string>
     <string name="terms_title" msgid="7697580845616764642">"ውሎች እና ደንቦች"</string>
+    <string name="webview_license_title" msgid="2813507464175738967">"የስርዓት WebView ፍቃድ"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"የግድግዳ ወረቀቶች"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"የሳተላይት ምስሎች አቅራቢዎች፦\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"የነፃ ምንጭ  ፈቃዶች"</string>
@@ -1237,7 +1242,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"የUSB  ማከማቻ"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"በSD ካርድ ላይ"</string>
     <string name="disabled" msgid="9206776641295849915">"ቦዝኗል"</string>
-    <string name="not_installed" msgid="1475144352069281880">"አልተጫነም"</string>
+    <string name="not_installed" msgid="2797554494953450291">"ለዚህ ተጠቃሚ አልተጫነም"</string>
     <string name="no_applications" msgid="7336588977497084921">"ምንም መተግበሪያዎች የሉም::"</string>
     <string name="internal_storage" msgid="1584700623164275282">"የውስጥ ማከማቻ"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"የUSB  ማከማቻ"</string>
@@ -1434,8 +1439,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"ማያኃይል በመሙላት ላይበፍፁም አይተኛም"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"የብሉቱዝ HCI ስለላ ምዝግብ ማስታወሻን ያንቁ"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"በአንድ ፋይል ውስጥ ያሉትን የብሉቱዝ HCI እሽጎች ይቅረጹ"</string>
-    <string name="oem_unlock_enable" msgid="6629321276287913315">"የOEM የተከፈተን ያንቁ"</string>
-    <string name="oem_unlock_enable_summary" msgid="3546686263996628110">"መሳሪያው OEM የተከፈተ እንዲሆን ይፍቀዱ"</string>
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM መክፈቻ"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"የማስነሻ ተሸካሚ እንዲከፈት ፍቀድ"</string>
+    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"የእርስዎን ፒን ያስገቡ"</string>
+    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"OEM መክፈቻን ለማንቃት የእርስዎን መሣሪያ ፒን ይስገቡ"</string>
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"የOEM መክፈቻ ይፈቀድ?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"ማስጠንቀቂያ፦ ይህ ቅንብር በሚበራበት ጊዜ የመሣሪያ ጥበቃ ባህሪዎች በዚህ መሣሪያ ላይ አይሰሩም።"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"የገመድ አልባ ማሳያ እውቅና ማረጋገጫ"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"የWi‑Fi ተጨማሪ ቃላት ምዝግብ ማስታወሻ መያዝ"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"አስገዳጅ የWi‑Fi ወደ ተንቀሳቃሽ ርክክብ"</string>
@@ -1538,6 +1547,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"መግለጫ ጽሑፎች እንዲህ ነው የሚመስሉት"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"ነባሪ"</string>
+    <string name="color_title" msgid="4258931051732243983">"ቀለም"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"ነባሪ"</string>
     <string name="color_none" msgid="3475640044925814795">"ምንም የለም"</string>
     <string name="color_white" msgid="8045195170201590239">"ነጭ"</string>
@@ -1595,12 +1605,12 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"<xliff:g id="REMAIN">%1$s</xliff:g> ይቀራል"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"ለመሙላት <xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> ይቀረዋል"</string>
-    <string name="power_discharging_duration" msgid="7125493014448497620">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> ገደማ ይቀራል"</string>
-    <string name="power_charging" msgid="712751285832976915">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="STATE">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration" msgid="4802183864773082009">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> እስኪሞላ ድረስ"</string>
-    <string name="power_charging_duration_ac" msgid="3611179931297824699">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> በኤሲ ላይ እስኪሞላ ድረስ"</string>
-    <string name="power_charging_duration_usb" msgid="1106605348913397583">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> በዩኤስቢ ላይ እስኪሞላ ድረስ"</string>
-    <string name="power_charging_duration_wireless" msgid="633606920144617227">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> ከገመድ አልባ ላይ እስኪሞላ ድረስ"</string>
+    <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> - ገደማ <xliff:g id="TIME">%2$s</xliff:g> ይቀራል"</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> እስከሚሞላ ድረስ"</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> በኤሲ ላይ እስከሚሞላ ድረስ"</string>
+    <string name="power_charging_duration_usb" msgid="182405645340976546">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> በዩኤስቢ ላይ እስከሚሞላ ድረስ"</string>
+    <string name="power_charging_duration_wireless" msgid="1829295708243159464">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> በገመድ አልባ ላይ እስከሚሞላ ድረስ"</string>
     <string name="power_usage_list_summary" msgid="2409288197839512482">"የተሞላው ሃይል በሙሉ እስኪያልቅ ድረስ ይጠቀሙ"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"ከተነቀለ ጀምሮ የባትሪ ጥቅም"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"ዳግም ከተጀመረጀምሮ የባትሪ ጥቅም"</string>
@@ -1617,7 +1627,6 @@
     <string name="awake" msgid="387122265874485088">"የመሣሪያማንቂያ ሰዓት"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi በጊዜ"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi በጊዜ"</string>
-    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"የታሪክ ዝርዝሮች"</string>
     <string name="details_title" msgid="3792801565213935385">"ዝርዝሮች ተጠቀም"</string>
     <string name="details_subtitle" msgid="32593908269911734">"ዝርዝሮችን ተጠቀም"</string>
@@ -1689,7 +1698,7 @@
     <string name="battery_saver" msgid="1426682272004907982">"የባትሪ ኃይል ቆጣቢ"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"በራስ ሰር አብራ"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"በፍፁም"</string>
-    <string name="battery_saver_turn_on_automatically_pct" msgid="3033681629861428940">"በ %1$d%% የባትሪ ኃይል ላይ"</string>
+    <string name="battery_saver_turn_on_automatically_pct" msgid="7536784431655058267">"በ%1$s ባትሪ"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"የሂደት ስታትስቲክስ"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"እያሄዱ ስላሉ ሂደቶች ያሉ ዝርዝር ስታትስቲክስ"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"የማህደረ ትውስታ አጠቃቀም"</string>
@@ -1813,7 +1822,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"በሃርድዌር የተደገፈ"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"ሶፍትዌር ብቻ"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"ምስክርነቶች ለዚህ ተጠቃሚ አይገኙም"</string>
-    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"የቁልፍ መክፈቻ ስርዓተ ጥለትህን ሳል"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"የአሳማኝ መታውቂያ ጭነትን ለማረጋገጥ የመክፈቻ ስርዓተ ጥለትህን መሳል አለብህ።"</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"ለምስክርነት ማረጋገጫ ማከማቻ የይለፍ ቃልን ይተይቡ።"</string>
@@ -1843,6 +1851,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"የመተግበሪያ ውሂብ አካትት"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"ራስ ሰር ነበረበት መልስ"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"መተግበሪያን ዳግም ስትጭን ምትኬ ቅንብሮች  እና ውሂብ እነበሩበት መልስ"</string>
+    <string name="backup_inactive_title" msgid="5355557151569037197">"የምትኬ አገልግሎት ቦዝኗል።"</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"ይህ በእርስዎ መሣሪያ መመሪያ የተዘጋጀ ነው።"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"የዴስክቶፕ መጠባበቂያ ይለፍ ቃል"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"ዴስክቶፕ ሙሉ ምትኬዎች በአሁኑ ሰዓት አልተጠበቁም"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"ለዴስክቶፕ ሙሉ ምትኬዎች የይለፍ ቃል ለመለወጥ ወይም ለማስወገድ ንካ"</string>
@@ -1952,7 +1962,11 @@
     <string name="enter_password" msgid="8035706727471334122">"Androidን ለመጀመር የይለፍ ቃልዎን ያስገቡ"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Androidን ለመጀመር ፒንዎን ያስገቡ"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Androidን ለመጀመር ስርዓተ-ጥለትዎን ይሳሉ"</string>
-    <string name="try_again" msgid="4272075051293936921">"በድጋሚ ሞክር::"</string>
+    <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"የተሳሳተ ስርዓተ ጥለት"</string>
+    <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"የተሳሳተ ይለፍ ቃል"</string>
+    <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"የተሳሳተ ፒን"</string>
+    <string name="checking_decryption" msgid="8287458611802609493">"በማረጋገጥ ላይ…"</string>
+    <string name="starting_android" msgid="8581493237458496835">"Androidን ማስጀመር"</string>
     <string name="delete" msgid="4219243412325163003">"ሰርዝ"</string>
     <string name="misc_files" msgid="6720680815969643497">"ልዩ ልዩ"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"ከ<xliff:g id="NUMBER">%1$d</xliff:g><xliff:g id="TOTAL">%2$d</xliff:g> ምረጥ"</string>
@@ -1990,8 +2004,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"ለማያ ገጽ ማቀናበሪያ ሁልጊዜ GPU ተጠቀም"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"የቀለም ህዋ አስመስል"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"የ OpenGL ክትትሎችን ያንቁ"</string>
-    <string name="use_nuplayer" msgid="5699257393367904387">"NuPlayerን (የሙከራ) ይጠቀሙ"</string>
-    <string name="use_nuplayer_summary" msgid="1991479067478516714">"ከAwesomePlayer ይልቅ NuPlayerን ይጠቀሙ"</string>
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"AwesomePlayer ተጠቀም (አጥብቆ የማይመከር)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"ለአብዛኛው የሚዲያ መልሶ ማጫወት በNuPlayer ምትክ AwesomePlayer ተጠቀም"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"የUSB ተሰሚ ማዛወር ያሰናክሉ"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"በራስ-ሰር ወደ የUSB ተሰሚ ተገጣሚዎች ማሳወር ያሰናክሉ"</string>
     <string name="debug_layout" msgid="5981361776594526155">"የአቀማመጥ ገደቦችን አሳይ"</string>
@@ -2167,7 +2181,6 @@
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"ተጠቃሚ ወይም መገለጫ አክል"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"ተጠቃሚ አክል"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"የተገደበ መገለጫ"</string>
-    <string name="user_summary_managed_profile" msgid="7369539529693048111">"የስራ መገለጫ"</string>
     <string name="user_need_lock_message" msgid="2596365678651842785">"የተገደበ መገለጫ መፍጠር ከመቻልዎ በፊት መተግበሪያዎችዎን እና የግል ውሂብዎን ለመጠበቅ ቁልፍ ማያ ገጽ ማዋቀር አለብዎት።"</string>
     <string name="user_set_lock_button" msgid="8311219392856626841">"ቁልፍ አዘጋጅ"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"አልተዋቀረም"</string>
@@ -2298,11 +2311,13 @@
     <string name="sim_cellular_data_unavailable_summary" msgid="3654805961942166428">"የውሂብ ሲም ለመምረጥ ይንኩ"</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"ለጥሪዎች ሁልጊዜ ይህንን ተጠቀም"</string>
     <string name="select_sim_for_data" msgid="2366081042162853044">"ለውሂብ ሲም ይምረጡ"</string>
+    <string name="data_switch_started" msgid="2040761479817166311">"የውሂብ ሲም በመቀየር ላይ፣ ይሄ እስከ አንድ ደቂቃ ድረስ ሊወስድ ይችላል..."</string>
     <string name="select_sim_for_calls" msgid="3503094771801109334">"ይደውሉ ከዚህ ጋር"</string>
     <string name="sim_select_card" msgid="211285163525563293">"ሲም ካርድ ይምረጡ"</string>
     <string name="sim_card_number_title" msgid="7845379943474336488">"ሲም <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"ሲም ባዶ ነው"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"የሲም ስም"</string>
+    <string name="sim_name_hint" msgid="7038643345238968930">"የሲም ስም ያስገቡ"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"የሲም ማስገቢያ %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"አገልግሎት አቅራቢ"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"ቁጥር"</string>
@@ -2312,7 +2327,6 @@
     <string name="color_purple" msgid="3888532466427762504">"ወይን ጠጅ"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"ምንም ሲም ካርዶች አልገቡም"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"የSIM ሁኔታ"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"ከSIM ጋር ተያያዥ መረጃ"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"ከነባሪ ሲም መልሰው ይደውሉ"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"የወጪ ጥሪዎች ሲም"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"ሌሎች የጥሪ ቅንብሮች"</string>
@@ -2320,8 +2334,11 @@
     <string name="preferred_network_offload_header" msgid="2321173571529106767">"የአውታረ መረብ ስም ስርጭት አሰናክል"</string>
     <string name="preferred_network_offload_footer" msgid="5857279426054744020">"የአውታረ መረብ ስም ስርጭት አሰናክል ሶስተኛ ወገኖች የአውታረ መረብዎ መረጃ እንዳይደርሱበት ይጠብቃል።"</string>
     <string name="preferred_network_offload_popup" msgid="2252915199889604600">"የአውታረ መረብ ስም ስርጭትን ማሰናከል ከተደበቁ አውታረ መረቦች ጋር ራስ-ሰር እንዳንገናኙ ይከላከላል።"</string>
+    <string name="sim_signal_strength" msgid="9144010043784767984">"<xliff:g id="DBM">%1$d</xliff:g> ል.ም/በደ. <xliff:g id="ASU">%2$d</xliff:g> asu"</string>
+    <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>
+    <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>
@@ -2330,22 +2347,22 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"የቅርብ ጊዜ ፍለጋዎች"</string>
     <string name="search_results_label" msgid="4163304782363526148">"ውጤቶች"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"የwifi wi-fi አውታረ መረብ ግንኙነት"</string>
-    <string name="keywords_more_default_sms_app" msgid="2744404159003574745">"የጽሁፍ መልዕክት"</string>
-    <string name="keywords_more_mobile_networks" msgid="7813380887358745769">"ሞባይል ህዋስ አገልግሎት አቅራቢ ገመድ አልባ"</string>
+    <string name="keywords_more_default_sms_app" msgid="895656981962034647">"ጽሑፍ መልዕክት መላክ መልዕክቶች መልዕክት አላላክ"</string>
+    <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"የተንቀሳቃሽ ስልክ ድምጸ ተያያዥ ሞደም ውሂብ 4ጂ 3ጂ 2ጂ lte"</string>
     <string name="keywords_home" msgid="3626170808219458848">"አስጀማሪ"</string>
     <string name="keywords_display" msgid="6709007669501628320">"ማያ ገጽ ተነኪ ማያ ገጽ"</string>
-    <string name="keywords_display_brightness_level" msgid="8636451602230815191">"ደብዛዛ ማያ ገጽ ተነኪ ማያ ገጽ"</string>
-    <string name="keywords_display_auto_brightness" msgid="8070218600502753102">"ደብዛዛ ማያ ገጽ ተነኪ ማያ ገጽ"</string>
-    <string name="keywords_display_wallpaper" msgid="4315466287469834939">"ዳራ"</string>
+    <string name="keywords_display_brightness_level" msgid="8923289340474728990">"አጨልም ማያንካ ባትሪ"</string>
+    <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"አጨልም ማያንካ ባትሪ"</string>
+    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"በስተጀርባ ማሳያ ግላዊነት ያላብሱ ያበጁ"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"የጽሁፍ መጠን"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"ፕሮጀክት"</string>
-    <string name="keywords_storage" msgid="7007275853993419928">"ክፍተት ዲስክ ሃርድ አጻፊ"</string>
-    <string name="keywords_battery" msgid="3992479295298655138">"ኃይል"</string>
-    <string name="keywords_spell_checker" msgid="4509482591225399210">"አፃፃፍ"</string>
+    <string name="keywords_storage" msgid="6572905220031852173">"ክፍት ቦታ ዲስክ ደረቅ አንጻፊ መሣሪያ አጠቃቀም"</string>
+    <string name="keywords_battery" msgid="2096185085932675704">"ኃይል አጠቃቀም አከፋፈል"</string>
+    <string name="keywords_spell_checker" msgid="6106749039734174140">"የፊደል አጻጻፍ መዝገበ-ቃላት ፊደል ማረሚያ ራስ-እርማት"</string>
     <string name="keywords_voice_input" msgid="3519547605812413860">"ማወቂያ ግቤት ንግግር ይናገሩ ቋንቋ ነጻ-እጅ ነጻ እጅ ማወቂያ አስጸያፊ ቃላት የተሰሚ ታሪክ ብሉቱዝ የጆሮ ማዳመጫ"</string>
-    <string name="keywords_text_to_speech_output" msgid="8207889472282225512">"ደረጃ ቋንቋ ነባሪ ተናገር መናገር"</string>
-    <string name="keywords_date_and_time" msgid="7666950126499155141">"ሰዓት"</string>
-    <string name="keywords_factory_data_reset" msgid="3693730656843989732">"ጥረግ ሰርዝ"</string>
+    <string name="keywords_text_to_speech_output" msgid="392447904221657930">"ደረጃ ቋንቋ ነባሪ ተናገር መናገር tts ተደራሽነት አንባቢ ማየት የተሳናቸው"</string>
+    <string name="keywords_date_and_time" msgid="2631808108134830066">"ሰዓት ወታደራዊ"</string>
+    <string name="keywords_factory_data_reset" msgid="4355133848707691977">"ጥረግ ሰርዝ ወደደነበረበት መልስ አጽዳ አስወግድ"</string>
     <string name="keywords_printing" msgid="1701778563617114846">"አታሚ"</string>
     <string name="keywords_sounds_and_notifications" msgid="5965996187974887000">"የድምጽ ማጉያ ትንሽ ድምጽ"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="2912933812460077912">"አታድርግ አትረብሽ አቋርጥ ማቋረጥ እረፍት"</string>
@@ -2354,7 +2371,7 @@
     <string name="keywords_location_mode" msgid="8584992704568356084">"ትክክለኝነት"</string>
     <string name="keywords_accounts" msgid="1957925565953357627">"መለያ"</string>
     <string name="keywords_users" msgid="4673901601478559100">"ገደብ ገድብ የተገደበ"</string>
-    <string name="keywords_keyboard_and_ime" msgid="1103378692379215672">"የጽሁፍ ማስተካከያ አስተካክል ድምጽ መንዘር የራስ ሰር ቋንቋ ምልክት ጠቁም ጥቆማ ገጽታ ጥቃት የሚያደርስ ቃል ተይብ ኢሞጂ"</string>
+    <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"የጽሑፍ እርማት ትክክል ድምፅ ንዝረት ራስ-ሰር ቋንቋ የእጅ ምልክት ጠቁም ጥቆማ ገጽታ ጸያፍ ቃል ተይብ ስሜት ገላጭ ምስል አለምአቀፍ"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"ማንሸራተት የይለፍ ቃል ስርዓተ-ጥለት ፒን"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"የWi-Fi NFC መለያ ያዋቅሩ"</string>
     <string name="write_tag" msgid="8571858602896222537">"ጻፍ"</string>
@@ -2371,7 +2388,6 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"የማሳወቂያ ድምጽ መጠን"</string>
     <string name="zen_mode_settings_title" msgid="7014915558669122902">"ማቋረጦች"</string>
     <string name="zen_mode_option_title" msgid="5061978632306007914">"ጥሪዎች እና ማሳወቂያዎች ሲመጡ"</string>
-    <string name="zen_mode_option_title_novoice" msgid="6680706009915204785">"ማሳወቂያዎች ሲመጡ"</string>
     <string name="zen_mode_option_off" msgid="3167702608910820883">"ሁልጊዜ አቋርጥ"</string>
     <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"ቅድሚያ የሚሰጣቸው ማቋረጦችን ብቻ ፍቀድ"</string>
     <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"አታቋርጥ"</string>
@@ -2429,14 +2445,17 @@
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"ተከናውኗል"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"ይህን እስኪያጠፉት ድረስ"</string>
     <string name="zen_mode_important_category" msgid="8123274463331022993">"ቅድሚያ የሚሰጣቸው ማቋረጦች"</string>
-    <string name="zen_mode_downtime_category" msgid="4730179065426038108">"ከስራ ውጪ የሆነበት ጊዜ (ቅድሚያ የሚሰጣቸው ማቋረጦች ብቻ)"</string>
+    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"የማይገኝበት ጊዜ"</string>
     <string name="zen_mode_downtime_days" msgid="3361856902633311616">"ቀኖች"</string>
     <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"ምንም"</string>
+    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"መቆራረጦች ተፈቅደዋል"</string>
+    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"ቅድሚያ የሚሰጠው ብቻ"</string>
+    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"ምንም"</string>
     <string name="zen_mode_automation_category" msgid="4653551005950835761">"ራስ-ሰር ስራ"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"በራስ-ሰር አብራ"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">"፣ "</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"በጭራሽ"</string>
-    <string name="zen_mode_phone_calls" msgid="8956214416859303966">"ጥሪዎች"</string>
+    <string name="zen_mode_calls" msgid="7051492091133751208">"ጥሪዎች"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"መልዕክቶች"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"ጥሪዎች/መልዕክቶች ከ"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"ማንኛውም ሰው"</string>
@@ -2450,7 +2469,9 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"የሳምንቱ ቀኖች ምሽቶች"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"የሚጀምርበት ጊዜ"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"የሚያበቃበት ጊዜ"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> ቀጣዩ ቀን"</string>
+    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> በቀጣዩ ቀን"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> ወይም ቀድሞ ያለ ማንኛውም ማንቂያ"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> በሚቀጥለው ቀን ወይም ቀድሞ ያለ ማንኛውም ማንቂያ"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"የመተግበሪያ ማሳወቂያዎች"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"የማሳወቂያ ቅንብሮች"</string>
     <string name="device_feedback" msgid="3238056036766293294">"ስለዚህ መሣሪያ ግብረመልስ ላክ"</string>
@@ -2458,7 +2479,11 @@
     <string name="switch_on_text" msgid="1124106706920572386">"በርቷል"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"ጠፍቷል"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"ማያ ገጽ መሰካት"</string>
-    <string name="screen_pinning_description" msgid="7091642350452605379">"ሲበራ የአሁኑን ማያ ገጽ እስኪነቅሉት ድረስ በእይታ ውስጥ ለማድረግ መሰካትን መጠቀም ይችላሉ።\n\nየማያ ገጽ መሰካትን ለመጠቀም፦\n\n1. ማያ ገጽ መሰካት እንደበራ ያረጋግጡ።\n\n2. ለመሰካት የሚፈልጉትን ማያ ገጽ ይክፈቱ።\n\n3. አጠቃላይ እይታን ይንኩ።\n\n4. የሰካ አዶውን ይንኩ።"</string>
+    <string name="screen_pinning_description" msgid="1137904524037468263">"ይህ ቅንብር ሲበራ እስከሚነቅሉት ድረስ አሁን ያለውን ማያ ገጽ እንደተያያዘ ለማቆየት የማያ ገጽ መሰካትን መጠቀም ይችላሉ።\n\nየማያ ገጽ መሰካትን ለመጠቀም፦\n\n1. ማያ ገጽ መሰካት መብራቱን ያረጋግጡ።\n\n2. ለመሰካት የሚፈልጉትን ማያ ገጽ ይክፈቱ።\n\n3. አጠቃላይ ዕይታን ይንኩ።\n\n4. ወደ ላይ ጠረግ ያድርጉ እና በመቀጠል የሰካ አዶውን ይንኩ።"</string>
+    <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"ከመንቀል በፊት የማስከፈቻ ስርዓተ-ጥለት ጠይቅ"</string>
+    <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"ከመንቀል በፊት ፒን ጠይቅ"</string>
+    <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"ከመንቀል በፊት የይለፍ ቃል ጠይቅ"</string>
+    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"ሲነቀል መሣሪያ ቆልፍ"</string>
     <string name="managed_user_title" msgid="8101244883654409696">"የስራ መገለጫ"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(የሙከራ)"</string>
     <string name="display_auto_rotate_title" msgid="6176450657107806043">"መሣሪያው ሲዞር"</string>
@@ -2467,7 +2492,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"በወርድ እይታ ላይ ቆይ"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"በአሁኑ አቀማመጠ-ገጽ ላይ ቆይ"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"የIMEI መረጃ"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"የIMEI ተዛማጅ መረጃ"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"ማመስጠር"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"ቀጥል"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"ይህን መሣሪያ ከመጀመሩ በፊት የእርስዎን ፒን እንዲጠይቅ በማድረግ ይበልጥ ጥበቃ ሊያደርጉለት ይችላሉ። መሣሪያው እስከሚጀምር ድረስ፣ ማንቂያዎችን ጨምሮ ጥሪዎችን፣ መልዕክቶችን ወይም ማሳወቂያዎችን መቀበል አይችልም። \n\nይህ በጠፉ ወይም በተሰረቁ መሣሪያዎች ላይ ላለ ውሂብ ጥበቃ ለማድረግ ያግዛል።"</string>
@@ -2485,4 +2509,7 @@
     <string name="encrypt_talkback_dialog_message_pin" msgid="1890374082842868489">"ይህን መሣሪያ ለማስጀምር ፒንዎን ሲያስገቡ እንደ <xliff:g id="SERVICE">%1$s</xliff:g> ያሉ የተደራሽነት አገልግሎቶች ሊገኙ አይችሉም።"</string>
     <string name="encrypt_talkback_dialog_message_pattern" msgid="4474332516537386384">"ይህን መሣሪያ ለማስጀምር የስርዓተ-ጥለትዎን ሲያስገቡ እንደ <xliff:g id="SERVICE">%1$s</xliff:g> ያሉ የተደራሽነት አገልግሎቶች ሊገኙ አይችሉም።"</string>
     <string name="encrypt_talkback_dialog_message_password" msgid="8166099418487083927">"ይህን መሣሪያ ለማስጀምር የይለፍ ቃልዎን ሲያስገቡ እንደ <xliff:g id="SERVICE">%1$s</xliff:g> ያሉ የተደራሽነት አገልግሎቶች ሊገኙ አይችሉም።"</string>
+    <string name="imei_information_title" msgid="8499085421609752290">"የIMEI መረጃ"</string>
+    <string name="imei_information_summary" msgid="2074095606556565233">"የIMEI ተዛማጅ መረጃ"</string>
+    <string name="slot_number" msgid="3762676044904653577">"(ቀዳዳ <xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-ar/arrays.xml b/res/values-ar/arrays.xml
index 2d8b042..de81138 100644
--- a/res/values-ar/arrays.xml
+++ b/res/values-ar/arrays.xml
@@ -527,4 +527,12 @@
     <item msgid="4338089220026248848">"تخزين مؤقت (برنامج النشاط)"</item>
     <item msgid="6652164677254579050">"تخزين مؤقت (فارغ)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"أزرق مخضر"</item>
+    <item msgid="8332294763632946560">"أزرق"</item>
+    <item msgid="2023216417616991392">"نيلي"</item>
+    <item msgid="3170497246594232819">"أرجواني"</item>
+    <item msgid="4608643045752965568">"قرنفلي"</item>
+    <item msgid="6131821495505931173">"أحمر"</item>
+  </string-array>
 </resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 6159ebe..7d254b11 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>
@@ -180,7 +180,6 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"‏يريد %1$s الدخول إلى رسائلك. هل تريد منح %2$s حق الدخول؟"</string>
     <string name="date_and_time" msgid="9062980487860757694">"التاريخ والوقت"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"اختيار المنطقة الزمنية"</string>
-    <string name="normal_date_format" msgid="7636406984925498359">"إقليمي (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"معاينة:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"حجم الخط:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -291,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>
@@ -322,8 +321,6 @@
     <string name="date_time_set_timezone" msgid="5045627174274377814">"تحديد المنطقة الزمنية"</string>
     <string name="date_time_set_date_title" msgid="6928286765325608604">"التاريخ"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"تعيين التاريخ"</string>
-    <string name="date_time_date_format_title" msgid="3976171711988766411">"تنسيق التاريخ"</string>
-    <string name="date_time_date_format" msgid="6951498879879281102">"اختيار تنسيق التاريخ"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"التصنيف أبجديًا"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"تصنيف بحسب المنطقة الزمنية"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"التاريخ"</string>
@@ -372,7 +369,8 @@
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"انتظر حتى يتم تشفير هاتفك. اكتمل <xliff:g id="PERCENT">^1</xliff:g>%."</string>
     <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"انتظر بينما يتم تشفير جهازك اللوحي. الوقت المتبقي: <xliff:g id="DURATION">^1</xliff:g>"</string>
     <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"انتظر بينما يتم تشفير هاتفك. الوقت المتبقي: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"حاول مرة أخرى خلال <xliff:g id="DELAY">^1</xliff:g> ثانية."</string>
+    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"لإلغاء تأمين الجهاز اللوحي، يمكنك إيقافه وتشغيله مرة أخرى."</string>
+    <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"لإلغاء تأمين الهاتف، يمكنك إيقافه وتشغيله مرة أخرى."</string>
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"تحذير: سيتم محو محتويات جهازك بعد إخفاق <xliff:g id="COUNT">^1</xliff:g> من المحاولات الأخرى لإلغاء القفل!"</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"اكتب كلمة المرور"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"لم يتم التشفير بنجاح"</string>
@@ -401,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>
@@ -412,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>
@@ -556,13 +556,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"كهاتف بسماعة خارجية"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"للموسيقى والوسائط"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"تذكّر الإعدادات"</string>
-    <string name="wifi_assistant_intro_setup" msgid="4605105515416995110">"‏نقدّم لكم\nتطبيق مساعد Wi‑Fi"</string>
-    <string name="wifi_assistant_no_thanks" msgid="2776983751990143934">"لا، شكرًا"</string>
-    <string name="wifi_assistant_setup" msgid="3772423650475730906">"الإعداد"</string>
-    <string name="wifi_assistant_card_message" msgid="107811647784658536">"‏الاتصال تلقائيًا بالشبكات المتوفرة باستخدام مساعد Wi‑Fi."</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"‏مساعد Wi‑Fi"</string>
-    <string name="wifi_assistant_title_message" msgid="6240721017579074015">"‏يوفر لك <xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> إمكانية الاتصال التلقائي بأفضل شبكة Wi-Fi متاحة"</string>
-    <string name="wifi_assistant_open_app" msgid="4803044899535675063">"فتح التطبيق"</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>
@@ -592,7 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"‏إعدادات Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"إعداد وإدارة نقاط الدخول اللاسلكية"</string>
-    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"‏تحديد Wi-Fi"</string>
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"‏تحديد شبكة Wi‑Fi"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"‏تحديد Wi-Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"‏جارٍ تشغيل Wi-Fi..."</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"‏إيقاف Wi-Fi…"</string>
@@ -607,8 +602,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"إتاحة الفحص دائمًا"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"السماح بالبحث دائمًا"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"‏السماح لخدمة الموقع في Google والتطبيقات الأخرى بالبحث عن الشبكات، حتى عند عدم تشغيل Wi-Fi"</string>
-    <string name="wifi_automatically_manage_title" msgid="6249976570008992746">"‏إدارة اتصال Wi‑Fi تلقائيًا"</string>
-    <string name="wifi_automatically_manage_summary" msgid="6952470763378312488">"‏السماح لتطبيق <xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> بإدارة اتصال Wi‑Fi"</string>
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"‏استخدام شبكات Wi‑Fi المفتوحة تلقائيًا"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"‏السماح لمساعد Wi‑Fi بالاتصال بالشبكات المفتوحة التي تم تحديد جودتها العالية"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"اختيار المساعد"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"تثبيت شهادات"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"‏لتحسين مستوى دقة الموقع ولأغراض أخرى، قد تُجري Google والتطبيقات الأخرى فحصًا للعثور على الشبكات القريبة، حتى عندما تكون ميزة Wi-Fi معطّلة. إذا لم تكن تريد إجراء هذا الفحص، فانتقل إلى الإعدادات المتقدمة &gt; إتاحة الفحص دائمًا."</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"‏قد تُجري التطبيقات فحصًا للعثور على الشبكات القريبة، حتى عندما تكون Wi-Fi معطّلة. إذا لم تكن تريد إجراء هذا الفحص، فانتقل إلى الإعدادات المتقدمة &gt; إتاحة الفحص دائمًا."</string>
@@ -629,6 +625,7 @@
     <string name="wifi_menu_scan" msgid="1470911530412095868">"فحص"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"متقدم"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"اتصال بالشبكة"</string>
+    <string name="wifi_menu_remember" msgid="8814185749388713796">"تذكر الشبكة"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"حذف الشبكة"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"تعديل الشبكة"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"‏الكتابة في علامة NFC"</string>
@@ -673,9 +670,11 @@
     <string name="wifi_unspecified" msgid="5431501214192991253">"(غير محدد)"</string>
     <string name="wifi_remembered" msgid="4955746899347821096">"تم الحفظ"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"معطلة"</string>
-    <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"تم تجنب اتصال الإنترنت الضعيف"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"‏أخفقت تهيئة عنوان IP"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"‏أخفق اتصال WiFi"</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"حدثت مشكلة في المصادقة"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"ليست في النطاق"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"لم يتم اكتشاف اتصال بالإنترنت."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"‏WPS متاح"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" ‏ (WPS متاح)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"أدخل كلمة مرور الشبكة"</string>
@@ -699,9 +698,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"‏تحذير: عند تخطي Wi-Fi، لن يستخدم جهازك اللوحي سوى بيانات الجهاز الخلوي مع عمليات التنزيل والتحميل المبدئية. لتجنب  تحصيل رسوم بيانات، يمكنك الاتصال بشبكة Wi-Fi."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"‏تحذير: عند تخطي Wi-Fi، لن يستخدم جهازك سوى بيانات الجهاز الخلوي مع عمليات التنزيل والتحميل المبدئية. لتجنب  تحصيل رسوم بيانات، يمكنك الاتصال بشبكة Wi-Fi."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"‏تحذير: عند تخطي Wi-Fi، لن يستخدم هاتفك سوى بيانات الجهاز الخلوي مع عمليات التنزيل والتحميل المبدئية. لتجنب  تحصيل رسوم بيانات، يمكنك الاتصال بشبكة Wi-Fi."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="2393880108322835846">"‏تحذير: عند تخطي Wi-Fi، لن يتوفر اتصال بالإنترنت في جهازك اللوحي لاستخدامه لتنفيذ أية عمليات تنزيل أو تحميل مبدئية."</string>
-    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1707391993265558787">"‏تحذير: عند تخطي Wi-Fi، لن يتوفر اتصال بالإنترنت في جهازك لاستخدامه لتنفيذ أية عمليات تنزيل أو تحميل مبدئية."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="1556858507920033022">"‏تحذير: عند تخطي Wi-Fi، لن يتوفر اتصال بالإنترنت في هاتفك لاستخدامه لتنفيذ أية عمليات تنزيل أو تحميل مبدئية."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"‏في حال تخطي Wi‑Fi:\n\nلن يكون لجهازك اللوحي اتصال بالإنترنت.\n\nلن تحصل على تحديثات البرامج إلا عند الاتصال بالإنترنت.\n\nيتعذر عليك تفعيل ميزات حماية الجهاز خلال هذا الوقت."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"‏في حال تخطي Wi‑Fi:\n\nلن يكون لجهازك اتصال بالإنترنت.\n\nلن تحصل على تحديثات البرامج إلا عند الاتصال بالإنترنت.\n\nيتعذر عليك تفعيل ميزات حماية الجهاز خلال هذا الوقت."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"‏في حال تخطي Wi‑Fi:\n\nلن يكون لهاتفك اتصال بالإنترنت.\n\nلن تحصل على تحديثات البرامج إلا عند الاتصال بالإنترنت.\n\nيتعذر عليك تفعيل ميزات حماية الجهاز خلال هذا الوقت."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"‏لم يتمكن الجهاز اللوحي من الاتصال بشبكة Wi-Fi هذه."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"‏تعذر على الجهاز الاتصال بشبكة Wi-Fi هذه."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"‏لم يتمكن الهاتف من الاتصال بشبكة Wi-Fi هذه."</string>
@@ -761,7 +760,6 @@
     <string name="ring_volume_title" msgid="7938706566797464165">"مستوى صوت الرنين"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"اهتزاز عند تشغيل الوضع صامت"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"صوت الإشعار الافتراضي"</string>
-    <string name="heads_up_enabled_title" msgid="1031078221910921622">"إشعار منبثق مع أولوية عالية"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"نغمة الرنين"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"التنبيه"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"استخدام مستوى صوت المكالمة الواردة للإشعارات"</string>
@@ -834,7 +832,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"سطوع تلقائي"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"الرفع لتنبيه الجهاز"</string>
     <string name="doze_title" msgid="2259176504273878294">"عرض المحيط"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"تشغيل الشاشة عندما يتم اختيار الجهاز أو وصول إشعارات"</string>
+    <string name="doze_summary" msgid="7128970177894383698">"تنشيط الشاشة عند الإمساك بالجهاز أو تلقي إشعارات"</string>
     <string name="title_font_size" msgid="4405544325522105222">"حجم الخط"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"حجم الخط"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"‏إعدادات تأمين بطاقة SIM"</string>
@@ -862,6 +860,10 @@
     <string name="sim_enter_cancel" msgid="6240422158517208036">"إلغاء"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"‏تم العثور على بطاقات SIM متعددة"</string>
     <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>
@@ -1012,6 +1014,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"‏يؤدي ذلك إلى مسح جميع البيانات من "<b>"وحدة التخزين الداخلية"</b>" لجهازك اللوحي، بما في ذلك:\n\n"<li>"حسابك في Google"</li>\n<li>"النظام وبيانات التطبيقات والإعدادات"</li>\n<li>"التطبيقات التي تم تنزيلها"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"‏يؤدي ذلك إلى مسح جميع البيانات من "<b>"وحدة التخزين الداخلية"</b>" لهاتفك، بما في ذلك:\n\n"<li>"حسابك في Google"</li>\n<li>"النظام وبيانات التطبيقات والإعدادات"</li>\n<li>"التطبيقات التي تم تنزيلها"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"تم تسجيل دخولك حاليًا في الحسابات التالية:\n"</string>
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"هناك مستخدمون آخرون موجودون على هذا الجهاز.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"الموسيقى"</li>\n<li>"الصور"</li>\n<li>"بيانات المستخدم الأخرى"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">"‏\n\nلمحو الموسيقى والصور وبيانات المستخدم الأخرى أيضًا، يجب محو "<b>"وحدة تخزين USB"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">"‏\n\nلمحو الموسيقى والصور وبيانات المستخدم الأخرى أيضًا، يجب مسح "<b>"بطاقة SD"</b>"."</string>
@@ -1023,7 +1026,6 @@
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"إعادة تعيين الهاتف"</string>
     <string name="master_clear_final_desc" msgid="7209547812233487345">"هل تريد مسح جميع المعلومات الشخصية والتطبيقات التي تم تنزيلها؟ لا يمكنك عكس هذا الإجراء!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"مسح كل شيء"</string>
-    <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"ارسم نقش إلغاء التأمين"</string>
     <string name="master_clear_gesture_explanation" msgid="826193821455182780">"يلزمك رسم نقش إلغاء التأمين لتأكيد إعادة الضبط بحسب بيانات المصنع."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"‏لم يتم تنفيذ إعادة التعيين نظرًا لعدم توفر خدمة System Clear."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"هل تريد إعادة الضبط؟"</string>
@@ -1041,7 +1043,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"‏هل تريد محو وحدة تخزين USB، وحذف جميع الملفات المخزنة عليها؟ لا يمكنك عكس هذا الإجراء!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"‏هل تريد محو بطاقة SD، وحذف جميع الملفات المخزنة عليها؟ لا يمكن عكس هذا الإجراء!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"مسح كل شيء"</string>
-    <string name="media_format_gesture_prompt" msgid="3109349468816856670">"ارسم نقش إلغاء التأمين"</string>
     <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"‏يلزمك رسم نقش إلغاء التأمين للتأكيد على أنك تريد محو وحدة تخزين USB."</string>
     <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"‏يلزمك رسم نقش إلغاء التأمين للتأكيد على أنك تريد محو وحدة بطاقة SD."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"اعدادات المكالمات"</string>
@@ -1087,6 +1088,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"‏الرجاء إدخال بطاقة SIM وإعادة التشغيل"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"الرجاء الاتصال بالإنترنت"</string>
     <string name="location_title" msgid="1029961368397484576">"موقعي"</string>
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"الملف الشخصي للعمل"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"موقع الملف الشخصي للعمل"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"تم الإيقاف من قِبل جهاز الكمبيوتر"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"الوضع"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"دقة عالية"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"توفير شحن البطارية"</string>
@@ -1124,6 +1128,7 @@
     <string name="copyright_title" msgid="865906688917260647">"حقوق الطبع والنشر"</string>
     <string name="license_title" msgid="1990487604356037871">"الترخيص"</string>
     <string name="terms_title" msgid="7697580845616764642">"البنود والشروط"</string>
+    <string name="webview_license_title" msgid="2813507464175738967">"‏ترخيص WebView للنظام"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"الخلفيات"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"‏الشركات الموفرة لصور القمر الصناعي:\n‎©2014 CNES / Astrium، وDigitalGlobe وBluesky"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"تراخيص البرامج مفتوحة المصدر"</string>
@@ -1237,7 +1242,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"‏وحدة تخزين USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"‏في بطاقة SD"</string>
     <string name="disabled" msgid="9206776641295849915">"معطل"</string>
-    <string name="not_installed" msgid="1475144352069281880">"لم يتم التثبيت."</string>
+    <string name="not_installed" msgid="2797554494953450291">"لم يتم التثبيت لهذا المستخدم"</string>
     <string name="no_applications" msgid="7336588977497084921">"ليست هناك أية تطبيقات."</string>
     <string name="internal_storage" msgid="1584700623164275282">"وحدة التخزين الداخلية"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"‏وحدة تخزين USB"</string>
@@ -1434,8 +1439,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"لا يتم مطلقًا دخول الشاشة في وضع السكون أثناء الشحن"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"تمكين سجل تطفل بواجهة وحدة تحكم المضيف عبر بلوتوث"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"التقاط حزم واجهة وحدة تحكم المضيف في ملف عبر بلوتوث"</string>
-    <string name="oem_unlock_enable" msgid="6629321276287913315">"‏تمكين إلغاء قفل OEM"</string>
-    <string name="oem_unlock_enable_summary" msgid="3546686263996628110">"‏السماح للجهاز بإلغاء قفل OEM"</string>
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"إلغاء قفل المصنّع الأصلي للجهاز"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"‏السماح بإلغاء قفل برنامج bootloader"</string>
+    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"أدخل رقم التعريف الشخصي"</string>
+    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"‏أدخل رقم التعريف الشخصي للجهاز لتمكين إلغاء قفل OEM"</string>
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"هل تريد السماح بإلغاء قفل المصنّع الأصلي للجهاز؟"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"تحذير: لن تعمل ميزات الحماية على هذا الجهاز أثناء تشغيل هذا الإعداد."</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"شهادة عرض شاشة لاسلكي"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"‏تمكين تسجيل Wi‑Fi Verbose"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"‏تسليم Wi-Fi حاد إلى خلوي"</string>
@@ -1538,6 +1547,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"ستبدو التسميات التوضيحية بالشكل التالي"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"افتراضي"</string>
+    <string name="color_title" msgid="4258931051732243983">"اللون"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"الافتراضية"</string>
     <string name="color_none" msgid="3475640044925814795">"بدون"</string>
     <string name="color_white" msgid="8045195170201590239">"أبيض"</string>
@@ -1595,12 +1605,12 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"الوقت المتبقي: <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> للشحن"</string>
-    <string name="power_discharging_duration" msgid="7125493014448497620">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - تبقى <xliff:g id="TIME">%2$s</xliff:g> تقريبًا"</string>
-    <string name="power_charging" msgid="712751285832976915">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="STATE">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration" msgid="4802183864773082009">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> حتى الاكتمال"</string>
-    <string name="power_charging_duration_ac" msgid="3611179931297824699">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> حتى الاكتمال عبر التيار المتردد"</string>
-    <string name="power_charging_duration_usb" msgid="1106605348913397583">"‏<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> حتى الاكتمال عبر USB"</string>
-    <string name="power_charging_duration_wireless" msgid="633606920144617227">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> حتى الاكتمال عبر الاتصال اللاسلكي"</string>
+    <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> - تبقى <xliff:g id="TIME">%2$s</xliff:g> تقريبًا"</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> حتى الاكتمال"</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> حتى الاكتمال باستخدام التيار المتردد"</string>
+    <string name="power_charging_duration_usb" msgid="182405645340976546">"‏<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> حتى الاكتمال عبر USB"</string>
+    <string name="power_charging_duration_wireless" msgid="1829295708243159464">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> حتى الاكتمال بالشحن اللاسلكي"</string>
     <string name="power_usage_list_summary" msgid="2409288197839512482">"الاستخدام منذ آخر شحن كامل"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"استخدام البطارية عند فصل الطاقة"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"استخدام البطارية منذ إعادة التعيين"</string>
@@ -1617,7 +1627,6 @@
     <string name="awake" msgid="387122265874485088">"وقت الوضع النشط للجهاز"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"‏وقت تشغيل Wi-Fi"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"‏وقت تشغيل Wi-Fi"</string>
-    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"تفاصيل السجل"</string>
     <string name="details_title" msgid="3792801565213935385">"تفاصيل الاستخدام"</string>
     <string name="details_subtitle" msgid="32593908269911734">"استخدام التفاصيل"</string>
@@ -1689,7 +1698,7 @@
     <string name="battery_saver" msgid="1426682272004907982">"موفِّر طاقة البطارية"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"التشغيل تلقائيًا"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"أبدًا"</string>
-    <string name="battery_saver_turn_on_automatically_pct" msgid="3033681629861428940">"‏على مستوى %1$d%% من البطارية"</string>
+    <string name="battery_saver_turn_on_automatically_pct" msgid="7536784431655058267">"‏عند بلوغ %1$s من طاقة البطارية"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"إحصائيات العمليات"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"الإحصائيات التقنية حول العمليات الجارية"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"استخدام الذاكرة"</string>
@@ -1813,7 +1822,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"وحدة تخزين صلبة"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"وحدة تخزين برمجية فقط"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"لا تتوفر بيانات الاعتماد لهذا المستخدم"</string>
-    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"ارسم نقش إلغاء القفل"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"يجب عليك رسم نقش إلغاء القفل لتأكيد تثبيت بيانات الاعتماد."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"اكتب كلمة المرور لوحدة تخزين بيانات الاعتماد."</string>
@@ -1843,6 +1851,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"تضمين بيانات التطبيق"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"استرداد تلقائي"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"استعادة الإعدادات والبيانات التي تم نسخها احتياطيًا عند تثبيت أحد التطبيقات"</string>
+    <string name="backup_inactive_title" msgid="5355557151569037197">"خدمة الاحتفاظ بنسخة احتياطية غير نشطة."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"يتم تعيين هذا حسب سياسة الجهاز."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"كلمة مرور احتياطية للكمبيوتر"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"النسخ الاحتياطية الكاملة لسطح المكتب غير محمية في الوقت الحالي"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"المس لتغيير كلمة مرور النسخ الاحتياطية الكاملة لسطح المكتب أو إزالتها"</string>
@@ -1952,7 +1962,11 @@
     <string name="enter_password" msgid="8035706727471334122">"‏لبدء تشغيل Android، أدخل كلمة المرور"</string>
     <string name="enter_pin" msgid="5305333588093263790">"‏لبدء تشغيل Android، أدخل رقم التعريف الشخصي"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"‏لبدء تشغيل Android، ارسم النقش"</string>
-    <string name="try_again" msgid="4272075051293936921">"أعد المحاولة."</string>
+    <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"نقش خاطئ"</string>
+    <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"كلمة مرور خاطئة"</string>
+    <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"رقم تعريف شخصي خاطئ"</string>
+    <string name="checking_decryption" msgid="8287458611802609493">"جارٍ التحقق…"</string>
+    <string name="starting_android" msgid="8581493237458496835">"‏جارٍ تشغيل Android"</string>
     <string name="delete" msgid="4219243412325163003">"حذف"</string>
     <string name="misc_files" msgid="6720680815969643497">"ملفات متنوعة"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"تم تحديد <xliff:g id="NUMBER">%1$d</xliff:g> من إجمالي <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -1990,8 +2004,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"استخدام وحدة معالجة الرسومات دائمًا لتركيب الشاشة"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"محاكاة مسافة اللون"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"‏تمكين عمليات تتبع OpenGL"</string>
-    <string name="use_nuplayer" msgid="5699257393367904387">"‏استخدام NuPlayer (تجريبي)"</string>
-    <string name="use_nuplayer_summary" msgid="1991479067478516714">"‏استخدام NuPlayer بدلاً من AwesomePlayer"</string>
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"‏استخدام AwesomePlayer (مهمل)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"‏استخدام AwesomePlayer بدلاً من NuPlayer لتشغيل معظم الوسائط"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"‏تعطيل توجيه الصوت عبر USB"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"‏تعطيل التوجيه التلقائي إلى أجهزة الصوت الطرفية عبر USB"</string>
     <string name="debug_layout" msgid="5981361776594526155">"عرض حدود المخطط"</string>
@@ -2167,7 +2181,6 @@
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"إضافة مستخدم أو ملف شخصي"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"إضافة مستخدم"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"ملف شخصي محظور"</string>
-    <string name="user_summary_managed_profile" msgid="7369539529693048111">"الملف الشخصي للعمل"</string>
     <string name="user_need_lock_message" msgid="2596365678651842785">"قبل أن تتمكن من إنشاء ملف شخصي مقيد، يلزمك إعداد تأمين للشاشة لحماية تطبيقاتك وبياناتك الشخصية."</string>
     <string name="user_set_lock_button" msgid="8311219392856626841">"تعيين التأمين"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"لم يتم الإعداد."</string>
@@ -2298,11 +2311,13 @@
     <string name="sim_cellular_data_unavailable_summary" msgid="3654805961942166428">"‏المس لتحديد بطاقة SIM للبيانات"</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"استخدام هذا للمكالمات دائمًا"</string>
     <string name="select_sim_for_data" msgid="2366081042162853044">"‏تحديد بطاقة SIM للبيانات"</string>
+    <string name="data_switch_started" msgid="2040761479817166311">"‏جارٍ تبديل بطاقة SIM للبيانات؛ قد يستغرق هذا مدة تصل إلى دقيقة..."</string>
     <string name="select_sim_for_calls" msgid="3503094771801109334">"الاتصال باستخدام"</string>
     <string name="sim_select_card" msgid="211285163525563293">"‏تحديد بطاقة SIM"</string>
     <string name="sim_card_number_title" msgid="7845379943474336488">"‏بطاقة SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"‏بطاقة SIM فارغة"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"‏اسم بطاقة SIM"</string>
+    <string name="sim_name_hint" msgid="7038643345238968930">"‏إدخال اسم SIM"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"‏%1$d لمنفذ SIM"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"مشغل شبكة الجوّال"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"الرقم"</string>
@@ -2312,7 +2327,6 @@
     <string name="color_purple" msgid="3888532466427762504">"أرجواني"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"‏لم يتم إدراج بطاقات SIM"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"‏وضع بطاقة SIM"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"‏معلومات ذات صلة ببطاقة SIM"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"‏رد الاتصال عبر بطاقة SIM الافتراضية"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"‏بطاقة SIM للمكالمات الصادرة"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"إعدادات المكالمات الأخرى"</string>
@@ -2320,8 +2334,11 @@
     <string name="preferred_network_offload_header" msgid="2321173571529106767">"تعطيل بث اسم الشبكة"</string>
     <string name="preferred_network_offload_footer" msgid="5857279426054744020">"يؤدي تعطيل بث اسم الشبكة إلى منع وصول الجهات الخارجية إلى معلومات الشبكة."</string>
     <string name="preferred_network_offload_popup" msgid="2252915199889604600">"سيؤدي تعطيل بث اسم الشبكة إلى منع الاتصال بالشبكات المخفية تلقائيًا."</string>
+    <string name="sim_signal_strength" msgid="9144010043784767984">"<xliff:g id="DBM">%1$d</xliff:g> ديسبل ميلي واط <xliff:g id="ASU">%2$d</xliff:g> وحدة إشارة واحدة"</string>
+    <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>
@@ -2330,22 +2347,22 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"عمليات البحث التي تمت مؤخرًا"</string>
     <string name="search_results_label" msgid="4163304782363526148">"النتائج"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"‏اتصال شبكة واي فاي wi-fi"</string>
-    <string name="keywords_more_default_sms_app" msgid="2744404159003574745">"رسالة نصية"</string>
-    <string name="keywords_more_mobile_networks" msgid="7813380887358745769">"خلوي هاتف مشغل شبكة جوّال لاسلكي"</string>
+    <string name="keywords_more_default_sms_app" msgid="895656981962034647">"رسالة نصية كتابة رسائل نصية إرسال رسائل"</string>
+    <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"‏خلوي مشغِّل شبكة جوّال لاسلكي بيانات 4g 3g 2g lte"</string>
     <string name="keywords_home" msgid="3626170808219458848">"launcher"</string>
     <string name="keywords_display" msgid="6709007669501628320">"شاشة لمس للشاشة"</string>
-    <string name="keywords_display_brightness_level" msgid="8636451602230815191">"شاشة لمس معتمة للشاشة"</string>
-    <string name="keywords_display_auto_brightness" msgid="8070218600502753102">"شاشة لمس معتمة للشاشة"</string>
-    <string name="keywords_display_wallpaper" msgid="4315466287469834939">"الخلفية"</string>
+    <string name="keywords_display_brightness_level" msgid="8923289340474728990">"تعتيم شاشة شاشة لمس بطارية"</string>
+    <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"تعتيم شاشة شاشة لمس بطارية"</string>
+    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"خلفية تخصيص التخصيص عرض"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"حجم النص"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"المشروع"</string>
-    <string name="keywords_storage" msgid="7007275853993419928">"مساحة محرك أقراص صلبة"</string>
-    <string name="keywords_battery" msgid="3992479295298655138">"الطاقة"</string>
-    <string name="keywords_spell_checker" msgid="4509482591225399210">"تدقيق إملائي"</string>
+    <string name="keywords_storage" msgid="6572905220031852173">"مسافة قرص محرك أقراص ثابتة جهاز استخدام"</string>
+    <string name="keywords_battery" msgid="2096185085932675704">"شحن استخدام طاقة"</string>
+    <string name="keywords_spell_checker" msgid="6106749039734174140">"تهجئة قاموس تدقيق إملائي تصحيح تلقائي"</string>
     <string name="keywords_voice_input" msgid="3519547605812413860">"أداة تعرف إدخال صوت تحدث لغة بدون استخدام اليدين بدون يدين تعرف كلمة مسيئة صوت سجل بلوتوث سماعة رأس"</string>
-    <string name="keywords_text_to_speech_output" msgid="8207889472282225512">"معدل لغة افتراضي تحدث"</string>
-    <string name="keywords_date_and_time" msgid="7666950126499155141">"الساعة"</string>
-    <string name="keywords_factory_data_reset" msgid="3693730656843989732">"حذف مسح"</string>
+    <string name="keywords_text_to_speech_output" msgid="392447904221657930">"تقييم لغة افتراضي يتحدث تحدث تحويل نص إلى كلام إمكانية الوصول قارئ مكفوف"</string>
+    <string name="keywords_date_and_time" msgid="2631808108134830066">"ساعة عسكرية"</string>
+    <string name="keywords_factory_data_reset" msgid="4355133848707691977">"محو حذف استرداد مسح إزالة"</string>
     <string name="keywords_printing" msgid="1701778563617114846">"طابعة"</string>
     <string name="keywords_sounds_and_notifications" msgid="5965996187974887000">"صفارة مكبر الصوت"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="2912933812460077912">"ممنوع الإزعاج ممنوع المقاطعة مقاطعة"</string>
@@ -2354,7 +2371,7 @@
     <string name="keywords_location_mode" msgid="8584992704568356084">"الدقة"</string>
     <string name="keywords_accounts" msgid="1957925565953357627">"الحساب"</string>
     <string name="keywords_users" msgid="4673901601478559100">"تقييد يقيد مقيد"</string>
-    <string name="keywords_keyboard_and_ime" msgid="1103378692379215672">"نص تصحيح صحيح صوت اهتزاز تلقائي لغة إيماءة يقترح اقتراح مظهر عدواني كلمة نوع رسم تعبيري"</string>
+    <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"نص تصحيح صحح صوت اهتزاز تلقائي لغة إيماءة اقتراح يقترح مظهر مسيء كلمة يكتب رمز تعبيري دولي"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"التمرير، كلمة المرور، النمط، رقم التعريف الشخصي"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"‏إعداد علامة NFC عبر Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"كتابة"</string>
@@ -2371,7 +2388,6 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"مستوى صوت الإشعارات"</string>
     <string name="zen_mode_settings_title" msgid="7014915558669122902">"المقاطعات"</string>
     <string name="zen_mode_option_title" msgid="5061978632306007914">"عند تلقي المكالمات والإشعارات"</string>
-    <string name="zen_mode_option_title_novoice" msgid="6680706009915204785">"عند تلقي إشعارات"</string>
     <string name="zen_mode_option_off" msgid="3167702608910820883">"المقاطعة دائمًا"</string>
     <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"السماح بالمقاطعات ذات الأولوية فقط"</string>
     <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"عدم المقاطعة"</string>
@@ -2429,14 +2445,17 @@
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"تم"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"لحين تعطيل هذا الإعداد"</string>
     <string name="zen_mode_important_category" msgid="8123274463331022993">"مقاطعات ذات أولوية"</string>
-    <string name="zen_mode_downtime_category" msgid="4730179065426038108">"وقت التوقف (مقاطعات ذات أولوية فقط)"</string>
+    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"التعطل"</string>
     <string name="zen_mode_downtime_days" msgid="3361856902633311616">"أيام"</string>
     <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"بدون"</string>
+    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"تم السماح بالمقاطعات"</string>
+    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"الأولوية فقط"</string>
+    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"بدون"</string>
     <string name="zen_mode_automation_category" msgid="4653551005950835761">"التشغيل التلقائي"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"تشغيل تلقائي"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">"، "</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"مطلقًا"</string>
-    <string name="zen_mode_phone_calls" msgid="8956214416859303966">"المكالمات"</string>
+    <string name="zen_mode_calls" msgid="7051492091133751208">"المكالمات"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"الرسائل"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"مكالمات/رسائل من"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"أي شخص"</string>
@@ -2450,7 +2469,9 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"ليالي الأسبوع"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"وقت البدء"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"وقت الانتهاء"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> في اليوم التالي"</string>
+    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> في اليوم التالي"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> أو أي تنبيه قبل ذلك"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> في اليوم التالي أو أي تنبيه قبل ذلك"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"إشعارات التطبيقات"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"إعدادات الإشعارات"</string>
     <string name="device_feedback" msgid="3238056036766293294">"إرسال تعليقات حول هذا الجهاز"</string>
@@ -2458,7 +2479,11 @@
     <string name="switch_on_text" msgid="1124106706920572386">"تشغيل"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"إيقاف"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"تثبيت الشاشة"</string>
-    <string name="screen_pinning_description" msgid="7091642350452605379">"عند تمكين ميزة تثبيت الشاشة، ستتمكن من استخدامها لتصبح الشاشة الحالية في العرض حتى يتم إلغاء التثبيت.\n\nلاستخدام تثبيت الشاشة:\n\n1. تأكد من تمكين تثبيت الشاشة.\n\n2. افتح الشاشة التي تريد تثبيتها.\n\n3. المس \"نظرة عامة\".\n\n4. المس رمز التثبيت."</string>
+    <string name="screen_pinning_description" msgid="1137904524037468263">"عندما يتم تمكين هذا الإعداد، يمكنك استخدام تثبيت الشاشة لتظل الشاشة الحالية قيد العرض حتى يتم إلغاء التثبيت.\n\nلاستخدام تثبيت الشاشة:\n\n1. تأكد من تمكين تثبيت الشاشة.\n\n2. افتح الشاشة التي تريد تثبيتها.\n\n3. المس عرض عام.\n\n4. مرر لأعلى والمس رمز مسمار التثبيت."</string>
+    <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"المطالبة بنقش إلغاء القفل قبل إزالة التثبيت"</string>
+    <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"المطالبة برقم التعريف الشخصي قبل إزالة التثبيت"</string>
+    <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"المطالبة بكلمة المرور قبل إزالة التثبيت"</string>
+    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"قفل الجهاز عند إزالة التثبيت"</string>
     <string name="managed_user_title" msgid="8101244883654409696">"الملف الشخصي للعمل"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(تجريبي)"</string>
     <string name="display_auto_rotate_title" msgid="6176450657107806043">"أوقات تدوير الجهاز"</string>
@@ -2467,7 +2492,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"الاحتفاظ بالعرض الأفقي"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"الاحتفاظ بالاتجاه الحالي"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"‏معلومات IMEI"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"‏المعلومات ذات الصلة بـ IMEI"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"التشفير"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"متابعة"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"يمكنك إضافة المزيد من الحماية إلى هذا الجهاز عن طريق اشتراط إدخال رقم التعريف الشخصي قبل بدء تشغيله. وإلى أن يتم بدء تشغيل الجهاز، لا يمكن للجهاز استقبال مكالمات أو رسائل أو إشعارات، بما في ذلك التنبيهات. \n\nويساعد هذا في حماية البيانات على الأجهزة  المفقودة أو المسروقة."</string>
@@ -2485,4 +2509,7 @@
     <string name="encrypt_talkback_dialog_message_pin" msgid="1890374082842868489">"عند إدخال رقم التعريف الشخصي لبدء هذا الجهاز، فلن تكون خدمات الدخول مثل <xliff:g id="SERVICE">%1$s</xliff:g> متاحة."</string>
     <string name="encrypt_talkback_dialog_message_pattern" msgid="4474332516537386384">"عند إدخال نمط لبدء هذا الجهاز، فلن تكون خدمات الدخول مثل <xliff:g id="SERVICE">%1$s</xliff:g> متاحة."</string>
     <string name="encrypt_talkback_dialog_message_password" msgid="8166099418487083927">"عند إدخال كلمة المرور لبدء هذا الجهاز، فلن تكون خدمات الدخول مثل <xliff:g id="SERVICE">%1$s</xliff:g> متاحة."</string>
+    <string name="imei_information_title" msgid="8499085421609752290">"‏معلومات IMEI"</string>
+    <string name="imei_information_summary" msgid="2074095606556565233">"‏المعلومات ذات الصلة بـ IMEI"</string>
+    <string name="slot_number" msgid="3762676044904653577">"(فتحة <xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-bg/arrays.xml b/res/values-bg/arrays.xml
index e345942..14f9114 100644
--- a/res/values-bg/arrays.xml
+++ b/res/values-bg/arrays.xml
@@ -527,4 +527,12 @@
     <item msgid="4338089220026248848">"Кеширано (клиентска програма за активността)"</item>
     <item msgid="6652164677254579050">"Кеширано (празно)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"синьо-зелено"</item>
+    <item msgid="8332294763632946560">"синьо"</item>
+    <item msgid="2023216417616991392">"индиго"</item>
+    <item msgid="3170497246594232819">"лилаво"</item>
+    <item msgid="4608643045752965568">"розово"</item>
+    <item msgid="6131821495505931173">"червено"</item>
+  </string-array>
 </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index ae77703..155474c 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>
@@ -180,7 +180,6 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s иска достъп до съобщенията ви. Ще предоставите ли достъп до %2$s?"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Дата и час"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Избор на часова зона"</string>
-    <string name="normal_date_format" msgid="7636406984925498359">"Регионално (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Визуализация:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Размер на шрифта:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -291,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>
@@ -322,8 +321,6 @@
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Избор на часова зона"</string>
     <string name="date_time_set_date_title" msgid="6928286765325608604">"Датa"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"Задаване на дата"</string>
-    <string name="date_time_date_format_title" msgid="3976171711988766411">"Формат на датата"</string>
-    <string name="date_time_date_format" msgid="6951498879879281102">"Избор на формат на датата"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Сортиране по азбучен ред"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Сортиране по часова зона"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Дата"</string>
@@ -372,7 +369,8 @@
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Изчакайте, докато телефонът ви се шифрова. Завършено: <xliff:g id="PERCENT">^1</xliff:g>%."</string>
     <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Изчакайте, докато таблетът ви се шифрова. Оставащо време: <xliff:g id="DURATION">^1</xliff:g>"</string>
     <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Изчакайте, докато телефонът ви се шифрова. Оставащо време: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Опитайте отново след <xliff:g id="DELAY">^1</xliff:g> секунди."</string>
+    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"За да отключите таблета си, го изключете и включете."</string>
+    <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"За да отключите телефона си, го изключете и включете."</string>
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"Предупреждение: Всичко от устройството ви ще бъде изтрито след още <xliff:g id="COUNT">^1</xliff:g> неуспешни опита за отключване!"</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Въведете паролата си"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Шифроването не бе успешно"</string>
@@ -401,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>
@@ -412,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>
@@ -556,13 +556,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Като високоговорител"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"За музика и медийни файлове"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Запомняне на настройки"</string>
-    <string name="wifi_assistant_intro_setup" msgid="4605105515416995110">"Представяме\nасистента за Wi‑Fi"</string>
-    <string name="wifi_assistant_no_thanks" msgid="2776983751990143934">"НЕ, БЛАГОДАРЯ"</string>
-    <string name="wifi_assistant_setup" msgid="3772423650475730906">"НАСТРОЙВАНЕ"</string>
-    <string name="wifi_assistant_card_message" msgid="107811647784658536">"Автоматично установяване на връзка с наличните мрежи посредством асистент за Wi‑Fi."</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Асистент за Wi‑Fi"</string>
-    <string name="wifi_assistant_title_message" msgid="6240721017579074015">"<xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> автоматично ви свързва с най-добрата налична Wi‑Fi мрежа"</string>
-    <string name="wifi_assistant_open_app" msgid="4803044899535675063">"ОТВАРЯНЕ НА ПРИЛОЖЕНИЕТО"</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>
@@ -592,7 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Настройки за Wi‑Fi"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Задаване и управление на безжични точки за достъп"</string>
-    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Избиране на Wi‑Fi"</string>
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Избиране на Wi‑Fi мрежа"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Избиране на Wi‑Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Wi‑Fi се включва…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Wi‑Fi се изключва…"</string>
@@ -607,8 +602,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"Сканирането е винаги налице"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Сканирането да е разрешено винаги"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Разрешете на услугата на Google за местоположения и другите приложения да сканират за мрежи дори когато Wi-Fi е изключен"</string>
-    <string name="wifi_automatically_manage_title" msgid="6249976570008992746">"Автоматично управление на Wi‑Fi"</string>
-    <string name="wifi_automatically_manage_summary" msgid="6952470763378312488">"Разрешаване на <xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> да управлява връзката ви с Wi‑Fi"</string>
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Автом. ползване на отворени Wi‑Fi мрежи"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Помощникът за Wi‑Fi автоматично да се свързва с отворени мрежи, които определи за надеждни"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Избиране на помощник"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Инсталиране на сертификати"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"За подобряване на точността на местоположението и за други цели Google и останалите приложения може да сканират за мрежи в района дори когато Wi-Fi е изключен. Ако не искате това да се случва, отворете „Разширени“ &gt; „Сканирането винаги да е налице“."</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Приложенията може да сканират за мрежи в района дори когато Wi-Fi е изключен. Ако не искате това да се случва, отворете „Разширени“ &gt; „Сканирането винаги да е налице“."</string>
@@ -629,6 +625,7 @@
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Сканиране"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Разширени"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Свързване с мрежа"</string>
+    <string name="wifi_menu_remember" msgid="8814185749388713796">"Запомняне на мрежата"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Забравяне на мрежа"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Промяна на мрежа"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Записване в маркера за КБП"</string>
@@ -673,9 +670,11 @@
     <string name="wifi_unspecified" msgid="5431501214192991253">"(неизвестни)"</string>
     <string name="wifi_remembered" msgid="4955746899347821096">"Запазено"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"Деактивирани"</string>
-    <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Избегната е лоша връзка с интернет"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"Неуспешно конфигуриране на IP адреса"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Неуспешна връзка с Wi-Fi"</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Проблем при удостоверяването"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Извън обхват"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Не е открит достъп до интернет. Няма да се свърже отново автоматично."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"Налице е WPS"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (Налице е WPS)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Въведете паролата за мрежата"</string>
@@ -699,9 +698,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"ПРЕДУПРЕЖДЕНИЕ: Ако пропуснете Wi‑Fi, таблетът ви ще използва само мобилни данни за първоначалните изтегляния и актуализации. За да избегнете евентуално таксуване, установете връзка с Wi‑Fi."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"ПРЕДУПРЕЖДЕНИЕ: Ако пропуснете Wi‑Fi, устройството ви ще използва само мобилни данни за първоначалните изтегляния и актуализации. За да избегнете евентуално таксуване, установете връзка с Wi‑Fi."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"ПРЕДУПРЕЖДЕНИЕ: Ако пропуснете Wi‑Fi, телефонът ви ще използва само мобилни данни за първоначалните изтегляния и актуализации. За да избегнете евентуално таксуване, установете връзка с Wi‑Fi."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="2393880108322835846">"ПРЕДУПРЕЖДЕНИЕ: Ако пропуснете Wi‑Fi, таблетът ви няма да има връзка с интернет, която да използва за първоначалните изтегляния или актуализации."</string>
-    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1707391993265558787">"ПРЕДУПРЕЖДЕНИЕ: Ако пропуснете Wi‑Fi, устройството ви няма да има връзка с интернет, която да използва за първоначалните изтегляния или актуализации."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="1556858507920033022">"ПРЕДУПРЕЖДЕНИЕ: Ако пропуснете Wi‑Fi, телефонът ви няма да има връзка с интернет, която да използва за първоначалните изтегляния или актуализации."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Ако не използвате Wi‑Fi:\n\nТаблетът ви няма да има връзка с интернет.\n\nНяма да получавате софтуерни актуализации, докато не се свържете с интернет.\n\nПонастоящем не можете да активирате функциите за защита на устройството."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Ако не използвате Wi‑Fi:\n\nУстройството ви няма да има връзка с интернет.\n\nНяма да получавате софтуерни актуализации, докато не се свържете с интернет.\n\nПонастоящем не можете да активирате функциите за защита на устройството."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Ако не използвате Wi‑Fi:\n\nТелефонът ви няма да има връзка с интернет.\n\nНяма да получавате софтуерни актуализации, докато не се свържете с интернет.\n\nПонастоящем не можете да активирате функциите за защита на устройството."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Таблетът не можа да се свърже с тази Wi‑Fi мрежа."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"Устройството не можа да се свърже с тази Wi‑Fi мрежа."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Телефонът не можа да се свърже с тази Wi‑Fi мрежа."</string>
@@ -761,7 +760,6 @@
     <string name="ring_volume_title" msgid="7938706566797464165">"Сила на звука при звънене"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Вибрира при тих режим"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Стандартен звук за известяване"</string>
-    <string name="heads_up_enabled_title" msgid="1031078221910921622">"Изскачане при висок приоритет"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Мелодия"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Известие"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Използване на силата на звука при вх. обаждане за известия"</string>
@@ -834,7 +832,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Автоматична яркост"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Събуждане при повдигане"</string>
     <string name="doze_title" msgid="2259176504273878294">"Дисплей, открояващ важни неща"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"Събуждане на екрана при вдигане на устройството или при получаване на известия"</string>
+    <string name="doze_summary" msgid="7128970177894383698">"Включване на екрана при вдигане на устройството или при получаване на известия"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Размер на шрифта"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Размер на шрифта"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Настройки за заключването на SIM картата"</string>
@@ -862,6 +860,10 @@
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Отказ"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"Открити са няколко SIM карти"</string>
     <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>
@@ -1012,6 +1014,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Това ще изтрие всички данни от "<b>"вътрешното хранилище"</b>" на таблета ви, включително:\n\n"<li>"профила ви в Google;"</li>\n<li>"данни и настройки от системата и приложенията;"</li>\n<li>"изтеглени приложения."</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Това ще изтрие всички данни от "<b>"вътрешното хранилище"</b>" на телефона ви, включително:\n\n"<li>"профила ви в Google;"</li>\n<li>"данни и настройки от системата и приложенията;"</li>\n<li>"изтеглени приложения."</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Понастоящем сте влезли в следните профили:\n"</string>
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"На това устройство има други потребители.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Музика"</li>\n<li>"Снимки"</li>\n<li>"Други потребителски данни"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"За да изчистите музиката, снимките и другите потребителски данни, трябва да се изтрие "<b>"USB хранилището"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"За да изчистите музиката, снимките и другите потребителски данни, трябва да се изтрие "<b>"SD картата"</b>"."</string>
@@ -1023,7 +1026,6 @@
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Нулиране на телефона"</string>
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Да се изтрие ли цялата ви лична информация и всички изтеглени приложения? Не можете да отмените това действие!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Изтриване на всичко"</string>
-    <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Начертайте фигурата си за отключване"</string>
     <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Трябва да начертаете фигурата си за отключване, за да потвърдите възстановяването на фабричните настройки."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Не се състоя рестартиране, защото услугата за изчистване на системата не се предлага."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Да се зададе ли повторно?"</string>
@@ -1041,7 +1043,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"Да се изтрие ли USB хранилището заедно с всички съхранявани там файлове? Не можете да отмените това действие!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Да се изтрие ли SD картата заедно с всички съхранявани там файлове? Не можете да отмените това действие!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Изтриване на всичко"</string>
-    <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Начертайте фигурата си за отключване"</string>
     <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Трябва да начертаете фигурата си за отключване, за да потвърдите, че искате да изтриете USB хранилището."</string>
     <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Трябва да начертаете фигурата си за отключване, за да потвърдите, че искате да изтриете SD картата."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Настройки за обаждане"</string>
@@ -1087,6 +1088,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Моля, поставете SIM карта и рестартирайте"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Моля, свържете се с интернет"</string>
     <string name="location_title" msgid="1029961368397484576">"Моето местоположение"</string>
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Служебен потр. профил"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Местоп. за служ. потр. профил"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Изключено от фирмата ви"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Режим"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Висока точност"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Запазване на батерията"</string>
@@ -1124,6 +1128,7 @@
     <string name="copyright_title" msgid="865906688917260647">"Авторски права"</string>
     <string name="license_title" msgid="1990487604356037871">"Лиценз"</string>
     <string name="terms_title" msgid="7697580845616764642">"Общи условия"</string>
+    <string name="webview_license_title" msgid="2813507464175738967">"Системен лиценз за WebView"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Тапети"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Доставчици на сателитни изображения:\n©2014 CNES/Astrium, DigitalGlobe, Bluesky"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Лицензи с отворен код"</string>
@@ -1237,7 +1242,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB хранилище"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"На SD карта"</string>
     <string name="disabled" msgid="9206776641295849915">"Деактивирано"</string>
-    <string name="not_installed" msgid="1475144352069281880">"Не е инсталирано"</string>
+    <string name="not_installed" msgid="2797554494953450291">"Не е инсталир. за потребителя"</string>
     <string name="no_applications" msgid="7336588977497084921">"Няма приложения."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Вътр. хранилище"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB хранилище"</string>
@@ -1434,8 +1439,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Екранът никога няма да е в спящ режим при зареждане"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Активиране на регистрационния файл за анализ на пакетите в команден ред за Bluetooth с протокола HCI"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Заснемане на всички пакети за Bluetooth с протокола HCI във файла"</string>
-    <string name="oem_unlock_enable" msgid="6629321276287913315">"Фабрично откл.: Актив."</string>
-    <string name="oem_unlock_enable_summary" msgid="3546686263996628110">"Разрешаване на фабричното отключване на у-вото"</string>
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"Отключване от OEM"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Разрешаване на първонач. зареждащата прогр. да се откл."</string>
+    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Въведете ПИН кода си"</string>
+    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Въведете ПИН кода за устройството си, за да активирате OEM отключването"</string>
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Да се разреши ли отключване от OEM?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"ПРЕДУПРЕЖДЕНИЕ: Функциите за защита на устройството няма да работят на това, докато следната настройка е включена."</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Сертифициране на безжичния дисплей"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"„Многословно“ регистр. на Wi‑Fi: Актив."</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Wi-Fi към моб. мрежи: Агресивно предав."</string>
@@ -1538,6 +1547,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"Надписите ще изглеждат така"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"По подразбиране"</string>
+    <string name="color_title" msgid="4258931051732243983">"Цвят"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"Стандартно"</string>
     <string name="color_none" msgid="3475640044925814795">"Без"</string>
     <string name="color_white" msgid="8045195170201590239">"Бял"</string>
@@ -1595,12 +1605,12 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"Остава: <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> до зареждане"</string>
-    <string name="power_discharging_duration" msgid="7125493014448497620">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – приблизително оставащо време: <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="power_charging" msgid="712751285832976915">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – <xliff:g id="STATE">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration" msgid="4802183864773082009">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – <xliff:g id="TIME">%2$s</xliff:g> до пълно зареждане"</string>
-    <string name="power_charging_duration_ac" msgid="3611179931297824699">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – <xliff:g id="TIME">%2$s</xliff:g> до пълно зарежд. при променлив ток"</string>
-    <string name="power_charging_duration_usb" msgid="1106605348913397583">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – <xliff:g id="TIME">%2$s</xliff:g> до пълно зареждане през USB"</string>
-    <string name="power_charging_duration_wireless" msgid="633606920144617227">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – <xliff:g id="TIME">%2$s</xliff:g> до пълно безжично зареждане"</string>
+    <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> – приблизително оставащо време: <xliff:g id="TIME">%2$s</xliff:g>"</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> до пълно зареждане"</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> до пълно зареждане при променлив ток"</string>
+    <string name="power_charging_duration_usb" msgid="182405645340976546">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> до пълно зареждане през USB"</string>
+    <string name="power_charging_duration_wireless" msgid="1829295708243159464">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> до пълно безжично зареждане"</string>
     <string name="power_usage_list_summary" msgid="2409288197839512482">"Използване от последното пълно зареждане"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Употреба на батерията след изключването"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Употреба на батерията след рестартирането"</string>
@@ -1617,7 +1627,6 @@
     <string name="awake" msgid="387122265874485088">"Активно време на устройство"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Време на включен Wi‑Fi"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Време на включен Wi‑Fi"</string>
-    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> –  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Подробности от историята"</string>
     <string name="details_title" msgid="3792801565213935385">"Подробности за употребата"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Подробности за употреба"</string>
@@ -1689,7 +1698,7 @@
     <string name="battery_saver" msgid="1426682272004907982">"Режим за запазване на батерията"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Автоматично включване"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Никога"</string>
-    <string name="battery_saver_turn_on_automatically_pct" msgid="3033681629861428940">"при %1$d%% батерия"</string>
+    <string name="battery_saver_turn_on_automatically_pct" msgid="7536784431655058267">"при %1$s батерия"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Статистически данни за процесите"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Подробни статистически данни за изпълняващите се процеси"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Използвана памет"</string>
@@ -1813,7 +1822,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"С хардуерна поддръжка"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Само софтуерно"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"Идентификационните данни не са налице за този потребител"</string>
-    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Начертайте фигурата си за отключване"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Трябва да начертаете фигурата си за отключване, за да потвърдите инсталирането на идентификационни данни."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Въведете паролата за хранилището за идентификационни данни."</string>
@@ -1843,6 +1851,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"Включв. на данните от прилож."</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Автоматично възстановяване"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"При повторно инсталиране на приложение да се възстановят настройките и данните от резервното копие"</string>
+    <string name="backup_inactive_title" msgid="5355557151569037197">"Услугата за създ. на резервно копие не е активна."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"Това е зададено от правилата на устройството ви."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Наст. комп.: Парола"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Понастоящем пълните резервни копия за настолен компютър не са защитени"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Докоснете, за да промените или премахнете паролата за пълни резервни копия на настолния компютър"</string>
@@ -1952,7 +1962,11 @@
     <string name="enter_password" msgid="8035706727471334122">"За да стартирате Android, въведете паролата си"</string>
     <string name="enter_pin" msgid="5305333588093263790">"За да стартирате Android, въведете ПИН кода си"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"За да стартирате Android, начертайте фигурата си"</string>
-    <string name="try_again" msgid="4272075051293936921">"Опитайте отново."</string>
+    <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"Грешна фигура"</string>
+    <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"Грешна парола"</string>
+    <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"Грешен ПИН код"</string>
+    <string name="checking_decryption" msgid="8287458611802609493">"Извършва се проверка…"</string>
+    <string name="starting_android" msgid="8581493237458496835">"Android се стартира"</string>
     <string name="delete" msgid="4219243412325163003">"Изтриване"</string>
     <string name="misc_files" msgid="6720680815969643497">"Разни файлове"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"избрани са <xliff:g id="NUMBER">%1$d</xliff:g> от <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -1990,8 +2004,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Винаги да се използва GPU за изграждане на екрана"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"Цвет. простр.: Симулиране"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Трасирания на OpenGL: Акт."</string>
-    <string name="use_nuplayer" msgid="5699257393367904387">"Ползв. на NuPlayer (експ. версия)"</string>
-    <string name="use_nuplayer_summary" msgid="1991479067478516714">"Използване на NuPlayer вместо на AwesomePlayer"</string>
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"Ползв. на AwesomePlayer (оттегл.)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"Ползв. на AwesomePlayer вместо NuPlayer за въпроизв. на повечето мултимедии"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"Маршрут. на аудио чрез USB: Деакт."</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"Авт. маршрут. за периферните у-ва за аудио чрез USB: Деакт."</string>
     <string name="debug_layout" msgid="5981361776594526155">"Граници на оформлението"</string>
@@ -2167,7 +2181,6 @@
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Добавяне на потр. или потр. профил"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Потребител: Добавяне"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Ограничен потребителски профил"</string>
-    <string name="user_summary_managed_profile" msgid="7369539529693048111">"Служебен потребителски профил"</string>
     <string name="user_need_lock_message" msgid="2596365678651842785">"Преди да можете да създадете потребителски профил с ограничена функционалност, трябва да настроите заключения екран, за да защитите приложенията и личните си данни."</string>
     <string name="user_set_lock_button" msgid="8311219392856626841">"Задаване на заключване"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Не е настроен"</string>
@@ -2298,11 +2311,13 @@
     <string name="sim_cellular_data_unavailable_summary" msgid="3654805961942166428">"Докоснете, за да изберете SIM карта за данни"</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"Използване винаги за обаждания"</string>
     <string name="select_sim_for_data" msgid="2366081042162853044">"Изберете SIM карта за данни"</string>
+    <string name="data_switch_started" msgid="2040761479817166311">"SIM картата за данни се превключва. Това може да отнеме до една минута..."</string>
     <string name="select_sim_for_calls" msgid="3503094771801109334">"Обаждане чрез"</string>
     <string name="sim_select_card" msgid="211285163525563293">"Изберете SIM карта"</string>
     <string name="sim_card_number_title" msgid="7845379943474336488">"SIM карта <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"Слотът за SIM карта е празен"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"Име на SIM картата"</string>
+    <string name="sim_name_hint" msgid="7038643345238968930">"Въведете името на SIM картата"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"Слот за SIM карта: %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Оператор"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Номер"</string>
@@ -2312,7 +2327,6 @@
     <string name="color_purple" msgid="3888532466427762504">"лилаво"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"Няма поставени SIM карти"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"Състояние на SIM картата"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"Информация, свързана със SIM картата"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"Обратно обаждане от стандартната SIM карта"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"SIM карта за изходящи обаждания"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Други настройки за обаждане"</string>
@@ -2320,8 +2334,11 @@
     <string name="preferred_network_offload_header" msgid="2321173571529106767">"Излъчв. на името на мрежата: Деакт."</string>
     <string name="preferred_network_offload_footer" msgid="5857279426054744020">"Спирането на излъчв. на името на мрежата ви предотвратява достъпа на трети страни до информ. за нея."</string>
     <string name="preferred_network_offload_popup" msgid="2252915199889604600">"Деакт. на излъчването на името на мрежата ще предотврати автоматичното свързване със скрити мрежи."</string>
+    <string name="sim_signal_strength" msgid="9144010043784767984">"<xliff:g id="DBM">%1$d</xliff:g> dBm, <xliff:g id="ASU">%2$d</xliff:g> asu"</string>
+    <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>
@@ -2330,22 +2347,22 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Скорошни търсения"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Резултати"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"Връзка с WiFi/Wi-Fi мрежа"</string>
-    <string name="keywords_more_default_sms_app" msgid="2744404159003574745">"текстово съобщение"</string>
-    <string name="keywords_more_mobile_networks" msgid="7813380887358745769">"мобилна мрежа, клетка, оператор, безжична мрежа"</string>
+    <string name="keywords_more_default_sms_app" msgid="895656981962034647">"текстово съобщение изпращане на текстови съобщения съобщения"</string>
+    <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"клетъчна мрежа клетка оператор безжична мрежа данни 4g 3g 2g lte"</string>
     <string name="keywords_home" msgid="3626170808219458848">"стартов панел"</string>
     <string name="keywords_display" msgid="6709007669501628320">"екран, сензорен екран"</string>
-    <string name="keywords_display_brightness_level" msgid="8636451602230815191">"затъмнен екран, сензорен екран"</string>
-    <string name="keywords_display_auto_brightness" msgid="8070218600502753102">"затъмнен екран, сензорен екран"</string>
-    <string name="keywords_display_wallpaper" msgid="4315466287469834939">"фон"</string>
+    <string name="keywords_display_brightness_level" msgid="8923289340474728990">"затъмнен екран сензорен екран батерия"</string>
+    <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"затъмнен екран сензорен екран батерия"</string>
+    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"фон персонализиране персонализиране на дисплея"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"размер на текста"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"прожектиране"</string>
-    <string name="keywords_storage" msgid="7007275853993419928">"място, диск, твърд диск"</string>
-    <string name="keywords_battery" msgid="3992479295298655138">"захранване"</string>
-    <string name="keywords_spell_checker" msgid="4509482591225399210">"правопис"</string>
+    <string name="keywords_storage" msgid="6572905220031852173">"място диск твърд диск устройство употреба"</string>
+    <string name="keywords_battery" msgid="2096185085932675704">"разход на енергия зареждане"</string>
+    <string name="keywords_spell_checker" msgid="6106749039734174140">"правописен речник проверка на правописа автоматично коригиране"</string>
     <string name="keywords_voice_input" msgid="3519547605812413860">"услуга за разпознаване, въвеждане, говор, говорене, език, „свободни ръце“, безконтактно разпознаване, обидна дума, звук, история, слушалки с bluetooth"</string>
-    <string name="keywords_text_to_speech_output" msgid="8207889472282225512">"скорост, език, по подразбиране, говорене, говор"</string>
-    <string name="keywords_date_and_time" msgid="7666950126499155141">"часовник"</string>
-    <string name="keywords_factory_data_reset" msgid="3693730656843989732">"изтриване на всички данни, изтриване"</string>
+    <string name="keywords_text_to_speech_output" msgid="392447904221657930">"скорост език по подразбиране говоря говорене синтезиран говор достъпност четец незрящи"</string>
+    <string name="keywords_date_and_time" msgid="2631808108134830066">"часовник 24 часа"</string>
+    <string name="keywords_factory_data_reset" msgid="4355133848707691977">"изтриване на данните изтриване възстановяване изчистване премахване"</string>
     <string name="keywords_printing" msgid="1701778563617114846">"принтер"</string>
     <string name="keywords_sounds_and_notifications" msgid="5965996187974887000">"писукане на високоговорителя"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="2912933812460077912">"не, не безпокойте, прекъсване, интервал на прекъсване"</string>
@@ -2354,7 +2371,7 @@
     <string name="keywords_location_mode" msgid="8584992704568356084">"точност"</string>
     <string name="keywords_accounts" msgid="1957925565953357627">"профил"</string>
     <string name="keywords_users" msgid="4673901601478559100">"ограничение, ограничаване, ограничено"</string>
-    <string name="keywords_keyboard_and_ime" msgid="1103378692379215672">"коригиране на текст, коригиране, звук, вибриране, автоматично, език, жест, предлагане, предложение, тема, обидна дума, тип, емотикон"</string>
+    <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"коригиране на текст коригиране звук вибриране автоматично език жест предлагане предложение тема обидна дума тип емотикони международно"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"плъзгане, парола, фигура, ПИН код"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Маркер за КБП за Wi-Fi: Настр."</string>
     <string name="write_tag" msgid="8571858602896222537">"Записване"</string>
@@ -2371,7 +2388,6 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Сила на звука при известие"</string>
     <string name="zen_mode_settings_title" msgid="7014915558669122902">"Прекъсвания"</string>
     <string name="zen_mode_option_title" msgid="5061978632306007914">"При получаване на обаждания и известия"</string>
-    <string name="zen_mode_option_title_novoice" msgid="6680706009915204785">"При получаване на известия"</string>
     <string name="zen_mode_option_off" msgid="3167702608910820883">"Прекъсване винаги"</string>
     <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Разрешаване само на приоритетни прекъсвания"</string>
     <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Без прекъсване"</string>
@@ -2429,14 +2445,17 @@
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Готово"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Докато не изключите това"</string>
     <string name="zen_mode_important_category" msgid="8123274463331022993">"Приоритетни прекъсвания"</string>
-    <string name="zen_mode_downtime_category" msgid="4730179065426038108">"Престой (само приоритетни прекъсвания)"</string>
+    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Почивка"</string>
     <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Дни"</string>
     <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Няма"</string>
+    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Прекъсванията са разрешени"</string>
+    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Само с приоритет"</string>
+    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Без"</string>
     <string name="zen_mode_automation_category" msgid="4653551005950835761">"Автоматизиране"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Автоматично включване"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Никога"</string>
-    <string name="zen_mode_phone_calls" msgid="8956214416859303966">"Обаждания"</string>
+    <string name="zen_mode_calls" msgid="7051492091133751208">"Обаждания"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Съобщения"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Обаждания/съобщения от"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Всички"</string>
@@ -2450,7 +2469,9 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Делничните вечери"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Начален час"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Краен час"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> на следващия ден"</string>
+    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> на следващия ден"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> или при всеки будилник преди това"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> на следващия ден или при всеки будилник преди това"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Известия за прилож."</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Настройки за известяване"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Изпращане на отзиви за устройството"</string>
@@ -2458,7 +2479,11 @@
     <string name="switch_on_text" msgid="1124106706920572386">"Включване"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Изключване"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"Фиксиране на екрани"</string>
-    <string name="screen_pinning_description" msgid="7091642350452605379">"Когато е включено, можете да използвате фиксирането на екрана, за да се показва текущият изглед, докато не го освободите.\n\nЗа да използвате функцията:\n\n1. Уверете се, че е включена.\n\n2. Отворете екрана, който искате да фиксирате.\n\n3. Докоснете бутона за общ преглед.\n\n4. Докоснете иконата за фиксиране."</string>
+    <string name="screen_pinning_description" msgid="1137904524037468263">"Когато настройката е вкл., можете да фиксирате текущия екран, за да се показва, докато го освободите.\n\nЗа да ползвате фиксирането на екрана:\n\n1. Уверете се, че е включено.\n\n2. Отворете екрана, който искате да фиксирате.\n\n3. Докоснете „Общ преглед“.\n\n4. Прекарайте пръст нагоре и докоснете иконата за фиксиране."</string>
+    <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Запитване за фигура за отключване преди освобождаване"</string>
+    <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Запитване за ПИН код преди освобождаване"</string>
+    <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Запитване за парола преди освобождаване"</string>
+    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Заключване на устройството при освобождаване"</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Служебен потр. профил"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Експериментално)"</string>
     <string name="display_auto_rotate_title" msgid="6176450657107806043">"При завъртане на устройството"</string>
@@ -2467,7 +2492,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Оставане в хоризонтален изглед"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Оставане в текущата ориентация"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"Информация за IMEI"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"Информация относно IMEI"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Шифроване"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Напред"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"Можете да осигурите допълнителен защитен слой за това устройство, като зададете ПИН кодът ви да се изисква при стартиране. Преди въвеждането му няма да могат да се получават обаждания, съобщения или известия. Будилниците също няма да работят. \n\nФункцията помага за защита на данните на загубени или откраднати устройства."</string>
@@ -2485,4 +2509,7 @@
     <string name="encrypt_talkback_dialog_message_pin" msgid="1890374082842868489">"Когато въведете ПИН кода си, за да стартирате това устройство, услугите за достъпност, като например <xliff:g id="SERVICE">%1$s</xliff:g>, още няма да бъдат налични."</string>
     <string name="encrypt_talkback_dialog_message_pattern" msgid="4474332516537386384">"Когато въведете фигурата си, за да стартирате това устройство, услугите за достъпност, като например <xliff:g id="SERVICE">%1$s</xliff:g>, още няма да бъдат налични."</string>
     <string name="encrypt_talkback_dialog_message_password" msgid="8166099418487083927">"Когато въведете паролата си, за да стартирате това устройство, услугите за достъпност, като например <xliff:g id="SERVICE">%1$s</xliff:g>, още няма да бъдат налични."</string>
+    <string name="imei_information_title" msgid="8499085421609752290">"Информация за IMEI"</string>
+    <string name="imei_information_summary" msgid="2074095606556565233">"Информация относно IMEI"</string>
+    <string name="slot_number" msgid="3762676044904653577">"(слот <xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-bn-rBD/arrays.xml b/res/values-bn-rBD/arrays.xml
index d8aed84..2c95367 100644
--- a/res/values-bn-rBD/arrays.xml
+++ b/res/values-bn-rBD/arrays.xml
@@ -527,4 +527,12 @@
     <item msgid="4338089220026248848">"ব্যবহৃত ক্যাশে (কার্যকলাপ ক্লায়েন্ট)"</item>
     <item msgid="6652164677254579050">"ব্যবহৃত ক্যাশে (খালি)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"টিল"</item>
+    <item msgid="8332294763632946560">"নীল"</item>
+    <item msgid="2023216417616991392">"বেগুনি নীলবর্ণ"</item>
+    <item msgid="3170497246594232819">"বেগুনি"</item>
+    <item msgid="4608643045752965568">"গোলাপী"</item>
+    <item msgid="6131821495505931173">"লাল"</item>
+  </string-array>
 </resources>
diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml
index 925b133..c8c9cf6 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>
@@ -180,7 +180,6 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s আপনার বার্তাগুলি অ্যাক্সেস করতে ইচ্ছুক। %2$s এ অ্যাক্সেস দেবেন?"</string>
     <string name="date_and_time" msgid="9062980487860757694">"দিন ও তারিখ"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"সময় অঞ্চল বেছে নিন"</string>
-    <string name="normal_date_format" msgid="7636406984925498359">"আঞ্চলিক (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"পূর্বরূপ:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"হরফের মাপ:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -291,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>
@@ -322,8 +321,6 @@
     <string name="date_time_set_timezone" msgid="5045627174274377814">"সময় অঞ্চল নির্বাচন করুন"</string>
     <string name="date_time_set_date_title" msgid="6928286765325608604">"তারিখ"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"তারিখ সেট করুন"</string>
-    <string name="date_time_date_format_title" msgid="3976171711988766411">"তারিখের বিন্যাস"</string>
-    <string name="date_time_date_format" msgid="6951498879879281102">"তারিখ ফর্ম্যাট চয়ন করুন"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"বর্ণানুক্রমে সাজান"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"সময় অঞ্চলের অনুসারে সাজান"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"তারিখ"</string>
@@ -372,7 +369,8 @@
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"এখন আপনার ফোন এনক্রিপ্ট করা হচ্ছে, অপেক্ষা করুন। <xliff:g id="PERCENT">^1</xliff:g>% সম্পূর্ণ।"</string>
     <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"আপনার ট্যাবলেট এনক্রিপ্ট হওয়া পর্যন্ত অপেক্ষা করুন৷ অবশিষ্ট সময়: <xliff:g id="DURATION">^1</xliff:g>"</string>
     <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"আপনার ফোন এনক্রিপ্ট হওয়া পর্যন্ত অপেক্ষা করুন৷ অবশিষ্ট সময়: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"<xliff:g id="DELAY">^1</xliff:g> সেকেন্ডের মধ্যে আবার চেষ্টা করুন।"</string>
+    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"আপনার ট্যাবলেট আনলক করতে, এটিকে বন্ধ করুন এবং তারপর চালু করুন৷"</string>
+    <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"আপনার ফোন আনলক করতে, এটিকে বন্ধ করুন এবং তারপর চালু করুন৷"</string>
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"সতর্কতা: আনলক করার আরো <xliff:g id="COUNT">^1</xliff:g>টি ব্যর্থ প্রচেষ্টার পর আপনার ডিভাইস সাফ করে ফেলা হবে।"</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"আপনার পাসওয়ার্ড টাইপ করুন"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"এনক্রিপশান অসফল"</string>
@@ -401,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>
@@ -412,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>
@@ -556,13 +556,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"স্পিকার ফোন হিসাবে"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"সঙ্গীত এবং মিডিয়ার জন্য"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"সেটিংস মনে রাখুন"</string>
-    <string name="wifi_assistant_intro_setup" msgid="4605105515416995110">\n"Wi‑Fi সহকারীকে উপস্থাপন করা হচ্ছে"</string>
-    <string name="wifi_assistant_no_thanks" msgid="2776983751990143934">"না,থাক"</string>
-    <string name="wifi_assistant_setup" msgid="3772423650475730906">"সেট আপ"</string>
-    <string name="wifi_assistant_card_message" msgid="107811647784658536">"একটি Wi‑Fi সহকারীর সাহায্যে স্বয়ংক্রিয়ভাবে উপলব্ধ নেটওয়ার্কে সংযুক্ত হোন।"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi‑Fi সহকারী"</string>
-    <string name="wifi_assistant_title_message" msgid="6240721017579074015">"<xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> উপলব্ধ Wi‑Fi এর মধ্যে সেরাটির সাথে স্বয়ংক্রিয়ভাবে আপনাকে সংযুক্ত করে"</string>
-    <string name="wifi_assistant_open_app" msgid="4803044899535675063">"অ্যাপ্লিকেশান খুলুন"</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>
@@ -592,7 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Wi‑Fi সেটিংস"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"ওয়্যারলেস অ্যাক্সেস পয়েন্ট সেট আপ ও পরিচালনা করুন"</string>
-    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Wi‑Fi নির্বাচন করুন"</string>
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Wi‑Fi নেটওয়ার্ক নির্বাচন করুন"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Wi‑Fi নির্বাচন করুন"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Wi‑Fi চালু করা হচ্ছে..."</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Wi‑Fi বন্ধ করা হচ্ছে..."</string>
@@ -607,8 +602,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"স্ক্যান করা সবসময় উপলব্ধ"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"সবসময় স্ক্যান করার অনুমতি দিন"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Google এর অবস্থান পরিষেবা এবং অন্যান্য অ্যাপ্লিকেশানগুলিকে নেটওয়ার্কগুলির খোঁজে স্ক্যান করতে দিন, এমনকি Wi-Fi বন্ধ থাকা অবস্থায়ও"</string>
-    <string name="wifi_automatically_manage_title" msgid="6249976570008992746">"স্বয়ংক্রিয়ভাবে Wi-Fi পরিচালনা করুন"</string>
-    <string name="wifi_automatically_manage_summary" msgid="6952470763378312488">"<xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g>-কে আপনার Wi‑Fi সংযোগ পরিচালনা করতে দিন"</string>
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"উন্মুক্ত Wi‑Fi স্বয়ংক্রিয়ভাবে ব্যবহার করুন"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"কোনো Wi‑Fi সহকারীকে স্বয়ংক্রিয়ভাবে উচ্চ মান হিসাবে নির্ধারিত উন্মুক্ত Wi‑Fi নেটওয়ার্কগুলিতে সংযোগ করতে দিন"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"সহায়ক নির্বাচন করুন"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"শংসাপত্রগুলি ইনস্টল করুন"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"অবস্থান নির্ভুলতা উন্নতি ও অন্যান্য উদ্দ্যেশ্যের জন্য Google এবং অন্যান্য অ্যাপ্লিকেশান কাছাকাছি নেটওয়ার্কগুলির জন্য স্ক্যান করতে পারে  এমনকি Wi-Fi বন্ধ থাকা সত্ত্বেও। আপনি যদি এটি না চান, তাহলে উন্নতিতে, সবসময় স্ক্যান করা উপলব্ধ এ যান।"</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"অ্যাপ্লিকেশানগুলি কাছাকাছি নেটওয়ার্কগুলির জন্য স্ক্যান করতে পারে  এমনকি Wi-Fi বন্ধ থাকা সত্ত্বেও। আপনি যদি এটি না চান, তাহলে উন্নতিতে, সবসময় স্ক্যান করা উপলব্ধ এ যান।"</string>
@@ -629,6 +625,7 @@
     <string name="wifi_menu_scan" msgid="1470911530412095868">"স্ক্যান করুন"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"উন্নত"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"নেটওয়ার্কের সাথে সংযোগ করুন"</string>
+    <string name="wifi_menu_remember" msgid="8814185749388713796">"নেটওয়ার্ক মনে রাখুন"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"নেটওয়ার্ক ভুলে যান"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"নেটওয়ার্ক পরিবর্তন করুন"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"NFC ট্যাগে লিখুন"</string>
@@ -673,9 +670,11 @@
     <string name="wifi_unspecified" msgid="5431501214192991253">"(অনির্দিষ্ট)"</string>
     <string name="wifi_remembered" msgid="4955746899347821096">"সংরক্ষিত"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"অক্ষম হয়েছে"</string>
-    <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"এড়িয়ে যাওয়া দুর্বল ইন্টারনেট সংযোগ"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP কনফিগারেশনের ব্যর্থতা"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"WiFi সংযোগের ব্যর্থতা"</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"প্রমাণীকরণ সমস্যা"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"পরিসরের মধ্যে নয়"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"কোনো ইন্টারনেট অ্যাক্সেস শনাক্ত হয়নি, স্বয়ংক্রিয়ভাবে পুনরায় সংযোগ স্থাপন করবে না৷"</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS উপলব্ধ"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS উপলব্ধ)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"আপনার নেটওয়ার্ক পাসওয়ার্ডটি লিখুন"</string>
@@ -699,9 +698,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"সতর্কবার্তা: আপনি যদি Wi‑Fi এড়িয়ে যান তাহলে আপনার টাবলেট প্রারম্ভিক ডাউনলোড ও আপডেটগুলির জন্য শুধুমাত্র সেলুলার ডেটা ব্যবহার করবে। ডেটা ব্যবহারের সম্ভাব্য চার্জ এড়ানোর জন্য, Wi‑Fi এর সাথে সংযুক্ত হোন।"</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"সতর্কবার্তা: আপনি যদি Wi‑Fi এড়িয়ে যান তাহলে আপনার ডিভাইস প্রারম্ভিক ডাউনলোড ও আপডেটগুলির জন্য শুধুমাত্র সেলুলার ডেটা ব্যবহার করবে। ডেটা ব্যবহারের সম্ভাব্য চার্জ এড়ানোর জন্য, Wi‑Fi এর সাথে সংযুক্ত হোন।"</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"সতর্কবার্তা: আপনি যদি Wi‑Fi এড়িয়ে যান তাহলে আপনার ফোন প্রারম্ভিক ডাউনলোড ও আপডেটগুলির জন্য শুধুমাত্র সেলুলার ডেটা ব্যবহার করবে। ডেটা ব্যবহারের সম্ভাব্য চার্জ এড়ানোর জন্য, Wi‑Fi এর সাথে সংযুক্ত হোন।"</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="2393880108322835846">"সতর্কতা: আপনি যদি Wi‑Fi এড়িয়ে যান, তাহলে প্রারম্ভিক ডাউনলোড অথবা আপডেট করার জন্য আপনার ট্যাবলেট কোনো ইন্টারনেট সংযোগ পাবে না।"</string>
-    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1707391993265558787">"সতর্কতা: আপনি যদি Wi‑Fi এড়িয়ে যান, তাহলে প্রারম্ভিক ডাউনলোড অথবা আপডেট করার জন্য আপনার ডিভাইস কোনো ইন্টারনেট সংযোগ পাবে না।"</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="1556858507920033022">"সতর্কতা: আপনি যদি Wi‑Fi এড়িয়ে যান, তাহলে প্রারম্ভিক ডাউনলোড অথবা আপডেট করার জন্য আপনার ফোন কোনো ইন্টারনেট সংযোগ পাবে না।"</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"যদি আপনি Wi‑Fi এড়িয়ে যান:\n\nআপনার ট্যাবলেটে কোনো ইন্টারনেট সংযোগ থাকবে না৷\n\nআপনি ইন্টারনেটে সংযোগ না করা পর্যন্ত সফ্টওয়্যার আপডেটগুলি পাবেন না৷\n\nএই সময়ে আপনি ডিভাইসের সুরক্ষা বৈশিষ্ট্যগুলি সক্রিয় করতে পারবেন না৷"</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"যদি আপনি Wi‑Fi এড়িয়ে যান:\n\nআপনার ডিভাইসে কোনো ইন্টারনেট সংযোগ থাকবে না৷\n\nআপনি ইন্টারনেটে সংযোগ না করা পর্যন্ত সফ্টওয়্যার আপডেটগুলি পাবেন না৷\n\nএই সময়ে আপনি ডিভাইসের সুরক্ষা বৈশিষ্ট্যগুলি সক্রিয় করতে পারবেন না৷"</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"যদি আপনি Wi‑Fi এড়িয়ে যান:\n\nআপনার ফোনে কোনো ইন্টারনেট সংযোগ থাকবে না৷\n\nআপনি ইন্টারনেটে সংযোগ না করা পর্যন্ত সফ্টওয়্যার আপডেটগুলি পাবেন না৷\n\nএই সময়ে আপনি ডিভাইসের সুরক্ষা বৈশিষ্ট্যগুলি সক্রিয় করতে পারবেন না৷"</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"ট্যাবলেট এই Wi‑Fi নেটওয়ার্কের সাথে সংযোগ স্থাপন করতে অক্ষম।"</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"ডিভাইসটি এই Wi‑Fi নেটওয়ার্কের সাথে সংযুক্ত হতে অক্ষম হয়েছে।"</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"ফোন এই Wi‑Fi নেটওয়ার্কের সাথে সংযোগ স্থাপন করতে অক্ষম।"</string>
@@ -761,7 +760,6 @@
     <string name="ring_volume_title" msgid="7938706566797464165">"রিঙ্গার ভলিউম"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"নিঃশব্দ থাকাকালীন কম্পন"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"ডিফল্ট বিজ্ঞপ্তি শব্দ"</string>
-    <string name="heads_up_enabled_title" msgid="1031078221910921622">"যদি উচ্চ অগ্রাধিকার থাকে তাহলে পপ আপ"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"রিংটোন"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"বিজ্ঞপ্তি"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"বিজ্ঞপ্তির জন্য ইনকামিং কল ভলিউম ব্যবহার করুন"</string>
@@ -834,7 +832,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"স্বয়ংক্রিয় উজ্জ্বলতা"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"সক্রিয় করতে লিফ্ট করুন"</string>
     <string name="doze_title" msgid="2259176504273878294">"অ্যামবিয়েন্ট প্রদর্শন"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"ডিভাইস হাতে তুলে নিলে বা বিজ্ঞপ্তি হাজির হলে স্ক্রীন জাগ্রত করুন"</string>
+    <string name="doze_summary" msgid="7128970177894383698">"যখন আপনি ডিভাইস হাতে নেবেন বা বিজ্ঞপ্তিগুলি গ্রহণ করবেন তখন স্ক্রীন জাগায়"</string>
     <string name="title_font_size" msgid="4405544325522105222">"হরফের আকার"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"হরফের আকার"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"সিম কার্ড লক সেটিংস"</string>
@@ -862,6 +860,10 @@
     <string name="sim_enter_cancel" msgid="6240422158517208036">"বাতিল করুন"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"একাধিক সিম পাওয়া গেছে"</string>
     <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>
+    <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">"ভুল সিম PIN কোড, আপনার ডিভাইসটি আনলক করতে এখন আপনাকে অবশ্যই আপনার ক্যারিয়ারের সাথে যোগাযোগ করতে হবে৷"</string>
   <plurals name="wrong_pin_code">
     <item quantity="one" msgid="4840607930166101114">"ভুল সিম পিন কোড, আপনার কাছে আর <xliff:g id="NUMBER">%d</xliff:g>টি প্রচেষ্টা বাকি রয়েছে, তার পরে আপনার ডিভাইসটি আনলক করতে আপনাকে অবশ্যই আপনার ক্যারিয়ারের সাথে যোগাযোগ করতে হবে৷"</item>
@@ -1012,6 +1014,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"এটি আপনার ট্যাবলেটের "<b>"অভ্যন্তরীণ সঞ্চয়স্থান"</b>", থেকে সমস্ত ডেটা মুছে দেবে, এগুলি সহ:\n\n"<li>"আপনার Google অ্যাকাউন্ট"</li>\n<li>"সিস্টেম এবং অ্যাপ্লিকেশান ডেটা এবং সেটিংস"</li>\n<li>"ডাউনলোড করা অ্যাপ্লিকেশানগুলি"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"এটি আপনার ফোনের "<b>"অভ্যন্তরীণ সঞ্চয়স্থান"</b>" থেকে সমস্ত ডেটা মুছে দেবে, এগুলি সহ: \n\n"<li>"আপনার Google অ্যাকাউন্ট"</li>\n<li>"সিস্টেম এবং অ্যাপ্লিকেশান ডেটা এবং সেটিংস"</li>\n<li>"ডাউনলোড করা অ্যাপ্লিকেশানগুলি"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"আপনি বর্তমানে নিম্নলিখিত অ্যাকাউন্টে সাইন ইন করে আছেন:\n"</string>
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"এই ডিভাইসে অন্যান্য ব্যবহারকারীরাও রয়েছেন৷\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"সঙ্গীত"</li>\n<li>"ফটো"</li>\n<li>"অন্যান্য ব্যবহারকারী ডেটা"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"আপনার সঙ্গীত, ছবি এবং অন্যান্য ব্যবহারকারী ডেটা সাফ করতে, "<b>"USB সঞ্চয়স্থানটিকে"</b>" মুছে দিতে হবে।"</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"আপনার সঙ্গীত, ছবি এবং অন্যান্য ব্যবহারকারী ডেটা সাফ করতে, "<b>"SD কার্ডটিকে"</b>" মুছে দিতে হবে।"</string>
@@ -1023,7 +1026,6 @@
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"ফোন পুনরায় সেট করুন"</string>
     <string name="master_clear_final_desc" msgid="7209547812233487345">"আপনার সমস্ত ব্যক্তিগত ডেটা এবং ডাউনলোড করা অ্যাপ্লিকেশানগুলি মুছে দিতে চান? আপনি পদক্ষেপটি আর বাতিল করতে পারবেন না!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"সবকিছু মুছে দিন"</string>
-    <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"আপনার আনলক প্যাটার্ন আঁকুন"</string>
     <string name="master_clear_gesture_explanation" msgid="826193821455182780">"ফ্যাক্টরি ডেটা রিসেট নিশ্চিত করতে আপনাকে আপনার আনলক প্যাটার্ন অঙ্কন করতে হবে।"</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"সিস্টেম সাফ করুন পরিষেবাটি উপলব্ধ না থাকার কারণে কোনো পুনরায় সেট করুন নির্দেশ সঞ্চালনা করা যায়নি।"</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"পুনরায় সেট করবেন?"</string>
@@ -1041,7 +1043,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"USB সঞ্চয়স্থান মুছে দেবেন? এর ফলে এতে সঞ্চিত সমস্ত ফাইল মুছে যাবে। আপনি পদক্ষেপটি আর বাতিল করতে পারবেন না!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"SD কার্ড মুছবেন? এর ফলে তাতে সঞ্চিত সমস্ত ফাইল মুছে যাবে। আপনি পদক্ষেপটি আর বাতিল করতে পারবেন না!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"সবকিছু মুছে দিন"</string>
-    <string name="media_format_gesture_prompt" msgid="3109349468816856670">"আপনার আনলক প্যাটার্ন আঁকুন"</string>
     <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"আপনি USB সঞ্চয়স্থান নিশ্চিহ্ন করতে চান তা নিশ্চিত করতে আপনাকে আপনার আনলক প্যাটার্ন আঁকতে হবে।"</string>
     <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"আপনি যে SD কার্ড মুছতে চান তা নিশ্চিত করতে আপনাকে আপনার আনলক প্যাটার্ন অঙ্কন করতে হবে।"</string>
     <string name="call_settings_title" msgid="5188713413939232801">"কল সেটিংস"</string>
@@ -1087,6 +1088,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"দয়া করে সিম কার্ড ঢোকান এবং পুনর্সূচনা করুন"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"দয়া করে ইন্টারনেটের সঙ্গে সংযুক্ত হোন"</string>
     <string name="location_title" msgid="1029961368397484576">"আমার অবস্থান"</string>
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"কাজের প্রোফাইল"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"কাজের প্রোফাইলের জন্য অবস্থান"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"আপনার কোম্পানী বন্ধ করেছে"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"মোড"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"উচ্চ পর্যায়ের যথার্থতা"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"ব্যাটারি সঞ্চয়"</string>
@@ -1124,6 +1128,7 @@
     <string name="copyright_title" msgid="865906688917260647">"কপিরাইট"</string>
     <string name="license_title" msgid="1990487604356037871">"লাইসেন্স"</string>
     <string name="terms_title" msgid="7697580845616764642">"চুক্তি এবং শর্তাবলী"</string>
+    <string name="webview_license_title" msgid="2813507464175738967">"সিস্টেম ওয়েবদর্শন লাইসেন্স"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"ওয়ালপেপারগুলি"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"উপগ্রহ চিত্র প্রদানকারী:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"মুক্ত উৎস লাইসেন্স"</string>
@@ -1237,7 +1242,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB সঞ্চয়স্থান"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"SD কার্ডে"</string>
     <string name="disabled" msgid="9206776641295849915">"অক্ষম হয়েছে"</string>
-    <string name="not_installed" msgid="1475144352069281880">"ইনস্টল করা নেই"</string>
+    <string name="not_installed" msgid="2797554494953450291">"এই ব্যবহারকারীর জন্য ইনস্টল করা নেই"</string>
     <string name="no_applications" msgid="7336588977497084921">"কোনো অ্যাপ্লিকেশান নেই"</string>
     <string name="internal_storage" msgid="1584700623164275282">"অভ্যন্তরীণ সঞ্চয়স্থান"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB সঞ্চয়স্থান"</string>
@@ -1434,8 +1439,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"চার্জ হওয়ার স্ক্রীন কখনই নিদ্রা মোডে যাবে না"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Bluetooth HCI স্নুপ লগ সক্ষম করুন"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"একটি ফাইলে সব bluetooth HCI প্যাকেট ক্যাপচার করুন"</string>
-    <string name="oem_unlock_enable" msgid="6629321276287913315">"OEM আনলক সক্রিয় করুন"</string>
-    <string name="oem_unlock_enable_summary" msgid="3546686263996628110">"ডিভাইসকে OEM আনলক হওয়ার জন্য অনুমতি দিন"</string>
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM আনলক করা হচ্ছে"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"বুট-লোডার আনলক করার অনুমতি দিন"</string>
+    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"আপনার PIN লিখুন"</string>
+    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"OEM আনলক সক্ষম করতে ডিভাইস PIN লিখুন"</string>
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"OEM আনলক করার অনুমতি দিতে চান?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"সতর্কতা: এই ডিভাইসে সেটিংটি চালু থাকা অবস্থায় ডিভাইস সুরক্ষা বৈশিষ্ট্যগুলি কাজ করবে না৷"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"ওয়্যারলেস ডিসপ্লে সার্টিফিকেশন"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Wi‑Fi ভারবোস লগিং সক্ষম করুন"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Wi‑Fi থেকে সেলুলারে তৎপর পরিবর্তন"</string>
@@ -1538,6 +1547,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"ক্যাপশান দেওয়া থাকলে এমন দেখায়"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"ডিফল্ট"</string>
+    <string name="color_title" msgid="4258931051732243983">"রঙ"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"ডিফল্ট"</string>
     <string name="color_none" msgid="3475640044925814795">"কোনো কিছুই নয়"</string>
     <string name="color_white" msgid="8045195170201590239">"সাদা"</string>
@@ -1595,12 +1605,12 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"<xliff:g id="REMAIN">%1$s</xliff:g> অবশিষ্ট রয়েছে"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> চার্জ করা বাকি"</string>
-    <string name="power_discharging_duration" msgid="7125493014448497620">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - প্রায়৷ <xliff:g id="TIME">%2$s</xliff:g> বাকি"</string>
-    <string name="power_charging" msgid="712751285832976915">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="STATE">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration" msgid="4802183864773082009">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - পূর্ণ হতে <xliff:g id="TIME">%2$s</xliff:g> সময় লাগবে"</string>
-    <string name="power_charging_duration_ac" msgid="3611179931297824699">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - AC তে পূর্ণ হতে <xliff:g id="TIME">%2$s</xliff:g> সময় লাগবে"</string>
-    <string name="power_charging_duration_usb" msgid="1106605348913397583">"<xliff:g id="LEVEL">%1$d</xliff:g> %% - USB এর মাধ্যমে পূর্ণ হতে <xliff:g id="TIME">%2$s</xliff:g> সময় লাগবে"</string>
-    <string name="power_charging_duration_wireless" msgid="633606920144617227">"<xliff:g id="LEVEL">%1$d</xliff:g> %% - ওয়্যারলেস থেকে পূর্ণ হতে <xliff:g id="TIME">%2$s</xliff:g> সময় লাগবে"</string>
+    <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> - আনুমানিক <xliff:g id="TIME">%2$s</xliff:g> বাকি আছে"</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> বাকি"</string>
+    <string name="power_charging_duration_ac" msgid="3969186192576594254">"<xliff:g id="LEVEL">%1$s</xliff:g> - ACতে সম্পূর্ণ হতে <xliff:g id="TIME">%2$s</xliff:g> বাকি"</string>
+    <string name="power_charging_duration_usb" msgid="182405645340976546">"<xliff:g id="LEVEL">%1$s</xliff:g> - USB এর মাধ্যমে সম্পূর্ণ হতে <xliff:g id="TIME">%2$s</xliff:g> বাকি"</string>
+    <string name="power_charging_duration_wireless" msgid="1829295708243159464">"<xliff:g id="LEVEL">%1$s</xliff:g> -  বেতার যোগে সম্পূর্ণ হতে <xliff:g id="TIME">%2$s</xliff:g> বাকি"</string>
     <string name="power_usage_list_summary" msgid="2409288197839512482">"শেষ সম্পূর্ণ চার্জ করার সময় থেকে যতটা ব্যবহার হয়েছে"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"আনপ্লাগ করার পর থেকে ব্যাটারি ব্যবহার"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"পুনরায় সেট করা থেকে ব্যাটারি ব্যবহার"</string>
@@ -1617,7 +1627,6 @@
     <string name="awake" msgid="387122265874485088">"ডিভাইস জাগ্রত সময়"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi‑Fi চালু থাকা মোট সময়"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi‑Fi চালু থাকা মোট সময়"</string>
-    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"ইতিহাস বিবরণ"</string>
     <string name="details_title" msgid="3792801565213935385">"বিশদ বিবরণ ব্যবহার করুন"</string>
     <string name="details_subtitle" msgid="32593908269911734">"বিশদ বিবরণ ব্যবহার করুন"</string>
@@ -1689,7 +1698,7 @@
     <string name="battery_saver" msgid="1426682272004907982">"ব্যাটারি সেভার"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"স্বয়ংক্রিয়ভাবে চালু হবে"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"কখনও নয়"</string>
-    <string name="battery_saver_turn_on_automatically_pct" msgid="3033681629861428940">"ব্যাটারিতে %1$d%% চার্জ থাকলে"</string>
+    <string name="battery_saver_turn_on_automatically_pct" msgid="7536784431655058267">"%1$s ব্যাটারি থাকলে"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"প্রক্রিয়ার পরিসংখ্যান"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"চলমান প্রক্রিয়াগুলি গিকি পরিসংখ্যান"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"মেমরি ব্যবহৃত"</string>
@@ -1813,7 +1822,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"হার্ডওয়্যার-ব্যাকড"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"শুধুমাত্র সফ্টওয়্যার"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"এই ব্যবহারকারীর জন্য প্রমাণপ্রত্রাদি উপলব্ধ নয়"</string>
-    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"আপনার আনলক প্যাটার্ন অঙ্কন করুন"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"ক্রেডেনশিয়াল ইনস্টলেশন নিশ্চিত করতে আপনাকে আপনার আনলক প্যার্টান অঙ্কন করতে হবে।"</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"প্রমাণপত্রাদির সঞ্চয়স্থানের জন্য পাসওয়ার্ডটি টাইপ করুন।"</string>
@@ -1843,6 +1851,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"অ্যাপ্লিকেশান ডেটা অন্তর্ভুক্ত করুন"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"স্বয়ংক্রিয়ভাবে পুনঃস্থাপন করুন"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"অ্যাপ্লিকেশান পুনরায় ইনস্টল করার সময়, ব্যাক আপ সেটিংস এবং ডেটা পুনরুদ্ধার করুন"</string>
+    <string name="backup_inactive_title" msgid="5355557151569037197">"ব্যাকআপ পরিষেবা নিষ্ক্রিয় রয়েছে৷"</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"এটি আপনার ডিভাইস নীতির অনুসারে সেট করা হয়৷"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"ডেস্কটপ ব্যাকআপ পাসওয়ার্ড"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"ডেস্কটপ পূর্ণ ব্যাকআপ বর্তমানে সুরক্ষিত নয়"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"ডেস্কটপ পুরো ব্যাকআপের জন্য পাসওয়ার্ড পরিবর্তন বা মুছে ফেলার জন্য স্পর্শ করুন"</string>
@@ -1952,7 +1962,11 @@
     <string name="enter_password" msgid="8035706727471334122">"Android শুরু করার জন্য, আপনার পাসওয়ার্ড লিখুন"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Android শুরু করার জন্য, আপনার PIN লিখুন"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Android শুরু করার জন্য, আপনার প্যাটার্ন আঁকুন"</string>
-    <string name="try_again" msgid="4272075051293936921">"আবার চেষ্টা করুন৷"</string>
+    <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"ভুল প্যাটার্ন"</string>
+    <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"ভুল পাসওয়ার্ড"</string>
+    <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"ভুল PIN"</string>
+    <string name="checking_decryption" msgid="8287458611802609493">"পরীক্ষা করা হচ্ছে..."</string>
+    <string name="starting_android" msgid="8581493237458496835">"Android শুরু হচ্ছে"</string>
     <string name="delete" msgid="4219243412325163003">"মুছুন"</string>
     <string name="misc_files" msgid="6720680815969643497">"বিবিধ ফাইলগুলি"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"<xliff:g id="TOTAL">%2$d</xliff:g> এর মধ্যে <xliff:g id="NUMBER">%1$d</xliff:g> নির্বাচিত"</string>
@@ -1990,8 +2004,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"সর্বদা স্ক্রীন কম্পোসিটিংয়ের জন্য GPU ব্যবহার করুন"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"রঙ স্থান নকল করুন"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"OpenGL ট্রেসগুলি সক্ষম করুন"</string>
-    <string name="use_nuplayer" msgid="5699257393367904387">"NuPlayer ব্যবহার করুন (পরীক্ষামূলক)"</string>
-    <string name="use_nuplayer_summary" msgid="1991479067478516714">"পরিবর্তে AwesomePlayer এর NuPlayer ব্যবহার করুন"</string>
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"AwesomePlayer ব্যবহার করুন (অসমর্থিত হয়েছে)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"অধিকাংশ মিডিয়া প্লেব্যাক করার জন্য NuPlayer এর পরিবর্তে AwesomePlayer ব্যবহার করুন"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"USB অডিও রাউটিং অক্ষম করুন"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"USB অডিও যন্ত্রানুষঙ্গে স্বয়ংক্রিয় রাউটিং অক্ষম করুন"</string>
     <string name="debug_layout" msgid="5981361776594526155">"লেআউট সীমাগুলি দেখান"</string>
@@ -2167,7 +2181,6 @@
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"ব্যবহারকারী অথবা প্রোফাইল যোগ করুন"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"ব্যবহারকারীকে যোগ করুন"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"সীমাবদ্ধ প্রোফাইল"</string>
-    <string name="user_summary_managed_profile" msgid="7369539529693048111">"কর্মস্থলের প্রোফাইল"</string>
     <string name="user_need_lock_message" msgid="2596365678651842785">"আপনি একটি সীমাবদ্ধযুক্ত প্রোফাইল তৈরি করার আগে, আপনাকে আপনার অ্যাপ্লিকেশান এবং ব্যক্তিগত ডেটা সুরক্ষিত করার জন্য একটি স্ক্রীন লক সেট আপ করতে হবে।"</string>
     <string name="user_set_lock_button" msgid="8311219392856626841">"লক সেট করুন"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"সেট আপ করা নেই"</string>
@@ -2298,11 +2311,13 @@
     <string name="sim_cellular_data_unavailable_summary" msgid="3654805961942166428">"একটি ডাটা সিম নির্বাচন করার জন্য স্পর্শ করুন"</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"কলের জন্য সবসময় এটি ব্যবহার করুন"</string>
     <string name="select_sim_for_data" msgid="2366081042162853044">"ডেটার জন্য একটি SIM চয়ন করুন"</string>
+    <string name="data_switch_started" msgid="2040761479817166311">"ডেটা SIM পাল্টাতে এক মিনিট পর্যন্ত সময় লাগতে পারে..."</string>
     <string name="select_sim_for_calls" msgid="3503094771801109334">"এর মাধ্যমে কল করুন"</string>
     <string name="sim_select_card" msgid="211285163525563293">"একটি সিম কার্ড নির্বাচন করুন"</string>
     <string name="sim_card_number_title" msgid="7845379943474336488">"সিম <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"সিম খালি"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"সিম এর নাম"</string>
+    <string name="sim_name_hint" msgid="7038643345238968930">"SIM নাম লিখুন"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"SIM স্লট %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"পরিষেবা প্রদানকারী"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"সংখ্যা"</string>
@@ -2312,7 +2327,6 @@
     <string name="color_purple" msgid="3888532466427762504">"বেগুনি"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"কোনো সিম কার্ড ঢোকানো নেই"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"সিম এর স্থিতি"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"সিম সম্পর্কিত তথ্য"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"ডিফল্ট সিম থেকে কল ব্যাক করুন"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"বহির্গামী কলের জন্য সিম"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"অন্যান্য কল সেটিংস"</string>
@@ -2320,8 +2334,11 @@
     <string name="preferred_network_offload_header" msgid="2321173571529106767">"নেটওয়ার্ক নাম সম্প্রচার অক্ষম করুন"</string>
     <string name="preferred_network_offload_footer" msgid="5857279426054744020">"অক্ষম নেটওয়ার্ক নাম সম্প্রচার আপনার নেটওয়ার্ক তথ্যকে তৃতীয় পক্ষের অ্যাক্সেস হওয়া থেকে রক্ষা করে।"</string>
     <string name="preferred_network_offload_popup" msgid="2252915199889604600">"নেটওয়ার্ক নাম সম্প্রচার অক্ষম করলে লুকানো নেটওয়ার্কের সাথে স্বয়ংক্রিয় সংযোগ প্রতিরোধ করা সম্ভব হবে।"</string>
+    <string name="sim_signal_strength" msgid="9144010043784767984">"<xliff:g id="DBM">%1$d</xliff:g> dBm <xliff:g id="ASU">%2$d</xliff:g> asu"</string>
+    <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>
@@ -2330,22 +2347,22 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"সাম্প্রতিক অনুসন্ধানগুলি"</string>
     <string name="search_results_label" msgid="4163304782363526148">"ফলাফল"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi নেটওয়ার্ক সংযোগ"</string>
-    <string name="keywords_more_default_sms_app" msgid="2744404159003574745">"পাঠ্য বার্তা"</string>
-    <string name="keywords_more_mobile_networks" msgid="7813380887358745769">"সেলুলার সেল ক্যারিয়ার ওয়্যারলেস"</string>
+    <string name="keywords_more_default_sms_app" msgid="895656981962034647">"পাঠ্য বার্তা পাঠ্য রচনা বার্তাগুলি বার্তালাপ"</string>
+    <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"সেলুলার ফোন ক্যারিয়ার ওয়্যারলেস ডেটা 4g 3g 2g lte"</string>
     <string name="keywords_home" msgid="3626170808219458848">"লঞ্চার"</string>
     <string name="keywords_display" msgid="6709007669501628320">"স্ক্রীন টাচস্ক্রীন"</string>
-    <string name="keywords_display_brightness_level" msgid="8636451602230815191">"অস্পষ্ট স্ক্রীন টাচস্ক্রীন"</string>
-    <string name="keywords_display_auto_brightness" msgid="8070218600502753102">"অস্পষ্ট স্ক্রীন টাচস্ক্রীন"</string>
-    <string name="keywords_display_wallpaper" msgid="4315466287469834939">"পটভূমি"</string>
+    <string name="keywords_display_brightness_level" msgid="8923289340474728990">"হালকা আলো টাচস্ক্রীন ব্যাটারি"</string>
+    <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"হালকা আলো টাচস্ক্রীন ব্যাটারি"</string>
+    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"পটভূমি ব্যক্তিগতকৃত কাস্টমাইজ প্রদর্শন"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"পাঠ্য আকার"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"অভিক্ষেপ করুন"</string>
-    <string name="keywords_storage" msgid="7007275853993419928">"স্থান ডিস্ক হার্ড ড্রাইভ"</string>
-    <string name="keywords_battery" msgid="3992479295298655138">"পাওয়ার"</string>
-    <string name="keywords_spell_checker" msgid="4509482591225399210">"বানান"</string>
+    <string name="keywords_storage" msgid="6572905220031852173">"স্থান ডিস্ক হার্ড ড্রাইভ ডিভাইস ব্যবহার"</string>
+    <string name="keywords_battery" msgid="2096185085932675704">"পাওয়ার ব্যবহার চার্জ"</string>
+    <string name="keywords_spell_checker" msgid="6106749039734174140">"বানান অভিধান বানান-পরীক্ষা স্বতঃ-সংশোধন"</string>
     <string name="keywords_voice_input" msgid="3519547605812413860">"শনাক্তকারী ইনপুট স্পিচ কথন ভাষা হ্যান্ডসফ্রী হাত বিনামূল্যে শনাক্তকরণ আপত্তিকর শব্দ অডিও ইতিহাস ব্লুটুথ হেডসেট"</string>
-    <string name="keywords_text_to_speech_output" msgid="8207889472282225512">"রেট ভাষা ডিফল্ট কথা বলা বলা"</string>
-    <string name="keywords_date_and_time" msgid="7666950126499155141">"ঘড়ি"</string>
-    <string name="keywords_factory_data_reset" msgid="3693730656843989732">"পুরোপুরি মুছে ফেলুন"</string>
+    <string name="keywords_text_to_speech_output" msgid="392447904221657930">"হার ভাষা ডিফল্ট কথা বলা কথা বলছে tts অ্যাক্সেসযোগ্যতা পাঠক অন্ধ"</string>
+    <string name="keywords_date_and_time" msgid="2631808108134830066">"ক্লক মিলিটারি"</string>
+    <string name="keywords_factory_data_reset" msgid="4355133848707691977">"মুছা মুছুন পুনরুদ্ধার সাফ করুন সরান"</string>
     <string name="keywords_printing" msgid="1701778563617114846">"প্রিন্টার"</string>
     <string name="keywords_sounds_and_notifications" msgid="5965996187974887000">"স্পিকার বীপ"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="2912933812460077912">"না করবেন না বিরক্ত বাধা দেয়া বাধা বিরতি"</string>
@@ -2354,7 +2371,7 @@
     <string name="keywords_location_mode" msgid="8584992704568356084">"নির্ভুলতা"</string>
     <string name="keywords_accounts" msgid="1957925565953357627">"অ্যাকাউন্ট"</string>
     <string name="keywords_users" msgid="4673901601478559100">"বাধানিষেধ বাধানিষেধ আরোপ করা বাধানিষেধযুক্ত"</string>
-    <string name="keywords_keyboard_and_ime" msgid="1103378692379215672">"পাঠ্য সংশোধন সংশোধন করা শব্দ কম্পন স্বয়ংক্রিয় ভাষা অঙ্গভঙ্গি পরামর্শ দেয়া পরামর্শ থিম আপত্তিকর শব্দ প্রকার ইমোজি"</string>
+    <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"পাঠ্য সংশোধন সঠিক শব্দ স্পন্দন স্বয়ং ভাষা অঙ্গভঙ্গি প্রস্তাব প্রস্তাবনা থিম আপত্তিজনক শব্দ লেখা ইমোজি অন্তর্জাতিক"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"পাসওয়ার্ড প্যাটার্ন PIN স্লাইড করুন"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC ট্যাগ সেটআপ করুন"</string>
     <string name="write_tag" msgid="8571858602896222537">"লিখুন"</string>
@@ -2371,7 +2388,6 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"বিজ্ঞপ্তির ভলিউম"</string>
     <string name="zen_mode_settings_title" msgid="7014915558669122902">"কল ও ম্যাসেজ আটকান"</string>
     <string name="zen_mode_option_title" msgid="5061978632306007914">"যখন কল এবং বিজ্ঞপ্তিগুলি আসবে"</string>
-    <string name="zen_mode_option_title_novoice" msgid="6680706009915204785">"যখন বিজ্ঞপ্তিগুলি আসবে"</string>
     <string name="zen_mode_option_off" msgid="3167702608910820883">"সর্বদা বাধা দিন"</string>
     <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"শুধুমাত্র প্রাধান্য কল ও ম্যাসেজ কখন কখন আটকানোর অনুমতি দিন"</string>
     <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"বাধা দেবেন না"</string>
@@ -2427,14 +2443,17 @@
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"সম্পন্ন হয়েছে"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"যতক্ষণ না আপনি এটি বন্ধ করছেন"</string>
     <string name="zen_mode_important_category" msgid="8123274463331022993">"প্রাধান্য পাওয়া কল ও ম্যাসেজ আটকান"</string>
-    <string name="zen_mode_downtime_category" msgid="4730179065426038108">"ডাউনটাইম (শুধুমাত্র প্রাধান্য কল ও ম্যাসেজ আটকান)"</string>
+    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"ডাউনটাইম"</string>
     <string name="zen_mode_downtime_days" msgid="3361856902633311616">"দিন"</string>
     <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"কোনো কিছুই নয়"</string>
+    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"বাধাগুলি অনুমোদিত রয়েছে"</string>
+    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"শুধুমাত্র অগ্রাধিকার"</string>
+    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"একবারও না"</string>
     <string name="zen_mode_automation_category" msgid="4653551005950835761">"অটোমেশন"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"স্বয়ংক্রিয়ভাবে চালু"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"কখনও নয়"</string>
-    <string name="zen_mode_phone_calls" msgid="8956214416859303966">"কলগুলি"</string>
+    <string name="zen_mode_calls" msgid="7051492091133751208">"কল"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"বার্তাগুলি"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"এর থেকে কলগুলি/বার্তাগুলি"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"যে কেউ"</string>
@@ -2448,7 +2467,9 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"প্রতি সোম-শুক্র রাত"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"শুরুর সময়"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"সমাপ্তি সময়"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> পরের দিন"</string>
+    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> পরের দিন"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> বা কোনো অ্যালার্ম বাজার পূর্বে"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> পরের দিন বা কোনো অ্যালার্ম বাজার পূর্বে"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"অ্যাপ বিজ্ঞপ্তিগুলি"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"বিজ্ঞপ্তির সেটিংস"</string>
     <string name="device_feedback" msgid="3238056036766293294">"এই ডিভাইসের সম্পর্কে মতামত পাঠান"</string>
@@ -2456,7 +2477,11 @@
     <string name="switch_on_text" msgid="1124106706920572386">"চালু করুন"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"বন্ধ করুন"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"স্ক্রীন পিন করা"</string>
-    <string name="screen_pinning_description" msgid="7091642350452605379">"চালু থাকাকালীন, আপনার দ্বারা আনপিন না করা পর্যন্ত বর্তমান স্ক্রীনকে দৃশ্যমান করে রাখতে স্ক্রীন পিন করা ব্যবহার করতে পারেন৷\n\nস্ক্রীন পিন করা ব্যবহার করার জন্য:\n\n১. স্ক্রীন পিন করা চালু রয়েছে কিনা তা নিশ্চিত করুন৷\n\n২. আপনি যে স্ক্রীনটিকে পিন করে রাখতে চান সেটি খুলুন৷\n\n৩. এক নজরে-স্পর্শ করুন৷\n\n৪. পিন আইকনে স্পর্শ করুন৷"</string>
+    <string name="screen_pinning_description" msgid="1137904524037468263">"যখন এই সেটিং চালু করা থাকে, তখন আনপিন না করা পর্যন্ত বর্তমান স্ক্রীনটিকে দর্শনে রাখতে আপনি স্ক্রীন পিন ব্যবস্থাটি ব্যবহার করতে পারেন৷\n\nস্ক্রীন পিন করা ব্যবস্থাটি ব্যবহার করতে:\n\n১. স্ক্রীন পিন করা ব্যবস্থাটি চালু আছে কিনা নিশ্চিত করুন৷\n\n২. আপনি যে স্ক্রীনটি পিন করতে চান সেটি খুলুন৷\n\n৩. সংক্ষিপ্ত বিবরণে স্পর্শ করুন৷\n\n৪. উপরের দিকে সোয়াইপ করুন এবং পিন আইকনে স্পর্শ করুন৷"</string>
+    <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"আনপিন করার আগে আনলক প্যাটার্ন চান"</string>
+    <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"আনপিন করার আগে PIN চান"</string>
+    <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"আনপিন করার আগে পাসওয়ার্ড চান"</string>
+    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"আনপিন করার সময় ডিভাইস লক করুন"</string>
     <string name="managed_user_title" msgid="8101244883654409696">"কর্মস্থলের প্রোফাইল"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(পরীক্ষামূলক)"</string>
     <string name="display_auto_rotate_title" msgid="6176450657107806043">"ডিভাইস যখন ঘোরানো হবে"</string>
@@ -2465,7 +2490,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"ভূদৃশ্য দৃশ্যে থাকুন"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"বর্তমান সজ্জায় থাকুন"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI তথ্য"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI আপেক্ষিক তথ্য"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"এনক্রিপশান"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"অবিরত থাকুন"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"আপনি এই ডিভাইসটিকে, সেটি শুরুর আগে আপনার PIN চাইবে, এমন পদ্ধতির মাধ্যমে আরো সুরক্ষিত করতে পারেন। ডিভাইস শুরু না হওয়া পর্যন্ত, এটি অ্যালার্ম সহ কল, বার্তা, বিজ্ঞপ্তি প্রাপ্ত করতে পারবেন না। \n\nআপনার ডিভাইস হারিয়ে বা চুরি হয়ে গেলে ডেটা সুরক্ষার ক্ষেত্রে সহায়তা করে।"</string>
@@ -2483,4 +2507,7 @@
     <string name="encrypt_talkback_dialog_message_pin" msgid="1890374082842868489">"এই ডিভাইসটি চালু করার জন্য যখন আপনি আপনার PIN লিখবেন, তখনও <xliff:g id="SERVICE">%1$s</xliff:g> এর মতো অ্যাক্সেসযোগ্যতা বিষয়ক পরিষেবাগুলি উপলব্ধ হবে না৷"</string>
     <string name="encrypt_talkback_dialog_message_pattern" msgid="4474332516537386384">"এই ডিভাইসটি চালু করার জন্য যখন আপনি আপনার প্যাটার্ন আঁকবেন, তখনও <xliff:g id="SERVICE">%1$s</xliff:g> এর মতো অ্যাক্সেসযোগ্যতা বিষয়ক পরিষেবাগুলি উপলব্ধ হবে না৷"</string>
     <string name="encrypt_talkback_dialog_message_password" msgid="8166099418487083927">"এই ডিভাইসটি চালু করার জন্য যখন আপনি আপনার পাসওয়ার্ড লিখবেন, তখনও <xliff:g id="SERVICE">%1$s</xliff:g> এর মতো অ্যাক্সেসযোগ্যতা বিষয়ক পরিষেবাগুলি উপলব্ধ হবে না৷"</string>
+    <string name="imei_information_title" msgid="8499085421609752290">"IMEI তথ্য"</string>
+    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI আপেক্ষিক তথ্য"</string>
+    <string name="slot_number" msgid="3762676044904653577">"(স্লট<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-ca/arrays.xml b/res/values-ca/arrays.xml
index 9b400bc..ad501bc 100644
--- a/res/values-ca/arrays.xml
+++ b/res/values-ca/arrays.xml
@@ -527,4 +527,12 @@
     <item msgid="4338089220026248848">"A la memòria cau (client de l\'activitat)"</item>
     <item msgid="6652164677254579050">"A la memòria cau (buit)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Verd blavós"</item>
+    <item msgid="8332294763632946560">"Blau"</item>
+    <item msgid="2023216417616991392">"Anyil"</item>
+    <item msgid="3170497246594232819">"Porpra"</item>
+    <item msgid="4608643045752965568">"Rosa"</item>
+    <item msgid="6131821495505931173">"Vermell"</item>
+  </string-array>
 </resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 53039e1..809f30e 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> visible disp. propers amb conf. Bluetooth oberta."</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>
@@ -180,7 +180,6 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s vol accedir als teus missatges. Vols donar-li accés a %2$s?"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Data i hora"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Selecció de la zona horària"</string>
-    <string name="normal_date_format" msgid="7636406984925498359">"Regional (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Previsualitza:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Cos de lletra:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -291,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>
@@ -322,8 +321,6 @@
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Selecciona la zona horària"</string>
     <string name="date_time_set_date_title" msgid="6928286765325608604">"Data"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"Defineix la data"</string>
-    <string name="date_time_date_format_title" msgid="3976171711988766411">"Format de data"</string>
-    <string name="date_time_date_format" msgid="6951498879879281102">"Format de data"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Ordena alfabèticament"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Ordena per zona horària"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Data"</string>
@@ -372,7 +369,8 @@
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Espera mentre s\'encripta el telèfon. <xliff:g id="PERCENT">^1</xliff:g>% completat."</string>
     <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Espera mentre s\'encripta la tauleta. Temps restant: <xliff:g id="DURATION">^1</xliff:g>"</string>
     <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Espera mentre s\'encripta el telèfon. Temps restant: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Torna-ho a provar d\'aquí a <xliff:g id="DELAY">^1</xliff:g> segons."</string>
+    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"Per desbloquejar la tauleta, apaga-la i torna-la a engegar."</string>
+    <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"Per desbloquejar el telèfon, apaga\'l i torna\'l a engegar."</string>
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"Advertiment: si proves de desbloquejar el dispositiu <xliff:g id="COUNT">^1</xliff:g> vegades més de manera incorrecta, se n\'esborraran totes les dades."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Escriu la contrasenya"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"S\'ha produït un error en encriptar"</string>
@@ -401,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>
@@ -412,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>
@@ -556,13 +556,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Com a telèfon amb altaveu"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Per a música i contingut multimèdia"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Recorda la configuració"</string>
-    <string name="wifi_assistant_intro_setup" msgid="4605105515416995110">"Presentem\nl\'assistent de Wi-Fi"</string>
-    <string name="wifi_assistant_no_thanks" msgid="2776983751990143934">"NO, GRÀCIES"</string>
-    <string name="wifi_assistant_setup" msgid="3772423650475730906">"CONFIGURA"</string>
-    <string name="wifi_assistant_card_message" msgid="107811647784658536">"Connecta\'t automàticament a les xarxes disponibles amb un assistent de Wi‑Fi."</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Assistent de Wi‑Fi"</string>
-    <string name="wifi_assistant_title_message" msgid="6240721017579074015">"<xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> et connecta automàticament a la millor xarxa Wi‑Fi disponible."</string>
-    <string name="wifi_assistant_open_app" msgid="4803044899535675063">"OBRE L\'APLICACIÓ"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Connectat mitjançant l\'assistent de Wi‑Fi"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"Emet pantalla"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Activa pantalla sense fil"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"No s\'ha trobat cap dispositiu a prop."</string>
@@ -592,7 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Configuració de Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Configura i gestiona els punts d\'accés sense fil"</string>
-    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Selecciona una xarxa Wi-Fi"</string>
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Selecciona una xarxa Wi‑Fi"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Selecciona una xarxa Wi-Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"S\'està activant la Wi-Fi..."</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"S\'està desactivant la Wi-Fi..."</string>
@@ -607,8 +602,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"Cerca xarxes sempre"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Permet sempre la cerca"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Permet que el servei d\'ubicacions de Google i altres aplicacions cerquin xarxes, fins i tot si la Wi-Fi està desactivada."</string>
-    <string name="wifi_automatically_manage_title" msgid="6249976570008992746">"Gestiona automàticament la Wi‑Fi"</string>
-    <string name="wifi_automatically_manage_summary" msgid="6952470763378312488">"Permet que <xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> gestioni la connexió Wi‑Fi"</string>
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Utilitza automàticament xarxes Wi-Fi obertes"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Permet que un assistent de Wi-Fi es connecti automàticament a les xarxes obertes considerades de bona qualitat"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Tria de l\'assistent"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Instal·la els certificats"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Per millorar la precisió de la ubicació i per a altres finalitats, Google i altres aplicacions poden cercar xarxes properes tot i que la Wi-Fi estigui desactivada. Si no vols que això passi, accedeix a Avançat &gt; Cerca xarxes sempre."</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Les aplicacions poden cercar xarxes properes tot i que la Wi-Fi estigui desactivada. Si no vols que això passi, accedeix a Avançat &gt; Cerca xarxes sempre."</string>
@@ -629,6 +625,7 @@
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Cerca"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Avançat"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Connecta\'t a la xarxa"</string>
+    <string name="wifi_menu_remember" msgid="8814185749388713796">"Recorda la xarxa"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Esborra la xarxa"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Modifica la xarxa"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Escriu a l\'etiqueta de NFC"</string>
@@ -673,9 +670,11 @@
     <string name="wifi_unspecified" msgid="5431501214192991253">"(sense especificar)"</string>
     <string name="wifi_remembered" msgid="4955746899347821096">"Desat"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"Desactivada"</string>
-    <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"S\'ha evitat una mala connexió a Internet"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"Error de configuració d\'IP"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Error de connexió Wi-Fi"</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Problema d\'autenticació"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Fora de l\'abast"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"No s\'ha detectat accés a Internet, no s\'hi tornarà a connectar automàticament."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS disponible"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS disponible)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Introdueix la contrasenya de la xarxa."</string>
@@ -699,9 +698,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"ADVERTIMENT: si omets la connexió Wi‑Fi, la tauleta utilitzarà només les dades mòbils per dur a terme les baixades inicials i les actualitzacions. Per evitar els possibles càrrecs per dades, connecta\'t a la xarxa Wi‑Fi."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"ADVERTIMENT: si omets la connexió Wi‑Fi, el dispositiu utilitzarà només les dades mòbils per dur a terme les baixades inicials i les actualitzacions. Per evitar els possibles càrrecs per dades, connecta\'t a la xarxa Wi‑Fi."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"ADVERTIMENT: si omets la connexió Wi‑Fi, el telèfon utilitzarà només les dades mòbils per dur a terme les baixades inicials i les actualitzacions. Per evitar els possibles càrrecs per dades, connecta\'t a la xarxa Wi‑Fi."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="2393880108322835846">"ADVERTIMENT: si omets la connexió Wi‑Fi, la tauleta no es podrà connectar a Internet per fer les baixades inicials ni les actualitzacions."</string>
-    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1707391993265558787">"ADVERTIMENT: si omets la connexió Wi‑Fi, el dispositiu no es podrà connectar a Internet per fer les baixades inicials ni les actualitzacions."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="1556858507920033022">"ADVERTIMENT: si omets la connexió Wi‑Fi, el telèfon no es podrà connectar a Internet per fer les baixades inicials ni les actualitzacions."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Si omets la Wi‑Fi:\n\nLa tauleta no tindrà connexió a Internet.\n\nNo podràs obtenir actualitzacions de programari fins que no et connectis a Internet.\n\nNo podràs activar les funcions de protecció del dispositiu en aquest moment."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Si omets la Wi‑Fi:\n\nEl dispositiu no tindrà connexió a Internet.\n\nNo podràs obtenir actualitzacions de programari fins que no et connectis a Internet.\nNo podràs activar les funcions de protecció del dispositiu en aquest moment.\n"</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Si omets la Wi‑Fi:\n\nEl telèfon no tindrà connexió a Internet.\n\nNo podràs obtenir actualitzacions de programari fins que no et connectis a Internet.\n\nNo podràs activar les funcions de protecció del dispositiu en aquest moment."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"La tauleta no ha pogut connectar amb aquesta xarxa Wi-Fi."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"El dispositiu no s\'ha pogut connectar a la xarxa Wi‑Fi."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"El telèfon no ha pogut connectar amb aquesta xarxa Wi-Fi."</string>
@@ -761,7 +760,6 @@
     <string name="ring_volume_title" msgid="7938706566797464165">"Volum del timbre"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibra quan estigui en silenci"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"So de notificació predeterminat"</string>
-    <string name="heads_up_enabled_title" msgid="1031078221910921622">"Emergent amb prioritat alta"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"So de trucada"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Notificació"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Utilitza el volum de trucada entrant per a les notificacions"</string>
@@ -834,7 +832,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Brillantor automàtica"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Aixeca\'l per reactivar-lo"</string>
     <string name="doze_title" msgid="2259176504273878294">"Pantalla Ambient"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"Activa la pantalla quan s\'agafa el dispositiu o quan arriben notificacions."</string>
+    <string name="doze_summary" msgid="7128970177894383698">"La pantalla es reactiva en agafar el dispositiu o en rebre notificacions."</string>
     <string name="title_font_size" msgid="4405544325522105222">"Mida del tipus de lletra"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Mida de la lletra"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Configuració de bloqueig de targeta SIM"</string>
@@ -862,6 +860,10 @@
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Cancel·la"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"Diverses SIM detectades"</string>
     <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>
@@ -1012,6 +1014,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Aquesta acció esborrarà totes les dades de l\'"<b>"emmagatzematge intern"</b>" de la tauleta, és a dir:\n\n"<li>"El teu compte de Google"</li>\n<li>"Les dades i la configuració del sistema i de les aplicacions"</li>\n<li>"Les aplicacions baixades"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Aquesta acció esborrarà totes les dades de l\'"<b>"emmagatzematge intern"</b>" del teu telèfon, és a dir:\n\n"<li>"El teu compte de Google"</li>\n<li>"Les dades i la configuració del sistema i de les aplicacions"</li>\n<li>"Les aplicacions baixades"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Actualment has iniciat la sessió als comptes següents:\n"</string>
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"En aquest dispositiu hi ha altres usuaris.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Música"</li>\n<li>"Fotos"</li>\n<li>"Altres dades de l\'usuari"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Per esborrar també música, imatges i altres dades d\'usuari, cal esborrar l\'"<b>"emmagatzematge USB"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Si vols suprimir música, imatges i altres dades de l\'usuari, cal que esborris la "<b>"targeta SD"</b>"."</string>
@@ -1023,7 +1026,6 @@
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Restableix el telèfon"</string>
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Vols esborrar tota la informació personal i les aplicacions baixades? Aquesta acció no es pot desfer."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Esborra-ho tot"</string>
-    <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Dibuixa el patró de desbloqueig"</string>
     <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Has de dibuixar el teu patró de desbloqueig per confirmar el restabliment de dades de fàbrica."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"No s\'ha restablert perquè el servei d\'esborrament del sistema no està disponible."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Restablir?"</string>
@@ -1041,7 +1043,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"Vols esborrar l\'emmagatzematge USB i suprimir tots els fitxers que hi ha emmagatzemats? Aquesta acció no es pot desfer."</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Vols esborrar la targeta SD i suprimir tots els fitxers que hi ha emmagatzemats? Aquesta acció no es pot desfer."</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Esborra-ho tot"</string>
-    <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Crea el teu patró de desbloqueig"</string>
     <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Has de dibuixar el teu patró de desbloqueig per confirmar que vols esborrar l\'emmagatzematge USB."</string>
     <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Has de dibuixar el teu patró de desbloqueig per confirmar que vols esborrar la targeta SD."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Configuració de trucades"</string>
@@ -1087,6 +1088,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Insereix la targeta SIM i reinicia"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Connecta a Internet"</string>
     <string name="location_title" msgid="1029961368397484576">"La meva ubicació"</string>
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Perfil professional"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Ubicació perfil professional"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Desactivada per l\'empresa"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Mode"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Alta precisió"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Estalvi de bateria"</string>
@@ -1124,6 +1128,7 @@
     <string name="copyright_title" msgid="865906688917260647">"Copyright"</string>
     <string name="license_title" msgid="1990487604356037871">"Llicència"</string>
     <string name="terms_title" msgid="7697580845616764642">"Termes i condicions"</string>
+    <string name="webview_license_title" msgid="2813507464175738967">"Llicència de WebView del sistema"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Fons de pantalla"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Proveïdors d\'imatges per satèl·lit:\n©2014 CNES/Astrium, DigitalGlobe, Bluesky"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Llicències de codi obert"</string>
@@ -1237,7 +1242,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Emmagatzematge USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"A la targeta SD"</string>
     <string name="disabled" msgid="9206776641295849915">"Desactivada"</string>
-    <string name="not_installed" msgid="1475144352069281880">"No instal·lada"</string>
+    <string name="not_installed" msgid="2797554494953450291">"No instal·lada per a l\'usuari"</string>
     <string name="no_applications" msgid="7336588977497084921">"No hi ha aplicacions."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Emmagatzematge intern"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Emmagatzematge USB"</string>
@@ -1434,8 +1439,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"La pantalla no entra mai en mode de repòs si el dispositiu està carregant-se"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Activa el registre de cerca HCI de Bluetooth"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Captura tots els paquets HCI de Bluetooth en un fitxer"</string>
-    <string name="oem_unlock_enable" msgid="6629321276287913315">"Activar desbloqueig OEM"</string>
-    <string name="oem_unlock_enable_summary" msgid="3546686263996628110">"Permet que l\'OEM desbloquegi el dispositiu."</string>
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"Desbloqueig d\'OEM"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Permet el desbloqueig del carregador d\'arrencada."</string>
+    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Introdueix el PIN."</string>
+    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Per activar el desbloqueig OEM, introdueix el PIN del dispositiu."</string>
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Vols permetre el desbloqueig d\'OEM?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"ADVERTIMENT: les característiques de protecció del dispositiu no funcionaran mentre aquesta opció estigui activada."</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Certificació de pantalla sense fil"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Activa el registre detallat de la Wi‑Fi"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Traspàs agressiu de Wi-Fi a dades mòbils"</string>
@@ -1520,7 +1529,7 @@
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Activada"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Desactivat"</string>
     <string name="accessibility_feature_or_input_method_not_allowed" msgid="5950315477009501647">"La teva organització no l\'admet."</string>
-    <string name="captioning_preview_title" msgid="1234015253497016890">"Visualització prèvia"</string>
+    <string name="captioning_preview_title" msgid="1234015253497016890">"Previsualització"</string>
     <string name="captioning_standard_options_title" msgid="3284211791180335844">"Opcions estàndard"</string>
     <string name="captioning_locale" msgid="4559155661018823503">"Idioma"</string>
     <string name="captioning_text_size" msgid="6737002449104466028">"Mida del text"</string>
@@ -1538,6 +1547,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"Els subtítols es mostraran així"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"Predeterminat"</string>
+    <string name="color_title" msgid="4258931051732243983">"Color"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"Predeterminat"</string>
     <string name="color_none" msgid="3475640044925814795">"Cap"</string>
     <string name="color_white" msgid="8045195170201590239">"Blanc"</string>
@@ -1595,12 +1605,12 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"Temps restant: <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> per completar la càrrega"</string>
-    <string name="power_discharging_duration" msgid="7125493014448497620">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - Falten <xliff:g id="TIME">%2$s</xliff:g> aproximadament"</string>
-    <string name="power_charging" msgid="712751285832976915">"<xliff:g id="LEVEL">%1$d</xliff:g>%%: <xliff:g id="STATE">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration" msgid="4802183864773082009">"<xliff:g id="LEVEL">%1$d</xliff:g>%%: <xliff:g id="TIME">%2$s</xliff:g> per completar la càrrega"</string>
-    <string name="power_charging_duration_ac" msgid="3611179931297824699">"<xliff:g id="LEVEL">%1$d</xliff:g>%%: <xliff:g id="TIME">%2$s</xliff:g> per completar la càrrega per CA"</string>
-    <string name="power_charging_duration_usb" msgid="1106605348913397583">"<xliff:g id="LEVEL">%1$d</xliff:g>%%: <xliff:g id="TIME">%2$s</xliff:g> per completar la càrrega per USB"</string>
-    <string name="power_charging_duration_wireless" msgid="633606920144617227">"<xliff:g id="LEVEL">%1$d</xliff:g>%%: <xliff:g id="TIME">%2$s</xliff:g> per completar la càrrega sense fil"</string>
+    <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g>: falten aproximadament <xliff:g id="TIME">%2$s</xliff:g>"</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> per completar la càrrega"</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> per completar la càrrega per CA"</string>
+    <string name="power_charging_duration_usb" msgid="182405645340976546">"<xliff:g id="LEVEL">%1$s</xliff:g>: <xliff:g id="TIME">%2$s</xliff:g> per completar la càrrega per USB"</string>
+    <string name="power_charging_duration_wireless" msgid="1829295708243159464">"<xliff:g id="LEVEL">%1$s</xliff:g>: <xliff:g id="TIME">%2$s</xliff:g> per completar la càrrega sense fil"</string>
     <string name="power_usage_list_summary" msgid="2409288197839512482">"Ús des de l\'última vegada que es va carregar per complet"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Ús de la bateria des que s\'ha desconnectat"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Ús de la bateria des que s\'ha restablert"</string>
@@ -1617,7 +1627,6 @@
     <string name="awake" msgid="387122265874485088">"Temps d\'activació del dispositiu"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi a temps"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi a temps"</string>
-    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Detalls de l\'historial"</string>
     <string name="details_title" msgid="3792801565213935385">"Detalls d\'ús"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Detalls d\'ús"</string>
@@ -1689,7 +1698,7 @@
     <string name="battery_saver" msgid="1426682272004907982">"Estalvi de bateria"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Activa automàticament"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Mai"</string>
-    <string name="battery_saver_turn_on_automatically_pct" msgid="3033681629861428940">"amb un %1$d%% de bateria"</string>
+    <string name="battery_saver_turn_on_automatically_pct" msgid="7536784431655058267">"amb un %1$s de bateria"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Estadístiques sobre processos"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Estadístiques sobre els processos en execució"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Ús de la memòria"</string>
@@ -1813,7 +1822,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Emmagatzemat en maquinari"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Només programari"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"Les credencials no estan disponibles per a aquest usuari."</string>
-    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Dibuixa el patró de desbloqueig"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Has de dibuixar el teu patró de desbloqueig per confirmar la instal·lació de les credencials."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Escriu la contrasenya per a l\'emmagatzematge de credencials."</string>
@@ -1843,6 +1851,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"Inclou dades de l\'aplicació"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Restauració automàtica"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Quan tornis a instal·lar una aplicació, restaura la configuració i les dades incloses a la còpia de seguretat"</string>
+    <string name="backup_inactive_title" msgid="5355557151569037197">"El servei de còpia de seguretat està inactiu."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"Es defineix a la política del dispositiu."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Contrasenya per a còpies d\'ordinador"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Les còpies de seguretat d\'ordinador completes no estan protegides"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Toca per canviar o eliminar la contrasenya per a còpies de seguretat d\'ordinador completes"</string>
@@ -1952,7 +1962,11 @@
     <string name="enter_password" msgid="8035706727471334122">"Per iniciar Android, introdueix la contrasenya."</string>
     <string name="enter_pin" msgid="5305333588093263790">"Per iniciar Android, introdueix el PIN."</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Per iniciar Android, dibuixa el patró."</string>
-    <string name="try_again" msgid="4272075051293936921">"Torna-ho a provar."</string>
+    <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"Patró incorrecte"</string>
+    <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"Contrasenya incorrecta"</string>
+    <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"PIN incorrecte"</string>
+    <string name="checking_decryption" msgid="8287458611802609493">"S\'està comprovant..."</string>
+    <string name="starting_android" msgid="8581493237458496835">"S\'està iniciant Android."</string>
     <string name="delete" msgid="4219243412325163003">"Suprimeix"</string>
     <string name="misc_files" msgid="6720680815969643497">"Fitxers diversos"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"s\'han seleccionat <xliff:g id="NUMBER">%1$d</xliff:g> de <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -1990,8 +2004,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Utilitza sempre GPU per combinar pantalles"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"Simula l\'espai de color"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Activa seguiment d\'OpenGL"</string>
-    <string name="use_nuplayer" msgid="5699257393367904387">"Utilitza NuPlayer (exp.)"</string>
-    <string name="use_nuplayer_summary" msgid="1991479067478516714">"Utilitza NuPlayer en lloc d\'AwesomePlayer"</string>
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"Utilitza AwesomePlayer (obsolet)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"Utilitza AwesomePlayer en lloc de NuPlayer per a la majoria de reproduccions multimèdia."</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"Desactiva l\'encaminament d\'àudio USB"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"Desactiva l\'encaminament automàtic als perifèrics d\'àudio USB"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Mostra límits de disseny"</string>
@@ -2100,7 +2114,7 @@
     <string name="data_usage_metered_mobile" msgid="2326986339431119372">"Xarxes mòbils"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Xarxes Wi‑Fi amb mètriques"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Per seleccionar xarxes amb mesurament d\'ús, activa la Wi‑Fi."</string>
-    <string name="data_usage_disclaimer" msgid="6887858149980673444">"El recompte de dades de l\'operador de tel. mòbil pot diferir del del dispositiu."</string>
+    <string name="data_usage_disclaimer" msgid="6887858149980673444">"El recompte de dades de l\'operador de telefonia mòbil pot ser diferent del del dispositiu."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Trucada d\'emergència"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Torna a la trucada"</string>
     <string name="vpn_name" msgid="4689699885361002297">"Nom"</string>
@@ -2167,7 +2181,6 @@
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Afegeix un usuari o un perfil"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Afegeix un usuari"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Perfil restringit"</string>
-    <string name="user_summary_managed_profile" msgid="7369539529693048111">"Perfil professional"</string>
     <string name="user_need_lock_message" msgid="2596365678651842785">"Per crear un perfil restringit, has de configurar una pantalla de bloqueig per protegir les aplicacions i les dades personals."</string>
     <string name="user_set_lock_button" msgid="8311219392856626841">"Defineix el bloqueig"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"No s\'ha configurat"</string>
@@ -2258,7 +2271,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"Gestor de trucades"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2451014351355183338">"Emissions d\'emergència"</string>
+    <string name="cell_broadcast_settings" msgid="2451014351355183338">"Missatges d\'emergència"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"Operadors de xarxa"</string>
     <string name="access_point_names" msgid="1381602020438634481">"Noms dels punts d\'accés"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"Mode LTE 4G millorat"</string>
@@ -2298,11 +2311,13 @@
     <string name="sim_cellular_data_unavailable_summary" msgid="3654805961942166428">"Toca per seleccionar una SIM de dades."</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"Utilitza sempre per a les trucades"</string>
     <string name="select_sim_for_data" msgid="2366081042162853044">"Selecciona una SIM per a les dades"</string>
+    <string name="data_switch_started" msgid="2040761479817166311">"S\'està canviant la SIM de dades. Això pot tardar un minut..."</string>
     <string name="select_sim_for_calls" msgid="3503094771801109334">"Truca mitjançant"</string>
     <string name="sim_select_card" msgid="211285163525563293">"Selecciona una targeta SIM"</string>
     <string name="sim_card_number_title" msgid="7845379943474336488">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"Targeta SIM buida"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"Nom de la targeta SIM"</string>
+    <string name="sim_name_hint" msgid="7038643345238968930">"Introdueix el nom de la SIM"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"Ranura per a la targeta SIM %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Operador de telefonia mòbil"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Número"</string>
@@ -2312,7 +2327,6 @@
     <string name="color_purple" msgid="3888532466427762504">"Porpra"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"No s\'ha inserit cap targeta SIM."</string>
     <string name="sim_status_title" msgid="6744870675182447160">"Estat de la targeta SIM"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"Informació relacionada amb la targeta SIM"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"Torna la trucada des de la SIM predeterminada"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"SIM per a trucades sortints"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Altres opcions de trucades"</string>
@@ -2320,8 +2334,11 @@
     <string name="preferred_network_offload_header" msgid="2321173571529106767">"Desactivar nom de xarxa"</string>
     <string name="preferred_network_offload_footer" msgid="5857279426054744020">"Si desactives l\'emissió del nom de la xarxa, els tercers no podran veure la informació de la xarxa."</string>
     <string name="preferred_network_offload_popup" msgid="2252915199889604600">"Si desactives l\'emissió del nom de la xarxa, no et podràs connectar automàticament a xarxes ocultes."</string>
+    <string name="sim_signal_strength" msgid="9144010043784767984">"<xliff:g id="DBM">%1$d</xliff:g> dBm <xliff:g id="ASU">%2$d</xliff:g> asu"</string>
+    <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>
+    <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Demana-m\'ho cada vegada"</string>
     <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>
@@ -2330,22 +2347,22 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Cerques recents"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Resultats"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"connexió xarxa wifi wi-fi"</string>
-    <string name="keywords_more_default_sms_app" msgid="2744404159003574745">"missatge de text"</string>
-    <string name="keywords_more_mobile_networks" msgid="7813380887358745769">"mòbil telèfon operador de telefonia mòbil sense fil"</string>
+    <string name="keywords_more_default_sms_app" msgid="895656981962034647">"missatge de text missatges de text missatges missatgeria"</string>
+    <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"mòbil telèfon mòbil operador de telefonia mòbil dades sense fil 4g 3g 2g lte"</string>
     <string name="keywords_home" msgid="3626170808219458848">"Launcher"</string>
     <string name="keywords_display" msgid="6709007669501628320">"pantalla pantalla tàctil"</string>
-    <string name="keywords_display_brightness_level" msgid="8636451602230815191">"pantalla atenuada pantalla tàctil"</string>
-    <string name="keywords_display_auto_brightness" msgid="8070218600502753102">"pantalla atenuada pantalla tàctil"</string>
-    <string name="keywords_display_wallpaper" msgid="4315466287469834939">"en segon pla"</string>
+    <string name="keywords_display_brightness_level" msgid="8923289340474728990">"pantalla atenuada pantalla tàctil bateria"</string>
+    <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"pantalla atenuada pantalla tàctil bateria"</string>
+    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"fons de pantalla personalitzar adaptar pantalla"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"mida del text"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"projecte"</string>
-    <string name="keywords_storage" msgid="7007275853993419928">"espai de disc disc dur"</string>
-    <string name="keywords_battery" msgid="3992479295298655138">"potència"</string>
-    <string name="keywords_spell_checker" msgid="4509482591225399210">"ortografia"</string>
+    <string name="keywords_storage" msgid="6572905220031852173">"espai disc unitat de disc dur dispositiu ús"</string>
+    <string name="keywords_battery" msgid="2096185085932675704">"ús de la bateria càrrega"</string>
+    <string name="keywords_spell_checker" msgid="6106749039734174140">"ortografia diccionari corrector ortogràfic correcció automàtica"</string>
     <string name="keywords_voice_input" msgid="3519547605812413860">"reconeixedor entrada veu parlar idioma mans lliures mans-lliures gratuït reconeixement paraula ofensiva àudio historial bluetooth auriculars"</string>
-    <string name="keywords_text_to_speech_output" msgid="8207889472282225512">"puntuar idioma predeterminat parlar parla"</string>
-    <string name="keywords_date_and_time" msgid="7666950126499155141">"rellotge"</string>
-    <string name="keywords_factory_data_reset" msgid="3693730656843989732">"esborrar suprimir"</string>
+    <string name="keywords_text_to_speech_output" msgid="392447904221657930">"puntuar idioma parla predeterminada parlar síntesi de veu accessibilitat lector invident"</string>
+    <string name="keywords_date_and_time" msgid="2631808108134830066">"rellotge 24 hores"</string>
+    <string name="keywords_factory_data_reset" msgid="4355133848707691977">"esborrar suprimir restaurar eliminar suprimir"</string>
     <string name="keywords_printing" msgid="1701778563617114846">"impressora"</string>
     <string name="keywords_sounds_and_notifications" msgid="5965996187974887000">"bip de l\'altaveu"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="2912933812460077912">"no molesteu interrompeu interrupció pausa"</string>
@@ -2354,7 +2371,7 @@
     <string name="keywords_location_mode" msgid="8584992704568356084">"precisió"</string>
     <string name="keywords_accounts" msgid="1957925565953357627">"compte"</string>
     <string name="keywords_users" msgid="4673901601478559100">"restricció restringir restringit"</string>
-    <string name="keywords_keyboard_and_ime" msgid="1103378692379215672">"text correcció correcte so vibració automàtic idioma gest suggerir suggeriment tema paraula ofensiva escriure emoji"</string>
+    <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"text correcció corregir so vibració automàtic idioma gest suggerir suggeriment tema ofensiu paraula tipus emoji internacional"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"fer lliscar el dit, contrasenya, patró, PIN"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Configura l\'etiqueta de NFC per a Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Escriu-hi"</string>
@@ -2371,7 +2388,6 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Volum de notificació"</string>
     <string name="zen_mode_settings_title" msgid="7014915558669122902">"Interrupcions"</string>
     <string name="zen_mode_option_title" msgid="5061978632306007914">"En rebre trucades i notificacions"</string>
-    <string name="zen_mode_option_title_novoice" msgid="6680706009915204785">"Quan es rebin notificacions"</string>
     <string name="zen_mode_option_off" msgid="3167702608910820883">"Interromp sempre"</string>
     <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Permet només interrupcions amb prioritat"</string>
     <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"No interrompis"</string>
@@ -2429,14 +2445,17 @@
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Fet"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Fins que no ho desactivis"</string>
     <string name="zen_mode_important_category" msgid="8123274463331022993">"Interrupcions amb prioritat"</string>
-    <string name="zen_mode_downtime_category" msgid="4730179065426038108">"Temps inactiu (només interrupcions amb prioritat)"</string>
+    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Temps d\'inactivitat"</string>
     <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Dies"</string>
     <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Cap"</string>
+    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Interrupcions permeses"</string>
+    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Només amb prioritat"</string>
+    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Cap"</string>
     <string name="zen_mode_automation_category" msgid="4653551005950835761">"Automatització"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Activa automàticament"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Mai"</string>
-    <string name="zen_mode_phone_calls" msgid="8956214416859303966">"Trucades"</string>
+    <string name="zen_mode_calls" msgid="7051492091133751208">"Trucades"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Missatges"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Trucades i missatges de"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Qualsevol usuari"</string>
@@ -2450,7 +2469,9 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Nits entre setmana"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Hora d\'inici"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Hora de finalització"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> del dia següent"</string>
+    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"A les <xliff:g id="FORMATTED_TIME">%s</xliff:g> del dia següent"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"A les <xliff:g id="FORMATTED_TIME">%s</xliff:g> o amb qualsevol alarma anterior"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"A les <xliff:g id="FORMATTED_TIME">%s</xliff:g> del dia següent o amb qualsevol alarma anterior"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Notificacions d\'aplicacions"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Configuració de les notificacions"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Comentaris sobre aquest dispositiu"</string>
@@ -2458,16 +2479,19 @@
     <string name="switch_on_text" msgid="1124106706920572386">"Activat"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Desactivat"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"Fixació de pantalla"</string>
-    <string name="screen_pinning_description" msgid="7091642350452605379">"Si l\'opció per fixar la pantalla està activada, pots fer-la servir per mantenir la pantalla actual en primer pla fins que no n\'anul·lis la fixació.\n\nPer fixar la pantalla:\n\n1. Comprova que tinguis l\'opció activada.\n\n2. Obre la pantalla que vols fixar.\n\n3. Toca Visió general.\n\n4. Toca la icona de la xinxeta."</string>
+    <string name="screen_pinning_description" msgid="1137904524037468263">"Quan aquest paràmetre estigui activat, pots fixar la pantalla per mantenir visible la pantalla actual fins que no n\'anul·lis la fixació.\n\nFes el següent:\n\n1. Assegura\'t que la fixació de la pantalla estigui activada.\n\n2. Obre la pantalla que vulguis fixar.\n\n3. Toca Visió general.\n\n4. Fes lliscar el dit cap amunt i toca la icona de fixar."</string>
+    <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Sol·licita el patró de desbloqueig abans d\'anul·lar la fixació"</string>
+    <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Demana el codi PIN abans d\'anul·lar la fixació"</string>
+    <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Demana la contrasenya abans d\'anul·lar la fixació"</string>
+    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Bloqueja el dispositiu en anul·lar la fixació"</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Perfil professional"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Experimental)"</string>
     <string name="display_auto_rotate_title" msgid="6176450657107806043">"Quan el dispositiu està girat"</string>
     <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Gira el contingut de la pantalla"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Continua amb l\'orientació vertical"</string>
+    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Continua amb el mode vertical"</string>
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Continua amb l\'orientació horitzontal"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Continua amb l\'orientació actual"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"Informació sobre l\'IMEI"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"Informació relativa a l\'IMEI"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Encriptació"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Continua"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"Per protegir encara més el dispositiu, pots sol·licitar el PIN abans que no s\'iniciï. Fins que no s\'inicia no pot rebre trucades, missatges ni notificacions, incloses alarmes.\n\nAixò permet protegir les dades dels dispositius perduts o robats."</string>
@@ -2485,4 +2509,7 @@
     <string name="encrypt_talkback_dialog_message_pin" msgid="1890374082842868489">"Quan introdueixis el teu PIN per iniciar aquest dispositiu, els serveis d\'accessibilitat com ara <xliff:g id="SERVICE">%1$s</xliff:g> encara no estaran disponibles."</string>
     <string name="encrypt_talkback_dialog_message_pattern" msgid="4474332516537386384">"Quan introdueixis el teu patró per iniciar aquest dispositiu, els serveis d\'accessibilitat com ara <xliff:g id="SERVICE">%1$s</xliff:g> encara no estaran disponibles."</string>
     <string name="encrypt_talkback_dialog_message_password" msgid="8166099418487083927">"Quan introdueixis la teva contrasenya per iniciar aquest dispositiu, els serveis d\'accessibilitat com ara <xliff:g id="SERVICE">%1$s</xliff:g> encara no estaran disponibles."</string>
+    <string name="imei_information_title" msgid="8499085421609752290">"Informació sobre l\'IMEI"</string>
+    <string name="imei_information_summary" msgid="2074095606556565233">"Informació relativa a l\'IMEI"</string>
+    <string name="slot_number" msgid="3762676044904653577">"(Ranura <xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-cs/arrays.xml b/res/values-cs/arrays.xml
index 35265fb..2d7e311 100644
--- a/res/values-cs/arrays.xml
+++ b/res/values-cs/arrays.xml
@@ -88,7 +88,7 @@
     <item msgid="8934131797783724664">"Vyhledávání..."</item>
     <item msgid="8513729475867537913">"Připojování..."</item>
     <item msgid="515055375277271756">"Ověřování..."</item>
-    <item msgid="1943354004029184381">"Načítání adresy IP…"</item>
+    <item msgid="1943354004029184381">"Načítání IP adresy…"</item>
     <item msgid="4221763391123233270">"Připojeno"</item>
     <item msgid="624838831631122137">"Pozastaveno"</item>
     <item msgid="7979680559596111948">"Odpojování..."</item>
@@ -102,7 +102,7 @@
     <item msgid="8878186979715711006">"Vyhledávání..."</item>
     <item msgid="355508996603873860">"Připojování k síti <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
     <item msgid="554971459996405634">"Ověřování v síti <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
-    <item msgid="7928343808033020343">"Získávání adresy IP ze sítě <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="7928343808033020343">"Získávání IP adresy ze sítě <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
     <item msgid="8937994881315223448">"Připojeno k síti <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
     <item msgid="1330262655415760617">"Pozastaveno"</item>
     <item msgid="7698638434317271902">"Odpojování od sítě <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
@@ -527,4 +527,12 @@
     <item msgid="4338089220026248848">"V mezipaměti (klient aktivity)"</item>
     <item msgid="6652164677254579050">"V mezipaměti (prázdné)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Šedozelená"</item>
+    <item msgid="8332294763632946560">"Modrá"</item>
+    <item msgid="2023216417616991392">"Indigo"</item>
+    <item msgid="3170497246594232819">"Nachová"</item>
+    <item msgid="4608643045752965568">"Růžová"</item>
+    <item msgid="6131821495505931173">"Červená"</item>
+  </string-array>
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index c40c49d..2150cee 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>
@@ -180,7 +180,6 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"Zařízení %1$s žádá o přístup k vašim zprávám. Povolit přístup zařízení %2$s?"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Datum a čas"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Vybrat časové pásmo"</string>
-    <string name="normal_date_format" msgid="7636406984925498359">"Regionální (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Náhled:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Velikost písma:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -291,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>
@@ -308,7 +307,7 @@
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Datum a čas"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Nastavit datum a čas"</string>
     <string name="date_and_time_settings_summary" msgid="7095318986757583584">"Umožňuje nastavit datum, čas, časové pásmo a formát"</string>
-    <string name="date_time_auto" msgid="7076906458515908345">"Automatický datum a čas"</string>
+    <string name="date_time_auto" msgid="7076906458515908345">"Automatické datum a čas"</string>
     <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Použít čas ze sítě"</string>
     <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"Použít čas ze sítě"</string>
     <string name="zone_auto" msgid="334783869352026648">"Automatické čas. pásmo"</string>
@@ -322,8 +321,6 @@
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Volba časového pásma"</string>
     <string name="date_time_set_date_title" msgid="6928286765325608604">"Datum"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"Nastavení data"</string>
-    <string name="date_time_date_format_title" msgid="3976171711988766411">"Formát data"</string>
-    <string name="date_time_date_format" msgid="6951498879879281102">"Vybrat formát data"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Řadit abecedně"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Řadit podle časového pásma"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Datum"</string>
@@ -372,7 +369,8 @@
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Počkejte prosím, než bude telefon zašifrován. Dokončeno: <xliff:g id="PERCENT">^1</xliff:g> %"</string>
     <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Počkejte prosím, než bude tablet zašifrován. Zbývající čas: <xliff:g id="DURATION">^1</xliff:g>"</string>
     <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Počkejte prosím, než bude telefon zašifrován. Zbývající čas: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Zkuste to znovu za: <xliff:g id="DELAY">^1</xliff:g> s."</string>
+    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"Chcete-li tablet odemknout, vypněte jej a poté jej znovu zapněte."</string>
+    <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"Chcete-li telefon odemknout, vypněte jej a poté jej znovu zapněte."</string>
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"Upozornění: Po <xliff:g id="COUNT">^1</xliff:g> dalších neúspěšných pokusech o odemknutí bude zařízení vymazáno!"</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Zadejte heslo"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Šifrování se nezdařilo"</string>
@@ -401,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>
@@ -412,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>
@@ -556,13 +556,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Jako telefon pro hlasitý poslech"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Pro hudbu a média"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Zapamatovat nastavení"</string>
-    <string name="wifi_assistant_intro_setup" msgid="4605105515416995110">"Představujeme\nasistenta Wi-Fi"</string>
-    <string name="wifi_assistant_no_thanks" msgid="2776983751990143934">"NE, DĚKUJI"</string>
-    <string name="wifi_assistant_setup" msgid="3772423650475730906">"NASTAVIT"</string>
-    <string name="wifi_assistant_card_message" msgid="107811647784658536">"Připojte se k dostupným sítím automaticky pomocí aplikace Google Wi-Fi Assistant."</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Google Wi‑Fi Assistant"</string>
-    <string name="wifi_assistant_title_message" msgid="6240721017579074015">"<xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> vás automaticky připojí k nejlepší dostupné síti Wi‑Fi"</string>
-    <string name="wifi_assistant_open_app" msgid="4803044899535675063">"SPUSTIT APLIKACI"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Připojeno pomocí asistenta připojení Wi-Fi"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"Odesílání obrazovky"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Povolit bezdrátový displej"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"V okolí nebyla nalezena žádná zařízení."</string>
@@ -592,7 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Nastavení Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Umožňuje nastavit a spravovat přístupové body bezdrátové sítě"</string>
-    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Vyberte síť Wi-Fi"</string>
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Vyberte síť Wi-Fi"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Vyberte síť Wi-Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Zapínání Wi‑Fi…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Vypínání Wi‑Fi…"</string>
@@ -607,8 +602,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"Hledání vždy zapnuto"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Vždy povolit vyhledávání sítí"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Povolit službě určování polohy Google a ostatním aplikacím hledat sítě, i když je síť Wi-Fi vypnutá"</string>
-    <string name="wifi_automatically_manage_title" msgid="6249976570008992746">"Automaticky spravovat připojení Wi‑Fi"</string>
-    <string name="wifi_automatically_manage_summary" msgid="6952470763378312488">"Nechat nástroj <xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> spravovat připojení Wi-Fi"</string>
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Automaticky používat otevřené sítě Wi-Fi"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Nechat asistenta Wi‑Fi automaticky se připojit ke kvalitním otevřeným sítím"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Zvolit asistenta"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Instalace certifikátů"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Za účelem zvýšení přesnosti a k dalším účelům mohou aplikace Google a další aplikace vyhledávat sítě Wi-Fi v okolí, i když je Wi-Fi vypnuta. Chcete-li toto zakázat, přejděte do nabídky Wi-Fi &gt; Rozšířené nastavení &gt; Hledání vždy zapnuto."</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Aplikace mohou vyhledávat sítě v okolí i v případě, že je Wi-Fi vypnuta. Chcete-li nastavení změnit, přejděte do nabídky Rozšířené nastavení &gt; Hledání vždy zapnuto."</string>
@@ -629,6 +625,7 @@
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Vyhledávání"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Rozšířené nastavení"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Připojit k síti"</string>
+    <string name="wifi_menu_remember" msgid="8814185749388713796">"Zapamatovat síť"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Odstranit záznam sítě"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Upravit síť"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Zápis na štítek NFC"</string>
@@ -673,9 +670,11 @@
     <string name="wifi_unspecified" msgid="5431501214192991253">"(neurčeno)"</string>
     <string name="wifi_remembered" msgid="4955746899347821096">"Uloženo"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"Vypnuto"</string>
-    <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Bylo zabráněno slabému připojení"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"Selhání konfigurace protokolu IP"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Selhání připojení Wi-Fi"</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Problém s ověřením"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Mimo dosah"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Nebyl zjištěn žádný přístup k internetu, připojení nebude automaticky obnoveno."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS je k dispozici"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS je k dispozici)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Zadejte heslo sítě"</string>
@@ -699,9 +698,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"UPOZORNĚNÍ: Pokud přeskočíte nastavení Wi-Fi, tablet ke stažení počátečních souborů a aktualizací použije pouze mobilní datové připojení. Chcete-li zabránit možným poplatkům za přenos dat, připojte se k síti Wi‑Fi."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"UPOZORNĚNÍ: Pokud přeskočíte nastavení Wi-Fi, zařízení ke stažení počátečních souborů a aktualizací použije pouze mobilní datové připojení. Chcete-li zabránit možným poplatkům za přenos dat, připojte se k síti Wi‑Fi."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"UPOZORNĚNÍ: Pokud přeskočíte nastavení Wi-Fi, telefon ke stažení počátečních souborů a aktualizací použije pouze mobilní datové připojení. Chcete-li zabránit možným poplatkům za přenos dat, připojte se k síti Wi‑Fi."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="2393880108322835846">"UPOZORNĚNÍ: Pokud nastavení sítě Wi‑Fi přeskočíte, tablet nebude mít připojení k internetu ke stažení počátečních souborů a aktualizací."</string>
-    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1707391993265558787">"UPOZORNĚNÍ: Pokud nastavení sítě Wi‑Fi přeskočíte, zařízení nebude mít připojení k internetu ke stažení počátečních souborů a aktualizací."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="1556858507920033022">"UPOZORNĚNÍ: Pokud nastavení sítě Wi‑Fi přeskočíte, telefon nebude mít připojení k internetu ke stažení počátečních souborů a aktualizací."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Pokud síť Wi‑Fi přeskočíte:\n\nTablet nebude mít připojení k internetu.\n\nDokud se nepřipojíte k internetu, nebudete dostávat aktualizace softwaru.\n\nNemůžete nyní aktivovat funkce ochrany zařízení."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Pokud síť Wi‑Fi přeskočíte:\n\nZařízení nebude mít připojení k internetu.\n\nDokud se nepřipojíte k internetu, nebudete dostávat aktualizace softwaru.\n\nNemůžete nyní aktivovat funkce ochrany zařízení."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Pokud síť Wi‑Fi přeskočíte:\n\nTelefon nebude mít připojení k internetu.\n\nDokud se nepřipojíte k internetu, nebudete dostávat aktualizace softwaru.\n\nNemůžete nyní aktivovat funkce ochrany zařízení."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Tabletu se nepodařilo připojit k této síti Wi-Fi."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"Zařízení se k této síti Wi-Fi nemohlo připojit."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Telefonu se nepodařilo připojit k této síti Wi-Fi."</string>
@@ -761,7 +760,6 @@
     <string name="ring_volume_title" msgid="7938706566797464165">"Hlasitost vyzvánění"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrovat v tichém režimu"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Výchozí zvuk oznámení"</string>
-    <string name="heads_up_enabled_title" msgid="1031078221910921622">"Prioritní ve vyskak. okně"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Vyzváněcí tón"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Oznámení"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Použije hlasitost příchozích hovorů také pro oznámení"</string>
@@ -834,7 +832,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatický jas"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Probudit zvednutím zařízení"</string>
     <string name="doze_title" msgid="2259176504273878294">"Ambientní displej"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"Probudit obrazovku při zvednutí zařízení nebo příjetí oznámení"</string>
+    <string name="doze_summary" msgid="7128970177894383698">"Odemknout obrazovku, když zvednete zařízení nebo vám přijde upozornění"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Velikost písma"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Velikost písma"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Nastavení zámku SIM karty"</string>
@@ -862,6 +860,10 @@
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Zrušit"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"Bylo nalezeno několik SIM karet"</string>
     <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>
+    <string name="sim_preferred_title" msgid="5567909634636045268">"Změnit preferovanou SIM kartu?"</string>
+    <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> je jediná SIM karta v zařízení. Chcete tuto SIM kartu použít k mobilnímu datovému připojení, volání a odesílání zpráv SMS?"</string>
     <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>
@@ -1012,6 +1014,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Tato akce smaže veškerá data z "<b>"interního úložiště"</b>" tabletu, mimo jiné následují:\n\n"<li>"váš účet Google"</li>\n<li>"nastavení a data systému a aplikací"</li>\n<li>"stažené aplikace"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Tato akce smaže veškerá data z "<b>"interního úložiště"</b>" telefonu, mimo jiné i následující:\n\n"<li>"váš účet Google"</li>\n<li>"nastavení a data systému a aplikací"</li>\n<li>"stažené aplikace"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Aktuálně jste přihlášeni k těmto účtům:\n"</string>
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"V tomto zařízení jsou přítomni další uživatelé.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Hudba"</li>\n<li>"Fotky"</li>\n<li>"další uživatelské údaje"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Chcete-li smazat také hudbu, obrázky a další uživatelská data, je potřeba vymazat "<b>"úložiště USB"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Chcete-li smazat také hudbu, obrázky a další uživatelská data, je potřeba vymazat "<b>"kartu SD"</b>"."</string>
@@ -1023,7 +1026,6 @@
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Resetovat telefon"</string>
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Chcete smazat všechny osobní informace a stažené aplikace? Tuto akci nelze vrátit zpět."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Odstranit vše"</string>
-    <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Proveďte gesto odemknutí"</string>
     <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Chcete-li potvrdit obnovení továrních dat, musíte nakreslit bezpečnostní gesto."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Pokus o obnovení se nezdařil, protože služba System Clear není dostupná."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Resetovat?"</string>
@@ -1041,7 +1043,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"Chcete úložiště USB smazat a odstranit tak všechny soubory, které jsou v něm uloženy? Tuto akci nelze vrátit zpět."</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Chcete kartu SD smazat a odstranit tak všechny soubory, které jsou na ní uloženy? Tuto akci nelze vrátit zpět."</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Odstranit vše"</string>
-    <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Proveďte gesto odemknutí"</string>
     <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Smazání úložiště USB je třeba potvrdit pomocí bezpečnostního gesta."</string>
     <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Smazání karty SD je třeba potvrdit pomocí bezpečnostního gesta."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Nastavení hovorů"</string>
@@ -1087,6 +1088,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Vložte SIM kartu a restartujte zařízení."</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Připojte se prosím k internetu."</string>
     <string name="location_title" msgid="1029961368397484576">"Moje poloha"</string>
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Pracovní profil"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Umístění pracovního profilu"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Vypnuto vaší společností"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Režim určování polohy"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Vysoká přesnost"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Úspora baterie"</string>
@@ -1124,6 +1128,7 @@
     <string name="copyright_title" msgid="865906688917260647">"Autorská práva"</string>
     <string name="license_title" msgid="1990487604356037871">"Licence"</string>
     <string name="terms_title" msgid="7697580845616764642">"Smluvní podmínky"</string>
+    <string name="webview_license_title" msgid="2813507464175738967">"Systémová licence WebView"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Tapety"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Poskytovatelé satelitních snímků:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Licence open source"</string>
@@ -1237,7 +1242,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Úložiště USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Na kartě SD"</string>
     <string name="disabled" msgid="9206776641295849915">"Deaktivováno"</string>
-    <string name="not_installed" msgid="1475144352069281880">"Není nainstalováno"</string>
+    <string name="not_installed" msgid="2797554494953450291">"Pro tohoto uživ. nenainstal."</string>
     <string name="no_applications" msgid="7336588977497084921">"Žádné aplikace"</string>
     <string name="internal_storage" msgid="1584700623164275282">"Interní úložiště"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Úložiště USB"</string>
@@ -1319,7 +1324,7 @@
     <string name="running_processes_header_footer" msgid="723908176275428442">"Využití paměti RAM aplikacemi"</string>
     <string name="running_processes_header_system_prefix" msgid="6104153299581682047">"Systém"</string>
     <string name="running_processes_header_apps_prefix" msgid="5787594452716832727">"Aplikace"</string>
-    <string name="running_processes_header_free_prefix" msgid="4620613031737078415">"Volné"</string>
+    <string name="running_processes_header_free_prefix" msgid="4620613031737078415">"Volná"</string>
     <string name="running_processes_header_used_prefix" msgid="5924288703085123978">"Využito"</string>
     <string name="running_processes_header_cached_prefix" msgid="7950853188089434987">"V mezipaměti"</string>
     <string name="running_processes_header_ram" msgid="996092388884426817">"<xliff:g id="RAM_0">%1$s</xliff:g> RAM"</string>
@@ -1434,8 +1439,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Obrazovka se při nabíjení nepřepne do režimu spánku"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Povolit protokol Bluetooth HCI"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Zachytit všechny pakety Bluetooth HCI do souboru"</string>
-    <string name="oem_unlock_enable" msgid="6629321276287913315">"Povolit odemknutí OEM"</string>
-    <string name="oem_unlock_enable_summary" msgid="3546686263996628110">"Povolit, aby zařízení bylo ve stavu odemknutí OEM"</string>
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"Odemknutí OEM"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Povolit odemknutí zavaděče"</string>
+    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Zadejte kód PIN"</string>
+    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Chcete-li povolit odemknutí OEM, zadejte kód PIN zařízení."</string>
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Povolit odemknutí OEM?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"UPOZORNĚNÍ: Pokud bude toto nastavení zapnuto, nebudou v tomto zařízení fungovat funkce ochrany zařízení."</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Certifikace bezdrátového displeje"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Povolit podrobné protokolování Wi‑Fi"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Agresivní předání z Wi-Fi na mobilní síť"</string>
@@ -1538,6 +1547,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"Titulky budou vypadat takto"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"Výchozí"</string>
+    <string name="color_title" msgid="4258931051732243983">"Barva"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"Výchozí"</string>
     <string name="color_none" msgid="3475640044925814795">"Žádná"</string>
     <string name="color_white" msgid="8045195170201590239">"Bílá"</string>
@@ -1595,12 +1605,12 @@
     <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">"Zbývá <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> do nabití"</string>
-    <string name="power_discharging_duration" msgid="7125493014448497620">"<xliff:g id="LEVEL">%1$d</xliff:g> %% – zbývá přibližně <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="power_charging" msgid="712751285832976915">"<xliff:g id="LEVEL">%1$d</xliff:g> %% – <xliff:g id="STATE">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration" msgid="4802183864773082009">"<xliff:g id="LEVEL">%1$d</xliff:g> %% – <xliff:g id="TIME">%2$s</xliff:g> do úplného nabití"</string>
-    <string name="power_charging_duration_ac" msgid="3611179931297824699">"<xliff:g id="LEVEL">%1$d</xliff:g> %% – <xliff:g id="TIME">%2$s</xliff:g> do úplného nabití adaptérem"</string>
-    <string name="power_charging_duration_usb" msgid="1106605348913397583">"<xliff:g id="LEVEL">%1$d</xliff:g> %% – <xliff:g id="TIME">%2$s</xliff:g> do úplného nabití pomocí USB"</string>
-    <string name="power_charging_duration_wireless" msgid="633606920144617227">"<xliff:g id="LEVEL">%1$d</xliff:g> %% – <xliff:g id="TIME">%2$s</xliff:g> do úplného nabití bezdrátově"</string>
+    <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> – zbývá přibližně <xliff:g id="TIME">%2$s</xliff:g>"</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> do úplného nabití"</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> do úplného nabití ze zásuvky"</string>
+    <string name="power_charging_duration_usb" msgid="182405645340976546">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> do úplného nabití přes USB"</string>
+    <string name="power_charging_duration_wireless" msgid="1829295708243159464">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> do úplného nabití bezdrátově"</string>
     <string name="power_usage_list_summary" msgid="2409288197839512482">"Použití od posledního úplného nabití"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Využití baterie od odpojení"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Využití baterie od obnovení"</string>
@@ -1617,7 +1627,6 @@
     <string name="awake" msgid="387122265874485088">"Doba provozu zařízení"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Doba provozu Wi-Fi"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Doba provozu modulu Wi-Fi"</string>
-    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> – <xliff:g id="NUMBER">%2$s</xliff:g> <xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Podrobnosti historie"</string>
     <string name="details_title" msgid="3792801565213935385">"Podrobnosti využívání"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Podrobnosti využívání"</string>
@@ -1689,7 +1698,7 @@
     <string name="battery_saver" msgid="1426682272004907982">"Spořič baterie"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Zapnout automaticky"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Nikdy"</string>
-    <string name="battery_saver_turn_on_automatically_pct" msgid="3033681629861428940">"pokud zbývá %1$d %% baterie"</string>
+    <string name="battery_saver_turn_on_automatically_pct" msgid="7536784431655058267">"%1$s baterie"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Statistiky procesů"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Podrobné statistiky běžících procesů"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Využití paměti"</string>
@@ -1710,7 +1719,7 @@
     <string name="mem_use_native_type" msgid="5976704902328347400">"Nativní"</string>
     <string name="mem_use_kernel_cache_type" msgid="6411475064463957513">"Mezipaměti jádra"</string>
     <string name="mem_use_zram_type" msgid="9087217476795358232">"Odkládací prostor zRam"</string>
-    <string name="mem_use_free_type" msgid="717708548454880840">"Volné"</string>
+    <string name="mem_use_free_type" msgid="717708548454880840">"Volná"</string>
     <string name="mem_use_total" msgid="6308786055749777934">"Celkem"</string>
     <string name="menu_duration_3h" msgid="4714866438374738385">"3 hodiny"</string>
     <string name="menu_duration_6h" msgid="1940846763432184132">"6 hodin"</string>
@@ -1813,7 +1822,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Hardwarové"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Pouze software"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"Pro tohoto uživatele jsou identifikační údaje nedostupné."</string>
-    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Proveďte bezpečnostní gesto"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Instalaci pověření je třeba potvrdit provedením bezpečnostního gesta."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Zadejte heslo pro úložiště pověření."</string>
@@ -1843,6 +1851,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"Zahrnout data aplikací"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Automatické obnovení"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Při přeinstalaci aplikace obnovit zálohovaná nastavení a další data"</string>
+    <string name="backup_inactive_title" msgid="5355557151569037197">"Služba zálohování není aktivní."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"Toto je nastaveno zásadami zařízení."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Heslo pro zálohy v počítači"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Úplné zálohy v počítači nejsou v současné době chráněny"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Tuto možnost vyberte, chcete-li změnit nebo odebrat heslo pro úplné zálohy v počítači"</string>
@@ -1952,7 +1962,11 @@
     <string name="enter_password" msgid="8035706727471334122">"Chcete-li spustit Android, zadejte heslo"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Chcete-li spustit Android, zadejte PIN"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Chcete-li spustit Android, nakreslete gesto"</string>
-    <string name="try_again" msgid="4272075051293936921">"Zkuste to znovu."</string>
+    <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"Nesprávné gesto"</string>
+    <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"Nesprávné heslo"</string>
+    <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"Nesprávný kód PIN"</string>
+    <string name="checking_decryption" msgid="8287458611802609493">"Kontrola…"</string>
+    <string name="starting_android" msgid="8581493237458496835">"Spouštění systému Android"</string>
     <string name="delete" msgid="4219243412325163003">"Smazat"</string>
     <string name="misc_files" msgid="6720680815969643497">"Různé soubory"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"vybráno: <xliff:g id="NUMBER">%1$d</xliff:g> z <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -1990,8 +2004,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Vždy použít GPU ke skládání obrazovky"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"Simulovat barevný prostor"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Povolit trasování OpenGL"</string>
-    <string name="use_nuplayer" msgid="5699257393367904387">"Použít NuPlayer (experimentální)"</string>
-    <string name="use_nuplayer_summary" msgid="1991479067478516714">"Namísto přehrávače AwesomePlayer použít NuPlayer"</string>
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"Používat AwesomePlayer (zastaralé)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"Používat k přehrávání většiny médií namísto přehrávače NuPlayer přehrávač AwsomePlayer"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"Vyp. směr. zvuku do USB"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"Vyp. aut. směr. zvuku do zvukových periferií USB"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Zobrazit ohraničení"</string>
@@ -2167,7 +2181,6 @@
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Přidat uživatele nebo profil"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Přidat uživatele"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Omezený profil"</string>
-    <string name="user_summary_managed_profile" msgid="7369539529693048111">"Pracovní profil"</string>
     <string name="user_need_lock_message" msgid="2596365678651842785">"Před vytvořením omezeného profilu je nutné nejprve nastavit zámek obrazovky k ochraně aplikací a dat."</string>
     <string name="user_set_lock_button" msgid="8311219392856626841">"Nastavit zámek"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Není nastaveno"</string>
@@ -2298,11 +2311,13 @@
     <string name="sim_cellular_data_unavailable_summary" msgid="3654805961942166428">"Klepnutím vyberte datovou SIM kartu"</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"Vždy používat pro hovory"</string>
     <string name="select_sim_for_data" msgid="2366081042162853044">"Vyberte SIM kartu pro data"</string>
+    <string name="data_switch_started" msgid="2040761479817166311">"Přepínání datových SIM karet, tato operace může chvíli trvat..."</string>
     <string name="select_sim_for_calls" msgid="3503094771801109334">"Volat pomocí"</string>
     <string name="sim_select_card" msgid="211285163525563293">"Vyberte SIM kartu"</string>
     <string name="sim_card_number_title" msgid="7845379943474336488">"SIM karta <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"Prázdná SIM"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"Název SIM karty"</string>
+    <string name="sim_name_hint" msgid="7038643345238968930">"Zadejte název SIM karty"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"Slot pro SIM kartu %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Operátor"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Číslo"</string>
@@ -2312,7 +2327,6 @@
     <string name="color_purple" msgid="3888532466427762504">"Nachová"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"Nejsou vloženy žádné SIM karty"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"Stav SIM karty"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"Údaje související se SIM kartou"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"Volat zpět z výchozí SIM karty"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"SIM karta pro odchozí hovory"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Další nastavení hovorů"</string>
@@ -2320,8 +2334,11 @@
     <string name="preferred_network_offload_header" msgid="2321173571529106767">"Zakázat vysílání názvu sítě"</string>
     <string name="preferred_network_offload_footer" msgid="5857279426054744020">"Zakázáním vysílání názvu sítě zabráníte třetím stranám v zobrazení informací o vaší síti."</string>
     <string name="preferred_network_offload_popup" msgid="2252915199889604600">"Zakázáním vysílání názvu sítě zabráníte automatickému připojování ke skrytým sítím."</string>
+    <string name="sim_signal_strength" msgid="9144010043784767984">"<xliff:g id="DBM">%1$d</xliff:g> dBm <xliff:g id="ASU">%2$d</xliff:g> asu"</string>
+    <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>
@@ -2330,22 +2347,22 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Poslední vyhledávání"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Výsledky"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi síť připojení"</string>
-    <string name="keywords_more_default_sms_app" msgid="2744404159003574745">"textová zpráva"</string>
-    <string name="keywords_more_mobile_networks" msgid="7813380887358745769">"mobilní síť operátor bezdrátové připojení"</string>
+    <string name="keywords_more_default_sms_app" msgid="895656981962034647">"textová zpráva SMS odesílání zpráv"</string>
+    <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"mobilní operátor mobilní data bezdrátový přenos 4g 3g 2g lte"</string>
     <string name="keywords_home" msgid="3626170808219458848">"launcher"</string>
     <string name="keywords_display" msgid="6709007669501628320">"obrazovka dotykový displej"</string>
-    <string name="keywords_display_brightness_level" msgid="8636451602230815191">"ztlumit obrazovka dotykový displej"</string>
-    <string name="keywords_display_auto_brightness" msgid="8070218600502753102">"ztlumit obrazovka dotykový displej"</string>
-    <string name="keywords_display_wallpaper" msgid="4315466287469834939">"pozadí"</string>
+    <string name="keywords_display_brightness_level" msgid="8923289340474728990">"ztlumit obrazovka dotykový displej baterie"</string>
+    <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"ztlumit obrazovka dotykový displej baterie"</string>
+    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"pozadí personalizace přizpůsobení displej"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"velikost textu"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"projekce"</string>
-    <string name="keywords_storage" msgid="7007275853993419928">"místo disk pevný disk"</string>
-    <string name="keywords_battery" msgid="3992479295298655138">"napájení"</string>
-    <string name="keywords_spell_checker" msgid="4509482591225399210">"pravopis"</string>
+    <string name="keywords_storage" msgid="6572905220031852173">"místo disk pevný disk zařízení využití"</string>
+    <string name="keywords_battery" msgid="2096185085932675704">"využití energie nabití"</string>
+    <string name="keywords_spell_checker" msgid="6106749039734174140">"pravopis slovník kontrola pravopisu automatické opravy"</string>
     <string name="keywords_voice_input" msgid="3519547605812413860">"recognizer input speech speak language hands-free hand free recognition offensive word audio history bluetooth headset"</string>
-    <string name="keywords_text_to_speech_output" msgid="8207889472282225512">"rychlost jazyk výchozí řeč mluva hlas"</string>
-    <string name="keywords_date_and_time" msgid="7666950126499155141">"hodiny"</string>
-    <string name="keywords_factory_data_reset" msgid="3693730656843989732">"smazat vymazat"</string>
+    <string name="keywords_text_to_speech_output" msgid="392447904221657930">"sazba jazyk výchozí řeč mluvit tts usnadnění čtečka nevidomí"</string>
+    <string name="keywords_date_and_time" msgid="2631808108134830066">"hodiny čas"</string>
+    <string name="keywords_factory_data_reset" msgid="4355133848707691977">"smazat vymazat obnovit vymazání odstranění"</string>
     <string name="keywords_printing" msgid="1701778563617114846">"tiskárna"</string>
     <string name="keywords_sounds_and_notifications" msgid="5965996187974887000">"reproduktor pípnutí"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="2912933812460077912">"nerušit vyrušení vyrušit"</string>
@@ -2354,7 +2371,7 @@
     <string name="keywords_location_mode" msgid="8584992704568356084">"přesnost"</string>
     <string name="keywords_accounts" msgid="1957925565953357627">"účet"</string>
     <string name="keywords_users" msgid="4673901601478559100">"omezení omezit omezeno"</string>
-    <string name="keywords_keyboard_and_ime" msgid="1103378692379215672">"oprava textu oprava zvuk vibrace automatické rozpoznání jazyka gesta návrhy návrh motiv sprosté slovo psaní emodži"</string>
+    <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"oprava textu opravit zvuk vibrace automatický výběr jazyka návrh navrhování motiv nevhodné slovo psaní emodži mezinárodní"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"přejetí prstem heslo gesto pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Nastavení štítku NFC pro Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Zapsat"</string>
@@ -2371,7 +2388,6 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Hlasitost oznámení"</string>
     <string name="zen_mode_settings_title" msgid="7014915558669122902">"Vyrušení"</string>
     <string name="zen_mode_option_title" msgid="5061978632306007914">"Při příchozím hovoru nebo oznámení"</string>
-    <string name="zen_mode_option_title_novoice" msgid="6680706009915204785">"Při příchozím oznámení"</string>
     <string name="zen_mode_option_off" msgid="3167702608910820883">"Vždy vyrušit"</string>
     <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Povolit pouze prioritní vyrušení"</string>
     <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Nerušit"</string>
@@ -2429,14 +2445,17 @@
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Hotovo"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Dokud tuto funkci nevypnete"</string>
     <string name="zen_mode_important_category" msgid="8123274463331022993">"Prioritní vyrušení"</string>
-    <string name="zen_mode_downtime_category" msgid="4730179065426038108">"Pozastavení (pouze prioritní vyrušení)"</string>
+    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Výpadek"</string>
     <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Dny"</string>
     <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Žádné"</string>
+    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Vyrušení jsou povolena"</string>
+    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Pouze prioritní"</string>
+    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Žádné"</string>
     <string name="zen_mode_automation_category" msgid="4653551005950835761">"Automatizace"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Automaticky zapnout"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Nikdy"</string>
-    <string name="zen_mode_phone_calls" msgid="8956214416859303966">"Volání"</string>
+    <string name="zen_mode_calls" msgid="7051492091133751208">"Volání"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Zprávy"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Volání/zprávy od"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Kohokoli"</string>
@@ -2450,7 +2469,9 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Víkendy"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Čas zahájení"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Čas ukončení"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> další den"</string>
+    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"Zítra v čase <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"V čase <xliff:g id="FORMATTED_TIME">%s</xliff:g> nebo při jakémkoli dřívějším budíku"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"Zítra v čase <xliff:g id="FORMATTED_TIME">%s</xliff:g> nebo při jakémkoli dřívějším budíku"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Oznámení aplikací"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Nastavení oznámení"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Odeslat zpětnou vazbu o tomto zařízení"</string>
@@ -2458,7 +2479,11 @@
     <string name="switch_on_text" msgid="1124106706920572386">"Zapnuto"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Vypnuto"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"Připnutí obrazovky"</string>
-    <string name="screen_pinning_description" msgid="7091642350452605379">"Po zapnutí této funkce můžete pomocí připnutí obrazovky nechat zobrazenou aktuální obrazovku, dokud ji neuvolníte.\n\nPostup připnutí obrazovky:\n\n1. Zkontrolujte, zda je funkce připnutí obrazovky zapnutá.\n\n2. Otevřete obrazovku, kterou chcete připnout.\n\n3. Klepněte na Přehled.\n\n4. Klepněte na ikonu špendlíku."</string>
+    <string name="screen_pinning_description" msgid="1137904524037468263">"Pokud je toto nastavení zapnuto, můžete pomocí připnutí obrazovky zajistit zobrazení aktuální obrazovky, dokud ji neuvolníte.\n\nPostup připnutí obrazovky:\n\n1. Zkontrolujte, zda je funkce připnutí obrazovky zapnutá.\n\n2. Otevřete obrazovku, kterou chcete připnout.\n\n3. Klepněte na Přehled.\n\n4. Přejeďte prstem nahoru a poté klepněte na ikonu špendlíku."</string>
+    <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Před uvolněním požádat o bezpečnostní gesto"</string>
+    <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Před uvolněním požádat o kód PIN"</string>
+    <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Před uvolněním požádat o heslo"</string>
+    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Při uvolnění uzamknout zařízení"</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Pracovní profil"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Experimentální)"</string>
     <string name="display_auto_rotate_title" msgid="6176450657107806043">"Při otočení zařízení"</string>
@@ -2467,7 +2492,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Zachovat orientaci na šířku"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Zachovat aktuální orientaci"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"Informace o kódu IMEI"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"Informace související s kódem IMEI"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Šifrování"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Pokračovat"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"Toto zařízení můžete dále ochránit tím, že před jeho spuštěním bude požadován kód PIN. Před spuštěním zařízení nemůže přijímat hovory, zprávy ani oznámení, včetně budíků. \n\nTato funkce pomáhá chránit data ve ztracených nebo ukradených zařízeních."</string>
@@ -2485,4 +2509,7 @@
     <string name="encrypt_talkback_dialog_message_pin" msgid="1890374082842868489">"Při zadávání kódu PIN ke spuštění zařízení ještě služby usnadnění přístupu, jako je <xliff:g id="SERVICE">%1$s</xliff:g>, nebudou k dispozici."</string>
     <string name="encrypt_talkback_dialog_message_pattern" msgid="4474332516537386384">"Při zadávání gesta ke spuštění zařízení ještě služby usnadnění přístupu, jako je <xliff:g id="SERVICE">%1$s</xliff:g>, nebudou k dispozici."</string>
     <string name="encrypt_talkback_dialog_message_password" msgid="8166099418487083927">"Při zadávání hesla ke spuštění zařízení ještě služby usnadnění přístupu, jako je <xliff:g id="SERVICE">%1$s</xliff:g>, nebudou k dispozici."</string>
+    <string name="imei_information_title" msgid="8499085421609752290">"Informace o kódu IMEI"</string>
+    <string name="imei_information_summary" msgid="2074095606556565233">"Informace související s kódem IMEI"</string>
+    <string name="slot_number" msgid="3762676044904653577">"(Slot <xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-da/arrays.xml b/res/values-da/arrays.xml
index ebf1249..31ff237 100644
--- a/res/values-da/arrays.xml
+++ b/res/values-da/arrays.xml
@@ -527,4 +527,12 @@
     <item msgid="4338089220026248848">"Cachelagret (aktivitetsklient)"</item>
     <item msgid="6652164677254579050">"Cachelagret (tom)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Turkis"</item>
+    <item msgid="8332294763632946560">"Blå"</item>
+    <item msgid="2023216417616991392">"Indigo"</item>
+    <item msgid="3170497246594232819">"Lilla"</item>
+    <item msgid="4608643045752965568">"Pink"</item>
+    <item msgid="6131821495505931173">"Rød"</item>
+  </string-array>
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index a4d28a8..6b0179d 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -43,7 +43,7 @@
     <string name="lte_ram_dump_on" msgid="8568568019520172177">"Tænd kassering af LTE RAM"</string>
     <string name="lte_ram_dump_off" msgid="2514507918652378283">"Sluk for kassering af LTE RAM"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"Vis adressebog på SIM-kortet"</string>
-    <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Vis faste opkaldsnumre"</string>
+    <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Vis numre til begrænset opkald"</string>
     <string name="radioInfo_menu_viewSDN" msgid="7130280686244955669">"Vis tjenesten faste opkaldsnumre"</string>
     <string name="radioInfo_menu_getPDP" msgid="560610293888406317">"Hent PDP-liste"</string>
     <string name="radioInfo_service_in" msgid="1915416319177520020">"I drift"</string>
@@ -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>
@@ -180,7 +180,6 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s vil gerne have adgang til dine beskeder. Vil du give %2$s adgang?"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Dato og klokkeslæt"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Vælg tidszone"</string>
-    <string name="normal_date_format" msgid="7636406984925498359">"Landestandard (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Eksempelvisning:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Skriftstørrelse:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -291,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>
@@ -322,8 +321,6 @@
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Vælg tidszone"</string>
     <string name="date_time_set_date_title" msgid="6928286765325608604">"Dato"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"Angiv dato"</string>
-    <string name="date_time_date_format_title" msgid="3976171711988766411">"Datoformat"</string>
-    <string name="date_time_date_format" msgid="6951498879879281102">"Vælg datoformat"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Sorter alfabetisk"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Sorter efter tidszone"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Dato"</string>
@@ -372,7 +369,8 @@
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Vent, mens din telefon krypteres. <xliff:g id="PERCENT">^1</xliff:g> % fuldført."</string>
     <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Vent, mens din tablet krypteres. Resterende tid: <xliff:g id="DURATION">^1</xliff:g>"</string>
     <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Vent, mens din telefon krypteres. Resterende tid: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Prøv igen om <xliff:g id="DELAY">^1</xliff:g> sekunder."</string>
+    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"Du låser din tablet ved at slukke og tænde den."</string>
+    <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"Du låser din telefon ved at slukke og tænde den."</string>
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"Advarsel! Enheden ryddes efter <xliff:g id="COUNT">^1</xliff:g> mislykkede oplåsningsforsøg mere."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Indtast din adgangskode"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Kryptering mislykkedes"</string>
@@ -401,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>
@@ -412,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>
@@ -556,13 +556,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Som højttalertelefon"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Til musik og medier"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Husk indstillinger"</string>
-    <string name="wifi_assistant_intro_setup" msgid="4605105515416995110">"Nyt: \nWi-Fi-assistent"</string>
-    <string name="wifi_assistant_no_thanks" msgid="2776983751990143934">"NEJ TAK"</string>
-    <string name="wifi_assistant_setup" msgid="3772423650475730906">"KONFIGURER"</string>
-    <string name="wifi_assistant_card_message" msgid="107811647784658536">"Opret automatisk forbindelse til tilgængelige netværk med en Wi-Fi-assistent."</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi-Fi-assistent"</string>
-    <string name="wifi_assistant_title_message" msgid="6240721017579074015">"<xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> opretter automatisk forbindelse til det bedste tilgængelige Wi-Fi-netværk"</string>
-    <string name="wifi_assistant_open_app" msgid="4803044899535675063">"ÅBN APP"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Forbindelse via Wi-Fi-assistent"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"Skærm til casting"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Aktivér trådløs skærm"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Der blev ikke fundet enheder i nærheden."</string>
@@ -592,7 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Indstillinger for Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Konfiguration og administration af trådløse adgangspunkter"</string>
-    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Vælg Wi-Fi-netværk"</string>
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Vælg Wi-Fi-netværk"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Vælg Wi-Fi-netværk"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Aktiverer Wi-Fi..."</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Deaktiverer Wi-Fi..."</string>
@@ -607,8 +602,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"Scanning altid tilgængelig"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Tillad altid scanning"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Lad Googles placeringstjeneste og andre apps søge efter netværk, selv når Wi-Fi er slået fra"</string>
-    <string name="wifi_automatically_manage_title" msgid="6249976570008992746">"Administrer Wi-Fi automatisk"</string>
-    <string name="wifi_automatically_manage_summary" msgid="6952470763378312488">"Lad <xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> administrere din Wi-Fi-forbindelse"</string>
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Brug automatisk åbent Wi-Fi"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Giv en Wi‑Fi-assistent lov til automatisk at oprette forbindelse til åbne netværk af høj kvalitet"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Vælg en assistent"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Installer certifikater"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Google og andre apps søger muligvis efter netværk i nærheden, selv når Wi-Fi er slukket, for at forbedre placeringsnøjagtighed m.m. Hvis du ikke ønsker dette, kan du gå til Avanceret &gt; Søgning altid tilgængelig."</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Apps kan søge efter netværk i nærheden, selv når Wi-Fi er slukket. Hvis du ikke ønsker, at dette sker, skal du gå til Avanceret &gt; Scanning altid tilgængelig."</string>
@@ -629,6 +625,7 @@
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Søg"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Avanceret"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Opret forbindelse til netværk"</string>
+    <string name="wifi_menu_remember" msgid="8814185749388713796">"Husk netværket"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Glem netværk"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Rediger netværk"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Skriv til NFC-tag"</string>
@@ -673,9 +670,11 @@
     <string name="wifi_unspecified" msgid="5431501214192991253">"(ikke specificeret)"</string>
     <string name="wifi_remembered" msgid="4955746899347821096">"Gemt"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"Deaktiveret"</string>
-    <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Dårlig internetforbindelse er undgået"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP-konfigurationsfejl"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Wi-Fi-forbindelsesfejl"</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Problem med godkendelse"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Ikke inden for rækkevidde"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Der blev ikke fundet nogen internetadgang. Forbindelsen bliver ikke automatisk genoprettet."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS er tilgængelig"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS er tilgængelig)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Indtast adgangskoden til dit netværk"</string>
@@ -699,9 +698,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"ADVARSEL! Hvis du springer over Wi-Fi, vil din tablet kun bruge mobildata til indledende downloads og opdateringer. Opret forbindelse til Wi-Fi for at undgå eventuelle gebyrer for datatrafik."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"ADVARSEL! Hvis du springer over Wi-Fi, vil din enhed kun bruge mobildata til indledende downloads og opdateringer. Opret forbindelse til Wi-Fi for at undgå eventuelle gebyrer for datatrafik."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"ADVARSEL! Hvis du springer over Wi-Fi, vil telefonen kun bruge mobildata til indledende downloads og opdateringer. Opret forbindelse til Wi-Fi for at undgå eventuelle gebyrer for datatrafik."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="2393880108322835846">"ADVARSEL! Hvis du springer over Wi-Fi, vil din tablet ikke have internetforbindelse til at gennemføre eventuelle indledende downloads eller opdateringer."</string>
-    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1707391993265558787">"ADVARSEL! Hvis du springer over Wi-Fi, vil enheden ikke have internetforbindelse til at gennemføre eventuelle indledende downloads eller opdateringer."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="1556858507920033022">"ADVARSEL! Hvis du springer over Wi-Fi, vil telefonen ikke have internetforbindelse til at gennemføre eventuelle indledende downloads eller opdateringer."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Hvis du springer Wi-Fi over:\n\nDin tablet vil ikke have en internetforbindelse.\n\nDu vil ikke få softwareopdateringer, indtil du opretter forbindelse til internettet.\n\nDet er ikke muligt at aktivere funktioner til enhedsbeskyttelse på nuværende tidspunkt."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Hvis du springer Wi-Fi over:\n\nEnheden vil ikke have en internetforbindelse.\n\n Du vil ikke få softwareopdateringer, indtil du opretter forbindelse til internettet.\n\nDet er ikke muligt at aktivere funktioner til enhedsbeskyttelse på nuværende tidspunkt."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Hvis du springer Wi-Fi over:\n\nDin telefon vil ikke have en internetforbindelse.\n\nDu vil ikke få softwareopdateringer, indtil du opretter forbindelse til internettet.\n\nDet er ikke muligt at aktivere funktioner til enhedsbeskyttelse på nuværende tidspunkt."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Tabletten kunne ikke oprette forbindelse til dette Wi-Fi-netværk."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"Enheden kunne ikke oprette forbindelse til dette Wi-Fi-netværk."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Telefonen kunne ikke oprette forbindelse til dette Wi-Fi-netværk."</string>
@@ -761,7 +760,6 @@
     <string name="ring_volume_title" msgid="7938706566797464165">"Lydstyrke for opkald"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrer ved lydløs"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Standardlyd for underretninger"</string>
-    <string name="heads_up_enabled_title" msgid="1031078221910921622">"Pop op, hvis høj prioritet"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Ringetone"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Underretning"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Brug lydstyrke for indgående opkald til underretninger"</string>
@@ -833,8 +831,8 @@
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Indstillinger"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatisk lysstyrke"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Løft enheden for at vække den"</string>
-    <string name="doze_title" msgid="2259176504273878294">"Omgivelsesfarve"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"Tænd skærmen, når enheden berøres eller modtager en underretning"</string>
+    <string name="doze_title" msgid="2259176504273878294">"Aktiv låseskærm"</string>
+    <string name="doze_summary" msgid="7128970177894383698">"Væk skærmen, når du tager enheden op eller modtager meddelelser"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Skriftstørrelse"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Skriftstørrelse"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Indstillinger for lås af SIM-kort"</string>
@@ -862,6 +860,10 @@
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Annuller"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"Der blev fundet flere SIM-kort"</string>
     <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>
@@ -1012,6 +1014,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Dette sletter alle data fra tablettens "<b>"interne lager"</b>", f.eks.: \n\n"<li>"din Google-konto"</li>\n<li>"data og indstillinger for system og applikationer"</li>\n<li>"downloadede applikationer"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Dette sletter alle data fra telefonens "<b>"interne lager"</b>", f.eks.: \n\n"<li>"din Google-konto"</li>\n<li>"data og indstillinger for system og applikationer"</li>\n<li>"downloadede applikationer"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Du er i øjeblikket logget ind på disse konti:\n"</string>
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Der er andre brugere til stede på denne enhed.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musik"</li>\n<li>"Billeder"</li>\n<li>"Andre brugerdata"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Ryd musik, billeder og andre brugerdata ved at formatere "<b>"USB-lager"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Hvis du vil rydde musik, billeder og andre brugerdata, skal du formatere "<b>"SD-kortet"</b>"."</string>
@@ -1023,7 +1026,6 @@
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Nulstil telefon"</string>
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Vil du slette alle dine personlige oplysninger og downloadede apps? Denne handling kan ikke fortrydes!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Slet alt"</string>
-    <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Tegn dit oplåsningsmønster"</string>
     <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Du skal tegne dit oplåsningsmønster for at bekræfte en gendannelse af fabriksindstillingerne."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Der blev ikke foretaget nogen nulstilling, fordi tjenesten Systemoprydning ikke er tilgængelig."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Vil du nulstille?"</string>
@@ -1041,7 +1043,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"Vil du slette USB-lageret og alle filer, som er gemt der? Handlingen kan ikke fortrydes!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Vil du rydde SD-kortet og alle dets filer? Handlingen kan ikke fortrydes!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Slet alt"</string>
-    <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Tegn dit oplåsningsmønster"</string>
     <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Du skal tegne dit oplåsningsmønster for at bekræfte, at du vil slette USB-lagringen."</string>
     <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Du skal tegne dit oplåsningsmønster for at bekræfte, at du vil slette SD-kortet."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Indstillinger for opkald"</string>
@@ -1087,6 +1088,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Indsæt SIM-kort, og genstart"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Opret forbindelse til internettet"</string>
     <string name="location_title" msgid="1029961368397484576">"Min placering"</string>
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Arbejdsprofil"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Placering for arbejdsprofil"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Slukket af din virksomhed"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Tilstand"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Høj nøjagtighed"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Batteribesparende"</string>
@@ -1124,6 +1128,7 @@
     <string name="copyright_title" msgid="865906688917260647">"Ophavsret"</string>
     <string name="license_title" msgid="1990487604356037871">"Licens"</string>
     <string name="terms_title" msgid="7697580845616764642">"Vilkår og betingelser"</string>
+    <string name="webview_license_title" msgid="2813507464175738967">"System WebView-licens"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Baggrunde"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Leverandører af satellitbilleder:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Open source-licenser"</string>
@@ -1237,7 +1242,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB-lager"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"På SD-kort"</string>
     <string name="disabled" msgid="9206776641295849915">"Deaktiveret"</string>
-    <string name="not_installed" msgid="1475144352069281880">"Ikke installeret"</string>
+    <string name="not_installed" msgid="2797554494953450291">"Ikke installeret for denne bruger"</string>
     <string name="no_applications" msgid="7336588977497084921">"Ingen apps."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Internt lager"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB-lager"</string>
@@ -1434,8 +1439,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Skærmen går ikke i dvale under opladning"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Aktivér Bluetooth HCI snoop log"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Gem alle Bluetooth HCI-pakker i en fil"</string>
-    <string name="oem_unlock_enable" msgid="6629321276287913315">"Aktivér OEM-oplåsning"</string>
-    <string name="oem_unlock_enable_summary" msgid="3546686263996628110">"Tillad OEM-oplåsning af enheden"</string>
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM-oplåsning"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Tillad, at startindlæseren låses op"</string>
+    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Indtast din pinkode"</string>
+    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Indtast pinkoden for din enhed for at aktivere OEM-oplåsning"</string>
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Vil du tillade OEM-oplåsning?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"ADVARSEL! Funktioner, der beskytter enheden, fungerer ikke på denne enhed, når denne indstilling er slået til."</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Certificering af trådløs skærm"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Aktivér detaljeret Wi-Fi-logføring"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Gennemtving skift fra Wi-Fi til mobildata"</string>
@@ -1538,6 +1547,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"Underteksterne vil se sådan ud"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"Standard"</string>
+    <string name="color_title" msgid="4258931051732243983">"Farve"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"Standard"</string>
     <string name="color_none" msgid="3475640044925814795">"Ingen"</string>
     <string name="color_white" msgid="8045195170201590239">"Hvid"</string>
@@ -1595,12 +1605,12 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"<xliff:g id="REMAIN">%1$s</xliff:g> tilbage"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> til batteriet er opladt"</string>
-    <string name="power_discharging_duration" msgid="7125493014448497620">"<xliff:g id="LEVEL">%1$d</xliff:g> %% – ca. <xliff:g id="TIME">%2$s</xliff:g> tilbage"</string>
-    <string name="power_charging" msgid="712751285832976915">"<xliff:g id="LEVEL">%1$d</xliff:g> %% – <xliff:g id="STATE">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration" msgid="4802183864773082009">"<xliff:g id="LEVEL">%1$d</xliff:g> %% – <xliff:g id="TIME">%2$s</xliff:g> til fuld opladning"</string>
-    <string name="power_charging_duration_ac" msgid="3611179931297824699">"<xliff:g id="LEVEL">%1$d</xliff:g> %% – <xliff:g id="TIME">%2$s</xliff:g> til fuld opladning i stikkontakt"</string>
-    <string name="power_charging_duration_usb" msgid="1106605348913397583">"<xliff:g id="LEVEL">%1$d</xliff:g> %% – <xliff:g id="TIME">%2$s</xliff:g> til fuld opladning via USB"</string>
-    <string name="power_charging_duration_wireless" msgid="633606920144617227">"<xliff:g id="LEVEL">%1$d</xliff:g> %% – <xliff:g id="TIME">%2$s</xliff:g> til fuld opladning, trådløs"</string>
+    <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> – ca. <xliff:g id="TIME">%2$s</xliff:g> tilbage"</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> til fuldt opladet"</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> til fuldt opladet med adapter"</string>
+    <string name="power_charging_duration_usb" msgid="182405645340976546">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> til fuldt opladet med USB"</string>
+    <string name="power_charging_duration_wireless" msgid="1829295708243159464">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> til fuldt opladet med trådløs"</string>
     <string name="power_usage_list_summary" msgid="2409288197839512482">"Forbrug siden sidste fulde opladning"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Batteriforbrug siden afbrydelse"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Batteriforbrug siden nulstilling"</string>
@@ -1617,7 +1627,6 @@
     <string name="awake" msgid="387122265874485088">"Enhedens opvågningstid"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi til tiden"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi til tiden"</string>
-    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Oplysninger om oversigten"</string>
     <string name="details_title" msgid="3792801565213935385">"Brugsdetaljer"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Brugsdetaljer"</string>
@@ -1689,7 +1698,7 @@
     <string name="battery_saver" msgid="1426682272004907982">"Batteribesparelse"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Slå automatisk til"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Aldrig"</string>
-    <string name="battery_saver_turn_on_automatically_pct" msgid="3033681629861428940">"batteri på %1$d %%"</string>
+    <string name="battery_saver_turn_on_automatically_pct" msgid="7536784431655058267">"ved %1$s batteri"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Processtatistikker"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Nørdede statistikker om kørende processer"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"hukommelse brugt"</string>
@@ -1722,24 +1731,24 @@
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Baggrund"</string>
     <string name="menu_proc_stats_type_foreground" msgid="2286182659954958586">"Forgrund"</string>
     <string name="menu_proc_stats_type_cached" msgid="5084272779786820693">"Cachelagret"</string>
-    <string name="voice_input_output_settings" msgid="1336135218350444783">"Taleinput og -output"</string>
+    <string name="voice_input_output_settings" msgid="1336135218350444783">"Indtaling og oplæsning"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Indstillinger for taleinput og -output"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Talesøgning"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Android-tastatur"</string>
     <string name="voice_category" msgid="1430370497125803904">"Tale"</string>
-    <string name="voice_input_settings" msgid="1099937800539324567">"Indstillinger for taleinput"</string>
-    <string name="voice_input_settings_title" msgid="2676028028084981891">"Taleinput"</string>
-    <string name="voice_service_preference_section_title" msgid="3778706644257601021">"Stemmeinputtjenester"</string>
+    <string name="voice_input_settings" msgid="1099937800539324567">"Indstillinger for indtaling"</string>
+    <string name="voice_input_settings_title" msgid="2676028028084981891">"Indtaling"</string>
+    <string name="voice_service_preference_section_title" msgid="3778706644257601021">"Indtalingstjenester"</string>
     <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"Komplet kommandoord og handling"</string>
-    <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"Enkel tale-til-tekst"</string>
-    <string name="voice_interaction_security_warning" msgid="6378608263983737325">"Denne tjeneste til taleinput vil kunne udføre stemmeovervågning, der altid er slået til, og styre stemmeaktiverede programmer på dine vegne. Den kommer fra applikationen <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g>. Vil du aktivere brugen af denne tjeneste?"</string>
-    <string name="tts_settings" msgid="8186971894801348327">"Indstillinger for tekst-til-tale"</string>
-    <string name="tts_settings_title" msgid="1237820681016639683">"Tekst-til-tale"</string>
+    <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"Enkel oplæsning"</string>
+    <string name="voice_interaction_security_warning" msgid="6378608263983737325">"Denne indtalingstjeneste vil kunne foretage lydovervågning, der altid er slået til, og styre taleaktiverede apps på dine vegne. Den kommer fra appen <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g>. Vil du aktivere brugen af denne tjeneste?"</string>
+    <string name="tts_settings" msgid="8186971894801348327">"Indstillinger for oplæsning"</string>
+    <string name="tts_settings_title" msgid="1237820681016639683">"Oplæsning"</string>
     <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Brug altid mine indstil."</string>
     <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Standardindstillingerne nedenfor tilsidesætter indstillinger for app"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Standardindstillinger"</string>
     <string name="tts_default_synth_title" msgid="4755558388333117572">"Standardmaskine"</string>
-    <string name="tts_default_synth_summary" msgid="6482936537135251690">"Indstiller den talesyntesemaskine, der skal bruges til talt tekst."</string>
+    <string name="tts_default_synth_summary" msgid="6482936537135251690">"Angiver den talesyntesemaskine, der skal bruges til oplæsning af tekst."</string>
     <string name="tts_default_rate_title" msgid="6030550998379310088">"Talehastighed"</string>
     <string name="tts_default_rate_summary" msgid="4061815292287182801">"Oplæsningshastighed for tekst"</string>
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Tonehøjde"</string>
@@ -1758,7 +1767,7 @@
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Konfigurer"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Vælg en anden maskine"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Denne funktion kan indsamle al den tekst, der læses op, inklusive personlige data såsom adgangskoder og kreditkortnumre. Den kommer fra <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>-maskinen. Vil du aktivere brug af denne talesyntesemaskine?"</string>
-    <string name="tts_engine_network_required" msgid="1190837151485314743">"Der kræves en aktiv netværksforbindelse, for at tekst-til-tale kan anvendes på dette sprog."</string>
+    <string name="tts_engine_network_required" msgid="1190837151485314743">"Oplæsning på dette sprog fungerer kun, når der findes en aktiv netværksforbindelse."</string>
     <string name="tts_default_sample_string" msgid="4040835213373086322">"Dette er et eksempel på talesyntese."</string>
     <string name="tts_status_title" msgid="7268566550242584413">"Status for standardsprog"</string>
     <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> er fuldt understøttet"</string>
@@ -1813,7 +1822,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Hardwarebaseret"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Kun software"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"Loginoplysningerne for denne bruger er ikke tilgængelige"</string>
-    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Tegn dit oplåsningsmønster"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Du skal tegne dit oplåsningsmønster for at bekræfte en gendannelse af fabriksindstillingerne."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Skriv adgangskoden til lager for loginoplysninger."</string>
@@ -1843,6 +1851,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"Inkluder appdata"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Automatisk gendannelse"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Når du geninstallerer en app, skal du gendanne sikkerhedskopierede indstillinger og data"</string>
+    <string name="backup_inactive_title" msgid="5355557151569037197">"Tjenesten til sikkerhedskopiering er inaktiv."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"Denne indstilles af din enhedspolitik."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Kode til lokal sikkerhedskopi"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Lokale fuldstændige sikkerhedskopieringer er i øjeblikket ikke beskyttet"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Tryk for at skifte eller fjerne adgangskoden til fuld lokal sikkerhedskopiering"</string>
@@ -1952,7 +1962,11 @@
     <string name="enter_password" msgid="8035706727471334122">"Start Android ved at indtaste din adgangskode"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Start Android ved at indtaste din pinkode"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Start Android ved at tegne dit mønster"</string>
-    <string name="try_again" msgid="4272075051293936921">"Prøv igen."</string>
+    <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"Forkert mønster"</string>
+    <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"Forkert adgangskode"</string>
+    <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"Forkert pinkode"</string>
+    <string name="checking_decryption" msgid="8287458611802609493">"Kontrollerer…"</string>
+    <string name="starting_android" msgid="8581493237458496835">"Starter Android"</string>
     <string name="delete" msgid="4219243412325163003">"Slet"</string>
     <string name="misc_files" msgid="6720680815969643497">"Diverse filer"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"<xliff:g id="NUMBER">%1$d</xliff:g> valgte ud af <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -1990,8 +2004,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Brug altid GPU til skærmsammensætning"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"Simuler farverum"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Aktivér OpenGL-spor"</string>
-    <string name="use_nuplayer" msgid="5699257393367904387">"Brug NuPlayer (eksperimentel)"</string>
-    <string name="use_nuplayer_summary" msgid="1991479067478516714">"Brug NuPlayer i stedet for AwesomePlayer"</string>
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"Brug AwesomePlayer (forældet)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"Brug AwesomePlayer i stedet for NuPlayer til de fleste typer medieafspilning"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"Slå USB-lydhåndtering fra"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"Slå autom. lydhåndtering fra for USB-lydenheder"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Vis layoutgrænser"</string>
@@ -2167,7 +2181,6 @@
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Tilføj en bruger eller en profil"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Tilføj bruger"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Begrænset profil"</string>
-    <string name="user_summary_managed_profile" msgid="7369539529693048111">"Arbejdsprofil"</string>
     <string name="user_need_lock_message" msgid="2596365678651842785">"Før du kan oprette en begrænset profil, skal du oprette en skærmlås for at beskytte dine apps og personlige data."</string>
     <string name="user_set_lock_button" msgid="8311219392856626841">"Konfigurer låseskærmen"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Ikke konfigureret"</string>
@@ -2298,11 +2311,13 @@
     <string name="sim_cellular_data_unavailable_summary" msgid="3654805961942166428">"Tryk for at vælge et data-SIM-kort"</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"Brug altid denne indstilling til opkald"</string>
     <string name="select_sim_for_data" msgid="2366081042162853044">"Vælg et SIM-kort til data"</string>
+    <string name="data_switch_started" msgid="2040761479817166311">"Data-SIM skiftes. Dette kan tage op til et minut..."</string>
     <string name="select_sim_for_calls" msgid="3503094771801109334">"Ring med"</string>
     <string name="sim_select_card" msgid="211285163525563293">"Vælg et SIM-kort"</string>
     <string name="sim_card_number_title" msgid="7845379943474336488">"SIM-kort: <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"Intet SIM-kort"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"Navn på SIM-kort"</string>
+    <string name="sim_name_hint" msgid="7038643345238968930">"Indtast SIM-kortnavn"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"SIM-indgang %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Mobilselskab"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Nummer"</string>
@@ -2312,7 +2327,6 @@
     <string name="color_purple" msgid="3888532466427762504">"Lilla"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"Der er ikke isat et SIM-kort"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"SIM-status"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"SIM-relaterede oplysninger"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"Ring tilbage fra standard-SIM-kort"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"SIM-kort til udgående opkald"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Andre indstillinger for opkald"</string>
@@ -2320,8 +2334,11 @@
     <string name="preferred_network_offload_header" msgid="2321173571529106767">"Deaktiver udsendelse af netværksnavn"</string>
     <string name="preferred_network_offload_footer" msgid="5857279426054744020">"Deaktivering af udsendelse af netværksnavn beskytter mod, at tredjeparter får adgang til dine netværksoplysninger."</string>
     <string name="preferred_network_offload_popup" msgid="2252915199889604600">"Deaktivering af udsendelse af netværksnavn forhindrer automatisk forbindelse til skjulte netværk."</string>
+    <string name="sim_signal_strength" msgid="9144010043784767984">"<xliff:g id="DBM">%1$d</xliff:g> dBm <xliff:g id="ASU">%2$d</xliff:g> asu"</string>
+    <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>
+    <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Spørg hver gang"</string>
     <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>
@@ -2330,22 +2347,22 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Seneste søgninger"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Resultater"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi netværk forbindelse"</string>
-    <string name="keywords_more_default_sms_app" msgid="2744404159003574745">"sms"</string>
-    <string name="keywords_more_mobile_networks" msgid="7813380887358745769">"mobil mobilselskab trådløs"</string>
+    <string name="keywords_more_default_sms_app" msgid="895656981962034647">"sms besked beskeder chat"</string>
+    <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"mobil mobilselskab trådløst netværk data 4g 3g 2g lte"</string>
     <string name="keywords_home" msgid="3626170808219458848">"starter"</string>
     <string name="keywords_display" msgid="6709007669501628320">"skærm berøringsskærm"</string>
-    <string name="keywords_display_brightness_level" msgid="8636451602230815191">"dæmp skærm berøringsskærm"</string>
-    <string name="keywords_display_auto_brightness" msgid="8070218600502753102">"dæmp skærm berøringsskærm"</string>
-    <string name="keywords_display_wallpaper" msgid="4315466287469834939">"baggrund"</string>
+    <string name="keywords_display_brightness_level" msgid="8923289340474728990">"dæmpe skærm touchskærm batteri"</string>
+    <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"dæmpe skærm touchskærm batteri"</string>
+    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"baggrund personliggør tilpas visning"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"tekststørrelse"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"projekt"</string>
-    <string name="keywords_storage" msgid="7007275853993419928">"diskplads harddisk"</string>
-    <string name="keywords_battery" msgid="3992479295298655138">"strøm"</string>
-    <string name="keywords_spell_checker" msgid="4509482591225399210">"stavekontrol"</string>
+    <string name="keywords_storage" msgid="6572905220031852173">"plads disk harddisk enhedsbrug"</string>
+    <string name="keywords_battery" msgid="2096185085932675704">"strømforbrug opladning"</string>
+    <string name="keywords_spell_checker" msgid="6106749039734174140">"stavning ordbog stavekontrol autokorrektur"</string>
     <string name="keywords_voice_input" msgid="3519547605812413860">"genkendelse input tale tal sprog håndfri hånd fri genkendelse stødende ord lyd historik bluetooth headset"</string>
-    <string name="keywords_text_to_speech_output" msgid="8207889472282225512">"takst standardsprog tale taler"</string>
-    <string name="keywords_date_and_time" msgid="7666950126499155141">"ur"</string>
-    <string name="keywords_factory_data_reset" msgid="3693730656843989732">"stryg slet"</string>
+    <string name="keywords_text_to_speech_output" msgid="392447904221657930">"pris sprog standard tale taler tts tilgængelighed læser blind"</string>
+    <string name="keywords_date_and_time" msgid="2631808108134830066">"tid militærtid"</string>
+    <string name="keywords_factory_data_reset" msgid="4355133848707691977">"eliminer slet gendan ryd fjern"</string>
     <string name="keywords_printing" msgid="1701778563617114846">"printer"</string>
     <string name="keywords_sounds_and_notifications" msgid="5965996187974887000">"højttaler bip"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="2912933812460077912">"vil ikke forstyrres afbryd afbrydelse pause"</string>
@@ -2354,7 +2371,7 @@
     <string name="keywords_location_mode" msgid="8584992704568356084">"nøjagtighed"</string>
     <string name="keywords_accounts" msgid="1957925565953357627">"konto"</string>
     <string name="keywords_users" msgid="4673901601478559100">"begrænsning begræns begrænset"</string>
-    <string name="keywords_keyboard_and_ime" msgid="1103378692379215672">"sms rettelse ret lyd vibrer automatisk sprog bevægelse foreslå forslag tema anstødeligt ord indtast emoji"</string>
+    <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"tekst korrektion korriger lyd vibrer auto sprog bevægelse foreslå forslag tema stødende ord type emoji international"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"stryg adgangskode mønster pinkode"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Konfigurer NFC-tag for Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Skriv"</string>
@@ -2371,7 +2388,6 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Lydstyrke for underretninger"</string>
     <string name="zen_mode_settings_title" msgid="7014915558669122902">"Afbrydelser"</string>
     <string name="zen_mode_option_title" msgid="5061978632306007914">"Når der modtages opkald og underretninger"</string>
-    <string name="zen_mode_option_title_novoice" msgid="6680706009915204785">"Når der modtages underretninger"</string>
     <string name="zen_mode_option_off" msgid="3167702608910820883">"Afbryd altid"</string>
     <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Tillad kun prioriterede afbrydelser"</string>
     <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Afbryd ikke"</string>
@@ -2429,14 +2445,17 @@
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Udfør"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Indtil du slår denne indstilling fra"</string>
     <string name="zen_mode_important_category" msgid="8123274463331022993">"Prioriterede afbrydelser"</string>
-    <string name="zen_mode_downtime_category" msgid="4730179065426038108">"Nedetid (kun prioriterede afbrydelser)"</string>
+    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Nedetid"</string>
     <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Dage"</string>
     <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Ingen"</string>
+    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Afbrydelser er tilladte"</string>
+    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Kun prioritet"</string>
+    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Ingen"</string>
     <string name="zen_mode_automation_category" msgid="4653551005950835761">"Automatisering"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Slå automatisk til"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Aldrig"</string>
-    <string name="zen_mode_phone_calls" msgid="8956214416859303966">"Opkald"</string>
+    <string name="zen_mode_calls" msgid="7051492091133751208">"Opkald"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Beskeder"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Opkald/sms-beskeder fra"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Alle"</string>
@@ -2450,7 +2469,9 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Hverdagsaftener"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Starttidspunkt"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Sluttidspunkt"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> næste dag"</string>
+    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> næste dag"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> eller en tidligere alarm"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> næste dag eller en tidligere alarm"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Appunderretninger"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Indstillinger for underretninger"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Send feedback om denne enhed"</string>
@@ -2458,7 +2479,11 @@
     <string name="switch_on_text" msgid="1124106706920572386">"Til"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Fra"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"Bliv i app"</string>
-    <string name="screen_pinning_description" msgid="7091642350452605379">"Når det er slået til, kan du bruge skærmfastholdelse til at fastholde visningen af det aktuelle skærmbillede, indtil du frigør det.\n\nSådan bruger du skærmfastholdelse:\n\n1. Sørg for, at skærmfastholdelse er slået til.\n\n2. Åbn det skærmbillede, du vil fastholde.\n\n3. Tryk på Oversigt.\n\n4. Tryk på tegnestiftikonet."</string>
+    <string name="screen_pinning_description" msgid="1137904524037468263">"Når denne indstilling er aktiveret, kan du bruge Bliv i app til at fastholde den aktuelle skærm i visningen, indtil du frigør den.\n\nSådan bruger du Bliv i app:\n\n1. Sørg for, at Bliv i app er slået til.\n\n2. Åbn den skærm, du vil fastholde.\n\n3. Tryk på Oversigt.\n\n4. Stryg opad, og tryk derefter på markøren."</string>
+    <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Bed om oplåsningsmønster inden frigørelse"</string>
+    <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Bed om pinkode inden frigørelse"</string>
+    <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Bed om adgangskode inden frigørelse"</string>
+    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Lås enheden ved frigørelse"</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Arbejdsprofil"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Eksperimentel)"</string>
     <string name="display_auto_rotate_title" msgid="6176450657107806043">"Når enheden roteres"</string>
@@ -2467,7 +2492,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Behold landskabsvisning"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Behold den aktuelle orientering"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI-oplysninger"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"Relative IMEI-oplysninger"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Kryptering"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Fortsæt"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"Du kan beskytte denne enhed yderligere ved at kræve din pinkode, før den starter. Enheden kan hverken modtage opkald, beskeder eller underretninger, herunder alarmer, før den er startet op. \n\nDette medvirker til at beskytte data på mistede eller stjålne enheder."</string>
@@ -2485,4 +2509,7 @@
     <string name="encrypt_talkback_dialog_message_pin" msgid="1890374082842868489">"Når du angiver din pinkode for at starte denne enhed, er tilgængelighedstjenester som <xliff:g id="SERVICE">%1$s</xliff:g> endnu ikke tilgængelige."</string>
     <string name="encrypt_talkback_dialog_message_pattern" msgid="4474332516537386384">"Når du angiver dit mønster for at starte denne enhed, er tilgængelighedstjenester som <xliff:g id="SERVICE">%1$s</xliff:g> endnu ikke tilgængelige."</string>
     <string name="encrypt_talkback_dialog_message_password" msgid="8166099418487083927">"Når du angiver din adgangskode for at starte denne enhed, er tilgængelighedstjenester som <xliff:g id="SERVICE">%1$s</xliff:g> endnu ikke tilgængelige."</string>
+    <string name="imei_information_title" msgid="8499085421609752290">"IMEI-oplysninger"</string>
+    <string name="imei_information_summary" msgid="2074095606556565233">"Relative IMEI-oplysninger"</string>
+    <string name="slot_number" msgid="3762676044904653577">"(Port <xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml
index f0ac2d1..34cd2ce 100644
--- a/res/values-de/arrays.xml
+++ b/res/values-de/arrays.xml
@@ -527,4 +527,12 @@
     <item msgid="4338089220026248848">"Im Cache gespeichert (Aktivitätsclient)"</item>
     <item msgid="6652164677254579050">"Im Cache gespeichert (leer)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Blaugrün"</item>
+    <item msgid="8332294763632946560">"Blau"</item>
+    <item msgid="2023216417616991392">"Indigo"</item>
+    <item msgid="3170497246594232819">"Lila"</item>
+    <item msgid="4608643045752965568">"Pink"</item>
+    <item msgid="6131821495505931173">"Rot"</item>
+  </string-array>
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index d0b13a5..2381e76 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>
@@ -180,7 +180,6 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s möchte auf Ihre Nachrichten zugreifen. Möchten Sie %2$s den Zugriff erlauben?"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Datum &amp; Uhrzeit"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Zeitzone wählen"</string>
-    <string name="normal_date_format" msgid="7636406984925498359">"Lokal (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Vorschau:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Schriftgröße:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -291,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>
@@ -322,8 +321,6 @@
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Zeitzone auswählen"</string>
     <string name="date_time_set_date_title" msgid="6928286765325608604">"Datum"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"Datum festlegen"</string>
-    <string name="date_time_date_format_title" msgid="3976171711988766411">"Datumsformat"</string>
-    <string name="date_time_date_format" msgid="6951498879879281102">"Datumsformat auswählen"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Alphabetisch sortieren"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Nach Zeitzone sortieren"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Datum"</string>
@@ -372,7 +369,8 @@
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Bitte warten Sie, während Ihr Telefon verschlüsselt wird. Zu <xliff:g id="PERCENT">^1</xliff:g> % abgeschlossen."</string>
     <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Ihr Tablet wird verschlüsselt. Bitte warten Sie noch <xliff:g id="DURATION">^1</xliff:g>."</string>
     <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Ihr Telefon wird verschlüsselt. Bitte warten Sie noch <xliff:g id="DURATION">^1</xliff:g>."</string>
-    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Versuchen Sie es in <xliff:g id="DELAY">^1</xliff:g> Sekunden erneut."</string>
+    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"Schalten Sie Ihr Tablet aus und wieder ein, um es zu entsperren."</string>
+    <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"Schalten Sie Ihr Telefon aus und wieder ein, um es zu entsperren."</string>
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"Achtung: Sollten die nächsten <xliff:g id="COUNT">^1</xliff:g> Versuche, das Gerät zu entsperren, fehlschlagen, werden die Gerätedaten gelöscht!"</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Passwort eingeben"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Verschlüsselung fehlgeschlagen"</string>
@@ -401,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>
@@ -412,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>
@@ -557,13 +557,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Als Lautsprechertelefon"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Für Musik und Medien"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Einstellungen speichern"</string>
-    <string name="wifi_assistant_intro_setup" msgid="4605105515416995110">"Neu:\nWLAN-Assistent"</string>
-    <string name="wifi_assistant_no_thanks" msgid="2776983751990143934">"Nein danke"</string>
-    <string name="wifi_assistant_setup" msgid="3772423650475730906">"Einrichten"</string>
-    <string name="wifi_assistant_card_message" msgid="107811647784658536">"Automatisch über Wi-Fi Assistant mit verfügbaren Netzwerken verbinden"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi‑Fi Assistant"</string>
-    <string name="wifi_assistant_title_message" msgid="6240721017579074015">"<xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> stellt automatisch eine Verbindung mit dem besten verfügbaren WLAN her."</string>
-    <string name="wifi_assistant_open_app" msgid="4803044899535675063">"App öffnen"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Über WLAN-Assistenten verbunden"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"Bildschirmübertragung"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Kabellose Übertragung aktivieren"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Kein Gerät in der Nähe gefunden"</string>
@@ -593,7 +588,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"WLAN-Einstellungen"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"WLAN"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"WLAN-Zugangspunkte festlegen und verwalten"</string>
-    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"WLAN auswählen"</string>
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"WLAN auswählen"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"WLAN auswählen"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"WLAN wird aktiviert…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"WLAN wird deaktiviert…"</string>
@@ -608,8 +603,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"Erkennungsfunktion immer verfügbar"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"WLAN-Suche immer zulassen"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Der Standortdienst von Google und andere Apps sollen auch bei deaktiviertem WLAN nach Netzwerken suchen."</string>
-    <string name="wifi_automatically_manage_title" msgid="6249976570008992746">"WLAN automatisch verwalten"</string>
-    <string name="wifi_automatically_manage_summary" msgid="6952470763378312488">"Verwaltung Ihrer WLAN-Verbindung an <xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> übertragen"</string>
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Automatisch offenes WLAN verwenden"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Automatische Verbindung mit offenen Netzwerken von hoher Qualität durch WLAN-Assistenten zulassen"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Assistent auswählen"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Zertifikate installieren"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Zur Erhöhung der Standortgenauigkeit und aus anderen Gründen können Google und andere Apps auch bei deaktiviertem WLAN nach Netzwerken in der Nähe suchen. Wenn Sie das nicht möchten, können Sie dies unter \"Erweitert\" &gt; \"Scannen immer verfügbar\" ändern."</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Apps können auch bei deaktiviertem WLAN nach Netzwerken in der Nähe suchen. Wenn Sie das nicht möchten, können Sie dies unter \"Erweitert\" &gt; \"Scannen immer verfügbar\" ändern."</string>
@@ -630,6 +626,7 @@
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Scannen"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Erweitert"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Mit Netzwerk verbinden"</string>
+    <string name="wifi_menu_remember" msgid="8814185749388713796">"Netzwerk speichern"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Netzwerk entfernen"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Netzwerk ändern"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"In NFC-Tag schreiben"</string>
@@ -674,9 +671,11 @@
     <string name="wifi_unspecified" msgid="5431501214192991253">"(keine Angabe)"</string>
     <string name="wifi_remembered" msgid="4955746899347821096">"Gespeichert"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"Deaktiviert"</string>
-    <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Schlechte Verbindung"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP-Konfigurationsfehler"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"WLAN-Verbindungsfehler"</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Authentifizierungsproblem"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Nicht in Reichweite"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Keine Internetverbindung erkannt, es kann nicht automatisch eine Verbindung hergestellt werden."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS verfügbar"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS verfügbar)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Geben Sie Ihr Netzwerkpasswort ein."</string>
@@ -700,9 +699,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"Achtung: Wenn Sie die WLAN-Option überspringen, nutzt Ihr Tablet eine Mobilfunkverbindung für erste Downloads und Updates. Um potenzielle Datengebühren zu vermeiden, stellen Sie eine WLAN-Verbindung her."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"Achtung: Wenn Sie die WLAN-Option überspringen, nutzt Ihr Gerät eine Mobilfunkverbindung für erste Downloads und Updates. Um potenzielle Datengebühren zu vermeiden, stellen Sie eine WLAN-Verbindung her."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"Achtung: Wenn Sie die WLAN-Option überspringen, nutzt Ihr Telefon eine Mobilfunkverbindung für erste Downloads und Updates. Um potenzielle Datengebühren zu vermeiden, stellen Sie eine WLAN-Verbindung her."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="2393880108322835846">"Achtung: Wenn Sie die WLAN-Option überspringen, kann Ihr Tablet keine Internetverbindung für die ersten Downloads oder Updates herstellen."</string>
-    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1707391993265558787">"Achtung: Wenn Sie die WLAN-Option überspringen, kann Ihr Gerät keine Internetverbindung für die ersten Downloads oder Updates herstellen."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="1556858507920033022">"Achtung: Wenn Sie die WLAN-Option überspringen, kann Ihr Telefon keine Internetverbindung für die ersten Downloads oder Updates herstellen."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Beachten Sie Folgendes, wenn Sie die WLAN-Option überspringen:\n\nAuf Ihrem Tablet besteht dann keine Internetverbindung.\n\nSie erhalten erst Software-Updates, nachdem Sie eine Internetverbindung hergestellt haben.\n\nSie können derzeit keine Geräteschutzfunktionen aktivieren."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Beachten Sie Folgendes, wenn Sie die WLAN-Option überspringen:\n\nAuf Ihrem Gerät besteht dann keine Internetverbindung.\n\nSie erhalten erst Software-Updates, nachdem Sie eine Internetverbindung hergestellt haben.\n\nSie können derzeit keine Geräteschutzfunktionen aktivieren."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Beachten Sie Folgendes, wenn Sie die WLAN-Option überspringen:\n\nAuf Ihrem Telefon besteht dann keine Internetverbindung.\n\nSie erhalten erst Software-Updates, nachdem Sie eine Internetverbindung hergestellt haben.\n\n Sie können derzeit keine Geräteschutzfunktionen aktivieren."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Das Tablet konnte nicht auf dieses WLAN zugreifen."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"Das Gerät konnte nicht auf dieses WLAN-Netzwerk zugreifen."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Das Telefon konnte nicht auf dieses WLAN zugreifen."</string>
@@ -762,7 +761,6 @@
     <string name="ring_volume_title" msgid="7938706566797464165">"Klingeltonlautstärke"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Im Lautlos-Modus vibrieren"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Standard-Benachrichtigungston"</string>
-    <string name="heads_up_enabled_title" msgid="1031078221910921622">"Pop-up bei hoher Priorität"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Klingelton"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Benachrichtigung"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Lautstärke für eingehende Anrufe für Benachrichtigungen verwenden"</string>
@@ -835,7 +833,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatische Helligkeit"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Zum Aktivieren anheben"</string>
     <string name="doze_title" msgid="2259176504273878294">"Inaktivitätsdisplay"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"Bildschirm aktivieren, wenn das Gerät verwendet wird oder eine Benachrichtigung eintrifft"</string>
+    <string name="doze_summary" msgid="7128970177894383698">"Bildschirm aktivieren, wenn Sie das Gerät verwenden oder eine Benachrichtigung erhalten"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Schriftgröße"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Schriftgröße"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Einstellungen für SIM-Sperre"</string>
@@ -863,6 +861,10 @@
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Abbrechen"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"Mehrere SIM-Karten gefunden"</string>
     <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>
+    <string name="sim_preferred_title" msgid="5567909634636045268">"Bevorzugte SIM-Karte aktualisieren?"</string>
+    <string name="sim_preferred_message" msgid="301251431163650167">"\"<xliff:g id="NEW_SIM">%1$s</xliff:g>\" ist die einzige SIM-Karte in Ihrem Gerät. Möchten Sie diese SIM-Karte für Mobilfunkdaten, Anrufe und SMS verwenden?"</string>
     <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>
@@ -1013,6 +1015,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Hierdurch werden alle Daten aus dem "<b>"internen Speicher"</b>" Ihres Tablets gelöscht, u. a.\n\n"<li>"Ihr Google-Konto"</li>\n<li>"System- und App-Daten sowie entsprechende Einstellungen"</li>\n<li>"Heruntergeladene Apps"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Hierdurch werden alle Daten aus dem "<b>"internen Speicher"</b>" Ihres Telefons gelöscht, u. a.\n\n"<li>"Ihr Google-Konto"</li>\n<li>"System- und App-Daten sowie entsprechende Einstellungen"</li>\n<li>"Heruntergeladene Apps"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Sie sind zurzeit in folgenden Konten angemeldet:\n"</string>
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Auf diesem Gerät sind andere Nutzer vorhanden.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musik"</li>\n<li>"Fotos"</li>\n<li>"Sonstige Nutzerdaten"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Um auch Musik, Bilder und sonstige Nutzerdaten zu löschen, muss der "<b>"USB-Speicher"</b>" gelöscht werden."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Um auch Musik, Bilder und sonstige Nutzerdaten zu löschen, muss die "<b>"SD-Karte"</b>" gelöscht werden."</string>
@@ -1024,7 +1027,6 @@
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Telefon zurücksetzen"</string>
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Alle personenbezogenen Daten und heruntergeladenen Apps löschen? Diese Aktion kann nicht rückgängig gemacht werden!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Alles löschen"</string>
-    <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Bitte zeichnen Sie Ihr Entsperrungsmuster."</string>
     <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Sie müssen Ihr Entsperrungsmuster eingeben, um das Zurücksetzen auf die Werkseinstellungen zu bestätigen."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Die Zurücksetzung konnte nicht durchgeführt werden, weil der Dienst zur Systembereinigung nicht verfügbar ist."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Zurücksetzen?"</string>
@@ -1042,7 +1044,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"USB-Speicher und alle darauf gespeicherten Dateien löschen? Diese Aktion kann nicht rückgängig gemacht werden!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"SD-Karte und alle darauf gespeicherten Dateien löschen? Die Aktion kann nicht rückgängig gemacht werden!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Alles löschen"</string>
-    <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Bitte zeichnen Sie Ihr Entsperrungsmuster."</string>
     <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Sie müssen Ihr Entsperrungsmuster zeichnen, um die Löschung des USB-Speichers zu bestätigen."</string>
     <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Sie müssen Ihr Entsperrungsmuster zeichnen, um das Löschen der SD-Karte zu bestätigen."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Anrufeinstellungen"</string>
@@ -1088,6 +1089,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Legen Sie die SIM ein und starten das Gerät neu."</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Bitte stellen Sie eine Verbindung zum Internet her."</string>
     <string name="location_title" msgid="1029961368397484576">"Mein Standort"</string>
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Arbeitsprofil"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Standort für Arbeitsprofil"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Vom Unternehmen deaktiviert"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Modus"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Hohe Genauigkeit"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Energiesparmodus"</string>
@@ -1125,6 +1129,7 @@
     <string name="copyright_title" msgid="865906688917260647">"Urheberrecht"</string>
     <string name="license_title" msgid="1990487604356037871">"Lizenz"</string>
     <string name="terms_title" msgid="7697580845616764642">"Nutzungsbedingungen"</string>
+    <string name="webview_license_title" msgid="2813507464175738967">"System-WebView-Lizenz"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Hintergründe"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Satellitenbilder bereitgestellt von:\n© 2014 CNES/Astrium, DigitalGlobe, Bluesky"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Open-Source-Lizenzen"</string>
@@ -1238,7 +1243,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB-Speicher"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Auf SD-Karte"</string>
     <string name="disabled" msgid="9206776641295849915">"Deaktiviert"</string>
-    <string name="not_installed" msgid="1475144352069281880">"Nicht installiert"</string>
+    <string name="not_installed" msgid="2797554494953450291">"Nicht für Nutzer installiert"</string>
     <string name="no_applications" msgid="7336588977497084921">"Keine Apps"</string>
     <string name="internal_storage" msgid="1584700623164275282">"Interner Speicher"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB-Speicher"</string>
@@ -1435,8 +1440,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Display wird beim Laden nie in den Ruhezustand versetzt"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Bluetooth HCI-Snoop-Protokoll aktivieren"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Alle Bluetooth HCI-Pakete in einer Datei erfassen"</string>
-    <string name="oem_unlock_enable" msgid="6629321276287913315">"OEM-Entsperrung aktivieren"</string>
-    <string name="oem_unlock_enable_summary" msgid="3546686263996628110">"OEM-Entsperrung des Geräts zulassen"</string>
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM-Entsperrung"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Bootloader-Entsperrung zulassen"</string>
+    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"PIN eingeben"</string>
+    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Zum Aktivieren der OEM-Entsperrung Geräte-PIN eingeben"</string>
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"OEM-Entsperrung zulassen?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"Achtung: Die Geräteschutzfunktionen funktionieren auf diesem Gerät nicht, solange diese Einstellung aktiviert ist."</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Kabellose Übertragung"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Ausführliche WLAN-Protokolle aktivieren"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Aggressives Handover von WLAN an Mobilfunk"</string>
@@ -1539,6 +1548,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"Untertitel sehen so aus."</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"Standard"</string>
+    <string name="color_title" msgid="4258931051732243983">"Farbe"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"Standard"</string>
     <string name="color_none" msgid="3475640044925814795">"Keine"</string>
     <string name="color_white" msgid="8045195170201590239">"Weiß"</string>
@@ -1596,12 +1606,12 @@
     <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">"Noch <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"Verbleibende Ladezeit: <xliff:g id="UNTIL_CHARGED">%1$s</xliff:g>"</string>
-    <string name="power_discharging_duration" msgid="7125493014448497620">"<xliff:g id="LEVEL">%1$d</xliff:g> %% – noch etwa <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="power_charging" msgid="712751285832976915">"<xliff:g id="LEVEL">%1$d</xliff:g> %% – <xliff:g id="STATE">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration" msgid="4802183864773082009">"<xliff:g id="LEVEL">%1$d</xliff:g> %% – voll in <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration_ac" msgid="3611179931297824699">"<xliff:g id="LEVEL">%1$d</xliff:g> %% – mit Netzteil voll in <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration_usb" msgid="1106605348913397583">"<xliff:g id="LEVEL">%1$d</xliff:g> %% – über USB-Verbindung voll in <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration_wireless" msgid="633606920144617227">"<xliff:g id="LEVEL">%1$d</xliff:g> %% – bei kabellosem Laden voll in <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> – noch etwa <xliff:g id="TIME">%2$s</xliff:g>"</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> – voll in <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="power_charging_duration_ac" msgid="3969186192576594254">"<xliff:g id="LEVEL">%1$s</xliff:g> – bei Wechselstrom voll in <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="power_charging_duration_usb" msgid="182405645340976546">"<xliff:g id="LEVEL">%1$s</xliff:g> – über USB voll in <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="power_charging_duration_wireless" msgid="1829295708243159464">"<xliff:g id="LEVEL">%1$s</xliff:g> – bei kabellosem Laden voll in <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="power_usage_list_summary" msgid="2409288197839512482">"Verbrauch seit letztem vollen Aufladen"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Akkuverbrauch seit dem Ausstecken"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Akkuverbrauch seit dem Zurücksetzen"</string>
@@ -1618,7 +1628,6 @@
     <string name="awake" msgid="387122265874485088">"Aktivzeit des Geräts"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"WLAN-Aktivzeit"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"WLAN-Aktivzeit"</string>
-    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> - <xliff:g id="NUMBER">%2$s</xliff:g> <xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Verlaufsdetails"</string>
     <string name="details_title" msgid="3792801565213935385">"Details zum Verbrauch"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Details"</string>
@@ -1690,9 +1699,7 @@
     <string name="battery_saver" msgid="1426682272004907982">"Energiesparmodus"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Automatisch aktivieren"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Nie"</string>
-    <!-- String.format failed for translation -->
-    <!-- no translation found for battery_saver_turn_on_automatically_pct (3033681629861428940) -->
-    <skip />
+    <string name="battery_saver_turn_on_automatically_pct" msgid="7536784431655058267">"bei Akku von %1$s"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Prozessstatistiken"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Statistiken zu laufenden Prozessen"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Speichernutzung"</string>
@@ -1816,7 +1823,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Hardware-gestützt"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Nur Software"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"Anmeldedaten sind für diesen Nutzer nicht verfügbar."</string>
-    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Bitte zeichnen Sie Ihr Entsperrungsmuster."</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Sie müssen Ihr Entsperrungsmuster eingeben, um das Installieren der Anmeldedaten zu bestätigen."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Geben Sie das Passwort für den Anmeldeinformationsspeicher ein."</string>
@@ -1846,6 +1852,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"App-Daten einschließen"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Autom. Wiederherstellung"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Nach der Neuinstallation einer App gesicherte Einstellungen und Daten wiederherstellen"</string>
+    <string name="backup_inactive_title" msgid="5355557151569037197">"Der Sicherungsdienst ist inaktiv."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"Dies wird durch Ihre Geräterichtlinien festgelegt."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Desktop-Sicherungspasswort"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Vollständige Desktop-Sicherungen sind momentan nicht passwortgeschützt."</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Zum Ändern oder Entfernen des Passworts für vollständige Desktop-Sicherungen berühren"</string>
@@ -1955,7 +1963,11 @@
     <string name="enter_password" msgid="8035706727471334122">"Geben Sie Ihr Passwort ein, um Android zu starten."</string>
     <string name="enter_pin" msgid="5305333588093263790">"Geben Sie Ihre PIN ein, um Android zu starten."</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Zeichnen Sie Ihr Muster, um Android zu starten."</string>
-    <string name="try_again" msgid="4272075051293936921">"Erneut versuchen"</string>
+    <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"Falsches Muster"</string>
+    <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"Falsches Passwort"</string>
+    <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"Falsche PIN"</string>
+    <string name="checking_decryption" msgid="8287458611802609493">"Wird überprüft…"</string>
+    <string name="starting_android" msgid="8581493237458496835">"Android wird gestartet"</string>
     <string name="delete" msgid="4219243412325163003">"Löschen"</string>
     <string name="misc_files" msgid="6720680815969643497">"Sonstige Dateien"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"<xliff:g id="NUMBER">%1$d</xliff:g> von <xliff:g id="TOTAL">%2$d</xliff:g> ausgewählt"</string>
@@ -1993,8 +2005,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"GPU immer für Bildschirmaufbau verwenden"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"Farbraum simulieren"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"OpenGL-Traces aktivieren"</string>
-    <string name="use_nuplayer" msgid="5699257393367904387">"NuPlayer verwenden (experimentell)"</string>
-    <string name="use_nuplayer_summary" msgid="1991479067478516714">"NuPlayer statt AwesomePlayer verwenden"</string>
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"AwesomePlayer (eingestellt) nutzen"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"Für die meisten Medien AwesomePlayer statt NuPlayer verwenden"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"USB-Audiorouting deaktivieren"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"Autom. Routing an externe USB-Audiogeräte deaktivieren"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Layoutgrenzen einblenden"</string>
@@ -2170,7 +2182,6 @@
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Nutzer oder Profil hinzufügen"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Nutzer hinzufügen"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Eingeschränktes Profil"</string>
-    <string name="user_summary_managed_profile" msgid="7369539529693048111">"Arbeitsprofil"</string>
     <string name="user_need_lock_message" msgid="2596365678651842785">"Vor dem Erstellen eines eingeschränkten Profils müssen Sie eine Displaysperre einrichten, um Ihre Apps und personenbezogenen Daten zu schützen."</string>
     <string name="user_set_lock_button" msgid="8311219392856626841">"Sperre einrichten"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Nicht eingerichtet"</string>
@@ -2301,11 +2312,13 @@
     <string name="sim_cellular_data_unavailable_summary" msgid="3654805961942166428">"Zum Auswählen einer Daten-SIM-Karte tippen"</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"Diese SIM für alle Anrufe verwenden"</string>
     <string name="select_sim_for_data" msgid="2366081042162853044">"SIM-Karte für Daten auswählen"</string>
+    <string name="data_switch_started" msgid="2040761479817166311">"Wechsel der Daten-SIM. Dies kann bis zu einer Minute dauern."</string>
     <string name="select_sim_for_calls" msgid="3503094771801109334">"Anrufen mit"</string>
     <string name="sim_select_card" msgid="211285163525563293">"SIM-Karte auswählen"</string>
     <string name="sim_card_number_title" msgid="7845379943474336488">"SIM-Karte <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"SIM-Karte ist leer."</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"Name der SIM-Karte"</string>
+    <string name="sim_name_hint" msgid="7038643345238968930">"Namen der SIM-Karte eingeben"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"SIM-Steckplatz %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Mobilfunkanbieter"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Nummer"</string>
@@ -2315,7 +2328,6 @@
     <string name="color_purple" msgid="3888532466427762504">"Lila"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"Keine SIM-Karte eingelegt"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"Status der SIM-Karte"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"Informationen zur SIM-Karte"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"Über Standard-SIM-Karte zurückrufen"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"SIM-Karte für ausgehende Anrufe"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Sonstige Anrufeinstellungen"</string>
@@ -2323,8 +2335,11 @@
     <string name="preferred_network_offload_header" msgid="2321173571529106767">"Netzwerknamenübertr. deaktivieren"</string>
     <string name="preferred_network_offload_footer" msgid="5857279426054744020">"Bei deaktivierter Netzwerknamenübertragung können Dritte nicht auf Ihre Netzwerkinformationen zugreifen."</string>
     <string name="preferred_network_offload_popup" msgid="2252915199889604600">"Bei deaktivierter Netzwerknamenübertragung ist keine autom. Verbindung zu verborgenen Netzwerken möglich."</string>
+    <string name="sim_signal_strength" msgid="9144010043784767984">"<xliff:g id="DBM">%1$d</xliff:g> dBm <xliff:g id="ASU">%2$d</xliff:g> asu"</string>
+    <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>
+    <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Jedes Mal fragen"</string>
     <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>
@@ -2333,22 +2348,22 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Letzte Suchanfragen"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Ergebnisse"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wlan wifi wi-fi netzwerkverbindung"</string>
-    <string name="keywords_more_default_sms_app" msgid="2744404159003574745">"sms"</string>
-    <string name="keywords_more_mobile_networks" msgid="7813380887358745769">"mobilfunk mobiltelefon mobilfunkanbieter drahtlos"</string>
+    <string name="keywords_more_default_sms_app" msgid="895656981962034647">"textnachricht sms nachrichten messaging mms"</string>
+    <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"mobilfunk mobilfunkanbieter drahtlos drahtlose daten 4g 3g 2g lte"</string>
     <string name="keywords_home" msgid="3626170808219458848">"übersicht launcher"</string>
     <string name="keywords_display" msgid="6709007669501628320">"bildschirm touchscreen"</string>
-    <string name="keywords_display_brightness_level" msgid="8636451602230815191">"bildschirm touchscreen dimmen"</string>
-    <string name="keywords_display_auto_brightness" msgid="8070218600502753102">"bildschirm touchscreen dimmen"</string>
-    <string name="keywords_display_wallpaper" msgid="4315466287469834939">"hintergrund"</string>
+    <string name="keywords_display_brightness_level" msgid="8923289340474728990">"display dimmen touchscreen akku"</string>
+    <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"display dimmen touchscreen akku"</string>
+    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"hintergrund personalisieren display anpassen"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"textgröße"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"projizieren"</string>
-    <string name="keywords_storage" msgid="7007275853993419928">"speicher speicherplatz festplatte laufwerk"</string>
-    <string name="keywords_battery" msgid="3992479295298655138">"stromversorgung"</string>
-    <string name="keywords_spell_checker" msgid="4509482591225399210">"rechtschreibung"</string>
+    <string name="keywords_storage" msgid="6572905220031852173">"speicherplatz festplatte gerät nutzung gerätenutzung"</string>
+    <string name="keywords_battery" msgid="2096185085932675704">"strom verbrauch stromverbrauch aufladen"</string>
+    <string name="keywords_spell_checker" msgid="6106749039734174140">"rechtschreibung schreibweise wörterbuch rechtschreibprüfung autokorrektur"</string>
     <string name="keywords_voice_input" msgid="3519547605812413860">"spracherkennung eingabesprache sprechen sprache freisprechfunktion erkennung anstößiges wort audioverlauf bluetooth headset"</string>
-    <string name="keywords_text_to_speech_output" msgid="8207889472282225512">"bewerten sprache standard sprechen sprache"</string>
-    <string name="keywords_date_and_time" msgid="7666950126499155141">"uhr"</string>
-    <string name="keywords_factory_data_reset" msgid="3693730656843989732">"löschen"</string>
+    <string name="keywords_text_to_speech_output" msgid="392447904221657930">"bewerten sprache standard sprechen tts bedienungshilfen leser reader blind sehbehindert"</string>
+    <string name="keywords_date_and_time" msgid="2631808108134830066">"uhr 24-stunden-zählung"</string>
+    <string name="keywords_factory_data_reset" msgid="4355133848707691977">"löschen entfernen wiederherstellen daten löschen"</string>
     <string name="keywords_printing" msgid="1701778563617114846">"drucker"</string>
     <string name="keywords_sounds_and_notifications" msgid="5965996187974887000">"lautsprecher signalton"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="2912933812460077912">"nicht stören unterbrechen unterbrechung pause"</string>
@@ -2357,7 +2372,7 @@
     <string name="keywords_location_mode" msgid="8584992704568356084">"genauigkeit"</string>
     <string name="keywords_accounts" msgid="1957925565953357627">"konto"</string>
     <string name="keywords_users" msgid="4673901601478559100">"einschränkung einschränken eingeschränkt"</string>
-    <string name="keywords_keyboard_and_ime" msgid="1103378692379215672">"textkorrektur korrigieren ton vibrieren automatisch sprache bewegung vorschlagen vorschlag design anstößig wort eingeben emoji"</string>
+    <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"text korrektur textkorrektur korrigieren sound ton vibrieren automatisch sprache bewegung vorschlagen vorschlag design anstößig anstößiges wort eingeben emoji international"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"ziehen passwort muster pin slide password pattern"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"WLAN-NFC-Tag einrichten"</string>
     <string name="write_tag" msgid="8571858602896222537">"Schreiben"</string>
@@ -2374,7 +2389,6 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Benachrichtigungslautstärke"</string>
     <string name="zen_mode_settings_title" msgid="7014915558669122902">"Unterbrechungen"</string>
     <string name="zen_mode_option_title" msgid="5061978632306007914">"Bei eingehenden Anrufen und Benachrichtigungen"</string>
-    <string name="zen_mode_option_title_novoice" msgid="6680706009915204785">"Wenn Benachrichtigungen eingehen"</string>
     <string name="zen_mode_option_off" msgid="3167702608910820883">"Immer unterbrechen"</string>
     <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Nur wichtige Unterbrechungen zulassen"</string>
     <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Nicht unterbrechen"</string>
@@ -2432,14 +2446,17 @@
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Fertig"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Bis zur Deaktivierung"</string>
     <string name="zen_mode_important_category" msgid="8123274463331022993">"Wichtige Unterbrechungen"</string>
-    <string name="zen_mode_downtime_category" msgid="4730179065426038108">"Inaktivität (nur wichtige Unterbrechungen)"</string>
+    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Inaktivität"</string>
     <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Tage"</string>
     <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Keine"</string>
+    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Zulässige Unterbrechungen"</string>
+    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Nur wichtige"</string>
+    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Keine"</string>
     <string name="zen_mode_automation_category" msgid="4653551005950835761">"Automatisierung"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Automatisch aktivieren"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Nie"</string>
-    <string name="zen_mode_phone_calls" msgid="8956214416859303966">"Anrufe"</string>
+    <string name="zen_mode_calls" msgid="7051492091133751208">"Anrufe"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Nachrichten"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Anrufe/Nachrichten von"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Alle"</string>
@@ -2452,8 +2469,10 @@
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Jede Nacht"</string>
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Wochentags abends"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Startzeit"</string>
-    <string name="zen_mode_end_time" msgid="8774327885892705505">"Endzeit"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"Am nächsten Tag um <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
+    <string name="zen_mode_end_time" msgid="8774327885892705505">"Schlusszeit"</string>
+    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"Um <xliff:g id="FORMATTED_TIME">%s</xliff:g> am nächsten Tag"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"Um <xliff:g id="FORMATTED_TIME">%s</xliff:g> oder bei einem Alarm davor"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"Um <xliff:g id="FORMATTED_TIME">%s</xliff:g> am nächsten Tag oder bei einem Alarm davor"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"App-Benachrichtigungen"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Benachrichtigungseinstellungen"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Feedback zu diesem Gerät senden"</string>
@@ -2461,7 +2480,11 @@
     <string name="switch_on_text" msgid="1124106706920572386">"An"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Aus"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"Bildschirm anheften"</string>
-    <string name="screen_pinning_description" msgid="7091642350452605379">"Hiermit können Sie die Ansicht des aktuellen Bildschirms fixieren.\n\nSo verwenden Sie die Bildschirmfixierung:\n\n1. Prüfen Sie, ob die Bildschirmfixierung aktiviert ist.\n\n2. Öffnen Sie den Bildschirm, den Sie fixieren möchten.\n\n3. Tippen Sie auf \"Übersicht\".\n\n4. Tippen Sie auf das Stecknadelsymbol."</string>
+    <string name="screen_pinning_description" msgid="1137904524037468263">"Wenn diese Einstellung aktiviert ist, können Sie die Ansicht des aktuellen Bildschirms fixieren.\n\nSo nutzen Sie die Bildschirmfixierung:\n\n1. Prüfen Sie, ob die Bildschirmfixierung aktiviert ist.\n\n2. Öffnen Sie den zu fixierenden Bildschirm.\n\n3. Tippen Sie auf \"Übersicht\".\n\n4. Wischen Sie nach oben und tippen Sie auf das Stecknadelsymbol."</string>
+    <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Vor dem Beenden nach Entsperrungsmuster fragen"</string>
+    <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Vor dem Beenden nach PIN fragen"</string>
+    <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Vor dem Beenden nach Passwort fragen"</string>
+    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Gerät beim Beenden sperren"</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Arbeitsprofil"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Experimentell)"</string>
     <string name="display_auto_rotate_title" msgid="6176450657107806043">"Bei Drehung des Geräts"</string>
@@ -2470,7 +2493,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Querformat beibehalten"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Aktuelle Ausrichtung beibehalten"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI-Informationen"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"Informationen zur relativen IMEI"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Verschlüsselung"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Weiter"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"Sie können dieses Gerät noch weiter schützen, indem Sie festlegen, dass vor dem Gerätestart die Eingabe Ihrer PIN erforderlich ist. Bis das Gerät startet, können weder Anrufe noch Nachrichten, Benachrichtigungen oder Alarme empfangen werden. \n\nSo schützen Sie Daten auf verloren gegangenen oder gestohlenen Geräten."</string>
@@ -2488,4 +2510,7 @@
     <string name="encrypt_talkback_dialog_message_pin" msgid="1890374082842868489">"Wenn Sie zum Starten dieses Geräts Ihre PIN eingeben, stehen Dienste für Bedienungshilfen wie <xliff:g id="SERVICE">%1$s</xliff:g> noch nicht zur Verfügung."</string>
     <string name="encrypt_talkback_dialog_message_pattern" msgid="4474332516537386384">"Wenn Sie zum Starten dieses Geräts Ihr Muster eingeben, stehen Dienste für Bedienungshilfen wie <xliff:g id="SERVICE">%1$s</xliff:g> noch nicht zur Verfügung."</string>
     <string name="encrypt_talkback_dialog_message_password" msgid="8166099418487083927">"Wenn Sie zum Starten dieses Geräts Ihr Passwort eingeben, stehen Dienste für Bedienungshilfen wie <xliff:g id="SERVICE">%1$s</xliff:g> noch nicht zur Verfügung."</string>
+    <string name="imei_information_title" msgid="8499085421609752290">"IMEI-Informationen"</string>
+    <string name="imei_information_summary" msgid="2074095606556565233">"Informationen zur relativen IMEI"</string>
+    <string name="slot_number" msgid="3762676044904653577">"(Slot <xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-el/arrays.xml b/res/values-el/arrays.xml
index 00342a2b..195d048 100644
--- a/res/values-el/arrays.xml
+++ b/res/values-el/arrays.xml
@@ -527,4 +527,12 @@
     <item msgid="4338089220026248848">"Αποθηκευμένο στην κρυφή μνήμη (δραστηριότητα πελάτη)"</item>
     <item msgid="6652164677254579050">"Αποθηκευμένο στην κρυφή μνήμη (κενό)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Γαλαζοπράσινο"</item>
+    <item msgid="8332294763632946560">"Μπλε"</item>
+    <item msgid="2023216417616991392">"Indigo"</item>
+    <item msgid="3170497246594232819">"Μοβ"</item>
+    <item msgid="4608643045752965568">"Ροζ"</item>
+    <item msgid="6131821495505931173">"Κόκκινο"</item>
+  </string-array>
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 7082f8e..eb40c9e 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>
@@ -180,7 +180,6 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s επιθυμεί να αποκτήσει πρόσβαση στα μηνύματά σας. Παραχώρηση πρόσβασης σε %2$s;"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Ημερομηνία &amp; ώρα"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Επιλέξτε ζώνη ώρας"</string>
-    <string name="normal_date_format" msgid="7636406984925498359">"Τοπική (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Προεπισκόπηση:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Μέγεθος γραμματοσειράς:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -291,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>
@@ -322,8 +321,6 @@
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Επιλογή ζώνης ώρας"</string>
     <string name="date_time_set_date_title" msgid="6928286765325608604">"Ημερομηνία"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"Ορισμός ημερομηνίας"</string>
-    <string name="date_time_date_format_title" msgid="3976171711988766411">"Μορφή ημερομηνίας"</string>
-    <string name="date_time_date_format" msgid="6951498879879281102">"Επιλογή μορφής ημερομηνίας"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Ταξινόμηση με βάση αλφαβητική σειρά"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Ταξινόμηση με βάση ζώνη ώρας"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Ημερομηνία"</string>
@@ -372,7 +369,8 @@
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Περιμένετε μέχρι να γίνει κρυπτογράφηση του τηλεφώνου σας. <xliff:g id="PERCENT">^1</xliff:g>% ολοκληρώθηκε."</string>
     <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Περιμένετε έως ότου ολοκληρωθεί η κρυπτογράφηση του tablet σας. Χρόνος που απομένει: <xliff:g id="DURATION">^1</xliff:g>"</string>
     <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Περιμένετε έως ότου ολοκληρωθεί η κρυπτογράφηση του τηλεφώνου σας. Χρόνος που απομένει: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Προσπαθήστε ξανά σε <xliff:g id="DELAY">^1</xliff:g> δευτερόλεπτα."</string>
+    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"Για να ξεκλειδώσετε το tablet σας, απενεργοποιήστε το και, στη συνέχεια, ενεργοποιήστε το."</string>
+    <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"Για να ξεκλειδώσετε το τηλέφωνό σας, απενεργοποιήστε το και, στη συνέχεια, ενεργοποιήστε το."</string>
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"Προσοχή: η συσκευή σας θα καταργηθεί μετά από <xliff:g id="COUNT">^1</xliff:g> αποτυχημένες προσπάθειες ξεκλειδώματος!"</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Πληκτρολογήστε τον κωδικό πρόσβασής σας"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Η κρυπτογράφηση απέτυχε"</string>
@@ -401,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>
@@ -412,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>
@@ -556,13 +556,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Ως τηλέφωνο ανοιχτής συνομιλίας"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Για μουσική και πολυμέσα"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Διατήρηση ρυθμίσεων"</string>
-    <string name="wifi_assistant_intro_setup" msgid="4605105515416995110">"Παρουσιάζουμε το\nΒοηθό Wi‑Fi"</string>
-    <string name="wifi_assistant_no_thanks" msgid="2776983751990143934">"ΟΧΙ, ΕΥΧΑΡΙΣΤΩ"</string>
-    <string name="wifi_assistant_setup" msgid="3772423650475730906">"ΡΥΘΜΙΣΗ"</string>
-    <string name="wifi_assistant_card_message" msgid="107811647784658536">"Αυτόματη σύνδεση σε διαθέσιμα δίκτυα με Βοηθό Wi‑Fi."</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Βοηθός Wi-Fi"</string>
-    <string name="wifi_assistant_title_message" msgid="6240721017579074015">"Η λειτουργία <xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> σάς συνδέει αυτόματα στην καλύτερη διαθέσιμη σύνδεση Wi-Fi"</string>
-    <string name="wifi_assistant_open_app" msgid="4803044899535675063">"ΑΝΟΙΓΜΑ ΕΦΑΡΜΟΓΗΣ"</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>
@@ -592,7 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Ρυθμίσεις Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Ορισμός &amp; διαχείριση ασύρματων σημείων πρόσβασης"</string>
-    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Επιλογή δικτύου Wi-Fi"</string>
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Επιλέξτε το δίκτυο Wi-Fi"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Επιλογή δικτύου Wi-Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Ενεργοποίηση του Wi-Fi…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Απενεργοποίηση του Wi-Fi…"</string>
@@ -607,8 +602,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"Σάρωση πάντα διαθέσιμη"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Να επιτρέπεται πάντα η σάρωση"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Να επιτρέπεται στην υπηρεσία τοποθεσίας της Google και σε άλλες εφαρμογές η σάρωση για δίκτυα, ακόμα και όταν το Wi‑Fi είναι απενεργοποιημένο"</string>
-    <string name="wifi_automatically_manage_title" msgid="6249976570008992746">"Αυτόματη διαχείριση Wi-Fi"</string>
-    <string name="wifi_automatically_manage_summary" msgid="6952470763378312488">"Να επιτρέπεται στο <xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> να διαχειρίζεται τη σύνδεση Wi‑Fi"</string>
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Αυτόματη χρήση ανοιχτού δικτύου Wi‑Fi"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Να επιτρέπεται σε ένα βοηθό Wi‑Fi η αυτόμ. σύνδεση σε ανοιχτά δίκτυα που θεωρούνται υψηλής ποιότητας"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Επιλογή βοηθού"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Εγκατάσταση πιστοποιητικών"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Για τη βελτίωση της ακρίβειας και για άλλους σκοπούς, το Google και άλλες εφαρμογές ενδέχεται να πραγματοποιούν σάρωση για κοντινά δίκτυα Wi-Fi, ακόμη και αν το Wi-Fi είναι απενεργοποιημένο. Αν δεν επιθυμείτε να συμβαίνει αυτό, μεταβείτε στη ρύθμιση Σύνθετες &gt; Πάντα διαθέσιμη σάρωση."</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Οι εφαρμογές ενδέχεται να κάνουν σάρωση για κοντινά δίκτυα, ακόμη και αν το Wi-Fi είναι απενεργοποιημένο. Αν δεν επιθυμείτε να συμβαίνει αυτό, μεταβείτε στη ρύθμιση Σύνθετες &gt; Πάντα διαθέσιμη σάρωση."</string>
@@ -629,6 +625,7 @@
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Σάρωση"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Σύνθετα"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Σύνδεση στο δίκτυο"</string>
+    <string name="wifi_menu_remember" msgid="8814185749388713796">"Υπενθύμιση δικτύου"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Διαγραφή δικτύου από τη μνήμη"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Τροποποίηση δικτύου"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Εγγραφή στην ετικέτα ΕΚΠ"</string>
@@ -673,9 +670,11 @@
     <string name="wifi_unspecified" msgid="5431501214192991253">"(δεν έχει καθοριστεί)"</string>
     <string name="wifi_remembered" msgid="4955746899347821096">"Αποθηκευμένο"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"Απενεργοποιημένο"</string>
-    <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Αποφυγή κακής σύνδεσης στο Διαδίκτυο"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"Αποτυχία διαμόρφωσης διεύθυνσης IP"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Αποτυχία σύνδεσης Wi-Fi"</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Πρόβλημα ελέγχου ταυτότητας"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Εκτός εμβέλειας"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Δεν εντοπίστηκε καμία πρόσβαση στο διαδίκτυο, δεν θα γίνει αυτόματη επανασύνδεση."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"Διαθέσιμο WPS"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (Διαθέσιμο WPS)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Εισαγάγετε κωδικό πρόσβασης δικτύου"</string>
@@ -699,9 +698,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Αν παραλείψετε το Wi‑Fi, το tablet σας θα χρησιμοποιεί μόνο δεδομένα κινητής τηλεφωνίας για αρχικές λήψεις και ενημερώσεις. Για να αποφύγετε πιθανές χρεώσεις δεδομένων, συνδεθείτε σε Wi‑Fi."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Αν παραλείψετε το Wi‑Fi, η συσκευή σας θα χρησιμοποιεί μόνο δεδομένα κινητής τηλεφωνίας για αρχικές λήψεις και ενημερώσεις. Για να αποφύγετε πιθανές χρεώσεις δεδομένων, συνδεθείτε σε Wi‑Fi."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Αν παραλείψετε το Wi‑Fi, το τηλέφωνό σας θα χρησιμοποιεί μόνο δεδομένα κινητής τηλεφωνίας για αρχικές λήψεις και ενημερώσεις. Για να αποφύγετε πιθανές χρεώσεις δεδομένων, συνδεθείτε σε Wi‑Fi."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="2393880108322835846">"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Αν παραλείψετε το Wi‑Fi, το tablet σας δεν θα έχει σύνδεση στο διαδίκτυο, την οποία θα χρησιμοποιεί για τυχόν αρχικές λήψεις ή ενημερώσεις."</string>
-    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1707391993265558787">"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Αν παραλείψετε το Wi‑Fi, η συσκευή σας δεν θα έχει σύνδεση στο διαδίκτυο, την οποία θα χρησιμοποιεί για τυχόν αρχικές λήψεις ή ενημερώσεις."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="1556858507920033022">"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Αν παραλείψετε το Wi‑Fi, το τηλέφωνό σας δεν θα έχει σύνδεση στο διαδίκτυο, την οποία θα χρησιμοποιεί για τυχόν αρχικές λήψεις ή ενημερώσεις."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Εάν παραλείψετε το Wi‑Fi:\n\nΤο tablet σας δεν θα έχει σύνδεση στο διαδίκτυο.\n\nΔεν θα λαμβάνετε ενημερώσεις λογισμικού έως ότου συνδεθείτε στο διαδίκτυο.\n\nΔεν μπορείτε να ενεργοποιήσετε προς το παρόν λειτουργίες προστασίας της συσκευής."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Εάν παραλείψετε το Wi‑Fi:\n\nΗ συσκευή σας δεν θα έχει σύνδεση στο διαδίκτυο.\n\nΔεν θα λαμβάνετε ενημερώσεις λογισμικού έως ότου συνδεθείτε στο διαδίκτυο.\n\nΔεν μπορείτε να ενεργοποιήσετε προς το παρόν λειτουργίες προστασίας της συσκευής."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Εάν παραλείψετε το Wi‑Fi:\n\nΤο τηλέφωνό σας δεν θα έχει σύνδεση στο διαδίκτυο.\n\nΔεν θα λαμβάνετε ενημερώσεις λογισμικού έως ότου συνδεθείτε στο διαδίκτυο.\n\nΔεν μπορείτε να ενεργοποιήσετε προς το παρόν λειτουργίες προστασίας της συσκευής."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Δεν ήταν δυνατή η σύνδεση του tablet σε αυτό το δίκτυο Wi-Fi."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"Η συσκευή δεν ήταν δυνατό να συνδεθεί σε αυτό το δίκτυο Wi-Fi."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Δεν ήταν δυνατή η σύνδεση του τηλεφώνου σε αυτό το δίκτυο Wi-Fi."</string>
@@ -761,7 +760,6 @@
     <string name="ring_volume_title" msgid="7938706566797464165">"Ένταση ήχου ειδοποίησης"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Δόνηση στο αθόρυβο"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Προεπιλεγμένος ήχος ειδοποίησης"</string>
-    <string name="heads_up_enabled_title" msgid="1031078221910921622">"Αναδ.παρ. για υψηλής προτερ."</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Ήχος κλήσης"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Ειδοποίηση"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Χρήση έντασης ήχου εισερχόμενης κλήσης για ειδοποιήσεις"</string>
@@ -834,7 +832,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Αυτόματη φωτεινότητα"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Σηκώστε για ενεργοποίηση"</string>
     <string name="doze_title" msgid="2259176504273878294">"Οθόνη ambient"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"Οθόνη αφύπνισης κατά την επιλογή συσκευής ή την άφιξη ειδοποιήσεων"</string>
+    <string name="doze_summary" msgid="7128970177894383698">"Η οθόνη ενεργοποιείται όταν σηκώνετε τη συσκευή ή λαμβάνετε ειδοποιήσεις"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Μέγεθος γραμματοσειράς"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Μέγεθος γραμματοσειράς"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Ρυθμίσεις κλειδώματος κάρτας SIM"</string>
@@ -862,6 +860,10 @@
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Ακύρωση"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"Βρέθηκαν πολλές SIM"</string>
     <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>
@@ -1012,6 +1014,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Με αυτόν τον τρόπο, θα διαγραφούν όλα τα δεδομένα από τον "<b>"εσωτερικό χώρο αποθήκευσης"</b>" της συσκευής σας tablet, συμπεριλαμβανομένων:\n\nΤων δεδομένων και των ρυθμίσεων συστήματος "<li>"του Λογαριασμού σας Google "</li>\n<li></li>\n<li>"Ληφθείσες εφαρμογές"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Με αυτόν τον τρόπο, θα διαγραφούν όλα τα δεδομένα από τον "<b>"εσωτερικό χώρο αποθήκευσης"</b>" της συσκευής σας tablet, συμπεριλαμβανομένων:\n\nΤων δεδομένων και των ρυθμίσεων συστήματος "<li>"του Λογαριασμού σας Google "</li>\n<li></li>\n<li>"Ληφθείσες εφαρμογές"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Αυτήν τη στιγμή είστε συνδεδεμένοι στους παρακάτω λογαριασμούς:\n"</string>
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Υπάρχουν άλλοι χρήστες σε αυτήν τη συσκευή.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Μουσική"</li>\n<li>"Φωτογραφίες"</li>\n<li>"Άλλα δεδομένα χρήστη"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Πρέπει να γίνει διαγραφή του "<b>"χώρου αποθήκευσης USB"</b>" για να γίνει, επίσης, εκκαθάριση της μουσικής, των εικόνων και άλλων δεδομένων."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Πρέπει να γίνει εκκαθάριση της "<b>"κάρτας SD"</b>" για να γίνει, επίσης, εκκαθάριση της μουσικής, των εικόνων και άλλων δεδομένων."</string>
@@ -1023,7 +1026,6 @@
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Επαναφορά τηλεφώνου"</string>
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Να διαγραφούν όλα τα προσωπικά σας στοιχεία και οι ληφθείσες εφαρμογές; Δεν μπορείτε να αναστρέψετε αυτήν την ενέργεια!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Διαγραφή όλων"</string>
-    <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Σχεδιάστε το μοτίβο ξεκλειδώματος"</string>
     <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Πρέπει να σχεδιάσετε το μοτίβο ξεκλειδώματος για να επιβεβαιώσετε την επαναφορά στις εργοστασιακές ρυθμίσεις."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Δεν πραγματοποιήθηκε επαναφορά επειδή η υπηρεσία Εκκαθάρισης συστήματος δεν είναι διαθέσιμη."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Να γίνει επαναφορά;"</string>
@@ -1041,7 +1043,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"Να γίνει διαγραφή του αποθηκευτικού χώρου USB, η οποία θα διαγράψει όλα τα αρχεία που έχετε αποθηκεύσει εκεί; Δεν μπορείτε να αναστρέψετε αυτήν την ενέργεια!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Να γίνει διαγραφή της κάρτας SD, με την οποία θα διαγραφούν όλα τα αρχεία που έχετε αποθηκεύσει εκεί; Αυτή η ενέργεια είναι μη αναστρέψιμη!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Διαγραφή όλων"</string>
-    <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Σχεδιάστε το μοτίβο ξεκλειδώματος"</string>
     <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Πρέπει να σχεδιάσετε το μοτίβο ξεκλειδώματος για να επιβεβαιώσετε ότι θέλετε να διαγράψετε το χώρο αποθήκευσης USB."</string>
     <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Πρέπει να σχεδιάσετε το μοτίβο ξεκλειδώματος για να επιβεβαιώσετε ότι θέλετε να διαγράψετε την κάρτα SD."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Ρυθμίσεις κλήσης"</string>
@@ -1087,6 +1088,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Εισαγάγετε την κάρτα SIM και κάντε επανεκκίνηση"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Συνδεθείτε στο διαδίκτυο"</string>
     <string name="location_title" msgid="1029961368397484576">"Η τοποθεσία μου"</string>
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Προφίλ εργασίας"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Τοποθεσία για προφίλ εργασίας"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Απενεργοποίηση από την εταιρεία"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Λειτουργία"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Υψηλή ακρίβεια"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Εξοικονόμησης μπαταρίας"</string>
@@ -1124,6 +1128,7 @@
     <string name="copyright_title" msgid="865906688917260647">"Πνευματικά δικαιώματα"</string>
     <string name="license_title" msgid="1990487604356037871">"Άδεια"</string>
     <string name="terms_title" msgid="7697580845616764642">"Όροι και προϋποθέσεις"</string>
+    <string name="webview_license_title" msgid="2813507464175738967">"Άδεια συστήματος WebView"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Ταπετσαρίες"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Πηγές δορυφορικών εικόνων:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Άδειες λογισμ.ανοικτ.κώδ."</string>
@@ -1237,7 +1242,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Αποθ. χώρος USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Στην κάρτα SD"</string>
     <string name="disabled" msgid="9206776641295849915">"Απενεργοποιημένο"</string>
-    <string name="not_installed" msgid="1475144352069281880">"Δεν έχει εγκατασταθεί"</string>
+    <string name="not_installed" msgid="2797554494953450291">"Δεν εγκαταστ. για το χρήστη"</string>
     <string name="no_applications" msgid="7336588977497084921">"Δεν υπάρχουν εφαρμογές."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Εσ. αποθ. χώρος"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Αποθ. χώρος USB"</string>
@@ -1434,8 +1439,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Η οθόνη δεν θα μεταβαίνει ποτέ σε κατάσταση αδράνειας κατά τη φόρτιση"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Ενεργοποίηση αρχείου καταγραφής παρακολούθησης Bluetooth HCI"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Καταγραφή όλων των πακέτων bluetooth HCI σε ένα αρχείο"</string>
-    <string name="oem_unlock_enable" msgid="6629321276287913315">"Ενεργ. ξεκλειδώματος OEM"</string>
-    <string name="oem_unlock_enable_summary" msgid="3546686263996628110">"Να επιτρέπεται το ξεκλείδωμα OEM της συσκευής"</string>
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"Ξεκλείδωμα OEM"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Να επιτρέπεται το ξεκλείδωμα λειτουργίας εκκίνησης"</string>
+    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Εισαγάγετε το PIN σας"</string>
+    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Εισαγάγετε το PIN της συσκευής σας για να ενεργοποιήσετε το ξεκλείδωμα OEM."</string>
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Να επιτρέπεται το ξεκλείδωμα OEM;"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Οι λειτουργίες προστασίας συσκευής δεν θα λειτουργούν σε αυτήν τη συσκευή, όταν είναι ενεργοποιημένη αυτή η ρύθμιση."</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Πιστοποίηση ασύρματης οθόνης"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Ενεργοποίηση λεπτομερ. καταγραφής Wi-Fi"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Επιθ.μεταβ. Wi-Fi σε δίκτυο κιν.τηλ."</string>
@@ -1538,6 +1547,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"Οι υπότιτλοι θα φαίνονται έτσι"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Αα"</string>
     <string name="locale_default" msgid="2593883646136326969">"Προεπιλογή"</string>
+    <string name="color_title" msgid="4258931051732243983">"Χρώμα"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"Προεπιλογή"</string>
     <string name="color_none" msgid="3475640044925814795">"Κανένα"</string>
     <string name="color_white" msgid="8045195170201590239">"Λευκό"</string>
@@ -1595,12 +1605,12 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"Απομένουν <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> για τη φόρτωση"</string>
-    <string name="power_discharging_duration" msgid="7125493014448497620">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - απομένουν περίπου <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="power_charging" msgid="712751285832976915">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="STATE">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration" msgid="4802183864773082009">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> για πλήρη φόρτιση"</string>
-    <string name="power_charging_duration_ac" msgid="3611179931297824699">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> για πλήρη φόρτιση με AC"</string>
-    <string name="power_charging_duration_usb" msgid="1106605348913397583">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> για πλήρη φόρτιση με USB"</string>
-    <string name="power_charging_duration_wireless" msgid="633606920144617227">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> για πλήρη ασύρματη φόρτιση"</string>
+    <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> - απομένουν περίπου <xliff:g id="TIME">%2$s</xliff:g>"</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> για πλήρη φόρτιση"</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> για πλήρη φόρτιση με φορτιστή AC"</string>
+    <string name="power_charging_duration_usb" msgid="182405645340976546">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> για πλήρη φόρτιση μέσω USB"</string>
+    <string name="power_charging_duration_wireless" msgid="1829295708243159464">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> για πλήρη ασύρματη φόρτιση"</string>
     <string name="power_usage_list_summary" msgid="2409288197839512482">"Χρήση από την τελευταία πλήρη φόρτιση"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Χρήση μπαταρίας από τη στιγμή της αποσύνδεσης από την τροφοδοσία"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Χρήση μπαταρίας από τη στιγμή της επαναφοράς"</string>
@@ -1617,7 +1627,6 @@
     <string name="awake" msgid="387122265874485088">"Χρόνος ενεργοποίησης της συσκευής"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi στην ώρα του"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi στην ώρα του"</string>
-    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> - <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Λεπτομέρειες ιστορικού"</string>
     <string name="details_title" msgid="3792801565213935385">"Λεπτομέρειες χρήσης"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Λεπτομέρειες χρήσης"</string>
@@ -1689,7 +1698,7 @@
     <string name="battery_saver" msgid="1426682272004907982">"Εξοικονόμησης μπαταρίας"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Αυτόματη ενεργοποίηση"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Ποτέ"</string>
-    <string name="battery_saver_turn_on_automatically_pct" msgid="3033681629861428940">"στο %1$d%% της μπαταρίας"</string>
+    <string name="battery_saver_turn_on_automatically_pct" msgid="7536784431655058267">"Μπαταρία %1$s"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Στατιστικά στοιχεία διαδικασίας"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Χρήσιμα στατιστικά στοιχεία σχετικά με τις εκτελούμενες διαδικασίες"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Χρήση μνήμης"</string>
@@ -1813,7 +1822,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Με υποστήριξη εξοπλισμού"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Μόνο λογισμικό"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"Τα διαπιστευτήρια δεν είναι διαθέσιμα γι\' αυτόν το χρήστη"</string>
-    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Σχεδιάστε το μοτίβο ξεκλειδώματος"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Πρέπει να σχεδιάσετε το μοτίβο ξεκλειδώματος για να επιβεβαιώσετε την εγκατάσταση των διαπιστευτηρίων."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Πληκτρολογήστε τον κωδικό πρόσβασης του αποθηκευτικού χώρου διαπιστευτηρίων."</string>
@@ -1843,6 +1851,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"Συμπερίληψη δεδομ. εφαρμογής"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Αυτόματη επαναφορά"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Κατά την εκ νέου εγκατάσταση μιας εφαρμογής, ανακτήστε τις ρυθμίσεις και τα δεδομένα για τα οποία έχετε δημιουργήσει αντίγραφα ασφαλείας"</string>
+    <string name="backup_inactive_title" msgid="5355557151569037197">"Η υπηρεσία αντιγράφων ασφαλείας είναι ανενεργή."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"Η υπηρεσία αυτή ορίζεται από την πολιτική της συσκευής σας."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Κωδ.πρόσβ.αντ.ασφ.επιφ.εργ."</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Τα πλήρη αντίγραφα ασφαλείας επιφάνειας εργασίας δεν προστατεύονται αυτήν τη στιγμή"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Αγγίξτε για αλλαγή ή κατάργηση του κωδικού πρόσβασης για τα πλήρη αντίγραφα ασφαλείας επιφάνειας εργασίας"</string>
@@ -1952,7 +1962,11 @@
     <string name="enter_password" msgid="8035706727471334122">"Για να ξεκινήσετε το Android, εισαγάγετε τον κωδικό σας"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Για να ξεκινήσετε το Android, εισαγάγετε το PIN σας"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Για να ξεκινήσετε το Android, σχεδιάστε το μοτίβο σας"</string>
-    <string name="try_again" msgid="4272075051293936921">"Δοκιμάστε ξανά."</string>
+    <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"Εσφαλμένο μοτίβο"</string>
+    <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"Εσφαλμένος κωδικός πρόσβασης"</string>
+    <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"Εσφαλμένος κωδικός PIN"</string>
+    <string name="checking_decryption" msgid="8287458611802609493">"Έλεγχος…"</string>
+    <string name="starting_android" msgid="8581493237458496835">"Έναρξη Android"</string>
     <string name="delete" msgid="4219243412325163003">"Διαγραφή"</string>
     <string name="misc_files" msgid="6720680815969643497">"Διάφορα αρχεία"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"Επιλέχθηκαν <xliff:g id="NUMBER">%1$d</xliff:g> από <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -1990,8 +2004,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Να γίνεται πάντα χρήση του GPU για σύνθεση οθόνης"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"Προσομοίωση χρωματικού χώρου"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Ενεργοποίηση ιχνών OpenGL"</string>
-    <string name="use_nuplayer" msgid="5699257393367904387">"Χρήση του NuPlayer (πειρ.)"</string>
-    <string name="use_nuplayer_summary" msgid="1991479067478516714">"Χρήση του NuPlayer αντί για το AwesomePlayer"</string>
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"Χρήση AwesomePlayer (καταργήθηκε)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"Χρήση AwesomePlayer αντί για NuPlayer για αναπαραγωγή μέσων"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"Απεν. δρομολ. ήχου USB"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"Απενερ.αυτόμ. δρομολ. σε περιφερειακά ήχου USB"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Εμφάνιση ορίων διάταξης"</string>
@@ -2167,7 +2181,6 @@
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Προσθήκη χρήστη ή προφίλ"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Προσθήκη χρήστη"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Προφίλ περιορισμένης πρόσβασης"</string>
-    <string name="user_summary_managed_profile" msgid="7369539529693048111">"Προφίλ εργασίας"</string>
     <string name="user_need_lock_message" msgid="2596365678651842785">"Προκειμένου να μπορέσετε να δημιουργήσετε ένα περιορισμένο προφίλ, θα πρέπει να δημιουργήσετε ένα κλείδωμα οθόνης για την προστασία των εφαρμογών και των προσωπικών δεδομένων σας."</string>
     <string name="user_set_lock_button" msgid="8311219392856626841">"Ορισμός κλειδώματος"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Δεν υπάρχει ρύθμιση"</string>
@@ -2298,11 +2311,13 @@
     <string name="sim_cellular_data_unavailable_summary" msgid="3654805961942166428">"Αγγίξτε για επιλογή SIM δεδομένων"</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"Να χρησιμοποιείται πάντα για κλήσεις"</string>
     <string name="select_sim_for_data" msgid="2366081042162853044">"Επιλέξτε μια κάρτα SIM για δεδομένα"</string>
+    <string name="data_switch_started" msgid="2040761479817166311">"Εναλλαγή κάρτας SIM δεδομένων, αυτό μπορεί να διαρκέσει ένα λεπτό…"</string>
     <string name="select_sim_for_calls" msgid="3503094771801109334">"Κλήση με"</string>
     <string name="sim_select_card" msgid="211285163525563293">"Επιλογή κάρτας SIM"</string>
     <string name="sim_card_number_title" msgid="7845379943474336488">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"Κενή SIM"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"Όνομα SIM"</string>
+    <string name="sim_name_hint" msgid="7038643345238968930">"Πληκτρολογήστε το όνομα SIM"</string>
     <!-- String.format failed for translation -->
     <!-- no translation found for sim_editor_title (4034301817366627870) -->
     <skip />
@@ -2314,7 +2329,6 @@
     <string name="color_purple" msgid="3888532466427762504">"Μοβ"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"Δεν έχουν τοποθετηθεί κάρτες SIM"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"Κατάσταση κάρτας SIM"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"Πληροφορίες που σχετίζονται με την κάρτα SIM"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"Επανάκληση από προεπιλεγμένη SIM"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"SIM για εξερχόμενες κλήσεις"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Άλλες ρυθμίσεις κλήσης"</string>
@@ -2322,8 +2336,11 @@
     <string name="preferred_network_offload_header" msgid="2321173571529106767">"Απενεργ. εκπομ. ονόμ. δικτύου"</string>
     <string name="preferred_network_offload_footer" msgid="5857279426054744020">"Η απενεργοποίηση εκπομπής ονόματος δικτύου δεν επιτρέπει την πρόσβαση τρίτων σε πληροφορίες δικτύου."</string>
     <string name="preferred_network_offload_popup" msgid="2252915199889604600">"Η απενεργοποίηση εκπομπής ονόματος δικτύου εμποδίζει την αυτόματη σύνδεση σε κρυφά δίκτυα."</string>
+    <string name="sim_signal_strength" msgid="9144010043784767984">"<xliff:g id="DBM">%1$d</xliff:g> dBm <xliff:g id="ASU">%2$d</xliff:g> asu"</string>
+    <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>
@@ -2332,22 +2349,22 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Πρόσφατες αναζητήσεις"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Αποτελέσματα"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi σύνδεση δικτύου"</string>
-    <string name="keywords_more_default_sms_app" msgid="2744404159003574745">"μήνυμα κειμένου"</string>
-    <string name="keywords_more_mobile_networks" msgid="7813380887358745769">"δίκτυο κινητής τηλεφωνίας κυψέλη εταιρεία κινητής τηλεφωνίας ασύρματο"</string>
+    <string name="keywords_more_default_sms_app" msgid="895656981962034647">"μήνυμα κειμένου ανταλλαγή μηνυμάτων κειμένου μηνύματα ανταλλαγή μηνυμάτων"</string>
+    <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"δίκτυο κινητής τηλεφωνίας κελί εταιρεία κινητής τηλεφωνίας ασύρματα δεδομένα 4g 3g 2g lte"</string>
     <string name="keywords_home" msgid="3626170808219458848">"λειτουργία εκκίνησης"</string>
     <string name="keywords_display" msgid="6709007669501628320">"οθόνη αφής"</string>
-    <string name="keywords_display_brightness_level" msgid="8636451602230815191">"σκοτεινή οθόνη αφής"</string>
-    <string name="keywords_display_auto_brightness" msgid="8070218600502753102">"σκοτεινή οθόνη αφής"</string>
-    <string name="keywords_display_wallpaper" msgid="4315466287469834939">"παρασκήνιο"</string>
+    <string name="keywords_display_brightness_level" msgid="8923289340474728990">"μείωση φωτεινότητας οθόνης οθόνη αφής μπαταρία"</string>
+    <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"μείωση φωτεινότητας οθόνης οθόνη αφής μπαταρία"</string>
+    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"φόντο εξατομίκευση προσαρμογή οθόνη"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"μέγεθος κειμένου"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"έργο"</string>
-    <string name="keywords_storage" msgid="7007275853993419928">"χώρος δίσκος σκληρός δίσκος"</string>
-    <string name="keywords_battery" msgid="3992479295298655138">"ενεργοποίηση"</string>
-    <string name="keywords_spell_checker" msgid="4509482591225399210">"ορθογραφία"</string>
+    <string name="keywords_storage" msgid="6572905220031852173">"χώρος στο δίσκο σκληρός δίσκος χρήση συσκευής"</string>
+    <string name="keywords_battery" msgid="2096185085932675704">"χρήση ισχύος φόρτιση"</string>
+    <string name="keywords_spell_checker" msgid="6106749039734174140">"ορθογραφικό λεξικό ορθογραφικός έλεγχος αυτόματη διόρθωση"</string>
     <string name="keywords_voice_input" msgid="3519547605812413860">"αναγνώριση είσοδος ομιλία μιλώ γλώσσα hands-free handsfree αναγνώριση προσβλητική λέξη ήχος ιστορικό bluetooth ακουστικά"</string>
-    <string name="keywords_text_to_speech_output" msgid="8207889472282225512">"τιμή γλώσσα προεπιλογή μιλώ ομιλία"</string>
-    <string name="keywords_date_and_time" msgid="7666950126499155141">"ρολόι"</string>
-    <string name="keywords_factory_data_reset" msgid="3693730656843989732">"κατάργηση διαγραφή"</string>
+    <string name="keywords_text_to_speech_output" msgid="392447904221657930">"αξιολόγηση γλώσσα προεπιλογή ομιλώ ομιλία tts προσβασιμότητα ανάγνωση προβλήματα όρασης"</string>
+    <string name="keywords_date_and_time" msgid="2631808108134830066">"ρολόι στρατιωτικό"</string>
+    <string name="keywords_factory_data_reset" msgid="4355133848707691977">"διαγραφή διαγραφή αποκατάσταση διαγραφή κατάργηση"</string>
     <string name="keywords_printing" msgid="1701778563617114846">"εκτυπωτής"</string>
     <string name="keywords_sounds_and_notifications" msgid="5965996187974887000">"ηχητικό σήμα ομιλητή"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="2912933812460077912">"μην μην ενοχλείτε διακόπτω διακοπή διάλειμμα"</string>
@@ -2356,7 +2373,7 @@
     <string name="keywords_location_mode" msgid="8584992704568356084">"ακρίβεια"</string>
     <string name="keywords_accounts" msgid="1957925565953357627">"λογαριασμός"</string>
     <string name="keywords_users" msgid="4673901601478559100">"περιορισμός περιορίζω περιορίστηκε"</string>
-    <string name="keywords_keyboard_and_ime" msgid="1103378692379215672">"κείμενο διόρθωση σωστό ήχος δόνηση αυτόματο γλώσσα κίνηση προτείνω πρόταση θέμα προσβλητική λέξη τύπος emoticon"</string>
+    <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"διόρθωση κειμένου διόρθωση ήχου δόνηση αυτόματο γλώσσα κίνηση προτείνω πρόταση θέμα προσβλητικό λέξη τύπος emoticon διεθνές"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"ολίσθηση κωδικός πρόσβασης μοτίβο pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Ρύθμιση ετικέτας ΕΚΠ Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Εγγραφή"</string>
@@ -2373,7 +2390,6 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Ένταση ήχου ειδοποίησης"</string>
     <string name="zen_mode_settings_title" msgid="7014915558669122902">"Διακοπές"</string>
     <string name="zen_mode_option_title" msgid="5061978632306007914">"Κατά τη λήψη κλήσεων και ειδοποιήσεων"</string>
-    <string name="zen_mode_option_title_novoice" msgid="6680706009915204785">"Κατά την άφιξη ειδοποιήσεων"</string>
     <string name="zen_mode_option_off" msgid="3167702608910820883">"Διακοπή πάντα"</string>
     <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Να επιτρέπονται μόνο οι διακοπές προτεραιότητας"</string>
     <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Χωρίς διακοπή"</string>
@@ -2431,14 +2447,17 @@
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Τέλος"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Μέχρι να το απενεργοποιήσετε"</string>
     <string name="zen_mode_important_category" msgid="8123274463331022993">"Διακοπές προτεραιότητας"</string>
-    <string name="zen_mode_downtime_category" msgid="4730179065426038108">"Νεκρός χρόνος (μόνο διακοπ. προτεραιότ.)"</string>
+    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Νεκρός χρόνος"</string>
     <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Ημέρες"</string>
     <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Καμία"</string>
+    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Επιτρέπονται διακοπές"</string>
+    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Μόνο προτεραιότητας"</string>
+    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Καμία"</string>
     <string name="zen_mode_automation_category" msgid="4653551005950835761">"Αυτοματοποίηση"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Αυτόματη ενεργοποίηση"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Ποτέ"</string>
-    <string name="zen_mode_phone_calls" msgid="8956214416859303966">"Κλήσεις"</string>
+    <string name="zen_mode_calls" msgid="7051492091133751208">"Κλήσεις"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Μηνύματα"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Κλήσεις/μηνύματα από"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Οποιοσδήποτε"</string>
@@ -2452,7 +2471,9 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Καθημερινές"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Ώρα έναρξης"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Ώρα λήξης"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> επόμενη μέρα"</string>
+    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> την επόμενη ημέρα"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> ή κάθε προηγούμενη ειδοποίηση"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> την επόμενη ημέρα ή κάθε προηγούμενη ειδοποίηση"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Ειδοποιήσεις εφαρμ."</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Ρυθμίσεις ειδοποιήσεων"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Αποστολή σχολίων για τη συσκευή"</string>
@@ -2460,7 +2481,11 @@
     <string name="switch_on_text" msgid="1124106706920572386">"Ενεργό"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Ανενεργό"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"Καρφίτσωμα οθόνης"</string>
-    <string name="screen_pinning_description" msgid="7091642350452605379">"Όταν είναι ενεργό, μπορείτε να χρησιμοποιήσετε το καρφίτσωμα οθόνης για να διατηρήσετε την τρέχουσα οθόνη σε προβολή έως ότου την ξεκαρφιτσώσετε.\n\nΓια να χρησιμοποιήσετε το καρφίτσωμα οθόνης:\n\n1. Βεβαιωθείτε ότι το καρφίτσωμα οθόνης είναι ενεργό.\n\n2. Ανοίξτε την οθόνη που θέλετε να καρφιτσώσετε.\n\n3. Αγγίξτε \"Επισκόπηση\".\n\n4. Αγγίξτε το εικονίδιο με την καρφίτσα."</string>
+    <string name="screen_pinning_description" msgid="1137904524037468263">"Με αυτήν τη ρύθμιση, χρησιμοποιείτε το καρφίτσωμα οθόνης για διατήρηση προβολής τρέχουσας οθόνης έως το ξεκαρφίτσωμα.\n\nΧρήση:\n\n1. Βεβαιωθείτε ότι το καρφίτσωμα οθόνης είναι ενεργό.\n\n2. Ανοίξτε την οθόνη για καρφίτσωμα.\n\n3. Αγγίξτε \"Επισκόπηση\".\n\n4. Σύρετε επάνω και αγγίξτε το εικονίδιο καρφίτσας."</string>
+    <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Να ζητείται το μοτίβο ξεκλειδώματος πριν από το ξεκαρφίτσωμα"</string>
+    <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Να ζητείται το PIN πριν από το ξεκαρφίτσωμα"</string>
+    <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Να ζητείται κωδικός πρόσβασης πριν από το ξεκαρφίτσωμα"</string>
+    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Κλείδωμα της συσκευής κατά το ξεκαρφίτσωμα"</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Προφίλ εργασίας"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Πειραματικό)"</string>
     <string name="display_auto_rotate_title" msgid="6176450657107806043">"Κατά την περιστροφή της συσκευής"</string>
@@ -2469,7 +2494,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Διατήρηση οριζόντιας προβολής"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Διατήρηση τρέχοντος προσανατολισμού"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"Πληροφορίες IMEI"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"Σχετικές πληροφορίες IMEI"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Κρυπτογράφηση"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Συνέχεια"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"Μπορείτε να προστατεύσετε ακόμα περισσότερο αυτήν τη συσκευή πραγματοποιώντας αίτημα κωδικού PIN πριν από την έναρξη της λειτουργίας της. Μέχρι να αρχίσει να λειτουργεί η συσκευή, δεν θα είναι δυνατή η λήψη κλήσεων, μηνυμάτων ή ειδοποιήσεων, συμπεριλαμβανομένων των ξυπνητηριών. \n\nΑυτή η ρύθμιση συμβάλλει στην προστασία των δεδομένων σας σε περίπτωση κλοπής ή απώλειας της συσκευής σας."</string>
@@ -2487,4 +2511,7 @@
     <string name="encrypt_talkback_dialog_message_pin" msgid="1890374082842868489">"Κατά την εισαγωγή του PIN σας για την εκκίνηση αυτής της συσκευής, οι υπηρεσίες προσβασιμότητας, όπως το <xliff:g id="SERVICE">%1$s</xliff:g> δεν θα είναι διαθέσιμες ακόμη."</string>
     <string name="encrypt_talkback_dialog_message_pattern" msgid="4474332516537386384">"Κατά την εισαγωγή του μοτίβου σας για την εκκίνηση αυτής της συσκευής, οι υπηρεσίες προσβασιμότητας, όπως το <xliff:g id="SERVICE">%1$s</xliff:g> δεν θα είναι διαθέσιμες ακόμη."</string>
     <string name="encrypt_talkback_dialog_message_password" msgid="8166099418487083927">"Κατά την εισαγωγή του κωδικού πρόσβασής σας για την εκκίνηση αυτής της συσκευής, οι υπηρεσίες προσβασιμότητας, όπως το <xliff:g id="SERVICE">%1$s</xliff:g> δεν θα είναι διαθέσιμες ακόμη."</string>
+    <string name="imei_information_title" msgid="8499085421609752290">"Πληροφορίες IMEI"</string>
+    <string name="imei_information_summary" msgid="2074095606556565233">"Σχετικές πληροφορίες IMEI"</string>
+    <string name="slot_number" msgid="3762676044904653577">"(Υποδοχή <xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-en-rGB/arrays.xml b/res/values-en-rGB/arrays.xml
index 3cbd031..3491ad7 100644
--- a/res/values-en-rGB/arrays.xml
+++ b/res/values-en-rGB/arrays.xml
@@ -527,4 +527,12 @@
     <item msgid="4338089220026248848">"Cached (activity client)"</item>
     <item msgid="6652164677254579050">"Cached (empty)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Teal"</item>
+    <item msgid="8332294763632946560">"Blue"</item>
+    <item msgid="2023216417616991392">"Indigo"</item>
+    <item msgid="3170497246594232819">"Purple"</item>
+    <item msgid="4608643045752965568">"Pink"</item>
+    <item msgid="6131821495505931173">"Red"</item>
+  </string-array>
 </resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 9e49235..568c043 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>
@@ -180,7 +180,6 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s wants to access your messages. Give access to %2$s?"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Date &amp; time"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Choose time zone"</string>
-    <string name="normal_date_format" msgid="7636406984925498359">"Regional (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Preview:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Font size:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -291,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>
@@ -322,8 +321,6 @@
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Select time zone"</string>
     <string name="date_time_set_date_title" msgid="6928286765325608604">"Date"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"Set date"</string>
-    <string name="date_time_date_format_title" msgid="3976171711988766411">"Date format"</string>
-    <string name="date_time_date_format" msgid="6951498879879281102">"Choose date format"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Sort alphabetically"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Sort by time zone"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Date"</string>
@@ -372,7 +369,8 @@
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Wait while your phone is being encrypted. <xliff:g id="PERCENT">^1</xliff:g>% complete."</string>
     <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Wait while your tablet is being encrypted. Time remaining: <xliff:g id="DURATION">^1</xliff:g>"</string>
     <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Wait while your phone is being encrypted. Time remaining: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Try again in <xliff:g id="DELAY">^1</xliff:g> seconds."</string>
+    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"To unlock your tablet, turn it off and then on."</string>
+    <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"To unlock your phone, turn it off and then on."</string>
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"Warning: Your device will be wiped after <xliff:g id="COUNT">^1</xliff:g> more failed attempts to be unlocked!"</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Type your password"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Encryption unsuccessful"</string>
@@ -401,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>
@@ -412,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>
@@ -556,13 +556,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"As speaker phone"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"For music and media"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Remember settings"</string>
-    <string name="wifi_assistant_intro_setup" msgid="4605105515416995110">"Introducing\nWi‑Fi Assistant"</string>
-    <string name="wifi_assistant_no_thanks" msgid="2776983751990143934">"NO, THANKS"</string>
-    <string name="wifi_assistant_setup" msgid="3772423650475730906">"SET UP"</string>
-    <string name="wifi_assistant_card_message" msgid="107811647784658536">"Automatically connect to available networks with a Wi‑Fi Assistant."</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi‑Fi Assistant"</string>
-    <string name="wifi_assistant_title_message" msgid="6240721017579074015">"<xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> automatically connects you to the best available Wi‑Fi"</string>
-    <string name="wifi_assistant_open_app" msgid="4803044899535675063">"OPEN APP"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Connected via Wi‑Fi assistant"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"Cast screen"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Enable wireless display"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"No nearby devices were found."</string>
@@ -592,7 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Wi‑Fi settings"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Set up &amp; manage wireless access points"</string>
-    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Select Wi‑Fi"</string>
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Select Wi‑Fi network"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Select Wi‑Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Turning Wi‑Fi on…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Turning off Wi‑Fi…"</string>
@@ -607,8 +602,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"Scanning always available"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Always allow scanning"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Let Google\'s location service and other apps scan for networks, even when Wi‑Fi is off"</string>
-    <string name="wifi_automatically_manage_title" msgid="6249976570008992746">"Automatically manage Wi‑Fi"</string>
-    <string name="wifi_automatically_manage_summary" msgid="6952470763378312488">"Let <xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> manage your Wi‑Fi connection"</string>
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Use open Wi‑Fi automatically"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Let a Wi‑Fi assistant automatically connect to open networks determined to be high quality"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Choose assistant"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Install certificates"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"To improve location accuracy and for other purposes, Google and other apps may scan for nearby networks, even when Wi-Fi is off. If you don\'t want this to happen, go to Advanced &gt; Scanning always available."</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Apps may scan for nearby networks, even when Wi-Fi is off. If you don\'t want this to happen, go to Advanced &gt; Scanning always available."</string>
@@ -629,6 +625,7 @@
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Scan"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Advanced"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Connect to network"</string>
+    <string name="wifi_menu_remember" msgid="8814185749388713796">"Remember network"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Forget network"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Modify network"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Write to NFC tag"</string>
@@ -673,9 +670,11 @@
     <string name="wifi_unspecified" msgid="5431501214192991253">"(unspecified)"</string>
     <string name="wifi_remembered" msgid="4955746899347821096">"Saved"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"Disabled"</string>
-    <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Avoided poor Internet connection"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP Configuration Failure"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Wi-Fi Connection Failure"</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Authentication problem"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Not in range"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"No Internet Access Detected, won\'t automatically reconnect."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS available"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS available)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Enter your network password"</string>
@@ -699,9 +698,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"WARNING: If you skip Wi‑Fi, your tablet will only use mobile data for initial downloads and updates. To avoid possible data charges, connect to Wi‑Fi."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"WARNING: If you skip Wi‑Fi, your device will only use mobile data for initial downloads and updates. To avoid possible data charges, connect to Wi‑Fi."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"WARNING: If you skip Wi‑Fi, your phone will only use mobile data for initial downloads and updates. To avoid possible data charges, connect to Wi‑Fi."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="2393880108322835846">"WARNING: If you skip Wi‑Fi, your tablet won\'t have an Internet connection to use for any initial downloads or updates."</string>
-    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1707391993265558787">"WARNING: If you skip Wi‑Fi, your device won\'t have an Internet connection to use for any initial downloads or updates."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="1556858507920033022">"WARNING: If you skip Wi‑Fi, your phone won\'t have an Internet connection to use for any initial downloads or updates."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"If you skip Wi‑Fi:\n\nYour tablet won\'t have an Internet connection.\n\nYou won\'t get software updates until you connect to the Internet.\n\nYou can\'t activate device protection features at this time."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"If you skip Wi‑Fi:\n\nYour device won\'t have an Internet connection.\n\nYou won\'t get software updates until you connect to the Internet.\n\nYou can\'t activate device protection features at this time."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"If you skip Wi‑Fi:\n\nYour phone won\'t have an Internet connection.\n\nYou won\'t get software updates until you connect to the Internet.\n\nYou can\'t activate device protection features at this time."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"The tablet was unable to connect to this Wi‑Fi network."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"The device was unable to connect to this Wi‑Fi network."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"The phone was unable to connect to this Wi‑Fi network."</string>
@@ -761,7 +760,6 @@
     <string name="ring_volume_title" msgid="7938706566797464165">"Ringer volume"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrate when silent"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Default notification sound"</string>
-    <string name="heads_up_enabled_title" msgid="1031078221910921622">"Pop up if high priority"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Ringtone"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Notification"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Use incoming call volume for notifications"</string>
@@ -834,7 +832,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatic brightness"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Lift to wake"</string>
     <string name="doze_title" msgid="2259176504273878294">"Ambient display"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"Wake screen when device is picked up or notifications arrive"</string>
+    <string name="doze_summary" msgid="7128970177894383698">"Wake screen when you pick up device or receive notifications"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Font size"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Font size"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM card lock settings"</string>
@@ -862,6 +860,10 @@
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Cancel"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"Multiple SIMs found"</string>
     <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>
@@ -1012,6 +1014,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"This will erase all data from your tablet\'s "<b>"internal storage"</b>", including:\n\n"<li>"Your Google account"</li>\n<li>"System and app data and settings"</li>\n<li>"Downloaded apps"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"This will erase all data from your phone\'s "<b>"internal storage"</b>", including:\n\n"<li>"Your Google account"</li>\n<li>"System and app data and settings"</li>\n<li>"Downloaded apps"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"You are currently signed in to the following accounts:\n"</string>
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"There are other users present on this device.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Music"</li>\n<li>"Photos"</li>\n<li>"Other user data"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"To clear music, pictures and other user data, the "<b>"USB storage"</b>" needs to be erased."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"To clear music, pictures and other user data, the "<b>"SD card"</b>" needs to be erased."</string>
@@ -1023,7 +1026,6 @@
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Reset phone"</string>
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Erase all your personal information and downloaded apps? You cannot reverse this action!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Erase everything"</string>
-    <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Draw your unlock pattern"</string>
     <string name="master_clear_gesture_explanation" msgid="826193821455182780">"You need to draw your unlock pattern to confirm a factory data reset."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"No reset was performed because the System Clear service isn\'t available."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Reset?"</string>
@@ -1041,7 +1043,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"Erase the USB storage, deleting all files stored there? You cannot reverse this action!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Erase the SD card, deleting all files stored there? You cannot reverse this action!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Erase everything"</string>
-    <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Draw your unlock pattern"</string>
     <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"You need to draw your unlock pattern to confirm that you want to erase the USB storage."</string>
     <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"You need to draw your unlock pattern to confirm that you want to erase the SD card."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Call settings"</string>
@@ -1087,6 +1088,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Please insert SIM card and restart"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Please connect to the internet"</string>
     <string name="location_title" msgid="1029961368397484576">"My Location"</string>
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Work profile"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Location for work profile"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Turned off by your company"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Mode"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"High accuracy"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Battery saving"</string>
@@ -1124,6 +1128,7 @@
     <string name="copyright_title" msgid="865906688917260647">"Copyright"</string>
     <string name="license_title" msgid="1990487604356037871">"Licence"</string>
     <string name="terms_title" msgid="7697580845616764642">"Terms and conditions"</string>
+    <string name="webview_license_title" msgid="2813507464175738967">"System WebView Licence"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Wallpapers"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Satellite imagery providers:\n©2014 CNES/Astrium, DigitalGlobe, Bluesky"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Open-source licences"</string>
@@ -1237,7 +1242,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB storage"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"On SD card"</string>
     <string name="disabled" msgid="9206776641295849915">"Disabled"</string>
-    <string name="not_installed" msgid="1475144352069281880">"Not installed"</string>
+    <string name="not_installed" msgid="2797554494953450291">"Not installed for this user"</string>
     <string name="no_applications" msgid="7336588977497084921">"No apps."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Internal storage"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB storage"</string>
@@ -1434,8 +1439,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Screen will never sleep while charging"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Enable Bluetooth HCI snoop log"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Capture all Bluetooth HCI packets in a file"</string>
-    <string name="oem_unlock_enable" msgid="6629321276287913315">"Enable OEM unlock"</string>
-    <string name="oem_unlock_enable_summary" msgid="3546686263996628110">"Allow the device to be OEM unlocked"</string>
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM unlocking"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Allow the bootloader to be unlocked"</string>
+    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Enter your PIN"</string>
+    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Enter your device PIN to enable OEM unlock"</string>
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Allow OEM unlocking?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"WARNING: Device protection features will not work on this device while this setting is turned on."</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Wireless display certification"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Enable Wi‑Fi verbose logging"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Aggressive Wi‑Fi to Mobile handover"</string>
@@ -1538,6 +1547,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"Captions will look like this"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"Default"</string>
+    <string name="color_title" msgid="4258931051732243983">"Colour"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"Default"</string>
     <string name="color_none" msgid="3475640044925814795">"None"</string>
     <string name="color_white" msgid="8045195170201590239">"White"</string>
@@ -1595,12 +1605,12 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"<xliff:g id="REMAIN">%1$s</xliff:g> remaining"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> to charge"</string>
-    <string name="power_discharging_duration" msgid="7125493014448497620">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – approx. <xliff:g id="TIME">%2$s</xliff:g> left"</string>
-    <string name="power_charging" msgid="712751285832976915">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – <xliff:g id="STATE">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration" msgid="4802183864773082009">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> until full"</string>
-    <string name="power_charging_duration_ac" msgid="3611179931297824699">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> until full on AC"</string>
-    <string name="power_charging_duration_usb" msgid="1106605348913397583">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> until full over USB"</string>
-    <string name="power_charging_duration_wireless" msgid="633606920144617227">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> until full from wireless"</string>
+    <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> – approx. <xliff:g id="TIME">%2$s</xliff:g> left"</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> until full"</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> until full on AC"</string>
+    <string name="power_charging_duration_usb" msgid="182405645340976546">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> until full over USB"</string>
+    <string name="power_charging_duration_wireless" msgid="1829295708243159464">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> until full from wireless"</string>
     <string name="power_usage_list_summary" msgid="2409288197839512482">"Use since last full charge"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Battery use since unplugged"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Battery use since reset"</string>
@@ -1617,7 +1627,6 @@
     <string name="awake" msgid="387122265874485088">"Device awake time"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi‑Fi on time"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi‑Fi on time"</string>
-    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"History details"</string>
     <string name="details_title" msgid="3792801565213935385">"Use details"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Use details"</string>
@@ -1689,7 +1698,7 @@
     <string name="battery_saver" msgid="1426682272004907982">"Battery saver"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Turn on automatically"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Never"</string>
-    <string name="battery_saver_turn_on_automatically_pct" msgid="3033681629861428940">"at %1$d%% battery"</string>
+    <string name="battery_saver_turn_on_automatically_pct" msgid="7536784431655058267">"at %1$s battery"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Process Stats"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Geeky stats about running processes"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Memory use"</string>
@@ -1813,7 +1822,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Hardware-backed"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Software only"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"Credentials are not available for this user"</string>
-    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Draw your unlock pattern"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"You need to draw your unlock pattern to confirm credential installation."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Type the password for credential storage."</string>
@@ -1835,7 +1843,7 @@
     <string name="privacy_settings" msgid="5446972770562918934">"Backup &amp; reset"</string>
     <string name="privacy_settings_title" msgid="4856282165773594890">"Backup &amp; reset"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Backup &amp; restore"</string>
-    <string name="personal_data_section_title" msgid="7815209034443782061">"personal data"</string>
+    <string name="personal_data_section_title" msgid="7815209034443782061">"Personal data"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Back up my data"</string>
     <string name="backup_data_summary" msgid="708773323451655666">"Back up app data, Wi‑Fi passwords and other settings to Google servers"</string>
     <string name="backup_configure_account_title" msgid="3790872965773196615">"Backup account"</string>
@@ -1843,6 +1851,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"Include app data"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Automatic restore"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"When reinstalling an app, restore backed up settings and data"</string>
+    <string name="backup_inactive_title" msgid="5355557151569037197">"Backup service is inactive."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"This is set by your device policy."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Desktop backup password"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Desktop full backups aren\'t currently protected"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Touch to change or remove the password for desktop full backups"</string>
@@ -1952,7 +1962,11 @@
     <string name="enter_password" msgid="8035706727471334122">"To start Android, enter your password"</string>
     <string name="enter_pin" msgid="5305333588093263790">"To start Android, enter your PIN"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"To start Android, draw your pattern"</string>
-    <string name="try_again" msgid="4272075051293936921">"Try again."</string>
+    <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"Wrong Pattern"</string>
+    <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"Wrong Password"</string>
+    <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"Wrong PIN"</string>
+    <string name="checking_decryption" msgid="8287458611802609493">"Checking…"</string>
+    <string name="starting_android" msgid="8581493237458496835">"Starting Android"</string>
     <string name="delete" msgid="4219243412325163003">"Delete"</string>
     <string name="misc_files" msgid="6720680815969643497">"Misc. files"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"selected <xliff:g id="NUMBER">%1$d</xliff:g> out of <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -1990,8 +2004,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Always use GPU for screen compositing"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"Simulate colour space"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Enable OpenGL traces"</string>
-    <string name="use_nuplayer" msgid="5699257393367904387">"Use NuPlayer (experimental)"</string>
-    <string name="use_nuplayer_summary" msgid="1991479067478516714">"Use NuPlayer instead of AwesomePlayer"</string>
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"Use AwesomePlayer (deprecated)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"Use AwesomePlayer instead of NuPlayer for most media playback"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"Disable USB audio routing"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"Disable automatic routing to USB audio peripherals"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Show layout bounds"</string>
@@ -2167,7 +2181,6 @@
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Add user or profile"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Add user"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Restricted profile"</string>
-    <string name="user_summary_managed_profile" msgid="7369539529693048111">"Work profile"</string>
     <string name="user_need_lock_message" msgid="2596365678651842785">"Before you can create a restricted profile, you\'ll need to set up a screen lock to protect your apps and personal data."</string>
     <string name="user_set_lock_button" msgid="8311219392856626841">"Set lock"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Not set up"</string>
@@ -2298,11 +2311,13 @@
     <string name="sim_cellular_data_unavailable_summary" msgid="3654805961942166428">"Touch to select a data SIM"</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"Always use this for calls"</string>
     <string name="select_sim_for_data" msgid="2366081042162853044">"Select a SIM for data"</string>
+    <string name="data_switch_started" msgid="2040761479817166311">"Switching data SIM, this may take up to a minute..."</string>
     <string name="select_sim_for_calls" msgid="3503094771801109334">"Call with"</string>
     <string name="sim_select_card" msgid="211285163525563293">"Select a SIM card"</string>
     <string name="sim_card_number_title" msgid="7845379943474336488">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"SIM empty"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"SIM name"</string>
+    <string name="sim_name_hint" msgid="7038643345238968930">"Enter SIM name"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"SIM slot %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Operator"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Number"</string>
@@ -2312,7 +2327,6 @@
     <string name="color_purple" msgid="3888532466427762504">"Purple"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"No SIM cards inserted"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"SIM status"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"SIM related information"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"Call back from default SIM"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"SIM for outgoing calls"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Other call settings"</string>
@@ -2320,8 +2334,11 @@
     <string name="preferred_network_offload_header" msgid="2321173571529106767">"Disable Network Name Broadcast"</string>
     <string name="preferred_network_offload_footer" msgid="5857279426054744020">"Disable Network Name Broadcast protects from third parties getting access to your network information."</string>
     <string name="preferred_network_offload_popup" msgid="2252915199889604600">"Disabling Network Name Broadcast will prevent automatic connection to hidden networks."</string>
+    <string name="sim_signal_strength" msgid="9144010043784767984">"<xliff:g id="DBM">%1$d</xliff:g> dBm <xliff:g id="ASU">%2$d</xliff:g> asu"</string>
+    <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>
+    <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Ask every time"</string>
     <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>
@@ -2330,22 +2347,22 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Recent searches"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Results"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi Wi-Fi network connection"</string>
-    <string name="keywords_more_default_sms_app" msgid="2744404159003574745">"text message"</string>
-    <string name="keywords_more_mobile_networks" msgid="7813380887358745769">"mobile operator wireless"</string>
+    <string name="keywords_more_default_sms_app" msgid="895656981962034647">"text message texting messages messaging"</string>
+    <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"mobile network mobile operator wireless data 4G 3G 2G LTE"</string>
     <string name="keywords_home" msgid="3626170808219458848">"launcher"</string>
     <string name="keywords_display" msgid="6709007669501628320">"screen touchscreen"</string>
-    <string name="keywords_display_brightness_level" msgid="8636451602230815191">"dim screen touchscreen"</string>
-    <string name="keywords_display_auto_brightness" msgid="8070218600502753102">"dim screen touchscreen"</string>
-    <string name="keywords_display_wallpaper" msgid="4315466287469834939">"background"</string>
+    <string name="keywords_display_brightness_level" msgid="8923289340474728990">"dim screen touchscreen battery"</string>
+    <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"dim screen touchscreen battery"</string>
+    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"background personalise customise display"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"text size"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"project"</string>
-    <string name="keywords_storage" msgid="7007275853993419928">"space disk hard drive"</string>
-    <string name="keywords_battery" msgid="3992479295298655138">"power"</string>
-    <string name="keywords_spell_checker" msgid="4509482591225399210">"spelling"</string>
+    <string name="keywords_storage" msgid="6572905220031852173">"space disk hard drive device usage"</string>
+    <string name="keywords_battery" msgid="2096185085932675704">"power usage charge"</string>
+    <string name="keywords_spell_checker" msgid="6106749039734174140">"spelling dictionary spell check auto-correct"</string>
     <string name="keywords_voice_input" msgid="3519547605812413860">"recogniser input speech speak language hands-free hand free recognition offensive word audio history bluetooth headset"</string>
-    <string name="keywords_text_to_speech_output" msgid="8207889472282225512">"rate language default speak speaking"</string>
-    <string name="keywords_date_and_time" msgid="7666950126499155141">"clock"</string>
-    <string name="keywords_factory_data_reset" msgid="3693730656843989732">"wipe delete"</string>
+    <string name="keywords_text_to_speech_output" msgid="392447904221657930">"rate language default speak speaking tts accessibility reader blind"</string>
+    <string name="keywords_date_and_time" msgid="2631808108134830066">"clock military"</string>
+    <string name="keywords_factory_data_reset" msgid="4355133848707691977">"wipe delete restore clear remove"</string>
     <string name="keywords_printing" msgid="1701778563617114846">"printer"</string>
     <string name="keywords_sounds_and_notifications" msgid="5965996187974887000">"speaker beep"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="2912933812460077912">"dont don\'t disturb interrupt interruption break"</string>
@@ -2354,7 +2371,7 @@
     <string name="keywords_location_mode" msgid="8584992704568356084">"accuracy"</string>
     <string name="keywords_accounts" msgid="1957925565953357627">"account"</string>
     <string name="keywords_users" msgid="4673901601478559100">"restriction restrict restricted"</string>
-    <string name="keywords_keyboard_and_ime" msgid="1103378692379215672">"text correction correct sound vibrate auto language gesture suggest suggestion theme offensive word type emoji"</string>
+    <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"text correction correct sound vibrate auto language gesture suggest suggestion theme offensive word type emoji international"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"slide password pattern pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Set up Wi-Fi NFC Tag"</string>
     <string name="write_tag" msgid="8571858602896222537">"Write"</string>
@@ -2371,7 +2388,6 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Notification volume"</string>
     <string name="zen_mode_settings_title" msgid="7014915558669122902">"Interruptions"</string>
     <string name="zen_mode_option_title" msgid="5061978632306007914">"When calls and notifications arrive"</string>
-    <string name="zen_mode_option_title_novoice" msgid="6680706009915204785">"When notifications arrive"</string>
     <string name="zen_mode_option_off" msgid="3167702608910820883">"Always interrupt"</string>
     <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Allow only priority interruptions"</string>
     <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Don\'t interrupt"</string>
@@ -2429,14 +2445,17 @@
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Done"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Until you turn this off"</string>
     <string name="zen_mode_important_category" msgid="8123274463331022993">"Priority interruptions"</string>
-    <string name="zen_mode_downtime_category" msgid="4730179065426038108">"Downtime (priority interruptions only)"</string>
+    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Downtime"</string>
     <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Days"</string>
     <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"None"</string>
+    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Interruptions allowed"</string>
+    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Priority only"</string>
+    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"None"</string>
     <string name="zen_mode_automation_category" msgid="4653551005950835761">"Automation"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Automatically turn on"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Never"</string>
-    <string name="zen_mode_phone_calls" msgid="8956214416859303966">"Calls"</string>
+    <string name="zen_mode_calls" msgid="7051492091133751208">"Calls"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Messages"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Calls/messages from"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Anyone"</string>
@@ -2450,7 +2469,9 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Weeknights"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Start time"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"End time"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> next day"</string>
+    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> next day"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> or any alarm before"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> next day or any alarm before"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"App notifications"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Notification settings"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Send feedback about this device"</string>
@@ -2458,7 +2479,11 @@
     <string name="switch_on_text" msgid="1124106706920572386">"On"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Off"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"Screen pinning"</string>
-    <string name="screen_pinning_description" msgid="7091642350452605379">"When turned on, you can use screen pinning to keep the current screen in view until you unpin.\n\nTo use screen pinning:\n\n1. Make sure screen pinning is turned on.\n\n2. Open the screen that you want to pin.\n\n3. Touch Overview.\n\n4. Touch the pin icon."</string>
+    <string name="screen_pinning_description" msgid="1137904524037468263">"When this setting is turned on, you can use screen pinning to keep the current screen in view until you unpin.\n\nTo use screen pinning:\n\n1. Make sure that screen pinning is turned on.\n\n2. Open the screen that you want to pin.\n\n3. Touch Overview.\n\n4. Swipe up and then touch the pin icon."</string>
+    <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Ask for unlock pattern before unpinning"</string>
+    <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Ask for PIN before unpinning"</string>
+    <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Ask for password before unpinning"</string>
+    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Lock device when unpinning"</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Work profile"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Experimental)"</string>
     <string name="display_auto_rotate_title" msgid="6176450657107806043">"When device is rotated"</string>
@@ -2467,7 +2492,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Stay in landscape view"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Stay in current orientation"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI information"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI-related information"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Encryption"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Continue"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"You can further protect this device by requiring your PIN before it starts up. Until the device starts up, it can\'t receive calls, messages or notifications, including alarms. \n\nThis helps protect data on lost or stolen devices."</string>
@@ -2485,4 +2509,7 @@
     <string name="encrypt_talkback_dialog_message_pin" msgid="1890374082842868489">"When you enter your PIN to start this device, accessibility services like <xliff:g id="SERVICE">%1$s</xliff:g> won\'t yet be available."</string>
     <string name="encrypt_talkback_dialog_message_pattern" msgid="4474332516537386384">"When you enter your pattern to start this device, accessibility services like <xliff:g id="SERVICE">%1$s</xliff:g> won\'t yet be available."</string>
     <string name="encrypt_talkback_dialog_message_password" msgid="8166099418487083927">"When you enter your password to start this device, accessibility services like <xliff:g id="SERVICE">%1$s</xliff:g> won\'t yet be available."</string>
+    <string name="imei_information_title" msgid="8499085421609752290">"IMEI information"</string>
+    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI-related information"</string>
+    <string name="slot_number" msgid="3762676044904653577">"(Slot<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-en-rIN/arrays.xml b/res/values-en-rIN/arrays.xml
index 3cbd031..3491ad7 100644
--- a/res/values-en-rIN/arrays.xml
+++ b/res/values-en-rIN/arrays.xml
@@ -527,4 +527,12 @@
     <item msgid="4338089220026248848">"Cached (activity client)"</item>
     <item msgid="6652164677254579050">"Cached (empty)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Teal"</item>
+    <item msgid="8332294763632946560">"Blue"</item>
+    <item msgid="2023216417616991392">"Indigo"</item>
+    <item msgid="3170497246594232819">"Purple"</item>
+    <item msgid="4608643045752965568">"Pink"</item>
+    <item msgid="6131821495505931173">"Red"</item>
+  </string-array>
 </resources>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 9e49235..568c043 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>
@@ -180,7 +180,6 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s wants to access your messages. Give access to %2$s?"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Date &amp; time"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Choose time zone"</string>
-    <string name="normal_date_format" msgid="7636406984925498359">"Regional (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Preview:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Font size:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -291,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>
@@ -322,8 +321,6 @@
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Select time zone"</string>
     <string name="date_time_set_date_title" msgid="6928286765325608604">"Date"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"Set date"</string>
-    <string name="date_time_date_format_title" msgid="3976171711988766411">"Date format"</string>
-    <string name="date_time_date_format" msgid="6951498879879281102">"Choose date format"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Sort alphabetically"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Sort by time zone"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Date"</string>
@@ -372,7 +369,8 @@
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Wait while your phone is being encrypted. <xliff:g id="PERCENT">^1</xliff:g>% complete."</string>
     <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Wait while your tablet is being encrypted. Time remaining: <xliff:g id="DURATION">^1</xliff:g>"</string>
     <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Wait while your phone is being encrypted. Time remaining: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Try again in <xliff:g id="DELAY">^1</xliff:g> seconds."</string>
+    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"To unlock your tablet, turn it off and then on."</string>
+    <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"To unlock your phone, turn it off and then on."</string>
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"Warning: Your device will be wiped after <xliff:g id="COUNT">^1</xliff:g> more failed attempts to be unlocked!"</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Type your password"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Encryption unsuccessful"</string>
@@ -401,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>
@@ -412,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>
@@ -556,13 +556,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"As speaker phone"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"For music and media"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Remember settings"</string>
-    <string name="wifi_assistant_intro_setup" msgid="4605105515416995110">"Introducing\nWi‑Fi Assistant"</string>
-    <string name="wifi_assistant_no_thanks" msgid="2776983751990143934">"NO, THANKS"</string>
-    <string name="wifi_assistant_setup" msgid="3772423650475730906">"SET UP"</string>
-    <string name="wifi_assistant_card_message" msgid="107811647784658536">"Automatically connect to available networks with a Wi‑Fi Assistant."</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi‑Fi Assistant"</string>
-    <string name="wifi_assistant_title_message" msgid="6240721017579074015">"<xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> automatically connects you to the best available Wi‑Fi"</string>
-    <string name="wifi_assistant_open_app" msgid="4803044899535675063">"OPEN APP"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Connected via Wi‑Fi assistant"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"Cast screen"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Enable wireless display"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"No nearby devices were found."</string>
@@ -592,7 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Wi‑Fi settings"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Set up &amp; manage wireless access points"</string>
-    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Select Wi‑Fi"</string>
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Select Wi‑Fi network"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Select Wi‑Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Turning Wi‑Fi on…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Turning off Wi‑Fi…"</string>
@@ -607,8 +602,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"Scanning always available"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Always allow scanning"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Let Google\'s location service and other apps scan for networks, even when Wi‑Fi is off"</string>
-    <string name="wifi_automatically_manage_title" msgid="6249976570008992746">"Automatically manage Wi‑Fi"</string>
-    <string name="wifi_automatically_manage_summary" msgid="6952470763378312488">"Let <xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> manage your Wi‑Fi connection"</string>
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Use open Wi‑Fi automatically"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Let a Wi‑Fi assistant automatically connect to open networks determined to be high quality"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Choose assistant"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Install certificates"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"To improve location accuracy and for other purposes, Google and other apps may scan for nearby networks, even when Wi-Fi is off. If you don\'t want this to happen, go to Advanced &gt; Scanning always available."</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Apps may scan for nearby networks, even when Wi-Fi is off. If you don\'t want this to happen, go to Advanced &gt; Scanning always available."</string>
@@ -629,6 +625,7 @@
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Scan"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Advanced"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Connect to network"</string>
+    <string name="wifi_menu_remember" msgid="8814185749388713796">"Remember network"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Forget network"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Modify network"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Write to NFC tag"</string>
@@ -673,9 +670,11 @@
     <string name="wifi_unspecified" msgid="5431501214192991253">"(unspecified)"</string>
     <string name="wifi_remembered" msgid="4955746899347821096">"Saved"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"Disabled"</string>
-    <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Avoided poor Internet connection"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP Configuration Failure"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Wi-Fi Connection Failure"</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Authentication problem"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Not in range"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"No Internet Access Detected, won\'t automatically reconnect."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS available"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS available)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Enter your network password"</string>
@@ -699,9 +698,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"WARNING: If you skip Wi‑Fi, your tablet will only use mobile data for initial downloads and updates. To avoid possible data charges, connect to Wi‑Fi."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"WARNING: If you skip Wi‑Fi, your device will only use mobile data for initial downloads and updates. To avoid possible data charges, connect to Wi‑Fi."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"WARNING: If you skip Wi‑Fi, your phone will only use mobile data for initial downloads and updates. To avoid possible data charges, connect to Wi‑Fi."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="2393880108322835846">"WARNING: If you skip Wi‑Fi, your tablet won\'t have an Internet connection to use for any initial downloads or updates."</string>
-    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1707391993265558787">"WARNING: If you skip Wi‑Fi, your device won\'t have an Internet connection to use for any initial downloads or updates."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="1556858507920033022">"WARNING: If you skip Wi‑Fi, your phone won\'t have an Internet connection to use for any initial downloads or updates."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"If you skip Wi‑Fi:\n\nYour tablet won\'t have an Internet connection.\n\nYou won\'t get software updates until you connect to the Internet.\n\nYou can\'t activate device protection features at this time."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"If you skip Wi‑Fi:\n\nYour device won\'t have an Internet connection.\n\nYou won\'t get software updates until you connect to the Internet.\n\nYou can\'t activate device protection features at this time."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"If you skip Wi‑Fi:\n\nYour phone won\'t have an Internet connection.\n\nYou won\'t get software updates until you connect to the Internet.\n\nYou can\'t activate device protection features at this time."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"The tablet was unable to connect to this Wi‑Fi network."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"The device was unable to connect to this Wi‑Fi network."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"The phone was unable to connect to this Wi‑Fi network."</string>
@@ -761,7 +760,6 @@
     <string name="ring_volume_title" msgid="7938706566797464165">"Ringer volume"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrate when silent"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Default notification sound"</string>
-    <string name="heads_up_enabled_title" msgid="1031078221910921622">"Pop up if high priority"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Ringtone"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Notification"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Use incoming call volume for notifications"</string>
@@ -834,7 +832,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatic brightness"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Lift to wake"</string>
     <string name="doze_title" msgid="2259176504273878294">"Ambient display"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"Wake screen when device is picked up or notifications arrive"</string>
+    <string name="doze_summary" msgid="7128970177894383698">"Wake screen when you pick up device or receive notifications"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Font size"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Font size"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM card lock settings"</string>
@@ -862,6 +860,10 @@
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Cancel"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"Multiple SIMs found"</string>
     <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>
@@ -1012,6 +1014,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"This will erase all data from your tablet\'s "<b>"internal storage"</b>", including:\n\n"<li>"Your Google account"</li>\n<li>"System and app data and settings"</li>\n<li>"Downloaded apps"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"This will erase all data from your phone\'s "<b>"internal storage"</b>", including:\n\n"<li>"Your Google account"</li>\n<li>"System and app data and settings"</li>\n<li>"Downloaded apps"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"You are currently signed in to the following accounts:\n"</string>
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"There are other users present on this device.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Music"</li>\n<li>"Photos"</li>\n<li>"Other user data"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"To clear music, pictures and other user data, the "<b>"USB storage"</b>" needs to be erased."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"To clear music, pictures and other user data, the "<b>"SD card"</b>" needs to be erased."</string>
@@ -1023,7 +1026,6 @@
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Reset phone"</string>
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Erase all your personal information and downloaded apps? You cannot reverse this action!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Erase everything"</string>
-    <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Draw your unlock pattern"</string>
     <string name="master_clear_gesture_explanation" msgid="826193821455182780">"You need to draw your unlock pattern to confirm a factory data reset."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"No reset was performed because the System Clear service isn\'t available."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Reset?"</string>
@@ -1041,7 +1043,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"Erase the USB storage, deleting all files stored there? You cannot reverse this action!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Erase the SD card, deleting all files stored there? You cannot reverse this action!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Erase everything"</string>
-    <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Draw your unlock pattern"</string>
     <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"You need to draw your unlock pattern to confirm that you want to erase the USB storage."</string>
     <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"You need to draw your unlock pattern to confirm that you want to erase the SD card."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Call settings"</string>
@@ -1087,6 +1088,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Please insert SIM card and restart"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Please connect to the internet"</string>
     <string name="location_title" msgid="1029961368397484576">"My Location"</string>
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Work profile"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Location for work profile"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Turned off by your company"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Mode"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"High accuracy"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Battery saving"</string>
@@ -1124,6 +1128,7 @@
     <string name="copyright_title" msgid="865906688917260647">"Copyright"</string>
     <string name="license_title" msgid="1990487604356037871">"Licence"</string>
     <string name="terms_title" msgid="7697580845616764642">"Terms and conditions"</string>
+    <string name="webview_license_title" msgid="2813507464175738967">"System WebView Licence"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Wallpapers"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Satellite imagery providers:\n©2014 CNES/Astrium, DigitalGlobe, Bluesky"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Open-source licences"</string>
@@ -1237,7 +1242,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB storage"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"On SD card"</string>
     <string name="disabled" msgid="9206776641295849915">"Disabled"</string>
-    <string name="not_installed" msgid="1475144352069281880">"Not installed"</string>
+    <string name="not_installed" msgid="2797554494953450291">"Not installed for this user"</string>
     <string name="no_applications" msgid="7336588977497084921">"No apps."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Internal storage"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB storage"</string>
@@ -1434,8 +1439,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Screen will never sleep while charging"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Enable Bluetooth HCI snoop log"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Capture all Bluetooth HCI packets in a file"</string>
-    <string name="oem_unlock_enable" msgid="6629321276287913315">"Enable OEM unlock"</string>
-    <string name="oem_unlock_enable_summary" msgid="3546686263996628110">"Allow the device to be OEM unlocked"</string>
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM unlocking"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Allow the bootloader to be unlocked"</string>
+    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Enter your PIN"</string>
+    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Enter your device PIN to enable OEM unlock"</string>
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Allow OEM unlocking?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"WARNING: Device protection features will not work on this device while this setting is turned on."</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Wireless display certification"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Enable Wi‑Fi verbose logging"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Aggressive Wi‑Fi to Mobile handover"</string>
@@ -1538,6 +1547,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"Captions will look like this"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"Default"</string>
+    <string name="color_title" msgid="4258931051732243983">"Colour"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"Default"</string>
     <string name="color_none" msgid="3475640044925814795">"None"</string>
     <string name="color_white" msgid="8045195170201590239">"White"</string>
@@ -1595,12 +1605,12 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"<xliff:g id="REMAIN">%1$s</xliff:g> remaining"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> to charge"</string>
-    <string name="power_discharging_duration" msgid="7125493014448497620">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – approx. <xliff:g id="TIME">%2$s</xliff:g> left"</string>
-    <string name="power_charging" msgid="712751285832976915">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – <xliff:g id="STATE">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration" msgid="4802183864773082009">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> until full"</string>
-    <string name="power_charging_duration_ac" msgid="3611179931297824699">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> until full on AC"</string>
-    <string name="power_charging_duration_usb" msgid="1106605348913397583">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> until full over USB"</string>
-    <string name="power_charging_duration_wireless" msgid="633606920144617227">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> until full from wireless"</string>
+    <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> – approx. <xliff:g id="TIME">%2$s</xliff:g> left"</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> until full"</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> until full on AC"</string>
+    <string name="power_charging_duration_usb" msgid="182405645340976546">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> until full over USB"</string>
+    <string name="power_charging_duration_wireless" msgid="1829295708243159464">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> until full from wireless"</string>
     <string name="power_usage_list_summary" msgid="2409288197839512482">"Use since last full charge"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Battery use since unplugged"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Battery use since reset"</string>
@@ -1617,7 +1627,6 @@
     <string name="awake" msgid="387122265874485088">"Device awake time"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi‑Fi on time"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi‑Fi on time"</string>
-    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"History details"</string>
     <string name="details_title" msgid="3792801565213935385">"Use details"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Use details"</string>
@@ -1689,7 +1698,7 @@
     <string name="battery_saver" msgid="1426682272004907982">"Battery saver"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Turn on automatically"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Never"</string>
-    <string name="battery_saver_turn_on_automatically_pct" msgid="3033681629861428940">"at %1$d%% battery"</string>
+    <string name="battery_saver_turn_on_automatically_pct" msgid="7536784431655058267">"at %1$s battery"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Process Stats"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Geeky stats about running processes"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Memory use"</string>
@@ -1813,7 +1822,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Hardware-backed"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Software only"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"Credentials are not available for this user"</string>
-    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Draw your unlock pattern"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"You need to draw your unlock pattern to confirm credential installation."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Type the password for credential storage."</string>
@@ -1835,7 +1843,7 @@
     <string name="privacy_settings" msgid="5446972770562918934">"Backup &amp; reset"</string>
     <string name="privacy_settings_title" msgid="4856282165773594890">"Backup &amp; reset"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Backup &amp; restore"</string>
-    <string name="personal_data_section_title" msgid="7815209034443782061">"personal data"</string>
+    <string name="personal_data_section_title" msgid="7815209034443782061">"Personal data"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Back up my data"</string>
     <string name="backup_data_summary" msgid="708773323451655666">"Back up app data, Wi‑Fi passwords and other settings to Google servers"</string>
     <string name="backup_configure_account_title" msgid="3790872965773196615">"Backup account"</string>
@@ -1843,6 +1851,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"Include app data"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Automatic restore"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"When reinstalling an app, restore backed up settings and data"</string>
+    <string name="backup_inactive_title" msgid="5355557151569037197">"Backup service is inactive."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"This is set by your device policy."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Desktop backup password"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Desktop full backups aren\'t currently protected"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Touch to change or remove the password for desktop full backups"</string>
@@ -1952,7 +1962,11 @@
     <string name="enter_password" msgid="8035706727471334122">"To start Android, enter your password"</string>
     <string name="enter_pin" msgid="5305333588093263790">"To start Android, enter your PIN"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"To start Android, draw your pattern"</string>
-    <string name="try_again" msgid="4272075051293936921">"Try again."</string>
+    <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"Wrong Pattern"</string>
+    <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"Wrong Password"</string>
+    <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"Wrong PIN"</string>
+    <string name="checking_decryption" msgid="8287458611802609493">"Checking…"</string>
+    <string name="starting_android" msgid="8581493237458496835">"Starting Android"</string>
     <string name="delete" msgid="4219243412325163003">"Delete"</string>
     <string name="misc_files" msgid="6720680815969643497">"Misc. files"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"selected <xliff:g id="NUMBER">%1$d</xliff:g> out of <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -1990,8 +2004,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Always use GPU for screen compositing"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"Simulate colour space"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Enable OpenGL traces"</string>
-    <string name="use_nuplayer" msgid="5699257393367904387">"Use NuPlayer (experimental)"</string>
-    <string name="use_nuplayer_summary" msgid="1991479067478516714">"Use NuPlayer instead of AwesomePlayer"</string>
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"Use AwesomePlayer (deprecated)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"Use AwesomePlayer instead of NuPlayer for most media playback"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"Disable USB audio routing"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"Disable automatic routing to USB audio peripherals"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Show layout bounds"</string>
@@ -2167,7 +2181,6 @@
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Add user or profile"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Add user"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Restricted profile"</string>
-    <string name="user_summary_managed_profile" msgid="7369539529693048111">"Work profile"</string>
     <string name="user_need_lock_message" msgid="2596365678651842785">"Before you can create a restricted profile, you\'ll need to set up a screen lock to protect your apps and personal data."</string>
     <string name="user_set_lock_button" msgid="8311219392856626841">"Set lock"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Not set up"</string>
@@ -2298,11 +2311,13 @@
     <string name="sim_cellular_data_unavailable_summary" msgid="3654805961942166428">"Touch to select a data SIM"</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"Always use this for calls"</string>
     <string name="select_sim_for_data" msgid="2366081042162853044">"Select a SIM for data"</string>
+    <string name="data_switch_started" msgid="2040761479817166311">"Switching data SIM, this may take up to a minute..."</string>
     <string name="select_sim_for_calls" msgid="3503094771801109334">"Call with"</string>
     <string name="sim_select_card" msgid="211285163525563293">"Select a SIM card"</string>
     <string name="sim_card_number_title" msgid="7845379943474336488">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"SIM empty"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"SIM name"</string>
+    <string name="sim_name_hint" msgid="7038643345238968930">"Enter SIM name"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"SIM slot %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Operator"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Number"</string>
@@ -2312,7 +2327,6 @@
     <string name="color_purple" msgid="3888532466427762504">"Purple"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"No SIM cards inserted"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"SIM status"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"SIM related information"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"Call back from default SIM"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"SIM for outgoing calls"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Other call settings"</string>
@@ -2320,8 +2334,11 @@
     <string name="preferred_network_offload_header" msgid="2321173571529106767">"Disable Network Name Broadcast"</string>
     <string name="preferred_network_offload_footer" msgid="5857279426054744020">"Disable Network Name Broadcast protects from third parties getting access to your network information."</string>
     <string name="preferred_network_offload_popup" msgid="2252915199889604600">"Disabling Network Name Broadcast will prevent automatic connection to hidden networks."</string>
+    <string name="sim_signal_strength" msgid="9144010043784767984">"<xliff:g id="DBM">%1$d</xliff:g> dBm <xliff:g id="ASU">%2$d</xliff:g> asu"</string>
+    <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>
+    <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Ask every time"</string>
     <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>
@@ -2330,22 +2347,22 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Recent searches"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Results"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi Wi-Fi network connection"</string>
-    <string name="keywords_more_default_sms_app" msgid="2744404159003574745">"text message"</string>
-    <string name="keywords_more_mobile_networks" msgid="7813380887358745769">"mobile operator wireless"</string>
+    <string name="keywords_more_default_sms_app" msgid="895656981962034647">"text message texting messages messaging"</string>
+    <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"mobile network mobile operator wireless data 4G 3G 2G LTE"</string>
     <string name="keywords_home" msgid="3626170808219458848">"launcher"</string>
     <string name="keywords_display" msgid="6709007669501628320">"screen touchscreen"</string>
-    <string name="keywords_display_brightness_level" msgid="8636451602230815191">"dim screen touchscreen"</string>
-    <string name="keywords_display_auto_brightness" msgid="8070218600502753102">"dim screen touchscreen"</string>
-    <string name="keywords_display_wallpaper" msgid="4315466287469834939">"background"</string>
+    <string name="keywords_display_brightness_level" msgid="8923289340474728990">"dim screen touchscreen battery"</string>
+    <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"dim screen touchscreen battery"</string>
+    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"background personalise customise display"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"text size"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"project"</string>
-    <string name="keywords_storage" msgid="7007275853993419928">"space disk hard drive"</string>
-    <string name="keywords_battery" msgid="3992479295298655138">"power"</string>
-    <string name="keywords_spell_checker" msgid="4509482591225399210">"spelling"</string>
+    <string name="keywords_storage" msgid="6572905220031852173">"space disk hard drive device usage"</string>
+    <string name="keywords_battery" msgid="2096185085932675704">"power usage charge"</string>
+    <string name="keywords_spell_checker" msgid="6106749039734174140">"spelling dictionary spell check auto-correct"</string>
     <string name="keywords_voice_input" msgid="3519547605812413860">"recogniser input speech speak language hands-free hand free recognition offensive word audio history bluetooth headset"</string>
-    <string name="keywords_text_to_speech_output" msgid="8207889472282225512">"rate language default speak speaking"</string>
-    <string name="keywords_date_and_time" msgid="7666950126499155141">"clock"</string>
-    <string name="keywords_factory_data_reset" msgid="3693730656843989732">"wipe delete"</string>
+    <string name="keywords_text_to_speech_output" msgid="392447904221657930">"rate language default speak speaking tts accessibility reader blind"</string>
+    <string name="keywords_date_and_time" msgid="2631808108134830066">"clock military"</string>
+    <string name="keywords_factory_data_reset" msgid="4355133848707691977">"wipe delete restore clear remove"</string>
     <string name="keywords_printing" msgid="1701778563617114846">"printer"</string>
     <string name="keywords_sounds_and_notifications" msgid="5965996187974887000">"speaker beep"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="2912933812460077912">"dont don\'t disturb interrupt interruption break"</string>
@@ -2354,7 +2371,7 @@
     <string name="keywords_location_mode" msgid="8584992704568356084">"accuracy"</string>
     <string name="keywords_accounts" msgid="1957925565953357627">"account"</string>
     <string name="keywords_users" msgid="4673901601478559100">"restriction restrict restricted"</string>
-    <string name="keywords_keyboard_and_ime" msgid="1103378692379215672">"text correction correct sound vibrate auto language gesture suggest suggestion theme offensive word type emoji"</string>
+    <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"text correction correct sound vibrate auto language gesture suggest suggestion theme offensive word type emoji international"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"slide password pattern pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Set up Wi-Fi NFC Tag"</string>
     <string name="write_tag" msgid="8571858602896222537">"Write"</string>
@@ -2371,7 +2388,6 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Notification volume"</string>
     <string name="zen_mode_settings_title" msgid="7014915558669122902">"Interruptions"</string>
     <string name="zen_mode_option_title" msgid="5061978632306007914">"When calls and notifications arrive"</string>
-    <string name="zen_mode_option_title_novoice" msgid="6680706009915204785">"When notifications arrive"</string>
     <string name="zen_mode_option_off" msgid="3167702608910820883">"Always interrupt"</string>
     <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Allow only priority interruptions"</string>
     <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Don\'t interrupt"</string>
@@ -2429,14 +2445,17 @@
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Done"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Until you turn this off"</string>
     <string name="zen_mode_important_category" msgid="8123274463331022993">"Priority interruptions"</string>
-    <string name="zen_mode_downtime_category" msgid="4730179065426038108">"Downtime (priority interruptions only)"</string>
+    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Downtime"</string>
     <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Days"</string>
     <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"None"</string>
+    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Interruptions allowed"</string>
+    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Priority only"</string>
+    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"None"</string>
     <string name="zen_mode_automation_category" msgid="4653551005950835761">"Automation"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Automatically turn on"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Never"</string>
-    <string name="zen_mode_phone_calls" msgid="8956214416859303966">"Calls"</string>
+    <string name="zen_mode_calls" msgid="7051492091133751208">"Calls"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Messages"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Calls/messages from"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Anyone"</string>
@@ -2450,7 +2469,9 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Weeknights"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Start time"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"End time"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> next day"</string>
+    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> next day"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> or any alarm before"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> next day or any alarm before"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"App notifications"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Notification settings"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Send feedback about this device"</string>
@@ -2458,7 +2479,11 @@
     <string name="switch_on_text" msgid="1124106706920572386">"On"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Off"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"Screen pinning"</string>
-    <string name="screen_pinning_description" msgid="7091642350452605379">"When turned on, you can use screen pinning to keep the current screen in view until you unpin.\n\nTo use screen pinning:\n\n1. Make sure screen pinning is turned on.\n\n2. Open the screen that you want to pin.\n\n3. Touch Overview.\n\n4. Touch the pin icon."</string>
+    <string name="screen_pinning_description" msgid="1137904524037468263">"When this setting is turned on, you can use screen pinning to keep the current screen in view until you unpin.\n\nTo use screen pinning:\n\n1. Make sure that screen pinning is turned on.\n\n2. Open the screen that you want to pin.\n\n3. Touch Overview.\n\n4. Swipe up and then touch the pin icon."</string>
+    <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Ask for unlock pattern before unpinning"</string>
+    <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Ask for PIN before unpinning"</string>
+    <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Ask for password before unpinning"</string>
+    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Lock device when unpinning"</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Work profile"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Experimental)"</string>
     <string name="display_auto_rotate_title" msgid="6176450657107806043">"When device is rotated"</string>
@@ -2467,7 +2492,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Stay in landscape view"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Stay in current orientation"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI information"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI-related information"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Encryption"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Continue"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"You can further protect this device by requiring your PIN before it starts up. Until the device starts up, it can\'t receive calls, messages or notifications, including alarms. \n\nThis helps protect data on lost or stolen devices."</string>
@@ -2485,4 +2509,7 @@
     <string name="encrypt_talkback_dialog_message_pin" msgid="1890374082842868489">"When you enter your PIN to start this device, accessibility services like <xliff:g id="SERVICE">%1$s</xliff:g> won\'t yet be available."</string>
     <string name="encrypt_talkback_dialog_message_pattern" msgid="4474332516537386384">"When you enter your pattern to start this device, accessibility services like <xliff:g id="SERVICE">%1$s</xliff:g> won\'t yet be available."</string>
     <string name="encrypt_talkback_dialog_message_password" msgid="8166099418487083927">"When you enter your password to start this device, accessibility services like <xliff:g id="SERVICE">%1$s</xliff:g> won\'t yet be available."</string>
+    <string name="imei_information_title" msgid="8499085421609752290">"IMEI information"</string>
+    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI-related information"</string>
+    <string name="slot_number" msgid="3762676044904653577">"(Slot<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-es-rUS/arrays.xml b/res/values-es-rUS/arrays.xml
index 21c7bda..f0c5445 100644
--- a/res/values-es-rUS/arrays.xml
+++ b/res/values-es-rUS/arrays.xml
@@ -527,4 +527,12 @@
     <item msgid="4338089220026248848">"En caché (cliente de actividad)"</item>
     <item msgid="6652164677254579050">"En caché (vacío)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Verde azulado"</item>
+    <item msgid="8332294763632946560">"Azul"</item>
+    <item msgid="2023216417616991392">"Índigo"</item>
+    <item msgid="3170497246594232819">"Púrpura"</item>
+    <item msgid="4608643045752965568">"Rosado"</item>
+    <item msgid="6131821495505931173">"Rojo"</item>
+  </string-array>
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index e9f60ba..4f41a19 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>
@@ -180,7 +180,6 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s quiere acceder a tus mensajes. ¿Quieres permitir el acceso a %2$s?"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Fecha y hora"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Elige la zona horaria"</string>
-    <string name="normal_date_format" msgid="7636406984925498359">"Regional (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Vista previa:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Tamaño de fuente:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -291,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>
@@ -322,8 +321,6 @@
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Seleccionar zona horaria"</string>
     <string name="date_time_set_date_title" msgid="6928286765325608604">"Fecha"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"Establecer fecha"</string>
-    <string name="date_time_date_format_title" msgid="3976171711988766411">"Formato de fecha"</string>
-    <string name="date_time_date_format" msgid="6951498879879281102">"Elegir el formato de fecha"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Ordenar alfabéticamente"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Ordenar por zona horaria"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Fecha"</string>
@@ -372,7 +369,8 @@
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Espera mientras se encripta tu dispositivo. <xliff:g id="PERCENT">^1</xliff:g>% completado."</string>
     <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Espera mientras se encripta la tablet. Tiempo restante: <xliff:g id="DURATION">^1</xliff:g>"</string>
     <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Espera mientras se encripta el teléfono. Tiempo restante: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Vuelve a intentarlo en <xliff:g id="DELAY">^1</xliff:g> segundos."</string>
+    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"Para desbloquear la tablet, apágala y vuelve a encenderla."</string>
+    <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"Para desbloquear el teléfono, apágalo y vuelve a encenderlo."</string>
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"Advertencia: Se borrarán los datos del dispositivo después de otros <xliff:g id="COUNT">^1</xliff:g> intentos fallidos para desbloquearlo."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Escribe la contraseña"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Encriptación incorrecta"</string>
@@ -401,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>
@@ -412,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>
@@ -556,13 +556,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Como altavoz"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Para música y medios"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Recordar la configuración"</string>
-    <string name="wifi_assistant_intro_setup" msgid="4605105515416995110">"Asistente\nde Wi‑Fi"</string>
-    <string name="wifi_assistant_no_thanks" msgid="2776983751990143934">"NO, GRACIAS"</string>
-    <string name="wifi_assistant_setup" msgid="3772423650475730906">"CONFIGURAR"</string>
-    <string name="wifi_assistant_card_message" msgid="107811647784658536">"Conectarse automáticamente a redes disponibles con un asistente de Wi-Fi"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Asistente de Wi-Fi"</string>
-    <string name="wifi_assistant_title_message" msgid="6240721017579074015">"<xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> te conecta automáticamente a la mejor red Wi-Fi disponible"</string>
-    <string name="wifi_assistant_open_app" msgid="4803044899535675063">"ABRIR APLICACIÓN"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Conexión por asistente de Wi-Fi"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"Pantalla de Cast"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Habilitar pantalla inalámbrica"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"No se encontraron dispositivos cercanos."</string>
@@ -592,7 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Configuración de Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Configurar y administrar los puntos de acceso de teléfonos inalámbricos"</string>
-    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Seleccionar red Wi-Fi"</string>
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Seleccionar red Wi‑Fi"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Seleccionar red Wi-Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Activando Wi-Fi..."</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Desactivando Wi-Fi..."</string>
@@ -607,8 +602,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"Búsqueda siempre disponible"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Siempre permitir la búsqueda"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Permitir que el servicio de ubicación de Google y otras aplicaciones busquen redes aunque la conexión Wi-Fi esté desactivada"</string>
-    <string name="wifi_automatically_manage_title" msgid="6249976570008992746">"Administrar Wi-Fi automáticamente"</string>
-    <string name="wifi_automatically_manage_summary" msgid="6952470763378312488">"Permitir que <xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> administre la conexión Wi‑Fi"</string>
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Usar Wi-Fi abierto automáticamente"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Permitir a un asistente de Wi-Fi conectarse automáticamente a redes abiertas de alta calidad."</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Elegir asistente"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Instalar certificados"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Para mejorar la precisión de la ubicación y para otros fines, Google y otras aplicaciones pueden explorar las redes cercanas, incluso cuando Wi-Fi esté desactivado. Si no quieres que esto ocurra, ve a Avanzado &gt; Exploración siempre disponible."</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Las aplicaciones pueden buscar redes cercanas incluso cuando Wi-Fi esté desactivado. Si no quieres que esto ocurra, ve a Config. avanzada &gt; Búsqueda siempre disponible."</string>
@@ -629,6 +625,7 @@
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Buscar"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Config. avanzada"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Conectar a la red"</string>
+    <string name="wifi_menu_remember" msgid="8814185749388713796">"Recordar red"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Olvidar red"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Modificar la red"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Escribir en etiqueta NFC"</string>
@@ -673,9 +670,11 @@
     <string name="wifi_unspecified" msgid="5431501214192991253">"(sin especificar)"</string>
     <string name="wifi_remembered" msgid="4955746899347821096">"Guardada"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"Inhabilitada"</string>
-    <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Mala conexión inhabilitada"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"Error de configuración IP"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Error de conexión Wi-Fi"</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Problema de autenticación"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Fuera de alcance"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"No se detectó el acceso a Internet. No se volverá a conectar de forma automática."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WSP disponible"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WSP disponible)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Ingresa la contraseña de la red."</string>
@@ -699,9 +698,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"ADVERTENCIA: Si omites la conexión Wi‑Fi, la tablet solo usará datos móviles para acceder a descargas y actualizaciones iniciales. Si quieres evitar posibles cargos por uso de datos, conéctate a una red Wi-Fi."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"ADVERTENCIA: Si omites la conexión Wi‑Fi, el dispositivo solo usará datos móviles para acceder a descargas y actualizaciones iniciales. Si quieres evitar posibles cargos por uso de datos, conéctate a una red Wi-Fi."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"ADVERTENCIA: Si omites la conexión Wi‑Fi, el teléfono solo usará datos móviles para acceder a descargas y actualizaciones iniciales. Si quieres evitar posibles cargos por uso de datos, conéctate a una red Wi-Fi."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="2393880108322835846">"ADVERTENCIA: Si omites la conexión Wi-Fi, la tablet no tendrá ninguna conexión a Internet disponible para acceder a descargas o actualizaciones iniciales."</string>
-    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1707391993265558787">"ADVERTENCIA: Si omites la conexión Wi-Fi, el dispositivo no tendrá ninguna conexión a Internet disponible para acceder a descargas o actualizaciones iniciales."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="1556858507920033022">"ADVERTENCIA: Si omites la conexión Wi-Fi, el teléfono no tendrá ninguna conexión a Internet disponible para acceder a descargas o actualizaciones iniciales."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Si omites la conexión Wi‑Fi:\n\nLa tablet no tendrá conexión a Internet.\n\nNo recibirás actualizaciones de software hasta que te conectes a Internet.\n\nMientras tanto, no podrás activar las funciones de protección del dispositivo."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Si omites la conexión Wi‑Fi:\n\nEl dispositivo no tendrá conexión a Internet.\n\nNo recibirás actualizaciones de software hasta que te conectes a Internet.\n\nMientras tanto, no podrás activar las funciones de protección del dispositivo."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Si omites la conexión Wi‑Fi:\n\nEl teléfono no tendrá conexión a Internet.\n\nNo recibirás actualizaciones de software hasta que te conectes a Internet.\n\nMientras tanto, no podrás activar las funciones de protección del dispositivo."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"La tablet no pudo conectarse a esta red Wi-Fi."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"El dispositivo no se pudo conectar a esta red Wi-Fi."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"El dispositivo no pudo conectarse a esta red Wi-Fi."</string>
@@ -761,7 +760,6 @@
     <string name="ring_volume_title" msgid="7938706566797464165">"Volumen del timbre"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrar en modo silencioso"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Sonido de notificación predeterminado"</string>
-    <string name="heads_up_enabled_title" msgid="1031078221910921622">"Aparecer con prioridad alta"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Tono de llamada"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Notificación"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Utilizar el volumen de las llamadas entrantes para las notificaciones"</string>
@@ -834,7 +832,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Brillo automático"</string>
     <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="8300817661725517088">"Activa la pantalla si se recoge el dispositivo o si llega una notificación."</string>
+    <string name="doze_summary" msgid="7128970177894383698">"Permite activar la pantalla cuando recoges el dispositivo o recibes 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="sim_lock_settings" msgid="3392331196873564292">"Configuración de bloqueo de la tarjeta SIM"</string>
@@ -862,6 +860,10 @@
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Cancelar"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"Se encontraron varias tarjetas SIM"</string>
     <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>
@@ -1012,6 +1014,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Esto borrará todos los datos del "<b>"almacenamiento interno"</b>" de tu tablet, por ejemplo:\n\n"<li>"tu cuenta de Google"</li>\n<li>"los datos y la configuración del sistema y de las aplicaciones"</li>\n<li>"las aplicaciones descargadas"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Se borrarán todos los datos del "<b>"almacenamiento interno"</b>" del dispositivo, por ejemplo:\n\n"<li>"tu cuenta de Google,"</li>\n<li>"datos de aplicaciones y ajustes del sistema,"</li>\n<li>"las aplicaciones descargadas."</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Actualmente has accedido a las siguientes cuentas:\n"</string>
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Hay otros usuarios presentes en este dispositivo.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Música"</li>\n<li>"Fotos"</li>\n<li>"Otros datos de usuario"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Para borrar la música, las imágenes y otros datos de usuario, debes borrar el "<b>"almacenamiento USB"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Para borrar música, imágenes y otros datos del usuario, deber borrar la "<b>"tarjeta SD"</b>"."</string>
@@ -1023,7 +1026,6 @@
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Restablecer dispositivo"</string>
     <string name="master_clear_final_desc" msgid="7209547812233487345">"¿Deseas eliminar toda tu información personal y aplicaciones descargadas? Esta acción no se puede deshacer."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Eliminar todo"</string>
-    <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Extrae tu patrón de desbloqueo"</string>
     <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Debes crear tu patrón de desbloqueo para confirmar que quieres restablecer los datos de fábrica."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"No se realizó ningún restablecimiento debido a que el servicio \"Eliminar sistema\" no está disponible."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"¿Restablecer?"</string>
@@ -1041,7 +1043,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"¿Deseas borrar el almacenamiento USB y eliminar todos sus archivos? Esta acción no se puede deshacer."</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"¿Deseas borrar la tarjeta SD y todos los archivos almacenados allí? Esta acción no se puede deshacer."</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Eliminar todo"</string>
-    <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Extrae tu patrón de desbloqueo"</string>
     <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Debes crear tu patrón de desbloqueo para confirmar que deseas borrar el almacenamiento USB."</string>
     <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Debes crear tu patrón de desbloqueo para confirmar que deseas borrar la tarjeta SD."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Config. de llamada"</string>
@@ -1087,6 +1088,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Inserta la tarjeta SIM y reinicia."</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Conéctate a Internet."</string>
     <string name="location_title" msgid="1029961368397484576">"Mi ubicación"</string>
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Perfil de trabajo"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Ubicación de perfil de trabajo"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Desactivada por la empresa"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Modo"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Precisión alta"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Ahorro de batería"</string>
@@ -1124,6 +1128,7 @@
     <string name="copyright_title" msgid="865906688917260647">"Derechos de autor"</string>
     <string name="license_title" msgid="1990487604356037871">"Licencia"</string>
     <string name="terms_title" msgid="7697580845616764642">"Términos y condiciones"</string>
+    <string name="webview_license_title" msgid="2813507464175738967">"Licencia de WebView del sistema"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Fondos de pantalla"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Proveedores de imágenes satelitales:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Licencias de código abierto"</string>
@@ -1237,7 +1242,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Almacenamiento USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"En tarjeta SD"</string>
     <string name="disabled" msgid="9206776641295849915">"Inhabilitadas"</string>
-    <string name="not_installed" msgid="1475144352069281880">"No instalado"</string>
+    <string name="not_installed" msgid="2797554494953450291">"No instalada para este usuario"</string>
     <string name="no_applications" msgid="7336588977497084921">"No hay aplicaciones."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Almacenamiento interno"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Almacenamiento USB"</string>
@@ -1434,8 +1439,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"La pantalla nunca quedará inactiva mientras el dispositivo se esté cargando."</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Registro de búsq. de HCI de Bluetooth"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Capturar todos los paquetes de HCI de Bluetooth en un archivo"</string>
-    <string name="oem_unlock_enable" msgid="6629321276287913315">"Habilitar desbloqueo OEM"</string>
-    <string name="oem_unlock_enable_summary" msgid="3546686263996628110">"Permitir que el dispositivo se desbloquee con OEM"</string>
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"Desbloqueo de OEM"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Permitir que el cargador de inicio se desbloquee"</string>
+    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Ingresa el PIN."</string>
+    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Ingresa el PIN del dispositivo para habilitar el desbloqueo OEM."</string>
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"¿Permitir desbloqueo de OEM?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"ADVERTENCIA: Las funciones de protección de dispositivos no funcionarán en este dispositivo mientras esta configuración esté activada."</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Certificación de pantalla inalámbrica"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Habilitar registro detallado de Wi-Fi"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Transferencia intensa de Wi‑Fi a celular"</string>
@@ -1538,6 +1547,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"Los subtítulos quedarán así:"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"Predeterminado"</string>
+    <string name="color_title" msgid="4258931051732243983">"Color"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"Predeterminado"</string>
     <string name="color_none" msgid="3475640044925814795">"Ninguno"</string>
     <string name="color_white" msgid="8045195170201590239">"Blanco"</string>
@@ -1595,12 +1605,12 @@
     <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">"Tiempo restante: <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"Carga completa en <xliff:g id="UNTIL_CHARGED">%1$s</xliff:g>"</string>
-    <string name="power_discharging_duration" msgid="7125493014448497620">"<xliff:g id="LEVEL">%1$d</xliff:g>%%: falta <xliff:g id="TIME">%2$s</xliff:g> aproximadamente"</string>
-    <string name="power_charging" msgid="712751285832976915">"<xliff:g id="LEVEL">%1$d</xliff:g>%%: <xliff:g id="STATE">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration" msgid="4802183864773082009">"<xliff:g id="LEVEL">%1$d</xliff:g>%% (<xliff:g id="TIME">%2$s</xliff:g> para completarse)"</string>
-    <string name="power_charging_duration_ac" msgid="3611179931297824699">"<xliff:g id="LEVEL">%1$d</xliff:g>%% (<xliff:g id="TIME">%2$s</xliff:g> para completarse en CA)"</string>
-    <string name="power_charging_duration_usb" msgid="1106605348913397583">"<xliff:g id="LEVEL">%1$d</xliff:g>%% (<xliff:g id="TIME">%2$s</xliff:g> para completarse por USB)"</string>
-    <string name="power_charging_duration_wireless" msgid="633606920144617227">"<xliff:g id="LEVEL">%1$d</xliff:g>%% (<xliff:g id="TIME">%2$s</xliff:g> para completar en modo inalámbrico)"</string>
+    <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g>: alrededor de <xliff:g id="TIME">%2$s</xliff:g> para completar la carga"</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> para completar la carga"</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> para completar la carga por CA"</string>
+    <string name="power_charging_duration_usb" msgid="182405645340976546">"<xliff:g id="LEVEL">%1$s</xliff:g>: <xliff:g id="TIME">%2$s</xliff:g> para completar la carga por USB"</string>
+    <string name="power_charging_duration_wireless" msgid="1829295708243159464">"<xliff:g id="LEVEL">%1$s</xliff:g>: <xliff:g id="TIME">%2$s</xliff:g> para completar la carga inalámbrica"</string>
     <string name="power_usage_list_summary" msgid="2409288197839512482">"Uso desde la última carga completa"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Uso de la batería desde que se desconectó"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Uso de la batería desde que se restableció"</string>
@@ -1617,7 +1627,6 @@
     <string name="awake" msgid="387122265874485088">"Hora de activación del dispositivo"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi a tiempo"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi a tiempo"</string>
-    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Detalles del historial"</string>
     <string name="details_title" msgid="3792801565213935385">"Utilizar detalles"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Detalles de uso"</string>
@@ -1689,7 +1698,7 @@
     <string name="battery_saver" msgid="1426682272004907982">"Ahorro de batería"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Activar automáticamente"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Nunca"</string>
-    <string name="battery_saver_turn_on_automatically_pct" msgid="3033681629861428940">"cuando la batería esté al %1$d%%"</string>
+    <string name="battery_saver_turn_on_automatically_pct" msgid="7536784431655058267">"con un %1$s de batería"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Estadísticas de procesos"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Estadísticas para geeks sobre procesos activos"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Uso de memoria"</string>
@@ -1813,7 +1822,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Copia de seguridad en hardware"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Solo software"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"Las credenciales no están disponibles para este usuario."</string>
-    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Crea tu patrón de desbloqueo."</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Debes crear tu patrón de desbloqueo para confirmar la instalación de las credenciales."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Escribe la contraseña para el almacenamiento de credenciales."</string>
@@ -1843,6 +1851,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"Incluir datos de aplicación"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Restaurar automáticamente"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Al reinstalar se restablece la configuración con copia de seguridad."</string>
+    <string name="backup_inactive_title" msgid="5355557151569037197">"Servicio de copia de seguridad inactivo"</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"Esta opción es establecida por la política de dispositivo."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Contras. copia de seguridad"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Tus copias de seguridad completas de escritorio no están protegidas por contraseña."</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Toca para cambiar o eliminar la contraseña de las copias de seguridad completas de tu escritorio."</string>
@@ -1952,7 +1962,11 @@
     <string name="enter_password" msgid="8035706727471334122">"Para iniciar el dispositivo Android, ingresa la contraseña."</string>
     <string name="enter_pin" msgid="5305333588093263790">"Para iniciar el dispositivo Android, ingresa el PIN."</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Para iniciar el dispositivo Android, dibuja el patrón."</string>
-    <string name="try_again" msgid="4272075051293936921">"Inténtalo de nuevo."</string>
+    <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"Patrón incorrecto"</string>
+    <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"Contraseña incorrecta"</string>
+    <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"PIN incorrecto"</string>
+    <string name="checking_decryption" msgid="8287458611802609493">"Comprobando…"</string>
+    <string name="starting_android" msgid="8581493237458496835">"Iniciando Android"</string>
     <string name="delete" msgid="4219243412325163003">"Eliminar"</string>
     <string name="misc_files" msgid="6720680815969643497">"Archivos variados"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"Se seleccionaron <xliff:g id="NUMBER">%1$d</xliff:g> de entre <xliff:g id="TOTAL">%2$d</xliff:g>."</string>
@@ -1990,8 +2004,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Usar GPU para combinar pantallas"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"Simular espacio de color"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Seguimientos de OpenGL"</string>
-    <string name="use_nuplayer" msgid="5699257393367904387">"Usar NuPlayer (experim.)"</string>
-    <string name="use_nuplayer_summary" msgid="1991479067478516714">"Usar NuPlayer en lugar de AwesomePlayer"</string>
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"AwesomePlayer (desuso)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"AwesomePlayer, no NuPlayer, para reproducciones"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"Inhab. enrutam. audio USB"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"Inhab. enrutam. automático a periféricos audio USB"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Mostrar límites de diseño"</string>
@@ -2167,7 +2181,6 @@
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Agregar usuario o perfil"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Agregar usuario"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Perfil restringido"</string>
-    <string name="user_summary_managed_profile" msgid="7369539529693048111">"Perfil de trabajo"</string>
     <string name="user_need_lock_message" msgid="2596365678651842785">"Para poder crear un perfil restringido, debes configurar un bloqueo de pantalla que proteja tus aplicaciones y datos personales."</string>
     <string name="user_set_lock_button" msgid="8311219392856626841">"Configurar bloqueo"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"No configurado"</string>
@@ -2298,11 +2311,13 @@
     <string name="sim_cellular_data_unavailable_summary" msgid="3654805961942166428">"Toca para seleccionar una tarjeta SIM de datos."</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"Usar siempre para llamadas"</string>
     <string name="select_sim_for_data" msgid="2366081042162853044">"Seleccionar SIM para datos"</string>
+    <string name="data_switch_started" msgid="2040761479817166311">"Cambiando SIM de datos, esto puede demorar unos minutos…"</string>
     <string name="select_sim_for_calls" msgid="3503094771801109334">"Llamar con"</string>
     <string name="sim_select_card" msgid="211285163525563293">"Seleccionar una tarjeta SIM"</string>
     <string name="sim_card_number_title" msgid="7845379943474336488">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"SIM vacía"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"Nombre de SIM"</string>
+    <string name="sim_name_hint" msgid="7038643345238968930">"Ingresar nombre de tarjeta SIM"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"Ranura de SIM %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Proveedor"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Número"</string>
@@ -2312,7 +2327,6 @@
     <string name="color_purple" msgid="3888532466427762504">"Púrpura"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"No se insertó ninguna tarjeta SIM."</string>
     <string name="sim_status_title" msgid="6744870675182447160">"Estado de SIM"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"Información relacionada con la tarjeta SIM"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"Devolver la llamada desde la tarjeta SIM predeterminada"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"Tarjeta SIM para llamadas salientes"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Otras configuraciones de llamada"</string>
@@ -2320,8 +2334,11 @@
     <string name="preferred_network_offload_header" msgid="2321173571529106767">"Inhab. mostrar nombre red"</string>
     <string name="preferred_network_offload_footer" msgid="5857279426054744020">"Inhabilitar la opción para mostrar el nombre de red previene el acceso de terceros a su información."</string>
     <string name="preferred_network_offload_popup" msgid="2252915199889604600">"Inhabilitar la opción para mostrar el nombre de red previene la conexión automática a redes ocultas."</string>
+    <string name="sim_signal_strength" msgid="9144010043784767984">"<xliff:g id="DBM">%1$d</xliff:g> dBm y <xliff:g id="ASU">%2$d</xliff:g> asu"</string>
+    <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>
+    <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Preguntar siempre"</string>
     <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>
@@ -2330,22 +2347,22 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Búsquedas recientes"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Resultados"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi, wi-fi, red, conexión"</string>
-    <string name="keywords_more_default_sms_app" msgid="2744404159003574745">"mensaje de texto"</string>
-    <string name="keywords_more_mobile_networks" msgid="7813380887358745769">"celular proveedor de telefonía celular conexión inalámbrica"</string>
+    <string name="keywords_more_default_sms_app" msgid="895656981962034647">"mensaje de texto, enviar mensajes de texto, mensajería"</string>
+    <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"celular, operador de telefonía celular, datos inalámbricos, 4g, 3g, 2g, lte"</string>
     <string name="keywords_home" msgid="3626170808219458848">"selector"</string>
     <string name="keywords_display" msgid="6709007669501628320">"pantalla táctil"</string>
-    <string name="keywords_display_brightness_level" msgid="8636451602230815191">"atenuar pantalla táctil"</string>
-    <string name="keywords_display_auto_brightness" msgid="8070218600502753102">"atenuar pantalla táctil"</string>
-    <string name="keywords_display_wallpaper" msgid="4315466287469834939">"en segundo plano"</string>
+    <string name="keywords_display_brightness_level" msgid="8923289340474728990">"atenuar pantalla, pantalla táctil, batería"</string>
+    <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"atenuar pantalla, pantalla táctil, batería"</string>
+    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"segundo plano, personalizar, ajustar pantalla"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"tamaño del texto"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"proyectar"</string>
-    <string name="keywords_storage" msgid="7007275853993419928">"espacio en el disco disco rígido"</string>
-    <string name="keywords_battery" msgid="3992479295298655138">"energía"</string>
-    <string name="keywords_spell_checker" msgid="4509482591225399210">"ortografía"</string>
+    <string name="keywords_storage" msgid="6572905220031852173">"espacio, disco, disco duro, uso de dispositivo"</string>
+    <string name="keywords_battery" msgid="2096185085932675704">"uso de energía, cargo"</string>
+    <string name="keywords_spell_checker" msgid="6106749039734174140">"ortografía, diccionario, corrección ortográfica, corrección automática"</string>
     <string name="keywords_voice_input" msgid="3519547605812413860">"herramienta de reconocimiento, entrada, voz, hablar, idioma, manos libres, reconocimiento, palabra ofensiva, historial de audio, auriculares bluetooth"</string>
-    <string name="keywords_text_to_speech_output" msgid="8207889472282225512">"calificar idioma predeterminado hablar hablando"</string>
-    <string name="keywords_date_and_time" msgid="7666950126499155141">"reloj"</string>
-    <string name="keywords_factory_data_reset" msgid="3693730656843989732">"eliminar"</string>
+    <string name="keywords_text_to_speech_output" msgid="392447904221657930">"tarifa, idioma, predeterminado, hablar, texto a voz, accesibilidad, lector, personas ciegas"</string>
+    <string name="keywords_date_and_time" msgid="2631808108134830066">"reloj, horario militar"</string>
+    <string name="keywords_factory_data_reset" msgid="4355133848707691977">"borrar, eliminar, restaurar, limpiar, quitar"</string>
     <string name="keywords_printing" msgid="1701778563617114846">"impresora"</string>
     <string name="keywords_sounds_and_notifications" msgid="5965996187974887000">"pitido del altavoz"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="2912933812460077912">"no no molestar interrumpir interrupción descanso"</string>
@@ -2354,7 +2371,7 @@
     <string name="keywords_location_mode" msgid="8584992704568356084">"precisión"</string>
     <string name="keywords_accounts" msgid="1957925565953357627">"cuenta"</string>
     <string name="keywords_users" msgid="4673901601478559100">"restricción restringir restringido"</string>
-    <string name="keywords_keyboard_and_ime" msgid="1103378692379215672">"texto corrección corregir sonido vibrar automático idioma gesto sugerir sugerencia tema palabra ofensiva escribir emoji"</string>
+    <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"corrección de texto, corregir, sonido, vibrar, automático, idioma, gesto, sugerir, sugerencia, tema, palabra ofensiva, tipo, emoji, internacional"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"deslizar, contraseña, patrón, pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Configurar etiqueta NFC Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Escribir"</string>
@@ -2371,7 +2388,6 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Volumen de notificación"</string>
     <string name="zen_mode_settings_title" msgid="7014915558669122902">"Interrupciones"</string>
     <string name="zen_mode_option_title" msgid="5061978632306007914">"Al recibir llamadas o notificaciones"</string>
-    <string name="zen_mode_option_title_novoice" msgid="6680706009915204785">"Al recibir notificaciones"</string>
     <string name="zen_mode_option_off" msgid="3167702608910820883">"Interrumpir siempre"</string>
     <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Permitir solo interrupciones de prioridad"</string>
     <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"No interrumpir"</string>
@@ -2429,14 +2445,17 @@
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Listo"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Hasta que lo desactives"</string>
     <string name="zen_mode_important_category" msgid="8123274463331022993">"Interrupciones de prioridad"</string>
-    <string name="zen_mode_downtime_category" msgid="4730179065426038108">"Tiempo inact. (solo interrup. prioridad)"</string>
+    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Tiempo de inactividad"</string>
     <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Días"</string>
     <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Ninguno"</string>
+    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Permitir interrupciones"</string>
+    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Solo prioridad"</string>
+    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Ninguno"</string>
     <string name="zen_mode_automation_category" msgid="4653551005950835761">"Automatización"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Activar automáticamente"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Nunca"</string>
-    <string name="zen_mode_phone_calls" msgid="8956214416859303966">"Llamadas"</string>
+    <string name="zen_mode_calls" msgid="7051492091133751208">"Llamadas"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Mensajes"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Llamadas y mensajes de"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Cualquiera"</string>
@@ -2450,7 +2469,9 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Noches entre semana"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Hora de inicio"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Hora de finalización"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"Día siguiente (<xliff:g id="FORMATTED_TIME">%s</xliff:g>)"</string>
+    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> el día siguiente"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> o cualquier alarma anterior"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> el día siguiente o cualquier alarma anterior"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Notif. aplicaciones"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Configuración de notificaciones"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Envía comentarios del dispositivo"</string>
@@ -2458,7 +2479,11 @@
     <string name="switch_on_text" msgid="1124106706920572386">"Activar"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Desactivar"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"Fijar pantalla"</string>
-    <string name="screen_pinning_description" msgid="7091642350452605379">"Al activar esta función, la pantalla actual seguirá visible hasta que dejes de fijarla.\n\nSi quieres usar la función para fijar la pantalla, sigue estos pasos:\n\n1. Asegúrate de que la función esté activada.\n\n2. Abre la pantalla que quieras fijar.\n\n3. Toca Recientes.\n\n4. Toca el ícono para fijar."</string>
+    <string name="screen_pinning_description" msgid="1137904524037468263">"Cuando esta opción está activada, usa la fijación de pantalla para mantener la vista de la pantalla.\n\nPara usar la fijación de pantalla:\n\n1. Asegúrate de que la opción esté activada.\n\n2. Abre la pantalla que deseas fijar.\n\n3. Toca Recientes.\n\n4. Desliza el dedo hacia arriba y toca el ícono para fijar."</string>
+    <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Solicitar patrón de desbloqueo para quitar fijación"</string>
+    <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Solicitar PIN para quitar fijación"</string>
+    <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Solicitar contraseña para quitar fijación"</string>
+    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Bloquear dispositivo al quitar fijación"</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Perfil de trabajo"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Experimental)"</string>
     <string name="display_auto_rotate_title" msgid="6176450657107806043">"Al girar el dispositivo"</string>
@@ -2467,7 +2492,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Mantener vista horizontal"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Mantener orientación actual"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"Información de IMEI"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"Información relacionada con IMEI"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Encriptación"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Continuar"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"Puedes solicitar el PIN del dispositivo antes de iniciarlo para aumentar la protección. Hasta que el dispositivo no se inicie, no podrá recibir llamadas, mensajes ni notificaciones, incluidas las alarmas. \n\nEsta configuración ayuda a proteger los datos en dispositivos perdidos o robados."</string>
@@ -2485,4 +2509,7 @@
     <string name="encrypt_talkback_dialog_message_pin" msgid="1890374082842868489">"Cuando ingreses el PIN para iniciar el dispositivo, los servicios de accesibilidad, como <xliff:g id="SERVICE">%1$s</xliff:g>, aún no estarán disponibles."</string>
     <string name="encrypt_talkback_dialog_message_pattern" msgid="4474332516537386384">"Cuando ingreses el patrón para iniciar el dispositivo, los servicios de accesibilidad, como <xliff:g id="SERVICE">%1$s</xliff:g>, aún no estarán disponibles."</string>
     <string name="encrypt_talkback_dialog_message_password" msgid="8166099418487083927">"Cuando ingreses la contraseña para iniciar el dispositivo, los servicios de accesibilidad, como <xliff:g id="SERVICE">%1$s</xliff:g>, aún no estarán disponibles."</string>
+    <string name="imei_information_title" msgid="8499085421609752290">"Información de IMEI"</string>
+    <string name="imei_information_summary" msgid="2074095606556565233">"Información relacionada con IMEI"</string>
+    <string name="slot_number" msgid="3762676044904653577">"(Ranura <xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-es/arrays.xml b/res/values-es/arrays.xml
index 973254f..44d63c8 100644
--- a/res/values-es/arrays.xml
+++ b/res/values-es/arrays.xml
@@ -527,4 +527,12 @@
     <item msgid="4338089220026248848">"En caché (cliente de actividad)"</item>
     <item msgid="6652164677254579050">"En caché (vacío)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Turquesa"</item>
+    <item msgid="8332294763632946560">"Azul"</item>
+    <item msgid="2023216417616991392">"Índigo"</item>
+    <item msgid="3170497246594232819">"Violeta"</item>
+    <item msgid="4608643045752965568">"Rosa"</item>
+    <item msgid="6131821495505931173">"Rojo"</item>
+  </string-array>
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 7f42786..d098072 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>
@@ -180,9 +180,8 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s quiere acceder a tus mensajes. ¿Quieres permitir el acceso a %2$s?"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Fecha y hora"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Seleccionar zona horaria"</string>
-    <string name="normal_date_format" msgid="7636406984925498359">"Regional (<xliff:g id="DATE">%s</xliff:g>)"</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>
@@ -291,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>
@@ -322,8 +321,6 @@
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Seleccionar zona horaria"</string>
     <string name="date_time_set_date_title" msgid="6928286765325608604">"Fecha"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"Establecer fecha"</string>
-    <string name="date_time_date_format_title" msgid="3976171711988766411">"Formato de fecha"</string>
-    <string name="date_time_date_format" msgid="6951498879879281102">"Formato de fecha"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Ordenar alfabéticamente"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Ordenar por zona horaria"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Fecha"</string>
@@ -343,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>
@@ -372,7 +369,8 @@
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Espera mientras se cifra el teléfono. <xliff:g id="PERCENT">^1</xliff:g>% completado"</string>
     <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Espera mientras se cifra el tablet. Tiempo restante: <xliff:g id="DURATION">^1</xliff:g>"</string>
     <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Espera mientras se cifra el teléfono. Tiempo restante: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Espera <xliff:g id="DELAY">^1</xliff:g> segundos y vuelve a intentarlo."</string>
+    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"Para desbloquear el tablet, apágalo y vuelve a encenderlo."</string>
+    <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"Para desbloquear el teléfono, apágalo y vuelve a encenderlo."</string>
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"Advertencia: Se borrarán los datos del dispositivo después de otros <xliff:g id="COUNT">^1</xliff:g> intentos fallidos para desbloquearlo"</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Escribe tu contraseña"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Error en el cifrado"</string>
@@ -401,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>
@@ -412,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>
@@ -556,13 +556,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Como altavoz del teléfono"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Para música y contenido multimedia"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Ajustes de recordatorio"</string>
-    <string name="wifi_assistant_intro_setup" msgid="4605105515416995110">"Asistente\nWi‑Fi"</string>
-    <string name="wifi_assistant_no_thanks" msgid="2776983751990143934">"NO, GRACIAS"</string>
-    <string name="wifi_assistant_setup" msgid="3772423650475730906">"CONFIGURAR"</string>
-    <string name="wifi_assistant_card_message" msgid="107811647784658536">"Conectar automáticamente a redes disponibles con un Asistente de Wi‑Fi."</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Asistente de Wi‑Fi"</string>
-    <string name="wifi_assistant_title_message" msgid="6240721017579074015">"<xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> te conecta automáticamente a la mejor red Wi-Fi disponible"</string>
-    <string name="wifi_assistant_open_app" msgid="4803044899535675063">"ABRIR APLICACIÓN"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Conectado a través de asistente Wi‑Fi"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"Enviar pantalla"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Habilitar pantalla inalámbrica"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"No hay dispositivos cercanos."</string>
@@ -592,7 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Ajustes de Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Configurar y administrar puntos de acceso inalámbricos"</string>
-    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Selecciona una red Wi-Fi"</string>
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Seleccionar red Wi‑Fi"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Selecciona una red Wi-Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Activando Wi‑Fi…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Desactivando Wi‑Fi…"</string>
@@ -607,8 +602,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"Buscar redes siempre"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Permitir búsqueda siempre"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Permitir que el servicio de ubicación de Google y otras aplicaciones busquen redes aunque la conexión Wi-Fi esté desactivada"</string>
-    <string name="wifi_automatically_manage_title" msgid="6249976570008992746">"Administrar Wi‑Fi automáticamente"</string>
-    <string name="wifi_automatically_manage_summary" msgid="6952470763378312488">"Permitir que <xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> administre tu conexión Wi‑Fi"</string>
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Usar redes Wi‑Fi abiertas automáticamente"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Dejar que un asistente de Wi‑Fi se conecte automáticamente a redes abiertas consideradas de buena calidad"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Elige un asistente"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Instalar certificados"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Para mejorar la precisión de la ubicación y otros fines, Google y otras aplicaciones pueden buscar redes cercanas aunque la conexión Wi-Fi esté desactivada. Si no quieres que esto ocurra, accede a Ajustes avanzados &gt; Buscar redes siempre."</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Las aplicaciones pueden buscar redes cercanas aunque la conexión Wi-Fi esté desactivada. Si no quieres que esto ocurra, accede a Ajustes avanzados &gt; Buscar redes siempre."</string>
@@ -629,6 +625,7 @@
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Buscar"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Ajustes avanzados"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Conectar con red"</string>
+    <string name="wifi_menu_remember" msgid="8814185749388713796">"Recordar red"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Borrar red"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Modificar red"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Escribir en etiqueta NFC"</string>
@@ -673,9 +670,11 @@
     <string name="wifi_unspecified" msgid="5431501214192991253">"(no especificado)"</string>
     <string name="wifi_remembered" msgid="4955746899347821096">"Guardado"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"Inhabilitado"</string>
-    <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Mala conexión inhabilitada"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"Error de configuración de IP"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Error de conexión Wi-Fi"</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Error de autenticación"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Fuera de rango"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"No se ha detectado acceso a Internet, no se volverá a conectar automáticamente."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS disponible"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS disponible)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Introduce la contraseña de tu red"</string>
@@ -699,9 +698,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"ADVERTENCIA: Si omites la conexión Wi‑Fi, el tablet solo utilizará datos móviles para realizar descargas y actualizaciones iniciales. Conéctate al Wi‑Fi para evitar posibles cargos de datos."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"ADVERTENCIA: Si omites la conexión Wi‑Fi, el dispositivo solo utilizará datos móviles para realizar descargas y actualizaciones iniciales. Conéctate al Wi‑Fi para evitar posibles cargos de datos."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"ADVERTENCIA: Si omites la conexión Wi‑Fi, el teléfono solo utilizará datos móviles para realizar descargas y actualizaciones iniciales. Conéctate al Wi‑Fi para evitar posibles cargos de datos."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="2393880108322835846">"ADVERTENCIA: Si omites la conexión Wi‑Fi, el tablet no tendrá conexión a Internet para realizar descargas ni actualizaciones iniciales."</string>
-    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1707391993265558787">"ADVERTENCIA: Si omites la conexión Wi‑Fi, el dispositivo no tendrá conexión a Internet para realizar descargas o actualizaciones iniciales."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="1556858507920033022">"ADVERTENCIA: Si omites la conexión Wi‑Fi, el teléfono no tendrá conexión a Internet para realizar descargas ni actualizaciones iniciales."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Si te saltas el paso de la conexión Wi‑Fi:\n\nTu tablet no tendrá conexión a Internet.\n\nNo obtendrás actualizaciones de software hasta que te conectes a Internet.\n\nNo podrás activar las funciones de protección del dispositivo en este momento."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Si te saltas el paso de la conexión Wi‑Fi:\n\nTu dispositivo no tendrá conexión a Internet.\n\nNo obtendrás actualizaciones de software hasta que te conectes a Internet.\n\nNo podrás activar las funciones de protección del dispositivo en este momento."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Si te saltas el paso de la conexión Wi‑Fi:\n\nTu teléfono no tendrá conexión a Internet.\n\nNo obtendrás actualizaciones de software hasta que te conectes a Internet.\n\nNo podrás activar las funciones de protección del dispositivo en este momento."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"El tablet no se ha podido conectar a esta red Wi-Fi."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"El dispositivo no se ha podido conectar a esta red Wi‑Fi."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"El teléfono no se ha podido conectar a esta red Wi‑Fi."</string>
@@ -761,7 +760,6 @@
     <string name="ring_volume_title" msgid="7938706566797464165">"Volumen del timbre"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrar en modo silencio"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Sonido de notificación predeterminado"</string>
-    <string name="heads_up_enabled_title" msgid="1031078221910921622">"Aparecer con prioridad alta"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Tono"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Notificación"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Utilizar volumen de llamada entrante para notificaciones"</string>
@@ -834,9 +832,9 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Brillo automático"</string>
     <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="8300817661725517088">"Activa la pantalla si se coge el dispositivo o si llega una notificación"</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="doze_summary" msgid="7128970177894383698">"Activar pantalla al coger el dispositivo o recibir notificaciones"</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>
@@ -862,6 +860,10 @@
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Cancelar"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"Varias SIM encontradas"</string>
     <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>
@@ -1012,6 +1014,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Se borrarán todos los datos del "<b>"almacenamiento interno"</b>" del tablet, como:\n\n"<li>"Tu cuenta de Google"</li>\n<li>"Los ajustes y los datos de aplicaciones y del sistema"</li>\n<li>"Las aplicaciones descargadas"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Se borrarán todos los datos del "<b>"almacenamiento interno"</b>" del teléfono, como:\n\n"<li>"Tu cuenta de Google"</li>\n<li>"Los ajustes y los datos de aplicaciones y del sistema"</li>\n<li>"Las aplicaciones descargadas"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Has accedido a las cuentas que se indican a continuación:\n"</string>
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Hay otros usuarios presentes en este dispositivo.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Música"</li>\n<li>"Fotos"</li>\n<li>"Otros datos de usuario"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Para eliminar la música, las imágenes y otros datos de usuario, debes borrar el "<b>"almacenamiento USB"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Para eliminar la música, las imágenes y otros datos de usuario, deber borrar la "<b>"tarjeta SD"</b>"."</string>
@@ -1023,7 +1026,6 @@
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Restablecer teléfono"</string>
     <string name="master_clear_final_desc" msgid="7209547812233487345">"¿Quieres borrar toda tu información personal y las aplicaciones descargadas? Esta acción no se puede deshacer."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Borrar todo"</string>
-    <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Dibuja tu patrón de desbloqueo"</string>
     <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Debes dibujar un patrón de desbloqueo para confirmar que quieres restablecer los datos de fábrica."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"No se ha reiniciado el sistema porque el servicio Borrado del sistema no está disponible."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"¿Restablecer?"</string>
@@ -1041,7 +1043,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"¿Quieres borrar el almacenamiento USB y eliminar todos sus archivos? Esta acción no se puede deshacer."</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"¿Quieres borrar la tarjeta SD y eliminar todos sus archivos? Esta acción no se puede deshacer."</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Borrar todo"</string>
-    <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Dibuja tu patrón de desbloqueo"</string>
     <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Debes dibujar el patrón de desbloqueo para confirmar que quieres borrar el almacenamiento USB."</string>
     <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Debes dibujar el patrón de desbloqueo para confirmar que quieres borrar la tarjeta SD."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Ajustes de llamadas"</string>
@@ -1087,6 +1088,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Inserta la tarjeta SIM y reinicia el dispositivo"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Debes conectarte a Internet"</string>
     <string name="location_title" msgid="1029961368397484576">"Mi ubicación"</string>
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Perfil de trabajo"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Ubicación para el perfil de trabajo"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Desactivado por tu empresa"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Modo"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Alta precisión"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Ahorro de batería"</string>
@@ -1124,6 +1128,7 @@
     <string name="copyright_title" msgid="865906688917260647">"Derechos de autor"</string>
     <string name="license_title" msgid="1990487604356037871">"Licencia"</string>
     <string name="terms_title" msgid="7697580845616764642">"Términos y condiciones"</string>
+    <string name="webview_license_title" msgid="2813507464175738967">"Licencia de WebView del sistema"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Fondos de pantalla"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Proveedores de imágenes de satélite:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Licencias de código abierto"</string>
@@ -1237,7 +1242,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Almacenamiento USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"En tarjeta SD"</string>
     <string name="disabled" msgid="9206776641295849915">"Inhabilitada"</string>
-    <string name="not_installed" msgid="1475144352069281880">"No instalada"</string>
+    <string name="not_installed" msgid="2797554494953450291">"No instalada para este usuario"</string>
     <string name="no_applications" msgid="7336588977497084921">"No hay aplicaciones."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Almacenamiento interno"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Almacenamiento USB"</string>
@@ -1316,7 +1321,7 @@
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> procesos y <xliff:g id="NUMSERVICES">%2$d</xliff:g> servicio"</string>
     <string name="running_processes_item_description_p_p" msgid="1607384595790852782">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> procesos y <xliff:g id="NUMSERVICES">%2$d</xliff:g> servicios"</string>
     <string name="running_processes_header_title" msgid="6588371727640789560">"Memoria del dispositivo"</string>
-    <string name="running_processes_header_footer" msgid="723908176275428442">"Uso de RAM de la aplicación"</string>
+    <string name="running_processes_header_footer" msgid="723908176275428442">"RAM usada por las aplicaciones"</string>
     <string name="running_processes_header_system_prefix" msgid="6104153299581682047">"Sistema"</string>
     <string name="running_processes_header_apps_prefix" msgid="5787594452716832727">"Aplicaciones"</string>
     <string name="running_processes_header_free_prefix" msgid="4620613031737078415">"Libre"</string>
@@ -1434,8 +1439,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"La pantalla nunca entra en modo de suspensión si el dispositivo se está cargando"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Registro de búsqueda de HCI Bluetooth"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Capturar todos los paquetes de HCI de Bluetooth HCI en un archivo"</string>
-    <string name="oem_unlock_enable" msgid="6629321276287913315">"Habilitar desbloqueo OEM"</string>
-    <string name="oem_unlock_enable_summary" msgid="3546686263996628110">"Permitir que el dispositivo se desbloquee con OEM"</string>
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"Desbloqueo de OEM"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Permitir desbloquear el gestor de arranque"</string>
+    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Introduce tu PIN"</string>
+    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Introduce el PIN del dispositivo para habilitar el desbloqueo de OEM"</string>
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"¿Permitir desbloqueo de OEM?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"ADVERTENCIA: Las funciones de protección no funcionarán en este dispositivo mientras esta opción esté activada."</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Certificación de pantalla inalámbrica"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Habilitar registro Wi-Fi detallado"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Transferencia total de Wi‑Fi a móvil"</string>
@@ -1538,6 +1547,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"Así aparecerán los subtítulos"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"Predeterminado"</string>
+    <string name="color_title" msgid="4258931051732243983">"Color"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"Predeterminado"</string>
     <string name="color_none" msgid="3475640044925814795">"Ninguno"</string>
     <string name="color_white" msgid="8045195170201590239">"Blanco"</string>
@@ -1595,12 +1605,12 @@
     <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">"Quedan <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> para completar la carga"</string>
-    <string name="power_discharging_duration" msgid="7125493014448497620">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - Quedan <xliff:g id="TIME">%2$s</xliff:g> aproximadamente"</string>
-    <string name="power_charging" msgid="712751285832976915">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="STATE">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration" msgid="4802183864773082009">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> para completar"</string>
-    <string name="power_charging_duration_ac" msgid="3611179931297824699">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> para completar con CA"</string>
-    <string name="power_charging_duration_usb" msgid="1106605348913397583">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> para completar con USB"</string>
-    <string name="power_charging_duration_wireless" msgid="633606920144617227">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> para completar con Wi-Fi"</string>
+    <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> - Quedan <xliff:g id="TIME">%2$s</xliff:g> aproximadamente"</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> para completar la batería"</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> para completar la batería con CA"</string>
+    <string name="power_charging_duration_usb" msgid="182405645340976546">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> para completar la batería por USB"</string>
+    <string name="power_charging_duration_wireless" msgid="1829295708243159464">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> para completar la batería con Wi-Fi"</string>
     <string name="power_usage_list_summary" msgid="2409288197839512482">"Uso desde la última carga completa"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Uso de la batería desde que se cargó"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Uso de la batería desde que se restableció"</string>
@@ -1617,7 +1627,6 @@
     <string name="awake" msgid="387122265874485088">"Tiempo de actividad del dispositivo"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Tiempo de conexión Wi-Fi"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Tiempo de conexión Wi-Fi"</string>
-    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Detalles de historial"</string>
     <string name="details_title" msgid="3792801565213935385">"Detalles de uso"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Detalles de uso"</string>
@@ -1689,7 +1698,7 @@
     <string name="battery_saver" msgid="1426682272004907982">"Ahorro de batería"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Activar automáticamente"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Nunca"</string>
-    <string name="battery_saver_turn_on_automatically_pct" msgid="3033681629861428940">"con %1$d%% de batería"</string>
+    <string name="battery_saver_turn_on_automatically_pct" msgid="7536784431655058267">"con un %1$s de batería"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Estadísticas de procesos"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Estadísticas técnicas sobre procesos en ejecución"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Uso de memoria"</string>
@@ -1698,8 +1707,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>
@@ -1813,7 +1822,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Almacenado en hardware"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Solo software"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"Las credenciales no están disponibles para este usuario"</string>
-    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Dibuja tu patrón de desbloqueo."</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Debes dibujar tu patrón de desbloqueo para confirmar la instalación de las credenciales."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Escribe la contraseña del almacenamiento de credenciales."</string>
@@ -1843,6 +1851,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"Incluir datos de aplicaciones"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Restauración automática"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Cuando vuelvas a instalar una aplicación, restaurar la configuración y los datos incluidos en la copia"</string>
+    <string name="backup_inactive_title" msgid="5355557151569037197">"El servicio de copia de seguridad está inactivo."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"Establecido por la política de tu dispositivo."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Contraseña para copias de ordenador"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Las copias de seguridad completas de ordenador no están protegidas"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Tocar para cambiar o eliminar la contraseña para las copias de seguridad completas de ordenador"</string>
@@ -1952,7 +1962,11 @@
     <string name="enter_password" msgid="8035706727471334122">"Para iniciar tu dispositivo Android, introduce tu contraseña"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Para iniciar tu dispositivo Android, introduce el PIN"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Para iniciar tu dispositivo Android, dibuja tu patrón"</string>
-    <string name="try_again" msgid="4272075051293936921">"Inténtalo de nuevo."</string>
+    <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"Patrón incorrecto"</string>
+    <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"Contraseña incorrecta"</string>
+    <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"PIN incorrecto"</string>
+    <string name="checking_decryption" msgid="8287458611802609493">"Comprobando..."</string>
+    <string name="starting_android" msgid="8581493237458496835">"Iniciando Android"</string>
     <string name="delete" msgid="4219243412325163003">"Eliminar"</string>
     <string name="misc_files" msgid="6720680815969643497">"Archivos variados"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"Has seleccionado <xliff:g id="NUMBER">%1$d</xliff:g> de <xliff:g id="TOTAL">%2$d</xliff:g>."</string>
@@ -1990,8 +2004,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Usar siempre GPU para combinar pantallas"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"Simular espacio de color"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Habilitar seguimiento OpenGL"</string>
-    <string name="use_nuplayer" msgid="5699257393367904387">"Usar NuPlayer (beta)"</string>
-    <string name="use_nuplayer_summary" msgid="1991479067478516714">"Usar NuPlayer en lugar de AwesomePlayer"</string>
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"Usar AwesomePlayer (obsoleto)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"Reproducir con AwesomePlayer en vez de NuPlayer"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"Inhabil enrutam audio USB"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"Inhabil enrutamiento autom a periféricos audio USB"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Mostrar límites de diseño"</string>
@@ -2019,7 +2033,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>
@@ -2167,7 +2181,6 @@
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Añadir usuario o perfil"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Añadir usuario"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Perfil limitado"</string>
-    <string name="user_summary_managed_profile" msgid="7369539529693048111">"Perfil de trabajo"</string>
     <string name="user_need_lock_message" msgid="2596365678651842785">"Para poder crear un perfil restringido, debes configurar una pantalla de bloqueo que proteja tus aplicaciones y datos personales."</string>
     <string name="user_set_lock_button" msgid="8311219392856626841">"Establecer bloqueo"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Sin configurar"</string>
@@ -2181,7 +2194,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>
@@ -2228,7 +2241,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>
@@ -2298,11 +2311,13 @@
     <string name="sim_cellular_data_unavailable_summary" msgid="3654805961942166428">"Toca para seleccionar una SIM de datos"</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"Usar siempre esta para llamadas"</string>
     <string name="select_sim_for_data" msgid="2366081042162853044">"Seleccionar una SIM de datos"</string>
+    <string name="data_switch_started" msgid="2040761479817166311">"Cambiando SIM de datos. Este proceso puede tardar hasta un minuto..."</string>
     <string name="select_sim_for_calls" msgid="3503094771801109334">"Llamar con"</string>
     <string name="sim_select_card" msgid="211285163525563293">"Seleccionar una tarjeta SIM"</string>
     <string name="sim_card_number_title" msgid="7845379943474336488">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"SIM vacía"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"Nombre de la SIM"</string>
+    <string name="sim_name_hint" msgid="7038643345238968930">"Introduce el nombre de SIM"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"Ranura de SIM %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Operador"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Número"</string>
@@ -2312,7 +2327,6 @@
     <string name="color_purple" msgid="3888532466427762504">"Violeta"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"No se ha insertado ninguna tarjeta SIM"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"Estado de SIM"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"Información relacionada con la tarjeta SIM"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"Volver a llamar desde SIM predeterminada"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"SIM para hacer llamadas"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Otras opciones de llamada"</string>
@@ -2320,8 +2334,11 @@
     <string name="preferred_network_offload_header" msgid="2321173571529106767">"Inhab. emisión nombre red"</string>
     <string name="preferred_network_offload_footer" msgid="5857279426054744020">"Si no emites el nombre de la red, los usuarios externos no podrá acceder a la información de tu red."</string>
     <string name="preferred_network_offload_popup" msgid="2252915199889604600">"Si no emites el nombre de la red, las conexiones automáticas no podrán ocultar las redes."</string>
+    <string name="sim_signal_strength" msgid="9144010043784767984">"<xliff:g id="DBM">%1$d</xliff:g> dBm <xliff:g id="ASU">%2$d</xliff:g> asu"</string>
+    <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>
+    <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Preguntar siempre"</string>
     <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>
@@ -2330,22 +2347,22 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Búsquedas recientes"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Resultados"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi, wi-fi, red, conexión"</string>
-    <string name="keywords_more_default_sms_app" msgid="2744404159003574745">"mensaje de texto"</string>
-    <string name="keywords_more_mobile_networks" msgid="7813380887358745769">"móvil, operador móvil, conexión inalámbrica"</string>
+    <string name="keywords_more_default_sms_app" msgid="895656981962034647">"mensaje texto, mensajes texto, mensajes"</string>
+    <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"celular, móvil, conexión inalámbrica, datos, 4g, 3g, 2g, lte"</string>
     <string name="keywords_home" msgid="3626170808219458848">"launcher"</string>
     <string name="keywords_display" msgid="6709007669501628320">"pantalla táctil"</string>
-    <string name="keywords_display_brightness_level" msgid="8636451602230815191">"atenuar pantalla táctil"</string>
-    <string name="keywords_display_auto_brightness" msgid="8070218600502753102">"atenuar pantalla táctil"</string>
-    <string name="keywords_display_wallpaper" msgid="4315466287469834939">"fondo"</string>
+    <string name="keywords_display_brightness_level" msgid="8923289340474728990">"atenuar, patalla, pantalla táctil, batería"</string>
+    <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"atenuar, patalla, pantalla táctil, batería"</string>
+    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"segundo plano, personalizar, customizar, pantalla"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"tamaño del texto"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"proyecto"</string>
-    <string name="keywords_storage" msgid="7007275853993419928">"espacio, disco, disco duro"</string>
-    <string name="keywords_battery" msgid="3992479295298655138">"potencia"</string>
-    <string name="keywords_spell_checker" msgid="4509482591225399210">"ortografía"</string>
+    <string name="keywords_storage" msgid="6572905220031852173">"espacio, disco, disco duro, dispositivo, uso"</string>
+    <string name="keywords_battery" msgid="2096185085932675704">"carga, consumo, energía"</string>
+    <string name="keywords_spell_checker" msgid="6106749039734174140">"ortografía, diccionarios, corrector ortográfico, corrección automática"</string>
     <string name="keywords_voice_input" msgid="3519547605812413860">"herramienta de reconocimiento, entrada, voz, hablar, idioma, manos libres, reconocimiento, palabra ofensiva, historial de audio, auriculares bluetooth"</string>
-    <string name="keywords_text_to_speech_output" msgid="8207889472282225512">"valorar, idioma, predeterminado. hablar"</string>
-    <string name="keywords_date_and_time" msgid="7666950126499155141">"reloj"</string>
-    <string name="keywords_factory_data_reset" msgid="3693730656843989732">"eliminar"</string>
+    <string name="keywords_text_to_speech_output" msgid="392447904221657930">"valorar, idioma, habla predeterminada, hablar, síntesis de voz, accesibilidad, lector, deficiencias visuales"</string>
+    <string name="keywords_date_and_time" msgid="2631808108134830066">"reloj, militar"</string>
+    <string name="keywords_factory_data_reset" msgid="4355133848707691977">"borrar, eliminar, restaurar, limpiar, quitar"</string>
     <string name="keywords_printing" msgid="1701778563617114846">"impresora"</string>
     <string name="keywords_sounds_and_notifications" msgid="5965996187974887000">"sonido del altavoz"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="2912933812460077912">"no molestar, interrumpir, interrupción, descanso"</string>
@@ -2354,7 +2371,7 @@
     <string name="keywords_location_mode" msgid="8584992704568356084">"precisión"</string>
     <string name="keywords_accounts" msgid="1957925565953357627">"cuenta"</string>
     <string name="keywords_users" msgid="4673901601478559100">"restricción, restringir, restringido"</string>
-    <string name="keywords_keyboard_and_ime" msgid="1103378692379215672">"texto, corrección, corregir, sonido, vibrar, automático, idioma, gesto, sugerir, sugerencia, tema, palabra ofensiva, escribir, emoji"</string>
+    <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"corrección texto, corregir, sonido, vibración automática, idioma, gesto, sugerencia, tema, palabra ofensiva, escribir, emoji, internacional"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"deslizar, contraseña, patrón, pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Configurar etiqueta NFC Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Editar"</string>
@@ -2371,7 +2388,6 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Volumen de notificaciones"</string>
     <string name="zen_mode_settings_title" msgid="7014915558669122902">"Interrupciones"</string>
     <string name="zen_mode_option_title" msgid="5061978632306007914">"Al recibir llamadas o notificaciones"</string>
-    <string name="zen_mode_option_title_novoice" msgid="6680706009915204785">"Al recibir notificaciones"</string>
     <string name="zen_mode_option_off" msgid="3167702608910820883">"Interrumpir siempre"</string>
     <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Permitir solo interrupciones de prioridad"</string>
     <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"No interrumpir"</string>
@@ -2429,14 +2445,17 @@
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Listo"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Hasta apagar el dispositivo"</string>
     <string name="zen_mode_important_category" msgid="8123274463331022993">"Interrupciones de prioridad"</string>
-    <string name="zen_mode_downtime_category" msgid="4730179065426038108">"Tiempo inactivo (solo interrupciones de prioridad)"</string>
+    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Tiempo de inactividad"</string>
     <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Días"</string>
     <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Ninguno"</string>
+    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Interrupciones permitidas"</string>
+    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Solo prioridad"</string>
+    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Ninguno"</string>
     <string name="zen_mode_automation_category" msgid="4653551005950835761">"Automático"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Activar automáticamente"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Nunca"</string>
-    <string name="zen_mode_phone_calls" msgid="8956214416859303966">"Llamadas"</string>
+    <string name="zen_mode_calls" msgid="7051492091133751208">"Llamadas"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Mensajes"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Llamadas y mensajes de"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Todo el mundo"</string>
@@ -2450,7 +2469,9 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Noches entre semana"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Hora de inicio"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Hora de finalización"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"Día siguiente a las <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
+    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"Día siguiente a las <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> o cualquier alarma antes de"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"Día siguiente a las <xliff:g id="FORMATTED_TIME">%s</xliff:g> o cualquier alarma antes de"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Notif. aplicaciones"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Ajustes de notificaciones"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Dar tu opinión sobre el dispositivo"</string>
@@ -2458,7 +2479,11 @@
     <string name="switch_on_text" msgid="1124106706920572386">"Sí"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"No"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"Fijar pantalla"</string>
-    <string name="screen_pinning_description" msgid="7091642350452605379">"Si activas la opción, puedes usar la activación de pantalla para mantener visible la pantalla actual hasta que desactives la pantalla.\n\nPara ello:\n\n1. Asegúrate de seleccionar la activación de pantalla.\n\n2. Abre la pantalla que quieras activar.\n\n3. Toca Visión general.\n\n4. Toca el icono de activación."</string>
+    <string name="screen_pinning_description" msgid="1137904524037468263">"Si esta opción está activada, puedes usar la opción para fijar la pantalla para mantener visible la pantalla actual hasta que desactives la pantalla.\n\nPara ello:\n\n1. Asegúrate de que la opción para fijar la pantalla esté activada.\n\n2. Abre la pantalla que quieras fijar.\n\n3. Toca Información general.\n\n4. Desliza el dedo hacia arriba y toca el icono para fijar la pantalla."</string>
+    <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Solicitar patrón de desbloqueo para desactivar"</string>
+    <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Solicitar PIN para desactivar"</string>
+    <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Solicitar contraseña para desactivar"</string>
+    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Bloquear dispositivo al desactivar"</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Perfil de trabajo"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Experimental)"</string>
     <string name="display_auto_rotate_title" msgid="6176450657107806043">"Al girar el dispositivo"</string>
@@ -2467,7 +2492,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Mantener vista horizontal"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Mantener orientación actual"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"Información del IMEI"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"Información relacionada con el IMEI"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Cifrado"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Continuar"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"Puedes solicitar el PIN del dispositivo antes de iniciarlo para aumentar la protección. Hasta que el dispositivo no se inicie, no podrá recibir llamadas, mensajes ni notificaciones, como alarmas. \n\nEsta opción ayuda a proteger los datos en dispositivos perdidos o robados."</string>
@@ -2485,4 +2509,7 @@
     <string name="encrypt_talkback_dialog_message_pin" msgid="1890374082842868489">"Cuando introduzcas tu PIN para iniciar este dispositivo, los servicios de accesibilidad como <xliff:g id="SERVICE">%1$s</xliff:g> aún no estarán disponibles."</string>
     <string name="encrypt_talkback_dialog_message_pattern" msgid="4474332516537386384">"Cuando introduzcas tu patrón para iniciar este dispositivo, los servicios de accesibilidad como <xliff:g id="SERVICE">%1$s</xliff:g> aún no estarán disponibles."</string>
     <string name="encrypt_talkback_dialog_message_password" msgid="8166099418487083927">"Cuando introduzcas tu contraseña para iniciar este dispositivo, los servicios de accesibilidad como <xliff:g id="SERVICE">%1$s</xliff:g> aún no estarán disponibles."</string>
+    <string name="imei_information_title" msgid="8499085421609752290">"Información del IMEI"</string>
+    <string name="imei_information_summary" msgid="2074095606556565233">"Información relacionada con el IMEI"</string>
+    <string name="slot_number" msgid="3762676044904653577">"(N.º <xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-et-rEE/arrays.xml b/res/values-et-rEE/arrays.xml
index 8ea34c4..b9adad2 100644
--- a/res/values-et-rEE/arrays.xml
+++ b/res/values-et-rEE/arrays.xml
@@ -527,4 +527,12 @@
     <item msgid="4338089220026248848">"Vahemälus (tegevuse klient)"</item>
     <item msgid="6652164677254579050">"Vahemälus (tühi)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Sinakasroheline"</item>
+    <item msgid="8332294763632946560">"Sinine"</item>
+    <item msgid="2023216417616991392">"Indigosinine"</item>
+    <item msgid="3170497246594232819">"Lilla"</item>
+    <item msgid="4608643045752965568">"Roosa"</item>
+    <item msgid="6131821495505931173">"Punane"</item>
+  </string-array>
 </resources>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index 0ff5e81..721364b 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>
@@ -180,7 +180,6 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s soovib saada juurdepääsu sõnumitele. Kas anda seadmele %2$s juurdepääs?"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Kuupäev ja kellaaeg"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Ajavööndi valimine"</string>
-    <string name="normal_date_format" msgid="7636406984925498359">"Piirkondlik (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Eelvaade:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Kirja suurus:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -291,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>
@@ -322,8 +321,6 @@
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Valige ajavöönd"</string>
     <string name="date_time_set_date_title" msgid="6928286765325608604">"Kuupäev"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"Kuupäeva määramine"</string>
-    <string name="date_time_date_format_title" msgid="3976171711988766411">"Kuupäeva vorming"</string>
-    <string name="date_time_date_format" msgid="6951498879879281102">"Valige kuupäevavorming"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Sordi tähestiku järgi"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Sordi ajavööndi alusel"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Kuupäev"</string>
@@ -372,7 +369,8 @@
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Oodake, kuni teie telefon krüpteeritakse. <xliff:g id="PERCENT">^1</xliff:g>% valmis."</string>
     <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Oodake, kuni teie tahvelarvuti krüpteeritakse. Aega on jäänud: <xliff:g id="DURATION">^1</xliff:g>"</string>
     <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Oodake, kuni teie telefon krüpteeritakse. Aega on jäänud: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Proovige uuesti <xliff:g id="DELAY">^1</xliff:g> sekundi pärast."</string>
+    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"Tahvelarvuti avamiseks lülitage see välja ja uuesti sisse."</string>
+    <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"Telefoni avamiseks lülitage see välja ja uuesti sisse."</string>
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"Hoiatus! Kui veel <xliff:g id="COUNT">^1</xliff:g> avamiskatset ebaõnnestub, siis seade tühjendatakse."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Sisestage parool"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Krüptimine ebaõnnestus"</string>
@@ -401,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>
@@ -412,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>
@@ -556,13 +556,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Kõlartelefonina"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Muusika ja meediumi jaoks"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Jäta seaded meelde"</string>
-    <string name="wifi_assistant_intro_setup" msgid="4605105515416995110">"Tutvustame\nWiFi Assistanti"</string>
-    <string name="wifi_assistant_no_thanks" msgid="2776983751990143934">"TÄNAN, EI"</string>
-    <string name="wifi_assistant_setup" msgid="3772423650475730906">"SEADISTAMINE"</string>
-    <string name="wifi_assistant_card_message" msgid="107811647784658536">"Automaatne ühendamine saadaolevate võrkudega, kasutades WiFi Assistanti."</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"WiFi Assistant"</string>
-    <string name="wifi_assistant_title_message" msgid="6240721017579074015">"<xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> ühendab teid automaatselt parima saadaoleva WiFi-võrguga"</string>
-    <string name="wifi_assistant_open_app" msgid="4803044899535675063">"AVA RAKENDUS"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Ühendatud WiFi-abi kaudu"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"Cast-ekraan"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Luba juhtmeta ekraaniühendus"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Läheduses seadmeid ei leitud."</string>
@@ -592,7 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"WiFi-seaded"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"WiFi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Määra ja halda traadita pääsupunkte"</string>
-    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"WiFi valimine"</string>
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"WiFi-võrgu valimine"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"WiFi valimine"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"WiFi sisselülitamine ..."</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"WiFi väljalülitamine ..."</string>
@@ -607,8 +602,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"Skannimine on alati saadaval"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Luba alati skannimine"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Lubab Google\'i asukohateenusel ja muudel rakendustel võrke skannida ka juhul, kui WiFi on välja lülitatud"</string>
-    <string name="wifi_automatically_manage_title" msgid="6249976570008992746">"WiFi automaatne haldamine"</string>
-    <string name="wifi_automatically_manage_summary" msgid="6952470763378312488">"Lubage <xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> halduril WiFi-ühendust hallata"</string>
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Kasuta avatud WiFi-t automaatselt"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Lase WiFi-abil automaatselt ühenduda kvaliteetsetesse avatud võrkudesse"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Abi valimine"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Sertifikaatide installimine"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Asukoha täpsuse parandamiseks ning muudel eesmärkidel võivad Google ja teised rakendused otsida läheduses olevaid võrke ka siis, kui WiFi on väljas. Kui te seda ei soovi, tehke valikud Täpsem &gt; Otsimine alati saadaval."</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Rakendused võivad otsida läheduses olevaid võrke ka siis, kui WiFi on väljas. Kui te seda ei soovi, tehke valikud Täpsem &gt; Otsimine alati saadaval."</string>
@@ -629,6 +625,7 @@
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Skannimine"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Täpsemalt"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Loo võrguühendus"</string>
+    <string name="wifi_menu_remember" msgid="8814185749388713796">"Jäta võrk meelde"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Unusta võrk"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Võrgu muutmine"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"NFC-kiibile kirjutamine"</string>
@@ -673,9 +670,11 @@
     <string name="wifi_unspecified" msgid="5431501214192991253">"(määramata)"</string>
     <string name="wifi_remembered" msgid="4955746899347821096">"Salvestatud"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"Keelatud"</string>
-    <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Halba Interneti-ühendust välditi"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP seadistamise ebaõnnestumine"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"WiFi-ühenduse viga"</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Autentimise probleem"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Pole vahemikus"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Interneti-ühendust ei tuvastatud, seadet ei ühendata automaatselt."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS on saadaval"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" WPS on saadaval"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Sisestage võrgu parool"</string>
@@ -699,9 +698,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"HOIATUS. Kui jätate WiFi vahele, siis kasutab tahvelarvuti esmasteks allalaadimisteks ja värskendamiseks ainult mobiilset andmesidet. Võimalike andmeside tasude vältimiseks ühendage tahvelarvuti WiFi-võrku."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"HOIATUS. Kui jätate WiFi vahele, siis kasutab seade esmasteks allalaadimisteks ja värskendamiseks ainult mobiilset andmesidet. Võimalike andmeside tasude vältimiseks ühendage seade WiFi-võrku."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"HOIATUS. Kui jätate WiFi vahele, siis kasutab telefon esmasteks allalaadimisteks ja värskendamiseks ainult mobiilset andmesidet. Võimalike andmeside tasude vältimiseks ühendage telefon WiFi-võrku."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="2393880108322835846">"HOIATUS! Kui jätate WiFi vahele, ei ole tahvelarvutil Interneti-ühendust, mida kasutada algseteks allalaadimisteks või värskendamisteks."</string>
-    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1707391993265558787">"HOIATUS! Kui jätate WiFi vahele, ei ole seadmel Interneti-ühendust, mida kasutada algseteks allalaadimisteks või värskendamisteks."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="1556858507920033022">"HOIATUS! Kui jätate WiFi vahele, ei ole telefonil Interneti-ühendust, mida kasutada algseteks allalaadimisteks või värskendamisteks."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Kui te ei loo WiFi-ühendust:\n\ntahvelarvutil ei ole Interneti-ühendust;\n\nte ei saa tarkvaravärskendusi enne, kui olete loonud Interneti-ühenduse;\n\nte ei saa sel ajal seadme kaitsefunktsioone aktiveerida."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Kui te ei loo WiFi-ühendust:\n\nseadmel ei ole Interneti-ühendust;\n\nte ei saa tarkvaravärskendusi enne, kui olete loonud Interneti-ühenduse;\n\nte ei saa sel ajal seadme kaitsefunktsioone aktiveerida."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Kui te ei loo WiFi-ühendust:\n\ntelefonil ei ole Interneti-ühendust;\n\nte ei saa tarkvaravärskendusi enne, kui olete loonud Interneti-ühenduse;\n\nte ei saa sel ajal seadme kaitsefunktsioone aktiveerida."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Tahvelarvutil ei õnnestunud luua ühendust selle WiFi-võrguga."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"Seadmel ei õnnestunud WiFi-võrguga ühendust luua."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Telefonil ei õnnestunud luua ühendust selle WiFi-võrguga."</string>
@@ -761,7 +760,6 @@
     <string name="ring_volume_title" msgid="7938706566797464165">"Helina helitugevus"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibreeri hääletus režiimis"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Märguande vaikeheli"</string>
-    <string name="heads_up_enabled_title" msgid="1031078221910921622">"Kõrge priorit. kuvatakse hüpik"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Helin"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Teatis"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Kasuta teatiste jaoks sissetuleva kõne helitugevust"</string>
@@ -834,7 +832,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Automaatne eredus"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Tõstke äratamiseks"</string>
     <string name="doze_title" msgid="2259176504273878294">"Ambientne ekraan"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"Ekraani aktiveerimine, kui seade võetakse kätte või saabub märguanne"</string>
+    <string name="doze_summary" msgid="7128970177894383698">"Ekraan aktiveerub, kui võtate seadme kätte või saate märguandeid"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Fondi suurus"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Fondi suurus"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM-kaardi luku seaded"</string>
@@ -862,6 +860,10 @@
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Tühista"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"Leiti mitu SIM-kaarti"</string>
     <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>
+    <string name="sim_preferred_title" msgid="5567909634636045268">"Kas värskendada SIM-kaarti?"</string>
+    <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> on seadme ainus SIM-kaart. Kas soovite kasutada seda SIM-kaarti mobiilse andmeside, kõnede ja SMS-sõnumite jaoks?"</string>
     <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>
@@ -1012,6 +1014,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"See kustutab kõik andmed teie tahvelarvuti "<b>"sisemälust"</b>", sh:\n\n"<li>"teie Google\'i konto"</li>\n<li>"süsteemi ja rakenduste andmed ning seaded"</li>\n<li>"Allalaaditud rakendused"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"See kustutab kõik andmed telefoni "<b>"sisemälust"</b>", sh:\n\n"<li>"teie Google\'i konto"</li>\n<li>"süsteemi ja rakenduse andmed ning seaded"</li>\n<li>"Allalaaditud rakendused"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Olete praegu sisse logitud järgmistele kontodele:\n"</string>
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Seadmes on teisi kasutajaid.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Muusika"</li>\n<li>"Fotod"</li>\n<li>"Muud kasutajaandmed"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Muusika, piltide ja muu kasutajateabe kustutamiseks tuleb tühjendada ka "<b>"USB-mäluseade"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Muusika, piltide ja muude kasutajaandmete kustutamiseks tuleb tühjendada ka "<b>"SD-kaart"</b>"."</string>
@@ -1023,7 +1026,6 @@
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Lähtesta telefon"</string>
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Kas kustutada kogu teie isiklik teave ja allalaaditud rakendused? Seda toimingut ei saa tagasi võtta."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Kustuta kõik"</string>
-    <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Joonistage oma avamismuster"</string>
     <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Tehaseandmetele lähtestamise kinnitamiseks peate joonistama avamismustri."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Lähtestust ei tehtud, sest süsteemi kustutamise teenus pole saadaval."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Kas lähtestada?"</string>
@@ -1041,7 +1043,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"Kas tühjendada USB-mäluseade, kustutades kõik salvestatud failid? Toimingut ei saa tagasi võtta."</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Kas soovite SD-kaardi tühjendada, kustutades kõik sinna salvestatud failid? Toimingut ei saa tagasi võtta."</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Kustuta kõik"</string>
-    <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Joonistage oma avamismuster"</string>
     <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"USB-salvestusruumi kustutamise kinnitamiseks peate joonistama avamismustri."</string>
     <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"SD-kaardi kustutamise kinnitamiseks peate joonistama avamismustri."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Kõneseaded"</string>
@@ -1087,6 +1088,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Sisestage SIM-kaart ja taaskäivitage"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Looge Interneti-ühendus"</string>
     <string name="location_title" msgid="1029961368397484576">"Minu asukoht"</string>
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Tööprofiil"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Tööprofiili asukoht"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Ettevõte on välja lülitanud"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Režiim"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Väga täpne"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Aku säästmine"</string>
@@ -1124,6 +1128,7 @@
     <string name="copyright_title" msgid="865906688917260647">"Autoriõigus"</string>
     <string name="license_title" msgid="1990487604356037871">"Litsents"</string>
     <string name="terms_title" msgid="7697580845616764642">"Nõuded ja tingimused"</string>
+    <string name="webview_license_title" msgid="2813507464175738967">"Süsteemi WebView\' litsents"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Taustapildid"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Satelliitpiltide pakkujad:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Avatud lähtekoodiga litsentsid"</string>
@@ -1237,7 +1242,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB-mäluseade"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"SD-kaardil"</string>
     <string name="disabled" msgid="9206776641295849915">"Keelatud"</string>
-    <string name="not_installed" msgid="1475144352069281880">"Installimata"</string>
+    <string name="not_installed" msgid="2797554494953450291">"Pole selle kasutaja jaoks installitud"</string>
     <string name="no_applications" msgid="7336588977497084921">"Rakendusi pole."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Sisemälu"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB-mäluseade"</string>
@@ -1434,8 +1439,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Ekraan ei lähe kunagi laadimise ajal unerežiimi"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Luba Bluetoothi HCI jälgimise logi"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Hõiva kõik faili Bluetoothi HCI paketid"</string>
-    <string name="oem_unlock_enable" msgid="6629321276287913315">"Luba OEM-i avamine"</string>
-    <string name="oem_unlock_enable_summary" msgid="3546686263996628110">"Luba seadmel kasutada OEM-i avamist"</string>
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM-i avamine"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Luba buudilaadur avada"</string>
+    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Sisestage PIN-kood"</string>
+    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"OEM-i avamise lubamiseks sisestage seadme PIN-kood"</string>
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Kas lubada OEM-i avamine?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"HOIATUS! Kui see seade on sisse lülitatud, ei toimi seadme turvafunktsioonid."</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Juhtmeta ekraaniühenduse sertifitseerimine"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Luba WiFi paljusõnaline logimine"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Agressiivne WiFi-lt mobiilile üleminek"</string>
@@ -1538,6 +1547,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"Tiitrid näevad välja sellised"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"Vaikimisi"</string>
+    <string name="color_title" msgid="4258931051732243983">"Värv"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"Vaikevärv"</string>
     <string name="color_none" msgid="3475640044925814795">"Puudub"</string>
     <string name="color_white" msgid="8045195170201590239">"Valge"</string>
@@ -1595,12 +1605,12 @@
     <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">"Jäänud on <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> laadimise lõpuni"</string>
-    <string name="power_discharging_duration" msgid="7125493014448497620">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – umbes <xliff:g id="TIME">%2$s</xliff:g> jäänud"</string>
-    <string name="power_charging" msgid="712751285832976915">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – <xliff:g id="STATE">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration" msgid="4802183864773082009">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – <xliff:g id="TIME">%2$s</xliff:g> täitumiseni"</string>
-    <string name="power_charging_duration_ac" msgid="3611179931297824699">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – <xliff:g id="TIME">%2$s</xliff:g> täitumiseni (vahelduvvool)"</string>
-    <string name="power_charging_duration_usb" msgid="1106605348913397583">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – <xliff:g id="TIME">%2$s</xliff:g> täitumiseni (USB)"</string>
-    <string name="power_charging_duration_wireless" msgid="633606920144617227">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – <xliff:g id="TIME">%2$s</xliff:g> täitumiseni (juhtmeta)"</string>
+    <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> – jäänud on umbes <xliff:g id="TIME">%2$s</xliff:g>"</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>, kuni aku on täis"</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>, kuni aku on täis (vahelduvvool)"</string>
+    <string name="power_charging_duration_usb" msgid="182405645340976546">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g>, kuni aku on täis (USB)"</string>
+    <string name="power_charging_duration_wireless" msgid="1829295708243159464">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g>, kuni aku on täis (juhtmeta laad.)"</string>
     <string name="power_usage_list_summary" msgid="2409288197839512482">"Kasutus alates viimasest täislaadimisest"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Akukasutus alates lahutamisest"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Akukasutus alates lähtestamisest"</string>
@@ -1617,7 +1627,6 @@
     <string name="awake" msgid="387122265874485088">"Seadme ärkveloleku aeg"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"WiFi õigel ajal"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"WiFi õigel ajal"</string>
-    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> – <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Ajaloo üksikasjad"</string>
     <string name="details_title" msgid="3792801565213935385">"Üksikasjade kasutamine"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Kasuta detaile"</string>
@@ -1689,7 +1698,7 @@
     <string name="battery_saver" msgid="1426682272004907982">"Akusäästja"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Automaatne sisselülitamine"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Mitte kunagi"</string>
-    <string name="battery_saver_turn_on_automatically_pct" msgid="3033681629861428940">"%1$d%% akutoidet"</string>
+    <string name="battery_saver_turn_on_automatically_pct" msgid="7536784431655058267">"%1$s akutaseme juures"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Protsessi statistika"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Tehnilised üksikasjad protsesside käitamise kohta"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Mälu kasutamine"</string>
@@ -1813,7 +1822,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Riistvaratoega"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Ainult tarkvara"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"Mandaadid pole selle kasutaja jaoks saadaval"</string>
-    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Joonistage oma luku avamise muster"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Mandaadi installimise kinnitamiseks tuleb teil joonistada luku avamise muster."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Sisestage mandaadi salvestamise parool."</string>
@@ -1843,6 +1851,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"Kaasa rakenduse andmed"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Automaatne taastamine"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Rakenduse uuesti installimisel taasta varundatud seaded ja andmed"</string>
+    <string name="backup_inactive_title" msgid="5355557151569037197">"Varundamisteenus ei ole aktiivne."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"Selle määravad teie seadmereeglid."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Arvutivarunduse parool"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Täielikud arvutivarundused pole praegu kaitstud"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Puudutage, et muuta või eemaldada täielike arvutivarunduste parool"</string>
@@ -1952,7 +1962,11 @@
     <string name="enter_password" msgid="8035706727471334122">"Androidi käivitamiseks sisestage parool"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Androidi käivitamiseks sisestage oma PIN-kood"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Androidi käivitamiseks joonistage muster"</string>
-    <string name="try_again" msgid="4272075051293936921">"Proovige uuesti."</string>
+    <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"Vale muster"</string>
+    <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"Vale parool"</string>
+    <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"Vale PIN-kood"</string>
+    <string name="checking_decryption" msgid="8287458611802609493">"Kontrollimine ..."</string>
+    <string name="starting_android" msgid="8581493237458496835">"Androidi käivitamine"</string>
     <string name="delete" msgid="4219243412325163003">"Kustuta"</string>
     <string name="misc_files" msgid="6720680815969643497">"Mitmesugused failid"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"valitud <xliff:g id="NUMBER">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -1990,8 +2004,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Kasuta alati GPU-d kuva koostamisel"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"Modelleeri värviruumi"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Luba OpenGL-i jälgimine"</string>
-    <string name="use_nuplayer" msgid="5699257393367904387">"Kasuta NuPlayerit (katse)"</string>
-    <string name="use_nuplayer_summary" msgid="1991479067478516714">"Kasuta NuPlayeri asemel AwesomePlayerit"</string>
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"Kas. AwesomePlayerit (aegunud)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"Kasuta meediumi esitamiseks NuPlayeri asemel AwesomePlayerit"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"USB-heli mars. keelamine"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"Auto. marsruut. keelamine väl. USB-heliseadmetesse"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Näita paigutuse piire"</string>
@@ -2167,7 +2181,6 @@
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Lisa kasutaja või profiil"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Kasutaja lisamine"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Piiratud profiil"</string>
-    <string name="user_summary_managed_profile" msgid="7369539529693048111">"Tööprofiil"</string>
     <string name="user_need_lock_message" msgid="2596365678651842785">"Enne piiratud profiili loomist peate seadistama lukustusekraani, et oma rakendusi ja isiklikke andmeid kaitsta."</string>
     <string name="user_set_lock_button" msgid="8311219392856626841">"Määra lukk"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Pole seadistatud"</string>
@@ -2298,11 +2311,13 @@
     <string name="sim_cellular_data_unavailable_summary" msgid="3654805961942166428">"Puudutage, et valida andmeside SIM-kaart"</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"Kasuta helistamiseks alati seda"</string>
     <string name="select_sim_for_data" msgid="2366081042162853044">"Andmete SIM-kaardi valimine"</string>
+    <string name="data_switch_started" msgid="2040761479817166311">"Andmete SIM-kaardi vahetamine, selleks võib kuluda kuni üks minut ..."</string>
     <string name="select_sim_for_calls" msgid="3503094771801109334">"Helistamine SIM-kaardiga"</string>
     <string name="sim_select_card" msgid="211285163525563293">"SIM-kaardi valimine"</string>
     <string name="sim_card_number_title" msgid="7845379943474336488">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"SIM-kaart on tühi"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"SIM-kaardi nimi"</string>
+    <string name="sim_name_hint" msgid="7038643345238968930">"Sisestage SIM-kaardi nimi"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"SIM-kaardi pesa %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Operaator"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Number"</string>
@@ -2312,7 +2327,6 @@
     <string name="color_purple" msgid="3888532466427762504">"Lilla"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"Ühtegi SIM-kaarti pole sisestatud"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"SIM-kaardi olek"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"SIM-kaardiga seotud teave"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"Tagasihelistamine vaike-SIM-kaardilt"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"SIM-kaart väljuvate kõnede jaoks"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Muud kõne seaded"</string>
@@ -2320,8 +2334,11 @@
     <string name="preferred_network_offload_header" msgid="2321173571529106767">"Võrgunime levitamise keelamine"</string>
     <string name="preferred_network_offload_footer" msgid="5857279426054744020">"Võrgunime levitamise keelamine ei lase kolmandatel osapooltel hankida juurdepääsu teie võrguteabele."</string>
     <string name="preferred_network_offload_popup" msgid="2252915199889604600">"Võrgunime levitamise keelamine takistab automaatset ühendamist varjatud võrkudega."</string>
+    <string name="sim_signal_strength" msgid="9144010043784767984">"<xliff:g id="DBM">%1$d</xliff:g> dBm <xliff:g id="ASU">%2$d</xliff:g> asu"</string>
+    <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>
+    <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Küsi iga kord"</string>
     <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>
@@ -2330,22 +2347,22 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Hiljutised otsingud"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Tulemused"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wifi-võrgu ühendus"</string>
-    <string name="keywords_more_default_sms_app" msgid="2744404159003574745">"tekstsõnum"</string>
-    <string name="keywords_more_mobile_networks" msgid="7813380887358745769">"mobiilne mobiil operaator traadita"</string>
+    <string name="keywords_more_default_sms_app" msgid="895656981962034647">"tekstisõnum SMS-i saatmine sõnumid sõnumside"</string>
+    <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"mobiil mobiilioperaator traadita andmed 4g 3g 2g lte"</string>
     <string name="keywords_home" msgid="3626170808219458848">"käivitaja"</string>
     <string name="keywords_display" msgid="6709007669501628320">"ekraan puutetundlik ekraan"</string>
-    <string name="keywords_display_brightness_level" msgid="8636451602230815191">"hämar ekraan puutetundlik ekraan"</string>
-    <string name="keywords_display_auto_brightness" msgid="8070218600502753102">"hämar ekraan puutetundlik ekraan"</string>
-    <string name="keywords_display_wallpaper" msgid="4315466287469834939">"taustal"</string>
+    <string name="keywords_display_brightness_level" msgid="8923289340474728990">"ekraani hämardamine puuteekraan aku"</string>
+    <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"ekraani hämardamine puuteekraan aku"</string>
+    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"tausta isikupärastamine kuva kohandamine"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"teksti suurus"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"projekt"</string>
-    <string name="keywords_storage" msgid="7007275853993419928">"ruum ketas kõvaketas"</string>
-    <string name="keywords_battery" msgid="3992479295298655138">"toide"</string>
-    <string name="keywords_spell_checker" msgid="4509482591225399210">"õigekirjakontroll"</string>
+    <string name="keywords_storage" msgid="6572905220031852173">"ruum ketas kõvaketas seadme kasutus"</string>
+    <string name="keywords_battery" msgid="2096185085932675704">"toite tarbimine laadimine"</string>
+    <string name="keywords_spell_checker" msgid="6106749039734174140">"õigekiri sõnastik õigekirjakontroll automaatne parandamine"</string>
     <string name="keywords_voice_input" msgid="3519547605812413860">"tuvastaja sisend kõne kõnelege keel käed vabad vabakäe tuvastamine solvav sõna heli ajalugu bluetooth peakomplekt"</string>
-    <string name="keywords_text_to_speech_output" msgid="8207889472282225512">"hindamine keel vaikevalik kõne rääkimine"</string>
-    <string name="keywords_date_and_time" msgid="7666950126499155141">"kell"</string>
-    <string name="keywords_factory_data_reset" msgid="3693730656843989732">"pühkimine kustutamine"</string>
+    <string name="keywords_text_to_speech_output" msgid="392447904221657930">"hinda keel vaikimisi kõnele kõnelemine tts juurdepääsetavus lugeja pime"</string>
+    <string name="keywords_date_and_time" msgid="2631808108134830066">"24-tunnine kell"</string>
+    <string name="keywords_factory_data_reset" msgid="4355133848707691977">"pühi kustuta taasta tühista eemalda"</string>
     <string name="keywords_printing" msgid="1701778563617114846">"printer"</string>
     <string name="keywords_sounds_and_notifications" msgid="5965996187974887000">"kõlar piiks"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="2912933812460077912">"ära häiri katkesta katkestus paus"</string>
@@ -2354,7 +2371,7 @@
     <string name="keywords_location_mode" msgid="8584992704568356084">"täpsus"</string>
     <string name="keywords_accounts" msgid="1957925565953357627">"konto"</string>
     <string name="keywords_users" msgid="4673901601478559100">"piirang piira piiratud"</string>
-    <string name="keywords_keyboard_and_ime" msgid="1103378692379215672">"teksti parandamine paranda heli vibreerimine automaatne keel liigutus soovita soovitus teema solvav sõna sisestamine emotikon"</string>
+    <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"tekstiparandus paranda heli vibreeri automaatne keel liigutus soovita soovitus teema solvav sõna tüüp emotikon rahvusvaheline"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"lohistamine parool muster PIN-kood"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"WiFi NFC-kiibi seadistamine"</string>
     <string name="write_tag" msgid="8571858602896222537">"Kirjuta"</string>
@@ -2371,7 +2388,6 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Märguande helitugevus"</string>
     <string name="zen_mode_settings_title" msgid="7014915558669122902">"Katkestused"</string>
     <string name="zen_mode_option_title" msgid="5061978632306007914">"Kõnede ja märguannete saabumisel"</string>
-    <string name="zen_mode_option_title_novoice" msgid="6680706009915204785">"Märguannete saabumisel"</string>
     <string name="zen_mode_option_off" msgid="3167702608910820883">"Katkesta alati"</string>
     <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Luba ainult prioriteetsed katkestused"</string>
     <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Ära katkesta"</string>
@@ -2429,14 +2445,17 @@
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Valmis"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Kuni lülitate selle välja"</string>
     <string name="zen_mode_important_category" msgid="8123274463331022993">"Prioriteetsed katkestused"</string>
-    <string name="zen_mode_downtime_category" msgid="4730179065426038108">"Puhkus (vaid prioriteetsed katkestused)"</string>
+    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Puhkeaeg"</string>
     <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Päevad"</string>
     <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Ühtegi"</string>
+    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Katkestused on lubatud"</string>
+    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Ainult prioriteetsed"</string>
+    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Puudub"</string>
     <string name="zen_mode_automation_category" msgid="4653551005950835761">"Automaatne"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Automaatne sisselülitus"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Mitte kunagi"</string>
-    <string name="zen_mode_phone_calls" msgid="8956214416859303966">"Kõned"</string>
+    <string name="zen_mode_calls" msgid="7051492091133751208">"Kõned"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Sõnumid"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Kõned/sõnumid kasutajalt"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Igaüks"</string>
@@ -2450,7 +2469,9 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Argiõhtuti"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Algusaeg"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Lõppaeg"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> järgmisel päeval"</string>
+    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> järgmisel päeval"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> või mõne varasema alarmi puhul"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> järgmisel päeval või mõne varasema alarmi puhul"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Rakenduse märguanded"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Märguandeseaded"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Seadme kohta tagasiside saatmine"</string>
@@ -2458,7 +2479,11 @@
     <string name="switch_on_text" msgid="1124106706920572386">"Sees"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Väljas"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"Ekraanikuva kinnitamine"</string>
-    <string name="screen_pinning_description" msgid="7091642350452605379">"Kui see on sisse lülitatud, saate ekraanikuva kinnitamise abil hoida aktiivse ekraanikuva nähtaval kuni ekraanikuva vabastamiseni.\n\nEkraanikuva kinnitamiseks:\n\n1. Veenduge, et ekraanikuva kinnitamine oleks sisse lülitatud.\n\n2. Avage kinnitatav ekraanikuva.\n\n3. Puudutage nuppu Ülevaade.\n\n4. Puudutage kinnitamisikooni."</string>
+    <string name="screen_pinning_description" msgid="1137904524037468263">"Kui see seade on sisse lülitatud, saate kasutada kuva kinnitamist, et praegune kuva nähtaval hoida, kuni selle eemaldate.\n\nKuva kinnitamise kasutamiseks tehke järgmist.\n\n1. Veenduge, et kuva kinnitamise funktsioon oleks sisse lülitatud.\n\n2. Avage kuva, mille soovite kinnitada.\n\n3. Puudutage valikut Ülevaade.\n\n4. Pühkige üles ja puudutage siis kinnitamise ikooni."</string>
+    <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Enne vabastamist küsi avamismustrit"</string>
+    <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Enne vabastamist küsi PIN-koodi"</string>
+    <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Enne vabastamist küsi parooli"</string>
+    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Vabastamise korral lukusta seade"</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Tööprofiil"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Katseline)"</string>
     <string name="display_auto_rotate_title" msgid="6176450657107806043">"Kui seade on pööratud"</string>
@@ -2467,7 +2492,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Horisontaalkuva säilitamine"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Praeguse suuna säilitamine"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI teave"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI suhteline teave"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Krüpteerimine"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Jätka"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"Seadme täiendavaks kaitsmiseks võite määrata, et seade nõuab käivitumiseks PIN-koodi sisestamist. Kuni seade pole käivitunud, ei saa see vastu võtta kõnesid, sõnumeid ega märguandeid, sh alarme. \n\nSee aitab kaitsta andmeid seadme kaotsimineku või varguse korral."</string>
@@ -2485,4 +2509,7 @@
     <string name="encrypt_talkback_dialog_message_pin" msgid="1890374082842868489">"Kui sisestate PIN-koodi seadme käivitamiseks, siis pole juurdepääsetavusteenused (nagu <xliff:g id="SERVICE">%1$s</xliff:g>) saadaval."</string>
     <string name="encrypt_talkback_dialog_message_pattern" msgid="4474332516537386384">"Kui sisestate mustri seadme käivitamiseks, siis pole juurdepääsetavusteenused (nagu <xliff:g id="SERVICE">%1$s</xliff:g>) saadaval."</string>
     <string name="encrypt_talkback_dialog_message_password" msgid="8166099418487083927">"Kui sisestate parooli seadme käivitamiseks, siis pole juurdepääsetavusteenused (nagu <xliff:g id="SERVICE">%1$s</xliff:g>) saadaval."</string>
+    <string name="imei_information_title" msgid="8499085421609752290">"IMEI teave"</string>
+    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI suhteline teave"</string>
+    <string name="slot_number" msgid="3762676044904653577">"(<xliff:g id="SLOT_NUM">%1$d</xliff:g>. pesa)"</string>
 </resources>
diff --git a/res/values-eu-rES/arrays.xml b/res/values-eu-rES/arrays.xml
index 35ecb7f..2bceb45 100644
--- a/res/values-eu-rES/arrays.xml
+++ b/res/values-eu-rES/arrays.xml
@@ -527,4 +527,12 @@
     <item msgid="4338089220026248848">"Cachean gordetakoa (jardueren bezeroa)"</item>
     <item msgid="6652164677254579050">"Cachean gordetakoa (hutsik)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Anila"</item>
+    <item msgid="8332294763632946560">"Urdina"</item>
+    <item msgid="2023216417616991392">"Indigoa"</item>
+    <item msgid="3170497246594232819">"Morea"</item>
+    <item msgid="4608643045752965568">"Arrosa"</item>
+    <item msgid="6131821495505931173">"Gorria"</item>
+  </string-array>
 </resources>
diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml
index 9e913b3..44e224f 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>
@@ -180,7 +180,6 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s gailuak zure mezuak atzitu nahi ditu. %2$s gailuari sarbidea eman?"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Data eta ordua"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Aukeratu ordu-zona"</string>
-    <string name="normal_date_format" msgid="7636406984925498359">"Eskualdekoa (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Aurreikusi:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Letra-tipoaren tamaina:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -291,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>
@@ -322,8 +321,6 @@
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Hautatu ordu-zona"</string>
     <string name="date_time_set_date_title" msgid="6928286765325608604">"Data"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"Ezarri data"</string>
-    <string name="date_time_date_format_title" msgid="3976171711988766411">"Dataren formatua"</string>
-    <string name="date_time_date_format" msgid="6951498879879281102">"Aukeratu dataren formatua"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Ordenatu alfabetikoki"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Ordenatu ordu-zonaren arabera"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Data"</string>
@@ -356,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>
@@ -372,7 +369,8 @@
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Itxaron telefonoa enkriptatzen den bitartean. % <xliff:g id="PERCENT">^1</xliff:g> osatuta."</string>
     <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Itxaron tableta enkriptatu arte. Falta den denbora: <xliff:g id="DURATION">^1</xliff:g>"</string>
     <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Itxaron telefonoa enkriptatu arte. Falta den denbora: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Saiatu berriro <xliff:g id="DELAY">^1</xliff:g> segundo barru."</string>
+    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"Tableta desblokeatzeko, itzali eta piztu berriro."</string>
+    <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"Telefonoa desblokeatzeko, itzali eta piztu berriro."</string>
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"Abisua: desblokeatzeko beste <xliff:g id="COUNT">^1</xliff:g> saiakera oker egiten badituzu, gailuko datu guztiak ezabatuko dira!"</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Idatzi pasahitza"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Ezin izan da enkriptatu"</string>
@@ -401,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>
@@ -412,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>
@@ -556,19 +556,14 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Bozgorailu gisa"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Musikarako eta multimedia-edukirako"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Gogoratu ezarpenak"</string>
-    <string name="wifi_assistant_intro_setup" msgid="4605105515416995110">"Wi‑Fi laguntzailea\n"</string>
-    <string name="wifi_assistant_no_thanks" msgid="2776983751990143934">"EZ, ESKERRIK ASKO"</string>
-    <string name="wifi_assistant_setup" msgid="3772423650475730906">"KONFIGURATU"</string>
-    <string name="wifi_assistant_card_message" msgid="107811647784658536">"Konektatu automatikoki erabilgarri dauden sareetara Wi‑Fi laguntzaile baten bidez."</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi‑Fi laguntzailea"</string>
-    <string name="wifi_assistant_title_message" msgid="6240721017579074015">"<xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> arduratzen da erabilgarri dagoen Wi‑Fi sare onenera automatikoki konektatzeaz"</string>
-    <string name="wifi_assistant_open_app" msgid="4803044899535675063">"IREKI APLIKAZIOA"</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>
-    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"Erabiltzen"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"Abian"</string>
     <string name="wifi_display_status_not_available" msgid="5714978725794210102">"Ez dago erabilgarri."</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"Bistaratze-aukerak"</string>
     <string name="wifi_display_options_title" msgid="5740656401635054838">"Hari gabeko pantailaren aukerak"</string>
@@ -577,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>
@@ -592,7 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Wi-Fi ezarpenak"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Konfiguratu eta kudeatu hari gabeko sarbide-puntuak"</string>
-    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Hautatu Wi-Fi sarea"</string>
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Hautatu Wi‑Fi sarea"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Hautatu Wi-Fi sarea"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Wi-Fi konexioa aktibatzen…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Wi-Fia desaktibatzen…"</string>
@@ -607,8 +602,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"Bilaketa beti erabilgarri"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Baimendu beti eskaneatzea"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Utzi Google kokapen-zerbitzuei eta beste aplikazioei sareak bilatzen, Wi-Fi konexioa desaktibatuta egon arren"</string>
-    <string name="wifi_automatically_manage_title" msgid="6249976570008992746">"Kudeatu Wi‑Fi konexioa automatikoki"</string>
-    <string name="wifi_automatically_manage_summary" msgid="6952470763378312488">"Utzi <xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> laguntzaileari Wi-Fi konexioa kudeatzen"</string>
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Erabili Wi‑Fi sare irekiak automatikoki"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Utzi Wi‑Fi laguntzaileari kalitate handiko gisa identifikatutako sare irekietara automatikoki konektatzen"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Aukeratu laguntzailea"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Instalatu ziurtagiriak"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Kokapenaren zehaztasuna hobetzeko eta beste helburu batzuetarako, Google-k eta beste aplikazio batzuek inguruko sareak bila ditzakete, Wi-Fia desaktibatuta egonda ere. Ez baduzu hori gertatzerik nahi, joan Ezarpen aurreratuak &gt; Bilaketa beti erabilgarri atalera."</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Aplikazioek inguruko sareak bila ditzakete, Wi-Fi desaktibatuta egonda ere. Ez baduzu hori gertatzerik nahi, joan Ezarpen aurreratuak &gt; Bilaketa beti erabilgarri atalera."</string>
@@ -629,6 +625,7 @@
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Bilatu"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Ezarpen aurreratuak"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Konektatu sarera"</string>
+    <string name="wifi_menu_remember" msgid="8814185749388713796">"Gogoratu sarea"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Ahaztu sarea"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Aldatu sarea"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Idatzi NFC etiketan"</string>
@@ -671,11 +668,13 @@
     <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="3111321240793227690">"Interneteko konexio txarra saihestu da"</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>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Autentifikazio-arazoa"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Urrunegi"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Ez da hauteman Interneterako sarbiderik. Ez da automatikoki berriro konektatuko."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPSa erabilgarri"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPSa erabilgarri)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Idatzi sarearen pasahitza"</string>
@@ -699,9 +698,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"KONTUZ: ez baduzu aktibatzen Wi‑Fi konexioa, tabletak datu mugikorrak soilik erabiliko ditu hasierako deskargak edo eguneratzeak egiteko. Datuengatiko kostuak ekiditeko, konektatu Wi-Fi sare batera."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"KONTUZ: ez baduzu aktibatzen Wi‑Fi konexioa, gailuak datu mugikorrak soilik erabiliko ditu hasierako deskargak edo eguneratzeak egiteko. Datuengatiko kostuak ekiditeko, konektatu Wi-Fi sare batera."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"KONTUZ: ez baduzu aktibatzen Wi‑Fi konexioa, telefonoak datu mugikorrak soilik erabiliko ditu hasierako deskargak edo eguneratzeak egiteko. Datuengatiko kostuak ekiditeko, konektatu Wi-Fi sare batera."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="2393880108322835846">"KONTUZ: ez baduzu aktibatzen Wi‑Fi konexioa, tabletak ez du Interneteko konexiorik edukiko hasierako deskargak edo eguneratzeak egiteko."</string>
-    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1707391993265558787">"KONTUZ: ez baduzu aktibatzen Wi‑Fi konexioa, gailuak ez du Interneteko konexiorik edukiko hasierako deskargak edo eguneratzeak egiteko."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="1556858507920033022">"KONTUZ: ez baduzu aktibatzen Wi‑Fi konexioa, telefonoak ez du Interneteko konexiorik edukiko hasierako deskargak edo eguneratzeak egiteko."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Wi‑Fi sarera konektatzeko urratsa saltatzen baduzu:\n\nTabletak ez du Interneterako konexiorik izango.\n\nEz duzu software-eguneratzerik jasoko Internetera konektatzen zaren arte.\n\nEzin izango dituzu gailuaren babes-eginbideak aktibatu."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Wi‑Fi sarera konektatzeko urratsa saltatzen baduzu:\n\nGailuak ez du Interneterako konexiorik izango.\n\nEz duzu software-eguneratzerik jasoko Internetera konektatzen zaren arte.\n\nEzin izango dituzu gailuaren babes-eginbideak aktibatu."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Wi‑Fi sarera konektatzeko urratsa saltatzen baduzu:\n\nTelefonoak ez du Interneterako konexiorik izango.\n\nEz duzu software-eguneratzerik jasoko Internetera konektatzen zaren arte.\n\nEzin izango dituzu gailuaren babes-eginbideak aktibatu."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Ezin izan da tableta Wi-Fi sare horretara konektatu."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"Gailua ezin izan da konektatu Wi‑Fi sare honetara."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Ezin izan da telefonoa Wi‑Fi sarera konektatu."</string>
@@ -761,7 +760,6 @@
     <string name="ring_volume_title" msgid="7938706566797464165">"Tonu-jotzailearen bolumena"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Dardara modu isilean dagoenean"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Jakinarazpen-soinu lehenetsia"</string>
-    <string name="heads_up_enabled_title" msgid="1031078221910921622">"Gaineratu lehentasun handikoak"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Tonua"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Jakinarazpenak"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Erabili sarrerako deien bolumena jakinerazpenetarako"</string>
@@ -816,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>
@@ -834,7 +832,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Distira automatikoa"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Aktibatu eskuetan hartzen denean"</string>
     <string name="doze_title" msgid="2259176504273878294">"Giroaren araberako pantaila"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"Argitu pantaila gailua mugitzen bada edo jakinarazpenak heltzen badira"</string>
+    <string name="doze_summary" msgid="7128970177894383698">"Argitu pantaila gailua mugitzen baduzu edo jakinarazpenak jasotzen badituzu"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Letra-tipoaren tamaina"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Letra-tipoaren tamaina"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM txartelaren blokeo-ezarpenak"</string>
@@ -862,6 +860,10 @@
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Utzi"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"Hainbat SIM txartel aurkitu dira"</string>
     <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?"</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>
@@ -913,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>
@@ -1012,6 +1014,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Tabletaren "<b>"barneko memoriako"</b>" datu guztiak ezabatuko dira, besteak beste:\n\n"<li>"Google kontua"</li>\n<li>"Sistema- eta aplikazio-datuak eta ezarpenak"</li>\n<li>"Deskargatutako aplikazioak"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Telefonoaren "<b>"barneko memoriako"</b>" datu guztiak ezabatuko dira, besteak beste:\n\n"<li>"Google kontua"</li>\n<li>"Sistema- eta aplikazio-datuak nahiz ezarpenak"</li>\n<li>"Deskargatutako aplikazioak"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Kontu hauetan hasi duzu saioa:\n"</string>
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Badaude erabiltzaile gehiago gailu honetan.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musika"</li>\n<li>"Argazkiak"</li>\n<li>"Bestelako erabiltzaile-datuak"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Musika, irudiak eta bestelako erabiltzaile-datuak garbitzeko, "<b>"USB memoria"</b>" ezabatu behar da."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Musika, irudiak eta bestelako erabiltzaile-datuak garbitzeko, "<b>"SD txartela"</b>" ezabatu behar da."</string>
@@ -1023,7 +1026,6 @@
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Berrezarri telefonoa"</string>
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Informazio pertsonal guztia eta deskargatutako aplikazioak ezabatu? Ezin duzu ekintza hori desegin!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Ezabatu guztia"</string>
-    <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Marraztu desblokeatzeko eredua"</string>
     <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Jatorrizko datuak berrezarri nahi dituzula berresteko, desblokeatzeko eredua marraztu behar duzu."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Ez da berrezartzerik gauzatu, sistema garbitzeko zerbitzua ez dagoelako erabilgarri."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Berrezarri?"</string>
@@ -1041,7 +1043,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"USB memoria eta bertan gordetako fitxategi guztiak ezabatu? Ezin duzu ekintza hori desegin!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"SD txartela eta bertan gordetako fitxategi guztiak ezabatu? Ezin duzu ekintza hori desegin!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Ezabatu guztia"</string>
-    <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Marraztu desblokeatzeko eredua"</string>
     <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"USB memoria ezabatu nahi duzula berresteko, desblokeatzeko eredua marraztu behar duzu."</string>
     <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"SD txartela ezabatu nahi duzula berresteko, desblokeatzeko eredua marraztu behar duzu."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Dei-ezarpenak"</string>
@@ -1061,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>
@@ -1087,6 +1088,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Sartu SIM txartela eta berrabiarazi"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Konektatu Internetera"</string>
     <string name="location_title" msgid="1029961368397484576">"Nire kokapena"</string>
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Laneko profila"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Laneko profilaren kokapena"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Enpresak desaktibatu du"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Modua"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Zehaztasun handia"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Bateria aurreztea"</string>
@@ -1124,6 +1128,7 @@
     <string name="copyright_title" msgid="865906688917260647">"Copyrighta"</string>
     <string name="license_title" msgid="1990487604356037871">"Lizentzia"</string>
     <string name="terms_title" msgid="7697580845616764642">"Zehaztapenak eta baldintzak"</string>
+    <string name="webview_license_title" msgid="2813507464175738967">"Web-ikustailearen lizentzia"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Horma-paperak"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Satelite-irudien hornitzaileak:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Kode irekiko lizentziak"</string>
@@ -1141,7 +1146,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 +1189,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>
@@ -1237,7 +1242,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB memoria"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"SD txartelean"</string>
     <string name="disabled" msgid="9206776641295849915">"Desgaituta"</string>
-    <string name="not_installed" msgid="1475144352069281880">"Instalatu gabe"</string>
+    <string name="not_installed" msgid="2797554494953450291">"Ez dago instalatuta erabiltzaile honentzat"</string>
     <string name="no_applications" msgid="7336588977497084921">"Ez dago aplikaziorik."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Barneko memoria"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB memoria"</string>
@@ -1334,8 +1339,8 @@
     <string name="background_process_stop_description" msgid="5034773197139654588">"Aplikazio-prozesu zaharra da hau, baina geroago behar bada erabiltzeko ari da exekutatzen. Normalean ez dago hori gelditzeko arrazoirik."</string>
     <string name="service_manage_description" msgid="7050092269951613102">"<xliff:g id="CLIENT_NAME">%1$s</xliff:g>: erabiltzen ari da. Kontrolatzeko, ukitu Ezarpenak."</string>
     <string name="main_running_process_description" msgid="1130702347066340890">"Abian den prozesu nagusia."</string>
-    <string name="process_service_in_use_description" msgid="8993335064403217080">"<xliff:g id="COMP_NAME">%1$s</xliff:g> zerbitzua erabiltzen ari da."</string>
-    <string name="process_provider_in_use_description" msgid="5586603325677678940">"<xliff:g id="COMP_NAME">%1$s</xliff:g> hornitzailea erabiltzen ari da"</string>
+    <string name="process_service_in_use_description" msgid="8993335064403217080">"<xliff:g id="COMP_NAME">%1$s</xliff:g> zerbitzua abian da."</string>
+    <string name="process_provider_in_use_description" msgid="5586603325677678940">"<xliff:g id="COMP_NAME">%1$s</xliff:g> hornitzailea abian da"</string>
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Sistemaren zerbitzua gelditu?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"Zerbitzua gelditzen baduzu, agian tabletako eginbide batzuk behar bezala funtzionatzeari utziko diote, tableta itzali eta berriro piztu arte."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Zerbitzua gelditzen baduzu, agian telefonoko eginbide batzuk behar bezala funtzionatzeari utziko diote, telefonoa itzali eta berriro piztu arte."</string>
@@ -1434,8 +1439,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Pantaila ez da inoiz inaktibo ezarriko kargatu bitartean"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Gaitu Bluetooth HCI miatze-erregistroa"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Bildu Bluetooth HCI pakete guztiak fitxategi batean"</string>
-    <string name="oem_unlock_enable" msgid="6629321276287913315">"Gaitu jatorrizkoak desblok. aukera"</string>
-    <string name="oem_unlock_enable_summary" msgid="3546686263996628110">"Baimendu jatorrizko ezarpenak desblokeatzea"</string>
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM desblokeoa"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Onartu abiarazlea desblokeatzea"</string>
+    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Idatzi PIN kodea"</string>
+    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"OEM desblokeoa gaitzeko, idatzi gailuaren PIN kodea"</string>
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"OEM desblokeoa onartu nahi duzu?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"ABISUA: ezarpen hau aktibatuta dagoen bitartean, gailuaren babes-eginbideek ez dute gailu honetan funtzionatuko."</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Hari gabeko bistaratze-egiaztatzea"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Gaitu Wi-Fi sareetan saioa hasteko modu xehatua"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Behartu Wi-Fi konexiotik datuenera aldatzera"</string>
@@ -1470,7 +1479,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>
@@ -1491,11 +1500,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>
@@ -1503,7 +1512,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>
@@ -1538,6 +1547,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"Bideo-oinek itxura hau izango dute:"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"Lehenetsia"</string>
+    <string name="color_title" msgid="4258931051732243983">"Koloreak"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"Lehenetsia"</string>
     <string name="color_none" msgid="3475640044925814795">"Bat ere ez"</string>
     <string name="color_white" msgid="8045195170201590239">"Zuria"</string>
@@ -1595,12 +1605,12 @@
     <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="7125493014448497620">"%% <xliff:g id="LEVEL">%1$d</xliff:g>. Geratzen den denbora, gutxi gorab.: <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="power_charging" msgid="712751285832976915">"%% <xliff:g id="LEVEL">%1$d</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration" msgid="4802183864773082009">"%% <xliff:g id="LEVEL">%1$d</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> guztiz kargatu arte"</string>
-    <string name="power_charging_duration_ac" msgid="3611179931297824699">"%% <xliff:g id="LEVEL">%1$d</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> korrontearen bidez guztiz kargatu arte"</string>
-    <string name="power_charging_duration_usb" msgid="1106605348913397583">"%% <xliff:g id="LEVEL">%1$d</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> USB bidez guztiz kargatu arte"</string>
-    <string name="power_charging_duration_wireless" msgid="633606920144617227">"%% <xliff:g id="LEVEL">%1$d</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> haririk gabe guztiz kargatu arte"</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>
+    <string name="power_charging_duration_usb" msgid="182405645340976546">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> USB bidez guztiz kargatu arte"</string>
+    <string name="power_charging_duration_wireless" msgid="1829295708243159464">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> haririk gabe guztiz kargatu arte"</string>
     <string name="power_usage_list_summary" msgid="2409288197839512482">"Azkenekoz guztiz kargatu zenetik emandako erabilera"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Bateriaren erabilera entxufea atera ondoren"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Azken aldiz berrezarri ondoren erabilitako bateria"</string>
@@ -1617,7 +1627,6 @@
     <string name="awake" msgid="387122265874485088">"Gailua aktibo egondako denbora"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi‑Fi garaiz"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi garaiz"</string>
-    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="PERCENT">%%</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Historiaren xehetasunak"</string>
     <string name="details_title" msgid="3792801565213935385">"Erabilera-xehetasunak"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Erabilera-xehetasunak"</string>
@@ -1689,7 +1698,7 @@
     <string name="battery_saver" msgid="1426682272004907982">"Bateria aurrezlea"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Aktibatu automatikoki"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Inoiz ez"</string>
-    <string name="battery_saver_turn_on_automatically_pct" msgid="3033681629861428940">"Bateriaren %% %1$d geratzen denean"</string>
+    <string name="battery_saver_turn_on_automatically_pct" msgid="7536784431655058267">"Bateria: %1$s"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Prozesu-estatistikak"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Exekutatzen ari diren prozesuei buruzko estatistika zehatzak"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Memoriaren erabilera"</string>
@@ -1741,7 +1750,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>
@@ -1813,7 +1822,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Hardwarean gordetakoa"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Softwarean soilik"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"Erabiltzaile honek ez dauka kredentzialik"</string>
-    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Marraztu desblokeatzeko nahi duzun eredua"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Kredentzialak instalatu nahi dituzula berresteko, desblokeatzeko eredua marraztu behar duzu."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Idatzi kredentzialen biltegiaren pasahitza."</string>
@@ -1842,7 +1850,9 @@
     <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>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Une honetan, ordenagailuko babeskopia osoak ez daude babestuta."</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Ukitu ordenagailuko babeskopia osoak egiteko pasahitza aldatzeko edo kentzeko"</string>
@@ -1850,7 +1860,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>
@@ -1952,7 +1962,11 @@
     <string name="enter_password" msgid="8035706727471334122">"Android gailua abiarazteko, idatzi pasahitza"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Android gailua abiarazteko, idatzi PIN kodea"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Android gailua abiarazteko, marraztu eredua"</string>
-    <string name="try_again" msgid="4272075051293936921">"Saiatu berriro."</string>
+    <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"Eredu okerra"</string>
+    <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"Pasahitz okerra"</string>
+    <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"PIN okerra"</string>
+    <string name="checking_decryption" msgid="8287458611802609493">"Egiaztatzen…"</string>
+    <string name="starting_android" msgid="8581493237458496835">"Android abiarazten"</string>
     <string name="delete" msgid="4219243412325163003">"Ezabatu"</string>
     <string name="misc_files" msgid="6720680815969643497">"Askotariko fitxategiak"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"<xliff:g id="NUMBER">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g> hautatuta"</string>
@@ -1990,8 +2004,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Erabili beti GPU pantaila-muntaietarako"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"Simulatu kolore-espazioa"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Gaitu OpenGL aztarnak"</string>
-    <string name="use_nuplayer" msgid="5699257393367904387">"Erabili NuPlayer (esperimentala)"</string>
-    <string name="use_nuplayer_summary" msgid="1991479067478516714">"Erabili NuPlayer AwesomePlayer-en ordez"</string>
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"Erabili AwesomePlayer (zaharkituta)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"Erabili gehienbat AwesomePlayer, eta ez NuPlayer"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"Desgaitu USB audio-bideratzea"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"Desgaitu USB audio-gailuetara automatikoki bideratzea"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Erakutsi diseinuaren mugak"</string>
@@ -2167,7 +2181,6 @@
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Gehitu erabiltzailea edo profila"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Gehitu erabiltzailea"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Profil murriztua"</string>
-    <string name="user_summary_managed_profile" msgid="7369539529693048111">"Laneko profila"</string>
     <string name="user_need_lock_message" msgid="2596365678651842785">"Profil murriztua sortu aurretik, aplikazioak eta datu pertsonalak babesteko, pantaila blokeatzeko metodo bat konfiguratu beharko duzu."</string>
     <string name="user_set_lock_button" msgid="8311219392856626841">"Ezarri blokeoa"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Konfiguratu gabe"</string>
@@ -2231,7 +2244,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>
@@ -2298,11 +2311,13 @@
     <string name="sim_cellular_data_unavailable_summary" msgid="3654805961942166428">"Ukitu datuen SIM txartela hautatzeko"</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"Erabili beti hau deietarako"</string>
     <string name="select_sim_for_data" msgid="2366081042162853044">"Hautatu datuetarako SIM txartela"</string>
+    <string name="data_switch_started" msgid="2040761479817166311">"Datuetarako erabili beharreko SIMa aldatzen ari da. Minutu oso bat behar izan daiteke horretarako…"</string>
     <string name="select_sim_for_calls" msgid="3503094771801109334">"Deitu SIM honekin:"</string>
     <string name="sim_select_card" msgid="211285163525563293">"Hautatu SIM txartela"</string>
     <string name="sim_card_number_title" msgid="7845379943474336488">"<xliff:g id="CARD_NUMBER">%1$d</xliff:g>. SIM txartela"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"SIM txartela hutsik dago"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"SIM txartelaren izena"</string>
+    <string name="sim_name_hint" msgid="7038643345238968930">"Idatzi SIM txartelaren izena"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"%1$d. SIM zirrikitua"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Operadorea"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Zenbakia"</string>
@@ -2312,7 +2327,6 @@
     <string name="color_purple" msgid="3888532466427762504">"Morea"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"Ez dago SIM txartelik sartuta"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"SIMaren egoera"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"SIMarekin erlazionatutako informazioa"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"Erantzun deiari SIM txartel lehenetsitik"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"Irteerako deien SIM txartela"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Deien beste ezarpen batzuk"</string>
@@ -2320,8 +2334,11 @@
     <string name="preferred_network_offload_header" msgid="2321173571529106767">"Desgaitu sarearen izena igortzeko aukera"</string>
     <string name="preferred_network_offload_footer" msgid="5857279426054744020">"\"Desgaitu sarearen izena igortzeko aukera\" ezarpenak galarazi egiten die hirugarrenei zure sarearen informazioa atzitzea."</string>
     <string name="preferred_network_offload_popup" msgid="2252915199889604600">"\"Desgaitu sarearen izena igortzeko aukera\" ezarpenak sare ezkutuetan automatikoki konektatzea ekiditen du."</string>
+    <string name="sim_signal_strength" msgid="9144010043784767984">"<xliff:g id="DBM">%1$d</xliff:g> dBm <xliff:g id="ASU">%2$d</xliff:g> asu"</string>
+    <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>
+    <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Galdetu beti"</string>
     <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>
@@ -2330,22 +2347,22 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Azken bilaketak"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Emaitzak"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi sareko konexioa"</string>
-    <string name="keywords_more_default_sms_app" msgid="2744404159003574745">"testu-mezu"</string>
-    <string name="keywords_more_mobile_networks" msgid="7813380887358745769">"mugikorra telefonia mugikorreko operadorea hari gabea"</string>
+    <string name="keywords_more_default_sms_app" msgid="895656981962034647">"testu-mezua, testu-mezuak, mezuak"</string>
+    <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"mugikorra, operadorea, eramailea, hari gabeko datuak, 4g, 3g, 2g, lte"</string>
     <string name="keywords_home" msgid="3626170808219458848">"abiarazlea"</string>
     <string name="keywords_display" msgid="6709007669501628320">"ukipen pantaila"</string>
-    <string name="keywords_display_brightness_level" msgid="8636451602230815191">"ilundu ukipen pantaila"</string>
-    <string name="keywords_display_auto_brightness" msgid="8070218600502753102">"ilundu ukipen pantaila"</string>
-    <string name="keywords_display_wallpaper" msgid="4315466287469834939">"atzeko plano"</string>
+    <string name="keywords_display_brightness_level" msgid="8923289340474728990">"ilundu pantaila, ukipen-pantaila, bateria"</string>
+    <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"ilundu pantaila, ukipen-pantaila, bateria"</string>
+    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"atzeko planoa, pertsonalizatu, pantaila"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"testuaren tamaina"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"proiektu"</string>
-    <string name="keywords_storage" msgid="7007275853993419928">"lekua disko gogorra memoria"</string>
-    <string name="keywords_battery" msgid="3992479295298655138">"bateria"</string>
-    <string name="keywords_spell_checker" msgid="4509482591225399210">"ortografia"</string>
+    <string name="keywords_storage" msgid="6572905220031852173">"tokia, diskoa, disko gogorra, gailua, erabilera"</string>
+    <string name="keywords_battery" msgid="2096185085932675704">"energia, kontsumoa, karga"</string>
+    <string name="keywords_spell_checker" msgid="6106749039734174140">"ortografia, hiztegia, zuzentzaile ortografikoa, zuzenketa automatikoa"</string>
     <string name="keywords_voice_input" msgid="3519547605812413860">"identifikatzailea idazketa hizketa hitz egin hizkuntza esku librekoa eskuak libre identifikazioa hitz iraingarria audioa historia bluetooth entzungailua"</string>
-    <string name="keywords_text_to_speech_output" msgid="8207889472282225512">"baloratu hizkuntza lehenetsi hitz egin hizketa"</string>
-    <string name="keywords_date_and_time" msgid="7666950126499155141">"ordu erloju ordulari"</string>
-    <string name="keywords_factory_data_reset" msgid="3693730656843989732">"garbitu ezabatu"</string>
+    <string name="keywords_text_to_speech_output" msgid="392447904221657930">"baloratu, hizkuntza, lehenetsia, hitz egin, hizketa, testua ahots bihurtzea, erabilerraztasuna, irakurlea, ikusmen-arazoak"</string>
+    <string name="keywords_date_and_time" msgid="2631808108134830066">"erlojua, militarra"</string>
+    <string name="keywords_factory_data_reset" msgid="4355133848707691977">"ezabatu, leheneratu, garbitu, kendu"</string>
     <string name="keywords_printing" msgid="1701778563617114846">"inprimagailua"</string>
     <string name="keywords_sounds_and_notifications" msgid="5965996187974887000">"bozgorailuaren soinu bip"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="2912933812460077912">"ez molestatu eten etenaldi"</string>
@@ -2354,7 +2371,7 @@
     <string name="keywords_location_mode" msgid="8584992704568356084">"zehaztasun"</string>
     <string name="keywords_accounts" msgid="1957925565953357627">"kontu"</string>
     <string name="keywords_users" msgid="4673901601478559100">"murrizketa murriztu debekatu"</string>
-    <string name="keywords_keyboard_and_ime" msgid="1103378692379215672">"testua zuzenketa zuzen soinu dar-dar dardara automatiko hizkuntza keinu iradoki iradokizun gai hitz iraingarri idatzi emotikono aurpegiera"</string>
+    <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"testua, zuzenketa, zuzendu, soinua, dardara, automatikoa, hizkuntza, keinua, iradoki, iradokizuna, gaia, iraingarria, hitza, mota, emotikonoa, nazioartekoa"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"lerratu pasahitz eredu pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Konfiguratu Wi-Fi NFC etiketa"</string>
     <string name="write_tag" msgid="8571858602896222537">"Idatzi"</string>
@@ -2371,13 +2388,12 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Jakinarazpenen bolumena"</string>
     <string name="zen_mode_settings_title" msgid="7014915558669122902">"Etenaldiak"</string>
     <string name="zen_mode_option_title" msgid="5061978632306007914">"Deiak eta jakinarazpenak jasotzean"</string>
-    <string name="zen_mode_option_title_novoice" msgid="6680706009915204785">"Jakinarazpenak jasotzean"</string>
     <string name="zen_mode_option_off" msgid="3167702608910820883">"Eten beti"</string>
     <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Baimendu lehentasun-etenaldiak soilik"</string>
     <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>
@@ -2420,7 +2436,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>
@@ -2429,28 +2445,33 @@
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Eginda"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Hau itzali arte"</string>
     <string name="zen_mode_important_category" msgid="8123274463331022993">"Lehentasun-etenaldiak"</string>
-    <string name="zen_mode_downtime_category" msgid="4730179065426038108">"Inaktibo (lehentasun-etenaldiak soilik)"</string>
+    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Jarduerarik gabeko denbora"</string>
     <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Egunak"</string>
     <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Bat ere ez"</string>
+    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Etenaldiak onartzen dira"</string>
+    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Lehentasunezkoak soilik"</string>
+    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Bat ere ez"</string>
     <string name="zen_mode_automation_category" msgid="4653551005950835761">"Automatizazioa"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Aktibatu automatikoki"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Inoiz ez"</string>
-    <string name="zen_mode_phone_calls" msgid="8956214416859303966">"Deiak"</string>
+    <string name="zen_mode_calls" msgid="7051492091133751208">"Deiak"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Mezuak"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Honen deiak/mezuak"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Edonor"</string>
     <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>
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Lanegunetako gauak"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Hasiera-ordua"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Amaiera-ordua"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> (hurrengo egunean)"</string>
+    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"Hurrengo eguneko <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> edo horren aurreko beste edozein alarma"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"Hurrengo eguneko <xliff:g id="FORMATTED_TIME">%s</xliff:g> edo horren aurreko beste edozein alarma"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Aplikazioen jakinarazpenak"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Jakinarazpen-ezarpenak"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Bidali gailu honi buruzko iritzia"</string>
@@ -2458,7 +2479,11 @@
     <string name="switch_on_text" msgid="1124106706920572386">"Aktibatuta"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Desaktibatuta"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"Pantaila ainguratzea"</string>
-    <string name="screen_pinning_description" msgid="7091642350452605379">"Aktibatzen denean, pantaila ainguratu egin dezakezu uneko pantaila ikusgai mantentzeko, aingura kendu arte.\n\nPantaila ainguratzeko:\n\n1. Ziurtatu pantaila ainguratzeko eginbidea aktibatuta dagoela.\n\n2. Ireki ainguratu nahi duzun pantaila.\n\n3. Ukitu Ikuspegi orokorra.\n\n4. Sakatu ainguraren ikonoa."</string>
+    <string name="screen_pinning_description" msgid="1137904524037468263">"Ezarpena aktibatzen denean, pantaila ainguratu egin dezakezu uneko pantaila ikusgai mantentzeko, aingura kendu arte.\n\nPantaila ainguratzeko:\n\n1. Ziurtatu pantaila ainguratzeko eginbidea aktibatuta dagoela.\n\n2. Ireki ainguratu nahi duzun pantaila.\n\n3. Ukitu Ikuspegi orokorra.\n\n4. Pasatu hatza gora eta sakatu ainguraren ikonoa."</string>
+    <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Eskatu desblokeatzeko eredua aingura kendu aurretik"</string>
+    <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Eskatu PIN kodea aingura kendu aurretik"</string>
+    <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Eskatu pasahitza aingura kendu aurretik"</string>
+    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Blokeatu gailua aingura kentzean"</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Laneko profila"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Esperimentala)"</string>
     <string name="display_auto_rotate_title" msgid="6176450657107806043">"Gailua biratzen denean"</string>
@@ -2467,7 +2492,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Jarraitu modu horizontalean"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Ez aldatu pantailaren orientazioa"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"IMEIari buruzko informazioa"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"IMEIari buruzko informazioa"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Enkriptatzea"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Jarraitu"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"Gailua are gehiago babes dezakezu hasieratu aurretik PIN kodea eskatuta. Gailua hasieratu arte, ezingo duzu jaso deirik, mezurik edo jakinarazpenik, alarmak barne. \n\nHorrela, gailua galdu edo lapurtzekotan, datuak babestuta egongo dira."</string>
@@ -2485,4 +2509,7 @@
     <string name="encrypt_talkback_dialog_message_pin" msgid="1890374082842868489">"Gailua abiarazteko PIN kodea idazten duzunean, <xliff:g id="SERVICE">%1$s</xliff:g> bezalako erabilerraztasun-zerbitzuak ez dira erabilgarri egongo oraindik."</string>
     <string name="encrypt_talkback_dialog_message_pattern" msgid="4474332516537386384">"Gailua abiarazteko eredua marrazten duzunean, <xliff:g id="SERVICE">%1$s</xliff:g> bezalako erabilerraztasun-zerbitzuak ez dira erabilgarri egongo oraindik."</string>
     <string name="encrypt_talkback_dialog_message_password" msgid="8166099418487083927">"Gailua abiarazteko pasahitza idazten duzunean, <xliff:g id="SERVICE">%1$s</xliff:g> bezalako erabilerraztasun-zerbitzuak ez dira erabilgarri egongo oraindik."</string>
+    <string name="imei_information_title" msgid="8499085421609752290">"IMEIari buruzko informazioa"</string>
+    <string name="imei_information_summary" msgid="2074095606556565233">"IMEIari buruzko informazioa"</string>
+    <string name="slot_number" msgid="3762676044904653577">"(<xliff:g id="SLOT_NUM">%1$d</xliff:g>. zirrikitua)"</string>
 </resources>
diff --git a/res/values-fa/arrays.xml b/res/values-fa/arrays.xml
index 8a10370..a5cfce4 100644
--- a/res/values-fa/arrays.xml
+++ b/res/values-fa/arrays.xml
@@ -527,4 +527,12 @@
     <item msgid="4338089220026248848">"قرار داده شده در حافظه پنهان (کلاینت فعالیت)"</item>
     <item msgid="6652164677254579050">"قرار داده شده در حافظه پنهان (خالی)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"فیروزه‌ای"</item>
+    <item msgid="8332294763632946560">"آبی"</item>
+    <item msgid="2023216417616991392">"نیلی"</item>
+    <item msgid="3170497246594232819">"بنفش"</item>
+    <item msgid="4608643045752965568">"صورتی"</item>
+    <item msgid="6131821495505931173">"قرمز"</item>
+  </string-array>
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 2bc50f2..5547090 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>
@@ -180,7 +180,6 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"‏%1$s می‌خواهد به پیام‌های شما دسترسی یابد. اجازه دسترسی به %2$s داده شود؟"</string>
     <string name="date_and_time" msgid="9062980487860757694">"تاریخ و زمان"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"انتخاب منطقهٔ زمانی"</string>
-    <string name="normal_date_format" msgid="7636406984925498359">"پیش‌فرض (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"پیش‌نمایش:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"اندازهٔ قلم:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -238,7 +237,7 @@
     <string name="ping_test_label" msgid="7255376471490860631">"اجرای تست پینگ"</string>
     <string name="radio_info_smsc_label" msgid="6399460520126501354">"SMSC:"</string>
     <string name="radio_info_smsc_update_label" msgid="7258686760358791539">"به‌روزرسانی"</string>
-    <string name="radio_info_smsc_refresh_label" msgid="6902302130315125102">"تازه کردن"</string>
+    <string name="radio_info_smsc_refresh_label" msgid="6902302130315125102">"بازخوانی"</string>
     <string name="radio_info_toggle_dns_check_label" msgid="8292252930563286858">"‏تغییر وضعیت علامت DNS"</string>
     <string name="oem_radio_info_label" msgid="6163141792477958941">"‏تنظیمات/اطلاعات خاص OEM"</string>
     <string name="band_mode_title" msgid="954174198903776205">"‏تنظیم باند GSM/UMTS"</string>
@@ -291,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>
@@ -322,8 +321,6 @@
     <string name="date_time_set_timezone" msgid="5045627174274377814">"انتخاب منطقهٔ زمانی"</string>
     <string name="date_time_set_date_title" msgid="6928286765325608604">"تاریخ"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"تنظیم تاریخ"</string>
-    <string name="date_time_date_format_title" msgid="3976171711988766411">"قالب تاریخ"</string>
-    <string name="date_time_date_format" msgid="6951498879879281102">"انتخاب قالب تاریخ"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"ترتیب الفبایی"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"بر اساس منطقهٔ زمانی مرتب شود"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"تاریخ"</string>
@@ -372,7 +369,8 @@
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"هنگام رمزگذاری گوشی خود، منتظر بمانید. <xliff:g id="PERCENT">^1</xliff:g>% کامل شد."</string>
     <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"وقتی رایانه لوحی‌تان رمز‌گذاری می‌شود، منتظر بمانید. مدت زمان باقیمانده: <xliff:g id="DURATION">^1</xliff:g>"</string>
     <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"وقتی تلفن‌تان رمز‌گذاری می‌شود، منتظر بمانید. مدت زمان باقیمانده: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"پس از <xliff:g id="DELAY">^1</xliff:g> ثانیه دوباره امتحان کنید."</string>
+    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"برای باز کردن قفل رایانه لوحی‌تان، آن را خاموش و سپس روشن کنید."</string>
+    <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"برای باز کردن قفل تلفن‌تان، آن را خاموش و سپس روشن کنید."</string>
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"اخطار: دستگاه‌تان پس از <xliff:g id="COUNT">^1</xliff:g> تلاش ناموفق دیگر برای باز کردن قفل آن، پاک می‌شود."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"گذرواژهٔ خود را تایپ کنید"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"رمزگذاری ناموفق"</string>
@@ -401,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>
@@ -412,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>
@@ -491,7 +491,7 @@
     <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> مرتبط‌سازی را رد کرد."</string>
     <string name="bluetooth_connecting_error_message" msgid="229861986106185022">"اتصال به <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ممکن نیست."</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"اسکن برای دستگاه‌ها"</string>
-    <string name="bluetooth_search_for_devices" msgid="2754007356491461674">"تازه‌سازی"</string>
+    <string name="bluetooth_search_for_devices" msgid="2754007356491461674">"بازخوانی"</string>
     <string name="bluetooth_searching_for_devices" msgid="9203739709307871727">"در حال جستجو..."</string>
     <string name="bluetooth_preference_device_settings" msgid="907776049862799122">"تنظیمات دستگاه"</string>
     <string name="bluetooth_preference_paired_dialog_title" msgid="8875124878198774180">"دستگاه مرتبط‌شده"</string>
@@ -556,13 +556,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"به‌عنوان تلفن دارای بلندگو"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"برای موسیقی و رسانه"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"به خاطر سپردن تنظیمات"</string>
-    <string name="wifi_assistant_intro_setup" msgid="4605105515416995110">"‏معرفی\n‏Wi‑Fi Assistant"</string>
-    <string name="wifi_assistant_no_thanks" msgid="2776983751990143934">"خیر، سپاسگزارم"</string>
-    <string name="wifi_assistant_setup" msgid="3772423650475730906">"راه‌اندازی"</string>
-    <string name="wifi_assistant_card_message" msgid="107811647784658536">"‏با Wi‑Fi Assistant به صورت خودکار به شبکه‌های موجود متصل شوید."</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi‑Fi Assistant"</string>
-    <string name="wifi_assistant_title_message" msgid="6240721017579074015">"‏<xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> به صورت خودکار شما را به بهترین Wi-Fi موجود وصل می‌کند"</string>
-    <string name="wifi_assistant_open_app" msgid="4803044899535675063">"باز کردن برنامه"</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>
@@ -592,7 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"‏تنظیمات Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"تنظیم و مدیریت نقاط دسترسی بی سیم"</string>
-    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"‏انتخاب Wi-Fi"</string>
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"‏انتخاب شبکه Wi-Fi"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"‏انتخاب Wi-Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"‏روشن کردن Wi-Fi…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"‏خاموش کردن Wi-Fi…"</string>
@@ -607,8 +602,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"اسکن کردن همواره در دسترس باشد"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"مجاز بودن همیشگی جستجوی شبکه"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"‏به سرویس‌ مکان Google و دیگر برنامه‌ها اجازه می‌دهد حتی هنگامی که Wi-Fi خاموش است، برای یافتن شبکه‌ها جستجو کنند"</string>
-    <string name="wifi_automatically_manage_title" msgid="6249976570008992746">"‏مدیریت خودکار Wi‑Fi"</string>
-    <string name="wifi_automatically_manage_summary" msgid="6952470763378312488">"‏به <xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> اجازه داده شود اتصال Wi-Fi شما را مدیریت کند"</string>
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"‏استفاده خودکار از Wi-Fi باز"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"‏به دستیار Wi-Fi اجازه داده شود به صورت خودکار به شبکه‌های باز با کیفیت بالا متصل شود"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"انتخاب دستیار"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"نصب گواهی‌ها"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"‏برای بهبود میزان دقت موقعیت مکانی و به منظور اهداف دیگر، Google و سایر برنامه‌ها ممکن است شبکه‌های اطراف را اسکن کنند، حتی وقتی Wi-Fi خاموش است. اگر نمی‌خواهید چنین شود، به پیشرفته &gt; همیشه اسکن موجود باشد، بروید."</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"‏برنامه‌ها ممکن است شبکه‌های اطراف را اسکن کنند، حتی زمانی که Wi-Fi خاموش است. اگر نمی‌خواهید چنین شود، به پیشرفته &gt; همیشه اسکن موجود باشد، بروید."</string>
@@ -629,6 +625,7 @@
     <string name="wifi_menu_scan" msgid="1470911530412095868">"اسکن"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"پیشرفته"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"اتصال به شبکه"</string>
+    <string name="wifi_menu_remember" msgid="8814185749388713796">"به خاطر سپردن شبکه"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"فراموش کردن شبکه"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"اصلاح کردن شبکه"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"‏نوشتن در برچسب NFC"</string>
@@ -673,9 +670,11 @@
     <string name="wifi_unspecified" msgid="5431501214192991253">"(مشخص نشده)"</string>
     <string name="wifi_remembered" msgid="4955746899347821096">"ذخیره‌شده"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"غیرفعال شد"</string>
-    <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"از اتصال به اینترنت ضعیف اجتناب شد"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"‏پیکربندی IP انجام نشد"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"‏اتصال Wi-Fi برقرار نشد"</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"مشکل تأیید اعتبار"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"در محدوده نیست"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"دسترسی به اینترنت شناسایی نشد، به صورت خودکار وصل نمی‌شود."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"‏WPS در دسترس است"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" ‏ (WPS در دسترس است)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"گذرواژه شبکه‌تان را وارد کنید"</string>
@@ -699,9 +698,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"‏هشدار: اگر از اتصال Wi‑Fi صرف نظر کنید، رایانه لوحی‌تان فقط از داده‌های شبکه تلفن همراه برای دانلودها و به‌روزرسانی‌های اولیه استفاده خواهد کرد. برای اجتناب از هزینه‌های احتمالی داده‌های شبکه تلفن همراه، به Wi‑Fi وصل شوید."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"‏هشدار: اگر از اتصال Wi‑Fi صرف نظر کنید، دستگاهتان فقط از داده‌های شبکه تلفن همراه برای دانلودها و به‌روزرسانی‌های اولیه استفاده خواهد کرد. برای اجتناب از هزینه‌های احتمالی داده‌های شبکه تلفن همراه، به Wi‑Fi وصل شوید."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"‏هشدار: اگر از اتصال Wi‑Fi صرف نظر کنید، تلفنتان فقط از داده‌های شبکه تلفن همراه برای دانلودها و به‌روزرسانی‌های اولیه استفاده خواهد کرد. برای اجتناب از هزینه‌های احتمالی داده‌های شبکه تلفن همراه، به Wi‑Fi وصل شوید."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="2393880108322835846">"‏هشدار: اگر از اتصال Wi‑Fi صرف نظر کنید، رایانه لوحی‌تان اتصال اینترنتی جهت استفاده برای هرگونه دانلود یا به‌روزرسانی اولیه‌ای نخواهد داشت."</string>
-    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1707391993265558787">"‏هشدار: اگر از اتصال Wi‑Fi صرف نظر کنید، دستگاهتان اتصال اینترنتی جهت استفاده برای هرگونه دانلود یا به‌روزرسانی اولیه‌ای نخواهد داشت."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="1556858507920033022">"‏هشدار: اگر از اتصال Wi-Fi صرف‌نظر کنید، تلفن شما اتصال اینترنتی‌ای نخواهد داشت تا از آن برای هرگونه دانلود یا به‌روزرسانی اولیه استفاده کند."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"‏اگر از Wi-Fi رد شوید:\n\nرایانه لوحیتان اتصال اینترنت نخواهد داشت.\n\nبه‌روزرسانی‌های نرم‌افزار را دریافت نمی‌کنید مگر این که به اینترنت وصل شوید.\n\nویژگی‌های حفاظتی دستگاه را در حال حاضر نمی‌توانید فعال کنید."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"‏اگر از Wi-Fi رد شوید:\n\nدستگاهتان اتصال اینترنت نخواهد داشت.\n\nبه‌روزرسانی‌های نرم‌افزار را دریافت نمی‌کنید مگر این که به اینترنت وصل شوید.\n\nویژگی‌های حفاظتی دستگاه را در حال حاضر نمی‌توانید فعال کنید."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"‏اگر از Wi-Fi رد شوید:\n\nتلفنتان اتصال اینترنت نخواهد داشت.\n\nبه‌روزرسانی‌های نرم‌افزار را دریافت نمی‌کنید مگر این که به اینترنت وصل شوید.\n\nویژگی‌های حفاظتی دستگاه را در حال حاضر نمی‌توانید فعال کنید."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"‏رایانه لوحی قادر به اتصال به این شبکه Wi-Fi نیست."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"‏دستگاه نتوانست به این شبکه Wi‑Fi وصل شود."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"‏تلفن قادر به اتصال به این شبکه Wi-Fi نیست."</string>
@@ -761,7 +760,6 @@
     <string name="ring_volume_title" msgid="7938706566797464165">"میزان صدای زنگ"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"لرزش در حالت بی‌صدا"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"صدای اعلان پیش‌فرض"</string>
-    <string name="heads_up_enabled_title" msgid="1031078221910921622">"بازشدن در صورت بالابودن اولویت"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"آهنگ زنگ"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"اعلان"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"استفاده از صدای تماس ورودی برای اعلان‌ها"</string>
@@ -834,7 +832,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"روشنایی خودکار"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"بیدار شدن با بالا بردن"</string>
     <string name="doze_title" msgid="2259176504273878294">"نمایشگر محیط"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"وقتی دستگاه برداشته می‌شود یا اعلان دریافت می‌شود، صفحه بیدار شود"</string>
+    <string name="doze_summary" msgid="7128970177894383698">"روشن شدن صفحه هنگامی که دستگاه را برمی‌دارید یا اعلانی دریافت می‌کنید"</string>
     <string name="title_font_size" msgid="4405544325522105222">"اندازه قلم"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"اندازهٔ قلم"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"تنظیمات قفل سیم کارت"</string>
@@ -862,6 +860,10 @@
     <string name="sim_enter_cancel" msgid="6240422158517208036">"لغو"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"چندین سیم‌کارت یافت شد"</string>
     <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>
@@ -1012,6 +1014,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"‏با این کار همه داده‌های "<b>"حافظهٔ داخلی"</b>" رایانهٔ لوحی شما پاک می‌شود، از جمله:\n\n"<li>"حساب Google شما"<li>\n</li>"داده‌ها و تنظیمات برنامه و سیستم"<li>\n</li>"برنامه‌های دانلود شده"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"‏با این کار همه داده‌های "<b>"حافظهٔ داخلی"</b>" گوشی شما پاک می‌شود، از جمله:\n\n"<li>"حساب Google شما"</li>\n<li>"داده‌های برنامه و سیستم و تنظیمات"</li>\n<li>"برنامه‌های دانلود شده"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"شما در حال حاضر به حساب‌های زیر وارد شده‌اید:\n"</string>
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"کاربران دیگری در این دستگاه وجود دارند.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"موسیقی"</li>\n<li>"عکس ها"</li>\n<li>"سایر اطلاعات کاربر"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">"‏\n\nبرای پاک کردن موسیقی، عکس‌ها و سایر داده‌های کاربر، "<b>"حافظهٔ USB"</b>" باید پاک شود."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">"‏\n\nبرای پاک کردن موسیقی، عکس‌ها و سایر داده‌های کاربر، "<b>"کارت SD"</b>" باید پاک شود."</string>
@@ -1023,7 +1026,6 @@
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"بازنشانی تلفن"</string>
     <string name="master_clear_final_desc" msgid="7209547812233487345">"همه اطلاعات شخصی و برنامه‌های دانلود شده پاک شود؟ این عملکرد دیگر قابل بازگشت نیست!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"پاک کردن همهٔ موارد"</string>
-    <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"الگوی بازگشایی قفل خود را بکشید"</string>
     <string name="master_clear_gesture_explanation" msgid="826193821455182780">"برای تأیید بازنشانی به داده‌های کارخانه، باید الگوی قفل گشایی خود را بکشید."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"هیچ بازنشانی انجام نشد زیرا سرویس پاکسازی سیستم در دسترس نیست."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"بازنشانی؟"</string>
@@ -1041,7 +1043,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"‏حافظهٔ USB و همه فایل‌های ذخیره شده در آن پاک شود؟ این عملکرد دیگر قابل بازگشت نیست!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"‏با پاک کردن کارت SD، همه فایل‌های ذخیره شده در آنجا حذف می‌شود؟ این عملکرد دیگر قابل بازگشت نیست!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"پاک کردن همهٔ موارد"</string>
-    <string name="media_format_gesture_prompt" msgid="3109349468816856670">"الگوی بازگشایی قفل خود را بکشید"</string>
     <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"‏برای تأیید پاک کردن حافظهٔ USB، باید الگوی قفل گشایی خود را بکشید."</string>
     <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"‏برای تأیید پاک کردن کارت SD، باید الگوی قفل گشایی خود را بکشید."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"تنظیمات تماس"</string>
@@ -1087,6 +1088,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"لطفاً سیم کارت را وارد کنید و دوباره راه‌اندازی کنید"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"لطفاً به اینترنت وصل شوید"</string>
     <string name="location_title" msgid="1029961368397484576">"موقعیت مکانی شما"</string>
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"نمایه کار"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"محل نمایه کارتان"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"شرکتتان آن را خاموش کرده است"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"حالت"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"دقت زیاد"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"صرفه‌جویی در باتری"</string>
@@ -1124,6 +1128,7 @@
     <string name="copyright_title" msgid="865906688917260647">"حق نسخه‌برداری"</string>
     <string name="license_title" msgid="1990487604356037871">"مجوز"</string>
     <string name="terms_title" msgid="7697580845616764642">"شرایط و مقررات"</string>
+    <string name="webview_license_title" msgid="2813507464175738967">"‏مجوز System WebView"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"کاغذدیواری‌ها"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"‏ارائه‌دهندگان تصویر ماهواره‌ای:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"مجوزهای منبع باز"</string>
@@ -1237,7 +1242,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"‏حافظهٔ USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"‏در کارت SD"</string>
     <string name="disabled" msgid="9206776641295849915">"غیر فعال شد"</string>
-    <string name="not_installed" msgid="1475144352069281880">"نصب نشده"</string>
+    <string name="not_installed" msgid="2797554494953450291">"برای این کاربر نصب نشده است"</string>
     <string name="no_applications" msgid="7336588977497084921">"برنامه‌ای موجود نیست."</string>
     <string name="internal_storage" msgid="1584700623164275282">"حافظهٔ داخلی"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"‏حافظهٔ USB"</string>
@@ -1434,8 +1439,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"صفحه هرگز در حین شارژ شدن به حالت خواب نمی‌رود"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"‏فعال کردن گزارش تجسس Bluetooth HCI"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"‏ذخیره تمامی بسته‌های HCI بلوتوث در یک فایل"</string>
-    <string name="oem_unlock_enable" msgid="6629321276287913315">"‏فعال کردن OEM بدون قفل"</string>
-    <string name="oem_unlock_enable_summary" msgid="3546686263996628110">"‏اجازه به دستگاه برای بازکردن قفل OEM"</string>
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"باز کردن قفل سازنده تجهیزات اصلی"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"اجازه دهید قفل بوت‌لودر باز شود"</string>
+    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"پین خودتان را وارد کنید"</string>
+    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"پین دستگاهتان را وارد کنید تا بازکردن قفل سازنده محصول اصلی را فعال کنید"</string>
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"اجازه می‌هید قفل سازنده تجهیزات اصلی باز شود؟"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"اخطار: وقتی این تنظیم روشن باشد، ویژگی‌های حفاظتی دستگاه در این دستگاه کار نمی‌کند."</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"گواهینامه نمایش بدون سیم"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"‏فعال کردن گزارش‌گیری طولانی Wi‑Fi"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"‏Wi‑Fi فعال برای واگذاری به شبکه سلولی"</string>
@@ -1538,6 +1547,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"زیرنویس‌ها شبیه به این هستند"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"پیش‌فرض"</string>
+    <string name="color_title" msgid="4258931051732243983">"رنگی"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"پیش‌فرض"</string>
     <string name="color_none" msgid="3475640044925814795">"هیچ‌کدام"</string>
     <string name="color_white" msgid="8045195170201590239">"سفید"</string>
@@ -1595,12 +1605,12 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"<xliff:g id="REMAIN">%1$s</xliff:g> مانده"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> مانده تا شارژ کامل"</string>
-    <string name="power_discharging_duration" msgid="7125493014448497620">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - تقریباً <xliff:g id="TIME">%2$s</xliff:g> مانده است"</string>
-    <string name="power_charging" msgid="712751285832976915">"<xliff:g id="LEVEL">%1$d</xliff:g>٪ - ‏<xliff:g id="STATE">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration" msgid="4802183864773082009">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> مانده تا شارژ کامل"</string>
-    <string name="power_charging_duration_ac" msgid="3611179931297824699">"‏<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> مانده تا شارژ کامل از طریق AC"</string>
-    <string name="power_charging_duration_usb" msgid="1106605348913397583">"‏<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> مانده تا شارژ کامل از طریق USB"</string>
-    <string name="power_charging_duration_wireless" msgid="633606920144617227">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> مانده تا شارژ کامل به صورت بی‌سیم"</string>
+    <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> - تقریباً ‏<xliff:g id="TIME">%2$s</xliff:g> باقی مانده است"</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> تا شارژ کامل"</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> تا شارژ کامل با جریان متناوب"</string>
+    <string name="power_charging_duration_usb" msgid="182405645340976546">"‏<xliff:g id="LEVEL">%1$s</xliff:g> - ‏<xliff:g id="TIME">%2$s</xliff:g> تا شارژ کامل از طریق USB"</string>
+    <string name="power_charging_duration_wireless" msgid="1829295708243159464">"<xliff:g id="LEVEL">%1$s</xliff:g> - ‏<xliff:g id="TIME">%2$s</xliff:g> تا شارژ کامل به طور بی‌سیم"</string>
     <string name="power_usage_list_summary" msgid="2409288197839512482">"استفاده از زمان آخرین شارژ کامل"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"استفاده از باتری از زمان جدا شدن"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"استفاده از باتری از زمان بازنشانی"</string>
@@ -1617,7 +1627,6 @@
     <string name="awake" msgid="387122265874485088">"زمان بیداری دستگاه"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"‏Wi-Fi به موقع"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"‏Wi-Fi به موقع"</string>
-    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"جزئیات سابقه"</string>
     <string name="details_title" msgid="3792801565213935385">"جزئیات استفاده"</string>
     <string name="details_subtitle" msgid="32593908269911734">"جزئیات استفاده"</string>
@@ -1683,13 +1692,13 @@
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> از زمان جدا کردن"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"در حین قطع اتصال آخر برای <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"مقدار کل استفاده"</string>
-    <string name="menu_stats_refresh" msgid="1676215433344981075">"تازه کردن"</string>
+    <string name="menu_stats_refresh" msgid="1676215433344981075">"بازخوانی"</string>
     <string name="process_kernel_label" msgid="3916858646836739323">"‏سیستم عامل Android"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"سرور رسانه"</string>
     <string name="battery_saver" msgid="1426682272004907982">"ذخیره کننده باتری"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"روشن شدن خودکار"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"هرگز"</string>
-    <string name="battery_saver_turn_on_automatically_pct" msgid="3033681629861428940">"‏در %1$d%% باتری"</string>
+    <string name="battery_saver_turn_on_automatically_pct" msgid="7536784431655058267">"‏در %1$s نیروی باتری"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"آمار فرآیند"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"آمار دقیق برای فرآیندهای در حال اجرا"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"استفاده از حافظه"</string>
@@ -1813,7 +1822,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"سخت‌افزاری"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"فقط نرم‌افزاری"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"اطلاعات کاربری این کاربر در دسترس نیست"</string>
-    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"رسم الگوی بازگشایی"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"باید الگوی بازگشایی را رسم کنید تا نصب مدارک صلاحیت تأیید شود."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"گذرواژه را برای حافظه اطلاعات کاربری تایپ کنید."</string>
@@ -1843,6 +1851,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"داده‌های برنامه شامل شود"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"بازیابی خودکار"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"هنگام نصب مجدد برنامه، تنظیمات و داده‌های نسخهٔ پشتیبان بازیابی شود"</string>
+    <string name="backup_inactive_title" msgid="5355557151569037197">"سرویس پشتیبان‌گیری غیرفعال است."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"این مورد توسط خط‌مشی دستگاهتان تنظیم شده است."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"گذرواژه نسخهٔ پشتیبان دسک‌تاپ"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"نسخه‌های پشتیبان کامل دسک‌تاپ در حال حاضر محافظت نمی‌شوند"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"برای تغییر یا حذف گذرواژه برای نسخه‌های پشتیبان کامل دسک‌تاپ لمس کنید"</string>
@@ -1879,7 +1889,7 @@
     <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"افزودن یک شبکه"</string>
     <string name="wifi_setup_not_connected" msgid="6997432604664057052">"متصل نیست"</string>
     <string name="wifi_setup_add_network" msgid="5939624680150051807">"افزودن شبکه"</string>
-    <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"تازه کردن لیست"</string>
+    <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"بازخوانی فهرست"</string>
     <string name="wifi_setup_skip" msgid="6661541841684895522">"رد شدن"</string>
     <string name="wifi_setup_next" msgid="3388694784447820477">"بعدی"</string>
     <string name="wifi_setup_back" msgid="144777383739164044">"برگشت"</string>
@@ -1952,7 +1962,11 @@
     <string name="enter_password" msgid="8035706727471334122">"‏برای شروع Android، گذرواژه‌تان را وارد کنید"</string>
     <string name="enter_pin" msgid="5305333588093263790">"‏برای شروع Android، پینتان را وارد کنید"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"‏برای شروع Android، الگویتان را رسم"</string>
-    <string name="try_again" msgid="4272075051293936921">"دوباره امتحان کنید."</string>
+    <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"الگوی اشتباه"</string>
+    <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"گذرواژه اشتباه"</string>
+    <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"پین اشتباه"</string>
+    <string name="checking_decryption" msgid="8287458611802609493">"در حال بررسی…"</string>
+    <string name="starting_android" msgid="8581493237458496835">"‏در حال راه‌اندازی Android"</string>
     <string name="delete" msgid="4219243412325163003">"حذف"</string>
     <string name="misc_files" msgid="6720680815969643497">"فایل‌های متفرقه"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"<xliff:g id="NUMBER">%1$d</xliff:g> مورد انتخاب شده از <xliff:g id="TOTAL">%2$d</xliff:g> مورد"</string>
@@ -1990,8 +2004,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"‏همیشه از GPU در ترکیب صفحه استفاده شود"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"شبیه‌سازی فضای رنگ"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"‏فعال کردن ردیابی‌های OpenGL"</string>
-    <string name="use_nuplayer" msgid="5699257393367904387">"‏استفاده از NuPlayer (آزمایشی)"</string>
-    <string name="use_nuplayer_summary" msgid="1991479067478516714">"‏استفاده از NuPlayer به جای AwesomePlayer"</string>
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"‏استفاده از AwesomePlayer (توصیه نمی‌شود)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"‏برای بازپخش اکثر رسانه‌ها، به‌جای NuPlayer از AwesomePlayer استفاده کنید"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"‏غیرفعال کردن مسیریابی صوتی USB"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"‏غیرفعال کردن مسیریابی خودکار به وسایل جانبی صوتی USB"</string>
     <string name="debug_layout" msgid="5981361776594526155">"نمایش محدوده‌های طرح‌بندی"</string>
@@ -2167,7 +2181,6 @@
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"افزودن کاربر یا نمایه"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"افزودن کاربر"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"نمایهٔ محدودشده"</string>
-    <string name="user_summary_managed_profile" msgid="7369539529693048111">"نمایه کاری"</string>
     <string name="user_need_lock_message" msgid="2596365678651842785">"قبل از ایجاد یک نمایه محدود، باید یک قفل صفحه را برای محافظت از برنامه‌ها و داده‌های شخصی خود تنظیم کنید."</string>
     <string name="user_set_lock_button" msgid="8311219392856626841">"تنظیم قفل"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"تنظیم نشده"</string>
@@ -2298,11 +2311,13 @@
     <string name="sim_cellular_data_unavailable_summary" msgid="3654805961942166428">"برای انتخاب سیم‌کارتی برای داده‌ها، این گزینه را لمس کنید"</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"همیشه این سیم برای تماس‌‌ها استفاده شود"</string>
     <string name="select_sim_for_data" msgid="2366081042162853044">"یک سیم کارت برای داده‌ انتخاب کنید"</string>
+    <string name="data_switch_started" msgid="2040761479817166311">"در حال تغییر سیم‌کارت داده، این کار ممکن است تا یک دقیقه طول بکشد..."</string>
     <string name="select_sim_for_calls" msgid="3503094771801109334">"تماس با"</string>
     <string name="sim_select_card" msgid="211285163525563293">"انتخاب سیم‌کارت"</string>
     <string name="sim_card_number_title" msgid="7845379943474336488">"سیم‌کارت <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"سیم‌کارت خالی است"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"نام سیم‌کارت"</string>
+    <string name="sim_name_hint" msgid="7038643345238968930">"نام سیم‌کارت را وارد کنید"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"‏شیار سیم‌کارت %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"شبکه مخابراتی"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"شماره"</string>
@@ -2312,7 +2327,6 @@
     <string name="color_purple" msgid="3888532466427762504">"بنفش"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"هیچ سیم‌کارتی جاگذاری نشده است"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"وضعیت سیم‌کارت"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"اطلاعات مربوط به سیم‌کارت"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"برگرداندن تماس از سیم‌کارت پیش‌فرض"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"سیم‌کارت برای تماس‌های خروجی"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"سایر تنظیمات تماس"</string>
@@ -2320,8 +2334,11 @@
     <string name="preferred_network_offload_header" msgid="2321173571529106767">"غیرفعال کردن پخش نام شبکه"</string>
     <string name="preferred_network_offload_footer" msgid="5857279426054744020">"غیرفعال کردن پخش نام شبکه، مانع از دسترسی اشخاص ثالث به اطلاعات شبکه شما می‌شود."</string>
     <string name="preferred_network_offload_popup" msgid="2252915199889604600">"غیرفعال کردن پخش نام شبکه از اتصال خودکار به شبکه‌های مخفی جلوگیری می‌کند."</string>
+    <string name="sim_signal_strength" msgid="9144010043784767984">"<xliff:g id="DBM">%1$d</xliff:g> dBm <xliff:g id="ASU">%2$d</xliff:g> asu"</string>
+    <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>
+    <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>
@@ -2330,31 +2347,31 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"جستجوهای اخیر"</string>
     <string name="search_results_label" msgid="4163304782363526148">"نتایج"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"‏wifi ‏اتصال شبکه wi-fi"</string>
-    <string name="keywords_more_default_sms_app" msgid="2744404159003574745">"پیام نوشتاری"</string>
-    <string name="keywords_more_mobile_networks" msgid="7813380887358745769">"شبکه تلفن همراه تلفن همراه شرکت مخابراتی بی‌سیم"</string>
+    <string name="keywords_more_default_sms_app" msgid="895656981962034647">"پیام نوشتاری ارسال پیامک پیام‌ها پیام‌رسانی"</string>
+    <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"‏شبکه تلفن همراه تلفن همراه شرکت مخابراتی بی‌سیم داده 4g 3g 2g lte"</string>
     <string name="keywords_home" msgid="3626170808219458848">"راه‌انداز"</string>
     <string name="keywords_display" msgid="6709007669501628320">"صفحه نمایش صفحه لمسی"</string>
-    <string name="keywords_display_brightness_level" msgid="8636451602230815191">"صفحه نمایش تار صفحه لمسی"</string>
-    <string name="keywords_display_auto_brightness" msgid="8070218600502753102">"صفحه نمایش تار صفحه لمسی"</string>
-    <string name="keywords_display_wallpaper" msgid="4315466287469834939">"پس‌زمینه"</string>
+    <string name="keywords_display_brightness_level" msgid="8923289340474728990">"باتری صفحه‌لمسی صفحه کم نور"</string>
+    <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"باتری صفحه‌لمسی صفحه کم نور"</string>
+    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"پس‌زمینه شخصی‌سازی سفارشی‌سازی نمایشگر"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"اندازه نوشتار"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"پروژه"</string>
-    <string name="keywords_storage" msgid="7007275853993419928">"فضا دیسک درایو سخت"</string>
-    <string name="keywords_battery" msgid="3992479295298655138">"نیرو"</string>
-    <string name="keywords_spell_checker" msgid="4509482591225399210">"املا"</string>
+    <string name="keywords_storage" msgid="6572905220031852173">"فضا دیسک دیسک سخت دستگاه استفاده"</string>
+    <string name="keywords_battery" msgid="2096185085932675704">"مصرف نیرو شارژ"</string>
+    <string name="keywords_spell_checker" msgid="6106749039734174140">"املا فرهنگ لغت غلط‌گیر املا تصحیح خودکار"</string>
     <string name="keywords_voice_input" msgid="3519547605812413860">"تشخیص‌دهنده ورودی گفتار زبان صحبت هندزفری تشخیص هندزفری کلمه توهین‌آمیز صوتی سابقه بلوتوث"</string>
-    <string name="keywords_text_to_speech_output" msgid="8207889472282225512">"سرعت زبان پیش‌فرض صحبت گفتار"</string>
-    <string name="keywords_date_and_time" msgid="7666950126499155141">"ساعت"</string>
-    <string name="keywords_factory_data_reset" msgid="3693730656843989732">"پاک کردن حذف"</string>
+    <string name="keywords_text_to_speech_output" msgid="392447904221657930">"‏رتبه‌بندی زبان پیش‌فرض صحبت کردن صحبت tts دسترس‌پذیری خواننده نابینا"</string>
+    <string name="keywords_date_and_time" msgid="2631808108134830066">"ساعت نظامی"</string>
+    <string name="keywords_factory_data_reset" msgid="4355133848707691977">"پاک کردن حذف کردن بازیابی پاک کردن برداشتن"</string>
     <string name="keywords_printing" msgid="1701778563617114846">"چاپگر"</string>
     <string name="keywords_sounds_and_notifications" msgid="5965996187974887000">"بیپ بلندگو"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="2912933812460077912">"مزاحم نشوید قطع وقفه توقف"</string>
     <string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
-    <string name="keywords_location" msgid="782326973714313480">"گزارش‌دهی سابقه مکان اطراف"</string>
+    <string name="keywords_location" msgid="782326973714313480">"گزارش‌دهی سابقه موقعیت مکانی اطراف"</string>
     <string name="keywords_location_mode" msgid="8584992704568356084">"دقت"</string>
     <string name="keywords_accounts" msgid="1957925565953357627">"حساب"</string>
     <string name="keywords_users" msgid="4673901601478559100">"محدودیت محدود محدود شده"</string>
-    <string name="keywords_keyboard_and_ime" msgid="1103378692379215672">"‏تصحیح نوشتار تصحیح صدا لرزش خودکار زبان اشاره پیشنهاد دادن پیشنهاد طرح زمینه توهین‌آمیز کلمه نوع شکلک emoji"</string>
+    <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"تصحیح نوشتار تصحیح صدا لرزش خودکار زبان اشاره پیشنهاد دادن پیشنهاد طرح زمینه کلمه توهین‌آمیز نوع ایموجی بین‌المللی"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"لغزاندن گذرواژه الگو پین"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"‏تنظیم برچسب NFC برای Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"نوشتن"</string>
@@ -2371,7 +2388,6 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"میزان صدای اعلان"</string>
     <string name="zen_mode_settings_title" msgid="7014915558669122902">"وقفه‌ها"</string>
     <string name="zen_mode_option_title" msgid="5061978632306007914">"هنگام ورود تماس‌ها و اعلان‌ها"</string>
-    <string name="zen_mode_option_title_novoice" msgid="6680706009915204785">"هنگام ورود اعلان‌ها"</string>
     <string name="zen_mode_option_off" msgid="3167702608910820883">"همیشه وقفه داشته باشد"</string>
     <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"فقط وقفه‌های اولویت‌دار مجاز باشند"</string>
     <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"وقفه نداشته باشد"</string>
@@ -2429,14 +2445,17 @@
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"انجام شد"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"تا وقتی آن را خاموش کنید"</string>
     <string name="zen_mode_important_category" msgid="8123274463331022993">"وقفه‌های اولویت‌دار"</string>
-    <string name="zen_mode_downtime_category" msgid="4730179065426038108">"زمان استراحت (فقط وقفه‌های اولویت‌دار)"</string>
+    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"فرویش"</string>
     <string name="zen_mode_downtime_days" msgid="3361856902633311616">"روزها"</string>
     <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"هیچ‌کدام"</string>
+    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"وقفه مجاز است"</string>
+    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"فقط اولویت‌دار"</string>
+    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"هیچ‌کدام"</string>
     <string name="zen_mode_automation_category" msgid="4653551005950835761">"اتوماسیون"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"روشن کردن خودکار"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">"، "</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"هرگز"</string>
-    <string name="zen_mode_phone_calls" msgid="8956214416859303966">"تماس‌ها"</string>
+    <string name="zen_mode_calls" msgid="7051492091133751208">"تماس‌ها"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"پیام‌ها"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"تماس‌ها/پیام‌ها از"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"همه"</string>
@@ -2450,7 +2469,9 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"شب‌ شنبه تا پنجشنبه"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"زمان شروع"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"زمان پایان"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> روز بعد"</string>
+    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> روز بعد"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> یا هر هشداری قبل از آن"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> روز بعد یا هر هشداری قبل از آن"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"اعلان‌های برنامه"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"تنظیمات اعلان"</string>
     <string name="device_feedback" msgid="3238056036766293294">"ارسال بازخورد درباره این دستگاه"</string>
@@ -2458,7 +2479,11 @@
     <string name="switch_on_text" msgid="1124106706920572386">"روشن"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"خاموش"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"پین کردن صفحه"</string>
-    <string name="screen_pinning_description" msgid="7091642350452605379">"با روشن کردن قابلیت پین کردن صفحه، می‌توانید از آن استفاده کنید تا صفحه فعلی تا وقتی پین آن را برمی‌دارید، در دید باقی بماند.\n\nبرای استفاده از پین کردن صفحه:\n\n‏۱. مطمئن شوید پین کردن صفحه روشن است.\n\n‏۲. صفحه‌ای را که می‌خواهید پین کنید، باز کنید.\n\n‏۳. «نمای کلی» را لمس کنید.\n\n‏۴. نماد پین را لمس کنید."</string>
+    <string name="screen_pinning_description" msgid="1137904524037468263">"زمانی که این تنظیم روشن است، می‌توانید از پین کردن صفحه نمایش استفاده کنید و صفحه نمایش کنونی را در نما نگه‌دارید تا زمانی که پین برداشته شود.\n\nبرای استفاده از پین کردن صفحه:\n\n۱. مطمئن شوید که پین کردن صفحه نمایش روشن است.\n\n۲.صفحه مورد نظر را برای پین کردن باز کنید.\n\n۳. نمای کلی را لمس کنید.\n\n۴. انگشتتان را به سرعت به بالا بکشید و سپس نماد پین را لمس کنید."</string>
+    <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"درخواست الگوی باز کردن قفل قبل از برداشتن پین"</string>
+    <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"درخواست کد پین قبل از برداشتن پین"</string>
+    <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"درخواست گذرواژه قبل از برداشتن پین"</string>
+    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"قفل کردن دستگاه هنگام برداشتن پین"</string>
     <string name="managed_user_title" msgid="8101244883654409696">"نمایه کاری"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(تجربی)"</string>
     <string name="display_auto_rotate_title" msgid="6176450657107806043">"وقتی دستگاه چرخانده می‌شود"</string>
@@ -2467,7 +2492,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"ماندن در نمای منظره"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"ماندن در جهت کنونی"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"‏اطلاعات IMEI"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"‏اطلاعات مربوط به IMEI"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"رمزگذاری"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"ادامه"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"می‌توانید برای محافظت بیشتر از دستگاه، قبل از راه‌اندازی آن، پینتان را درخواست کنید. تا زمانی که دستگاه راه‌اندازی نشود، نمی‌تواند تماس‌ها، پیام‌ها، یا اعلان‌ها را، از جمله زنگ‌های هشدار، دریافت کند. \n\nاین امر به حفاظت از اطلاعات در دستگاه‌های گم‌شده یا دزدیده شده کمک می‌کند."</string>
@@ -2485,4 +2509,7 @@
     <string name="encrypt_talkback_dialog_message_pin" msgid="1890374082842868489">"هنگامی که برای راه‌اندازی این دستگاه، پین خودتان را وارد می‌کنید، سرویس‌های دسترس‌پذیری مانند <xliff:g id="SERVICE">%1$s</xliff:g> هنوز در دسترس نیستند."</string>
     <string name="encrypt_talkback_dialog_message_pattern" msgid="4474332516537386384">"هنگامی که برای راه‌اندازی این دستگاه، الگویتان را وارد می‌کنید، سرویس‌های دسترس‌پذیری مانند <xliff:g id="SERVICE">%1$s</xliff:g> هنوز در دسترس نیستند."</string>
     <string name="encrypt_talkback_dialog_message_password" msgid="8166099418487083927">"هنگامی که برای راه‌اندازی این دستگاه، گذرواژه‌تان را وارد می‌کنید، سرویس‌های دسترس‌پذیری مانند <xliff:g id="SERVICE">%1$s</xliff:g> هنوز در دسترس نیستند."</string>
+    <string name="imei_information_title" msgid="8499085421609752290">"‏اطلاعات IMEI"</string>
+    <string name="imei_information_summary" msgid="2074095606556565233">"‏اطلاعات مربوط به IMEI"</string>
+    <string name="slot_number" msgid="3762676044904653577">"(شکاف<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-fi/arrays.xml b/res/values-fi/arrays.xml
index 4f2c0d7..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>
@@ -527,4 +527,12 @@
     <item msgid="4338089220026248848">"Välimuistissa (toiminnan suorittaja)"</item>
     <item msgid="6652164677254579050">"Välimuistissa (tyhjä)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Turkoosi"</item>
+    <item msgid="8332294763632946560">"Sininen"</item>
+    <item msgid="2023216417616991392">"Indigo"</item>
+    <item msgid="3170497246594232819">"Violetti"</item>
+    <item msgid="4608643045752965568">"Vaaleanpunainen"</item>
+    <item msgid="6131821495505931173">"Punainen"</item>
+  </string-array>
 </resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index a226423..837d4e6 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>
@@ -180,7 +180,6 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s haluaa käyttää viestejäsi. Myönnetäänkö käyttöoikeus kohteeseen %2$s?"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Päivämäärä ja aika"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Valitse aikavyöhyke"</string>
-    <string name="normal_date_format" msgid="7636406984925498359">"Paikallinen (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Esikatselu:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Kirjasimen koko:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -269,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>
@@ -291,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>
@@ -322,8 +321,6 @@
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Valitse aikavyöhyke"</string>
     <string name="date_time_set_date_title" msgid="6928286765325608604">"Päiväys"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"Aseta päivämäärä"</string>
-    <string name="date_time_date_format_title" msgid="3976171711988766411">"Päiväyksen muoto"</string>
-    <string name="date_time_date_format" msgid="6951498879879281102">"Valitse päivämäärän muoto"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Lajittelu aakkosjärjestyksessä"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Lajittelu aikavyöhykkeen mukaan"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Päiväys"</string>
@@ -334,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>
@@ -361,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>
@@ -372,7 +369,8 @@
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Odota, puhelinta salataan. <xliff:g id="PERCENT">^1</xliff:g> % valmiina."</string>
     <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Odota, tablet-laitteesi salataan. Aikaa jäljellä: <xliff:g id="DURATION">^1</xliff:g>"</string>
     <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Odota, puhelimesi salataan. Aikaa jäljellä: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Yritä uudelleen <xliff:g id="DELAY">^1</xliff:g> sekunnin kuluttua."</string>
+    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"Avaa lukitus käynnistämällä tabletti uudelleen."</string>
+    <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"Avaa lukitus käynnistämällä puhelin uudelleen."</string>
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"Varoitus: laite tyhjennetään <xliff:g id="COUNT">^1</xliff:g> epäonnistuneen lukituksenpoistoyrityksen jälkeen!"</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Kirjoita salasana"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Salaus epäonnistui"</string>
@@ -382,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>
@@ -401,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>
@@ -412,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>
@@ -556,13 +556,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Kaiuttimena"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Musiikille ja medialle"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Muista asetukset"</string>
-    <string name="wifi_assistant_intro_setup" msgid="4605105515416995110">"Esitt.\nWi-Fi Assistant"</string>
-    <string name="wifi_assistant_no_thanks" msgid="2776983751990143934">"EI KIITOS"</string>
-    <string name="wifi_assistant_setup" msgid="3772423650475730906">"MÄÄRITYS"</string>
-    <string name="wifi_assistant_card_message" msgid="107811647784658536">"Muodosta yhteys käytettävissä oleviin verkkoihin automaattisesti Wi‑Fi Assistantin avulla."</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi‑Fi Assistant"</string>
-    <string name="wifi_assistant_title_message" msgid="6240721017579074015">"<xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> yhdistää sinut automaattisesti parhaaseen käytettävissä olevaan Wi‑Fi-verkkoon"</string>
-    <string name="wifi_assistant_open_app" msgid="4803044899535675063">"AVAA SOVELLUS"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Yhteys muodostettu Wi‑Fi-apurin kautta"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"Lähetysnäyttö"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Ota langaton näyttö käyttöön"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Bluetooth-laitteita ei löydy lähistöltä."</string>
@@ -587,54 +582,56 @@
     <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>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Ota käyttöön ja hallinnoi langattoman yhteyden tukiasemia"</string>
-    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Valitse wifi-verkko"</string>
+    <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>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Anna Googlen sijaintipalvelun ja muiden sovellusten etsiä verkkoja, vaikka Wi-Fi-yhteys on pois käytöstä"</string>
-    <string name="wifi_automatically_manage_title" msgid="6249976570008992746">"Automaatinen Wi‑Fi-hallinta"</string>
-    <string name="wifi_automatically_manage_summary" msgid="6952470763378312488">"<xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> saa hallinnoida Wi‑Fi-yhteyttä"</string>
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Käytä avointa Wi‑Fiä automaattisest"</string>
+    <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>
+    <string name="wifi_menu_remember" msgid="8814185749388713796">"Muista verkko"</string>
     <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-tunniste"</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_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 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>
@@ -643,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>
@@ -673,14 +670,16 @@
     <string name="wifi_unspecified" msgid="5431501214192991253">"(ei määritetty)"</string>
     <string name="wifi_remembered" msgid="4955746899347821096">"Tallennettu"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"Pois käytöstä"</string>
-    <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Huono verkkoyhteys, ei muodostettu"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP-kokoonpanovirhe"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Wi-Fi-yhteysvirhe"</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Todennusvirhe"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Ei kantoalueella"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Internetyhteyttä ei havaittu, yhteyttä ei muodosteta automaattisesti uudelleen."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS käytettävissä"</string>
     <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,12 +698,12 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"VAROITUS: jos ohitat Wi‑Fin, tablet-laitteen ensimmäiset lataukset ja päivitykset tehdään mobiilitiedonsiirtoyhteyden kautta. Vältä mahdolliset tiedonsiirtomaksut käyttämällä Wi-Fi-verkkoa."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"VAROITUS: jos ohitat Wi‑Fin, laitteen ensimmäiset lataukset ja päivitykset tehdään mobiilitiedonsiirtoyhteyden kautta. Vältä mahdolliset tiedonsiirtomaksut käyttämällä Wi-Fi-verkkoa."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"VAROITUS: jos ohitat Wi‑Fin, puhelimen ensimmäiset lataukset ja päivitykset tehdään mobiilitiedonsiirtoyhteyden kautta. Vältä mahdolliset tiedonsiirtomaksut käyttämällä Wi-Fi-verkkoa."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="2393880108322835846">"VAROITUS: jos ohitat Wi‑Fin, tablet-laitteella ei ole internetyhteyttä ensimmäisiä latauksia tai päivityksiä varten."</string>
-    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1707391993265558787">"VAROITUS: jos ohitat Wi‑Fin, laitteella ei ole internetyhteyttä ensimmäisiä latauksia tai päivityksiä varten."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="1556858507920033022">"VAROITUS: jos ohitat Wi‑Fin, laitteella ei ole internetyhteyttä ensimmäisiä latauksia tai päivityksiä varten."</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_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 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>
@@ -724,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>
@@ -740,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>
@@ -761,7 +760,6 @@
     <string name="ring_volume_title" msgid="7938706566797464165">"Soittoäänen voimakkuus"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Käytä värinää äänettömässä tilassa"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Ilmoituksen oletusääni"</string>
-    <string name="heads_up_enabled_title" msgid="1031078221910921622">"Näytä tärkeät ruudussa"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Soittoääni"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Ilmoitus"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Käytä ilmoituksille puhelun äänenvoimakkuutta"</string>
@@ -805,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>
@@ -834,7 +832,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Automaattinen kirkkaus"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Herätä nostamalla"</string>
     <string name="doze_title" msgid="2259176504273878294">"Ambient-näyttö"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"Aktivoi näyttö, kun laite otetaan käteen tai ilmoituksia saapuu"</string>
+    <string name="doze_summary" msgid="7128970177894383698">"Aktivoi näyttö, kun laite otetaan käteen tai ilmoituksia saapuu"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Kirjasimen koko"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Kirjasinkoko"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM-kortin lukitusasetukset"</string>
@@ -862,6 +860,10 @@
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Peruuta"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"SIM-kortteja löytyi useita"</string>
     <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>
@@ -884,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>
@@ -1012,6 +1014,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Tämä poistaa kaikki tablet-laitteesi "<b>"sisäisen tallennustilan"</b>" tiedot, kuten:\n\n"<li>"Google-tilisi"</li>\n<li>"Järjestelmä- ja sovellustiedot ja -asetukset"</li>\n<li>"Ladatut sovellukset"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Tämä poistaa kaikki puhelimesi "<b>"sisäisen tallennustilan"</b>" tiedot, kuten:\n\n"<li>"Google-tilisi"</li>\n<li>"Järjestelmä- ja sovellustiedot ja -asetukset"</li>\n<li>"Ladatut sovellukset"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Olet kirjautunut sisään seuraaviin tileihin:\n"</string>
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Tällä laitteella on muita paikalla olevia käyttäjiä.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musiikki"</li>\n<li>"Valokuvat"</li>\n<li>"Muut käyttäjän tiedot"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Jos haluat poistaa musiikin, kuvat ja muut käyttäjän tiedot, "<b>"USB-tallennustila"</b>" tulee tyhjentää."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Jos haluat poistaa musiikin, kuvat ja muut käyttäjän tiedot, "<b>"SD-kortti"</b>" tulee tyhjentää."</string>
@@ -1023,7 +1026,6 @@
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Palauta puhelimen asetukset"</string>
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Haluatko poistaa kaikki henkilökohtaiset tietosi ja lataamasi sovellukset? Toimintoa ei voi peruuttaa!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Poista kaikki"</string>
-    <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Piirrä lukituksenpoistokuvio"</string>
     <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Vahvista tehdasasetusten palautus piirtämällä lukituksenpoistokuviosi."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Palauttamista ei suoritettu, koska System Clear -palvelu ei ole käytettävissä."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Palautetaanko?"</string>
@@ -1041,7 +1043,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"Haluatko tyhjentää USB-tilan ja poistaa kaikki siellä olevat tiedostot? Toimintoa ei voi peruuttaa!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Haluatko tyhjentää SD-kortin ja poistaa kaikki siellä olevat tiedostot? Toimintoa ei voi peruuttaa!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Poista kaikki"</string>
-    <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Piirrä lukituksenpoistokuvio"</string>
     <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Vahvista USB-tallennustilan tyhjennys piirtämällä lukituksenpoistokuviosi."</string>
     <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Varmista SD-kortin tyhjennys piirtämällä lukituksenpoistokuviosi."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Puheluasetukset"</string>
@@ -1087,6 +1088,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Aseta SIM-kortti ja käynnistä uudelleen"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Muodosta yhteys internetiin"</string>
     <string name="location_title" msgid="1029961368397484576">"Oma sijainti"</string>
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Työprofiili"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Työprofiilin sijainti"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Yritys poisti sijainnin käyt."</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Tila"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Suuri tarkkuus"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Virransäästötila"</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>
@@ -1124,6 +1128,7 @@
     <string name="copyright_title" msgid="865906688917260647">"Tekijänoikeudet"</string>
     <string name="license_title" msgid="1990487604356037871">"Käyttölupa"</string>
     <string name="terms_title" msgid="7697580845616764642">"Käyttöehdot"</string>
+    <string name="webview_license_title" msgid="2813507464175738967">"WebView-järjestelmälisenssi"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Taustakuvat"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Satelliittikuvat:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Avoimen lähdekoodin käyttöluvat"</string>
@@ -1215,7 +1220,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>
@@ -1237,7 +1242,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB-tallennustila"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"SD-kortilla"</string>
     <string name="disabled" msgid="9206776641295849915">"Pois käytöstä"</string>
-    <string name="not_installed" msgid="1475144352069281880">"Ei asennettu"</string>
+    <string name="not_installed" msgid="2797554494953450291">"Ei asennettu tälle käyttäjälle"</string>
     <string name="no_applications" msgid="7336588977497084921">"Ei sovelluksia."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Sisäinen tallennustila"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB-tila"</string>
@@ -1419,7 +1424,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>
@@ -1434,8 +1439,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Näyttö ei sammu puhelimen latautuessa"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Ota Bluetoothin HCI-tarkkailuloki käyttöön"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Tallenna kaikki Bluetoothin HCl-paketit tiedostoon"</string>
-    <string name="oem_unlock_enable" msgid="6629321276287913315">"Käytä OEM-lukituksen av."</string>
-    <string name="oem_unlock_enable_summary" msgid="3546686263996628110">"Salli laitteen OEM-lukituksen avaus"</string>
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM:n lukituksen avaus"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Salli käynnistysohjelman lukituksen avaaminen"</string>
+    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Syötä PIN-koodisi"</string>
+    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Anna laitteen PIN-koodi OEM-lukituksen avauksen käyttöön ottamiseksi"</string>
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Sallitaanko OEM:n lukituksen avaus?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"VAROITUS: laitteen suojaustoiminnot eivät toimi tämän asetuksen ollessa käytössä."</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Langattoman näytön sertifiointi"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Käytä Wi-Fin laajennettua lokikirjausta"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Aggressiivinen handover: Wi-Fi-matkapuh."</string>
@@ -1491,11 +1500,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>
@@ -1538,6 +1547,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"Tekstitys näyttää tältä"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"Oletus"</string>
+    <string name="color_title" msgid="4258931051732243983">"Väri"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"Oletusarvo"</string>
     <string name="color_none" msgid="3475640044925814795">"Ei mitään"</string>
     <string name="color_white" msgid="8045195170201590239">"Valkoinen"</string>
@@ -1563,7 +1573,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>
@@ -1595,29 +1605,19 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"<xliff:g id="REMAIN">%1$s</xliff:g> jäljellä"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> latausaikaa jäljellä"</string>
-    <!-- String.format failed for translation -->
-    <!-- no translation found for power_discharging_duration (7125493014448497620) -->
-    <skip />
-    <string name="power_charging" msgid="712751285832976915">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – <xliff:g id="STATE">%2$s</xliff:g>"</string>
-    <!-- String.format failed for translation -->
-    <!-- no translation found for power_charging_duration (4802183864773082009) -->
-    <skip />
-    <!-- String.format failed for translation -->
-    <!-- no translation found for power_charging_duration_ac (3611179931297824699) -->
-    <skip />
-    <!-- String.format failed for translation -->
-    <!-- no translation found for power_charging_duration_usb (1106605348913397583) -->
-    <skip />
-    <!-- String.format failed for translation -->
-    <!-- no translation found for power_charging_duration_wireless (633606920144617227) -->
-    <skip />
+    <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> – jäljellä n. <xliff:g id="TIME">%2$s</xliff:g>"</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> kunnes täynnä"</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> kunnes täynnä (laturilataus)"</string>
+    <string name="power_charging_duration_usb" msgid="182405645340976546">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> kunnes täynnä (USB-lataus)"</string>
+    <string name="power_charging_duration_wireless" msgid="1829295708243159464">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> kunnes täynnä (WiFi-lataus)"</string>
     <string name="power_usage_list_summary" msgid="2409288197839512482">"Käyttö edellisen täyden latauksen jälk."</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Akun käyttö laturin irrottamisen jälkeen"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Akun käyttö tilastojen tyhjentämisen jälkeen"</string>
     <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,13 +1627,12 @@
     <string name="awake" msgid="387122265874485088">"Laitteen käytössäoloaika"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi-yhteyden käytössäoloaika"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi-yhteyden käytössäoloaika"</string>
-    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Historiatiedot"</string>
     <string name="details_title" msgid="3792801565213935385">"Käyttötiedot"</string>
     <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>
@@ -1653,8 +1652,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>
@@ -1677,7 +1676,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>
@@ -1699,9 +1698,7 @@
     <string name="battery_saver" msgid="1426682272004907982">"Virransäästö"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Käynnistä automaattisesti"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Ei koskaan"</string>
-    <!-- String.format failed for translation -->
-    <!-- no translation found for battery_saver_turn_on_automatically_pct (3033681629861428940) -->
-    <skip />
+    <string name="battery_saver_turn_on_automatically_pct" msgid="7536784431655058267">"kun akkua jäljellä %1$s"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Käsittelytiedot"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Käsittelyn tarkat tiedot"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Muistin käyttö"</string>
@@ -1794,7 +1791,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>
@@ -1825,7 +1822,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Laitteiston tukema"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Vain ohjelmisto"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"Kirjautumistunnukset eivät ole tämän käyttäjän käytettävissä"</string>
-    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Piirrä lukituksenpoistokuvio"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Vahvista kirjautumistunnuksien asennus piirtämällä lukituksenpoistokuviosi."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Anna käyttöoikeustietojen tallennustilan salasana."</string>
@@ -1849,12 +1845,14 @@
     <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>
     <string name="auto_restore_title" msgid="5397528966329126506">"Automaattinen palauttaminen"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Palauta varmuuskopioidut asetukset ja tiedot, kun sovellus asennetaan uudelleen."</string>
+    <string name="backup_inactive_title" msgid="5355557151569037197">"Varmuuskopiopalvelu ei ole käytössä."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"Tämä on määritetty laitteen käytännöissä."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Varmuuskop. salasana"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Tietokoneen kaikkien tietojen varmuuskopiointia ei ole tällä hetkellä suojattu."</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Muuta tai vaihda tietokoneen kaikkien tietojen varmuuskopioinnin salasana koskettamalla"</string>
@@ -1862,7 +1860,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>
@@ -1885,9 +1883,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>
@@ -1909,9 +1907,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>
@@ -1964,7 +1962,11 @@
     <string name="enter_password" msgid="8035706727471334122">"Käynnistä Android kirjoittamalla salasana"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Käynistä Android kirjoittamalla PIN-koodi"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Käynnistä Android piirtämällä kuvio"</string>
-    <string name="try_again" msgid="4272075051293936921">"Yritä uudelleen."</string>
+    <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"Väärä kuvio"</string>
+    <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"Väärä salasana"</string>
+    <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"Väärä PIN-koodi"</string>
+    <string name="checking_decryption" msgid="8287458611802609493">"Tarkistetaan…"</string>
+    <string name="starting_android" msgid="8581493237458496835">"Androidia käynnistetään"</string>
     <string name="delete" msgid="4219243412325163003">"Poista"</string>
     <string name="misc_files" msgid="6720680815969643497">"Muut tiedostot"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"valittu <xliff:g id="NUMBER">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -1988,7 +1990,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>
@@ -1999,11 +2001,11 @@
     <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_nuplayer" msgid="5699257393367904387">"Käytä NuPlayeria (kok.)"</string>
-    <string name="use_nuplayer_summary" msgid="1991479067478516714">"Käytä NuPlayeria AwesomePlayerin sijaan"</string>
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"Käytä AwesomePlayeria (vanh.)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"Toista useimmat mediat AwesomePlayerilla NuPlayerin sijaan"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"USB-äänireititys pois"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"Automaattireititys USB-äänilaitteisiin pois päältä"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Näytä asettelun rajat"</string>
@@ -2028,7 +2030,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>
@@ -2062,7 +2064,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>
@@ -2179,8 +2181,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_summary_managed_profile" msgid="7369539529693048111">"Työ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>
@@ -2236,7 +2237,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>
@@ -2285,7 +2286,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>
@@ -2310,11 +2311,13 @@
     <string name="sim_cellular_data_unavailable_summary" msgid="3654805961942166428">"Valitse SIM-kortti tiedonsiirtoa varten"</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"Käytä kaikille puheluille"</string>
     <string name="select_sim_for_data" msgid="2366081042162853044">"Valitse SIM-kortti tiedonsiirtoon"</string>
+    <string name="data_switch_started" msgid="2040761479817166311">"Vaihdetaan tiedonsiirron SIM-korttia, odota hetki…"</string>
     <string name="select_sim_for_calls" msgid="3503094771801109334">"Valitse puhelinoperaattori:"</string>
     <string name="sim_select_card" msgid="211285163525563293">"SIM-kortin valinta"</string>
     <string name="sim_card_number_title" msgid="7845379943474336488">"SIM-kortti <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"Tyhjä SIM"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"SIM-kortin nimi"</string>
+    <string name="sim_name_hint" msgid="7038643345238968930">"Anna SIM-kortin nimi"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"SIM-korttipaikka %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Operaattori"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Numero"</string>
@@ -2324,7 +2327,6 @@
     <string name="color_purple" msgid="3888532466427762504">"Violetti"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"Laitteessa ei ole SIM-kortteja"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"SIM-kortin tila"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"SIM-korttiin liittyvät tiedot"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"Soita takaisin oletus-SIM-kortilla"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"Lähtevien puheluiden SIM-kortti"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Muut puheluasetukset"</string>
@@ -2332,8 +2334,11 @@
     <string name="preferred_network_offload_header" msgid="2321173571529106767">"Älä lähetä verkon nimeä"</string>
     <string name="preferred_network_offload_footer" msgid="5857279426054744020">"Älä lähetä verkon nimeä -asetus estää kolmansia osapuolia urkkimasta verkkotietojasi."</string>
     <string name="preferred_network_offload_popup" msgid="2252915199889604600">"Älä lähetä verkon nimeä -asetus estää automaattisen yhdistämisen piilotettuihin verkkoihin."</string>
+    <string name="sim_signal_strength" msgid="9144010043784767984">"<xliff:g id="DBM">%1$d</xliff:g> dBm <xliff:g id="ASU">%2$d</xliff:g> asu"</string>
+    <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>
+    <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Kysy aina"</string>
     <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>
@@ -2341,23 +2346,23 @@
     <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_more_default_sms_app" msgid="2744404159003574745">"tekstiviesti"</string>
-    <string name="keywords_more_mobile_networks" msgid="7813380887358745769">"matkapuhelin solu operaattori langaton"</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>
     <string name="keywords_display" msgid="6709007669501628320">"näyttö kosketusnäyttö"</string>
-    <string name="keywords_display_brightness_level" msgid="8636451602230815191">"näytön himmennys kosketusnäyttö"</string>
-    <string name="keywords_display_auto_brightness" msgid="8070218600502753102">"näytön himmennys kosketusnäyttö"</string>
-    <string name="keywords_display_wallpaper" msgid="4315466287469834939">"tausta"</string>
+    <string name="keywords_display_brightness_level" msgid="8923289340474728990">"näytön himmennys kosketusnäyttö akku"</string>
+    <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"näytön himmennys kosketusnäyttö akku"</string>
+    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"tausta räätälöi muokkaa näyttö"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"tekstin koko"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"lähetys"</string>
-    <string name="keywords_storage" msgid="7007275853993419928">"tila levy kiintolevy"</string>
-    <string name="keywords_battery" msgid="3992479295298655138">"virta"</string>
-    <string name="keywords_spell_checker" msgid="4509482591225399210">"oikeinkirjoitus"</string>
+    <string name="keywords_storage" msgid="6572905220031852173">"levytila levy kiintolevy laite käyttö"</string>
+    <string name="keywords_battery" msgid="2096185085932675704">"virta käyttö lataus"</string>
+    <string name="keywords_spell_checker" msgid="6106749039734174140">"oikeinkirjoitus sanakirja oikoluku automaattikorjaus"</string>
     <string name="keywords_voice_input" msgid="3519547605812413860">"tunnistin syöte puhe puhu kieli handsfree kädet vapaana tunnistus loukkaava sana ääni historia bluetooth kuulokkeet"</string>
-    <string name="keywords_text_to_speech_output" msgid="8207889472282225512">"luokitus kieli oletus oletusarvo puhu puhe"</string>
-    <string name="keywords_date_and_time" msgid="7666950126499155141">"kello"</string>
-    <string name="keywords_factory_data_reset" msgid="3693730656843989732">"pyyhi poista"</string>
+    <string name="keywords_text_to_speech_output" msgid="392447904221657930">"nopeus kieli oletus puhua puhuminen tekstistä puheeksi esteettömyys lukija sokea"</string>
+    <string name="keywords_date_and_time" msgid="2631808108134830066">"kello 24-tuntinen"</string>
+    <string name="keywords_factory_data_reset" msgid="4355133848707691977">"pyyhi poista palauta tyhjennä poista"</string>
     <string name="keywords_printing" msgid="1701778563617114846">"tulostin"</string>
     <string name="keywords_sounds_and_notifications" msgid="5965996187974887000">"kaiutin äänimerkki"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="2912933812460077912">"älä häiritse keskeytä keskeytys tauko"</string>
@@ -2366,15 +2371,15 @@
     <string name="keywords_location_mode" msgid="8584992704568356084">"tarkkuus"</string>
     <string name="keywords_accounts" msgid="1957925565953357627">"tili"</string>
     <string name="keywords_users" msgid="4673901601478559100">"rajoitus rajoittaa rajoitettu"</string>
-    <string name="keywords_keyboard_and_ime" msgid="1103378692379215672">"teksti korjaus korjaa ääni värinä automaattinen kieli ele ehdota ehdotus teema loukkaava sana tyyppi emoji hymiö"</string>
+    <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"teksti korjaus korjaa ääni värinä automaattinen kieli ele ehdottaa ehdotus teema loukkaava sana kirjoita emoji kansainvälinen"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"liu\'uta salasana lukituksenpoistokuvio PIN-koodi"</string>
-    <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Määritä Wi-Fi ja NFC-tunniste"</string>
+    <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Määritä Wi-Fi ja NFC-tagi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Kirjoita"</string>
-    <string name="status_awaiting_tap" msgid="2130145523773160617">"Kirjoita napauttamalla tunnistetta…"</string>
+    <string name="status_awaiting_tap" msgid="2130145523773160617">"Kirjoita napauttamalla tagia…"</string>
     <string name="status_invalid_password" msgid="2575271864572897406">"Virheellinen salasana, yritä uudelleen."</string>
     <string name="status_write_success" msgid="5228419086308251169">"Onnistui!"</string>
-    <string name="status_failed_to_write" msgid="8072752734686294718">"Tietojen kirjoittaminen NFC-tunnisteeseen epäonnistui. Jos ongelma jatkuu, kokeile toista tunnistetta."</string>
-    <string name="status_tag_not_writable" msgid="2511611539977682175">"NFC-tunnisteeseen ei voi kirjoittaa. Käytä toista tunnistetta."</string>
+    <string name="status_failed_to_write" msgid="8072752734686294718">"Tietojen kirjoittaminen NFC-tagiin epäonnistui. Jos ongelma jatkuu, kokeile toista tagia."</string>
+    <string name="status_tag_not_writable" msgid="2511611539977682175">"NFC-tagiin ei voi kirjoittaa. Käytä toista tagia."</string>
     <string name="default_sound" msgid="8821684447333687810">"Oletusääni"</string>
     <string name="notification_settings" msgid="8791730980212496561">"Äänet ja ilmoitukset"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"Median äänenvoimakkuus"</string>
@@ -2383,7 +2388,6 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Ilmoituksen äänenvoimakkuus"</string>
     <string name="zen_mode_settings_title" msgid="7014915558669122902">"Häiriöt"</string>
     <string name="zen_mode_option_title" msgid="5061978632306007914">"Kun puheluita ja ilmoituksia saapuu"</string>
-    <string name="zen_mode_option_title_novoice" msgid="6680706009915204785">"Kun ilmoituksia saapuu"</string>
     <string name="zen_mode_option_off" msgid="3167702608910820883">"Häiritse aina"</string>
     <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Salli vain tärkeät häiriöt"</string>
     <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Älä häiritse"</string>
@@ -2413,8 +2417,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>
@@ -2433,22 +2437,25 @@
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Älä koskaan näytä ilmoituksia tästä sovelluksesta"</string>
     <string name="app_notification_priority_title" msgid="1967189807102076587">"Tärkeät"</string>
     <string name="app_notification_priority_summary" msgid="7513344552201639232">"Näytä ilmoitukset luettelon kärjessä ja jatka niiden näyttämistä kun laite on asetettu näyttämään vain tärkeät häiriöt"</string>
-    <string name="app_notification_sensitive_title" msgid="7707233094233553192">"Herkkä"</string>
+    <string name="app_notification_sensitive_title" msgid="7707233094233553192">"Yksityisluontoinen"</string>
     <string name="app_notification_sensitive_summary" msgid="2505314249332316395">"Piilota arkaluonteinen sisältö tämän sovelluksen ilmoituksista, kun laite on lukittu"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Estetty"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Tärkeät"</string>
-    <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Herkkä"</string>
+    <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Yksityisluontoinen"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Valmis"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Kunnes poistat tämän käytöstä"</string>
     <string name="zen_mode_important_category" msgid="8123274463331022993">"Tärkeät häiriöt"</string>
-    <string name="zen_mode_downtime_category" msgid="4730179065426038108">"Vapaalla (vain tärkeät häiriöt)"</string>
+    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Vapaalla"</string>
     <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Päivät"</string>
     <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Ei mitään"</string>
+    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Keskeytykset sallittu"</string>
+    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Vain tärkeät"</string>
+    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Ei mitään"</string>
     <string name="zen_mode_automation_category" msgid="4653551005950835761">"Automaattinen"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Ota automaattisesti käyttöön"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Ei koskaan"</string>
-    <string name="zen_mode_phone_calls" msgid="8956214416859303966">"Puhelut"</string>
+    <string name="zen_mode_calls" msgid="7051492091133751208">"Puhelut"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Viestit"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Saapuneet puhelut/viestit:"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Kuka tahansa"</string>
@@ -2462,7 +2469,9 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Arki-illat"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Aloitusaika"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Päättymisaika"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> seuraavana päivänä"</string>
+    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> seuraavana päivänä"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> tai hälytyksen yhteydessä"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> seuraavana päivänä tai hälytyksen yhteydessä"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Sovellusilmoitukset"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Ilmoitusasetukset"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Lähetä palautetta tästä laitteesta"</string>
@@ -2470,7 +2479,11 @@
     <string name="switch_on_text" msgid="1124106706920572386">"Käytössä"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Ei käytössä"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"Näytön kiinnitys"</string>
-    <string name="screen_pinning_description" msgid="7091642350452605379">"Kun asetus on käytössä, voit käyttää näytön kiinnitystä pitääksesi nykyisen näytön esillä, kunnes poistat kiinnityksen.\n\nNäytön kiinnityksen käyttäminen:\n\n1. Varmista, että näytön kiinnitys on käytössä.\n\n2. Avaa näyttö, jonka haluat kiinnittää.\n\n3. Valitse Viimeisimmät.\n\n4. Kosketa kiinnityskuvaketta."</string>
+    <string name="screen_pinning_description" msgid="1137904524037468263">"Kun asetus on käytössä, voit kiinnittää nykyisen näytön pitääksesi sen näkyvissä, kunnes poistat sen kiinnityksen.\n\nNäytön kiinnityksen käyttö:\n\n1. Varmista, että näytön kiinnitys on käytössä.\n\n2. Avaa kiinnitettävä näyttö.\n\n3. Valitse Viimeisimmät.\n\n4. Pyyhkäise ylös ja kosketa kiinnityskuvaketta."</string>
+    <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Pyydä lukituksenpoistokuviota ennen irrotusta"</string>
+    <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Pyydä PIN-koodi ennen irrotusta"</string>
+    <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Pyydä salasana ennen irrotusta"</string>
+    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Lukitse laite irrotuksen aikana"</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Työprofiili"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Kokeellinen)"</string>
     <string name="display_auto_rotate_title" msgid="6176450657107806043">"Kun laite käännetään"</string>
@@ -2479,7 +2492,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Säilytä vaakanäkymä"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Säilytä nykyinen suunta"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI-koodin tiedot"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI-koodiin liittyvät tiedot"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Salaus"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Jatka"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"Voit parantaa tämän laitteen suojausta vaatimalla PIN-koodin ennen käynnistystä. Ennen käynnistystä laite ei vastaanota puheluita, viestejä eikä ilmoituksia, mukaan lukien hälytykset. \n\nTämä auttaa suojaamaan kadonneen tai varastetun laitteen sisältämät tiedot."</string>
@@ -2497,4 +2509,7 @@
     <string name="encrypt_talkback_dialog_message_pin" msgid="1890374082842868489">"Kun annat PIN-koodisi käynnistääksesi tämän laitteen, käytettävyyspalvelut, kuten <xliff:g id="SERVICE">%1$s</xliff:g>, eivät ole vielä käytettävissä."</string>
     <string name="encrypt_talkback_dialog_message_pattern" msgid="4474332516537386384">"Kun annat mallin käynnistääksesi tämän laitteen, käytettävyyspalvelut, kuten <xliff:g id="SERVICE">%1$s</xliff:g>, eivät ole vielä käytettävissä."</string>
     <string name="encrypt_talkback_dialog_message_password" msgid="8166099418487083927">"Kun annat salasanasi käynnistääksesi tämän laitteen, käytettävyyspalvelut, kuten <xliff:g id="SERVICE">%1$s</xliff:g>, eivät ole vielä käytettävissä."</string>
+    <string name="imei_information_title" msgid="8499085421609752290">"IMEI-koodin tiedot"</string>
+    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI-koodiin liittyvät tiedot"</string>
+    <string name="slot_number" msgid="3762676044904653577">"(Paikka <xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-fr-rCA/arrays.xml b/res/values-fr-rCA/arrays.xml
index deedadc..a3e83c1 100644
--- a/res/values-fr-rCA/arrays.xml
+++ b/res/values-fr-rCA/arrays.xml
@@ -527,4 +527,12 @@
     <item msgid="4338089220026248848">"Mise en cache (client d\'activité)"</item>
     <item msgid="6652164677254579050">"Mise en cache (vide)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Turquoise"</item>
+    <item msgid="8332294763632946560">"Bleu"</item>
+    <item msgid="2023216417616991392">"Indigo"</item>
+    <item msgid="3170497246594232819">"Mauve"</item>
+    <item msgid="4608643045752965568">"Rose"</item>
+    <item msgid="6131821495505931173">"Rouge"</item>
+  </string-array>
 </resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index c16c653..3628dd4 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>
@@ -180,7 +180,6 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s souhaite accéder à vos messages. Autoriser l\'accès à %2$s?"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Date et heure"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Sélectionner le fuseau horaire"</string>
-    <string name="normal_date_format" msgid="7636406984925498359">"Format régional (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Aperçu :"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Taille de police :"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -215,7 +214,7 @@
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Tentatives :"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Service GPRS :"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Itinérance :"</string>
-    <string name="radio_info_imei_label" msgid="1220524224732944192">"Code IMEI :"</string>
+    <string name="radio_info_imei_label" msgid="1220524224732944192">"Code IIEM :"</string>
     <string name="radio_info_call_redirect_label" msgid="1654674226961476872">"Redirection des appels :"</string>
     <string name="radio_info_ppp_resets_label" msgid="3241667824729310546">"Nombre de réinitialisations PPP depuis le démarrage :"</string>
     <string name="radio_info_gsm_disconnects_label" msgid="1683069665736339820">"Déconnexions GSM :"</string>
@@ -291,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>
@@ -322,8 +321,6 @@
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Sélectionner le fuseau horaire"</string>
     <string name="date_time_set_date_title" msgid="6928286765325608604">"Date"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"Définir la date"</string>
-    <string name="date_time_date_format_title" msgid="3976171711988766411">"Format de la date"</string>
-    <string name="date_time_date_format" msgid="6951498879879281102">"Sél le format de la date"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Trier par ordre alphabétique"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Trier par fuseau horaire"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Date"</string>
@@ -372,7 +369,8 @@
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Veuillez patienter pendant le chiffrement de votre téléphone. <xliff:g id="PERCENT">^1</xliff:g> % effectué(s)."</string>
     <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Veuillez patienter pendant le chiffrement de votre tablette. Temps restant : <xliff:g id="DURATION">^1</xliff:g>"</string>
     <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Veuillez patienter pendant le chiffrement de votre téléphone. Temps restant : <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Réessayez dans <xliff:g id="DELAY">^1</xliff:g> secondes."</string>
+    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"Pour déverrouiller votre tablette, redémarrez-la."</string>
+    <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"Pour déverrouiller votre téléphone, redémarrez-le."</string>
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"Attention : Les données de votre appareil seront effacées si vous effectuez encore <xliff:g id="COUNT">^1</xliff:g> tentatives de déverrouillage infructueuses."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Saisissez votre mot de passe."</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Échec du chiffrement"</string>
@@ -401,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>
@@ -412,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>
@@ -556,14 +556,9 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Comme téléphone à haut-parleur"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Pour la musique et le multimédia"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Mémoriser ces paramètres"</string>
-    <string name="wifi_assistant_intro_setup" msgid="4605105515416995110">"Présentation de l\'\nAssistant Wi‑Fi"</string>
-    <string name="wifi_assistant_no_thanks" msgid="2776983751990143934">"NON, MERCI"</string>
-    <string name="wifi_assistant_setup" msgid="3772423650475730906">"CONFIGURER"</string>
-    <string name="wifi_assistant_card_message" msgid="107811647784658536">"Connectez-vous automatiquement aux réseaux à proximité à l\'aide d\'un assistant Wi‑Fi."</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Assistant Wi‑Fi"</string>
-    <string name="wifi_assistant_title_message" msgid="6240721017579074015">"<xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> vous connecte automatiquement au meilleur réseau Wi‑Fi disponible."</string>
-    <string name="wifi_assistant_open_app" msgid="4803044899535675063">"OUVRIR L\'APPLICATION"</string>
-    <string name="wifi_display_settings_title" msgid="2925465988657380522">"Écran de diffusion"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Connecté à l\'aide de l\'assistant Wi-Fi"</string>
+    <string name="wifi_display_settings_title" msgid="2925465988657380522">"Diffuser l\'écran"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Activer l\'affichage sans fil"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Aucun appareil détecté à proximité."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Connexion en cours…"</string>
@@ -592,7 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Paramètres Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Configurer et gérer les points d\'accès sans fil"</string>
-    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Sélectionner le Wi-Fi"</string>
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Sélectionnez un réseau Wi-Fi"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Sélectionner le Wi-Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Activation du Wi-Fi en cours…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Désactivation du Wi-Fi en cours…"</string>
@@ -607,8 +602,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"Recherche toujours disponible"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Toujours autoriser la recherche"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Autoriser le service de localisation de Google et les autres applications à rechercher des réseaux, même si le Wi-Fi est désactivé"</string>
-    <string name="wifi_automatically_manage_title" msgid="6249976570008992746">"Gérer automatiquement le Wi‑Fi"</string>
-    <string name="wifi_automatically_manage_summary" msgid="6952470763378312488">"Laisser <xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> gérer votre connexion Wi-Fi"</string>
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Utiliser automatiquement le Wi-Fi ouvert"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Laisser un assistant Wi‑Fi se connecter automatiquement aux réseaux ouverts jugés de bonne qualité"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Sélectionner un assistant"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Installer les certificats"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Pour améliorer la précision, entre autres, le service de localisation de Google et d\'autres applications peuvent rechercher des réseaux Wi-Fi à proximité, même lorsque le Wi-Fi est désactivé. Vous pouvez modifier ce paramètre dans Options avancées &gt; Recherche toujours disponible."</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Les applications peuvent rechercher des réseaux à proximité, même lorsque le Wi-Fi est désactivé. Vous pouvez modifier ce paramètre dans Options avancées &gt; Recherche toujours disponible."</string>
@@ -629,6 +625,7 @@
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Scanner"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Options avancées"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Se connecter au réseau"</string>
+    <string name="wifi_menu_remember" msgid="8814185749388713796">"Mémoriser ce réseau"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Retirer le réseau"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Modifier le réseau"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Écrire sur la balise NFC"</string>
@@ -673,9 +670,11 @@
     <string name="wifi_unspecified" msgid="5431501214192991253">"(non spécifié)"</string>
     <string name="wifi_remembered" msgid="4955746899347821096">"Enregistré"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"Désactivés"</string>
-    <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Mauvaise connexion Internet évitée"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"Échec de configuration de l\'adresse IP"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Échec de connexion Wi-Fi"</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Problème d\'authentification"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Hors de portée"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Aucun accès à Internet détecté, reconnexion automatique impossible"</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS disponible"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS disponible)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Entrez votre mot de passe réseau"</string>
@@ -699,9 +698,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"AVERTISSEMENT : Si vous ne configurez pas le Wi-Fi, votre tablette n\'utilisera que les données cellulaires pour les mises à jour et les téléchargements initiaux. Connectez-vous au Wi-Fi afin d\'éviter d\'éventuels frais liés à la consommation de données."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"AVERTISSEMENT : Si vous ne configurez pas le Wi-Fi, votre appareil n\'utilisera que les données cellulaires pour les mises à jour et les téléchargements initiaux. Connectez-vous au Wi-Fi afin d\'éviter d\'éventuels frais liés à la consommation de données."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"AVERTISSEMENT : Si vous ne configurez pas le Wi-Fi, votre téléphone n\'utilisera que les données cellulaires pour les mises à jour et les téléchargements initiaux. Connectez-vous au Wi-Fi afin d\'éviter d\'éventuels frais liés à la consommation de données."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="2393880108322835846">"AVERTISSEMENT : Si vous ne configurez pas le Wi-Fi, votre tablette ne disposera d\'aucune connexion Internet pour les mises à jour ou les téléchargements initiaux."</string>
-    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1707391993265558787">"AVERTISSEMENT : Si vous ne configurez pas le Wi-Fi, votre appareil ne disposera d\'aucune connexion Internet pour les mises à jour ou les téléchargements initiaux."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="1556858507920033022">"AVERTISSEMENT : Si vous ne configurez pas le Wi-Fi, votre téléphone ne disposera d\'aucune connexion Internet pour les mises à jour ou les téléchargements initiaux."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Si vous ignorez le Wi-Fi :\n\nVotre appareil ne sera pas connecté à Internet.\n\nVous ne recevrez pas de mises à jour logicielles jusqu\'à ce que vous vous connectiez à Internet.\n\nVous ne pouvez pas activer les fonctionnalités de protection de l\'appareil en ce moment."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Si vous ignorez le Wi-Fi :\n\nVotre appareil ne sera pas connecté à Internet. \n\nVous ne recevrez pas de mises à jour logicielles jusqu\'à ce que vous vous connectiez à Internet.\n\nVous ne pouvez pas activer les fonctionnalités de protection de l\'appareil en ce moment."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Si vous ignorez le Wi-Fi :\n\nVotre appareil ne sera pas connecté à Internet.\n\nVous ne recevrez pas de mises à jour logicielles jusqu\'à ce que vous vous connectiez à l\'Internet.\n\nVous ne pouvez pas activer les fonctionnalités de protection de l\'appareil en ce moment."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Connexion impossible de la tablette à ce réseau Wi-Fi."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"Impossible de connecter l\'appareil à ce réseau Wi-Fi."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Connexion impossible du téléphone à ce réseau Wi-Fi."</string>
@@ -761,7 +760,6 @@
     <string name="ring_volume_title" msgid="7938706566797464165">"Volume de la sonnerie"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrer en mode silencieux"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Son de notification par défaut"</string>
-    <string name="heads_up_enabled_title" msgid="1031078221910921622">"Fen. context. priorité élevée"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Sonnerie"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Notification"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Utiliser le volume des appels entrants pour les notifications"</string>
@@ -834,7 +832,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Ajuster automatiquement la luminosité"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Soulever pour activer"</string>
     <string name="doze_title" msgid="2259176504273878294">"Affichage en mode Veille"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"Activer l\'écran en cas de déplacement de l\'appareil ou d\'arrivée d\'une notification"</string>
+    <string name="doze_summary" msgid="7128970177894383698">"Activer l\'écran lorsque vous prenez l\'appareil ou recevez des notifications"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Taille de police"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Taille de police"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Paramètres de verrouillage de la carte SIM"</string>
@@ -862,6 +860,10 @@
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Annuler"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"Plusieurs cartes SIM détectées"</string>
     <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>
+    <string name="sim_preferred_title" msgid="5567909634636045268">"M. à jour la carte SIM préf.?"</string>
+    <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> est la seule carte SIM dans votre appareil. Voulez-vous utiliser cette carte SIM pour les données cellulaires, les appels et les textos?"</string>
     <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>
@@ -1012,6 +1014,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Cette action effacera toutes les données de la "<b>"mémoire de stockage interne"</b>" de votre tablette, y compris :\n\n"<li>"Votre compte Google"</li>\n<li>"Les données et paramètres du système et de l\'application"</li>\n<li>"Les applications téléchargées"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Cette action effacera toutes les données du "<b>"stockage interne"</b>" de votre téléphone, y compris :\n\n"<li>"Votre compte Google"</li>\n<li>"Les données et paramètres du système et de l\'application"</li>\n<li>"Les applications téléchargées"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Vous êtes actuellement connecté aux comptes suivants :\n"</string>
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"D\'autres personnes utilisent cet appareil.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musique"</li>\n<li>"Photos"</li>\n<li>"Autres données utilisateur"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Pour supprimer la musique, les photos et les autres données utilisateur, vous devez effacer la "<b>"mémoire de stockage USB"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Pour supprimer la musique, les photos et les autres données utilisateur, vous devez effacer la "<b>"carte SD"</b>"."</string>
@@ -1023,7 +1026,6 @@
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Réinitialiser le téléphone"</string>
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Effacer toutes vos informations personnelles et les applications téléchargées? Cette action est irréversible."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Tout effacer"</string>
-    <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Dessinez votre schéma de déverrouillage."</string>
     <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Vous devez dessiner votre schéma de déverrouillage pour confirmer le rétablissement de la configuration d\'usine."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Les données n\'ont pas été réinitialisées, car le service de nettoyage du système n\'est pas disponible."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Réinitialiser?"</string>
@@ -1041,7 +1043,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"Effacer la mémoire de stockage USB en supprimant tous les fichiers qu\'elle contient? Cette action est irréversible."</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Effacer la carte SD en supprimant tous les fichiers qu\'elle contient? Cette action est irréversible."</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Tout effacer"</string>
-    <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Dessinez votre schéma de déverrouillage."</string>
     <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Vous devez dessiner votre schéma de déverrouillage pour confirmer l\'effacement de la mémoire de stockage USB."</string>
     <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Vous devez dessiner votre schéma de déverrouillage pour confirmer l\'effacement de la carte SD."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Paramètres d\'appel"</string>
@@ -1087,6 +1088,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Insérez la carte SIM, puis redémarrez."</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Connectez-vous à Internet."</string>
     <string name="location_title" msgid="1029961368397484576">"My Location"</string>
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Profil professionnel"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Position pour profil profess."</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Désactivé par votre entreprise"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Mode"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Haute précision"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Économie de la batterie"</string>
@@ -1124,6 +1128,7 @@
     <string name="copyright_title" msgid="865906688917260647">"Droits d\'auteur"</string>
     <string name="license_title" msgid="1990487604356037871">"Licence"</string>
     <string name="terms_title" msgid="7697580845616764642">"Conditions d\'utilisation"</string>
+    <string name="webview_license_title" msgid="2813507464175738967">"Licence WebView du système"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Fonds d\'écran"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Fournisseurs d\'images satellite :\n© CNES/Astrium, DigitalGlobe, Bluesky 2014"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Licences Open Source"</string>
@@ -1237,7 +1242,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Mémoire de stockage USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Sur la carte SD"</string>
     <string name="disabled" msgid="9206776641295849915">"Désactivés"</string>
-    <string name="not_installed" msgid="1475144352069281880">"Non installée"</string>
+    <string name="not_installed" msgid="2797554494953450291">"Pas installée pour cet utilisateur"</string>
     <string name="no_applications" msgid="7336588977497084921">"Aucune application"</string>
     <string name="internal_storage" msgid="1584700623164275282">"Mémoire de stockage interne"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Mémoire de stockage USB"</string>
@@ -1434,8 +1439,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"L\'écran ne se met jamais en veille lors du chargement"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Activer le journal HCI Snoop Bluetooth"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Capturer tous les paquets HCI Bluetooth dans un fichier"</string>
-    <string name="oem_unlock_enable" msgid="6629321276287913315">"Activer le déverrouillage par le fabricant"</string>
-    <string name="oem_unlock_enable_summary" msgid="3546686263996628110">"Autoriser le déverrouillage de l\'appareil par le fabricant"</string>
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"Déverrouillage par le fabricant"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Autoriser le déverrouillage du fichier d\'amorce"</string>
+    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Entrez votre NIP"</string>
+    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Entrez votre NIP d\'appareil pour activer le déverrouillage OEM"</string>
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Permettre le déverrouillage par le fabricant?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"AVERTISSEMENT : Les fonctions de protection de l\'appareil ne fonctionneront pas sur cet appareil lorsque ce paramètre est activé."</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Certification de l\'affichage sans fil"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Autoriser enreg. données Wi-Fi détaillées"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Passage forcé du Wi-Fi aux données cellulaires"</string>
@@ -1538,6 +1547,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"Les sous-titres ressembleront à ceci"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"Par défaut"</string>
+    <string name="color_title" msgid="4258931051732243983">"Couleur"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"Par défaut"</string>
     <string name="color_none" msgid="3475640044925814795">"Aucun"</string>
     <string name="color_white" msgid="8045195170201590239">"Blanc"</string>
@@ -1595,12 +1605,12 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"Temps restant : <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> avant le chargement complet"</string>
-    <string name="power_discharging_duration" msgid="7125493014448497620">"<xliff:g id="LEVEL">%1$d</xliff:g> %% – Temps restant : environ <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="power_charging" msgid="712751285832976915">"<xliff:g id="LEVEL">%1$d</xliff:g> %% – <xliff:g id="STATE">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration" msgid="4802183864773082009">"<xliff:g id="LEVEL">%1$d</xliff:g> %% (chargée à 100 %% dans <xliff:g id="TIME">%2$s</xliff:g>)"</string>
-    <string name="power_charging_duration_ac" msgid="3611179931297824699">"<xliff:g id="LEVEL">%1$d</xliff:g> %% (chargée à 100 %% sur prise de courant dans <xliff:g id="TIME">%2$s</xliff:g>)"</string>
-    <string name="power_charging_duration_usb" msgid="1106605348913397583">"<xliff:g id="LEVEL">%1$d</xliff:g> %% (chargée à 100 %% par USB dans <xliff:g id="TIME">%2$s</xliff:g>)"</string>
-    <string name="power_charging_duration_wireless" msgid="633606920144617227">"<xliff:g id="LEVEL">%1$d</xliff:g> %% (chargée à 100 %% avec chargeur sans fil dans <xliff:g id="TIME">%2$s</xliff:g>)"</string>
+    <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> %% – Temps restant : environ <xliff:g id="TIME">%2$s</xliff:g>"</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> %% (chargée à 100 %% dans <xliff:g id="TIME">%2$s</xliff:g>)"</string>
+    <string name="power_charging_duration_ac" msgid="3969186192576594254">"<xliff:g id="LEVEL">%1$s</xliff:g> %% (charge complète sur c.a. dans <xliff:g id="TIME">%2$s</xliff:g>)"</string>
+    <string name="power_charging_duration_usb" msgid="182405645340976546">"<xliff:g id="LEVEL">%1$s</xliff:g> %% (chargée à 100 %% par USB dans <xliff:g id="TIME">%2$s</xliff:g>)"</string>
+    <string name="power_charging_duration_wireless" msgid="1829295708243159464">"<xliff:g id="LEVEL">%1$s</xliff:g> %% (chargée à 100 %% avec chargeur sans fil dans <xliff:g id="TIME">%2$s</xliff:g>)"</string>
     <string name="power_usage_list_summary" msgid="2409288197839512482">"Usage depuis la dernière charge complète"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Utilisation de la batterie depuis le débranchement"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Utilisation de la batterie depuis la dernière réinitialisation"</string>
@@ -1617,7 +1627,6 @@
     <string name="awake" msgid="387122265874485088">"Durée de fonctionnement de l\'appareil"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi/temps"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi/temps"</string>
-    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Détails de l\'historique"</string>
     <string name="details_title" msgid="3792801565213935385">"Détails d\'utilisation"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Détails d\'utilisation"</string>
@@ -1689,9 +1698,7 @@
     <string name="battery_saver" msgid="1426682272004907982">"Économie d\'énergie"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Activer automatiquement"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Jamais"</string>
-    <!-- String.format failed for translation -->
-    <!-- no translation found for battery_saver_turn_on_automatically_pct (3033681629861428940) -->
-    <skip />
+    <string name="battery_saver_turn_on_automatically_pct" msgid="7536784431655058267">"lorsque la pile atteint %1$s"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Statistiques des processus"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Statistiques détaillées sur les processus en cours d\'exécution"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Mémoire utilisée"</string>
@@ -1815,7 +1822,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Intégré au matériel"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Uniquement logiciel"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"Les identifiants ne sont pas accessibles pour cet utilisateur"</string>
-    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Dessinez votre schéma de déverrouillage."</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Pour confirmer l\'installation des certificats, vous devez dessiner votre schéma de déverrouillage."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Saisir le mot de passe de stockage des identifiants"</string>
@@ -1845,6 +1851,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"Inclure données applications"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Restauration automatique"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Lors de la réinstallation d\'une application, restaurer les paramètres et les données sauvegardées"</string>
+    <string name="backup_inactive_title" msgid="5355557151569037197">"Le service de sauvegarde est inactif."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"Cela est défini par la politique de votre appareil."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Mot de passe sauvegarde PC"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Les sauvegardes complètes sur PC ne sont pas protégées actuellement."</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Appuyez pour modifier ou supprimer le mot de passe utilisé pour les sauvegardes complètes sur PC."</string>
@@ -1954,7 +1962,11 @@
     <string name="enter_password" msgid="8035706727471334122">"Pour lancer Android, entrez votre mot de passe"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Pour lancer Android, entrez votre NIP"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Pour lancer Android, dessinez votre schéma."</string>
-    <string name="try_again" msgid="4272075051293936921">"Réessayer."</string>
+    <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"Schéma erroné"</string>
+    <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"Mot de passe incorrect"</string>
+    <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"NIP erroné"</string>
+    <string name="checking_decryption" msgid="8287458611802609493">"Vérification en cours…"</string>
+    <string name="starting_android" msgid="8581493237458496835">"Démarrage d\'Android en cours..."</string>
     <string name="delete" msgid="4219243412325163003">"Supprimer"</string>
     <string name="misc_files" msgid="6720680815969643497">"Fichiers divers"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"<xliff:g id="NUMBER">%1$d</xliff:g> fichiers sélectionnés sur <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -1992,8 +2004,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Toujours utiliser le GPU pour la composition écran"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"Simuler esp. colorimétrique"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Enable OpenGL traces"</string>
-    <string name="use_nuplayer" msgid="5699257393367904387">"NuPlayer (expérimental)"</string>
-    <string name="use_nuplayer_summary" msgid="1991479067478516714">"Utiliser NuPlayer au lieu d\'AwesomePlayer"</string>
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"Util. AwesomePlayer (obs.)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"Util. AwesomePlayer au lieu de NuPlayer pr lect. média"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"Désact. routage audio USB"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"Désactiver routage automatique appareils audio USB"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Afficher les contours"</string>
@@ -2169,7 +2181,6 @@
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Ajouter un utilisateur ou un profil"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Ajouter utilisateur"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Profil limité"</string>
-    <string name="user_summary_managed_profile" msgid="7369539529693048111">"Profil professionnel"</string>
     <string name="user_need_lock_message" msgid="2596365678651842785">"Avant de créer un profil limité, vous devez définir un écran de verrouillage pour protéger vos applications et vos données personnelles."</string>
     <string name="user_set_lock_button" msgid="8311219392856626841">"Définir verrouillage écran"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Non configuré"</string>
@@ -2300,11 +2311,13 @@
     <string name="sim_cellular_data_unavailable_summary" msgid="3654805961942166428">"Touchez pour choisir une carte SIM pour les données."</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"Toujours l\'utiliser pour les appels"</string>
     <string name="select_sim_for_data" msgid="2366081042162853044">"Sélectionnez une carte SIM pour données"</string>
+    <string name="data_switch_started" msgid="2040761479817166311">"Changement de carte SIM pour les données, cela peut prendre jusqu\'à une minute..."</string>
     <string name="select_sim_for_calls" msgid="3503094771801109334">"Appeler avec"</string>
     <string name="sim_select_card" msgid="211285163525563293">"Sélectionnez une carte SIM"</string>
     <string name="sim_card_number_title" msgid="7845379943474336488">"Carte SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"La fente pour carte SIM est vide"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"Nom de la carte SIM"</string>
+    <string name="sim_name_hint" msgid="7038643345238968930">"Entrez le nom de la carte SIM"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"Fente pour carte SIM %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Fournisseur de services"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Numéro"</string>
@@ -2314,7 +2327,6 @@
     <string name="color_purple" msgid="3888532466427762504">"Mauve"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"Aucune carte SIM insérée"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"État de la carte SIM"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"Reenseignements concernant la carte SIM"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"Rappeler avec la carte SIM par défaut"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"Carte SIM pour les appels sortants"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Autres paramètres d\'appel"</string>
@@ -2322,8 +2334,11 @@
     <string name="preferred_network_offload_header" msgid="2321173571529106767">"Désact. diff. nom réseau"</string>
     <string name="preferred_network_offload_footer" msgid="5857279426054744020">"La désactivation de la diffusion du nom du réseau empêche les tiers d\'accéder aux détails du réseau."</string>
     <string name="preferred_network_offload_popup" msgid="2252915199889604600">"La désactivation de la diffusion du nom du réseau bloque la connexion automatique aux réseaux masqués"</string>
+    <string name="sim_signal_strength" msgid="9144010043784767984">"<xliff:g id="DBM">%1$d</xliff:g> dBm <xliff:g id="ASU">%2$d</xliff:g> asu"</string>
+    <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>
+    <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Toujours demander"</string>
     <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>
@@ -2332,22 +2347,22 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Recherches récentes"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Résultats"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi connexion réseau wi-fi"</string>
-    <string name="keywords_more_default_sms_app" msgid="2744404159003574745">"message texte"</string>
-    <string name="keywords_more_mobile_networks" msgid="7813380887358745769">"cellulaire fournisseur de services sans fil"</string>
+    <string name="keywords_more_default_sms_app" msgid="895656981962034647">"message texte envoyer des messages messages messagerie"</string>
+    <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"cellulaire fournisseur de services données sans fil 4g 3g 2g lte"</string>
     <string name="keywords_home" msgid="3626170808219458848">"lanceur d\'applications"</string>
     <string name="keywords_display" msgid="6709007669501628320">"écran tactile"</string>
-    <string name="keywords_display_brightness_level" msgid="8636451602230815191">"réduire la luminosité de l\'écran tactile"</string>
-    <string name="keywords_display_auto_brightness" msgid="8070218600502753102">"réduire la luminosité de l\'écran tactile"</string>
-    <string name="keywords_display_wallpaper" msgid="4315466287469834939">"arrière-plan"</string>
+    <string name="keywords_display_brightness_level" msgid="8923289340474728990">"assombrir l\'écran écran tactile pile"</string>
+    <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"assombrir l\'écran écran tactile pile"</string>
+    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"personnaliser arrière-plan personnaliser écran"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"taille du texte"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"projet"</string>
-    <string name="keywords_storage" msgid="7007275853993419928">"espace disque dur"</string>
-    <string name="keywords_battery" msgid="3992479295298655138">"alimentation"</string>
-    <string name="keywords_spell_checker" msgid="4509482591225399210">"orthographe"</string>
+    <string name="keywords_storage" msgid="6572905220031852173">"espace disque disque dur utilisation appareil"</string>
+    <string name="keywords_battery" msgid="2096185085932675704">"frais de consommation d\'énergie"</string>
+    <string name="keywords_spell_checker" msgid="6106749039734174140">"orthographe dictionnaire correcteur orthographique correction automatique"</string>
     <string name="keywords_voice_input" msgid="3519547605812413860">"détecteur entrée voix parler langue mains libres reconnaissance mains libres terme choquant historique audio écouteur bluetooth"</string>
-    <string name="keywords_text_to_speech_output" msgid="8207889472282225512">"débit langue par défaut parler parole"</string>
-    <string name="keywords_date_and_time" msgid="7666950126499155141">"horloge"</string>
-    <string name="keywords_factory_data_reset" msgid="3693730656843989732">"réinitialiser et effacer"</string>
+    <string name="keywords_text_to_speech_output" msgid="392447904221657930">"débit langue valeur par défaut parler discuter tts accessibilité lecteur aveugle"</string>
+    <string name="keywords_date_and_time" msgid="2631808108134830066">"horloge militaire"</string>
+    <string name="keywords_factory_data_reset" msgid="4355133848707691977">"réinitialiser supprimer restaurer effacer"</string>
     <string name="keywords_printing" msgid="1701778563617114846">"imprimante"</string>
     <string name="keywords_sounds_and_notifications" msgid="5965996187974887000">"haut-parleur signal sonore"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="2912933812460077912">"ne pas déranger interrompre interruption pause"</string>
@@ -2356,7 +2371,7 @@
     <string name="keywords_location_mode" msgid="8584992704568356084">"précision"</string>
     <string name="keywords_accounts" msgid="1957925565953357627">"compte"</string>
     <string name="keywords_users" msgid="4673901601478559100">"limitation limiter limité"</string>
-    <string name="keywords_keyboard_and_ime" msgid="1103378692379215672">"texte correction corriger son vibreur auto langue geste suggérer suggestion thème terme choquant type emoji"</string>
+    <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"correction de texte corriger son vibreur automatique langue geste suggérer suggestion thème choquant type de mot emoji international"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"glisser mot de passe schéma nip"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Créer une balise NFC par Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Écrire"</string>
@@ -2373,7 +2388,6 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Volume des notifications"</string>
     <string name="zen_mode_settings_title" msgid="7014915558669122902">"Interruptions"</string>
     <string name="zen_mode_option_title" msgid="5061978632306007914">"À la réception d\'appels et de notifications"</string>
-    <string name="zen_mode_option_title_novoice" msgid="6680706009915204785">"À la réception de notifications"</string>
     <string name="zen_mode_option_off" msgid="3167702608910820883">"Toujours interrompre"</string>
     <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"N\'autoriser que les interruptions prioritaires"</string>
     <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Ne pas interrompre"</string>
@@ -2431,14 +2445,17 @@
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Terminé"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Jusqu\'à la désactivation"</string>
     <string name="zen_mode_important_category" msgid="8123274463331022993">"Interruptions prioritaires"</string>
-    <string name="zen_mode_downtime_category" msgid="4730179065426038108">"Arrêt (interruptions prio. seulement)"</string>
+    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Temps d\'arrêt"</string>
     <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Jours"</string>
     <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Aucun"</string>
+    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Interruptions autorisées"</string>
+    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Priorités seulement"</string>
+    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Aucun"</string>
     <string name="zen_mode_automation_category" msgid="4653551005950835761">"Automatisation"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Activation automatique"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Jamais"</string>
-    <string name="zen_mode_phone_calls" msgid="8956214416859303966">"Appels"</string>
+    <string name="zen_mode_calls" msgid="7051492091133751208">"Appels"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Messages"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Appels/Messages de"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"N\'importe qui"</string>
@@ -2452,7 +2469,9 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Les soirs de semaine"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Heure de début"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Heure de fin"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> le lendemain"</string>
+    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> le lendemain"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> ou toute alarme avant"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> le lendemain ou toute alarme avant"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Notif. application"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Paramètres de notification"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Commentaires sur cet appareil"</string>
@@ -2460,7 +2479,11 @@
     <string name="switch_on_text" msgid="1124106706920572386">"Activé"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Désactivé"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"Épinglage à l\'écran"</string>
-    <string name="screen_pinning_description" msgid="7091642350452605379">"Lorsque cette fonction est activée, vous pouvez utiliser l\'épinglage d\'écran pour garder l\'écran en cours actif jusqu\'à ce que vous annuliez l\'épinglage.\n\nPour utiliser l\'épinglage d\'écran : \n\n1. Assurez-vous que l\'épinglage d\'écran est activé.\n\n2. Ouvrez l\'écran que vous souhaitez épingler.\n\n3. Touchez Aperçu.\n\n4. Touchez l\'icône d\'épingle."</string>
+    <string name="screen_pinning_description" msgid="1137904524037468263">"Lorsque ce paramètre est activé, vous pouvez épingler l\'écran afin de l\'ancrer dans sa vue actuelle jusqu\'à ce que vous l\'annuliez.\n\nPour épingler l\'écran, procédez comme suit :\n\n1. Assurez-vous que l\'épinglage de l\'écran est activé.\n\n2. Ouvrez l\'écran que vous voulez épingler.\n\n3. Touchez « Aperçu ».\n\n4. Balayez l\'écran vers le haut, puis touchez l\'icône d\'épinglage."</string>
+    <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Demander le schéma de déverrouillage avant d\'annuler l\'épinglage"</string>
+    <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Demander le NIP avant d\'annuler l\'épinglage"</string>
+    <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Demander le mot de passe avant d\'annuler l\'épinglage"</string>
+    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Verrouiller l\'écran après l\'annulation de l\'épinglage"</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Profil professionnel"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Expérimentale)"</string>
     <string name="display_auto_rotate_title" msgid="6176450657107806043">"Lorsque l\'utilisateur pivote l\'appareil"</string>
@@ -2469,7 +2492,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Rester en mode paysage"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Garder l\'orientation actuelle"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"Information concernant le code IIEM"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"Information concernant le code IIEM"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Chiffrement"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Continuer"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"Pour améliorer la protection de cet appareil, vous pouvez exiger l\'entrée du NIP avant le démarrage. L\'appareil ne reçoit pas d\'appels, de messages ni de notifications, y compris les alertes, tant qu\'il n\'a pas démarré. \n\nCette fonctionnalité permet de protéger les données en cas de perte ou de vol de l\'appareil."</string>
@@ -2487,4 +2509,7 @@
     <string name="encrypt_talkback_dialog_message_pin" msgid="1890374082842868489">"Lorsque vous entrez votre NIP pour démarrer cet appareil, les services d\'accessibilité comme <xliff:g id="SERVICE">%1$s</xliff:g> ne seront pas accessibles immédiatement."</string>
     <string name="encrypt_talkback_dialog_message_pattern" msgid="4474332516537386384">"Lorsque vous entrez votre motif pour démarrer cet appareil, les services d\'accessibilité comme <xliff:g id="SERVICE">%1$s</xliff:g> ne seront pas accessibles immédiatement."</string>
     <string name="encrypt_talkback_dialog_message_password" msgid="8166099418487083927">"Lorsque vous entrez votre mot de passe pour démarrer cet appareil, les services d\'accessibilité comme <xliff:g id="SERVICE">%1$s</xliff:g> ne seront pas accessibles immédiatement."</string>
+    <string name="imei_information_title" msgid="8499085421609752290">"Information concernant le code IIEM"</string>
+    <string name="imei_information_summary" msgid="2074095606556565233">"Information concernant le code IIEM"</string>
+    <string name="slot_number" msgid="3762676044904653577">"(Fente <xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-fr/arrays.xml b/res/values-fr/arrays.xml
index 629816b..9a8811f 100644
--- a/res/values-fr/arrays.xml
+++ b/res/values-fr/arrays.xml
@@ -527,4 +527,12 @@
     <item msgid="4338089220026248848">"Mise en cache (client d\'activité)"</item>
     <item msgid="6652164677254579050">"Mise en cache (vide)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Turquoise"</item>
+    <item msgid="8332294763632946560">"Bleu"</item>
+    <item msgid="2023216417616991392">"Indigo"</item>
+    <item msgid="3170497246594232819">"Violet"</item>
+    <item msgid="4608643045752965568">"Rose"</item>
+    <item msgid="6131821495505931173">"Rouge"</item>
+  </string-array>
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index bf4ddd3..d39de01 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>
@@ -180,7 +180,6 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"Une demande d\'accès à vos messages a été envoyée pour \"%1$s\". Accorder l\'accès à \"%2$s\" ?"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Date et heure"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Sélectionner le fuseau horaire"</string>
-    <string name="normal_date_format" msgid="7636406984925498359">"Format régional (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Aperçu :"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Taille de police :"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -291,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>
@@ -322,8 +321,6 @@
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Définir le fuseau horaire"</string>
     <string name="date_time_set_date_title" msgid="6928286765325608604">"Date"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"Définir la date"</string>
-    <string name="date_time_date_format_title" msgid="3976171711988766411">"Format de la date"</string>
-    <string name="date_time_date_format" msgid="6951498879879281102">"Choisir le format de la date"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Trier par ordre alphabétique"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Trier par fuseau horaire"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Date"</string>
@@ -372,7 +369,8 @@
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Veuillez patienter pendant le chiffrement de votre téléphone. <xliff:g id="PERCENT">^1</xliff:g> % effectué(s)."</string>
     <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Veuillez patienter pendant le chiffrement de votre tablette. Temps restant : <xliff:g id="DURATION">^1</xliff:g>"</string>
     <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Veuillez patienter pendant le chiffrement de votre téléphone. Temps restant : <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Réessayez dans <xliff:g id="DELAY">^1</xliff:g> secondes."</string>
+    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"Pour déverrouiller votre tablette, éteignez-la, puis rallumez-la."</string>
+    <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"Pour déverrouiller votre téléphone, éteignez-le, puis rallumez-le."</string>
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"Attention : Les données de votre appareil seront effacées si vous effectuez encore <xliff:g id="COUNT">^1</xliff:g> tentatives de déverrouillage infructueuses."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Saisissez votre mot de passe."</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Échec du chiffrement"</string>
@@ -401,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>
@@ -412,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">"Annuler 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>
@@ -556,13 +556,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Comme téléphone à haut-parleur"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Pour la musique et le multimédia"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Mémoriser ces paramètres"</string>
-    <string name="wifi_assistant_intro_setup" msgid="4605105515416995110">"Découvrez\nl\'assistant Wi‑Fi"</string>
-    <string name="wifi_assistant_no_thanks" msgid="2776983751990143934">"NON, MERCI"</string>
-    <string name="wifi_assistant_setup" msgid="3772423650475730906">"CONFIGURER"</string>
-    <string name="wifi_assistant_card_message" msgid="107811647784658536">"Connectez-vous automatiquement aux réseaux disponibles à l\'aide d\'un assistant Wi‑Fi."</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Assistant Wi‑Fi"</string>
-    <string name="wifi_assistant_title_message" msgid="6240721017579074015">"<xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> vous connecte automatiquement au meilleur réseau Wi‑Fi disponible"</string>
-    <string name="wifi_assistant_open_app" msgid="4803044899535675063">"OUVRIR L\'APPLICATION"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Connecté via l\'assistant Wi‑Fi"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"Caster l\'écran"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Activer l\'affichage sans fil"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Aucun appareil détecté à proximité."</string>
@@ -592,7 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Paramètres Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Configurer et gérer les points d\'accès sans fil"</string>
-    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Sélectionner le Wi-Fi"</string>
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Sélectionner un réseau Wi‑Fi"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Sélectionner le Wi-Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Activation du Wi-Fi en cours…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Désactivation du Wi-Fi en cours…"</string>
@@ -607,8 +602,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"Recherche toujours disponible"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Toujours autoriser la recherche"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Autoriser le service de localisation de Google et les autres applications à rechercher des réseaux, même si le Wi-Fi est désactivé"</string>
-    <string name="wifi_automatically_manage_title" msgid="6249976570008992746">"Gérer automatiquement le Wi‑Fi"</string>
-    <string name="wifi_automatically_manage_summary" msgid="6952470763378312488">"Laisser l\'assistant <xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> gérer votre connexion Wi-Fi"</string>
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Utiliser automatiquement le Wi-Fi ouvert"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Laisser un assistant Wi‑Fi se connecter automatiquement aux réseaux ouverts jugés de bonne qualité"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Sélectionner un assistant"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Installer les certificats"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Pour améliorer la précision et à d\'autres fins, le service de localisation de Google et d\'autres applications peuvent rechercher des réseaux Wi-Fi à proximité, même lorsque le Wi-Fi est désactivé. Vous pouvez modifier ce paramètre dans Options avancées &gt; Recherche toujours disponible."</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Les applications peuvent rechercher des réseaux à proximité, même lorsque le Wi-Fi est désactivé. Vous pouvez modifier ce paramètre dans Avancé &gt; Recherche toujours disponible."</string>
@@ -629,6 +625,7 @@
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Rechercher"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Options avancées"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Se connecter au réseau"</string>
+    <string name="wifi_menu_remember" msgid="8814185749388713796">"Se souvenir du réseau"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Retirer le réseau"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Modifier le réseau"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Modifier le tag NFC"</string>
@@ -673,9 +670,11 @@
     <string name="wifi_unspecified" msgid="5431501214192991253">"(non spécifié)"</string>
     <string name="wifi_remembered" msgid="4955746899347821096">"Enregistré"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"Désactivé"</string>
-    <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Mauvaise connexion Internet évitée"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"Échec de configuration de l\'adresse IP"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Échec de la connexion Wi-Fi"</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Problème d\'authentification."</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Hors de portée"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Aucun accès à Internet détecté, reconnexion automatique impossible"</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS disponible"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS disponible)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Saisissez votre mot de passe réseau."</string>
@@ -686,7 +685,7 @@
     <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Refuser"</string>
     <string name="wifi_hotspot_title" msgid="7726205804813286950">"Se connecter au point d\'accès pour la connexion ?"</string>
     <string name="wifi_hotspot_message" msgid="3673833421453455747">"\"<xliff:g id="APP_NAME">%1$s</xliff:g>\" requiert une connexion en ligne pour autoriser la connexion au réseau."</string>
-    <string name="wifi_hotspot_connect" msgid="5065506390164939225">"CONNECTER"</string>
+    <string name="wifi_hotspot_connect" msgid="5065506390164939225">"SE CONNECTER"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Se connecter"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Échec de la connexion au réseau."</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Retirer"</string>
@@ -699,9 +698,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"AVERTISSEMENT : Si vous ne configurez pas le Wi-Fi, votre tablette n\'utilisera que les données mobiles pour les mises à jour et les téléchargements initiaux. Connectez-vous au Wi-Fi afin d\'éviter d\'éventuels frais liés à la consommation de données."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"AVERTISSEMENT : Si vous ne configurez pas le Wi-Fi, votre appareil n\'utilisera que les données mobiles pour les mises à jour et les téléchargements initiaux. Connectez-vous au Wi-Fi afin d\'éviter d\'éventuels frais liés à la consommation de données."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"AVERTISSEMENT : Si vous ne configurez pas le Wi-Fi, votre téléphone n\'utilisera que les données mobiles pour les mises à jour et les téléchargements initiaux. Connectez-vous au Wi-Fi afin d\'éviter d\'éventuels frais liés à la consommation de données."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="2393880108322835846">"AVERTISSEMENT : Si vous ne configurez pas le Wi-Fi, votre tablette ne disposera d\'aucune connexion Internet pour les mises à jour ou les téléchargements initiaux."</string>
-    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1707391993265558787">"AVERTISSEMENT : Si vous ne configurez pas le Wi-Fi, votre appareil ne disposera d\'aucune connexion Internet pour les mises à jour ou les téléchargements initiaux."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="1556858507920033022">"AVERTISSEMENT : Si vous ne configurez pas le Wi-Fi, votre téléphone ne disposera d\'aucune connexion Internet pour les mises à jour ou les téléchargements initiaux."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Si vous ignorez l\'étape de configuration de la connexion Wi‑Fi :\n\nVotre tablette n\'aura pas accès à Internet.\n\nVous ne pourrez pas obtenir les mises à jour des logiciels tant que vous ne vous connecterez pas à Internet.\n\nVous ne pourrez pas activer les fonctionnalités de protection de l\'appareil dans l\'immédiat."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Si vous ignorez l\'étape de configuration de la connexion Wi‑Fi :\n\nVotre appareil n\'aura pas accès à Internet.\n\nVous ne pourrez pas obtenir les mises à jour des logiciels tant que vous ne vous connecterez pas à Internet.\n\nVous ne pourrez pas activer les fonctionnalités de protection de l\'appareil dans l\'immédiat."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Si vous ignorez l\'étape de configuration de la connexion Wi‑Fi :\n\nVotre téléphone n\'aura pas accès à Internet.\n\nVous ne pourrez pas obtenir les mises à jour des logiciels tant que vous ne vous connecterez pas à Internet.\n\nVous ne pourrez pas activer les fonctionnalités de protection de l\'appareil dans l\'immédiat."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Connexion impossible de la tablette à ce réseau Wi-Fi."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"Impossible de connecter l\'appareil à ce réseau Wi-Fi."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Connexion impossible du téléphone à ce réseau Wi-Fi."</string>
@@ -761,7 +760,6 @@
     <string name="ring_volume_title" msgid="7938706566797464165">"Volume de la sonnerie"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrer en mode silencieux"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Son de notification par défaut"</string>
-    <string name="heads_up_enabled_title" msgid="1031078221910921622">"Ouvrir pop-up si priorité élevée"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Sonnerie"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Notification"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Utiliser le volume des appels entrants pour les notifications"</string>
@@ -834,7 +832,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Ajuster automatiquement la luminosité"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Soulever pour activer"</string>
     <string name="doze_title" msgid="2259176504273878294">"Affichage en mode Veille"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"Activer l\'écran si l\'appareil est déplacé ou si une notification arrive"</string>
+    <string name="doze_summary" msgid="7128970177894383698">"Activer l\'écran lors de la prise en main de l\'appareil ou de la réception de notifications"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Taille de la police"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Taille de police"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Paramètres verrouillage SIM"</string>
@@ -862,6 +860,10 @@
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Annuler"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"Plusieurs cartes SIM détectées"</string>
     <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>
+    <string name="sim_preferred_title" msgid="5567909634636045268">"Modifier carte SIM préférée ?"</string>
+    <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> est la seule carte SIM dans votre appareil. Voulez-vous utiliser cette carte SIM pour les données mobiles, les appels et les SMS ?"</string>
     <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>
@@ -1012,6 +1014,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Cette action effacera toutes les données de la "<b>"mémoire de stockage interne"</b>" de votre tablette, y compris :\n\n"<li>"Votre compte Google"</li>\n<li>"Les données et paramètres du système et de l\'application"</li>\n<li>"Les applications téléchargées"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Cette action effacera toutes les données du "<b>"stockage interne"</b>" de votre téléphone, y compris :\n\n"<li>"Votre compte Google"</li>\n<li>"Les données et paramètres du système et de l\'application"</li>\n<li>"Les applications téléchargées"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Vous êtes actuellement connecté aux comptes suivants :\n"</string>
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"D\'autres personnes utilisent cet appareil.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musique"</li>\n<li>"Photos"</li>\n<li>"Autres données utilisateur"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Pour supprimer la musique, les photos et les autres données utilisateur, vous devez effacer la "<b>"mémoire de stockage USB"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Pour supprimer la musique, les photos et les autres données utilisateur, vous devez effacer la "<b>"carte SD"</b>"."</string>
@@ -1023,7 +1026,6 @@
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Réinitialiser le téléphone"</string>
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Effacer toutes vos informations personnelles et les applications téléchargées ? Cette action est irréversible."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Tout effacer"</string>
-    <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Saisissez votre schéma de déverrouillage"</string>
     <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Vous devez dessiner votre schéma de déverrouillage pour confirmer le rétablissement de la configuration d\'usine."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Les données n\'ont pas été réinitialisées, car le service de nettoyage du système n\'est pas disponible."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Réinitialiser ?"</string>
@@ -1041,7 +1043,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"Effacer la mémoire de stockage USB en supprimant tous les fichiers qu\'elle contient ? Cette action est irréversible."</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Effacer la carte SD en supprimant tous les fichiers qu\'elle contient ? Cette action est irréversible."</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Tout effacer"</string>
-    <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Dessinez votre schéma de déverrouillage"</string>
     <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Vous devez dessiner votre schéma de déverrouillage pour confirmer l\'effacement de la mémoire de stockage USB."</string>
     <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Vous devez dessiner votre schéma de déverrouillage pour confirmer l\'effacement de la carte SD."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Paramètres d\'appel"</string>
@@ -1087,6 +1088,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Insérez la carte SIM, puis redémarrez."</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Connectez-vous à Internet."</string>
     <string name="location_title" msgid="1029961368397484576">"Ma position"</string>
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Profil professionnel"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Emplacement du profil pro"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Désactivé par votre entreprise"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Mode"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Haute précision"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Économie de batterie"</string>
@@ -1124,6 +1128,7 @@
     <string name="copyright_title" msgid="865906688917260647">"Droits d\'auteur"</string>
     <string name="license_title" msgid="1990487604356037871">"Licence"</string>
     <string name="terms_title" msgid="7697580845616764642">"Conditions d\'utilisation"</string>
+    <string name="webview_license_title" msgid="2813507464175738967">"Licence WebView du système"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Fonds d\'écran"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Fournisseurs d\'images satellite :\n© CNES/Astrium, DigitalGlobe, Bluesky 2014"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Licences open source"</string>
@@ -1237,7 +1242,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Stockage USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Sur la carte SD"</string>
     <string name="disabled" msgid="9206776641295849915">"Désactivée"</string>
-    <string name="not_installed" msgid="1475144352069281880">"Non installée"</string>
+    <string name="not_installed" msgid="2797554494953450291">"Non installé pour cet utilisateur"</string>
     <string name="no_applications" msgid="7336588977497084921">"Aucune application"</string>
     <string name="internal_storage" msgid="1584700623164275282">"Stockage interne"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Mémoire USB"</string>
@@ -1434,8 +1439,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"L\'écran ne se met jamais en veille lors du chargement."</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Activer journaux HCI Bluetooth"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Enregistrer tous les paquets HCI Bluetooth dans un fichier"</string>
-    <string name="oem_unlock_enable" msgid="6629321276287913315">"Activer déverrouillage OEM"</string>
-    <string name="oem_unlock_enable_summary" msgid="3546686263996628110">"Autoriser le déverrouillage OEM de l\'appareil"</string>
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"Déverrouillage OEM"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Autoriser le déverrouillage du chargeur d\'amorçage"</string>
+    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Saisissez votre code d\'accès."</string>
+    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Saisir le code d\'accès de l\'appareil pour activer le déverrouillage OEM"</string>
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Autoriser le déverrouillage OEM ?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"AVERTISSEMENT : Les fonctionnalités de protection de l\'appareil sont désactivées tant que ce paramètre est activé."</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Certification de l\'affichage sans fil"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Autoriser enreg. infos Wi-Fi détaillées"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Passage forcé du Wi-Fi aux données mobiles"</string>
@@ -1538,6 +1547,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"Aperçu des sous-titres"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"Par défaut"</string>
+    <string name="color_title" msgid="4258931051732243983">"Couleur"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"Par défaut"</string>
     <string name="color_none" msgid="3475640044925814795">"Aucune"</string>
     <string name="color_white" msgid="8045195170201590239">"Blanc"</string>
@@ -1595,12 +1605,12 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"Temps restant : <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> avant chargement complet"</string>
-    <string name="power_discharging_duration" msgid="7125493014448497620">"<xliff:g id="LEVEL">%1$d</xliff:g> %% – Temps restant : <xliff:g id="TIME">%2$s</xliff:g> environ"</string>
-    <string name="power_charging" msgid="712751285832976915">"<xliff:g id="LEVEL">%1$d</xliff:g> %% – <xliff:g id="STATE">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration" msgid="4802183864773082009">"<xliff:g id="LEVEL">%1$d</xliff:g> %% (chargée à 100 %% dans <xliff:g id="TIME">%2$s</xliff:g>)"</string>
-    <string name="power_charging_duration_ac" msgid="3611179931297824699">"<xliff:g id="LEVEL">%1$d</xliff:g> %% (chargée à 100 %% sur secteur dans <xliff:g id="TIME">%2$s</xliff:g>)"</string>
-    <string name="power_charging_duration_usb" msgid="1106605348913397583">"<xliff:g id="LEVEL">%1$d</xliff:g> %% (chargée à 100 %% via USB dans <xliff:g id="TIME">%2$s</xliff:g>)"</string>
-    <string name="power_charging_duration_wireless" msgid="633606920144617227">"<xliff:g id="LEVEL">%1$d</xliff:g> %% (chargée à 100 %% sans fil dans <xliff:g id="TIME">%2$s</xliff:g>)"</string>
+    <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> – Temps restant : <xliff:g id="TIME">%2$s</xliff:g> environ"</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> (chargée à 100 %% dans <xliff:g id="TIME">%2$s</xliff:g>)"</string>
+    <string name="power_charging_duration_ac" msgid="3969186192576594254">"<xliff:g id="LEVEL">%1$s</xliff:g> (chargée à 100 %% sur secteur dans <xliff:g id="TIME">%2$s</xliff:g>)"</string>
+    <string name="power_charging_duration_usb" msgid="182405645340976546">"<xliff:g id="LEVEL">%1$s</xliff:g> (chargée à 100 %% via USB dans <xliff:g id="TIME">%2$s</xliff:g>)"</string>
+    <string name="power_charging_duration_wireless" msgid="1829295708243159464">"<xliff:g id="LEVEL">%1$s</xliff:g> (chargée à 100 %% sans fil dans <xliff:g id="TIME">%2$s</xliff:g>)"</string>
     <string name="power_usage_list_summary" msgid="2409288197839512482">"Utilis. depuis dernière charge complète"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Utilisation de la batterie depuis le débranchement"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Utilisation de la batterie depuis la dernière réinitialisation"</string>
@@ -1617,7 +1627,6 @@
     <string name="awake" msgid="387122265874485088">"Durée de fonctionnement de l\'appareil"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi/temps"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi/temps"</string>
-    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Informations sur l\'historique"</string>
     <string name="details_title" msgid="3792801565213935385">"Informations sur l\'utilisation"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Détails d\'utilisation"</string>
@@ -1689,9 +1698,7 @@
     <string name="battery_saver" msgid="1426682272004907982">"Économiseur de batterie"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Activer automatiquement"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Jamais"</string>
-    <!-- String.format failed for translation -->
-    <!-- no translation found for battery_saver_turn_on_automatically_pct (3033681629861428940) -->
-    <skip />
+    <string name="battery_saver_turn_on_automatically_pct" msgid="7536784431655058267">"lorsque la batterie atteint %1$s"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Statistiques relatives aux processus"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Statistiques détaillées relatives aux processus en cours d\'exécution"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Utilisation de la mémoire"</string>
@@ -1815,7 +1822,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Intégré au matériel"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Uniquement logiciel"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"Les identifiants ne sont pas disponibles pour cet utilisateur."</string>
-    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Dessinez votre schéma de déverrouillage."</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Pour confirmer l\'installation des certificats, vous devez dessiner votre schéma de déverrouillage."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Saisir le mot de passe de stockage des identifiants"</string>
@@ -1845,6 +1851,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"Inclure données application"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Restaurer automatiquement"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Lors de la réinstallation d\'une application, restaurer les paramètres et les données sauvegardées"</string>
+    <string name="backup_inactive_title" msgid="5355557151569037197">"Le service de sauvegarde n\'est pas activé."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"Cette préférence est définie par les règles de votre appareil."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Mot de passe sauvegarde PC"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Les sauvegardes complètes sur PC ne sont pas protégées actuellement."</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Appuyez pour modifier ou supprimer le mot de passe utilisé pour les sauvegardes complètes sur PC."</string>
@@ -1954,7 +1962,11 @@
     <string name="enter_password" msgid="8035706727471334122">"Pour lancer Android, saisissez votre mot de passe."</string>
     <string name="enter_pin" msgid="5305333588093263790">"Pour lancer Android, saisissez votre code PIN."</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Pour lancer Android, dessinez votre motif."</string>
-    <string name="try_again" msgid="4272075051293936921">"Réessayer"</string>
+    <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"Schéma erroné."</string>
+    <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"Mot de passe erroné."</string>
+    <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"Code PIN erroné."</string>
+    <string name="checking_decryption" msgid="8287458611802609493">"Vérification en cours…"</string>
+    <string name="starting_android" msgid="8581493237458496835">"Lancement d\'Android en cours..."</string>
     <string name="delete" msgid="4219243412325163003">"Supprimer"</string>
     <string name="misc_files" msgid="6720680815969643497">"Fichiers divers"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"<xliff:g id="NUMBER">%1$d</xliff:g> fichiers sélectionnés sur <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -1992,8 +2004,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Toujours utiliser le GPU pour la composition écran"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"Simuler espace colori."</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Activer les traces OpenGL"</string>
-    <string name="use_nuplayer" msgid="5699257393367904387">"NuPlayer (expérimental)"</string>
-    <string name="use_nuplayer_summary" msgid="1991479067478516714">"Utiliser NuPlayer au lieu de AwesomePlayer"</string>
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"Utiliser AwesomePlayer (obsolète)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"Utiliser AwesomePlayer au lieu de NuPlayer pour la lecture de la plupart des contenus médias"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"Désact. routage audio USB"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"Désactiver routage auto vers périph. audio USB"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Afficher les contours"</string>
@@ -2169,7 +2181,6 @@
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Ajouter un utilisateur ou un profil"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Ajouter utilisateur"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Profil limité"</string>
-    <string name="user_summary_managed_profile" msgid="7369539529693048111">"Profil professionnel"</string>
     <string name="user_need_lock_message" msgid="2596365678651842785">"Avant de créer un profil limité, vous devez définir un écran de verrouillage pour protéger vos applications et vos données personnelles."</string>
     <string name="user_set_lock_button" msgid="8311219392856626841">"Définir verrouillage écran"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Non configuré"</string>
@@ -2300,11 +2311,13 @@
     <string name="sim_cellular_data_unavailable_summary" msgid="3654805961942166428">"Appuyez pour choisir une carte SIM pour les données."</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"Toujours l\'utiliser pour les appels"</string>
     <string name="select_sim_for_data" msgid="2366081042162853044">"Sélectionnez carte SIM pour les données"</string>
+    <string name="data_switch_started" msgid="2040761479817166311">"Changement de carte SIM en cours… Cela peut prendre jusqu\'à une minute."</string>
     <string name="select_sim_for_calls" msgid="3503094771801109334">"Appeler avec"</string>
     <string name="sim_select_card" msgid="211285163525563293">"Sélectionnez une carte SIM"</string>
     <string name="sim_card_number_title" msgid="7845379943474336488">"Carte SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"Carte SIM vide"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"Nom de la carte SIM"</string>
+    <string name="sim_name_hint" msgid="7038643345238968930">"Saisir le nom de la carte SIM"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"Emplacement pour carte SIM %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Opérateur"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Numéro"</string>
@@ -2314,7 +2327,6 @@
     <string name="color_purple" msgid="3888532466427762504">"Violet"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"Aucune carte SIM insérée."</string>
     <string name="sim_status_title" msgid="6744870675182447160">"État de la carte SIM"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"Informations relatives à la carte SIM"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"Rappeler depuis la carte SIM par défaut"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"Carte SIM pour appels sortants"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Autres paramètres d\'appel"</string>
@@ -2322,8 +2334,11 @@
     <string name="preferred_network_offload_header" msgid="2321173571529106767">"Désactiver diffusion nom réseau"</string>
     <string name="preferred_network_offload_footer" msgid="5857279426054744020">"La désactivation de la diffusion du nom du réseau empêche les tiers d\'accéder aux infos sur le réseau."</string>
     <string name="preferred_network_offload_popup" msgid="2252915199889604600">"La désactivation de la diffusion du nom du réseau bloque la connexion automatique aux réseaux masqués."</string>
+    <string name="sim_signal_strength" msgid="9144010043784767984">"<xliff:g id="DBM">%1$d</xliff:g> dBm <xliff:g id="ASU">%2$d</xliff:g> asu"</string>
+    <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>
+    <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Toujours demander"</string>
     <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>
@@ -2332,22 +2347,22 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Recherches récentes"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Résultats"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi réseau connexion"</string>
-    <string name="keywords_more_default_sms_app" msgid="2744404159003574745">"SMS"</string>
-    <string name="keywords_more_mobile_networks" msgid="7813380887358745769">"mobile opérateur sans fil"</string>
+    <string name="keywords_more_default_sms_app" msgid="895656981962034647">"SMS SMS/MMS messages messagerie"</string>
+    <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"cellulaire opérateur mobile données sans fil 4g 3g 2g lte"</string>
     <string name="keywords_home" msgid="3626170808219458848">"lanceur d\'applications"</string>
     <string name="keywords_display" msgid="6709007669501628320">"écran écran tactile"</string>
-    <string name="keywords_display_brightness_level" msgid="8636451602230815191">"réduire la luminosité écran écran tactile"</string>
-    <string name="keywords_display_auto_brightness" msgid="8070218600502753102">"réduire la luminosité écran écran tactile"</string>
-    <string name="keywords_display_wallpaper" msgid="4315466287469834939">"arrière-plan"</string>
+    <string name="keywords_display_brightness_level" msgid="8923289340474728990">"assombrir l\'écran écran tactile batterie"</string>
+    <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"assombrir l\'écran écran tactile batterie"</string>
+    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"personnaliser arrière-plan personnaliser écran"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"taille du texte"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"projet"</string>
-    <string name="keywords_storage" msgid="7007275853993419928">"espace disque disque dur"</string>
-    <string name="keywords_battery" msgid="3992479295298655138">"alimentation"</string>
-    <string name="keywords_spell_checker" msgid="4509482591225399210">"orthographe"</string>
+    <string name="keywords_storage" msgid="6572905220031852173">"espace disque disque dur utilisation appareil"</string>
+    <string name="keywords_battery" msgid="2096185085932675704">"consommation batterie charge"</string>
+    <string name="keywords_spell_checker" msgid="6106749039734174140">"orthographe dictionnaire correcteur orthographique correction automatique"</string>
     <string name="keywords_voice_input" msgid="3519547605812413860">"détecteur saisie voix parler langue mains libres main libre reconnaissance terme choquant historique audio casque bluetooth"</string>
-    <string name="keywords_text_to_speech_output" msgid="8207889472282225512">"débit langue par défaut parler parole"</string>
-    <string name="keywords_date_and_time" msgid="7666950126499155141">"horloge"</string>
-    <string name="keywords_factory_data_reset" msgid="3693730656843989732">"effacer supprimer"</string>
+    <string name="keywords_text_to_speech_output" msgid="392447904221657930">"débit langue valeur par défaut parler discuter tts accessibilité lecteur aveugle"</string>
+    <string name="keywords_date_and_time" msgid="2631808108134830066">"horloge militaire"</string>
+    <string name="keywords_factory_data_reset" msgid="4355133848707691977">"réinitialiser supprimer restaurer effacer"</string>
     <string name="keywords_printing" msgid="1701778563617114846">"imprimante"</string>
     <string name="keywords_sounds_and_notifications" msgid="5965996187974887000">"haut-parleur signal sonore"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="2912933812460077912">"ne pas déranger interrompre interruption pause"</string>
@@ -2356,7 +2371,7 @@
     <string name="keywords_location_mode" msgid="8584992704568356084">"précision"</string>
     <string name="keywords_accounts" msgid="1957925565953357627">"compte"</string>
     <string name="keywords_users" msgid="4673901601478559100">"limitation limiter limité"</string>
-    <string name="keywords_keyboard_and_ime" msgid="1103378692379215672">"texte correction corriger son vibreur auto langue geste suggérer suggestion thème terme choquant type emoji"</string>
+    <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"correction de texte corriger son vibreur automatique langue geste suggérer suggestion thème choquant type de mot emoji international"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"faire glisser mot de passe schéma code d\'accès"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Créer un tag NFC pour Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Modifier"</string>
@@ -2373,7 +2388,6 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Volume des notifications"</string>
     <string name="zen_mode_settings_title" msgid="7014915558669122902">"Sonneries"</string>
     <string name="zen_mode_option_title" msgid="5061978632306007914">"À la réception d\'appels et de notifications"</string>
-    <string name="zen_mode_option_title_novoice" msgid="6680706009915204785">"À la réception de notifications"</string>
     <string name="zen_mode_option_off" msgid="3167702608910820883">"Toujours sonner"</string>
     <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"N\'autoriser que les sonneries prioritaires"</string>
     <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Ne pas interrompre"</string>
@@ -2384,7 +2398,7 @@
     <string name="notification_pulse_title" msgid="1247988024534030629">"Voyant de notification"</string>
     <string name="lock_screen_notifications_title" msgid="9118805570775519455">"Si l\'appareil est verrouillé"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Afficher l\'intégralité du contenu des notifications"</string>
-    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Masquer le contenu sensible des notifications"</string>
+    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Masquer le contenu des notifications sensibles"</string>
     <string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"N\'afficher aucune notification"</string>
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"Lorsque votre appareil est verrouillé, comment voulez-vous que les notifications s\'affichent ?"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Notifications des applications"</string>
@@ -2408,7 +2422,7 @@
   </plurals>
     <string name="no_notification_listeners" msgid="2767405417723149879">"Aucun outil d\'écoute des notifications installé."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Activer <xliff:g id="SERVICE">%1$s</xliff:g> ?"</string>
-    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> pourra lire toutes les notifications publiées par le système ou toute application installée. Ces notifications peuvent comporter des informations personnelles, telles que des noms de contacts et le texte de messages qui vous ont été envoyés. L\'application pourra également masquer ces notifications ou sélectionner les boutons d\'action qu\'elles contiennent."</string>
+    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> pourra lire toutes les notifications publiées par le système ou par toute application installée. Ces notifications peuvent comporter des informations personnelles, telles que des noms de contacts et le texte de messages qui vous ont été envoyés. Ce service permet également de masquer ces notifications ou de sélectionner les boutons d\'action qu\'elles contiennent."</string>
     <string name="manage_condition_providers" msgid="3039306415273606730">"Fournisseurs de conditions"</string>
     <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Aucune application ne fournit de conditions."</string>
   <plurals name="manage_condition_providers_summary_nonzero">
@@ -2431,14 +2445,17 @@
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"OK"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Jusqu\'à désactivation"</string>
     <string name="zen_mode_important_category" msgid="8123274463331022993">"Sonneries prioritaires"</string>
-    <string name="zen_mode_downtime_category" msgid="4730179065426038108">"Arrêt (sonneries prioritaires uniquement)"</string>
+    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Temps d\'arrêt"</string>
     <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Jours"</string>
     <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Aucun"</string>
+    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Interruptions autorisées"</string>
+    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Prioritaires uniquement"</string>
+    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Aucun"</string>
     <string name="zen_mode_automation_category" msgid="4653551005950835761">"Automatisation"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Activation automatique"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Jamais"</string>
-    <string name="zen_mode_phone_calls" msgid="8956214416859303966">"Appels"</string>
+    <string name="zen_mode_calls" msgid="7051492091133751208">"Appels"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Messages"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Appels/Messages de"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Tout le monde"</string>
@@ -2452,7 +2469,9 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Les soirs de semaine"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Heure de début"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Heure de fin"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> le lendemain"</string>
+    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> le lendemain"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> ou toute alarme définie avant cette heure"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> le lendemain ou toute alarme définie avant cette heure"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Notifications appli."</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Paramètres de notification"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Envoyer commentaires sur appareil"</string>
@@ -2460,7 +2479,11 @@
     <string name="switch_on_text" msgid="1124106706920572386">"Activé"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Désactivé"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"Épinglage d\'écran"</string>
-    <string name="screen_pinning_description" msgid="7091642350452605379">"Lorsque l\'option est activée, vous pouvez épingler l\'écran pour qu\'il reste affiché jusqu\'à ce que vous annuliez l\'épinglage.\n\nProcédez comme suit :\n\n1. Assurez-vous que l\'option est activée.\n\n2. Ouvrez l\'écran à épingler.\n\n3. Appuyez sur \"Aperçu\".\n\n4. Appuyez sur l\'icône représentant une punaise."</string>
+    <string name="screen_pinning_description" msgid="1137904524037468263">"Lorsque ce paramètre est activé, vous pouvez épingler l\'écran afin de l\'ancrer dans la vue jusqu\'à annulation de cette opération.\n\nPour épingler l\'écran, procédez comme suit :\n\n1. Assurez-vous que l\'épinglage de l\'écran est activé.\n\n2. Ouvrez l\'écran que vous voulez épingler.\n\n3. Appuyez sur \"Aperçu\".\n\n4. Balayez l\'écran vers le haut, puis appuyez sur l\'icône d\'épinglage."</string>
+    <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Demander schéma de déverrouillage avant d\'annuler épinglage"</string>
+    <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Demander le code PIN avant d\'annuler l\'épinglage"</string>
+    <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Demander le mot de passe avant d\'annuler l\'épinglage"</string>
+    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Verrouiller l\'appareil lors de l\'annulation de l\'épinglage"</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Profil professionnel"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Expérimental)"</string>
     <string name="display_auto_rotate_title" msgid="6176450657107806043">"Lorsque l\'utilisateur fait pivoter l\'appareil"</string>
@@ -2469,7 +2492,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Rester en mode paysage"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Conserver l\'orientation actuelle"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"Informations sur le code IMEI"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"Informations relatives au code IMEI"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Chiffrement"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Continuer"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"Pour améliorer la protection de cet appareil, vous pouvez exiger la saisie du code PIN avant le démarrage. Dans ce cas, l\'appareil ne reçoit pas d\'appels, de messages ni de notifications, y compris les alertes, tant qu\'il n\'a pas démarré. \n\nCette fonctionnalité permet de protéger les données en cas de perte ou de vol de l\'appareil."</string>
@@ -2487,4 +2509,7 @@
     <string name="encrypt_talkback_dialog_message_pin" msgid="1890374082842868489">"Lorsque vous saisissez votre code PIN pour démarrer cet appareil, les services d\'accessibilité comme <xliff:g id="SERVICE">%1$s</xliff:g> ne sont pas disponibles."</string>
     <string name="encrypt_talkback_dialog_message_pattern" msgid="4474332516537386384">"Lorsque vous dessinez votre motif pour démarrer cet appareil, les services d\'accessibilité comme <xliff:g id="SERVICE">%1$s</xliff:g> ne sont pas disponibles."</string>
     <string name="encrypt_talkback_dialog_message_password" msgid="8166099418487083927">"Lorsque vous saisissez votre mot de passe pour démarrer cet appareil, les services d\'accessibilité comme <xliff:g id="SERVICE">%1$s</xliff:g> ne sont pas disponibles."</string>
+    <string name="imei_information_title" msgid="8499085421609752290">"Informations sur le code IMEI"</string>
+    <string name="imei_information_summary" msgid="2074095606556565233">"Informations relatives au code IMEI"</string>
+    <string name="slot_number" msgid="3762676044904653577">"(Emplacement <xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-gl-rES/arrays.xml b/res/values-gl-rES/arrays.xml
index 6362a93..c513957 100644
--- a/res/values-gl-rES/arrays.xml
+++ b/res/values-gl-rES/arrays.xml
@@ -527,4 +527,12 @@
     <item msgid="4338089220026248848">"Na caché (cliente de actividade)"</item>
     <item msgid="6652164677254579050">"Na caché (en branco)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Verde azulado"</item>
+    <item msgid="8332294763632946560">"Azul"</item>
+    <item msgid="2023216417616991392">"Índigo"</item>
+    <item msgid="3170497246594232819">"Violeta"</item>
+    <item msgid="4608643045752965568">"Rosa"</item>
+    <item msgid="6131821495505931173">"Vermello"</item>
+  </string-array>
 </resources>
diff --git a/res/values-gl-rES/strings.xml b/res/values-gl-rES/strings.xml
index 614b8d8..2077be4 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> visible para disp próximos con axus BT abertos."</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>
@@ -180,7 +180,6 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s quere acceder ás túas mensaxes. Queres conceder acceso a %2$s?"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Data e hora"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Seleccionar zona horaria"</string>
-    <string name="normal_date_format" msgid="7636406984925498359">"Rexional (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Vista previa:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Tamaño do tipo de letra:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -291,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>
@@ -322,8 +321,6 @@
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Seleccionar zona horaria"</string>
     <string name="date_time_set_date_title" msgid="6928286765325608604">"Data"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"Definir data"</string>
-    <string name="date_time_date_format_title" msgid="3976171711988766411">"Formato de data"</string>
-    <string name="date_time_date_format" msgid="6951498879879281102">"Seleccionar formato de data"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Ordenar alfabeticamente"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Ordenar por zona horaria"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Data"</string>
@@ -372,7 +369,8 @@
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Agarda mentres se encripta o teléfono. <xliff:g id="PERCENT">^1</xliff:g>% completado."</string>
     <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Agarda mentres se cifra o tablet. Tempo restante: <xliff:g id="DURATION">^1</xliff:g>"</string>
     <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Agarda mentres se cifra o teléfono. Tempo restante: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Téntao de novo en <xliff:g id="DELAY">^1</xliff:g> segundos."</string>
+    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"Para desbloquear o tablet, apágao e volve acendelo."</string>
+    <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"Para desbloquear o teléfono, apágao e volve acendelo."</string>
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"Advertencia: O dispositivo borrarase se se realizan <xliff:g id="COUNT">^1</xliff:g> intentos máis de desbloquealo sen éxito."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Escribe o teu contrasinal"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Encriptación incorrecta"</string>
@@ -401,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>
@@ -412,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>
@@ -556,13 +556,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Como altofalante"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Para música e contido multimedia"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Lembrar configuración"</string>
-    <string name="wifi_assistant_intro_setup" msgid="4605105515416995110">"Asistente\nwifi"</string>
-    <string name="wifi_assistant_no_thanks" msgid="2776983751990143934">"NON, GRAZAS"</string>
-    <string name="wifi_assistant_setup" msgid="3772423650475730906">"CONFIGURAR"</string>
-    <string name="wifi_assistant_card_message" msgid="107811647784658536">"Conectar automaticamente a redes dispoñibles cun asistente wifi."</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Asistente de wifi"</string>
-    <string name="wifi_assistant_title_message" msgid="6240721017579074015">"<xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> conéctate automaticamente á mellor wifi dispoñible"</string>
-    <string name="wifi_assistant_open_app" msgid="4803044899535675063">"ABRIR APLICACIÓN"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Conectado ao asistente de wifi"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"Enviar pantalla"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Activar visualización sen fíos"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Non hai dispositivos cerca."</string>
@@ -592,7 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Configuración da wifi"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wifi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Configura e xestiona puntos de acceso sen fíos"</string>
-    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Seleccionar wifi"</string>
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Seleccionar rede wifi"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Seleccionar wifi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Activando a wifi..."</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Desactivando a wifi..."</string>
@@ -607,11 +602,12 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"Exploración sempre dispoñible"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Permitir sempre a busca"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Permite ao servizo de localización de Google e a outras aplicacións buscar redes, aínda que a wifi estea desactivada"</string>
-    <string name="wifi_automatically_manage_title" msgid="6249976570008992746">"Xestionar automaticamente a wifi"</string>
-    <string name="wifi_automatically_manage_summary" msgid="6952470763378312488">"Permitir que <xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> xestione a túa conexión wifi"</string>
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Utilizar wifi aberta automaticamente"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Permitir ao asistente wifi conectarse automaticamente a redes abertas de alta calidade"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Seleccionar asistente"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Instalar certificados"</string>
-    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Para mellorar a precisión da localización e para outros fins, é posible que Google e outras aplicacións busquen redes próximas, aínda que a wifi estea desactivada. Se non queres que isto pase, vai a Avanzado &gt; Exploración sempre dispoñible."</string>
-    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"É posible que as aplicacións busquen redes próximas, aínda que a wifi estea desactivada. Se non queres que isto pase, vai a Avanzado &gt; Exploración sempre dispoñible."</string>
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Para mellorar a precisión da localización e para outros fins, é posible que Google e outras aplicacións busquen redes próximas, aínda que a wifi estea desactivada. Se non queres que isto pase, accede a Avanzado &gt; Buscar redes sempre."</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"É posible que as aplicacións busquen redes próximas, aínda que a wifi estea desactivada. Se non queres que isto pase, accede a Avanzado &gt; Buscar redes sempre."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Non mostrar outra vez"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Manter a wifi activada durante o modo de suspensión"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Wifi activada na suspensión"</string>
@@ -629,6 +625,7 @@
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Explorar"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Avanzada"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Conectar coa rede"</string>
+    <string name="wifi_menu_remember" msgid="8814185749388713796">"Lembrar rede"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Esquecer rede"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Modificar rede"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Escribir na etiqueta NFC"</string>
@@ -673,9 +670,11 @@
     <string name="wifi_unspecified" msgid="5431501214192991253">"(non especificado)"</string>
     <string name="wifi_remembered" msgid="4955746899347821096">"Gardada"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"Desactivadas"</string>
-    <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Evitou unha conexión a Internet deficiente"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"Erro na configuración de IP"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Erro na conexión wifi"</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Problema de autenticación"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Non está dentro da zona de cobertura"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Non se detectou acceso a Internet e non se volverá conectar automaticamente."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS dispoñible"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS dispoñible)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Introduce o contrasinal da túa rede"</string>
@@ -699,9 +698,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"ADVERTENCIA: Se omites a conexión wifi, o tablet só utilizará datos móbiles para facer descargas e actualizacións iniciais. Para evitar posibles cargos de datos, conéctate a unha rede wifi."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"ADVERTENCIA: Se omites a conexión wifi, o dispositivo só utilizará datos móbiles para facer descargas e actualizacións iniciais. Para evitar posibles cargos de datos, conéctate a unha rede wifi."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"ADVERTENCIA: Se omites a conexión wifi, o teléfono só utilizará datos móbiles para facer descargas e actualizacións iniciais. Para evitar posibles cargos de datos, conéctate a unha rede wifi."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="2393880108322835846">"ADVERTENCIA: Se omites a conexión wifi, o tablet non se poderá conectar a Internet para facer descargas ou actualizacións iniciais."</string>
-    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1707391993265558787">"ADVERTENCIA: Se omites a conexión wifi, o dispositivo non se poderá conectar a Internet para facer descargas ou actualizacións iniciais."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="1556858507920033022">"ADVERTENCIA: Se omites a conexión wifi, o teléfono non se poderá conectar a Internet para facer descargas ou actualizacións iniciais."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Se omites a conexión wifi:\n\nO teu tablet non se poderá conectar a Internet.\n\nNon recibirás actualizacións de software ata que te conectes a Internet.\n\nNon podes activar as funcións de protección do dispositivo neste momento."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Se omites a conexión wifi:\n\nO teu dispositivo non se poderá conectar a Internet.\n\nNon recibirás actualizacións de software ata que te conectes a Internet.\n\nNon podes activar as funcións de protección do dispositivo neste momento."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Se omites a conexión wifi:\n\nO teu teléfono non se poderá conectar a Internet.\n\nNon recibirás actualizacións de software ata que te conectes a Internet.\n\nNon podes activar as funcións de protección do dispositivo neste momento."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"O tablet non puido conectarse a esta rede wifi."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"O dispositivo non foi capaz de conectarse a esta rede wifi."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"O teléfono non foi capaz de conectarse a esta rede wifi."</string>
@@ -761,7 +760,6 @@
     <string name="ring_volume_title" msgid="7938706566797464165">"Volume do timbre"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrar cando está en silencio"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Son de notificación predeterminado"</string>
-    <string name="heads_up_enabled_title" msgid="1031078221910921622">"Emerxente con prioridade alta"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Ton de chamada"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Notificación"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Utilizar o volume da chamada entrante para as notificacións"</string>
@@ -834,7 +832,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Brillo automático"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Levantar para acender"</string>
     <string name="doze_title" msgid="2259176504273878294">"Pantalla ambiente"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"Activa a pantalla cando se colle o dispositivo ou cando chegan notificacións"</string>
+    <string name="doze_summary" msgid="7128970177894383698">"Activar pantalla ao coller o dispositivo ou recibir notificacións"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Tamaño do tipo de letra"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Tamaño do tipo de letra"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Configuración de bloqueo da tarxeta SIM"</string>
@@ -862,6 +860,10 @@
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Cancelar"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"Encontráronse varias tarxetas SIM"</string>
     <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>
@@ -1012,6 +1014,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Esta acción borrará todos os datos do "<b>"almacenamento interno"</b>" do teu tablet, como:\n\n"<li>"A túa conta de Google"</li>\n<li>"Os datos e a configuracións do sistema e das aplicacións"</li>\n<li>"Aplicacións descargadas"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Esta acción borrará todos os datos do "<b>"almacenamento interno"</b>" do teléfono, como:\n\n"<li>"A túa conta de Google"</li>\n<li>"Os datos e configuracións do sistema e das aplicacións"</li>\n<li>"As aplicacións descargadas"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Actualmente tes sesión iniciada nas seguintes contas:\n"</string>
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Hai outros usuarios presentes neste dispositivo.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Música"</li>\n<li>"Fotos"</li>\n<li>"Outros datos do usuario"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Para borrar música, imaxes e outros datos do usuario, é necesario borrar o "<b>"almacenamento USB"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Para borrar música, imaxes e outros datos de usuario, é necesario borrar a "<b>"tarxeta SD"</b>"."</string>
@@ -1023,7 +1026,6 @@
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Restablecer teléfono"</string>
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Queres borrar toda a túa información persoal e as aplicacións descargadas? Non podes desfacer esta acción."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Borrar todo"</string>
-    <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Debuxa o teu padrón de desbloqueo"</string>
     <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Tes que debuxar o teu padrón de desbloqueo para confirmar un restablecemento dos datos de fábrica."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Non se levou a cabo ningún restablecemento debido a que o servizo de borrado do sistema non está dispoñible."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Restablecer?"</string>
@@ -1041,7 +1043,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"Queres borrar o almacenamento USB e todos os ficheiros almacenados nel? Non poderás desfacer esta acción."</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Queres borrar a tarxeta SD e todos os ficheiros almacenados nela? Non poderás desfacer esta acción."</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Borrar todo"</string>
-    <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Debuxa o teu padrón de desbloqueo"</string>
     <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Tes que debuxar o teu padrón de desbloqueo para confirmar que queres borrar o almacenamento USB."</string>
     <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Tes que debuxar o teu padrón de desbloqueo para confirmar que queres borrar a tarxeta SD."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Configuración de chamada"</string>
@@ -1087,6 +1088,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Introduce unha tarxeta SIM e reinicia"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Conéctate a Internet"</string>
     <string name="location_title" msgid="1029961368397484576">"A miña localización"</string>
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Perfil de traballo"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Localización perfil traballo"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Desactivado pola túa empresa"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Modo"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Alta precisión"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Aforro de batería"</string>
@@ -1124,6 +1128,7 @@
     <string name="copyright_title" msgid="865906688917260647">"Copyright"</string>
     <string name="license_title" msgid="1990487604356037871">"Licenza"</string>
     <string name="terms_title" msgid="7697580845616764642">"Termos e condicións"</string>
+    <string name="webview_license_title" msgid="2813507464175738967">"Licenza WebView do sistema"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Fondos de pantalla"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Provedores de imaxes por satélite:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Licenzas de código aberto"</string>
@@ -1237,9 +1242,9 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Almacenamento USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Na tarxeta SD"</string>
     <string name="disabled" msgid="9206776641295849915">"Desactivada"</string>
-    <string name="not_installed" msgid="1475144352069281880">"Non instalada"</string>
+    <string name="not_installed" msgid="2797554494953450291">"Sen instalar para este usuario"</string>
     <string name="no_applications" msgid="7336588977497084921">"Ningunha aplicación."</string>
-    <string name="internal_storage" msgid="1584700623164275282">"Almac. interno"</string>
+    <string name="internal_storage" msgid="1584700623164275282">"Almacenamento interno"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Almac. USB"</string>
     <string name="sd_card_storage" product="default" msgid="7623513618171928235">"Tarxeta SD"</string>
     <string name="recompute_size" msgid="7722567982831691718">"Recalculando o tamaño…"</string>
@@ -1434,8 +1439,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"A pantalla nunca estará en modo de suspensión durante a carga"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Activar rexistro de busca HCI Bluetooth"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Capturar todos os paquetes HCI Bluetooth nun ficheiro"</string>
-    <string name="oem_unlock_enable" msgid="6629321276287913315">"Activar desbloqueo OEM"</string>
-    <string name="oem_unlock_enable_summary" msgid="3546686263996628110">"Permite que o dispositivo estea bloqueado polo OEM"</string>
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"Desbloqueo do OEM"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Permitir que se desbloqueo o cargador de inicio"</string>
+    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Introduce o teu PIN"</string>
+    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Introduce o PIN do dispositivo para activar o desbloqueo do OEM"</string>
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Queres permitir o desbloqueo do OEM?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"AVISO: As funcións de protección do dispositivo non funcionarán neste dispositivo se está activada esta configuración."</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Certificado de visualización sen fíos"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Activar rexistro detallado da wifi"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Entrega agresiva de wifi a móbil"</string>
@@ -1538,6 +1547,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"Os subtítulos terán un aspecto similar ao seguinte"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"Predeterminada"</string>
+    <string name="color_title" msgid="4258931051732243983">"Cor"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"Predeterminado"</string>
     <string name="color_none" msgid="3475640044925814795">"Ningún"</string>
     <string name="color_white" msgid="8045195170201590239">"Branco"</string>
@@ -1595,12 +1605,12 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"<xliff:g id="REMAIN">%1$s</xliff:g> restante(s)"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> para completar a carga"</string>
-    <string name="power_discharging_duration" msgid="7125493014448497620">"<xliff:g id="LEVEL">%1$d</xliff:g>%%: aprox. <xliff:g id="TIME">%2$s</xliff:g> restante(s)"</string>
-    <string name="power_charging" msgid="712751285832976915">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="STATE">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration" msgid="4802183864773082009">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> para completar a carga"</string>
-    <string name="power_charging_duration_ac" msgid="3611179931297824699">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> para completar a carga por CA"</string>
-    <string name="power_charging_duration_usb" msgid="1106605348913397583">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> para completar a carga por USB"</string>
-    <string name="power_charging_duration_wireless" msgid="633606920144617227">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> para completar a carga por rede sen fíos"</string>
+    <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> - faltan aproximadamente <xliff:g id="TIME">%2$s</xliff:g>"</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> para completar a carga"</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> para completar a carga con CA"</string>
+    <string name="power_charging_duration_usb" msgid="182405645340976546">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> para completar a carga con USB"</string>
+    <string name="power_charging_duration_wireless" msgid="1829295708243159464">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> para completar a carga co modo sen fíos"</string>
     <string name="power_usage_list_summary" msgid="2409288197839512482">"Uso desde a última carga completa"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Uso da batería desde que se desconectou"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Uso da batería desde o restablecemento"</string>
@@ -1617,7 +1627,6 @@
     <string name="awake" msgid="387122265874485088">"Hora de activación do dispositivo"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Tempo de conexión wifi"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Tempo de conexión wifi"</string>
-    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Detalles do historial"</string>
     <string name="details_title" msgid="3792801565213935385">"Detalles do uso"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Detalles de uso"</string>
@@ -1689,7 +1698,7 @@
     <string name="battery_saver" msgid="1426682272004907982">"Aforro de batería"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Activar automaticamente"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Nunca"</string>
-    <string name="battery_saver_turn_on_automatically_pct" msgid="3033681629861428940">"co %1$d%% de batería"</string>
+    <string name="battery_saver_turn_on_automatically_pct" msgid="7536784431655058267">"cun %1$s de batería"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Estatísticas de procesos"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Estatísticas frikis sobre procesos en execución"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Uso da memoria"</string>
@@ -1813,7 +1822,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Almacenado en hardware"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Só software"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"As credenciais non están dispoñibles para este usuario"</string>
-    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Debuxa o teu padrón de desbloqueo"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Tes que debuxar o padrón de desbloqueo para confirmar a instalación de credenciais."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Escribe o contrasinal do almacenamento de credenciais."</string>
@@ -1843,6 +1851,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"Incluír datos de aplicacións"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Restauración automática"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Cando volvas instalar unha aplicación, restaura a configuración e os datos dos que fixeches unha copia de seguranza"</string>
+    <string name="backup_inactive_title" msgid="5355557151569037197">"O servizo de copias de seguranza está inactivo."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"Establécese mediante a política do dispositivo."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Contrasinal para copias"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"As copias de seguridade de ordenador completas non están protexidas"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Toca para cambiar ou eliminar o contrasinal para as copias de seguranza completas do escritorio"</string>
@@ -1952,7 +1962,11 @@
     <string name="enter_password" msgid="8035706727471334122">"Para iniciar o dispositivo Android, introduce o teu contrasinal"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Para iniciar o dispositivo Android, introduce o teu PIN"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Para iniciar o dispositivo Android, debuxa o teu padrón"</string>
-    <string name="try_again" msgid="4272075051293936921">"Téntao de novo."</string>
+    <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"Padrón incorrecto"</string>
+    <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"Contrasinal incorrecto"</string>
+    <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"PIN incorrecto"</string>
+    <string name="checking_decryption" msgid="8287458611802609493">"Comprobando..."</string>
+    <string name="starting_android" msgid="8581493237458496835">"Iniciando Android"</string>
     <string name="delete" msgid="4219243412325163003">"Eliminar"</string>
     <string name="misc_files" msgid="6720680815969643497">"Ficheiros variados"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"seleccionáronse <xliff:g id="NUMBER">%1$d</xliff:g> de <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -1990,8 +2004,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Utilizar sempre GPU para a composición da pantalla"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"Simular o espazo da cor"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Activar rastros OpenGL"</string>
-    <string name="use_nuplayer" msgid="5699257393367904387">"Usar NuPlayer (experim.)"</string>
-    <string name="use_nuplayer_summary" msgid="1991479067478516714">"Usar NuPlayer en lugar de AwesomePlayer"</string>
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"Utilizar AwesomePlayer (obsoleto)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"Utilizar AwesomePlayer en lugar de NuPlayer para a maioría das reproducións de medios"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"Desactivar enr. audio USB"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"Desactivar enrutamento aut. a periférico audio USB"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Mostrar límites de deseño"</string>
@@ -2037,7 +2051,7 @@
     <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"Sincronización automática de datos"</string>
     <string name="data_usage_menu_sim_cards" msgid="6410498422797244073">"Tarxetas SIM"</string>
     <string name="data_usage_menu_cellular_networks" msgid="5243515735055652279">"Redes móbiles"</string>
-    <string name="account_settings_menu_auto_sync" msgid="6243013719753700377">"Sincronización de datos auto."</string>
+    <string name="account_settings_menu_auto_sync" msgid="6243013719753700377">"Sincronización automática"</string>
     <string name="account_settings_menu_auto_sync_personal" msgid="785541379617346438">"Sincr. auto. de datos persoais"</string>
     <string name="account_settings_menu_auto_sync_work" msgid="329565580969147026">"Sincr. auto. datos do traballo"</string>
     <string name="data_usage_change_cycle" msgid="7776556448920114866">"Cambiar ciclo…"</string>
@@ -2167,7 +2181,6 @@
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Engadir usuario ou perfil"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Engadir usuario"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Perfil restrinxido"</string>
-    <string name="user_summary_managed_profile" msgid="7369539529693048111">"Perfil de traballo"</string>
     <string name="user_need_lock_message" msgid="2596365678651842785">"Para poder crear un perfil restrinxido, precisarás configurar un bloqueo da pantalla para protexer as túas aplicacións e datos persoais."</string>
     <string name="user_set_lock_button" msgid="8311219392856626841">"Establecer bloqueo"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Non configurado"</string>
@@ -2193,7 +2206,7 @@
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"Só o propietario do teléfono pode xestionar usuarios."</string>
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Os perfís restrinxidos non poden engadir contas"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Eliminar <xliff:g id="USER_NAME">%1$s</xliff:g> do dispositivo"</string>
-    <string name="user_add_on_lockscreen_menu" msgid="3025132738715222247">"Engadir us. co disp. bloqueado"</string>
+    <string name="user_add_on_lockscreen_menu" msgid="3025132738715222247">"Engade usuarios co disp. bloq."</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Novo usuario"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Novo perfil"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Queres eliminarte a ti mesmo?"</string>
@@ -2298,11 +2311,13 @@
     <string name="sim_cellular_data_unavailable_summary" msgid="3654805961942166428">"Toca para seleccionar unha SIM de datos"</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"Usar sempre para as chamadas"</string>
     <string name="select_sim_for_data" msgid="2366081042162853044">"Seleccionar unha SIM para datos"</string>
+    <string name="data_switch_started" msgid="2040761479817166311">"Cambiando SIM de datos. Este proceso pode tardar ata un minuto..."</string>
     <string name="select_sim_for_calls" msgid="3503094771801109334">"Chamar con"</string>
     <string name="sim_select_card" msgid="211285163525563293">"Seleccionar unha tarxeta SIM"</string>
     <string name="sim_card_number_title" msgid="7845379943474336488">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"SIM baleira"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"Nome da SIM"</string>
+    <string name="sim_name_hint" msgid="7038643345238968930">"Introducir o nome da SIM"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"Rañura da SIM %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Operador"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Número"</string>
@@ -2312,7 +2327,6 @@
     <string name="color_purple" msgid="3888532466427762504">"Violeta"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"Non hai ningunha tarxeta SIM inserida"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"Estado da SIM"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"Información relacionada coa SIM"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"Devolver chamada da SIM predeterminada"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"Tarxeta SIM para chamadas saíntes"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Outras configuracións de chamada"</string>
@@ -2320,8 +2334,11 @@
     <string name="preferred_network_offload_header" msgid="2321173571529106767">"Desactivar emisión nome"</string>
     <string name="preferred_network_offload_footer" msgid="5857279426054744020">"Desactivar a emisión do nome da rede evita que terceiros accedan á información da túa rede."</string>
     <string name="preferred_network_offload_popup" msgid="2252915199889604600">"Desactivar a emisión do nome da rede evitará a conexión automática a redes ocultas."</string>
+    <string name="sim_signal_strength" msgid="9144010043784767984">"<xliff:g id="DBM">%1$d</xliff:g> dBm <xliff:g id="ASU">%2$d</xliff:g> asu"</string>
+    <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>
+    <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Preguntar sempre"</string>
     <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>
@@ -2330,22 +2347,22 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Buscas recentes"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Resultados"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi rede conexión"</string>
-    <string name="keywords_more_default_sms_app" msgid="2744404159003574745">"mensaxe de texto"</string>
-    <string name="keywords_more_mobile_networks" msgid="7813380887358745769">"móbil operador sen fíos móbil"</string>
+    <string name="keywords_more_default_sms_app" msgid="895656981962034647">"mensaxe de texto mensaxes de texto mensaxes mensaxería"</string>
+    <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"móbil operador sen fíos datos 4g 3g 2g lte"</string>
     <string name="keywords_home" msgid="3626170808219458848">"iniciador"</string>
     <string name="keywords_display" msgid="6709007669501628320">"pantalla pantalla táctil"</string>
-    <string name="keywords_display_brightness_level" msgid="8636451602230815191">"atenuar pantalla pantalla táctil"</string>
-    <string name="keywords_display_auto_brightness" msgid="8070218600502753102">"atenuar pantalla pantalla táctil"</string>
-    <string name="keywords_display_wallpaper" msgid="4315466287469834939">"fondo"</string>
+    <string name="keywords_display_brightness_level" msgid="8923289340474728990">"atenuar pantalla pantalla táctil batería"</string>
+    <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"atenuar pantalla pantalla táctil batería"</string>
+    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"segundo plano personalizar pantalla"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"tamaño do texto"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"proxecto"</string>
-    <string name="keywords_storage" msgid="7007275853993419928">"espazo disco unidade de disco duro"</string>
-    <string name="keywords_battery" msgid="3992479295298655138">"batería"</string>
-    <string name="keywords_spell_checker" msgid="4509482591225399210">"ortografía"</string>
+    <string name="keywords_storage" msgid="6572905220031852173">"espazo disco unidade de disco duro uso do dispositivo"</string>
+    <string name="keywords_battery" msgid="2096185085932675704">"carga consumo enerxía"</string>
+    <string name="keywords_spell_checker" msgid="6106749039734174140">"ortografía dicionario corrector ortográfico autocorrector"</string>
     <string name="keywords_voice_input" msgid="3519547605812413860">"recoñecedor entrada voz falar idioma mans libres man libre recoñecemento palabra ofensiva audio historial auriculares bluetooth"</string>
-    <string name="keywords_text_to_speech_output" msgid="8207889472282225512">"puntuar idioma predeterminado falar fala"</string>
-    <string name="keywords_date_and_time" msgid="7666950126499155141">"reloxo"</string>
-    <string name="keywords_factory_data_reset" msgid="3693730656843989732">"borrar eliminar"</string>
+    <string name="keywords_text_to_speech_output" msgid="392447904221657930">"puntuar idioma predeterminado falar síntese de voz tts accesibilidade lector cego"</string>
+    <string name="keywords_date_and_time" msgid="2631808108134830066">"reloxo 24 horas"</string>
+    <string name="keywords_factory_data_reset" msgid="4355133848707691977">"borrar eliminar restaurar quitar"</string>
     <string name="keywords_printing" msgid="1701778563617114846">"impresora"</string>
     <string name="keywords_sounds_and_notifications" msgid="5965996187974887000">"alarma sonora do altofalante"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="2912933812460077912">"non non molestar interromper interrupción pausa"</string>
@@ -2354,7 +2371,7 @@
     <string name="keywords_location_mode" msgid="8584992704568356084">"precisión"</string>
     <string name="keywords_accounts" msgid="1957925565953357627">"conta"</string>
     <string name="keywords_users" msgid="4673901601478559100">"restrición restrinxir restrinxido"</string>
-    <string name="keywords_keyboard_and_ime" msgid="1103378692379215672">"texto corrección correcto son vibrar automático idioma xesto suxerir suxestión tema palabra ofensiva escribir emoji"</string>
+    <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"texto corrección correcto son vibrar automático idioma xesto suxerir suxestión tema palabra ofensiva escribir emoji internacional"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"pasar o dedo contrasinal padrón pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Configurar etiqueta NFC wifi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Escribir"</string>
@@ -2371,7 +2388,6 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Volume das notificacións"</string>
     <string name="zen_mode_settings_title" msgid="7014915558669122902">"Interrupcións"</string>
     <string name="zen_mode_option_title" msgid="5061978632306007914">"Cando se reciben chamadas e notificacións"</string>
-    <string name="zen_mode_option_title_novoice" msgid="6680706009915204785">"Cando se reciben notificacións"</string>
     <string name="zen_mode_option_off" msgid="3167702608910820883">"Interromper sempre"</string>
     <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Permitir só interrupcións prioritarias"</string>
     <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Non interromper"</string>
@@ -2429,14 +2445,17 @@
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Feito"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Ata que desactives isto"</string>
     <string name="zen_mode_important_category" msgid="8123274463331022993">"Interrupcións prioritarias"</string>
-    <string name="zen_mode_downtime_category" msgid="4730179065426038108">"Inactividade (só interrupcións prioritarias)"</string>
+    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Tempo de inactividade"</string>
     <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Días"</string>
     <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Ningún"</string>
+    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Interrupcións permitidas"</string>
+    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Só prioridade"</string>
+    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Ningún"</string>
     <string name="zen_mode_automation_category" msgid="4653551005950835761">"Automatización"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Activar automaticamente"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Nunca"</string>
-    <string name="zen_mode_phone_calls" msgid="8956214416859303966">"Chamadas"</string>
+    <string name="zen_mode_calls" msgid="7051492091133751208">"Chamadas"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Mensaxes"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Chamadas/mensaxes de"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Calquera"</string>
@@ -2450,7 +2469,9 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Noites pola semana"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Hora de inicio"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Hora de finalización"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> do seguinte día"</string>
+    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"Ás <xliff:g id="FORMATTED_TIME">%s</xliff:g> do día seguinte"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"Ás <xliff:g id="FORMATTED_TIME">%s</xliff:g> ou con calquera alarma anterior"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"Ás <xliff:g id="FORMATTED_TIME">%s</xliff:g> do día seguinte ou con calquera alarma anterior"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Notific. aplicacións"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Configuración das notificacións"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Enviar comentarios do dispositivo"</string>
@@ -2458,7 +2479,11 @@
     <string name="switch_on_text" msgid="1124106706920572386">"Activado"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Desactivado"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"Fixar pantalla"</string>
-    <string name="screen_pinning_description" msgid="7091642350452605379">"Se activas a función, podes usar a fixación de pantalla para manter a vista da pantalla actual ata que soltes a pantalla.\n\nPara utilizar a fixación de pantalla:\n\n1. Asegúrate de que a fixación de pantalla está activada.\n\n2. Abre a pantalla que queres fixar.\n\n3. Toca Visión xeral.\n\n4. Toca a icona de fixación."</string>
+    <string name="screen_pinning_description" msgid="1137904524037468263">"Se esta opción está activada, podes fixar a pantalla para manter visible a pantalla actual ata que non anules a fixación.\n\nFai o seguinte:\n\n1. Asegúrate de que a fixación de pantalla está activada.\n\n2. Abre a pantalla que queres fixar.\n\n3. Toca Visión xeral.\n\n4. Pasa o dedo cara arriba e toca a icona de fixación."</string>
+    <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Solicitar un padrón de desbloqueo antes de soltar a pantalla"</string>
+    <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Solicitar un PIN antes de soltar a pantalla"</string>
+    <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Solicitar un contrasinal antes de soltar a pantalla"</string>
+    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Bloquear dispositivo ao soltar a pantalla"</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Perfil do traballo"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Experimental)"</string>
     <string name="display_auto_rotate_title" msgid="6176450657107806043">"Ao xirar o dispositivo"</string>
@@ -2467,7 +2492,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Permanecer na vista horizontal"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Permanecer na orientación actual"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"Información de IMEI"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"Información relativa de IMEI"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Cifrado"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Continuar"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"Podes protexer aínda máis este dispositivo requirindo o teu PIN antes de inicialo. Ata que o dispositivo se inicie, non poderá recibir chamadas, mensaxes nin notificacións, incluídas as alarmas. \n\nEsta acción axudará a protexer os datos en dispositivos perdidos ou roubados."</string>
@@ -2485,4 +2509,7 @@
     <string name="encrypt_talkback_dialog_message_pin" msgid="1890374082842868489">"Cando introduzas o teu PIN para iniciar este dispositivo, os servizos de accesibilidade como <xliff:g id="SERVICE">%1$s</xliff:g> aínda non estarán dispoñibles."</string>
     <string name="encrypt_talkback_dialog_message_pattern" msgid="4474332516537386384">"Cando introduzas o teu padrón para iniciar este dispositivo, os servizos de accesibilidade como <xliff:g id="SERVICE">%1$s</xliff:g> aínda non estarán dispoñibles."</string>
     <string name="encrypt_talkback_dialog_message_password" msgid="8166099418487083927">"Cando introduzas o teu contrasinal para iniciar este dispositivo, os servizos de accesibilidade como <xliff:g id="SERVICE">%1$s</xliff:g> aínda non estarán dispoñibles."</string>
+    <string name="imei_information_title" msgid="8499085421609752290">"Información de IMEI"</string>
+    <string name="imei_information_summary" msgid="2074095606556565233">"Información relativa de IMEI"</string>
+    <string name="slot_number" msgid="3762676044904653577">"(Rañura<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-hi/arrays.xml b/res/values-hi/arrays.xml
index f9bc0fa..57cb420 100644
--- a/res/values-hi/arrays.xml
+++ b/res/values-hi/arrays.xml
@@ -527,4 +527,12 @@
     <item msgid="4338089220026248848">"संचित (गतिविधि क्लाइंट)"</item>
     <item msgid="6652164677254579050">"संचित (खाली)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"हरा-नीला"</item>
+    <item msgid="8332294763632946560">"नीला"</item>
+    <item msgid="2023216417616991392">"गहरा नीला"</item>
+    <item msgid="3170497246594232819">"बैंगनी"</item>
+    <item msgid="4608643045752965568">"गुलाबी"</item>
+    <item msgid="6131821495505931173">"लाल"</item>
+  </string-array>
 </resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 78b1b65..b280338 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>
@@ -180,7 +180,6 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s आपके संदेशों को एक्सेस करना चाहता है. %2$s पर एक्सेस दें?"</string>
     <string name="date_and_time" msgid="9062980487860757694">"दिनांक और समय"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"समय क्षेत्र चुनें"</string>
-    <string name="normal_date_format" msgid="7636406984925498359">"क्षेत्रीय (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"पूर्वावलोकन:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"अक्षरों का आकार:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -291,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>
@@ -322,8 +321,6 @@
     <string name="date_time_set_timezone" msgid="5045627174274377814">"समय क्षेत्र को चुनें"</string>
     <string name="date_time_set_date_title" msgid="6928286765325608604">"दिनांक"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"दिनांक सेट करें"</string>
-    <string name="date_time_date_format_title" msgid="3976171711988766411">"दिनांक प्रारूप"</string>
-    <string name="date_time_date_format" msgid="6951498879879281102">"दिनांक प्रारूप चुनें"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"वर्णानुक्रम में क्रमित करें"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"समय क्षेत्र द्वारा क्रमित करें"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"तिथि"</string>
@@ -372,7 +369,8 @@
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"अपना फ़ोन एन्‍क्रिप्‍ट होने तक प्रतीक्षा करें. <xliff:g id="PERCENT">^1</xliff:g>% पूर्ण."</string>
     <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"जब तक आपका टेबलेट एन्क्रिप्ट किया जा रहा है तब तक प्रतीक्षा करें. शेष समय: <xliff:g id="DURATION">^1</xliff:g>"</string>
     <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"जब तक आपका फ़ोन एन्क्रिप्ट किया जा रहा है तब तक प्रतीक्षा करें. शेष समय: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"<xliff:g id="DELAY">^1</xliff:g> सेकंड में पुन: प्रयास करें."</string>
+    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"अपना टैबलेट अनलॉक करने के लिए, उसे बंद करें फिर चालू करें."</string>
+    <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"अपना फ़ोन अनलॉक करने के लिए, उसे बंद करें फिर चालू करें."</string>
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"चेतावनी: अनलॉक किए जाने के <xliff:g id="COUNT">^1</xliff:g> और विफल प्रयासों के बाद आपका डिवाइस हटा दिया जाएगा!"</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"अपना पासवर्ड लिखें"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"एन्क्रिप्‍शन विफल"</string>
@@ -401,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>
@@ -412,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>
@@ -556,13 +556,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"स्‍पीकर फ़ोन के रूप में"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"संगीत और मीडिया के लिए"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"सेटिंग याद रखें"</string>
-    <string name="wifi_assistant_intro_setup" msgid="4605105515416995110">"पेश है\nWi‑Fi सहायक"</string>
-    <string name="wifi_assistant_no_thanks" msgid="2776983751990143934">"रहने दें"</string>
-    <string name="wifi_assistant_setup" msgid="3772423650475730906">"सेट करें"</string>
-    <string name="wifi_assistant_card_message" msgid="107811647784658536">"वाई-फ़ाई सहायक के साथ उपलब्ध नेटवर्क से अपने आप कनेक्ट करें."</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"वाई-फ़ाई सहायक"</string>
-    <string name="wifi_assistant_title_message" msgid="6240721017579074015">"<xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> आपको अपने आप ही श्रेष्ठ उपलब्ध वाई-फ़ाई से कनेक्ट करता है"</string>
-    <string name="wifi_assistant_open_app" msgid="4803044899535675063">"ऐप्स खोलें"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"वाई-फ़ाई सहायक के द्वारा कनेक्‍ट है"</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>
@@ -592,7 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"वाई-फ़ाई सेटिंग"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"वाई-फ़ाई"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"वायरलेस पहुंच बिंदुओं को सेट अप और प्रबंधित करें"</string>
-    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"वाई-फ़ाई  चुनें"</string>
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"वाई-फ़ाई नेटवर्क चुनें"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"वाई-फ़ाई चुनें"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"वाई-फ़ाई  चालू हो रहा है…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"वाई-फ़ाई  बंद हो रहा है…"</string>
@@ -607,8 +602,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"स्कैनिंग हमेशा उपलब्ध है"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"हमेशा स्कैन करने दें"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Google की स्थान सेवा और अन्य ऐप्स को नेटवर्क स्कैन करने दें, भले ही वाई-फ़ाई बंद हो"</string>
-    <string name="wifi_automatically_manage_title" msgid="6249976570008992746">"वाई-फ़ाई अपने आप प्रबंधित करें"</string>
-    <string name="wifi_automatically_manage_summary" msgid="6952470763378312488">"<xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> को आपका वाई-फ़ाई कनेक्शन प्रबंधित करने दें"</string>
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"खुले वाई-फ़ाई का अपने आप उपयोग करें"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"उच्‍च गुणवत्‍ता वाले के रूप में पहचाने गए खुले नेटवर्क से वाई-फ़ाई सहायक को अपने आप कनेक्‍ट होने दें"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"सहायक चुनें"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"प्रमाणपत्र इंस्टाल करें"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"स्थान सटीकता को बेहतर बनाने तथा अन्य प्रयोजनों के लिए, Google और अन्य ऐप्स  आसपास के नेटवर्क स्कैन कर सकते हैं, भले ही वाई-फ़ाई  बंद हो. यदि आप ऐसा नहीं होने देना चाहते हैं, तो उन्नत &gt; स्कैनिंग हमेशा उपलब्ध पर जाएं."</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"ऐप्स  आसपास के नेटवर्क स्कैन कर सकते हैं, भले ही वाई-फ़ाई  बंद हो. यदि आप ऐसा नहीं होने देना चाहते हैं, तो उन्नत &gt; स्कैनिंग हमेशा उपलब्ध पर जाएं."</string>
@@ -629,6 +625,7 @@
     <string name="wifi_menu_scan" msgid="1470911530412095868">"स्कैन करें"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"अतिरिक्त सेटिंग"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"नेटवर्क से कनेक्‍ट करें"</string>
+    <string name="wifi_menu_remember" msgid="8814185749388713796">"नेटवर्क याद रखें"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"नेटवर्क भूलें"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"नेटवर्क बदलें"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"NFC टैग पर लिखें"</string>
@@ -673,9 +670,11 @@
     <string name="wifi_unspecified" msgid="5431501214192991253">"(अनिर्दिष्ट)"</string>
     <string name="wifi_remembered" msgid="4955746899347821096">"सहेजा गया"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"अक्षम"</string>
-    <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"खराब कनेक्‍शन पर ध्‍यान नहीं दि‍या गया"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP कॉन्‍फ़िगरेशन की विफलता"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"वाईफ़ाई कनेक्‍शन विफलता"</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"प्रमाणीकरण समस्या"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"रेंज में नहीं"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"किसी इंटरनेट कनेक्‍शन का पता नहीं चला, अपने आप पुन: कनेक्‍ट नहीं हो सकता."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS उपलब्‍ध"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS उपलब्‍ध)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"अपना नेटवर्क पासवर्ड डालें"</string>
@@ -699,9 +698,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"चेतावनी: यदि आप वाई-फ़ाई को छोड़ते हैं, तो आपका टेबलेट आरंभिक डाउनलोड और नई जानकारी के लिए केवल सेल्युलर डेटा का उपयोग करेगा. संभावित डेटा शुल्क से बचने के लिए, वाई-फ़ाई से कनेक्ट करें."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"चेतावनी: यदि आप वाई-फ़ाई को छोड़ते हैं, तो आपका डिवाइस आरंभिक डाउनलोड और अपडेट के लिए केवल सेल्युलर डेटा का उपयोग करेगा. संभावित डेटा शुल्क से बचने के लिए, वाई-फ़ाई से कनेक्ट करें."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"चेतावनी: यदि आप वाई-फ़ाई को छोड़ते हैं, तो आपका फ़ोन आरंभिक डाउनलोड और अपडेट के लिए केवल सेल्युलर डेटा का उपयोग करेगा. संभावित डेटा शुल्क से बचने के लिए, वाई-फ़ाई से कनेक्ट करें."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="2393880108322835846">"चेतावनी: यदि आप वाई-फ़ाई को छोड़ते हैं, तो किसी भी आरंभिक डाउनलोड या नई जावकारी के लिए आपके टेबलेट में इंटरनेट कनेक्शन नहीं होगा."</string>
-    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1707391993265558787">"चेतावनी: यदि आप वाई-फ़ाई को छोड़ते हैं, तो किसी भी आरंभिक डाउनलोड या नई जानकारी के लिए आपके डिवाइस में इंटरनेट कनेक्शन नहीं होगा."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="1556858507920033022">"चेतावनी: यदि आप वाई-फ़ाई को छोड़ते हैं, तो किसी भी आरंभिक डाउनलोड या अपडेट के लिए उपयोग करने के लिए आपके फ़ोन में इंटरनेट कनेक्शन नहीं होगा."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"यदि आप वाई-फ़ाई को छोड़ते हैं:\n\nतो आपके टैबलेट में इंटरनेट कनेक्‍शन नहीं होगा.\n\nआपको सॉफ़्टवेयर अपडेट तब तक नहीं मिलेंगे जब तक कि आप इंटरनेट से कनेक्‍ट नहीं करते.\n\nआप इस समय डिवाइस सुरक्षा सुविधाओं को सक्रिय नहीं कर सकते हैं."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"यदि आप वाई-फ़ाई को छोड़ते हैं:\n\nतो आपके डिवाइस में इंटरनेट कनेक्‍शन नहीं होगा.\n\nआपको सॉफ़्टवेयर अपडेट तब तक नहीं मिलेंगे जब तक कि आप इंटरनेट से कनेक्‍ट नहीं करते.\n\nआप डिवाइस सुरक्षा सुविधाओं को इस समय सक्रिय नहीं कर सकते हैं."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"यदि आप वाई-फ़ाई को छोड़ते हैंI:\n\nतो आपके फ़ोन में इंटरनेट कनेक्‍शन नहीं होगा.\n\nआपको सॉफ़्टवेयर अपडेट तब तक नहीं मिलेंगे जब तक कि आप इंटरनेट से कनेक्‍ट नहीं करते.\n\nआप डिवाइस सुरक्षा सुविधाओं को इस समय सक्रिय नहीं कर सकते हैं."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"टेबलेट इस वाई-फ़ाई  नेटवर्क से कनेक्ट नहीं हो सका था."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"डिवाइस इस वाई-फ़ाई नेटवर्क से कनेक्ट नहीं हो सका."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"फ़ोन इस वाई-फ़ाई  नेटवर्क से कनेक्ट नहीं हो सका था."</string>
@@ -761,7 +760,6 @@
     <string name="ring_volume_title" msgid="7938706566797464165">"रिंगर वॉल्‍यूम"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"मौन होने पर कंपन करें"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"साधारण नोटिफिकेशन ध्वनी"</string>
-    <string name="heads_up_enabled_title" msgid="1031078221910921622">"उच्च प्राथमिकता होने पर पॉप अप"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"रिंगटोन"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"नोटिफिकेशन"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"नोटिफिकेशन के लिए इनकमिंग कॉल वॉल्‍यूम का उपयोग करें"</string>
@@ -834,7 +832,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"अपनेआप स्क्रीन की रोशनी"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"सक्रिय करने के लिए उठाएं"</string>
     <string name="doze_title" msgid="2259176504273878294">"परिवेशी प्रदर्शन"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"डिवाइस को उठाने या नोटिफिकेशन के आने पर स्‍क्रीन को सक्रिय करें"</string>
+    <string name="doze_summary" msgid="7128970177894383698">"डिवाइस को उठाने पर या नोटिफिकेशन प्राप्‍त होने पर स्‍क्रीन सक्रिय करें"</string>
     <string name="title_font_size" msgid="4405544325522105222">"अक्षरों का आकार"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"अक्षरों का आकार"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"सिम कार्ड लॉक सेटिंग"</string>
@@ -862,6 +860,10 @@
     <string name="sim_enter_cancel" msgid="6240422158517208036">"रहने दें"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"एकाधिक सिम मिलीं"</string>
     <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> आपके डिवाइस में लगी एकमात्र सिम है. क्‍या आप इस सिम का उपयोग सेल्युलर डेटा, कॉल तथा SMS संदेशों के लिए करना चाहते हैं?"</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>
@@ -1012,6 +1014,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"इससे आपके टेबलेट के "<b>"मोबाइल मेमोरी"</b>" से सभी डेटा मिट जाएगा, जिसमें शामिल है:\n\n"<li>"आपका Google खाता"</li>\n<li>"सिस्‍टम और ऐप्स डेटा और सेटिंग"</li>\n<li>"डाउनलोड किए गए ऐप्स"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"इससे आपके फ़ोन के "<b>"मोबाइल मेमोरी"</b>" से सभी डेटा मिट जाएगा, जिसमें शामिल है:\n\n"<li>"आपका Google खाता"</li>\n<li>"सिस्‍टम और ऐप्स डेटा और सेटिंग"</li>\n<li>"डाउनलोड किए गए ऐप्स"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"आप वर्तमान में निम्‍न खातों में प्रवेश हैं:\n"</string>
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"इस डिवाइस पर अन्‍य उपयोगकर्ता मौजूद हैं.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"संगीत"</li>\n<li>"फ़ोटो"</li>\n<li>"अन्‍य उपयोगकर्ता डेटा"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"संगीत, चित्र और अन्‍य उपयोगकर्ता डेटा साफ़ करने के लिए "<b>" USB मेमोरी"</b>" मिटाना होगा."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"संगीत, चित्र और अन्‍य उपयोगकर्ता डेटा साफ़ करने के लिए "<b>"SD कार्ड"</b>" को साफ़ करना होगा."</string>
@@ -1023,7 +1026,6 @@
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"फ़ोन रीसेट करें"</string>
     <string name="master_clear_final_desc" msgid="7209547812233487345">"आपकी सभी निजी जानकारी और डाउनलोड किए गए ऐप्स मिटाएं? आप इस क्रिया को पूर्ववत नहीं कर सकते!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"सब कुछ मिटाएं"</string>
-    <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"अपना अनलॉक आकार आरेखित करें"</string>
     <string name="master_clear_gesture_explanation" msgid="826193821455182780">"आपको फ़ैक्टरी डेटा रीसेट की पुष्टि करने के लिए अपना अनलॉक आकार बनाना होगा."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"सिस्‍टम साफ़ करें सेवा उपलब्‍ध न होने के कारण कोई रीसेट निष्‍पादित नहीं किया गया था."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"रीसेट करें?"</string>
@@ -1041,7 +1043,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"SD कार्ड में संग्रहीत सभी फ़ाइलें हटाते हुए उसे मिटाएं? आप यह क्रिया पूर्ववत नहीं कर सकते!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"SD कार्ड में संग्रहीत सभी फ़ाइलें हटाते हुए उसे मिटाएं? आप इस क्रिया को पूर्ववत नहीं कर सकते!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"सब कुछ मिटाएं"</string>
-    <string name="media_format_gesture_prompt" msgid="3109349468816856670">"अपना अनलॉक आकार आरेखित करें"</string>
     <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"आप USB मेमोरी मिटाना चाहते हैं, इसकी पुष्टि के लिए आपको अपना अनलॉक आकार बनाना होगा."</string>
     <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"आप SD कार्ड को मिटाना चाहते हैं, इसकी पुष्टि करने के लिए आपको अपना अनलॉक आकार बनाना होगा."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"कॉल सेटिंग"</string>
@@ -1087,6 +1088,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"कृपया सिम कार्ड डालें और पुन: प्रारंभ करें"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"कृपया इंटरनेट से कनेक्ट करें"</string>
     <string name="location_title" msgid="1029961368397484576">"मेरा स्थान"</string>
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"कार्य प्रोफ़ाइल"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"कार्य प्रोफ़ाइल का स्‍थान"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"आपकी कंपनी ने बंद किया है"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"मोड"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"उच्च सटीकता"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"बैटरी की बचत"</string>
@@ -1124,6 +1128,7 @@
     <string name="copyright_title" msgid="865906688917260647">"कॉपीराइट"</string>
     <string name="license_title" msgid="1990487604356037871">"लाइसेंस"</string>
     <string name="terms_title" msgid="7697580845616764642">"नियम और शर्तें"</string>
+    <string name="webview_license_title" msgid="2813507464175738967">"सिस्टम WebView लाइसेंस"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"वॉलपेपर"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"उपग्रह इमेजरी प्रदाता:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"ओपन सोर्स लाइसेंस"</string>
@@ -1237,7 +1242,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB मेमोरी"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"SD कार्ड पर"</string>
     <string name="disabled" msgid="9206776641295849915">"अक्षम किया गया"</string>
-    <string name="not_installed" msgid="1475144352069281880">"इंस्‍टॉल नहीं है"</string>
+    <string name="not_installed" msgid="2797554494953450291">"इस उपयोगकर्ता के लिए इंस्‍टॉल नहीं किया गया"</string>
     <string name="no_applications" msgid="7336588977497084921">"कोई ऐप्स नहीं."</string>
     <string name="internal_storage" msgid="1584700623164275282">"मोबाइल मेमोरी"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB मेमोरी"</string>
@@ -1434,8 +1439,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"चार्ज होने के दौरान स्‍क्रीन कभी निष्‍क्रिय नहीं होगी"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"ब्लूटूथ HCI स्‍नूप लॉग सक्षम करें"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"फ़ाइल के सभी ब्लूटूथ HCI पैकेट कैप्‍चर करें"</string>
-    <string name="oem_unlock_enable" msgid="6629321276287913315">"OEM अनलॉक सक्षम करें"</string>
-    <string name="oem_unlock_enable_summary" msgid="3546686263996628110">"डिवाइस को OEM अनलॉक होने की अनुमति दें"</string>
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM अनलॉक करना"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"बूटलोडर को अनलाॅक किए जाने की अनुमति दें"</string>
+    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"अपना पिन डालें"</string>
+    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"OEM अनलॉक सक्षम करने के लिए अपना डिवाइस पिन डालें"</string>
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"OEM अनलॉक करने की अनुमति दें?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"चेतावनी: इस सेटिंग के चालू रहने पर डिवाइस सुरक्षा सुविधाएं इस डिवाइस पर काम नहीं करेंगी."</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"वायरलेस दिखाई देने के लिए प्रमाणन"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"वाई-फ़ाई वर्बोस प्रवेश सक्षम करें"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"वाई-फ़ाई से सेल्यूलर पर बलपूर्वक हस्तांतरण"</string>
@@ -1538,6 +1547,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"कैप्‍शन इस तरह दिखाई देंगे"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"सामान्य"</string>
+    <string name="color_title" msgid="4258931051732243983">"रंग"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"डिफ़ॉल्ट"</string>
     <string name="color_none" msgid="3475640044925814795">"कोई नहीं"</string>
     <string name="color_white" msgid="8045195170201590239">"सफ़ेद"</string>
@@ -1595,12 +1605,12 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"<xliff:g id="REMAIN">%1$s</xliff:g> शेष"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"चार्ज होने में <xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> शेष"</string>
-    <string name="power_discharging_duration" msgid="7125493014448497620">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - लगभग <xliff:g id="TIME">%2$s</xliff:g> शेष"</string>
-    <string name="power_charging" msgid="712751285832976915">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="STATE">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration" msgid="4802183864773082009">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - पूर्ण होने में <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration_ac" msgid="3611179931297824699">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - AC पर पूर्ण होने में <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration_usb" msgid="1106605348913397583">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - USB पर पूर्ण होने में <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration_wireless" msgid="633606920144617227">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - वायरलेस से पूर्ण होने में <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> - लगभग <xliff:g id="TIME">%2$s</xliff:g> शेष"</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> पूरी होने तक"</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> AC पर पूरी होने तक"</string>
+    <string name="power_charging_duration_usb" msgid="182405645340976546">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> USB पर पूरी होने तक"</string>
+    <string name="power_charging_duration_wireless" msgid="1829295708243159464">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> वायरलेस से पूरी होने तक"</string>
     <string name="power_usage_list_summary" msgid="2409288197839512482">"आखरी चार्ज से अब तक का उपयोग"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"अनप्‍लग होने के बाद से बैटरी का उपयोग"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"रीसेट के बाद से बैटरी उपयोग"</string>
@@ -1617,7 +1627,6 @@
     <string name="awake" msgid="387122265874485088">"डिवाइस सक्रियण समय"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"वाई-फ़ाई  चालू होने से अब तक का समय"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"वाई-फ़ाई  चालू होने से अब तक का समय"</string>
-    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"इतिहास विवरण"</string>
     <string name="details_title" msgid="3792801565213935385">"विवरणों का उपयोग करें"</string>
     <string name="details_subtitle" msgid="32593908269911734">"विवरणों का उपयोग करें"</string>
@@ -1689,7 +1698,7 @@
     <string name="battery_saver" msgid="1426682272004907982">"बैटरी सेवर"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"अपने आप चालू करें"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"कभी नहीं"</string>
-    <string name="battery_saver_turn_on_automatically_pct" msgid="3033681629861428940">"%1$d%% बैटरी होने पर"</string>
+    <string name="battery_saver_turn_on_automatically_pct" msgid="7536784431655058267">"%1$s बैटरी पर"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"प्रोसेस के आंकड़े"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"चल रही प्रक्रिया के बारे में आकंड़े"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"मेमोरी उपयोग"</string>
@@ -1813,7 +1822,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"हार्डवेयर-समर्थित"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"केवल सॉफ़्टवेयर"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"इस उपयोगकर्ता के लिए प्रमाणिकता उपलब्ध नहीं हैं"</string>
-    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"अपना अनलॉक आकार आरेखित करें"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"आपको प्रमाणिकता इंस्‍टॉलेशन की पुष्टि करने के लिए अपना अनलॉक आकार बनाना होगा."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"प्रमाणिकता मेमोरी के लिए पासवर्ड लिखें."</string>
@@ -1843,6 +1851,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"ऐप्स डेटा शामिल करें"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"अपने आप डेटा रिस्टोर करें"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"किसी ऐप्स को पुन: इंस्‍टॉल करने पर, बैकअप ली गई सेटिंग और डेटा पुनर्स्‍थापित करें"</string>
+    <string name="backup_inactive_title" msgid="5355557151569037197">"बैकअप सेवा निष्‍क्रिय है."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"इसे आपकी डिवाइस नीति द्वारा सेट किया गया है."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"डेस्‍कटॉप बैकअप पासवर्ड"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"डेस्‍कटॉप पूर्ण बैकअप वर्तमान में सुरक्षित नहीं हैं"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"डेस्कटॉप के पूर्ण बैकअप के पासवर्ड को बदलने या निकालने के लिए स्‍पर्श करें."</string>
@@ -1952,7 +1962,11 @@
     <string name="enter_password" msgid="8035706727471334122">"Android प्रारंभ करने के लिए, अपना पासवर्ड डालें"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Android प्रारंभ करने के लिए, अपना पिन डालें"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Android प्रारंभ करने के लिए, अपना प्रतिमान लिखें"</string>
-    <string name="try_again" msgid="4272075051293936921">"पुन: प्रयास करें."</string>
+    <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"गलत पैटर्न"</string>
+    <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"गलत पासवर्ड"</string>
+    <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"गलत पिन"</string>
+    <string name="checking_decryption" msgid="8287458611802609493">"जांच की जा रही है..."</string>
+    <string name="starting_android" msgid="8581493237458496835">"Android प्रारंभ किया जा रहा है"</string>
     <string name="delete" msgid="4219243412325163003">"हटाएं"</string>
     <string name="misc_files" msgid="6720680815969643497">"विविध फ़ाइलें"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"<xliff:g id="TOTAL">%2$d</xliff:g> में से <xliff:g id="NUMBER">%1$d</xliff:g> चयनित"</string>
@@ -1990,8 +2004,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"स्‍क्रीन संयोजन के लिए हमेशा GPU का उपयोग करें"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"रंग स्पेस सिम्युलेट करें"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"OpenGL चिह्न सक्षम करें"</string>
-    <string name="use_nuplayer" msgid="5699257393367904387">"NuPlayer उपयोग करें (प्रयोगात्मक)"</string>
-    <string name="use_nuplayer_summary" msgid="1991479067478516714">"AwesomePlayer के बजाय NuPlayer का उपयोग करें"</string>
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"AwesomePlayer चलाएं (बहिष्‍कृत)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"अधिकांश मीडिया प्‍लेबैक हेतु NuPlayer के बजाय AwesomePlayer पे चलाएं"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"USB ऑडियो रूटिंग अक्षम करें"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"USB ऑडियो पेरिफ़ेरल पर स्‍वत: रूटिंग अक्षम करें"</string>
     <string name="debug_layout" msgid="5981361776594526155">"लेआउट सीमाएं दिखाएं"</string>
@@ -2167,7 +2181,6 @@
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"उपयोगकर्ता या प्रोफ़ाइल जोड़ें"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"उपयोगकर्ता जोड़ें"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"प्रतिबंधित प्रोफ़ाइल"</string>
-    <string name="user_summary_managed_profile" msgid="7369539529693048111">"कार्य प्रोफ़ाइल"</string>
     <string name="user_need_lock_message" msgid="2596365678651842785">"इससे पहले कि आप कोई प्रतिबंधित प्रोफ़ाइल बनाएं, आपको अपने ऐप्स  और व्यक्तिगत डेटा की सुरक्षा करने के लिए एक स्क्रीन लॉक सेट करना होगा."</string>
     <string name="user_set_lock_button" msgid="8311219392856626841">"लॉक सेट करें"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"सेट नहीं है"</string>
@@ -2298,11 +2311,13 @@
     <string name="sim_cellular_data_unavailable_summary" msgid="3654805961942166428">"डेटा सिम चुनने के लिए स्पर्श करें"</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"कॉल के लिए हमेशा इसका उपयोग करें"</string>
     <string name="select_sim_for_data" msgid="2366081042162853044">"डेटा के लिए सिम चुनें"</string>
+    <string name="data_switch_started" msgid="2040761479817166311">"डेटा सिम स्‍विच की जा रही है, इसमें एक मिनट तक लग सकता है..."</string>
     <string name="select_sim_for_calls" msgid="3503094771801109334">"इससे सिम से कॉल करें"</string>
     <string name="sim_select_card" msgid="211285163525563293">"सिम कार्ड चुनें"</string>
     <string name="sim_card_number_title" msgid="7845379943474336488">"सिम <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"सिम खाली है"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"सिम का नाम"</string>
+    <string name="sim_name_hint" msgid="7038643345238968930">"सिम का नाम डालें"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"सिम स्‍लॉट %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"वाहक"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"नंबर"</string>
@@ -2312,7 +2327,6 @@
     <string name="color_purple" msgid="3888532466427762504">"बैंगनी"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"कोई सिम कार्ड नहीं डाला गया"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"सिम स्थिति"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"सिम संबंधी जानकारी"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"डिफ़ॉल्ट सिम से कॉल करें"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"आउटगोइंग कॉल के लिए सिम"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"अन्य कॉल सेटिंग"</string>
@@ -2320,8 +2334,11 @@
     <string name="preferred_network_offload_header" msgid="2321173571529106767">"नेटवर्क नाम प्रसारण अक्षम करें"</string>
     <string name="preferred_network_offload_footer" msgid="5857279426054744020">"नेटवर्क नाम प्रसारण अक्षम करने से तृतीय पक्षों को आपकी नेटवर्क जानकारी की एक्सेस नहीं मिल पाती."</string>
     <string name="preferred_network_offload_popup" msgid="2252915199889604600">"नेटवर्क नाम प्रसारण को अक्षम करने से छिपे हुए नेटवर्क से स्वचालित कनेक्शन नहीं होगा."</string>
+    <string name="sim_signal_strength" msgid="9144010043784767984">"<xliff:g id="DBM">%1$d</xliff:g> dBm <xliff:g id="ASU">%2$d</xliff:g> asu"</string>
+    <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>
+    <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>
@@ -2330,22 +2347,22 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"हाल ही की खोजें"</string>
     <string name="search_results_label" msgid="4163304782363526148">"परिणाम"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi वाई-फ़ाई नेटवर्क कनेक्शन"</string>
-    <string name="keywords_more_default_sms_app" msgid="2744404159003574745">"लेख संदेश"</string>
-    <string name="keywords_more_mobile_networks" msgid="7813380887358745769">"सेल्युलर सेल वाहक वायरलेस"</string>
+    <string name="keywords_more_default_sms_app" msgid="895656981962034647">"text message texting messages messaging"</string>
+    <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"cellular cell carrier wireless data 4g 3g 2g lte"</string>
     <string name="keywords_home" msgid="3626170808219458848">"लॉन्चर"</string>
     <string name="keywords_display" msgid="6709007669501628320">"स्क्रीन टचस्क्रीन"</string>
-    <string name="keywords_display_brightness_level" msgid="8636451602230815191">"धुंधली स्क्रीन टचस्क्रीन"</string>
-    <string name="keywords_display_auto_brightness" msgid="8070218600502753102">"धुंधली स्क्रीन टचस्क्रीन"</string>
-    <string name="keywords_display_wallpaper" msgid="4315466287469834939">"पृष्ठभूमि"</string>
+    <string name="keywords_display_brightness_level" msgid="8923289340474728990">"हल्की रोशनी वाली टचस्‍क्रीन बैटरी"</string>
+    <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"हल्की रोशनी वाली टचस्‍क्रीन बैटरी"</string>
+    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"background personalize customize diplay"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"लेख का आकार"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"प्रोजेक्ट"</string>
-    <string name="keywords_storage" msgid="7007275853993419928">"स्थान डिस्क हार्ड डिस्क"</string>
-    <string name="keywords_battery" msgid="3992479295298655138">"पावर"</string>
-    <string name="keywords_spell_checker" msgid="4509482591225399210">"वर्तनी"</string>
+    <string name="keywords_storage" msgid="6572905220031852173">"space disk hard drive device usage"</string>
+    <string name="keywords_battery" msgid="2096185085932675704">"पावर उपयोग का शुल्‍क"</string>
+    <string name="keywords_spell_checker" msgid="6106749039734174140">"spelling dictionary spellcheck auto-correct"</string>
     <string name="keywords_voice_input" msgid="3519547605812413860">"पहचानकर्ता इनपुट बोली बोलें भाषा हैंड्सफ़्री हैंड फ़्री पहचान आपत्तिजनक शब्द ऑडियो इतिहास bluetooth हैडसेट"</string>
-    <string name="keywords_text_to_speech_output" msgid="8207889472282225512">"रेट करें भाषा डिफ़ॉल्ट बोलें बोलना"</string>
-    <string name="keywords_date_and_time" msgid="7666950126499155141">"घड़ी"</string>
-    <string name="keywords_factory_data_reset" msgid="3693730656843989732">"वाइप हटाना"</string>
+    <string name="keywords_text_to_speech_output" msgid="392447904221657930">"rate language default speak speaking tts accessibility reader blind"</string>
+    <string name="keywords_date_and_time" msgid="2631808108134830066">"सेना की घड़ी"</string>
+    <string name="keywords_factory_data_reset" msgid="4355133848707691977">"wipe delete restore clear remove"</string>
     <string name="keywords_printing" msgid="1701778563617114846">"प्रिंटर"</string>
     <string name="keywords_sounds_and_notifications" msgid="5965996187974887000">"स्पीकर बीप"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="2912933812460077912">"न करें परेशान न करें बाधा डालना बाधा ब्रेक"</string>
@@ -2354,7 +2371,7 @@
     <string name="keywords_location_mode" msgid="8584992704568356084">"सटीकता"</string>
     <string name="keywords_accounts" msgid="1957925565953357627">"खाता"</string>
     <string name="keywords_users" msgid="4673901601478559100">"प्रतिबंध प्रतिबंधित करें प्रतिबंधित"</string>
-    <string name="keywords_keyboard_and_ime" msgid="1103378692379215672">"लेख सुधार सही ध्वनि कंपन स्वतः भाषा जेस्चर सुझाव दें सुझाव थीम घृणास्पद शब्द प्रकार इमोजी"</string>
+    <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"text correction correct sound vibrate auto language gesture suggest suggestion theme offensive word type emoji international"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"स्लाइड पासवर्ड प्रतिमान पिन"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"वाई-फ़ाई  NFC टैग सेट करें"</string>
     <string name="write_tag" msgid="8571858602896222537">"लिखें"</string>
@@ -2371,7 +2388,6 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"नोटिफिकेशन वॉल्‍यूम"</string>
     <string name="zen_mode_settings_title" msgid="7014915558669122902">"कॉल और मैसेज को रोकें"</string>
     <string name="zen_mode_option_title" msgid="5061978632306007914">"कॉल और नोटिफिकेशन आने पर"</string>
-    <string name="zen_mode_option_title_novoice" msgid="6680706009915204785">"नोटिफिकेशन आने पर"</string>
     <string name="zen_mode_option_off" msgid="3167702608910820883">"हमेशा अवरोधित करें"</string>
     <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"केवल प्राथमिकता वाले कॉल और मैसेज को रोकने की अनुमति दें"</string>
     <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"अवरोध उत्पन्न न करें"</string>
@@ -2429,14 +2445,17 @@
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"पूर्ण"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"जब तक आप इसे बंद नहीं कर देते"</string>
     <string name="zen_mode_important_category" msgid="8123274463331022993">"प्राथमिकता वाले कॉल और मैसेज को रोकें"</string>
-    <string name="zen_mode_downtime_category" msgid="4730179065426038108">"डाउनटाइम (केवल प्राथमिकता वाले कॉल और मैसेज को रोकें)"</string>
+    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"बंद रहने का समय"</string>
     <string name="zen_mode_downtime_days" msgid="3361856902633311616">"दिन"</string>
     <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"कोई नहीं"</string>
+    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"कॉल और मैसेज को रोकेने की अनुमति है"</string>
+    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"केवल प्राथमिकता"</string>
+    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"कोई नहीं"</string>
     <string name="zen_mode_automation_category" msgid="4653551005950835761">"स्वचालन"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"स्वचालित रूप से चालू"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"कभी नहीं"</string>
-    <string name="zen_mode_phone_calls" msgid="8956214416859303966">"कॉल"</string>
+    <string name="zen_mode_calls" msgid="7051492091133751208">"कॉल"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"संदेश"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"इसकी ओर से कॉल/संदेश"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"कोई भी"</string>
@@ -2450,7 +2469,9 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"प्रति सोम-शुक्र रात"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"प्रारंभ समय"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"समाप्ति समय"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"अगले दिन <xliff:g id="FORMATTED_TIME">%s</xliff:g> पर"</string>
+    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> अगले दिन"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> या पहले के किसी भी अलार्म पर"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> अगले दिन या उससे पहले के किसी भी अलार्म पर"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"ऐप्स नोटिफिकेशन"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"नोटिफिकेशन सेटिंग"</string>
     <string name="device_feedback" msgid="3238056036766293294">"इस डिवाइस के बारे में फ़ीडबैक भेजें"</string>
@@ -2458,7 +2479,11 @@
     <string name="switch_on_text" msgid="1124106706920572386">"चालू"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"बंद"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"स्क्रीन पिन करना"</string>
-    <string name="screen_pinning_description" msgid="7091642350452605379">"चालू होने पर, जब तक आप अनपिन नहीं कर देते तब तक वर्तमान स्क्रीन को दृश्य में बनाए रखने के लिए स्क्रीन पिनिंग का उपयोग कर सकते हैं.\n\nस्क्रीन पिनिंग का उपयोग करने के लिए:\n\n1. सुनिश्चित करें कि स्क्रीन पिनिंग चालू है.\n\n2. वह स्क्रीन खोलें जिसे आप पिन करना चाहते हैं.\n\n3. अवलोकन स्पर्श करें.\n\n4. पिन आइकन स्पर्श करें."</string>
+    <string name="screen_pinning_description" msgid="1137904524037468263">"यह सेटिंग चालू होने पर जब तक आप अनपिन नहीं करते हैं तब तक वर्तमान स्‍क्रीन को दृश्‍य में बनाए रखने के लिए स्‍क्रीन पिन का उपयोग कर सकते हैं.\n\nस्‍क्रीन पिन करने का उपयोग करने के लिए:\n\n1. सुनिश्‍िचत करें कि स्‍क्रीन पिन करना चालू है.\n\n2. वह स्‍क्रीन खोलें जिसे आप पिन करना चाहते हैं.\n\n3. अवलोकन स्‍पर्श करें.\n\n4. ऊपर स्‍वाइप करें और फिर पिन आइकन स्‍पर्श करें."</string>
+    <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"अनपिन करने से पहले अनलॉक पैटर्न के लिए पूछें"</string>
+    <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"अनपिन करने से पहले पिन के लिए पूछें"</string>
+    <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"अनपिन करने से पहले पासवर्ड के लिए पूछें"</string>
+    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"अनपिन करते समय डिवाइस लॉक करें"</string>
     <string name="managed_user_title" msgid="8101244883654409696">"कार्य प्रोफ़ाइल"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(प्रायोगिक)"</string>
     <string name="display_auto_rotate_title" msgid="6176450657107806043">"डिवाइस घुमाए जाने पर"</string>
@@ -2467,7 +2492,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"भू-दृश्य में बने रहें"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"वर्तमान अभिविन्यास में बने रहें"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI जानकारी"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI संबंधी जानकारी"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"एैन्‍क्रिप्‍शन"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"जारी रखें"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"आप अपने डिवाइस के प्रारंभ होने से पहले अपना पिन डालना आवश्‍यक बनाकर उसे अधिक सुरक्षित बना सकते हैं. जब तक डिवाइस प्रारंभ नहीं हो जाता, वह अलार्म सहित कॉल, संदेश या नोटिफिकेशन प्राप्‍त नहीं कर सकता. \n\nइससे गुम हुए या चोरी गए डिवाइस पर डेटा की सुरक्षा करने में सहायता मिलती है."</string>
@@ -2485,4 +2509,7 @@
     <string name="encrypt_talkback_dialog_message_pin" msgid="1890374082842868489">"जब आप इस डिवाइस को प्रारंभ करने के लिए अपना पिन डालते हैं, तो <xliff:g id="SERVICE">%1$s</xliff:g> जैसी सरल उपयोग सेवाएं अभी भी उपलब्ध नहीं होंगी."</string>
     <string name="encrypt_talkback_dialog_message_pattern" msgid="4474332516537386384">"जब आप इस डिवाइस को प्रारंभ करने के लिए अपना पैटर्न डालते हैं, तो <xliff:g id="SERVICE">%1$s</xliff:g> जैसी सरल उपयोग सेवाएं अभी भी उपलब्ध नहीं होंगी."</string>
     <string name="encrypt_talkback_dialog_message_password" msgid="8166099418487083927">"जब आप इस डिवाइस को प्रारंभ करने के लिए अपना पासवर्ड डालते हैं, तो <xliff:g id="SERVICE">%1$s</xliff:g> जैसी सरल उपयोग सेवाएं अभी भी उपलब्ध नहीं होंगी."</string>
+    <string name="imei_information_title" msgid="8499085421609752290">"IMEI जानकारी"</string>
+    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI संबंधी जानकारी"</string>
+    <string name="slot_number" msgid="3762676044904653577">"(स्लॉट<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-hr/arrays.xml b/res/values-hr/arrays.xml
index e9671c3..fbbf535 100644
--- a/res/values-hr/arrays.xml
+++ b/res/values-hr/arrays.xml
@@ -527,4 +527,12 @@
     <item msgid="4338089220026248848">"Predmemorija (klijent aktivnosti)"</item>
     <item msgid="6652164677254579050">"Predmemorija (prazna)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Tirkiznoplava"</item>
+    <item msgid="8332294763632946560">"Plava"</item>
+    <item msgid="2023216417616991392">"Indigo"</item>
+    <item msgid="3170497246594232819">"Ljubičasta"</item>
+    <item msgid="4608643045752965568">"Ružičasta"</item>
+    <item msgid="6131821495505931173">"Crvena"</item>
+  </string-array>
 </resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index cc0ca2a..2342080 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>
@@ -180,7 +180,6 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s želi pristupiti vašim porukama. Želite li dati pristup korisniku %2$s?"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Datum i vrijeme"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Odabir vremenske zone"</string>
-    <string name="normal_date_format" msgid="7636406984925498359">"Regionalno (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Pregled:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Veličina fonta:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -291,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>
@@ -322,8 +321,6 @@
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Odaberi vremensku zonu"</string>
     <string name="date_time_set_date_title" msgid="6928286765325608604">"Datum"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"Postavi datum"</string>
-    <string name="date_time_date_format_title" msgid="3976171711988766411">"Oblik datuma"</string>
-    <string name="date_time_date_format" msgid="6951498879879281102">"Odaberite format datuma"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Poredaj abecedno"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Poredaj po vremenskoj zoni"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Datum"</string>
@@ -372,7 +369,8 @@
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Pričekajte dok ne završi kriptiranje telefona. <xliff:g id="PERCENT">^1</xliff:g>% dovršeno."</string>
     <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Pričekajte dok se vaš tablet kodira. Preostalo vrijeme: <xliff:g id="DURATION">^1</xliff:g>"</string>
     <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Pričekajte dok se vaš telefon kodira. Preostalo vrijeme: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Pokušajte ponovo za <xliff:g id="DELAY">^1</xliff:g> s."</string>
+    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"Da biste otključali tablet, isključite ga i ponovo uključite."</string>
+    <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"Da biste otključali telefon, isključite ga i ponovo uključite."</string>
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"Upozorenje: možete pokušati otključati uređaj još <xliff:g id="COUNT">^1</xliff:g> puta. Ako ne uspijete, izbrisat će se podaci na uređaju!"</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Unesite svoju zaporku"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Enkripcija neuspješna"</string>
@@ -401,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>
@@ -412,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>
@@ -556,13 +556,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Kao telefonski zvučnik"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Za glazbu i medije"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Zapamti postavke"</string>
-    <string name="wifi_assistant_intro_setup" msgid="4605105515416995110">"Novo!\nWi‑Fi Assistant"</string>
-    <string name="wifi_assistant_no_thanks" msgid="2776983751990143934">"NE, HVALA"</string>
-    <string name="wifi_assistant_setup" msgid="3772423650475730906">"POSTAVI"</string>
-    <string name="wifi_assistant_card_message" msgid="107811647784658536">"Automatski se povežite s dostupnim mrežama pomoću Wi‑Fi Assistanta."</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi‑Fi Assistant"</string>
-    <string name="wifi_assistant_title_message" msgid="6240721017579074015">"<xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> automatski vas povezuje s najboljom dostupnom Wi‑Fi mrežom"</string>
-    <string name="wifi_assistant_open_app" msgid="4803044899535675063">"OTVORI APLIKACIJU"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Povezani putem pomoćnika za Wi-Fi"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"Emitirani zaslon"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Omogući bežični prikaz"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"U blizini nema uređaja."</string>
@@ -592,7 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Postavke Wi-Fi-ja"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Postavljanje i upravljanje bežičnim pristupnim točkama"</string>
-    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Odaberite Wi-Fi mrežu"</string>
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Odabir Wi-Fi mreže"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Odaberite Wi‑Fi mrežu"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Uključivanje Wi-Fi-ja…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Isključivanje Wi-Fi-ja…"</string>
@@ -607,8 +602,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"Traženje je uvijek dostupno"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Uvijek omogući pretraživanje"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Neka Googleova usluga lokacije i druge aplikacije traže mreže, čak i kada je Wi-Fi isključen"</string>
-    <string name="wifi_automatically_manage_title" msgid="6249976570008992746">"Automatski upravljaj Wi‑Fi vezom"</string>
-    <string name="wifi_automatically_manage_summary" msgid="6952470763378312488">"Neka <xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> upravlja Wi‑Fi vezom"</string>
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Automatski upotrebljavaj otvoreni Wi‑Fi"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Dopusti pomoćniku za Wi‑Fi automatsko povezivanje s otvorenim mrežama s utvrđenom visokom kvalitetom"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Odaberite pomoćnik"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Instaliranje certifikata"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Radi poboljšavanja preciznosti i u neke druge svrhe Google i ostale aplikacije mogu tražiti mreže u blizini, čak i kada je Wi-Fi isključen. Ako ne želite da se to događa, idite na opcije Napredno &gt; Traženje je uvijek dostupno."</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Aplikacije mogu tražiti mreže u blizini, čak i kada je Wi-Fi isključen. Ako ne želite da se to događa, idite na opcije Napredno &gt; Traženje je uvijek dostupno."</string>
@@ -629,6 +625,7 @@
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Skeniraj"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Napredno"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Poveži s mrežom"</string>
+    <string name="wifi_menu_remember" msgid="8814185749388713796">"Zapamti mrežu"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Zaboravi mrežu"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Izmijeni mrežu"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Piši na oznaku NFC"</string>
@@ -673,9 +670,11 @@
     <string name="wifi_unspecified" msgid="5431501214192991253">"(nije određeno)"</string>
     <string name="wifi_remembered" msgid="4955746899347821096">"Spremljeno"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"Onemogućeno"</string>
-    <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Izbjegavanje slabe internetske veze"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"Konfiguracija IP-a nije uspjela"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Povezivanje s Wi-Fi-jem nije uspjelo"</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Problem u autentifikaciji"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Nije u rasponu"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Pristup internetu nije otkriven. Nema automatskog ponovnog povezivanja."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS dostupan"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS dostupan)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Unesite mrežnu zaporku"</string>
@@ -699,9 +698,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"UPOZORENJE: ako preskočite Wi‑Fi, tablet će upotrebljavati samo mobilne podatke za početna preuzimanja i ažuriranja. Da biste izbjegli moguće troškove za prijenos podataka, povežite se s Wi-Fi-jem."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"UPOZORENJE: ako preskočite Wi‑Fi, uređaj će upotrebljavati samo mobilne podatke za početna preuzimanja i ažuriranja. Da biste izbjegli moguće troškove za prijenos podataka, povežite se s Wi-Fi-jem."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"UPOZORENJE: ako preskočite Wi‑Fi, telefon će upotrebljavati samo mobilne podatke za početna preuzimanja i ažuriranja. Da biste izbjegli moguće troškove za prijenos podataka, povežite se s Wi-Fi-jem."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="2393880108322835846">"UPOZORENJE: ako preskočite Wi‑Fi, tablet neće imati internetsku vezu za početna preuzimanja ili ažuriranja."</string>
-    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1707391993265558787">"UPOZORENJE: ako preskočite Wi‑Fi, uređaj neće imati internetsku vezu za početna preuzimanja ili ažuriranja."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="1556858507920033022">"UPOZORENJE: ako preskočite Wi‑Fi, telefon neće imati internetsku vezu za početna preuzimanja ili ažuriranja."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Ako preskočite Wi‑Fi:\n\ntablet neće imati internetsku vezu.\n\nNećete primati ažuriranja softvera dok se ne povežete s internetom.\n\nNe možete aktivirati značajke zaštite uređaja u ovom trenutku."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Ako preskočite Wi‑Fi:\n\nuređaj neće imati internetsku vezu.\n\nNećete primati ažuriranja softvera dok se ne povežete s internetom.\n\nNe možete aktivirati značajke zaštite uređaja u ovom trenutku."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Ako preskočite Wi‑Fi:\n\ntelefon neće imati internetsku vezu.\n\nNećete primati ažuriranja softvera dok se ne povežete s internetom.\n\nNe možete aktivirati značajke zaštite uređaja u ovom trenutku."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Tabletno računalo nije se moglo povezati s ovom Wi-Fi mrežom."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"Uređaj se nije mogao povezati s tom Wi‑Fi mrežom."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Telefon se nije mogao povezati s ovom Wi-Fi mrežom."</string>
@@ -761,7 +760,6 @@
     <string name="ring_volume_title" msgid="7938706566797464165">"Glasnoća zvona"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibracija ako je bešumno"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Zadani zvuk obavijesti"</string>
-    <string name="heads_up_enabled_title" msgid="1031078221910921622">"Skočni za visoki prioritet"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Zvuk zvona"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Obavijest"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Koristi glasnoću dolaznog poziva za obavijesti"</string>
@@ -834,7 +832,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatska svjetlina"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Aktivacija podizanjem"</string>
     <string name="doze_title" msgid="2259176504273878294">"Ambijentalni zaslon"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"Aktiviraj zaslon prilikom podizanja uređaja ili kada stigne obavijest"</string>
+    <string name="doze_summary" msgid="7128970177894383698">"Aktiviraj zaslon prilikom podizanja uređaja ili primanja obavijesti"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Veličina fonta"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Veličina fonta"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Postavke zaključavanja SIM kartice"</string>
@@ -862,6 +860,10 @@
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Odustani"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"Pronađeno je više SIM-ova"</string>
     <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>
+    <string name="sim_preferred_title" msgid="5567909634636045268">"Ažurirati preferirani SIM?"</string>
+    <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> predstavlja jedini SIM u vašem uređaju. Želite li upotrebljavati taj SIM za mobilne podatke, pozive i SMS poruke?"</string>
     <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>
@@ -1012,6 +1014,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"To će izbrisati sve podatke s "<b>"unutarnje pohrane"</b>" tabletnog računala, uključujući:\n\n"<li>"vaš Google račun"</li>\n<li>"podatke i postavke sustava i aplikacija"</li>\n<li>"preuzete aplikacije"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"To će izbrisati sve podatke s "<b>"unutarnje pohrane"</b>" telefona, uključujući:\n\n"<li>"vaš Google račun"</li>\n<li>"podatke i postavke sustava i aplikacija"</li>\n<li>"preuzete aplikacije"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Trenutačno ste prijavljeni na sljedeće račune:\n"</string>
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Na ovom uređaju postoje i drugi korisnici.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Glazba"</li>\n<li>"Fotografije"</li>\n<li>"Ostali korisnički podaci"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Da biste izbrisali glazbu, slike i ostale korisničke podatke, "<b>"USB pohrana"</b>" treba biti izbrisana."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Da biste izbrisali glazbu, slike i ostale korisničke podatke, trebate izbrisati "<b>"SD karticu"</b>"."</string>
@@ -1023,7 +1026,6 @@
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Poništi telefon"</string>
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Izbrisati sve osobne podatke i preuzete aplikacije? Radnja se ne može poništiti!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Izbriši sve"</string>
-    <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Iscrtajte uzorak za otključavanje"</string>
     <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Da biste potvrdili vraćanje na tvorničke postavke, trebate nacrtati svoj uzorak za otključavanje."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Nije došlo do poništavanja jer nije dostupna usluga brisanja sustava."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Poništiti?"</string>
@@ -1041,7 +1043,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"Izbrisati USB pohranu i sve u njoj pohranjene datoteke? Radnja se ne može poništiti!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Izbrisati SD karticu i sve pohranjene datoteke na njoj? Radnja se ne može poništiti!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Izbriši sve"</string>
-    <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Iscrtajte uzorak za otključavanje"</string>
     <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Morate iscrtati uzorak za otključavanje kako biste potvrdili da želite izbrisati USB memoriju."</string>
     <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Trebate iscrtati svoj uzorak za otključavanje kako biste potvrdili da želite izbrisati SD karticu."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Postavke poziva"</string>
@@ -1087,6 +1088,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Umetnite SIM karticu i pokrenite ponovo"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Povežite se s internetom"</string>
     <string name="location_title" msgid="1029961368397484576">"Moja lokacija"</string>
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Radni profil"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Lokacija za radni profil"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Isključila ju je vaša tvrtka"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Način"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Visoka preciznost"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Štednja baterije"</string>
@@ -1124,6 +1128,7 @@
     <string name="copyright_title" msgid="865906688917260647">"Autorska prava"</string>
     <string name="license_title" msgid="1990487604356037871">"Licenca"</string>
     <string name="terms_title" msgid="7697580845616764642">"Uvjeti i odredbe"</string>
+    <string name="webview_license_title" msgid="2813507464175738967">"WebView licenca sustava"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Pozadinske slike"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Davatelji satelitskih slika:\n©2014. CNES/Astrium, DigitalGlobe, Bluesky"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Otvori licence izvora"</string>
@@ -1237,7 +1242,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Memorija USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Na SD kartici"</string>
     <string name="disabled" msgid="9206776641295849915">"Onemogućeno"</string>
-    <string name="not_installed" msgid="1475144352069281880">"Nije instalirano"</string>
+    <string name="not_installed" msgid="2797554494953450291">"Nije instalirano za korisnika"</string>
     <string name="no_applications" msgid="7336588977497084921">"Nema aplikacija."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Unutarnja pohrana"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Memorija USB"</string>
@@ -1434,8 +1439,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Zaslon nikad neće prijeći u mirovanje tijekom punjenja"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Omogući zapisnik naredbe \"snoop\" za Bluetooth HCI"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Snimi sve Bluetooth HCI pakete u datoteci"</string>
-    <string name="oem_unlock_enable" msgid="6629321276287913315">"Omogući OEM otključavanje"</string>
-    <string name="oem_unlock_enable_summary" msgid="3546686263996628110">"Dopuštanje OEM otključavanja uređaja"</string>
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM otključavanje"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Neka kôd za pokretanje sustava bude otključan"</string>
+    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Unesite PIN"</string>
+    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Unesite PIN uređaja da biste omogućili OEM otključavanje"</string>
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Želite li dopustiti OEM otključavanje?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"UPOZORENJE: značajke za zaštitu uređaja neće funkcionirati na ovom uređaju dok je ta postavka uključena."</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Certifikacija bežičnog prikaza"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Omogući opširnu prijavu na Wi-Fi"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Aktivni prijelaz s Wi‑Fi na mob. mrežu"</string>
@@ -1538,6 +1547,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"Opisi će izgledati ovako"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"Zadano"</string>
+    <string name="color_title" msgid="4258931051732243983">"Boja"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"Zadano"</string>
     <string name="color_none" msgid="3475640044925814795">"Ništa"</string>
     <string name="color_white" msgid="8045195170201590239">"Bijela"</string>
@@ -1595,12 +1605,12 @@
     <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">"Preostalo je <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> do dovršetka punjenja"</string>
-    <string name="power_discharging_duration" msgid="7125493014448497620">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – još približno <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="power_charging" msgid="712751285832976915">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – <xliff:g id="STATE">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration" msgid="4802183864773082009">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – <xliff:g id="TIME">%2$s</xliff:g> do napunjenosti"</string>
-    <string name="power_charging_duration_ac" msgid="3611179931297824699">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – <xliff:g id="TIME">%2$s</xliff:g> do napunjenosti putem utičnice"</string>
-    <string name="power_charging_duration_usb" msgid="1106605348913397583">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – <xliff:g id="TIME">%2$s</xliff:g> do napunjenosti putem USB-a"</string>
-    <string name="power_charging_duration_wireless" msgid="633606920144617227">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – <xliff:g id="TIME">%2$s</xliff:g> do napunjenosti bežičnim putem"</string>
+    <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> – još približno <xliff:g id="TIME">%2$s</xliff:g>"</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> do napunjenosti"</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> do napunjenosti strujnim napajanjem"</string>
+    <string name="power_charging_duration_usb" msgid="182405645340976546">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> do napunjenosti putem USB-a"</string>
+    <string name="power_charging_duration_wireless" msgid="1829295708243159464">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> do napunjenosti bežičnim putem"</string>
     <string name="power_usage_list_summary" msgid="2409288197839512482">"Upotreba od posljednje napunjenosti"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Upotreba baterije nakon isključivanja"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Upotreba baterije od poništavanja"</string>
@@ -1617,7 +1627,6 @@
     <string name="awake" msgid="387122265874485088">"Vrijeme budnosti uređaja"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi na vrijeme"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi na vrijeme"</string>
-    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> - <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Detalji povijesti"</string>
     <string name="details_title" msgid="3792801565213935385">"Pojedinosti o upotrebi"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Pojedinosti o upotrebi"</string>
@@ -1689,7 +1698,7 @@
     <string name="battery_saver" msgid="1426682272004907982">"Štednja baterije"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Uključi automatski"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Nikada"</string>
-    <string name="battery_saver_turn_on_automatically_pct" msgid="3033681629861428940">"pri %1$d%% baterije"</string>
+    <string name="battery_saver_turn_on_automatically_pct" msgid="7536784431655058267">"na %1$s baterije"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Statistički podaci o procesima"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Detaljni statistički podaci o trenutačnim procesima"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Upotreba memorije"</string>
@@ -1813,7 +1822,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Hardverska"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Samo softverska"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"Za ovog korisnika nisu dostupne vjerodajnice"</string>
-    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Iscrtajte obrazac za otključavanje"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Da biste potvrdili instalaciju vjerodajnica, trebate nacrtati svoj obrazac za otključavanje."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Upišite zaporku za pohranu vjerodajnica."</string>
@@ -1843,6 +1851,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"Uključi podatke aplikacija"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Automatska obnova"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Pri ponovnoj instalaciji aplikacije vratiti postavke i podatke za koje su stvorene sigurnosne kopije"</string>
+    <string name="backup_inactive_title" msgid="5355557151569037197">"Usluga sigurnosnog kopiranja nije aktivna."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"To je postavljeno pravilom uređaja."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Zaporka sigurnosne kopije"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Potpune sigurnosne kopije na stolnom računalu trenutačno nisu zaštićene"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Odaberite za promjenu ili uklanjanje zaporke u potpunim sigurnosnim kopijama na stolnom računalu"</string>
@@ -1952,7 +1962,11 @@
     <string name="enter_password" msgid="8035706727471334122">"Da biste pokrenuli Android, unesite svoju zaporku"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Da biste pokrenuli Android, unesite svoj PIN"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Da biste pokrenuli Android, nacrtajte svoj obrazac"</string>
-    <string name="try_again" msgid="4272075051293936921">"Pokušajte ponovo."</string>
+    <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"Pogrešan uzorak"</string>
+    <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"Pogrešna zaporka"</string>
+    <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"Pogrešan PIN"</string>
+    <string name="checking_decryption" msgid="8287458611802609493">"Provjeravanje…"</string>
+    <string name="starting_android" msgid="8581493237458496835">"Pokretanje Androida"</string>
     <string name="delete" msgid="4219243412325163003">"Izbriši"</string>
     <string name="misc_files" msgid="6720680815969643497">"Razne datoteke"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"odabrano <xliff:g id="NUMBER">%1$d</xliff:g> od <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -1990,8 +2004,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Uvijek upotrijebi GPU kod slaganja zaslona"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"Simuliraj prostor boja"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Omogući OpenGL praćenja"</string>
-    <string name="use_nuplayer" msgid="5699257393367904387">"Koristi NuPlayer (eksp.)"</string>
-    <string name="use_nuplayer_summary" msgid="1991479067478516714">"Koristi NuPlayer umjesto AwesomePlayera"</string>
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"Upotrijebi AwesomePlayer (obustavljeno)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"Upotrijebi AwesomePlayer umjesto NuPlayera za reprodukciju većine medija"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"Onemogući USB audiousmj."</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"Onemogući aut. usmjeravanje na USB audioperiferiju"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Prikaži granice izgleda"</string>
@@ -2167,7 +2181,6 @@
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Dodavanje korisnika ili profila"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Dodaj korisnika"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Ograničeni profil"</string>
-    <string name="user_summary_managed_profile" msgid="7369539529693048111">"Radni profil"</string>
     <string name="user_need_lock_message" msgid="2596365678651842785">"Prije izrade ograničenog profila trebate postaviti zaključavanje zaslona radi zaštite svojih aplikacija i osobnih podataka."</string>
     <string name="user_set_lock_button" msgid="8311219392856626841">"Postavi zaključavanje"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Nije postavljen"</string>
@@ -2298,11 +2311,13 @@
     <string name="sim_cellular_data_unavailable_summary" msgid="3654805961942166428">"Dodirnite za odabir podatkovnog SIM-a"</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"Uvijek upotrebljavaj za pozive"</string>
     <string name="select_sim_for_data" msgid="2366081042162853044">"Odaberite SIM za podatke"</string>
+    <string name="data_switch_started" msgid="2040761479817166311">"Prebacuje se podatkovni SIM, to može potrajati najviše minutu..."</string>
     <string name="select_sim_for_calls" msgid="3503094771801109334">"Poziv putem usluge"</string>
     <string name="sim_select_card" msgid="211285163525563293">"Odabir SIM kartice"</string>
     <string name="sim_card_number_title" msgid="7845379943474336488">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"SIM je prazan"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"Naziv SIM-a"</string>
+    <string name="sim_name_hint" msgid="7038643345238968930">"Unesite naziv SIM-a"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"Utor za SIM %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Mobilni operater"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Broj"</string>
@@ -2312,7 +2327,6 @@
     <string name="color_purple" msgid="3888532466427762504">"Ljubičasta"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"SIM kartica nije umetnuta"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"Status SIM-a"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"Informacije povezane sa SIM-om"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"Uzvratni poziv sa zadanog SIM-a"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"SIM za odlazne pozive"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Ostale postavke poziva"</string>
@@ -2320,8 +2334,11 @@
     <string name="preferred_network_offload_header" msgid="2321173571529106767">"Ne emitiraj naziv mreže"</string>
     <string name="preferred_network_offload_footer" msgid="5857279426054744020">"Onemogućivanje emitiranja naziva mreže sprječava treće strane da pristupe podacima o vašoj mreži."</string>
     <string name="preferred_network_offload_popup" msgid="2252915199889604600">"Onemogućivanje emitiranja naziva mreže spriječit će automatsko povezivanje sa skrivenim mrežama."</string>
+    <string name="sim_signal_strength" msgid="9144010043784767984">"<xliff:g id="DBM">%1$d</xliff:g> dBm <xliff:g id="ASU">%2$d</xliff:g> asu"</string>
+    <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>
+    <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Pitaj svaki put"</string>
     <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>
@@ -2330,22 +2347,22 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Nedavna pretraživanja"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Rezultati"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi mreža veza"</string>
-    <string name="keywords_more_default_sms_app" msgid="2744404159003574745">"SMS poruka"</string>
-    <string name="keywords_more_mobile_networks" msgid="7813380887358745769">"mobilni mobitel mobilni operater bežično"</string>
+    <string name="keywords_more_default_sms_app" msgid="895656981962034647">"tekstne poruke slanje SMS-a poruke slanje poruka"</string>
+    <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"mobilno mobitel mobilni operater bežično podaci 4g 3g 2g lte"</string>
     <string name="keywords_home" msgid="3626170808219458848">"pokretač"</string>
     <string name="keywords_display" msgid="6709007669501628320">"zaslon dodirni zaslon"</string>
-    <string name="keywords_display_brightness_level" msgid="8636451602230815191">"zatamnjenje zaslon dodirni zaslon"</string>
-    <string name="keywords_display_auto_brightness" msgid="8070218600502753102">"zatamnjenje zaslon dodirni zaslon"</string>
-    <string name="keywords_display_wallpaper" msgid="4315466287469834939">"u pozadini"</string>
+    <string name="keywords_display_brightness_level" msgid="8923289340474728990">"zatamnjenje zaslon dodirni zaslon baterija"</string>
+    <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"zatamnjenje zaslon dodirni zaslon baterija"</string>
+    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"pozadina personalizirati prilagoditi zaslon"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"veličina teksta"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"projekcija"</string>
-    <string name="keywords_storage" msgid="7007275853993419928">"memorija disk tvrdi disk"</string>
-    <string name="keywords_battery" msgid="3992479295298655138">"napajanje"</string>
-    <string name="keywords_spell_checker" msgid="4509482591225399210">"pravopis"</string>
+    <string name="keywords_storage" msgid="6572905220031852173">"prostor disk tvrdi disk uređaj upotreba"</string>
+    <string name="keywords_battery" msgid="2096185085932675704">"potrošnja energije punjenje"</string>
+    <string name="keywords_spell_checker" msgid="6106749039734174140">"pravopis rječnik provjera pravopisa automatsko ispravljanje"</string>
     <string name="keywords_voice_input" msgid="3519547605812413860">"prepoznavanje unos govor govoriti jezik bez ruku uvredljiva riječ audio povijest bluetooth slušalice"</string>
-    <string name="keywords_text_to_speech_output" msgid="8207889472282225512">"brzina jezik zadano govoriti govor"</string>
-    <string name="keywords_date_and_time" msgid="7666950126499155141">"sat"</string>
-    <string name="keywords_factory_data_reset" msgid="3693730656843989732">"uklanjanje brisanje"</string>
+    <string name="keywords_text_to_speech_output" msgid="392447904221657930">"brzina jezik zadano govoriti govorenje tts pristupačnost čitač slijepi"</string>
+    <string name="keywords_date_and_time" msgid="2631808108134830066">"sat vojni prikaz"</string>
+    <string name="keywords_factory_data_reset" msgid="4355133848707691977">"obrisati izbrisati vratiti isprazniti ukloniti"</string>
     <string name="keywords_printing" msgid="1701778563617114846">"pisač"</string>
     <string name="keywords_sounds_and_notifications" msgid="5965996187974887000">"zvučnik kratak zvučni signal"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="2912933812460077912">"ne ometaj prekinuti prekid zaustaviti"</string>
@@ -2354,7 +2371,7 @@
     <string name="keywords_location_mode" msgid="8584992704568356084">"točnost"</string>
     <string name="keywords_accounts" msgid="1957925565953357627">"račun"</string>
     <string name="keywords_users" msgid="4673901601478559100">"ograničenje ograničiti ograničeno"</string>
-    <string name="keywords_keyboard_and_ime" msgid="1103378692379215672">"ispravljanje teksta ispraviti zvuk vibracija automatski jezik pokret predložiti prijedlog tema uvredljiva riječ pisati emoji"</string>
+    <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"ispravak teksta ispraviti zvuk vibracija automatski jezik pokret predložiti prijedlog tema uvredljivo riječ upisivati emoji međunarodno"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"kliziti zaporka uzorak PIN"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Postavite oznaku NFC za Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Piši"</string>
@@ -2371,7 +2388,6 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Glasnoća obavijesti"</string>
     <string name="zen_mode_settings_title" msgid="7014915558669122902">"Prekidi"</string>
     <string name="zen_mode_option_title" msgid="5061978632306007914">"Kada stignu pozivi i obavijesti"</string>
-    <string name="zen_mode_option_title_novoice" msgid="6680706009915204785">"Kad stignu obavijesti"</string>
     <string name="zen_mode_option_off" msgid="3167702608910820883">"Uvijek prekidaj"</string>
     <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Dopusti samo prioritetne prekide"</string>
     <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Ne prekidaj"</string>
@@ -2429,14 +2445,17 @@
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Gotovo"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Dok to ne isključite"</string>
     <string name="zen_mode_important_category" msgid="8123274463331022993">"Prioritetni prekidi"</string>
-    <string name="zen_mode_downtime_category" msgid="4730179065426038108">"Prekid rada (samo prioritetni prekidi)"</string>
+    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Prekid rada"</string>
     <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Dani"</string>
     <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Nijedan"</string>
+    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Ometanja su dopuštena"</string>
+    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Samo prioritetno"</string>
+    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Ništa"</string>
     <string name="zen_mode_automation_category" msgid="4653551005950835761">"Automatizacija"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Automatski uključi"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Nikada"</string>
-    <string name="zen_mode_phone_calls" msgid="8956214416859303966">"Pozivi"</string>
+    <string name="zen_mode_calls" msgid="7051492091133751208">"Pozivi"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Poruke"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Pozivi/poruke od kontakta"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Svatko"</string>
@@ -2450,7 +2469,9 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Noći radnih dana"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Vrijeme početka"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Vrijeme završetka"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> sutra"</string>
+    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> sutra"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> ili bilo koji alarm prije toga"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> sutra ili bilo koji alarm prije toga"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Obavijest aplikacije"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Postavke obavijesti"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Pošalji povr. informacije o uređaju"</string>
@@ -2458,7 +2479,11 @@
     <string name="switch_on_text" msgid="1124106706920572386">"Uključeno"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Isključeno"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"Prikvačivanje zaslona"</string>
-    <string name="screen_pinning_description" msgid="7091642350452605379">"Kad je prikvačivanje zaslona uključeno, možete zadržati trenutačan zaslon u prednjem planu dok ga ne otkvačite.\n\nDa biste upotrebljavali prikvačivanje zaslona:\n\n1. Provjerite je li prikvačivanje zaslona uključeno.\n\n2. Otvorite željeni zaslon.\n\n3. Dodirnite Pregled.\n\n4. Dodirnite ikonu pribadače."</string>
+    <string name="screen_pinning_description" msgid="1137904524037468263">"Kad je ta postavka uključena, prikvačivanjem možete zadržati trenutačan zaslon u prednjem planu dok ga ne otkvačite.\n\nZa prikvačivanje zaslona:\n\n1. Provjerite je li prikačivanje zaslona uključeno.\n\n2. Otvorite željeni zaslon.\n\n3. Dodirnite Pregled.\n\n4. Prijeđite prstom prema gore pa dodirnite ikonu pribadače."</string>
+    <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Traži uzorak za otključavanje radi otkvačivanja"</string>
+    <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Traži PIN radi otkvačivanja"</string>
+    <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Traži zaporku radi otkvačivanja"</string>
+    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Zaključaj uređaj prilikom otkvačivanja"</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Radni profil"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Eksperimentalno)"</string>
     <string name="display_auto_rotate_title" msgid="6176450657107806043">"Kada se uređaj rotira"</string>
@@ -2467,7 +2492,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Ostani u vodoravnom prikazu"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Ostani u trenutačnom usmjerenju"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"Informacije IMEI-ja"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"Relativne informacije IMEI-ja"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Enkripcija"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Nastavi"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"Ovaj uređaj možete dodatno zaštititi zahtijevanjem PIN-a kako bi se pokrenuo. Dok se uređaj ne pokrene, ne može primati pozive, poruke ni obavijesti, uključujući alarme. \n\nTime se štite podaci na izgubljenim ili ukradenim uređajima."</string>
@@ -2485,4 +2509,7 @@
     <string name="encrypt_talkback_dialog_message_pin" msgid="1890374082842868489">"Kada unesete PIN za pokretanje uređaja, usluge pristupačnosti, kao što je <xliff:g id="SERVICE">%1$s</xliff:g>, još neće biti dostupne."</string>
     <string name="encrypt_talkback_dialog_message_pattern" msgid="4474332516537386384">"Kada unesete uzorak za pokretanje uređaja, usluge pristupačnosti, kao što je <xliff:g id="SERVICE">%1$s</xliff:g>, još neće biti dostupne."</string>
     <string name="encrypt_talkback_dialog_message_password" msgid="8166099418487083927">"Kada unesete zaporku za pokretanje uređaja, usluge pristupačnosti, kao što je <xliff:g id="SERVICE">%1$s</xliff:g>, još neće biti dostupne."</string>
+    <string name="imei_information_title" msgid="8499085421609752290">"Informacije IMEI-ja"</string>
+    <string name="imei_information_summary" msgid="2074095606556565233">"Relativne informacije IMEI-ja"</string>
+    <string name="slot_number" msgid="3762676044904653577">"(Utor <xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-hu/arrays.xml b/res/values-hu/arrays.xml
index 3a5c52c..a158ca4 100644
--- a/res/values-hu/arrays.xml
+++ b/res/values-hu/arrays.xml
@@ -527,4 +527,12 @@
     <item msgid="4338089220026248848">"Gyorsítótárazott (tevékenységkliens)"</item>
     <item msgid="6652164677254579050">"Gyorsítótárazott (üres)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Pávakék"</item>
+    <item msgid="8332294763632946560">"Kék"</item>
+    <item msgid="2023216417616991392">"Indigókék"</item>
+    <item msgid="3170497246594232819">"Lila"</item>
+    <item msgid="4608643045752965568">"Rózsaszín"</item>
+    <item msgid="6131821495505931173">"Piros"</item>
+  </string-array>
 </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index f056dc0..e354ca8 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>
@@ -180,7 +180,6 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"A(z) %1$s hozzáférést kér üzeneteihez. Biztosítja a(z) %2$s számára a hozzáférést?"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Dátum és idő"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Válasszon időzónát"</string>
-    <string name="normal_date_format" msgid="7636406984925498359">"Regionális (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Előnézet:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Betűméret:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -291,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>
@@ -322,8 +321,6 @@
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Időzóna kiválasztása"</string>
     <string name="date_time_set_date_title" msgid="6928286765325608604">"Dátum"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"Dátum beállítása"</string>
-    <string name="date_time_date_format_title" msgid="3976171711988766411">"Dátumformátum"</string>
-    <string name="date_time_date_format" msgid="6951498879879281102">"Válassza ki a dátum formátumát"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Rendezés név szerint"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Rendezés időzóna szerint"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Dátum"</string>
@@ -372,7 +369,8 @@
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Kérjük, várjon a telefonja titkosításáig. <xliff:g id="PERCENT">^1</xliff:g>% kész."</string>
     <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Táblagépe titkosítása folyamatban van. Hátralévő idő: <xliff:g id="DURATION">^1</xliff:g>"</string>
     <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Telefonja titkosítása folyamatban van. Hátralévő idő: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Próbálja újra <xliff:g id="DELAY">^1</xliff:g> másodperc múlva."</string>
+    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"A feloldáshoz kapcsolja ki a táblagépet, majd kapcsolja be újra."</string>
+    <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"A feloldáshoz kapcsolja ki a telefont, majd kapcsolja be újra."</string>
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"Figyelem: <xliff:g id="COUNT">^1</xliff:g> további sikertelen feloldási próbálkozás után az eszközadatok törlődnek!"</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Írja be a jelszavát"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"A titkosítás sikertelen"</string>
@@ -401,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>
@@ -412,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>
@@ -556,13 +556,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Telefonhangszóróként"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Zenéhez és médiához"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Beállítások megjegyzése"</string>
-    <string name="wifi_assistant_intro_setup" msgid="4605105515416995110">"Wi‑Fi-kezelő\nbemutatása"</string>
-    <string name="wifi_assistant_no_thanks" msgid="2776983751990143934">"KÖSZÖNÖM, NEM"</string>
-    <string name="wifi_assistant_setup" msgid="3772423650475730906">"BEÁLLÍTÁS"</string>
-    <string name="wifi_assistant_card_message" msgid="107811647784658536">"Automatikusan csatlakozzon a rendelkezésre álló hálózatokhoz egy Wi‑Fi-kezelő segítségével."</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi‑Fi-kezelő"</string>
-    <string name="wifi_assistant_title_message" msgid="6240721017579074015">"A(z) <xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> automatikusan csatlakozik a legjobb elérhető Wi-Fi-hálózathoz"</string>
-    <string name="wifi_assistant_open_app" msgid="4803044899535675063">"ALKALMAZÁS MEGNYITÁSA"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Csatlakozva Wi‑Fi-segéddel"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"Képernyő tartalmának átküldése"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Vezeték nélküli kijelző engedélyezése"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Nem található a közelben más eszköz."</string>
@@ -592,7 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Wi-Fi beállítások"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Vezeték nélküli hozzáférési pontok beállítása és kezelése"</string>
-    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Wi-Fi hálózat kiválasztása"</string>
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Wi-Fi-hálózat kiválasztása"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Wi-Fi-hálózat kiválasztása"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Bekapcsolja a Wi-Fit?"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Wi-Fi kikapcsolása..."</string>
@@ -607,8 +602,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"A keresés mindig elérhető"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Keresés engedélyezése mindig"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"A Google helyszolgáltatása és más alkalmazások akkor is kereshetnek hálózatokat, ha a Wi-Fi ki van kapcsolva"</string>
-    <string name="wifi_automatically_manage_title" msgid="6249976570008992746">"Wi‑Fi automatikus kezelése"</string>
-    <string name="wifi_automatically_manage_summary" msgid="6952470763378312488">"A(z) <xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> kezelje a Wi‑Fi-kapcsolatot"</string>
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Nyílt Wi‑Fi automatikus használata"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"A Wi-Fi-segéd automatikusan csatlakozhat a jó minőségűnek ítélt nyílt hálózatokhoz"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Segéd kiválasztása"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Tanúsítványok telepítése"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"A hely pontosságának javítása és egyéb célok érdekében a Google és más alkalmazások kereshetnek közeli Wi-Fi hálózatokat még akkor is, ha a Wi-Fi ki van kapcsolva. Ha nem szeretné ezt, állítsa át a Speciális &gt; A keresés mindig elérhető beállítást."</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Az alkalmazások még akkor is megkereshetik a közeli hálózatokat, ha a Wi-Fi ki van kapcsolva. Ha nem szeretné ezt, állítsa át a Speciális &gt; A keresés mindig elérhető beállítást."</string>
@@ -629,6 +625,7 @@
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Keresés"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Speciális"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Csatlakozás hálózathoz"</string>
+    <string name="wifi_menu_remember" msgid="8814185749388713796">"Hálózat megjegyzése"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Hálózat elfelejtése"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Hálózat módosítása"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"NFC-címke írása"</string>
@@ -673,9 +670,11 @@
     <string name="wifi_unspecified" msgid="5431501214192991253">"(nincs megadva)"</string>
     <string name="wifi_remembered" msgid="4955746899347821096">"Mentve"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"Letiltva"</string>
-    <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Került, rossz minőségű internetkapcsolat"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP-konfigurációs hiba"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Wi-Fi-kapcsolati hiba"</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Azonosítási probléma"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Hatókörön kívül"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Nincs érzékelhető internet-hozzáférés, ezért nem kapcsolódik újra automatikusan."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS elérhető"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS elérhető)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Adja meg hálózati jelszavát"</string>
@@ -699,9 +698,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"FIGYELMEZTETÉS: ha kihagyja a Wi‑Fi bekapcsolását, akkor táblagépe csak mobiladatokat fog használni a kezdeti letöltésekhez és frissítésekhez. Az esetleges adatforgalmi díjak elkerülése érdekében csatlakozzon egy Wi-Fi-hálózathoz."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"FIGYELMEZTETÉS: ha kihagyja a Wi‑Fi bekapcsolását, akkor eszköze csak mobiladatokat fog használni a kezdeti letöltésekhez és frissítésekhez. Az esetleges adatforgalmi díjak elkerülése érdekében csatlakozzon egy Wi-Fi-hálózathoz."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"FIGYELMEZTETÉS: ha kihagyja a Wi‑Fi bekapcsolását, akkor telefonja csak mobiladatokat fog használni a kezdeti letöltésekhez és frissítésekhez. Az esetleges adatforgalmi díjak elkerülése érdekében csatlakozzon egy Wi-Fi-hálózathoz."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="2393880108322835846">"FIGYELMEZTETÉS: ha kihagyja a Wi‑Fi bekapcsolását, akkor táblagépe nem fog tudni internetkapcsolatot használni a kezdeti letöltésekhez vagy frissítésekhez."</string>
-    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1707391993265558787">"FIGYELMEZTETÉS: ha kihagyja a Wi‑Fi bekapcsolását, akkor eszköze nem fog tudni internetkapcsolatot használni a kezdeti letöltésekhez vagy frissítésekhez."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="1556858507920033022">"FIGYELMEZTETÉS: ha kihagyja a Wi‑Fi bekapcsolását, akkor telefonja nem fog tudni internetkapcsolatot használni a kezdeti letöltésekhez vagy frissítésekhez."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Ha kihagyja a Wi‑Fi-t:\n\nTáblagépének nem lesz internetkapcsolata.\n\nNem kap szoftverfrissítéseket, amíg nem csatlakozik az internethez.\n\nMost nem aktiválhatja az eszköz védelmi funkcióit."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Ha kihagyja a Wi‑Fi-t:\n\nEszközének nem lesz internetkapcsolata.\n\nNem kap szoftverfrissítéseket, amíg nem csatlakozik az internethez.\n\nMost nem aktiválhatja az eszköz védelmi funkcióit."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Ha kihagyja a Wi‑Fi-t:\n\nTelefonjának nem lesz internetkapcsolata.\n\nNem kap szoftverfrissítéseket, amíg nem csatlakozik az internethez.\n\nMost nem aktiválhatja az eszköz védelmi funkcióit."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"A táblagép nem tudott csatlakozni ehhez a Wi-Fi hálózathoz."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"Az eszköz nem tudott csatlakozni ehhez a Wi-Fi-hálózathoz."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"A telefon nem tudott csatlakozni ehhez a Wi-Fi hálózathoz."</string>
@@ -761,7 +760,6 @@
     <string name="ring_volume_title" msgid="7938706566797464165">"Csengetés hangereje"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Rezgés néma üzemmódban"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Alapértelmezett értesítési hang"</string>
-    <string name="heads_up_enabled_title" msgid="1031078221910921622">"A magas prioritású jelenjen meg"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Csengőhang"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Értesítés"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Bejövő hívások hangerejének használata az értesítéseknél"</string>
@@ -834,7 +832,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatikus fényerő"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Felébresztéshez emelje meg"</string>
     <string name="doze_title" msgid="2259176504273878294">"Környezeti kijelző"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"Képernyő felébresztése, amikor az eszközt felemelik, vagy ha értesítés érkezik"</string>
+    <string name="doze_summary" msgid="7128970177894383698">"„Ébredési” képernyő, amikor felveszi az eszközt, vagy értesítést kap"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Betűméret"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Betűméret"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM kártya lezárási beállításai"</string>
@@ -862,6 +860,10 @@
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Mégse"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"Több SIM kártyát találtunk"</string>
     <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>
@@ -1012,6 +1014,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Ez minden adatot töröl a táblagép "<b>"belső tárolójáról"</b>", többek között: \n \n"<li>"Google Fiókját"</li>\n<li>"A rendszer- és alkalmazásadatokat és beállításokat"</li>" \n "<li>"A letöltött alkalmazásokat"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Ez minden adatot töröl a telefon "<b>"belső tárolójáról"</b>", többek között: \n \n"<li>"Google Fiókját"</li>\n<li>"A rendszer- és alkalmazásadatokat és beállításokat"</li>" \n "<li>"A letöltött alkalmazásokat"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Jelenleg a következő fiókokba van bejelentkezve:\n"</string>
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Más felhasználók is vannak ezen az eszközön.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Zene"</li>\n<li>"Fotók"</li>\n<li>"Más felhasználói adatok"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"A zenék, képek és más felhasználói adatok törléséhez az "<b>"USB-tárat"</b>" is törölnie kell."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"A zenék, képek és más felhasználói adatok törléséhez az "<b>"SD-kártyát"</b>" is törölnie kell."</string>
@@ -1023,7 +1026,6 @@
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Telefon visszaállítása"</string>
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Törli az összes személyes információt és letöltött alkalmazást? A műveletet nem lehet visszavonni!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Minden törlése"</string>
-    <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Rajzolja le a feloldási mintát"</string>
     <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Le kell rajzolnia a feloldási mintát a gyári adatok visszaállításának megerősítéséhez."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Nem történt visszaállítás, mert a Rendszertisztítás szolgáltatás nem érhető el."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Visszaállítás?"</string>
@@ -1041,7 +1043,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"Törli az USB-tárolót, ezzel eltávolítva az összes ott tárolt fájlt? A műveletet nem lehet visszavonni!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Törli az SD-kártyát, ezzel eltávolítva az összes ott tárolt fájlt? A műveletet nem lehet visszavonni!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Minden törlése"</string>
-    <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Rajzolja le a feloldási mintát"</string>
     <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Le kell rajzolnia a feloldó mintát annak megerősítéséhez, hogy törölni kívánja az USB-tárat."</string>
     <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Le kell rajzolnia a feloldó mintát annak megerősítéséhez, hogy törölni kívánja az SD-kártyát."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Hívásbeállítások"</string>
@@ -1087,6 +1088,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Helyezze be a SIM kártyát és indítsa újra"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Csatlakozzon az internethez"</string>
     <string name="location_title" msgid="1029961368397484576">"Saját pozíció"</string>
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Munkahelyi profil"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"A munkahelyi profil helye"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Ezt az Ön vállalata letiltotta"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Mód"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Nagyon pontos"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Energiatakarékos"</string>
@@ -1124,6 +1128,7 @@
     <string name="copyright_title" msgid="865906688917260647">"Szerzői jog"</string>
     <string name="license_title" msgid="1990487604356037871">"Licenc"</string>
     <string name="terms_title" msgid="7697580845616764642">"Általános Szerződési Feltételek"</string>
+    <string name="webview_license_title" msgid="2813507464175738967">"WebView-rendszerlicenc"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Háttérképek"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"A műholdképek szolgáltatói:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Nyílt forráskódú licencek"</string>
@@ -1237,7 +1242,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB-tár"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Az SD-kártyán"</string>
     <string name="disabled" msgid="9206776641295849915">"Letiltva"</string>
-    <string name="not_installed" msgid="1475144352069281880">"Nincs telepítve"</string>
+    <string name="not_installed" msgid="2797554494953450291">"Nincs telepítve e felh.-hoz"</string>
     <string name="no_applications" msgid="7336588977497084921">"Nincsenek alkalmazások."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Belső tárhely"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB-tár"</string>
@@ -1434,8 +1439,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"A képernyő soha nem kapcsol ki töltés során"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Bluetooth HCI snoop napló engedélyezése"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Az összes Bluetooth HCI-csomag rögzítése egy fájlban"</string>
-    <string name="oem_unlock_enable" msgid="6629321276287913315">"OEM feloldás megengedett"</string>
-    <string name="oem_unlock_enable_summary" msgid="3546686263996628110">"Az eszköz OEM feloldásának engedélyezése"</string>
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM-feloldás"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"A rendszerbetöltő feloldásának engedélyezése"</string>
+    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Írja be a PIN kódot"</string>
+    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Adja meg az eszköz PIN kódját a kártyafüggetlenítéshez"</string>
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Engedélyezi az OEM-feloldást?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"FIGYELEM! Az eszközvédelmi funkciók addig nem fognak működni ezen az eszközön, amíg ez a beállítás be van kapcsolva."</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Vezeték nélküli kijelző tanúsítványa"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Részletes Wi-Fi-naplózás engedélyezése"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Agresszív Wi‑Fi–mobilhálózat átadás"</string>
@@ -1538,6 +1547,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"A feliratok így fognak kinézni"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"Alapértelmezett"</string>
+    <string name="color_title" msgid="4258931051732243983">"Szín"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"Alapértelmezett"</string>
     <string name="color_none" msgid="3475640044925814795">"Semelyik"</string>
     <string name="color_white" msgid="8045195170201590239">"Fehér"</string>
@@ -1595,12 +1605,12 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> -- <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"<xliff:g id="REMAIN">%1$s</xliff:g> van hátra"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> a feltöltéshez"</string>
-    <string name="power_discharging_duration" msgid="7125493014448497620">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – kb. <xliff:g id="TIME">%2$s</xliff:g> van hátra"</string>
-    <string name="power_charging" msgid="712751285832976915">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – <xliff:g id="STATE">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration" msgid="4802183864773082009">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – <xliff:g id="TIME">%2$s</xliff:g> a teljes töltöttségig"</string>
-    <string name="power_charging_duration_ac" msgid="3611179931297824699">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – <xliff:g id="TIME">%2$s</xliff:g> a feltöltésig hálózati áramról"</string>
-    <string name="power_charging_duration_usb" msgid="1106605348913397583">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – <xliff:g id="TIME">%2$s</xliff:g> a teljes feltöltésig USB-n"</string>
-    <string name="power_charging_duration_wireless" msgid="633606920144617227">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – <xliff:g id="TIME">%2$s</xliff:g> a feltöltésig vezeték nélkül"</string>
+    <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> – kb. <xliff:g id="TIME">%2$s</xliff:g> van hátra"</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> a teljes töltöttség eléréséig"</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> a teljes feltöltésig hálózatról"</string>
+    <string name="power_charging_duration_usb" msgid="182405645340976546">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> a teljes feltöltésig USB-ről"</string>
+    <string name="power_charging_duration_wireless" msgid="1829295708243159464">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> a feltöltésig vezeték nélkül"</string>
     <string name="power_usage_list_summary" msgid="2409288197839512482">"Használat az utolsó teljes feltöltés óta"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Akkumulátorhasználat a legutolsó töltés óta"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Akkumulátorhasználat a visszaállítás óta"</string>
@@ -1617,7 +1627,6 @@
     <string name="awake" msgid="387122265874485088">"Eszköz készenléti ideje"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi időben"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi időben"</string>
-    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Előzmények részletei"</string>
     <string name="details_title" msgid="3792801565213935385">"Használat részletei"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Használat részletei"</string>
@@ -1689,7 +1698,7 @@
     <string name="battery_saver" msgid="1426682272004907982">"Akkumulátorkímélő mód"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Automatikus bekapcsolás"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Soha"</string>
-    <string name="battery_saver_turn_on_automatically_pct" msgid="3033681629861428940">"%1$d%% akkumulátortöltöttségnél"</string>
+    <string name="battery_saver_turn_on_automatically_pct" msgid="7536784431655058267">"Akkumulátortöltöttség: %1$s"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Folyamatstatisztikák"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"A futó folyamatok statisztikái"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Memóriahasználat"</string>
@@ -1710,7 +1719,7 @@
     <string name="mem_use_native_type" msgid="5976704902328347400">"Natív"</string>
     <string name="mem_use_kernel_cache_type" msgid="6411475064463957513">"Kernelgyorsítótárak"</string>
     <string name="mem_use_zram_type" msgid="9087217476795358232">"ZRam-váltás"</string>
-    <string name="mem_use_free_type" msgid="717708548454880840">"Ingyenes"</string>
+    <string name="mem_use_free_type" msgid="717708548454880840">"Szabad"</string>
     <string name="mem_use_total" msgid="6308786055749777934">"Összes"</string>
     <string name="menu_duration_3h" msgid="4714866438374738385">"3 óra"</string>
     <string name="menu_duration_6h" msgid="1940846763432184132">"6 óra"</string>
@@ -1813,7 +1822,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"hardveresen támogatott"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"kizárólag szoftveres"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"A hitelesítési adatok nem érhetők el ennél a felhasználónál"</string>
-    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Rajzolja le a feloldási mintát"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"A hitelesítési adatok telepítésének megerősítéséhez rajzolja le feloldási mintáját."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Írja be az azonosítótároló jelszavát."</string>
@@ -1843,6 +1851,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"Alkalmazásadatok is"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Automatikus helyreállítás"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Amikor újratelepít egy alkalmazást, a biztonsági mentésből állítsa helyre a beállításait és az adatokat"</string>
+    <string name="backup_inactive_title" msgid="5355557151569037197">"A biztonsági másolat szolgáltatás inaktív."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"Ezt az eszközszabályzat határozza meg."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Asztali mentés jelszava"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Az asztali teljes biztonsági mentések jelenleg nem védettek."</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Érintse meg, ha módosítaná vagy eltávolítaná a jelszót az asztali teljes mentésekhez"</string>
@@ -1952,7 +1962,11 @@
     <string name="enter_password" msgid="8035706727471334122">"Az Android indításához írja be jelszavát"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Az Android indításához írja be PIN kódját"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Az Android indításához rajzolja le mintáját"</string>
-    <string name="try_again" msgid="4272075051293936921">"Próbálja újra."</string>
+    <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"Helytelen minta"</string>
+    <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"Helytelen jelszó"</string>
+    <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"Helytelen PIN kód"</string>
+    <string name="checking_decryption" msgid="8287458611802609493">"Ellenőrzés…"</string>
+    <string name="starting_android" msgid="8581493237458496835">"Az Android indítása"</string>
     <string name="delete" msgid="4219243412325163003">"Törlés"</string>
     <string name="misc_files" msgid="6720680815969643497">"Egyéb fájlok"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"<xliff:g id="TOTAL">%2$d</xliff:g>/<xliff:g id="NUMBER">%1$d</xliff:g> kiválasztva"</string>
@@ -1990,8 +2004,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Mindig a GPU használata képernyő-feldolgozáshoz"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"Színtérszimuláció"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"OpenGL nyomon követése"</string>
-    <string name="use_nuplayer" msgid="5699257393367904387">"NuPlayer (kísérleti)"</string>
-    <string name="use_nuplayer_summary" msgid="1991479067478516714">"NuPlayer használata az AwesomePlayer helyett"</string>
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"AwesomePlayer (megszűnt)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"Az AwesomePlayer használata a NuPlayer helyett"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"Hangátirányítás tiltása"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"Hangátirányítás tiltása az USB-s hangeszközöknél"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Elrendezéshatár mutatása"</string>
@@ -2167,7 +2181,6 @@
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Felhasználó vagy profil hozzáadása"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Felhasználó hozzáad."</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Korlátozott jogokkal rendelkező profil"</string>
-    <string name="user_summary_managed_profile" msgid="7369539529693048111">"Munkaprofil"</string>
     <string name="user_need_lock_message" msgid="2596365678651842785">"Mielőtt létrehozhatna egy korlátozott profilt, be kell állítania egy képernyőzárat, hogy megvédje alkalmazásait és személyes adatait."</string>
     <string name="user_set_lock_button" msgid="8311219392856626841">"Képernyőzár beállítása"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Nincs beállítva"</string>
@@ -2298,11 +2311,13 @@
     <string name="sim_cellular_data_unavailable_summary" msgid="3654805961942166428">"Adatforgalmi SIM kártya kiválasztásához érintse meg"</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"Mindig ezt használja hívásokhoz"</string>
     <string name="select_sim_for_data" msgid="2366081042162853044">"SIM kiválasztása az adathasználathoz"</string>
+    <string name="data_switch_started" msgid="2040761479817166311">"Váltás az adatforgalomhoz használt SIM kártyák között, ez legfeljebb egy percet vesz igénybe."</string>
     <string name="select_sim_for_calls" msgid="3503094771801109334">"Hívás a következővel:"</string>
     <string name="sim_select_card" msgid="211285163525563293">"Válasszon egy SIM kártyát"</string>
     <string name="sim_card_number_title" msgid="7845379943474336488">"<xliff:g id="CARD_NUMBER">%1$d</xliff:g>. SIM kártya"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"A SIM kártya üres"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"SIM kártya neve"</string>
+    <string name="sim_name_hint" msgid="7038643345238968930">"Adja meg a SIM kártya nevét"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"%1$d. számú SIM-nyílás"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Szolgáltató"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Szám"</string>
@@ -2312,7 +2327,6 @@
     <string name="color_purple" msgid="3888532466427762504">"Lila"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"Nincs SIM kártya behelyezve"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"SIM kártya állapota"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"SIM kártyával kapcsolatos információ"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"Visszahívás az alapértelmezett SIM kártyáról"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"SIM kártya kimenő hívásokhoz"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Egyéb hívásbeállítások"</string>
@@ -2320,8 +2334,11 @@
     <string name="preferred_network_offload_header" msgid="2321173571529106767">"Hálózatnév küldése – Ki"</string>
     <string name="preferred_network_offload_footer" msgid="5857279426054744020">"A Hálózat nevének küldését kikapcsolva harmadik felek nem férhetnek hozzá a hálózati adatokhoz."</string>
     <string name="preferred_network_offload_popup" msgid="2252915199889604600">"A Hálózat nevének küldését kikapcsolva nem kapcsolódik automatikusan rejtett hálózatokhoz."</string>
+    <string name="sim_signal_strength" msgid="9144010043784767984">"<xliff:g id="DBM">%1$d</xliff:g> dBm <xliff:g id="ASU">%2$d</xliff:g> asu"</string>
+    <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>
+    <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Mindig kérdezzen rá"</string>
     <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>
@@ -2330,22 +2347,22 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Legutóbbi keresések"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Találatok"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi, wi-fi hálózati kapcsolat"</string>
-    <string name="keywords_more_default_sms_app" msgid="2744404159003574745">"szöveges üzenet"</string>
-    <string name="keywords_more_mobile_networks" msgid="7813380887358745769">"mobil mobiltelefon szolgáltató vezeték nélküli"</string>
+    <string name="keywords_more_default_sms_app" msgid="895656981962034647">"szöveges üzenet szöveges üzenet küldése üzenetek üzenetváltás"</string>
+    <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"mobil cella szolgáltató vezeték nélküli adat 4g 3g 2g lte"</string>
     <string name="keywords_home" msgid="3626170808219458848">"indító"</string>
     <string name="keywords_display" msgid="6709007669501628320">"képernyő érintőképernyő"</string>
-    <string name="keywords_display_brightness_level" msgid="8636451602230815191">"halványítás képernyő érintőképernyő"</string>
-    <string name="keywords_display_auto_brightness" msgid="8070218600502753102">"halványítás képernyő érintőképernyő"</string>
-    <string name="keywords_display_wallpaper" msgid="4315466287469834939">"háttér"</string>
+    <string name="keywords_display_brightness_level" msgid="8923289340474728990">"képernyő sötétítése érintőképernyő akkumulátor"</string>
+    <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"képernyő sötétítése érintőképernyő akkumulátor"</string>
+    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"háttér személyre szabás testreszabás kijelző"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"betűméret"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"kivetítés"</string>
-    <string name="keywords_storage" msgid="7007275853993419928">"tárhely lemez merevlemez"</string>
-    <string name="keywords_battery" msgid="3992479295298655138">"töltöttség"</string>
-    <string name="keywords_spell_checker" msgid="4509482591225399210">"helyesírás-ellenőrzés"</string>
+    <string name="keywords_storage" msgid="6572905220031852173">"tárhely lemez merevlemez eszköz használat"</string>
+    <string name="keywords_battery" msgid="2096185085932675704">"fogyasztás töltés"</string>
+    <string name="keywords_spell_checker" msgid="6106749039734174140">"helyesírás szótár helyesírás-ellenőrzés automatikus javítás"</string>
     <string name="keywords_voice_input" msgid="3519547605812413860">"felismerő bevitel beszéd beszélni nyelv szabadkezes szabad kezes felismerés sértő szó hang előzmények bluetooth headset"</string>
-    <string name="keywords_text_to_speech_output" msgid="8207889472282225512">"értékelés nyelv alapértelmezett beszéd beszél"</string>
-    <string name="keywords_date_and_time" msgid="7666950126499155141">"óra"</string>
-    <string name="keywords_factory_data_reset" msgid="3693730656843989732">"törlés"</string>
+    <string name="keywords_text_to_speech_output" msgid="392447904221657930">"sebesség nyelv alapértelmezett beszél beszéd tts kisegítő lehetőségek olvasó vak"</string>
+    <string name="keywords_date_and_time" msgid="2631808108134830066">"óra katonai"</string>
+    <string name="keywords_factory_data_reset" msgid="4355133848707691977">"törlés törlés visszaállítás törlés eltávolítás"</string>
     <string name="keywords_printing" msgid="1701778563617114846">"nyomtató"</string>
     <string name="keywords_sounds_and_notifications" msgid="5965996187974887000">"hangszóró sípolás"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="2912933812460077912">"ne zavarjanak megszakít megszakítás szünet"</string>
@@ -2354,7 +2371,7 @@
     <string name="keywords_location_mode" msgid="8584992704568356084">"pontosság"</string>
     <string name="keywords_accounts" msgid="1957925565953357627">"fiók"</string>
     <string name="keywords_users" msgid="4673901601478559100">"korlátozás korlátoz korlátozott"</string>
-    <string name="keywords_keyboard_and_ime" msgid="1103378692379215672">"szöveg javítás javít hang rezgés automatikus nyelv kézmozdulat javasol javaslat téma sértő szó gépel hangulatjel"</string>
+    <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"szövegjavítás javítás hang rezgés automatikus nyelv kézmozdulat javasol javaslat téma trágár szó gépel hangulatjel nemzetközi"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"csúsztatás jelszó minta pin kód"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC-címke beállítása"</string>
     <string name="write_tag" msgid="8571858602896222537">"Írás"</string>
@@ -2371,7 +2388,6 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Értesítés hangereje"</string>
     <string name="zen_mode_settings_title" msgid="7014915558669122902">"Zavaró üzenetek"</string>
     <string name="zen_mode_option_title" msgid="5061978632306007914">"Hívások és értesítések érkezésekor"</string>
-    <string name="zen_mode_option_title_novoice" msgid="6680706009915204785">"Értesítés érkezésekor"</string>
     <string name="zen_mode_option_off" msgid="3167702608910820883">"Bármikor zavarhat"</string>
     <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Csak a prioritást élvező üzenetek engedélyezettek"</string>
     <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Ne zavarjon"</string>
@@ -2429,14 +2445,17 @@
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Kész"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Amíg ki nem kapcsolja ezt"</string>
     <string name="zen_mode_important_category" msgid="8123274463331022993">"Prioritást élvező üzenetek"</string>
-    <string name="zen_mode_downtime_category" msgid="4730179065426038108">"Inaktív (csak prioritást élvező üzenetek)"</string>
+    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Inaktivitás"</string>
     <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Napok"</string>
     <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Nincs"</string>
+    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Engedélyezett megszakítások"</string>
+    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Csak prioritásos"</string>
+    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Nincs"</string>
     <string name="zen_mode_automation_category" msgid="4653551005950835761">"Automatizálás"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Automatikus bekapcsolás"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Soha"</string>
-    <string name="zen_mode_phone_calls" msgid="8956214416859303966">"Hívások"</string>
+    <string name="zen_mode_calls" msgid="7051492091133751208">"Hívások"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Üzenetek"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Hívások/üzenetek a következőtől:"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Bárki"</string>
@@ -2450,7 +2469,9 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Hétköznap este"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Kezdés ideje"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Befejezés ideje"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> a következő napon"</string>
+    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> a következő napon"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g>, illetve minden korábbi ébresztéskor"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> a következő napon, illetve minden korábbi ébresztéskor"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Alkalmazásértesítések"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Értesítési beállítások"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Visszajelzés küldése az eszközről"</string>
@@ -2458,7 +2479,11 @@
     <string name="switch_on_text" msgid="1124106706920572386">"Be"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Ki"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"Képernyő rögzítése"</string>
-    <string name="screen_pinning_description" msgid="7091642350452605379">"Engedélyezett állapotban használhatja a képernyőrögzítés funkciót, hogy a funkció visszavonásáig az aktuális képernyő legyen látható.\n\nA használathoz:\n\n1. Győződjön meg arról, hogy a funkció engedélyezve van.\n\n2. Nyissa meg a rögzíteni kívánt oldalt.\n\n3. Érintse meg az Áttekintés elemet.\n\n4. Érintse meg a rögzítés ikont."</string>
+    <string name="screen_pinning_description" msgid="1137904524037468263">"Ha bekapcsolta, a képernyő rögzítését használva visszavonásig az aktuális képernyő lesz látható.\n\nA használathoz:\n\n1. Ellenőrizze, hogy bekapcsolta-e a funkciót.\n\n2. Nyissa meg a rögzítendő képernyőt.\n\n3. Érintse meg az Áttekintés elemet.\n\n4. Csúsztasson gyorsan felfelé, majd érintse meg a rögzítés ikont."</string>
+    <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Feloldási minta kérése a rögzítés feloldásához"</string>
+    <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"PIN kód kérése a rögzítés feloldásához"</string>
+    <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Jelszó kérése a rögzítés feloldásához"</string>
+    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Eszköz zárolása a rögzítés feloldásakor"</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Munkaprofil"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Kísérleti)"</string>
     <string name="display_auto_rotate_title" msgid="6176450657107806043">"Az eszköz forgatásakor"</string>
@@ -2467,7 +2492,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Fekvő nézet megtartása"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Jelenlegi tájolás megtartása"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI-információ"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"Relatív IMEI-információ"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Titkosítás"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Tovább"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"További védelmet adhat az eszköznek, ha annak elindítása előtt PIN kódot kér. Amíg az eszköz el nem indul, nem fogadhat hívásokat, üzeneteket vagy értesítéseket, az ébresztőket is beleértve. \n\nEz segít megóvni adatait, ha ellopják eszközét."</string>
@@ -2485,4 +2509,7 @@
     <string name="encrypt_talkback_dialog_message_pin" msgid="1890374082842868489">"Amikor megadja a PIN kódot az eszköz indításához, a(z) <xliff:g id="SERVICE">%1$s</xliff:g> funkcióhoz hasonló kisegítő lehetőségek még nem lesznek elérhetők."</string>
     <string name="encrypt_talkback_dialog_message_pattern" msgid="4474332516537386384">"Amikor megadja a mintát az eszköz indításához, a(z) <xliff:g id="SERVICE">%1$s</xliff:g> funkcióhoz hasonló kisegítő lehetőségek még nem lesznek elérhetők."</string>
     <string name="encrypt_talkback_dialog_message_password" msgid="8166099418487083927">"Amikor megadja a jelszót az eszköz indításához, a(z) <xliff:g id="SERVICE">%1$s</xliff:g> funkcióhoz hasonló kisegítő lehetőségek még nem lesznek elérhetők."</string>
+    <string name="imei_information_title" msgid="8499085421609752290">"IMEI-információ"</string>
+    <string name="imei_information_summary" msgid="2074095606556565233">"Relatív IMEI-információ"</string>
+    <string name="slot_number" msgid="3762676044904653577">"(Hely: <xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-hy-rAM/arrays.xml b/res/values-hy-rAM/arrays.xml
index 3f8ab10..221314a 100644
--- a/res/values-hy-rAM/arrays.xml
+++ b/res/values-hy-rAM/arrays.xml
@@ -527,4 +527,12 @@
     <item msgid="4338089220026248848">"Քեշավորված (սպասառուի գործողությունը)"</item>
     <item msgid="6652164677254579050">"Քեշավորված (դատարկ)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Փիրուզագույն"</item>
+    <item msgid="8332294763632946560">"Կապույտ"</item>
+    <item msgid="2023216417616991392">"Ինդիգո"</item>
+    <item msgid="3170497246594232819">"Մանուշակագույն"</item>
+    <item msgid="4608643045752965568">"Վարդագույն"</item>
+    <item msgid="6131821495505931173">"Կարմիր"</item>
+  </string-array>
 </resources>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index 8f6cee4..c1865ca 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>
@@ -180,7 +180,6 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s-ը ցանկանում է մատչել ձեր հաղորդագրությունները: Մուտք տա՞լ %2$s-ին:"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Ամսաթիվ և ժամ"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Ընտրել ժամային գոտին"</string>
-    <string name="normal_date_format" msgid="7636406984925498359">"Տարածաշրջանային (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Դիտում."</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Տառաչափը՝"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -291,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>
@@ -322,8 +321,6 @@
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Ընտրել ժամային գոտին"</string>
     <string name="date_time_set_date_title" msgid="6928286765325608604">"Ամսաթիվը"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"Կարգավորել ամսաթիվը"</string>
-    <string name="date_time_date_format_title" msgid="3976171711988766411">"Ամսաթվի ձևաչափը"</string>
-    <string name="date_time_date_format" msgid="6951498879879281102">"Ընտրել ամսաթվի ձևաչափը"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Դասակարգել այբբենական կարգով"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Տեսակավորել ըստ ժամային գոտու"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Ամսաթիվ"</string>
@@ -372,7 +369,8 @@
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Սպասեք մինչ ձեր հեռախոսը կկոդավորվի: <xliff:g id="PERCENT">^1</xliff:g>%-ով ավարտված է:"</string>
     <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Սպասեք մինչև ձեր գրասալիկը կոդավորվի: Մնաց՝ <xliff:g id="DURATION">^1</xliff:g>"</string>
     <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Սպասեք մինչև ձեր հեռախոսը կոդավորվի: Մնաց՝ <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Կրկին փորձեք <xliff:g id="DELAY">^1</xliff:g> վայրկյանից:"</string>
+    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"Գրասալիկն ապակողպելու համար անջատեք, ապա նորից միացրեք այն:"</string>
+    <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"Հեռախոսն ապակողպելու համար անջատեք, ապա նորից միացրեք այն:"</string>
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"Զգուշացում. Եթե ևս <xliff:g id="COUNT">^1</xliff:g> անգամ չկարողանաք ճիշտ ապակողպել, ձեր սարքի ողջ տվյալները կմաքրվեն:"</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Մուտքագրեք ձեր գաղտնաբառը"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Կոդավորումը անհաջող էր"</string>
@@ -395,12 +393,13 @@
     <string name="unlock_set_unlock_none_summary" msgid="8914673583104628191">"Անվտանգություն չկա"</string>
     <string name="unlock_set_unlock_biometric_weak_title" msgid="2227215291604628670">"Դեմքով ապակողպում"</string>
     <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"Ցածր անվտանգություն, փորձնական"</string>
-    <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Կաղապար"</string>
+    <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Նախշ"</string>
     <string name="unlock_set_unlock_pattern_summary" msgid="7062696666227725593">"Միջին անվտանգություն"</string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN"</string>
     <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>
@@ -409,10 +408,11 @@
     <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
     <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Գաղտնաբառ"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Անջատել էկրանի կողպումը"</string>
-    <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Հեռացնել ապակողպման կաղապարը"</string>
+    <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_change_lock_pattern_title" msgid="2044092014872741130">"Փոխել ապակողպման կաղապարը"</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>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Գաղտնաբառը պետք է առնվազն %d նիշից բաղկացած լինի"</string>
@@ -556,13 +556,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Որպես բարձրախոս հեռախոս"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Երաժշտության և մեդիայի համար"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Հիշել կարգավորումները"</string>
-    <string name="wifi_assistant_intro_setup" msgid="4605105515416995110">"Ծանոթացեք\nWi-Fi Օգնական"</string>
-    <string name="wifi_assistant_no_thanks" msgid="2776983751990143934">"Ոչ, շնորհակալություն:"</string>
-    <string name="wifi_assistant_setup" msgid="3772423650475730906">"Կարգավորել"</string>
-    <string name="wifi_assistant_card_message" msgid="107811647784658536">"Ավտոմատ միացնել հասանելի ցանցերին՝ Wi-Fi Օգնականի միջոցով:"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi-Fi Օգնական"</string>
-    <string name="wifi_assistant_title_message" msgid="6240721017579074015">"<xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g>-ն ավտոմատ ձեզ կմիացնի լավագույն հասանելի Wi-Fi-ին"</string>
-    <string name="wifi_assistant_open_app" msgid="4803044899535675063">"Բացել ծրագիրը"</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>
@@ -592,7 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Wi‑Fi կարգավորումներ"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Կարգավորել և կառավարել անլար միացման կետերը"</string>
-    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Ընտրել Wi‑Fi"</string>
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Ընտրեք Wi-Fi ցանց"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Ընտրել Wi‑Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Wi‑Fi-ի միացում…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Wi‑Fi-ն անջատվում է..."</string>
@@ -607,8 +602,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"Սկանավորումը միշտ հասանելի է"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Միշտ թույլատրել սկանավորումը"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Թույլատրել Google-ի տեղադրության ծառայությանը և այլ ծրագրերին սկանավորել ցանցեր` նույնիսկ երբ WiFi-ը անջատված է"</string>
-    <string name="wifi_automatically_manage_title" msgid="6249976570008992746">"Ավտոմատ կառավարել Wi-Fi-ը"</string>
-    <string name="wifi_automatically_manage_summary" msgid="6952470763378312488">"Թողնել, որպեսզի <xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> կառավարի Ձեր Wi-Fi կապը"</string>
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Ինքնաշխատ օգտագործել բաց Wi‑Fi ցանցերը"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Թույլ տալ Wi‑Fi օգնականին ինքնաշխատորեն միանալ բաց ցանցերին, որոնց որակը գնահատվում է որպես բարձր"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Օգնականի ընտրություն"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Տեղադրել վկայականները"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Տեղանքի ճշգրտությունը կատարելագործելու կամ այլ նպատակների համար` Google-ը և այլ ծրագրերը հնարավոր է սկանավորեն մոտակա ցանցերը, նույնիսկ եթե Wi-Fi-ը անջատված է: Եթե դուք չեք ցանկանում դա, անցեք դեպի Ընդլայնված &gt; Սկանավորումը միշտ հասանելի:"</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Հավելվածը հնարավոր է սկանավորի մոտակա ցանցերը, անգամ եթե  Wi-Fi-ն անջատված է: Եթե չեք ցանկանում, որ սա պատահի, անցեք Ընդլայնված կարգավորումներ &gt; Սկանավորումը միշտ հասանելի է:"</string>
@@ -629,6 +625,7 @@
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Սկանավորում"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Ընդլայնված"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Միանալ ցանցին"</string>
+    <string name="wifi_menu_remember" msgid="8814185749388713796">"Պահել ցանցը"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Մոռանալ ցանցը"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Փոփոխել ցանցը"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Գրել NFC պիտակում"</string>
@@ -673,9 +670,11 @@
     <string name="wifi_unspecified" msgid="5431501214192991253">"(չտարբերակված)"</string>
     <string name="wifi_remembered" msgid="4955746899347821096">"Պահված է"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"Անջատված"</string>
-    <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Չմիացավ թույլ ինտերնետային կապի պատճառով"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP կարգավորման ձախողում"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"WiFi կապի ձախողում"</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Նույնականացման խնդիր"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Ընդգրկույթից դուրս է"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Ինտերնետի հասանելիություն չկա. ավտոմատ կերպով կրկին չի միանա:"</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS-ը հասանելի է"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS-ը հասանելի է)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Մուտքագրեք ձեր ցանցի գաղտնաբառը"</string>
@@ -699,9 +698,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"ԶԳՈՒՇԱՑՈՒՄ. Եթե բաց թողնեք Wi-Fi-ը, ձեր գրասալիկը միայն կօգտագործի բջջային տվյալների կապը՝ նախնական ներբեռնումների և թարմացումների համար: Տվյալների կապի հնարավոր վճարներից խուսափելու համար միացեք որևէ Wi-Fi ցանցի:"</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"ԶԳՈՒՇԱՑՈՒՄ. Եթե բաց թողնեք Wi-Fi-ը, ձեր սարքը միայն կօգտագործի բջջային տվյալների կապը՝ նախնական ներբեռնումների և թարմացումների համար: Տվյալների կապի հնարավոր վճարներից խուսափելու համար միացեք որևէ Wi-Fi ցանցի:"</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"ԶԳՈՒՇԱՑՈՒՄ. Եթե բաց թողնեք Wi-Fi-ը, ձեր հեռախոսը միայն կօգտագործի բջջային տվյալների կապը՝ նախնական ներբեռնումների և թարմացումների համար: Տվյալների կապի հնարավոր վճարներից խուսափելու համար միացեք որևէ Wi-Fi ցանցի:"</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="2393880108322835846">"ԶԳՈՒՇԱՑՈՒՄ. Եթե բաց թողնեք Wi-Fi-ը, ձեր գրասալիկն ինտերնետ կապ չի ունենա՝ նախնական ներբեռնումների և թարմացումների համար:"</string>
-    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1707391993265558787">"ԶԳՈՒՇԱՑՈՒՄ. Եթե բաց թողնեք Wi-Fi-ը, ձեր սարքն ինտերնետ կապ չի ունենա՝ նախնական ներբեռնումների և թարմացումների համար:"</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="1556858507920033022">"ԶԳՈՒՇԱՑՈՒՄ. Եթե բաց թողնեք Wi-Fi-ը, ձեր հեռախոսն ինտերնետ կապ չի ունենա՝ նախնական ներբեռնումների և թարմացումների համար:"</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Եթե ​​չկարգավորեք Wi-Fi-ը.\n\nՁեր գրասալիկը համացանցի կապակցում չի ունենա:\n\nԴուք չեք ստանա ծրագրակազմի թարմացումներ մինչև համացանցին կապակցվելը:\n\nԴուք չեք կարողանա ակտիվացնել սարքի պաշտպանության գործառույթները:"</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Եթե ​​չկարգավորեք Wi-Fi-ը.\n\nՁեր սարքը համացանցի կապակցում չի ունենա:\n\nԴուք չեք ստանա ծրագրակազմի թարմացումներ մինչև համացանցին կապակցվելը:\n\nԴուք չեք կարողանա ակտիվացնել սարքի պաշտպանության գործառույթները:"</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Եթե չկարգավորեք Wi-Fi-ը.\n\nՁեր հեռախոսը համացանցի կապակցում չի ունենա:\n\nԴուք չեք ստանա ծրագրակազմի թարմացումներ մինչև համացանցին կապակցվելը:\n\nԴուք չեք կարողանա ակտիվացնել սարքի պաշտպանության գործառույթները:"</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Գրասալիկը չկարողացավ միանալ Wi‑Fi ցանցին:"</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"Սարքը չկարողացավ միանալ այս Wi-Fi ցանցին:"</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Հեռախոսը չկարողացավ միանալ այս Wi-Fi ցանցին:"</string>
@@ -761,7 +760,6 @@
     <string name="ring_volume_title" msgid="7938706566797464165">"Զանգակի բարձրությունը"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Թրթռալ, երբ անձայն ռեժիմում է"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Ծանուցման լռելյայն ձայնը"</string>
-    <string name="heads_up_enabled_title" msgid="1031078221910921622">"Ելնի, եթե կարևոր է"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Զանգերանգ"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Ծանուցում"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Օգտագործել մուտքային ձայնի բարձրությունը ծանուցումների համար"</string>
@@ -834,7 +832,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Ինքնուրույն պայծառություն"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Բարձրացնել՝ միանալու համար"</string>
     <string name="doze_title" msgid="2259176504273878294">"Քնելու ռեժիմի արգելք"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"Միացնել էկրանը, երբ սարքը վերցնում են տեղից կամ ծանուցումներ են ստացվում"</string>
+    <string name="doze_summary" msgid="7128970177894383698">"Ակտիվացնում է էկրանը, երբ վերցնում եք սարքը կամ ծանուցումներ ստանում"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Տառաչափ"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Տառաչափը"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM քարտի կողպման կարգավորումներ"</string>
@@ -862,6 +860,10 @@
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Չեղարկել"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"Բազմաթիվ SIM քարտեր են գտնվել"</string>
     <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>
@@ -1012,6 +1014,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Սա կջնջի բոլոր տվյալները ձեր գրասալիկի "<b>" ներքին պահոցից"</b>", այդ թվում՝\n\n"<li>"Ձեր Google հաշիվը"</li>\n<li>"Համակարգի և հավելվածների տվյալներն ու կարգավորումները"</li>\n<li>"Ներբեռնված հավելվածները"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Սա կջնջի բոլոր տվյալները ձեր սարքի "<b>"ներքին պահոցից"</b>", ներառյալ`\n\n"<li>"Ձեր Google հաշիվը"</li>\n<li>"Համակարգի և հավելվածների տվյալներն ու կարգավորումները"</li>\n<li>"Ներբեռնված ծրագրերը"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Դուք այժմ գրանցված եք հետևյալ հաշիվներում՝\n"</string>
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Այս սարքում այլ օգտվողների հաշիվներ կան:\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Երաժշտություն"</li>\n<li>"Լուսանկարներ"</li>\n<li>"Օգտվողի այլ տվյալներ"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Երաժշտությունը, նկարները և այլ տվյալները ջնջելու համար "<b>"USB կրիչը "</b>"պետք է ջնջվի:"</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Երաժշտությունը, նկարները և այլ տվյալները "<b>"SD քարտից"</b>" մաքրելու համար` այն պետք է ջնջել:"</string>
@@ -1023,7 +1026,6 @@
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Վերակայել հեռախոսը"</string>
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Ջնջե՞լ ձեր բոլոր անձնական և ներբեռնված հավելվածները: Այս գործողությունն անշրջելի է:"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Ջնջել ամենը"</string>
-    <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Պատկերեք էկրանն ապակողպող կաղապարը"</string>
     <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Դուք պետք է պատկերեք ձեր ապակողպման կաղապարը` գործարանային տվյալների վերականգնումը հաստատելու համար:"</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Վերականգնում տեղի չի ունեցել, քանի որ համակարգի մաքրիչ ծառայությունը հասանելի չէ:"</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Վերակայե՞լ:"</string>
@@ -1041,7 +1043,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"Ջնջել USB կրիչը՝ ջնջելով այնտեղ պահվող բոլոր ֆայլերը: Այս գործողությունն անշրջելի է:"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Ջնջե՞լ USB կրիչը` այնտեղ պահվող բոլոր ֆայլերով: Այս գործողությունը հետադարձելի չէ:"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Ջնջել ամեն ինչ"</string>
-    <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Ներկայացրեք էկրանի ապակողպման ձեր կաղապարը"</string>
     <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Դուք պետք է պատկերեք ձեր ապակողպման նախշը` հաստատելու համար USB կրիչի ջնջումը:"</string>
     <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Պետք է պատկերեք էկրանի ապակողպման ձեր կաղապարը՝ հաստատելու համար, որ ցանկանում եք մաքրել SD քարտը:"</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Զանգի կարգավորումները"</string>
@@ -1087,6 +1088,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Խնդրում ենք տեղադրել SIM քարտ և վերագործարկել"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Խնդրում ենք միանալ ինտերնետին"</string>
     <string name="location_title" msgid="1029961368397484576">"Իմ տեղադրությունը"</string>
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Աշխատանքային պրոֆիլ"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Տեղ աշխատանքային պրոֆիլի համար"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Անջատվել է ընկերության կողմից"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Ռեժիմ"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Բարձր ճշգրտություն"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Մարտկոցի տնտեսում"</string>
@@ -1124,6 +1128,7 @@
     <string name="copyright_title" msgid="865906688917260647">"Հեղինակային իրավունք"</string>
     <string name="license_title" msgid="1990487604356037871">"Արտոնագիր"</string>
     <string name="terms_title" msgid="7697580845616764642">"Կանոններն ու պայմանները"</string>
+    <string name="webview_license_title" msgid="2813507464175738967">"Համակարգի WebView-ի լիցենզիա"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Պաստառներ"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Արբանյակային պատկերների մատակարարներ՝\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Բաց աղբյուրով լիցենզիաներ"</string>
@@ -1146,11 +1151,11 @@
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN-ը սահմանված է"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Նախշը կարգավորված է"</string>
     <string name="lock_settings_title" msgid="335025124489630932">"Էկրանի անվտանգություն"</string>
-    <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Փոխել ապակողպման կաղապարը"</string>
+    <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Փոխել ապակողպող նախշը"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Փոխել ապակողպման PIN-ը"</string>
-    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Հաստատել պահված նախշը"</string>
+    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Հաստատեք պահված նախշը"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Կրկին փորձեք`"</string>
-    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Պատկերեք ապակողպման կաղապարը"</string>
+    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Գծեք ապակողպող նախշը"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Սեղմեք Ցանկ` օգնության համար:"</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Հեռացրեք մատը ավարտելուց հետո"</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="1348234155120957561">"Միացրեք առնվազն <xliff:g id="NUMBER">%d</xliff:g> կետ: Փորձեք կրկին:"</string>
@@ -1162,15 +1167,15 @@
     <string name="lockpattern_retry_button_text" msgid="1949847413862309134">"Կրկին փորձել"</string>
     <string name="lockpattern_continue_button_text" msgid="4723771754714471410">"Շարունակել"</string>
     <string name="lockpattern_settings_title" msgid="3207750489460466680">"Ապակողպող նախշը"</string>
-    <string name="lockpattern_settings_enable_title" msgid="6920616873671115281">"Պահանջել կաղապար"</string>
-    <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"Պետք է պատկերել կաղապարը` էկրանը ապակողպելու համար"</string>
-    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"Կաղապարը տեսանելի դարձնել"</string>
+    <string name="lockpattern_settings_enable_title" msgid="6920616873671115281">"Պահանջել նախշ"</string>
+    <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"Օգտագործել նախշ՝ հեռախոսը պաշտպանելու համար"</string>
+    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"Նախշը տեսանելի դարձնել"</string>
     <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="8898518337442601027">"Թրթրռալ հպումից"</string>
     <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"Հոսանքի կոճակը անկնթարթորեն կողպվում է"</string>
     <string name="lockpattern_settings_power_button_instantly_locks_summary" msgid="8196258755143711694">"Բացառությամբ, երբ ապակողպված է պահվում <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g>-ի կողմից"</string>
-    <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Սահմանել ապակողպման կաղապարը"</string>
-    <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Փոխել ապակողպման կաղապարը"</string>
-    <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Ինչպես պատկերել ապակողպման նախշը"</string>
+    <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Ստեղծել նախշ"</string>
+    <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Փոխել ապակողպող նախշը"</string>
+    <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Ինչպես ապակողպող նախշ գծել"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Չափից շատ սխալ փորձեր"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Կրկին փորձեք <xliff:g id="NUMBER">%d</xliff:g> վայրկյանից:"</string>
     <string name="activity_not_found" msgid="5551664692991605325">"Հավելվածը տեղադրված չէ ձեր հեռախոսում:"</string>
@@ -1237,7 +1242,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB կրիչ"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"SD քարտի վրա"</string>
     <string name="disabled" msgid="9206776641295849915">"Կասեցված է"</string>
-    <string name="not_installed" msgid="1475144352069281880">"Տեղադրված չէ"</string>
+    <string name="not_installed" msgid="2797554494953450291">"Տեղադրված չէ այս օգտվողի համար"</string>
     <string name="no_applications" msgid="7336588977497084921">"Ծրագրեր չկան"</string>
     <string name="internal_storage" msgid="1584700623164275282">"Ներքին պահոց"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB կրիչ"</string>
@@ -1434,8 +1439,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Էկրանը երբեք չի քնի լիցքավորման ընթացքում"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Միացնել Bluetooth HCI snoop log-ը"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Կորզել բոլոր bluetooth HCI փաթեթները մի ֆայլում"</string>
-    <string name="oem_unlock_enable" msgid="6629321276287913315">"Միացնել OEM ապակողպումը"</string>
-    <string name="oem_unlock_enable_summary" msgid="3546686263996628110">"Թույլ տալ, որ սարքը OEM ապակողպվի"</string>
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM ապակողպում"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Թույլ տալ սկզբնաբեռնման բեռնիչի ապակողպումը"</string>
+    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Մուտքագրեք PIN-ը"</string>
+    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Մուտքագրեք ձեր սարքի PIN-ը՝ OEM ապակողպումն ակտիվացնելու համար:"</string>
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Թույլատրե՞լ OEM ապակողպումը:"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"ԶԳՈՒՇԱՑՈՒՄ. Այս կարգավորումը միացրած ժամանակ սարքի պաշտպանության գործառույթները չեն աջակցվի այս սարքի վրա:"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Անլար էկրանի վկայագրում"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Միացնել Wi‑Fi մանրամասն գրանցամատյանները"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Wi‑Fi-ից կտրուկ անցում բջջային ինտերնետի"</string>
@@ -1538,6 +1547,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"Խորագրերն այսպիսին կլինեն"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"Լռելյայն"</string>
+    <string name="color_title" msgid="4258931051732243983">"Գույն"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"Կանխադրված"</string>
     <string name="color_none" msgid="3475640044925814795">"Ոչինչ"</string>
     <string name="color_white" msgid="8045195170201590239">"Սպիտակ"</string>
@@ -1595,12 +1605,12 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"մնում է <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> մինչև լիցաքավորվելը"</string>
-    <string name="power_discharging_duration" msgid="7125493014448497620">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - մնաց մոտ. <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="power_charging" msgid="712751285832976915">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="STATE">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration" msgid="4802183864773082009">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> մինչև լիցքավորումը"</string>
-    <string name="power_charging_duration_ac" msgid="3611179931297824699">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> մինչև լիցքավորումը AC-ով"</string>
-    <string name="power_charging_duration_usb" msgid="1106605348913397583">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> մինչև լիցքավորումը USB-ով"</string>
-    <string name="power_charging_duration_wireless" msgid="633606920144617227">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> մինչև լիցքավորումը անլար"</string>
+    <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> - մնաց մոտավորապես <xliff:g id="TIME">%2$s</xliff:g>"</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> մինչև լրիվ լիցքավորումը"</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> մինչև լրիվ լիցքավորումը հոսանքից"</string>
+    <string name="power_charging_duration_usb" msgid="182405645340976546">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> մինչև լրիվ լիցքավորումը USB-ով"</string>
+    <string name="power_charging_duration_wireless" msgid="1829295708243159464">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> մինչև լրիվ լիցքավորումը անլար ցանցից"</string>
     <string name="power_usage_list_summary" msgid="2409288197839512482">"Վերջին լիցքավորումից հետո օգտագործումը"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Մարտկոցի օգտագործման չափը անջատումից հետո"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Մարտկոցի օգտագործման չափը վերակայումից հետո"</string>
@@ -1617,7 +1627,6 @@
     <string name="awake" msgid="387122265874485088">"Սարքի արթնանալու ժամանակը"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi‑Fi ժամանակին"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi‑Fi-ը ժամանակին"</string>
-    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Պատմության մանրամասները"</string>
     <string name="details_title" msgid="3792801565213935385">"Օգտագործման մանրամասները"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Օգտագործման մանրամասները"</string>
@@ -1689,7 +1698,7 @@
     <string name="battery_saver" msgid="1426682272004907982">"Մարտկոցի էներգախնայիչ"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Ավտոմատ միանալ"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Երբեք"</string>
-    <string name="battery_saver_turn_on_automatically_pct" msgid="3033681629861428940">"մարտկոցի լիցքավորվածությունը՝ %1$d%%"</string>
+    <string name="battery_saver_turn_on_automatically_pct" msgid="7536784431655058267">"%1$s մարտկոց"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Գործընթացի վիճակագրություն"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Ընթացիկ գործընթացների տեխնիկական վիճակագրություն"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Օգտագործվող հիշողություն"</string>
@@ -1813,7 +1822,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Պահուստավորված սարք"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Միայն ծրագրային"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"Հավատարմագրերը հասանելի չեն այս օգտվողի համար"</string>
-    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Պատկերել էկրանի ապակողպման ձեր կաղապարը"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Պետք է ներկայացնեք ձեր ապակողպման կաղապարը` վկայագրերի տեղադրումը հաստատելու համար:"</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Մուտքագրեք հավատարմագրային պահոցի գաղտնաբառը:"</string>
@@ -1843,6 +1851,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"Ներառել ծրագրի տվյալները"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Ինքնուրույն վերականգնում"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Այս ծրագիրը ապատեղադրելու համար վերականգնեք կարգավորումները և տվյալները"</string>
+    <string name="backup_inactive_title" msgid="5355557151569037197">"Կրկնօրինակման ծառայությունը ակտիվ չէ:"</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"Սարքի քաղաքականության համաձայն:"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Աշխատասեղանի պահուստավորման գաղտնաբառ"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Աշխատասեղանի ամբողջական պահուստավորումները այժմ պաշտպանված չեն"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Աշխատասեղանի ամբողջական պահուստավորման համար ընտրել փոխել կամ հեռացնել գաղտնաբառը"</string>
@@ -1952,7 +1962,11 @@
     <string name="enter_password" msgid="8035706727471334122">"Android- մեկնարկի համար մուտքագրեք ձեր գաղտնաբառը"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Android- մեկնարկի համար մուտքագրեք ձեր PIN-ը"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Android- մեկնարկի համար մուտքագրեք ձեր կաղապարը"</string>
-    <string name="try_again" msgid="4272075051293936921">"Կրկին փորձեք:"</string>
+    <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"Կաղապարը սխալ է"</string>
+    <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"Գաղտնաբառը սխալ է"</string>
+    <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"PIN-ը սխալ է"</string>
+    <string name="checking_decryption" msgid="8287458611802609493">"Ստուգվում է…"</string>
+    <string name="starting_android" msgid="8581493237458496835">"Android-ը գործարկվում է"</string>
     <string name="delete" msgid="4219243412325163003">"Ջնջել"</string>
     <string name="misc_files" msgid="6720680815969643497">"Խառը ֆայլեր"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"Ընտրված է <xliff:g id="NUMBER">%1$d</xliff:g>-ը <xliff:g id="TOTAL">%2$d</xliff:g>-ից"</string>
@@ -1990,8 +2004,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Միշտ օգտագործել GPU-ն` էկրանի կազմման համար"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"Նմանակել գունատարածքը"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Ակտիվացնել OpenGL հետքերը"</string>
-    <string name="use_nuplayer" msgid="5699257393367904387">"Օգտագործել NuPlayer (փորձնական)"</string>
-    <string name="use_nuplayer_summary" msgid="1991479067478516714">"Օգտագործել NuPlayer-ը՝ AwesomePlayer-ի փոխարեն"</string>
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"Օգտագործել AwesomePlayer-ը (խորհուրդ չի տրվում)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"Մեդիա նվագարկումների մեծ մասի համար օգտագործել AwesomePlayer-ը՝ NuPlayer-ի փոխարեն"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"Անջատել USB աուդիո երթուղայնացումը"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"Անջատել ավտոմատ երթուղայնացումը դեպի USB աուդիո սարքեր"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Ցուցադրել կապակցումների դասավորությունը"</string>
@@ -2167,7 +2181,6 @@
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Ավելացնել օգտվող կամ պրոֆիլ"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Ավելացնել օգտվող"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Սահմանափակված պրոֆիլ"</string>
-    <string name="user_summary_managed_profile" msgid="7369539529693048111">"Աշխատանքային պրոֆիլ"</string>
     <string name="user_need_lock_message" msgid="2596365678651842785">"Նախքան դուք կկարողանաք ստեղծել սահմանափակ պրոֆիլ, դուք պետք է կարգավորեք էկրանի կողպումը` ձեր ծրագրերը և անձնական տվյալները պաշտպանելու համար:"</string>
     <string name="user_set_lock_button" msgid="8311219392856626841">"Կարգավորել կողպումը"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Կարգավորված չէ"</string>
@@ -2298,11 +2311,13 @@
     <string name="sim_cellular_data_unavailable_summary" msgid="3654805961942166428">"Հպեք՝ տվյալների կապի SIM ընտրելու համար"</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"Միշտ օգտագործել այս քարտը՝ զանգերի համար"</string>
     <string name="select_sim_for_data" msgid="2366081042162853044">"Ընտրեք SIM քարտը տվյալների համար"</string>
+    <string name="data_switch_started" msgid="2040761479817166311">"Տվյալների SIM քարտը փոխարկվում է: Դա կարող է մինչև մեկ րոպե տևել..."</string>
     <string name="select_sim_for_calls" msgid="3503094771801109334">"Զանգահարել հետևյալով"</string>
     <string name="sim_select_card" msgid="211285163525563293">"Ընտրեք SIM քարտը"</string>
     <string name="sim_card_number_title" msgid="7845379943474336488">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"SIM-ը դատարկ է"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"SIM-քարտի անունը"</string>
+    <string name="sim_name_hint" msgid="7038643345238968930">"Մուտքագրեք SIM-ի անունը"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"SIM քարտի բնիկ %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Օպերատորը"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Համար"</string>
@@ -2312,7 +2327,6 @@
     <string name="color_purple" msgid="3888532466427762504">"Մանուշակագույն"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"SIM քարտը տեղադրված չէ"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"SIM-ի կարգավիճակը"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"SIM-ին վերաբերող տվյալներ"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"Հետ զանգել կանխադրված SIM-ով"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"SIM՝ ելքային զանգերի համար"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Այլ զանգերի կարգավորումներ"</string>
@@ -2320,8 +2334,11 @@
     <string name="preferred_network_offload_header" msgid="2321173571529106767">"Անջատել ցանցի անվան հեռարձակումը"</string>
     <string name="preferred_network_offload_footer" msgid="5857279426054744020">"Ցանցի անվան հեռարձակման անջատումը պաշտպանում է ձեզ՝ երրորդ կողմից ձեր ցանցի մասին ինֆորմացիա ստանալուց:"</string>
     <string name="preferred_network_offload_popup" msgid="2252915199889604600">"Ցանցի անվան հեռարձակման անջատումը կհանգեցնի թաքնված ցանցերին ավտոմատ միացման:"</string>
+    <string name="sim_signal_strength" msgid="9144010043784767984">"<xliff:g id="DBM">%1$d</xliff:g> dBm <xliff:g id="ASU">%2$d</xliff:g> asu"</string>
+    <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">"Ընտրեք SIM քարտը"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Կարգավորումներ"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Կարգավորումներ"</string>
@@ -2330,22 +2347,22 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Վերջին որոնումները"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Արդյունքներ"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi ցանցային կապ"</string>
-    <string name="keywords_more_default_sms_app" msgid="2744404159003574745">"տեքստային հաղորդագրություն"</string>
-    <string name="keywords_more_mobile_networks" msgid="7813380887358745769">"բջջային կապի բջջային օպերատորի անլար ցանց"</string>
+    <string name="keywords_more_default_sms_app" msgid="895656981962034647">"տեքստային հաղորդագրություն տեքստային հաղորդագրություն գրել հաղորդակցում"</string>
+    <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"բջջային օպերատոր անլար 4g 3g 2g lte"</string>
     <string name="keywords_home" msgid="3626170808219458848">"թողարկիչ"</string>
     <string name="keywords_display" msgid="6709007669501628320">"հպէկրան"</string>
-    <string name="keywords_display_brightness_level" msgid="8636451602230815191">"հպէկրանի մգեցում"</string>
-    <string name="keywords_display_auto_brightness" msgid="8070218600502753102">"հպէկրանի մգեցում"</string>
-    <string name="keywords_display_wallpaper" msgid="4315466287469834939">"հետնաշերտ"</string>
+    <string name="keywords_display_brightness_level" msgid="8923289340474728990">"էկրանի խամրում հպէկրան մարտկոց"</string>
+    <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"էկրանի խամրում հպէկրան մարտկոց"</string>
+    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"հետնաշերտ անհատականացնել հարմարեցնել էկրան"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"տեքստի չափը"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"նախագիծ"</string>
-    <string name="keywords_storage" msgid="7007275853993419928">"տարածք սկավառակ կոշտ սկավառակ"</string>
-    <string name="keywords_battery" msgid="3992479295298655138">"սնուցում"</string>
-    <string name="keywords_spell_checker" msgid="4509482591225399210">"ուղղագրություն"</string>
+    <string name="keywords_storage" msgid="6572905220031852173">"տարածք սկավառակ կոշտ սկավառակ սարք օգտագործում"</string>
+    <string name="keywords_battery" msgid="2096185085932675704">"սնուցում օգտագործում լիցքավորում"</string>
+    <string name="keywords_spell_checker" msgid="6106749039734174140">"ուղղագրություն բառարան ուղղագրության ստուգում ինքնուղղում"</string>
     <string name="keywords_voice_input" msgid="3519547605812413860">"ճանաչող մուտքի խոսք խոսքի լեզու անձեռն անձեռն ճանաչում վիրավորական բառ աուդիո պատմություն Bluetooth ականջակալ"</string>
-    <string name="keywords_text_to_speech_output" msgid="8207889472282225512">"ցուցանիշ լեզու կանխադրված խոսել խոսք"</string>
-    <string name="keywords_date_and_time" msgid="7666950126499155141">"ժամացույց"</string>
-    <string name="keywords_factory_data_reset" msgid="3693730656843989732">"սրբելով ջնջել"</string>
+    <string name="keywords_text_to_speech_output" msgid="392447904221657930">"արագություն լեզու կանխադրված խոսել տեքստից խոսք հնչյունավորում մատչելիություն ընթերցող կույր"</string>
+    <string name="keywords_date_and_time" msgid="2631808108134830066">"ժամացույց ռազմական"</string>
+    <string name="keywords_factory_data_reset" msgid="4355133848707691977">"սրբել ջնջել վերականգնել մաքրել հեռացնել"</string>
     <string name="keywords_printing" msgid="1701778563617114846">"տպիչ"</string>
     <string name="keywords_sounds_and_notifications" msgid="5965996187974887000">"բարձրախոսի ազդանշան"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="2912933812460077912">"չխանգարել ընդհատել ընդհատում ընդմիջում"</string>
@@ -2354,7 +2371,7 @@
     <string name="keywords_location_mode" msgid="8584992704568356084">"ճշգրտություն"</string>
     <string name="keywords_accounts" msgid="1957925565953357627">"հաշիվ"</string>
     <string name="keywords_users" msgid="4673901601478559100">"սահմանափակում սահմանափակել սահմանափակված"</string>
-    <string name="keywords_keyboard_and_ime" msgid="1103378692379215672">"ուղղում ձայն թրթռոց ավտո լեզու ժեստ առաջարկել առաջարկ թեմա վիրավորական բառ տիպ զմայլիկ"</string>
+    <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"տեքստի ուղղում ուղղել ձայն թրթռալ ավտոմատ լեզու ժեստ առաջարկել առաջարկ թեմա վիրավորական բառ մուտքագրել զմայլիկ միջազգային"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"սահեցնել գաղտնաբառ նախշ pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Կարգավորել Wi-Fi NFC պիտակը"</string>
     <string name="write_tag" msgid="8571858602896222537">"Գրել"</string>
@@ -2371,7 +2388,6 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Ծանուցման ձայնի բարձրություն"</string>
     <string name="zen_mode_settings_title" msgid="7014915558669122902">"Ընդհատումներ"</string>
     <string name="zen_mode_option_title" msgid="5061978632306007914">"Զանգեր և ծանուցումներ ստանալիս"</string>
-    <string name="zen_mode_option_title_novoice" msgid="6680706009915204785">"Ծանուցումներ ստանալիս"</string>
     <string name="zen_mode_option_off" msgid="3167702608910820883">"Միշտ ընդհատել"</string>
     <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Թույլատրել միայն կարևոր ծանուցումները"</string>
     <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Չընդհատել"</string>
@@ -2429,14 +2445,17 @@
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Պատրաստ է"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Քանի դեռ չեք անջատել"</string>
     <string name="zen_mode_important_category" msgid="8123274463331022993">"Կարևոր ծանուցումներ"</string>
-    <string name="zen_mode_downtime_category" msgid="4730179065426038108">"Անջատված (միայն կարևոր ծանուցումներ)"</string>
+    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Անգործունության ժամանակը"</string>
     <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Օրեր"</string>
     <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"-"</string>
+    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Ընդհատումները թույլատրված են"</string>
+    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Միայն կարևորները"</string>
+    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Ոչ մեկը"</string>
     <string name="zen_mode_automation_category" msgid="4653551005950835761">"Ավտոմատացում"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Ավտոմատ միացնել"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Երբեք"</string>
-    <string name="zen_mode_phone_calls" msgid="8956214416859303966">"Զանգեր"</string>
+    <string name="zen_mode_calls" msgid="7051492091133751208">"Զանգեր"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Հաղորդագրություններ"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Զանգեր և հաղորդագրություններ հետևյալ օգտվողից՝"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Բոլորը"</string>
@@ -2450,7 +2469,9 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Երեկոյան աշխ. օրերին"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Մեկնարկի ժամը"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Ավարտի ժամը"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> հաջորդ օրը"</string>
+    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g>-ին հաջորդ օրը"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g>-ին կամ որևէ զարթուցիչից առաջ"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g>-ին հաջորդ օրը կամ որևէ զարթուցիչից առաջ"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Ծրագրերի ծանուցումներ"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Ծանուցման կարգավորումներ"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Ուղարկել կարծիք այս սարքի մասին"</string>
@@ -2458,7 +2479,11 @@
     <string name="switch_on_text" msgid="1124106706920572386">"Միացված"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Անջատված"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"Ամրակցել էկրանը"</string>
-    <string name="screen_pinning_description" msgid="7091642350452605379">"Երբ էկրանի ամրացումը միացված է, կարող եք օգտագործել այն՝ ընթացիկ էկրանը տեսադաշտում պահելու համար, քանի դեռ չեք ապամրացրել այն:\n\nԷկրանի ամրացումն օգտագործելու համար՝\n\n1. Համոզվեք, որ էկրանի ամրացումը միացված է:\n\n2. Բացեք այն էկրանը, որը ցանկանում եք ամրացնել:\n\n3. Հպեք Համատեսքի կոճակին:\n\n4. Հպեք ամրացման պատկերակին:"</string>
+    <string name="screen_pinning_description" msgid="1137904524037468263">"Երբ այս կարգավորումը միացված է, կարող եք օգտագործել էկրանի ամրացումը՝ ընթացիկ էկրանը տեսադաշտում պահելու համար, մինչև այն չապամրացնեք:\n\nԷկրանի ամրացումն օգտագործելու համար՝\n\n1. Համոզվեք, որ այն միացված է:\n\n2. Բացեք այն էկրանը, որը ցանկանում եք ամրացնել:\n\n3. Հպեք Համատեսքի կոճակին:\n\n4. Սահեցրեք վերև և հպեք ամրացման պատկերակին:"</string>
+    <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Ապաամրացնելուց առաջ հարցնել ապակողպող նախշը"</string>
+    <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Ապաամրացնելուց առաջ հարցնել PIN-կոդը"</string>
+    <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Ապաամրացնելուց առաջ հարցնել գաղտնաբառը"</string>
+    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Ապամրացման ժամանակ կողպել սարքը"</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Աշխատանքային պրոֆիլ"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Փորձնական)"</string>
     <string name="display_auto_rotate_title" msgid="6176450657107806043">"Երբ սարքը պտտվում է"</string>
@@ -2467,7 +2492,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Մնալ լանդշաֆտային դիրքով"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Մնալ ընթացիկ դիրքով"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI-ի վերաբերյալ տվյալներ"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI-ին վերաբերող տվյալներ"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Գաղտնագրում"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Շարունակել"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"Դուք կարող եք նաև պաշտպանել այս սարքը՝ այն մեկնարկելուց առաջ պահանջելով մուտքագրել PIN-ը: Մինչև մեկնարկը սարքը չի կարող ստանալ զանգեր, հաղորդագրություններ կամ տեղեկացումներ, այդ թվում՝ զարթուցիչներ: \n\n Այս գործառույթն օգնում է պաշտպանել տվյալները՝ կորած կամ գողացված սարքերում:"</string>
@@ -2485,4 +2509,7 @@
     <string name="encrypt_talkback_dialog_message_pin" msgid="1890374082842868489">"Երբ մուտքագրեք ձեր PIN-ը՝ այս սարքը մեկնարկելու համար, մատչելիության ծառայութունները, ինչպես օրինակ՝ <xliff:g id="SERVICE">%1$s</xliff:g>-ը, դեռևս հասանելի չեն լինի:"</string>
     <string name="encrypt_talkback_dialog_message_pattern" msgid="4474332516537386384">"Երբ մուտքագրեք ձեր նախշը՝ այս սարքը մեկնարկելու համար, մատչելիության ծառայութունները, ինչպես օրինակ՝ <xliff:g id="SERVICE">%1$s</xliff:g>-ը, դեռևս հասանելի չեն լինի:"</string>
     <string name="encrypt_talkback_dialog_message_password" msgid="8166099418487083927">"Երբ մուտքագրեք ձեր գաղտնաբառը՝ այս սարքը մեկնարկելու համար, մատչելիության ծառայութունները, ինչպես օրինակ՝ <xliff:g id="SERVICE">%1$s</xliff:g>-ը, դեռևս հասանելի չեն լինի:"</string>
+    <string name="imei_information_title" msgid="8499085421609752290">"IMEI-ի վերաբերյալ տվյալներ"</string>
+    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI-ին վերաբերող տվյալներ"</string>
+    <string name="slot_number" msgid="3762676044904653577">"(Սլոտ<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-in/arrays.xml b/res/values-in/arrays.xml
index 110cf1f..ed06375 100644
--- a/res/values-in/arrays.xml
+++ b/res/values-in/arrays.xml
@@ -521,10 +521,18 @@
     <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>
     <item msgid="6652164677254579050">"Disimpan dalam cache (kosong)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Hijau kebiruan"</item>
+    <item msgid="8332294763632946560">"Biru"</item>
+    <item msgid="2023216417616991392">"Nila"</item>
+    <item msgid="3170497246594232819">"Ungu"</item>
+    <item msgid="4608643045752965568">"Merah Muda"</item>
+    <item msgid="6131821495505931173">"Merah"</item>
+  </string-array>
 </resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index b3b383b..93d54f8 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> dapat dilihat oleh perangkat lain 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>
@@ -180,7 +180,6 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s ingin mengakses pesan Anda. Berikan akses pada %2$s?"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Tanggal &amp; waktu"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Pilih zona waktu"</string>
-    <string name="normal_date_format" msgid="7636406984925498359">"Daerah (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Pratinjau:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Ukuran font:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -291,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>
@@ -322,8 +321,6 @@
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Pilih zona waktu"</string>
     <string name="date_time_set_date_title" msgid="6928286765325608604">"Tanggal"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"Setel tanggal"</string>
-    <string name="date_time_date_format_title" msgid="3976171711988766411">"Format tanggal"</string>
-    <string name="date_time_date_format" msgid="6951498879879281102">"Pilih format tanggal"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Urutkan menurut abjad"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Urutkan menurut zona waktu"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Tanggal"</string>
@@ -372,7 +369,8 @@
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Tunggu sampai ponsel selesai dienkripsi. <xliff:g id="PERCENT">^1</xliff:g>% selesai."</string>
     <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Tunggu, tablet sedang dienkripsi. Sisa waktu: <xliff:g id="DURATION">^1</xliff:g>"</string>
     <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Tunggu, ponsel sedang dienkripsi. Sisa waktu: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Coba lagi dalam <xliff:g id="DELAY">^1</xliff:g> detik."</string>
+    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"Untuk membuka kunci, matikan, lalu nyalakan kembali tablet Anda."</string>
+    <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"Untuk membuka kunci, matikan, lalu nyalakan kembali ponsel Anda."</string>
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"Peringatan: Perangkat Anda akan dihapus setelah <xliff:g id="COUNT">^1</xliff:g> percobaan gagal lagi dalam pembukaan kunci!"</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Ketikkan sandi Anda"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Enkripsi gagal"</string>
@@ -401,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>
@@ -412,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>
@@ -556,13 +556,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Sebagai pengeras suara telepon"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Untuk musik dan media"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Ingat setelan"</string>
-    <string name="wifi_assistant_intro_setup" msgid="4605105515416995110">"Sambut\nBantuan Wi‑Fi"</string>
-    <string name="wifi_assistant_no_thanks" msgid="2776983751990143934">"TIDAK, TERIMA KASIH"</string>
-    <string name="wifi_assistant_setup" msgid="3772423650475730906">"SIAPKAN"</string>
-    <string name="wifi_assistant_card_message" msgid="107811647784658536">"Tersambung ke jaringan yang tersedia secara otomatis dengan Wi‑Fi Assistant."</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi‑Fi Assistant"</string>
-    <string name="wifi_assistant_title_message" msgid="6240721017579074015">"<xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> otomatis menyambungkan Anda ke Wi-Fi terbaik yang tersedia"</string>
-    <string name="wifi_assistant_open_app" msgid="4803044899535675063">"BUKA APLIKASI"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Terhubung melalui Asisten Wi-Fi"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"Layar Transmisi"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Aktifkan layar nirkabel"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Tidak ditemukan perangkat terdekat."</string>
@@ -592,7 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Setelan Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Siapkan &amp; kelola titik akses nirkabel"</string>
-    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Pilih Wi-Fi"</string>
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Pilih jaringan Wi-Fi"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Pilih Wi-Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Menyalakan Wi-Fi..."</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Mematikan Wi-Fi..."</string>
@@ -607,8 +602,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"Pemindaian selalu tersedia"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Selalu izinkan pemindaian"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Izinkan layanan lokasi Google dan aplikasi lainnya memindai jaringan saat Wi-Fi tidak aktif sekalipun"</string>
-    <string name="wifi_automatically_manage_title" msgid="6249976570008992746">"Kelola Wi‑Fi secara otomatis"</string>
-    <string name="wifi_automatically_manage_summary" msgid="6952470763378312488">"Izinkan <xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> mengelola koneksi Wi-Fi Anda"</string>
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Gunakan Wi-Fi terbuka secara otomatis"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Izinkan Asisten Wi-Fi tersambung otomatis ke jaringan terbuka yang ditentukan berkualitas tinggi"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Pilih asisten"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Pasang sertifikat"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Untuk meningkatkan akurasi lokasi dan untuk tujuan lainnya, Google dan aplikasi lainnya dapat memindai jaringan terdekat, bahkan saat Wi-Fi mati. Jika Anda tidak ingin ini terjadi, buka Lanjutan &gt; Pemindaian selalu tersedia."</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Aplikasi dapat memindai jaringan terdekat, bahkan saat Wi-Fi mati. Jika Anda tidak ingin ini terjadi, buka Lanjutan &gt; Pemindaian selalu tersedia."</string>
@@ -624,11 +620,12 @@
     <string name="wifi_access_points" msgid="7053990007031968609">"Jaringan Wi-Fi"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Tombol Tekan WPS"</string>
     <string name="wifi_menu_more_options" msgid="2448097861752719396">"Opsi lainnya"</string>
-    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Entri Pin WPS"</string>
-    <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi‑Fi Direct"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Masukan PIN WPS"</string>
+    <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi‑Fi Langsung"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Pindai"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Lanjutan"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Hubungkan ke jaringan"</string>
+    <string name="wifi_menu_remember" msgid="8814185749388713796">"Ingat jaringan"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Lupakan jaringan"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Ubah jaringan"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Tulis ke tag NFC"</string>
@@ -673,9 +670,11 @@
     <string name="wifi_unspecified" msgid="5431501214192991253">"(tidak ditentukan)"</string>
     <string name="wifi_remembered" msgid="4955746899347821096">"Disimpan"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"Nonaktif"</string>
-    <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Koneksi internet buruk dihindari"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"Kegagalan Konfigurasi IP"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Kegagalan Sambungan Wi-Fi"</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Masalah autentikasi"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Tidak dalam jangkauan"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Akses Internet Tidak Terdeteksi, tidak akan menyambung ulang secara otomatis."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS tersedia"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS tersedia)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Masukkan sandi jaringan Anda"</string>
@@ -699,9 +698,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"PERINGATAN: jika Anda melompati Wi‑Fi, tablet Anda hanya akan menggunakan data seluler untuk unduhan dan pembaruan awal. Untuk menghindari kemungkinan biaya data, sambungkan ke Wi‑Fi."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"PERINGATAN: jika Anda melompati Wi‑Fi, perangkat Anda hanya akan menggunakan data seluler untuk unduhan dan pembaruan awal. Untuk menghindari kemungkinan biaya data, sambungkan ke Wi‑Fi."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"PERINGATAN: jika Anda melompati Wi‑Fi, ponsel Anda hanya akan menggunakan data seluler untuk unduhan atau pembaruan awal. Untuk menghindari kemungkinan biaya data, sambungkan ke Wi‑Fi."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="2393880108322835846">"PERINGATAN: Jika Anda melompati Wi‑Fi, tablet Anda tidak akan memiliki sambungan internet guna dipakai untuk unduhan atau pembaruan awal apa pun."</string>
-    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1707391993265558787">"PERINGATAN: Jika Anda melompati Wi‑Fi, perangkat Anda tidak akan memiliki sambungan internet guna dipakai untuk unduhan atau pembaruan awal apa pun."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="1556858507920033022">"PERINGATAN: Jika Anda melompati Wi‑Fi, ponsel Anda tidak akan memiliki sambungan internet guna dipakai untuk unduhan atau pembaruan awal apa pun."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Jika Anda mengabaikan Wi‑Fi:\n\nTablet tidak akan memiliki sambungan internet.\n\nAnda tidak akan mendapatkan pembaruan perangkat lunak jika tidak tersambung ke internet.\n\nAnda tidak dapat mengaktifkan fitur perlindungan perangkat saat ini."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Jika Anda mengabaikan Wi‑Fi:\n\nPerangkat tidak akan memiliki sambungan internet.\n\nAnda tidak akan mendapatkan pembaruan perangkat lunak jika tidak tersambung ke internet.\n\nAnda tidak dapat mengaktifkan fitur perlindungan perangkat saat ini."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Jika Anda mengabaikan Wi‑Fi:\n\nPonsel tidak akan memiliki sambungan internet.\n\nAnda tidak akan mendapatkan pembaruan perangkat lunak jika tidak tersambung ke internet.\n\nAnda tidak dapat mengaktifkan fitur perlindungan perangkat saat ini."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Tablet tidak dapat menyambung ke jaringan Wi-Fi ini."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"Perangkat tidak dapat tersambung ke jaringan Wi‑Fi ini."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Ponsel tidak dapat menyambung ke jaringan Wi-Fi ini."</string>
@@ -724,7 +723,7 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Gateway"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Panjang awalan jaringan"</string>
-    <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"Wi‑Fi Direct"</string>
+    <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"Wi‑Fi Langsung"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"Informasi perangkat"</string>
     <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Ingat sambungan ini"</string>
     <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"Telusuri perangkat"</string>
@@ -761,7 +760,6 @@
     <string name="ring_volume_title" msgid="7938706566797464165">"Volume dering"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Getar saat senyap"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Suara pemberitahuan default"</string>
-    <string name="heads_up_enabled_title" msgid="1031078221910921622">"Munculan jika prioritas tinggi"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Nada dering"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Pemberitahuan"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Gunakan volume panggilan masuk untuk pemberitahuan"</string>
@@ -834,7 +832,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Kecerahan otomatis"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Angkat untuk membangunkan"</string>
     <string name="doze_title" msgid="2259176504273878294">"Tampilan ruangan"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"Nyalakan layar saat perangkat diambil atau ada pemberitahuan"</string>
+    <string name="doze_summary" msgid="7128970177894383698">"Membangunkan layar saat Anda mengambil perangkat atau menerima pemberitahuan"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Ukuran font"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Ukuran font"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Setelan kunci kartu SIM"</string>
@@ -862,6 +860,10 @@
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Batal"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"Ditemukan beberapa SIM"</string>
     <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>
+    <string name="sim_preferred_title" msgid="5567909634636045268">"Perbarui kartu SIM piihan?"</string>
+    <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> adalah satu-satunya SIM di perangkat. Ingin menggunakan SIM ini untuk data seluler, panggilan telepon, dan pesan SMS?"</string>
     <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>
@@ -1012,6 +1014,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Ini akan menghapus semua data dari "<b>"penyimpanan internal"</b>" tablet Anda, termasuk:\n\n"<li>"Akun Google Anda"</li>\n<li>"Data sistem dan apl serta setelan"</li>\n<li>"Apl unduhan"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Ini akan menghapus semua data dari "<b>"penyimpanan internal"</b>" ponsel Anda, termasuk:\n\n"<li>"Akun Google Anda"</li>\n<li>"Data sistem dan apl serta setelan"</li>\n<li>"Apl unduhan"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Saat ini Anda telah masuk ke akun berikut ini:\n"</string>
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Ada pengguna lain yang aktif di perangkat ini.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musik"</li>\n<li>"Foto"</li>\n<li>"Data pengguna lainnya"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Untuk menghapus gambar, musik, dan data pengguna lainnya, "<b>"penyimpanan USB"</b>" perlu dihapus."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Untuk menghapus musik, gambar, dan data pengguna lainnya, "<b>"kartu SD"</b>" perlu dihapus."</string>
@@ -1023,7 +1026,6 @@
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Setel ulang telepon"</string>
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Hapus semua informasi pribadi dan apl unduhan Anda? Anda tidak dapat mengurungkan tindakan ini!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Hapus semua"</string>
-    <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Buat pola pembuka kunci Anda"</string>
     <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Anda perlu membuat pola pembuka kunci untuk mengonfirmasi kembalikan ke setelan pabrik."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Penyetelan ulang tidak dilakukan karena layanan System Clear tidak tersedia."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Setel ulang?"</string>
@@ -1041,7 +1043,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"Hapus penyimpanan USB beserta semua file yang tersimpan di sana? Anda tidak dapat mengurungkan tindakan ini!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Hapus kartu SD beserta semua file yang tersimpan di sana? Anda tidak dapat mengurungkan tindakan ini!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Hapus semua"</string>
-    <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Buat pola pembuka kunci Anda"</string>
     <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Anda perlu membuat pola pembuka kunci untuk mengonfirmasi bahwa Anda ingin menghapus penyimpanan USB."</string>
     <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Anda perlu membuat pola pembuka kunci untuk mengonfirmasi bahwa Anda ingin menghapus kartu SD."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Setelan panggilan"</string>
@@ -1087,6 +1088,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Masukkan kartu SIM dan mulai ulang"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Sambungkan ke internet"</string>
     <string name="location_title" msgid="1029961368397484576">"Lokasiku"</string>
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Profil kerja"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Lokasi untuk profil kerja"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Dinonaktifkan oleh perusahaan Anda"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Mode"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Akurasi tinggi"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Hemat baterai"</string>
@@ -1124,6 +1128,7 @@
     <string name="copyright_title" msgid="865906688917260647">"Hak cipta"</string>
     <string name="license_title" msgid="1990487604356037871">"Lisensi"</string>
     <string name="terms_title" msgid="7697580845616764642">"Persyaratan dan ketentuan"</string>
+    <string name="webview_license_title" msgid="2813507464175738967">"Lisensi WebView Sistem"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Wallpaper"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Penyedia citra satelit:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Lisensi sumber terbuka"</string>
@@ -1174,9 +1179,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>
@@ -1199,7 +1204,7 @@
     <string name="controls_label" msgid="7611113077086853799">"Kontrol"</string>
     <string name="force_stop" msgid="7435006169872876756">"Paksa berhenti"</string>
     <string name="total_size_label" msgid="1048676419552557254">"Total"</string>
-    <string name="application_size_label" msgid="8494609207373874267">"Apl"</string>
+    <string name="application_size_label" msgid="8494609207373874267">"Aplikasi"</string>
     <string name="external_code_size_label" msgid="3459343140355961335">"Apl penyimpanan USB"</string>
     <string name="data_size_label" msgid="8679376373625710107">"Data"</string>
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Data penyimpanan USB"</string>
@@ -1237,8 +1242,8 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Penyimpanan USB"</string>
     <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="1475144352069281880">"Tidak terpasang"</string>
-    <string name="no_applications" msgid="7336588977497084921">"Tidak ada apl."</string>
+    <string name="not_installed" msgid="2797554494953450291">"Tidak dipasang untuk pengguna ini"</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 +1397,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 +1405,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>
@@ -1434,8 +1439,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Layar tidak akan redup selama mengisi daya"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Aktifkan log pengintaian HCI Bluetooth"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Tangkap semua paket HCI bluetooth di dalam file"</string>
-    <string name="oem_unlock_enable" msgid="6629321276287913315">"Aktifkan OEM terbuka"</string>
-    <string name="oem_unlock_enable_summary" msgid="3546686263996628110">"Izinkan perangkat menjadi perangkat OEM terbuka"</string>
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"Buka kunci OEM"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Izinkan bootloader dibuka kuncinya"</string>
+    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Masukkan PIN"</string>
+    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Masukkan PIN perangkat untuk mengaktifkan buka kunci OEM"</string>
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Izinkan buka kunci OEM?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"PERINGATAN: Fitur perlindungan perangkat tidak akan berfungsi di perangkat ini saat setelan diaktifkan."</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Sertifikasi layar nirkabel"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Aktifkan Pencatatan Log Panjang Wi-Fi"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Pengalihan Wi-Fi Agresif ke Seluler"</string>
@@ -1481,7 +1490,7 @@
     <string name="usage_stats_label" msgid="5890846333487083609">"Statistik penggunaan"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Statistik penggunaan"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Urutkan menurut:"</string>
-    <string name="app_name_label" msgid="5440362857006046193">"Apl"</string>
+    <string name="app_name_label" msgid="5440362857006046193">"Aplikasi"</string>
     <string name="last_time_used_label" msgid="8459441968795479307">"Terakhir kali digunakan"</string>
     <string name="usage_time_label" msgid="295954901452833058">"Waktu penggunaan"</string>
     <string name="accessibility_settings" msgid="3975902491934816215">"Aksesibilitas"</string>
@@ -1538,6 +1547,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"Teks akan terlihat seperti ini"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"Default"</string>
+    <string name="color_title" msgid="4258931051732243983">"Warna"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"Default"</string>
     <string name="color_none" msgid="3475640044925814795">"Tidak ada"</string>
     <string name="color_white" msgid="8045195170201590239">"Putih"</string>
@@ -1595,12 +1605,12 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"<xliff:g id="REMAIN">%1$s</xliff:g> tersisa"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> lagi agar terisi penuh"</string>
-    <string name="power_discharging_duration" msgid="7125493014448497620">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - kira-kira tersisa <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="power_charging" msgid="712751285832976915">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="STATE">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration" msgid="4802183864773082009">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> hingga penuh"</string>
-    <string name="power_charging_duration_ac" msgid="3611179931297824699">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> hingga penuh pada AC"</string>
-    <string name="power_charging_duration_usb" msgid="1106605348913397583">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> hingga penuh melalui USB"</string>
-    <string name="power_charging_duration_wireless" msgid="633606920144617227">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> hingga penuh dari nirkabel"</string>
+    <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> - kira-kira tersisa. <xliff:g id="TIME">%2$s</xliff:g>"</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> sampai penuh"</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> sampai penuh pada AC"</string>
+    <string name="power_charging_duration_usb" msgid="182405645340976546">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> sampai penuh melalui USB"</string>
+    <string name="power_charging_duration_wireless" msgid="1829295708243159464">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> sampai penuh dari nirkabel"</string>
     <string name="power_usage_list_summary" msgid="2409288197839512482">"Digunakan sejak isi daya penuh terakhir"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Penggunaan baterai sejak dicabut"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Penggunaan baterai sejak penyetelan ulang"</string>
@@ -1617,7 +1627,6 @@
     <string name="awake" msgid="387122265874485088">"Waktu bangun perangkat"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi berdasarkan waktu"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi berdasarkan waktu"</string>
-    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Detail riwayat"</string>
     <string name="details_title" msgid="3792801565213935385">"Gunakan detail"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Gunakan detail"</string>
@@ -1689,7 +1698,7 @@
     <string name="battery_saver" msgid="1426682272004907982">"Penghemat baterai"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Aktifkan secara otomatis"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Tidak pernah"</string>
-    <string name="battery_saver_turn_on_automatically_pct" msgid="3033681629861428940">"saat baterai %1$d%%"</string>
+    <string name="battery_saver_turn_on_automatically_pct" msgid="7536784431655058267">"dengan %1$s baterai"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Statistik Proses"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Statistik teknis tentang proses yang berjalan"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Penggunaan memori"</string>
@@ -1813,7 +1822,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Menggunakan perangkat keras"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Khusus perangkat lunak"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"Kredensial tidak tersedia untuk pengguna ini"</string>
-    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Gambar pola pembuka kunci Anda"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Anda perlu menggambar pola pembuka kunci untuk mengonfirmasi instalasi kredensial."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Ketik sandi untuk penyimpanan kredensial."</string>
@@ -1836,13 +1844,15 @@
     <string name="privacy_settings_title" msgid="4856282165773594890">"Buat cadangan &amp; setel ulang"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Mencadangkan &amp; memulihkan"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Data pribadi"</string>
-    <string name="backup_data_title" msgid="1239105919852668016">"Mencadangkan dataku"</string>
+    <string name="backup_data_title" msgid="1239105919852668016">"Cadangkan data saya"</string>
     <string name="backup_data_summary" msgid="708773323451655666">"Mencadangkan data aplikasi, sandi Wi-Fi, dan setelan lainnya ke server Google"</string>
     <string name="backup_configure_account_title" msgid="3790872965773196615">"Akun cadangan"</string>
     <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Saat ini, tidak ada akun yang menyimpan data cadangan"</string>
     <string name="include_app_data_title" msgid="2829970132260278394">"Sertakan data aplikasi"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Pemulihan otomatis"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Memulihkan cadangan setelan dan data ketika memasang ulang apl"</string>
+    <string name="backup_inactive_title" msgid="5355557151569037197">"Layanan cadangan tidak aktif."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"Ini ditetapkan oleh kebijakan perangkat Anda."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Sandi cadangan desktop"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Saat ini cadangan desktop penuh tidak dilindungi"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Sentuh guna mengubah atau menghapus sandi untuk cadangan lengkap desktop"</string>
@@ -1952,7 +1962,11 @@
     <string name="enter_password" msgid="8035706727471334122">"Untuk memulai Android, masukkan sandi"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Untuk memulai Android, masukkan PIN"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Untuk memulai Android, gambar pola Anda"</string>
-    <string name="try_again" msgid="4272075051293936921">"Coba lagi."</string>
+    <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"Pola Salah"</string>
+    <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"Sandi Salah"</string>
+    <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"PIN Salah"</string>
+    <string name="checking_decryption" msgid="8287458611802609493">"Memeriksa…"</string>
+    <string name="starting_android" msgid="8581493237458496835">"Memulai Android"</string>
     <string name="delete" msgid="4219243412325163003">"Hapus"</string>
     <string name="misc_files" msgid="6720680815969643497">"File Serbaneka"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"Terpilih <xliff:g id="NUMBER">%1$d</xliff:g> dari <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -1990,8 +2004,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Selalu gunakan GPU untuk pengomposisian layar"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"Simulasikan ruang warna"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Aktifkan jejak OpenGL"</string>
-    <string name="use_nuplayer" msgid="5699257393367904387">"Gunakan NuPlayer (eksperimental)"</string>
-    <string name="use_nuplayer_summary" msgid="1991479067478516714">"Gunakan NuPlayer, bukan AwesomePlayer"</string>
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"Pakai AwesomePlayer (lawas)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"Pakai AwesomePlayer untuk memutar media, bukan NuPlayer"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"Perutean audio USB nonaktif"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"Perutean otomatis ke periferal audio USB nonaktif"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Tampilkan batas tata letak"</string>
@@ -2010,7 +2024,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>
@@ -2089,7 +2103,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>
@@ -2167,7 +2181,6 @@
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Tambahkan pengguna atau profil"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Tambahkan pengguna"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Profil dibatasi"</string>
-    <string name="user_summary_managed_profile" msgid="7369539529693048111">"Profil kerja"</string>
     <string name="user_need_lock_message" msgid="2596365678651842785">"Sebelum dapat membuat profil yang dibatasi, Anda perlu menyiapkan kunci layar untuk melindungi aplikasi dan data pribadi Anda."</string>
     <string name="user_set_lock_button" msgid="8311219392856626841">"Setel kunci"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Tidak disiapkan"</string>
@@ -2298,11 +2311,13 @@
     <string name="sim_cellular_data_unavailable_summary" msgid="3654805961942166428">"Sentuh untuk memilih SIM data"</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"Selalu gunakan ini untuk panggilan"</string>
     <string name="select_sim_for_data" msgid="2366081042162853044">"Pilih SIM untuk data"</string>
+    <string name="data_switch_started" msgid="2040761479817166311">"Mengalihkan SIM data, mungkin perlu waktu beberapa saat..."</string>
     <string name="select_sim_for_calls" msgid="3503094771801109334">"Telepon dengan"</string>
     <string name="sim_select_card" msgid="211285163525563293">"Pilih kartu SIM"</string>
     <string name="sim_card_number_title" msgid="7845379943474336488">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"SIM kosong"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"Nama SIM"</string>
+    <string name="sim_name_hint" msgid="7038643345238968930">"Masukkan nama SIM"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"Slot SIM %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Operator"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Nomor"</string>
@@ -2312,7 +2327,6 @@
     <string name="color_purple" msgid="3888532466427762504">"Ungu"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"Tidak ada kartu SIM yang dimasukkan"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"Status SIM"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"Informasi terkait SIM"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"Teleponan balik dari SIM default"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"SIM untuk panggilan keluar"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Setelan panggilan lainnya"</string>
@@ -2320,8 +2334,11 @@
     <string name="preferred_network_offload_header" msgid="2321173571529106767">"Nonaktifkan Siaran Nama Jaringan"</string>
     <string name="preferred_network_offload_footer" msgid="5857279426054744020">"Menonaktifkan Siaran Nama Jaringan melindungi informasi jaringan Anda dari akses pihak ketiga."</string>
     <string name="preferred_network_offload_popup" msgid="2252915199889604600">"Penonaktifan Siaran Nama Jaringan akan mencegah sambungan otomatis ke jaringan tersembunyi."</string>
+    <string name="sim_signal_strength" msgid="9144010043784767984">"<xliff:g id="DBM">%1$d</xliff:g> dBm <xliff:g id="ASU">%2$d</xliff:g> asu"</string>
+    <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>
+    <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Selalu tanya"</string>
     <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>
@@ -2330,22 +2347,22 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Penelusuran terkini"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Hasil"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi network connection sambungan jaringan"</string>
-    <string name="keywords_more_default_sms_app" msgid="2744404159003574745">"pesan teks"</string>
-    <string name="keywords_more_mobile_networks" msgid="7813380887358745769">"seluler operator nirkabel"</string>
+    <string name="keywords_more_default_sms_app" msgid="895656981962034647">"teks pesan mengirim SMS pesan perpesanan"</string>
+    <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"seluler sel operator nirkabel data 4g 3g 2g lte"</string>
     <string name="keywords_home" msgid="3626170808219458848">"peluncur"</string>
     <string name="keywords_display" msgid="6709007669501628320">"layar sentuh"</string>
-    <string name="keywords_display_brightness_level" msgid="8636451602230815191">"layar sentuh redup"</string>
-    <string name="keywords_display_auto_brightness" msgid="8070218600502753102">"layar sentuh redup"</string>
-    <string name="keywords_display_wallpaper" msgid="4315466287469834939">"latar belakang"</string>
+    <string name="keywords_display_brightness_level" msgid="8923289340474728990">"layar redup layar sentuh baterai"</string>
+    <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"layar redup layar sentuh baterai"</string>
+    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"latar belakang personalisasi sesuaikan tampilan"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"ukuran teks"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"proyeksi"</string>
-    <string name="keywords_storage" msgid="7007275853993419928">"ruang disk hard drive"</string>
-    <string name="keywords_battery" msgid="3992479295298655138">"daya"</string>
-    <string name="keywords_spell_checker" msgid="4509482591225399210">"ejaan"</string>
+    <string name="keywords_storage" msgid="6572905220031852173">"ruang disk hard drive perangkat penggunaan"</string>
+    <string name="keywords_battery" msgid="2096185085932675704">"penggunaan daya isi daya"</string>
+    <string name="keywords_spell_checker" msgid="6106749039734174140">"ejaan kamus periksaejaan koreksi-otomatis"</string>
     <string name="keywords_voice_input" msgid="3519547605812413860">"recognizer input speech speak language hands-free hand free recognition offensive word audio history bluetooth headset pengenal masukan ucapan ucapkan bahasa handsfree pengenalan kata menyinggung audio riwayat bluetooth headset"</string>
-    <string name="keywords_text_to_speech_output" msgid="8207889472282225512">"beri nilai bahasa default ucapkan berbicara"</string>
-    <string name="keywords_date_and_time" msgid="7666950126499155141">"jam"</string>
-    <string name="keywords_factory_data_reset" msgid="3693730656843989732">"hapus"</string>
+    <string name="keywords_text_to_speech_output" msgid="392447904221657930">"rating bahasa default berbicara berbicara text to speech aksesibilitas pembaca tunanetra"</string>
+    <string name="keywords_date_and_time" msgid="2631808108134830066">"jam militer"</string>
+    <string name="keywords_factory_data_reset" msgid="4355133848707691977">"sapu hapus pulihkan kosongkan buang"</string>
     <string name="keywords_printing" msgid="1701778563617114846">"printer"</string>
     <string name="keywords_sounds_and_notifications" msgid="5965996187974887000">"bip pengeras suara"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="2912933812460077912">"jangan jangan ganggu mengganggu gangguan terputus"</string>
@@ -2354,7 +2371,7 @@
     <string name="keywords_location_mode" msgid="8584992704568356084">"akurasi"</string>
     <string name="keywords_accounts" msgid="1957925565953357627">"akun"</string>
     <string name="keywords_users" msgid="4673901601478559100">"pembatasan membatasi dibatasi"</string>
-    <string name="keywords_keyboard_and_ime" msgid="1103378692379215672">"koreksi teks koreksi suara getar otomatis bahasa isyarat menyarankan saran tema kata menyinggung ketik emoji"</string>
+    <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"teks koreksi benar suara getar otomatis bahasa isyarat sarankan saran tema menyinggung kata jenis emoji internasional"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"geser pin pola sandi"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Siapkan Tag NFC Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Tulis"</string>
@@ -2371,7 +2388,6 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Volume pemberitahuan"</string>
     <string name="zen_mode_settings_title" msgid="7014915558669122902">"Interupsi"</string>
     <string name="zen_mode_option_title" msgid="5061978632306007914">"Saat ada panggilan telepon dan pemberitahuan"</string>
-    <string name="zen_mode_option_title_novoice" msgid="6680706009915204785">"Saat ada pemberitahuan"</string>
     <string name="zen_mode_option_off" msgid="3167702608910820883">"Selalu ganggu"</string>
     <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Hanya mengizinkan interupsi prioritas"</string>
     <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Jangan ganggu"</string>
@@ -2429,14 +2445,17 @@
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Selesai"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Hingga Anda menonaktifkan ini"</string>
     <string name="zen_mode_important_category" msgid="8123274463331022993">"Interupsi prioritas"</string>
-    <string name="zen_mode_downtime_category" msgid="4730179065426038108">"Nonaktif (hanya interupsi prioritas)"</string>
+    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Waktu non-operasional"</string>
     <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Hari"</string>
     <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Tidak ada"</string>
+    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Gangguan diizinkan"</string>
+    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Hanya untuk prioritas"</string>
+    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Tidak ada"</string>
     <string name="zen_mode_automation_category" msgid="4653551005950835761">"Automasi"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Otomatis aktif"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Tidak pernah"</string>
-    <string name="zen_mode_phone_calls" msgid="8956214416859303966">"Panggilan telepon"</string>
+    <string name="zen_mode_calls" msgid="7051492091133751208">"Panggilan telepon"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Pesan"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Panggilan telepon/pesan dari"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Semua orang"</string>
@@ -2450,7 +2469,9 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Malam hari kerja"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Waktu mulai"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Waktu berakhir"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> hari berikutnya"</string>
+    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> hari berikutnya"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> atau alarm sebelumnya"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> hari berikutnya atau alarm sebelumnya"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Pemberitahuan apl"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Setelan pemberitahuan"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Kirim masukan tentang perangkat ini"</string>
@@ -2458,7 +2479,11 @@
     <string name="switch_on_text" msgid="1124106706920572386">"Aktif"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Nonaktif"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"Penyematan layar"</string>
-    <string name="screen_pinning_description" msgid="7091642350452605379">"Jika diaktifkan, layar dapat dipasangi pin agar tampilan layar tetap seperti saat ini sampai pin dilepas.\n\nUntuk memasang pin pada layar:\n\n1. Pastikan pemasangan pin pada layar telah diaktifkan.\n\n2. Buka layar yang ingin Anda pasangi pin.\n\n3. Sentuh Ringkasan.\n\n4. Sentuh ikon pin."</string>
+    <string name="screen_pinning_description" msgid="1137904524037468263">"Jika setelan ini diaktifkan, Anda dapat memasang pin ke layar agar layar aktif tetap ditampilkan sampai Anda melepas pin.\n\nUntuk memasang pin ke layar:\n\n1. Pastikan fitur pasang pin ke layar diaktifkan.\n\n2. Buka layar yang ingin Anda pasangkan pin.\n\n3. Sentuh Ringkasan.\n\n4. Gesek ke atas, lalu sentuh ikon pin."</string>
+    <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Minta pola pembuka kunci sebelum melepas pin"</string>
+    <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Minta PIN sebelum melepas pin"</string>
+    <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Minta sandi sebelum melepas pin"</string>
+    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Kunci perangkat saat melepas pin"</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Profil kerja"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Eksperimental)"</string>
     <string name="display_auto_rotate_title" msgid="6176450657107806043">"Saat perangkat diputar"</string>
@@ -2467,7 +2492,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Tetap dalam tampilan lanskap"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Tetap dalam orientasi saat ini"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"Informasi IMEI"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"Informasi relatif IMEI"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Enkripsi"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Lanjutkan"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"Anda dapat melindungi perangkat ini lebih lanjut dengan meminta PIN sebelum memulai perangkat. Jika perangkat belum dimulai, panggilan telepon, pesan, atau pemberitahuan, termasuk alarm, tidak dapat diterima. \n\nIni membantu melindungi data pada perangkat yang hilang atau dicuri."</string>
@@ -2485,4 +2509,7 @@
     <string name="encrypt_talkback_dialog_message_pin" msgid="1890374082842868489">"Jika Anda memasukkan PIN untuk memulai perangkat ini, layanan aksesibilitas seperti <xliff:g id="SERVICE">%1$s</xliff:g> belum dapat tersedia."</string>
     <string name="encrypt_talkback_dialog_message_pattern" msgid="4474332516537386384">"Jika Anda memasukkan pola untuk memulai perangkat ini, layanan aksesibilitas seperti <xliff:g id="SERVICE">%1$s</xliff:g> belum dapat tersedia."</string>
     <string name="encrypt_talkback_dialog_message_password" msgid="8166099418487083927">"Jika Anda memasukkan sandi untuk memulai perangkat ini, layanan aksesibilitas seperti <xliff:g id="SERVICE">%1$s</xliff:g> belum dapat tersedia."</string>
+    <string name="imei_information_title" msgid="8499085421609752290">"Informasi IMEI"</string>
+    <string name="imei_information_summary" msgid="2074095606556565233">"Informasi relatif IMEI"</string>
+    <string name="slot_number" msgid="3762676044904653577">"(Slot<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-is-rIS/arrays.xml b/res/values-is-rIS/arrays.xml
index 9bd0cef..dd0af19 100644
--- a/res/values-is-rIS/arrays.xml
+++ b/res/values-is-rIS/arrays.xml
@@ -527,4 +527,12 @@
     <item msgid="4338089220026248848">"Í skyndiminni (virknibiðlari)"</item>
     <item msgid="6652164677254579050">"Í skyndiminni (autt)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Blágrænn"</item>
+    <item msgid="8332294763632946560">"Blár"</item>
+    <item msgid="2023216417616991392">"Dimmfjólublár"</item>
+    <item msgid="3170497246594232819">"Fjólublár"</item>
+    <item msgid="4608643045752965568">"Bleikur"</item>
+    <item msgid="6131821495505931173">"Rauður"</item>
+  </string-array>
 </resources>
diff --git a/res/values-is-rIS/strings.xml b/res/values-is-rIS/strings.xml
index 3dbd5d3..6cfc87b 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>
@@ -180,7 +180,6 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s vill fá aðgang að skilaboðunum þínum. Viltu gefa %2$s aðgang?"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Dagsetning og tími"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Veldu tímabelti"</string>
-    <string name="normal_date_format" msgid="7636406984925498359">"Svæðisbundið (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Forskoðun:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Leturstærð:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -291,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>
@@ -322,8 +321,6 @@
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Velja tímabelti"</string>
     <string name="date_time_set_date_title" msgid="6928286765325608604">"Dagsetning"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"Stilla dagsetningu"</string>
-    <string name="date_time_date_format_title" msgid="3976171711988766411">"Dagsetningarsnið"</string>
-    <string name="date_time_date_format" msgid="6951498879879281102">"Veldu dagsetningarsnið"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Raða í stafrófsröð"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Raða eftir tímabelti"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Dagsetning"</string>
@@ -372,7 +369,8 @@
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Bíddu á meðan verið er að dulkóða símann. <xliff:g id="PERCENT">^1</xliff:g>% lokið."</string>
     <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Bíddu á meðan verið er að dulkóða spjaldtölvuna. Tími eftir: <xliff:g id="DURATION">^1</xliff:g>"</string>
     <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Bíddu á meðan verið er að dulkóða símann. Tími eftir: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Reyndu aftur eftir <xliff:g id="DELAY">^1</xliff:g> sekúndur."</string>
+    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"Slökktu á spjaldtölvunni og kveiktu á henni aftur til að taka hana úr lás."</string>
+    <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"Slökktu á símanum og kveiktu á honum aftur til að taka hann úr lás."</string>
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"Viðvörun: Eftir <xliff:g id="COUNT">^1</xliff:g> misheppnaðar opnunartilraunir í viðbót verður allt þurrkað út úr tækinu."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Sláðu inn aðgangsorðið þitt"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Dulkóðun mistókst"</string>
@@ -401,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>
@@ -412,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>
@@ -556,13 +556,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Sem hátalari"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Fyrir tónlist og margmiðlunarefni"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Muna stillingar"</string>
-    <string name="wifi_assistant_intro_setup" msgid="4605105515416995110">"Við kynnum\nWi‑Fi aðstoð"</string>
-    <string name="wifi_assistant_no_thanks" msgid="2776983751990143934">"NEI, TAKK"</string>
-    <string name="wifi_assistant_setup" msgid="3772423650475730906">"SETJA UPP"</string>
-    <string name="wifi_assistant_card_message" msgid="107811647784658536">"Tengjast sjálfkrafa við tiltæk net með Wi-Fi aðstoð."</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi-Fi aðstoð"</string>
-    <string name="wifi_assistant_title_message" msgid="6240721017579074015">"<xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> tengir þig sjálfkrafa við besta Wi-Fi net sem er í boði"</string>
-    <string name="wifi_assistant_open_app" msgid="4803044899535675063">"OPIÐ FORRIT"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Tengt í gegnum Wi-Fi aðstoð"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"Senda út skjá"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Leyfa þráðlausan skjá"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Engin nálæg tæki fundust."</string>
@@ -592,7 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Stillingar Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Setja upp og stjórna þráðlausum aðgangsstöðum"</string>
-    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Velja Wi-Fi"</string>
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Veldu Wi-Fi net"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Velja Wi-Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Kveikir á Wi‑Fi…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Slekkur á Wi‑Fi…"</string>
@@ -607,8 +602,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"Leit alltaf í boði"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Leyfa alltaf leit"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Leyfa staðsetningarþjónustu Google og öðrum forritum að leita að Wi-Fi neti, jafnvel þegar slökkt er á Wi-Fi"</string>
-    <string name="wifi_automatically_manage_title" msgid="6249976570008992746">"Sjálfvirk stjórnun Wi-Fi"</string>
-    <string name="wifi_automatically_manage_summary" msgid="6952470763378312488">"Leyfa <xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> að stjórna Wi-Fi tengingunni þinni"</string>
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Nota opin Wi-Fi net sjálfkrafa"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Leyfa Wi-Fi aðstoð að tengjast neti sjálfkrafa ef gæði þess eru mikil"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Veldu aðstoðarforrit"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Setja upp vottorð"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Til að bæta nákvæmni staðsetningar o.fl. kunna forrit að leita að nálægum netum, jafnvel þegar slökkt er á Wi-Fi. Ef þú vilt koma í veg fyrir þetta skaltu fara í Ítarlegar stillingar &gt; Leit alltaf í boði."</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Forrit geta leitað að nálægum netum, jafnvel þegar slökkt er á Wi-Fi. Ef þú vilt koma í veg fyrir þetta skaltu fara í Ítarlegar stillingar &gt; Leit alltaf í boði"</string>
@@ -629,6 +625,7 @@
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Leita"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Ítarlegt"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Tengt við net"</string>
+    <string name="wifi_menu_remember" msgid="8814185749388713796">"Vista net"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Gleyma neti"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Breyta neti"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Skrifa í NFC-merki"</string>
@@ -673,9 +670,11 @@
     <string name="wifi_unspecified" msgid="5431501214192991253">"(ótilgreint)"</string>
     <string name="wifi_remembered" msgid="4955746899347821096">"Vistað"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"Óvirkt"</string>
-    <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Komist hjá lélegri nettengingu"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP-stillingarvilla"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"WiFi-tengingarvilla"</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Vandamál við auðkenningu"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Ekkert samband"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Enginn netaðgangur fannst; endurtengist ekki sjálfkrafa."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS tiltækt"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS tiltækt)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Sláðu inn aðgangsorð netsins"</string>
@@ -699,9 +698,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"VIÐVÖRUN: Ef þú notar ekki Wi-Fi getur spjaldtölvan aðeins sótt efni og uppfærslur með farsímagögnum. Tengdu tölvuna við Wi-Fi til að komast hjá mögulegum gagnakostnaði."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"VIÐVÖRUN: Ef þú notar ekki Wi-Fi getur tækið aðeins sótt efni og uppfærslur með farsímagögnum. Tengdu tækið við Wi-Fi til að komast hjá mögulegum gagnakostnaði."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"VIÐVÖRUN: Ef þú notar ekki Wi-Fi getur síminn aðeins sótt efni og uppfærslur með farsímagögnum. Tengdu símann við Wi-Fi til að komast hjá mögulegum gagnakostnaði."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="2393880108322835846">"VIÐVÖRUN: Ef þú notar ekki Wi-Fi net er ekki hægt að tengja spjaldtölvuna þína við internetið til að sækja efni og uppfærslur."</string>
-    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1707391993265558787">"VIÐVÖRUN: Ef þú notar ekki Wi-Fi net er ekki hægt að tengja tækið þitt við internetið til að sækja efni og uppfærslur."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="1556858507920033022">"VIÐVÖRUN: Ef þú notar ekki Wi-Fi net er ekki hægt að tengja símann þinn við internetið til að sækja efni og uppfærslur."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Ef þú sleppir Wi‑Fi:\n\nSpjaldtölvan verður ónettengd.\n\nÞú færð ekki hugbúnaðaruppfærslur fyrr en þú tengist netinu.\n\nÞú getur ekki virkjað öryggiseiginleika tækisins á þessari stundu."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Ef þú sleppir Wi‑Fi:\n\nTækið verður ónettengt.\n\nÞú færð ekki hugbúnaðaruppfærslur fyrr en þú tengist netinu.\n\nÞú getur ekki virkjað öryggiseiginleika tækisins á þessari stundu."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Ef þú sleppir Wi‑Fi:\n\nSíminn verður ónettengdur.\n\nÞú færð ekki hugbúnaðaruppfærslur fyrr en þú tengist netinu.\n\nÞú getur ekki virkjað öryggiseiginleika tækisins á þessari stundu."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Spjaldtölvan gat ekki tengst þessu Wi-Fi neti."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"Ekki var hægt að tengja tækið við þetta Wi-Fi net."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Síminn gat ekki tengst þessu Wi-Fi neti."</string>
@@ -761,7 +760,6 @@
     <string name="ring_volume_title" msgid="7938706566797464165">"Hljóðstyrkur hringingar"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Titra þegar slökkt er á hljóði"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Sjálfgefið hljóð tilkynninga"</string>
-    <string name="heads_up_enabled_title" msgid="1031078221910921622">"Birtast ef forgangur er mikill"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Hringitónn"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Tilkynning"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Nota hljóðstyrk hringinga fyrir tilkynningar"</string>
@@ -834,7 +832,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Sjálfvirk birtustilling"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Lyfta til að vekja"</string>
     <string name="doze_title" msgid="2259176504273878294">"Umhverfisskjár"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"Vekja skjáinn þegar tækið er tekið upp eða þegar tilkynningar berast"</string>
+    <string name="doze_summary" msgid="7128970177894383698">"Vekja skjáinn þegar þú tekur tækið upp eða þegar tilkynningar berast"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Leturstærð"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Leturstærð"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Stillingar SIM-kortaláss"</string>
@@ -862,6 +860,10 @@
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Hætta við"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"Mörg SIM-kort fundust"</string>
     <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>
@@ -1012,6 +1014,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Þessi aðgerð eyðir öllum gögnum úr "<b>"innbyggðri geymslu"</b>" spjaldtölvunnar, þar á meðal:\n\n"<li>"Google reikningnum þínum"</li>\n<li>"Gögnum og stillingum forrita og kerfis"</li>\n<li>"Forritum sem hafa verið sótt"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Þessi aðgerð eyðir öllum gögnum úr "<b>"innbyggðri geymslu"</b>" símans, þar á meðal:\n\n"<li>"Google reikningnum þínum"</li>\n<li>"Gögnum og stillingum forrita og kerfis"</li>\n<li>"Forritum sem hafa verið sótt"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Þú ert skráð(ur) inn á eftirfarandi reikninga:\n"</string>
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Aðrir notendur eru til staðar í þessu tæki.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Tónlist"</li>\n<li>"Myndir"</li>\n<li>"Önnur notandagögn"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Til að hreinsa tónlist, myndir og önnur notandagögn þarf að hreinsa allt út af "<b>"USB-geymslunni"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Til að hreinsa tónlist, myndir og önnur notandagögn þarf að hreinsa allt út af "<b>"SD-kortinu"</b>"."</string>
@@ -1023,7 +1026,6 @@
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Endurstilla símann"</string>
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Eyða öllum persónuupplýsingum og sóttum forritum? Ekki er hægt að afturkalla þessa aðgerð."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Eyða öllu"</string>
-    <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Teiknaðu opnunarmynstrið"</string>
     <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Þú þarft að teikna opnunarmynstrið til að staðfesta núllstillingu."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Endurstilling var ekki framkvæmd vegna þess að kerfishreinsunarþjónustan er ekki tiltæk."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Endurstilla?"</string>
@@ -1041,7 +1043,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"Hreinsa út af USB-geymslunni og eyða öllum skrám sem þar eru geymdar? Sú aðgerð er óafturkræf!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Hreinsa út af SD-kortinu og eyða öllum skrám sem þar eru geymdar? Sú aðgerð er óafturkræf!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Eyða öllu"</string>
-    <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Teiknaðu opnunarmynstrið"</string>
     <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Þú þarft að teikna opnunarmynstrið til að staðfesta að þú viljir eyða öllum gögnum af USB-geymslunni."</string>
     <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Þú þarft að teikna opnunarmynstrið til að staðfesta að þú viljir hreinsa SD-kortið."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Símtalsstillingar"</string>
@@ -1087,6 +1088,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Settu SIM-kortið í og endurræstu"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Tengdu tækið við netið"</string>
     <string name="location_title" msgid="1029961368397484576">"Staðsetningin mín"</string>
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Vinnusnið"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Staðsetning vinnusniðs"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Fyrirtækið slökkti á þessu"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Stilling"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Mikil nákvæmni"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Rafhlöðusparnaður"</string>
@@ -1124,6 +1128,7 @@
     <string name="copyright_title" msgid="865906688917260647">"Höfundarréttur"</string>
     <string name="license_title" msgid="1990487604356037871">"Leyfi"</string>
     <string name="terms_title" msgid="7697580845616764642">"Skilmálar"</string>
+    <string name="webview_license_title" msgid="2813507464175738967">"Leyfi vefglugga í kerfi"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Veggfóður"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Gervihnattamyndir frá:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Leyfi opins kóða"</string>
@@ -1237,7 +1242,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB-geymsla"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Á SD-korti"</string>
     <string name="disabled" msgid="9206776641295849915">"Óvirkt"</string>
-    <string name="not_installed" msgid="1475144352069281880">"Ekki uppsett"</string>
+    <string name="not_installed" msgid="2797554494953450291">"Ekki uppsett fyrir þennan notanda"</string>
     <string name="no_applications" msgid="7336588977497084921">"Engin forrit."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Innbyggð geymsla"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB-geymsla"</string>
@@ -1434,8 +1439,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Skjárinn fer aldrei í hvíld við hleðslu"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Gera HCI-snuðraraskrá Bluetooth virka"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Fanga alla HCI-pakka Bluetooth í skrá"</string>
-    <string name="oem_unlock_enable" msgid="6629321276287913315">"Virkja opnun framleiðanda"</string>
-    <string name="oem_unlock_enable_summary" msgid="3546686263996628110">"Leyfa framleiðandaopnun tækis"</string>
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"Opnun framleiðanda"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Leyfa opnun ræsiforritsins"</string>
+    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Sláðu inn PIN-númerið þitt"</string>
+    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Sláðu inn PIN-númer tækisins til að gera opnun framleiðanda virka"</string>
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Leyfa opnun framleiðanda?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"VIÐVÖRUN: Öryggiseiginleikar til að vernda tækið virka ekki í þessu tæki þegar þessi stilling er virk."</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Vottun þráðlausra skjáa"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Kveikja á ítarlegri skráningu Wi-Fi"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Ágeng yfirfærsla frá Wi-Fi til símkerfis"</string>
@@ -1538,6 +1547,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"Skjátextarnir munu líta svona út"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"Sjálfgefið"</string>
+    <string name="color_title" msgid="4258931051732243983">"Litur"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"Sjálfgefið"</string>
     <string name="color_none" msgid="3475640044925814795">"Enginn"</string>
     <string name="color_white" msgid="8045195170201590239">"Hvítur"</string>
@@ -1595,12 +1605,12 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"<xliff:g id="REMAIN">%1$s</xliff:g> eftir"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> þar til fullri hleðslu er náð"</string>
-    <string name="power_discharging_duration" msgid="7125493014448497620">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – u.þ.b. <xliff:g id="TIME">%2$s</xliff:g> eftir"</string>
-    <string name="power_charging" msgid="712751285832976915">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – <xliff:g id="STATE">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration" msgid="4802183864773082009">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – <xliff:g id="TIME">%2$s</xliff:g> þar til fullhlaðið"</string>
-    <string name="power_charging_duration_ac" msgid="3611179931297824699">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – <xliff:g id="TIME">%2$s</xliff:g> þar til fullhlaðið með hleðslutæki"</string>
-    <string name="power_charging_duration_usb" msgid="1106605348913397583">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – <xliff:g id="TIME">%2$s</xliff:g> þar til fullhlaðið yfir USB"</string>
-    <string name="power_charging_duration_wireless" msgid="633606920144617227">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – <xliff:g id="TIME">%2$s</xliff:g> þar til fullhlaðið þráðlaust"</string>
+    <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> – u.þ.b. <xliff:g id="TIME">%2$s</xliff:g> eftir"</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> í fulla hleðslu"</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> í fulla hleðslu með hleðslutæki"</string>
+    <string name="power_charging_duration_usb" msgid="182405645340976546">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> í fulla hleðslu í gegnum USB"</string>
+    <string name="power_charging_duration_wireless" msgid="1829295708243159464">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> í fulla hleðslu þráðlaust"</string>
     <string name="power_usage_list_summary" msgid="2409288197839512482">"Notkun frá síðustu fullu hleðslu"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Rafhlöðunotkun frá síðustu hleðslu"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Rafhlöðunotkun frá endurstillingu"</string>
@@ -1617,7 +1627,6 @@
     <string name="awake" msgid="387122265874485088">"Vökutími tækis"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi tími"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi tími"</string>
-    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> – <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Upplýsingar um notkun"</string>
     <string name="details_title" msgid="3792801565213935385">"Notkunarupplýsingar"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Notkunarupplýsingar"</string>
@@ -1689,7 +1698,7 @@
     <string name="battery_saver" msgid="1426682272004907982">"Rafhlöðusparnaður"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Kveikja sjálfkrafa"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Aldrei"</string>
-    <string name="battery_saver_turn_on_automatically_pct" msgid="3033681629861428940">"%1$d%% eftir af rafhlöðunni"</string>
+    <string name="battery_saver_turn_on_automatically_pct" msgid="7536784431655058267">"þegar hleðsla rafhlöðu er %1$s"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Tölfræði vinnsluferla"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Nördaleg tölfræði um opin vinnsluferli"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Minnisnotkun"</string>
@@ -1813,7 +1822,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Byggist á vélbúnaði"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Hugbúnaður eingöngu"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"Skilríki eru ekki í boði fyrir þennan notanda"</string>
-    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Teiknaðu opnunarmynstrið"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Þú þarft að teikna opnunarmynstrið til að staðfesta uppsetningu skilríkja."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Sláðu inn aðgangsorðið fyrir skilríkjageymsluna."</string>
@@ -1843,6 +1851,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"Fela forritsgögn"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Sjálfvirk endurheimt"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Endurheimta vistaðar stillingar og gögn þegar forrit er enduruppsett"</string>
+    <string name="backup_inactive_title" msgid="5355557151569037197">"Afritunarþjónustan er óvirk."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"Tækjastefnan stillti þetta."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Aðgangsorð tölvuafritunar"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Heildarafritun á tölvu er ekki varin sem stendur."</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Snertu til að breyta eða fjarlægja aðgangsorðið fyrir heildarafritun á tölvu"</string>
@@ -1952,7 +1962,11 @@
     <string name="enter_password" msgid="8035706727471334122">"Sláðu inn aðgangsorðið þitt til að ræsa Android"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Sláðu inn PIN-númerið þitt til að ræsa Android"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Teiknaðu opnunarmynstrið til að ræsa Android"</string>
-    <string name="try_again" msgid="4272075051293936921">"Reyndu aftur."</string>
+    <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"Rangt mynstur"</string>
+    <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"Rangt aðgangsorð"</string>
+    <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"Rangt PIN-númer"</string>
+    <string name="checking_decryption" msgid="8287458611802609493">"Athugar…"</string>
+    <string name="starting_android" msgid="8581493237458496835">"Ræsir Android"</string>
     <string name="delete" msgid="4219243412325163003">"Eyða"</string>
     <string name="misc_files" msgid="6720680815969643497">"Ýmsar skrár"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"<xliff:g id="NUMBER">%1$d</xliff:g> valdar af <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -1990,8 +2004,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Nota alltaf skjákort við samsetningu skjámyndar"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"Herma eftir litasviði"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Kveikja á OpenGL-rakningu"</string>
-    <string name="use_nuplayer" msgid="5699257393367904387">"Nota NuPlayer (tilraun)"</string>
-    <string name="use_nuplayer_summary" msgid="1991479067478516714">"Nota NuPlayer í stað AwesomePlayer"</string>
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"Nota AwesomePlayer (úrelt)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"Nota AwesomePlayer til að spila margmiðlunarefni í stað NuPlayer"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"Slökkva á USB-hljóðbeiningu"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"Slökkva á sjálfvirkri beiningu til USB-hljóðtækja"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Sýna mörk í uppsetningu"</string>
@@ -2167,7 +2181,6 @@
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Bæta notanda eða sniði við"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Bæta notanda við"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Takmarkað snið"</string>
-    <string name="user_summary_managed_profile" msgid="7369539529693048111">"Vinnusnið"</string>
     <string name="user_need_lock_message" msgid="2596365678651842785">"Áður en þú getur búið til takmarkað snið þarftu að setja upp skjálás til að vernda forritin þín og persónuleg gögn."</string>
     <string name="user_set_lock_button" msgid="8311219392856626841">"Velja lás"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Ekki uppsett"</string>
@@ -2298,11 +2311,13 @@
     <string name="sim_cellular_data_unavailable_summary" msgid="3654805961942166428">"Snertu til að velja SIM-kort fyrir gögn"</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"Nota þetta alltaf fyrir símtöl"</string>
     <string name="select_sim_for_data" msgid="2366081042162853044">"Veldu SIM-kort fyrir gögn"</string>
+    <string name="data_switch_started" msgid="2040761479817166311">"Skiptir um SIM-kort fyrir gögn, þetta kann að taka allt að mínútu..."</string>
     <string name="select_sim_for_calls" msgid="3503094771801109334">"Hringja með"</string>
     <string name="sim_select_card" msgid="211285163525563293">"Velja SIM-kort"</string>
     <string name="sim_card_number_title" msgid="7845379943474336488">"SIM-kort <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"Ekkert SIM-kort"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"Heiti SIM-korts"</string>
+    <string name="sim_name_hint" msgid="7038643345238968930">"Sláðu inn heiti SIM-korts"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"SIM-kortarauf %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Símafyrirtæki"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Símanúmer"</string>
@@ -2312,7 +2327,6 @@
     <string name="color_purple" msgid="3888532466427762504">"Fjólublár"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"Ekkert SIM-kort í"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"Staða SIM-korts"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"Upplýsingar tengdar SIM-korti"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"Hringja til baka með sjálfgefnu SIM-korti"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"SIM-kort til að hringja með"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Aðrar símtalsstillingar"</string>
@@ -2320,8 +2334,11 @@
     <string name="preferred_network_offload_header" msgid="2321173571529106767">"Slökkva á birtingu netheitis"</string>
     <string name="preferred_network_offload_footer" msgid="5857279426054744020">"„Slökkva á birtingu netheitis“ ver netupplýsingarnar þínar fyrir aðgangi þriðju aðila."</string>
     <string name="preferred_network_offload_popup" msgid="2252915199889604600">"„Slökkva á birtingu netheitis“ kemur í veg fyrir sjálfvirka tengingu við falin net."</string>
+    <string name="sim_signal_strength" msgid="9144010043784767984">"<xliff:g id="DBM">%1$d</xliff:g> dBm <xliff:g id="ASU">%2$d</xliff:g> asu"</string>
+    <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>
+    <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Spyrja í hvert skipti"</string>
     <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>
@@ -2330,22 +2347,22 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Nýleg leit"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Niðurstöður"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi nettenging"</string>
-    <string name="keywords_more_default_sms_app" msgid="2744404159003574745">"sms-skilaboð"</string>
-    <string name="keywords_more_mobile_networks" msgid="7813380887358745769">"farsími símafyrirtæki þráðlaust"</string>
+    <string name="keywords_more_default_sms_app" msgid="895656981962034647">"skilaboð sms textaskilaboð sms-skilaboð"</string>
+    <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"farsími farsímakerfi símafyrirtæki þráðlaust gögn 4g 3g 2g lte"</string>
     <string name="keywords_home" msgid="3626170808219458848">"ræsiforrit"</string>
     <string name="keywords_display" msgid="6709007669501628320">"skjár snertiskjár"</string>
-    <string name="keywords_display_brightness_level" msgid="8636451602230815191">"dekkja skjár snertiskjár"</string>
-    <string name="keywords_display_auto_brightness" msgid="8070218600502753102">"dekkja skjár snertiskjár"</string>
-    <string name="keywords_display_wallpaper" msgid="4315466287469834939">"bakgrunnur"</string>
+    <string name="keywords_display_brightness_level" msgid="8923289340474728990">"myrkva skjár snertiskjár rafhlaða"</string>
+    <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"myrkva skjár snertiskjár rafhlaða"</string>
+    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"bakgrunnur sérsníða sérstilla skjár"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"textastærð"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"verkefni"</string>
-    <string name="keywords_storage" msgid="7007275853993419928">"rými pláss diskur harður diskur"</string>
-    <string name="keywords_battery" msgid="3992479295298655138">"orka"</string>
-    <string name="keywords_spell_checker" msgid="4509482591225399210">"stafsetning"</string>
+    <string name="keywords_storage" msgid="6572905220031852173">"pláss harður diskur drif tæki notkun"</string>
+    <string name="keywords_battery" msgid="2096185085932675704">"orka notkun hleðsla"</string>
+    <string name="keywords_spell_checker" msgid="6106749039734174140">"stafsetning orðabók ritvilluleit sjálfvirk leiðrétting"</string>
     <string name="keywords_voice_input" msgid="3519547605812413860">"talgreinir inntak tal tala tungumál handfrjálst talkennsl raddkennsl dónalegt orð hljóð ferill bluetooth höfuðtól"</string>
-    <string name="keywords_text_to_speech_output" msgid="8207889472282225512">"tíðni hraði tungumál sjálfgefið tala tal"</string>
-    <string name="keywords_date_and_time" msgid="7666950126499155141">"klukka"</string>
-    <string name="keywords_factory_data_reset" msgid="3693730656843989732">"þurrka út eyða"</string>
+    <string name="keywords_text_to_speech_output" msgid="392447904221657930">"hraði tungumál sjálfgefið tala tal talgervill aðgengi lesari blint"</string>
+    <string name="keywords_date_and_time" msgid="2631808108134830066">"klukka tími"</string>
+    <string name="keywords_factory_data_reset" msgid="4355133848707691977">"þurrka eyða endurheimta hreinsa Ffjarlægja"</string>
     <string name="keywords_printing" msgid="1701778563617114846">"prentari"</string>
     <string name="keywords_sounds_and_notifications" msgid="5965996187974887000">"hátalari hljóðmerki"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="2912933812460077912">"ekki trufla ónáðið ekki truflun hlé pása"</string>
@@ -2354,7 +2371,7 @@
     <string name="keywords_location_mode" msgid="8584992704568356084">"nákvæmni"</string>
     <string name="keywords_accounts" msgid="1957925565953357627">"reikningur"</string>
     <string name="keywords_users" msgid="4673901601478559100">"takmörkun takmarka takmarkað"</string>
-    <string name="keywords_keyboard_and_ime" msgid="1103378692379215672">"textaleiðrétting leiðrétta hljóð titringur sjálfvirkt tungumál bending tillaga þema móðgandi orð skrifa emoji"</string>
+    <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"texti leiðrétting leiðrétta hljóð titringur sjálfvirkt tungumál bending stinga upp á tillaga þema móðgandi orð skrifa emoji alþjóðlegt"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"renna aðgangsorð mynstur pin-númer"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Setja upp Wi-Fi NFC-merki"</string>
     <string name="write_tag" msgid="8571858602896222537">"Skrifa"</string>
@@ -2371,7 +2388,6 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Hljóðstyrkur tilkynninga"</string>
     <string name="zen_mode_settings_title" msgid="7014915558669122902">"Truflun"</string>
     <string name="zen_mode_option_title" msgid="5061978632306007914">"Þegar símtöl og tilkynningar berast"</string>
-    <string name="zen_mode_option_title_novoice" msgid="6680706009915204785">"Þegar tilkynningar berast"</string>
     <string name="zen_mode_option_off" msgid="3167702608910820883">"Trufla alltaf"</string>
     <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Leyfa aðeins forgangstruflanir"</string>
     <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Ekki trufla"</string>
@@ -2429,14 +2445,17 @@
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Lokið"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Þar til þú slekkur á þessu"</string>
     <string name="zen_mode_important_category" msgid="8123274463331022993">"Forgangstruflanir"</string>
-    <string name="zen_mode_downtime_category" msgid="4730179065426038108">"Niðritími (aðeins forgangstruflanir)"</string>
+    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Niðritími"</string>
     <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Dagar"</string>
     <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Engir"</string>
+    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Truflun leyfð"</string>
+    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Aðeins forgangur"</string>
+    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Enginn"</string>
     <string name="zen_mode_automation_category" msgid="4653551005950835761">"Sjálfvirkni"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Kveikja sjálfkrafa"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Aldrei"</string>
-    <string name="zen_mode_phone_calls" msgid="8956214416859303966">"Símtöl"</string>
+    <string name="zen_mode_calls" msgid="7051492091133751208">"Símtöl"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Skilaboð"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Símtöl/skilaboð frá"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Öllum"</string>
@@ -2450,7 +2469,9 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Á virkum kvöldum"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Upphafstími"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Lokatími"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> næsta dag"</string>
+    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> næsta dag"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> eða við vekjara áður"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> næsta dag eða við vekjara áður"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Forritatilkynningar"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Tilkynningastillingar"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Senda ábendingar um þetta tæki"</string>
@@ -2458,7 +2479,11 @@
     <string name="switch_on_text" msgid="1124106706920572386">"Kveikt"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Slökkt"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"Skjáfesting"</string>
-    <string name="screen_pinning_description" msgid="7091642350452605379">"Þegar kveikt er á skjáfestingu er hægt að nota hana til að halda einni skjámynd opinni þar til þú tekur festinguna af.\n\nTil að nota skjáfestingu:\n\n1. Gakktu úr skugga um að kveikt sé á skjáfestingu.\n\n2. Opnaðu skjámyndina sem þú vilt festa.\n\n3. Snertu Yfirlit.\n\n4. Snertu prjónstáknið."</string>
+    <string name="screen_pinning_description" msgid="1137904524037468263">"Þegar kveikt er á þessari stillingu geturðu notað skjáfestingu til að hafa núverandi skjá opinn þangað til þú losar.\n\nTil að nota skjáfestingu:\n\n1. Gakktu úr skugga um að kveikt sé á skjáfestingu.\n\n2. Opnaðu skjáinn sem þú vilt festa.\n\n3. Snertu Yfirlit.\n\n4. Strjúktu upp og snertu svo festingartáknið."</string>
+    <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Biðja um opnunarmynstur til að losa"</string>
+    <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Biðja um PIN-númer til að losa"</string>
+    <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Biðja um aðgangsorð til að losa"</string>
+    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Læsa tækinu við losun"</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Vinnusnið"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Tilraun)"</string>
     <string name="display_auto_rotate_title" msgid="6176450657107806043">"Þegar tækinu er snúið"</string>
@@ -2467,7 +2492,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Halda langsniði"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Halda þessari stefnu"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI-upplýsingar"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI-tengdar upplýsingar"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Dulkóðun"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Halda áfram"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"Þú getur verndað þetta tæki betur með því að krefjast PIN-númers fyrir ræsingu. Áður en tækið er ræst getur það ekki tekið á móti símtölum, skilaboðum eða tilkynningum, þar á meðal vekjurum. \n\nÞetta eykur gagnavernd í týndum eða stolnum tækjum."</string>
@@ -2485,4 +2509,7 @@
     <string name="encrypt_talkback_dialog_message_pin" msgid="1890374082842868489">"Þegar þú slærð inn PIN-númerið þitt til að ræsa þetta tæki verður aðgengisþjónusta á borð við <xliff:g id="SERVICE">%1$s</xliff:g> ekki strax í boði."</string>
     <string name="encrypt_talkback_dialog_message_pattern" msgid="4474332516537386384">"Þegar þú teiknar mynstrið þitt til að ræsa þetta tæki verður aðgengisþjónusta á borð við <xliff:g id="SERVICE">%1$s</xliff:g> ekki strax í boði."</string>
     <string name="encrypt_talkback_dialog_message_password" msgid="8166099418487083927">"Þegar þú slærð inn aðgangsorðið þitt til að ræsa þetta tæki verður aðgengisþjónusta á borð við <xliff:g id="SERVICE">%1$s</xliff:g> ekki strax í boði."</string>
+    <string name="imei_information_title" msgid="8499085421609752290">"IMEI-upplýsingar"</string>
+    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI-tengdar upplýsingar"</string>
+    <string name="slot_number" msgid="3762676044904653577">"(Rauf<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-it/arrays.xml b/res/values-it/arrays.xml
index 51e5bf6..bf4ae9d 100644
--- a/res/values-it/arrays.xml
+++ b/res/values-it/arrays.xml
@@ -527,4 +527,12 @@
     <item msgid="4338089220026248848">"Memorizzata nella cache (client attività)"</item>
     <item msgid="6652164677254579050">"Memorizzata nella cache (vuoto)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Verde acqua"</item>
+    <item msgid="8332294763632946560">"Blu"</item>
+    <item msgid="2023216417616991392">"Indaco"</item>
+    <item msgid="3170497246594232819">"Viola"</item>
+    <item msgid="4608643045752965568">"Rosa"</item>
+    <item msgid="6131821495505931173">"Rosso"</item>
+  </string-array>
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 82df351..5f5f9e8 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>
@@ -180,7 +180,6 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s desidera accedere ai tuoi messaggi. Dare accesso a %2$s?"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Data e ora"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Scegli il fuso orario"</string>
-    <string name="normal_date_format" msgid="7636406984925498359">"Regionale (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Anteprima:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Dimensioni carattere:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -291,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>
@@ -322,8 +321,6 @@
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Seleziona fuso orario"</string>
     <string name="date_time_set_date_title" msgid="6928286765325608604">"Data"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"Imposta data"</string>
-    <string name="date_time_date_format_title" msgid="3976171711988766411">"Formato di data"</string>
-    <string name="date_time_date_format" msgid="6951498879879281102">"Scegli il formato della data"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Ordine alfabetico"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Ordina per fuso orario"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Data"</string>
@@ -372,7 +369,8 @@
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Attendi il termine della crittografia del telefono. <xliff:g id="PERCENT">^1</xliff:g>% completato."</string>
     <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Attendi che il tablet venga crittografato. Tempo rimanente: <xliff:g id="DURATION">^1</xliff:g>"</string>
     <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Attendi che il telefono venga crittografato. Tempo rimanente: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Riprova tra <xliff:g id="DELAY">^1</xliff:g> secondi."</string>
+    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"Per sbloccare il tablet, spegnilo e accendilo."</string>
+    <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"Per sbloccare il telefono, spegnilo e accendilo."</string>
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"Avviso. I dati del dispositivo verranno cancellati dopo altri <xliff:g id="COUNT">^1</xliff:g> tentativi di sblocco non riusciti."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Digita la password"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Crittografia non riuscita"</string>
@@ -401,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>
@@ -412,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>
@@ -556,13 +556,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Come vivavoce"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Per musica e audio media"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Ricorda impostazioni"</string>
-    <string name="wifi_assistant_intro_setup" msgid="4605105515416995110">"Il nuovo\nWiFi Assistant"</string>
-    <string name="wifi_assistant_no_thanks" msgid="2776983751990143934">"NO, GRAZIE"</string>
-    <string name="wifi_assistant_setup" msgid="3772423650475730906">"IMPOSTA"</string>
-    <string name="wifi_assistant_card_message" msgid="107811647784658536">"Connetti automaticamente alle reti disponibili con un assistente Wi-Fi."</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Assistente Wi‑Fi"</string>
-    <string name="wifi_assistant_title_message" msgid="6240721017579074015">"<xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> ti connette automaticamente alla migliore rete Wi‑Fi disponibile"</string>
-    <string name="wifi_assistant_open_app" msgid="4803044899535675063">"APRI APP"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Connesso tramite assistente Wi‑Fi"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"Trasmetti schermo"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Attiva display wireless"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Nessun dispositivo Bluetooth vicino."</string>
@@ -592,7 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Impostazioni Wi‑Fi"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Configura e gestisci punti di accesso wireless"</string>
-    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Seleziona Wi‑Fi"</string>
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Seleziona rete Wi‑Fi"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Seleziona Wi-Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Attivazione Wi‑Fi…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Disattivazione Wi‑Fi…"</string>
@@ -607,8 +602,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"Scansione sempre disponibile"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Consenti sempre la scansione"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Consenti al servizio di geolocalizzazione di Google e ad altre app di eseguire la scansione delle reti, anche quando il Wi-Fi non è attivo"</string>
-    <string name="wifi_automatically_manage_title" msgid="6249976570008992746">"Gestisci automaticamente Wi-Fi"</string>
-    <string name="wifi_automatically_manage_summary" msgid="6952470763378312488">"Delega a <xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> la gestione della connessione Wi‑Fi"</string>
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Utilizza automaticamente Wi‑Fi aperto"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Consenti a un assistente Wi‑Fi di connettersi automaticamente alle reti aperte di alta qualità"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Seleziona assistente"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Installa certificati"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Per una maggiore precisione nella localizzazione e altri motivi, Google e altre app sono in grado di cercare reti nelle vicinanze, anche quando la connessione Wi-Fi è disattivata. Se non desideri consentire tale ricerca, accedi ad Avanzate &gt; Scansione sempre disponibile."</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Le app possono cercare reti nelle vicinanze, anche quando la connessione Wi-Fi è disattivata. Se non desideri consentire tale ricerca, accedi ad Advanzate &gt; Scansione sempre disponibile."</string>
@@ -629,6 +625,7 @@
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Scansione"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Avanzate"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Connetti alla rete"</string>
+    <string name="wifi_menu_remember" msgid="8814185749388713796">"Memorizza rete"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Elimina rete"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Modifica rete"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Scrivi su tag NFC"</string>
@@ -673,9 +670,11 @@
     <string name="wifi_unspecified" msgid="5431501214192991253">"(non specificati)"</string>
     <string name="wifi_remembered" msgid="4955746899347821096">"Salvata"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"Disattivata"</string>
-    <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Connessione Internet debole evitata"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"Errore configurazione IP"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Errore connessione Wi-Fi"</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Problema di autenticazione"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Fuori portata"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Nessun accesso a Internet rilevato, non verrà eseguita la riconnessione automatica."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS disponibile"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS disponibile)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Inserisci la password di rete"</string>
@@ -699,9 +698,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"AVVISO. Se non attivi il Wi‑Fi, il tablet utilizzerà solo la rete dati per gli aggiornamenti e i download iniziali. Per evitare possibili costi per i dati, connettiti al Wi‑Fi."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"AVVISO. Se non attivi il Wi‑Fi, il dispositivo utilizzerà solo la rete dati per gli aggiornamenti e i download iniziali. Per evitare possibili costi per i dati, connettiti al Wi‑Fi."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"AVVISO. Se non attivi il Wi‑Fi, il telefono utilizzerà solo la rete dati per gli aggiornamenti e i download iniziali. Per evitare possibili costi per i dati, connettiti al Wi‑Fi."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="2393880108322835846">"AVVISO: Se non attivi il Wi‑Fi, il tablet non avrà una connessione a Internet da utilizzare per eventuali aggiornamenti o download iniziali."</string>
-    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1707391993265558787">"AVVISO. Se non attivi il Wi‑Fi, il dispositivo non avrà una connessione a Internet da utilizzare per eventuali aggiornamenti o download iniziali."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="1556858507920033022">"AVVISO. Se non attivi il Wi‑Fi, il telefono non avrà una connessione a Internet da utilizzare per eventuali aggiornamenti o download iniziali."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Se salti il Wi‑Fi:\n\nIl tuo tablet non avrà una connessione Internet.\n\nNon riceverai aggiornamenti software fino alla connessione a Internet.\n\nAl momento non puoi attivare le funzioni di protezione del dispositivo."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Se salti il Wi‑Fi:\n\nIl dispositivo non avrà una connessione Internet.\n\nNon riceverai aggiornamenti software fino alla connessione a Internet.\n\nAl momento non puoi attivare le funzioni di protezione del dispositivo."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Se salti il Wi‑Fi:\n\nIl telefono non avrà una connessione Internet.\n\nNon riceverai aggiornamenti software fino alla connessione a Internet.\n\nAl momento non puoi attivare le funzioni di protezione del dispositivo."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Impossibile collegare il tablet alla rete Wi‑Fi."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"Impossibile stabilire una connessione tra il dispositivo e la rete Wi-Fi."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Impossibile collegare il telefono alla rete Wi‑Fi."</string>
@@ -761,7 +760,6 @@
     <string name="ring_volume_title" msgid="7938706566797464165">"Volume suoneria"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibra in modalità silenziosa"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Suono di notifica predefinito"</string>
-    <string name="heads_up_enabled_title" msgid="1031078221910921622">"Notif. popup per alta priorità"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Suoneria"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Notifica"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Usa volume chiamate in entrata per le notifiche"</string>
@@ -834,7 +832,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Luminosità automatica"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Solleva per riattivare"</string>
     <string name="doze_title" msgid="2259176504273878294">"Display Ambient"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"Riattiva lo schermo al sollevamento del dispositivo o all\'arrivo di notifiche"</string>
+    <string name="doze_summary" msgid="7128970177894383698">"Riattiva schermo quando sollevi il dispositivo o ricevi notifiche"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Dimensioni carattere"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Dimensioni carattere"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Impostazioni blocco SIM"</string>
@@ -862,6 +860,10 @@
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Annulla"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"Trovate più SIM"</string>
     <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 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>
@@ -1012,6 +1014,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Questa operazione cancellerà tutti i dati memorizzati nell\'"<b>"archivio interno"</b>" del tablet, compresi:\n\n"<li>"Il tuo account Google"</li>\n<li>"Dati e impostazioni del sistema e delle applicazioni"</li>\n<li>"Applicazioni scaricate"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Questa operazione cancellerà tutti i dati memorizzati nell\'"<b>"archivio interno"</b>" del telefono, compresi:\n\n"<li>"Il tuo account Google"</li>\n<li>"Dati e impostazioni del sistema e delle applicazioni"</li>\n<li>"Applicazioni scaricate"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Al momento sei collegato ai seguenti account:\n"</string>
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Sono presenti altri utenti su questo dispositivo.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musica"</li>\n<li>"Foto"</li>\n<li>"Altri dati utente"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Per cancellare musica, foto e altri dati dell\'utente, è necessario cancellare i dati dell\'"<b>"archivio USB"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Per cancellare musica, foto e altri dati dell\'utente, è necessario cancellare i dati della "<b>"scheda SD"</b>"."</string>
@@ -1023,7 +1026,6 @@
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Ripristina telefono"</string>
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Cancellare tutti i dati personali e le applicazioni scaricate? Questa azione è irreversibile."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Cancella tutto"</string>
-    <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Inserisci la sequenza di sblocco"</string>
     <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Per confermare un ripristino dati di fabbrica occorre inserire la sequenza di sblocco."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Nessun ripristino eseguito perché il servizio System Clear non è disponibile."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Reimpostare?"</string>
@@ -1041,7 +1043,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"Cancellare l\'archivio USB, eliminando tutti i file memorizzati al suo interno? Questa azione è irreversibile."</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Cancellare la scheda SD, eliminando tutti i file memorizzati al suo interno? Questa azione è irreversibile."</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Cancella tutto"</string>
-    <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Inserisci la sequenza di sblocco"</string>
     <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Devi inserire la sequenza di sblocco per confermare che desideri cancellare l\'archivio USB."</string>
     <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Devi inserire la sequenza di sblocco per confermare che desideri cancellare la scheda SD."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Impostazioni chiamate"</string>
@@ -1087,6 +1088,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Inserisci la scheda SIM e riavvia"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Connettiti a Internet"</string>
     <string name="location_title" msgid="1029961368397484576">"La mia posizione"</string>
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Profilo di lavoro"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Posizione per profilo di lavoro"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Disattivata dalla tua azienda"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Modalità"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Alta precisione"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Basso consumo"</string>
@@ -1124,6 +1128,7 @@
     <string name="copyright_title" msgid="865906688917260647">"Copyright"</string>
     <string name="license_title" msgid="1990487604356037871">"Licenza"</string>
     <string name="terms_title" msgid="7697580845616764642">"Termini e condizioni"</string>
+    <string name="webview_license_title" msgid="2813507464175738967">"Licenza di sistema per WebView"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Sfondi"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Fornitori di immagini satellitari:\n©2014 CNES/Astrium, DigitalGlobe, Bluesky"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Licenze open source"</string>
@@ -1237,7 +1242,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Archivio USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Scheda SD"</string>
     <string name="disabled" msgid="9206776641295849915">"Disattivato"</string>
-    <string name="not_installed" msgid="1475144352069281880">"Non installata"</string>
+    <string name="not_installed" msgid="2797554494953450291">"Non installata per l\'utente"</string>
     <string name="no_applications" msgid="7336588977497084921">"Nessuna applicazione."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Archivio interno"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Archivio USB"</string>
@@ -1434,8 +1439,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Lo schermo non va mai in stand-by se sotto carica"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Attiva log di esame HCI Bluetooth"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Acquisisci tutti i pacchetti HCI Bluetooth in un file"</string>
-    <string name="oem_unlock_enable" msgid="6629321276287913315">"Attiva sblocco costruttore"</string>
-    <string name="oem_unlock_enable_summary" msgid="3546686263996628110">"Consenti sblocco dispositivo dal costruttore"</string>
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"Sblocco OEM"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Consenti lo sblocco del bootloader"</string>
+    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Inserisci il PIN"</string>
+    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Inserisci il PIN del dispositivo per attivare lo sblocco OEM"</string>
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Consentire lo sblocco OEM?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"AVVISO. Le funzioni di protezione del dispositivo non funzionano su questo dispositivo se questa impostazione è attiva."</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Certificazione display wireless"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Attiva registrazione dettagliata Wi-Fi"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Wi‑Fi aggressivo per passaggio a cellulare"</string>
@@ -1538,6 +1547,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"I sottotitoli verranno visualizzati così"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"Predefinita"</string>
+    <string name="color_title" msgid="4258931051732243983">"Colore"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"Predefinito"</string>
     <string name="color_none" msgid="3475640044925814795">"Nessuno"</string>
     <string name="color_white" msgid="8045195170201590239">"Bianco"</string>
@@ -1595,12 +1605,12 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"<xliff:g id="REMAIN">%1$s</xliff:g> rimanenti"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> alla ricarica"</string>
-    <string name="power_discharging_duration" msgid="7125493014448497620">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - circa <xliff:g id="TIME">%2$s</xliff:g> rimanente"</string>
-    <string name="power_charging" msgid="712751285832976915">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="STATE">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration" msgid="4802183864773082009">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> alla carica completa"</string>
-    <string name="power_charging_duration_ac" msgid="3611179931297824699">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> alla carica completa con CA"</string>
-    <string name="power_charging_duration_usb" msgid="1106605348913397583">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> alla carica completa tramite USB"</string>
-    <string name="power_charging_duration_wireless" msgid="633606920144617227">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> alla carica completa con wireless"</string>
+    <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> - circa. <xliff:g id="TIME">%2$s</xliff:g> rimanente"</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> alla carica completa"</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> alla carica completa tramite CA"</string>
+    <string name="power_charging_duration_usb" msgid="182405645340976546">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> alla carica completa tramite USB"</string>
+    <string name="power_charging_duration_wireless" msgid="1829295708243159464">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> lla carica completa con wireless"</string>
     <string name="power_usage_list_summary" msgid="2409288197839512482">"Utilizzo dall\'ultima ricarica completa"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Utilizzo batteria dallo scollegamento"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Utilizzo batteria dal ripristino"</string>
@@ -1617,7 +1627,6 @@
     <string name="awake" msgid="387122265874485088">"Tempo di attività dispositivo"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Tempo accensione Wi‑Fi"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Tempo accensione Wi‑Fi"</string>
-    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Dettagli cronologia"</string>
     <string name="details_title" msgid="3792801565213935385">"Dettagli di utilizzo"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Dettagli di utilizzo"</string>
@@ -1689,7 +1698,7 @@
     <string name="battery_saver" msgid="1426682272004907982">"Risparmio batteria"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Attiva automaticamente"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Mai"</string>
-    <string name="battery_saver_turn_on_automatically_pct" msgid="3033681629861428940">"con batteria %1$d%%"</string>
+    <string name="battery_saver_turn_on_automatically_pct" msgid="7536784431655058267">"al %1$s di batteria"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Statistiche sui processi"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Statistiche tecniche sui processi in esecuzione"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Memoria usata"</string>
@@ -1813,7 +1822,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Basato sull\'hardware"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Solo software"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"Le credenziali non sono disponibili per questo utente"</string>
-    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Inserisci la sequenza di sblocco"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Per confermare l\'installazione delle credenziali devi inserire la sequenza di sblocco."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Digita la password per l\'archivio credenziali."</string>
@@ -1843,6 +1851,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"Includi dati app"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Ripristino automatico"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"In caso di reinstallazione di un\'applicazione, ripristina impostazioni e dati di backup"</string>
+    <string name="backup_inactive_title" msgid="5355557151569037197">"Il servizio di backup non è attivo."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"Viene impostato in base alla norma del dispositivo."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Password di backup desktop"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"I backup desktop completi non sono attualmente protetti."</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Tocca per modificare o rimuovere la password per i backup desktop completi"</string>
@@ -1952,7 +1962,11 @@
     <string name="enter_password" msgid="8035706727471334122">"Per avviare Android, inserisci la password"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Per avviare Android, inserisci il PIN"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Per avviare Android, traccia la tua sequenza"</string>
-    <string name="try_again" msgid="4272075051293936921">"Riprova."</string>
+    <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"Sequenza sbagliata"</string>
+    <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"Password sbagliata"</string>
+    <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"PIN errato"</string>
+    <string name="checking_decryption" msgid="8287458611802609493">"Verifica…"</string>
+    <string name="starting_android" msgid="8581493237458496835">"Avvio di Android in corso"</string>
     <string name="delete" msgid="4219243412325163003">"Elimina"</string>
     <string name="misc_files" msgid="6720680815969643497">"File vari"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"selezionati <xliff:g id="NUMBER">%1$d</xliff:g> di <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -1990,8 +2004,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Usa sempre GPU per la composizione dello schermo"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"Simula spazio colore"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Attiva tracce OpenGL"</string>
-    <string name="use_nuplayer" msgid="5699257393367904387">"Usa NuPlayer (sperimentale)"</string>
-    <string name="use_nuplayer_summary" msgid="1991479067478516714">"Usa NuPlayer invece di AwesomePlayer"</string>
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"Usa AwesomePlayer (opzione obsoleta)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"Usa AwesomePlayer invece di NuPlayer per la maggior parte della riproduzione di elementi multimediali"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"Disattiva routing audio USB"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"Disattiva routing automatico a periferiche audio USB"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Mostra limiti di layout"</string>
@@ -2167,7 +2181,6 @@
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Aggiungi utente o profilo"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Aggiungi utente"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Profilo con limitazioni"</string>
-    <string name="user_summary_managed_profile" msgid="7369539529693048111">"Profilo di lavoro"</string>
     <string name="user_need_lock_message" msgid="2596365678651842785">"Prima di poter creare un profilo con limitazioni, devi impostare un blocco schermo per proteggere le tue app e i tuoi dati personali."</string>
     <string name="user_set_lock_button" msgid="8311219392856626841">"Imposta blocco"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Non configurato"</string>
@@ -2298,11 +2311,13 @@
     <string name="sim_cellular_data_unavailable_summary" msgid="3654805961942166428">"Tocca per selezionare una SIM dati"</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"Usa sempre questa per chiamare"</string>
     <string name="select_sim_for_data" msgid="2366081042162853044">"Seleziona una SIM per i dati"</string>
+    <string name="data_switch_started" msgid="2040761479817166311">"Passaggio a un\'altra SIM dati in corso. L\'operazione potrebbe richiedere un minuto."</string>
     <string name="select_sim_for_calls" msgid="3503094771801109334">"Chiama con"</string>
     <string name="sim_select_card" msgid="211285163525563293">"Seleziona una scheda SIM"</string>
     <string name="sim_card_number_title" msgid="7845379943474336488">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"SIM vuota"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"Nome SIM"</string>
+    <string name="sim_name_hint" msgid="7038643345238968930">"Inserisci il nome della SIM"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"Slot della SIM %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Operatore"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Numero"</string>
@@ -2312,7 +2327,6 @@
     <string name="color_purple" msgid="3888532466427762504">"Viola"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"Nessuna scheda SIM inserita"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"Stato SIM"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"Informazioni relative alla SIM"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"Richiama da SIM predefinita"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"SIM per chiamate in uscita"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Altre impostazioni chiamate"</string>
@@ -2320,8 +2334,11 @@
     <string name="preferred_network_offload_header" msgid="2321173571529106767">"Disattiva tras. nome rete"</string>
     <string name="preferred_network_offload_footer" msgid="5857279426054744020">"Disattiva la trasm. del nome di rete per impedire a terze parti di accedere a informazioni di rete."</string>
     <string name="preferred_network_offload_popup" msgid="2252915199889604600">"Disattiva la trasmissione del nome di rete per impedire la connessione automatica a reti nascoste."</string>
+    <string name="sim_signal_strength" msgid="9144010043784767984">"<xliff:g id="DBM">%1$d</xliff:g> dBm <xliff:g id="ASU">%2$d</xliff:g> asu"</string>
+    <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>
+    <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Chiedi ogni volta"</string>
     <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>
@@ -2330,22 +2347,22 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Ricerche recenti"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Risultati"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi connessione rete Wi-Fi"</string>
-    <string name="keywords_more_default_sms_app" msgid="2744404159003574745">"SMS"</string>
-    <string name="keywords_more_mobile_networks" msgid="7813380887358745769">"cellulare cella operatore wireless"</string>
+    <string name="keywords_more_default_sms_app" msgid="895656981962034647">"SMS invio di messaggi messaggi"</string>
+    <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"cellulare cell operatore wireless dati 4g 3g 2g lte"</string>
     <string name="keywords_home" msgid="3626170808219458848">"Avvio applicazioni"</string>
     <string name="keywords_display" msgid="6709007669501628320">"display touchscreen"</string>
-    <string name="keywords_display_brightness_level" msgid="8636451602230815191">"oscura display touchscreen"</string>
-    <string name="keywords_display_auto_brightness" msgid="8070218600502753102">"oscura display touchscreen"</string>
-    <string name="keywords_display_wallpaper" msgid="4315466287469834939">"sfondo"</string>
+    <string name="keywords_display_brightness_level" msgid="8923289340474728990">"attenuazione schermo touchscreen batteria"</string>
+    <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"attenuazione schermo touchscreen batteria"</string>
+    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"sfondo personalizzare personalizzazione display"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"dimensioni testo"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"progetto"</string>
-    <string name="keywords_storage" msgid="7007275853993419928">"spazio unità disco rigido"</string>
-    <string name="keywords_battery" msgid="3992479295298655138">"potenza"</string>
-    <string name="keywords_spell_checker" msgid="4509482591225399210">"controllo ortografico"</string>
+    <string name="keywords_storage" msgid="6572905220031852173">"spazio disco disco rigido dispositivo utilizzo"</string>
+    <string name="keywords_battery" msgid="2096185085932675704">"alimentazione utilizzo ricarica"</string>
+    <string name="keywords_spell_checker" msgid="6106749039734174140">"ortografia dizionario correttore ortografico correzione automatica"</string>
     <string name="keywords_voice_input" msgid="3519547605812413860">"funzione di riconoscimento immissione vocale dire lingua vivavoce viva voce riconoscimento parola offensiva cronologia audio auricolare bluetooth"</string>
-    <string name="keywords_text_to_speech_output" msgid="8207889472282225512">"valutazione lingua predefinita parla parlare"</string>
-    <string name="keywords_date_and_time" msgid="7666950126499155141">"orologio"</string>
-    <string name="keywords_factory_data_reset" msgid="3693730656843989732">"cancella dati"</string>
+    <string name="keywords_text_to_speech_output" msgid="392447904221657930">"velocità lingua predefinita parlare voce tts accessibilità reader non vedenti"</string>
+    <string name="keywords_date_and_time" msgid="2631808108134830066">"orologio 24 ore"</string>
+    <string name="keywords_factory_data_reset" msgid="4355133848707691977">"cancellare eliminare ripristinare annullare rimuovere"</string>
     <string name="keywords_printing" msgid="1701778563617114846">"stampante"</string>
     <string name="keywords_sounds_and_notifications" msgid="5965996187974887000">"bip altoparlante"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="2912933812460077912">"non disturbare interrompi interruzione pausa"</string>
@@ -2354,7 +2371,7 @@
     <string name="keywords_location_mode" msgid="8584992704568356084">"precisione"</string>
     <string name="keywords_accounts" msgid="1957925565953357627">"account"</string>
     <string name="keywords_users" msgid="4673901601478559100">"limitazione limitare limitato"</string>
-    <string name="keywords_keyboard_and_ime" msgid="1103378692379215672">"correzione testo correggi audio vibrazione lingua automatica gesti suggerisci suggerimento tema parola offensiva digita emoji"</string>
+    <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"correzione del testo correggere suono vibrazione lingua automatica gesto suggerire suggerimento tema digitazione parole offensive emoji internazionale"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"scorrimento password sequenza pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Configura tag NFC Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Modifica"</string>
@@ -2371,7 +2388,6 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Volume notifiche"</string>
     <string name="zen_mode_settings_title" msgid="7014915558669122902">"Interruzioni"</string>
     <string name="zen_mode_option_title" msgid="5061978632306007914">"Quando ricevo chiamate e notifiche"</string>
-    <string name="zen_mode_option_title_novoice" msgid="6680706009915204785">"Quando ricevo notifiche"</string>
     <string name="zen_mode_option_off" msgid="3167702608910820883">"Interrompi sempre"</string>
     <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Consenti solo interruzioni con priorità"</string>
     <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Non interrompere"</string>
@@ -2420,7 +2436,7 @@
     <string name="app_notification_block_title" msgid="172237877395761371">"Blocca"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Non mostrare mai notifiche di questa app"</string>
     <string name="app_notification_priority_title" msgid="1967189807102076587">"Priorità"</string>
-    <string name="app_notification_priority_summary" msgid="7513344552201639232">"Mostra le notifiche in cima all\'elenco e continua a riceverle quando il dispositivo è impostato su interruzioni solo per priorità"</string>
+    <string name="app_notification_priority_summary" msgid="7513344552201639232">"Mostra le notifiche in cima all\'elenco e continua a riceverle quando il dispositivo è impostato su interruzioni con priorità"</string>
     <string name="app_notification_sensitive_title" msgid="7707233094233553192">"Riservati"</string>
     <string name="app_notification_sensitive_summary" msgid="2505314249332316395">"Quando il dispositivo è bloccato, nascondi i contenuti riservati dalle notifiche dell\'app"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Bloccate"</string>
@@ -2429,28 +2445,33 @@
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Fine"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Fino alla disattivazione"</string>
     <string name="zen_mode_important_category" msgid="8123274463331022993">"Interruzioni con priorità"</string>
-    <string name="zen_mode_downtime_category" msgid="4730179065426038108">"Tempo di inattività (solo interruzioni con priorità)"</string>
+    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Tempo di inattività"</string>
     <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Giorni"</string>
     <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Nessuno"</string>
+    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Interruzioni consentite"</string>
+    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Solo con priorità"</string>
+    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Nessuno"</string>
     <string name="zen_mode_automation_category" msgid="4653551005950835761">"Automazione"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Attiva automaticamente"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Mai"</string>
-    <string name="zen_mode_phone_calls" msgid="8956214416859303966">"Chiamate"</string>
+    <string name="zen_mode_calls" msgid="7051492091133751208">"Chiamate"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Messaggi"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Chiamate/messaggi da"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Chiunque"</string>
     <string name="zen_mode_from_contacts" msgid="8751503728985572786">"Solo contatti"</string>
     <string name="zen_mode_from_starred" msgid="2168651127340381533">"Solo contatti Speciali"</string>
     <string name="zen_mode_events" msgid="2456995649835437565">"Eventi e promemoria"</string>
-    <string name="zen_mode_alarm_info" msgid="3195430795475795398">"Gli avvisi sono sempre interruzioni di priorità"</string>
+    <string name="zen_mode_alarm_info" msgid="3195430795475795398">"Le sveglie sono sempre interruzioni con priorità"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Attiva automaticam."</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Mai"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Ogni notte"</string>
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Sere giorni feriali"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Ora di inizio"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Ora di fine"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> giorno successivo"</string>
+    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> giorno successivo"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> o qualsiasi sveglia precedente"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> giorno successivo o qualsiasi sveglia precedente"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Notifiche app"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Impostazioni di notifica"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Invia feedback sul dispositivo"</string>
@@ -2458,7 +2479,11 @@
     <string name="switch_on_text" msgid="1124106706920572386">"Attivo"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Non attivo"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"Blocco su schermo"</string>
-    <string name="screen_pinning_description" msgid="7091642350452605379">"Quando è attivo, puoi utilizzare il blocco su schermo per tenere visibile la schermata corrente finché la sblocchi.\n\nPer utilizzare il blocco su schermo, procedi nel seguente modo:\n\n1. Assicurati che il blocco su schermo sia attivo.\n\n2. Apri la schermata che desideri bloccare.\n\n3. Tocca Panoramica.\n\n4. Tocca l\'icona di blocco."</string>
+    <string name="screen_pinning_description" msgid="1137904524037468263">"Quando l\'impostazione è attiva, puoi utilizzare il blocco su schermo per lasciare visibile la schermata corrente finché la sblocchi.\n\nPer utilizzare la funzione:\n\n1. Assicurati che il blocco su schermo sia attivo.\n\n2. Apri la schermata da bloccare.\n\n3. Tocca Panoramica.\n\n4. Scorri in alto e tocca l\'icona di blocco."</string>
+    <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Richiedi sequenza di sblocco prima di sbloccare"</string>
+    <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Richiedi il PIN prima di sbloccare"</string>
+    <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Richiedi password prima di sbloccare"</string>
+    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Blocca dispositivo per sblocco"</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Profilo di lavoro"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Sperimentale)"</string>
     <string name="display_auto_rotate_title" msgid="6176450657107806043">"Quando il dispositivo viene ruotato"</string>
@@ -2467,7 +2492,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Rimani in visualizzazione orizzontale"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Rimani in orientamento corrente"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"Dati IMEI"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"Dati relativi all\'IMEI"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Crittografia"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Continua"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"Puoi proteggere ulteriormente il dispositivo attivando la richiesta del PIN prima dell\'avvio. Fino all\'avvio, il dispositivo non può ricevere chiamate, messaggi o notifiche, inclusi allarmi. \n\nIn questo modo puoi proteggere i dati su dispositivi persi o rubati."</string>
@@ -2485,4 +2509,7 @@
     <string name="encrypt_talkback_dialog_message_pin" msgid="1890374082842868489">"Quando inserisci il tuo codice PIN per avviare questo dispositivo, i servizi di accessibilità quali <xliff:g id="SERVICE">%1$s</xliff:g> non saranno ancora disponibili."</string>
     <string name="encrypt_talkback_dialog_message_pattern" msgid="4474332516537386384">"Quando inserisci un pattern per avviare questo dispositivo, i servizi di accessibilità quali <xliff:g id="SERVICE">%1$s</xliff:g> non saranno ancora disponibili."</string>
     <string name="encrypt_talkback_dialog_message_password" msgid="8166099418487083927">"Quando inserisci una password per avviare questo dispositivo, i servizi di accessibilità quali <xliff:g id="SERVICE">%1$s</xliff:g> non saranno ancora disponibili."</string>
+    <string name="imei_information_title" msgid="8499085421609752290">"Dati IMEI"</string>
+    <string name="imei_information_summary" msgid="2074095606556565233">"Dati relativi all\'IMEI"</string>
+    <string name="slot_number" msgid="3762676044904653577">"(Slot <xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-iw/arrays.xml b/res/values-iw/arrays.xml
index 4907eee..de3f45d 100644
--- a/res/values-iw/arrays.xml
+++ b/res/values-iw/arrays.xml
@@ -527,4 +527,12 @@
     <item msgid="4338089220026248848">"בקובץ שמור (לקוח פעילות)"</item>
     <item msgid="6652164677254579050">"בקובץ שמור (ריק)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"כחול-ירקרק"</item>
+    <item msgid="8332294763632946560">"כחול"</item>
+    <item msgid="2023216417616991392">"כחול כהה"</item>
+    <item msgid="3170497246594232819">"סגול"</item>
+    <item msgid="4608643045752965568">"ורוד"</item>
+    <item msgid="6131821495505931173">"אדום"</item>
+  </string-array>
 </resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 1e080d6..1aa867a 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>
@@ -180,7 +180,6 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"‏%1$s רוצה לגשת להודעות שלך. להעניק גישה ל-%2$s?"</string>
     <string name="date_and_time" msgid="9062980487860757694">"תאריך ושעה"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"בחר אזור זמן"</string>
-    <string name="normal_date_format" msgid="7636406984925498359">"אזורי (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"תצוגה מקדימה:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"גודל גופן:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -291,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>
@@ -322,8 +321,6 @@
     <string name="date_time_set_timezone" msgid="5045627174274377814">"בחר אזור זמן"</string>
     <string name="date_time_set_date_title" msgid="6928286765325608604">"תאריך"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"הגדר תאריך"</string>
-    <string name="date_time_date_format_title" msgid="3976171711988766411">"פורמט תאריך"</string>
-    <string name="date_time_date_format" msgid="6951498879879281102">"בחירת פורמט תאריך"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"מיין לפי סדר אלפביתי"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"מיין לפי אזור זמן"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"תאריך"</string>
@@ -372,7 +369,8 @@
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"המתן בזמן הצפנת הטלפון. <xliff:g id="PERCENT">^1</xliff:g> הושלמו."</string>
     <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"המתן עד להשלמת ההצפנה של הטאבלט. זמן נותר: <xliff:g id="DURATION">^1</xliff:g>"</string>
     <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"המתן עד להשלמת ההצפנה של הטלפון. זמן נותר: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"נסה שוב בעוד <xliff:g id="DELAY">^1</xliff:g> שניות."</string>
+    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"כדי לבטל את נעילת הטאבלט, כבה את הטאבלט והפעל אותו שוב."</string>
+    <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"כדי לבטל את נעילת הטלפון, כבה את הטלפון והפעל אותו שוב."</string>
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"אזהרה: המכשיר שלך יימחק לאחר <xliff:g id="COUNT">^1</xliff:g> ניסיונות כושלים נוספים לביטול הנעילה!"</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"הקלד את הסיסמה שלך"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"ההצפנה נכשלה"</string>
@@ -401,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>
@@ -412,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>
@@ -554,15 +554,10 @@
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"הגדרות עגינה"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"שימוש בעגינה לאודיו"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"כטלפון דיבורית"</string>
-    <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"עבור מוסיקה ומדיה"</string>
+    <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"עבור מוזיקה ומדיה"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"זכור הגדרות"</string>
-    <string name="wifi_assistant_intro_setup" msgid="4605105515416995110">"‏חדש -\nWi‑Fi Assistant"</string>
-    <string name="wifi_assistant_no_thanks" msgid="2776983751990143934">"לא, תודה"</string>
-    <string name="wifi_assistant_setup" msgid="3772423650475730906">"הגדר"</string>
-    <string name="wifi_assistant_card_message" msgid="107811647784658536">"‏התחבר אוטומטית לרשתות זמינות באמצעות Wi‑Fi Assistant."</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi‑Fi Assistant"</string>
-    <string name="wifi_assistant_title_message" msgid="6240721017579074015">"‏<xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> מחבר אותך באופן אוטומטי אל רשת ה-Wi‑Fi בעלת הביצועים הטובים ביותר שזמינה"</string>
-    <string name="wifi_assistant_open_app" msgid="4803044899535675063">"פתח את האפליקציה"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"‏מחובר באמצעות אסיסטנט ה-Wi-Fi"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"‏מסך Cast"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"‏הפעל תצוגת WiFi"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"לא נמצאו מכשירים בקרבת מקום."</string>
@@ -592,7 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"‏הגדרות Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"הגדר ונהל נקודות גישה אלחוטיות"</string>
-    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"‏בחר Wi-Fi"</string>
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"‏בחר רשת Wi‑Fi"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"‏בחר Wi-Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"‏מפעיל את ה-Wi-Fi…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"‏מכבה את ה-Wi-Fi..."</string>
@@ -607,8 +602,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"סריקה זמינה תמיד"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"התר סריקה תמיד"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"‏אפשר לשירות המיקום של Google ולאפליקציות אחרות לסרוק בחיפוש אחר רשתות, גם כש-Wi-Fi כבוי."</string>
-    <string name="wifi_automatically_manage_title" msgid="6249976570008992746">"‏נהל Wi‑Fi באופן אוטומטי"</string>
-    <string name="wifi_automatically_manage_summary" msgid="6952470763378312488">"‏אפשר ל-<xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> לנהל את חיבור Wi-Fi שלך"</string>
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"‏השתמש אוטומטית ב-Wi‑Fi פתוח"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"‏אפשר לאסיסטנט ה-Wi-Fi להתחבר אוטומטית לרשתות פתוחות שנקבע כי הן באיכות גבוהה"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"בחירת אסיסטנט"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"התקן אישורים"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"‏כדי לשפר את מידת הדיוק מבחינת מיקום ולהשגת יתרונות נוספים, אפליקציות של Google ואפליקציות נוספות עשויות לבצע סריקה לאיתור רשתות קרובות, גם כאשר ה-Wi-Fi כבוי. אם אינך מעוניין בכך, עבור אל \'מתקדם\' &gt; \'סריקה זמינה תמיד\'."</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"‏אפליקציות עשויים לבצע סריקה לאיתור רשתות קרובות, גם אם ה-Wi-Fi כבוי. אם אינך מעוניין בכך, עבור אל \'מתקדם\' &gt; \'סריקה זמינה תמיד\'."</string>
@@ -629,6 +625,7 @@
     <string name="wifi_menu_scan" msgid="1470911530412095868">"סרוק"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"מתקדם"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"התחבר לרשת"</string>
+    <string name="wifi_menu_remember" msgid="8814185749388713796">"זכור את הרשת"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"שכח רשת"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"שנה רשת"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"‏כתוב בתג NFC"</string>
@@ -673,9 +670,11 @@
     <string name="wifi_unspecified" msgid="5431501214192991253">"(לא צוין)"</string>
     <string name="wifi_remembered" msgid="4955746899347821096">"נשמר"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"מושבת"</string>
-    <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"נמנע חיבור אינטרנט באיכות ירודה"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"‏כשל בתצורת IP"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"‏כשל בחיבור Wi-Fi"</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"בעיית אימות"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"מחוץ לטווח"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"אין גישה לאינטרנט. לא יתבצע חיבור מחדש באופן אוטומטי."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"‏WPS זמין"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" ‏ (WPS זמין)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"הזן את סיסמת הרשת שלך"</string>
@@ -699,9 +698,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"‏אזהרה: אם תדלג על Wi‑Fi, הטאבלט ישתמש רק בנתונים סלולריים עבור הורדות ועדכונים ראשוניים. כדי להימנע מחיובים אפשריים עבור נתונים, התחבר ל-Wi‑Fi."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"‏אזהרה: אם תדלג על Wi‑Fi, המכשיר ישתמש רק בנתונים סלולריים עבור הורדות ועדכונים ראשוניים. כדי להימנע מחיובים אפשריים עבור נתונים, התחבר ל-Wi‑Fi."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"‏אזהרה: אם תדלג על Wi‑Fi, הטלפון ישתמש רק בנתונים סלולריים עבור הורדות ועדכונים ראשוניים. כדי להימנע מחיובים אפשריים עבור נתונים, התחבר ל-Wi‑Fi."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="2393880108322835846">"‏אזהרה: אם תדלג על Wi‑Fi, לטאבלט שלך לא יהיה חיבור אינטרנט עבור הורדות או עדכונים ראשוניים כלשהם."</string>
-    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1707391993265558787">"‏אזהרה: אם תדלג על Wi‑Fi, למכשיר שלך לא יהיה חיבור אינטרנט עבור הורדות או עדכונים ראשוניים כלשהם."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="1556858507920033022">"‏אזהרה: אם תדלג על Wi‑Fi, לטלפון שלך לא יהיה חיבור אינטרנט עבור הורדות או עדכונים ראשוניים כלשהם."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"‏אם אתה מדלג על ‏Wi‑Fi‏:\n\nהטאבלט לא יהיה מחובר לאינטרנט.\n\nלא תוכל לקבל עדכוני תוכנה עד שתתחבר לאינטרנט.\n\nבשלב זה אינך יכול להפעיל תכונות של הגנת מכשיר."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"‏אם אתה מדלג על ‏Wi‑Fi‏:\n\nהמכשיר לא יהיה מחובר לאינטרנט.\n\nלא תקבל עדכוני תוכנה עד שתתחבר לאינטרנט.\n\nבשלב זה אינך יכול להפעיל תכונות של הגנת מכשיר."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"‏אם אתה מדלג על ‏Wi‑Fi‏:\n\nהטלפון לא יהיה מחובר לאינטרנט.\n\nלא תוכל לקבל עדכוני תוכנה עד שתתחבר לאינטרנט.\n\nבשלב זה אינך יכול להפעיל תכונות של הגנת מכשיר."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"‏הטאבלט לא הצליח להתחבר לרשת ה-Wi-Fi הזו."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"‏המכשיר לא הצליח להתחבר לרשת ה-Wi-Fi הזו."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"‏הטלפון לא הצליח להתחבר לרשת ה-Wi-Fi הזו."</string>
@@ -761,7 +760,6 @@
     <string name="ring_volume_title" msgid="7938706566797464165">"עוצמת קול של צלצול"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"רטט במצב שקט"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"צליל ברירת מחדל להתראה"</string>
-    <string name="heads_up_enabled_title" msgid="1031078221910921622">"חלון קופץ לעדיפות גבוהה"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"צלצול"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"התראה"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"השתמש בעוצמת הקול של שיחות נכנסות להתראות"</string>
@@ -776,12 +774,12 @@
     <string name="lock_sounds_enable_title" msgid="450098505659399520">"צלילי נעילת מסך"</string>
     <string name="haptic_feedback_enable_title" msgid="2438293710530828760">"רטט בעת מגע"</string>
     <string name="audio_record_proc_title" msgid="4271091199976457534">"ביטול רעש"</string>
-    <string name="volume_media_description" msgid="7949355934788807863">"פריטי מוסיקה, סרטוני וידאו, משחקים ומדיה נוספת"</string>
+    <string name="volume_media_description" msgid="7949355934788807863">"פריטי מוזיקה, סרטוני וידאו, משחקים ומדיה נוספת"</string>
     <string name="volume_ring_description" msgid="5936851631698298989">"רינגטונים והתראות"</string>
     <string name="volume_notification_description" msgid="5810902320215328321">"התראות"</string>
     <string name="volume_alarm_description" msgid="8322615148532654841">"התראות"</string>
     <string name="volume_ring_mute" msgid="3018992671608737202">"השתק רינגטון והתראות"</string>
-    <string name="volume_media_mute" msgid="3399059928695998166">"השתק מוסיקה וסוגי מדיה אחרים"</string>
+    <string name="volume_media_mute" msgid="3399059928695998166">"השתק מוזיקה וסוגי מדיה אחרים"</string>
     <string name="volume_notification_mute" msgid="7955193480006444159">"השתק התראות"</string>
     <string name="volume_alarm_mute" msgid="4452239420351035936">"השתק התראות קוליות"</string>
     <string name="dock_settings" msgid="1820107306693002541">"עגינה"</string>
@@ -834,7 +832,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"בהירות אוטומטית"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"הרם כדי להוציא ממצב שינה"</string>
     <string name="doze_title" msgid="2259176504273878294">"תצוגת אווירה"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"הער את המסך בעת הרמת המכשיר או בעת הגעת הודעות"</string>
+    <string name="doze_summary" msgid="7128970177894383698">"הוצא את המסך ממצב כשאתה מרים את המכשיר או מקבל הודעות"</string>
     <string name="title_font_size" msgid="4405544325522105222">"גודל גופן"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"גודל גופן"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"‏הגדרות נעילת כרטיס SIM"</string>
@@ -862,6 +860,10 @@
     <string name="sim_enter_cancel" msgid="6240422158517208036">"ביטול"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"‏נמצאו מספר כרטיסי SIM"</string>
     <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>
@@ -919,7 +921,7 @@
     <string name="memory_media_usage" msgid="3738830697707880405">"מדיה"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"הורדות"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"תמונות, סרטוני וידאו"</string>
-    <string name="memory_music_usage" msgid="1363785144783011606">"אודיו (מוסיקה, רינגטונים, פודקאסטים ועוד)"</string>
+    <string name="memory_music_usage" msgid="1363785144783011606">"אודיו (מוזיקה, רינגטונים, פודקאסטים ועוד)"</string>
     <string name="memory_media_misc_usage" msgid="235452944021647124">"שונות"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"נתונים בקובץ שמור"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"בטל טעינה של אחסון משותף"</string>
@@ -934,8 +936,8 @@
     <string name="sd_mount_summary" product="default" msgid="4673411327373419641"></string>
     <string name="sd_format" product="nosdcard" msgid="2148179271623099054">"‏מחק אחסון USB"</string>
     <string name="sd_format" product="default" msgid="2576054280507119870">"‏מחק כרטיס SD"</string>
-    <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"‏מוחק את כל הנתונים שבאמצעי האחסון הפנימי מסוג USB, כגון מוסיקה ותמונות."</string>
-    <string name="sd_format_summary" product="default" msgid="212703692181793109">"‏מוחק את כל הנתונים שבכרטיס SD, כגון מוסיקה ותמונות."</string>
+    <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"‏מוחק את כל הנתונים שבאמצעי האחסון הפנימי מסוג USB, כגון מוזיקה ותמונות."</string>
+    <string name="sd_format_summary" product="default" msgid="212703692181793109">"‏מוחק את כל הנתונים שבכרטיס SD, כגון מוזיקה ותמונות."</string>
     <string name="memory_clear_cache_title" msgid="5423840272171286191">"האם לנקות נתונים בקובץ שמור?"</string>
     <string name="memory_clear_cache_message" msgid="4550262490807415948">"פעולה זו תנקה נתונים בקובץ שמור, לכל האפליקציות."</string>
     <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"‏פונקציית MTP או PTP פעילה"</string>
@@ -1012,18 +1014,18 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"‏פעולה זו תמחק את כל הנתונים מ"<b>"האחסון הפנימי"</b>" של הטאבלט שלך, כולל:\n\n"<li>"חשבון Google שלך"</li>\n<li>"הנתונים וההגדרות של המערכת והאפליקציות שלך"</li>\n<li>"האפליקציות שהורדת"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"‏פעולה זו תמחק את כל הנתונים מ"<b>"האחסון הפנימי"</b>" של הטלפון שלך, כולל:\n\n"<li>"חשבון Google שלך"</li>\n<li>"הנתונים וההגדרות של המערכת והאפליקציות שלך"</li>\n<li>"האפליקציות שהורדת"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"אתה מחובר כעת לחשבונות הבאים:\n"</string>
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"קיימים משתמשים אחרים במכשיר זה.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"מוסיקה"</li>\n<li>"תמונות"</li>\n<li>"נתוני משתמש אחרים"</li></string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">"‏\n\nכדי למחוק פריטי מוסיקה, תמונות ונתוני משתמש אחרים, יש למחוק את "<b>"אחסון ה-USB"</b>"."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">"‏\n\nכדי למחוק פריטי מוסיקה, תמונות ונתוני משתמש אחרים, יש למחוק את "<b>"כרטיס ה-SD"</b>"."</string>
+    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">"‏\n\nכדי למחוק פריטי מוזיקה, תמונות ונתוני משתמש אחרים, יש למחוק את "<b>"אחסון ה-USB"</b>"."</string>
+    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">"‏\n\nכדי למחוק פריטי מוזיקה, תמונות ונתוני משתמש אחרים, יש למחוק את "<b>"כרטיס ה-SD"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"‏מחק אחסון USB"</string>
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"‏מחק כרטיס SD"</string>
-    <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"‏מחק את כל הנתונים באחסון ה-USB הפנימי, כגון פריטי מוסיקה או תמונות"</string>
-    <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"‏מחק את כל הנתונים שבכרטיס ה-SD, כגון מוסיקה או תמונות"</string>
+    <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"‏מחק את כל הנתונים באחסון ה-USB הפנימי, כגון פריטי מוזיקה או תמונות"</string>
+    <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"‏מחק את כל הנתונים שבכרטיס ה-SD, כגון מוזיקה או תמונות"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"איפוס טאבלט"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"איפוס טלפון"</string>
     <string name="master_clear_final_desc" msgid="7209547812233487345">"למחוק את כל המידע האישי שלך והאפליקציות שהורדת? לא ניתן לבטל את הפעולה!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"מחק הכל"</string>
-    <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"שרטט את קו ביטול הנעילה"</string>
     <string name="master_clear_gesture_explanation" msgid="826193821455182780">"עליך לשרטט את קו ביטול הנעילה כדי לאפשר איפוס נתוני יצרן."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"לא בוצע איפוס מכיוון שהשירות \'ניקוי מערכת\' אינו זמין."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"לאפס?"</string>
@@ -1041,7 +1043,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"‏למחוק את אחסון ה-USB, כולל כל הקבצים שמאוחסנים בו? לא ניתן לבטל פעולה זו!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"‏למחוק את כרטיס ה-SD ואת כל הקבצים המאוחסנים בו? לא ניתן לבטל פעולה זו!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"מחק הכל"</string>
-    <string name="media_format_gesture_prompt" msgid="3109349468816856670">"שרטט את קו ביטול הנעילה"</string>
     <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"‏עליך לשרטט את קו ביטול הנעילה כדי לאשר שברצונך למחוק את אחסון ה-USB."</string>
     <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"‏עליך לשרטט את קו ביטול הנעילה כדי לאשר שברצונך למחוק את כרטיס ה-SD."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"הגדרות שיחה"</string>
@@ -1087,6 +1088,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"‏הכנס כרטיס SIM ואתחל"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"התחבר לאינטרנט"</string>
     <string name="location_title" msgid="1029961368397484576">"המיקום שלי"</string>
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"פרופיל עבודה"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"מיקום עבור פרופיל עבודה"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"הושבת על ידי החברה שלך"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"מצב"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"רמת דיוק גבוהה"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"חיסכון בסוללה"</string>
@@ -1124,6 +1128,7 @@
     <string name="copyright_title" msgid="865906688917260647">"זכויות יוצרים"</string>
     <string name="license_title" msgid="1990487604356037871">"רישיון"</string>
     <string name="terms_title" msgid="7697580845616764642">"תנאים והגבלות"</string>
+    <string name="webview_license_title" msgid="2813507464175738967">"‏רישיון WebView במערכת"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"טפטים"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"‏ספקים של צילומי לוויין:\n‎©2014 CNES / Astrium‏, DigitalGlobe‏, Bluesky"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"רשיונות קוד פתוח"</string>
@@ -1237,7 +1242,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"‏אחסון USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"‏בכרטיס SD"</string>
     <string name="disabled" msgid="9206776641295849915">"מושבת"</string>
-    <string name="not_installed" msgid="1475144352069281880">"לא מותקן"</string>
+    <string name="not_installed" msgid="2797554494953450291">"לא מותקן עבור משתמש זה"</string>
     <string name="no_applications" msgid="7336588977497084921">"אין אפליקציות."</string>
     <string name="internal_storage" msgid="1584700623164275282">"אחסון פנימי"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"‏אחסון USB"</string>
@@ -1434,8 +1439,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"המסך לעולם לא יהיה במצב שינה במהלך טעינה"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"‏הפעלת Snoop Log של Bluetooth HCI"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"‏אחד את כל חבילות Bluetooth HCI בקובץ"</string>
-    <string name="oem_unlock_enable" msgid="6629321276287913315">"‏אפשר ביטול נעילה של OEM"</string>
-    <string name="oem_unlock_enable_summary" msgid="3546686263996628110">"‏אפשר במכשיר ביטול נעילה של יצרן הציוד המקורי (OEM)"</string>
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"‏ביטול נעילה של OEM"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"אפשר ביטול של נעילת מנהל האתחול"</string>
+    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"‏הזן את מספר ה-PIN שלך"</string>
+    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"‏הזן את מספר ה-PIN של המכשיר כדי להפעיל ביטול נעילה של OEM (יצרן ציוד מקורי)"</string>
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"‏האם לאפשר ביטול נעילה של OEM (יצרן ציוד מקורי)?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"אזהרה: תכונות הגנת מכשיר לא יפעלו במכשיר הזה כשההגדרה הזו פועלת."</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"‏אישור של תצוגת WiFi"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"‏הפעל רישום מפורט של Wi‑Fi ביומן"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"‏העברה אגרסיבית מ-Wi‑Fi לרשת סלולרית"</string>
@@ -1538,6 +1547,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"כיתובים יראו כך"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"ברירת מחדל"</string>
+    <string name="color_title" msgid="4258931051732243983">"צבע"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"ברירת מחדל"</string>
     <string name="color_none" msgid="3475640044925814795">"ללא"</string>
     <string name="color_white" msgid="8045195170201590239">"לבן"</string>
@@ -1595,12 +1605,12 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"נותרו <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> לסיום הטעינה"</string>
-    <string name="power_discharging_duration" msgid="7125493014448497620">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - נותרו בקירוב <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="power_charging" msgid="712751285832976915">"<xliff:g id="LEVEL">%1$d</xliff:g>%% ‏- <xliff:g id="STATE">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration" msgid="4802183864773082009">"<xliff:g id="LEVEL">%1$d</xliff:g>%% ‏- <xliff:g id="TIME">%2$s</xliff:g> עד למילוי"</string>
-    <string name="power_charging_duration_ac" msgid="3611179931297824699">"<xliff:g id="LEVEL">%1$d</xliff:g>%%‏ - <xliff:g id="TIME">%2$s</xliff:g> עד למילוי בזרם חילופין"</string>
-    <string name="power_charging_duration_usb" msgid="1106605348913397583">"‏<xliff:g id="LEVEL">%1$d</xliff:g>%% ‏- <xliff:g id="TIME">%2$s</xliff:g> עד למילוי בחיבור USB"</string>
-    <string name="power_charging_duration_wireless" msgid="633606920144617227">"<xliff:g id="LEVEL">%1$d</xliff:g>%% ‏- <xliff:g id="TIME">%2$s</xliff:g> עד למילוי בטעינה אלחוטית"</string>
+    <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> - ‏<xliff:g id="TIME">%2$s</xliff:g> בקירוב עד לסיום"</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> עד למילוי"</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> עד למילוי בזרם חילופין"</string>
+    <string name="power_charging_duration_usb" msgid="182405645340976546">"‏<xliff:g id="LEVEL">%1$s</xliff:g> ‏- <xliff:g id="TIME">%2$s</xliff:g> עד למילוי ב-USB"</string>
+    <string name="power_charging_duration_wireless" msgid="1829295708243159464">"<xliff:g id="LEVEL">%1$s</xliff:g> ‏- <xliff:g id="TIME">%2$s</xliff:g> עד למילוי בטעינה אלחוטית"</string>
     <string name="power_usage_list_summary" msgid="2409288197839512482">"שימוש מאז הטעינה המלאה האחרונה"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"צריכת סוללה מאז הניתוק"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"צריכת סוללה מאז האיפוס"</string>
@@ -1617,7 +1627,6 @@
     <string name="awake" msgid="387122265874485088">"זמן פעולה של מכשיר"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"‏Wi-Fi בזמן"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"‏Wi-Fi בזמן"</string>
-    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"פרטי היסטוריה"</string>
     <string name="details_title" msgid="3792801565213935385">"פרטי שימוש"</string>
     <string name="details_subtitle" msgid="32593908269911734">"פרטי שימוש"</string>
@@ -1689,7 +1698,7 @@
     <string name="battery_saver" msgid="1426682272004907982">"חיסכון בסוללה"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"הפעל אוטומטית"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"אף פעם"</string>
-    <string name="battery_saver_turn_on_automatically_pct" msgid="3033681629861428940">"‏כשחיי סוללה בשיעור %1$d%%"</string>
+    <string name="battery_saver_turn_on_automatically_pct" msgid="7536784431655058267">"‏בעוצמת סוללה של %1$s"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"סטטיסטיקה של תהליך"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"סטטיסטיקה של מומחי מחשבים על התהליכים הפועלים"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"זיכרון בשימוש"</string>
@@ -1813,7 +1822,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"מגובה באמצעות חומרה"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"תוכנה בלבד"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"פרטי כניסה אינם זמינים עבור המשתמש הזה"</string>
-    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"שרטט את קו ביטול הנעילה"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"עליך לשרטט את קו ביטול הנעילה כדי לאשר התקנת הסמכות."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"הקלד את הסיסמה עבור אחסון אישורים."</string>
@@ -1843,6 +1851,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"כלול נתוני אפליקציה"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"שחזור אוטומטי"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"לאחר התקנה מחדש של אפליקציה, שחזר את ההגדרות והנתונים המגובים"</string>
+    <string name="backup_inactive_title" msgid="5355557151569037197">"שירות הגיבוי אינו פעיל."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"העדפה זו מוגדרת על ידי מדיניות המכשיר."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"סיסמת גיבוי מקומי"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"גיבויים מלאים בשולחן העבודה אינם מוגנים כעת"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"גע כדי לשנות או להסיר את הסיסמה עבור גיבויים מלאים בשולחן העבודה"</string>
@@ -1952,7 +1962,11 @@
     <string name="enter_password" msgid="8035706727471334122">"‏כדי להפעיל את Android, הזן את הסיסמה שלך"</string>
     <string name="enter_pin" msgid="5305333588093263790">"‏כדי להפעיל את Android, הזן את קוד האימות"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"‏כדי להפעיל את Android, שרטט את קו ביטול הנעילה"</string>
-    <string name="try_again" msgid="4272075051293936921">"נסה שוב."</string>
+    <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"קו ביטול נעילה שגוי"</string>
+    <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"סיסמה שגויה"</string>
+    <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"‏מספר PIN שגוי"</string>
+    <string name="checking_decryption" msgid="8287458611802609493">"בודק…"</string>
+    <string name="starting_android" msgid="8581493237458496835">"‏מפעיל את Android"</string>
     <string name="delete" msgid="4219243412325163003">"מחק"</string>
     <string name="misc_files" msgid="6720680815969643497">"קובצי \'שונות\'"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"נבחרו <xliff:g id="NUMBER">%1$d</xliff:g> מתוך <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -1990,8 +2004,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"‏השתמש תמיד ב-GPU להרכבת מסך"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"צור הדמיה של מרחב צבעים"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"‏הפעל מעקבי OpenGL"</string>
-    <string name="use_nuplayer" msgid="5699257393367904387">"‏השתמש ב-NuPlayer (ניסיוני)"</string>
-    <string name="use_nuplayer_summary" msgid="1991479067478516714">"‏השתמש ב-NuPlayer במקום ב-AwesomePlayer"</string>
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"‏שימוש-AwesomePlayer (ישן)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"‏השתמש ב-AwesomePlayer במקום NuPlayer לרוב המדיה"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"‏השבת ניתוב אודיו ב-USB"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"‏השבת ניתוב אוטומטי אל התקני אודיו חיצוניים ב-USB"</string>
     <string name="debug_layout" msgid="5981361776594526155">"הצג את גבולות הפריסה"</string>
@@ -2167,7 +2181,6 @@
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"הוסף משתמש או פרופיל"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"הוסף משתמש"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"פרופיל מוגבל"</string>
-    <string name="user_summary_managed_profile" msgid="7369539529693048111">"פרופיל עבודה"</string>
     <string name="user_need_lock_message" msgid="2596365678651842785">"לפני שתוכל ליצור פרופיל מוגבל, תצטרך להגדיר נעילת מסך כדי להגן על האפליקציות ועל הנתונים האישיים שלך."</string>
     <string name="user_set_lock_button" msgid="8311219392856626841">"הגדר נעילה"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"לא מוגדר"</string>
@@ -2298,11 +2311,13 @@
     <string name="sim_cellular_data_unavailable_summary" msgid="3654805961942166428">"‏גע כדי לבחור SIM לנתונים"</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"השתמש תמיד עבור שיחות"</string>
     <string name="select_sim_for_data" msgid="2366081042162853044">"‏בחר SIM לנתונים"</string>
+    <string name="data_switch_started" msgid="2040761479817166311">"‏מחליף את כרטיס ה-SIM המשמש לתקשורת נתונים. הפעולה עשויה לערוך עד דקה..."</string>
     <string name="select_sim_for_calls" msgid="3503094771801109334">"התקשר באמצעות"</string>
     <string name="sim_select_card" msgid="211285163525563293">"‏בחר כרטיס SIM"</string>
     <string name="sim_card_number_title" msgid="7845379943474336488">"‏SIM ‏<xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"‏כרטיס ה-SIM ריק"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"‏שם SIM"</string>
+    <string name="sim_name_hint" msgid="7038643345238968930">"‏הזן את שם ה-SIM"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"‏חריץ SIM ‏%1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"ספק"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"מספר"</string>
@@ -2312,7 +2327,6 @@
     <string name="color_purple" msgid="3888532466427762504">"סגול"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"‏לא הוכנסו כרטיסי SIM"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"‏סטטוס SIM"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"‏מידע הקשור ל-SIM"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"‏התקשר חזרה מ-SIM המוגדר כברירת מחדל"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"‏SIM עבור שיחות יוצאות"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"הגדרות שיחה אחרות"</string>
@@ -2320,8 +2334,11 @@
     <string name="preferred_network_offload_header" msgid="2321173571529106767">"Disable Network Name"</string>
     <string name="preferred_network_offload_footer" msgid="5857279426054744020">"‏Disable Network Name Broadcast מגן מפני גישה של גורמי צד שלישי אל פרטי הרשת שלך."</string>
     <string name="preferred_network_offload_popup" msgid="2252915199889604600">"‏Disabling Network Name Broadcast ימנע חיבור אוטומטי אל רשתות מוסתרות."</string>
+    <string name="sim_signal_strength" msgid="9144010043784767984">"‏<xliff:g id="DBM">%1$d</xliff:g> dBm ‏<xliff:g id="ASU">%2$d</xliff:g> asu"</string>
+    <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>
@@ -2330,22 +2347,22 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"חיפושים אחרונים"</string>
     <string name="search_results_label" msgid="4163304782363526148">"תוצאות"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"‏wifi wi-fi חיבור רשת"</string>
-    <string name="keywords_more_default_sms_app" msgid="2744404159003574745">"הודעת טקסט"</string>
-    <string name="keywords_more_mobile_networks" msgid="7813380887358745769">"חיבור אלחוטי של ספק סלולרי"</string>
+    <string name="keywords_more_default_sms_app" msgid="895656981962034647">"הודעת טקסט שליחת הודעות טקסט הודעות העברת הודעות"</string>
+    <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"‏סלולרי תא ספק אלחוטי נתונים 4 g ‏3g ‏2g ‏lte "</string>
     <string name="keywords_home" msgid="3626170808219458848">"מפעיל האפליקציות"</string>
     <string name="keywords_display" msgid="6709007669501628320">"מסך מגע"</string>
-    <string name="keywords_display_brightness_level" msgid="8636451602230815191">"עמעם מסך מגע"</string>
-    <string name="keywords_display_auto_brightness" msgid="8070218600502753102">"עמעם מסך מגע"</string>
-    <string name="keywords_display_wallpaper" msgid="4315466287469834939">"רקע"</string>
+    <string name="keywords_display_brightness_level" msgid="8923289340474728990">"מסך עמום סוללה מסך מגע"</string>
+    <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"מסך עמום סוללה מסך מגע"</string>
+    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"התאם אישית רקע התאמה אישית תצוגה"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"גודל טקסט"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"הקרן"</string>
-    <string name="keywords_storage" msgid="7007275853993419928">"שטח דיסק כונן קשיח"</string>
-    <string name="keywords_battery" msgid="3992479295298655138">"חשמל"</string>
-    <string name="keywords_spell_checker" msgid="4509482591225399210">"איות"</string>
+    <string name="keywords_storage" msgid="6572905220031852173">"שטח דיסק כונן קשיח מכשיר שימוש"</string>
+    <string name="keywords_battery" msgid="2096185085932675704">"חיוב על שימוש באספקת מתח"</string>
+    <string name="keywords_spell_checker" msgid="6106749039734174140">"איות מילון בדיקת איות תיקון אוטומטי"</string>
     <string name="keywords_voice_input" msgid="3519547605812413860">"‏מזהה קלט דיבור דבר שפה דיבורית ללא מגע זיהוי מילה פוגענית היסטוריית אודיו Bluetooth אוזניות"</string>
-    <string name="keywords_text_to_speech_output" msgid="8207889472282225512">"דירוג שפה ברירת מחדל דבר דיבור"</string>
-    <string name="keywords_date_and_time" msgid="7666950126499155141">"שעון"</string>
-    <string name="keywords_factory_data_reset" msgid="3693730656843989732">"מחק"</string>
+    <string name="keywords_text_to_speech_output" msgid="392447904221657930">"‏דירוג שפה ברירת מחדל לדבר מדבר tts נגישות קורא עיוור"</string>
+    <string name="keywords_date_and_time" msgid="2631808108134830066">"שעון צבאי"</string>
+    <string name="keywords_factory_data_reset" msgid="4355133848707691977">"נגב מחק שחזר נקה הסר"</string>
     <string name="keywords_printing" msgid="1701778563617114846">"מדפסת"</string>
     <string name="keywords_sounds_and_notifications" msgid="5965996187974887000">"צפצוף רמקול"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="2912933812460077912">"לא אל תפריע הפרע הפרעה הפסקה"</string>
@@ -2354,7 +2371,7 @@
     <string name="keywords_location_mode" msgid="8584992704568356084">"דיוק"</string>
     <string name="keywords_accounts" msgid="1957925565953357627">"חשבון"</string>
     <string name="keywords_users" msgid="4673901601478559100">"הגבלה הגבל מוגבל"</string>
-    <string name="keywords_keyboard_and_ime" msgid="1103378692379215672">"תיקון טקסט תיקון צליל רטט אוטומטי שפה תנועה הצע הצעה עיצוב פוגעני מילה הקלד אמוג\'י"</string>
+    <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"תיקון טקסט תקן צליל רטט אוטומטי שפה תנועה הצע הצעה עיצוב מילה פוגענית הקלד אמוג\'י בינלאומי"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"‏החלקה סיסמה קו ביטול נעילה מספר PIN"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"‏הגדר תג NFC של Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"כתוב"</string>
@@ -2371,7 +2388,6 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"עוצמת קול של הודעות"</string>
     <string name="zen_mode_settings_title" msgid="7014915558669122902">"הפרעות"</string>
     <string name="zen_mode_option_title" msgid="5061978632306007914">"כשנכנסות שיחות והודעות"</string>
-    <string name="zen_mode_option_title_novoice" msgid="6680706009915204785">"כשנכנסות הודעות"</string>
     <string name="zen_mode_option_off" msgid="3167702608910820883">"התר תמיד הפרעות"</string>
     <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"התר רק הפרעות בעדיפות גבוהה"</string>
     <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"אל תתיר הפרעות"</string>
@@ -2429,14 +2445,17 @@
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"בוצע"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"עד שתכבה"</string>
     <string name="zen_mode_important_category" msgid="8123274463331022993">"הפרעות בעדיפות גבוהה"</string>
-    <string name="zen_mode_downtime_category" msgid="4730179065426038108">"זמן השבתה (רק הפרעות בעדיפות גבוהה)"</string>
+    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"זמן השבתה"</string>
     <string name="zen_mode_downtime_days" msgid="3361856902633311616">"ימים"</string>
     <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"ללא"</string>
+    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"הפרעות מותרות"</string>
+    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"עדיפות בלבד"</string>
+    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"ללא"</string>
     <string name="zen_mode_automation_category" msgid="4653551005950835761">"אוטומציה"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"הפעל אוטומטית"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"אף פעם"</string>
-    <string name="zen_mode_phone_calls" msgid="8956214416859303966">"שיחות"</string>
+    <string name="zen_mode_calls" msgid="7051492091133751208">"שיחות"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"הודעות"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"שיחות/הודעות מאת"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"כל אחד"</string>
@@ -2450,7 +2469,9 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"לילות בימי חול"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"שעת התחלה"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"שעת סיום"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> למחרת"</string>
+    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> למחרת"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> או במועד מוקדם יותר שבו הוגדרה התראה"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> למחרת או במועד מוקדם יותר שבו הוגדרה התראה"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"הודעות אפליקציה"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"הגדרות התראה"</string>
     <string name="device_feedback" msgid="3238056036766293294">"שלח משוב על המכשיר הזה"</string>
@@ -2458,7 +2479,11 @@
     <string name="switch_on_text" msgid="1124106706920572386">"פועל"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"כבוי"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"הצמדת מסך"</string>
-    <string name="screen_pinning_description" msgid="7091642350452605379">"כשהתכונה פועלת, ניתן להשתמש בהקפאת מסך כדי להמשיך ולהציג את המסך הנוכחי עד שתבטל את ההקפאה.\n\nכדי להשתמש בהקפאת מסך:\n\n1. ודא שהקפאת מסך פועלת.\n\n2. פתח את המסך שברצונך להקפיא.\n\n3. גע ב\'סקירה\'.\n\n4. גע בסמל ההקפאה."</string>
+    <string name="screen_pinning_description" msgid="1137904524037468263">"כשהגדרה זו מופעלת, ניתן להשתמש בהצמדת מסך כדי לשמור את המסך הנוכחי בתצוגה עד לביטול ההצמדה.\n\nכדי להשתמש בהצמדת מסך:\n\n1. ודא שהצמדת מסך מופעלת.\n\n2. פתח את המסך שברצונך להצמיד.\n\n3. גע ב\'סקירה\'.\n\n4. החלק כלפי מעלה ואז גע בסמל הנעץ."</string>
+    <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"בקש קו ביטול נעילה לפני ביטול הצמדה"</string>
+    <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"בקש קוד אימות לפני ביטול הצמדה"</string>
+    <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"בקש סיסמה לפני ביטול הצמדה"</string>
+    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"נעל מכשיר בזמן ביטול הצמדה"</string>
     <string name="managed_user_title" msgid="8101244883654409696">"פרופיל עבודה"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(ניסיוני)"</string>
     <string name="display_auto_rotate_title" msgid="6176450657107806043">"בעת סיבוב המכשיר"</string>
@@ -2467,7 +2492,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"הישאר בתצוגה לרוחב"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"הישאר בכיוון המסך הנוכחי"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"‏פרטי IMEI"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"‏מידע הקשור ל-IMEI"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"הצפנה"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"המשך"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"‏באפשרותך לחזק את ההגנה על מכשיר זה על-ידי דרישת מספר ה-PIN שלך לפני הפעלתו. עד שהמכשיר יופעל, הוא לא לא יוכל לקבל שיחות, הודעות או התראות. \n\nהדבר יסייע להגן על נתונים במכשירים שאבדו או נגנבו."</string>
@@ -2485,4 +2509,7 @@
     <string name="encrypt_talkback_dialog_message_pin" msgid="1890374082842868489">"‏כשתזין את מספר ה-PIN להפעלת המכשיר הזה, שירותי נגישות כמו <xliff:g id="SERVICE">%1$s</xliff:g> עדיין לא יהיו זמינים."</string>
     <string name="encrypt_talkback_dialog_message_pattern" msgid="4474332516537386384">"כשתזין את קו ביטול הנעילה להפעלת המכשיר הזה, שירותי נגישות כמו <xliff:g id="SERVICE">%1$s</xliff:g> עדיין לא יהיו זמינים."</string>
     <string name="encrypt_talkback_dialog_message_password" msgid="8166099418487083927">"כשתזין את הסיסמה להפעלת המכשיר הזה, שירותי נגישות כמו <xliff:g id="SERVICE">%1$s</xliff:g> עדיין לא יהיו זמינים."</string>
+    <string name="imei_information_title" msgid="8499085421609752290">"‏פרטי IMEI"</string>
+    <string name="imei_information_summary" msgid="2074095606556565233">"‏מידע הקשור ל-IMEI"</string>
+    <string name="slot_number" msgid="3762676044904653577">"(חריץ <xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-ja/arrays.xml b/res/values-ja/arrays.xml
index e27a885..cac7959 100644
--- a/res/values-ja/arrays.xml
+++ b/res/values-ja/arrays.xml
@@ -527,4 +527,12 @@
     <item msgid="4338089220026248848">"キャッシュ済み（アクティビティクライアント）"</item>
     <item msgid="6652164677254579050">"キャッシュ済み（空）"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"ティール"</item>
+    <item msgid="8332294763632946560">"ブルー"</item>
+    <item msgid="2023216417616991392">"インディゴ"</item>
+    <item msgid="3170497246594232819">"パープル"</item>
+    <item msgid="4608643045752965568">"ピンク"</item>
+    <item msgid="6131821495505931173">"レッド"</item>
+  </string-array>
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 96dd042..4d8aaf9 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>
@@ -182,7 +182,6 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$sがメッセージにアクセスしようとしています。%2$sにアクセスを許可しますか？"</string>
     <string name="date_and_time" msgid="9062980487860757694">"日付と時刻"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"タイムゾーンの選択"</string>
-    <string name="normal_date_format" msgid="7636406984925498359">"地域（<xliff:g id="DATE">%s</xliff:g>）"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"プレビュー:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"フォントサイズ:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -293,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>
@@ -324,8 +323,6 @@
     <string name="date_time_set_timezone" msgid="5045627174274377814">"タイムゾーンの選択"</string>
     <string name="date_time_set_date_title" msgid="6928286765325608604">"日付"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"日付設定"</string>
-    <string name="date_time_date_format_title" msgid="3976171711988766411">"日付形式"</string>
-    <string name="date_time_date_format" msgid="6951498879879281102">"日付形式の選択"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"アルファベット順"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"タイムゾーン順"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"日付"</string>
@@ -374,7 +371,8 @@
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"携帯端末を暗号化しています。しばらくお待ちください。<xliff:g id="PERCENT">^1</xliff:g>%完了。"</string>
     <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"タブレットを暗号化していますのでお待ちください。残り時間: <xliff:g id="DURATION">^1</xliff:g>"</string>
     <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"携帯電話を暗号化していますのでお待ちください。残り時間: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"<xliff:g id="DELAY">^1</xliff:g>秒後にやり直してください。"</string>
+    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"タブレットのロックを解除するには、OFFにしてからONにします。"</string>
+    <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"携帯電話のロックを解除するには、OFFにしてからONにします。"</string>
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"警告: ロック解除にあと<xliff:g id="COUNT">^1</xliff:g>回失敗すると、端末のデータが消去されます。"</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"パスワードを入力してください"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"暗号化できませんでした"</string>
@@ -403,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>
@@ -414,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>
@@ -461,8 +461,8 @@
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"次へ"</string>
     <string name="lock_setup" msgid="3355847066343753943">"設定が完了しました。"</string>
     <string name="device_admin_title" msgid="3562216873644263804">"デバイス管理"</string>
-    <string name="manage_device_admin" msgid="5059296715271077278">"端末管理者"</string>
-    <string name="manage_device_admin_summary" msgid="7672709110988761075">"端末管理者を表示または無効にする"</string>
+    <string name="manage_device_admin" msgid="5059296715271077278">"端末管理アプリ"</string>
+    <string name="manage_device_admin_summary" msgid="7672709110988761075">"端末管理アプリを表示または無効にする"</string>
     <string name="manage_trust_agents" msgid="4629279457536987768">"信頼できるエージェント"</string>
     <string name="disabled_because_no_backup_security" msgid="6877660253409580377">"使用するには、まず画面ロックを設定してください"</string>
     <string name="manage_trust_agents_summary" msgid="6804319935640148441">"信頼できるエージェントを表示または無効にする"</string>
@@ -558,13 +558,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"スピーカーフォン"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"音楽とメディア"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"設定を保存"</string>
-    <string name="wifi_assistant_intro_setup" msgid="4605105515416995110">"Wi‑Fiアシスタントの\nご紹介"</string>
-    <string name="wifi_assistant_no_thanks" msgid="2776983751990143934">"利用しない"</string>
-    <string name="wifi_assistant_setup" msgid="3772423650475730906">"セットアップ"</string>
-    <string name="wifi_assistant_card_message" msgid="107811647784658536">"Wi‑Fiアシスタントを使って、利用可能なネットワークに自動的に接続します。"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi-Fiアシスタント"</string>
-    <string name="wifi_assistant_title_message" msgid="6240721017579074015">"<xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g>は利用条件が最も良いWi‑Fiに自動的に接続します"</string>
-    <string name="wifi_assistant_open_app" msgid="4803044899535675063">"アプリを開く"</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>
@@ -581,7 +576,7 @@
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"タブレットが他のデバイスと接触したときのデータ交換を許可する"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"端末が他のデバイスと接触したときのデータ交換を許可する"</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Androidビーム"</string>
-    <string name="android_beam_on_summary" msgid="3618057099355636830">"アプリコンテンツをNFCで転送する準備が整いました"</string>
+    <string name="android_beam_on_summary" msgid="3618057099355636830">"アプリコンテンツをNFCで転送できます"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"OFF"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"NFCがOFFのため使用できません"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Androidビーム"</string>
@@ -594,7 +589,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Wi-Fiの設定"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"ワイヤレスアクセスポイントを設定する"</string>
-    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Wi-Fiの選択"</string>
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Wi-Fiネットワークの選択"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Wi-Fiを選択"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Wi-FiをONにしています…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Wi-FiをOFFにしています…"</string>
@@ -609,8 +604,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"スキャンを常に実行する"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"スキャンを常に許可する"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Wi-FiがOFFになっていても、Googleの位置情報サービスと他のアプリでネットワークをスキャンする"</string>
-    <string name="wifi_automatically_manage_title" msgid="6249976570008992746">"Wi‑Fiを自動的に管理する"</string>
-    <string name="wifi_automatically_manage_summary" msgid="6952470763378312488">"<xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g>を使ってWi‑Fi接続を管理する"</string>
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"オープンWi-Fiを自動的に使用"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Wi-Fiアシスタントを使って高品質のオープンネットワークを自動的に判断して接続する"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"アシスタントの選択"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"証明書のインストール"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"位置情報の精度を向上させるため、Wi-FiがOFFの場合でもGoogleやその他のアプリは近くのネットワークをスキャンすることができます。このスキャンが必要ない場合は、[詳細設定] &gt; [スキャンを常に実行する]にアクセスします。"</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Wi-FiがOFFの場合でもアプリは近くのネットワークをスキャンできます。このスキャンが必要ない場合は、[詳細設定] &gt; [スキャンを常に実行する]にアクセスします。"</string>
@@ -631,6 +627,7 @@
     <string name="wifi_menu_scan" msgid="1470911530412095868">"スキャン"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"詳細設定"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"ネットワークに接続"</string>
+    <string name="wifi_menu_remember" msgid="8814185749388713796">"ネットワークを保存"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"ネットワークから切断"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"ネットワークを変更"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"NFCタグに書き込む"</string>
@@ -675,9 +672,11 @@
     <string name="wifi_unspecified" msgid="5431501214192991253">"（指定なし）"</string>
     <string name="wifi_remembered" msgid="4955746899347821096">"保存済み"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"無効"</string>
-    <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"インターネット接続不良により無効"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP設定エラー"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"WiFi接続エラー"</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"認証に問題"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"圏外"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"インターネットアクセスを検出できないため、自動的に再接続されません。"</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS利用可"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" （WPS利用可）"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"ネットワークパスワードを入力してください"</string>
@@ -701,9 +700,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"警告: [Wi‑Fi]をスキップすると、タブレットはモバイルデータのみを使って最初のダウンロードやアップデートを行います。データ通信料が発生する可能性を防ぐにはWi‑Fiに接続してください。"</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"警告: [Wi‑Fi]をスキップすると、端末はモバイルデータのみを使って最初のダウンロードやアップデートを行います。データ通信料が発生する可能性を防ぐにはWi‑Fiに接続してください。"</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"警告: [Wi‑Fi]をスキップすると、携帯電話はモバイルデータのみを使って最初のダウンロードやアップデートを行います。データ通信料が発生する可能性を防ぐにはWi‑Fiに接続してください。"</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="2393880108322835846">"警告: [Wi‑Fi]をスキップすると、タブレットはインターネットに接続されず最初のダウンロードやアップデートを行えません。"</string>
-    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1707391993265558787">"警告: [Wi‑Fi]をスキップすると、端末はインターネットに接続されず最初のダウンロードやアップデートを行えません。"</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="1556858507920033022">"警告: [Wi‑Fi]をスキップすると、携帯電話はインターネットに接続されず最初のダウンロードやアップデートを行えません。"</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Wi-Fiをスキップした場合:\n\nタブレットはインターネットに接続されません。\n\nインターネットに接続するまで、ソフトウェアは更新されません。\n\n現時点では端末保護機能を有効にできません。"</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Wi-Fiをスキップした場合:\n\n携帯端末はインターネットに接続されません。\n\nインターネットに接続するまで、ソフトウェアは更新されません。\n\n現時点では端末保護機能を有効にできません。"</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Wi-Fiをスキップした場合:\n\n携帯電話はインターネットに接続されません。\n\nインターネットに接続するまで、ソフトウェアは更新されません。\n\n現時点では端末保護機能を有効にできません。"</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"タブレットからこのWi-Fiネットワークに接続できませんでした。"</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"端末からこのWi‑Fiネットワークに接続できませんでした。"</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"携帯端末からこのWi-Fiネットワークに接続できませんでした。"</string>
@@ -763,7 +762,6 @@
     <string name="ring_volume_title" msgid="7938706566797464165">"着信音量"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"マナーモード時のバイブレーション"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"デフォルトの通知音"</string>
-    <string name="heads_up_enabled_title" msgid="1031078221910921622">"最優先の場合はポップアップ"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"着信音"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"通知"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"通知音にも着信音量を適用"</string>
@@ -822,7 +820,7 @@
     <string name="screen_timeout_title" msgid="5130038655092628247">"画面がOFFになったとき"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"操作が行われない状態で<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>経過後"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"壁紙"</string>
-    <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"壁紙の選択先:"</string>
+    <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"壁紙タイプの選択"</string>
     <string name="screensaver_settings_title" msgid="3349790120327233241">"スクリーンセーバー"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"ホルダー装着時またはスリープ/充電時"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"いずれか"</string>
@@ -836,7 +834,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"明るさを自動調整"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"指を離してスリープ状態から復帰"</string>
     <string name="doze_title" msgid="2259176504273878294">"常時オン ディスプレイ"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"端末が取り上げられたとき、または通知を受信したときにスリープ状態から復帰"</string>
+    <string name="doze_summary" msgid="7128970177894383698">"端末を取り上げたとき、または通知を受信したときにスリープ状態から復帰"</string>
     <string name="title_font_size" msgid="4405544325522105222">"フォントサイズ"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"フォントサイズ"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIMカードロック設定"</string>
@@ -864,6 +862,10 @@
     <string name="sim_enter_cancel" msgid="6240422158517208036">"キャンセル"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"複数のSIMが見つかりました"</string>
     <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>
+    <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>
@@ -1014,6 +1016,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"この操作を行うと、タブレットの以下のデータを含む"<b>"内部ストレージ"</b>"の全データが消去されます:\n\n"<li>"Googleアカウント"</li>\n<li>"システムやアプリのデータと設定"</li>\n<li>"ダウンロードしたアプリ"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"この操作を行うと、携帯端末の以下のデータを含む"<b>"内部ストレージ"</b>"の全データが消去されます:\n\n"<li>"Googleアカウント"</li>\n<li>"システムやアプリのデータと設定"</li>\n<li>"ダウンロードしたアプリ"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"以下のアカウントにログインしています:\n"</string>
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"この端末には他にもユーザーがいます。\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"音楽"</li>\n<li>"画像"</li>\n<li>"他のユーザーデータ"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"音楽、画像、その他のユーザーデータを消去する場合は"<b>"USBストレージデータ"</b>"を消去する必要があります。"</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"音楽、画像、その他のユーザーデータを消去するには、"<b>"SDカード"</b>"を消去する必要があります。"</string>
@@ -1025,7 +1028,6 @@
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"携帯端末をリセット"</string>
     <string name="master_clear_final_desc" msgid="7209547812233487345">"個人情報とダウンロードしたアプリをすべて削除しますか？この操作を元に戻すことはできません。"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"すべて消去"</string>
-    <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"ロック解除パターンを入力してください"</string>
     <string name="master_clear_gesture_explanation" msgid="826193821455182780">"データの初期化を確定するにはロック解除パターンを入力する必要があります。"</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"System Clearサービスが利用できないため、リセットされませんでした。"</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"リセットしますか？"</string>
@@ -1043,7 +1045,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"USBストレージ内のデータを消去して、保存されているすべてのファイルを削除しますか？この操作は元に戻せません。"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"SDカード内のデータを消去して、保存されているすべてのファイルを削除しますか？この操作は元に戻せません。"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"すべて消去"</string>
-    <string name="media_format_gesture_prompt" msgid="3109349468816856670">"ロック解除パターンを入力してください"</string>
     <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"USBストレージ内のデータを消去してよいか確認するため、ロック解除パターンを入力する必要があります。"</string>
     <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"SDカード内のデータを消去してよいか確認するため、ロック解除パターンを入力する必要があります。"</string>
     <string name="call_settings_title" msgid="5188713413939232801">"通話設定"</string>
@@ -1089,6 +1090,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"SIMカードを挿入して再起動してください"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"インターネットに接続してください"</string>
     <string name="location_title" msgid="1029961368397484576">"現在地"</string>
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"ワークプロフィール"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"ワークプロフィールの場所"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"会社がOFFに設定しています"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"モード"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"高精度"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"バッテリー節約"</string>
@@ -1097,8 +1101,8 @@
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"最近の位置情報リクエスト"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"位置情報を最近リクエストしたアプリはありません"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"位置情報サービス"</string>
-    <string name="location_high_battery_use" msgid="517199943258508020">"高い電池使用量"</string>
-    <string name="location_low_battery_use" msgid="8602232529541903596">"低い電池使用量"</string>
+    <string name="location_high_battery_use" msgid="517199943258508020">"電池使用量: 高"</string>
+    <string name="location_low_battery_use" msgid="8602232529541903596">"電池使用量: 低"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"位置情報モード"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"GPS、Wi‑Fi、モバイルネットワークで現在地を特定する"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Wi‑Fiとモバイルネットワークで現在地を特定する"</string>
@@ -1126,6 +1130,7 @@
     <string name="copyright_title" msgid="865906688917260647">"著作権"</string>
     <string name="license_title" msgid="1990487604356037871">"ライセンス"</string>
     <string name="terms_title" msgid="7697580845616764642">"利用規約"</string>
+    <string name="webview_license_title" msgid="2813507464175738967">"システムのWebViewライセンス"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"壁紙"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"航空写真の提供:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"オープンソースライセンス"</string>
@@ -1239,7 +1244,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USBストレージ"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"SDカード上"</string>
     <string name="disabled" msgid="9206776641295849915">"無効"</string>
-    <string name="not_installed" msgid="1475144352069281880">"未インストール"</string>
+    <string name="not_installed" msgid="2797554494953450291">"このユーザーでは未インストール"</string>
     <string name="no_applications" msgid="7336588977497084921">"アプリはありません。"</string>
     <string name="internal_storage" msgid="1584700623164275282">"内部ストレージ"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USBストレージ"</string>
@@ -1436,8 +1441,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"充電中に画面をスリープにしない"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Bluetooth HCIスヌープログを有効にする"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Bluetooth HCIパケットをすべてファイルにキャプチャする"</string>
-    <string name="oem_unlock_enable" msgid="6629321276287913315">"OEMロック解除を有効にする"</string>
-    <string name="oem_unlock_enable_summary" msgid="3546686263996628110">"端末にOEMロック解除を許可する"</string>
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"OEMロック解除"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"ブートローダーによるロック解除を許可する"</string>
+    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"PINを入力してください"</string>
+    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"OEMロック解除を有効にするには端末のPINを入力してください"</string>
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"OEMロック解除の許可"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"警告: この設定をONにしている場合、この端末では端末保護機能を利用できません。"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"ワイヤレスディスプレイ認証"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Wi-Fi詳細ログの有効化"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Wi-Fiを強制的にモバイル接続に切り替える"</string>
@@ -1540,6 +1549,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"字幕サンプル"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aあ"</string>
     <string name="locale_default" msgid="2593883646136326969">"デフォルト"</string>
+    <string name="color_title" msgid="4258931051732243983">"カラー"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"デフォルト"</string>
     <string name="color_none" msgid="3475640044925814795">"なし"</string>
     <string name="color_white" msgid="8045195170201590239">"白"</string>
@@ -1597,12 +1607,12 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"残り<xliff:g id="REMAIN">%1$s</xliff:g>"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"充電されるまで<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g>"</string>
-    <string name="power_discharging_duration" msgid="7125493014448497620">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - 残り約<xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="power_charging" msgid="712751285832976915">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="STATE">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration" msgid="4802183864773082009">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - フル充電まで<xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration_ac" msgid="3611179931297824699">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - フル充電まで<xliff:g id="TIME">%2$s</xliff:g>（AC経由）"</string>
-    <string name="power_charging_duration_usb" msgid="1106605348913397583">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - フル充電まで<xliff:g id="TIME">%2$s</xliff:g>（USB経由）"</string>
-    <string name="power_charging_duration_wireless" msgid="633606920144617227">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - フル充電まで<xliff:g id="TIME">%2$s</xliff:g>（ワイヤレス）"</string>
+    <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> - 残り約<xliff:g id="TIME">%2$s</xliff:g>"</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>"</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>（AC）"</string>
+    <string name="power_charging_duration_usb" msgid="182405645340976546">"<xliff:g id="LEVEL">%1$s</xliff:g> - フル充電まで<xliff:g id="TIME">%2$s</xliff:g>（USB）"</string>
+    <string name="power_charging_duration_wireless" msgid="1829295708243159464">"<xliff:g id="LEVEL">%1$s</xliff:g> - フル充電まで<xliff:g id="TIME">%2$s</xliff:g>（ワイヤレス）"</string>
     <string name="power_usage_list_summary" msgid="2409288197839512482">"前回のフル充電から使用"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"電池使用時間"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"リセット後の電池使用量"</string>
@@ -1619,7 +1629,6 @@
     <string name="awake" msgid="387122265874485088">"端末使用時間"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi-FiをONにしている時間"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-FiをONにしている時間"</string>
-    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"履歴の詳細"</string>
     <string name="details_title" msgid="3792801565213935385">"使用状況の詳細"</string>
     <string name="details_subtitle" msgid="32593908269911734">"使用状況の詳細"</string>
@@ -1691,7 +1700,7 @@
     <string name="battery_saver" msgid="1426682272004907982">"バッテリーセーバー"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"自動的にON"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"使用しない"</string>
-    <string name="battery_saver_turn_on_automatically_pct" msgid="3033681629861428940">"電池残量が%1$d%%"</string>
+    <string name="battery_saver_turn_on_automatically_pct" msgid="7536784431655058267">"%1$sの電池"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"プロセスの統計情報"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"プロセスの実行に関する独自の統計情報"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"メモリ使用"</string>
@@ -1738,7 +1747,7 @@
     <string name="tts_settings" msgid="8186971894801348327">"テキスト読み上げの設定"</string>
     <string name="tts_settings_title" msgid="1237820681016639683">"テキスト読み上げの出力"</string>
     <string name="use_default_tts_settings_title" msgid="1577063839539732930">"常に自分の設定を使用"</string>
-    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"アプリの設定を以下のデフォルト設定で上書きする"</string>
+    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"アプリの設定を以下のデフォルト設定でオーバーライドする"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"デフォルト設定"</string>
     <string name="tts_default_synth_title" msgid="4755558388333117572">"デフォルトのエンジン"</string>
     <string name="tts_default_synth_summary" msgid="6482936537135251690">"テキスト読み上げに使用する音声合成エンジンを設定する"</string>
@@ -1819,7 +1828,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"ハードウェア式"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"ソフトウェアのみ"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"認証情報はこのユーザーには表示されません"</string>
-    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"ロック解除パターンを入力してください"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"認証情報をインストールするには、ロック解除パターンを入力する必要があります。"</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"認証情報ストレージのパスワードを入力してください。"</string>
@@ -1849,6 +1857,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"アプリのデータを含める"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"自動復元"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"アプリを再インストールする際に、バックアップした設定とデータを復元する"</string>
+    <string name="backup_inactive_title" msgid="5355557151569037197">"バックアップサービスは無効"</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"これは端末ポリシーで設定されています。"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"PCバックアップパスワード"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"デスクトップのフルバックアップは現在保護されていません"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"デスクトップのフルバックアップ用のパスワードを変更または削除する場合にタップします"</string>
@@ -1958,7 +1968,11 @@
     <string name="enter_password" msgid="8035706727471334122">"Androidを起動するには、パスワードを入力します"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Androidを起動するには、PINを入力します"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Androidを起動するには、パターンを入力します"</string>
-    <string name="try_again" msgid="4272075051293936921">"もう一度お試しください。"</string>
+    <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"パターンが正しくありません"</string>
+    <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"パスワードが正しくありません"</string>
+    <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"PINが正しくありません"</string>
+    <string name="checking_decryption" msgid="8287458611802609493">"確認しています…"</string>
+    <string name="starting_android" msgid="8581493237458496835">"Androidを起動しています"</string>
     <string name="delete" msgid="4219243412325163003">"削除"</string>
     <string name="misc_files" msgid="6720680815969643497">"その他のファイル"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"選択済み: <xliff:g id="NUMBER">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>件"</string>
@@ -1996,8 +2010,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"画面合成に常にGPUを使用する"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"色空間シミュレート"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"OpenGLトレースを有効化"</string>
-    <string name="use_nuplayer" msgid="5699257393367904387">"NuPlayer（試験版）を使用"</string>
-    <string name="use_nuplayer_summary" msgid="1991479067478516714">"AwesomePlayerの代わりにNuPlayerを使用"</string>
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"AwesomePlayerを使用（廃止）"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"ほとんどのメディア再生でNuPlayerの代わりにAwesomePlayerを使用"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"USBオーディオルーティングを無効化"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"USBオーディオ周辺機器への自動ルーティングを無効化"</string>
     <string name="debug_layout" msgid="5981361776594526155">"レイアウト境界を表示"</string>
@@ -2173,7 +2187,6 @@
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"ユーザーまたはプロフィールを追加"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"ユーザーを追加"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"制限付きプロフィール"</string>
-    <string name="user_summary_managed_profile" msgid="7369539529693048111">"ワークプロフィール"</string>
     <string name="user_need_lock_message" msgid="2596365678651842785">"制限付きプロフィールを作成する場合は、アプリや個人データを保護するように画面ロックを設定しておく必要があります。"</string>
     <string name="user_set_lock_button" msgid="8311219392856626841">"ロックを設定"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"セットアップしていません"</string>
@@ -2304,11 +2317,13 @@
     <string name="sim_cellular_data_unavailable_summary" msgid="3654805961942166428">"タップしてデータSIMを選択する"</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"このSIMを常に通話に使用する"</string>
     <string name="select_sim_for_data" msgid="2366081042162853044">"データに使用するSIMを選択してください"</string>
+    <string name="data_switch_started" msgid="2040761479817166311">"データSIMに切り替えています。最大で1分ほどかかる場合があります..."</string>
     <string name="select_sim_for_calls" msgid="3503094771801109334">"通話に使用するSIMを選択してください"</string>
     <string name="sim_select_card" msgid="211285163525563293">"SIMカードを選択"</string>
     <string name="sim_card_number_title" msgid="7845379943474336488">"SIMカード番号: <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"SIMが空です"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"SIMの名前"</string>
+    <string name="sim_name_hint" msgid="7038643345238968930">"SIM名を入力します"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"SIMスロット%1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"携帯通信会社"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"番号"</string>
@@ -2318,7 +2333,6 @@
     <string name="color_purple" msgid="3888532466427762504">"パープル"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"SIMカードが挿入されていません"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"SIMのステータス"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"SIMの関連情報"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"デフォルトのSIMからコールバック"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"発信用のSIM"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"その他の通話設定"</string>
@@ -2326,8 +2340,11 @@
     <string name="preferred_network_offload_header" msgid="2321173571529106767">"SSIDブロードキャスト無効化"</string>
     <string name="preferred_network_offload_footer" msgid="5857279426054744020">"SSIDブロードキャスト無効化は、第三者があなたのネットワーク情報にアクセスできないようにする機能です。"</string>
     <string name="preferred_network_offload_popup" msgid="2252915199889604600">"SSIDブロードキャスト無効化は、非表示のネットワークに対する自動接続を無効にします。"</string>
+    <string name="sim_signal_strength" msgid="9144010043784767984">"<xliff:g id="DBM">%1$d</xliff:g>dBm <xliff:g id="ASU">%2$d</xliff:g>asu"</string>
+    <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>
@@ -2336,22 +2353,22 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"最近の検索"</string>
     <string name="search_results_label" msgid="4163304782363526148">"検索結果"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi ネットワーク 接続"</string>
-    <string name="keywords_more_default_sms_app" msgid="2744404159003574745">"テキスト メッセージ"</string>
-    <string name="keywords_more_mobile_networks" msgid="7813380887358745769">"モバイル 携帯通信会社 無線"</string>
+    <string name="keywords_more_default_sms_app" msgid="895656981962034647">"テキスト メッセージ テキスト送信 メッセージ SMS"</string>
+    <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"モバイル 携帯 携帯通信会社 無線 データ 4G 3G 2G LTE"</string>
     <string name="keywords_home" msgid="3626170808219458848">"ランチャー"</string>
     <string name="keywords_display" msgid="6709007669501628320">"画面 タッチスクリーン"</string>
-    <string name="keywords_display_brightness_level" msgid="8636451602230815191">"暗くする 画面 タッチスクリーン"</string>
-    <string name="keywords_display_auto_brightness" msgid="8070218600502753102">"暗くする 画面 タッチスクリーン"</string>
-    <string name="keywords_display_wallpaper" msgid="4315466287469834939">"バックグラウンド"</string>
+    <string name="keywords_display_brightness_level" msgid="8923289340474728990">"暗くする 画面 タッチスクリーン 電池"</string>
+    <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"暗くする 画面 タッチスクリーン 電池"</string>
+    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"背景 パーソナライズ カスタマイズ 表示"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"文字 サイズ"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"プロジェクト"</string>
-    <string name="keywords_storage" msgid="7007275853993419928">"スペース ディスク ハード ドライブ"</string>
-    <string name="keywords_battery" msgid="3992479295298655138">"電源"</string>
-    <string name="keywords_spell_checker" msgid="4509482591225399210">"スペル"</string>
+    <string name="keywords_storage" msgid="6572905220031852173">"容量 ディスク ハード ドライブ 端末 使用量"</string>
+    <string name="keywords_battery" msgid="2096185085932675704">"電源 使用量 充電"</string>
+    <string name="keywords_spell_checker" msgid="6106749039734174140">"スペル 辞書 スペルチェック 自動修正"</string>
     <string name="keywords_voice_input" msgid="3519547605812413860">"認識装置 入力 音声 話す 言語 ハンズフリー ハンズフリー 認識 不適切な 語句 音声 履歴 bluetooth ヘッドセット"</string>
-    <string name="keywords_text_to_speech_output" msgid="8207889472282225512">"速度 言語 デフォルト 読み上げる 読み上げ"</string>
-    <string name="keywords_date_and_time" msgid="7666950126499155141">"時計"</string>
-    <string name="keywords_factory_data_reset" msgid="3693730656843989732">"ワイプ 削除"</string>
+    <string name="keywords_text_to_speech_output" msgid="392447904221657930">"スピード 言語 デフォルト 音声 読み上げ TTS ユーザー補助 リーダー 目の不自由な"</string>
+    <string name="keywords_date_and_time" msgid="2631808108134830066">"時計 24時間"</string>
+    <string name="keywords_factory_data_reset" msgid="4355133848707691977">"ワイプ 削除 復元 消去 除去"</string>
     <string name="keywords_printing" msgid="1701778563617114846">"プリンタ"</string>
     <string name="keywords_sounds_and_notifications" msgid="5965996187974887000">"スピーカー ビープ音"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="2912933812460077912">"しない 表示しない 通知 中断する 中断 故障"</string>
@@ -2360,7 +2377,7 @@
     <string name="keywords_location_mode" msgid="8584992704568356084">"精度"</string>
     <string name="keywords_accounts" msgid="1957925565953357627">"アカウント"</string>
     <string name="keywords_users" msgid="4673901601478559100">"制限 制限する 制限された"</string>
-    <string name="keywords_keyboard_and_ime" msgid="1103378692379215672">"テキスト 修正 修正する 音 バイブレーション 自動 言語 ジェスチャー 提案する 候補 テーマ 不適切な 語句 入力する 絵文字"</string>
+    <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"テキスト 補正 修正 音 バイブレーション 自動 言語 ジェスチャー 候補 テーマ 不適切 語 入力 絵文字 国際"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"スライド パスワード パターン pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFCタグのセットアップ"</string>
     <string name="write_tag" msgid="8571858602896222537">"書き込む"</string>
@@ -2377,7 +2394,6 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"通知の音量"</string>
     <string name="zen_mode_settings_title" msgid="7014915558669122902">"割り込み"</string>
     <string name="zen_mode_option_title" msgid="5061978632306007914">"通話の着信時と通知の受信時"</string>
-    <string name="zen_mode_option_title_novoice" msgid="6680706009915204785">"通知の受信時"</string>
     <string name="zen_mode_option_off" msgid="3167702608910820883">"常に割り込み"</string>
     <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"優先的な割り込みのみ許可"</string>
     <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"割り込みなし"</string>
@@ -2426,23 +2442,26 @@
     <string name="app_notification_block_title" msgid="172237877395761371">"ブロック"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"このアプリからの通知を表示しない"</string>
     <string name="app_notification_priority_title" msgid="1967189807102076587">"優先度"</string>
-    <string name="app_notification_priority_summary" msgid="7513344552201639232">"端末が優先的な割り込みに設定されている場合に限り、通知を受け取ってリストの先頭に表示し続ける"</string>
+    <string name="app_notification_priority_summary" msgid="7513344552201639232">"通知をリストの先頭に表示し、端末が優先的な割り込みのみ許可に設定されていても表示する"</string>
     <string name="app_notification_sensitive_title" msgid="7707233094233553192">"プライベート"</string>
-    <string name="app_notification_sensitive_summary" msgid="2505314249332316395">"端末がロックされている場合、プライベートな内容はこのアプリの通知に表示されません"</string>
+    <string name="app_notification_sensitive_summary" msgid="2505314249332316395">"端末がロックされている場合、このアプリの通知のプライベートな内容を表示しない"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"ブロック済み"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"優先度"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"プライベート"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"完了"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"ユーザーがOFFにするまで"</string>
     <string name="zen_mode_important_category" msgid="8123274463331022993">"優先的な割り込み"</string>
-    <string name="zen_mode_downtime_category" msgid="4730179065426038108">"ダウンタイム（優先的な割り込みのみ）"</string>
+    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"ダウンタイム"</string>
     <string name="zen_mode_downtime_days" msgid="3361856902633311616">"日数"</string>
     <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"なし"</string>
+    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"中断を許可"</string>
+    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"重要な通知のみ"</string>
+    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"なし"</string>
     <string name="zen_mode_automation_category" msgid="4653551005950835761">"自動化"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"自動的にON"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">"、 "</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"なし"</string>
-    <string name="zen_mode_phone_calls" msgid="8956214416859303966">"通話"</string>
+    <string name="zen_mode_calls" msgid="7051492091133751208">"通話"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"メッセージ"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"発信/送信元"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"全員"</string>
@@ -2456,7 +2475,9 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"平日の夜間"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"開始時間"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"終了時間"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"次の日の<xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
+    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"翌日の<xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g>またはアラームが鳴るまで"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"翌日の<xliff:g id="FORMATTED_TIME">%s</xliff:g>またはアラームが鳴るまで"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"アプリの通知"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"通知設定"</string>
     <string name="device_feedback" msgid="3238056036766293294">"この端末についてフィードバックを送信"</string>
@@ -2464,7 +2485,11 @@
     <string name="switch_on_text" msgid="1124106706920572386">"ON"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"OFF"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"画面の固定"</string>
-    <string name="screen_pinning_description" msgid="7091642350452605379">"この設定をONにして画面の固定を使用すると、固定を解除するまで現在の画面が常に表示されるようになります。\n\n画面の固定を使用するには:\n\n1. 画面の固定がONになっていることを確認します。\n\n2. 固定する画面を開きます。\n\n3. [最近]をタップします。\n\n4. 固定アイコンをタップします。"</string>
+    <string name="screen_pinning_description" msgid="1137904524037468263">"この設定をONにして画面固定を使用すると、固定を解除するまで現在の画面が常に表示されるようになります。\n\n画面の固定を使用するには:\n\n1. 画面の固定がONになっていることを確認します。\n\n2. 固定する画面を開きます。\n\n3. [最近]をタップします。\n\n4. 上にスワイプして固定アイコンをタップします。"</string>
+    <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"画面固定を解除する前にロック解除パターンの入力を求める"</string>
+    <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"画面固定を解除する前にPINの入力を求める"</string>
+    <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"画面固定を解除する前にパスワードの入力を求める"</string>
+    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"画面固定を解除するときに端末をロックする"</string>
     <string name="managed_user_title" msgid="8101244883654409696">"ワークプロフィール"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"（試験運用）"</string>
     <string name="display_auto_rotate_title" msgid="6176450657107806043">"端末が回転したとき"</string>
@@ -2473,7 +2498,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"横向きのままにする"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"現在の向きを維持する"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI情報"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI関連情報"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"暗号化"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"次へ"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"この端末の起動前にPINを入力することでこの端末の保護を強化できます。端末が起動するまで、通話、メッセージ、アラームなどの通知を受信することはできません。\n\nこれにより、端末を紛失したり盗まれたりしても端末上のデータを保護することができます。"</string>
@@ -2491,4 +2515,7 @@
     <string name="encrypt_talkback_dialog_message_pin" msgid="1890374082842868489">"PINを入力してこの端末を開始しても、<xliff:g id="SERVICE">%1$s</xliff:g>のようなユーザー補助サービスはまだご利用になれません。"</string>
     <string name="encrypt_talkback_dialog_message_pattern" msgid="4474332516537386384">"パターンを入力してこの端末を開始しても、<xliff:g id="SERVICE">%1$s</xliff:g>のようなユーザー補助サービスはまだご利用になれません。"</string>
     <string name="encrypt_talkback_dialog_message_password" msgid="8166099418487083927">"パスワードを入力してこの端末を開始しても、<xliff:g id="SERVICE">%1$s</xliff:g>のようなユーザー補助サービスはまだご利用になれません。"</string>
+    <string name="imei_information_title" msgid="8499085421609752290">"IMEI情報"</string>
+    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI関連情報"</string>
+    <string name="slot_number" msgid="3762676044904653577">"（スロット<xliff:g id="SLOT_NUM">%1$d</xliff:g>）"</string>
 </resources>
diff --git a/res/values-ka-rGE/arrays.xml b/res/values-ka-rGE/arrays.xml
index cef9189..1a4f75f 100644
--- a/res/values-ka-rGE/arrays.xml
+++ b/res/values-ka-rGE/arrays.xml
@@ -527,4 +527,12 @@
     <item msgid="4338089220026248848">"ქეშირებულია (აქტივობის კლიენტი)"</item>
     <item msgid="6652164677254579050">"ქეშირებული (ცარიელი)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"ზურმუხტისფერი"</item>
+    <item msgid="8332294763632946560">"ლურჯი"</item>
+    <item msgid="2023216417616991392">"მუქი ლურჯი"</item>
+    <item msgid="3170497246594232819">"მეწამული"</item>
+    <item msgid="4608643045752965568">"ვარდისფერი"</item>
+    <item msgid="6131821495505931173">"წითელი"</item>
+  </string-array>
 </resources>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index 87acd37..4b1c2ffc 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>
@@ -180,7 +180,6 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s-ს უნდა თქვენს შეტყობინებებზე წვდომა. მისცემთ %2$s-ს წვდომას?"</string>
     <string name="date_and_time" msgid="9062980487860757694">"თარიღი და დრო"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"დროის ზონის არჩევა"</string>
-    <string name="normal_date_format" msgid="7636406984925498359">"რეგიონული (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"გადახედვა"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"შრიფტის ზომა:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -291,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>
@@ -322,8 +321,6 @@
     <string name="date_time_set_timezone" msgid="5045627174274377814">"აირჩიეთ დროის ზონა"</string>
     <string name="date_time_set_date_title" msgid="6928286765325608604">"თარიღი"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"თარიღის დაყენება"</string>
-    <string name="date_time_date_format_title" msgid="3976171711988766411">"თარიღის ფორმატი"</string>
-    <string name="date_time_date_format" msgid="6951498879879281102">"თარიღის ფორმატის არჩევა"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"ანბანური სორტირება"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"დახარისხება დროის სარტყელის მიხედვით"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"თარიღი"</string>
@@ -372,7 +369,8 @@
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"დაელოდეთ, ვიდრე თქვენი ტელეფონი დაიშიფრება. <xliff:g id="PERCENT">^1</xliff:g>% შესრულებულია."</string>
     <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"მოითმინეთ, სანამ თქვენი ტაბლეტი დაიშიფრებოდეს. დარჩენილი დრო: <xliff:g id="DURATION">^1</xliff:g>"</string>
     <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"მოითმინეთ, სანამ თქვენი ტელეფონი დაიშიფრებოდეს. დარჩენილი დრო: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"სცადეთ ხელახლა <xliff:g id="DELAY">^1</xliff:g> წამში."</string>
+    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"თქვენი ტაბლეტის განბლოკვისათვის, გამორთეთ და ხელახლა ჩართეთ."</string>
+    <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"ტელეფონის განბლოკვისათვის, გამორთეთ და ხელახლა ჩართეთ."</string>
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"გაფრთხილება: თქვენი მოწყობილობა სრულად წაიშლება განბლოკვის კიდევ <xliff:g id="COUNT">^1</xliff:g> არასწორი მცდელობის შემდეგ!"</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"აკრიფეთ თქვენი პაროლი"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"დაშიფვრა ვერ შესრულდა"</string>
@@ -401,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>
@@ -412,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>
@@ -556,13 +556,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"ხმამაღლამოსაუბრე კავშირისათვის"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"მუსიკისა და მულტიმედიისათვის"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"პარამეტრების დამახსოვრება"</string>
-    <string name="wifi_assistant_intro_setup" msgid="4605105515416995110">"ახალი\nWi‑Fi ასისტენტი"</string>
-    <string name="wifi_assistant_no_thanks" msgid="2776983751990143934">"გმადლობთ, არა"</string>
-    <string name="wifi_assistant_setup" msgid="3772423650475730906">"კონფიგურაცია"</string>
-    <string name="wifi_assistant_card_message" msgid="107811647784658536">"Wi‑Fi ასისტენტის საშუალებით ხელმისაწვდომ საიტებზე მიერთება."</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi‑Fi ასისტენტი"</string>
-    <string name="wifi_assistant_title_message" msgid="6240721017579074015">"<xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> ავტომატურად დაგაკავშირებთ საუკეთესო ხელმისაწვდომ Wi‑Fi-სთან"</string>
-    <string name="wifi_assistant_open_app" msgid="4803044899535675063">"აპის გახსნა"</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>
@@ -592,7 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Wi‑Fi პარამეტრები"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"უსადენო წვდომის წერტილების დაყენება და მართვა"</string>
-    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"აირჩიეთ Wi‑Fi"</string>
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"აირჩიეთ Wi-Fi ქსელი"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"აირჩიეთ Wi‑Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Wi‑Fi ირთვება…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"WiFi-ის გამორთვა…"</string>
@@ -607,8 +602,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"ყოველთვის ეძებე ქსელი"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"სკანირების მუდამ დაშვება"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Google მდებარეობის განმსაზღვრელმა სერვისმა და სხვა აპებმა მოახდინონ  ქსელების სკანირება, მაშინაც კი, როცა Wi-Fi გამორთულია"</string>
-    <string name="wifi_automatically_manage_title" msgid="6249976570008992746">"Wi‑Fi-ს ავტომატური მართვა"</string>
-    <string name="wifi_automatically_manage_summary" msgid="6952470763378312488">"<xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g>-ისთვის ნებართვის მინიჭება, რომ მართოს თქვენი Wi‑Fi კავშირი"</string>
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"ავრომატურად გამოიყენეოს ღია Wi-Fi"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"მიეცით Wi-Fi თანაშემწეს ავტომატურად დაუკავშირდეს ღია ქსელებს განისაზღვრება, როგორც მაღალი ხარისხის"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"აირჩიეთ თანაშემწე"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"სერთიფიკატების ინსტალაცია"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"მდებარეობის ზუსტი განსაზღვრისა და სხვა ფუნქციების გასაუმჯობესებლად Google-მა და სხვა აპებმა შეიძლება მოიძიონ ახლომდებარე ქსელები, მაშინაც კი, როცა Wi-Fi გამორთულია. თუ ეს არ გსურთ, გადადით „ყოველთვის ხელმისაწვდომ გაფართოებულ &gt; ძიებაზე“."</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"აპებს შეუძლია ახლომდებარე ქსელების მოძიება, თუნდაც იმ შემთხვევაში, თუ Wi-Fi გამორთულია. ამ პარამეტრების შესაცვლელად შეგიძლიათ გადახვიდეთ გაფართოებულ ძიებაზე."</string>
@@ -629,6 +625,7 @@
     <string name="wifi_menu_scan" msgid="1470911530412095868">"ძიება"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"დამატებითი"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"ქსელთან დაკავშირება"</string>
+    <string name="wifi_menu_remember" msgid="8814185749388713796">"ქსელის დახსომება"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"დაივიწყე ქსელი"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"ქსელის პარამეტრების შეცვლა"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"NFC თეგზე ჩაწერა"</string>
@@ -673,9 +670,11 @@
     <string name="wifi_unspecified" msgid="5431501214192991253">"(არ არის მითითებული)"</string>
     <string name="wifi_remembered" msgid="4955746899347821096">"დამახსოვრებულია"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"გამორთულია"</string>
-    <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"სუსტი ინტერნეტის თავიდან აცილება"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP კონფიგურაციის შეფერხება"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"WiFi კავშირის შეფერხება"</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"ავთენტიკაციის პრობლემა"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"არ არის დიაპაზონში"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"ინტერნეტთან წვდომის ამოცნობა ვერ მოხერხდა. ავტომატურად ხელახლა დაკავშირება არ განხორციელდება."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"ხელმისაწვდომია WPS"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS ხელმისაწვდომია)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"შეიყვანეთ თქვენი ქსელის პაროლი"</string>
@@ -699,9 +698,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"გაფრთხილება: თუ Wi‑Fi-ს გამოტოვებთ, თქვენი ტაბლეტი ფიჭურ ინტერნეტს მხოლოდ საწყისი ჩამოტვირთვისათვის და განახლებებისთვის. მონაცემთა გადაცემის ხარჯების ასარიდებლად, დაუკავშირდით Wi‑Fi-ს."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"გაფრთხილება: თუ Wi‑Fi-ს გამოტოვებთ, თქვენი მოწყობილობა ფიჭურ ინტერნეტს მხოლოდ საწყისი ჩამოტვირთვისათვის და განახლებებისთვის. მონაცემთა გადაცემის ხარჯების ასარიდებლად, დაუკავშირდით Wi‑Fi-ს."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"გაფრთხილება: თუ Wi‑Fi-ს გამოტოვებთ, თქვენი ტელეფონი ფიჭურ ინტერნეტს მხოლოდ საწყისი ჩამოტვირთვისათვის და განახლებებისთვის. მონაცემთა გადაცემის ხარჯების ასარიდებლად, დაუკავშირდით Wi‑Fi-ს."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="2393880108322835846">"გაფრთხილება: Wi‑Fi-ს თუ გამოტოვებთ, თქვენ ტაბლეტს საწყისი ჩამოტვირთვებისა და განახლებებისათვის ინტერნეტთან კავშირი არ ექნება."</string>
-    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1707391993265558787">"გაფრთხილება: Wi‑Fi-ს თუ გამოტოვებთ, თქვენი მოწყობილობას საწყისი ჩამოტვირთვებისა და განახლებებისათვის ინტერნეტთან კავშირი არ ექნება."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="1556858507920033022">"გაფრთხილება: Wi‑Fi-ს თუ გამოტოვებთ, თქვენ ტელეფონს საწყისი ჩამოტვირთვებისა და განახლებებისათვის ინტერნეტთან კავშირი არ ექნება."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"თუ თქვენ გამოტოვებთ Wi-Fi-ს:\n\nთქვენს ტაბლეტს არ ექნება ინტერნეტ კავშირი.\n\nთქვენ ვერ მიიღებთ პროგრამულ განახლებებს, სანამ ინტერნეტს არ დაუკავშირდებით.\n\nამ დროს თქვენ შეგიძლიათ გაააქტიუროთ მოწყობილობის დაცვის შესაძლებლობები."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"თუ თქვენ გამოტოვებთ Wi-Fi-ს:\n\nთქვენს მოწყობილობას არ ექნება ინტერნეტ კავშირი.\n\nთქვენ ვერ მიიღებთ პროგრამულ განახლებებს, სანამ ინტერნეტს არ დაუკავშირდებით.\n\nამ დროს თქვენ შეგიძლიათ გაააქტიუროთ მოწყობილობის დაცვის შესაძლებლობები."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"თუ თქვენ გამოტოვებთ Wi-Fi-ს:\n\nთქვენს ტელეფონს არ ექნება ინტერნეტ კავშირი.\n\nთქვენ ვერ მიიღებთ პროგრამულ განახლებებს, სანამ ინტერნეტს არ დაუკავშირდებით.\n\nამ დროს თქვენ შეგიძლიათ გაააქტიუროთ მოწყობილობის დაცვის შესაძლებლობები."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"ტაბლეტი ვერ დაუკავშირდა Wi‑Fi ქსელს."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"მოწყობილობა ამ Wi‑Fi ქსელს ვერ დაუკავშირდა."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"ტელეფონის ჩართვა ამ Wi-Fi ქსელში ვერ მოხერხდა."</string>
@@ -761,7 +760,6 @@
     <string name="ring_volume_title" msgid="7938706566797464165">"მრეკავის ხმა"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"ვიბრაცია დადუმებული ზარისას"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"ნაგულისხმევი ხმა შეტყობინებისთვის"</string>
-    <string name="heads_up_enabled_title" msgid="1031078221910921622">"ამოხტომა მაღალი პრიორიტეტისას"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"ზარი"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"შეტყობინებები"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"შემომავალი ზარის ხმის დონის გამოყენება შეტყობინებებისთვის"</string>
@@ -834,7 +832,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"ავტომატური სიკაშკაშე"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"გაღვიძება აწევისას"</string>
     <string name="doze_title" msgid="2259176504273878294">"გარემოს ეკრანი"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"მოწყობილობის აღებისას ან შემომავალი შეტყობინებებისას ეკრანის გამოღვიძება"</string>
+    <string name="doze_summary" msgid="7128970177894383698">"გამოაღვიძეთ ეკრანი, როდესაც მოწყობილობას აიღებთ ან მიიღებთ შეტყობინებას."</string>
     <string name="title_font_size" msgid="4405544325522105222">"შრიფტის ზომა"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"შრიფტის ზომა"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM ბარათის დაბლოკვის პარამეტრები"</string>
@@ -862,6 +860,10 @@
     <string name="sim_enter_cancel" msgid="6240422158517208036">"გაუქმება"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"მოიძებნა სხვადასხვა SIM-ები"</string>
     <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>
+    <string name="sim_preferred_title" msgid="5567909634636045268">"განახლდეს უპირატესი სიმ ბარათი?"</string>
+    <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> არის ერთადერთი სიმი თქვენს მოწყობილობაში. გსურთ, გამოიყენოთ ეს სიმი ფიჭური მონაცემების, ზარებისა და 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>
@@ -1012,6 +1014,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"ეს მოქმედება წაშლის ყველა მონაცემებს თქვენი ტაბლეტის "<b>"შიდა მეხსიერებიდან"</b>", მათ შორის:\n\n"<li>"თქვენს Google-ის ანგარიშს"</li>\n<li>"სისტემისა და აპების მონაცემებს და პარამეტრებს"</li>\n<li>"ჩამოტვირთულ აპებს"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"ეს მოქმედება წაშლის ყველა მონაცემებს თქვენი ტელეფონის "<b>"შიდა მეხსიერებიდან"</b>", მათ შორის:\n\n"<li>"თქვენს Google-ის ანგარიშს"</li>\n<li>"სისტემისა და აპების მონაცემებს და პარამეტრებს"</li>\n<li>"ჩამოტვირთულ აპებს"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"ამჟამად შესული ხართ შემდეგ ანგარიშებში:\n"</string>
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n" ამ მოწყობილობაზე წარმოდგენილია სხვა მომხმარებლები. \n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"მუსიკა"</li>\n<li>"ფოტოები"</li>\n<li>"მომხმარებლის სხვა მონაცემები"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"მუსიკის, ფოტოების და მომხმარებლის სხვა მონაცემების წასაშლელად საჭიროა "<b>"USB მეხსიერების"</b>" წაშლა."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"მუსიკის, სურათებისა და მომხმარებლის სხვა მონაცემების წასაშლელად უნდა წაიშალოს "<b>"SD ბარათი"</b>"."</string>
@@ -1023,7 +1026,6 @@
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"ტელეფონის საწყისი მდგომარეობის აღდგენა"</string>
     <string name="master_clear_final_desc" msgid="7209547812233487345">"გსურთ, ყველა თქვენი პირადი ინფორმაციისა და ჩამოტვირთული აპების წაშლა? ამ ქმედების უკან დაბრუნება შეუძლებელია."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"ყველაფრის წაშლა"</string>
-    <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"განბლოკვის თქვენი ნიმუშის შემუშავება"</string>
     <string name="master_clear_gesture_explanation" msgid="826193821455182780">"ქარხნული მონაცემების აღდგენის დასადასტურებლად საჭიროა გრაფიკული გასახების დახაზვა."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"არ ჩამოყრილა, რადგან System Clear სამსახური მიუწვდომელია."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"ჩამოვყაროთ პარამეტრები?"</string>
@@ -1041,7 +1043,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"გასუფთავდეს USB მეხსიერება და წაიშალოს მასში შენახული ყველა ფაილი? ამ მოქმედების უკან დაბრუნება შეუძლებელია!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"გასუფთავდეს SD ბარათი და წაიშალოს მასში შენახული ყველა ფაილი? ამ მოქმედების დაბრუნება შეუძლებელია!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"წაშალე ყველაფერი"</string>
-    <string name="media_format_gesture_prompt" msgid="3109349468816856670">"განბლოკვის თქვენი ნიმუშის შემუშავება"</string>
     <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"USB მეხსიერების წაშლის დასადასტურებლად უნდა დახაზოთ თქვენი განბლოკვის გრაფიკული გასაღები."</string>
     <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"უნდა დახაზოთ გრაფიკული გასაღები, რათა დაადასტუროთ, რომ გსურთ SD ბარათის წაშლა."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"დარეკვის პარამეტრები"</string>
@@ -1087,6 +1088,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"გთხოვთ, ჩადოთ SIM ბარათი და გადატვირთოთ"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"გთხოვთ, დააკავშიროთ ინტერნეტთან"</string>
     <string name="location_title" msgid="1029961368397484576">"ჩემი მდებარეობა"</string>
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"სამუშაო პროფილი"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"ადგილმდებარეობა სამუშაო პროფილისათვის"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"გამორთულია თქვენი კომპანიის მიერ"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"რეჟიმი"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"მაღალი სიზუსტე"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"ბატარეის დაზოგვა"</string>
@@ -1124,6 +1128,7 @@
     <string name="copyright_title" msgid="865906688917260647">"საავტორო უფლებები"</string>
     <string name="license_title" msgid="1990487604356037871">"ლიცენზია"</string>
     <string name="terms_title" msgid="7697580845616764642">"წესები და პირობები"</string>
+    <string name="webview_license_title" msgid="2813507464175738967">"სისტემის ვებ მიმოხილვის ლიცენზია"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"ფონები"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"სატელიტური სურათების პროვაიდერები:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"ღია კოდის ლიცენზიები"</string>
@@ -1237,7 +1242,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB მეხსიერება"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"SD ბარათზე"</string>
     <string name="disabled" msgid="9206776641295849915">"გამორთული"</string>
-    <string name="not_installed" msgid="1475144352069281880">"არ არის დაყენებული"</string>
+    <string name="not_installed" msgid="2797554494953450291">"ამ მომხმ. დაყენებული არ არის"</string>
     <string name="no_applications" msgid="7336588977497084921">"არ არის აპები."</string>
     <string name="internal_storage" msgid="1584700623164275282">"შიდა მეხსიერება"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB მეხსიერება"</string>
@@ -1434,8 +1439,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"დატენვისას ეკრანი არ დაიძინებს"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Bluetooth HCI snoop ჟურნალის ჩართვა"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"ყველა bluetooth HCI პაკეტის ფაილში ჩაწერა"</string>
-    <string name="oem_unlock_enable" msgid="6629321276287913315">"OEM განბლოკვის ჩართვა"</string>
-    <string name="oem_unlock_enable_summary" msgid="3546686263996628110">"მოწყობილობის OEM-ის საშუალებით განბლოკვის ჩართვა"</string>
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM განბლოკვა"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"ნება დართოს განბლოკოს ჩამტვირთველმა"</string>
+    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"შეიყვანეთ თქვენი PIN"</string>
+    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"OEM განბლოკვის ჩასართავად შეიყვანეთ თქვენი მოწყობილობის PIN"</string>
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"მისცეს ნება OEM განბლოკვას?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"გაფრთხილება: სანამ ეს პარამეტრი ჩართულია, მოწყობილობის დაცვის ფუნქცია ამ მოწყობილობაზე, ვერ იმუშავებს."</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"უსადენო ეკრანის სერტიფიცირება"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Wi‑Fi-ს დაწვრილებითი აღრიცხვის ჩართვა"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Wi‑Fi-დან ფიჭურ კავშირზე პროაქტიური ჰენდოვერი"</string>
@@ -1538,6 +1547,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"ტიტრები გამოჩნდება ასე"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"ნაგულისხმევი"</string>
+    <string name="color_title" msgid="4258931051732243983">"ფერი"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"ნაგულისხმევი"</string>
     <string name="color_none" msgid="3475640044925814795">"არცერთი"</string>
     <string name="color_white" msgid="8045195170201590239">"თეთრი"</string>
@@ -1595,12 +1605,12 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"დარჩენილია <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"დატენვამდე <xliff:g id="UNTIL_CHARGED">%1$s</xliff:g>"</string>
-    <string name="power_discharging_duration" msgid="7125493014448497620">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - დარჩა დაახლ. <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="power_charging" msgid="712751285832976915">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="STATE">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration" msgid="4802183864773082009">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> დატენვამდე"</string>
-    <string name="power_charging_duration_ac" msgid="3611179931297824699">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> AC-ზე სრულ დატენვამდე"</string>
-    <string name="power_charging_duration_usb" msgid="1106605348913397583">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> USB-ზე სრულ დატენვამდე"</string>
-    <string name="power_charging_duration_wireless" msgid="633606920144617227">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> უსადენოდან სრულ დატენვამდე"</string>
+    <string name="power_discharging_duration" msgid="1605929174734600590">"დაახლ. <xliff:g id="LEVEL">%1$s</xliff:g> დარჩენილია <xliff:g id="TIME">%2$s</xliff:g>"</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> სრულ დატენვამდე"</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> ელკვებით სრულ დატენვამდე"</string>
+    <string name="power_charging_duration_usb" msgid="182405645340976546">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> USB-თი სრულ დატენვამდე"</string>
+    <string name="power_charging_duration_wireless" msgid="1829295708243159464">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> უსადენოდან სრულ დატენვამდე"</string>
     <string name="power_usage_list_summary" msgid="2409288197839512482">"გამოიყენეთ მას შემდეგ, რაც სრულად დაიტენება"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"ბატარეის ხარჯი დამტენის გამოერთების შემდეგ"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"ელემენტის გამოყენება გადატვირთვის შემდეგ"</string>
@@ -1617,7 +1627,6 @@
     <string name="awake" msgid="387122265874485088">"მოწყობილობის ღვიძილის დრო"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi-ს მუშაობის დრო"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi‑Fi მუშაობის დრო"</string>
-    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"ისტორიის დეტალები"</string>
     <string name="details_title" msgid="3792801565213935385">"ბატარეის გამოყენების დეტალები"</string>
     <string name="details_subtitle" msgid="32593908269911734">"გამოყენების დეტალები"</string>
@@ -1689,7 +1698,7 @@
     <string name="battery_saver" msgid="1426682272004907982">"ბატარეის მზოგი"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"ავტომატურად გამორთვა"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"არასოდეს"</string>
-    <string name="battery_saver_turn_on_automatically_pct" msgid="3033681629861428940">"%1$d%% ბატარეაზე"</string>
+    <string name="battery_saver_turn_on_automatically_pct" msgid="7536784431655058267">"ბატარეის %1$s-ზე"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"პროცესის სტატისტიკა"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"მიმდინარე პროცესების შემაჯამებელი სტატისტიკა"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"გამოყენებული მეხსიერება"</string>
@@ -1813,7 +1822,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"აპარატურული"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"მხოლოდ პროგრამული"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"ამ მომხმარებლისთვის ავტორიზაციის მონაცემები ხელმისაწვდომი არ არის"</string>
-    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"დახაზეთ თქვენი განბლოკვის ნიმუში"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"ავტორიზაციის დაყენების დასადასტურებლად უნდა დახაზოთ თქვენი განბლოკვის ნიმუში."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"შეიყვანეთ ავტორიზაციის მონაცემთა საცავის პაროლი."</string>
@@ -1843,6 +1851,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"აპის მონაცემების ჩათვლით"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"ავტომატური აღდგენა"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"აპის ხელახალი ინსტალაციისას აღდგეს პარამეტრები და მონაცემები სარეზერვო კოპიიდან, თუ ის არსებობს"</string>
+    <string name="backup_inactive_title" msgid="5355557151569037197">"სარეზერვო სამსახური არ არის აქტიური."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"ეს დაყენებულია თქვენი მოწყობილობის პოლიტიკით."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"დესკტოპის სარეზერვო ასლის პაროლი"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"დესკტოპის სრული სარეზერვო ასლები ამჟამად დაცული არ არის"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"შეეხეთ დესკტოპის სრული სარეზერვო ასლების პაროლის შესაცვლელად ან წასაშლელად"</string>
@@ -1952,7 +1962,11 @@
     <string name="enter_password" msgid="8035706727471334122">"Android-ის ჩასართავად, შეიყვანეთ თქვენი პაროლი."</string>
     <string name="enter_pin" msgid="5305333588093263790">"Android-ის ჩასართავად, შეიყვანეთ თქვენი PIN."</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Android-ის ჩასართავად, მოხაზეთ თქვენი ნიმუში."</string>
-    <string name="try_again" msgid="4272075051293936921">"სცადეთ ხელახლა."</string>
+    <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"არასწორი ნიმუში"</string>
+    <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"არასწორი პაროლი"</string>
+    <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"არასწორი PIN"</string>
+    <string name="checking_decryption" msgid="8287458611802609493">"შემოწმება..."</string>
+    <string name="starting_android" msgid="8581493237458496835">"მიმდინარეობს Android-ის გამოძახება"</string>
     <string name="delete" msgid="4219243412325163003">"წაშლა"</string>
     <string name="misc_files" msgid="6720680815969643497">"სხვადასხვა ფაილი"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"არჩეულია <xliff:g id="NUMBER">%1$d</xliff:g> სულ <xliff:g id="TOTAL">%2$d</xliff:g>-დან"</string>
@@ -1990,8 +2004,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"ეკრანის კომპოზიციისთვის ყოველთვის გამოიყენე GPU"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"ფერთა სივრცის სიმულაცია"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"OpenGL კვალის ჩართვა"</string>
-    <string name="use_nuplayer" msgid="5699257393367904387">"NuPlayer-ის გამოყ.(ექსპ.)"</string>
-    <string name="use_nuplayer_summary" msgid="1991479067478516714">"AwesomePlayer-ის მაგივრად NuPlayer-ის გამოყენება"</string>
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"გამოიყენოს AwesomePlayer (უარყოფილია)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"უმეტესი მედიის ჩართვისათვის, NuPlayer-ს ნაცვლად, გამოიყენოს AwesomePlayer"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"USB აუდიო მარშრ. გამორთვა"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"USB აუდიო პერიფერიების ავტ.მარშრუტიზაციის გამორთვა"</string>
     <string name="debug_layout" msgid="5981361776594526155">"ელემენტების საზღვრის ჩვენება"</string>
@@ -2167,7 +2181,6 @@
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"მომხმარებლის ან პროფილის დამატება"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"მომხმარებლის დამატება"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"შეზღუდული პროფილი"</string>
-    <string name="user_summary_managed_profile" msgid="7369539529693048111">"სამუშაო პროფილი"</string>
     <string name="user_need_lock_message" msgid="2596365678651842785">"შეზღუდული პროფილის შექმნამდე, საკუთარი აპლიკაციებისა და პირადი მონაცემების დასაცავად, უნდა დაბლოკოთ ეკრანი."</string>
     <string name="user_set_lock_button" msgid="8311219392856626841">"საკეტის დაყენება"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"არ არის დარეგულირებული"</string>
@@ -2298,11 +2311,13 @@
     <string name="sim_cellular_data_unavailable_summary" msgid="3654805961942166428">"შეეხეთ მონაცემთა SIM-ის ასარჩევად"</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"ზარებისთვის მუდამ ამის გამოყენება"</string>
     <string name="select_sim_for_data" msgid="2366081042162853044">"მობილური ინტერნეტისთვის SIM-ის არჩევა"</string>
+    <string name="data_switch_started" msgid="2040761479817166311">"მონაცემების SIM-ზე გადართვა, ამას შესაძლოა ერთ წუთამდე დასჭირდეს..."</string>
     <string name="select_sim_for_calls" msgid="3503094771801109334">"დარეკვა SIM-ით:"</string>
     <string name="sim_select_card" msgid="211285163525563293">"აირჩიეთ SIM ბარათი"</string>
     <string name="sim_card_number_title" msgid="7845379943474336488">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"SIM ცარიელია"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"SIM-ის სახელი"</string>
+    <string name="sim_name_hint" msgid="7038643345238968930">"შეიყვანეთ SIM-ის სახელი"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"SIM სათავსო %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"ოპერატორი"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"ნომერი"</string>
@@ -2312,7 +2327,6 @@
     <string name="color_purple" msgid="3888532466427762504">"მეწამული"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"SIM ბარათები მოთავსებული არ არის"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"SIM სტატუსი"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"SIM-თან დაკავშირებული ინფორმაცია"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"გადარეკვა ნაგულისხმევი SIM-იდან"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"SIM გამავალი ზარებისთვის"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"ზარის სხვა პარამეტრები"</string>
@@ -2320,8 +2334,11 @@
     <string name="preferred_network_offload_header" msgid="2321173571529106767">"ქსელის სახ.გადაც. გამორთ."</string>
     <string name="preferred_network_offload_footer" msgid="5857279426054744020">"ქსელის სახელის გადაცემის გამორთვა გიცავთ მესამე მხარის მიერ ქსელის თქვენს მონაცემებზე წვდომისაგან."</string>
     <string name="preferred_network_offload_popup" msgid="2252915199889604600">"ქსელის სახელის გადაცემის გამორთვა დამალულ ქსელებში ავტომატურ დაკავშირებას აგარიდებთ."</string>
+    <string name="sim_signal_strength" msgid="9144010043784767984">"<xliff:g id="DBM">%1$d</xliff:g> dBm <xliff:g id="ASU">%2$d</xliff:g> asu"</string>
+    <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>
+    <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>
@@ -2330,22 +2347,22 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"ბოლო ძიებები"</string>
     <string name="search_results_label" msgid="4163304782363526148">"შედეგები"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi ქსელის კავშირი"</string>
-    <string name="keywords_more_default_sms_app" msgid="2744404159003574745">"ტექსტური შეტყობინება"</string>
-    <string name="keywords_more_mobile_networks" msgid="7813380887358745769">"ფიჭური მობილური ოპერატორი უსადენო"</string>
+    <string name="keywords_more_default_sms_app" msgid="895656981962034647">"ტექსტი შეტყობინება SMS დამესიჯება მესიჯი"</string>
+    <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"მობილური ფიჭური ოპერატორი უსადენო ინტერნეტი 4g 3g 2g lte"</string>
     <string name="keywords_home" msgid="3626170808219458848">"გამშვები"</string>
     <string name="keywords_display" msgid="6709007669501628320">"ეკრანის სენსორი"</string>
-    <string name="keywords_display_brightness_level" msgid="8636451602230815191">"დაბნელებული ეკრანის სენსორი"</string>
-    <string name="keywords_display_auto_brightness" msgid="8070218600502753102">"დაბნელებული ეკრანის სენსორი"</string>
-    <string name="keywords_display_wallpaper" msgid="4315466287469834939">"ფონი"</string>
+    <string name="keywords_display_brightness_level" msgid="8923289340474728990">"ეკრანის ჩაბნელება სენსორული ეკრანი ბატარეა"</string>
+    <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"ეკრანის ჩაბნელება სენსორული ეკრანი ბატარეა"</string>
+    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"ფონი პერსონალიზაცია მორგება დისპლეი"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"ტექსტის ზომა"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"პროექტი"</string>
-    <string name="keywords_storage" msgid="7007275853993419928">"სივრცე დისკი მყარი დისკი"</string>
-    <string name="keywords_battery" msgid="3992479295298655138">"ხარისხში აყვანა"</string>
-    <string name="keywords_spell_checker" msgid="4509482591225399210">"მართლწერა"</string>
+    <string name="keywords_storage" msgid="6572905220031852173">"დივრცე დისკი მყარი დისკი მოწყობილობა გამოყენება"</string>
+    <string name="keywords_battery" msgid="2096185085932675704">"ენერგიის გამოყენება დატენვა"</string>
+    <string name="keywords_spell_checker" msgid="6106749039734174140">"მართლწერის ლექსიკონი მართლწერა ავტოშესწორება"</string>
     <string name="keywords_voice_input" msgid="3519547605812413860">"ამომცნობი შეყვანა მეტყველება ლაპარაკი უხელო რეჟიმი ამოცნობა შეტევა სიტყვა აუდიო-ისტორია bluetooth ყურსასმენი"</string>
-    <string name="keywords_text_to_speech_output" msgid="8207889472282225512">"შეფასება ენა ნაგულისხმევი ლაპარაკი საუბარი"</string>
-    <string name="keywords_date_and_time" msgid="7666950126499155141">"საათი"</string>
-    <string name="keywords_factory_data_reset" msgid="3693730656843989732">"საიმედოდ წაშლა"</string>
+    <string name="keywords_text_to_speech_output" msgid="392447904221657930">"მაჩვენებეი ენა ნაგულისხმევი ლაპარაკი საუბარი tts ხელმისაწვდომობა მკითხველი უსინათლო"</string>
+    <string name="keywords_date_and_time" msgid="2631808108134830066">"საათი სამხედრო"</string>
+    <string name="keywords_factory_data_reset" msgid="4355133848707691977">"გადაშლა წაშლა აღდგენა გასუფთავება ამოშლა"</string>
     <string name="keywords_printing" msgid="1701778563617114846">"პრინტერი"</string>
     <string name="keywords_sounds_and_notifications" msgid="5965996187974887000">"სპიკერი სიგნალი"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="2912933812460077912">"არ შემაწუხოთ წყვეტა შეწყვეტა"</string>
@@ -2354,7 +2371,7 @@
     <string name="keywords_location_mode" msgid="8584992704568356084">"სიზუსტე"</string>
     <string name="keywords_accounts" msgid="1957925565953357627">"ანგარიში"</string>
     <string name="keywords_users" msgid="4673901601478559100">"შეზღუდვა შეზღუდული"</string>
-    <string name="keywords_keyboard_and_ime" msgid="1103378692379215672">"ტექსტის კორექცია კორექცია ხმა ვიბრაცია ავტო ენა ჟესტი შეთავაზება თემა შეტევა სიტყვა აკრეფა emoji"</string>
+    <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"ტექსტის კორექცია შესწორება ხმა ვიბრაცია ავტო ენა ჟესტი შეთავაზება თემა შეურაცხმყოფელი სიტყვა აკრეფა emoji საერთაშორისო"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"გასრიალება პაროლი ნიმუში pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC თეგის დაყენება"</string>
     <string name="write_tag" msgid="8571858602896222537">"ჩაწერა"</string>
@@ -2371,7 +2388,6 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"შეტყობინების ხმა"</string>
     <string name="zen_mode_settings_title" msgid="7014915558669122902">"შეწყვეტები"</string>
     <string name="zen_mode_option_title" msgid="5061978632306007914">"ზარების და შეტყობინებების შემოსვლისას"</string>
-    <string name="zen_mode_option_title_novoice" msgid="6680706009915204785">"შეტყობინებების შემოსვლისას"</string>
     <string name="zen_mode_option_off" msgid="3167702608910820883">"შეწყვეტა ნებისმიერ დროს"</string>
     <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"მხოლოდ პრიორიტეტული შეწყვეტების დაშვება"</string>
     <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"არ დაუშვა შეწყვეტა"</string>
@@ -2429,14 +2445,17 @@
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"დასრულება"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"სანამ ამას გამორთავდეთ"</string>
     <string name="zen_mode_important_category" msgid="8123274463331022993">"პრიორიტეტული შეწყვეტები"</string>
-    <string name="zen_mode_downtime_category" msgid="4730179065426038108">"შეჩერებული (მხოლოდ პრიორიტეტული შეწყვეტები)"</string>
+    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"ავარიული პაუზა"</string>
     <string name="zen_mode_downtime_days" msgid="3361856902633311616">"დღეები"</string>
     <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"არცერთი"</string>
+    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"დაშვებულია შეწყვეტები"</string>
+    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"მხოლოდ პრიორიტეტული"</string>
+    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"არცერთი"</string>
     <string name="zen_mode_automation_category" msgid="4653551005950835761">"ავტომატიზაცია"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"ავტომატურად ჩაირთოს"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"არასოდეს"</string>
-    <string name="zen_mode_phone_calls" msgid="8956214416859303966">"ზარები"</string>
+    <string name="zen_mode_calls" msgid="7051492091133751208">"ზარები"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"შეტყობინებები"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"ზარები/შეტყობინებები ავტორისგან:"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"ნებისმიერი"</string>
@@ -2450,7 +2469,9 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"კვირის ღამეებისას"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"დაწყების დრო"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"დასრულების დრო"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> შემდეგი დღე"</string>
+    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> შემდეგი დღე"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> ან ნებისმიერი წინა შეტყობინება"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> მეორე დღის, ან ნებისმიერი წინა შეტყობინება"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"აპის შეტყობინებები"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"შეტყობინების პარამეტრები"</string>
     <string name="device_feedback" msgid="3238056036766293294">"გამოხმაურება ამ მოწყობილობის შესახებ"</string>
@@ -2458,7 +2479,11 @@
     <string name="switch_on_text" msgid="1124106706920572386">"ჩართული"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"გამორთული"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"ეკრანზე ჩამაგრება"</string>
-    <string name="screen_pinning_description" msgid="7091642350452605379">"ჩართულ რეჟიმში, თქვენ შეგიძლიათ ეკრანის მიმაგრების ფუნქციის გამოყენებით ამჟამინდელი ეკრანი მიამაგროთ.\n\nეკრანის დამაგრების გამოსაყენებლად: \n\n1. დარწმუნდით, რომ ეკრანზე დამაგრების ფუნქცია გააქტიურებულია\n\n2. გახსენით ის ეკრანი, რომლის დამაგრებაც გსურთ.\n\n3. შეეხეთ მიმოხილვას.\n\n4. შეეხეთ მიმაგრების სიმბოლოს."</string>
+    <string name="screen_pinning_description" msgid="1137904524037468263">"როდესაც ეს პარამეტრი ჩართულია, შეგიძლიათ გამოიყენოთ ეკრანზე ჩამაგრება და მიმდინარე ეკრანი ჩაამაგროთ, სანამ მოხსნიდეთ.\n\nეკრანზე ჩამაგრებისათვის:\n\n1. დარწმუნდით, რომ ეკრანზე ჩამაგრება ჩართულია.\n\n2. გახსენით ეკრანი, რომლის ჩამაგრებაც გსურთ.\n\n3. შეეხეთ ტექსტს „მიმოხილვა“.\n\n4. აასრიალეთ ზევით და შემდეგ შეეხეთ ჭიკარტის ხატულას."</string>
+    <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"ფიქსაციის მოხსნამდე განბლოკვის ნიმუშის მოთხოვნა"</string>
+    <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"ფიქსაციის მოხსნამდე PIN-ის მოთხოვნა"</string>
+    <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"ფიქსაციის მოხსნამდე პაროლის მოთხოვნა"</string>
+    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"ჩამაგრების მოხსნიდან მოწყობილობის ჩაკეტვა"</string>
     <string name="managed_user_title" msgid="8101244883654409696">"სამუშაო პროფილი"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(ექსპერიმენტული)"</string>
     <string name="display_auto_rotate_title" msgid="6176450657107806043">"მოწყობილობის შეტრიალებისას"</string>
@@ -2467,7 +2492,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"ლანდშაფტის ხედზე დარჩენა"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"ამჟამინდელ ორიენტაციაზე დარჩენა"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI ინფორმაცია"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI შესაბამისი ინფორმაცია"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"დაშიფვრა"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"გაგრძელება"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"ამ მოწყობილობის დაცვა დამატებით შეგიძლიათ, დაწყებამდე PIN-ის მოთხოვნით. მოწყობილობის დაწყებამდე ზარების, შეტყობინებების და შეხსენებების, ასევე მაღვიძარების მიღებას ვერ მოახერხებს. \n\nეს ტელეფონის დაკარგვის შემთხვევაში მონაცემთა დაცვას ემსახურება."</string>
@@ -2485,4 +2509,7 @@
     <string name="encrypt_talkback_dialog_message_pin" msgid="1890374082842868489">"როდესაც ამ მოწყობილობის ჩასართავად თქვენს PIN-ს შეიყვანთ, მარტივი წვდომის სერვისები, როგორიცაა <xliff:g id="SERVICE">%1$s</xliff:g> ხელმისაწვდომი ჯერ არ იქნება."</string>
     <string name="encrypt_talkback_dialog_message_pattern" msgid="4474332516537386384">"როდესაც ამ მოწყობილობის ჩასართავად თქვენს ნიმუშს შეიყვანთ, მარტივი წვდომის სერვისები, როგორიცაა <xliff:g id="SERVICE">%1$s</xliff:g> ხელმისაწვდომი ჯერ არ იქნება."</string>
     <string name="encrypt_talkback_dialog_message_password" msgid="8166099418487083927">"როდესაც ამ მოწყობილობის ჩასართავად თქვენს პაროლს შეიყვანთ, მარტივი წვდომის სერვისები, როგორიცაა <xliff:g id="SERVICE">%1$s</xliff:g> ხელმისაწვდომი ჯერ არ იქნება."</string>
+    <string name="imei_information_title" msgid="8499085421609752290">"IMEI ინფორმაცია"</string>
+    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI შესაბამისი ინფორმაცია"</string>
+    <string name="slot_number" msgid="3762676044904653577">"(სლოტი<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-kk-rKZ/arrays.xml b/res/values-kk-rKZ/arrays.xml
index 247f0bb..bb6ed9c 100644
--- a/res/values-kk-rKZ/arrays.xml
+++ b/res/values-kk-rKZ/arrays.xml
@@ -527,4 +527,12 @@
     <item msgid="4338089220026248848">"Кэштелген (белсенділік клиенті)"</item>
     <item msgid="6652164677254579050">"Кэштелген (бос)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Көгілдір"</item>
+    <item msgid="8332294763632946560">"Көк"</item>
+    <item msgid="2023216417616991392">"Индиго түсі"</item>
+    <item msgid="3170497246594232819">"Қызылкүрең"</item>
+    <item msgid="4608643045752965568">"Қызғылт"</item>
+    <item msgid="6131821495505931173">"Қызыл"</item>
+  </string-array>
 </resources>
diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk-rKZ/strings.xml
index 77fd88e..510cadd 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>
@@ -180,7 +180,6 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s хабарларыңызға кіруді қалайды. %2$s кірсін бе?"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Күн және уақыт"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Уақыт аймағын таңдау"</string>
-    <string name="normal_date_format" msgid="7636406984925498359">"Жергілікті (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Алдын ала көру:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Шрифт өлшемі:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -291,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>
@@ -322,8 +321,6 @@
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Уақыт аймағын таңдау"</string>
     <string name="date_time_set_date_title" msgid="6928286765325608604">"Күні"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"Күнін реттеу"</string>
-    <string name="date_time_date_format_title" msgid="3976171711988766411">"Күн пішімі"</string>
-    <string name="date_time_date_format" msgid="6951498879879281102">"Дерекқор форматын таңдау"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Әліппе бойынша сұрыптау"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Уақыт аймағы бойынша сұрыптау"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Күн-айы"</string>
@@ -372,7 +369,8 @@
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Телефон зарядталғанша күтіңіз. <xliff:g id="PERCENT">^1</xliff:g>% аяқталды."</string>
     <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Планшет шифрланып жатыр, күтіңіз. Қалған уақыт: <xliff:g id="DURATION">^1</xliff:g>"</string>
     <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Телефон шифрланып жатыр, күтіңіз. Қалған уақыт: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"<xliff:g id="DELAY">^1</xliff:g> секундтан кейін қайта әрекеттеніңіз."</string>
+    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"To unlock your tablet, turn it off and then on."</string>
+    <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"To unlock your phone, turn it off and then on."</string>
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"Ескерту: бекітпесін ашудың тағы <xliff:g id="COUNT">^1</xliff:g> әрекетінен кейін құрылғыңыздың деректері өшіріледі!"</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Кілстөзін теру"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Кодтау орындалмады"</string>
@@ -401,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>
@@ -412,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>
@@ -556,13 +556,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Үндеткіш телефоны ретінде"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Музыка және медиа үшін"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Параметрлерді есте сақтау"</string>
-    <string name="wifi_assistant_intro_setup" msgid="4605105515416995110">"Wi‑Fi Assistant\nкіріспе"</string>
-    <string name="wifi_assistant_no_thanks" msgid="2776983751990143934">"ЖОҚ, РАҚМЕТ"</string>
-    <string name="wifi_assistant_setup" msgid="3772423650475730906">"РЕТТЕУ"</string>
-    <string name="wifi_assistant_card_message" msgid="107811647784658536">"Wi‑Fi Assistant бар қол жетімді желілерге автоматты түрде қосылу."</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi‑Fi Assistant"</string>
-    <string name="wifi_assistant_title_message" msgid="6240721017579074015">"<xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> ең жақсы қол жетімді Wi‑Fi желісіне автоматты түрде қосылады"</string>
-    <string name="wifi_assistant_open_app" msgid="4803044899535675063">"ҚОЛДАНБАНЫ АШУ"</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>
@@ -592,7 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Wi‑Fi параметрлері"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Сымсыз қол жетімділік нүктесін орнату және басқару"</string>
-    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Wi‑Fi таңдау"</string>
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Wi‑Fi желісін таңдау"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Wi‑Fi желісін таңдау"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Wi‑Fi байланысын қосуда…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Wi‑Fi байланысын өшіруде…"</string>
@@ -607,8 +602,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"Тексеру әрқашан қол жетімді"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Тексеруге әрқашан рұқсат ету"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Google орынды анықтау қызметі және басқа қолданбалар тіпті Wi-Fi өшіріліп тұрса да желілердің бар-жоғын тексереді"</string>
-    <string name="wifi_automatically_manage_title" msgid="6249976570008992746">"Wi‑Fi желісін автоматты түрде басқару"</string>
-    <string name="wifi_automatically_manage_summary" msgid="6952470763378312488">"<xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> Wi‑Fi байланысын басқаруға рұқсат ету"</string>
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Wi‑Fi желісін автоматты түрде пайдалану"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Wi‑Fi көмекшісіне сапасы жоғары екені анықталған ашық желілерге автоматты түрде қосылуға мүмкіндік береді"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Көмекшіні таңдау"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Сертификаттар орнату"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Аймақ нақтылығын жақсарту және басқа мақсаттар үшін Google және басқа қолданбалар маңайдағы желілерді тексеруі мүмкін, Wi-Fi өшіріліп тұрса да. Егер бұны қаламасаңыз, Жетілдірілген&gt; Тексеру әрқашан қол жетімді тармақтарына кіріңіз."</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Қолданбалардың маңайдағы желілерді тексеру мүмкіндігі болады, Wi-Fi өшіріліп тұрса да. Егер бұны қаламасаңыз, Жетілдірілген&gt; Тексеру әрқашан қол жетімді тармақтарына кіріңіз."</string>
@@ -629,6 +625,7 @@
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Скандеу"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Қосымша"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Желіге жалғау"</string>
+    <string name="wifi_menu_remember" msgid="8814185749388713796">"Желіні есте сақтау"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Желіні ұмыту"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Желіні өзгерту"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"NFC белгісіне жазу"</string>
@@ -673,9 +670,11 @@
     <string name="wifi_unspecified" msgid="5431501214192991253">"(анықталмаған)"</string>
     <string name="wifi_remembered" msgid="4955746899347821096">"Сақталды"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"Өшірілген"</string>
-    <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Нашар интернет байланысын қолданбады"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP конфигурациясының қатесі"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Wi-Fi байланысының қатесі"</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Растау мәселесі"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Аумақта жоқ"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Интернетке қатынас анықталмады, автоматты түрде қайта қосылу орындалмайды."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS қол жетімді"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS қол жетімді)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Желі құпия сөзін енгізіңіз"</string>
@@ -699,9 +698,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"ЕСКЕРТУ: егер Wi‑Fi қадамын өткізіп жіберсеңіз, планшет бастапқы жүктеулер және жаңартулар үшін тек ұялы деректерді пайдаланады. Ықтимал деректер ақыларын болдырмау үшін Wi‑Fi желісіне қосылыңыз."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"ЕСКЕРТУ: егер Wi‑Fi қадамын өткізіп жіберсеңіз, құрылғы бастапқы жүктеулер және жаңартулар үшін тек ұялы деректерді пайдаланады. Ықтимал деректер ақыларын болдырмау үшін Wi‑Fi желісіне қосылыңыз."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"ЕСКЕРТУ: егер Wi‑Fi қадамын өткізіп жіберсеңіз, телефон бастапқы жүктеулер және жаңартулар үшін тек ұялы деректерді пайдаланады. Ықтимал деректер ақыларын болдырмау үшін Wi‑Fi желісіне қосылыңыз."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="2393880108322835846">"ЕСКЕРТУ: Wi‑Fi қадамын өткізіп жіберсеңіз, планшетте кез келген бастапқы жүктеулер немесе жаңартулар үшін пайдаланатын интернет байланысы болмайды."</string>
-    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1707391993265558787">"ЕСКЕРТУ: Wi‑Fi қадамын өткізіп жіберсеңіз, құрылғыда кез келген бастапқы жүктеулер немесе жаңартулар үшін пайдаланатын интернет байланысы болмайды."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="1556858507920033022">"ЕСКЕРТУ: Wi‑Fi қадамын өткізіп жіберсеңіз, телефонда кез келген бастапқы жүктеулер немесе жаңартулар үшін пайдаланатын интернет байланысы болмайды."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Wi‑Fi желісін өткізіп жіберсеңіз:\n\nПланшетіңізде интернет байланысы болмайды.\n\nИнтернетке қосылғанша бағдарламалық жасақтама жаңартуларын алмайсыз.\n\nҚазіргі уақытта құрылғының қорғау мүмкіндіктерін белсендіре алмайсыз."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Wi‑Fi желісін өткізіп жіберсеңіз:\n\nҚұрылғыңызда интернет байланысы болмайды.\n\nИнтернетке қосылғанша бағдарламалық жасақтама жаңартуларын алмайсыз.\n\nҚазіргі уақытта құрылғының қорғау мүмкіндіктерін белсендіре алмайсыз."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Wi‑Fi желісін өткізіп жіберсеңіз:\n\nТелефоныңызда интернет байланысы болмайды.\n\nИнтернетке қосылғанша бағдарламалық жасақтама жаңартуларын алмайсыз.\n\nҚазіргі уақытта құрылғының қорғау мүмкіндіктерін белсендіре алмайсыз."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Планшет осы Wi‑Fi желісіне қосыла алмады."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"Құрылғы осы Wi‑Fi желісіне қосыла алмады."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Телефон осы Wi‑Fi желісіне жалғана алмады."</string>
@@ -761,7 +760,6 @@
     <string name="ring_volume_title" msgid="7938706566797464165">"Шырылдау қаттылығы"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Үнсіз кезінде тербеу"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Бастапқы хабар дыбысы"</string>
-    <string name="heads_up_enabled_title" msgid="1031078221910921622">"Бас-ғы жоғ. болса, қалқып шығу"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Қоңырау әуені"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Хабар"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Келген қоңырау дыбысын хабарлар үшін қолдану"</string>
@@ -834,7 +832,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Aвтоматтық жарықтық"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Ояту үшін көтеру"</string>
     <string name="doze_title" msgid="2259176504273878294">"Айналаны көрсету"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"Құрылғы тұтқасын алғанда немесе хабарландырулар келгенде экранды ояту"</string>
+    <string name="doze_summary" msgid="7128970177894383698">"Құрылғыны көтергенде немесе хабарландырулар алғанда экранды ояту"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Шрифт өлшемі"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Шрифт өлшемі"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM картасын бекіту параметрлері"</string>
@@ -862,6 +860,10 @@
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Өшіру"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"Бірнеше SIM картасы табылды"</string>
     <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>
+    <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 PIN коды дұрыс емес қазір сізге құрылғыны ашу өтінішімен жабдықтаушыға хабарласу қажет."</string>
   <plurals name="wrong_pin_code">
     <item quantity="one" msgid="4840607930166101114">"SIM PIN коды дұрыс емес, жабдықтаушыға құрылғыны бекіту өтінішімен хабарласуға дейін <xliff:g id="NUMBER">%d</xliff:g> рет әрекеттену мүмкіндігіңіз бар."</item>
@@ -1012,6 +1014,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Бұл сіздің планшетіңіздің "<b>"ішкі жадынан"</b>" барлық дерекқорды өшіреді, келесі деректерді қоса:\n\n"<li>"Google есептік жазбаңыз"</li>\n<li>"Жүйе және қолданба дерекқоры және параметрлері"</li>\n<li>"Жүктелген қолданбалар"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Бұл телефонның "<b>"ішкі жадынан"</b>" барлық деректерді өшіреді:\n\n"<li>" Google есептік жазбаңызды"</li>\n<li>"Жүйе және қолданба дерекқоры мен параметрлерін"</li>\n<li>"Жүктелген қолданбаларды"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Сіз келесі есептік жазбаларға кірдіңіз:\n"</string>
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Осы құрылғыда басқа пайдаланушылар бар.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Mузыка"</li>\n<li>"Фотосуреттер"</li>\n<li>"Басқа пайдаланушы деректері"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Музыка, фотосуреттер және басқа деректерді өшіру үшін, "<b>"USB жадын"</b>" өшіру қажет."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Музыка, фотосуреттер және басқа пайдаланушы деректерін тазалау үшін "<b>"SD картасы"</b>" өшірілуі тиіс."</string>
@@ -1023,7 +1026,6 @@
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Телефонды қайта реттеу"</string>
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Барлық жеке ақпаратыңыз бен жүктелген қолданбаларыңыз жойылсын ба? Бұл әрекетті кері орындау мүмкін болмайды!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Барлығын өшіру"</string>
-    <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Бекітпе ашу кескінін сызыңыз"</string>
     <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Зауыттық дерекқорды қайта реттеуді растау үшін бектіпе ашу кескінін сызуыңыз қажет."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Қайта реттеулер орындалмады, себебі Жүйе Тазалау қызметі қол жетімсіз."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Қайта реттелсін бе?"</string>
@@ -1041,7 +1043,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"USB жады ішінде сақталған барлық деректерімен бірге өшірілісін бе? Бұл әрекетті кері орындау мүмкін болмайды!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"SD картасы ішінде сақталған барлық деректерімен бірге өшірілісін бе? Бұл әрекетті кері орындау мүмкін болмайды!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Барлығын өшіріңіз"</string>
-    <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Бекітпесін ашу кескінін сызу"</string>
     <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"USB жадын өшіруді қалайтыныңызды растау үшін бекітпе ашу кескінін қайта сызуыңыз қажет."</string>
     <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"SD картасын өшіруді қалайтыныңызды растау үшін бектіпе ашу кескінін сызуыңыз қажет."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Қоңырау параметрлері"</string>
@@ -1087,6 +1088,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"SIM картасын енгізіп, қайта бастаңыз"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Интернетке қосылыңыз"</string>
     <string name="location_title" msgid="1029961368397484576">"Mенің аймағым"</string>
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Жұмыс профилі"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Жұмыс профилінің орны"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Компанияңыз өшірген"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Режим"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Жоғары дәлдік"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Батарея үнемдеу"</string>
@@ -1124,6 +1128,7 @@
     <string name="copyright_title" msgid="865906688917260647">"Авторлық құқықтар"</string>
     <string name="license_title" msgid="1990487604356037871">"Лицензия"</string>
     <string name="terms_title" msgid="7697580845616764642">"Шарттары"</string>
+    <string name="webview_license_title" msgid="2813507464175738967">"Жүйенің WebView лицензиясы"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Экранның артқы фондары"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Жерсерік кескіндерін жеткізушілер:\n©2014 CNES/Astrium, DigitalGlobe, Bluesky"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Бастапқы лицензияларды ашу"</string>
@@ -1237,7 +1242,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB жады"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"SD картасында"</string>
     <string name="disabled" msgid="9206776641295849915">"Өшірілген"</string>
-    <string name="not_installed" msgid="1475144352069281880">"Орнатылмаған"</string>
+    <string name="not_installed" msgid="2797554494953450291">"Осы пайдал. үшін орнатылмаған"</string>
     <string name="no_applications" msgid="7336588977497084921">"Қолданбалар жоқ"</string>
     <string name="internal_storage" msgid="1584700623164275282">"Ішкі жад"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB жады"</string>
@@ -1434,8 +1439,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Зарядтау кезінде экран ұйықтамайды"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Bluetooth HCI snoop тіркелімін қосу"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Барлық bluetooth HCI жинақтарын файлға сақтаңыз"</string>
-    <string name="oem_unlock_enable" msgid="6629321276287913315">"OEM бекітпесін ашуды қосу"</string>
-    <string name="oem_unlock_enable_summary" msgid="3546686263996628110">"Құрылғыға OEM бекітпесін ашуға рұқсат ету"</string>
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM бекітпесін ашу"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Жүктеуші бекітпесін ашуға рұқсат ету"</string>
+    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"PIN кодын енгізіңіз"</string>
+    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"OEM бекітпесін ашуды қосу үшін құрылғының PIN кодын енгізіңіз"</string>
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"OEM бекітпесін ашуға рұқсат ету керек пе?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"ЕСКЕРТУ: осы параметр қосулы кезде осы құрылғыда құрылғыны қорғау мүмкіндіктері жұмыс істемейді."</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Сымсыз дисплей сертификаты"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Wi‑Fi егжей-тегжейлі журналға тір. қосу"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Агрессивті Wi‑Fi жел. ұялы жел. ауыстыру"</string>
@@ -1538,6 +1547,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"Айдары осындай болады"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"Бастапқы"</string>
+    <string name="color_title" msgid="4258931051732243983">"Түс"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"Әдепкі"</string>
     <string name="color_none" msgid="3475640044925814795">"Ешқандай"</string>
     <string name="color_white" msgid="8045195170201590239">"Ақ"</string>
@@ -1595,12 +1605,12 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"<xliff:g id="REMAIN">%1$s</xliff:g> қалды"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"Зарядталғанша <xliff:g id="UNTIL_CHARGED">%1$s</xliff:g>"</string>
-    <string name="power_discharging_duration" msgid="7125493014448497620">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – шамамен <xliff:g id="TIME">%2$s</xliff:g> қалды"</string>
-    <string name="power_charging" msgid="712751285832976915">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – <xliff:g id="STATE">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration" msgid="4802183864773082009">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - толғанған дейін <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration_ac" msgid="3611179931297824699">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - айнымалы токпен толғанға дейін <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration_usb" msgid="1106605348913397583">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - USB арқылы толғанға дейін <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration_wireless" msgid="633606920144617227">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - сымсыз қосылымнан толғанға дейін <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> - шамамен <xliff:g id="TIME">%2$s</xliff:g> қалды"</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>"</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>"</string>
+    <string name="power_charging_duration_usb" msgid="182405645340976546">"<xliff:g id="LEVEL">%1$s</xliff:g> - USB арқылы толғанша <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="power_charging_duration_wireless" msgid="1829295708243159464">"<xliff:g id="LEVEL">%1$s</xliff:g> - сымсыз толғанша <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="power_usage_list_summary" msgid="2409288197839512482">"Соңғы толық зарядтаудан бері пайдалану"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Ажыратылғаннан бері батарея қолданысы"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Қайта реттелгеннен бергі батарея қолданысы"</string>
@@ -1617,7 +1627,6 @@
     <string name="awake" msgid="387122265874485088">"Құрылғыны ояту уақыты"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi‑Fi уақытында"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi‑Fi уақытында"</string>
-    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Тарих егжей-тегжейі"</string>
     <string name="details_title" msgid="3792801565213935385">"Егжей-тегжейлі ақпаратты қолдану"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Қолдану деректері"</string>
@@ -1689,7 +1698,7 @@
     <string name="battery_saver" msgid="1426682272004907982">"Батарея үнемдегіш"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Автоматты түрде қосу"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Ешқашан"</string>
-    <string name="battery_saver_turn_on_automatically_pct" msgid="3033681629861428940">"%1$d%% батарея зарядында"</string>
+    <string name="battery_saver_turn_on_automatically_pct" msgid="7536784431655058267">"%1$s батареяда"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Үрдіс статистикалары"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Қосылған үрдістерге қатысты гик статистикалары"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Жад қолдану"</string>
@@ -1813,7 +1822,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Компьютерлік жабдықтаманың сақтық көшірмесі жасалды"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Компьютерлік бағдарлама ғана"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"Осы пайдаланушы үшін тіркелгі деректері қол жетімді емес"</string>
-    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Бекітпесін ашу кескінін сызу"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Растау деректері қорын орнатуды растау үшін бекітпені ашатын кескінді сызуыңыз қажет."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Растау деректерінің жадының кілсөзін енгізіңіз."</string>
@@ -1843,6 +1851,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"Қолданба деректерін қамту"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Aвтоматтық қалпына келтіру"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Қолданбаны қайта орнатқанда параметрлер және деректердің сақтық көшірмесін қалпына келтіріңіз"</string>
+    <string name="backup_inactive_title" msgid="5355557151569037197">"Сақтық көшірме жасау қызметі белсенді емес."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"Бұл құрылғы саясаты арқылы орнатылған."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Компьютер үстелінің сақтық көшірмесі"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Жұмыс үстелінің сақтық көшірмелері қазір қорғалмаған"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Жұмыс үстелінің толық сақтық көшірмесінің кілтсөзін өзгерту немесе жою үшін түртіңіз"</string>
@@ -1952,7 +1962,11 @@
     <string name="enter_password" msgid="8035706727471334122">"Android құрылғысын іске қосу үшін құпия сөзіңізді енгізіңіз"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Android құрылғысын іске қосу үшін PIN кодын енгізіңіз"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Android құрылғысын іске қосу үшін өрнекті енгізіңіз"</string>
-    <string name="try_again" msgid="4272075051293936921">"Қайта әрекеттену."</string>
+    <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"Қате өрнек"</string>
+    <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"Қате құпия сөз"</string>
+    <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"Қате PIN"</string>
+    <string name="checking_decryption" msgid="8287458611802609493">"Тексеру…"</string>
+    <string name="starting_android" msgid="8581493237458496835">"Android жүйесі іске қосылуда"</string>
     <string name="delete" msgid="4219243412325163003">"Жою"</string>
     <string name="misc_files" msgid="6720680815969643497">"Басқа файлдар"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"<xliff:g id="NUMBER">%1$d</xliff:g> таңдалды, барлығы <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -1990,8 +2004,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Экранды жасақтау үшін әрқашан графикалық процессор қолдану қажет"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"Түстер аймағына еліктеу"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"OpenGL (ашық графика кітапханасы) қолданбасы қосу"</string>
-    <string name="use_nuplayer" msgid="5699257393367904387">"NuPlayer (эксп-тік) пайд."</string>
-    <string name="use_nuplayer_summary" msgid="1991479067478516714">"AwesomePlayer орнына NuPlayer пайдалану"</string>
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"AwesomePlayer пайдалану (ескірген)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"Медианың көпшілігін ойнату үшін NuPlayer орнына AwesomePlayer пайдалану"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"USB аудио бағыттау. өшіру"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"USB перифериялық аудио құр-на автоматты бағ. өшіру"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Орналасу жиектерін көрсету"</string>
@@ -2167,7 +2181,6 @@
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Пайдаланушы немесе профиль қосу"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Пайдаланушы қосу"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Шектеулі профайл"</string>
-    <string name="user_summary_managed_profile" msgid="7369539529693048111">"Жұмыс профилі"</string>
     <string name="user_need_lock_message" msgid="2596365678651842785">"Шектелген профайл жасақтауға дейін қолданбалар мен жеке деректерді қорғау үшін экран бекітпесін тағайындау қажет."</string>
     <string name="user_set_lock_button" msgid="8311219392856626841">"Бекітпе тағайындау"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Жасақталмаған"</string>
@@ -2298,11 +2311,13 @@
     <string name="sim_cellular_data_unavailable_summary" msgid="3654805961942166428">"Деректер SIM картасын таңдау үшін түртіңіз"</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"Осыны қоңыраулар үшін әрқашан пайдалану"</string>
     <string name="select_sim_for_data" msgid="2366081042162853044">"Деректер үшін SIM картасын таңдау"</string>
+    <string name="data_switch_started" msgid="2040761479817166311">"Деректер SIM картасы ауыстырылуда, бұл бір минутқа дейін алуы мүмкін..."</string>
     <string name="select_sim_for_calls" msgid="3503094771801109334">"Келесімен қоңырау шалу"</string>
     <string name="sim_select_card" msgid="211285163525563293">"SIM картасын таңдау"</string>
     <string name="sim_card_number_title" msgid="7845379943474336488">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"SIM бос"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"SIM атауы"</string>
+    <string name="sim_name_hint" msgid="7038643345238968930">"SIM атауын енгізіңіз"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"%1$d SIM слоты"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Оператор"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Нөмір"</string>
@@ -2312,7 +2327,6 @@
     <string name="color_purple" msgid="3888532466427762504">"Қызылкүрең"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"SIM карталары салынбаған"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"SIM күйі"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"SIM картасына қатысты ақпарат"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"Әдепкі SIM картасынан кері қоңырау шалу"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"Шығыс қоңырауларға арналған SIM картасы"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Басқа қоңырау параметрлері"</string>
@@ -2320,8 +2334,11 @@
     <string name="preferred_network_offload_header" msgid="2321173571529106767">"Желі атауын таратуды өшіру"</string>
     <string name="preferred_network_offload_footer" msgid="5857279426054744020">"«Желі атауын таратуды өшіру» желі туралы ақпаратқа қатынас алатын үшінші тараптардан қорғайды."</string>
     <string name="preferred_network_offload_popup" msgid="2252915199889604600">"«Желі атауын таратуды өшіру» жасырын желілерге автоматты түрде қосылуды болдырмайды."</string>
+    <string name="sim_signal_strength" msgid="9144010043784767984">"<xliff:g id="DBM">%1$d</xliff:g> дБ/мВт <xliff:g id="ASU">%2$d</xliff:g> асб"</string>
+    <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>
+    <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>
@@ -2330,22 +2347,22 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Жақындағы іздеулер"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Нәтижелер"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi желі байланысы"</string>
-    <string name="keywords_more_default_sms_app" msgid="2744404159003574745">"мәтіндік хабар"</string>
-    <string name="keywords_more_mobile_networks" msgid="7813380887358745769">"ұялы оператор сымсыз"</string>
+    <string name="keywords_more_default_sms_app" msgid="895656981962034647">"мәтіндік хабар мәтіндік хабарлар жіберу хабар алмасу"</string>
+    <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"ұялы ұялы оператор сымсыз деректер 4g 3g 2g lte"</string>
     <string name="keywords_home" msgid="3626170808219458848">"қосқыш"</string>
     <string name="keywords_display" msgid="6709007669501628320">"сенсорлы экран"</string>
-    <string name="keywords_display_brightness_level" msgid="8636451602230815191">"сенсорлы экранды күңгірттеу"</string>
-    <string name="keywords_display_auto_brightness" msgid="8070218600502753102">"сенсорлы экранды күңгірттеу"</string>
-    <string name="keywords_display_wallpaper" msgid="4315466287469834939">"фон"</string>
+    <string name="keywords_display_brightness_level" msgid="8923289340474728990">"экранды күңгірттеу сенсорлы экран батарея"</string>
+    <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"экранды күңгірттеу сенсорлы экран батарея"</string>
+    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"фон жекелендіру теңшеу дисплей"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"мәтін өлшемі"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"жоба"</string>
-    <string name="keywords_storage" msgid="7007275853993419928">"бос орын қатты диск"</string>
-    <string name="keywords_battery" msgid="3992479295298655138">"қуат"</string>
-    <string name="keywords_spell_checker" msgid="4509482591225399210">"емле"</string>
+    <string name="keywords_storage" msgid="6572905220031852173">"бос орын диск қатты диск құрылғы пайдалану"</string>
+    <string name="keywords_battery" msgid="2096185085932675704">"қуат пайдалану заряд"</string>
+    <string name="keywords_spell_checker" msgid="6106749039734174140">"емле сөздігі емлені тексеру авто түзету"</string>
     <string name="keywords_voice_input" msgid="3519547605812413860">"тану құралы енгізу сөз сөйлеу тіл хэндсфри хэндфри тану тіл тигізетін сөз аудио тарих bluetooth құлақаспап жинағы"</string>
-    <string name="keywords_text_to_speech_output" msgid="8207889472282225512">"жылдамдық тіл әдепкі сөйлеу"</string>
-    <string name="keywords_date_and_time" msgid="7666950126499155141">"сағат"</string>
-    <string name="keywords_factory_data_reset" msgid="3693730656843989732">"өшіру жою"</string>
+    <string name="keywords_text_to_speech_output" msgid="392447904221657930">"баға тіл әдепкі сөйлеу сөйлеу tts арнайы мүмкіндіктер оқу құралы соқыр"</string>
+    <string name="keywords_date_and_time" msgid="2631808108134830066">"сағат әскери"</string>
+    <string name="keywords_factory_data_reset" msgid="4355133848707691977">"өшіру жою қалпына келтіру тазалау жою"</string>
     <string name="keywords_printing" msgid="1701778563617114846">"принтер"</string>
     <string name="keywords_sounds_and_notifications" msgid="5965996187974887000">"динамиктің дыбыстық сигналы"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="2912933812460077912">"мазаламау үзу"</string>
@@ -2354,7 +2371,7 @@
     <string name="keywords_location_mode" msgid="8584992704568356084">"дәлдік"</string>
     <string name="keywords_accounts" msgid="1957925565953357627">"есептік жазба"</string>
     <string name="keywords_users" msgid="4673901601478559100">"шектеу шектелген"</string>
-    <string name="keywords_keyboard_and_ime" msgid="1103378692379215672">"мәтінді түзету түзету дыбыс дірілдету автоматты тіл қимыл ұсыну ұсыныс тақырып тіл тигізетін сөз теру эмодзи"</string>
+    <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"мәтінді түзету түзету дыбыс дірілдету авто тіл қимыл ұсыну ұсыныс тақырып тіл тигізетін сөз түрі эмодзи халықаралық"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"сырғыту құпия сөз өрнек PIN"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC белгісін реттеу"</string>
     <string name="write_tag" msgid="8571858602896222537">"Жазу"</string>
@@ -2371,7 +2388,6 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Хабарландырудың дыбыс деңгейі"</string>
     <string name="zen_mode_settings_title" msgid="7014915558669122902">"Үзулер"</string>
     <string name="zen_mode_option_title" msgid="5061978632306007914">"Қоңыраулар және хабарландырулар келгенде"</string>
-    <string name="zen_mode_option_title_novoice" msgid="6680706009915204785">"Хабарландырулар келгенде"</string>
     <string name="zen_mode_option_off" msgid="3167702608910820883">"Әрқашан үзу"</string>
     <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Тек басым үзулерге рұқсат беру"</string>
     <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Үзбеу"</string>
@@ -2429,14 +2445,17 @@
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Орындалды"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Сіз осыны өшіргенше"</string>
     <string name="zen_mode_important_category" msgid="8123274463331022993">"Басым үзулер"</string>
-    <string name="zen_mode_downtime_category" msgid="4730179065426038108">"Бос тұру уақыты (тек басым үзулер)"</string>
+    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Бос тұру уақыты"</string>
     <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Күндер"</string>
     <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Ешқандай"</string>
+    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Үзілістерге рұқсат етілген"</string>
+    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Тек басымдық"</string>
+    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Ешқандай"</string>
     <string name="zen_mode_automation_category" msgid="4653551005950835761">"Автоматтандыру"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Автоматты түрде қосу"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Ешқашан"</string>
-    <string name="zen_mode_phone_calls" msgid="8956214416859303966">"Қоңыраулар"</string>
+    <string name="zen_mode_calls" msgid="7051492091133751208">"Қоңыраулар"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Хабарлар"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Мынадан қоңыраулар/хабарлар"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Кез келген адам"</string>
@@ -2450,7 +2469,9 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Жұмыс күн-гі түндер"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Басталу уақыты"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Аяқталу уақыты"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> келесі күні"</string>
+    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"келесі күні <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> немесе оның алдындағы кез келген дабыл"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"келесі күні <xliff:g id="FORMATTED_TIME">%s</xliff:g> немесе оның алдындағы кез келген дабыл"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Қолданба хабар-лары"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Хабарландыру параметрлері"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Осы құрылғы туралы пікір жіберу"</string>
@@ -2458,7 +2479,11 @@
     <string name="switch_on_text" msgid="1124106706920572386">"Қосулы"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Өшірулі"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"Экранды бекіту"</string>
-    <string name="screen_pinning_description" msgid="7091642350452605379">"Қосулы кезде босатқанша ағымдағы экранда көрсетіп тұру үшін экранды бекітуді пайдалануға болады.\n\nЭкранды бекітуді пайдалану үшін:\n\n1. Экранды бекіту қосулы екенін тексеріңіз.\n\n2. Бекіту керек экранды ашыңыз.\n\n3. «Шолу» пәрменін түртіңіз.\n\n4. Бекіту белгішесін түртіңіз."</string>
+    <string name="screen_pinning_description" msgid="1137904524037468263">"Осы параметр қосылса, босатқанша көріністегі ағымдағы экранды ұстау үшін экранды түйреуді пайдалануға болады.\n\nЭкранды түйреуді пайдалану үшін:\n\n1. Экранды түйреу қосулы екенін тексеріңіз.\n\n2. Түйреу керек экранды ашыңыз.\n\n3. «Шолу» тармағын түр-з.\n\n4. Жоғары қарай жанаңыз, содан кейін түйреу белгіш-н түр-з."</string>
+    <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Босату алдында бекітпесін ашу өрнегін сұрау"</string>
+    <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Босату алдында PIN кодын сұрау"</string>
+    <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Босату алдында құпия сөзді сұрау"</string>
+    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Босатқанда құрылғыны бекіту"</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Жұмыс профилі"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Эксперименттік)"</string>
     <string name="display_auto_rotate_title" msgid="6176450657107806043">"Құрылғы бұрылғанда"</string>
@@ -2467,7 +2492,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Пейзаждық көріністе қалу"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Ағымдағы бағдарда қалу"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI ақпараты"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI кодына қатысты ақпарат"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Шифрлау"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Жалғастыру"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"Іске қосылуы алдында PIN кодын талап ету арқылы осы құрылғыны қосымша қорғауға болады. Іске қосылғанша құрылғы қоңырауларды, хабарларды немесе хабарландыруларды, соның ішінде, дабылдарды қабылдай алмайды. \n\nБұл жоғалған немесе ұрланған құрылғылардағы деректерді қорғауға көмектеседі."</string>
@@ -2485,4 +2509,7 @@
     <string name="encrypt_talkback_dialog_message_pin" msgid="1890374082842868489">"Осы құрылғыны іске қосу үшін PIN кодын енгізгенде <xliff:g id="SERVICE">%1$s</xliff:g> сияқты арнайы мүмкіндіктер қызметтері әлі қол жетімді болмайды."</string>
     <string name="encrypt_talkback_dialog_message_pattern" msgid="4474332516537386384">"Осы құрылғыны іске қосу үшін өрнекті енгізгенде <xliff:g id="SERVICE">%1$s</xliff:g> сияқты арнайы мүмкіндіктер қызметтері әлі қол жетімді болмайды."</string>
     <string name="encrypt_talkback_dialog_message_password" msgid="8166099418487083927">"Осы құрылғыны іске қосу үшін құпия сөзді енгізгенде <xliff:g id="SERVICE">%1$s</xliff:g> сияқты арнайы мүмкіндіктер қызметтері әлі қол жетімді болмайды."</string>
+    <string name="imei_information_title" msgid="8499085421609752290">"IMEI ақпараты"</string>
+    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI кодына қатысты ақпарат"</string>
+    <string name="slot_number" msgid="3762676044904653577">"(<xliff:g id="SLOT_NUM">%1$d</xliff:g> ұяшығы)"</string>
 </resources>
diff --git a/res/values-km-rKH/arrays.xml b/res/values-km-rKH/arrays.xml
index 25ef19a..41d20e9 100644
--- a/res/values-km-rKH/arrays.xml
+++ b/res/values-km-rKH/arrays.xml
@@ -527,4 +527,12 @@
     <item msgid="4338089220026248848">"ទុក​ក្នុង​ឃ្លាំង​សម្ងាត់ (ម៉ាស៊ីន​​កូន​សកម្មភាព​)"</item>
     <item msgid="6652164677254579050">"ទុក​ក្នុង​ឃ្លាំង​សម្ងាត់ (ទទេ​)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"បៃតង​​ចាស់"</item>
+    <item msgid="8332294763632946560">"ពណ៌ខៀវ"</item>
+    <item msgid="2023216417616991392">"ពណ៌​ឆ្លុះ"</item>
+    <item msgid="3170497246594232819">"ស្វាយ"</item>
+    <item msgid="4608643045752965568">"ផ្កាឈូក"</item>
+    <item msgid="6131821495505931173">"ពណ៌ក្រហម"</item>
+  </string-array>
 </resources>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index 2fe8559..4cb82db 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -28,7 +28,7 @@
   </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"ឥឡូវ​អ្នក​ក្លាយ​ជា​អ្នក​អភិវឌ្ឍ​ហើយ!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"មិន​ចាំបាច់​ទេ អ្នក​ជា​អ្នក​អភិវឌ្ឍ​រួច​ហើយ។"</string>
-    <string name="header_category_wireless_networks" msgid="5110914332313954940">"ឥត​ខ្សែ &amp; បណ្ដាញ"</string>
+    <string name="header_category_wireless_networks" msgid="5110914332313954940">"ឥត​ខ្សែ &amp; បណ្ដាញ​"</string>
     <string name="header_category_connections" msgid="6471513040815680662">"ការ​តភ្ជាប់"</string>
     <string name="header_category_device" msgid="4544026001618307754">"ឧបករណ៍"</string>
     <string name="header_category_personal" msgid="3310195187905720823">"ផ្ទាល់ខ្លួន"</string>
@@ -73,7 +73,7 @@
     <string name="small_font" msgid="2295331917424072635">"តូច"</string>
     <string name="medium_font" msgid="2068475425515133701">"ឧបករណ៍​ផ្ទុក"</string>
     <string name="large_font" msgid="599055175160971446">"ធំ"</string>
-    <string name="font_size_save" msgid="3450855718056759095">"យល់​ព្រម"</string>
+    <string name="font_size_save" msgid="3450855718056759095">"យល់​ព្រម​"</string>
     <string name="sdcard_setting" product="nosdcard" msgid="8281011784066476192">"ឧបករណ៍​ផ្ទុក​យូអេសប៊ី"</string>
     <string name="sdcard_setting" product="default" msgid="5922637503871474866">"កាត​អេសឌី"</string>
     <string name="battery_info_status_label" msgid="8109155295509700309">"ស្ថានភាព​ថ្ម៖"</string>
@@ -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>
@@ -180,7 +180,6 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s ចង់​ចូល​ដំណើរការ​សារ​របស់​អ្នក។ សូម​ផ្ដល់​ការ​ចូល​ដំណើរការ​ទៅ​កាន់​%2$s?"</string>
     <string name="date_and_time" msgid="9062980487860757694">"កាលបរិច្ឆេទ &amp; ម៉ោង"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"ជ្រើស​តំបន់​ពេល​វេលា"</string>
-    <string name="normal_date_format" msgid="7636406984925498359">"តាម​តំបន់ (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"មើល​ជាមុន៖"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"ទំហំ​ពុម្ពអក្សរ៖"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -200,7 +199,7 @@
     <string name="proxy_hostname_label" msgid="8490171412999373362">"ឈ្មោះ​ម៉ាស៊ីន​ប្រូកស៊ី"</string>
     <string name="proxy_hostname_hint" msgid="2076157057003936176">"proxy.example.com"</string>
     <string name="proxy_error" msgid="8926675299638611451">"ប្រយ័ត្ន"</string>
-    <string name="proxy_error_dismiss" msgid="4993171795485460060">"យល់​ព្រម"</string>
+    <string name="proxy_error_dismiss" msgid="4993171795485460060">"យល់​ព្រម​"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"ឈ្មោះ​ម៉ាស៊ីន​ដែល​អ្នក​បាន​បញ្ចូល​មិន​ត្រឹមត្រូវ។"</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"បញ្ជី​ដកចេញ​ដែល​អ្នក​បាន​បញ្ចូល​មិន​មាន​ទ្រង់ទ្រាយ​ត្រឹមត្រូវ។ សូម​បញ្ចូល​បញ្ជី​ដែន​​​ដ​ក​ចេញ​បំបែក​ដោយ​សញ្ញា​ក្បៀស។"</string>
     <string name="proxy_error_empty_port" msgid="5539106187558215246">"អ្នក​ត្រូវ​តែ​បំពេញ​វាល​ច្រក។"</string>
@@ -264,7 +263,7 @@
     <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"ឧបករណ៍​ផ្ទុក​យូអេសប៊ី​បាន​ភ្ជាប់​បាន​តែ​អាន"</string>
     <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"កាត​អេសឌី​​បាន​ភ្ជាប់​បាន​តែ​អាន"</string>
     <string name="skip_label" msgid="47510779345218297">"រំលង"</string>
-    <string name="next_label" msgid="4693520878012668114">"បន្ទាប់"</string>
+    <string name="next_label" msgid="4693520878012668114">"បន្ទាប់​"</string>
     <string name="language_picker_title" msgid="5349877711342869319">"ភាសា"</string>
     <string name="activity_picker_label" msgid="6295660302548177109">"ជ្រើស​សកម្មភាព"</string>
     <string name="device_info_label" msgid="6551553813651711205">"ព័ត៌មាន​ឧបករណ៍"</string>
@@ -275,7 +274,7 @@
     <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"ឧបករណ៍​ផ្ទុក​​យូអេសប៊ី"</string>
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"កាត​អេសឌី"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"ការ​កំណត់​ប្រូកស៊ី"</string>
-    <string name="cancel" msgid="6859253417269739139">"បោះ​បង់"</string>
+    <string name="cancel" msgid="6859253417269739139">"បោះ​បង់​"</string>
     <string name="cancel_all_caps" msgid="3183966387632229461">"បោះបង់"</string>
     <string name="continue_all_caps" msgid="5152713914673789893">"បន្ត"</string>
     <string name="okay" msgid="1997666393121016642">"យល់ព្រម"</string>
@@ -291,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>
@@ -317,13 +316,11 @@
     <string name="date_time_24hour_title" msgid="3203537578602803850">"ទ្រង់ទ្រាយ 24 ម៉ោង"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"ប្រើ​ទ្រង់ទ្រាយ ២៤ ម៉ោង"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"ពេលវេលា"</string>
-    <string name="date_time_set_time" msgid="5716856602742530696">"កំណត់​ម៉ោង"</string>
+    <string name="date_time_set_time" msgid="5716856602742530696">"កំណត់​ម៉ោង​"</string>
     <string name="date_time_set_timezone_title" msgid="3047322337368233197">"តំបន់​ពេលវេលា"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"ជ្រើស​តំបន់​ពេលវេលា"</string>
     <string name="date_time_set_date_title" msgid="6928286765325608604">"កាលបរិច្ឆេទ"</string>
-    <string name="date_time_set_date" msgid="7021491668550232105">"កំណត់​កាល​បរិច្ឆេទ"</string>
-    <string name="date_time_date_format_title" msgid="3976171711988766411">"ទ្រង់ទ្រាយ​កាលបរិច្ឆេទ"</string>
-    <string name="date_time_date_format" msgid="6951498879879281102">"ជ្រើស​ទ្រង់ទ្រាយ​កាល​បរិច្ឆេទ"</string>
+    <string name="date_time_set_date" msgid="7021491668550232105">"កំណត់​កាល​បរិច្ឆេទ​"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"តម្រៀប​តាម​អក្សរក្រម"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"តម្រៀប​តាម​តំបន់​ពេល​វេលា"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"កាលបរិច្ឆេទ"</string>
@@ -345,7 +342,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"បង្ហាញ​ព័ត៌មាន​​ប្រវត្តិរូប​លើ​អេក្រង់ចាក់សោ"</string>
     <string name="profile_info_settings_title" msgid="3518603215935346604">"ព័ត៌មាន​ប្រវត្តិរូប"</string>
     <string name="Accounts_settings_title" msgid="1643879107901699406">"គណនី"</string>
-    <string name="location_settings_title" msgid="1369675479310751735">"ទី​តាំង"</string>
+    <string name="location_settings_title" msgid="1369675479310751735">"ទី​តាំង​"</string>
     <string name="account_settings_title" msgid="626177544686329806">"គណនី"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"សុវត្ថិភាព"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"កំណត់​ទីតាំង​របស់​ខ្ញុំ ដោះ​សោ​អេក្រង់ ចាក់​សោ​ស៊ីម​កាត ចាក់​សោ​ការ​ផ្ទុក​ព័ត៌មាន​សម្ងាត់"</string>
@@ -372,7 +369,8 @@
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"រង់ចាំ​ខណៈ​ដែល​ទូរស័ព្ទ​របស់​អ្នក​កំពុង​ត្រូវ​បាន​ដាក់លេខ​កូដ។ បញ្ចប់ <xliff:g id="PERCENT">^1</xliff:g>% ។"</string>
     <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"រង់ចាំ​ខណៈ​ពេល​ដែល​ឧបករណ៍​កុំព្យូទ័រ​បន្ទះ​របស់​អ្នក​កំពុង​​ត្រូវ​បាន​អ៊ិនគ្រីប​។ ពេលវេលា​នៅ​សល់​៖ <xliff:g id="DURATION">^1</xliff:g>"</string>
     <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"រង់ចាំ​ខណៈ​ពេល​ដែល​ទូរស័ព្ទ​របស់​អ្នក​កំពុង​ត្រូវ​បាន​អ៊ិនគ្រីប​។ ពេលវេលា​នៅ​សល់​៖ <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"ព្យាយាម​ម្ដង​ទៀត​ក្នុង​រយៈ​ពេល <xliff:g id="DELAY">^1</xliff:g> វិនាទី។"</string>
+    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"ដើម្បីដោះសោថេប្លេតរបស់អ្នក ត្រូវបិទវា ហើយបើកវាវិញ។"</string>
+    <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"ដើម្បីដោះសោទូរស័ព្ទរបស់អ្នក ត្រូវបិទវា ហើយបើកវាវិញ។"</string>
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"ព្រមាន៖ ឧបករណ៍​របស់​អ្នក​នឹង​ត្រូវ​បាន​លុប​បន្ទាប់ពី​ការ​ព្យាយាម​ដោះ​សោ​បរាជ័យ <xliff:g id="COUNT">^1</xliff:g> ដង!"</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"បញ្ចូល​ពាក្យ​សម្ងាត់​របស់​អ្នក"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"កា​រដាក់​លេខ​កូដ​មិន​ជោគជ័យ"</string>
@@ -399,24 +397,26 @@
     <string name="unlock_set_unlock_pattern_summary" msgid="7062696666227725593">"សុវត្ថិភាព​មធ្យម"</string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"កូដ PIN"</string>
     <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_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>
     <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"ដោះ​សោ​តាម​​ទម្រង់​មុខ"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"លំនាំ"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"កូដ PIN"</string>
-    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"ពាក្យសម្ងាត់"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"ពាក្យសម្ងាត់​"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"បិទ​ការ​ចាក់​សោ​អេក្រង់"</string>
     <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>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"ពាក្យ​សម្ងាត់​ត្រូវ​មាន​យ៉ាង​ហោច​ណាស់ %d តួអក្សរ"</string>
-    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"កូដ PIN ត្រូវ​តែ​មាន​​យ៉ាង​ហោច​ណាស់ %d តួ"</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"កូដ PIN ត្រូវ​តែ​មាន​​យ៉ាង​ហោច​ណាស់ %d តួ​"</string>
     <string name="lockpassword_press_continue" msgid="122706614386757182">"ប៉ះ បន្ត​ពេល​រួចរាល់"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"បន្ត"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"ពាក្យ​សម្ងាត់​ត្រូវ​តែ​តិច​ជាង <xliff:g id="NUMBER">%d</xliff:g> តួអក្សរ។"</string>
@@ -453,10 +453,10 @@
   </plurals>
     <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"អ្នក​គ្រប់គ្រង​ឧបករណ៍​មិន​អនុញ្ញាត​ឲ្យ​ប្រើ​ពាក្យ​សម្ងាត់​បច្ចុប្បន្ន​ទេ។"</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="6830610582179569631">"ឡើង, ចុះ ឬ​លំដាប់​តួលេខ​ស្ទួន​ត្រូវ​បាន​ហាមឃាត់"</string>
-    <string name="lockpassword_ok_label" msgid="313822574062553672">"យល់​ព្រម"</string>
-    <string name="lockpassword_cancel_label" msgid="8818529276331121899">"បោះ​បង់"</string>
-    <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"បោះ​បង់"</string>
-    <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"បន្ទាប់"</string>
+    <string name="lockpassword_ok_label" msgid="313822574062553672">"យល់​ព្រម​"</string>
+    <string name="lockpassword_cancel_label" msgid="8818529276331121899">"បោះ​បង់​"</string>
+    <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"បោះ​បង់​"</string>
+    <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"បន្ទាប់​"</string>
     <string name="lock_setup" msgid="3355847066343753943">"ការ​រៀបចំ​បាន​បញ្ចប់។"</string>
     <string name="device_admin_title" msgid="3562216873644263804">"ការ​គ្រប់គ្រង​ឧបករណ៍"</string>
     <string name="manage_device_admin" msgid="5059296715271077278">"អ្នក​គ្រប់គ្រង​ឧបករណ៍"</string>
@@ -482,7 +482,7 @@
     <string name="bluetooth_display_passkey_pin_msg" msgid="2796550001376088433">"ដើម្បី​ផ្គូផ្គង​ជា​មួយ៖ <xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>វាយ​បញ្ចូល៖ <xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g> បន្ទាប់​មក​ចុច​ Return ឬ Enter ។"</string>
     <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"ផ្គូផ្គង"</string>
     <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"ផ្គូផ្គង"</string>
-    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"បោះ​បង់"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"បោះ​បង់​"</string>
     <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"ការ​ផ្គូផ្គង​ដើម្បី​ចូល​ដំណើរការ​ទំនាក់ទំនង និង​ប្រវត្តិ​ហៅ​របស់​អ្នក ពេល​បាន​តភ្ជាប់។"</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
     <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"មិន​អាច​ផ្គូផ្គង​ជា​មួយ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ។"</string>
@@ -556,13 +556,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"ជា​​អូប៉ាល័រ​ទូរស័ព្ទ"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"សម្រាប់​តន្ត្រី និង​មេឌៀ"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"ចងចាំ​ការ​កំណត់"</string>
-    <string name="wifi_assistant_intro_setup" msgid="4605105515416995110">"ណែនាំ\nជំនួយការ​វ៉ាយហ្វាយ"</string>
-    <string name="wifi_assistant_no_thanks" msgid="2776983751990143934">"ទេ, ​​អរគុណ!"</string>
-    <string name="wifi_assistant_setup" msgid="3772423650475730906">"រៀបចំ"</string>
-    <string name="wifi_assistant_card_message" msgid="107811647784658536">"តភ្ជាប់​ដោយ​ស្វ័យ​ប្រវត្តិ​ទៅ​បណ្ដាញ​​ដែល​អាច​ប្រើ​បាន​ជា​មួយ​​ជំនួយ​ការ​វ៉ាយហ្វាយ។"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"ជំនួយការ​វ៉ាយហ្វាយ"</string>
-    <string name="wifi_assistant_title_message" msgid="6240721017579074015">"<xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> ភ្ជាប់​ដោយ​ស្វ័យប្រវត្តិ​ទៅ​វ៉ាយហ្វាយ​ល្អ​បំផុត​ដែល​អាច​ប្រើ​បាន"</string>
-    <string name="wifi_assistant_open_app" msgid="4803044899535675063">"កម្មវិធី​បើក"</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>
@@ -592,7 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"ការកំណត់​វ៉ាយហ្វាយ"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"វ៉ាយហ្វាយ"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"រៀបចំ &amp; គ្រប់គ្រង​ចំណុច​ចូល​ដំណើរការ​ឥត​ខ្សែ"</string>
-    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"ជ្រើស​វ៉ាយហ្វាយ"</string>
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"ជ្រើសរើសបណ្តាញ Wi‑Fi"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"ជ្រើស​វ៉ាយហ្វាយ"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"កំពុង​បើក​វ៉ាយហ្វាយ..."</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"កំពុង​បិទ​វ៉ាយហ្វាយ..."</string>
@@ -607,8 +602,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"វិភាគ​រក​​គ្រប់ពេល"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"អនុញ្ញាត​ឲ្យ​វិភាគ​រក​ជានិច្ច"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"អនុញ្ញាត​ឲ្យ​សេវាកម្ម​ទីតាំង​របស់ Google និង​កម្មវិធី​ផ្សេងៗ​វិភាគ​រក​បណ្ដាញ សូម្បីតែ​បិទ​វ៉ាយហ្វាយ"</string>
-    <string name="wifi_automatically_manage_title" msgid="6249976570008992746">"គ្រប់គ្រង​វ៉ាយហ្វាយ​ដោយ​​ស្វ័យ​ប្រវត្តិ"</string>
-    <string name="wifi_automatically_manage_summary" msgid="6952470763378312488">"ឲ្យ <xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> គ្រប់គ្រង​ការ​ភ្ជាប់​វ៉ាយហ្វាយ​របស់​អ្នក"</string>
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"ប្រើ Wi‑Fi បើកដោយស្វ័យប្រវត្តិ"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"អនុញ្ញាតឲ្យជំនួយការ Wi‑Fi ភ្ជាប់ទៅបណ្តាញបើកដែលត្រូវបានកំណត់ថាមានគុណភាពសេវាខ្ពស់ដោយស្វ័យប្រវត្តិ"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"ជ្រើសរើសជំនួយការ"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"ដំឡើង​វិញ្ញាបនបត្រ"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"ដើម្បី​បង្កើន​ភាព​ត្រឹមត្រូវ​ទីតាំង និង​សម្រាប់​គោលបំណង​ផ្សេងៗ Google និង​កម្មវិធី​ផ្សេង​អាច​វិភាគ​រក​បណ្ដាញ​ដែល​នៅ​ជិត​ៗ សូម្បី​តែ​បិទ​វ៉ាយហ្វាយ​ក៏​ដោយ។ បើ​អ្នក​មិន​ចង់​​ឲ្យ​កើត​ឡើង ចូល​ទៅ​កម្រិត​ខ្ពស់ &gt; វិភាគ​រ​ក​ជា​និច្ច​ពេល​អាច​ប្រើ​បាន។"</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"កម្មវិធី​អាច​វិភាគ​រក​បណ្ដាញ​ដែល​នៅ​ជិត ​សូម្បីតែ​​បិទ​វ៉ាយហ្វាយ។ បើ​អ្នក​មិន​ចង់​ឲ្យ​កើត​ឡើង ចូល​ទៅ កម្រិត​ខ្ពស់ &gt; ការ​វិភាគ​រក​អាច​ប្រើ​បាន​ជា​និច្ច។"</string>
@@ -629,6 +625,7 @@
     <string name="wifi_menu_scan" msgid="1470911530412095868">"វិភាគ"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"កម្រិត​ខ្ពស់"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"តភ្ជាប់បណ្ដាញ"</string>
+    <string name="wifi_menu_remember" msgid="8814185749388713796">"ចងចាំ​បណ្ដាញ"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"បំភ្លេច​បណ្ដាញ"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"កែ​បណ្ដាញ"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"សរសេរ​ទៅ​ស្លាក​អិនអេហ្វស៊ី"</string>
@@ -666,16 +663,18 @@
     <string name="wifi_eap_user_cert" msgid="1291089413368160789">"វិញ្ញាបនបត្រ​អ្នក​ប្រើ"</string>
     <string name="wifi_eap_identity" msgid="4359453783379679103">"អត្តសញ្ញាណ"</string>
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"អត្តសញ្ញាណ​អនាមិក"</string>
-    <string name="wifi_password" msgid="5948219759936151048">"ពាក្យសម្ងាត់"</string>
+    <string name="wifi_password" msgid="5948219759936151048">"ពាក្យសម្ងាត់​"</string>
     <string name="wifi_show_password" msgid="6461249871236968884">"បង្ហាញ​ពាក្យ​សម្ងាត់"</string>
     <string name="wifi_ip_settings" msgid="3359331401377059481">"ការ​កំណត់ IP"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(មិន​ផ្លាស់ប្ដូរ)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(មិន​បាន​បញ្ជាក់)"</string>
     <string name="wifi_remembered" msgid="4955746899347821096">"បាន​រក្សាទុក"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"បាន​បិទ"</string>
-    <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"បាន​រារាំង​ការ​តភ្ជាប់​អ៊ីនធឺណិត​មិន​ល្អ"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"ការ​កំណត់​រចនាសម្ព័ន្ធ IP បរាជ័យ"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"ការ​ភ្ជាប់​ WiFi បរាជ័យ"</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"បញ្ហា​ក្នុង​ការ​ផ្ទៀងផ្ទាត់"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"នៅ​ក្រៅ​តំបន់"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"រក​មិន​ឃើញ​ការ​ចូល​ដំណើរការ​អ៊ីនធឺណិត, នឹង​មិន​ភ្ជាប់​ឡើង​វិញ​ដោយ​ស្វ័យ​ប្រវត្តិ​ទេ។"</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS អាច​ប្រើ​បាន"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (មាន WPS)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"បញ្ចូល​ពាក្យ​សម្ងាត់​បណ្ដាញ​របស់​អ្នក"</string>
@@ -693,15 +692,15 @@
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"បាន​បរាជ័យ​ក្នុង​បំភ្លេច​បណ្ដាញ"</string>
     <string name="wifi_save" msgid="3331121567988522826">"រក្សាទុក"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"បាន​បរាជ័យ​ក្នុង​ការ​រក្សាទុក​បណ្ដាញ"</string>
-    <string name="wifi_cancel" msgid="6763568902542968964">"បោះ​បង់"</string>
+    <string name="wifi_cancel" msgid="6763568902542968964">"បោះ​បង់​"</string>
     <string name="wifi_skip_anyway" msgid="6965361454438011190">"រំលង"</string>
     <string name="wifi_dont_skip" msgid="7350341524881124808">"កុំ​រំលង"</string>
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"ព្រមាន​៖ ប្រសិន​បើ​អ្នក​រំលង​ប្រព័ន្ធ​វ៉ាយហ្វាយ កុំព្យូទ័រ​បន្ទះ​របស់​អ្នក​នឹង​ប្រើ​តែ​​ទិន្នន័យ​ចល័ត​សម្រាប់​ការ​ធ្វើ​បច្ចុប្បន្នភាព និង​ការ​ទាញយក​ដំបូង។ ដើម្បី​ជៀសវាង​ការ​គិត​ប្រាក់​សម្រាប់​​ទិន្នន័យ, តភ្ជាប់​ទៅ​វ៉ាយហ្វាយ។"</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"ព្រមាន​៖ ប្រសិន​បើ​អ្នក​រំលង​វ៉ាយហ្វាយ ឧបករណ៍​របស់​អ្នក​នឹង​ប្រើ​តែ​ទិន្នន័យ​ចល័ត​សម្រាប់​ការ​ធ្វើ​បច្ចុប្បន្នភាព និង​ការ​ទាញយក​ដំបូង​។ ដើម្បី​ជៀសវាង​គិត​ប្រាក់​សម្រាប់​​​ទិន្នន័យ​, តភ្ជាប់​ទៅ​វ៉ាយហ្វាយ។"</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"ព្រមាន​៖ ប្រសិន​បើ​អ្នក​រំលង​វ៉ាយហ្វាយ ទូរស័ព្ទ​របស់​អ្នក​នឹង​ប្រើ​តែ​ទិន្នន័យ​ចល័ត​សម្រាប់​ការ​ធ្វើ​បច្ចុប្បន្នភាព និង​ការ​ទាញយក​ដំបូង។ ដើម្បី​ជៀសវាង​​ការ​គិត​ប្រាក់​​​សម្រាប់​​ទិន្នន័យ, តភ្ជាប់​ទៅ​វ៉ាយហាយ។"</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="2393880108322835846">"ព្រមាន​៖ ប្រសិន​បើ​អ្នក​រំលង​វ៉ាយហ្វាយ កុំព្យូទ័រ​បន្ទះ​របស់​អ្នក​នឹង​មិន​មាន​ការ​តភ្ជាប់​អ៊ីនធឺណិត​ ដើម្បី​ប្រើ​សម្រាប់​ការ​ធ្វើ​បច្ចុប្បន្នភាព ឬ​ទាញយក​​ណាមួយ​ឡើយ។"</string>
-    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1707391993265558787">"ព្រមាន​៖ ប្រសិន​បើ​អ្នក​រំលង​វ៉ាយហ្វាយ ឧបករណ៍​របស់​អ្នក​នឹង​មិន​មាន​ការ​តភ្ជាប់​អ៊ីនធឺណិត​ ដើម្បី​​ប្រើ​សម្រាប់​ការ​​ធ្វើ​បច្ចុប្បន្នភាព ឬ​ការ​ទាញ​យក​ដំបូង​ណា​មួយ​ឡើយ។"</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="1556858507920033022">"ព្រមាន​៖ ប្រសិន​បើ​អ្នក​រំលង​វ៉ាយហ្វាយ ទូរស័ព្ទ​របស់​អ្នក​នឹង​មិន​មាន​ការ​តភ្ជាប់​អ៊ីនធឺណិត​ ដើម្បី​ប្រើ​សម្រាប់​ការ​​ធ្វើ​បច្ចុប្បន្នភាព និង​ការ​​ទាញយក​ដំបូង​ណាមួយ​ឡើយ។"</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"ប្រសិនបើអ្នករំលង Wi‑Fi៖\n\nថេប្លេតរបស់អ្នកនឹងមិនមានការភ្ជាប់អ៊ីនធឺណិតទេ។\n\nអ្នកនឹងមិនទទួលបានការធ្វើបច្ចុប្បន្នភាពកម្មវិធីឡើយ រហូតទាល់តែអ្នកភ្ជាប់ទៅអ៊ីនធឺណិត។\n\nអ្នកមិនអាចធ្វើសកម្មភាពលក្ខណៈពិសេសការពារឧបករណ៍នៅពេលនេះទេ។"</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"ប្រសិនបើអ្នករំលង Wi‑Fi៖\n\nឧបករណ៍របស់អ្នកនឹងមិនមានការភ្ជាប់អ៊ីនធឺណិតទេ។\n\nអ្នកនឹងមិនទទួលបានការធ្វើបច្ចុប្បន្នភាពកម្មវិធីឡើយ រហូតទាល់តែអ្នកភ្ជាប់ទៅអ៊ីនធឺណិត។\n\nអ្នកមិនអាចធ្វើសកម្មភាពលក្ខណៈពិសេសការពារឧបករណ៍នៅពេលនេះទេ។"</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"ប្រសិនបើអ្នករំលង Wi‑Fi៖\n\nទូរស័ព្ទរបស់អ្នកនឹងមិនមានការភ្ជាប់អ៊ីនធឺណិតទេ។\n\nអ្នកនឹងមិនទទួលបានការធ្វើបច្ចុប្បន្នភាពកម្មវិធីឡើយ រហូតទាល់តែអ្នកភ្ជាប់ទៅអ៊ីនធឺណិត។\n\nអ្នកមិនអាចធ្វើសកម្មភាពលក្ខណៈពិសេសការពារឧបករណ៍នៅពេលនេះទេ។"</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"កុំព្យូទ័រ​បន្ទះ​មិន​អាច​​ភ្ជាប់​ទៅ​បណ្ដាញ​វ៉ាយហ្វាយ​នេះ​បាន​ទេ។"</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"ឧបករណ៍​មិន​អាច​តភ្ជាប់​ទៅ​បណ្ដាញ​វ៉ាយហ្វាយ​នេះ​បាន​ទេ។"</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"ទូរស័ព្ទ​មិន​អាច​តភ្ជាប់​ទៅ​បណ្ដាញ​វ៉ាយហ្វាយ​នេះ"</string>
@@ -715,7 +714,7 @@
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"បណ្ដាញ​បាន​រក្សាទុក"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"ការ​កំណត់ IP"</string>
     <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"រក្សាទុក"</string>
-    <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"បោះ​បង់"</string>
+    <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"បោះ​បង់​"</string>
     <string name="wifi_ip_settings_invalid_ip_address" msgid="2513142355364274970">"បញ្ចូល​អាសយដ្ឋាន IP ដែល​ត្រឹមត្រូវ។"</string>
     <string name="wifi_ip_settings_invalid_gateway" msgid="8164264988361096450">"បញ្ចូល​អាសយដ្ឋាន​ច្រកចេញ​ចូល​ដែល​ត្រឹមត្រូវ"</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="8744583948328391047">"បញ្ចូល​អាសយដ្ឋាន DNS ដែល​ត្រឹមត្រូវ។"</string>
@@ -761,7 +760,6 @@
     <string name="ring_volume_title" msgid="7938706566797464165">"កម្រិត​សំឡេង​កម្មវិធី​រោទ៍"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"ញ័រ​ពេល​ស្ងាត់"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"សំឡេង​ជូន​ដំណឹង​លំនាំដើម"</string>
-    <string name="heads_up_enabled_title" msgid="1031078221910921622">"លេចឡើង​ ​បើ​អាទិភាព​ខ្ពស់"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"សំឡេង​រោទ៍"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"ការ​ជូន​ដំណឹង"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"ប្រើ​កម្រិត​សំឡេង​ហៅ​ចូល​សម្រាប់​ជូន​ដំណឹង"</string>
@@ -787,11 +785,11 @@
     <string name="dock_settings" msgid="1820107306693002541">"ភ្ជាប់"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"កំណត់​ការ​ភ្ជាប់"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"សំឡេង"</string>
-    <string name="dock_audio_summary_desk" msgid="6487784412371139335">"កំណត់​សម្រាប់​​ការ​ភ្ជាប់​ផ្ទៃតុ"</string>
+    <string name="dock_audio_summary_desk" msgid="6487784412371139335">"កំណត់​សម្រាប់​​ការ​ភ្ជាប់​ផ្ទៃតុ​"</string>
     <string name="dock_audio_summary_car" msgid="6740897586006248450">"កំណត់​សម្រាប់​ភ្ជាប់រថយន្ត"</string>
     <string name="dock_audio_summary_none" product="tablet" msgid="8215337394914283607">"មិន​បាន​ភ្ជាប់​កុំព្យូទ័រ​បន្ទះ"</string>
     <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"មិន​បាន​ភ្ជាប់ទូរស័ព្ទ"</string>
-    <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"កំណត់​សម្រាប់​ការ​ភ្ជាប់"</string>
+    <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"កំណត់​សម្រាប់​ការ​ភ្ជាប់​"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"រក​មិន​ឃើញ​ការ​ភ្ជាប់"</string>
     <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"អ្នក​ត្រូវ​ភ្ជាប់​កុំព្យូទ័រ​បន្ទះ មុន​នឹង​រៀបចំ​​​សំឡេង​​ភ្ជាប់។"</string>
     <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"អ្នក​ត្រូវ​តែ​ភ្ជាប់​ទូរស័ព្ទ មុន​ពេល​កំណត់​សំឡេង​ភ្ជាប់។"</string>
@@ -834,7 +832,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"ពន្លឺ​ស្វ័យ​ប្រវត្តិ"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"លើក​ដៃ​ដើម្បី​ឲ្យ​ភ្ញាក់"</string>
     <string name="doze_title" msgid="2259176504273878294">"បង្ហាញ​​ជុំវិញ"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"អេក្រង់​ភ្ញាក់​នៅ​ពេល​ឧបករណ៍​​ត្រូវ​បាន​ប៉ះ ​ឬ​​មានការ​ជូន​ដំណឹង"</string>
+    <string name="doze_summary" msgid="7128970177894383698">"ដាស់អេក្រង់នៅពេលដែលអ្នកលើកឧបករណ៍របស់អ្នកឡើង ឬទទួលបានការជូនដំណឹង់"</string>
     <string name="title_font_size" msgid="4405544325522105222">"ទំហំពុម្ពអក្សរ"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"ទំហំ​ពុម្ពអក្សរ"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"កំណត់​ការ​ចាក់សោ​ស៊ីម​កាត"</string>
@@ -858,10 +856,14 @@
     <string name="sim_change_failed" msgid="304964924772218382">"មិន​អាច​ប្ដូរ​កូដ PIN ។\nប្រហែលជា​កូដ PIN មិន​ត្រឹមត្រូវ។"</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"បាន​ប្ដូរ​​​កូដ PIN ស៊ីម​កាត់​ដោយ​ជោគជ័យ"</string>
     <string name="sim_lock_failed" msgid="5651596916127873626">"មិន​អាច​ប្ដូរ​ស្ថានភាព​ការ​ចាក់​សោ​ស៊ីម​កាត។\nប្រហែល​ជា​កូដ​ PIN មិន​ត្រឹមត្រូវ។"</string>
-    <string name="sim_enter_ok" msgid="6475946836899218919">"យល់​ព្រម"</string>
-    <string name="sim_enter_cancel" msgid="6240422158517208036">"បោះ​បង់"</string>
+    <string name="sim_enter_ok" msgid="6475946836899218919">"យល់​ព្រម​"</string>
+    <string name="sim_enter_cancel" msgid="6240422158517208036">"បោះ​បង់​"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"បាន​រក​ឃើញ​ស៊ី​ម​ជា​ច្រើន"</string>
     <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> គឺជាស៊ីមតែមួយគត់នៅក្នុងឧបករណ៍របស់អ្នក។ តើអ្នកចង់ប្រើស៊ីមនេះសម្រាប់ប្រើទិន្នន័យប្រព័ន្ធទូរស័ព្ទ និងសារ SMS ទេ?"</string>
     <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>
@@ -949,7 +951,7 @@
     <string name="dlg_error_unmount_text" product="default" msgid="3073562815631781894">"មិន​អាច​ផ្ដាច់​​កាត​អេសឌី។ ព្យាយាម​ម្ដង​ទៀត​ពេល​ក្រោយ។"</string>
     <string name="unmount_inform_text" product="nosdcard" msgid="7120241136790744265">"ឧបករណ៍​ផ្ទុក​យូអេសប៊ី​នឹង​​​ត្រូវ​បាន​ផ្ដាច់។"</string>
     <string name="unmount_inform_text" product="default" msgid="1904212716075458402">"កាត​អេសឌី​នឹង​ត្រូវ​បាន​ផ្ដាច់។"</string>
-    <string name="sd_ejecting_title" msgid="8824572198034365468">"ផ្ដាច់"</string>
+    <string name="sd_ejecting_title" msgid="8824572198034365468">"ផ្ដាច់​"</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"ការ​ផ្ដាច់​​កំពុង​ដំណើរការ"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"អស់​ទំហំផ្ទុក"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"មុខងារ​ប្រព័ន្ធ​មួយ​ចំនួន​ដូច​ជា ការ​ធ្វើ​សម​កាល​កម្ម​អាច​ដំណើរការ​មិន​ត្រឹមត្រូវ។ ព្យាយាម​បង្កើត​ទំហំ ដោយ​លុប​ ឬ​​ដោះ​ខ្ទាស់​ធាតុ​មួយ​ចំនួន​ដូច​ជា កម្មវិធី ឬ​មាតិកា​មេឌៀ។"</string>
@@ -971,8 +973,8 @@
     <string name="apn_apn" msgid="2479425126733513353">"APN"</string>
     <string name="apn_http_proxy" msgid="1826885957243696354">"ប្រូកស៊ី"</string>
     <string name="apn_http_port" msgid="3763259523984976226">"ច្រក"</string>
-    <string name="apn_user" msgid="455637547356117761">"ឈ្មោះ​អ្នក​ប្រើ"</string>
-    <string name="apn_password" msgid="5412301994998250968">"ពាក្យសម្ងាត់"</string>
+    <string name="apn_user" msgid="455637547356117761">"ឈ្មោះ​អ្នក​ប្រើ​"</string>
+    <string name="apn_password" msgid="5412301994998250968">"ពាក្យសម្ងាត់​"</string>
     <string name="apn_server" msgid="2436185314756372858">"ម៉ាស៊ីន​មេ"</string>
     <string name="apn_mmsc" msgid="3670124402105585737">"MMSC"</string>
     <string name="apn_mms_proxy" msgid="5374082621073999275">"ប្រូកស៊ី MMS"</string>
@@ -1012,6 +1014,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"វា​នឹង​លុប​ទិន្នន័យ​ពី​ "<b>"ឧបករណ៍​ផ្ទុក​ខាង​ក្នុង"</b>"នៃ​កុំព្យូទ័រ​បន្ទះ​របស់​អ្នក រួម​មាន៖\n\n"<li>"គណនី Google របស់​អ្នក"</li>\n<li>"ការកំណត់ និង​ទិន្នន័យ​កម្មវិធី និង​ប្រព័ន្ធ"</li>\n<li>"កម្មវិធី​បាន​ទាញ​យក"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"វា​នឹង​លុប​ទិន្នន័យ​ទាំងអស់​ពី​ "<b>"ឧបករណ៍​ផ្ទុក​ខាង​ក្នុង"</b>"នៃ​ទូរស័ព្ទ​របស់​អ្នក​ រួមមាន៖\n\n"<li>"គណនី Google របស់​អ្នក"</li>\n<li>"ការ​កំណត់​ និង​ទិន្នន័យ​ប្រព័ន្ធ ព្រម​ទាំង​កម្មវិធី"</li>\n<li>"កម្មវិធី​បាន​ទាញ​យក"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"បច្ចុប្បន្ន​ អ្នក​បាន​ចូល​គណនី​ដូច​ខាង​ក្រោម៖ \n"</string>
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"មានអ្នកផ្សេងច្រើនទៀតមានវត្តមាននៅលើឧបករណ៍នេះ។\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"តន្ត្រី"</li>\n<li>"រូបថត"</li>\n<li>"ទិន្នន័យ​អ្នក​ប្រើ​ផ្សេង​ទៀត"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"ដើម្បី​សម្អាត​តន្ត្រី រូបថត និង​ទិន្នន័យ​អ្នក​ប្រើ​ផ្សេងៗ តម្រូវ​ឲ្យ​លុប"<b>"ឧបករណ៍​ផ្ទុក​យូអេសប៊ី"</b>" ។"</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"ដើម្បី​សម្អាត​តន្ត្រី, រូបភាព និង​ទិន្នន័យ​អ្នកប្រើ​ផ្សេងទៀត "<b>"ចាំបាច់​ត្រូវ"</b>" លុប​កាត​អេសឌី។"</string>
@@ -1023,7 +1026,6 @@
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"កំណត់​ទូរស័ព្ទ​ឡើងវិញ"</string>
     <string name="master_clear_final_desc" msgid="7209547812233487345">"លុប​ព័ត៌មាន​​ផ្ទាល់ខ្លួន​ និង​កម្មវិធី​បាន​ទាញ​យក​របស់​អ្នក​ទាំងអស់? អ្នក​មិន​អាច​ត្រឡប់​សកម្មភាព​នេះ​បា​ន​ទេ!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"លុប​អ្វីៗ​ទាំងអស់"</string>
-    <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"គូរ​លំនាំ​ដោះ​សោ​របស់​អ្នក"</string>
     <string name="master_clear_gesture_explanation" msgid="826193821455182780">"អ្នក​ត្រូវ​តែ​គូរ​លំនាំ​ដោះ​សោ​របស់​អ្នក ដើម្បី​បញ្ជាក់​ការ​កំណត់​ទិន្នន័យ​ដូច​ចេញ​ពី​រោងចក្រ"</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"គ្មាន​ការ​កំណត់​ឡើងវិញ​ត្រូវ​បាន​អនុវត្ត ព្រោះ​សេវាកម្ម​សម្អាត​ប្រព័ន្ធ​មិន​អាច​ប្រើ​បាន។"</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"កំណត់​ឡើងវិញ?"</string>
@@ -1041,7 +1043,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"លុប​ទិន្នន័យ​ក្នុង​ឧបករណ៍​ផ្ទុក​យូអេសប៊ី នឹង​លុប​ឯកសារ​ទាំងអស់​ដែល​មាន? អ្នក​មិន​អាច​ត្រឡប់​សកម្មភាព​នេះ​​វិញ​បាន​ទេ!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"លុប​កាត​​អេសឌី នឹង​លុប​ឯកសារ​ទាំងអស់? អ្នក​មិន​អាច​ត្រឡប់​សកម្មភាព​នេះ​វិញ​បាន​ទេ!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"លុប​​​ទាំងអស់"</string>
-    <string name="media_format_gesture_prompt" msgid="3109349468816856670">"គូរ​លំនាំ​ដោះ​សោ​របស់​អ្នក"</string>
     <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"អ្នក​ត្រូវតែ​គូរ​លំនាំ​ដោះ​សោ​របស់​អ្នក ដើម្បី​បញ្ជក់​ថា​អ្នក​ចង់​លុប​ឧបករណ៍​ផ្ទុក​យូអេសប៊ី។"</string>
     <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"អ្នក​ត្រូវ​គូរ​លំនាំ​ដោះ​សោ​របស់​អ្នក ដើម្បី​បញ្ជាក់​ថា​អ្នក​ចង់​លុប​កាត​អេសឌី។"</string>
     <string name="call_settings_title" msgid="5188713413939232801">"កំណត់​ការ​ហៅ"</string>
@@ -1083,15 +1084,18 @@
     <string name="network_scorer_change_active_dialog_text" msgid="8035173880322990715">"ប្រើ <xliff:g id="NEW_APP">%1$s</xliff:g> ជំនួស​ឲ្យ <xliff:g id="CURRENT_APP">%2$s</xliff:g> ដើម្បី​គ្រប់គ្រង​ការ​ភ្ជាប់​បណ្ដាញ​របស់​អ្នក?"</string>
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="7444620909047611601">"ប្រើ <xliff:g id="NEW_APP">%s</xliff:g> ដើម្បី​គ្រប់គ្រង​ការ​ភ្ជាប់​បណ្ដាញ​របស់​អ្នក?"</string>
     <string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"មិន​ស្គាល់​ប្រតិបត្តិ​ករ​ស៊ីមកាត"</string>
-    <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s គ្មាន​តំបន់​បណ្ដាញ​ដែល​ផ្ដល់​បាន​​ស្គាល់"</string>
+    <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s គ្មាន​តំបន់​បណ្ដាញ​ដែល​ផ្ដល់​បាន​​ស្គាល់​"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"សូម​បញ្ចូល​ស៊ីមកាត និង​ចាប់ផ្ដើម​ឡើង​វិញ"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"សូម​ភ្ជាប់​អ៊ីនធឺណិត"</string>
     <string name="location_title" msgid="1029961368397484576">"ទីតាំង​ខ្ញុំ"</string>
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"ប្រវត្តិរូប​ការងារ"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"ទីតាំងសម្រាប់ប្រវត្តិរូបការងាររបស់អ្នក"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"បានបិទដោយក្រុមហ៊ុនរបស់អ្នក"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"របៀបកំណត់"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"ភាព​ត្រឹមត្រូវ​ខ្ពស់"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"ការ​សន្សំ​ថ្ម"</string>
     <string name="location_mode_sensors_only_title" msgid="3040366132175435160">"តែ​​ឧបករណ៍​ប៉ុណ្ណោះ"</string>
-    <string name="location_mode_location_off_title" msgid="2829713015012529465">"បិទទីតាំង"</string>
+    <string name="location_mode_location_off_title" msgid="2829713015012529465">"បិទទីតាំង​"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"សំណើ​ទីតាំង​ថ្មី"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"បច្ចុប្បន្ន​គ្មាន​កម្មវិធី​បាន​ស្នើ​ទីតាំង"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"សេវាកម្ម​ទីតាំង"</string>
@@ -1124,6 +1128,7 @@
     <string name="copyright_title" msgid="865906688917260647">"រក្សាសិទ្ធិ"</string>
     <string name="license_title" msgid="1990487604356037871">"អាជ្ញាប័ណ្ណ"</string>
     <string name="terms_title" msgid="7697580845616764642">"លក្ខខណ្ឌ​ប្រើប្រាស់"</string>
+    <string name="webview_license_title" msgid="2813507464175738967">"អាជ្ញាប័ណ្ណ System WebView"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"ផ្ទាំង​រូបភាព"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"កម្មវិធី​ផ្ដល់​សេវា​រូបភាព​ផ្កាយ​រណប​៖\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"អាជ្ញាប័ណ្ណ​កម្មវិធី​ប្រភព​កូដ​ចំហ"</string>
@@ -1150,7 +1155,7 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"ប្ដូរ​​​កូដ​ PIN ដោះ​សោ"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"បញ្ជាក់​លំនាំ​បាន​រក្សាទុក"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"ព្យាយាម​ម្ដង​ទៀត៖"</string>
-    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"គូរ​​លំនាំ​ដោះ​សោ"</string>
+    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"គូរ​​លំនាំ​ដោះ​សោ​"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"ចុច ម៉ឺនុយ​សម្រាប់​ជំនួយ។"</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"ដក​ម្រាមដៃ​​ពេល​រួចរាល់។"</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="1348234155120957561">"ភ្ជាប់​ចំណុច​យ៉ាង​ហោច​ណាស់ <xliff:g id="NUMBER">%d</xliff:g> ។ ព្យាយាម​ម្ដង​ទៀត។"</string>
@@ -1237,7 +1242,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"ឧបករណ៍​ផ្ទុក​​យូអេសប៊ី"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"លើ​កាត​អេសឌី"</string>
     <string name="disabled" msgid="9206776641295849915">"បិទ"</string>
-    <string name="not_installed" msgid="1475144352069281880">"មិនបាន​ដំឡើង"</string>
+    <string name="not_installed" msgid="2797554494953450291">"មិន​បាន​ដំឡើង​សម្រាប់​អ្នក​ប្រើ​នេះ"</string>
     <string name="no_applications" msgid="7336588977497084921">"គ្មាន​កម្មវិធី"</string>
     <string name="internal_storage" msgid="1584700623164275282">"ឧបករណ៍​ខាង​ក្នុង"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"ឧបករណ៍​ផ្ទុក​​យូអេសប៊ី"</string>
@@ -1245,8 +1250,8 @@
     <string name="recompute_size" msgid="7722567982831691718">"កំពុង​គណនា​ទំហំ​ឡើងវិញ…"</string>
     <string name="clear_data_dlg_title" msgid="5605258400134511197">"លុប​ទិន្នន័យ​កម្មវិធី?"</string>
     <string name="clear_data_dlg_text" msgid="8847257251846779938">"ទិន្នន័យ​របស់​កម្មវិធី​នេះ​ទាំងអស់​នឹង​ត្រូវ​បាន​លុប​ជា​អចិន្ត្រៃយ៍។ រួមមាន ឯកសារ​ទាំងអស់, ការ​កំណត់, គណនី, មូលដ្ឋាន​ទិន្នន័យ ។ល។"</string>
-    <string name="dlg_ok" msgid="2402639055725653590">"យល់​ព្រម"</string>
-    <string name="dlg_cancel" msgid="1674753358972975911">"បោះ​បង់"</string>
+    <string name="dlg_ok" msgid="2402639055725653590">"យល់​ព្រម​"</string>
+    <string name="dlg_cancel" msgid="1674753358972975911">"បោះ​បង់​"</string>
     <string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
     <string name="app_not_found_dlg_text" msgid="8333723538280257243">"រក​មិន​ឃើញ​កម្មវិធី​ក្នុង​បញ្ជី​កម្មវិធី​បាន​ដំឡើង។"</string>
     <string name="clear_data_failed" msgid="1907582169616856698">"មិន​អាច​សម្អាត​ទិន្នន័យ​កម្មវិធី។"</string>
@@ -1321,7 +1326,7 @@
     <string name="running_processes_header_apps_prefix" msgid="5787594452716832727">"កម្មវិធី"</string>
     <string name="running_processes_header_free_prefix" msgid="4620613031737078415">"ទំនេរ"</string>
     <string name="running_processes_header_used_prefix" msgid="5924288703085123978">"បាន​ប្រើ"</string>
-    <string name="running_processes_header_cached_prefix" msgid="7950853188089434987">"បាន​ទុក​ក្នុង​ឃ្លាំង"</string>
+    <string name="running_processes_header_cached_prefix" msgid="7950853188089434987">"បាន​ទុក​ក្នុង​ឃ្លាំង​"</string>
     <string name="running_processes_header_ram" msgid="996092388884426817">"<xliff:g id="RAM_0">%1$s</xliff:g> នៃ​អង្គចងចាំ"</string>
     <string name="runningservicedetails_settings_title" msgid="3224004818524731568">"កម្មវិធី​កំពុង​ដំណើរការ"</string>
     <string name="no_services" msgid="7133900764462288263">"មិន​សកម្ម"</string>
@@ -1375,14 +1380,14 @@
     <string name="user_dict_settings_add_screen_title" msgid="742580720124344291">"ឃ្លា"</string>
     <string name="user_dict_settings_add_dialog_more_options" msgid="8848798370746019825">"ជម្រើស​ច្រើន​ទៀត"</string>
     <string name="user_dict_settings_add_dialog_less_options" msgid="2441785268726036101">"ជម្រើស​តិច"</string>
-    <string name="user_dict_settings_add_dialog_confirm" msgid="6225823625332416144">"យល់​ព្រម"</string>
+    <string name="user_dict_settings_add_dialog_confirm" msgid="6225823625332416144">"យល់​ព្រម​"</string>
     <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"ពាក្យ"</string>
     <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"ផ្លូវកាត់៖"</string>
     <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"ភាសា៖"</string>
     <string name="user_dict_settings_add_word_hint" msgid="5725254076556821247">"បញ្ចូល​ពាក្យ"</string>
     <string name="user_dict_settings_add_shortcut_hint" msgid="7333763456561873445">"ផ្លូវកាត់​ជម្រើស"</string>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"កែ​ពាក្យ"</string>
-    <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"កែសម្រួល"</string>
+    <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"កែសម្រួល​"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"លុប"</string>
     <string name="user_dict_settings_empty_text" msgid="8165273379942105271">"អ្នក​មិន​មាន​ពាក្យ​ក្នុង​វចនានុក្រម​អ្នក​ប្រើ។ បន្ថែម​ពាក្យ​ដោយ​ប៉ះ​ប៊ូតុង (+) ។"</string>
     <string name="user_dict_settings_all_languages" msgid="6742000040975959247">"សម្រាប់​ភាសា​ទាំងអស់"</string>
@@ -1398,8 +1403,8 @@
     <string name="quick_launch_shortcut" msgid="5090405067413522300">"ស្វែងរក + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
     <string name="quick_launch_clear_dialog_title" msgid="5546543501250320220">"សម្អាត"</string>
     <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"ផ្លូវកាត់​របស់​អ្នក​សម្រាប់ <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>) នឹង​ត្រូវ​បាន​សម្អាត។"</string>
-    <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"យល់​ព្រម"</string>
-    <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"បោះ​បង់"</string>
+    <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"យល់​ព្រម​"</string>
+    <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"បោះ​បង់​"</string>
     <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"កម្មវិធី"</string>
     <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"ផ្លូវកាត់"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"ការ​បញ្ចូល​អត្ថបទ"</string>
@@ -1434,8 +1439,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"អេក្រង់​នឹង​មិន​ដេក​ពេល​បញ្ចូល​ថ្ម"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"បើក​កំណត់​ហេតុ HCI snoop ប៊្លូធូស"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"ចាប់​យក​​​កញ្ចប់​ HCI​ ប៊្លូ​ធូ​ស ទាំង​អស់​នៅ​ក្នុង​ឯកសារ"</string>
-    <string name="oem_unlock_enable" msgid="6629321276287913315">"បើក​ការ​ដោះ​សោ OEM"</string>
-    <string name="oem_unlock_enable_summary" msgid="3546686263996628110">"ឲ្យ​ឧបករណ៍​បាន​ដោះ​សោ OEM"</string>
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"ការដោះសោ OEM"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"អនុញ្ញាតឲ្យដោះសោកម្មវិធីចាប់ផ្តើមប្រព័ន្ធ"</string>
+    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"បញ្ចូល​កូដ PIN របស់​អ្នក"</string>
+    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"បញ្ចូល​កូដ PIN ឧបករណ៍​របស់​អ្នក ដើម្បី​បើក​ការ​ដោះ​សោ OEM"</string>
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"អនុញ្ញាតការដោះសោ OEM?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"ព្រមាន៖ លក្ខណៈពិសេសការពារឧបករណ៍នឹងមិនដំណើរការនៅលើឧបករណ៍នេះទេ ខណៈពេលដែលការកំណត់នេះត្រូវបានបើក។"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"បង្ហាញ​ការ​កំណត់​រចនាសម្ព័ន្ធ​ឥត​ខ្សែ"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"បើក​កំណត់ហេតុ​រៀបរាប់​វ៉ាយហ្វាយ"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"វ៉ាយហ្វាយ​បង្ខំ​ទៅ​ការ​បញ្ជូន​ចល័ត"</string>
@@ -1521,7 +1530,7 @@
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"បិទ"</string>
     <string name="accessibility_feature_or_input_method_not_allowed" msgid="5950315477009501647">"មិនបាន​អនុញ្ញាត​ដោយ​ស្ថាប័ន​របស់​អ្នក"</string>
     <string name="captioning_preview_title" msgid="1234015253497016890">"មើល​ជាមុន"</string>
-    <string name="captioning_standard_options_title" msgid="3284211791180335844">"ជម្រើស​ស្តង់​ដារ"</string>
+    <string name="captioning_standard_options_title" msgid="3284211791180335844">"ជម្រើស​ស្តង់​ដារ​"</string>
     <string name="captioning_locale" msgid="4559155661018823503">"ភាសា"</string>
     <string name="captioning_text_size" msgid="6737002449104466028">"ទំហំ​អត្ថបទ"</string>
     <string name="captioning_preset" msgid="8939737196538429044">"រចនាប័ទ្ម​ចំណងជើង"</string>
@@ -1538,6 +1547,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"ចំណងជើង​នឹង​​មាន​រូបរាង​ដូច​នេះ"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"លំនាំដើម"</string>
+    <string name="color_title" msgid="4258931051732243983">"ពណ៌"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"លំនាំដើម"</string>
     <string name="color_none" msgid="3475640044925814795">"គ្មាន"</string>
     <string name="color_white" msgid="8045195170201590239">"ពណ៌ស"</string>
@@ -1587,28 +1597,20 @@
     <string name="print_cancelling_state_title_template" msgid="7102968925358219875">"ការ​បោះបង់ <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
     <string name="print_failed_state_title_template" msgid="1436099128973357969">"កំហុស​​ម៉ាស៊ីន​បោះពុម្ព <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
     <string name="print_blocked_state_title_template" msgid="9065391617425962424">"បាន​ទប់ស្កាត់​ម៉ាស៊ីន​បោះពុម្ព <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
-    <string name="print_search_box_shown_utterance" msgid="7730361832020726951">"បាន​បង្ហាញ​ប្រ​អប់​ស្វែងរក"</string>
-    <string name="print_search_box_hidden_utterance" msgid="7980832833405818400">"បាន​លាក់​ប្រអប់​ស្វែងរក"</string>
+    <string name="print_search_box_shown_utterance" msgid="7730361832020726951">"បាន​បង្ហាញ​ប្រ​អប់​ស្វែងរក​"</string>
+    <string name="print_search_box_hidden_utterance" msgid="7980832833405818400">"បាន​លាក់​ប្រអប់​ស្វែងរក​"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"ថ្ម"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"អ្វី​​ដែល​កំពុង​​ប្រើ​ថ្ម"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"មិន​មាន​ទិន្នន័យ​ការ​ប្រើ​ថ្ម"</string>
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"នៅ​សល់ <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> ដើម្បី​បញ្ចូល​ថ្ម"</string>
-    <string name="power_discharging_duration" msgid="7125493014448497620">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - ប្រហែល​នៅ​ប្រើ​បាន <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="power_charging" msgid="712751285832976915">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="STATE">%2$s</xliff:g>"</string>
-    <!-- String.format failed for translation -->
-    <!-- no translation found for power_charging_duration (4802183864773082009) -->
-    <skip />
-    <!-- String.format failed for translation -->
-    <!-- no translation found for power_charging_duration_ac (3611179931297824699) -->
-    <skip />
-    <!-- String.format failed for translation -->
-    <!-- no translation found for power_charging_duration_usb (1106605348913397583) -->
-    <skip />
-    <!-- String.format failed for translation -->
-    <!-- no translation found for power_charging_duration_wireless (633606920144617227) -->
-    <skip />
+    <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> - នៅ​សល់​ប្រហែល <xliff:g id="TIME">%2$s</xliff:g>"</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> រហូត​ដល់​ពេញ"</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> រហូត​ដល់ពេញ​រចន្ត​ឆ្លាស់"</string>
+    <string name="power_charging_duration_usb" msgid="182405645340976546">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> រហូត​ដល់​ពេញ​តាមយូអេសប៊ី"</string>
+    <string name="power_charging_duration_wireless" msgid="1829295708243159464">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> រហូត​ដល់​ពេញ​ពី​ឥតខ្សែ"</string>
     <string name="power_usage_list_summary" msgid="2409288197839512482">"ប្រើ​តាំង​ពី​បញ្ចូល​ថ្ម​ពេញ​ចុងក្រោយ"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"ថ្ម​ដែល​បាន​ប្រើ​តាំង​ពី​លែង​បញ្ចូល"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"ថ្មី​ប្រើ​តាំង​ពី​ពេល​កំណត់​ឡើង​វិញ"</string>
@@ -1625,7 +1627,6 @@
     <string name="awake" msgid="387122265874485088">"ពេលវេលា​ភ្ញាក់​របស់​ឧបករណ៍"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"ពេលវេលា​​បើក​វ៉ាយហ្វាយ"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"ពេលវេលា​បើក​វ៉ាយហ្វាយ"</string>
-    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"ព័ត៌មាន​លម្អិត​ប្រវត្តិ"</string>
     <string name="details_title" msgid="3792801565213935385">"ព័ត៌មាន​លម្អិត​ការ​ប្រើ"</string>
     <string name="details_subtitle" msgid="32593908269911734">"ព័ត៌មាន​លម្អិត​នៃការ​ប្រើ"</string>
@@ -1640,7 +1641,7 @@
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"កុំព្យូទ័រ​បន្ទះ​ទំនេរ"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"ទូរស័ព្ទ​ទំនេរ"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"ផ្សេងៗ"</string>
-    <string name="power_overcounted" msgid="2762354976171358445">"លើស"</string>
+    <string name="power_overcounted" msgid="2762354976171358445">"លើស​"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU សរុប"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"ផ្ទៃ​ខាង​មុខ CPU"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"មិន​ដេក"</string>
@@ -1654,7 +1655,7 @@
     <string name="usage_type_data_wifi_send" msgid="1847552143597396162">"ផ្ញើ​កញ្ចប់ព័ត៌មានតាមវ៉ាយហ្វាយ"</string>
     <string name="usage_type_data_wifi_recv" msgid="5678475911549183829">"​ទទួលកញ្ចប់ព័ត៌មានតាមវ៉ាយហ្វាយ"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"សំឡេង"</string>
-    <string name="usage_type_video" msgid="4295357792078579944">"វីដេអូ"</string>
+    <string name="usage_type_video" msgid="4295357792078579944">"វីដេអូ​"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"ពេលវេលា​បើក"</string>
     <string name="usage_type_no_coverage" msgid="3797004252954385053">"ពេលវេលា​គ្មាន​សញ្ញា"</string>
     <string name="usage_type_total_battery_capacity" msgid="3798285287848675346">"កម្រិត​​ថ្ម​សរុប"</string>
@@ -1677,16 +1678,16 @@
     <string name="battery_desc_wifi" msgid="2375567464707394131">"ថ្មប្រើ​ដោយ​វ៉ាយហ្វាយ"</string>
     <string name="battery_sugg_wifi" msgid="3355461362094706957">"បិទ​វ៉ាយ​ហ្វាយ​​ពេល​មិន​ប្រើ​ ឬ​​​មិន​មាន"</string>
     <string name="battery_desc_bluetooth" msgid="8069070756186680367">"ថ្ម​បាន​ប្រើ​ដោយ​ប៊្លូធូស"</string>
-    <string name="battery_sugg_bluetooth_basic" msgid="1942935021750897422">"បិទ​ប៊្លូធូស​ពេល​អ្នក​មិន​ប្រើ"</string>
+    <string name="battery_sugg_bluetooth_basic" msgid="1942935021750897422">"បិទ​ប៊្លូធូស​ពេល​អ្នក​មិន​ប្រើ​"</string>
     <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"ព្យាយាម​តភ្ជាប់​​ទៅ​ឧបករណ៍​ប៊្លូធូស​ផ្សេង"</string>
     <string name="battery_desc_apps" msgid="8530418792605735226">"ថ្ម​បាន​ប្រើ​ដោយ​កម្មវិធី"</string>
     <string name="battery_sugg_apps_info" msgid="6907588126789841231">"បញ្ឈប់ ឬ​លុប​កម្មវិធី"</string>
-    <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"ជ្រើស​របៀប​សន្សំ​ថ្ម"</string>
+    <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"ជ្រើស​របៀប​សន្សំ​ថ្ម​"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"កម្មវិធី​អាច​ផ្ដល់​ការ​កំណត់​ ដើម្បី​កាត់បន្ថយ​ការ​ប្រើ​ថ្ម"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"ថ្ម​បាន​ប្រើ​ដោយ​អ្នក​ប្រើ"</string>
     <string name="battery_desc_unaccounted" msgid="7404256448541818019">"ការ​ប្រើ​ថាមពល​​ផ្សេងៗ"</string>
     <string name="battery_msg_unaccounted" msgid="1963583522633067961">"ការ​ប្រើ​ថ្ម​គឺជា​ការ​ប្រើ​ថាមពល​ប្រហាក់ប្រហែល និង​មិន​រួម​បញ្ចូល​​គ្រប់​ប្រភព​នៃ​ការ​ប្រើ​ថ្ម។​​ ផ្សេងៗ​គឺជា​ភាព​ខុសគ្នា​រវាង​ការ​ប្រើ​ថ្ម​ប្រហាក់ប្រហែល​ដែល​បាន​គណនា​ និង​ការ​ប្រើ​ជាក់ស្ដែង​បាន​ពិនិត្យមើល​លើ​ថ្ម។"</string>
-    <string name="battery_desc_overcounted" msgid="5481865509489228603">"ការ​ប្រើ​ប្រាស់​ថាមពល​លើស"</string>
+    <string name="battery_desc_overcounted" msgid="5481865509489228603">"ការ​ប្រើ​ប្រាស់​ថាមពល​លើស​"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> តាំង​ពី​បានដក"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"ពេល​បាន​ដក​ឧបករណ៍​បញ្ចូល​ថ្ម​ចុង​ក្រោយ​សម្រាប់ <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
@@ -1697,14 +1698,14 @@
     <string name="battery_saver" msgid="1426682272004907982">"កម្មវិធី​សន្សំ​ថ្ម"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"បើក​ដោយ​ស្វ័យ​ប្រវត្តិ"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"កុំ"</string>
-    <string name="battery_saver_turn_on_automatically_pct" msgid="3033681629861428940">"​ពេល​ថ្ម %1$d%%"</string>
+    <string name="battery_saver_turn_on_automatically_pct" msgid="7536784431655058267">"​​នៅ​ថ្ម %1$s"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"ស្ថិតិ​​ដំណើរការ"</string>
-    <string name="process_stats_summary" msgid="109387941605607762">"ស្ថិតិ Geeky អំពី​ដំណើរការ"</string>
-    <string name="app_memory_use" msgid="7849258480392171939">"ការ​ប្រើ​​អង្គ​ចងចាំ"</string>
+    <string name="process_stats_summary" msgid="109387941605607762">"ស្ថិតិ Geeky អំពី​ដំណើរការ​"</string>
+    <string name="app_memory_use" msgid="7849258480392171939">"ការ​ប្រើ​​អង្គ​ចងចាំ​"</string>
     <string name="process_stats_total_duration" msgid="1869761515101180444">"<xliff:g id="TYPE">%1$s</xliff:g> កម្មវិធី​ចប់​នៅ <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="process_stats_type_background" msgid="3934992858120683459">"ផ្ទៃ​ខាង​ក្រោយ"</string>
     <string name="process_stats_type_foreground" msgid="7713118254089580536">"ផ្ទៃ​ខាង​មុខ"</string>
-    <string name="process_stats_type_cached" msgid="6314925846944806511">"ទុក​ក្នុង​ឃ្លាំង"</string>
+    <string name="process_stats_type_cached" msgid="6314925846944806511">"ទុក​ក្នុង​ឃ្លាំង​"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"​អង្គ​ចងចាំ​ឧបករណ៍ <xliff:g id="MEMSTATE">%1$s</xliff:g> បច្ចុប្បន្ន"</string>
     <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"ការ​ប្រើ​អង្គ​ចងចាំ​មធ្យម"</string>
     <string name="process_stats_max_ram_use" msgid="3273876448926689261">"ការ​ប្រើ​អង្គ​ចងចាំ​អតិបរមា"</string>
@@ -1713,7 +1714,7 @@
     <string name="menu_proc_stats_duration" msgid="2323483592994720196">"រយៈពេល"</string>
     <string name="mem_details_title" msgid="6548392825497290498">"ព័ត៌មាន​លម្អិត​អង្គ​ចងចាំ"</string>
     <string name="mem_state_subtitle" msgid="2407238869781011933">"ស្ថានភាព​អង្គ​ចងចាំ"</string>
-    <string name="mem_use_subtitle" msgid="7319468770222422412">"ការ​ប្រើ​​អង្គ​ចងចាំ"</string>
+    <string name="mem_use_subtitle" msgid="7319468770222422412">"ការ​ប្រើ​​អង្គ​ចងចាំ​"</string>
     <string name="mem_use_kernel_type" msgid="8698327165935012484">"ខឺណែល"</string>
     <string name="mem_use_native_type" msgid="5976704902328347400">"ដើម"</string>
     <string name="mem_use_kernel_cache_type" msgid="6411475064463957513">"ឃ្លាំង​សម្ងាត់​ខឺណែល"</string>
@@ -1729,7 +1730,7 @@
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"ប្រភេទ​ស្ថានភាព"</string>
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"ផ្ទៃ​ខាង​ក្រោយ"</string>
     <string name="menu_proc_stats_type_foreground" msgid="2286182659954958586">"ផ្ទៃ​ខាង​មុខ"</string>
-    <string name="menu_proc_stats_type_cached" msgid="5084272779786820693">"ទុក​ក្នុង​ឃ្លាំង"</string>
+    <string name="menu_proc_stats_type_cached" msgid="5084272779786820693">"ទុក​ក្នុង​ឃ្លាំង​"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"ការ​បញ្ចូល &amp; បញ្ចេញ​សំឡេង"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"កំណត់​ការ​បញ្ចូល​​ &amp; បញ្ចេញ​សំឡេង"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"ស្វែងរក​តាម​​សំឡេង"</string>
@@ -1799,7 +1800,7 @@
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"បិទ"</string>
     <string name="gadget_wifi" msgid="4712584536500629417">"វ៉ាយហ្វាយ"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"ប៊្លូធូស"</string>
-    <string name="gadget_location" msgid="2974757497945178165">"ទី​តាំង"</string>
+    <string name="gadget_location" msgid="2974757497945178165">"ទី​តាំង​"</string>
     <string name="gadget_sync" msgid="858895763714222152">"ធ្វើ​សម​កាល​កម្ម"</string>
     <string name="gadget_brightness_template" msgid="930541920933123603">"ពន្លឺ <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"ស្វ័យប្រវត្តិ"</string>
@@ -1821,7 +1822,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"កន្លែង​ផ្ទុក​របស់​​ផ្នែក​រឹង"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"កន្លែង​ផ្ទុក​របស់​​កម្មវិធី"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"ព័ត៌មាន​សម្ងាត់​មិន​មាន​សម្រាប់​អ្នកប្រើ​នេះ​ទេ"</string>
-    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"គូរ​លំនាំ​ដោះ​សោ​របស់​អ្នក"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"អ្នក​ត្រូវ​គូរ​លំនាំ​ដោះ​សោ​របស់​អ្នក ដើម្បី​បញ្ជាក់​ការ​ដំឡើង​ព័ត៌មាន​សម្ងាត់។"</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"បញ្ចូល​ពាក្យ​សម្ងាត់​សម្រាប់​ការ​ផ្ទុក​ព័ត៌មាន​សម្ងាត់។"</string>
@@ -1851,6 +1851,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"រួម​បញ្ចូល​ទិន្នន័យ​កម្មវិធី"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"ស្ដារ​ឡើង​វិញ​ស្វ័យ​ប្រវត្តិ"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"ពេល​ដំឡើង​កម្មវិធី​ឡើងវិញ ស្ដារ​ការ​កំណត់​បម្រុងទុក និង​ទិន្នន័យ"</string>
+    <string name="backup_inactive_title" msgid="5355557151569037197">"សេវាកម្មបម្រុងអសកម្ម។"</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"វាត្រូវបានកំណត់ដោយគោលការណ៍ឧបករណ៍របស់អ្នក។"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"ពាក្យ​សម្ងាត់​បម្រុង​ទុក​លើ​ផ្ទៃតុ"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"ការ​បម្រុង​ទុក​ពេញលេញ​លើ​ផ្ទៃតុ​បច្ចុប្បន្ន​មិន​ត្រូវ​បាន​ការពារ​ទេ។"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"ប៉ះ ដើម្បី​ប្ដូរ ឬ​លុប​ពាក្យ​សម្ងាត់​សម្រាប់​ការ​បម្រុងទុក​ពេញលេញ​លើ​ផ្ទៃតុ"</string>
@@ -1889,13 +1891,13 @@
     <string name="wifi_setup_add_network" msgid="5939624680150051807">"បន្ថែម​បណ្ដាញ"</string>
     <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"ផ្ទុក​បញ្ជី​ឡើងវិញ"</string>
     <string name="wifi_setup_skip" msgid="6661541841684895522">"រំលង"</string>
-    <string name="wifi_setup_next" msgid="3388694784447820477">"បន្ទាប់"</string>
+    <string name="wifi_setup_next" msgid="3388694784447820477">"បន្ទាប់​"</string>
     <string name="wifi_setup_back" msgid="144777383739164044">"ថយក្រោយ"</string>
     <string name="wifi_setup_detail" msgid="2336990478140503605">"ព័ត៌មាន​លម្អិត​បណ្ដាញ"</string>
     <string name="wifi_setup_connect" msgid="7954456989590237049">"តភ្ជាប់"</string>
     <string name="wifi_setup_forget" msgid="2562847595567347526">"បំភ្លេច"</string>
     <string name="wifi_setup_save" msgid="3659235094218508211">"រក្សាទុក"</string>
-    <string name="wifi_setup_cancel" msgid="3185216020264410239">"បោះ​បង់"</string>
+    <string name="wifi_setup_cancel" msgid="3185216020264410239">"បោះ​បង់​"</string>
     <string name="wifi_setup_status_scanning" msgid="5317003416385428036">"កំពុង​វិភាគ​រក​បណ្ដាញ…"</string>
     <string name="wifi_setup_status_select_network" msgid="7519563569903137003">"ប៉ះ​បណ្ដាញ ដើម្បី​តភ្ជាប់​វា"</string>
     <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"តភ្ជាប់​ទៅ​បណ្ដាញ​មាន​ស្រាប់"</string>
@@ -1910,7 +1912,7 @@
     <string name="wifi_setup_description_connected" msgid="736032046548460779">"ប៉ះ "<b>"បន្ទាប់"</b>" ដើម្បី​បន្ត​ការ​រៀបចំ។\n\nប៉ះ "<b>"ថយក្រោយ"</b>" ដើម្បី​តភ្ជាប់​​បណ្ដាញ​វ៉ាយហ្វាយ​ផ្សេង។"</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"បាន​បើក​ការ​ធ្វើ​សម​កាល​កម្ម"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"បាន​បិទ​ការ​ធ្វើ​សម​កាល​កម្ម"</string>
-    <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"ធ្វើ​សម​កាល​កម្ម​ឥឡូវ"</string>
+    <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"ធ្វើ​សម​កាល​កម្ម​ឥឡូវ​"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"កំហុស​ការ​ធ្វើ​សម​កាល​កម្ម។"</string>
     <string name="sync_failed" msgid="1696499856374109647">"ការ​ធ្វើ​សម​កាល​កម្ម​បាន​បរាជ័យ"</string>
     <string name="sync_active" msgid="8476943765960863040">"ការ​ធ្វើ​សម​កាល​កម្ម សកម្ម"</string>
@@ -1960,7 +1962,11 @@
     <string name="enter_password" msgid="8035706727471334122">"ដើម្បី​ចាប់ផ្ដើម Android បញ្ចូល​ពាក្យ​សម្ងាត់​របស់​អ្នក"</string>
     <string name="enter_pin" msgid="5305333588093263790">"ដើម្បី​ចាប់ផ្ដើម Android បញ្ចូល​កូដ PIN របស់​អ្នក"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"ដើម្បី​ចាប់ផ្ដើម Android គូរ​លំនាំ​របស់​អ្នក"</string>
-    <string name="try_again" msgid="4272075051293936921">"ព្យាយាម​ម្ដង​ទៀត។"</string>
+    <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"លំនាំ​មិន​ត្រឹមត្រូវ"</string>
+    <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"ពាក្យ​សម្ងាត់​មិន​ត្រឹមត្រូវ"</string>
+    <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"កូដ PIN មិន​ត្រឹមត្រូវ"</string>
+    <string name="checking_decryption" msgid="8287458611802609493">"កំពុង​ពិនិត្យ​មើល..."</string>
+    <string name="starting_android" msgid="8581493237458496835">"ចាប់ផ្ដើម Android"</string>
     <string name="delete" msgid="4219243412325163003">"លុប"</string>
     <string name="misc_files" msgid="6720680815969643497">"ឯកសារ​ផ្សេងៗ"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"បាន​ជ្រើស <xliff:g id="NUMBER">%1$d</xliff:g> នៃ <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -1998,8 +2004,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"ប្រើ GPU ជា​និច្ច​សម្រាប់​​ផ្សំ​អេក្រង់"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"ក្លែង​ធ្វើ​ចន្លោះ​ពណ៌"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"បើក​ដាន​ OpenGL"</string>
-    <string name="use_nuplayer" msgid="5699257393367904387">"ប្រើ NuPlayer (ពិសោធន៍)"</string>
-    <string name="use_nuplayer_summary" msgid="1991479067478516714">"ប្រើ NuPlayer ជំនួស​ឲ្យ AwesomePlayer"</string>
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"ប្រើ AwesomePlayer (បានបញ្ឈប់)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"ប្រើ AwesomePlayer ជំនួសឲ្យ NuPlayer សម្រាប់កម្មវិធីលេងឯកសារកំសាន្តភាគច្រើន"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"បិទការនាំផ្លូវអូឌីយ៉ូយូអេសប៊ី"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"បិទការនាំផ្លូវស្វ័យប្រវត្តិទៅឧបករណ៍អូឌីយ៉ូ​យូអេសប៊ី"</string>
     <string name="debug_layout" msgid="5981361776594526155">"បង្ហាញ​ព្រំដែន​ប្លង់"</string>
@@ -2125,13 +2131,13 @@
     <string name="vpn_search_domains" msgid="5391995501541199624">"ដែន​ស្វែងរក DNS"</string>
     <string name="vpn_dns_servers" msgid="5570715561245741829">"ម៉ាស៊ីន​មេ DNS (ឧ. 8.8.8.8)"</string>
     <string name="vpn_routes" msgid="3818655448226312232">"បញ្ជូន​ផ្លូវ​បន្ត (ឧ. 10.0.0.0/8)"</string>
-    <string name="vpn_username" msgid="1863901629860867849">"ឈ្មោះ​អ្នក​ប្រើ"</string>
-    <string name="vpn_password" msgid="6756043647233596772">"ពាក្យសម្ងាត់"</string>
+    <string name="vpn_username" msgid="1863901629860867849">"ឈ្មោះ​អ្នក​ប្រើ​"</string>
+    <string name="vpn_password" msgid="6756043647233596772">"ពាក្យសម្ងាត់​"</string>
     <string name="vpn_save_login" msgid="6350322456427484881">"រក្សាទុក​ព័ត៌មាន​គណនី"</string>
     <string name="vpn_not_used" msgid="9094191054524660891">"(មិន​បាន​ប្រើ)"</string>
     <string name="vpn_no_ca_cert" msgid="2095005387500126113">"(កុំ​ផ្ទៀងផ្ទាត់​ម៉ាស៊ីន​មេ)"</string>
     <string name="vpn_no_server_cert" msgid="2167487440231913330">"(បាន​ទទួល​ពី​ម៉ាស៊ីន​មេ)"</string>
-    <string name="vpn_cancel" msgid="1979937976123659332">"បោះ​បង់"</string>
+    <string name="vpn_cancel" msgid="1979937976123659332">"បោះ​បង់​"</string>
     <string name="vpn_save" msgid="4233484051644764510">"រក្សាទុក"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"តភ្ជាប់"</string>
     <string name="vpn_edit" msgid="8647191407179996943">"កែ​ប្រវត្តិរូប VPN"</string>
@@ -2159,7 +2165,7 @@
     <string name="new_backup_pw_prompt" msgid="8755501377391998428">"បញ្ចូល​ពាក្យ​សម្ងាត់​ថ្មី​សម្រាប់​ការ​បម្រុងទុក​ពេញលេញ​នៅ​ទី​នេះ"</string>
     <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"បញ្ចូល​ពាក្យ​សម្ងាត់​បម្រុង​ទុក​ពេញលេញ​ថ្មី​នៅ​ទី​នេះ​ម្ដង​ទៀត"</string>
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"កំណត់​ពាក្យ​សម្ងាត់​បម្រុងទុក"</string>
-    <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"បោះ​បង់"</string>
+    <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"បោះ​បង់​"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"បច្ចុប្បន្នភាព​ប្រព័ន្ធ​បន្ថែម"</string>
     <string name="selinux_status_disabled" msgid="924551035552323327">"បិទ"</string>
     <string name="selinux_status_permissive" msgid="6004965534713398778">"អនុញ្ញាត"</string>
@@ -2175,7 +2181,6 @@
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"បន្ថែម​អ្នក​ប្រើ ឬ​ប្រវត្តិរូប"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"បន្ថែម​អ្នកប្រើ"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"ប្រវត្តិរូប​បាន​ដាក់​កម្រិត"</string>
-    <string name="user_summary_managed_profile" msgid="7369539529693048111">"ប្រវត្តិរូប​ការងារ"</string>
     <string name="user_need_lock_message" msgid="2596365678651842785">"មុន​ពេល​អ្នក​អាច​បង្កើត​ប្រវត្តិ​រូប​បាន​ដាក់​កម្រិត អ្នក​ត្រូវ​រៀបចំ​ការ​ចាក់​សោ​អេក្រង់ ដើម្បី​ការពារ​កម្មវិធី និង​ទិន្នន័យ​ផ្ទាល់ខ្លួន​របស់​អ្នក។"</string>
     <string name="user_set_lock_button" msgid="8311219392856626841">"កំណត់​ការ​ចាក់​សោ"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"មិន​បាន​កំណត់"</string>
@@ -2269,7 +2274,7 @@
     <string name="cell_broadcast_settings" msgid="2451014351355183338">"ការ​ផ្សាយ​ពេល​មាន​អាសន្ន"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"ប្រតិបត្តិ​ករ​​​បណ្ដាញ"</string>
     <string name="access_point_names" msgid="1381602020438634481">"ឈ្មោះ​ចំណុច​ចូល​ដំណើរការ"</string>
-    <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"បាន​ធ្វើ​ឲ្យ​របៀប 4G LTE ល្អ​ប្រសើរ"</string>
+    <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"បាន​ធ្វើ​ឲ្យ​របៀប 4G LTE ល្អ​ប្រសើរ​"</string>
     <string name="enhanced_4g_lte_mode_summary" msgid="1376589643017218924">"ប្រើ​​ទិន្នន័យ LTE ​ដើម្បី​បង្កើន​សំឡេង​ និង​ទំនាក់ទំនង (បាន​ផ្ដល់​អនុសាសន៍​)"</string>
     <string name="preferred_network_type_title" msgid="3431041717309776341">"ប្រភេទ​បណ្ដាញ​​ដែល​​ពេញចិត្ត"</string>
     <string name="preferred_network_type_summary" msgid="6564884693884755019">"LTE (បាន​ផ្ដល់​អនុសាសន៍)"</string>
@@ -2288,10 +2293,10 @@
     <string name="restriction_nfc_enable_summary_config" msgid="3232480757215851738">"អនុញ្ញាត​ឲ្យ​ប្ដូរ​ទិន្នន័យ នៅ​ពេល​ប៉ះ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> នេះ និង​ឧបករណ៍ NFC ផ្សេងទៀត"</string>
     <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"ឲ្យ​ប្ដូរ​ទិន្នន័យ​ពេល​កុំព្យូទ័រ​បន្ទះ​ប៉ះ​ឧបករណ៍​ផ្សេង"</string>
     <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"ឲ្យ​ប្ដូរ​ទិន្នន័យ​ពេល​ទូរស័ព្ទ​ប៉ះ​ឧបករណ៍​ផ្សេង"</string>
-    <string name="restriction_location_enable_title" msgid="5020268888245775164">"ទី​តាំង"</string>
+    <string name="restriction_location_enable_title" msgid="5020268888245775164">"ទី​តាំង​"</string>
     <string name="restriction_location_enable_summary" msgid="3489765572281788755">"ឲ្យ​កម្មវិធី​ប្រើ​ព័ត៌មាន​ទីតាំង​របស់​អ្នក"</string>
     <string name="wizard_back" msgid="5567007959434765743">"ថយក្រោយ"</string>
-    <string name="wizard_next" msgid="3606212602795100640">"បន្ទាប់"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"បន្ទាប់​"</string>
     <string name="wizard_finish" msgid="3286109692700083252">"បញ្ចប់"</string>
     <string name="user_image_take_photo" msgid="1280274310152803669">"ថតរូប"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"ជ្រើស​រូបថត​ពី​វិចិត្រសាល"</string>
@@ -2306,11 +2311,13 @@
     <string name="sim_cellular_data_unavailable_summary" msgid="3654805961942166428">"ប៉ះ​ដើម្បី​ជ្រើស​ស៊ី​ម​ទិន្នន័យ"</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"ប្រើ​វា​សម្រាប់​ការ​ហៅ​ជា​និច្ច"</string>
     <string name="select_sim_for_data" msgid="2366081042162853044">"ជ្រើស​ស៊ីម​សម្រាប់​ទិន្នន័យ"</string>
+    <string name="data_switch_started" msgid="2040761479817166311">"កំពុងប្តូរស៊ីមទិន្នន័យ វាអាចចំណាយពេលមួយនាទី..."</string>
     <string name="select_sim_for_calls" msgid="3503094771801109334">"ហៅ​ជាមួយ"</string>
     <string name="sim_select_card" msgid="211285163525563293">"ជ្រើស​ស៊ី​ម​កាត"</string>
     <string name="sim_card_number_title" msgid="7845379943474336488">"ស៊ី​ម <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"អត់មាន​ស៊ីមកាត"</string>
-    <string name="sim_editor_name" msgid="1722945976676142029">"ឈ្មោះ​ស៊ី​ម"</string>
+    <string name="sim_editor_name" msgid="1722945976676142029">"ឈ្មោះ​ស៊ី​ម​"</string>
+    <string name="sim_name_hint" msgid="7038643345238968930">"បញ្ចូលឈ្មោះស៊ីមកាត"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"រន្ធ​ស៊ីម %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"ក្រុមហ៊ុន​បញ្ជូន"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"លេខ"</string>
@@ -2320,7 +2327,6 @@
     <string name="color_purple" msgid="3888532466427762504">"ស្វាយ"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"គ្មាន​ស៊ី​ម​កាត​បាន​បញ្ចូល"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"ស្ថានភាព​ស៊ី​ម​កាត"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"ព័ត៌មាន​ទាក់ទង​ស៊ីម​កាត"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"ហៅ​ត្រឡប់​មក​វិញ​ពី​ស៊ីម​លំនាំដើម"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"ស៊ីម​សម្រាប់​ការ​ហៅ​ចេញ"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"​កំណត់​ការ​​ហៅ​ផ្សេងទៀត"</string>
@@ -2328,8 +2334,11 @@
     <string name="preferred_network_offload_header" msgid="2321173571529106767">"បិទ​ការ​ផ្សាយ​ឈ្មោះបណ្ដាញ"</string>
     <string name="preferred_network_offload_footer" msgid="5857279426054744020">"បិទ​ការ​ការពារ​ការ​ផ្សាយ​ឈ្មោះ​បណ្ដាញ​ពី​ភាគី​ទី​បី ដើម្បី​ចូល​ទៅ​កាន់​ព័ត៌មាន​បណ្ដាញ​របស់​អ្នក។"</string>
     <string name="preferred_network_offload_popup" msgid="2252915199889604600">"បិទ​ការ​ផ្សាយ​​ឈ្មោះ​បណ្ដាញ​នឹង​ការពារ​ការ​តភ្ជាប់​ស្វ័យប្រវត្តិ​ទៅ​បណ្ដាញ​ដែល​លាក់។"</string>
+    <string name="sim_signal_strength" msgid="9144010043784767984">"<xliff:g id="DBM">%1$d</xliff:g> dBm <xliff:g id="ASU">%2$d</xliff:g> asu"</string>
+    <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>
+    <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>
@@ -2338,31 +2347,31 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"ការ​ស្វែងរក​ថ្មីៗ"</string>
     <string name="search_results_label" msgid="4163304782363526148">"លទ្ធផល"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"ការ​ភ្ជាប់​បណ្ដាញ​វ៉ាយហ្វាយ"</string>
-    <string name="keywords_more_default_sms_app" msgid="2744404159003574745">"សារ​អត្ថបទ"</string>
-    <string name="keywords_more_mobile_networks" msgid="7813380887358745769">"ចល័ត ចល័ត ក្រុមហ៊ុន​បញ្ជូន ឥត​ខ្សែ"</string>
+    <string name="keywords_more_default_sms_app" msgid="895656981962034647">"សារ​អត្ថបទ សរសេរ​សារ​អត្ថបទ ការ​ផ្ញើ​សារ"</string>
+    <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"ចល័ត ចល័ត​ ក្រុមហ៊ុន​បញ្ជូន ឥត​ខ្សែ ទិន្នន័យ 4g 3g 2g lte"</string>
     <string name="keywords_home" msgid="3626170808219458848">"កម្មវិធី​ចាប់ផ្ដើម"</string>
     <string name="keywords_display" msgid="6709007669501628320">"អេក្រង់ ប៉ះ​អេក្រង់"</string>
-    <string name="keywords_display_brightness_level" msgid="8636451602230815191">"អេក្រង់​ព្រិលៗ ប៉ះ​អេក្រង់"</string>
-    <string name="keywords_display_auto_brightness" msgid="8070218600502753102">"អេក្រង់​ព្រិលៗ ប៉ះ​អេក្រង់"</string>
-    <string name="keywords_display_wallpaper" msgid="4315466287469834939">"ផ្ទៃ​ខាងក្រោយ"</string>
+    <string name="keywords_display_brightness_level" msgid="8923289340474728990">"ធ្វើ​ឲ្យ​អេក្រង់​ព្រិល​ពេល​ប៉ះ​ថ្ម"</string>
+    <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"ធ្វើ​ឲ្យ​អេក្រង់​ព្រិល​ពេល​ប៉ះ​ថ្ម"</string>
+    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"ធ្វើ​ផ្ទៃ​ខាង​ក្រោយ​តាម​បុគ្គល​ប្ដូរ​ការ​បង្ហាញ​តាម​បំណង"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"ទំហំ​អត្ថបទ"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"គម្រោង"</string>
-    <string name="keywords_storage" msgid="7007275853993419928">"ទំហំ ថាស ថាសរឹង"</string>
-    <string name="keywords_battery" msgid="3992479295298655138">"ថាមពល"</string>
-    <string name="keywords_spell_checker" msgid="4509482591225399210">"ការ​ប្រកប"</string>
+    <string name="keywords_storage" msgid="6572905220031852173">"ទំហំ ថាស​រឹង ដ្រាយ ឧបករណ៍ ការ​ប្រើ"</string>
+    <string name="keywords_battery" msgid="2096185085932675704">"គិតលុយ​ការ​ប្រើ​ថាមពល"</string>
+    <string name="keywords_spell_checker" msgid="6106749039734174140">"ប្រកប វចនានុក្រម ពិនិត្យ​អក្ខរាវិរុទ្ធ កែ​ស្វ័យ​ប្រវត្តិ"</string>
     <string name="keywords_voice_input" msgid="3519547605812413860">"កម្មវិធី​ស្គាល់ ការ​បញ្ចូល ការ​និយាយ និយាយ ភាសា ហេនហ្វ្រី ហេនហ្វ្រី ការ​ស្គាល់ បំពាន ពាក្យ សំឡេង ប្រវត្តិ ប៊្លូធូស កាស"</string>
-    <string name="keywords_text_to_speech_output" msgid="8207889472282225512">"អត្រា ភាសា លំនាំដើម និយាយ ការ​និយាយ"</string>
-    <string name="keywords_date_and_time" msgid="7666950126499155141">"នាឡិកា"</string>
-    <string name="keywords_factory_data_reset" msgid="3693730656843989732">"សម្អាត លុប"</string>
+    <string name="keywords_text_to_speech_output" msgid="392447904221657930">"អត្រា ភាសា លំនាំដើម និយាយ ការ​និយាយ tts ភាព​ងាយស្រួល ​អ្នក​អាន ពិការ"</string>
+    <string name="keywords_date_and_time" msgid="2631808108134830066">"កម្លាំង​នាឡិកា"</string>
+    <string name="keywords_factory_data_reset" msgid="4355133848707691977">"លុប លុប ស្ដារ​ឡើង​វិញ សម្អាត លុបចេញ"</string>
     <string name="keywords_printing" msgid="1701778563617114846">"ម៉ាស៊ីន​បោះពុម្ព"</string>
     <string name="keywords_sounds_and_notifications" msgid="5965996187974887000">"សំឡេង​អូប៉ាល័រ"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="2912933812460077912">"កុំ កុំ រំខាន ផ្អាក បំបែក"</string>
     <string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
     <string name="keywords_location" msgid="782326973714313480">"ការ​រាយការណ៍​ប្រវត្តិ​ទីតាំង​នៅ​ក្បែរ​ៗ"</string>
-    <string name="keywords_location_mode" msgid="8584992704568356084">"ភាព​ត្រឹមត្រូវ"</string>
+    <string name="keywords_location_mode" msgid="8584992704568356084">"ភាព​ត្រឹមត្រូវ​"</string>
     <string name="keywords_accounts" msgid="1957925565953357627">"គណនី"</string>
     <string name="keywords_users" msgid="4673901601478559100">"ការ​ដាក់​កម្រិត ដាក់កម្រិត បាន​ដាក់​កម្រិត"</string>
-    <string name="keywords_keyboard_and_ime" msgid="1103378692379215672">"អត្ថបទ ការ​កែ កែ សំឡេង ញ័រ ស្វ័យប្រវត្តិ ភាសា កាយវិការ ស្នើ ការ​ស្នើ រូបរាង បំពាន ពាក្យ វាយ​បញ្ចូល សញ្ញា​អារម្មណ៍"</string>
+    <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"ការ​កែ​អត្ថបទ កែ សំឡេង ញ័រ ស្វ័យប្រវត្តិ ភាសា កាយវិការ ស្នើ ការ​ស្នើ រូបរាង បំពាន ពាក្យ វាយ​បញ្ចូល សញ្ញា​អារម្មណ៍ អន្តរជាតិ"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"រុញ​ពាក្យសម្ងាត់ លំនាំ កូដ pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"រៀបចំ​ស្លាក​អិនអេហ្វ​ស៊ី​វ៉ាយហ្វាយ"</string>
     <string name="write_tag" msgid="8571858602896222537">"សរសេរ"</string>
@@ -2379,7 +2388,6 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"កម្រិត​សំឡេង​ការ​ជូន​ដំណឹង"</string>
     <string name="zen_mode_settings_title" msgid="7014915558669122902">"​ផ្អាក"</string>
     <string name="zen_mode_option_title" msgid="5061978632306007914">"ពេល​មាន​ការ​ហៅ និង​ការ​ជូន​ដំណឹង"</string>
-    <string name="zen_mode_option_title_novoice" msgid="6680706009915204785">"ពេល​មាន​​ការ​ជូន​ដំណឹង"</string>
     <string name="zen_mode_option_off" msgid="3167702608910820883">"ផ្អាក​ជា​និច្ច"</string>
     <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"អនុញ្ញាត​តែ​ការ​​​ផ្អាក​​អាទិភាព​ប៉ុណ្ណោះ"</string>
     <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"កុំ​ផ្អាក"</string>
@@ -2391,7 +2399,7 @@
     <string name="lock_screen_notifications_title" msgid="9118805570775519455">"នៅ​ពេល​​បាន​ចាក់សោ​ឧបករណ៍"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"បង្ហាញ​មាតិកា​ជូនដំណឹង​ទាំងអស់"</string>
     <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"លាក់​មាតិកា​ជូនដំណឹង​​មិន​សមរម្យ"</string>
-    <string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"កុំ​បង្ហាញ​ការ​ជូនដំណឹង"</string>
+    <string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"កុំ​បង្ហាញ​ការ​ជូនដំណឹង​"</string>
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"នៅ​ពេល​ឧបករណ៍​របស់​អ្នក​ជាប់​សោ តើ​អ្នក​ចង់​ឲ្យ​ការ​ជូន​ដំណឹង​បង្ហាញ​ដោយ​របៀប​ណា?"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"ការ​ជូន​ដំណឹង​កម្មវិធី"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"សំឡេង​ផ្សេង​ទៀត"</string>
@@ -2437,14 +2445,17 @@
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"រួចរាល់"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"រហូត​ដល់ពេល​​អ្នក​បិទ​វា"</string>
     <string name="zen_mode_important_category" msgid="8123274463331022993">"ការ​​ផ្អាក​​​អាទិភាព"</string>
-    <string name="zen_mode_downtime_category" msgid="4730179065426038108">"ពេល​សម្រាក ឬរវល់​(តែ​ការ​ផ្អាក​អាទិភាព)"</string>
+    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"រាប់​ថយក្រោយ"</string>
     <string name="zen_mode_downtime_days" msgid="3361856902633311616">"ថ្ងៃ"</string>
     <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"គ្មាន"</string>
+    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"បាន​អនុញ្ញាត​ការ​ផ្អាក"</string>
+    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"តែ​អាទិភាព​ប៉ុណ្ណោះ"</string>
+    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"គ្មាន"</string>
     <string name="zen_mode_automation_category" msgid="4653551005950835761">"ស្វ័យ​ប្រវត្តិ"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"បើក​ដោយ​ស្វ័យ​ប្រវត្តិ"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"កុំ"</string>
-    <string name="zen_mode_phone_calls" msgid="8956214416859303966">"ហៅ"</string>
+    <string name="zen_mode_calls" msgid="7051492091133751208">"ហៅ"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"សារ"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"ការ​ហៅ​ទូរស័ព្ទ/​ផ្ញើ​សារ​ពី"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"គ្រប់គ្នា"</string>
@@ -2458,7 +2469,9 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"យប់​សប្ដាហ៍​ធ្វើការ"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"ម៉ោង​ចាប់ផ្ដើម"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"ម៉ោង​បញ្ចប់"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> ថ្ងៃ​បន្ទាប់"</string>
+    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> ថ្ងៃបន្ទាប់"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> ឬការដាស់តឿនណាមួយមុននោះ"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> ថ្ងៃបន្ទាប់ ឬការដាស់តឿនណាមួយមុននោះ"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"ការជូន​ដំណឹងកម្មវិធី"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"​កំណត់​ការ​ជូនដំណឹង"</string>
     <string name="device_feedback" msgid="3238056036766293294">"ផ្ដល់​មតិ​ស្ថាបនា​អំពី​ឧបករណ៍​នេះ"</string>
@@ -2466,7 +2479,11 @@
     <string name="switch_on_text" msgid="1124106706920572386">"បើក"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"បិទ"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"ភ្ជាប់​អេក្រង់"</string>
-    <string name="screen_pinning_description" msgid="7091642350452605379">"នៅ​ពេល​បាន​បើក អ្នក​អាច​ប្រើ​ការ​ភ្ជាប់​អេក្រង់ ដើម្បី​រក្សាទុក​អេក្រង់​បច្ចុប្បន្ន​ក្នុង​ទិដ្ឋភាព​ដែល​អ្នក​មិន​ភ្ជាប់។\n\nដើម្បី​ប្រើ​ការ​ភ្ជាប់​អេក្រង់៖\n\n១. ប្រាកដ​ថា ការ​ភ្ជាប់​អេក្រង់​ត្រូវ​បាន​បើក។\n\n២. បើក​អេក្រង់​ដែល​អ្នក​ចង់​ភ្ជាប់។\n\n៣. ប៉ះ​ទិដ្ឋភាព។\n\n៤. ប៉ះ​រូបតំណាង​ភ្ជាប់។"</string>
+    <string name="screen_pinning_description" msgid="1137904524037468263">"នៅ​ពេល​ការ​កំណត់​នេះ​ត្រូវ​បាន​បើក អ្នក​អាច​ប្រើ​ការ​ភ្ជាប់​អេក្រង់ ដើម្បី​​​រក្សា​អេក្រង់​បច្ចុប្បន្ន​ក្នុង​ទិដ្ឋភាព​រហូត​ដល់​អ្នក​ផ្ដាច់។\n\nដើម្បី​ប្រើ​ការ​ភ្ជាប់​អេក្រង់៖\n\n១. ប្រាកដ​ថា ការ​ភ្ជាប់​អេក្រង់​ត្រូវ​បាន​បើក។\n\n២. បើក​អេក្រង់​ដែល​អ្នក​ចង់​ភ្ជាប់។\n\n៣. ប៉ះ​ទិដ្ឋភាព​ទូទៅ។\n\n៤. អូស​ឡើង​លើ ហើយ​បន្ទាប់​មក​ប៉ះ​រូបតំណាង​ភ្ជាប់។"</string>
+    <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"សួរ​រក​លំនាំ​ដោះ​សោ​មុន​ពេល​ផ្ដាច់"</string>
+    <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"សួរ​រក​កូដ PIN មុន​ពេល​ផ្ដាច់"</string>
+    <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"សួរ​រក​ពាក្យ​សម្ងាត់​មុន​ពេល​ផ្ដាច់"</string>
+    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"ចាក់​សោ​ឧបករណ៍​ពេល​មិន​ភ្ជាប់"</string>
     <string name="managed_user_title" msgid="8101244883654409696">"ប្រវត្តិរូប​ការងារ"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(ពិសោធន៍​)"</string>
     <string name="display_auto_rotate_title" msgid="6176450657107806043">"នៅ​ពេល​បង្វិល​ឧបករណ៍"</string>
@@ -2475,7 +2492,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"ស្ថិតនៅ​​ក្នុង​ទិដ្ឋភាព​ទេសភាព"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"ស្ថិត​នៅ​ក្នុង​​ទិស​ដៅ​​បច្ចុប្បន្ន"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"ព័ត៌មាន IMEI"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"ព័ត៌មាន​ទាក់ទង​នឹង IMEI"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"ការ​អ៊ិនគ្រីប"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"បន្ត"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"អ្នក​អាច​ការពារ​ឧបករណ៍​នេះ​បន្ថែម​ទៀត​ដោយ​ទាមទារ​​កូដ PIN របស់​អ្នក​មុន​ពេល​វា​ចាប់ផ្ដើម។ រហូត​ដល់​ឧបករណ៍​ចាប់ផ្ដើម វា​មិន​អាច​ទទួល​ការ​​ហៅ, សារ ឬ​ការ​ជូន​ដំណឹង​​រួមមាន ការ​រោទ៍​។ \n\nវា​ជួយ​ការពារ​ទិន្នន័យ​នៅ​ពេល​ឧបករណ៍​បាត់ ឬ​គេ​លួច។"</string>
@@ -2493,4 +2509,7 @@
     <string name="encrypt_talkback_dialog_message_pin" msgid="1890374082842868489">"នៅ​ពេល​អ្នក​បញ្ចូល​​កូដ PIN ដើម្បី​ចាប់ផ្ដើម​ឧបករណ៍​នេះ សេវាកម្ម​ភាព​ងាយស្រួល​ដូច​ជា <xliff:g id="SERVICE">%1$s</xliff:g> នឹង​មិន​អាច​ប្រើ​បាន​នៅ​ឡើយ​ទេ។"</string>
     <string name="encrypt_talkback_dialog_message_pattern" msgid="4474332516537386384">"នៅ​ពេល​អ្នក​បញ្ចូល​​លំនាំ​ដើម្បី​ចាប់ផ្ដើម​ឧបករណ៍​នេះ សេវាកម្ម​ភាព​ងាយស្រួល​ដូច​ជា <xliff:g id="SERVICE">%1$s</xliff:g> នឹង​មិន​អាច​ប្រើ​បាន​នៅ​ឡើយ​ទេ។"</string>
     <string name="encrypt_talkback_dialog_message_password" msgid="8166099418487083927">"នៅ​ពេល​អ្នក​បញ្ចូល​ពាក្យ​សម្ងាត់​ដើម្បី​ចាប់ផ្ដើម​ឧបករណ៍​នេះ សេវាកម្ម​ភាព​ងាយស្រួល​ដូច​ជា <xliff:g id="SERVICE">%1$s</xliff:g> នឹង​មិន​អាច​ប្រើ​បាន​នៅ​ឡើយ​ទេ។"</string>
+    <string name="imei_information_title" msgid="8499085421609752290">"ព័ត៌មាន IMEI"</string>
+    <string name="imei_information_summary" msgid="2074095606556565233">"ព័ត៌មាន​ទាក់ទង​នឹង IMEI"</string>
+    <string name="slot_number" msgid="3762676044904653577">"(រន្ធ <xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-kn-rIN/arrays.xml b/res/values-kn-rIN/arrays.xml
index 8e41db2..f71abee 100644
--- a/res/values-kn-rIN/arrays.xml
+++ b/res/values-kn-rIN/arrays.xml
@@ -527,4 +527,12 @@
     <item msgid="4338089220026248848">"ಕ್ಯಾಶ್ ಮಾಡಲಾದ (ಚಟುವಟಿಕೆ ಕ್ಲೈಂಟ್)"</item>
     <item msgid="6652164677254579050">"ಕ್ಯಾಶ್ ಮಾಡಲಾಗಿದೆ (ಖಾಲಿ)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"ಗಾಢ ಹಸಿರು-ನೀಲಿ"</item>
+    <item msgid="8332294763632946560">"ನೀಲಿ"</item>
+    <item msgid="2023216417616991392">"ಊದಾ"</item>
+    <item msgid="3170497246594232819">"ನೇರಳೆ"</item>
+    <item msgid="4608643045752965568">"ಗುಲಾಬಿ ಬಣ್ಣ"</item>
+    <item msgid="6131821495505931173">"ಕೆಂಪು"</item>
+  </string-array>
 </resources>
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
index 379fce5..3c9e3a4 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>
@@ -180,7 +180,6 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s ನಿಮ್ಮ ಸಂದೇಶಗಳನ್ನು ಪ್ರವೇಶಿಸಲು ಬಯಸುತ್ತದೆ. %2$s ಗೆ ಪ್ರವೇಶವನ್ನು ನೀಡುವುದೇ?"</string>
     <string name="date_and_time" msgid="9062980487860757694">"ದಿನಾಂಕ &amp; ಸಮಯ"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"ಸಮಯದ ವಲಯವನ್ನು ಆರಿಸಿ"</string>
-    <string name="normal_date_format" msgid="7636406984925498359">"ಪ್ರಾದೇಶಿಕ (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"ಪೂರ್ವವೀಕ್ಷಣೆ:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"ಫಾಂಟ್ ಗಾತ್ರ:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -291,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>
@@ -322,8 +321,6 @@
     <string name="date_time_set_timezone" msgid="5045627174274377814">"ಸಮಯ ವಲಯವನ್ನು ಆಯ್ಕೆಮಾಡಿ"</string>
     <string name="date_time_set_date_title" msgid="6928286765325608604">"ದಿನಾಂಕ"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"ದಿನಾಂಕವನ್ನು ಹೊಂದಿಸಿ"</string>
-    <string name="date_time_date_format_title" msgid="3976171711988766411">"ದಿನಾಂಕ ಸ್ವರೂಪ"</string>
-    <string name="date_time_date_format" msgid="6951498879879281102">"ದಿನಾಂಕ ಸ್ವರೂಪವನ್ನು ಆರಿಸಿ"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"ವರ್ಣಮಾಲೆಯಾನುಸಾರ ವಿಂಗಡಿಸು"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"ಸಮಯ ವಲಯದ ಅನುಸಾರವಾಗಿ ವಿಂಗಡಿಸು"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"ದಿನಾಂಕ"</string>
@@ -372,7 +369,8 @@
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"ನಿಮ್ಮ ಫೋನ್ ಅನ್ನು ಎನ್‌ಕ್ರಿಪ್ಟ್‌ ಮಾಡುವಾಗ ನಿರೀಕ್ಷಿಸಿ. <xliff:g id="PERCENT">^1</xliff:g>% ಪೂರ್ಣಗೊಂಡಿದೆ."</string>
     <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್ ಎನ್‌ಕ್ರಿಪ್ಟ್ ಆಗುವವರೆಗೆ ಕಾಯಿರಿ. ಉಳಿದಿರುವ ಸಮಯ: <xliff:g id="DURATION">^1</xliff:g>"</string>
     <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"ನಿಮ್ಮ ಫೋನ್ ಎನ್‌ಕ್ರಿಪ್ಟ್ ಆಗುವವರೆಗೆ ಕಾಯಿರಿ. ಉಳಿದಿರುವ ಸಮಯ: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"<xliff:g id="DELAY">^1</xliff:g> ಸೆಕೆಂಡುಗಳಲ್ಲಿ ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ."</string>
+    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್‌ ಅನ್‌ಲಾಕ್‌ ಮಾಡಲು, ಅದನ್ನು ಆಫ್‌ ಮಾಡಿ ನಂತರ ಆನ್‌ ಮಾಡಿ."</string>
+    <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"ನಿಮ್ಮ ಫೋನ್‌ ಅನ್‌ಲಾಕ್‌ ಮಾಡಲು, ಅದನ್ನು ಆಫ್‌ ಮಾಡಿ ನಂತರ ಆನ್‌ ಮಾಡಿ."</string>
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"ಎಚ್ಚರಿಕೆ: ಅನ್‌ಲಾಕ್‌ ಮಾಡಲು <xliff:g id="COUNT">^1</xliff:g> ಹೆಚ್ಚಿನ ವಿಫಲ ಪ್ರಯತ್ನಗಳ ನಂತರ ನಿಮ್ಮ ಸಾಧನವನ್ನು ಅಳಿಸಲಾಗುತ್ತದೆ!"</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"ನಿಮ್ಮ ಪಾಸ್‌ವರ್ಡ್‌ ಟೈಪ್ ಮಾಡಿ"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"ಎನ್‌ಕ್ರಿಪ್ಷನ್ ಯಶಸ್ವಿಯಾಗಿದೆ"</string>
@@ -401,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>
@@ -412,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>
@@ -556,13 +556,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"ಸ್ಪೀಕರ್ ಫೋನ್‌ನಂತೆ"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"ಸಂಗೀತ ಮತ್ತು ಮಾಧ್ಯಮಕ್ಕಾಗಿ"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ನೆನಪಿನಲ್ಲಿಡು"</string>
-    <string name="wifi_assistant_intro_setup" msgid="4605105515416995110">"Wi‑Fi ಸಹಾಯಕವನ್ನು\nಪರಿಚಯಿಸಲಾಗುತ್ತಿದೆ"</string>
-    <string name="wifi_assistant_no_thanks" msgid="2776983751990143934">"ಬೇಡ, ಧನ್ಯವಾದಗಳು"</string>
-    <string name="wifi_assistant_setup" msgid="3772423650475730906">"ಹೊಂದಿಸು"</string>
-    <string name="wifi_assistant_card_message" msgid="107811647784658536">"Wi‑Fi ಸಹಾಯದೊಂದಿಗೆ ಲಭ್ಯ ನೆಟ್‌ವರ್ಕ್‌ಗಳಿಗೆ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಸಂಪರ್ಕಿಸಿ."</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi‑Fi ಸಹಾಯಕ"</string>
-    <string name="wifi_assistant_title_message" msgid="6240721017579074015">"<xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> ಲಭ್ಯವಿರುವ ಉತ್ತಮ Wi‑Fi ಗೆ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ನಿಮ್ಮನ್ನು ಸಂಪರ್ಕಪಡಿಸುತ್ತದೆ"</string>
-    <string name="wifi_assistant_open_app" msgid="4803044899535675063">"ಅಪ್ಲಿಕೇಶನ್ ತೆರೆಯಿರಿ"</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>
@@ -592,7 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Wi‑Fi ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"ವಯರ್‌ಲೆಸ್‌ ಪ್ರವೇಶಿಸುವಿಕೆ ಅಂಶಗಳನ್ನು ಹೊಂದಿಸಿ &amp; ನಿರ್ವಹಿಸಿ"</string>
-    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Wi‑Fi ಆಯ್ಕೆಮಾಡಿ"</string>
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Wi-Fi ನೆಟ್‌ವರ್ಕ್ ಆಯ್ಕೆಮಾಡಿ"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Wi‑Fi ಆಯ್ಕೆಮಾಡಿ"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Wi‑Fi ಆನ್‌ ಮಾಡಲಾಗುತ್ತಿದೆ…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Wi‑Fi ಆಫ್‌ ಮಾಡಲಾಗುತ್ತಿದೆ…"</string>
@@ -607,8 +602,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"ಸ್ಕ್ಯಾನಿಂಗ್ ಯಾವಾಗಲೂ ಲಭ್ಯ"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"ಯಾವಾಗಲೂ ಸ್ಕ್ಯಾನಿಂಗ್ ಅನುಮತಿಸು"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Wi‑Fi ಆಫ್‌ ಆಗಿದ್ದಾಗಲೂ ಕೂಡ Google ನ ಸ್ಥಳ ಸೇವೆಗಳು ಮತ್ತು ಇತರ ಅಪ್ಲಿಕೇಶನ್‌ ನೆಟ್‌ವರ್ಕ್‌ಗಳನ್ನು ಸ್ಕ್ಯಾನ್‌ ಮಾಡುತ್ತವೆ"</string>
-    <string name="wifi_automatically_manage_title" msgid="6249976570008992746">"ಸ್ವಯಂಚಾಲಿತವಾಗಿ Wi‑Fi ನಿರ್ವಹಿಸಿ"</string>
-    <string name="wifi_automatically_manage_summary" msgid="6952470763378312488">"ನಿಮ್ಮ Wi‑Fi ಸಂಪರ್ಕ ನಿರ್ವಹಣೆಯನ್ನು <xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> ಗೆ ಬಿಟ್ಟುಬಿಡಿ"</string>
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಮುಕ್ತ Wi‑Fi ಬಳಸಿ"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"ಉತ್ತಮ ಗುಣಮಟ್ಟದ್ದೆಂದು ದೃಢೀಕರಿಸಲಾಗಿರುವ ಮುಕ್ತ ನೆಟ್‌ವರ್ಕ್‌ಗಳಿಗೆ ಸಂಪರ್ಕಪಡಿಸಲು Wi‑Fi ಸಹಾಯಕವನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಅನುಮತಿಸಿ"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"ಸಹಾಯಕ ಆಯ್ಕೆಮಾಡಿ"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"ಪ್ರಮಾಣಪತ್ರಗಳನ್ನು ಸ್ಥಾಪಿಸು"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"ಸ್ಥಳ ನಿಖರತೆಯನ್ನು ಸುಧಾರಿಸಲು ಮತ್ತು ಇತರ ಉದ್ದೇಶಗಳಿಗಾಗಿ, Wi-Fi ಆಫ್‌ ಇದ್ದಾಗಲೂ ಸಹ, ಹತ್ತಿರದ ನೆಟ್‌ವರ್ಕ್‌ಗಳಿಗಾಗಿ Google ಮತ್ತು ಇತರ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಸ್ಕ್ಯಾನ್‌ ಮಾಡಬಹುದು. ನೀವು ಇದನ್ನು ಮಾಡಲು ಬಯಸದಿದ್ದರೆ, ಸುಧಾರಿತ &gt; ಸ್ಕ್ಯಾನಿಂಗ್‌ಗೆ ಹೋಗಿ ಯಾವಾಗಲೂ ಲಭ್ಯವಿರುತ್ತದೆ."</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Wi-Fi ಆಫ್‌ ಇದ್ದಾಗಲೂ ಸಹ, ಹತ್ತಿರದ ನೆಟ್‌ವರ್ಕ್‌ಗಳಿಗಾಗಿ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಸ್ಕ್ಯಾನ್‌ ಮಾಡಬಹುದು. ನೀವು ಇದನ್ನು ಬಯಸದಿದ್ದರೆ, ಸುಧಾರಿತ &gt; ಸ್ಕ್ಯಾನಿಂಗ್‌‌ಗೆ ಹೋಗಿ ಯಾವಾಗಲೂ ಲಭ್ಯವಿರುತ್ತದೆ."</string>
@@ -629,6 +625,7 @@
     <string name="wifi_menu_scan" msgid="1470911530412095868">"ಸ್ಕ್ಯಾನ್"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"ಸುಧಾರಿತ"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"ನೆಟ್‌ವರ್ಕ್‌ಗೆ ಸಂಪರ್ಕಪಡಿಸಿ"</string>
+    <string name="wifi_menu_remember" msgid="8814185749388713796">"ನೆಟ್‌ವರ್ಕ್ ನೆನಪಿಡಿ"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"ನೆಟ್‌ವರ್ಕ್‌ ಮರೆತುಬಿಡು"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"ನೆಟ್‌ವರ್ಕ್‌ ಮಾರ್ಪಡಿಸು"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"NFC ಟ್ಯಾಗ್ ರೈಟ್ ಮಾಡಿ"</string>
@@ -673,9 +670,11 @@
     <string name="wifi_unspecified" msgid="5431501214192991253">"(ನಿರ್ದಿಷ್ಟಪಡಿಸದ)"</string>
     <string name="wifi_remembered" msgid="4955746899347821096">"ಉಳಿಸಲಾಗಿದೆ"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"</string>
-    <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"ಕಳಪೆ ಇಂಟರ್ನೆಟ್ ಸಂಪರ್ಕವನ್ನು ತಪ್ಪಿಸಲಾಗಿದೆ"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP ಕಾನ್ಫಿಗರೇಶನ್ ವಿಫಲತೆ"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"WiFi ಸಂಪರ್ಕ ವಿಫಲತೆ"</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"ಪ್ರಮಾಣೀಕರಣ ಸಮಸ್ಯೆ"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"ವ್ಯಾಪ್ತಿಯಲ್ಲಿಲ್ಲ"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"ಯಾವುದೇ ಇಂಟರ್ನೆಟ್‌ ಪ್ರವೇಶ ಪತ್ತೆಯಾಗಿಲ್ಲ, ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಮರುಸಂಪರ್ಕಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS ಲಭ್ಯವಿದೆ"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS ಲಭ್ಯವಿದೆ)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"ನಿಮ್ಮ ನೆಟ್‌ವರ್ಕ್‌ ಪಾಸ್‌ವರ್ಡ್‌ ನಮೂದಿಸಿ"</string>
@@ -699,9 +698,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"ಎಚ್ಚರಿಕೆ: ನೀವು Wi-Fi ಸ್ಕಿಪ್ ಮಾಡಿದರೆ, ಆರಂಭಿಕ ಡೌನ್‌ಲೋಡ್‌ಗಳು ಮತ್ತು ನವೀಕರಣಗಳಿಗಾಗಿ ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್ ಸೆಲ್ಯುಲಾರ್ ಡೇಟಾವನ್ನು ಮಾತ್ರ ಬಳಸುತ್ತದೆ. ಸಂಭಾವ್ಯ ಡೇಟಾ ಶುಲ್ಕಗಳನ್ನು ನಿಯಂತ್ರಿಸಲು, Wi-Fi ಗೆ ಸಂಪರ್ಕಪಡಿಸಿ."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"ಎಚ್ಚರಿಕೆ: ನೀವು Wi-Fi ಸ್ಕಿಪ್ ಮಾಡಿದರೆ, ಆರಂಭಿಕ ಡೌನ್‌ಲೋಡ್‌ಗಳು ಮತ್ತು ನವೀಕರಣಗಳಿಗಾಗಿ ನಿಮ್ಮ ಸಾಧನ ಸೆಲ್ಯುಲಾರ್ ಡೇಟಾವನ್ನು ಮಾತ್ರ ಬಳಸುತ್ತದೆ. ಸಂಭಾವ್ಯ ಡೇಟಾ ಶುಲ್ಕಗಳನ್ನು ನಿಯಂತ್ರಿಸಲು, Wi-Fi ಗೆ ಸಂಪರ್ಕಪಡಿಸಿ."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"ಎಚ್ಚರಿಕೆ: ನೀವು Wi-Fi ಸ್ಕಿಪ್ ಮಾಡಿದರೆ, ಆರಂಭಿಕ ಡೌನ್‌ಲೋಡ್‌ಗಳು ಮತ್ತು ನವೀಕರಣಗಳಿಗಾಗಿ ನಿಮ್ಮ ಫೋನ್ ಸೆಲ್ಯುಲಾರ್ ಡೇಟಾವನ್ನು ಮಾತ್ರ ಬಳಸುತ್ತದೆ. ಸಂಭಾವ್ಯ ಡೇಟಾ ಶುಲ್ಕಗಳನ್ನು ನಿಯಂತ್ರಿಸಲು, Wi-Fi ಗೆ ಸಂಪರ್ಕಪಡಿಸಿ."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="2393880108322835846">"ಎಚ್ಚರಿಕೆ: ನೀವು Wi-Fi ಸ್ಕಿಪ್ ಮಾಡಿದರೆ, ಯಾವುದೇ ಆರಂಭಿಕ ಡೌನ್‌ಲೋಡ್‌ಗಳು ಅಥವಾ ನವೀಕರಣಗಳಿಗೆ ಬಳಸಲು ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್ ಇಂಟರ್ನೆಟ್ ಸಂಪರ್ಕವನ್ನು ಹೊಂದಿರುವುದಿಲ್ಲ."</string>
-    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1707391993265558787">"ಎಚ್ಚರಿಕೆ: ನೀವು Wi-Fi ಸ್ಕಿಪ್ ಮಾಡಿದರೆ, ಯಾವುದೇ ಆರಂಭಿಕ ಡೌನ್‌ಲೋಡ್‌ಗಳು ಅಥವಾ ನವೀಕರಣಗಳನ್ನು ಬಳಸಲು ನಿಮ್ಮ ಸಾಧನ ಇಂಟರ್ನೆಟ್ ಸಂಪರ್ಕವನ್ನು ಹೊಂದಿರುವುದಿಲ್ಲ."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="1556858507920033022">"ಎಚ್ಚರಿಕೆ: ನೀವು Wi-Fi ಸ್ಕಿಪ್ ಮಾಡಿದರೆ, ಯಾವುದೇ ಆರಂಭಿಕ ಡೌನ್‌ಲೋಡ್‌ಗಳು ಅಥವಾ ನವೀಕರಣಗಳನ್ನು ಬಳಸಲು ನಿಮ್ಮ ಫೋನ್ ಇಂಟರ್ನೆಟ್ ಸಂಪರ್ಕವನ್ನು ಹೊಂದಿರುವುದಿಲ್ಲ."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"ನೀವು Wi-Fi ಸ್ಕಿಪ್ ಮಾಡಿದರೆ:\n\nನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್ ಇಂಟರ್ನೆಟ್ ಸಂಪರ್ಕವನ್ನು ಹೊಂದಿರುವುದಿಲ್ಲ.\n\nನೀವು ಇಂಟರ್ನೆಟ್‌ಗೆ ಸಂಪರ್ಕಗೊಳ್ಳುವವರೆಗೂ ನೀವು ಸಾಫ್ಟ್‌ವೇರ್ ನವೀಕರಣಗಳನ್ನು ಪಡೆದುಕೊಳ್ಳುವುದಿಲ್ಲ.\n\nಈ ಸಮಯದಲ್ಲಿ ನಿಮಗೆ ಸಾಧನ ರಕ್ಷಣೆ ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"ನೀವು Wi-Fi ಅನ್ನು ಸ್ಕಿಪ್ ಮಾಡಿದರೆ:\n\nನಿಮ್ಮ ಸಾಧನವು ಇಂಟರ್ನೆಟ್ ಸಂಪರ್ಕವನ್ನು ಹೊಂದಿರುವುದಿಲ್ಲ.\n\nನೀವು ಇಂಟರ್ನೆಟ್‌ಗೆ ಸಂಪರ್ಕಗೊಳ್ಳುವವರೆಗೂ ನೀವು ಸಾಫ್ಟ್‌ವೇರ್ ನವೀಕರಣಗಳನ್ನು ಪಡೆದುಕೊಳ್ಳುವುದಿಲ್ಲ.\n\nಈ ಸಮಯದಲ್ಲಿ ನಿಮಗೆ ಸಾಧನ ರಕ್ಷಣೆ ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"ನೀವು Wi-Fi ಸ್ಕಿಪ್ ಮಾಡಿದರೆ:\n\nನಿಮ್ಮ ಫೋನ್ ಇಂಟರ್ನೆಟ್ ಸಂಪರ್ಕವನ್ನು ಹೊಂದಿರುವುದಿಲ್ಲ.\n\nನೀವು ಇಂಟರ್ನೆಟ್‌ಗೆ ಸಂಪರ್ಕಗೊಳ್ಳುವವರೆಗೂ ನೀವು ಸಾಫ್ಟ್‌ವೇರ್ ನವೀಕರಣಗಳನ್ನು ಪಡೆದುಕೊಳ್ಳುವುದಿಲ್ಲ.\n\nಈ ಸಮಯದಲ್ಲಿ ನಿಮಗೆ ಸಾಧನ ರಕ್ಷಣೆ ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"ಈ Wi‑Fi ನೆಟ್‌ವರ್ಕ್‌ಗೆ ಟ್ಯಾಬ್ಲೆಟ್‌‌ ಅನ್ನು ಸಂಪರ್ಕಪಡಿಸಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"ಸಾಧನಕ್ಕೆ ಈ Wi-Fi ನೆಟ್‌ವರ್ಕ್ ಸಂಪರ್ಕಪಡಿಸಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"ಈ Wi‑Fi ನೆಟ್‌ವರ್ಕ್‌ಗೆ ಫೋನ್‌ಗೆ ಸಂಪರ್ಕಪಡಿಸಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ."</string>
@@ -761,7 +760,6 @@
     <string name="ring_volume_title" msgid="7938706566797464165">"ರಿಂಗರ್ ವಾಲ್ಯೂಮ್"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"ನಿಶ್ಶಬ್ಧವಾಗಿರುವಾಗ ವೈಬ್ರೇಟ್‌ ಮಾಡು"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"ಡೀಫಾಲ್ಟ್ ಅಧಿಸೂಚನೆ ಧ್ವನಿ"</string>
-    <string name="heads_up_enabled_title" msgid="1031078221910921622">"ಪಾಪ್‌ ಅಪ್‌ ಹೆಚ್ಚಿನ ಪ್ರಾಶಸ್ತ್ಯ"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"ರಿಂಗ್‌ಟೋನ್‌"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"ಅಧಿಸೂಚನೆ"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"ಅಧಿಸೂಚನೆಗಳಿಗಾಗಿ ಒಳಬರುವ ಕರೆ ವಾಲ್ಯುಮ್ ಅನ್ನು ಬಳಸಿ"</string>
@@ -834,7 +832,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"ಸ್ವಯಂಚಾಲಿತ ಪ್ರಖರತೆ"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"ಎಬ್ಬಿಸಲು ಎತ್ತಿರಿ"</string>
     <string name="doze_title" msgid="2259176504273878294">"ಆವರಿಸಿದ ಪರದೆ"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"ಸಾಧನವನ್ನು ಎತ್ತಿದಾಗ ಅಥವಾ ಅಧಿಸೂಚನೆಗಳು ಬಂದಾಗ ಪರದೆಯನ್ನು ಎಚ್ಚರಿಸು"</string>
+    <string name="doze_summary" msgid="7128970177894383698">"ನೀವು ಸಾಧನವನ್ನು ಕೈಗೆತ್ತಿಕೊಂಡಾಗ ಅಥವಾ ಅಧಿಸೂಚನೆಗಳನ್ನು ಸ್ವೀಕರಿಸಿದಾಗ ಪರದೆಯನ್ನು ಎಚ್ಚರಗೊಳಿಸು"</string>
     <string name="title_font_size" msgid="4405544325522105222">"ಫಾಂಟ್ ಗಾತ್ರ"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"ಫಾಂಟ್ ಗಾತ್ರ"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"ಸಿಮ್‌ ಕಾರ್ಡ್ ಲಾಕ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
@@ -862,6 +860,10 @@
     <string name="sim_enter_cancel" msgid="6240422158517208036">"ರದ್ದುಮಾಡು"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"ಬಹು ಸಿಮ್‌ ಗಳು ಕಂಡುಬಂದಿವೆ"</string>
     <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> ಸಿಮ್‌ ಮಾತ್ರವಿದೆ. ಸೆಲ್ಯುಲಾರ್ ಡೇಟಾ, ಕರೆಗಳು ಮತ್ತು SMS ಸಂದೇಶಗಳಿಗೆ ನೀವು ಈ ಸಿಮ್‌‌ ಬಳಸಬೇಕೆಂದು ಬಯಸುತ್ತೀರಾ?"</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>
@@ -1012,6 +1014,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"ಇದು ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್‌ನ "<b>"ಆಂತರಿಕ ಸಂಗ್ರಹಣೆಯ"</b>" ಎಲ್ಲ ಡೇಟಾವನ್ನು ಅಳಿಸುತ್ತದೆ, ಅವುಗಳೆಂದರೆ:\n\n"<li>"ನಿಮ್ಮ Google ಖಾತೆ"</li>\n<li>"ಸಿಸ್ಟಂ ಮತ್ತು ಅಪ್ಲಿಕೇಶನ್ ಡೇಟಾ ಹಾಗೂ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</li>\n<li>"ಡೌನ್‌ಲೋಡ್ ಮಾಡಿರುವ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"ಇದು ನಿಮ್ಮ ಫೋನ್‌ನ "<b>"ಆಂತರಿಕ ಸಂಗ್ರಹಣೆಯಲ್ಲಿರುವ"</b>", ಇವುಗಳನ್ನು ಒಳಗೊಂಡಂತೆ ಎಲ್ಲ ಡೇಟಾವನ್ನು ಅಳಿಸಿ ಹಾಕುತ್ತದೆ:\n\n"<li>"ನಿಮ್ಮ Google ಖಾತೆ"</li>\n<li>"ಸಿಸ್ಟಂ ಮತ್ತು ಅಪ್ಲಿಕೇಶನ್ ಡೇಟಾ ಹಾಗೂ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</li>\n<li>"ಡೌನ್‌ಲೋಡ್ ಮಾಡಿರುವ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"ನೀವು ಪ್ರಸ್ತುತವಾಗಿ ಕೆಳಗಿನ ಖಾತೆಗಳಿಗೆ ಸೈನ್ ಇನ್ ಆಗಿರುವಿರಿ:\n"</string>
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"ಈ ಸಾಧನದಲ್ಲಿ ಪ್ರಸ್ತುತ ಇತರ ಬಳಕೆದಾರರಿದ್ದಾರೆ.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"ಸಂಗೀತ"</li>\n<li>"ಫೋಟೋಗಳು"</li>\n<li>"ಇತರ ಬಳಕೆದಾರರ ಡೇಟಾ"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"ಸಂಗೀತ, ಚಿತ್ರಗಳು, ಮತ್ತು ಇತರ ಬಳಕೆದಾರರ ಡೇಟಾವನ್ನು ತೆರವುಗೊಳಿಸಲು, "<b>"USB ಸಂಗ್ರಹಣೆಯನ್ನು"</b>" ಅಳಿಸಬೇಕಾಗಿದೆ."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"ಸಂಗೀತ, ಚಿತ್ರಗಳು, ಮತ್ತು ಬಳಕೆದಾರರ ಇತರೆ ಡೇಟಾವನ್ನು ತೆರವುಗೊಳಿಸಲು, "<b>"SD ಕಾರ್ಡ್‌ ಅನ್ನು"</b>" ಅಳಿಸಬೇಕಾಗಿದೆ."</string>
@@ -1023,7 +1026,6 @@
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"ಫೋನ್‌ ಅನ್ನು ಮರುಹೊಂದಿಸಿ"</string>
     <string name="master_clear_final_desc" msgid="7209547812233487345">"ನಿಮ್ಮ ಎಲ್ಲ ವೈಯಕ್ತಿಕ ಮಾಹಿತಿ ಮತ್ತು ಡೌನ್‌ಲೋಡ್ ಮಾಡಿದ ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಅಳಿಸಬೇಕೆ? ಈ ಕ್ರಿಯೆಯನ್ನು ಹಿಮ್ಮುಖಗೊಳಿಸಲು ನಿಮಗೆ ಸಾಧ್ಯವಿಲ್ಲ!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"ಎಲ್ಲವನ್ನೂ ಅಳಿಸು"</string>
-    <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"ನಿಮ್ಮ ಅನ್‌ಲಾಕ್‌ ನಮೂನೆಯನ್ನು ಚಿತ್ರಿಸಿ"</string>
     <string name="master_clear_gesture_explanation" msgid="826193821455182780">"ಫ್ಯಾಕ್ಟರಿ ಡೇಟಾ ಮರುಹೊಂದಿಕೆ ಖಚಿತಪಡಿಸಲು ನಿಮ್ಮ ಅನ್‌‌ಲಾಕ್‌ ನಮೂನೆಯನ್ನು ನೀವು ಎಳೆಯುವ ಅಗತ್ಯವಿದೆ."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"ಸಿಸ್ಟಂ ತೆರವುಗೊಳಿಸುವ ಸೇವೆಯು ಲಭ್ಯವಿಲ್ಲದಿರುವ ಕಾರಣ ಮರುಹೊಂದಿಸುವಿಕೆಯನ್ನು ನಿರ್ವಹಿಸಲಾಗಲಿಲ್ಲ."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"ಮರುಹೊಂದಿಸುವುದೇ?"</string>
@@ -1041,7 +1043,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"USB ಸಂಗ್ರಹಣೆಯಲ್ಲಿ  ಸಂಗ್ರಹವಾಗಿರುವ ಎಲ್ಲ ಫೈಲ್‌ಗಳನ್ನು ಅಳಿಸುವ ಮೂಲಕ ಅದನ್ನು ಅಳಿಸುವುದೇ? ಈ ಕ್ರಿಯೆಯನ್ನು ನೀವು ಹಿಮ್ಮುಖಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"SD ಕಾರ್ಡ್‌‌ನಲ್ಲಿ ಸಂಗ್ರಹವಾಗಿರುವ ಎಲ್ಲ ಫೈಲ್‌ಗಳನ್ನು ಅಳಿಸುವ ಮೂಲಕ ಅದನ್ನು ಅಳಿಸುವುದೇ? ಈ ಕ್ರಿಯೆಯನ್ನು ನೀವು ಹಿಮ್ಮುಖಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"ಎಲ್ಲವನ್ನೂ ಅಳಿಸು"</string>
-    <string name="media_format_gesture_prompt" msgid="3109349468816856670">"ನಿಮ್ಮ ಅನ್‌ಲಾಕ್‌ ನಮೂನೆಯನ್ನು ಚಿತ್ರಿಸಿ"</string>
     <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"USB ಸಂಗ್ರಹಣೆಯನ್ನು ಅಳಿಸಿಹಾಕಲು ನೀವು ಬಯಸುತ್ತೀರಿ ಎಂದು ಖಚಿತಪಡಿಸಲು ನಿಮ್ಮ ಅನ್‌ಲಾಕ್‌ ನಮೂನೆಯನ್ನು ನೀವು ಚಿತ್ರಿಸುವ ಅಗತ್ಯವಿದೆ."</string>
     <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"SD ಕಾರ್ಡ್‌ ಅನ್ನು ಅಳಿಸಿಹಾಕಲು ನೀವು ಬಯಸಿರುವುದನ್ನು ಖಚಿತಪಡಿಸಲು ನಿಮ್ಮ ಅನ್‌ಲಾಕ್‌ ನಮೂನೆಯನ್ನು ನೀವು ಎಳೆಯುವ ಅಗತ್ಯವಿದೆ."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"ಕರೆ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
@@ -1087,6 +1088,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"ದಯವಿಟ್ಟು ಸಿಮ್‌ ಕಾರ್ಡ್‌ ಅನ್ನು ಸೇರಿಸಿ ಮತ್ತು ಮರುಪ್ರಾರಂಭಿಸಿ"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"ದಯವಿಟ್ಟು ಇಂಟರ್ನೆಟ್‌ಗೆ ಸಂಪರ್ಕಪಡಿಸಿ"</string>
     <string name="location_title" msgid="1029961368397484576">"ನನ್ನ ಸ್ಥಾನ"</string>
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"ಕೆಲಸದ ಪ್ರೊಫೈಲ್"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"ಕೆಲಸದ ಪ್ರೊಫೈಲ್‌ನ ಸ್ಥಳ"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"ನಿಮ್ಮ ಕಂಪನಿಯಿಂದ ಆಫ್ ಮಾಡಲಾಗಿದೆ"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"ಮೋಡ್"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"ಅಧಿಕ ನಿಖರತೆ"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"ಬ್ಯಾಟರಿ ಉಳಿತಾಯ"</string>
@@ -1124,6 +1128,7 @@
     <string name="copyright_title" msgid="865906688917260647">"ಹಕ್ಕುಸ್ವಾಮ್ಯ"</string>
     <string name="license_title" msgid="1990487604356037871">"ಪರವಾನಗಿ"</string>
     <string name="terms_title" msgid="7697580845616764642">"ನಿಯಮಗಳು ಮತ್ತು ಷರತ್ತುಗಳು"</string>
+    <string name="webview_license_title" msgid="2813507464175738967">"ಸಿಸ್ಟಂ ವೆಬ್‌ವೀಕ್ಷಣೆ ಪರವಾನಗಿ"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"ವಾಲ್‌ಪೇಪರ್‌ಗಳು"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"ಉಪಗ್ರಹ ಚಿತ್ರಣ ಪೂರೈಕೆದಾರರು:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"ತೆರೆದ ಮೂಲ ಪರವಾನಗಿಗಳು"</string>
@@ -1237,7 +1242,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB ಸಂಗ್ರಹಣೆ"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"SD ಕಾರ್ಡ್‌ ನಲ್ಲಿ"</string>
     <string name="disabled" msgid="9206776641295849915">"ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"</string>
-    <string name="not_installed" msgid="1475144352069281880">"ಸ್ಥಾಪಿಸಲಾಗಿಲ್ಲ"</string>
+    <string name="not_installed" msgid="2797554494953450291">"ಈ ಬಳಕೆದಾರರಿಗಾಗಿ ಸ್ಥಾಪಿಸಲಾಗಿಲ್ಲ"</string>
     <string name="no_applications" msgid="7336588977497084921">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಇಲ್ಲ."</string>
     <string name="internal_storage" msgid="1584700623164275282">"ಆಂತರಿಕ ಸಂಗ್ರಹಣೆ"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB ಸಂಗ್ರಹಣೆ"</string>
@@ -1434,8 +1439,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"ಚಾರ್ಜ್ ಮಾಡುವಾಗ ಪರದೆಯು ಎಂದಿಗೂ ನಿದ್ರಾವಸ್ಥೆಗೆ ಹೋಗುವುದಿಲ್ಲ"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"ಬ್ಲೂಟೂತ್‌‌ HCI ಸ್ನೂಪ್ ಲಾಗ್ ಸಕ್ರಿಯಗೊಳಿಸಿ"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"ಫೈಲ್‌ನಲ್ಲಿ ಎಲ್ಲ bluetooth HCI ಪ್ಯಾಕೆಟ್‌ಗಳನ್ನು ಸೆರೆಹಿಡಿಯಿರಿ"</string>
-    <string name="oem_unlock_enable" msgid="6629321276287913315">"OEM ಅನ್‌ಲಾಕ್ ಸಕ್ರಿಯಗೊಳಿಸಿ"</string>
-    <string name="oem_unlock_enable_summary" msgid="3546686263996628110">"ಸಾಧನ OEM ಅನ್‌ಲಾಕ್ ಆಗಿರಲು ಅವಕಾಶ ನೀಡಿ"</string>
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM ಅನ್‌ಲಾಕ್‌ ಮಾಡಲಾಗುತ್ತಿದೆ"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"ಬೂಟ್‌ಲೋಡರ್‌ ಅನ್‌ಲಾಕ್‌ ಮಾಡಲು ಅನುಮತಿಸಿ"</string>
+    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"ನಿಮ್ಮ PIN ನಮೂದಿಸಿ"</string>
+    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"OEM ಅನ್‌ಲಾಕ್ ಸಕ್ರಿಯಗೊಳಿಸಲು ನಿಮ್ಮ ಸಾಧನದ PIN ನಮೂದಿಸಿ"</string>
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"OEM ಅನ್‌ಲಾಕ್‌ ಮಾಡುವಿಕೆಯನ್ನು ಅನುಮತಿಸುವುದೇ?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"ಎಚ್ಚರಿಕೆ: ಈ ಸೆಟ್ಟಿಂಗ್‌ ಆನ್‌ ಇರುವಾಗ ಈ ಸಾಧನದಲ್ಲಿ ಸಾಧನ ಸಂರಕ್ಷಣಾ ವೈಶಿಷ್ಟ್ಯಗಳು ಕಾರ್ಯ ನಿರ್ವಹಿಸುವುದಿಲ್ಲ."</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"ವೈರ್‌ಲೆಸ್ ಪ್ರದರ್ಶನ ಪ್ರಮಾಣೀಕರಣ"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Wi‑Fi ವೆರ್ಬೋಸ್ ಲಾಗಿಂಗ್ ಸಕ್ರಿಯಗೊಳಿಸಿ"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"ಸೆಲ್ಯುಲರ್‌ ಹಸ್ತಾಂತರಿಸಲು ಆಕ್ರಮಣಕಾರಿ Wi‑Fi"</string>
@@ -1538,6 +1547,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"ಶೀರ್ಷಿಕೆಯು ಈ ರೀತಿಯಾಗಿ ಕಂಡುಬರುತ್ತದೆ"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"ಡೀಫಾಲ್ಟ್"</string>
+    <string name="color_title" msgid="4258931051732243983">"ಬಣ್ಣ"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"ಡೀಫಾಲ್ಟ್"</string>
     <string name="color_none" msgid="3475640044925814795">"ಯಾವುದೂ ಇಲ್ಲ"</string>
     <string name="color_white" msgid="8045195170201590239">"ಬಿಳಿ"</string>
@@ -1595,12 +1605,12 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"<xliff:g id="REMAIN">%1$s</xliff:g> ಉಳಿದಿದೆ"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"ಚಾರ್ಜ್‌ ಮಾಡಲು <xliff:g id="UNTIL_CHARGED">%1$s</xliff:g>"</string>
-    <string name="power_discharging_duration" msgid="7125493014448497620">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - ಅಂದಾಜು. <xliff:g id="TIME">%2$s</xliff:g> ಉಳಿದಿದೆ"</string>
-    <string name="power_charging" msgid="712751285832976915">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="STATE">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration" msgid="4802183864773082009">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - ಪೂರ್ಣಗೊಳ್ಳುವವರೆಗೆ <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration_ac" msgid="3611179931297824699">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - AC ಯಲ್ಲಿ ಪೂರ್ಣಗೊಳ್ಳುವವರೆಗೆ <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration_usb" msgid="1106605348913397583">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - USB ಮೂಲಕ ಪೂರ್ಣಗೊಳ್ಳುವವರೆಗೆ <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration_wireless" msgid="633606920144617227">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - ವೈರ್‌ಲೆಸ್ ಮೂಲಕ ಪೂರ್ಣಗೊಳ್ಳುವವರೆಗೆ <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="power_discharging_duration" msgid="1605929174734600590">"ಸುಮಾರು <xliff:g id="LEVEL">%1$s</xliff:g> <xliff:g id="TIME">%2$s</xliff:g> ಉಳಿದಿದೆ"</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> ಪೂರ್ಣವಾಗುವವರೆಗೆ"</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> AC ನಲ್ಲಿ ಪೂರ್ಣವಾಗುವವರೆಗೆ"</string>
+    <string name="power_charging_duration_usb" msgid="182405645340976546">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> USB ಮೂಲಕ ಪೂರ್ಣವಾಗುವವರೆಗೆ"</string>
+    <string name="power_charging_duration_wireless" msgid="1829295708243159464">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> ವೈರ್‌‌ಲೆಸ್‌ನಿಂದ ಪೂರ್ಣವಾಗುವವರೆಗೆ"</string>
     <string name="power_usage_list_summary" msgid="2409288197839512482">"ಪೂರ್ತಿ ಚಾರ್ಜ್ ಆಗುವವರೆಗೆ ಬಳಸಿ"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"ಅನ್‌ಪ್ಲಗ್‌ ಆದಾಗಿನಿಂದ ಬ್ಯಾಟರಿಯ ಬಳಕೆ"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"ಮರುಹೊಂದಿಸಿದಾಗಿನಿಂದ ಬಳಕೆಯಾದ ಬ್ಯಾಟರಿ"</string>
@@ -1617,7 +1627,6 @@
     <string name="awake" msgid="387122265874485088">"ಸಾಧನ ಎಚ್ಚರಗೊಂಡ ಸಮಯ"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi‑Fi ಸಮಯದಲ್ಲಿ"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi‑Fi ಸಮಯದಲ್ಲಿ"</string>
-    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"ಇತಿಹಾಸದ ವಿವರಗಳು"</string>
     <string name="details_title" msgid="3792801565213935385">"ಬಳಕೆಯ ವಿವರಗಳು"</string>
     <string name="details_subtitle" msgid="32593908269911734">"ಬಳಕೆಯ ವಿವರಗಳು"</string>
@@ -1689,7 +1698,7 @@
     <string name="battery_saver" msgid="1426682272004907982">"ಬ್ಯಾಟರಿ ಸೇವರ್‌‌"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಆನ್ ಆಗುವಿಕೆ"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"ಎಂದಿಗೂ ಬೇಡ"</string>
-    <string name="battery_saver_turn_on_automatically_pct" msgid="3033681629861428940">"%1$d%% ಬ್ಯಾಟರಿ ಇದ್ದಾಗ"</string>
+    <string name="battery_saver_turn_on_automatically_pct" msgid="7536784431655058267">"%1$s ನಲ್ಲಿ ಬ್ಯಾಟರಿ"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"ಪ್ರಕ್ರಿಯೆಯ ಅಂಕಿಅಂಶಗಳು"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"ಚಾಲನೆಯಲ್ಲಿರುವ ಪ್ರಕ್ರಿಯೆಗಳ ಕುರಿತು Geeky ಅಂಕಿಅಂಶಗಳು"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"ಸ್ಮರಣೆ ಬಳಕೆ"</string>
@@ -1813,7 +1822,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"ಹಾರ್ಡ್‌ವೇರ್‌ ಬೆಂಬಲಿತ"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"ಸಾಫ್ಟ್‌ವೇರ್‌ ಮಾತ್ರ"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"ಈ ಬಳಕೆದಾರರಿಗೆ ರುಜುವಾತುಗಳು ಲಭ್ಯವಿಲ್ಲ"</string>
-    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"ನಿಮ್ಮ ಅನ್‌ಲಾಕ್‌ ನಮೂನೆಯನ್ನು ಚಿತ್ರಿಸಿ"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"ನೀವು ರುಜುವಾತು ಸ್ಥಾಪನೆಯನ್ನು ಖಚಿತಪಡಿಸಲು ನಿಮ್ಮ ಅನ್‌ಲಾಕ್‌ ನಮೂನೆಯನ್ನು ನೀವು ಡ್ರಾ ಮಾಡುವ ಅಗತ್ಯವಿರುತ್ತದೆ."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"ರುಜುವಾತು ಸಂಗ್ರಹಣೆಗಾಗಿ ಪಾಸ್‌ವರ್ಡ್‌ ಅನ್ನು ನಮೂದಿಸಿ."</string>
@@ -1843,6 +1851,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"ಅಪ್ಲಿಕೇಶನ್ ಡೇಟಾ ಸೇರಿಸಿ"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"ಸ್ವಯಂಚಾಲಿತ ಪುನಃಸ್ಥಾಪನೆ"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"ಅಪ್ಲಿಕೇಶನ್‌ ಅನ್ನು ಮರುಸ್ಥಾಪಿಸುವಾಗ, ಬ್ಯಾಕ್ ಅಪ್‌ ಮಾಡಲಾದ ಸೆಟ್ಟಿಂಗ್‌ಗಳು ಮತ್ತು ಡೇಟಾವನ್ನು ಮರುಸ್ಥಾಪಿಸು"</string>
+    <string name="backup_inactive_title" msgid="5355557151569037197">"ಬ್ಯಾಕಪ್ ಸೇವೆಯು ನಿಷ್ಕ್ರಿಯವಾಗಿದೆ."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"ನಿಮ್ಮ ಸಾಧನ ನೀತಿಯ ಮೂಲಕ ಇದನ್ನು ಹೊಂದಿಸಲಾಗುತ್ತದೆ."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"ಡೆಸ್ಕ್‌ಟಾಪ್ ಬ್ಯಾಕಪ್ ಪಾಸ್‌ವರ್ಡ್"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"ಡೆಸ್ಕ್‌ಟಾಪ್‌‌ನ ಪೂರ್ಣ ಬ್ಯಾಕಪ್‌‌ಗಳನ್ನು ಪ್ರಸ್ತುತ ರಕ್ಷಿಸಲಾಗಿಲ್ಲ"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"ಡೆಸ್ಕ್‌ಟಾಪ್‌ನ ಪೂರ್ಣ ಬ್ಯಾಕಪ್‌ಗಳಿಗೆ ಪಾಸ್‌ವರ್ಡ್‌ ಅನ್ನು ಬದಲಾಯಿಸಲು ಅಥವಾ ತೆಗೆದುಹಾಕಲು ಸ್ಪರ್ಶಿಸಿ"</string>
@@ -1952,7 +1962,11 @@
     <string name="enter_password" msgid="8035706727471334122">"Android ಪ್ರಾರಂಭಿಸಲು, ನಿಮ್ಮ ಪಾಸ್‌ವರ್ಡ್‌ ನಮೂದಿಸಿ"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Android ಪ್ರಾರಂಭಿಸಲು, ನಿಮ್ಮ ಪಿನ್‌ ನಮೂದಿಸಿ"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Android ಪ್ರಾರಂಭಿಸಲು, ನಿಮ್ಮ ನಮೂನೆಯನ್ನು ಚಿತ್ರಿಸಿ"</string>
-    <string name="try_again" msgid="4272075051293936921">"ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ."</string>
+    <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"ತಪ್ಪು ಪ್ಯಾಟರ್ನ್"</string>
+    <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"ತಪ್ಪು ಪಾಸ್‌ವರ್ಡ್"</string>
+    <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"ತಪ್ಪು ಪಿನ್‌"</string>
+    <string name="checking_decryption" msgid="8287458611802609493">"ಪರಿಶೀಲಿಸಲಾಗುತ್ತಿದೆ..."</string>
+    <string name="starting_android" msgid="8581493237458496835">"Android ಪ್ರಾರಂಭಿಸಲಾಗುತ್ತಿದೆ"</string>
     <string name="delete" msgid="4219243412325163003">"ಅಳಿಸು"</string>
     <string name="misc_files" msgid="6720680815969643497">"ಇತರೆ ಫೈಲ್‌ಗಳು"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"<xliff:g id="TOTAL">%2$d</xliff:g> ರಲ್ಲಿ <xliff:g id="NUMBER">%1$d</xliff:g> ಅನ್ನು ಆಯ್ಕೆ ಮಾಡಲಾಗಿದೆ"</string>
@@ -1990,8 +2004,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"ಸ್ಕ್ರೀನ್ ಸಂಯೋಜನೆಗಾಗಿ ಯಾವಾಗಲೂ GPU ಬಳಸಿ"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"ಬಣ್ಣದ ಸ್ಥಳವನ್ನು ಅನುಕರಿಸು"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"OpenGL ಕುರುಹುಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿ"</string>
-    <string name="use_nuplayer" msgid="5699257393367904387">"NuPlayer ಬಳಸಿ (ಪ್ರಾಯೋಗಿಕ)"</string>
-    <string name="use_nuplayer_summary" msgid="1991479067478516714">"AwesomePlayer ಬದಲಾಗಿ NuPlayer ಬಳಸಿ"</string>
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"AwesomePlayer (ಬಳಸಬೇಡಿ) ಬಳಸಿ"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"ಅತ್ಯಂತ ಹೆಚ್ಚಿನ ಮಾಧ್ಯಮ ಪ್ಲೇಬ್ಯಾಕ್‌ಗಾಗಿ NuPlayer ಬದಲಿಗೆ AwesomePlayer ಬಳಸಿ"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"USB ಆಡಿಯೋ ರೂಟಿಂಗ್ ನಿಷ್ಕ್ರಿ."</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"USB ಆಡಿಯೊ ಸಲಕರಣೆಗಳಿಗೆ ಸ್ವಯಂ ರೂಟಿಂಗ್ ನಿಷ್ಕ್ರಿಯ."</string>
     <string name="debug_layout" msgid="5981361776594526155">"ಲೇಔಟ್ ಪರಿಮಿತಿಗಳನ್ನು ತೋರಿಸು"</string>
@@ -2167,7 +2181,6 @@
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"ಬಳಕೆದಾರ ಅಥವಾ ಪ್ರೊಫೈಲ್ ಸೇರಿಸಿ"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"ಬಳಕೆದಾರರನ್ನು ಸೇರಿಸಿ"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"ನಿರ್ಬಂಧಿಸಿದ ಪ್ರೊಫೈಲ್"</string>
-    <string name="user_summary_managed_profile" msgid="7369539529693048111">"ಕೆಲಸದ ಪ್ರೊಫೈಲ್"</string>
     <string name="user_need_lock_message" msgid="2596365678651842785">"ನೀವು ನಿರ್ಬಂಧಿತ ಪ್ರೊಫೈಲ್ ಅನ್ನು ರಚಿಸಬಹುದಾದರ ಮೊದಲು, ನಿಮ್ಮ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಮತ್ತು ವೈಯಕ್ತಿಕ ಡೇಟಾವನ್ನು ರಕ್ಷಿಸಲು ನೀವು ಪರದೆಯ ಲಾಕ್‌ ಹೊಂದಿಸುವ ಅಗತ್ಯವಿದೆ."</string>
     <string name="user_set_lock_button" msgid="8311219392856626841">"ಲಾಕ್ ಹೊಂದಿಸಿ"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"ಇನ್ನೂ ಹೊಂದಿಸಿಲ್ಲ"</string>
@@ -2298,11 +2311,13 @@
     <string name="sim_cellular_data_unavailable_summary" msgid="3654805961942166428">"ಡೇಟಾ ಸಿಮ್‌ ಆಯ್ಕೆ ಮಾಡಲು ಸ್ಪರ್ಶಿಸಿ"</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"ಕರೆಗಳನ್ನು ಮಾಡಲು ಯಾವಾಗಲೂ ಇದನ್ನು ಬಳಸಿ"</string>
     <string name="select_sim_for_data" msgid="2366081042162853044">"ಡೇಟಾಗಾಗಿ SIM ಆಯ್ಕೆಮಾಡಿ"</string>
+    <string name="data_switch_started" msgid="2040761479817166311">"ಡೇಟಾ ಸಿಮ್ ಬದಲಾಯಿಸಲಾಗುತ್ತಿದೆ, ಇದಕ್ಕೆ ಒಂದು ನಿಮಿಷದವರೆಗೆ ಸಮಯ ತೆಗೆದುಕೊಳ್ಳಬಹುದು..."</string>
     <string name="select_sim_for_calls" msgid="3503094771801109334">"ಇದರೊಂದಿಗೆ ಕರೆ ಮಾಡಿ"</string>
     <string name="sim_select_card" msgid="211285163525563293">"ಸಿಮ್‌ ಕಾರ್ಡ್ ಆಯ್ಕೆಮಾಡಿ"</string>
     <string name="sim_card_number_title" msgid="7845379943474336488">"ಸಿಮ್‌ <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"ಸಿಮ್‌ ಖಾಲಿಯಿದೆ"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"ಸಿಮ್‌ ಹೆಸರು"</string>
+    <string name="sim_name_hint" msgid="7038643345238968930">"ಸಿಮ್ ಹೆಸರನ್ನು ನಮೂದಿಸಿ"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"SIM ಸ್ಲಾಟ್ %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"ವಾಹಕ"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"ಸಂಖ್ಯೆ"</string>
@@ -2312,7 +2327,6 @@
     <string name="color_purple" msgid="3888532466427762504">"ನೇರಳೆ"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"ಯಾವುದೇ ಸಿಮ್‌ ಕಾರ್ಡ್‌ಗಳನ್ನು ಅಳವಡಿಸಿಲ್ಲ"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"ಸಿಮ್‌ ಸ್ಥಿತಿ"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"ಸಿಮ್‌ ಸಂಬಂಧಿತ ಮಾಹಿತಿ"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"ಡೀಫಾಲ್ಟ್ ಸಿಮ್‌ ನಿಂದ ಮರಳಿ ಕರೆಮಾಡಿ"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"ಹೊರಹೋಗುವ ಕರೆಗಳಿಗಾಗಿ ಸಿಮ್‌"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"ಇತರ ಕರೆ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
@@ -2320,8 +2334,11 @@
     <string name="preferred_network_offload_header" msgid="2321173571529106767">"ನೆಟ್‌ವರ್ಕ್ ಹೆಸರಿನ ಪ್ರಸಾರವನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ"</string>
     <string name="preferred_network_offload_footer" msgid="5857279426054744020">"ನೆಟ್‌ವರ್ಕ್ ಹೆಸರು ಪ್ರಸಾರದ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸುವಿಕೆಯು ಮೂರನೇ ವ್ಯಕ್ತಿಗಳು ನಿಮ್ಮ ನೆಟ್‌ವರ್ಕ್ ಮಾಹಿತಿಗೆ ಪ್ರವೇಶಿಸುವುದರಿಂದ ತಡೆಯುತ್ತದೆ."</string>
     <string name="preferred_network_offload_popup" msgid="2252915199889604600">"ನೆಟ್‌ವರ್ಕ್ ಹೆಸರಿನ ಪ್ರಸಾರವನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸುವುದರಿಂದ ಮರೆ ಮಾಡಲಾಗಿರುವ ನೆಟ್‌ವರ್ಕ್‌ಗಳಿಗೆ ಸ್ವಯಂಚಾಲಿತ ಸಂಪರ್ಕವನ್ನು ತಡೆಯುತ್ತದೆ."</string>
+    <string name="sim_signal_strength" msgid="9144010043784767984">"<xliff:g id="DBM">%1$d</xliff:g> dBm <xliff:g id="ASU">%2$d</xliff:g> asu"</string>
+    <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>
+    <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>
@@ -2330,22 +2347,22 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"ಇತ್ತೀಚಿನ ಹುಡುಕಾಟಗಳು"</string>
     <string name="search_results_label" msgid="4163304782363526148">"ಫಲಿತಾಂಶಗಳು"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"ವೈಫೈ ವೈ-ಫೈ ನೆಟ್‌ವರ್ಕ್‌ ಸಂಪರ್ಕ"</string>
-    <string name="keywords_more_default_sms_app" msgid="2744404159003574745">"ಪಠ್ಯ ಸಂದೇಶ"</string>
-    <string name="keywords_more_mobile_networks" msgid="7813380887358745769">"ಸೆಲ್ಯುಲಾರ್ ಸೆಲ್ ವಾಹಕ ವೈರ್‌ಲೆಸ್"</string>
+    <string name="keywords_more_default_sms_app" msgid="895656981962034647">"ಪಠ್ಯ ಸಂದೇಶ ಸಂದೇಶ ಕಳುಹಿಸುವಿಕೆ ಸಂದೇಶಗಳು ಸಂದೇಶ ಕಳುಹಿಸುವಿಕೆ"</string>
+    <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"ಸೆಲ್ಯುಲಾರ್ ಸೆಲ್ ವಾಹಕ ವೈರ್‌ಲೆಸ್ ಡೇಟಾ 4g 3g 2g ಎಲ್‌ಟಿಇ"</string>
     <string name="keywords_home" msgid="3626170808219458848">"ಲಾಂಚರ್"</string>
     <string name="keywords_display" msgid="6709007669501628320">"ಪರದೆ ಟಚ್‌ಸ್ಕ್ರೀನ್"</string>
-    <string name="keywords_display_brightness_level" msgid="8636451602230815191">"ಮಂದ ಪರದೆ ಟಚ್‌ಸ್ಕ್ರೀನ್"</string>
-    <string name="keywords_display_auto_brightness" msgid="8070218600502753102">"ಮಂದ ಪರದೆ ಟಚ್‌ಸ್ಕ್ರೀನ್"</string>
-    <string name="keywords_display_wallpaper" msgid="4315466287469834939">"ಹಿನ್ನೆಲೆ"</string>
+    <string name="keywords_display_brightness_level" msgid="8923289340474728990">"ಡಿಮ್‌‌ ಪರದೆ ಟಚ್‌ಸ್ಕ್ರೀನ್ ಬ್ಯಾಟರಿ"</string>
+    <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"ಡಿಮ್‌‌ ಪರದೆ ಟಚ್‌ಸ್ಕ್ರೀನ್ ಬ್ಯಾಟರಿ"</string>
+    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"ಹಿನ್ನೆಲೆ ವೈಯಕ್ತೀಕರಿಸು ಕಸ್ಟಮೈಸ್ ಪ್ರದರ್ಶನ"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"ಪಠ್ಯದ ಗಾತ್ರ"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"ಪ್ರಾಜೆಕ್ಟ್"</string>
-    <string name="keywords_storage" msgid="7007275853993419928">"ಸ್ಪೇಸ್ ಡಿಸ್ಕ್ ಹಾರ್ಡ್ ಡ್ರೈವ್"</string>
-    <string name="keywords_battery" msgid="3992479295298655138">"ಪವರ್‌"</string>
-    <string name="keywords_spell_checker" msgid="4509482591225399210">"ಕಾಗುಣಿತ"</string>
+    <string name="keywords_storage" msgid="6572905220031852173">"ಸ್ಥಳ ಡಿಸ್ಕ್ ಹಾರ್ಡ್ ಡ್ರೈವ್ ಸಾಧನ ಬಳಕೆ"</string>
+    <string name="keywords_battery" msgid="2096185085932675704">"ವಿದ್ಯುತ್ ಬಳಕೆ ಶುಲ್ಕ"</string>
+    <string name="keywords_spell_checker" msgid="6106749039734174140">"ಕಾಗುಣಿತ ನಿಘಂಟು ಕಾಗುಣಿತ ಪರಿಶೀಲನೆ ಸ್ವಯಂ-ಸರಿಪಡಿಸುವಿಕೆ"</string>
     <string name="keywords_voice_input" msgid="3519547605812413860">"ಗುರುತಿಸುವಿಕೆ ಇನ್‌ಪುಟ್ ಧ್ವನಿ ಭಾಷೆ ಮಾತನಾಡಿ ಹ್ಯಾಂಡ್ಸ್-ಫ್ರೀ ಹ್ಯಾಂಡ್ ಫ್ರೀ ಗುರುತಿಸುವಿಕೆ ಆಕ್ಷೇಪಾರ್ಹ ಪದ ಆಡಿಯೊ ಇತಿಹಾಸ ಬ್ಲೂಟೂತ್ ಹೆಡ್‌ಸೆಟ್"</string>
-    <string name="keywords_text_to_speech_output" msgid="8207889472282225512">"ಭಾಷೆ ರೇಟ್ ಮಾಡಿ ಡೀಫಾಲ್ಟ್ ಮಾತು ಮಾತನಾಡುವಿಕೆ"</string>
-    <string name="keywords_date_and_time" msgid="7666950126499155141">"ಗಡಿಯಾರ"</string>
-    <string name="keywords_factory_data_reset" msgid="3693730656843989732">"ಅಳಿಸು ವೈಪ್"</string>
+    <string name="keywords_text_to_speech_output" msgid="392447904221657930">"ರೇಟ್ ಮಾಡು ಭಾಷೆ ಡೀಫಾಲ್ಟ್ ಮಾತನಾಡಿ ಮಾತನಾಡುವ ಟಿಟಿಎಸ್ ಪ್ರವೇಶಿಸುವಿಕೆ ರೀಡರ್ ಕುರುಡು"</string>
+    <string name="keywords_date_and_time" msgid="2631808108134830066">"ಕ್ಲಾಕ್‌ ಮಿಲಿಟರಿ"</string>
+    <string name="keywords_factory_data_reset" msgid="4355133848707691977">"ಒರೆಸು ಅಳಿಸು ಮರುಸ್ಥಾಪಿಸು ತೆರವುಗೊಳಿಸು ತೆಗೆದುಹಾಕು"</string>
     <string name="keywords_printing" msgid="1701778563617114846">"ಪ್ರಿಂಟರ್"</string>
     <string name="keywords_sounds_and_notifications" msgid="5965996187974887000">"ಸ್ಪೀಕರ್ ಬೀಪ್"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="2912933812460077912">"ತೊಂದರೆ ಮಾಡಬೇಡ ತಡೆ ತೊಂದರೆ ವಿರಾಮ"</string>
@@ -2354,7 +2371,7 @@
     <string name="keywords_location_mode" msgid="8584992704568356084">"ನಿಖರತೆ"</string>
     <string name="keywords_accounts" msgid="1957925565953357627">"ಖಾತೆ"</string>
     <string name="keywords_users" msgid="4673901601478559100">"ನಿರ್ಬಂಧ ನಿರ್ಬಂಧಿಸು ನಿರ್ಬಂಧಿಸಲಾಗಿದೆ"</string>
-    <string name="keywords_keyboard_and_ime" msgid="1103378692379215672">"ಪಠ್ಯ ತಿದ್ದುಪಡಿ ಸರಿಯಾದ ಧ್ವನಿ ಕಂಪನ ಸ್ವಯಂ ಭಾಷೆ ಸಂಜ್ಞೆ ಸಲಹೆ ಸೂಚಿಸು ಥೀಮ್ ತಪ್ಪು ಪದ ಎಮೋಜಿ ಟೈಪ್ ಮಾಡಿ"</string>
+    <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"ಪಠ್ಯ ತಿದ್ದುಪಡಿ ಸರಿಪಡಿಸು ಶಬ್ದ ವೈಬ್ರೇಟ್ ಸ್ವಯಂ ಭಾಷೆ ಸನ್ನೆ ಸಲಹೆ ನೀಡಿ ಸಲಹೆ ಥೀಮ್ ಆಕ್ರಮಣಕಾರಿ ಶಬ್ದ ಪ್ರಕಾರ ಎಮೊಜಿ ಅಂತರರಾಷ್ಟ್ರೀಯ"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"ಸ್ಲೈಡ್ ಪಾಸ್‌ವರ್ಡ್ ಮಾದರಿ ಪಿನ್"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC ಟ್ಯಾಗ್‌ ಹೊಂದಿಸಿ"</string>
     <string name="write_tag" msgid="8571858602896222537">"ಬರೆಯಿರಿ"</string>
@@ -2371,7 +2388,6 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"ಅಧಿಸೂಚನೆ ವಾಲ್ಯೂಮ್"</string>
     <string name="zen_mode_settings_title" msgid="7014915558669122902">"ಕರೆ ಹಾಗೂ ಸಂದೇಶಗಳನ್ನು ತಡೆಹಾಕು"</string>
     <string name="zen_mode_option_title" msgid="5061978632306007914">"ಕರೆಗಳು ಮತ್ತು ಅಧಿಸೂಚನೆಗಳು ಬಂದಾಗ"</string>
-    <string name="zen_mode_option_title_novoice" msgid="6680706009915204785">"ಅಧಿಸೂಚನೆಗಳನ್ನು ಸ್ವೀಕರಿಸುವಾಗ"</string>
     <string name="zen_mode_option_off" msgid="3167702608910820883">"ಯಾವಾಗಲೂ ಅಡಚಣೆ ಮಾಡು"</string>
     <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"ಆದ್ಯತೆಯ ಕರೆ ಹಾಗೂ ಸಂದೇಶಗಳನ್ನು ತಡೆಹಾಕಲು ಅನುಮತಿಸು"</string>
     <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"ಅಡಚಣೆ ಮಾಡಬೇಡ"</string>
@@ -2429,14 +2445,17 @@
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"ಮುಗಿದಿದೆ"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"ನೀವು ಇದನ್ನು ಆಫ್‌ ಮಾಡುವವರೆಗೂ"</string>
     <string name="zen_mode_important_category" msgid="8123274463331022993">"ಆದ್ಯತೆಯ ಕರೆ ಹಾಗೂ ಸಂದೇಶಗಳನ್ನು ತಡೆಹಾಕು"</string>
-    <string name="zen_mode_downtime_category" msgid="4730179065426038108">"ಡೌನ್‌ಟೈಮ್‌(ಕೇವಲ ಆದ್ಯತೆಯ ಕರೆ ಹಾಗೂ ಸಂದೇಶಗಳನ್ನು ತಡೆಹಾಕು)"</string>
+    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"ಸ್ಥಗಿತಕಾಲ"</string>
     <string name="zen_mode_downtime_days" msgid="3361856902633311616">"ದಿನಗಳು"</string>
     <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"ಯಾವುದೂ ಇಲ್ಲ"</string>
+    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"ಅಡಚಣೆಗಳನ್ನು ಅನುಮತಿಸಲಾಗಿದೆ"</string>
+    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"ಆದ್ಯತೆ ಮಾತ್ರ"</string>
+    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"ಯಾವುದೂ ಇಲ್ಲ"</string>
     <string name="zen_mode_automation_category" msgid="4653551005950835761">"ಸ್ವಯಂಚಾಲನೆ"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಆನ್‌ ಆಗುವಿಕೆ"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"ಎಂದಿಗೂ ಬೇಡ"</string>
-    <string name="zen_mode_phone_calls" msgid="8956214416859303966">"ಕರೆಗಳು"</string>
+    <string name="zen_mode_calls" msgid="7051492091133751208">"ಕರೆಗಳು"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"ಸಂದೇಶಗಳು"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"ಇವರಿಂದ ಕರೆಗಳು/ಸಂದೇಶಗಳು"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"ಯಾರಾದರೂ"</string>
@@ -2450,7 +2469,9 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"ವಾರದ ರಾತ್ರಿಗಳು"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"ಪ್ರಾರಂಭ ಸಮಯ"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"ಮುಕ್ತಾಯದ ಸಮಯ"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> ಮುಂದಿನ ದಿನ"</string>
+    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> ಮುಂದಿನ ದಿನ"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> ಅಥವಾ ಮೊದಲೇ ಯಾವುದೇ ಎಚ್ಚರಿಕೆ"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> ಮುಂದಿನ ದಿನ ಅಥವಾ ಮೊದಲೇ ಯಾವುದೇ ಎಚ್ಚರಿಕೆ"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"ಅಪ್ಲಿಕೇಶನ್‌ ಅಧಿಸೂಚನೆಗಳು"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"ಅಧಿಸೂಚನೆ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="device_feedback" msgid="3238056036766293294">"ಈ ಸಾಧನದ ಕುರಿತು ಪ್ರತಿಕ್ರಿಯೆಯನ್ನು ಕಳುಹಿಸಿ"</string>
@@ -2458,7 +2479,11 @@
     <string name="switch_on_text" msgid="1124106706920572386">"ಆನ್"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"ಆಫ್"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"ಸ್ಕ್ರೀನ್ ಪಿನ್ನಿಂಗ್"</string>
-    <string name="screen_pinning_description" msgid="7091642350452605379">"ಆನ್ ಮಾಡಿದಾಗ, ನೀವು ಅನ್‌ಪಿನ್ ಮಾಡುವವರೆಗೆ ಪ್ರಸ್ತುತ ಪರೆದೆಯನ್ನು ವೀಕ್ಷಣೆಯಲ್ಲಿಡಲು ನೀವು ಪರದೆ ಪಿನ್ ಮಾಡುವಿಕೆಯನ್ನು ಬಳಸಬಹುದು.\n\nಪರದೆ ಪಿನ್ ಮಾಡುವಿಕೆಯನ್ನು ಬಳಸಲು:\n\n1. ಪರದೆ ಪಿನ್ ಮಾಡುವಿಕೆ ಆನ್ ಆಗಿರುವುದನ್ನು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ.\n\n2. ನೀವು ಪಿನ್ ಮಾಡಲು ಬಯಸುವ ಪರದೆ ತೆರೆಯಿರಿ.\n\n3. ’ಸಮಗ್ರ ನೋಟ’ವನ್ನು ಸ್ಪರ್ಶಿಸಿ.\n\n4. ಪಿನ್ ಐಕಾನ್ ಸ್ಪರ್ಶಿಸಿ."</string>
+    <string name="screen_pinning_description" msgid="1137904524037468263">"ಈ ಸೆಟ್ಟಿಂಗ್ ಆನ್ ಮಾಡಿದಾಗ, ನೀವು ಅನ್‌ಪಿನ್ ಮಾಡುವವರೆಗೆ ಪ್ರಸ್ತುತ ಪರೆದೆಯನ್ನು ವೀಕ್ಷಣೆಯ ಮೋಡ್‌ನಲ್ಲಿಡಲು ನೀವು ಪರದೆ ಪಿನ್ ಮಾಡುವಿಕೆಯನ್ನು ಬಳಸಬಹುದು.\n\nಪರದೆ ಪಿನ್ ಮಾಡುವಿಕೆಯನ್ನು ಬಳಸಲು:\n\n1. ಪರದೆ ಪಿನ್ ಮಾಡುವಿಕೆ ಆನ್ ಮಾಡಲಾಗಿದೆಯೇ ಎಂಬುದನ್ನು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ.\n\n2. ನೀವು ಪಿನ್ ಮಾಡಲು ಬಯಸುವ ಪರದೆ ತೆರೆಯಿರಿ.\n\n3. ಅವಲೋಕನ ಸ್ಪರ್ಶಿಸಿ.\n\n4. ಮೇಲಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿ ತದನಂತರ ಪಿನ್ ಐಕಾನ್ ಸ್ಪರ್ಶಿಸಿ."</string>
+    <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"ಅನ್‌ಪಿನ್ ಮಾಡುವುದಕ್ಕೂ ಮೊದಲು ಅನ್‌ಲಾಕ್ ಪ್ಯಾಟರ್ನ್ ಕೇಳು"</string>
+    <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"ಅನ್‌ಪಿನ್ ಮಾಡುವುದಕ್ಕೂ ಮೊದಲು ಪಿನ್‌ ಕೇಳು"</string>
+    <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"ಅನ್‌ಪಿನ್ ಮಾಡುವುದಕ್ಕೂ ಮೊದಲು ಪಾಸ್‌ವರ್ಡ್ ಕೇಳು"</string>
+    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"ಅನ್‌ಪಿನ್ ಮಾಡುವಾಗ ಸಾಧನ ಲಾಕ್ ಮಾಡು"</string>
     <string name="managed_user_title" msgid="8101244883654409696">"ಕೆಲಸದ ಪ್ರೊಫೈಲ್"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(ಪ್ರಾಯೋಗಿಕ)"</string>
     <string name="display_auto_rotate_title" msgid="6176450657107806043">"ಸಾಧನವನ್ನು ತಿರುಗಿಸಿದಾಗ"</string>
@@ -2467,7 +2492,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"ಲ್ಯಾಂಡ್‌ಸ್ಕೇಪ್ ವೀಕ್ಷಣೆಯಲ್ಲಿ ಉಳಿಯಿರಿ"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"ಪ್ರಸ್ತುತ ಓರಿಯಂಟೇಶನ್‌ನಲ್ಲಿ ಉಳಿಯಿರಿ"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI ಮಾಹಿತಿ"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI ಸಂಬಂಧಿತ ಮಾಹಿತಿ"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"ಎನ್‌ಕ್ರಿಪ್ಷನ್"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"ಮುಂದುವರಿಸು"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"ನೀವು ಈ ಸಾಧನವನ್ನು ಪ್ರಾರಂಭಿಸುವ ಮೊದಲು ನಿಮ್ಮ PIN ಅನ್ನು ಪಡೆದುಕೊಳ್ಳುವ ಮೂಲಕ ಅದನ್ನು ಇನ್ನಷ್ಟು ರಕ್ಷಿಸಬಹುದು. ಸಾಧನವನ್ನು ಪ್ರಾರಂಭಿಸುವವರೆಗೂ, ಎಚ್ಚರಿಕೆಗಳು ಸೇರಿದಂತೆ ಇದು ಕರೆಗಳು, ಸಂದೇಶಗಳು, ಅಧಿಸೂಚನೆಗಳನ್ನು ಸ್ವೀಕರಿಸುವುದಿಲ್ಲ. \n\nಇದು ಸಾಧನಗಳಲ್ಲಿನ ಕಳೆದುಹೋದ ಅಥವಾ ನಾಶವಾದ ಡೇಟಾವನ್ನು ರಕ್ಷಿಸಲು ಸಹಾಯ ಮಾಡುತ್ತದೆ."</string>
@@ -2485,4 +2509,7 @@
     <string name="encrypt_talkback_dialog_message_pin" msgid="1890374082842868489">"ಈ ಸಾಧನವನ್ನು ಪ್ರಾರಂಭಿಸಲು ನಿಮ್ಮ ಪಿನ್‌‌ ಅನ್ನು ನೀವು ನಮೂದಿಸಿದಾಗ, <xliff:g id="SERVICE">%1$s</xliff:g> ಅಂತಹ ಪ್ರವೇಶ ಸೇವೆಗಳು ಲಭ್ಯವಿರುವುದಿಲ್ಲ."</string>
     <string name="encrypt_talkback_dialog_message_pattern" msgid="4474332516537386384">"ಈ ಸಾಧನವನ್ನು ಪ್ರಾರಂಭಿಸಲು ನಿಮ್ಮ ಪ್ಯಾಟರ್ನ್ ಅನ್ನು ನೀವು ನಮೂದಿಸಿದಾಗ, <xliff:g id="SERVICE">%1$s</xliff:g> ಅಂತಹ ಪ್ರವೇಶ ಸೇವೆಗಳು ಲಭ್ಯವಿರುವುದಿಲ್ಲ."</string>
     <string name="encrypt_talkback_dialog_message_password" msgid="8166099418487083927">"ಈ ಸಾಧನವನ್ನು ಪ್ರಾರಂಭಿಸಲು ನಿಮ್ಮ ಪಾಸ್‌ವರ್ಡ್‌ ಅನ್ನು ನೀವು ನಮೂದಿಸಿದಾಗ, <xliff:g id="SERVICE">%1$s</xliff:g> ರೀತಿಯ ಪ್ರವೇಶ ಸೇವೆಗಳು ಲಭ್ಯವಿರುವುದಿಲ್ಲ."</string>
+    <string name="imei_information_title" msgid="8499085421609752290">"IMEI ಮಾಹಿತಿ"</string>
+    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI ಸಂಬಂಧಿತ ಮಾಹಿತಿ"</string>
+    <string name="slot_number" msgid="3762676044904653577">"(ಸ್ಲಾಟ್‌<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-ko/arrays.xml b/res/values-ko/arrays.xml
index 9254ae4..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>
@@ -527,4 +527,12 @@
     <item msgid="4338089220026248848">"캐시됨(활동 클라이언트)"</item>
     <item msgid="6652164677254579050">"캐시됨(비어 있음)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"청록색"</item>
+    <item msgid="8332294763632946560">"파란색"</item>
+    <item msgid="2023216417616991392">"남색"</item>
+    <item msgid="3170497246594232819">"보라색"</item>
+    <item msgid="4608643045752965568">"분홍색"</item>
+    <item msgid="6131821495505931173">"빨간색"</item>
+  </string-array>
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 055a3c8..87ca93f 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>
@@ -180,7 +180,6 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s이(가) 메시지에 액세스하려고 합니다. %2$s에 액세스 권한을 제공하시겠습니까?"</string>
     <string name="date_and_time" msgid="9062980487860757694">"날짜 및 시간"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"시간대 선택"</string>
-    <string name="normal_date_format" msgid="7636406984925498359">"기본값(<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"미리보기:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"글꼴 크기:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -291,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>
@@ -322,8 +321,6 @@
     <string name="date_time_set_timezone" msgid="5045627174274377814">"표준시간대 선택"</string>
     <string name="date_time_set_date_title" msgid="6928286765325608604">"날짜"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"날짜 설정"</string>
-    <string name="date_time_date_format_title" msgid="3976171711988766411">"날짜 형식"</string>
-    <string name="date_time_date_format" msgid="6951498879879281102">"날짜 형식 선택"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"가나다순으로 정렬"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"시간대순 정렬"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"날짜"</string>
@@ -372,7 +369,8 @@
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"휴대전화를 암호화하는 동안 잠시 기다려 주세요. <xliff:g id="PERCENT">^1</xliff:g>% 완료되었습니다."</string>
     <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"태블릿을 암호화하는 동안 잠시 기다려 주세요. 남은 시간: <xliff:g id="DURATION">^1</xliff:g>"</string>
     <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"휴대전화를 암호화하는 동안 잠시 기다려 주세요. 남은 시간: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"<xliff:g id="DELAY">^1</xliff:g>초 후에 다시 시도하세요."</string>
+    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"태블릿의 잠금을 해제하려면 전원을 껐다가 다시 켜세요."</string>
+    <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"휴대전화의 잠금을 해제하려면 전원을 껐다가 다시 켜세요."</string>
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"경고: 잠금 해제 시도를 <xliff:g id="COUNT">^1</xliff:g>회 이상 실패할 경우 기기의 데이터가 삭제됩니다!"</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"비밀번호 입력"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"암호화하지 못했습니다."</string>
@@ -401,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>
@@ -412,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>
@@ -556,13 +556,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"스피커폰으로 사용"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"음악 및 미디어"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"설정 기억"</string>
-    <string name="wifi_assistant_intro_setup" msgid="4605105515416995110">"Wi‑Fi 도우미\n소개"</string>
-    <string name="wifi_assistant_no_thanks" msgid="2776983751990143934">"아니요"</string>
-    <string name="wifi_assistant_setup" msgid="3772423650475730906">"설정"</string>
-    <string name="wifi_assistant_card_message" msgid="107811647784658536">"Wi‑Fi 도우미로 사용 가능한 네트워크에 자동으로 연결합니다."</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi‑Fi 도우미"</string>
-    <string name="wifi_assistant_title_message" msgid="6240721017579074015">"<xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g>이(가) 사용 가능한 최상의 Wi‑Fi에 자동으로 연결합니다."</string>
-    <string name="wifi_assistant_open_app" msgid="4803044899535675063">"앱 열기"</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>
@@ -592,7 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Wi-Fi 설정"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"무선 액세스포인트(AP) 설정 및 관리"</string>
-    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Wi-Fi 선택"</string>
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Wi‑Fi 네트워크 선택"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Wi-Fi 선택"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Wi-Fi 사용 설정 중..."</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Wi-Fi 사용 중지 중..."</string>
@@ -607,8 +602,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"네트워크 항상 검색"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"항상 검색 허용"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Wi‑Fi가 꺼진 경우에도 Google 위치 서비스 및 기타 앱이 네트워크를 검색하도록 합니다."</string>
-    <string name="wifi_automatically_manage_title" msgid="6249976570008992746">"Wi‑Fi 자동 관리"</string>
-    <string name="wifi_automatically_manage_summary" msgid="6952470763378312488">"<xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g>에서 Wi‑Fi 연결을 관리하도록 허용합니다."</string>
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"개방형 Wi‑Fi를 자동으로 사용"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"품질이 우수하다고 확인된 개방형 네트워크에 Wi‑Fi 도우미를 자동으로 연결"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"도우미 선택"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"인증서 설치"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"정확성 개선 등의 목적으로 Google 및 기타 앱이 근처 Wi-Fi 네트워크를 스캔할 수 있습니다. Wi-Fi가 꺼져 있을 때도 작동합니다. 이 기능을 사용하지 않으려면 고급 &gt; 네트워크 항상 검색으로 이동하세요."</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"앱이 Wi-Fi가 꺼져 있을 때도 근처 네트워크를 스캔할 수 있습니다. 이 기능을 사용하지 않으려면 고급 &gt; 네트워크 항상 검색으로 이동하세요."</string>
@@ -629,6 +625,7 @@
     <string name="wifi_menu_scan" msgid="1470911530412095868">"검색"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"고급"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"네트워크 연결"</string>
+    <string name="wifi_menu_remember" msgid="8814185749388713796">"네트워크 저장"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"네트워크 저장 안함"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"네트워크 수정"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"NFC 태그에 기록"</string>
@@ -673,9 +670,11 @@
     <string name="wifi_unspecified" msgid="5431501214192991253">"(지정되지 않음)"</string>
     <string name="wifi_remembered" msgid="4955746899347821096">"저장됨"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"사용 중지됨"</string>
-    <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"인터넷 접속 불량 방지"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP 설정 실패"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Wi-Fi 연결 실패"</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"인증 문제"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"범위 내에 없음"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"감지된 인터넷 액세스가 없으며 자동으로 다시 연결되지 않습니다."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS 사용 가능"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS 사용 가능)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"네트워크 비밀번호 입력"</string>
@@ -699,9 +698,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"경고: Wi‑Fi 설정을 건너뛰면 태블릿에서 초기 다운로드와 업데이트에 셀룰러 데이터만 사용합니다. 데이터 요금 부담을 줄이려면 Wi-Fi를 사용하세요."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"경고: Wi‑Fi 설정을 건너뛰면 기기에서 초기 다운로드와 업데이트에 셀룰러 데이터만 사용합니다. 데이터 요금 부담을 줄이려면 Wi-Fi를 사용하세요."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"경고: Wi‑Fi 설정을 건너뛰면 휴대전화에서 초기 다운로드와 업데이트에 셀룰러 데이터만 사용합니다. 데이터 요금 부담을 줄이려면 Wi-Fi를 사용하세요."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="2393880108322835846">"경고: Wi‑Fi 설정을 건너뛰면 태블릿에서 인터넷에 연결할 수 없어 초기 다운로드나 업데이트가 불가능합니다."</string>
-    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1707391993265558787">"경고: Wi‑Fi 설정을 건너뛰면 기기에서 인터넷에 연결할 수 없어 초기 다운로드나 업데이트가 불가능합니다."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="1556858507920033022">"경고: Wi‑Fi 설정을 건너뛰면 휴대전화에서 인터넷에 연결할 수 없어 초기 다운로드나 업데이트가 불가능합니다."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Wi‑Fi를 건너뛸 경우:\n\n태블릿이 인터넷에 연결되지 않습니다.\n\n인터넷에 연결할 때까지 소프트웨어 업데이트를 받지 못합니다.\n\n이번에는 기기 보호 기능을 활성화할 수 없습니다."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Wi‑Fi를 건너뛸 경우:\n\n기기가 인터넷에 연결되지 않습니다.\n\n인터넷에 연결할 때까지 소프트웨어 업데이트를 받지 못합니다.\n\n이번에는 기기 보호 기능을 활성화할 수 없습니다."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Wi‑Fi를 건너뛸 경우:\n\n휴대전화가 인터넷에 연결되지 않습니다.\n\n인터넷에 연결할 때까지 소프트웨어 업데이트를 받지 못합니다.\n\n이번에는 기기 보호 기능을 활성화할 수 없습니다."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"해당 태블릿으로 이 Wi-Fi 네트워크에 연결할 수 없습니다."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"해당 기기에서 이 Wi-Fi 네트워크에 연결할 수 없습니다."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"해당 휴대전화로 이 Wi-Fi 네트워크에 연결할 수 없습니다."</string>
@@ -761,7 +760,6 @@
     <string name="ring_volume_title" msgid="7938706566797464165">"모드 설정"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"무음 시 진동"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"기본 알림 소리"</string>
-    <string name="heads_up_enabled_title" msgid="1031078221910921622">"높은 우선순위인 경우 표시"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"벨소리"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"알림"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"전화 벨소리와 알림을 같은 볼륨으로"</string>
@@ -834,7 +832,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"자동 밝기"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"기기를 들어 대기 모드 해제"</string>
     <string name="doze_title" msgid="2259176504273878294">"절전 모드 자동 해제"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"기기를 들거나 알림 수신 시 절전 모드 해제"</string>
+    <string name="doze_summary" msgid="7128970177894383698">"기기를 들거나 알림을 수신 시 절전 모드를 해제합니다."</string>
     <string name="title_font_size" msgid="4405544325522105222">"글꼴 크기"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"글꼴 크기"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM 카드 잠금 설정"</string>
@@ -862,6 +860,10 @@
     <string name="sim_enter_cancel" msgid="6240422158517208036">"취소"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"여러 개의 SIM이 있음"</string>
     <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 PIN 코드가 잘못되었습니다. 이동통신사에 문의하여 기기를 잠금 해제해야 합니다."</string>
   <plurals name="wrong_pin_code">
     <item quantity="one" msgid="4840607930166101114">"SIM PIN 코드가 잘못되었습니다. <xliff:g id="NUMBER">%d</xliff:g>회 이상 실패할 경우 이동통신사에 문의하여 기기를 잠금 해제해야 합니다."</item>
@@ -1012,6 +1014,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"공장 초기화하면 태블릿의 "<b>"내부 저장소의 모든 데이터가 삭제됩니다."</b>\n\n<li>"Google 계정"</li>\n<li>"시스템과 앱 데이터 및 설정"</li>\n<li>"다운로드된 앱"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"공장 초기화하면 휴대전화 "<b>"내부 저장소의 모든 데이터가 삭제됩니다."</b>\n\n<li>"Google 계정"</li>\n<li>"시스템과 앱 데이터 및 설정"</li>\n<li>"다운로드된 앱"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"현재 로그인한 계정:\n"</string>
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"이 기기에 다른 사용자가 있습니다.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"음악"</li>\n<li>"사진"</li>\n<li>"기타 사용자 데이터"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"음악이나 사진, 기타 사용자 데이터를 지우려면 "<b>"USB 저장소"</b>"를 삭제해야 합니다."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"음악이나 사진, 기타 사용자 데이터를 지우려면 "<b>"SD 카드"</b>"를 삭제해야 합니다."</string>
@@ -1023,7 +1026,6 @@
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"휴대전화 초기화"</string>
     <string name="master_clear_final_desc" msgid="7209547812233487345">"모든 개인 정보와 다운로드한 앱을 삭제하시겠습니까? 수행한 후에는 작업을 취소할 수 없습니다."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"모두 지우기"</string>
-    <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"잠금해제 패턴을 그리세요."</string>
     <string name="master_clear_gesture_explanation" msgid="826193821455182780">"초기화를 실행하려면 잠금해제 패턴을 그려야 합니다."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"시스템 지우기 서비스를 사용할 수 없어 초기화하지 못했습니다."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"초기화하시겠습니까?"</string>
@@ -1041,7 +1043,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"USB 저장소를 지워서 저장된 모든 파일을 삭제하시겠습니까? 수행한 후에는 작업을 취소할 수 없습니다."</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"SD 카드를 지워서 저장된 모든 파일을 삭제하시겠습니까? 수행한 후에는 작업을 취소할 수 없습니다."</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"모두 지우기"</string>
-    <string name="media_format_gesture_prompt" msgid="3109349468816856670">"잠금해제 패턴을 그리세요."</string>
     <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"USB 저장소를 지우려면 잠금해제 패턴을 그려야 합니다."</string>
     <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"SD 카드를 지우려면 잠금해제 패턴을 그려야 합니다."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"통화 설정"</string>
@@ -1087,6 +1088,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"SIM 카드를 삽입하고 다시 시작하세요."</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"인터넷에 연결하세요."</string>
     <string name="location_title" msgid="1029961368397484576">"사용자 위치"</string>
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"직장 프로필"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"직장 프로필 위치"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"회사가 사용 중지했습니다."</string>
     <string name="location_mode_title" msgid="3982009713118421689">"모드"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"높은 정확성"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"배터리 절약"</string>
@@ -1124,6 +1128,7 @@
     <string name="copyright_title" msgid="865906688917260647">"저작권"</string>
     <string name="license_title" msgid="1990487604356037871">"라이선스"</string>
     <string name="terms_title" msgid="7697580845616764642">"약관"</string>
+    <string name="webview_license_title" msgid="2813507464175738967">"시스템 WebView 라이선스"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"배경화면"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"위성 이미지 제공업체:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"오픈소스 라이선스"</string>
@@ -1237,7 +1242,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB 저장소"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"SD 카드"</string>
     <string name="disabled" msgid="9206776641295849915">"사용 안함"</string>
-    <string name="not_installed" msgid="1475144352069281880">"설치되지 않음"</string>
+    <string name="not_installed" msgid="2797554494953450291">"이 사용자에게 설치되지 않음"</string>
     <string name="no_applications" msgid="7336588977497084921">"앱 없음"</string>
     <string name="internal_storage" msgid="1584700623164275282">"내부 저장소"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB 저장소"</string>
@@ -1434,8 +1439,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"충전하는 동안 화면이 꺼지지 않음"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"블루투스 HCI 스누프 로그 사용"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"모든 블루투스 HCI 패킷을 하나의 파일에 캡처"</string>
-    <string name="oem_unlock_enable" msgid="6629321276287913315">"OEM 잠금 해제 사용"</string>
-    <string name="oem_unlock_enable_summary" msgid="3546686263996628110">"기기가 OEM 잠금 해제되도록 허용"</string>
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM 잠금 해제"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"부트로더 잠금 해제 허용"</string>
+    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"PIN 입력"</string>
+    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"OEM 잠금 해제를 사용하도록 설정하려면 기기 PIN을 입력하세요."</string>
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"OEM 잠금 해제를 허용하시겠습니까?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"경고: 이 설정을 사용하는 동안에는 이 기기에서 기기 보호 기능이 작동하지 않습니다."</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"무선 디스플레이 인증서"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Wi-Fi 상세 로깅 사용"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Wi-Fi에서 데이터 네트워크로 적극 핸드오버"</string>
@@ -1538,6 +1547,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"자막이 다음과 같이 표시됩니다."</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"기본값"</string>
+    <string name="color_title" msgid="4258931051732243983">"색상"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"기본값"</string>
     <string name="color_none" msgid="3475640044925814795">"없음"</string>
     <string name="color_white" msgid="8045195170201590239">"흰색"</string>
@@ -1595,12 +1605,12 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"<xliff:g id="REMAIN">%1$s</xliff:g> 남음"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> 후 완충"</string>
-    <string name="power_discharging_duration" msgid="7125493014448497620">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - 대략 <xliff:g id="TIME">%2$s</xliff:g> 남음"</string>
-    <string name="power_charging" msgid="712751285832976915">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="STATE">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration" msgid="4802183864773082009">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> 후 충전 완료"</string>
-    <string name="power_charging_duration_ac" msgid="3611179931297824699">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> 후 충전 완료(AC)"</string>
-    <string name="power_charging_duration_usb" msgid="1106605348913397583">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> 후 충전 완료(USB)"</string>
-    <string name="power_charging_duration_wireless" msgid="633606920144617227">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> 후 충전 완료(무선)"</string>
+    <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> - 대략 <xliff:g id="TIME">%2$s</xliff:g> 남음"</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> 후 충전 완료"</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> 후 충전 완료(AC 전원)"</string>
+    <string name="power_charging_duration_usb" msgid="182405645340976546">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> 후 충전 완료(USB)"</string>
+    <string name="power_charging_duration_wireless" msgid="1829295708243159464">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> 후 충전 완료(무선)"</string>
     <string name="power_usage_list_summary" msgid="2409288197839512482">"마지막 충전 완료 후 배터리 사용 내역"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"플러그를 뽑은 이후 배터리 전원 사용"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"초기화 이후 배터리 사용"</string>
@@ -1617,7 +1627,6 @@
     <string name="awake" msgid="387122265874485088">"장치 무중단 가동 시간"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi 사용 시간"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi 사용 시간"</string>
-    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"기록 세부정보"</string>
     <string name="details_title" msgid="3792801565213935385">"사용 세부정보"</string>
     <string name="details_subtitle" msgid="32593908269911734">"사용 세부정보"</string>
@@ -1689,7 +1698,7 @@
     <string name="battery_saver" msgid="1426682272004907982">"배터리 세이버"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"자동으로 사용 설정"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"사용 안함"</string>
-    <string name="battery_saver_turn_on_automatically_pct" msgid="3033681629861428940">"배터리가 %1$d%%일 때"</string>
+    <string name="battery_saver_turn_on_automatically_pct" msgid="7536784431655058267">"%1$s 배터리"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"프로세스 통계"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"프로세스 실행에 관한 통계"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"메모리 사용량"</string>
@@ -1813,7 +1822,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"하드웨어 지원"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"소프트웨어 전용"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"이 사용자는 자격증명을 확인하거나 수정할 수 없습니다."</string>
-    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"잠금해제 패턴을 그리세요."</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"자격증명 설치를 확인하려면 잠금해제 패턴을 그려야 합니다."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"자격증명 저장소 비밀번호를 입력하세요."</string>
@@ -1843,6 +1851,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"앱 데이터 포함"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"자동 복원"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"앱을 다시 설치하면 백업된 설정과 데이터 복원"</string>
+    <string name="backup_inactive_title" msgid="5355557151569037197">"백업 서비스가 비활성 상태입니다."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"기기 정책에 따라 설정되었습니다."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"데스크톱 백업 비밀번호"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"데스크톱 전체 백업에 비밀번호가 설정되어 있지 않음"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"데스크톱 전체 백업에 대한 비밀번호를 변경하거나 삭제하려면 터치하세요."</string>
@@ -1952,7 +1962,11 @@
     <string name="enter_password" msgid="8035706727471334122">"Android를 시작하려면 비밀번호를 입력하세요."</string>
     <string name="enter_pin" msgid="5305333588093263790">"Android를 시작하려면 PIN을 입력하세요."</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Android를 시작하려면 패턴을 그리세요."</string>
-    <string name="try_again" msgid="4272075051293936921">"다시 시도해 보세요."</string>
+    <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"잘못된 패턴"</string>
+    <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"잘못된 비밀번호"</string>
+    <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"잘못된 PIN"</string>
+    <string name="checking_decryption" msgid="8287458611802609493">"확인 중..."</string>
+    <string name="starting_android" msgid="8581493237458496835">"Android 시작하는 중"</string>
     <string name="delete" msgid="4219243412325163003">"삭제"</string>
     <string name="misc_files" msgid="6720680815969643497">"기타 파일"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"<xliff:g id="TOTAL">%2$d</xliff:g>개 중 <xliff:g id="NUMBER">%1$d</xliff:g>개가 선택됨"</string>
@@ -1990,8 +2004,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"화면 합성 목적으로 항상 GPU 사용"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"색상 공간 적용"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"OpenGL 추적 사용 설정"</string>
-    <string name="use_nuplayer" msgid="5699257393367904387">"NuPlayer 사용(베타)"</string>
-    <string name="use_nuplayer_summary" msgid="1991479067478516714">"AwesomePlayer 대신 NuPlayer 사용"</string>
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"AwesomePlayer 사용(지원 중단됨)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"대부분의 미디어 재생에 NuPlayer 대신 AwesomePlayer 사용"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"USB 오디오 연결 사용 중지"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"USB 오디오 주변기기로 자동 연결 사용 중지"</string>
     <string name="debug_layout" msgid="5981361776594526155">"레이아웃 범위 표시"</string>
@@ -2167,7 +2181,6 @@
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"사용자 또는 프로필 추가"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"사용자 추가"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"제한된 프로필"</string>
-    <string name="user_summary_managed_profile" msgid="7369539529693048111">"직장 프로필"</string>
     <string name="user_need_lock_message" msgid="2596365678651842785">"제한된 프로필을 만들기 전에 화면 잠금을 설정하여 앱과 개인 데이터를 보호해야 합니다."</string>
     <string name="user_set_lock_button" msgid="8311219392856626841">"잠금 설정"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"설정되지 않음"</string>
@@ -2298,11 +2311,13 @@
     <string name="sim_cellular_data_unavailable_summary" msgid="3654805961942166428">"터치하여 데이터 SIM을 선택하세요."</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"통화에 항상 사용"</string>
     <string name="select_sim_for_data" msgid="2366081042162853044">"데이터에 사용할 SIM 선택"</string>
+    <string name="data_switch_started" msgid="2040761479817166311">"데이터 SIM을 전환하는 중입니다. 최대 1분 정도 걸릴 수 있습니다..."</string>
     <string name="select_sim_for_calls" msgid="3503094771801109334">"통화에 사용할 SIM"</string>
     <string name="sim_select_card" msgid="211285163525563293">"SIM 카드 선택"</string>
     <string name="sim_card_number_title" msgid="7845379943474336488">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"SIM 카드 비어있음"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"SIM 이름"</string>
+    <string name="sim_name_hint" msgid="7038643345238968930">"SIM 이름 입력"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"SIM 슬롯 %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"이동통신사"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"번호"</string>
@@ -2312,7 +2327,6 @@
     <string name="color_purple" msgid="3888532466427762504">"보라색"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"SIM 카드가 장착되지 않음"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"SIM 상태"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"SIM 관련 정보"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"기본 SIM에서 다시 전화하기"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"발신 전화용 SIM"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"기타 통화 설정"</string>
@@ -2320,8 +2334,11 @@
     <string name="preferred_network_offload_header" msgid="2321173571529106767">"네트워크 이름 브로드캐스트 사용 중지"</string>
     <string name="preferred_network_offload_footer" msgid="5857279426054744020">"네트워크 이름 브로드캐스트를 사용 중지하면 타사에서 내 네트워크 정보에 액세스할 수 없습니다."</string>
     <string name="preferred_network_offload_popup" msgid="2252915199889604600">"네트워크 이름 브로드캐스트를 사용 중지하면 숨겨진 네트워크에 자동으로 연결되지 않습니다."</string>
+    <string name="sim_signal_strength" msgid="9144010043784767984">"<xliff:g id="DBM">%1$d</xliff:g>dBm <xliff:g id="ASU">%2$d</xliff:g>asu"</string>
+    <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>
@@ -2330,22 +2347,22 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"최근 검색어"</string>
     <string name="search_results_label" msgid="4163304782363526148">"검색결과"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi Wi-Fi 네트워크 연결"</string>
-    <string name="keywords_more_default_sms_app" msgid="2744404159003574745">"문자 메시지"</string>
-    <string name="keywords_more_mobile_networks" msgid="7813380887358745769">"셀룰러 셀 이동통신사 무선"</string>
+    <string name="keywords_more_default_sms_app" msgid="895656981962034647">"문자 메시지 문자 메시지 전송 메시지"</string>
+    <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"휴대전화 셀 이동통신사 무선 데이터 4G 3G 2G LTE"</string>
     <string name="keywords_home" msgid="3626170808219458848">"런처"</string>
     <string name="keywords_display" msgid="6709007669501628320">"화면 터치스크린"</string>
-    <string name="keywords_display_brightness_level" msgid="8636451602230815191">"화면 터치스크린 어둡게"</string>
-    <string name="keywords_display_auto_brightness" msgid="8070218600502753102">"화면 터치스크린 어둡게"</string>
-    <string name="keywords_display_wallpaper" msgid="4315466287469834939">"배경"</string>
+    <string name="keywords_display_brightness_level" msgid="8923289340474728990">"화면 어둡게 하기 터치스크린 배터리"</string>
+    <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"화면 어둡게 하기 터치스크린 배터리"</string>
+    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"백그라운드 맞춤설정 맞춤설정 디스플레이"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"텍스트 크기"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"프로젝트"</string>
-    <string name="keywords_storage" msgid="7007275853993419928">"공간 디스크 하드 드라이브"</string>
-    <string name="keywords_battery" msgid="3992479295298655138">"전원"</string>
-    <string name="keywords_spell_checker" msgid="4509482591225399210">"맞춤법"</string>
+    <string name="keywords_storage" msgid="6572905220031852173">"공간 디스크 하드 드라이브 기기 사용"</string>
+    <string name="keywords_battery" msgid="2096185085932675704">"전원 사용 충전"</string>
+    <string name="keywords_spell_checker" msgid="6106749039734174140">"철자 사전 맞춤법 검사 자동 수정"</string>
     <string name="keywords_voice_input" msgid="3519547605812413860">"인식기 음성 입력 언어 말하기 핸즈프리 핸드 프리 인식 불쾌감을 주는 단어 오디오 기록 블루투스 헤드셋"</string>
-    <string name="keywords_text_to_speech_output" msgid="8207889472282225512">"평가 언어 기본 말하기 말하기"</string>
-    <string name="keywords_date_and_time" msgid="7666950126499155141">"시계"</string>
-    <string name="keywords_factory_data_reset" msgid="3693730656843989732">"완전 삭제"</string>
+    <string name="keywords_text_to_speech_output" msgid="392447904221657930">"속도 언어 기본 말하기 말하기 TTS 접근성 리더 시각 장애인"</string>
+    <string name="keywords_date_and_time" msgid="2631808108134830066">"시계 군사"</string>
+    <string name="keywords_factory_data_reset" msgid="4355133848707691977">"삭제 삭제 복원 삭제 삭제"</string>
     <string name="keywords_printing" msgid="1701778563617114846">"프린터"</string>
     <string name="keywords_sounds_and_notifications" msgid="5965996187974887000">"스피커 신호음"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="2912933812460077912">"안함 알림 일시중지 중단 방해 금지 중지"</string>
@@ -2354,7 +2371,7 @@
     <string name="keywords_location_mode" msgid="8584992704568356084">"정확성"</string>
     <string name="keywords_accounts" msgid="1957925565953357627">"계정"</string>
     <string name="keywords_users" msgid="4673901601478559100">"제한 제한하다 제한됨"</string>
-    <string name="keywords_keyboard_and_ime" msgid="1103378692379215672">"텍스트 수정 올바른 소리 진동 자동 언어 동작 제안 추천 테마 불쾌감을 주는 단어 입력 그림 이모티콘"</string>
+    <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"텍스트 수정 수정 사운드 진동 자동 언어 제스처 추천하기 추천 테마 불쾌감을 주는 단어 유형 그림 이모티콘 전 세계"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"슬라이드 비밀번호 패턴 PIN"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC 태그 설정"</string>
     <string name="write_tag" msgid="8571858602896222537">"쓰기"</string>
@@ -2369,12 +2386,11 @@
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"알람 볼륨"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"벨소리 볼륨"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"알림 볼륨"</string>
-    <string name="zen_mode_settings_title" msgid="7014915558669122902">"알림"</string>
+    <string name="zen_mode_settings_title" msgid="7014915558669122902">"소리/진동 알림"</string>
     <string name="zen_mode_option_title" msgid="5061978632306007914">"전화 및 알림 수신 시"</string>
-    <string name="zen_mode_option_title_novoice" msgid="6680706009915204785">"알림 수신 시"</string>
-    <string name="zen_mode_option_off" msgid="3167702608910820883">"항상 알림"</string>
-    <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"최우선 알림만 허용"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"알림 차단"</string>
+    <string name="zen_mode_option_off" msgid="3167702608910820883">"항상 소리/진동 알림"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"중요 소리/진동 알림만 허용"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"소리/진동 알림 차단"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"전화 벨소리"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"기본 알림 벨소리"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"전화 올 때 벨소리와 함께 진동"</string>
@@ -2428,29 +2444,34 @@
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"중요"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"완료"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"이 기능을 사용 중지할 때까지"</string>
-    <string name="zen_mode_important_category" msgid="8123274463331022993">"최우선 알림"</string>
-    <string name="zen_mode_downtime_category" msgid="4730179065426038108">"차단 모드(최우선 알림만 수신)"</string>
+    <string name="zen_mode_important_category" msgid="8123274463331022993">"중요 소리/진동 알림"</string>
+    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"다운타임"</string>
     <string name="zen_mode_downtime_days" msgid="3361856902633311616">"일"</string>
     <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"없음"</string>
+    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"알림 허용"</string>
+    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"중요 알림만"</string>
+    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"선택 안함"</string>
     <string name="zen_mode_automation_category" msgid="4653551005950835761">"자동"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"자동 사용 설정"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"사용 안함"</string>
-    <string name="zen_mode_phone_calls" msgid="8956214416859303966">"통화"</string>
+    <string name="zen_mode_calls" msgid="7051492091133751208">"통화"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"메시지"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"통화/메시지 발신자"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"누구나"</string>
     <string name="zen_mode_from_contacts" msgid="8751503728985572786">"주소록에 있는 사용자만"</string>
     <string name="zen_mode_from_starred" msgid="2168651127340381533">"별표 표시한 주소록에 있는 사용자만"</string>
     <string name="zen_mode_events" msgid="2456995649835437565">"일정 및 알림"</string>
-    <string name="zen_mode_alarm_info" msgid="3195430795475795398">"알람은 항상 최우선 알림입니다."</string>
+    <string name="zen_mode_alarm_info" msgid="3195430795475795398">"알람은 항상 중요 소리/진동 알림입니다."</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"자동 사용 설정"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"사용 안함"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"매일 밤"</string>
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"평일 밤"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"시작 시간"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"종료 시간"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"다음 날 <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
+    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"다음 날 <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> 또는 알람이 울리기 전"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"다음 날 <xliff:g id="FORMATTED_TIME">%s</xliff:g> 또는 알람이 울리기 전"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"앱 알림"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"알림 설정"</string>
     <string name="device_feedback" msgid="3238056036766293294">"이 기기에 대한 의견 보내기"</string>
@@ -2458,7 +2479,11 @@
     <string name="switch_on_text" msgid="1124106706920572386">"사용"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"사용 안함"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"화면 고정"</string>
-    <string name="screen_pinning_description" msgid="7091642350452605379">"화면 고정을 사용 설정하면 현재 화면을 고정 해제 시까지 표시할 수 있습니다.\n\n화면 고정을 사용하려면 다음 단계를 따르세요.\n\n1. 화면 고정이 사용 설정되었는지 확인합니다.\n\n2. 고정하려는 화면을 엽니다. \n\n3. \'최근 사용\'을 터치합니다.\n\n4. 핀 아이콘을 터치합니다."</string>
+    <string name="screen_pinning_description" msgid="1137904524037468263">"이 설정이 사용 설정되어 있는 경우 화면 고정을 사용하여 고정 해제하기 전까지 현재 화면을 계속 표시할 수 있습니다.\n\n화면 고정을 사용하려면 다음 단계를 따르세요.\n\n1. 화면 고정을 사용하도록 설정했는지 확인합니다.\n\n2. 고정하려는 화면을 엽니다.\n\n3. 개요를 터치합니다.\n\n4. 위로 스와이프한 다음 핀 아이콘을 터치합니다."</string>
+    <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"고정 해제 이전에 잠금해제 패턴 요청"</string>
+    <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"고정 해제 이전에 PIN 요청"</string>
+    <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"고정 해제 이전에 비밀번호 요청"</string>
+    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"화면 고정 해제 시 기기 잠금"</string>
     <string name="managed_user_title" msgid="8101244883654409696">"직장 프로필"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(베타)"</string>
     <string name="display_auto_rotate_title" msgid="6176450657107806043">"기기 회전 시"</string>
@@ -2467,7 +2492,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"가로 보기 유지"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"현재 방향 유지"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI 정보"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI 상대 정보"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"암호화"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"계속"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"기기를 시작할 때 PIN을 입력하도록 설정하면 기기를 보호할 수 있습니다. 기기가 시작되기 전까지 전화, 메시지 및 알람을 포함한 알림을 받을 수 없게 됩니다. \n\n이를 통해 분실 또는 도난된 기기에서 데이터를 보호할 수 있습니다."</string>
@@ -2485,4 +2509,7 @@
     <string name="encrypt_talkback_dialog_message_pin" msgid="1890374082842868489">"기기를 시작하기 위해 PIN을 입력할 때에는 <xliff:g id="SERVICE">%1$s</xliff:g> 등의 접근성 서비스가 지원되지 않습니다."</string>
     <string name="encrypt_talkback_dialog_message_pattern" msgid="4474332516537386384">"기기를 시작하기 위해 패턴을 입력할 때에는 <xliff:g id="SERVICE">%1$s</xliff:g> 등의 접근성 서비스가 지원되지 않습니다."</string>
     <string name="encrypt_talkback_dialog_message_password" msgid="8166099418487083927">"기기를 시작하기 위해 비밀번호를 입력할 때에는 <xliff:g id="SERVICE">%1$s</xliff:g> 등의 접근성 서비스가 지원되지 않습니다."</string>
+    <string name="imei_information_title" msgid="8499085421609752290">"IMEI 정보"</string>
+    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI 상대 정보"</string>
+    <string name="slot_number" msgid="3762676044904653577">"(슬롯 <xliff:g id="SLOT_NUM">%1$d</xliff:g>개)"</string>
 </resources>
diff --git a/res/values-ky-rKG/arrays.xml b/res/values-ky-rKG/arrays.xml
index 51129a1..f77cba9 100644
--- a/res/values-ky-rKG/arrays.xml
+++ b/res/values-ky-rKG/arrays.xml
@@ -454,4 +454,12 @@
     <item msgid="4338089220026248848">"Кештелген (иш-аракет кардары)"</item>
     <item msgid="6652164677254579050">"Кештелген (бош)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Жашыл көгүш"</item>
+    <item msgid="8332294763632946560">"Көк"</item>
+    <item msgid="2023216417616991392">"Индиго"</item>
+    <item msgid="3170497246594232819">"Кызгылт көгүш"</item>
+    <item msgid="4608643045752965568">"Кызгылтым"</item>
+    <item msgid="6131821495505931173">"Кызыл"</item>
+  </string-array>
 </resources>
diff --git a/res/values-ky-rKG/strings.xml b/res/values-ky-rKG/strings.xml
index 6cc02ec..32d7930 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>
@@ -268,7 +268,6 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s сиздин баарлашуу билдирүүлөрүңүзгө жеткиси келет. %2$s уруксат берилсинби?"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Күн жана убакыт"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Саат алкагын тандаңыз"</string>
-    <string name="normal_date_format" msgid="7636406984925498359">"Жергиликтүү (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <!-- no translation found for display_preview_label (1127597250917274792) -->
     <skip />
     <!-- no translation found for display_font_size_label (8941851418397475389) -->
@@ -457,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) -->
@@ -506,8 +505,6 @@
     <string name="date_time_set_date_title" msgid="6928286765325608604">"Дата"</string>
     <!-- no translation found for date_time_set_date (7021491668550232105) -->
     <skip />
-    <string name="date_time_date_format_title" msgid="3976171711988766411">"Дата форматы"</string>
-    <string name="date_time_date_format" msgid="6951498879879281102">"Датанын форматын тандоо"</string>
     <!-- no translation found for zone_list_menu_sort_alphabetically (5683377702671088588) -->
     <skip />
     <!-- no translation found for zone_list_menu_sort_by_timezone (2720190443744884114) -->
@@ -574,8 +571,8 @@
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Телефонуңуз шифрленгичке күтө туруңуз. <xliff:g id="PERCENT">^1</xliff:g>% аткарылды."</string>
     <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Планшетиңиз шифрленгенче күтө туруңуз. <xliff:g id="DURATION">^1</xliff:g> убакыт калды."</string>
     <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Телефонуңуз шифрленгенче күтө туруңуз. <xliff:g id="DURATION">^1</xliff:g> убакыт калды."</string>
-    <!-- no translation found for crypt_keeper_cooldown (685210918307862395) -->
-    <skip />
+    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"Планшетиңиздин кулпусун ачуу үчүн, аны өчүрүп күйгүзүңүз."</string>
+    <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"Телефонуңуздун кулпусун ачуу үчүн, аны өчүрүп күйгүзүңүз."</string>
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"Эскертүү: Кулпуну дагы <xliff:g id="COUNT">^1</xliff:g> жолу ача албай койсоңуз, түзмөгүңүз тазаланат!"</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Сырсөзүңүздү териңиз"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Шифрлөө ийгиликсиз аяктады"</string>
@@ -609,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>
@@ -625,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) -->
@@ -831,13 +830,8 @@
     <skip />
     <!-- no translation found for bluetooth_dock_settings_remember (5551459057010609115) -->
     <skip />
-    <string name="wifi_assistant_intro_setup" msgid="4605105515416995110">\n"Wi‑Fi Жардамчысын тааныштыруу"</string>
-    <string name="wifi_assistant_no_thanks" msgid="2776983751990143934">"ЖОК, РАХМАТ"</string>
-    <string name="wifi_assistant_setup" msgid="3772423650475730906">"ОРНОТУУ"</string>
-    <string name="wifi_assistant_card_message" msgid="107811647784658536">"Wi‑Fi Жардамчысы менен жеткиликтүү тармактарга автоматтык түрдө туташуу."</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi‑Fi Жардамчысы"</string>
-    <string name="wifi_assistant_title_message" msgid="6240721017579074015">"<xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> автоматтык түрдө жеткиликтүү Wi‑Fi\'дын эң мыктысына туташтырат"</string>
-    <string name="wifi_assistant_open_app" msgid="4803044899535675063">"КОЛДОНМОНУ АЧУУ"</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>
@@ -869,7 +863,7 @@
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
     <!-- no translation found for wifi_settings_summary (668767638556052820) -->
     <skip />
-    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Wi‑Fi тандоо"</string>
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Wi‑Fi тармагын тандаңыз"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Wi‑Fi\'ды тандаңыз"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Wi‑Fi жандырылууда…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Wi‑Fi өчүрүлүүдө…"</string>
@@ -886,8 +880,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"Дайым жеткиликтүүнү скандоо"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Ар дайым иликтей алышсын"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Wi-Fi өчүп турса да, Google\'дун жайгашкан жерди аныктоо кызматына жана башка колдонмолорго тармактарды иликтөөгө мүмкүндүк берүү"</string>
-    <string name="wifi_automatically_manage_title" msgid="6249976570008992746">"Wi-FI\'ды автоматтык түрдө башкаруу"</string>
-    <string name="wifi_automatically_manage_summary" msgid="6952470763378312488">"<xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> Wi‑Fi туташууңузду башкаруусуна уруксат берүү"</string>
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Автоматтык түрдө ачык Wi‑Fi пайдалануу"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Жогорку сапаттуу болуп аныкталган ачык тармктрга Wi‑Fi жардамчысы авт-к түрдө тутшсуна уруксат берүү"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Жардамчы тандоо"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Сертификаттарды орнотуу"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Жайгаштыруунун тактыгын жогорулатуу жана башка максаттарда, Google жана башка колдонмолор, Wi-Fi өчүк болсо да түйүндөрдү скандашы мүмкүн. Эгер сиз муну каалабасаңыз, Илгерилетилген &gt; Скандоо дайым жеткиликтүүгө барыңыз."</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Колдонмолор Wi-Fi өчүк болсо да, жакын арадагы түйүндөрдү скандай алышат. Эгер сиз муну каалабасаңыз, Илгерилетилген &gt; Скандоо дайым жеткиликтүүгө барыңыз."</string>
@@ -913,6 +908,7 @@
     <skip />
     <!-- no translation found for wifi_menu_connect (4996220309848349408) -->
     <skip />
+    <string name="wifi_menu_remember" msgid="8814185749388713796">"Тармакты эстеп калуу"</string>
     <!-- no translation found for wifi_menu_forget (8736964302477327114) -->
     <skip />
     <!-- no translation found for wifi_menu_modify (2068554918652440105) -->
@@ -975,10 +971,12 @@
     <skip />
     <string name="wifi_remembered" msgid="4955746899347821096">"Сакталды"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"Өчүрүлгөн"</string>
-    <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Байланыш начар болгондуктан, интернет өчүрүлгөн"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP конфигурациясы бузулду"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"WiFi туташуусу бузулду"</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Аутентификация маселеси бар"</string>
     <!-- no translation found for wifi_not_in_range (1136191511238508967) -->
     <skip />
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Интернетке кирүү мүмкүнчүлүгү табылган жок, андыктан автоматтык түрдө кайра туташпайт."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS жеткиликтүү"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS жеткиликтүү)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Тармактагы сырсөзүңүздү киргизиңиз"</string>
@@ -1006,9 +1004,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"ЭСКЕРТҮҮ: Эгер Wi‑Fi\'ды этибарга албай койсоңуз, баштапкы жүктөп алуулар жана жаңыртуулар үчүн планшетиңиз уюктук дайындар тармагын гана колдонот. Акы төлөбөш үчүн, Wi‑Fi\'га туташыңыз."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"ЭСКЕРТҮҮ: Эгер Wi‑Fi\'ды этибарга албай койсоңуз, баштапкы жүктөп алуулар жана жаңыртуулар үчүн түзмөгүңүз уюктук дайындар тармагын гана колдонот. Акы төлөбөш үчүн, Wi‑Fi\'га туташыңыз."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"ЭСКЕРТҮҮ: Эгер Wi‑Fi\'ды этибарга албай койсоңуз, баштапкы жүктөп алуулар жана жаңыртуулар үчүн телефонуңуз уюктук дайындар тармагын гана колдонот. Акы төлөбөш үчүн, Wi‑Fi\'га туташыңыз."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="2393880108322835846">"ЭСКЕРТҮҮ: Эгер Wi‑Fi\'ды этибарга албай койсоңуз, баштапкы жүктөп алуулар же жаңыртуулар үчүн планшетиңизде Интернет байланышы болбойт."</string>
-    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1707391993265558787">"ЭСКЕРТҮҮ: Эгер Wi‑Fi\'ды этибарга албай койсоңуз, баштапкы жүктөп алуулар же жаңыртуулар үчүн түзмөгүңүздө Интернет байланышы болбойт."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="1556858507920033022">"ЭСКЕРТҮҮ: Эгер Wi‑Fi\'ды этибарга албай койсоңуз, баштапкы жүктөп алуулар же жаңыртуулар үчүн телефонуңузда Интернет байланышы болбойт."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Эгер Wi‑Fi\'ды өткөрүп жиберсеңиз:\n\nПланшетииңиз Интернетке туташа албайт.\n\nИнтернетке туташмайынча программа жаңыртуулары алынбайт.\n\nБул жолу түзмөктү коргоо мүмкүнчүлүктөрү жандырылбайт."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Эгер Wi‑Fi\'ды өткөрүп жиберсеңиз:\n\nТүзмөгүңүз Интернетке туташа албайт.\n\nИнтернетке туташмайынча программа жаңыртуулары алынбайт.\n\nБул жолу түзмөктү коргоо мүмкүнчүлүктөрү жандырылбайт."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Эгер Wi‑Fi\'ды өткөрүп жиберсеңиз:\n\nТелефонуңуз Интернетке туташа албайт.\n\nИнтернетке туташмайынча программа жаңыртуулары алынбайт.\n\nБул жолу түзмөктү коргоо мүмкүнчүлүктөрү жандырылбайт."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Планшет Wi‑Fi түйүнгө кошула алган жок."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"Түзмөк бул Wi‑Fi тармагына туташа алган жок."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Телефон бул Wi‑Fi түйүнгө кошула алган жок."</string>
@@ -1084,7 +1082,6 @@
     <!-- no translation found for vibrate_in_silent_title (3897968069156767036) -->
     <skip />
     <string name="notification_sound_title" msgid="5137483249425507572">"Эскертменин абалкы үнү"</string>
-    <string name="heads_up_enabled_title" msgid="1031078221910921622">"Өтө шашылыш болсо ыргып чыгат"</string>
     <!-- no translation found for incoming_call_volume_title (8073714801365904099) -->
     <skip />
     <!-- no translation found for notification_volume_title (2012640760341080408) -->
@@ -1188,7 +1185,7 @@
     <skip />
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Ойготуу үчүн көтөрүү"</string>
     <string name="doze_title" msgid="2259176504273878294">"Градиент дисплейи"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"Түзмөк алынганда же эскертмелер келгенде экранды ойготуу"</string>
+    <string name="doze_summary" msgid="7128970177894383698">"Түзмөк көтөрүлгөндө же эскертмелер алынганда экран ойгонсун"</string>
     <!-- no translation found for title_font_size (4405544325522105222) -->
     <skip />
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Тамганын чоңдугу"</string>
@@ -1235,6 +1232,10 @@
     <skip />
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"Бир нече SIM табылды"</string>
     <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>
+    <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-карта PIN-коду туура эмес. Эми түзмөктү бөгөттөн чыгарыш үчүн операторуңузга кайрылышыңыз керек."</string>
   <plurals name="wrong_pin_code">
     <item quantity="one" msgid="4840607930166101114">"SIM PIN-коду туура эмес, сизде <xliff:g id="NUMBER">%d</xliff:g> аракет калды. Болбосо, түзмөктү бөгөттөн чыгарыш үчүн операторуңузга кайрылышыңыз керек."</item>
@@ -1476,6 +1477,7 @@
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Бул, телефонуңуздун "<b>"ички сактагычындагы"</b>" бардык берилиштерди кийинкилер менен кошо өчүрөт:\n\n"<li>"Сиздин Google эсебиңиз"</li>\n<li>"Систем, колдонмолордун берилиштери жана тууралоолору"</li>\n<li>"Жүктөлүп алынган колдонмолор"</li></string>
     <!-- no translation found for master_clear_accounts (6412857499147999073) -->
     <skip />
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Бул түзмөктө башка колдонуучулар бар.\n"</string>
     <!-- no translation found for master_clear_desc_also_erases_external (1903185203791274237) -->
     <skip />
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Музыканы, сүрөттөрдү, жана башка колдонуучу берилиштерин өчүрүш үчүн, "<b>"USB сактагычты"</b>" тазалаш керек."</string>
@@ -1493,8 +1495,6 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Сиздин бардык жеке маалыматтарыңыз жана жүктөп алынган колдонмолоруңуз өчүрүлсүнбү? Сиз бул аракетти артка кайтара албайсыз!"</string>
     <!-- no translation found for master_clear_final_button_text (5390908019019242910) -->
     <skip />
-    <!-- no translation found for master_clear_gesture_prompt (1428645764883536750) -->
-    <skip />
     <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Баштапкы абалга кайтаруу аракетин ырасташ үчүн, үлгү ачкычты тартышыңыз керек болот."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Тазалоо аткарылган жок, анткени System Clear кызматы жеткиликсиз."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Тазалансынбы?"</string>
@@ -1519,8 +1519,6 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Бардык сакталган файлдар өчүрүлүп, SD-карта тазалансынбы? Сиз бул аракетти артка кайтара албайсыз!"</string>
     <!-- no translation found for media_format_final_button_text (4881713344315923175) -->
     <skip />
-    <!-- no translation found for media_format_gesture_prompt (3109349468816856670) -->
-    <skip />
     <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"USB сактагычты тазалоону ырастоо үчүн, үлгү ачкычты тартышыңыз керек болот."</string>
     <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"SD-картаны тазалоо аракетин ырасташ үчүн үлгү ачкычты тартышыңыз керек болот."</string>
     <!-- no translation found for call_settings_title (5188713413939232801) -->
@@ -1591,6 +1589,9 @@
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Интернетке кошулуңуз"</string>
     <!-- no translation found for location_title (1029961368397484576) -->
     <skip />
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Жумуш профили"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Жумуш профилинин жайгашкн жери"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Ишканаңыз тарабынан өчүрүлгөн"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Тартип"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Жогорку тактык"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Батарейди үнөмдөө"</string>
@@ -1639,6 +1640,7 @@
     <skip />
     <!-- no translation found for terms_title (7697580845616764642) -->
     <skip />
+    <string name="webview_license_title" msgid="2813507464175738967">"Систем WebView Уруксаттамасы"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Тушкагаздар"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Спутник сүрөттөрүн камсыздагычтар:\n©2014 CNES/Astrium, DigitalGlobe, Bluesky"</string>
     <!-- no translation found for settings_license_activity_title (7553683406244228650) -->
@@ -1824,7 +1826,7 @@
     <skip />
     <!-- no translation found for disabled (9206776641295849915) -->
     <skip />
-    <string name="not_installed" msgid="1475144352069281880">"Орнотулган эмес"</string>
+    <string name="not_installed" msgid="2797554494953450291">"Бул колднууч үчн орнтулгн эмес"</string>
     <string name="no_applications" msgid="7336588977497084921">"Эч бир колдонмо жок."</string>
     <!-- no translation found for internal_storage (1584700623164275282) -->
     <skip />
@@ -2105,8 +2107,12 @@
     <skip />
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Bluetooth HCI уруксатсыздарды каттоону иштетүү"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Бардык Bluetooth HCI пакеттерин бир файлга жазуу"</string>
-    <string name="oem_unlock_enable" msgid="6629321276287913315">"OEM кулпу ачууну иштетүү"</string>
-    <string name="oem_unlock_enable_summary" msgid="3546686263996628110">"Түзмөккө кулпуну OEM аркылуу ачканга уруксат берүү"</string>
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM бөгөттөн чыгаруу"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Кайра жүктөгүчтү бөгөттөн чыгарууга уруксат берүү"</string>
+    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"PIN\'иңизди киргизиңиз"</string>
+    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"OEM кулпуну ачууну иштетүү үчүн түзмөгүңүздүн PIN\'ин киргизиңиз"</string>
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"OEM бөгөттөн чыгарууга уруксатпы?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"ЭСКЕРТҮҮ: Бул жөндөө күйгүзүлүп турганда түзмөктү коргоо өзгөчөлүктөрү иштебейт."</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Зымсыз дисплейди аныктоо"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Wi‑Fi дайын-даректүү протоколун иштетүү"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Уюктук хэндоверге өжөр Wi-Fi"</string>
@@ -2224,6 +2230,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"Субтитрлер мындай көрүнөт"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Өө"</string>
     <string name="locale_default" msgid="2593883646136326969">"Абалкы"</string>
+    <string name="color_title" msgid="4258931051732243983">"Түс"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"Демейки"</string>
     <string name="color_none" msgid="3475640044925814795">"Эчтеке жок"</string>
     <string name="color_white" msgid="8045195170201590239">"Ак"</string>
@@ -2284,12 +2291,12 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"<xliff:g id="REMAIN">%1$s</xliff:g> калды"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> кубаттоо"</string>
-    <string name="power_discharging_duration" msgid="7125493014448497620">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – <xliff:g id="TIME">%2$s</xliff:g> чакты калды"</string>
-    <string name="power_charging" msgid="712751285832976915">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – <xliff:g id="STATE">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration" msgid="4802183864773082009">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – <xliff:g id="TIME">%2$s</xliff:g> толгонго чейин"</string>
-    <string name="power_charging_duration_ac" msgid="3611179931297824699">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – <xliff:g id="TIME">%2$s</xliff:g> толгонго чейин, кубаттагыч аркылуу"</string>
-    <string name="power_charging_duration_usb" msgid="1106605348913397583">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – <xliff:g id="TIME">%2$s</xliff:g> толгонго чейин, USB аркылуу"</string>
-    <string name="power_charging_duration_wireless" msgid="633606920144617227">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – <xliff:g id="TIME">%2$s</xliff:g> толгонго чейин, зымсыз"</string>
+    <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> - болжол менен <xliff:g id="TIME">%2$s</xliff:g> саат калды"</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> толгончо"</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> AC аркылуу толгончо"</string>
+    <string name="power_charging_duration_usb" msgid="182405645340976546">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> USB аркылуу толгончо"</string>
+    <string name="power_charging_duration_wireless" msgid="1829295708243159464">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> зымсыз кубаттоо аркылуу толгончо"</string>
     <string name="power_usage_list_summary" msgid="2409288197839512482">"Акыркы толук кубатталгндн бери колдонңуз"</string>
     <!-- no translation found for battery_since_unplugged (338073389740738437) -->
     <skip />
@@ -2315,8 +2322,6 @@
     <skip />
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi‑Fi өз учурунда"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Өз убагындагы Wi‑Fi"</string>
-    <!-- no translation found for usage_name_percent (7976919382448235858) -->
-    <skip />
     <!-- no translation found for history_details_title (3608240585315506067) -->
     <skip />
     <!-- no translation found for details_title (3792801565213935385) -->
@@ -2425,7 +2430,7 @@
     <string name="battery_saver" msgid="1426682272004907982">"Батареяны үнөмдөгүч"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Автоматтык түрдө күйгүзүү"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Эч качан"</string>
-    <string name="battery_saver_turn_on_automatically_pct" msgid="3033681629861428940">"батарея %1$d%% болгондо"</string>
+    <string name="battery_saver_turn_on_automatically_pct" msgid="7536784431655058267">"батареянын кубаты %1$s болгондо"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Процесстин статистикасы"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Иштеп жаткан процесстердин өзгөчө статистикасы"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Эс тутумдун пайдаланылышы"</string>
@@ -2593,7 +2598,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Аппараттык негиздеги"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Програмдык гана"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"Бул колдонуучу далдаштырма дайындарын колдоно албайт"</string>
-    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Бөгөттөн чыгаруу сүрөтүн тартыңыз"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Сертификат сактагычты орнотууну ырастоо үчүн, үлгү ачкычты тартышыңыз керек."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Сертификат сактагычтын сырсөзүн териңиз."</string>
@@ -2639,6 +2643,8 @@
     <!-- no translation found for auto_restore_title (5397528966329126506) -->
     <skip />
     <string name="auto_restore_summary" msgid="4235615056371993807">"Колдонмону кайрадан орнотууда, бэкапталган тууралоолорду жана берилиштерди калыбына келтириңиз"</string>
+    <string name="backup_inactive_title" msgid="5355557151569037197">"Камдык көчүрмөнү сактоо кызматы жандырылган эмес."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"Бул түзмөгүңүздүн саясаты тарабынан коюлган."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Компүтердеги бэкаптын сырсөзү"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Компүтердеги толук бэкап учурда корголгон эмес"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Тийип, компүтердеги толук бэкаптын сырсөзүн өзгөртүңүз же жок кылыңыз"</string>
@@ -2795,7 +2801,11 @@
     <string name="enter_password" msgid="8035706727471334122">"Android\'ду иштетүү үчүн, сырсөзүңүздү киргизиңиз"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Android\'ду иштетүү үчүн, PIN\'иңизди киргизиңиз"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Android\'ду иштетүү үчүн, үлгүңүздү чийиңиз"</string>
-    <string name="try_again" msgid="4272075051293936921">"Кайра бир аракеттениңиз."</string>
+    <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"Үлгү туура эмес"</string>
+    <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"Сырсөз туура эмес"</string>
+    <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"PIN код туура эмес"</string>
+    <string name="checking_decryption" msgid="8287458611802609493">"Текшерүүдө…"</string>
+    <string name="starting_android" msgid="8581493237458496835">"Android жүргүзүлүүдө"</string>
     <!-- no translation found for delete (4219243412325163003) -->
     <skip />
     <string name="misc_files" msgid="6720680815969643497">"Башка файлдар"</string>
@@ -2842,8 +2852,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Экранды калыптоодо ар дайым GPU колдонулсун"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"Түс мейкиндигин эмуляциялоо"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"OpenGL трейстерин иштетүү"</string>
-    <string name="use_nuplayer" msgid="5699257393367904387">"NuPlayer колдонуу (сынамык)"</string>
-    <string name="use_nuplayer_summary" msgid="1991479067478516714">"AwesomePlayer ордуна NuPlayer колдонуу"</string>
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"AwesomePlayer колдн (сунштлбайт)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"Көпчлк медиа ойнт ү-н NuPlayer ордуна AwesomePlayer колдн"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"USB аудио багыттама өчүр"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"Тышкы USB аудио жабдыктарына авто багыттама өчрүү"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Катмардын чектерин көргөзүү"</string>
@@ -3073,7 +3083,6 @@
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Колдонуучу же профиль кошуу"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Колдонуучу кошуу"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Чектелген профайл"</string>
-    <string name="user_summary_managed_profile" msgid="7369539529693048111">"Жумуш профили"</string>
     <string name="user_need_lock_message" msgid="2596365678651842785">"Чектелген профайл түзөөрдөн мурун, сиз өзүңүздүн колдонмолоруңузду жана жеке маалыматтарыңызды коргош үчүн, бөгөттөө көшөгөсүн орнотушуңуз керек болот."</string>
     <string name="user_set_lock_button" msgid="8311219392856626841">"Бөгөт коюу"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Түзүлгөн жок"</string>
@@ -3204,11 +3213,13 @@
     <string name="sim_cellular_data_unavailable_summary" msgid="3654805961942166428">"Дайындар SIM\'ин тандоо үчүн тийиңиз"</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"Бул нерсе дайым чалуулр үчүн колдонулсн"</string>
     <string name="select_sim_for_data" msgid="2366081042162853044">"Дайындар үчүн SIM тандаңыз"</string>
+    <string name="data_switch_started" msgid="2040761479817166311">"Дайындар SIM\'и которулууда, бул бир мүнөткө чейин созулушу мүмкүн…"</string>
     <string name="select_sim_for_calls" msgid="3503094771801109334">"Төмөнкү менен чалуу"</string>
     <string name="sim_select_card" msgid="211285163525563293">"SIM карта тандаңыз"</string>
     <string name="sim_card_number_title" msgid="7845379943474336488">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"SIM бош"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"SIM аталышы"</string>
+    <string name="sim_name_hint" msgid="7038643345238968930">"SIM аталышын киргизиңиз"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"SIM оюкчасы %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Оператор"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Номер"</string>
@@ -3218,7 +3229,6 @@
     <string name="color_purple" msgid="3888532466427762504">"Кызгылт көгүш"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"SIM карта кыстарылган эмес"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"SIM абалы"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"SIM картага байланыштуу маалымат"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"Демейки SIM\'ден кайра чалуу"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"Чыгуучу чалуулар үчүн SIM"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Башка чалуу жөндөөлөрү"</string>
@@ -3226,8 +3236,11 @@
     <string name="preferred_network_offload_header" msgid="2321173571529106767">"Тармак атын жайлтну өчрүү"</string>
     <string name="preferred_network_offload_footer" msgid="5857279426054744020">"Тармактн аталышн жайылтуу мүмкүнчүлгү өчүрүлгндө, үчүнчү жактр тармагыңыздн маалыматн көрбөй калышт."</string>
     <string name="preferred_network_offload_popup" msgid="2252915199889604600">"Тармактн аталышн жайлтуу мүмкүнчлгү өчүрүлгндө, жашырлгн тармактрг автоматтк туташуу мүмкн эмс болт."</string>
+    <string name="sim_signal_strength" msgid="9144010043784767984">"<xliff:g id="DBM">%1$d</xliff:g> dBm <xliff:g id="ASU">%2$d</xliff:g> asu"</string>
+    <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>
@@ -3236,22 +3249,22 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Акыркы издөөлөр"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Натыйжалар"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi түйүнүнө байланышуу"</string>
-    <string name="keywords_more_default_sms_app" msgid="2744404159003574745">"SMS билдирүүсү"</string>
-    <string name="keywords_more_mobile_networks" msgid="7813380887358745769">"зымсыз уюктук оператор"</string>
+    <string name="keywords_more_default_sms_app" msgid="895656981962034647">"SMS билдирүү SMS билдирүүлөрүн жазышуу билдирүү жазышуу"</string>
+    <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"уюлдук уюл оператор зымсыз дайындар 4g 3g 2g lte"</string>
     <string name="keywords_home" msgid="3626170808219458848">"ишке киргизгич"</string>
     <string name="keywords_display" msgid="6709007669501628320">"экран, сенсордук экран"</string>
-    <string name="keywords_display_brightness_level" msgid="8636451602230815191">"күңүрт экран, сенсордук экран"</string>
-    <string name="keywords_display_auto_brightness" msgid="8070218600502753102">"күңүрт экран, сенсордук экран"</string>
-    <string name="keywords_display_wallpaper" msgid="4315466287469834939">"фон"</string>
+    <string name="keywords_display_brightness_level" msgid="8923289340474728990">"күңүрт экран сенсордук экран батарея"</string>
+    <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"күңүрт экран сенсордук экран батарея"</string>
+    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"фон жекечелештирүү өзгөчөлөштүрүү дисплей"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"текст өлчөмү"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"долбоор"</string>
-    <string name="keywords_storage" msgid="7007275853993419928">"мейкиндик диск катуу диск"</string>
-    <string name="keywords_battery" msgid="3992479295298655138">"кубат"</string>
-    <string name="keywords_spell_checker" msgid="4509482591225399210">"орфография"</string>
+    <string name="keywords_storage" msgid="6572905220031852173">"бош орун диск катуу диск түзмөк колдонуу"</string>
+    <string name="keywords_battery" msgid="2096185085932675704">"кубаттын керектелиши кубаттоо"</string>
+    <string name="keywords_spell_checker" msgid="6106749039734174140">"орфографиялык сөздүк орфография текшергичи авто-тууралоо"</string>
     <string name="keywords_voice_input" msgid="3519547605812413860">"тааныгыч киргизүү кеби сүйлөө тили үн менен башкаруу колу бош тааныгыч адепсиз сөз аудио таржымал bluetooth гарнитура"</string>
-    <string name="keywords_text_to_speech_output" msgid="8207889472282225512">"рейтинг тил демейки сүйлө сүйлөө"</string>
-    <string name="keywords_date_and_time" msgid="7666950126499155141">"саат"</string>
-    <string name="keywords_factory_data_reset" msgid="3693730656843989732">"тазалоо, жок кылуу"</string>
+    <string name="keywords_text_to_speech_output" msgid="392447904221657930">"рейтинг тил демейки сүйлө сүйлөө tts жеткиликтүүлүк окурман сокур"</string>
+    <string name="keywords_date_and_time" msgid="2631808108134830066">"аскер сааты"</string>
+    <string name="keywords_factory_data_reset" msgid="4355133848707691977">"сүрүү жок кылуу калыбына келтирүү тазалоо алып салуу"</string>
     <string name="keywords_printing" msgid="1701778563617114846">"принтер"</string>
     <string name="keywords_sounds_and_notifications" msgid="5965996187974887000">"катуу сүйлөткүчтүн үнү"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="2912933812460077912">"тынчымды алба үзүү үзгүлтүккө учуроо тыныгуу"</string>
@@ -3260,7 +3273,7 @@
     <string name="keywords_location_mode" msgid="8584992704568356084">"тактык"</string>
     <string name="keywords_accounts" msgid="1957925565953357627">"каттоо эсеби"</string>
     <string name="keywords_users" msgid="4673901601478559100">"чектөө чектөө чектелген"</string>
-    <string name="keywords_keyboard_and_ime" msgid="1103378692379215672">"текст оңдоо туура үн дирилдөө авто тил жаңсоо сунуштоо сунуштама темасы адепсиз сөз жымың терүү"</string>
+    <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"текст тууралоо туура добуш дирилдөө авт тил жаңсоо сунуштоо сунуш тема адепсиз сөз түрү эмодзи эларалык"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"сырсөз үлгү төөнөгүчүн жылмыштыруу"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC тегин орнотуу"</string>
     <string name="write_tag" msgid="8571858602896222537">"Жазуу"</string>
@@ -3277,7 +3290,6 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Эскертме үнүнүн катуулугу"</string>
     <string name="zen_mode_settings_title" msgid="7014915558669122902">"Үзгүлтүктөр"</string>
     <string name="zen_mode_option_title" msgid="5061978632306007914">"Чалуулар же эскертмелер келгенде"</string>
-    <string name="zen_mode_option_title_novoice" msgid="6680706009915204785">"Эскертмелер келгенде"</string>
     <string name="zen_mode_option_off" msgid="3167702608910820883">"Ар дайым үзгүлтүккө учурасын"</string>
     <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Артыкчылыктуу үзгүлтүктөргө гана уруксат берилсин"</string>
     <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Үзгүлтүккө учурабасын"</string>
@@ -3337,14 +3349,17 @@
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Аткарылды"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Бул өчүрүлгөнгө чейин"</string>
     <string name="zen_mode_important_category" msgid="8123274463331022993">"Артыкчылыктуу үзгүлтүктөр"</string>
-    <string name="zen_mode_downtime_category" msgid="4730179065426038108">"Сенек мезгл (артыкчлктуу үзгүлтктр гана)"</string>
+    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Аракетсиз убакыт"</string>
     <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Күндөр"</string>
     <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Эч нерсе жок"</string>
+    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Үзгүлтүктөргө уруксат берилген"</string>
+    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Артыкчылык гана"</string>
+    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Эч нерсе жок"</string>
     <string name="zen_mode_automation_category" msgid="4653551005950835761">"Автоматташтыруу"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Автоматтык түрдө күйүү"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Эч качан"</string>
-    <string name="zen_mode_phone_calls" msgid="8956214416859303966">"Чалуулар"</string>
+    <string name="zen_mode_calls" msgid="7051492091133751208">"Чалуулар"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Билдирүүлөр"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Төмөнкүдөн келген чалуулар/билдирүүлөр"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Баары"</string>
@@ -3358,7 +3373,9 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Иш түндөрү"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Баштоо убакыты"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Аяктоо убакыты"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> кийинки күнү"</string>
+    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> кийинки күнү"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> же ага чейин бир айгай"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> кийинки күнү же ага чейин бир айгай"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Колдонмо эскертмелери"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Эскертме жөндөөлөрү"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Бул түзмөк жөнүндө пикир жөнөтүү"</string>
@@ -3366,7 +3383,11 @@
     <string name="switch_on_text" msgid="1124106706920572386">"Күйгүзүлгөн"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Өчүк"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"Экранды кадап коюу"</string>
-    <string name="screen_pinning_description" msgid="7091642350452605379">"Күйгүзүлгөндөн кийин, учурдагы экран бошотулганга чейин көрүнүп турушу үчүн экран кадоону пайдалансаңыз болот.\n\nЭкран кадоону пайдалануу үчүн:\n\n1. Экран кадоо күйгүзүлгөнүн текшериңиз.\n\n2. Кадала турган экранды ачыңыз.\n\n3. Көз жүгүртүүгө тийип коюңуз.\n\n4. Төөнөгүч сөлөкөтүнө тийип коюңуз."</string>
+    <string name="screen_pinning_description" msgid="1137904524037468263">"Бул жөндөө күйгүзүлгөндө, учурдагы экран бошотулганга чейин көрүнүп турушу үчүн экран кадоону пайдалансаңыз болот.\n\nЭкран кадоо мүмкүнчүлүгүн пайдалануу үчүн:\n\n1. Экран кадоону күйгүзңүз.\n\n2. Кадала турган экранды ачыңз.\n\n3. Карап чыгууга тийип коюңз.\n\n4. Жогору серпип, андан соң кадоо сүрөтчөснө тийип коюңз."</string>
+    <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Бошотуудан мурун кулпуну ачкан үлгү суралсын"</string>
+    <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Бошотуудан мурун PIN суралсын"</string>
+    <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Бошотуудан мурун сырсөз суралсын"</string>
+    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Бошотулганда түзмөк кулпулансын"</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Жумуш профили"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Сынамык)"</string>
     <string name="display_auto_rotate_title" msgid="6176450657107806043">"Түзмөк айланганда"</string>
@@ -3375,7 +3396,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Туурасынан көрүнүштө кала берсин"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Учурдагы багытта кала берсин"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI маалыматы"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI байланыштуу маалымат"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Шифрлөө"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Улантуу"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"Бул түзмөктү иштетүү үчүн PIN\'ди талап кылуу менен, аны коргосоңуз болот. Түзмөк иштетилмейинче чалуулар, билдирүүлөр же эскертмелер, ошондой эле ойготкучтар алынбайт. \n\nУшуну менен, жоголгон же уурдалган түзмөктөрдөгү дайындар корголот."</string>
@@ -3393,4 +3413,7 @@
     <string name="encrypt_talkback_dialog_message_pin" msgid="1890374082842868489">"Бул түзмөктү иштетүү үчүн PIN киргизилгенде, <xliff:g id="SERVICE">%1$s</xliff:g> сыяктуу атайын мүмкүнчүлүктөр кызматтары иштебей калат."</string>
     <string name="encrypt_talkback_dialog_message_pattern" msgid="4474332516537386384">"Бул түзмөктү иштетүү үчүн үлгүңүз киргизилгенде, <xliff:g id="SERVICE">%1$s</xliff:g> сыяктуу атайын мүмкүнчүлүктөр кызматтары иштебей калат."</string>
     <string name="encrypt_talkback_dialog_message_password" msgid="8166099418487083927">"Бул түзмөктү иштетүү үчүн сырсөзүңүз киргизилгенде, <xliff:g id="SERVICE">%1$s</xliff:g> сыяктуу атайын мүмкүнчүлүктөр кызматтары иштебей калат."</string>
+    <string name="imei_information_title" msgid="8499085421609752290">"IMEI маалыматы"</string>
+    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI байланыштуу маалымат"</string>
+    <string name="slot_number" msgid="3762676044904653577">"(Оюк<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-land/styles.xml b/res/values-land/styles.xml
index 8cbd5e8..974b226 100644
--- a/res/values-land/styles.xml
+++ b/res/values-land/styles.xml
@@ -34,13 +34,13 @@
         <item name="android:textSize">14sp</item>
         <item name="android:textAlignment">viewStart</item>
         <item name="android:textAppearance">@android:style/TextAppearance.Material.Body1</item>
-        <item name="android:textColor">@*android:color/secondary_text_default_material_light</item>
+        <item name="android:textColor">?android:attr/textColorSecondary</item>
     </style>
 
     <style name="wifi_item_content">
         <item name="android:textAlignment">viewStart</item>
         <item name="android:textAppearance">@android:style/TextAppearance.Material.Subhead</item>
-        <item name="android:textColor">@*android:color/primary_text_default_material_light</item>
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
     </style>
 
     <style name="wifi_item_edit_content">
diff --git a/res/values-lo-rLA/arrays.xml b/res/values-lo-rLA/arrays.xml
index a738682..0209d96 100644
--- a/res/values-lo-rLA/arrays.xml
+++ b/res/values-lo-rLA/arrays.xml
@@ -527,4 +527,12 @@
     <item msgid="4338089220026248848">"Cached (​ການ​ເຄື່ອນ​ໄຫວ​ລູກ​ຂ່າຍ)"</item>
     <item msgid="6652164677254579050">"Cached (​ຫວ່າງ​ເປົ່າ)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"ສີຂຽວອົມຟ້າ"</item>
+    <item msgid="8332294763632946560">"ຟ້າ"</item>
+    <item msgid="2023216417616991392">"​ສີມ່ວງ​ເຂັ້ມ"</item>
+    <item msgid="3170497246594232819">"ສີມ່ວງ"</item>
+    <item msgid="4608643045752965568">"ບົວ"</item>
+    <item msgid="6131821495505931173">"ແດງ"</item>
+  </string-array>
 </resources>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index cbd7280..8c5cc46 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>
@@ -180,7 +180,6 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s ຕ້ອງການສິດເພື່ອເຂົ້າໄປຂໍ້ຄວາມຂອງທ່ານ. ໃຫ້ສິດແກ່ %2$s ຫຼືບໍ່?"</string>
     <string name="date_and_time" msgid="9062980487860757694">"ວັນ​ທີ &amp; ເວ​ລາ"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"ເລືອກເຂດເວລາ"</string>
-    <string name="normal_date_format" msgid="7636406984925498359">"ທ້ອງຖິ່ນ (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"ຕົວຢ່າງ:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"ຂະໜາດໂຕອັກສອນ:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -291,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>
@@ -322,8 +321,6 @@
     <string name="date_time_set_timezone" msgid="5045627174274377814">"ເລືອກເຂດເວລາ"</string>
     <string name="date_time_set_date_title" msgid="6928286765325608604">"ວັນທີ"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"ຕັ້ງວັນທີ"</string>
-    <string name="date_time_date_format_title" msgid="3976171711988766411">"​ຮູບ​ແບບ​ວັນ​ທີ"</string>
-    <string name="date_time_date_format" msgid="6951498879879281102">"ເລືອກຮູບແບບວັນທີ"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"ຮຽງຕາມໂຕອັກສອນ"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"ຮຽງຕາມເຂດເວລາ"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"ວັນທີ"</string>
@@ -372,7 +369,8 @@
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"ລໍຖ້າລະຫວ່າງທີ່ໂທລະສັບຂອງທ່ານກຳລັງຖືກເຂົ້າລະຫັດ. ສຳເລັດແລ້ວ <xliff:g id="PERCENT">^1</xliff:g>%."</string>
     <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"ກະ​ລຸ​ນາ​ລໍ​ຖ້າ​ຂະ​ນະ​ທີ່​ແທັບ​ເລັດຂອງ​ທ່ານ​ກຳ​ລັງ​ຖືກ​ເຂົ້າ​ລະ​ຫັດ. ຍັງ​ເຫຼືອ​ອີກ: <xliff:g id="DURATION">^1</xliff:g>"</string>
     <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"ກະ​ລຸ​ນາ​ລໍ​ຖ້າ​ຂະ​ນະ​ທີ່​ໂທ​ລະ​ສັບ​ຂອງ​ທ່ານ​ກຳ​ລັງ​ຖືກ​ເຂົ້າ​ລະ​ຫັດ. ຍັງ​ເຫຼືອ​ອີກ: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"ລອງອີກຄັ້ງໃນ <xliff:g id="DELAY">^1</xliff:g> ວິນາທີ."</string>
+    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"ເພືອ​ປົດ​ລັອກ​ແທັບ​ເລັດຂອງ​ທ່ານ, ປິດ ແລະ​ເປີດ​ມັນ​ອີກ."</string>
+    <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"ເພືອ​ປົດ​ລັອກ​ໂທ​ລະ​ສັ​ບ​ຂອງ​ທ່ານ, ປິດ ແລະ​ເປີດ​ມັນ​ອີກ."</string>
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"ຄຳ​ເຕືອນ: ອຸ​ປະ​ກອນ​ຂອງ​ທ່ານ​ຈະ​ຖືກ​ລຶບ​ຂໍ້​ມູນຫຼັງ​ຈາກ​ທີ່​ພະ​ຍາ​ຍາມ​ປົດ​ລັອກ​ລົ້ມ​ເຫລວ <xliff:g id="COUNT">^1</xliff:g> ເທື່ອ!"</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"ພິມລະຫັດຜ່ານຂອງທ່ານ"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"ການເຂົ້າລະຫັດບໍ່ສຳເລັດ"</string>
@@ -400,7 +398,8 @@
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN"</string>
     <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_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 +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>
@@ -498,7 +498,7 @@
     <string name="bluetooth_preference_paired_dialog_name_label" msgid="8111146086595617285">"ຊື່"</string>
     <string name="bluetooth_preference_paired_dialog_internet_option" msgid="7112953286863428412">"​ການ​ເຊື່ອມ​ຕໍ່​ອິນ​ເຕີ​ເນັດ"</string>
     <string name="bluetooth_preference_paired_dialog_keyboard_option" msgid="2271954176947879628">"​ແປ້ນ​ພິມ"</string>
-    <string name="bluetooth_preference_paired_dialog_contacts_option" msgid="7747163316331917594">"ລາຍ​ຊື່​ຜູ່​ຕິດ​ຕໍ່ ແລະ​ປະ​ຫວັດ​ການ​ໂທ"</string>
+    <string name="bluetooth_preference_paired_dialog_contacts_option" msgid="7747163316331917594">"ລາຍ​ຊື່​ຜູ່​ຕິດ​ຕໍ່ ແລະ​ປະ​ຫວັດ​ການ​ໂທ​"</string>
     <string name="bluetooth_pairing_dialog_title" msgid="1417255032435317301">"ຈັບຄູ່ກັບອຸປະກອນນີ້ບໍ?"</string>
     <string name="bluetooth_pairing_dialog_sharing_phonebook_title" msgid="7664141669886358618">"ແບ່ງ​ປັນ​ສະ​ມຸດ​ໂທ​ລະ​ສັບ​ບໍ?"</string>
     <string name="bluetooth_pairing_dialog_contants_request" msgid="5531109163573611348">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ຕ້ອງ​ການ​ເຂົ້າ​ເຖິງ​ລາຍ​ຊື່​ຜູ່​ຕິດ​ຕໍ່​ ແລະ​ປະ​ຫວັດ​ການ​ໂທ​ຂອງ​ທ່ານ."</string>
@@ -556,13 +556,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"ເປັນລຳໂພງ"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"ສຳລັບເພງ ແລະສື່"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"ຈື່ການຕັ້ງຄ່າ"</string>
-    <string name="wifi_assistant_intro_setup" msgid="4605105515416995110">"ຂໍ​ແນະ​ນຳ\nWi‑Fi Assistant"</string>
-    <string name="wifi_assistant_no_thanks" msgid="2776983751990143934">"ບໍ່, ຂອບ​ໃຈ"</string>
-    <string name="wifi_assistant_setup" msgid="3772423650475730906">"ຕັ້ງຄ່າ"</string>
-    <string name="wifi_assistant_card_message" msgid="107811647784658536">"​ເຊື່ອມ​ຕໍ່​ຫາ​ເຄືອ​ຂ່າຍ​ທີ່​ສາ​ມາດ​ໃຊ້​ໄດ້​ໂດຍ​ອັດ​ຕະ​ໂນ​ມັດ​ພ້ອມ Wi-Fi Assistant."</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi‑Fi Assistant"</string>
-    <string name="wifi_assistant_title_message" msgid="6240721017579074015">"<xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> ຈະ​ຊ່ວຍ​ເຊື່ອມ​ຕໍ່​ເຂົ້າ​ກັບ Wi‑Fi ທີ່ແຮງ​ທີ່ສຸດ​ໂດຍ​ອັດຕະ​ໂນມັດ"</string>
-    <string name="wifi_assistant_open_app" msgid="4803044899535675063">"ເປີດແອັບຯ"</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>
@@ -592,7 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"ການຕັ້ງຄ່າ Wi​-Fi"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi​-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"ຕັ້ງຄ່າ &amp; ຈັດການຈຸດການເຂົ້າໃຊ້ລະບົບໄຮ້ສາຍ"</string>
-    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"ເລືອກ Wi-Fi"</string>
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"ເລືອກ​ເຄືອ​ຂ່າຍ Wi‑Fi"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"ເລືອກ Wi-Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"ກຳລັງເປີດ Wi-Fi..."</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"ກຳລັງປິດ Wi-Fi..."</string>
@@ -607,8 +602,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"ການສະແກນພ້ອມໃຊ້ຕະຫຼອດເວລາ"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"​ອະ​ນຸ​ຍາດ​ການ​ສະ​ແກນ​ທຸກ​ເທື່ອ"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"ໃຫ້​ບໍລິການ​ສະຖານທີ່​ຂອງ Google ແລະ​ແອັບຯ​ອື່ນໆ​ສະແກນ​ຫາ​ເຄືອ​ຂ່າຍ​ໄດ້, ເຖິງ​ແມ່ນ​ວ່າ Wi-Fi ຈະ​ປິດ​ກໍ​ຕາມ."</string>
-    <string name="wifi_automatically_manage_title" msgid="6249976570008992746">"ຈັດ​ການ Wi‑Fi ໂດຍ​ອັດ​ຕະ​ໂນ​ມັດ"</string>
-    <string name="wifi_automatically_manage_summary" msgid="6952470763378312488">"ໃຫ້ <xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> ຈັດ​ການ​ການ​ເຊື່ອມ​ຕໍ່ Wi‑Fi ຂອງ​ທ່ານ"</string>
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"ໃຊ້​ເປີດ Wi‑Fi ອັດ​ຕະ​ໂນ​ມັດ"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"ໃຫ້​ຕົວ​ຊ່ວຍ Wi‑Fi ເຊື່ອມ​ຕໍ່​ ເພື່ອ​ເປີດ​ເຄືອ​ຂ່າຍ​ທີ່​ໄດ້​ກຳ​ນົດ​ໃຫ້​ເປັນ​ຄຸນ​ນະ​ພາບ​ສູງ​ໂດຍ​ອັດ​ຕະ​ໂນ​ມັດ"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"ເລືອກ​ຕົວ​ຊ່ວຍ"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"ຕິດຕັ້ງໃບຮັບຮອງ"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"ເພື່ອປັບປຸງຄວາມຖືກຕ້ອງຂອງສະຖານທີ່ ແລະເພື່ອຈຸດປະສົງອື່ນໆ, Google ແລະແອັບຯອື່ນໆອາດສະແກນເຄືອຂ່າຍທີ່ຢູ່ໃກ້ຄຽງ ເຖິງແມ່ນວ່າ Wi-Fi ຈະປິດກໍຕາມ. ຫາກທ່ານບໍ່ຕ້ອງການໃຫ້ສະແກນ, ກະລຸນາໄປທີ່ເມນູ ຂັ້ນສູງ &gt; ການສະແກນພ້ອມໃຊ້ຕະຫຼອດເວລາ."</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"ແອັບຯຕ່າງໆອາດສະແກນຫາເຄືອຂ່າຍໃກ້ຄຽງ ເຖິງແມ່ນວ່າ Wi-Fi ຈະປິດກໍຕາມ. ຫາກທ່ານບໍ່ຕ້ອງການໃຫ້ສະແກນ, ກະລຸນາໄປທີ່ເມນູ ຂັ້ນສູງ &gt; ການສະແກນພ້ອມໃຊ້ຕະຫຼອດເວລາ."</string>
@@ -629,6 +625,7 @@
     <string name="wifi_menu_scan" msgid="1470911530412095868">"ສະແກນ"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"ໂຕເລືອກຂັ້ນສູງ"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"ເຊື່ອມຕໍ່ເຄືອຂ່າຍ"</string>
+    <string name="wifi_menu_remember" msgid="8814185749388713796">"​ຈື່​ເຄືອ​ຂ່າຍ​ໄວ້"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"ລືມເຄືອຂ່າຍ"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"ແກ້ໄຂເຄືອຂ່າຍ"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"ຂຽນ​ໃສ່​ແທັກ NFC"</string>
@@ -673,16 +670,18 @@
     <string name="wifi_unspecified" msgid="5431501214192991253">"(ບໍ່ໄດ້ລະບຸ)"</string>
     <string name="wifi_remembered" msgid="4955746899347821096">"ບັນ​ທຶກແລ້ວ"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"ປິດການນຳໃຊ້"</string>
-    <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"ຫຼີກເວັ້ນການເຊື່ອມທີ່ສັນຍານອ່ອນ"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"ການ​ຕັ້ງ​ຄ່າ IP ລົ້ມ​ເຫຼວ"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"​ການ​ເຊື່ອມ​ຕໍ່ WiFi ລົ້ມ​ເຫຼວ"</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"ບັນຫາການພິສູດຢືນຢັນ"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"ບໍ່ຢູ່ໃນໄລຍະທີ່ເຊື່ອມຕໍ່ໄດ້"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"​ບໍ່​ພົບ​ການ​ເຊື່ອມ​ຕໍ່​ອິນ​ເຕີ​ເນັດ​, ຈະ​ບໍ່​ຖືກ​ເຊື່ອມ​ຕໍ່​ໃໝ່​ໂດຍ​ອັດ​ຕະ​ໂນ​ມັດ."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"ສາມາດໃຊ້ WPS ໄດ້"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (ສາມາດໃຊ້ WPS ໄດ້)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"ໃສ່​ລະຫັດ​ເຄືອ​ຂ່າຍ​ຂອງ​ທ່ານ"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"ບໍ່ໃຊ້"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"ເພື່ອປັບປຸງຄວາມຖືກຕ້ອງຂອງສະຖານທີ່ ແລະເພື່ອຈຸດປະສົງອື່ນໆ, <xliff:g id="APP_NAME">%1$s</xliff:g> ຕ້ອງການເປີດນຳໃຊ້ການສະແກນເຄືອຂ່າຍ ເຖິງແມ່ນວ່າ Wi-Fi ຈະປິດກໍຕາມ.\n\nອະນຸຍາດການດຳເນີນການນີ້ ໃຫ້ກັບທຸກແອັບຯທີ່ຕ້ອງການສະແກນບໍ່?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"ເພື່ອ​ປິດ, ໃຫ້​ໄປ​ທີ່​ຫົວ​ຂໍ້​ຂັ້ນ​ສູງ ໃນ​ເມ​ນູ​ໂອ​ເວີ​ໂຟລ."</string>
-    <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"ອະ​ນຸ​ຍາດ"</string>
+    <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"ອະ​ນຸ​ຍາດ​"</string>
     <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"ປະ​ຕິ​ເສດ"</string>
     <string name="wifi_hotspot_title" msgid="7726205804813286950">"ເຂົ້າ​ສູ່​ລະ​ບົບ​ເພື່ອ​ເຊື່ອມ​ຕໍ່​ບໍ່?"</string>
     <string name="wifi_hotspot_message" msgid="3673833421453455747">"<xliff:g id="APP_NAME">%1$s</xliff:g> ຕ້ອງ​ການ​ໃຫ້​ທ່ານ​ເຂົ້າ​ສູ່​ລະ​ບົບ​ອອນ​ລາຍ​ກ່ອນ​ຈະ​ເຊື່ອມ​ຕໍ່​ຫາ​ເຄືອ​ຂ່າຍ."</string>
@@ -699,9 +698,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"ຄຳ​ເຕືອນ: ຫາກ​ທ່ານ​ຂ້າມ Wi‑Fi, ແທັບ​ເລັດຂອງ​ທ່ານ​ຈະ​ໃຊ້​ເພື່ອ​ການ​ເຊື່ອມ​ຕໍ່​ຜ່ານ​ມື​ຖື​ເພື່າອ​ດາວ​ໂຫລດ ແລະ​ອັບ​ເດດ. ເພື່ອ​ປ້ອງ​ກັນ​ການ​​ຮຽກ​ເກັບ​ຄ່າ​ບໍ​ລິ​ການ​​ອິນ​ເຕີ​ເນັດ, ກະ​ລຸ​ນາ​ເຊື່ອມ​ຕໍ່​ຫາ​ເຄືອ​ຂ່າຍ Wi‑Fi."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"ຄຳ​ເຕືອນ: ຫາກ​ທ່ານ​ຂ້າມ Wi‑Fi, ອຸ​ປະ​ກອນ​ຂອງ​ທ່ານ​ຈະ​ໃຊ້​ເພື່ອ​ການ​ເຊື່ອມ​ຕໍ່​ຜ່ານ​ມື​ຖື​ເພື່າອ​ດາວ​ໂຫລດ ແລະ​ອັບ​ເດດ. ເພື່ອ​ປ້ອງ​ກັນ​ການ​​ຮຽກ​ເກັບ​ຄ່າ​ບໍ​ລິ​ການ​​ອິນ​ເຕີ​ເນັດ, ກະ​ລຸ​ນາ​ເຊື່ອມ​ຕໍ່​ຫາ​ເຄືອ​ຂ່າຍ Wi‑Fi."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"ຄຳ​ເຕືອນ: ຫາກ​ທ່ານ​ຂ້າມ Wi‑Fi, ໂທ​ລະ​ສັບຂອງ​ທ່ານ​ຈະ​ໃຊ້​ເພື່ອ​ການ​ເຊື່ອມ​ຕໍ່​ຜ່ານ​ມື​ຖື​ເພື່າອ​ດາວ​ໂຫລດ ແລະ​ອັບ​ເດດ. ເພື່ອ​ປ້ອງ​ກັນ​ການ​​ຮຽກ​ເກັບ​ຄ່າ​ບໍ​ລິ​ການ​​ອິນ​ເຕີ​ເນັດ, ກະ​ລຸ​ນາ​ເຊື່ອມ​ຕໍ່​ຫາ​ເຄືອ​ຂ່າຍ Wi‑Fi."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="2393880108322835846">"ຄຳ​ເຕືອນ: ຫາກ​ທ່ານ​ຂ້າມ Wi‑Fi, ​ແທັບ​ເລັດຂອງ​ທ່ານ​ຈະ​ບໍ່​ມີ​ອິນ​ເຕີ​ເນັດ​ເພື່ອ​ໃຊ້​ໃນ​ການ​ດາວ​ໂຫລດ ຫຼື​ອັບ​ເດດ."</string>
-    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1707391993265558787">"ຄຳ​ເຕືອນ: ຫາກ​ທ່ານ​ຂ້າມ Wi‑Fi, ​ອຸ​ປະ​ກອນ​ຂອງ​ທ່ານ​ຈະ​ບໍ່​ມີ​ອິນ​ເຕີ​ເນັດ​ເພື່ອ​ໃຊ້​ໃນ​ການ​ດາວ​ໂຫລດ ຫຼື​ອັບ​ເດດ."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="1556858507920033022">"ຄຳ​ເຕືອນ: ຫາກ​ທ່ານ​ຂ້າມ Wi‑Fi, ​ໂທ​ລະ​ສັບຂອງ​ທ່ານ​ຈະ​ບໍ່​ມີ​ອິນ​ເຕີ​ເນັດ​ເພື່ອ​ໃຊ້​ໃນ​ການ​ດາວ​ໂຫລດ ຫຼື​ອັບ​ເດດ."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"ຖ້າ​ທ່ານ​ຂ້າມ Wi‑Fi ໄປ:\n\nແທັບ​ເລັດ​ຂອງ​ທ່ານ​ຈະ​ບໍ່​ມີ​ການ​ເຊື່ອມ​ຕໍ່​ອິນ​ເຕີ​ເນັດ.\n\n}ທ່ານ​ຈະ​ບໍ່​ເອົາ​ການ​ອັບ​ເດດ​ຊອບແວຣ​ໄດ້ ຈົນ​ກວ່າ​ທ່ານ​ເຊື່ອມ​ຕໍ່​ກັບ​ອິນ​ເຕີ​ເນັດ.\n\nທ່ານ​ບໍ່​ສາ​ມາດ​ເປີດ​ນຳ​ໃຊ້​ຄຸນສົມບັດການ​ປົກ​ປ້ອງ​ອຸ​ປະ​ກອນ​ຂອງ​ທ່ານ​ໄດ້​ໃນ​ເວ​ລາ​ນີ້."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"ຖ້າ​ທ່ານ​ຂ້າມ Wi‑Fi:\n\nອຸ​ປະ​ກອນ​ຂອງ​ທ່ານ​ຈະ​ບໍ່​ມີ​ການ​ເຊື່ອມ​ຕໍ່​ອິນ​ເຕີ​ເນັດ.\n\nທ່ານ​ຈະ​ບໍ່​ໄດ້​ຮັບ​ການ​ອັບ​ເດດ​ຊອບແວຣ ຈົນ​ກວ່າ​ທ່ານ​ເຊື່ອມ​ຕໍ່​ອິນ​ເຕີ​ເນັດ.\n\nທ່ານ​ບໍ່​ສາ​ມາດ​ເປີດ​ນຳໃຊ້​ຄຸນສົມບັດການ​ປົກ​ປ້ອງ​ອຸ​ປະ​ກອນ​ໄດ້​ໃນ​ເວ​ລາ​ນີ້."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"ຖ້າ​ທ່ານ​ຂ້າມ Wi‑Fi ໄປ:\n\nໂທ​ລະ​ສັບ​ຂອງ​ທ່ານ​ຈະ​ບໍ່​ມີ​ການ​ເຊື່ອມ​ຕໍ່​ອິນ​ເຕີ​ເນັດ.\n\nທ່ານ​ຈະ​ບໍ່​ເອົາ​ການ​ອັບ​ເດດ​ຊອບແວຣ​ໄດ້ ຈົນ​ກວ່າ​ທ່ານ​ເຊື່ອມ​ຕໍ່​ກັບ​ອິນ​ເຕີ​ເນັດ.\n\nທ່ານ​ບໍ່​ສາ​ມາດ​ເປີດ​ນຳ​ໃຊ້​ຄຸນສົມບັດການ​ປົກ​ປ້ອງ​ອຸ​ປະ​ກອນ​ຂອງ​ທ່ານ​ໄດ້​ໃນ​ເວ​ລາ​ນີ້."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"ແທັບເລັດບໍ່ສາມາດເຊື່ອມຕໍ່ກັບເຄືອຂ່າຍ Wi-Fi ນີ້ໄດ້."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"ອຸ​ປະ​ກອນບໍ່​ສາ​ມາດ​ເຊື່ອມ​ຕໍ່​ຫາ​ເຄືອ​ຂ່າຍ Wi-Fi ນີ້​ໄດ້."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"ໂທລະສັບບໍ່ສາມາດເຊື່ອມຕໍ່ກັບເຄືອຂ່າຍ Wi-Fi ນີ້ໄດ້."</string>
@@ -761,7 +760,6 @@
     <string name="ring_volume_title" msgid="7938706566797464165">"ລະດັບສຽງໂທເຂົ້າ"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"ສັ່ນເຕືອນເມື່ອປິດສຽງ"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"ສຽງແຈ້ງເຕືອນເລີ່ມຕົ້ນ"</string>
-    <string name="heads_up_enabled_title" msgid="1031078221910921622">"ສະແດງປັອບອັບ​ຖ້າຄວາມ​ສຳຄັນ​ສູງ"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"ຣິງໂທນ"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"ການແຈ້ງເຕືອນ"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"ໃຊ້ລະດັບສຽງໂທເຂົ້າເປັນສຽງແຈ້ງເຕືອນ"</string>
@@ -834,7 +832,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"ປັບຄວາມແຈ້ງອັດຕະໂນມັດ"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"ຍົກ​ເພື່ອ​ເປີດ​ໜ້າ​ຈໍ"</string>
     <string name="doze_title" msgid="2259176504273878294">"ການ​ສະ​ແດງ​ຜົນ​ສະ​ພາບ​ແວດ​ລ້ອມ"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"​ເປີດ​ໜ້າ​ຈໍ​ເມື່ອ​​ມີ​ການ​ຈ​ັບ​ອຸ​ປະ​ກອນ​ຂຶ້ນ​ມາ ຫຼື​ມີ​ການ​ແຈ້ງ​ເຕືອນ"</string>
+    <string name="doze_summary" msgid="7128970177894383698">"ປຸກ​ໜ້າ​ຈໍ ເມື່ອ​ທ່ານ​ເລືອກ​ອຸ​ປະ​ກອນ ຫຼື​ຮັບ​ການ​ແຈ້ງ​ເຕືອນ"</string>
     <string name="title_font_size" msgid="4405544325522105222">"ຂະໜາດໂຕອັກສອນ"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"ຂະໜາດໂຕອັກສອນ"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"ການຕັ້ງຄ່າການລັອກ SIM card"</string>
@@ -862,6 +860,10 @@
     <string name="sim_enter_cancel" msgid="6240422158517208036">"ຍົກເລີກ"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"ພົບຫຼາຍ SIM"</string>
     <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>
+    <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>
@@ -1012,6 +1014,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"ນີ້ຈະເປັນການລຶບຂໍ້ມູນທັງໝົດຈາກ "<b>"ໜ່ວຍຄວາມຈຳພາຍໃນ"</b>" ຂອງແທັບເລັດທ່ານ, ຮວມເຖິງ:\n\n"<li>"ບັນຊີ Google ຂອງທ່ານ"</li>\n<li>"ຂໍ້ມູນລະບົບ ແລະແອັບພລິເຄຊັນ ແລະການຕັ້ງຄ່າ"</li>\n<li>"ແອັບຯທີ່ດາວໂຫລດມາ"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"ນີ້ຈະເປັນການລຶບຂໍ້ມູນທັງໝົດໃນ "<b>"ໜ່ວຍຄວາມຈຳພາຍໃນ"</b>" ຂອງໂທລະສັບທ່ານ ຮວມເຖິງ:\n\n"<li>"ບັນຊີ Google ຂອງທ່ານ"</li>\n<li>"ຂໍ້ມູນລະບົບ ແລະແອັບພລິເຄຊັນ ຮວມທັງການຕັ້ງຄ່າຕ່າງໆ"</li>\n<li>"ແອັບພລິເຄຊັນທີ່ດາວໂຫລດມາ"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"ປັດຈຸບັນທ່ານກຳລັງເຂົ້າສູ່ລະບົບບັນຊີຕໍ່ໄປນີ້:\n"</string>
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"ມີ​ຜູ້​ໃຊ້​ອື່ນ​ຢູ່​ເທິງ​ອຸ​ປະ​ກອນ​ນີ້.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"ເພງ"</li>\n<li>"ຮູບພາບ"</li>\n<li>"ຂໍ້ມູນຜູ່ໃຊ້ອື່ນໆ"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"ເພື່ອລຶບເພງ, ຮູບພາບ ແລະຂໍ້ມູນຜູ່ໃຊ້ອື່ນໆ, ຈະຕ້ອງລຶບ "<b>"ບ່ອນຈັດເກັບຂໍ້ມູນ USB"</b>" ອອກນຳ."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"ເພື່ອລຶບເພງ, ຮູບພາບ ແລະຂໍ້ມູນຜູ່ໃຊ້ອື່ນໆ, ຈະຕ້ອງລຶບ "<b>"SD card"</b>" ອອກນຳ."</string>
@@ -1023,7 +1026,6 @@
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"ຣີເຊັດໂທລະສັບ"</string>
     <string name="master_clear_final_desc" msgid="7209547812233487345">"ຕ້ອງ​ການ​ລຶບ​ຂໍ້​ມູນ​ສ່ວນ​ໂຕ ແລະ​ແອັບຯ​ທີ່​ດາວ​ໂຫລດ​ມາ​ທັງໝົດ​ບໍ່? ທ່ານ​ຈະ​ບໍ່​ສາມາດ​ເອົາ​ກັບ​ຄືນ​ມາ​ໄດ້​ອີກ!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"ລຶບທຸກສິ່ງທຸກຢ່າງ"</string>
-    <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"ແຕ້ມຮູບແບບການປົດລັອກຂອງທ່ານ"</string>
     <string name="master_clear_gesture_explanation" msgid="826193821455182780">"ທ່ານຕ້ອງແຕ້ມລະຫັດປົດລັອກຂອງທ່ານ ເພື່ອຢືນຢັນການຣີເຊັດຄ່າຈາກໂຮງງານ."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"ບໍ່ໄດ້ດຳເນີນການຣີເຊັດເທື່ອ ເນື່ອງຈາກບໍລິການ System Clear ບໍ່ສາມາດເຮັດວຽກໄດ້."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"ຕ້ອງການຣີເຊັດບໍ່?"</string>
@@ -1041,7 +1043,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"ລຶບບ່ອນຈັດເກັບຂໍ້ມູນ USB, ຕ້ອງການລຶບໄຟລ໌ທັງໝົດທີ່ຈັດເກັບໃນນັ້ນບໍ່? ທ່ານຈະບໍ່ສາມາດເອົາກັບຄືນມາໄດ້ອີກ!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"ລຶບຂໍ້ມູນໃນ SD card, ລຶບທຸກໄຟລ໌ທີ່ເກັບໄວ້ໃນນັ້ນບໍ່? ທ່ານຈະບໍ່ສາມາດຍົກເລີກການກະທຳນີ້ໄດ້!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"ລຶບທຸກສິ່ງທຸກຢ່າງ"</string>
-    <string name="media_format_gesture_prompt" msgid="3109349468816856670">"ແຕ້ມຮູບແບບປົດລັອກຂອງທ່ານ"</string>
     <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"ທ່ານຕ້ອງແຕ້ມຮູບແບບປົດລັອກຂອງທ່ານ ເພື່ອຢືນຢັນວ່າທ່ານຕ້ອງການລຶບບ່ອນຈັດເກັບຂໍ້ມູນ USB."</string>
     <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"ທ່ານຕ້ອງແຕ້ມຮູບແບບປົດລັອກຂອງທ່ານ ເພື່ອຢືນຢັນວ່າທ່ານຕ້ອງການລຶບ SD card."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"ຕັ້ງຄ່າການໂທ"</string>
@@ -1087,6 +1088,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"ກະ​ລຸ​ນາ​ໃສ່​ຊິມກາດ ​ແລະເປີດເຄື່ອງຄືນໃໝ່"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"ກະ​ລຸ​ນາ​ເຊື່ອມ​ຕໍ່​ກັບ​ອິນ​ເຕີ​ເນັດ"</string>
     <string name="location_title" msgid="1029961368397484576">"ທີ່ຢູ່ຂອງຂ້ອຍ"</string>
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"​ໂປຣ​ໄຟລ໌​ບ່ອນ​ເຮັດ​ວຽກ"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"ຈຸດ​ທີ່​ຕັ້ງ​ສຳ​ລັບ​ໂປ​ຣ​ໄຟ​ລ໌​ບ່ອນ​ເຮັດ​ວຽກ​"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"ປິດ​ໂດຍ​ບໍ​ລິ​ສັດ​ຂອງ​ທ່ານ"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"ໂຫມດ"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"ຄວາມຖືກຕ້ອງສູງ"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"ປະຢັດໄຟ"</string>
@@ -1124,6 +1128,7 @@
     <string name="copyright_title" msgid="865906688917260647">"ສະຫງວນລິຂະສິດ"</string>
     <string name="license_title" msgid="1990487604356037871">"ລິຂະສິດ"</string>
     <string name="terms_title" msgid="7697580845616764642">"ຂໍ້ກຳນົດ ແລະເງື່ອນໄຂ"</string>
+    <string name="webview_license_title" msgid="2813507464175738967">"ໃບ​ອະ​ນຸ​ຍາດ WebView ຂອງ​ລະ​ບົບ"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"ພາບພື້ນຫຼັງ"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"ຜູ່​ສະ​ໜອງ​ພາບ​ຖ່າຍ​ດາວ​ທຽມ:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"ລິຂະສິດໂອເພນຊອດ"</string>
@@ -1237,7 +1242,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"ບ່ອນຈັດເກັບຂໍ້ມູນ USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"ໃນ SD card"</string>
     <string name="disabled" msgid="9206776641295849915">"ປິດການນຳໃຊ້"</string>
-    <string name="not_installed" msgid="1475144352069281880">"ບໍ່ໄດ້ຕິດຕັ້ງ"</string>
+    <string name="not_installed" msgid="2797554494953450291">"ບໍ່ໄດ້​ຕິດຕັ້ງ​ສຳລັບ​ຜູ່ໃຊ້ນີ້"</string>
     <string name="no_applications" msgid="7336588977497084921">"ບໍ່ມີແອັບຯ."</string>
     <string name="internal_storage" msgid="1584700623164275282">"ພື້ນທີ່ຈັດເກັບຂໍ້ມູນພາຍໃນ"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"ບ່ອນເກັບຂໍ້ມູນ USB"</string>
@@ -1434,8 +1439,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"ໜ້າຈໍຈະບໍ່ປິດໃນຂະນະທີ່ສາກໄຟຢູ່"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"ເປີດໃຊ້ງານການຊອດແນມ Bluetooth HCI"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"ເກັບກຳທຸກແພັກເກັດໃນໄຟລ໌ bluetooth HCI"</string>
-    <string name="oem_unlock_enable" msgid="6629321276287913315">"ເປີດ​ໃຊ້​ການ​ປົດ​ລັອກ OEM"</string>
-    <string name="oem_unlock_enable_summary" msgid="3546686263996628110">"ອະນຸຍາດ​ໃຫ້​ອຸປະກອນ​ສາມາດ​ປົດ​ລັອກ OEM ໄດ້"</string>
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"ການ​ປົດ​ລັອກ OEM"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"ອະ​ນຸ​ຍາດ​ໃຫ້​ປົດ​ລັອກ​ບູດ​ໂຫຼດ​ເດີ"</string>
+    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"​ປ້ອນ​ລະ​ຫັດ​ PIN ຂອງ​ທ່ານ"</string>
+    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"​ປ້ອນ​ລະ​ຫັດ PIN ​ຂອງ​ອຸ​ປະ​ກອນ​ຂອງ​ທ່ານ​ເພື່ອ​ເປີດ​ນຳ​ໃຊ້​ການ​ປົດ​ລັອກ OEM"</string>
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"ອະ​ນຸ​ຍາດ​ການ​ປົກ​ລັອກ OEM ບໍ?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"ຄຳ​ເຕືອນ: ຄຸນ​ສົມ​ບັດ​ປົກ​ປ້ອງ​ອຸ​ປະ​ກອນ​ຈະ​ບໍ່​ເຮັດ​ວຽກຢູ່​ໃນ​ອຸ​ປະ​ກອນ​ນີ້ ໃນ​ຂະ​ນະ​ທີ່​ການ​ຕັ້ງ​ຄ່ານີ້​ເປີດ​ຢູ່."</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"ສະແດງການຮັບຮອງຂອງລະບົບໄຮ້ສາຍ"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"​ເປີດ​ນຳ​ໃຊ້ການ​ເກັບ​ປະ​ຫວັດ​ Verbose Wi‑Fi"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"ໃຫ້​ບຸລິມະສິດ​ການ​ປ່ຽນ​ຈາກ Wi-Fi ເປັນ​ເຄືອ​​ຂ່າຍ​ໂທ​ລະ​ສັບ"</string>
@@ -1538,6 +1547,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"ຄຳບັນຍາຍຈະເປັນແບບນີ້"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"ຄ່າເລີ່ມຕົ້ນ"</string>
+    <string name="color_title" msgid="4258931051732243983">"ສີ"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"ຄ່າເລີ່ມຕົ້ນ"</string>
     <string name="color_none" msgid="3475640044925814795">"ບໍ່ມີ"</string>
     <string name="color_white" msgid="8045195170201590239">"ຂາວ"</string>
@@ -1581,7 +1591,7 @@
     <string name="print_print_jobs" msgid="3582094777756968793">"ວຽກ​ພິມ"</string>
     <string name="print_print_job" msgid="7563741676053287211">"ວຽກ​ພິມ"</string>
     <string name="print_restart" msgid="8373999687329384202">"ປິດເປີດໃໝ່"</string>
-    <string name="print_cancel" msgid="3621199386568672235">"ຍົກ​ເລີກ"</string>
+    <string name="print_cancel" msgid="3621199386568672235">"ຍົກ​ເລີກ​"</string>
     <string name="print_job_summary" msgid="8472427347192930694">"<xliff:g id="PRINTER">%1$s</xliff:g>\n<xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="print_printing_state_title_template" msgid="5736107667714582025">"ກຳລັງພິມ <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
     <string name="print_cancelling_state_title_template" msgid="7102968925358219875">"ກຳລັງຍົກເລີກ <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
@@ -1595,12 +1605,12 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"ເຫຼືອອີກ <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> ​ກ່ອນ​ຈະ​ເຕັມ"</string>
-    <string name="power_discharging_duration" msgid="7125493014448497620">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - ຍັງ​ເຫຼືອ​ປະ​ມານ <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="power_charging" msgid="712751285832976915">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="STATE">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration" msgid="4802183864773082009">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - ອີກ <xliff:g id="TIME">%2$s</xliff:g> ຈຶ່ງ​ຈະ​ເຕັມ"</string>
-    <string name="power_charging_duration_ac" msgid="3611179931297824699">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - ອີກ <xliff:g id="TIME">%2$s</xliff:g> ຈຶ່ງ​ຈະ​ເຕັມ​ຜ່ານ​ປລັກ​ໄຟ AC"</string>
-    <string name="power_charging_duration_usb" msgid="1106605348913397583">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - ອີກ <xliff:g id="TIME">%2$s</xliff:g> ຈຶ່ງ​ຈະ​ເຕັມ​ຜ່ານ USB"</string>
-    <string name="power_charging_duration_wireless" msgid="633606920144617227">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - ອີກ <xliff:g id="TIME">%2$s</xliff:g> ຈຶ່ງ​ຈະ​ເຕັມ​ຈາກ​ລະ​ບົບ​ໄຮ້​ສາຍ"</string>
+    <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> - ​ເຫຼືອປະ​ມານ <xliff:g id="TIME">%2$s</xliff:g>"</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> ຈຶ່ງ​ຈະ​ເຕັມ"</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> ​ຈຶ່ງ​ຈະ​ເຕັມ​ໂດຍສາກ​ດ້ວຍ​ໄຟ AC"</string>
+    <string name="power_charging_duration_usb" msgid="182405645340976546">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> ຈຶ່ງ​ຈະ​ເຕັມ​ໂດຍສາກ​ດ້ວຍ USB"</string>
+    <string name="power_charging_duration_wireless" msgid="1829295708243159464">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> ​ຈຶ່ງ​ຈະ​ເຕັມ​ໂດຍ​ສາກ​ແບບ​ໄຮ້​ສາຍ"</string>
     <string name="power_usage_list_summary" msgid="2409288197839512482">"​ໃຊ້​ຕັ້ງ​ແຕ່​ການ​ສາກ​ໄຟ​ເຕັມ​ເທື່ອ​ສຸດ​ທ້າຍ"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"ການນຳໃຊ້ແບັດເຕີຣີຕັ້ງແຕ່ຖອດສາຍສາກ"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"ການໃຊ້ແບັດເຕີຣີນັບຈາກການຣີເຊັດ"</string>
@@ -1617,7 +1627,6 @@
     <string name="awake" msgid="387122265874485088">"ເວລາການເຮັດວຽກຂອງອຸປະກອນ"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"ເວລາເປີດໃຊ້ Wi-Fi"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"ໄລຍະເວລາການໃຊ້ Wi-Fi"</string>
-    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"ລາຍລະອຽດປະຫວັດການນຳໃຊ້"</string>
     <string name="details_title" msgid="3792801565213935385">"ໃຊ້ລາຍລະອຽດ"</string>
     <string name="details_subtitle" msgid="32593908269911734">"ໃຊ້ລາຍລະອຽດ"</string>
@@ -1689,7 +1698,7 @@
     <string name="battery_saver" msgid="1426682272004907982">"ປະຢັດ​ແບັດເຕີຣີ"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"ເປີດ​ໃຊ້​ອັດ​ຕະ​ໂນ​ມັດ"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"ບໍ່​ມີ​ປິດ"</string>
-    <string name="battery_saver_turn_on_automatically_pct" msgid="3033681629861428940">"ທີ່ແບັດເຕີຣີ %1$d%%"</string>
+    <string name="battery_saver_turn_on_automatically_pct" msgid="7536784431655058267">"ເມື່ອ​ແບັດ​ເຕີ​ຣີເຫຼືອ %1$s"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"ສະຖິຕິໂປຣເຊສ"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"ສະຖານະ Geeky ກ່ຽວກັບໂປຣເຊສທີ່ກຳລັງເຮັດວຽກຢູ່"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"ໜ່ວຍຄວາມຈຳທີ່ໃຊ້"</string>
@@ -1813,7 +1822,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"ໃຊ້ຮາດແວ"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"ຊອບແວເທົ່ານັ້ນ"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"ບໍ່​ມີຂໍ້​ມູນ​​ຮັບ​ຮອງ​ໂຕສຳ​ລັບ​ຜູ່​ໃຊ້​ນີ້"</string>
-    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"ແຕ້ມຮູບແບບປົດລັອກຂອງທ່ານ"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"ທ່ານຕ້ອງແຕ້ມຮູບແບບປົດລັອກຂອງທ່ານ ເພື່ອຢືນຢັນການຕິດຕັ້ງຂໍ້ມູນຮັບຮອງ."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"ພິມລະຫັດຜ່ານຂອງບ່ອນຈັດເກັບຂໍ້ມູນຮັບຮອງ."</string>
@@ -1843,6 +1851,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"​ຮວມ​ຂໍ້​ມູນ​ແອັບຯ"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"ການກູ້ຂໍ້ມູນອັດຕະໂນມັດ"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"ເມື່ອຕິດຕັ້ງແອັບຯໃດນຶ່ງຄືນໃໝ່, ໃຫ້ໃຊ້ການຕັ້ງຄ່າ ແລະຂໍ້ມູນທີ່ເຄີຍສຳຮອງໄວ້"</string>
+    <string name="backup_inactive_title" msgid="5355557151569037197">"ການ​ບໍ​ລິ​ການ​ສຳຮອງຂໍ້ມູນ​ບໍ່ເປີດໃຊ້."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"ອັນ​ນີ້​ຖືກ​ຕັ້ງ​ໂດຍ​ນະ​ໂຍ​ບາຍ​ຂອງອຸ​ປະ​ກອນ​ຂອງ​ທ່ານ."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"ລະຫັດຜ່ານການສຳຮອງຂໍ້ມູນເດັກສະທັອບ"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"ການ​ສຳຮອງ​ຂໍ້ມູນ​ເຕັມຮູບແບບ​ໃນ​ເດັກສະທັອບ​ຍັງ​ບໍ່​ໄດ້​ຮັບ​ການ​ປ້ອງກັນ​ໃນ​ເວລາ​ນີ້"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"ແຕະເພື່ອປ່ຽນ ຫຼືລຶບລະຫັດຂອງການສຳຮອງຂໍ້ມູນເຕັມຮູບແບບໃນເດັກສະທັອບ"</string>
@@ -1952,7 +1962,11 @@
     <string name="enter_password" msgid="8035706727471334122">"ເພີ່ມ​ເລີ່ມ​ຕົ້ນ​ໃຊ້ Android, ໃຫ້​ໃສ່​ລະ​ຫັດ​ຜ່ານ​ຂອງ​ທ່ານ"</string>
     <string name="enter_pin" msgid="5305333588093263790">"ເພີ່ມ​ເລີ່ມ​ຕົ້ນ​ໃຊ້ Android, ໃຫ້​​ໃສ່​ລະ​ຫັດ PIN ຂອງ​ທ່ານ"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"ເພີ່ມ​ເລີ່ມ​ຕົ້ນ​ໃຊ້ Android, ໃຫ້​ແຕ້ມ​ຮູບ​ແບບ​ປົດ​ລອກ​ຂອງ​ທ່ານ"</string>
-    <string name="try_again" msgid="4272075051293936921">"ລອງໃໝ່ອີກຄັ້ງ."</string>
+    <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"ຮູບແບບປົດ​ລັອກ​ບໍ່​ຖືກ​ຕ້ອງ"</string>
+    <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"ລະຫັດຜ່ານ​ບໍ່ຖືກຕ້ອງ"</string>
+    <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"ລະຫັດ PIN ​ບໍ່​ຖືກ​ຕ້ອງ"</string>
+    <string name="checking_decryption" msgid="8287458611802609493">"ກຳລັງກວດສອບ..."</string>
+    <string name="starting_android" msgid="8581493237458496835">"​ກຳ​ລັງ​ເລີ່ມ​ລະ​ບົບ Android"</string>
     <string name="delete" msgid="4219243412325163003">"ລຶບ"</string>
     <string name="misc_files" msgid="6720680815969643497">"ໄຟລ໌ອື່ນໆ"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"ເລືອກແລ້ວ <xliff:g id="NUMBER">%1$d</xliff:g> ຈາກທັງໝົດ <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -1990,8 +2004,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"ໃຊ້ GPU ໃນການວາງອົງປະກອບໜ້າຈໍສະເໝີ"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"ຈຳລອງ color space"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"ເປີດການໃຊ້ຮ່ອງຮອຍໃນ OpenGL"</string>
-    <string name="use_nuplayer" msgid="5699257393367904387">"​ໃຊ້ NuPlayer (ທົດ​ລອງ)"</string>
-    <string name="use_nuplayer_summary" msgid="1991479067478516714">"​ໃຊ້ NuPlayer ແທນ AwesomePlayer"</string>
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"ໃຊ້ AwesomePlayer (ບໍ່​ເຫັນ​ດີ)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"ໃຊ້ AwesomePlayer ແທນ NuPlayer ສຳ​ລັບ​ການ​ຫຼິ້ນ​ມີ​ເດຍ​ຄືນ​ສ່ວນ​ໃຫຍ່"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"ປິດ​ການ​ນຳ​ໃຊ້​ເສັ້ນ​ທາງ​ສຽງ USB"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"ປິດ​​ການ​ນຳ​ໃຊ້​ເສັ້ນ​ທາງ​​ອັດ​ຕະ​ໂນ​ມັດ​ໄປ​ຫາອຸ​ປະ​ກອ​ນ​ຕໍ່​ພ່ວງ​ສຽງ​ USB"</string>
     <string name="debug_layout" msgid="5981361776594526155">"ສະແດງຂອບການຈັດວາງ"</string>
@@ -2098,7 +2112,7 @@
     <string name="data_usage_metered_title" msgid="7383175371006596441">"ການ​ຈຳ​ກັດ​ເຄືອ​ຂ່າຍ"</string>
     <string name="data_usage_metered_body" msgid="3262343834446126044">"​ເຄືອ​ຂ່າຍ​ທີ່​ຖືກ​ນັບ​ຂໍ້​ມູນ​ຈະ​ຖືກ​ປະ​ຕິ​ບັດ​ເຊັ່ນ​ດຽວ​ກັບ​ເຄືອ​ຂ່າຍມ​ື​ຖື​ໃນ​ເວ​ລາ​ທີ່​ຂໍ້​ມູນ​ພື້ນຫຼັງ​ຖືກ​ຈຳ​ກັດ. ແອັບຯ​ຕ່າງໆ​ອາດ​​ເຕືອນ​ກ່ອນ​ນຳ​ໃຊ້​ເຄືອ​ຂ່າຍ​ເຫຼົ່າ​ນີ້​ສຳ​ລັບ​ການ​ດາວ​ໂຫລດ​ໄຟລ໌​ຂະ​ໜາດ​ໃຫຍ່."</string>
     <string name="data_usage_metered_mobile" msgid="2326986339431119372">"ເຄືອ​ຂ່າຍ​ມື​ຖື"</string>
-    <string name="data_usage_metered_wifi" msgid="1761738002328299714">"​ເຄືອ​ຂ່າຍ​ Wi-Fi ທີ່​ຖືກ​ນັບ​ຂໍ້​ມູນ"</string>
+    <string name="data_usage_metered_wifi" msgid="1761738002328299714">"​ເຄືອ​ຂ່າຍ​ Wi-Fi ທີ່​ຖືກ​ນັບ​ຂໍ້​ມູນ​"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"ເພື່ອ​ເລືອກ​ເຄືອ​ຂ່າຍ​ທີ່​ຖືກ​ນັບ​ຂໍ້​ມູນ​, ໃຫ້​ເປີດ​ໃຊ້ Wi‑Fi ກ່ອນ."</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"​ການ​ນັບ​ຈ​ຳ​ນວນ​ຂໍ້​ມູນ​ທີ່​ໃຊ້​ຂອງ​ຜູ່​ໃຫ້​ບໍ​ລິ​ການ​ອາດ​ແຕກ​ຕ່າງ​ຈາກ​​ທີ່ອຸ​ປະ​ກອນ​ຂອງ​ທ່ານນັບ."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"ການໂທສຸກເສີນ"</string>
@@ -2167,7 +2181,6 @@
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"ເພີ່ມ​ຜູ່​ໃຊ້ ຫຼື​ໂປຣ​ໄຟລ໌"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"ເພີ່ມຜູ່ໃຊ້"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"ໂປຣໄຟລ໌ທີ່ຖືກຈຳກັດ"</string>
-    <string name="user_summary_managed_profile" msgid="7369539529693048111">"​ໂປຣ​ໄຟລ໌​ບ່ອນ​ເຮັດ​ວຽກ"</string>
     <string name="user_need_lock_message" msgid="2596365678651842785">"ກ່ອນທ່ານຈະສ້າງໂປຣໄຟລ໌ທີ່ຖືກຈຳກັດນັ້ນ, ທ່ານຈະຕ້ອງຕັ້ງຄ່າການລັອກໜ້າຈໍ ເພື່ອປ້ອງກັນແອັບຯ ແລະຂໍ້ມູນສ່ວນໂຕຂອງທ່ານກ່ອນ."</string>
     <string name="user_set_lock_button" msgid="8311219392856626841">"ຕັ້ງການລັອກ"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"ບໍ່ໄດ້ຕັ້ງຄ່າ"</string>
@@ -2212,7 +2225,7 @@
     <string name="user_exit_guest_title" msgid="5613997155527410675">"​ລຶບ​ແຂກ"</string>
     <string name="user_exit_guest_confirm_title" msgid="3405527634738147409">"ລຶບ​ແຂກ?"</string>
     <string name="user_exit_guest_confirm_message" msgid="2194459201944413257">"​ແອັບຯ​ແລະ​ຂໍ້​ມູນ​ທັງ​ໝົດ​ໃນ​ເຊດ​ຊັນ​ນີ້​ຈະ​ຖືກ​ລຶບ​ອອກ."</string>
-    <string name="user_exit_guest_dialog_remove" msgid="6351370829952745350">"ລຶບ"</string>
+    <string name="user_exit_guest_dialog_remove" msgid="6351370829952745350">"ລຶບ​"</string>
     <string name="user_enable_calling" msgid="8310589470979488255">"ອະ​ນຸ​ຍາດ​ໃຫ້​ໂທ​ລະ​ສັບ"</string>
     <string name="user_enable_calling_sms" msgid="794823380737672333">"ອະ​ນ​ຸ​ຍາດ​ໃຫ້​ໂທ​ລະ​ສັບ​ແລະ​ສົ່ງ SMS"</string>
     <string name="user_remove_user" msgid="6490483480937295389">"​ລຶບ​ຜູ່​ໃຊ້"</string>
@@ -2298,11 +2311,13 @@
     <string name="sim_cellular_data_unavailable_summary" msgid="3654805961942166428">"ແຕະ​ເພື່ອ​ເລືອກ SIM ຂໍ້​ມູນ"</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"ໃຊ້​ອັນ​ນີ້​ທຸກ​ເທື່ອ​ເພື່ອ​ໂທ"</string>
     <string name="select_sim_for_data" msgid="2366081042162853044">"​ເລືອກ​ຊິມ​ທີ່​ໃຊ້​ສຳ​ລັບ​ຂໍ້​ມູນ"</string>
+    <string name="data_switch_started" msgid="2040761479817166311">"ກຳ​ລັງ​ສະ​ຫຼັບ​ SIM ຂໍ້​ມູນ, ອັນ​ນີ້​ອາດ​ຈະ​ໃຊ້​ເວ​ລາ​ເປັນ​ນາ​ທີ..."</string>
     <string name="select_sim_for_calls" msgid="3503094771801109334">"ໂທ​ດ້ວຍ"</string>
     <string name="sim_select_card" msgid="211285163525563293">"ເລືອກ SIM ກາດ"</string>
     <string name="sim_card_number_title" msgid="7845379943474336488">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"SIM ຫວ່າງເປົ່າ"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"ຊື່ SIM"</string>
+    <string name="sim_name_hint" msgid="7038643345238968930">"ປ້ອນ​ຊື່ SIM ເຂົ້​າ​ໄປ"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"ຊ່ອງ​ຊິມ %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"​ຜູ່​ໃຫ້​ບໍ​ລິ​ການ"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"ໝາຍເລກ"</string>
@@ -2312,7 +2327,6 @@
     <string name="color_purple" msgid="3888532466427762504">"ສີມ່ວງ"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"ບໍ່​ໄດ້​ໃສ່ SIM ກາດ"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"ສະ​ຖາ​ນະ SIM"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"ຂໍ້​ມູນ​ທີ່​ກ່ຽວ​ຂ້ອງ​ກັບ SIM"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"ໂທ​ກັບ​ຈາກ SIM ເລີ່ມ​ຕົ້ນ"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"SIM ສຳ​ລັບ​ການ​ໂທ​ອອກ"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"ການຕັ້ງຄ່າການໂທອື່ນໆ"</string>
@@ -2320,8 +2334,11 @@
     <string name="preferred_network_offload_header" msgid="2321173571529106767">"ປິດ​ການ​ນຳ​ໃຊ້ Network Name Broadcast"</string>
     <string name="preferred_network_offload_footer" msgid="5857279426054744020">"ປິດ​ການ​ນຳ​ໃຊ້ Network Name Broadcast ​ເພື່ອ​ປ້ອງ​ກັນ​ບໍ່​ໃຫ້​ພາກ​ສ່ວນ​ທີ​ສາມ​ເຂົ້າ​ເຖິງ​ຂໍ້​ມູນ​ເຄືອ​ຂ່າຍ​ຂອງ​ທ່ານ​ໄດ້."</string>
     <string name="preferred_network_offload_popup" msgid="2252915199889604600">"ການ​ປິດ​ການ​ນຳ​ໃຊ້ Network Name Broadcast ຈະ​ເປັນ​ການ​ປ້ອງ​ກັນ​ການ​ເຊື່ອມ​ຕໍ່​ອັດ​ຕະ​ໂນ​ມັດ​ໄປ​ຫາ​ເຄືອ​ຂ່າຍ​ທີ່​​ເຊື່ອງ​ໂຕ​ເອງ​ໄວ້."</string>
+    <string name="sim_signal_strength" msgid="9144010043784767984">"<xliff:g id="DBM">%1$d</xliff:g> dBm <xliff:g id="ASU">%2$d</xliff:g> asu"</string>
+    <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>
+    <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>
@@ -2330,31 +2347,31 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"ການ​​ຊອກ​ຫາ​​ທີ່​ຜ່ານ​ມາ"</string>
     <string name="search_results_label" msgid="4163304782363526148">"ຜົນ​ການ​ຊອກ​ຫາ"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi network connection"</string>
-    <string name="keywords_more_default_sms_app" msgid="2744404159003574745">"ຂໍ້ຄວາມ"</string>
-    <string name="keywords_more_mobile_networks" msgid="7813380887358745769">"ມືຖື ຜູ່ໃຫ້ບໍລິການ ລະບົບໄຮ້ສາຍ"</string>
+    <string name="keywords_more_default_sms_app" msgid="895656981962034647">"​ຂໍ້​ຄວາມ ການ​ສົ່ງ​ຂໍ້​ຄວາມ"</string>
+    <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"ເຄືອ​ຂ່າຍ​ໂທ​ລະ​ສັບ ເຄືອ​ຂ່າຍ ຜູ່​ໃຫ້​ບໍ​ລິ​ການ ໄຮ້​ສາຍ ຂໍ້​ມູນ 4g 3g 2g lte"</string>
     <string name="keywords_home" msgid="3626170808219458848">"​ລອນ​ເຊີ"</string>
     <string name="keywords_display" msgid="6709007669501628320">"ໜ້າຈໍ ໜ້າຈໍສຳຜັດ"</string>
-    <string name="keywords_display_brightness_level" msgid="8636451602230815191">"ຫຼຸດແສງໜ້າຈໍ ໜ້າຈໍ ໜ້າຈໍສຳຜັດ"</string>
-    <string name="keywords_display_auto_brightness" msgid="8070218600502753102">"ຫຼຸດແສງໜ້າຈໍ ໜ້າຈໍ ໜ້າຈໍສຳຜັດ"</string>
-    <string name="keywords_display_wallpaper" msgid="4315466287469834939">"ພື້ນຫຼັງ"</string>
+    <string name="keywords_display_brightness_level" msgid="8923289340474728990">"​ຄ່ອຍ​ແສງ​ໜ້າ​ຈໍ ໜ້າ​ຈໍ​ແຕະ ແບັດ​ເຕີ​ຣີ"</string>
+    <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"​ຄ່ອຍ​ແສງ​ໜ້າ​ຈໍ ໜ້າ​ຈໍ​ແຕະ ແບັດ​ເຕີ​ຣີ"</string>
+    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"​ພາບ​ພື້ນຫຼັງ ປັບ​ແຕ່ງ​ສ່ວນ​ຕົວ ປັບ​ແຕ່ງ ການ​ສະ​ແດງ​ຜົນ"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"ຂະ​ໜາດ​ໂຕ​ອັກ​ສອນ"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"ໂປຣເຈັກ"</string>
-    <string name="keywords_storage" msgid="7007275853993419928">"ເນື້ອທີ່ຫວ່າງ ຮາດໄດຣຟ໌"</string>
-    <string name="keywords_battery" msgid="3992479295298655138">"ພະລັງງານ"</string>
-    <string name="keywords_spell_checker" msgid="4509482591225399210">"ການສະກົດຄຳ"</string>
+    <string name="keywords_storage" msgid="6572905220031852173">"​ພື້ນ​ທີ່​ວ່າງ ດິສ ບ່ອນ​ເກັບ​ຂໍ້​ມູນ ອຸ​ປະ​ກອນ ນຳ​ໃຊ້"</string>
+    <string name="keywords_battery" msgid="2096185085932675704">"ການ​ໃຊ້​ ພະ​ລັງ​ງານ ສາກໄຟ"</string>
+    <string name="keywords_spell_checker" msgid="6106749039734174140">"​ການ​ສະ​ກົດ​ຄຳ ວັດ​ຈະ​ນາ​ນຸ​ກົມ ການກວດ​ການ​ສະ​ກົດ ການ​ແກ້​ໄຂ​ຄຳ​ຜິດ​ອັດ​ຕະ​ໂນ​ມັດ"</string>
     <string name="keywords_voice_input" msgid="3519547605812413860">"ໂຕ​ຈຳ​ແນກ ​​ການ​ປ້ອນ​ຂໍ້​ມູນ​ເຂົ້າ ກາ​ນ​ເວົ້າ ເວົ້າ ພາ​ສາ ແຮນ​ຟຣີ ການ​ຈຳ​ແນກ ຄຳ​ບໍ່​ສຸ​ພາບ ສຽງ  bluetooth ຊຸດ​ຫ​ູ​ຟັງ"</string>
-    <string name="keywords_text_to_speech_output" msgid="8207889472282225512">"ອັນດັບ ພາສາ ຄ່າເລີ່ມຕົ້ນ ເວົ້າ ການເວົ້າ"</string>
-    <string name="keywords_date_and_time" msgid="7666950126499155141">"ໂມງ"</string>
-    <string name="keywords_factory_data_reset" msgid="3693730656843989732">"ລຶບລ້າງ ລຶບ"</string>
+    <string name="keywords_text_to_speech_output" msgid="392447904221657930">"​ໃຫ້​ຄະ​ແນນ ພາ​ສາ ເລີ່ມ​ຕົ້ນ ເວົ້າ ການ​ເວົ້າ tts ​ການ​ຊ່ວຍ​ການ​ເຂົ້າ​ເຖິງ ຕົວ​ອ່ານ ຕາ​ບອດ"</string>
+    <string name="keywords_date_and_time" msgid="2631808108134830066">"​ໂມງ ທະ​ຫານ"</string>
+    <string name="keywords_factory_data_reset" msgid="4355133848707691977">"ລົບ​ລ້າງ ລຶບ ກູ້​ຄືນ ລົບ​ລ້າງ ລຶບ"</string>
     <string name="keywords_printing" msgid="1701778563617114846">"ເຄື່ອງພິມ"</string>
     <string name="keywords_sounds_and_notifications" msgid="5965996187974887000">"ລຳໂພງ ບີ໊ບ"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="2912933812460077912">"ບໍ່ ບໍ່ລົບກວນ ການລົບກວນ ການຢຸດລົບກວນ"</string>
     <string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
     <string name="keywords_location" msgid="782326973714313480">"ການ​ລາຍ​ງານ​ປະຫວັດ​ສະຖານທີ່​ໃກ້​ຄຽງ"</string>
-    <string name="keywords_location_mode" msgid="8584992704568356084">"ຄວາມຖືກຕ້ອງ"</string>
+    <string name="keywords_location_mode" msgid="8584992704568356084">"ຄວາມຖືກຕ້ອງ​"</string>
     <string name="keywords_accounts" msgid="1957925565953357627">"ບັນຊີ"</string>
     <string name="keywords_users" msgid="4673901601478559100">"ການຫ້າມ ຫ້າມ ຖືກຫ້າມ"</string>
-    <string name="keywords_keyboard_and_ime" msgid="1103378692379215672">"ຂໍ້ຄວາມ ການແກ້ໄຂ ແກ້ໄຂ ສຽງ ການສັ່ນ ພາສາ ທ່າທາງ ແນະນຳ ການແນະນຳ ຮູບແບບສີສັນ ຄຳຫຍາບ ພິມ ອີໂມຈິ"</string>
+    <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"​ແກ້​ໄຂ ຂໍ້​ຄວາມ ແກ້​ໄຂ ສຽງ ສັ່ນ​ເຕືອນ ອັດ​ຕະ​ໂນ​ມັດ ພາ​ສາ ແນະ​ນຳ ການ​ແນະ​ນຳ ຮູບ​ແບບ​ສີ​ສັນ ຄຳ ຫຍາບ​ຄາຍ ປະ​ເພດ ອີ​ໂມ​ຈິ ສາ​ກົນ"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"ສະ​ໄລ້ ລະ​ຫັດ​ຜ່ານ ຮູບ​ແບບ pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"ຕັ້ງ​ຄ່າ​ແທັກ Wi-Fi NFC"</string>
     <string name="write_tag" msgid="8571858602896222537">"ຂຽນ"</string>
@@ -2371,7 +2388,6 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"ລະ​ດັບ​ສຽງ​ແຈ້ງ​ເຕືອນ"</string>
     <string name="zen_mode_settings_title" msgid="7014915558669122902">"ການລົບກວນ"</string>
     <string name="zen_mode_option_title" msgid="5061978632306007914">"​ເມື່ອ​ມີ​ການ​ໂທ ຫຼື​ການ​ແຈ້ງ​ເຕືອນ​ເຂົ້າ​ມາ"</string>
-    <string name="zen_mode_option_title_novoice" msgid="6680706009915204785">"ເມື່ອ​ມີ​ການ​ແຈ້ງ​ເຕືອນ​ເຂົ້າ​ມາ"</string>
     <string name="zen_mode_option_off" msgid="3167702608910820883">"ອະນຸຍາດໃຫ້ລົບກວນໄດ້ຕະຫຼອດ"</string>
     <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"ອະນຸຍາດ​ສະເພາະ​ການ​ລົບກວນ​ທີ່​ສຳຄັນ"</string>
     <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"ບໍ່​ອະນຸຍາດ​ໃຫ້​ມີ​ການ​ລົບກວນ​ເລີຍ"</string>
@@ -2427,16 +2443,19 @@
     <string name="app_notification_row_priority" msgid="7723839972982746568">"ລະດັບຄວາມສຳຄັນ"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"​ລະ​ອຽດ​​ອ່ອນ"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"ແລ້ວໆ"</string>
-    <string name="zen_mode_default_option" msgid="6940069025071935243">"ຈົນກວ່າ​ທ່ານ​ຈະ​ປິດ"</string>
+    <string name="zen_mode_default_option" msgid="6940069025071935243">"ຈົນກວ່າ​ທ່ານ​ຈະ​ປິດ​"</string>
     <string name="zen_mode_important_category" msgid="8123274463331022993">"ການ​ລົບກວນ​ສຳຄັນ"</string>
-    <string name="zen_mode_downtime_category" msgid="4730179065426038108">"ດາວທາມ (ການ​ລົບກວນ​ສຳຄັນ​ເທົ່າ​ນັ້ນ)"</string>
+    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"​ເວ​ລາ​ປິດ​ເຮັດ​ວຽກ"</string>
     <string name="zen_mode_downtime_days" msgid="3361856902633311616">"ມື້"</string>
     <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"ບໍ່ມີ"</string>
+    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"ອະ​ນຸ​ຍາດ​ໃຫ້​ລົບ​ກວນ​ໄດ້"</string>
+    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"​ສະ​ເພາະ​ທີ່​ສຳ​ຄັນ​ເທົ່າ​ນັ້ນ"</string>
+    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"ບໍ່ມີ"</string>
     <string name="zen_mode_automation_category" msgid="4653551005950835761">"ລະບົບ​ອັດຕະໂນມັດ"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"ເປີດ​ໂດຍ​ອັດ​ຕະ​ໂນ​ມັດ"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"ບໍ່​ໃຊ້"</string>
-    <string name="zen_mode_phone_calls" msgid="8956214416859303966">"​ການ​ໂທ"</string>
+    <string name="zen_mode_calls" msgid="7051492091133751208">"​ການ​ໂທ"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"ຂໍ້​ຄວາມ"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"ໂທ​ລະ​ສັບ/ຂໍ້​ຄວາມ​ ຈາກ"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"ທຸກຄົນ"</string>
@@ -2450,15 +2469,21 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"ຄືນ​ວັນ​ຈັນຫາ​ສຸກ"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"ເວລາເລີ່ມ"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"ເວລາສິ້ນສຸດ"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> ມື້​ຕໍ່​ໄປ"</string>
+    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> ວັນ​ຕໍ່​ໄປ"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> ຫຼື​ການ​ເຕືອນ​ໃດ​ໜຶ່ງ​ກ່ອນນີ້"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> ວັນ​ຕໍ່​ໄປ ຫຼື​ການ​ເຕືອນ​ໃດ​ໜຶ່ງ​​ກ່ອນນີ້"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"ການ​ແຈ້ງ​ເຕືອນ​ແອັບຯ"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"​ການ​ຕັ້ງ​ຄ່າ​ການ​ແຈ້ງ​ເຕືອນ"</string>
     <string name="device_feedback" msgid="3238056036766293294">"ສົ່ງ​ຄຳ​ຕິ​ຊົມ​ກ່ຽວ​ກັບ​ອຸ​ປະ​ກອນ​ນີ້"</string>
     <string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"ໃສ່ PIN ຜູ່​ເບິ່ງ​ແຍງ​ລະບົບ"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"ເປີດ"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"ປິດ"</string>
-    <string name="screen_pinning_title" msgid="2292573232264116542">"ການ​ປັກ​ໝຸດ​ໜ້າ​ຈໍ"</string>
-    <string name="screen_pinning_description" msgid="7091642350452605379">"ເມື່ອ​ເປີດ​ໃຊ້, ທ່ານ​ຈະ​ສາ​ມາດ​ນຳ​ໃຊ້​ການ​ປັກ​ໝຸດ​ໜ້າ​ຈໍ​ເພື່ອ​ໃຫ້​ໜ້າ​ຈໍ​ປັດ​ຈຸ​ບັນ​ຢູ່​ໃນ​ມຸມມອງ​ສະ​ເໝີ ຈົນ​ກວ່າ​ທ່ານ​ຈະ​ຖອດ​ໝຸດ​ອອກ.\n\n​ເພື່ອ​ນຳ​ໃຊ້​ການ​ປັກ​ໝຸດ​ໜ້າ​ຈໍ:\n\n1. ​ກວດ​ສອບ​ໃຫ້​ໝັ້ນ​ໃຈ​ວ່າ ການ​ປັກ​ໝຸດ​ໜ້າ​ຈໍ​ ນັ້ນ​ເປີດ​ຢູ່.\n\n2. ​ເປີດ​ໜ້າ​ຈໍ​ທີ່​ທ່ານ​ຕ້ອງ​ການ​ຈະ​ປັກ​ໝຸດ.\n\n3. ​ສຳ​ຜັດ​ປຸ່ມ ພາບ​ຮວມ.\n\n4. ​ສຳ​ຜັດ​ໄອ​ຄອນ ປັກ​ໝຸດ."</string>
+    <string name="screen_pinning_title" msgid="2292573232264116542">"ການ​ປັກ​ໝຸດ​ໜ້າ​ຈໍ​"</string>
+    <string name="screen_pinning_description" msgid="1137904524037468263">"ເມື່ອ​ເປີດ​ການ​ຕັ້ງ​ຄ່າ​ນີ້, ທ່ານ​ຈະ​ສາ​ມາດ​ໃຊ້​ການ​ປັກ​ໝຸດ​ໜ້າ​ຈໍເພື່ອ​ຮັກ​ສາ​ໜ້າ​ຈໍ​ປັດ​ຈຸ​ບັນ​ໃຫ້​ຢູ່​ໃນ​ມຸມມອງ​ຂອງ​ທ່ານ​ສະ​ເໝີ ຈົນ​ກວ່າ​ທ່ານ​ຈະ​ຖອດ​ໝຸດ.\n\nເພື່ອ​ນຳ​ໃຊ້​ການ​ປັກ​ໝຸດ​ໜ້າ​ຈໍ:\n\n1. ​ກວດ​ສອບ​ວ່າ ການ​ປັກ​ໝຸດ​ໜ້າ​ຈໍ ໄດ້​ເປີດ​ຢູ່.\n\n2. ​ເປີດ​ໜ້າ​ຈໍ​ທີ່​ທ່ານ​ຕ້ອງ​ການ​ຈະ​ປັກ​ໝຸດ.\n\n3. ​ກົດ​ປຸ່ມ ພາບ​ຮວມ.\n\n4. ​ປັດ​ນິ້ວ​ຂຶ້ນ ແລ້ວ​ແຕະ​ທີ່​ໄອ​ຄອນ​ປັກ​ໝຸດ."</string>
+    <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"​ຖາມ​ຫາ​ຮູບ​ແບບ​ປົດ​ລັອກ​ກ່ອນ​ຍົກ​ເລີກ​ການ​ປັກ​ໝຸດ"</string>
+    <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"​ຖາມ​ຫາ PIN ກ່ອນ​ຍົກ​ເລີກ​ການປັກ​ໝຸດ"</string>
+    <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"​ຖາມ​ຫາ​ລະ​ຫັດ​ຜ່ານ​ກ່ອນ​ຍົກ​ເລີກ​ການ​ປັກ​ໝຸດ"</string>
+    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"ລັອກ​ອຸ​ປະ​ກອນ​ເມື່ອ​ຍົກ​ເລີກ​ການ​ປັກ​ໝຸດ"</string>
     <string name="managed_user_title" msgid="8101244883654409696">"​ໂປຣ​ໄຟລ໌​ບ່ອນ​ເຮັດ​ວຽກ"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(ທົດ​ລອງ)"</string>
     <string name="display_auto_rotate_title" msgid="6176450657107806043">"ເມື່ອ​ໝຸນ​ອຸປະກອນ"</string>
@@ -2467,7 +2492,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"ໃຊ້​ທິດທາງ​ລວງ​ນອນ"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"ໃຊ້ທິດທາງ​ປັດຈຸບັນ​ຂອງ​ໜ້າ​ຈໍ"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"ຂໍ້ມູນ IMEI"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"ຂໍ້ມູນ​ກ່ຽວ​ຂ້ອງ​ກັບ IMEI"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"ການເຂົ້າລະຫັດ"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"ດຳເນີນການຕໍ່"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"ທ່ານ​ສາ​ມາດ​ເສີມ​ການ​ປ້ອງ​ກັນ​ໃຫ້​ອຸ​ປະ​ກອນ​ນີ້​ໄດ້ ໂດຍ​ການ​ບັງ​ຄັບ​ໃຫ້​ໃສ່​ລະ​ຫັດ PIN ​ກ່ອນ​ເປີດ​ໃຊ້. ​ກ່ອນ​ການ​ເປີດ​ໃຊ້, ອຸ​ປະ​ກອນ​ຈະ​ບໍ່​ສາ​ມາດຮັບ​ໂທ​ລະ​ສັບ, ຂໍ້​ຄວາມ ຫຼື ການ​ແຈ້ງ​ເຕືອນ ຮວມ​ເຖິງ​ໂມງ​ປຸກ​ໄດ້. \n\n​ມັນ​ຈະ​ຊ່ວຍ​ປ້ອງ​ການ​ການ​ສູນ​ເສຍ​ຂໍ້​ມູນ​ຫາກ​ອຸ​ປະ​ກອນ​ສູນ​ຫາຍ ຫຼື ຖືກ​ລັກ."</string>
@@ -2485,4 +2509,7 @@
     <string name="encrypt_talkback_dialog_message_pin" msgid="1890374082842868489">"ເມື່ອ​ທ່ານ​ປ້ອນ​ລະ​ຫັດ PIN ​ຂອງ​ທ່ານ​ເພື່ອ​ເລີ່ມ​ອຸ​ປະ​ກອນ​ນີ້, ​ບໍ​ລິ​ການ​ຊ່ວຍ​ການ​ເຂົ້າ​ເຖິງ​ເຊັ່ນ <xliff:g id="SERVICE">%1$s</xliff:g> ຈະ​ຍັງ​ບໍ່​ສາ​ມາດ​ນຳ​ໃຊ້​ໄດ້."</string>
     <string name="encrypt_talkback_dialog_message_pattern" msgid="4474332516537386384">"ເມື່ອ​ທ່ານ​ປ້ອນ​ຮູບ​ແບບ​ປົດ​ລັອກ​ຂອງ​ທ່ານ​ເພື່ອ​ເລີ່ມ​ອຸ​ປະ​ກອນ​ນີ້, ​ບໍ​ລິ​ການ​ຊ່ວຍ​ການ​ເຂົ້າ​ເຖິງ​ເຊັ່ນ <xliff:g id="SERVICE">%1$s</xliff:g> ຈະ​ຍັງ​ບໍ່​ສາ​ມາດ​ນຳ​ໃຊ້​ໄດ້."</string>
     <string name="encrypt_talkback_dialog_message_password" msgid="8166099418487083927">"ເມື່ອ​ທ່ານ​ປ້ອນ​ລະ​ຫັດ​ຜ່ານ​ຂອງ​ທ່ານ​ເພື່ອ​ເລີ່ມ​ອຸ​ປະ​ກອນ​ນີ້, ​ບໍ​ລິ​ການ​ຊ່ວຍ​ການ​ເຂົ້າ​ເຖິງ​ເຊັ່ນ <xliff:g id="SERVICE">%1$s</xliff:g> ​ຈະ​ຍັງ​ບໍ່​ສາ​ມາດ​ນຳ​ໃຊ້​ໄດ້."</string>
+    <string name="imei_information_title" msgid="8499085421609752290">"ຂໍ້ມູນ IMEI"</string>
+    <string name="imei_information_summary" msgid="2074095606556565233">"ຂໍ້ມູນ​ກ່ຽວ​ຂ້ອງ​ກັບ IMEI"</string>
+    <string name="slot_number" msgid="3762676044904653577">"(ຊ່ອງ <xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-lt/arrays.xml b/res/values-lt/arrays.xml
index d504edb..7614636 100644
--- a/res/values-lt/arrays.xml
+++ b/res/values-lt/arrays.xml
@@ -527,4 +527,12 @@
     <item msgid="4338089220026248848">"Išsaugota talpykloje (veiklos kliento programa)"</item>
     <item msgid="6652164677254579050">"Išsaugota talpykloje (tuščia)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Žalsvai mėlyna"</item>
+    <item msgid="8332294763632946560">"Mėlyna"</item>
+    <item msgid="2023216417616991392">"Indigo"</item>
+    <item msgid="3170497246594232819">"Purpurinė"</item>
+    <item msgid="4608643045752965568">"Rožinė"</item>
+    <item msgid="6131821495505931173">"Raudona"</item>
+  </string-array>
 </resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index a91b143..0467d92 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>
@@ -180,7 +180,6 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s nori pasiekti jūsų pranešimus. Suteikti prieigą %2$s?"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Data ir laikas"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Pasirinkite laiko juostą"</string>
-    <string name="normal_date_format" msgid="7636406984925498359">"Pagal vietovę (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Peržiūra:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Šrifto dydis:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -291,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>
@@ -322,8 +321,6 @@
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Pasirinkti laiko zoną"</string>
     <string name="date_time_set_date_title" msgid="6928286765325608604">"Data"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"Nustatyti datą"</string>
-    <string name="date_time_date_format_title" msgid="3976171711988766411">"Datos formatas"</string>
-    <string name="date_time_date_format" msgid="6951498879879281102">"Pasirinkite datos formatą"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Rūšiuoti pagal abėcėlę"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Rūšiuoti pagal laiko zoną"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Data"</string>
@@ -372,7 +369,8 @@
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Palaukite, kol šifruojamas telefonas. Baigta <xliff:g id="PERCENT">^1</xliff:g> %."</string>
     <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Palaukite, kol planšetinis kompiuteris bus užšifruotas. Liko laiko: <xliff:g id="DURATION">^1</xliff:g>"</string>
     <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Palaukite, kol telefonas bus užšifruotas. Liko laiko: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Bandyti dar kartą po <xliff:g id="DELAY">^1</xliff:g> sek."</string>
+    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"Jei norite atrakinti planšetinį kompiuterį, išjunkite jį ir vėl įjunkite."</string>
+    <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"Jei norite atrakinti telefoną, išjunkite jį ir vėl įjunkite."</string>
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"Įspėjimas: įrenginys bus išvalytas, jei dar <xliff:g id="COUNT">^1</xliff:g> k. nesėkmingai bandysite jį atrakinti!"</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Įveskite slaptažodį"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Šifruotė nepavyko"</string>
@@ -401,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>
@@ -412,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>
@@ -556,13 +556,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Kaip kalbėtojo telefonas"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Muzikai ir medijai"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Atsiminti nustatymus"</string>
-    <string name="wifi_assistant_intro_setup" msgid="4605105515416995110">"„Wi-Fi“\npagelbiklis"</string>
-    <string name="wifi_assistant_no_thanks" msgid="2776983751990143934">"NE, AČIŪ"</string>
-    <string name="wifi_assistant_setup" msgid="3772423650475730906">"NUSTATYTI"</string>
-    <string name="wifi_assistant_card_message" msgid="107811647784658536">"Automatiškai prisijungti prie pasiekiamų tinklų, naudojant „Wi‑Fi“ pagelbiklį."</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"„Wi‑Fi“ pagelbiklis"</string>
-    <string name="wifi_assistant_title_message" msgid="6240721017579074015">"<xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> automatiškai prijungia jūsų įrenginį prie geriausio pasiekiamo „Wi‑Fi“ tinklo"</string>
-    <string name="wifi_assistant_open_app" msgid="4803044899535675063">"ATIDARYTI PROGRAMĄ"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Prisijungta naudojant „Wi‑Fi“ pagelbiklį"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"Perduoti ekraną"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Įgalinti belaidį rodymą"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Nerasta netoliese esančių įrenginių."</string>
@@ -592,7 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"„Wi-Fi“ nustatymai"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Nustatyti ir valdyti bevielius prieigos taškus"</string>
-    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Pasirinkite „Wi-Fi“"</string>
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Pasirinkti „Wi‑Fi“ tinklą"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Pasirinkti „Wi-Fi“"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"„Wi-Fi“ įjungiama…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"„Wi-Fi“ išjungiama…"</string>
@@ -607,8 +602,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"Nuskaitymas visada pasiekiamas"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Visada leisti nuskaityti"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Leisti „Google“ vietovių paslaugai ir kitoms programoms nuskaityti tinklus, net kai „Wi-Fi“ išjungtas"</string>
-    <string name="wifi_automatically_manage_title" msgid="6249976570008992746">"Automatiškai tvarkyti „Wi-Fi“"</string>
-    <string name="wifi_automatically_manage_summary" msgid="6952470763378312488">"Leiskite „<xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g>“ valdyti jūsų „Wi-Fi“ ryšį"</string>
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Automatiškai naudoti atvirą „Wi‑Fi“"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Leisti „Wi‑Fi“ pagelbikliui automatiškai prisijungti prie atvirų aukštos kokybės tinklų."</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Pasirinkti pagelbiklį"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Įdiegti sertifikatus"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Kad patobulintumėte vietovių tikslumą ir kitais tikslais, leiskite „Google“ vietovių paslaugai ir kitoms programoms ieškoti netoliese esančių „Wi-Fi“ tinklų, net jei „Wi-Fi“ išjungtas. Jei nenorite, kad būtų ieškoma, eikite į skiltį „Išplėstiniai“ &gt; „Visada galima ieškoti“."</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Programos gali ieškoti netoliese esančių tinklų, net kai „Wi-Fi“ yra išjungtas. Jei nenorite, kad būtų ieškoma, eikite į skiltį „Išplėstiniai“ &gt; „Visada galima ieškoti“."</string>
@@ -629,6 +625,7 @@
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Nuskaityti"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Išplėstinis"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Prijungti prie tinklo"</string>
+    <string name="wifi_menu_remember" msgid="8814185749388713796">"Prisiminti tinklą"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Pamiršti tinklą"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Keisti tinklą"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Rašyti į ALR žymą"</string>
@@ -673,9 +670,11 @@
     <string name="wifi_unspecified" msgid="5431501214192991253">"(nenurodyta)"</string>
     <string name="wifi_remembered" msgid="4955746899347821096">"Išsaugotas"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"Neleidžiama"</string>
-    <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Išvengta prasto interneto ryšio"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP konfigūracijos triktis"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"„Wi-Fi“ ryšio triktis"</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Autentifikavimo problema"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Ne diapazone"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Neaptikta jokia prieiga prie interneto, nebus automatiškai iš naujo prisijungta."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"Galima WPS"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (galima WPS)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Įveskite tinklo slaptažodį"</string>
@@ -699,9 +698,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"ĮSPĖJIMAS: jei praleisite prisijungimo prie „Wi-Fi“ veiksmą, planšetiniame kompiuteryje pradiniams atsisiuntimams ir naujiniams bus naudojami tik mobiliojo ryšio duomenys. Kad išvengtumėte galimų duomenų mokesčių, prisijunkite prie „Wi‑Fi“."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"ĮSPĖJIMAS: jei praleisite prisijungimo prie „Wi-Fi“ veiksmą, įrenginyje pradiniams atsisiuntimams ir naujiniams bus naudojami tik mobiliojo ryšio duomenys. Kad išvengtumėte galimų duomenų mokesčių, prisijunkite prie „Wi‑Fi“."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"ĮSPĖJIMAS: jei praleisite prisijungimo prie „Wi-Fi“ veiksmą, telefone pradiniams atsisiuntimams ir naujiniams bus naudojami tik mobiliojo ryšio duomenys. Kad išvengtumėte galimų duomenų mokesčių, prisijunkite prie „Wi‑Fi“."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="2393880108322835846">"ĮSPĖJIMAS: jei praleisite prisijungimo prie „Wi-Fi“ veiksmą, planšetiniame kompiuteryje nebus interneto ryšio pradiniams atsisiuntimams arba naujiniams."</string>
-    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1707391993265558787">"ĮSPĖJIMAS: jei praleisite prisijungimo prie „Wi-Fi“ veiksmą, įrenginyje nebus interneto ryšio pradiniams atsisiuntimams arba naujiniams."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="1556858507920033022">"ĮSPĖJIMAS: jei praleisite prisijungimo prie „Wi-Fi“ veiksmą, telefone nebus interneto ryšio pradiniams atsisiuntimams arba naujiniams."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Jei praleisite „Wi‑Fi“:\n\nPlanšetiniame kompiuteryje nebus interneto ryšio.\n\nNegausite programinės įrangos naujinių, kol prisijungsite prie interneto.\n\nŠiuo metu negalėsite suaktyvinti įrenginio apsaugos funkcijų."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Jei praleisite „Wi‑Fi“:\n\nĮrenginyje nebus interneto ryšio.\n\nNegausite programinės įrangos naujinių, kol prisijungsite prie interneto.\n\nŠiuo metu negalėsite suaktyvinti įrenginio apsaugos funkcijų."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Jei praleisite „Wi‑Fi“:\n\nTelefone nebus interneto ryšio.\n\nNegausite programinės įrangos naujinių, kol prisijungsite prie interneto.\n\nŠiuo metu negalėsite suaktyvinti įrenginio apsaugos funkcijų."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Planšetiniam kompiuteriui nepavyko prisijungti prie šio „Wi-Fi“ tinklo."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"Įrenginiui nepavyko prisijungti prie šio „Wi-Fi“ tinklo."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Telefonui nepavyko prisijungti prie šio „Wi-Fi“ tinklo."</string>
@@ -761,7 +760,6 @@
     <string name="ring_volume_title" msgid="7938706566797464165">"Skambučio garsumas"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibruoti, kai veikia tyliuoju režimu"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Numatytasis pranešimo garsas"</string>
-    <string name="heads_up_enabled_title" msgid="1031078221910921622">"Rod. iššok. l., jei pr. did."</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Skambėjimo tonas"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Pranešimas"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Įspėjimams naudoti gaunamų skambučių garsumą"</string>
@@ -834,7 +832,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatinis šviesumas"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Pakelti ir pažadinti"</string>
     <string name="doze_title" msgid="2259176504273878294">"Aplinkos vaizdas"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"Atrakinti ekraną, kai įrenginys paimamas ar gaunamas pranešimas"</string>
+    <string name="doze_summary" msgid="7128970177894383698">"Pažadinti ekraną, kai paimamas įrenginys arba gaunamas pranešimas"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Šrifto dydis"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Šrifto dydis"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM kortelės užrakto nustatymai"</string>
@@ -862,6 +860,10 @@
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Atšaukti"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"Rastos kelios SIM"</string>
     <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>
+    <string name="sim_preferred_title" msgid="5567909634636045268">"Atnauj. pageid. SIM kortelę?"</string>
+    <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> yra vienintelė SIM kortelė įrenginyje. Ar norite naudoti šią SIM kortelę mobiliesiems duomenims, skambučiams bei SMS pranešimams siųsti ir gauti?"</string>
     <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>
@@ -1012,6 +1014,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Taip bus ištrinti visi duomenys iš planšetinio kompiuterio "<b>"vidinės atminties"</b>", įskaitant:\n\n"<li>"„Google“ paskyrą"</li>\n<li>"Sistemos ir programų duomenis bei nustatymus"</li>\n<li>"Atsisiųstas programas"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Taip bus ištrinti visi duomenys iš telefono "<b>"vidinės atminties"</b>", įskaitant:\n\n"<li>"„Google“ paskyrą"</li>\n<li>"Sistemos ir programų duomenis bei nustatymus"</li>\n<li>"Atsisiųstas programas"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Šiuo metu esate prisijungę prie šių paskyrų:\n"</string>
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Yra kitų šio įrenginio naudotojų.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Muzika"</li>\n<li>"Nuotraukos"</li>\n<li>"Kiti naudotojo duomenys"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Norint išvalyti muzikos failus, paveikslėlius bei kitus naudotojo duomenis, reikia ištrinti "<b>"USB atmintį"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Norint išvalyti muzikos failus, paveikslėlius ir kitus naudotojo duomenis, reikia ištrinti "<b>"SD kortelę"</b>"."</string>
@@ -1023,7 +1026,6 @@
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Iš naujo nustatyti telefoną"</string>
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Ištrinti visą asmeninę informaciją ir atsisiųstas programas? Šio veiksmo negalėsite atšaukti!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Ištrinti viską"</string>
-    <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Nustatyti atrakinimo modelį"</string>
     <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Kad patvirtintumėte gamyklinių duomenų nustatymą iš naujo, turite nubrėžti atrakinimo šabloną."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Nebuvo nustatyta iš naujo, nes paslauga „Sistemos išvalymas“ nepasiekiama."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Nustatyti iš naujo?"</string>
@@ -1041,7 +1043,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"Ištrinti USB atmintinę ištrinant visus joje saugomus failus? Šio veiksmo negalėsite atšaukti!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Ištrinti SD kortelę ištrinant visus joje saugomus failus? Šio veiksmo negalėsite atšaukti!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Ištrinti viską"</string>
-    <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Nustatyti atrakinimo modelį"</string>
     <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Kad patvirtintumėte, jog norite ištrinti USB atmintinę, turite nubrėžti atrakinimo šabloną."</string>
     <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Kad patvirtintumėte, jog norite ištrinti SD kortelę, turite nubrėžti atrakinimo šabloną."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Skambinimo nustatymai"</string>
@@ -1087,6 +1088,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Įdėkite SIM kortelę ir paleiskite iš naujo"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Prisijunkite prie interneto"</string>
     <string name="location_title" msgid="1029961368397484576">"Mano vieta"</string>
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Darbo profilis"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Darbo profilio vieta"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Išjungė jūsų įmonė"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Režimas"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Didelis tikslumas"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Akumuliatoriaus tausojimas"</string>
@@ -1124,6 +1128,7 @@
     <string name="copyright_title" msgid="865906688917260647">"Autorių teisės"</string>
     <string name="license_title" msgid="1990487604356037871">"Licencija"</string>
     <string name="terms_title" msgid="7697580845616764642">"Taisyklės ir nuostatos"</string>
+    <string name="webview_license_title" msgid="2813507464175738967">"Sistemos „WebView“ licencija"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Ekrano fonai"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Palydovinių vaizdų teikėjai:\n© CNES / „Astrium“, „DigitalGlobe“, „Bluesky“, 2014 m."</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Atvirojo šaltinio licencijos"</string>
@@ -1237,7 +1242,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB atmintinė"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"SD kortelėje"</string>
     <string name="disabled" msgid="9206776641295849915">"Neleidžiama"</string>
-    <string name="not_installed" msgid="1475144352069281880">"Neįdiegta"</string>
+    <string name="not_installed" msgid="2797554494953450291">"Neįdiegta šiam naudotojui"</string>
     <string name="no_applications" msgid="7336588977497084921">"Nėra programų"</string>
     <string name="internal_storage" msgid="1584700623164275282">"Vidinė atmint."</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB atmintinė"</string>
@@ -1434,8 +1439,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Kraunant ekranas niekada neveiks miego režimu"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Įgalinti „Bluetooth“ HCI šnipinėjimo žurnalą"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Užfiksuoti visus faile esančius „Bluetooth“ HCI paketus"</string>
-    <string name="oem_unlock_enable" msgid="6629321276287913315">"Įgalinti OĮG atr. funkc."</string>
-    <string name="oem_unlock_enable_summary" msgid="3546686263996628110">"Leisti atrakinti įrenginį naudojant OĮG funkciją"</string>
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"OĮG atrakinimas"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Leisti atrakinti oper. sistemos paleidimo progr."</string>
+    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Įveskite PIN kodą"</string>
+    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Įveskite įrenginio PIN kodą, kad įgalintumėte OĮG operatoriaus pasirinkimo ribojimo panaikinimą"</string>
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Leisti OĮG atrakinimą?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"ĮSPĖJIMAS: kol šis nustatymas bus įjungtas, šiame įrenginyje neveiks įrenginio apsaugos funkcijos."</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Belaidžio rodymo sertifikavimas"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Įgal. „Wi‑Fi“ daugiaž. įraš. į žurnalą"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Agres. „Wi‑Fi“ duom. perd. į mob. tinklą"</string>
@@ -1538,6 +1547,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"Antraštės atrodys taip"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"Numatytoji"</string>
+    <string name="color_title" msgid="4258931051732243983">"Spalva"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"Numatytoji"</string>
     <string name="color_none" msgid="3475640044925814795">"Nėra"</string>
     <string name="color_white" msgid="8045195170201590239">"Balta"</string>
@@ -1595,12 +1605,12 @@
     <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">"Liko: <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"Liko įkrauti: <xliff:g id="UNTIL_CHARGED">%1$s</xliff:g>"</string>
-    <string name="power_discharging_duration" msgid="7125493014448497620">"<xliff:g id="LEVEL">%1$d</xliff:g> %% – liko maždaug <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="power_charging" msgid="712751285832976915">"<xliff:g id="LEVEL">%1$d</xliff:g> %% – <xliff:g id="STATE">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration" msgid="4802183864773082009">"<xliff:g id="LEVEL">%1$d</xliff:g> %% – <xliff:g id="TIME">%2$s</xliff:g> iki visiško įkrovimo"</string>
-    <string name="power_charging_duration_ac" msgid="3611179931297824699">"<xliff:g id="LEVEL">%1$d</xliff:g> %% – <xliff:g id="TIME">%2$s</xliff:g> iki vis. įkrov. naud. kint. sr."</string>
-    <string name="power_charging_duration_usb" msgid="1106605348913397583">"<xliff:g id="LEVEL">%1$d</xliff:g> %% – <xliff:g id="TIME">%2$s</xliff:g> iki visiško įkrovimo per USB"</string>
-    <string name="power_charging_duration_wireless" msgid="633606920144617227">"<xliff:g id="LEVEL">%1$d</xliff:g> %% – <xliff:g id="TIME">%2$s</xliff:g> iki visiško įkrovimo belaid. ryš."</string>
+    <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> – liko maždaug <xliff:g id="TIME">%2$s</xliff:g>"</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> iki visiško įkrovimo"</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> iki visiško įkrovimo naud. kint. sr."</string>
+    <string name="power_charging_duration_usb" msgid="182405645340976546">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> iki visiško įkrovimo naudojant USB"</string>
+    <string name="power_charging_duration_wireless" msgid="1829295708243159464">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> iki visiško įkrovimo belaid. ryš."</string>
     <string name="power_usage_list_summary" msgid="2409288197839512482">"Naudoti nuo paskutinio visiško įkrovimo"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Akumuliatoriaus naudojimas po to, kai buvo ištrauktas iš lizdo"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Akumuliatoriaus naudojimas po nustatymo iš naujo"</string>
@@ -1617,7 +1627,6 @@
     <string name="awake" msgid="387122265874485088">"Įrenginio veikimo laikas"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"„Wi-Fi“ laiku"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"„Wi-Fi“ laiku"</string>
-    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> – <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Istorijos informacija"</string>
     <string name="details_title" msgid="3792801565213935385">"Išsami naudojimo informacija"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Išsami naudojimo informacija"</string>
@@ -1689,7 +1698,7 @@
     <string name="battery_saver" msgid="1426682272004907982">"Akumuliatoriaus tausojimo priemonė"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Įjungti automatiškai"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Niekada"</string>
-    <string name="battery_saver_turn_on_automatically_pct" msgid="3033681629861428940">"kai akumuliatorius įkrautas %1$d %%"</string>
+    <string name="battery_saver_turn_on_automatically_pct" msgid="7536784431655058267">"kai yra %1$s akumuliatoriaus energijos"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Procesų statistika"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Entuziastų pateikta statistika apie vykstančius procesus"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Naudojama atmintis"</string>
@@ -1724,7 +1733,7 @@
     <string name="menu_proc_stats_type_cached" msgid="5084272779786820693">"Išsaugota talpykloje"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"Balso įvestis ir išvestis"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Balso įvesties ir išvesties nustatymai"</string>
-    <string name="voice_search_settings_title" msgid="2775469246913196536">"Balso paieška"</string>
+    <string name="voice_search_settings_title" msgid="2775469246913196536">"Paieška balsu"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"„Android“ klaviatūra"</string>
     <string name="voice_category" msgid="1430370497125803904">"Kalba"</string>
     <string name="voice_input_settings" msgid="1099937800539324567">"Įvesties balsu nustatymai"</string>
@@ -1813,7 +1822,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Atsarginė kopija saugoma įrenginio vidinėje atmintyje"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Saugoma tik programinėje įrangoje"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"Kredencialai nepasiekiami šiam naudotojui"</string>
-    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Nubrėžti atrakinimo piešinį"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Kad patvirtintumėte kredencialų diegimą, turite nubrėžti atrakinimo piešinį."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Įveskite kredencialų atmintinės slaptažodį."</string>
@@ -1843,6 +1851,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"Įtraukti programos duomenis"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Automatinis atkūrimas"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Iš naujo įdiegdami programą atkurkite nustatymus ir duomenis, kurių atsarginės kopijos buvo sukurtos"</string>
+    <string name="backup_inactive_title" msgid="5355557151569037197">"Atsarginio kopijavimo paslauga neaktyvi."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"Tai nustatyta vadovaujantis įrenginio politika."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Viet. atsrg. kop. slapt."</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Šiuo metu visos vietinės atsarginės kopijos neapsaugotos"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Jei norite pakeisti ar pašalinti visų vietinių atsarginių kopijų slaptažodį, palieskite"</string>
@@ -1952,7 +1962,11 @@
     <string name="enter_password" msgid="8035706727471334122">"Jei norite paleisti „Android“, įveskite slaptažodį"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Jei norite paleisti „Android“, įveskite PIN kodą"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Jei norite paleisti „Android“, nupieškite savo šabloną"</string>
-    <string name="try_again" msgid="4272075051293936921">"Bandykite dar kartą."</string>
+    <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"Netinkamas šablonas"</string>
+    <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"Netinkamas slaptažodis"</string>
+    <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"Netinkamas PIN kodas"</string>
+    <string name="checking_decryption" msgid="8287458611802609493">"Tikrinama…"</string>
+    <string name="starting_android" msgid="8581493237458496835">"Paleidžiama „Android“"</string>
     <string name="delete" msgid="4219243412325163003">"Ištrinti"</string>
     <string name="misc_files" msgid="6720680815969643497">"Įvairūs failai"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"pasirinkti (-a) <xliff:g id="NUMBER">%1$d</xliff:g> iš <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -1990,8 +2004,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Komponuojant ekraną visada naudoti GPU"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"Imituoti spalvų erdvę"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Įgalinti „OpenGL“ pėdsak."</string>
-    <string name="use_nuplayer" msgid="5699257393367904387">"Naud. „NuPlayer“ (eksp.)"</string>
-    <string name="use_nuplayer_summary" msgid="1991479067478516714">"Naudokite „NuPlayer“ vietoje „AwesomePlayer“"</string>
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"Naud. „AwesomePlayer“ (neben.)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"Naud. „AwesomePlayer“ vietoje „NuPlayer“, kad atk. daug. med."</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"Išj. USB garso marš. par."</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"Išj. aut. maršr. parink. į USB garso išor. įtaisus"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Rodyti išdėstymo ribas"</string>
@@ -2167,7 +2181,6 @@
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Pridėti naudotoją ar profilį"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Pridėti naudotoją"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Ribotas profilis"</string>
-    <string name="user_summary_managed_profile" msgid="7369539529693048111">"Darbo profilis"</string>
     <string name="user_need_lock_message" msgid="2596365678651842785">"Prieš kuriant apribotą profilį reikės nustatyti ekrano užraktą, kad apsaugotumėte programas ir asmeninius duomenis."</string>
     <string name="user_set_lock_button" msgid="8311219392856626841">"Nustatyti užraktą"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Nenustatyta"</string>
@@ -2298,11 +2311,13 @@
     <string name="sim_cellular_data_unavailable_summary" msgid="3654805961942166428">"Palieskite, kad pasirinktumėte duomenų SIM"</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"Visada naudoti tai skambučiams"</string>
     <string name="select_sim_for_data" msgid="2366081042162853044">"Pasirinkite duomenims skirtą SIM"</string>
+    <string name="data_switch_started" msgid="2040761479817166311">"Perjungiama duomenų SIM kortelė. Tai gali užtrukti iki minutės..."</string>
     <string name="select_sim_for_calls" msgid="3503094771801109334">"Skambinkite naudodami…"</string>
     <string name="sim_select_card" msgid="211285163525563293">"Pasirinkite SIM kortelę"</string>
     <string name="sim_card_number_title" msgid="7845379943474336488">"SIM Nr. <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"SIM tuščia"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"SIM pavadinimas"</string>
+    <string name="sim_name_hint" msgid="7038643345238968930">"Įveskite SIM kortelės pavadinimą"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"SIM lizdas %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Operatorius"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Numeris"</string>
@@ -2312,7 +2327,6 @@
     <string name="color_purple" msgid="3888532466427762504">"Purpurinė"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"Nėra SIM kortelės"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"SIM būsena"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"Su SIM susijusi informacija"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"Atgalinis skambinimas iš numatytosios SIM"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"SIM išsiunčiamiesiems skambučiams"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Kiti skambučio nustatymai"</string>
@@ -2320,8 +2334,11 @@
     <string name="preferred_network_offload_header" msgid="2321173571529106767">"Išj. tinklo pav. transl."</string>
     <string name="preferred_network_offload_footer" msgid="5857279426054744020">"Išjungus tinklo pavadinimo transliavimą apsaugoma nuo trečiųjų šalių prieigos prie tinklo inform."</string>
     <string name="preferred_network_offload_popup" msgid="2252915199889604600">"Išjungus tinklo pavadinimo transliavimą apsaugoma nuo automatinio prisijungimo prie paslėptų tinklų."</string>
+    <string name="sim_signal_strength" msgid="9144010043784767984">"<xliff:g id="DBM">%1$d</xliff:g> dBm <xliff:g id="ASU">%2$d</xliff:g> ASU"</string>
+    <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>
+    <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Klausti kaskart"</string>
     <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>
@@ -2330,22 +2347,22 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Paskutinės paieškos"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Rezultatai"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"„Wi-Fi“ tinklo ryšys"</string>
-    <string name="keywords_more_default_sms_app" msgid="2744404159003574745">"teksto pranešimas"</string>
-    <string name="keywords_more_mobile_networks" msgid="7813380887358745769">"mobilusis ryšys mobiliojo ryšio operatorius belaidis ryšys"</string>
+    <string name="keywords_more_default_sms_app" msgid="895656981962034647">"teksto pranešimas siųsti žinutę pranešimai susirašinėjimas žinutėmis"</string>
+    <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"mobilusis mobiliojo ryšio operatorius belaidis ryšys duomenys 4G 3G 2G LTE"</string>
     <string name="keywords_home" msgid="3626170808219458848">"paleidimo priemonė"</string>
     <string name="keywords_display" msgid="6709007669501628320">"ekranas jutiklinis ekranas"</string>
-    <string name="keywords_display_brightness_level" msgid="8636451602230815191">"užtemdytas ekranas jutiklinis ekranas"</string>
-    <string name="keywords_display_auto_brightness" msgid="8070218600502753102">"užtemdytas ekranas jutiklinis ekranas"</string>
-    <string name="keywords_display_wallpaper" msgid="4315466287469834939">"fonas"</string>
+    <string name="keywords_display_brightness_level" msgid="8923289340474728990">"pritemdytas ekranas jutiklinis ekranas akumuliatorius"</string>
+    <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"pritemdytas ekranas jutiklinis ekranas akumuliatorius"</string>
+    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"fonas suasmeninti tinkinti pateikti"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"teksto dydis"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"projektas"</string>
-    <string name="keywords_storage" msgid="7007275853993419928">"talpa diskas standusis diskas"</string>
-    <string name="keywords_battery" msgid="3992479295298655138">"maitinimas"</string>
-    <string name="keywords_spell_checker" msgid="4509482591225399210">"rašyba"</string>
+    <string name="keywords_storage" msgid="6572905220031852173">"vieta diskas standusis diskas įrenginys naudojimas"</string>
+    <string name="keywords_battery" msgid="2096185085932675704">"maitinimas naudojimas įkrovimas"</string>
+    <string name="keywords_spell_checker" msgid="6106749039734174140">"rašyba žodynas rašybos tikrinimas automatinis pataisymas"</string>
     <string name="keywords_voice_input" msgid="3519547605812413860">"atpažinimo priemonė įvesties kalba kalbėti laisvų rankų režimas atpažinimas įžeidžiantis žodis garso istorija „Bluetooth“ ausinės"</string>
-    <string name="keywords_text_to_speech_output" msgid="8207889472282225512">"greitis kalba numatytasis nustatymas kalbėti kalbėjimas"</string>
-    <string name="keywords_date_and_time" msgid="7666950126499155141">"laikrodis"</string>
-    <string name="keywords_factory_data_reset" msgid="3693730656843989732">"išvalyti ištrinti"</string>
+    <string name="keywords_text_to_speech_output" msgid="392447904221657930">"įvertinti kalba numatytasis kalbėti kalbėjimas TĮK pritaikymas neįgaliesiems skaitytojas aklas"</string>
+    <string name="keywords_date_and_time" msgid="2631808108134830066">"laikrodis kariuomenė"</string>
+    <string name="keywords_factory_data_reset" msgid="4355133848707691977">"valyti ištrinti atkurti išvalyti pašalinti"</string>
     <string name="keywords_printing" msgid="1701778563617114846">"spausdintuvas"</string>
     <string name="keywords_sounds_and_notifications" msgid="5965996187974887000">"garsiakalbis pyptelėjimas"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="2912933812460077912">"negalima netrukdyti pertraukti nutraukimas nutrūkęs ryšys"</string>
@@ -2354,7 +2371,7 @@
     <string name="keywords_location_mode" msgid="8584992704568356084">"tikslumas"</string>
     <string name="keywords_accounts" msgid="1957925565953357627">"paskyra"</string>
     <string name="keywords_users" msgid="4673901601478559100">"apribojimas riboti apribota"</string>
-    <string name="keywords_keyboard_and_ime" msgid="1103378692379215672">"teksto taisymas taisyti garsas vibruoti automatinis kalba gestas siūlyti pasiūlymas tema įžeidžiantis žodis tipas jaustukas"</string>
+    <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"teksto pataisymas pataisyti garsas vibruoti automatinis kalba gestas pasiūlyti pasiūlymas tema įžeidžiantis žodis tipas jaustukai tarptautinis"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"slysti slaptažodis šablonas PIN kodas"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Nustatyti „Wi-Fi“ ALR žymą"</string>
     <string name="write_tag" msgid="8571858602896222537">"Rašyti"</string>
@@ -2371,7 +2388,6 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Pranešimo garsumas"</string>
     <string name="zen_mode_settings_title" msgid="7014915558669122902">"Pertrauktys"</string>
     <string name="zen_mode_option_title" msgid="5061978632306007914">"Kai gaunami skambučiai ir pranešimai"</string>
-    <string name="zen_mode_option_title_novoice" msgid="6680706009915204785">"Kai gaunami pranešimai"</string>
     <string name="zen_mode_option_off" msgid="3167702608910820883">"Visada pertraukti"</string>
     <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Leisti tik prioritetines pertrauktis"</string>
     <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Nepertraukti"</string>
@@ -2429,14 +2445,17 @@
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Atlikta"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Kol išjungsite"</string>
     <string name="zen_mode_important_category" msgid="8123274463331022993">"Prioritetinės pertrauktys"</string>
-    <string name="zen_mode_downtime_category" msgid="4730179065426038108">"Prastova (tik prioritetinės pertrauktys)"</string>
+    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Prastova"</string>
     <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Dienos"</string>
     <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Nėra"</string>
+    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Leidžiamos pertrauktys"</string>
+    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Tik prioritetinės"</string>
+    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Nėra"</string>
     <string name="zen_mode_automation_category" msgid="4653551005950835761">"Automatika"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Automatiškai įjungti"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Niekada"</string>
-    <string name="zen_mode_phone_calls" msgid="8956214416859303966">"Skambučiai"</string>
+    <string name="zen_mode_calls" msgid="7051492091133751208">"Skambučiai"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Pranešimai"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Skambučiai / pranešimai nuo"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Bet ko"</string>
@@ -2450,7 +2469,9 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Savaitgalių naktimis"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Pradžios laikas"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Pabaigos laikas"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> kitą dieną"</string>
+    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> kitą dieną"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> arba bet kuris įspėjimas prieš tai"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> kitą dieną arba bet kuris įspėjimas prieš tai"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Programų pranešimai"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Įspėjimų nustatymai"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Siųsti atsiliepimą apie šį įrenginį"</string>
@@ -2458,7 +2479,11 @@
     <string name="switch_on_text" msgid="1124106706920572386">"Įjungti"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Išjungti"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"Ekrano prisegimas"</string>
-    <string name="screen_pinning_description" msgid="7091642350452605379">"Kai ekrano prisegimo funkc. įjungta, galite ją naudoti, kad išlaik. dabartinį ekraną rodinyje, kol atsegsite.\n\nJei norite naudoti ekrano priseg. funkciją:\n\n1. Įsitikinkite, kad ekrano priseg. funkc. įjungta.\n\n2. Atidarykite norimą prisegti ekraną.\n\n3. Palieskite „Apžvalga“.\n\n4. Palieskite smeigtuko piktogr."</string>
+    <string name="screen_pinning_description" msgid="1137904524037468263">"Įjungę šį nustatymą galite naudoti ekrano prisegimą, kad būtų rodomas dabartinis ekranas, kol jį atsegsite.\n\nKad naudotumėte ekrano prisegimą:\n\n1. Įsitikinkite, kad ši funkcija įjungta.\n\n2. Atidarykite norimą prisegti ekraną.\n\n3. Palieskite „Apžvalga“.\n\n4. Perbraukite aukštyn ir palieskite prisegimo piktogr."</string>
+    <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Prašyti atrakinimo piešinio prieš atsegant"</string>
+    <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Prašyti PIN kodo prieš atsegant"</string>
+    <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Prašyti slaptažodžio prieš atsegant"</string>
+    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Užrakinti įrenginį atsegant"</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Darbo profilis"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Eksperimentinis)"</string>
     <string name="display_auto_rotate_title" msgid="6176450657107806043">"Kai įrenginys pasukamas"</string>
@@ -2467,7 +2492,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Išlaikyti gulsčiąjį rodinį"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Išlaikyti esamą orientaciją"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI informacija"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI susijusi informacija"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Šifruotė"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Tęsti"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"Galite papildomai apsaugoti įrenginį reikalaudami PIN kodo prieš jį paleidžiant. Kol įrenginys nepaleistas, negalima gauti skambučių ar pranešimų, įskaitant įspėjimus. \n\nTai padeda apsaugoti prarastų arba pavogtų įrenginių duomenis."</string>
@@ -2485,4 +2509,7 @@
     <string name="encrypt_talkback_dialog_message_pin" msgid="1890374082842868489">"Kai įvesite PIN kodą, norėdami paleisti įrenginį, pritaikymo neįgaliesiems paslaugos, pvz., „<xliff:g id="SERVICE">%1$s</xliff:g>“, dar nebus pasiekiamos."</string>
     <string name="encrypt_talkback_dialog_message_pattern" msgid="4474332516537386384">"Kai nupiešite atrakinimo piešinį, norėdami paleisti įrenginį, pritaikymo neįgaliesiems paslaugos, pvz., „<xliff:g id="SERVICE">%1$s</xliff:g>“, dar nebus pasiekiamos."</string>
     <string name="encrypt_talkback_dialog_message_password" msgid="8166099418487083927">"Kai įvesite slaptažodį, norėdami paleisti įrenginį, pritaikymo neįgaliesiems paslaugos, pvz., „<xliff:g id="SERVICE">%1$s</xliff:g>“, dar nebus pasiekiamos."</string>
+    <string name="imei_information_title" msgid="8499085421609752290">"IMEI informacija"</string>
+    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI susijusi informacija"</string>
+    <string name="slot_number" msgid="3762676044904653577">"(<xliff:g id="SLOT_NUM">%1$d</xliff:g> lizdas)"</string>
 </resources>
diff --git a/res/values-lv/arrays.xml b/res/values-lv/arrays.xml
index d35b204..5f75f6a 100644
--- a/res/values-lv/arrays.xml
+++ b/res/values-lv/arrays.xml
@@ -527,4 +527,12 @@
     <item msgid="4338089220026248848">"Saglabāts kešatmiņā (darbības klients)"</item>
     <item msgid="6652164677254579050">"Saglabāts kešatmiņā (tukša)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Zilganzaļa"</item>
+    <item msgid="8332294763632946560">"Zila"</item>
+    <item msgid="2023216417616991392">"Indigo"</item>
+    <item msgid="3170497246594232819">"Violeta"</item>
+    <item msgid="4608643045752965568">"Rozā"</item>
+    <item msgid="6131821495505931173">"Sarkana"</item>
+  </string-array>
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index f994944..dfef156 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>
@@ -180,7 +180,6 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"Ierīce “%1$s” vēlas piekļūt jūsu ziņojumiem. Vai sniegt piekļuvi ierīcei “%2$s”?"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Datums un laiks"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Laika joslas izvēle"</string>
-    <string name="normal_date_format" msgid="7636406984925498359">"Reģionāls (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Priekšskatījums:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Fonta lielums:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -291,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>
@@ -322,8 +321,6 @@
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Atlasīt laika joslu"</string>
     <string name="date_time_set_date_title" msgid="6928286765325608604">"Datums"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"Iestatīt datumu"</string>
-    <string name="date_time_date_format_title" msgid="3976171711988766411">"Datuma formāts"</string>
-    <string name="date_time_date_format" msgid="6951498879879281102">"Datuma formāta izvēle"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Kārtot alfabēta secībā"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Kārtot pēc laika joslas"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Datums"</string>
@@ -372,7 +369,8 @@
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Uzgaidiet, kamēr tiek šifrēts jūsu tālrunis. Pabeigti <xliff:g id="PERCENT">^1</xliff:g>%."</string>
     <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Uzgaidiet, līdz tiks pabeigta planšetdatora šifrēšana. Atlikušais laiks: <xliff:g id="DURATION">^1</xliff:g>"</string>
     <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Uzgaidiet, līdz tiks pabeigta tālruņa šifrēšana. Atlikušais laiks: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Mēģiniet vēlreiz pēc <xliff:g id="DELAY">^1</xliff:g> sekundēm."</string>
+    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"Lai atbloķētu planšetdatoru, izslēdziet un atkal ieslēdziet to."</string>
+    <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"Lai atbloķētu tālruni, izslēdziet un atkal ieslēdziet to."</string>
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"Brīdinājums: pēc vēl <xliff:g id="COUNT">^1</xliff:g> neveiksmīgiem ierīces atbloķēšanas mēģinājumiem tās dati tiks dzēsti."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Ierakstiet paroli"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Šifrēšana neizdevās."</string>
@@ -401,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>
@@ -412,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>
@@ -556,13 +556,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Kā mikrofons ar skaļruni"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Mūzikai un multividei"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Iegaumēt iestatījumus"</string>
-    <string name="wifi_assistant_intro_setup" msgid="4605105515416995110">"Ievads par\nWi‑Fi Assistant"</string>
-    <string name="wifi_assistant_no_thanks" msgid="2776983751990143934">"NĒ, PALDIES"</string>
-    <string name="wifi_assistant_setup" msgid="3772423650475730906">"IESTATĪT"</string>
-    <string name="wifi_assistant_card_message" msgid="107811647784658536">"Automātiski izveidojiet savienojumu ar pieejamajiem tīkliem, izmantojot lietotni Wi-Fi Assistant."</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi-Fi Assistant"</string>
-    <string name="wifi_assistant_title_message" msgid="6240721017579074015">"<xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> automātiski izveido savienojumu ar vislabāko pieejamo Wi‑Fi tīklu"</string>
-    <string name="wifi_assistant_open_app" msgid="4803044899535675063">"ATVĒRT LIETOTNI"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Izveidots savienojums ar Wi‑Fi palīgu"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"Apraides ekrāns"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Bezvadu attēlošanas iespējošana"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Tuvumā nav atrasta neviena ierīce."</string>
@@ -592,7 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Wi-Fi iestatījumi"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Bezvadu piekļuves punktu iestatīšana un pārvaldība"</string>
-    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Atlasīt Wi-Fi tīklu"</string>
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Wi‑Fi tīkla atlase"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Atlasīt Wi-Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Notiek Wi-Fi ieslēgšana..."</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Notiek Wi-Fi izslēgšana..."</string>
@@ -607,8 +602,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"Meklēšana vienmēr pieejama"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Vienmēr atļaut meklēšanu"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Atļaut Google atrašanās vietas pakalpojumam un citām lietotnēm meklēt tīklus, pat ja Wi-Fi savienojums ir izslēgts"</string>
-    <string name="wifi_automatically_manage_title" msgid="6249976570008992746">"Automātiski pārvaldīt Wi-Fi"</string>
-    <string name="wifi_automatically_manage_summary" msgid="6952470763378312488">"Ļaujiet <xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> pārvaldīt savu Wi-Fi savienojumu."</string>
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Automātiski izmantot atvērtu Wi‑Fi tīklu"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Ļaut Wi‑Fi palīgam automātiski pieslēgties atvērtiem augstas kvalitātes Wi-Fi tīkliem"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Palīga atlase"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Sertifikātu instalēšana"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Atrašanās vietas noteikšanas precizitātes uzlabošanai un citiem nolūkiem Google un citas lietotnes var meklēt tuvumā esošos tīklus pat tad, kad Wi-Fi ir izslēgts. Ja to nevēlaties, atveriet Papildu &gt; Meklēšana vienmēr pieejama."</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Lietotnes var meklēt tuvumā esošos tīklus pat tad, kad Wi-Fi ir izslēgts. Ja to nevēlaties, atveriet Papildu &gt; Meklēšana vienmēr pieejama."</string>
@@ -629,6 +625,7 @@
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Skenēt"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Papildu"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Izveidot savienojumu ar tīklu"</string>
+    <string name="wifi_menu_remember" msgid="8814185749388713796">"Atcerēties tīklu"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Neiegaumēt tīklu"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Pārveidot tīklu"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Rakstīt NFC atzīmē"</string>
@@ -673,9 +670,11 @@
     <string name="wifi_unspecified" msgid="5431501214192991253">"(nav norādīts)"</string>
     <string name="wifi_remembered" msgid="4955746899347821096">"Saglabāts"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"Atspējots"</string>
-    <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Novērsts nekvalitatīvs interneta savienojums"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP konfigurācijas kļūme"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Wi-Fi savienojuma kļūme"</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Autentificēšanas problēma"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Nav diapazona ietvaros"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Nevar noteikt interneta savienojumu. Savienojums netiks izveidots vēlreiz automātiski."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS ir pieejams"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS ir pieejams)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Ievadiet tīkla paroli"</string>
@@ -699,9 +698,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"BRĪDINĀJUMS. Ja izlaidīsiet Wi‑Fi savienojuma izveidi, sākotnējām lejupielādēm un atjauninājumiem planšetdators izmantos tikai mobilos datus. Lai izvairītos no iespējamās maksas par datu izmantošanu, izveidojiet Wi‑Fi savienojumu."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"BRĪDINĀJUMS. Ja izlaidīsiet Wi‑Fi savienojuma izveidi, sākotnējām lejupielādēm un atjauninājumiem ierīce izmantos tikai mobilos datus. Lai izvairītos no iespējamās maksas par datu izmantošanu, izveidojiet Wi-Fi savienojumu."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"BRĪDINĀJUMS. Ja izlaidīsiet Wi‑Fi savienojuma izveidi, sākotnējām lejupielādēm un atjauninājumiem tālrunis izmantos tikai mobilos datus. Lai izvairītos no iespējamās maksas par datu izmantošanu, izveidojiet Wi‑Fi savienojumu."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="2393880108322835846">"BRĪDINĀJUMS. Ja izlaidīsiet Wi‑Fi savienojuma izveidi, planšetdatoram nebūs interneta savienojuma, kas būs nepieciešams sākotnējām lejupielādēm vai atjauninājumiem."</string>
-    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1707391993265558787">"BRĪDINĀJUMS. Ja izlaidīsiet Wi‑Fi savienojuma izveidi, ierīcei nebūs interneta savienojuma, kas būs nepieciešams sākotnējām lejupielādēm vai atjauninājumiem."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="1556858507920033022">"BRĪDINĀJUMS. Ja izlaidīsiet Wi‑Fi savienojuma izveidi, tālrunim nebūs interneta savienojuma, kas būs nepieciešams sākotnējām lejupielādēm vai atjauninājumiem."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Ja neizmantojat Wi‑Fi savienojumu:\n\nJūsu planšetdatorā nebūs interneta savienojuma.\n\nKamēr nebūs izveidots savienojums ar internetu, nesaņemsiet programmatūras atjauninājumus.\n\nPašlaik nevar aktivizēt ierīces aizsardzības funkcijas."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Ja neizmantojat Wi‑Fi savienojumu:\n\nJūsu ierīcē nebūs interneta savienojuma.\n\nKamēr nebūs izveidots savienojums ar internetu, nesaņemsiet programmatūras atjauninājumus.\n\nPašlaik nevar aktivizēt ierīces aizsardzības funkcijas."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Ja neizmantojat Wi‑Fi savienojumu:\n\nJūsu tālrunī nebūs interneta savienojuma.\n\nKamēr nebūs izveidots savienojums ar internetu, nesaņemsiet programmatūras atjauninājumus.\n\nPašlaik nevar aktivizēt ierīces aizsardzības funkcijas."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Planšetdatorā nevarēja izveidot savienojumu ar Wi-Fi tīklu."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"Ierīcē nevarēja izveidot savienojumu ar Wi-Fi tīklu."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Tālrunī nevarēja izveidot savienojumu ar Wi-Fi tīklu."</string>
@@ -761,7 +760,6 @@
     <string name="ring_volume_title" msgid="7938706566797464165">"Zvanītāja skaļums"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrē klusuma režīmā"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Noklusējuma paziņojuma skaņa"</string>
-    <string name="heads_up_enabled_title" msgid="1031078221910921622">"Uznirstoši (augsta prioritāte)"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Zvana signāls"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Paziņojums"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Paziņojumiem izmantot ienākošā zvana skaļumu"</string>
@@ -834,7 +832,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Automātisks spilgtums"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Pacelt, lai ieslēgtu"</string>
     <string name="doze_title" msgid="2259176504273878294">"Ambients displejs"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"Aktivizēt ekrānu, kad ierīcē tiek saņemts zvans vai paziņojumi"</string>
+    <string name="doze_summary" msgid="7128970177894383698">"Ekrāns tiek aktivizēts, kad paņemat ierīci vai saņemat paziņojumus."</string>
     <string name="title_font_size" msgid="4405544325522105222">"Fonta lielums"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Fonta lielums"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM kartes bloķēšanas iestatījumi"</string>
@@ -862,6 +860,10 @@
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Atcelt"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"Atrastas vairākas SIM kartes"</string>
     <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>
+    <string name="sim_preferred_title" msgid="5567909634636045268">"Vai atjaunināt izvēlēto SIM?"</string>
+    <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> ir vienīgā SIM karte jūsu ierīcē. Vai vēlaties izmantot šo SIM karti mobilajiem datiem, zvaniem un īsziņām?"</string>
     <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>
@@ -1012,6 +1014,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Tādējādi tiks izdzēsti visi planšetdatora "<b>"iekšējā atmiņā"</b>" esošie dati, tostarp:\n\n"<li>"Google konta dati;"</li>\n<li>"sistēmas un lietotņu dati un iestatījumi;"</li>\n<li>"lejupielādētās lietotnes."</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Tiks dzēsti visi tālruņa "<b>"iekšējā atmiņā"</b>" esošie dati, tostarp:\n\n"<li>"Google konta dati;"</li>\n<li>"sistēmas un lietotņu dati un iestatījumi;"</li>\n<li>"lejupielādētās lietotnes."</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Pašlaik esat pierakstījies šādos kontos:\n"</string>
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Šo ierīci izmanto vēl citi lietotāji.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Mūzika"</li>\n<li>"Fotoattēli"</li>\n<li>"Citi lietotāja dati"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Lai dzēstu mūziku, attēlus un citus lietotāja datus, ir jāizdzēš "<b>"USB atmiņas"</b>" saturs."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Lai dzēstu mūziku, attēlus un citus lietotāja datus, ir jādzēš "<b>"SD kartes"</b>" saturs."</string>
@@ -1023,7 +1026,6 @@
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Atiestatīt tālruni"</string>
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Vai dzēst visu jūsu personīgo informāciju un visas lejupielādētās lietotnes? Šo darbību nevar atcelt!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Dzēst visu"</string>
-    <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Zīmējiet atbloķēšanas kombināciju."</string>
     <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Lai apstiprinātu rūpnīcas datu atiestatīšanu, norādiet grafisko atslēgu."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Atiestatīšana netika veikta, jo nav pieejams pakalpojums Sistēmas tīrīšana."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Vai atiestatīt?"</string>
@@ -1041,7 +1043,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"Vai izdzēst USB atmiņas saturu, dzēšot visus tajā glabātos failus? Šo darbību nevar atcelt."</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Vai izdzēst SD kartes saturu, tostarp visus tajā saglabātos failus? Šo darbību nevar atcelt!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Dzēst visu"</string>
-    <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Zīmējiet atbloķēšanas kombināciju."</string>
     <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Lai apstiprinātu USB atmiņas satura dzēšanu, norādiet grafisko atslēgu."</string>
     <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Lai apstiprinātu SD kartes satura dzēšanu, norādiet grafisko atslēgu."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Zvanu iestatījumi"</string>
@@ -1087,6 +1088,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Lūdzu, ievietojiet SIM karti un restartējiet."</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Lūdzu, izveidojiet savienojumu ar internetu."</string>
     <string name="location_title" msgid="1029961368397484576">"Mana atrašanās vieta"</string>
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Darba profils"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Darba profila atrašanās vieta"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Izslēdza jūsu uzņēmums"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Režīms"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Augsta precizitāte"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Akumulatora jaudas taupīšana"</string>
@@ -1124,6 +1128,7 @@
     <string name="copyright_title" msgid="865906688917260647">"Autortiesības"</string>
     <string name="license_title" msgid="1990487604356037871">"Licence"</string>
     <string name="terms_title" msgid="7697580845616764642">"Pakalpojumu sniegšanas noteikumi"</string>
+    <string name="webview_license_title" msgid="2813507464175738967">"Sistēmas WebView licence"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Fona tapetes"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Satelītuzņēmumu nodrošinātāji:\n©2014 CNES/Astrium, DigitalGlobe, Bluesky"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Atklātā pirmkoda licences"</string>
@@ -1237,7 +1242,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB krātuve"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"SD kartē"</string>
     <string name="disabled" msgid="9206776641295849915">"Atspējots"</string>
-    <string name="not_installed" msgid="1475144352069281880">"Nav instalēts"</string>
+    <string name="not_installed" msgid="2797554494953450291">"Nav instalēta šim lietotājam"</string>
     <string name="no_applications" msgid="7336588977497084921">"Nav lietotņu"</string>
     <string name="internal_storage" msgid="1584700623164275282">"Iekšējā krātuve"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB krātuve"</string>
@@ -1434,8 +1439,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Uzlādes laikā ekrāns nekad nepārslēgsies miega režīmā"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Iespējot Bluetooth HCI analizētāja žurnālu"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Tvert visas Bluetooth HCI paketes failā"</string>
-    <string name="oem_unlock_enable" msgid="6629321276287913315">"Iespējot OEM bloķēšanu"</string>
-    <string name="oem_unlock_enable_summary" msgid="3546686263996628110">"Atļaut ierīcē izmantot OEM atbloķēšanu"</string>
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM atbloķēšana"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Atļaut palaišanas ielādētāja atbloķēšanu"</string>
+    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Ievadiet savu PIN kodu."</string>
+    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Lai iespējotu OEM atbloķēšanu, ievadiet ierīces PIN kodu."</string>
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Vai atļaut OEM atbloķēšanu?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"BRĪDINĀJUMS. Kamēr šis iestatījums būs ieslēgts, ierīces aizsardzības funkcijas nedarbosies."</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Bezvadu attēlošanas sertifikācija"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Iespējot Wi‑Fi detalizēto reģistrēšanu"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Agresīva pāreja no Wi‑Fi uz mobilo tīklu"</string>
@@ -1538,6 +1547,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"Paraksti izskatīsies šādi:"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"Noklusējums"</string>
+    <string name="color_title" msgid="4258931051732243983">"Krāsa"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"Noklusējuma"</string>
     <string name="color_none" msgid="3475640044925814795">"Nav"</string>
     <string name="color_white" msgid="8045195170201590239">"Balta"</string>
@@ -1595,12 +1605,12 @@
     <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">"Vēl <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"Atlikušais uzlādes laiks: <xliff:g id="UNTIL_CHARGED">%1$s</xliff:g>"</string>
-    <string name="power_discharging_duration" msgid="7125493014448497620">"<xliff:g id="LEVEL">%1$d</xliff:g>%% — aptuvenais atlikušais laiks: <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="power_charging" msgid="712751285832976915">"<xliff:g id="LEVEL">%1$d</xliff:g>%% — <xliff:g id="STATE">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration" msgid="4802183864773082009">"<xliff:g id="LEVEL">%1$d</xliff:g>%% — <xliff:g id="TIME">%2$s</xliff:g> līdz pilnai uzlādei"</string>
-    <string name="power_charging_duration_ac" msgid="3611179931297824699">"<xliff:g id="LEVEL">%1$d</xliff:g>%% — <xliff:g id="TIME">%2$s</xliff:g> līdz pilnai maiņstrāvas uzlādei"</string>
-    <string name="power_charging_duration_usb" msgid="1106605348913397583">"<xliff:g id="LEVEL">%1$d</xliff:g>%% — <xliff:g id="TIME">%2$s</xliff:g> līdz pilnai USB uzlādei"</string>
-    <string name="power_charging_duration_wireless" msgid="633606920144617227">"<xliff:g id="LEVEL">%1$d</xliff:g>%% — <xliff:g id="TIME">%2$s</xliff:g> līdz pilnai bezvadu uzlādei"</string>
+    <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> — aptuvenais atlikušais laiks: <xliff:g id="TIME">%2$s</xliff:g>"</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> līdz pilnai uzlādei"</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> līdz pilnai maiņstrāvas uzlādei"</string>
+    <string name="power_charging_duration_usb" msgid="182405645340976546">"<xliff:g id="LEVEL">%1$s</xliff:g> — <xliff:g id="TIME">%2$s</xliff:g> līdz pilnai USB uzlādei"</string>
+    <string name="power_charging_duration_wireless" msgid="1829295708243159464">"<xliff:g id="LEVEL">%1$s</xliff:g> — <xliff:g id="TIME">%2$s</xliff:g> līdz pilnai bezvadu uzlādei"</string>
     <string name="power_usage_list_summary" msgid="2409288197839512482">"Lietojums kopš pēdējās pilnās uzlādes"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Akumulatora lietojums kopš atslēgšanas"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Akumulatora patēriņš kopš atiestatīšanas"</string>
@@ -1617,7 +1627,6 @@
     <string name="awake" msgid="387122265874485088">"Ierīces nomoda laiks"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi uz laiku"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi uz laiku"</string>
-    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Vēstures dati"</string>
     <string name="details_title" msgid="3792801565213935385">"Lietojuma dati"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Izmantot detaļas"</string>
@@ -1689,7 +1698,7 @@
     <string name="battery_saver" msgid="1426682272004907982">"Akumulatora enerģijas taupīšanas režīms"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Ieslēgt automātiski"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Nekad"</string>
-    <string name="battery_saver_turn_on_automatically_pct" msgid="3033681629861428940">"ar akumulatora enerģijas līmeni %1$d%%"</string>
+    <string name="battery_saver_turn_on_automatically_pct" msgid="7536784431655058267">"ar akumulatora jaudu %1$s"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Procesu statistika"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Statistika par darbības procesiem"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Atmiņas lietojums"</string>
@@ -1813,7 +1822,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Krātuve aparatūrā"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Tikai programmatūrā"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"Šim lietotājam nav pieejami akreditācijas dati."</string>
-    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Norādiet atbloķēšanas kombināciju."</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Lai apstiprinātu akreditācijas datu instalēšanu, norādiet atbloķēšanas kombināciju."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Ierakstiet akreditācijas datu krātuves paroli."</string>
@@ -1843,6 +1851,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"Lietotņu datu iekļaušana"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Automātiska atjaunošana"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Atkārtoti instalējot lietotni, atjaunot dublētos iestatījumus un datus"</string>
+    <string name="backup_inactive_title" msgid="5355557151569037197">"Dublēšanas pakalpojums nav aktīvs."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"Šo iestata ierīces politika."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Datora dublējuma parole"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Darbvirsmas pilnie dublējumi pašlaik nav aizsargāti."</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Pieskarieties, lai mainītu vai noņemtu paroli pilniem darbvirsmas dublējumiem."</string>
@@ -1952,7 +1962,11 @@
     <string name="enter_password" msgid="8035706727471334122">"Lai startētu Android ierīci, ievadiet savu paroli"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Lai startētu Android ierīci, ievadiet savu PIN kodu"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Lai startētu Android ierīci, uzzīmējiet savu kombināciju"</string>
-    <string name="try_again" msgid="4272075051293936921">"Mēģiniet vēlreiz."</string>
+    <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"Nepareiza kombinācija."</string>
+    <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"Nepareiza parole."</string>
+    <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"Nepareizs PIN kods."</string>
+    <string name="checking_decryption" msgid="8287458611802609493">"Notiek pārbaude..."</string>
+    <string name="starting_android" msgid="8581493237458496835">"Notiek Android startēšana"</string>
     <string name="delete" msgid="4219243412325163003">"Dzēst"</string>
     <string name="misc_files" msgid="6720680815969643497">"Dažādi faili"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"Atlasīti <xliff:g id="NUMBER">%1$d</xliff:g> no <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -1990,8 +2004,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Vienmēr izmantot GPU atveidi ekrāna salikšanai"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"Simulēt krāstelpu"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Iespējot OpenGL trases"</string>
-    <string name="use_nuplayer" msgid="5699257393367904387">"Izmantot NuPlayer (eksp.)"</string>
-    <string name="use_nuplayer_summary" msgid="1991479067478516714">"AwesomePlayer vietā izmantot NuPlayer"</string>
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"Izmant. AwesomePlayer (novec.)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"Atskaņot multivides saturu ar AwesomePlayer, nevis NuPlayer"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"Atspējot USB audio maršr."</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"Atspējot auto maršr. uz USB audio ārējām ierīcēm"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Rādīt izkārtojuma robežas"</string>
@@ -2167,7 +2181,6 @@
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Pievienot lietotāju vai profilu"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Pievienot lietotāju"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Ierobežots profils"</string>
-    <string name="user_summary_managed_profile" msgid="7369539529693048111">"Darba profils"</string>
     <string name="user_need_lock_message" msgid="2596365678651842785">"Lai varētu izveidot ierobežotu profilu, jums jāiestata ekrāna bloķēšana, kas aizsargās jūsu lietotni un personas datus."</string>
     <string name="user_set_lock_button" msgid="8311219392856626841">"Iestatīt bloķēšanu"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Nav iestatīts"</string>
@@ -2298,11 +2311,13 @@
     <string name="sim_cellular_data_unavailable_summary" msgid="3654805961942166428">"Pieskarieties, lai izvēlētos datu SIM karti."</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"Vienmēr izmantot šo iestatījumu zvaniem"</string>
     <string name="select_sim_for_data" msgid="2366081042162853044">"Atlasīt SIM karti datu pārraidei"</string>
+    <string name="data_switch_started" msgid="2040761479817166311">"Notiek datu SIM kartes mainīšana. Tas neaizņems vairāk par minūti..."</string>
     <string name="select_sim_for_calls" msgid="3503094771801109334">"Izmantot zvaniem"</string>
     <string name="sim_select_card" msgid="211285163525563293">"SIM kartes atlasīšana"</string>
     <string name="sim_card_number_title" msgid="7845379943474336488">"SIM karte <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"SIM karte ir tukša"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"SIM kartes nosaukums"</string>
+    <string name="sim_name_hint" msgid="7038643345238968930">"Ievadiet SIM nosaukumu"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"SIM kartes slots: %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Mobilo sakaru operators"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Numurs"</string>
@@ -2312,7 +2327,6 @@
     <string name="color_purple" msgid="3888532466427762504">"Violeta"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"Nav ievietota neviena SIM karte."</string>
     <string name="sim_status_title" msgid="6744870675182447160">"SIM kartes statuss"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"Ar SIM saistīta informācija"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"Atzvanīšana no noklusējuma SIM kartes"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"SIM karte izejošajiem zvaniem"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Citi zvanu iestatījumi"</string>
@@ -2320,8 +2334,11 @@
     <string name="preferred_network_offload_header" msgid="2321173571529106767">"Tīklu nosauk. apraides atspēj."</string>
     <string name="preferred_network_offload_footer" msgid="5857279426054744020">"Tīklu nosaukumu apraides atspējošana neļauj trešajām pusēm piekļūt informācijai par jūsu tīklu."</string>
     <string name="preferred_network_offload_popup" msgid="2252915199889604600">"Atspējojot tīklu nosaukumu apraidi, netiek atļauta automātiska pieslēgšanās slēptiem tīkliem."</string>
+    <string name="sim_signal_strength" msgid="9144010043784767984">"<xliff:g id="DBM">%1$d</xliff:g> dBm <xliff:g id="ASU">%2$d</xliff:g> asu"</string>
+    <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>
+    <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Vaicāt katru reizi"</string>
     <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>
@@ -2330,22 +2347,22 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Nesen izmantotie meklēšanas vaicājumi"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Rezultāti"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi Wi-Fi tīkls savienojums"</string>
-    <string name="keywords_more_default_sms_app" msgid="2744404159003574745">"īsziņa"</string>
-    <string name="keywords_more_mobile_networks" msgid="7813380887358745769">"mobilais tīkls mobilo sakaru operators bezvadu"</string>
+    <string name="keywords_more_default_sms_app" msgid="895656981962034647">"īsziņa sūtīt īsziņu ziņas ziņojumapmaiņa"</string>
+    <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"mobilais operators bezvadu dati 4g 3g 2g lte"</string>
     <string name="keywords_home" msgid="3626170808219458848">"palaišanas programma"</string>
     <string name="keywords_display" msgid="6709007669501628320">"ekrāns skārienekrāns"</string>
-    <string name="keywords_display_brightness_level" msgid="8636451602230815191">"tumšs ekrāns skārienekrāns"</string>
-    <string name="keywords_display_auto_brightness" msgid="8070218600502753102">"tumšs ekrāns skārienekrāns"</string>
-    <string name="keywords_display_wallpaper" msgid="4315466287469834939">"fons"</string>
+    <string name="keywords_display_brightness_level" msgid="8923289340474728990">"tumšs ekrāns skārienekrāns akumulators"</string>
+    <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"tumšs ekrāns skārienekrāns akumulators"</string>
+    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"fons personalizēt pielāgot displejs"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"teksta lielums"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"projicēt"</string>
-    <string name="keywords_storage" msgid="7007275853993419928">"vieta disks cietais disks"</string>
-    <string name="keywords_battery" msgid="3992479295298655138">"barošana"</string>
-    <string name="keywords_spell_checker" msgid="4509482591225399210">"pareizrakstības pārbaude"</string>
+    <string name="keywords_storage" msgid="6572905220031852173">"vieta disks cietai disks ierīce lietojums"</string>
+    <string name="keywords_battery" msgid="2096185085932675704">"jauda lietojums uzlāde"</string>
+    <string name="keywords_spell_checker" msgid="6106749039734174140">"pareizrakstība vārdnīca pareizrakstības pārbaude automātiskā labošana"</string>
     <string name="keywords_voice_input" msgid="3519547605812413860">"atpazinējs ievade runa runāt valoda brīvroku atpazīšana aizskarošs vārds audiovēsture bluetooth austiņas"</string>
-    <string name="keywords_text_to_speech_output" msgid="8207889472282225512">"vērtēt valoda runāt runāšana"</string>
-    <string name="keywords_date_and_time" msgid="7666950126499155141">"pulkstenis"</string>
-    <string name="keywords_factory_data_reset" msgid="3693730656843989732">"notīrīt dzēst"</string>
+    <string name="keywords_text_to_speech_output" msgid="392447904221657930">"ātrums valoda noklusējums runāt runāšana tts pieejamība lasītājs neredzīgs"</string>
+    <string name="keywords_date_and_time" msgid="2631808108134830066">"pulkstenis 24 stundu"</string>
+    <string name="keywords_factory_data_reset" msgid="4355133848707691977">"dzēst atjaunot notīrīt noņemt"</string>
     <string name="keywords_printing" msgid="1701778563617114846">"printeris"</string>
     <string name="keywords_sounds_and_notifications" msgid="5965996187974887000">"skaļrunis signāls"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="2912933812460077912">"netraucēt pārtraukt pārtraukums"</string>
@@ -2354,7 +2371,7 @@
     <string name="keywords_location_mode" msgid="8584992704568356084">"precizitāte"</string>
     <string name="keywords_accounts" msgid="1957925565953357627">"konts"</string>
     <string name="keywords_users" msgid="4673901601478559100">"ierobežojums ierobežot ierobežots"</string>
-    <string name="keywords_keyboard_and_ime" msgid="1103378692379215672">"teksta korekcija labot signāls vibrācija automātiski valoda žests ieteikt ieteikums motīvs aizskarošs vārds rakstīt emocijzīmes"</string>
+    <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"teksts labojums labot skaņa vibrācija automātisks valoda žests ieteikt ieteikums motīvs aizvainojošs vārds rakstīt emocijzīmes starptautisks"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"vilkt parole kombinācija pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Iestatīt Wi-Fi NFC atzīmi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Rakstīt"</string>
@@ -2371,7 +2388,6 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Paziņojumu skaļums"</string>
     <string name="zen_mode_settings_title" msgid="7014915558669122902">"Pārtraukumi"</string>
     <string name="zen_mode_option_title" msgid="5061978632306007914">"Saņemot zvanus un paziņojumus"</string>
-    <string name="zen_mode_option_title_novoice" msgid="6680706009915204785">"Saņemot paziņojumus"</string>
     <string name="zen_mode_option_off" msgid="3167702608910820883">"Vienmēr pārtraukt"</string>
     <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Atļaut tikai prioritāros pārtraukumus"</string>
     <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Nepārtraukt"</string>
@@ -2429,14 +2445,17 @@
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Gatavs"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Līdz brīdim, kad ieslēgsiet"</string>
     <string name="zen_mode_important_category" msgid="8123274463331022993">"Prioritārie pārtraukumi"</string>
-    <string name="zen_mode_downtime_category" msgid="4730179065426038108">"Dīkstāve (tikai prioritārie pārtraukumi)"</string>
+    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Dīkstāve"</string>
     <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Dienas"</string>
     <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Nav"</string>
+    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Pārtraukumi atļauti"</string>
+    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Tikai prioritārie"</string>
+    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Nav"</string>
     <string name="zen_mode_automation_category" msgid="4653551005950835761">"Automatizācija"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Automātiska ieslēgšana"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Nekad"</string>
-    <string name="zen_mode_phone_calls" msgid="8956214416859303966">"Zvani"</string>
+    <string name="zen_mode_calls" msgid="7051492091133751208">"Zvani"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Ziņojumi"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Zvani/ziņojumi no:"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Ikviens"</string>
@@ -2450,7 +2469,9 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Darbadienu naktīs"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Sākuma laiks"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Beigu laiks"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> (nākamajā dienā)"</string>
+    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> nākamajā dienā"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> vai tad, ja iepriekš atskan signāls"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> nākamajā dienā vai tad, ja iepriekš atskan signāls"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Lietotņu paziņojumi"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Paziņojumu iestatījumi"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Sūtīt atsauksmes par šo ierīci"</string>
@@ -2458,7 +2479,11 @@
     <string name="switch_on_text" msgid="1124106706920572386">"Ieslēgts"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Izslēgts"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"Ekrāna piespraušana"</string>
-    <string name="screen_pinning_description" msgid="7091642350452605379">"Kad ir ieslēgta ekrāna piespraušana, var tikt rādīts pašreizējais ekrāns, līdz to atspraudīsiet.\n\nLai izmantotu ekrāna piespraušanu:\n\n1. Ieslēdziet ekrāna piespraušanu.\n\n2. Atveriet ekrānu, kuru vēlaties piespraust.\n\n3. Pieskarieties vienumam “Pārskats”.\n\n4. Pieskarieties spraudītes ikonai."</string>
+    <string name="screen_pinning_description" msgid="1137904524037468263">"Ja iestatījums ir ieslēgts, varat piespraust ekrānu. Ekrāns būs redzams, kamēr to neatspraudīsiet.\n\nKā piespraust\n\n1. Ekrāna piespraušanai ir jābūt ieslēgtai.\n\n2. Atveriet ekrānu, kuru vēlaties piespraust.\n\n3. Pieskarieties vienumam “Pārskats”.\n\n4. Velciet augšup un pēc tam pieskarieties piespraušanas ikonai."</string>
+    <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Pirms atspraušanas pieprasīt grafisko atslēgu"</string>
+    <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Pirms atspraušanas pieprasīt PIN"</string>
+    <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Pirms atspraušanas pieprasīt paroli"</string>
+    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Bloķēt ierīci, kad tiek veikta atspraušana"</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Darba profils"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Eksperimentāla)"</string>
     <string name="display_auto_rotate_title" msgid="6176450657107806043">"Kad ierīce tiek pagriezta"</string>
@@ -2467,7 +2492,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Saglabāt ainavas skatu"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Saglabāt pašreizējo virzienu"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI informācija"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"Ar IMEI saistīta informācija"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Šifrējums"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Turpināt"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"Varat uzlabot šīs ierīces drošības līmeni, iestatot, lai pirms ierīces palaišanas tiktu pieprasīts PIN. Kamēr ierīce nav palaista, nevar saņemt zvanus, ziņojumus vai paziņojumus, tostarp modinātāja signālus.\n\nTādējādi tiek uzlabota datu aizsardzība pazaudētās vai nozagtās ierīcēs."</string>
@@ -2485,4 +2509,7 @@
     <string name="encrypt_talkback_dialog_message_pin" msgid="1890374082842868489">"Kad ievadīsiet PIN kodu, lai sāknētu šo ierīci, pieejamības pakalpojumi, piemēram, <xliff:g id="SERVICE">%1$s</xliff:g>, vēl nebūs pieejami."</string>
     <string name="encrypt_talkback_dialog_message_pattern" msgid="4474332516537386384">"Kad ievadīsiet kombināciju, lai sāknētu šo ierīci, pieejamības pakalpojumi, piemēram, <xliff:g id="SERVICE">%1$s</xliff:g>, vēl nebūs pieejami."</string>
     <string name="encrypt_talkback_dialog_message_password" msgid="8166099418487083927">"Kad ievadīsiet paroli, lai sāknētu šo ierīci, pieejamības pakalpojumi, piemēram, <xliff:g id="SERVICE">%1$s</xliff:g>, vēl nebūs pieejami."</string>
+    <string name="imei_information_title" msgid="8499085421609752290">"IMEI informācija"</string>
+    <string name="imei_information_summary" msgid="2074095606556565233">"Ar IMEI saistīta informācija"</string>
+    <string name="slot_number" msgid="3762676044904653577">"(<xliff:g id="SLOT_NUM">%1$d</xliff:g>. slots)"</string>
 </resources>
diff --git a/res/values-mk-rMK/arrays.xml b/res/values-mk-rMK/arrays.xml
index d802371..6479149 100644
--- a/res/values-mk-rMK/arrays.xml
+++ b/res/values-mk-rMK/arrays.xml
@@ -527,4 +527,12 @@
     <item msgid="4338089220026248848">"Кеширана (клиент за активност)"</item>
     <item msgid="6652164677254579050">"Кеширана (празна)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Тиркизна"</item>
+    <item msgid="8332294763632946560">"Сина"</item>
+    <item msgid="2023216417616991392">"Индиго"</item>
+    <item msgid="3170497246594232819">"Виолетова"</item>
+    <item msgid="4608643045752965568">"Розова"</item>
+    <item msgid="6131821495505931173">"Црвена"</item>
+  </string-array>
 </resources>
diff --git a/res/values-mk-rMK/strings.xml b/res/values-mk-rMK/strings.xml
index f1df723..9ef06b4 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>
@@ -180,7 +180,6 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s сака да пристапи кон вашите пораки. Дозволи пристап на %2$s?"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Датум и време"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Избери временска зона"</string>
-    <string name="normal_date_format" msgid="7636406984925498359">"Регионален (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Преглед:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Големина на фонт:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -291,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>
@@ -322,8 +321,6 @@
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Избери временска зона"</string>
     <string name="date_time_set_date_title" msgid="6928286765325608604">"Датум"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"Подеси датум"</string>
-    <string name="date_time_date_format_title" msgid="3976171711988766411">"Формат на датум"</string>
-    <string name="date_time_date_format" msgid="6951498879879281102">"Избери формат на датум"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Подреди по азбучен ред"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Подреди по временска зона"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Датум"</string>
@@ -372,7 +369,8 @@
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Почекајте додека телефон се шифрира. <xliff:g id="PERCENT">^1</xliff:g>% завршено."</string>
     <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Почекајте додека се кодира вашиот таблет. Преостанато време: <xliff:g id="DURATION">^1</xliff:g>"</string>
     <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Почекајте додека се кодира вашиот телефон. Преостанато време: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Обидете се повторно за <xliff:g id="DELAY">^1</xliff:g> секунди."</string>
+    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"За да го отклучите таблетот, исклучете го и повторно вклучете го."</string>
+    <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"За да го отклучите телефонот, исклучете го и повторно вклучете го."</string>
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"Предупредување: уредот ќе се избрише по уште <xliff:g id="COUNT">^1</xliff:g> неуспешни обиди да се отклучи!"</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Напиши ја лозинката"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Шифрирањето е неуспешно"</string>
@@ -401,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>
@@ -412,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>
@@ -556,13 +556,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Како интерфон"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"За музика и медиуми"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Запомни подесувања"</string>
-    <string name="wifi_assistant_intro_setup" msgid="4605105515416995110">"Зап. со\nWi‑Fi Помош."</string>
-    <string name="wifi_assistant_no_thanks" msgid="2776983751990143934">"НЕ, БЛАГОДАРАМ"</string>
-    <string name="wifi_assistant_setup" msgid="3772423650475730906">"ПОСТАВИ"</string>
-    <string name="wifi_assistant_card_message" msgid="107811647784658536">"Автоматски поврзете се со достапни мрежи со Помошник за Wi‑Fi."</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Помошник за Wi‑Fi"</string>
-    <string name="wifi_assistant_title_message" msgid="6240721017579074015">"<xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> автоматски ве поврзува со најдобрата достапна Wi‑Fi мрежа"</string>
-    <string name="wifi_assistant_open_app" msgid="4803044899535675063">"ОТВОРИ АПЛИКАЦИЈА"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Поврзано преку помошник за Wi-Fismile"</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>
@@ -592,7 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Подесувања за Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Постави и управувај со безжични пристапни точки"</string>
-    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Избери Wi-Fi"</string>
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Изберете Wi-Fi мрежа"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Избери Wi-Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Вклучување на Wi-Fi..."</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Исклучување на Wi-Fi..."</string>
@@ -607,8 +602,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"Скенирањето е секогаш достапно"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Секогаш дозволувај скенирање"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Дозволете услугата за локација на Google и други апликации да скенираат за мрежи, дури и кога Wi-Fi е исклучена"</string>
-    <string name="wifi_automatically_manage_title" msgid="6249976570008992746">"Автоматски управувајте со Wi‑Fi"</string>
-    <string name="wifi_automatically_manage_summary" msgid="6952470763378312488">"Дозволете <xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> да управува со поврзувањето на Wi‑Fi"</string>
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Автоматски користете отворена Wi‑Fi"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Дозволете помошникот за Wi‑Fi автоматски да се поврзува со отворени мрежи со висок квалитет"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Изберете помошник"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Инсталирај сертификати"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"За да се подобри точноста на локација и за други цели, Google и другите апликации може да скенираат за мрежи во околината, дури и кога Wi-Fi е исклучена. Ако не сакате да се случи ова, одете во Напредно &gt; Скенирање секогаш достапно."</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Апликациите може да скенираат за мрежи во околината, дури и кога Wi-Fi е исклучена. Ако не сакате да се случи ова, одете на Напредно &gt; Скенирање секогаш достапно."</string>
@@ -629,6 +625,7 @@
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Скенирај"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Напредни"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Поврзи се на мрежа"</string>
+    <string name="wifi_menu_remember" msgid="8814185749388713796">"Запомни мрежа"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Заборави мрежа"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Измени мрежа"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Пишувајте на ознака за НФЦ"</string>
@@ -673,9 +670,11 @@
     <string name="wifi_unspecified" msgid="5431501214192991253">"(неодредени)"</string>
     <string name="wifi_remembered" msgid="4955746899347821096">"Зачувано"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"Оневозможено"</string>
-    <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Избегнува слаба конекција на интернет"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"Конфигурирањето ИП не успеа"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Поврзувањето преку Wi-Fi не успеа"</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Проблем со автентикација"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Надвор од опсег"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Не е откриен пристап до интернет, нема автоматски повторно да се поврзете."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"Достапен WPS"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (Достапен WPS)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Внесете ја вашата мрежна лозинка"</string>
@@ -699,9 +698,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"ПРЕДУПРЕДУВАЊЕ: Ако прескокнете Wi‑Fi, таблетот ќе користи само мобилни податоци за првични преземања или ажурирања. За да избегнете можни трошоци за податоци, поврзете се на Wi‑Fi."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"ПРЕДУПРЕДУВАЊЕ: Ако прескокнете Wi‑Fi, уредот ќе користи само мобилни податоци за првични преземања или ажурирања. За да избегнете можни трошоци за податоци, поврзете се на Wi‑Fi."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"ПРЕДУПРЕДУВАЊЕ: Ако прескокнете Wi‑Fi, телефонот ќе користи само мобилни податоци за првични преземања или ажурирања. За да избегнете можни трошоци за податоци, поврзете се на Wi‑Fi."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="2393880108322835846">"ПРЕДУПРЕДУВАЊЕ: Ако прескокнете Wi‑Fi, таблетот нема да биде поврзан на интернет за какви било првични преземања или ажурирања."</string>
-    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1707391993265558787">"ПРЕДУПРЕДУВАЊЕ: Ако прескокнете Wi‑Fi, уредот нема да биде поврзан на интернет за какви било првични преземања или ажурирања."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="1556858507920033022">"ПРЕДУПРЕДУВАЊЕ: Ако прескокнете Wi‑Fi, телефонот нема да биде поврзан на интернет за какви било првични преземања или ажурирања."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Доколку го прескокнете Wi‑Fi:\n\nТаблетот нема да има интернет-поврзување.\n\nНема да добивате софтверски ажурирања сѐ додека не се поврзете на интернет.\n\nВо моментов, не може да ги активирате функциите за заштита на уредот."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Доколку го прескокнете Wi‑Fi:\n\nУредот нема да има интернет-поврзување.\n\nНема да добивате софтверски ажурирања сѐ додека не се поврзете на интернет.\n\nВо моментов, не може да ги активирате функциите за заштита на уредот."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Доколку го прескокнете Wi‑Fi:\n\nТелефонот нема да има интернет-поврзување.\n\nНема да добивате софтверски ажурирања сѐ додека не се поврзете на интернет.\n\nВо моментов, не може да ги активирате функциите за заштита на уредот."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Таблетот не можеше да се поврзете со оваа Wi-Fi мрежа."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"Уредот не можеше да се поврзе на оваа мрежа на Wi‑Fi."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Телефонот не можеше да се поврзе со оваа Wi-Fi мрежа."</string>
@@ -761,7 +760,6 @@
     <string name="ring_volume_title" msgid="7938706566797464165">"Јачина на ѕвонење"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Вибрира кога е на тивко"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Стандарден звук за известување"</string>
-    <string name="heads_up_enabled_title" msgid="1031078221910921622">"Покажи ако е висок приоритет"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Мелодија"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Известување"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Користи јачина на звук на дојдовен повик за известувања"</string>
@@ -834,7 +832,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Автоматска осветленост"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Подигнете да се активира"</string>
     <string name="doze_title" msgid="2259176504273878294">"Амбиентален екран"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"Разбуди го екранот кога ќе се крене уредот или ќе пристигнат известувања"</string>
+    <string name="doze_summary" msgid="7128970177894383698">"Екран за будење кога ќе го подигнете уредот или ќе примите известувања"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Големина на фонт"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Големина на фонт"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Подесувања на заклучување на SIM картичка"</string>
@@ -862,6 +860,10 @@
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Откажи"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"Пронајдени се повеќе СИМ-картички"</string>
     <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> е единственaта СИМ-картичка во вашиот уред. Дали сакате да ја користите оваа СИМ-картичка за мобилни податоци, повици и СМС-пораки?"</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>
@@ -1012,6 +1014,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Ова ќе ги избрише сите податоци од "<b>"внатрешна меморија"</b>"на вашиот таблет, заедно со:\n\n"<li>"вашата сметка на Google"</li>\n<li>"податоци и подесувања на систем и апликации"</li>\n<li>"преземени апликации"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Ова ќе ги избрише сите податоци од "<b>"внатрешната меморија"</b>" на телефонот, заедно со:\n\n"<li>"вашата сметка на Google"</li>\n<li>"податоци и подесувања на систем и апликации"</li>\n<li>"преземени апликации"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Моментално сте најавени на следниве сметки:\n"</string>
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Присутни се и други корисници на уредот.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Музика"</li>\n<li>"Фотографии"</li>\n<li>"Други податоци за корисникот"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"За да исчистите музика, слики и други податоци на корисникот, "<b>"меморијата"</b>" треба да се избрише."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"За да исчистите музика, слики и други податоци на корисникот, "<b>"СД картичката"</b>" треба да се избрише."</string>
@@ -1023,7 +1026,6 @@
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Ресетирај телефон"</string>
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Избришете ги сите ваши лични податоци и преземени апликации? Не може да се врати ова дејство!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Избриши сè"</string>
-    <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Употреби шема за отклучување"</string>
     <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Треба да ја употребите шемата за отклучување за да потврдите ресетирање на податоците до фабричките подесувања."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Не се изврши ресетирање зашто услугата за чистење на системот не е достапна."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Ресетирај?"</string>
@@ -1041,7 +1043,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"Избриши ја УСБ меморијата, избриши ги сите датотеки меморирани таму? Не може да се врати ова дејство!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Избриши ја СД картичката, избриши ги сите датотеки меморирани таму? Не може да се врати ова дејство!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Избриши сè"</string>
-    <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Употреби шема за отклучување"</string>
     <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Треба да ја употребите шемата за отклучување за да потврдите дека сакате да ја избришете УСБ меморијата."</string>
     <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Треба да ја употребите шемата за отклучување за да потврдите дека сакате да ја избришете СД картичката."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Подесувања на повик"</string>
@@ -1087,6 +1088,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Вметнете СИМ картичката и рестартирајте"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Поврзете се на интернет"</string>
     <string name="location_title" msgid="1029961368397484576">"Моја локација"</string>
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Работен профил"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Локација за работен профил"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Исклучено од вашата компанија"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Режим"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Голема прецизност"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Заштеда на батерија"</string>
@@ -1124,6 +1128,7 @@
     <string name="copyright_title" msgid="865906688917260647">"Авторски права"</string>
     <string name="license_title" msgid="1990487604356037871">"Лиценца"</string>
     <string name="terms_title" msgid="7697580845616764642">"Правила и услови"</string>
+    <string name="webview_license_title" msgid="2813507464175738967">"Системска лиценца за WebView"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Тапети"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Даватели на сателитски снимки:\n©2014 CNES/Astrium, DigitalGlobe, Bluesky"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Лиценци на софтвер со отворен код"</string>
@@ -1237,7 +1242,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"УСБ меморија"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"На СД картичка"</string>
     <string name="disabled" msgid="9206776641295849915">"Оневозможено"</string>
-    <string name="not_installed" msgid="1475144352069281880">"Не е инсталирана"</string>
+    <string name="not_installed" msgid="2797554494953450291">"Не е инсталирано за корисникот"</string>
     <string name="no_applications" msgid="7336588977497084921">"Нема апликации."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Внатрешна меморија"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"УСБ меморија"</string>
@@ -1434,8 +1439,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Екранот никогаш нема да биде во режим на штедење додека се полни"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Овозможи Bluetooth HCI за евиденција на пресретнување пакети"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Сними ги сите Bluetooth HCI пакети во датотека"</string>
-    <string name="oem_unlock_enable" msgid="6629321276287913315">"Овозможи ОЕМ-отклучување"</string>
-    <string name="oem_unlock_enable_summary" msgid="3546686263996628110">"Дозволете уредот да биде отклучен со ОЕМ"</string>
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"Отклучување со OEM"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Дозволи да се отклучи подигнувачот"</string>
+    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Внесете го ПИН-кодот"</string>
+    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Внесете го ПИН-кодот на уредот за да овозможите отклучување со OEM"</string>
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Дозволете отклучување со OEM?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"ПРЕДУПРЕДУВАЊЕ: функциите за заштита на уредот нема да работат на овој уред додека е вклучена оваа поставка."</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Приказ на сертификација на безжична мрежа"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Овозможи преопширно пријавување Wi‑Fi"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Агресивно предавање од Wi‑Fi на мобилен"</string>
@@ -1538,6 +1547,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"Титлите ќе изгледаат вака"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Аа"</string>
     <string name="locale_default" msgid="2593883646136326969">"Стандардно"</string>
+    <string name="color_title" msgid="4258931051732243983">"Боја"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"Стандардна"</string>
     <string name="color_none" msgid="3475640044925814795">"Ниедна"</string>
     <string name="color_white" msgid="8045195170201590239">"Бела"</string>
@@ -1595,12 +1605,12 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"Преостануваат <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> до полнење"</string>
-    <string name="power_discharging_duration" msgid="7125493014448497620">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – останува приближно <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="power_charging" msgid="712751285832976915">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – <xliff:g id="STATE">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration" msgid="4802183864773082009">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – <xliff:g id="TIME">%2$s</xliff:g> додека да се наполни"</string>
-    <string name="power_charging_duration_ac" msgid="3611179931297824699">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – <xliff:g id="TIME">%2$s</xliff:g> додека да се наполни преку AC"</string>
-    <string name="power_charging_duration_usb" msgid="1106605348913397583">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – <xliff:g id="TIME">%2$s</xliff:g> додека да се наполни преку УСБ"</string>
-    <string name="power_charging_duration_wireless" msgid="633606920144617227">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – <xliff:g id="TIME">%2$s</xliff:g> додека да се наполни безжично"</string>
+    <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> – преостанува приближно <xliff:g id="TIME">%2$s</xliff:g>"</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> до целосно полна"</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> до целосно полна на AC"</string>
+    <string name="power_charging_duration_usb" msgid="182405645340976546">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> до целосно полна преку USB"</string>
+    <string name="power_charging_duration_wireless" msgid="1829295708243159464">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> до целосно полна, безжично"</string>
     <string name="power_usage_list_summary" msgid="2409288197839512482">"Се користи од последн. потполно полнење"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Употреба на батеријата од исклучување"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Употреба на батеријата од ресетирање"</string>
@@ -1617,7 +1627,6 @@
     <string name="awake" msgid="387122265874485088">"Време на активност на уред"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi на време"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi на време"</string>
-    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> - <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Детали на историја"</string>
     <string name="details_title" msgid="3792801565213935385">"Користи детали"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Користи детали"</string>
@@ -1689,7 +1698,7 @@
     <string name="battery_saver" msgid="1426682272004907982">"Штедач на батерија"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Вклучи автоматски"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Никогаш"</string>
-    <string name="battery_saver_turn_on_automatically_pct" msgid="3033681629861428940">"на %1$d%% батерија"</string>
+    <string name="battery_saver_turn_on_automatically_pct" msgid="7536784431655058267">"на %1$s батерија"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Статистика на процес"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Паметна статистика за процеси кои се извршуваат"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Употреба на меморија"</string>
@@ -1813,7 +1822,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Резервна копија на хардвер"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Само софтвер"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"Акредитивите не се достапни за овој корисник"</string>
-    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Употреби ја својата шема за отклучување"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Треба да ја употребите шемата за отклучување за да потврдите инсталација на акредитивот."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Внеси ја лозинката за меморирање акредитиви."</string>
@@ -1843,6 +1851,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"Опфати податоци за апликација"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Автоматско враќање"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"При инсталирање апликација, обнови снимени подесувања и податоци"</string>
+    <string name="backup_inactive_title" msgid="5355557151569037197">"Услугата Резервна копија не е активна."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"Ова е поставено од правилата на уредот."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Резервна лозинка за работна површина"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Целосни резервни копии на работната површина кои во моментов не се заштитени"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Допрете за да се промени или отстрани лозинката за целосна резервна копија на работната површина"</string>
@@ -1952,7 +1962,11 @@
     <string name="enter_password" msgid="8035706727471334122">"За да стартувате Android, внесете ја лозинката"</string>
     <string name="enter_pin" msgid="5305333588093263790">"За да стартувате Android, внесете го ПИН-кодот"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"За да стартувате Android, внесете ја шемата"</string>
-    <string name="try_again" msgid="4272075051293936921">"Обиди се повторно."</string>
+    <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"Погрешна шема"</string>
+    <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"Погрешна лозинка"</string>
+    <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"Погрешен ПИН"</string>
+    <string name="checking_decryption" msgid="8287458611802609493">"Се проверува..."</string>
+    <string name="starting_android" msgid="8581493237458496835">"Се вклучува Android"</string>
     <string name="delete" msgid="4219243412325163003">"Избриши"</string>
     <string name="misc_files" msgid="6720680815969643497">"Разни датотеки"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"избрани <xliff:g id="NUMBER">%1$d</xliff:g> од <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -1990,8 +2004,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Секогаш користи GPU за составување екран"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"Симулирај простор на бои"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Овозможи траги на OpenGL"</string>
-    <string name="use_nuplayer" msgid="5699257393367904387">"Користи NuPlayer (пробно)"</string>
-    <string name="use_nuplayer_summary" msgid="1991479067478516714">"Користете NuPlayer наместо AwesomePlayer"</string>
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"Користи AwesomePlayer"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"Користи AwesomePlayer наместо NuPlayer за репродукција на мнозинството медиуми"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"Исклучи УСБ-пренасочување"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"Исклучи автоматско пренасочување до УСБ-аудиоуреди"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Прикажи граници на слој"</string>
@@ -2167,7 +2181,6 @@
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Додајте корисник или профил"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Додајте корисник"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Ограничен профил"</string>
-    <string name="user_summary_managed_profile" msgid="7369539529693048111">"Работен профил"</string>
     <string name="user_need_lock_message" msgid="2596365678651842785">"Пред да може да создадете ограничен профил, треба да поставите заклучување на екранот за да ги заштити вашите апликации и лични податоци."</string>
     <string name="user_set_lock_button" msgid="8311219392856626841">"Подеси заклучување"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Не е подесен"</string>
@@ -2298,11 +2311,13 @@
     <string name="sim_cellular_data_unavailable_summary" msgid="3654805961942166428">"Допри за да избереш СИМ со податоци"</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"Секогаш користи го ова за повици"</string>
     <string name="select_sim_for_data" msgid="2366081042162853044">"Изберете СИМ за податоци"</string>
+    <string name="data_switch_started" msgid="2040761479817166311">"Се префрла СИМ-картичката за податоци, ова може да потрае до една минута..."</string>
     <string name="select_sim_for_calls" msgid="3503094771801109334">"Повикајте со"</string>
     <string name="sim_select_card" msgid="211285163525563293">"Избери СИМ-картичка"</string>
     <string name="sim_card_number_title" msgid="7845379943474336488">"СИМ <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"СИМ-картичката е празна"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"Име на СИМ-картичка"</string>
+    <string name="sim_name_hint" msgid="7038643345238968930">"Внесете име на СИМ"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"Отвор за СИМ-картичка %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Оператор"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Број"</string>
@@ -2312,7 +2327,6 @@
     <string name="color_purple" msgid="3888532466427762504">"Виолетова"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"Нема вметнати СИМ-картички"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"Статус на СИМ-картичка"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"Информации за СИМ-картичка"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"Вратете повик од стандардна СИМ-картичка"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"СИМ-картичка за појдовни повици"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Други поставки за повик"</string>
@@ -2320,8 +2334,11 @@
     <string name="preferred_network_offload_header" msgid="2321173571529106767">"Онев. Емит. име на мрежа"</string>
     <string name="preferred_network_offload_footer" msgid="5857279426054744020">"Оневозм. Емитување име на мрежа штити трети страни да добијат пристап до информ. на вашата мрежа."</string>
     <string name="preferred_network_offload_popup" msgid="2252915199889604600">"Оневозможувањето Емитување име на мрежа ќе спречи автоматско поврзување со скриени мрежи."</string>
+    <string name="sim_signal_strength" msgid="9144010043784767984">"<xliff:g id="DBM">%1$d</xliff:g> dBm <xliff:g id="ASU">%2$d</xliff:g> asu"</string>
+    <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>
+    <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>
@@ -2330,22 +2347,22 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Неодамнешни пребарувања"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Резултати"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi мрежно поврзување"</string>
-    <string name="keywords_more_default_sms_app" msgid="2744404159003574745">"текстуална порака"</string>
-    <string name="keywords_more_mobile_networks" msgid="7813380887358745769">"мобилен ќелија давател на услуга безжичен"</string>
+    <string name="keywords_more_default_sms_app" msgid="895656981962034647">"текстуална порака испраќање текстуални пораки пораки испраќање пораки"</string>
+    <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"мобилна мрежа мобилен оператор безжичен податоци 4g 3g 2g lte"</string>
     <string name="keywords_home" msgid="3626170808219458848">"стартер"</string>
     <string name="keywords_display" msgid="6709007669501628320">"екран екран на допир"</string>
-    <string name="keywords_display_brightness_level" msgid="8636451602230815191">"затемни екран екран на допир"</string>
-    <string name="keywords_display_auto_brightness" msgid="8070218600502753102">"затемни екран екран на допир"</string>
-    <string name="keywords_display_wallpaper" msgid="4315466287469834939">"заднина"</string>
+    <string name="keywords_display_brightness_level" msgid="8923289340474728990">"затемни екран екран на допир батерија"</string>
+    <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"затемни екран екран на допир батерија"</string>
+    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"заднина персонализирај приспособи екран"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"големина на текст"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"проектирај"</string>
-    <string name="keywords_storage" msgid="7007275853993419928">"простор диск тврд диск"</string>
-    <string name="keywords_battery" msgid="3992479295298655138">"енергија"</string>
-    <string name="keywords_spell_checker" msgid="4509482591225399210">"правопис"</string>
+    <string name="keywords_storage" msgid="6572905220031852173">"простор диск тврд диск уред употреба"</string>
+    <string name="keywords_battery" msgid="2096185085932675704">"напојување употреба трошок"</string>
+    <string name="keywords_spell_checker" msgid="6106749039734174140">"правопис речник проверка на правопис автоматска поправка"</string>
     <string name="keywords_voice_input" msgid="3519547605812413860">"препознавач влез говор говори јазик интерфон рака бесплатно препознавање навредлив збор аудио историја bluetooth слушалки"</string>
-    <string name="keywords_text_to_speech_output" msgid="8207889472282225512">"оцени јазик зададено изговори изговарање"</string>
-    <string name="keywords_date_and_time" msgid="7666950126499155141">"часовник"</string>
-    <string name="keywords_factory_data_reset" msgid="3693730656843989732">"избриши бришење"</string>
+    <string name="keywords_text_to_speech_output" msgid="392447904221657930">"стапка јазик стандардно зборувај зборување ттс пристапност читател слепо"</string>
+    <string name="keywords_date_and_time" msgid="2631808108134830066">"часовник војнички"</string>
+    <string name="keywords_factory_data_reset" msgid="4355133848707691977">"бриши избриши обнови исчисти отстрани"</string>
     <string name="keywords_printing" msgid="1701778563617114846">"печатач"</string>
     <string name="keywords_sounds_and_notifications" msgid="5965996187974887000">"звучник звучен сигнал"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="2912933812460077912">"немој не вознемирувај прекинува прекинување прекин"</string>
@@ -2354,7 +2371,7 @@
     <string name="keywords_location_mode" msgid="8584992704568356084">"точност"</string>
     <string name="keywords_accounts" msgid="1957925565953357627">"сметка"</string>
     <string name="keywords_users" msgid="4673901601478559100">"рестрикција ограничи ограничено"</string>
-    <string name="keywords_keyboard_and_ime" msgid="1103378692379215672">"текст исправка исправи звук вибрации автоматски јазик движење предложи предлог тема навредлив збор тип емотикона"</string>
+    <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"текст поправка поправи звук вибрирај автоматски јазик движење предложи предлог тема навредлив збор впиши емотикона меѓународно"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"лизгај лозинка шема ПИН"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Поставете Wi-Fi ознака за НФЦ"</string>
     <string name="write_tag" msgid="8571858602896222537">"Пишувај"</string>
@@ -2371,7 +2388,6 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Јачина на звук на известување"</string>
     <string name="zen_mode_settings_title" msgid="7014915558669122902">"Прекини"</string>
     <string name="zen_mode_option_title" msgid="5061978632306007914">"Кога ќе пристигнат повици и известувања"</string>
-    <string name="zen_mode_option_title_novoice" msgid="6680706009915204785">"Кога ќе пристигнат известувања"</string>
     <string name="zen_mode_option_off" msgid="3167702608910820883">"Секогаш прекинувај"</string>
     <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Дозволи само приоритетни прекини"</string>
     <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Не прекинувај"</string>
@@ -2429,14 +2445,17 @@
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Готово"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Додека не го исклучите"</string>
     <string name="zen_mode_important_category" msgid="8123274463331022993">"Приоритетни прекини"</string>
-    <string name="zen_mode_downtime_category" msgid="4730179065426038108">"Пауза (само приоритетни прекини)"</string>
+    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Пауза"</string>
     <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Денови"</string>
     <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Ништо"</string>
+    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Прекините се дозволени"</string>
+    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Само приоритетно"</string>
+    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Нема"</string>
     <string name="zen_mode_automation_category" msgid="4653551005950835761">"Автоматизација"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Вклучи автоматски"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Никогаш"</string>
-    <string name="zen_mode_phone_calls" msgid="8956214416859303966">"Повици"</string>
+    <string name="zen_mode_calls" msgid="7051492091133751208">"Повици"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Пораки"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Повици/пораки од"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Кој било"</string>
@@ -2450,7 +2469,9 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Ноќите во неделата"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Време на започнување"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Време на завршување"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> следниот ден"</string>
+    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> следниот ден"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> или кој било аларм пред тоа"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> следниот ден или кој било аларм пред тоа"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Известувања за апли."</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Поставки на известувања"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Испрати информации за уредот"</string>
@@ -2458,7 +2479,11 @@
     <string name="switch_on_text" msgid="1124106706920572386">"Вклучи"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Исклучи"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"Прикачување екран"</string>
-    <string name="screen_pinning_description" msgid="7091642350452605379">"Кога е вклучено, закачувањето на екранот може да го користите за да го задржите прикажан тековниот екран сè додека не го откачите.\n\nЗа да користите закачување на екранот:\n\n1. Проверете дали закачувањето на екранот е вклучено.\n\n2. Отворете го екранот што сакате да го закачите.\n\n3. Допрете Краток преглед.\n\n4. Допрете ја иконата за закачување."</string>
+    <string name="screen_pinning_description" msgid="1137904524037468263">"Кога е вклучена поставката, може да користите прикачување на екранот за да се прикажува тековниот екран сè додека не го откачите.\n\nЗа да користите прикачување на екранот:\n\n1. Погрижете се прикачувањето екран да е вклучено.\n\n2. Отворете го екранот што сакате да го прикачите.\n\n3. Допрете Краток преглед.\n\n4. Повлечете нагоре, а потоа допрете ја иконата за прикачување."</string>
+    <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Прашај за шема за отклучување пред откачување"</string>
+    <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Прашај за ПИН пред откачување"</string>
+    <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Прашај за лозинка пред откачување"</string>
+    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Заклучи го уредот при откачување"</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Работен профил"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Експериментално)"</string>
     <string name="display_auto_rotate_title" msgid="6176450657107806043">"Кога уредот се ротира"</string>
@@ -2467,7 +2492,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Остани во приказ на пејзаж"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Остани во тековната ориентација"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"Информации за IMEI"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"Информации во врска со IMEI"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Шифрирање"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Продолжи"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"Може дополнително да го заштитите уредот ако го побарате ПИН-кодот пред да се стартува. Сè додека уредот не се стартува, не може да прима повици, пораки или известувања, како и аларми. \n\nОва помага да се заштитат податоците на загубени или украдени уреди."</string>
@@ -2485,4 +2509,7 @@
     <string name="encrypt_talkback_dialog_message_pin" msgid="1890374082842868489">"Кога ќе го внесете ПИН-кодот за да го вклучите уредот, услугите за пристапност како <xliff:g id="SERVICE">%1$s</xliff:g> сè уште нема да бидат достапни."</string>
     <string name="encrypt_talkback_dialog_message_pattern" msgid="4474332516537386384">"Кога ќе ја внесете шемата за да го вклучите уредот, услугите за пристапност како <xliff:g id="SERVICE">%1$s</xliff:g> сè уште нема да бидат достапни."</string>
     <string name="encrypt_talkback_dialog_message_password" msgid="8166099418487083927">"Кога ќе ја внесете лозинката за да го вклучите уредот, услугите за пристапност како <xliff:g id="SERVICE">%1$s</xliff:g> сè уште нема да бидат достапни."</string>
+    <string name="imei_information_title" msgid="8499085421609752290">"Информации за IMEI"</string>
+    <string name="imei_information_summary" msgid="2074095606556565233">"Информации во врска со IMEI"</string>
+    <string name="slot_number" msgid="3762676044904653577">"(Отвор<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-ml-rIN/arrays.xml b/res/values-ml-rIN/arrays.xml
index ae2e967..f99d2d3 100644
--- a/res/values-ml-rIN/arrays.xml
+++ b/res/values-ml-rIN/arrays.xml
@@ -527,4 +527,12 @@
     <item msgid="4338089220026248848">"കാഷെചെയ്‌തു (പ്രവർത്തന ക്ലയന്റ്)"</item>
     <item msgid="6652164677254579050">"കാഷെചെയ്‌തു (ശൂന്യം)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"ടീല്‍"</item>
+    <item msgid="8332294763632946560">"നീല"</item>
+    <item msgid="2023216417616991392">"ഇൻഡിഗോ"</item>
+    <item msgid="3170497246594232819">"പര്‍പ്പിള്‍"</item>
+    <item msgid="4608643045752965568">"പിങ്ക്"</item>
+    <item msgid="6131821495505931173">"ചുവപ്പ്"</item>
+  </string-array>
 </resources>
diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml
index b4f0d2c..a24c5e7 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>
@@ -180,7 +180,6 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s, നിങ്ങളുടെ സന്ദേശങ്ങൾ ആക്‌സസ്സുചെയ്യാൻ താൽപ്പര്യപ്പെടുന്നു. %2$s എന്നതിലേക്ക് ആക്‌സസ്സ് നൽകണോ?"</string>
     <string name="date_and_time" msgid="9062980487860757694">"തീയതിയും സമയവും"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"സമയ മേഖല തിരഞ്ഞെടുക്കുക"</string>
-    <string name="normal_date_format" msgid="7636406984925498359">"പ്രാദേശികം (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"പ്രിവ്യൂ കാണുക:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"ഫോണ്ട് വലുപ്പം:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -291,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>
@@ -322,8 +321,6 @@
     <string name="date_time_set_timezone" msgid="5045627174274377814">"സമയ മേഖല തിരഞ്ഞെടുക്കുക"</string>
     <string name="date_time_set_date_title" msgid="6928286765325608604">"തീയതി"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"തീയതി സജ്ജീകരിക്കുക"</string>
-    <string name="date_time_date_format_title" msgid="3976171711988766411">"തീയതി ഫോർമാറ്റ്"</string>
-    <string name="date_time_date_format" msgid="6951498879879281102">"തീയതി ഫോർമാറ്റ് തിരഞ്ഞെടുക്കുക"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"അക്ഷരമാലക്രമത്തിൽ അടുക്കുക"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"സമയ മേഖലയനുസരിച്ച് അടുക്കുക"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"തീയതി"</string>
@@ -372,7 +369,8 @@
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"നിങ്ങളുടെ ഫോൺ എൻക്രിപ്റ്റുചെയ്യുമ്പോൾ കാത്തിരിക്കുക. <xliff:g id="PERCENT">^1</xliff:g>% പൂർത്തിയായി."</string>
     <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"നിങ്ങളുടെ ടാബ്‌ലെറ്റ് എൻക്രിപ്‌റ്റു‌ചെയ്യുമ്പോൾ കാത്തിരിക്കുക. ശേഷിക്കുന്ന സമയം: <xliff:g id="DURATION">^1</xliff:g>"</string>
     <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"നിങ്ങളുടെ ഫോൺ എൻക്രിപ്‌റ്റു‌ചെയ്യുമ്പോൾ കാത്തിരിക്കുക. ശേഷിക്കുന്ന സമയം: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"<xliff:g id="DELAY">^1</xliff:g> സെക്കൻഡിനുള്ളിൽ വീണ്ടും ശ്രമിക്കുക."</string>
+    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"നിങ്ങളുടെ ടാബ്‌ലെറ്റ് അൺലോക്കുചെയ്യാൻ, ഇത് ഓഫാക്കിയശേഷം ഓണാക്കുക."</string>
+    <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"നിങ്ങളുടെ ഫോൺ അൺലോക്കുചെയ്യാൻ, ഇത് ഓഫാക്കിയശേഷം ഓണാക്കുക."</string>
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"മുന്നറിയിപ്പ്: <xliff:g id="COUNT">^1</xliff:g>-ൽ കൂടുതൽ തവണ അൺലോക്ക് ചെയ്യാനുള്ള ശ്രമങ്ങൾ പരാജയപ്പെട്ടുകഴിഞ്ഞാൽ നിങ്ങളുടെ ഉപകരണം മായ്ക്കപ്പെടും!"</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"നിങ്ങളുടെ പാസ്‌വേഡ് ടൈപ്പുചെയ്യുക"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"എൻക്രിപ്റ്റുചെയ്യൽ പരാജയപ്പെട്ടു"</string>
@@ -401,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>
@@ -412,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>
@@ -556,13 +556,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"സ്‌പീക്കർ ഫോണായി"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"സംഗീതം, മീഡിയ എന്നിവയ്‌ക്കായി"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"ക്രമീകരണങ്ങൾ ഓർമ്മിക്കുക"</string>
-    <string name="wifi_assistant_intro_setup" msgid="4605105515416995110">"Wi‑Fi അസിസ്‌റ്റന്റ്\nഅവതരിപ്പിക്കുന്നു"</string>
-    <string name="wifi_assistant_no_thanks" msgid="2776983751990143934">"വേണ്ട, നന്ദി"</string>
-    <string name="wifi_assistant_setup" msgid="3772423650475730906">"സജ്ജമാക്കുക"</string>
-    <string name="wifi_assistant_card_message" msgid="107811647784658536">"ഒരു Wi‑Fi അസിസ്‌റ്റന്റ് ഉപയോഗിച്ച് ലഭ്യമായ നെറ്റ്‌വർക്കുകളിൽ യാന്ത്രികമായി കണക്‌റ്റുചെയ്യുക."</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi‑Fi അസിസ്‌റ്റന്റ്"</string>
-    <string name="wifi_assistant_title_message" msgid="6240721017579074015">"ലഭ്യമായതിൽ മികച്ച Wi‑Fi ലേക്ക് നിങ്ങളെ <xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> യാന്ത്രികമായി കണക്‌റ്റുചെയ്യുന്നു"</string>
-    <string name="wifi_assistant_open_app" msgid="4803044899535675063">"അപ്ലിക്കേഷൻ തുറക്കുക"</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>
@@ -592,7 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Wi‑Fi ക്രമീകരണങ്ങൾ"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"വയർലെസ് ആക്‌സസ് പോയിന്റുകൾ സജ്ജീകരിക്കുക, നിയന്ത്രിക്കുക"</string>
-    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Wi‑Fi തിരഞ്ഞെടുക്കുക"</string>
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Wi‑Fi നെറ്റ്‌വർക്ക് തിരഞ്ഞെടുക്കുക"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Wi‑Fi തിരഞ്ഞെടുക്കുക"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Wi‑Fi ഓണാക്കുന്നു…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Wi‑Fi ഓഫാക്കുന്നു…"</string>
@@ -607,8 +602,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"സ്‌കാൻ ചെയ്യൽ എല്ലായ്‌പ്പോഴും ലഭ്യമാണ്"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"സ്‌കാനിംഗ് എല്ലായ്‌പ്പോഴും അനുവദിക്കുക"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Wi-Fi ഓഫാണെങ്കിൽപ്പോലും, Google ലൊക്കേഷൻ സേവനത്തെയും മറ്റ് അപ്ലിക്കേഷനുകളെയും നെറ്റ്‌വർക്കുകൾ സ്‌കാൻ ചെയ്യാൻ അനുവദിക്കുക"</string>
-    <string name="wifi_automatically_manage_title" msgid="6249976570008992746">"Wi‑Fi യാന്ത്രികമായി നിയന്ത്രിക്കുക"</string>
-    <string name="wifi_automatically_manage_summary" msgid="6952470763378312488">"നിങ്ങളുടെ Wi‑Fi കണക്ഷൻ നിയന്ത്രിക്കാൻ <xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> എന്നതിനെ അനുവദിക്കുക"</string>
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"ഓപ്പൺ Wi‑Fi സ്വയം ഉപയോഗിക്കുക"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"ഉയർന്ന നിലവാരമുള്ളതെന്ന് നിർണ്ണയിക്കപ്പെടുന്ന ഓപ്പൺ നെറ്റ്‌വർക്കുകൾ സ്വയം കണക്‌റ്റുചെയ്യാൻ ഒരു Wi-Fi അസിസ്റ്റന്റിനെ അനുവദിക്കുക"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"സാഹായിയെ തിരഞ്ഞെടുക്കുക"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"സർട്ടിഫിക്കറ്റുകൾ ഇൻസ്റ്റാളുചെയ്യുക"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"ലൊക്കേഷൻ കൃത്യത മെച്ചപ്പെടുത്തുന്നതിനും മറ്റ് ആവശ്യകതകൾക്കായും, Wi-Fi ഓഫായിരിക്കുമ്പോൾപ്പോലും Google-ഉം മറ്റ് അപ്ലിക്കേഷനുകളും സമീപത്തുള്ള നെറ്റ്‌വർക്കുകൾ സ്‌കാൻ ചെയ്യാനിടയുണ്ട്. ഇത് സംഭവിക്കാൻ താൽപ്പര്യപ്പെടുന്നില്ലെങ്കിൽ, വിപുലമായത് &gt; സ്‌കാൻ ചെയ്യൽ എല്ലായ്‌പ്പോഴും ലഭ്യമാണ് എന്നതിലേക്ക് പോകുക."</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Wi-Fi ഓഫായിരിക്കുമ്പോൾപ്പോലും സമീപമുള്ള നെറ്റ്‌വർക്കുകൾക്കായി അപ്ലിക്കേഷനുകൾ സ്‌കാൻ ചെയ്യാനിടയുണ്ട്. ഇത് സംഭവിക്കാൻ താൽപ്പര്യപ്പെടുന്നില്ലെങ്കിൽ, വിപുലമായത് &gt; സ്‌കാൻ ചെയ്യൽ എല്ലായ്‌പ്പോഴും ലഭ്യമാണ് എന്നതിലേക്ക് പോകുക."</string>
@@ -629,6 +625,7 @@
     <string name="wifi_menu_scan" msgid="1470911530412095868">"സ്‌കാൻ ചെയ്യുക"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"വിപുലമായത്"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"നെ‌റ്റ്‌വർക്കിൽ കണക്‌റ്റുചെയ്യുക"</string>
+    <string name="wifi_menu_remember" msgid="8814185749388713796">"നെറ്റ്‌വർക്ക് ഓർമ്മിക്കുക"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"നെറ്റ്‌വർക്ക് മറക്കുക"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"നെറ്റ്‌വർക്ക് പരിഷ്‌ക്കരിക്കുക"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"NFC ടാഗിലേക്ക് റൈറ്റുചെയ്യുക"</string>
@@ -673,9 +670,11 @@
     <string name="wifi_unspecified" msgid="5431501214192991253">"(വ്യക്തമാക്കിയിട്ടില്ല)"</string>
     <string name="wifi_remembered" msgid="4955746899347821096">"സംരക്ഷിച്ചു"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"പ്രവർത്തനരഹിതമാക്കി"</string>
-    <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"മോശം ഇന്റർനെറ്റ് കണക്ഷൻ ഒഴിവാക്കുക."</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP കോൺഫിഗറേഷൻ പരാജയം"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"WiFi കണക്ഷൻ പരാജയം"</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"ആധികാരികമാക്കുന്നതിലെ പ്രശ്‌നം"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"പരിധിയിലില്ല"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"ഇന്റർനെറ്റ് ആക്സസ്സൊന്നും കണ്ടെത്താത്തതിനാൽ സ്വയം വീണ്ടും കണക്‌റ്റുചെയ്യില്ല."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS ലഭ്യമാണ്"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS ലഭ്യമാണ്)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"നിങ്ങളുടെ നെറ്റ്‌വർക്ക് പാസ്‌വേഡ് നൽകുക"</string>
@@ -699,9 +698,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"മുന്നറിയിപ്പ്: Wi‑Fi ഒഴിവാക്കുകയാണെങ്കിൽ, നിങ്ങളുടെ ടാബ്‌ലെറ്റ് പ്രാരംഭ ഡൗൺലോഡുകൾക്കും അപ്‌ഡേറ്റുകൾക്കും സെല്ലുലാർ ഡാറ്റ മാത്രം ഉപയോഗിക്കും. സാധ്യമായ ഡാറ്റ നിരക്കുകൾ ഒഴിവാക്കുന്നതിന് Wi‑Fi-മായി കണക്‌റ്റുചെയ്യുക."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"മുന്നറിയിപ്പ്: Wi‑Fi ഒഴിവാക്കുകയാണെങ്കിൽ, നിങ്ങളുടെ ഉപകരണം പ്രാരംഭ ഡൗൺലോഡുകൾക്കും അപ്‌ഡേറ്റുകൾക്കും സെല്ലുലാർ ഡാറ്റ മാത്രം ഉപയോഗിക്കും. സാധ്യമായ ഡാറ്റ നിരക്കുകൾ ഒഴിവാക്കുന്നതിന് Wi‑Fi-മായി കണക്‌റ്റുചെയ്യുക."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"മുന്നറിയിപ്പ്: Wi‑Fi ഒഴിവാക്കുകയാണെങ്കിൽ, നിങ്ങളുടെ ഫോൺ പ്രാരംഭ ഡൗൺലോഡുകൾക്കും അപ്‌ഡേറ്റുകൾക്കും സെല്ലുലാർ ഡാറ്റ മാത്രം ഉപയോഗിക്കും. സാധ്യമായ ഡാറ്റ നിരക്കുകൾ ഒഴിവാക്കുന്നതിന് Wi‑Fi-മായി കണക്‌റ്റുചെയ്യുക."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="2393880108322835846">"മുന്നറിയിപ്പ്: Wi‑Fi ഒഴിവാക്കിയാൽ, ടാബ്‌ലെറ്റിന്റെ ഏതെങ്കിലും പ്രാരംഭ ഡൗൺലോഡുകൾക്കോ അപ്‌ഡേറ്റുകൾക്കോ വേണ്ടി ഉപയോഗിക്കുന്നതിനായി ഇന്റർനെറ്റ്‌ കണക്ഷൻ ഉണ്ടായിരിക്കില്ല."</string>
-    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1707391993265558787">"മുന്നറിയിപ്പ്: Wi‑Fi ഒഴിവാക്കുകയാണെങ്കിൽ, നിങ്ങളുടെ ഉപകരണത്തിന്റെ ഏതെങ്കിലും പ്രാരംഭ ഡൗൺലോഡുകൾക്കോ അപ്‌ഡേറ്റുകൾക്കോ വേണ്ടി ഉപയോഗിക്കുന്നതിന് ഇന്റർനെറ്റ്‌ കണക്ഷൻ ഉണ്ടാകില്ല."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="1556858507920033022">"മുന്നറിയിപ്പ്: Wi‑Fi ഒഴിവാക്കിയാൽ, ഫോണിന്റെ ഏതെങ്കിലും പ്രാരംഭ ഡൗൺലോഡുകൾക്കോ അപ്‌ഡേറ്റുകൾക്കോ വേണ്ടി ഉപയോഗിക്കുന്നതിനായി ഇന്റർനെറ്റ്‌ കണക്ഷൻ ഉണ്ടായിരിക്കില്ല."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"നിങ്ങൾ Wi‑Fi ഒഴിവാക്കുകയാണെങ്കിൽ:\n\nനിങ്ങളുടെ ടാബ്‌ലെറ്റിന് ഇന്റർനെറ്റ് കണക്ഷൻ ഉണ്ടാകില്ല.\n\n ഇന്റർനെറ്റിലേക്ക് കണക്‌റ്റുചെയ്യുന്നതുവരെ, സോഫ്‌റ്റ്‌വെയർ അപ്‌ഡേറ്റുകൾ ലഭിക്കില്ല.\n\nഇപ്പോൾ നിങ്ങൾക്ക് ഉപകരണ പരിരക്ഷാ ഫീച്ചറുകൾ സജീവമാക്കാനാവില്ല."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"നിങ്ങൾ Wi‑Fi ഒഴിവാക്കുകയാണെങ്കിൽ:\n\nനിങ്ങളുടെ ഉപകരണത്തിന് ഇന്റർനെറ്റ് കണക്ഷൻ ഉണ്ടാകില്ല.\n\n ഇന്റർനെറ്റിലേക്ക് കണക്‌റ്റുചെയ്യുന്നതുവരെ സോഫ്‌റ്റ്‌വെയർ അപ്‌ഡേറ്റുകൾ ലഭിക്കില്ല.\n\nഇപ്പോൾ നിങ്ങൾക്ക് ഉപകരണ പരിരക്ഷ ഫീച്ചറുകൾ സജീവമാക്കാനാവില്ല."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"നിങ്ങൾ Wi‑Fi ഒഴിവാക്കുകയാണെങ്കിൽ:\n\nനിങ്ങളുടെ ഫോണിന് ഇന്റർനെറ്റ് കണക്ഷൻ ഉണ്ടാകില്ല.\n\nഇന്റർനെറ്റിലേക്ക് കണക്‌റ്റുചെയ്യുന്നതുവരെ സോഫ്‌റ്റ്‌വെയർ അപ്‌ഡേറ്റുകൾ ലഭിക്കില്ല.\n\nഇപ്പോൾ നിങ്ങൾക്ക് ഉപകരണ പരിരക്ഷാ ഫീച്ചറുകൾ സജീവമാക്കാനാവില്ല."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"ഈ Wi‑Fi നെറ്റ്‌വർക്കിൽ കണക്റ്റുചെയ്യാൻ ടാബ്‌ലെറ്റിനായില്ല."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"ഈ Wi‑Fi നെറ്റ്‌വർക്കിലേക്ക് ഉപകരണം കണക്‌റ്റുചെയ്യാനായില്ല."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"ഫോൺ ഈ Wi‑Fi നെറ്റ്‌വർക്കിൽ കണക്റ്റുചെയ്യാനായില്ല."</string>
@@ -761,7 +760,6 @@
     <string name="ring_volume_title" msgid="7938706566797464165">"റിംഗർ വോളിയം"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"നിശബ്‌ദമായിരിക്കുമ്പോൾ വൈബ്രേറ്റുചെയ്യുക"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"സ്ഥിര അറിയിപ്പ് ശബ്‌ദം"</string>
-    <string name="heads_up_enabled_title" msgid="1031078221910921622">"ഉയർന്ന പ്രാധാന്യം ഉള്ളതാണെങ്കിൽ, പോപ്പ്‌അപ്പ് ചെയ്യുക"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"റിംഗ്ടോൺ"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"അറിയിപ്പ്"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"അറിയിപ്പുകൾക്ക് ഇൻകമിംഗ് കോൾ വോളിയം ഉപയോഗിക്കുക"</string>
@@ -834,7 +832,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"യാന്ത്രിക തെളിച്ചം"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"സജീവമാക്കാൻ ലിഫ്റ്റുചെയ്യുക"</string>
     <string name="doze_title" msgid="2259176504273878294">"ആമ്പിയന്റ് ഡിസ്‌പ്ലേ"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"ഉപകരണം കൈയ്യിലെടുക്കുമ്പോഴോ അറിയിപ്പുകൾ വരുമ്പോഴോ സ്ക്രീൻ സജീവമാക്കുക"</string>
+    <string name="doze_summary" msgid="7128970177894383698">"ഉപകരണം കൈയ്യിലെടുക്കുമ്പോഴോ അറിയിപ്പുകൾ വരുമ്പോഴോ സ്ക്രീൻ സജീവമാക്കുക"</string>
     <string name="title_font_size" msgid="4405544325522105222">"ഫോണ്ട് വലുപ്പം"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"ഫോണ്ട് വലുപ്പം"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"സിം കാർഡ് ലോക്ക് ക്രമീകരണങ്ങൾ"</string>
@@ -862,6 +860,10 @@
     <string name="sim_enter_cancel" msgid="6240422158517208036">"റദ്ദാക്കുക"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"ഒന്നിലധികം സിം-കൾ കണ്ടെത്തി"</string>
     <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>
+    <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>. സെല്ലുലാർ ഡാറ്റയ്‌ക്കും കോളുകൾക്കും 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>
@@ -1012,6 +1014,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"ഇത് നിങ്ങളുടെ ടാബ്‌ലെറ്റിന്റെ "<b>"ആന്തരിക സംഭരണത്തിൽ"</b>" നിന്നും ഇവയുൾപ്പെടെ എല്ലാ ഡാറ്റയും മായ്ക്കും:\n\n"<li>"നിങ്ങളുടെ Google അക്കൗണ്ട്"</li>\n<li>"സി‌സ്റ്റത്തിന്റെയും അപ്ലിക്കേഷന്റെയും ഡാറ്റയും ക്രമീകരണങ്ങളും"</li>\n<li>"ഡൗൺലോഡുചെ‌യ്‌ത അപ്ലിക്കേഷനുകൾ"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"ഇത് നിങ്ങളുടെ ഫോണിലെ "<b>"ആന്തരിക സംഭരണത്തിലെ"</b>" എല്ലാ ഡാറ്റയും മായ്ക്കും, അതിൽ ഇവയുൾപ്പെടുന്നു:\n\n"<li>"നിങ്ങളുടെ Google അക്കൗണ്ട്"</li>\n<li>"സിസ്റ്റം, അപ്ലിക്കേഷൻ എന്നിവയുടെ ഡാറ്റയും ക്രമീകരണങ്ങളും"</li>\n<li>"ഡൗൺലോഡ്ചെയ്‌ത അപ്ലിക്കേഷനുകൾ"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"നിങ്ങൾ നിലവിൽ ഇനിപ്പറയുന്ന അക്കൗണ്ടുകളിൽ സൈൻ ചെ‌യ്തിരിക്കുന്നു:\n"</string>
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"ഈ ഉപകരണത്തിൽ മറ്റ് ഉപയോക്താക്കളുണ്ട്.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"സംഗീതം"</li>\n<li>"ഫോട്ടോകൾ"</li>\n<li>"മറ്റ് ഉപയോക്തൃ ഡാറ്റ"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"സംഗീതം, ചിത്രങ്ങൾ, മറ്റ് ഉപയോക്തൃ ഡാറ്റ എന്നിവ മായ്ക്കുന്നതിന്, "<b>"USB സംഭരണം"</b>" മായ്ക്കേണ്ടതുണ്ട്."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"സംഗീതം, ചിത്രങ്ങൾ, മറ്റ് ഉപയോക്തൃ ഡാറ്റ എന്നിവ മായ്ക്കുന്നതിന്, "<b>"SD കാർഡ്"</b>" മായ്ക്കേണ്ടതുണ്ട്."</string>
@@ -1023,7 +1026,6 @@
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"ഫോൺ പുനഃസജ്ജമാക്കുക"</string>
     <string name="master_clear_final_desc" msgid="7209547812233487345">"നിങ്ങളുടെ എല്ലാ വ്യക്തിഗത വിവരവും ഡൗൺലോഡ് ചെയ്‌ത അപ്ലിക്കേഷനുകളും മായ്ക്കണോ? നിങ്ങൾക്ക് ഈ പ്രവർത്തനം പഴയപടിയാക്കാനാകില്ല!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"എല്ലാം മായ്ക്കുക"</string>
-    <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"നിങ്ങളുടെ അൺലോക്ക് പാറ്റേൺ വരയ്‌ക്കുക"</string>
     <string name="master_clear_gesture_explanation" msgid="826193821455182780">"ഒരു ഫാക്‌ടറി ഡാറ്റ പുനഃസജ്ജീകരണം സ്ഥിരീകരിക്കാൻ നിങ്ങൾ ഒരു അൺലോക്ക് പാറ്റേൺ വരയ്‌ക്കേണ്ടതുണ്ട്."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"സി‌സ്റ്റം മായ്ക്കുക സേവനം ലഭ്യമല്ലാത്തതിനാൽ പുനഃസജ്ജീകരണമൊന്നും നടത്തിയില്ല."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"പുനഃസജ്ജമാക്കണോ?"</string>
@@ -1041,7 +1043,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"USB സംഭരണത്തിൽ സംഭരിച്ചിരിക്കുന്ന എല്ലാ ഫയലുകളും ഇല്ലാതാക്കി അത് മായ്‌ക്കണോ? നിങ്ങൾക്ക് ഈ പ്രവർത്തനം പഴയപടിയാക്കാനാകില്ല!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"SD കാർഡിൽ സംഭരിച്ചിരിക്കുന്ന എല്ലാ ഫയലുകളും ഇല്ലാതാക്കി അത് മായ്‌ക്കണോ? നിങ്ങൾക്ക് ഈ പ്രവർത്തനം പഴയപടിയാക്കാനാകില്ല!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"എല്ലാം മായ്ക്കുക"</string>
-    <string name="media_format_gesture_prompt" msgid="3109349468816856670">"നിങ്ങളുടെ അൺലോക്ക് പാറ്റേൺ വരയ്‌ക്കുക"</string>
     <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"USB സംഭരണം നിങ്ങൾക്ക് മായ്‌ക്കണമെന്ന് സ്ഥിരീകരിക്കാൻ നിങ്ങളുടെ അൺലോക്ക് പാറ്റേൺ വരയ്‌ക്കേണ്ടതുണ്ട്."</string>
     <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"SD കാർഡ് മായ്‌ക്കണമെന്നത് സ്ഥിരീകരിക്കാൻ നിങ്ങൾ ഒരു അൺലോക്ക് പാറ്റേൺ വരയ്‌ക്കേണ്ടതുണ്ട്."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"കോൾ ക്രമീകരണങ്ങൾ"</string>
@@ -1087,6 +1088,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"സിം കാർഡ് ചേർത്തതിനുശേഷം പുനരാരംഭിക്കുക"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"ഇന്റർനെറ്റിൽ കണക്റ്റുചെയ്യുക"</string>
     <string name="location_title" msgid="1029961368397484576">"എന്റെ ലൊക്കേഷൻ"</string>
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"ഔദ്യോഗിക പ്രൊഫൈൽ"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"ഔദ്യോഗിക പ്രൊഫൈലിനായുള്ള ലൊക്കേഷൻ"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"നിങ്ങളുടെ കമ്പനി ഓഫുചെയ്‌തു"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"മോഡ്"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"ഉയർന്ന കൃത്യത"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"ബാറ്ററി ലാഭിക്കൽ"</string>
@@ -1124,6 +1128,7 @@
     <string name="copyright_title" msgid="865906688917260647">"പകര്‍പ്പവകാശം"</string>
     <string name="license_title" msgid="1990487604356037871">"ലൈസന്‍സ്"</string>
     <string name="terms_title" msgid="7697580845616764642">"നിബന്ധനകളും വ്യവസ്ഥകളും"</string>
+    <string name="webview_license_title" msgid="2813507464175738967">"സിസ്‌റ്റം WebView ലൈസൻസ്"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"വാൾപേപ്പറുകൾ"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"ഉപഗ്രഹ ഇമേജറി ദാതാക്കൾ:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"ഓപ്പൺ സോഴ്‌സ് ലൈസൻസുകൾ"</string>
@@ -1237,7 +1242,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB സംഭരണം"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"SD കാർഡിൽ"</string>
     <string name="disabled" msgid="9206776641295849915">"പ്രവർത്തനരഹിതമാക്കി"</string>
-    <string name="not_installed" msgid="1475144352069281880">"ഇൻസ്റ്റാളുചെയ്‌തിട്ടില്ല"</string>
+    <string name="not_installed" msgid="2797554494953450291">"ഈ ഉപയോക്താവിനായി ഇൻസ്‌റ്റാളുചെയ്‌തിട്ടില്ല"</string>
     <string name="no_applications" msgid="7336588977497084921">"അപ്ലിക്കേഷനുകളൊന്നുമില്ല."</string>
     <string name="internal_storage" msgid="1584700623164275282">"ആന്തരിക സംഭരണം"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB സംഭരണം"</string>
@@ -1434,8 +1439,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"ചാർജ്ജുചെയ്യുമ്പോൾ സ്‌ക്രീൻ ഒരിക്കലും സുഷുപ്തിയിലാകില്ല"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"ബ്ലൂടൂത്ത് HCI സ്‌നൂപ്പ് ലോഗ് പ്രവർത്തനക്ഷമമാക്കുക"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"ഒരു ഫയലിൽ എല്ലാ ബ്ലൂടൂത്ത് HCI പാക്കറ്റുകളും ക്യാപ്‌ചർ ചെയ്യുക"</string>
-    <string name="oem_unlock_enable" msgid="6629321276287913315">"OEM അൺലോക്കുചെയ്യൽ പ്രവർത്തനക്ഷമമാക്കുക"</string>
-    <string name="oem_unlock_enable_summary" msgid="3546686263996628110">"OEM അൺലോക്ക് ചെയ്‌തതായിരിക്കാൻ ഉപകരണത്തെ അനുവദിക്കുക"</string>
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM അൺലോക്കുചെയ്യൽ"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"അൺലോക്കാകാൻ ബൂട്ട്‌ലോഡറിനെ അനുവദിക്കുക"</string>
+    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"നിങ്ങളുടെ PIN നൽകുക"</string>
+    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"OEM അൺലോക്ക് പ്രവർത്തനക്ഷമമാക്കുന്നതിന് നിങ്ങളുടെ ഉപകരണത്തിന്റെ PIN നൽകുക"</string>
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"OEM അൺലോക്കുചെയ്യൽ അനുവദിക്കണോ?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"മുന്നറിയിപ്പ്: ഈ ക്രമീകരണം ഓണായിരിക്കുമ്പോൾ, ഉപകരണ സുരക്ഷാ ഫീച്ചറുകൾ ഈ ഉപകരണത്തിൽ പ്രവർത്തിക്കില്ല."</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"വയർലെസ് ഡിസ്‌പ്ലേ സർട്ടിഫിക്കേഷൻ"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Wi‑Fi വെർബോസ് ലോഗിംഗ് പ്രവർത്തനക്ഷമമാക്കുക"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"സെല്ലുലാർ ഹാൻഡ്ഓവറിലേക്ക് വൈഫൈ അഗ്രസ്സീവാക്കുക"</string>
@@ -1538,6 +1547,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"അടിക്കുറിപ്പുകൾ ഇതുപോലെ കാണപ്പെടും"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"സ്ഥിരമായത്"</string>
+    <string name="color_title" msgid="4258931051732243983">"വർണ്ണം"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"സ്ഥിരമായത്"</string>
     <string name="color_none" msgid="3475640044925814795">"ഒന്നുമില്ല"</string>
     <string name="color_white" msgid="8045195170201590239">"വെളുപ്പ്"</string>
@@ -1595,12 +1605,12 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"<xliff:g id="REMAIN">%1$s</xliff:g> ശേഷിക്കുന്നു"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"ചാർജ്ജാകാനുള്ള സമയം <xliff:g id="UNTIL_CHARGED">%1$s</xliff:g>"</string>
-    <string name="power_discharging_duration" msgid="7125493014448497620">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - ഏകദേശം <xliff:g id="TIME">%2$s</xliff:g> ശേഷിക്കുന്നു"</string>
-    <string name="power_charging" msgid="712751285832976915">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="STATE">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration" msgid="4802183864773082009">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - പൂർണ്ണമായും ചാർജ്ജാകുന്നതിന്, <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration_ac" msgid="3611179931297824699">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - AC-യിൽ പൂർണ്ണമായും ചാർജ്ജാകുന്നതിന്, <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration_usb" msgid="1106605348913397583">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - USB വഴി പൂർണ്ണമായും ചാർജ്ജാകുന്നതിന്, <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration_wireless" msgid="633606920144617227">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - വയർലെസ് വഴി പൂർണ്ണമായും ചാർജ്ജാകുന്നതിന്, <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> - ഏകദേശം <xliff:g id="TIME">%2$s</xliff:g> ശേഷിക്കുന്നു"</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>"</string>
+    <string name="power_charging_duration_ac" msgid="3969186192576594254">"<xliff:g id="LEVEL">%1$s</xliff:g> - AC-യിൽ പൂർണ്ണമായും ചാർജ്ജാകുന്നതിന്, <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="power_charging_duration_usb" msgid="182405645340976546">"<xliff:g id="LEVEL">%1$s</xliff:g> - USB വഴി പൂർണ്ണമായും ചാർജ്ജാകുന്നതിന്, <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="power_charging_duration_wireless" msgid="1829295708243159464">"<xliff:g id="LEVEL">%1$s</xliff:g> - വയർലെസ് വഴി പൂർണ്ണമായും ചാർജ്ജാകുന്നതിന്, <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="power_usage_list_summary" msgid="2409288197839512482">"പൂർണ്ണമായും ചാർജ് ആയതുമുതൽ ഉപയോഗിച്ചവ"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"അൺപ്ലഗ്ഗുചെയ്‌തതിനുശേഷമുള്ള ബാറ്ററി ഉപയോഗം"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"പുനഃസജ്ജമാക്കിയതിന് ശേഷമുള്ള ബാറ്ററി ഉപയോഗം"</string>
@@ -1617,7 +1627,6 @@
     <string name="awake" msgid="387122265874485088">"ഉപകരണം സജീവമായ സമയം"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi‑Fi ഓൺ ടൈം"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi‑Fi ഓൺ ടൈം"</string>
-    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"ചരിത്ര വിശദാംശങ്ങൾ"</string>
     <string name="details_title" msgid="3792801565213935385">"വിശദാംശങ്ങൾ ഉപയോഗിക്കുക"</string>
     <string name="details_subtitle" msgid="32593908269911734">"വിശദാംശങ്ങൾ ഉപയോഗിക്കുക"</string>
@@ -1689,7 +1698,7 @@
     <string name="battery_saver" msgid="1426682272004907982">"ബാറ്ററി സേവർ"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"ഓട്ടോമാറ്റിക്കായി ഓണാക്കുക"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"ഒരിക്കലുമില്ല"</string>
-    <string name="battery_saver_turn_on_automatically_pct" msgid="3033681629861428940">"%1$d%% ബാറ്ററി"</string>
+    <string name="battery_saver_turn_on_automatically_pct" msgid="7536784431655058267">"%1$s ബാറ്ററി"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"പ്രോസസ്സ് സ്ഥിതിവിവരക്കണക്കുകൾ"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"പ്രവർത്തന പ്രോസസ്സുകളെക്കുറിച്ചുള്ള Geeky സ്ഥിതിവിവരക്കണക്കുകൾ"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"മെമ്മറി ഉപയോഗം"</string>
@@ -1813,7 +1822,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"ഹാർഡ്‌വെയറിൽ സംഭരിച്ചത്"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"സോഫ്‌റ്റ്‌വെയറിൽ മാത്രം"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"ഈ ഉപയോക്താവിന് ക്രെഡൻഷ്യലുകളൊന്നും ലഭ്യമല്ല"</string>
-    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"നിങ്ങളുടെ അൺലോക്ക് പാറ്റേൺ വരയ്‌ക്കുക"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"ക്രെഡൻഷ്യൽ ഇൻസ്റ്റാളുചെയ്യൽ സ്ഥിരീകരിക്കുന്നതിന് നിങ്ങളുടെ അൺലോക്ക് പാറ്റേൺ വരയ്‌ക്കേണ്ടതുണ്ട്."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"ക്രെഡൻഷ്യൽ സംഭരണത്തിനുള്ള പാ‌സ്‌വേഡ് ടൈപ്പുചെയ്യുക."</string>
@@ -1843,6 +1851,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"അപ്ലിക്കേഷൻ ഡാറ്റ ഉൾപ്പെടുത്തുക"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"യാന്ത്രികമായി പുനഃസ്ഥാപിക്കൽ"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"ഒരു അപ്ലിക്കേഷൻ വീണ്ടും ഇൻസ്റ്റാൾ ചെയ്യുമ്പോൾ, ബാക്കപ്പുചെയ്‌ത ക്രമീകരണങ്ങളും ഡാറ്റയും പുനഃസ്ഥാപിക്കുക"</string>
+    <string name="backup_inactive_title" msgid="5355557151569037197">"ബാക്കപ്പ് സേവനം നിർജ്ജീവമാണ്."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"ഇത് നിങ്ങളുടെ ഉപകരണ നയം സജ്ജീകരിച്ചതാണ്."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"ഡെ‌സ്‌ക്ടോപ്പ് ബാക്കപ്പ് പാസ്‌വേഡ്"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"ഡെസ്‌ക്‌ടോപ്പ് പൂർണ്ണ ബാക്കപ്പുകൾ നിലവിൽ പരിരക്ഷിച്ചിട്ടില്ല"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"ഡെസ്‌ക്‌ടോപ്പ് പൂർണ്ണ ബാക്കപ്പുകൾക്കായി പാസ്‌വേഡുകൾ മാറ്റാനോ നീക്കംചെയ്യാനോ സ്‌പർശിക്കുക"</string>
@@ -1952,7 +1962,11 @@
     <string name="enter_password" msgid="8035706727471334122">"Android ആരംഭിക്കുന്നതിന്, നിങ്ങളുടെ പാസ്‌വേഡ് നൽകുക"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Android ആരംഭിക്കുന്നതിന്, നിങ്ങളുടെ പിൻ നൽകുക"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Android ആരംഭിക്കുന്നതിന്, നിങ്ങളുടെ പാറ്റേൺ വരയ്‌ക്കുക"</string>
-    <string name="try_again" msgid="4272075051293936921">"വീണ്ടും ശ്രമിക്കൂ."</string>
+    <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"പാറ്റേൺ തെറ്റാണ്"</string>
+    <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"പാസ്‌വേഡ് തെറ്റാണ്"</string>
+    <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"പിൻ തെറ്റാണ്"</string>
+    <string name="checking_decryption" msgid="8287458611802609493">"പരിശോധിക്കുന്നു…"</string>
+    <string name="starting_android" msgid="8581493237458496835">"Android ആരംഭിക്കുന്നു"</string>
     <string name="delete" msgid="4219243412325163003">"ഇല്ലാതാക്കുക"</string>
     <string name="misc_files" msgid="6720680815969643497">"പലവക ഫയലുകൾ"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"<xliff:g id="TOTAL">%2$d</xliff:g>-ൽ <xliff:g id="NUMBER">%1$d</xliff:g> എണ്ണം തിരഞ്ഞടുത്തു"</string>
@@ -1990,8 +2004,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"സ്‌ക്രീൻ കമ്പോസിറ്റുചെയ്യലിനായി എല്ലായ്‌പ്പോഴും GPU ഉപയോഗിക്കുക"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"വർണ്ണ സ്‌പെയ്‌സ് അനുകരിക്കുക"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"OpenGL ട്രെയ്‌സുകൾ പ്രവർത്തനക്ഷമമാക്കുക"</string>
-    <string name="use_nuplayer" msgid="5699257393367904387">"NuPlayer ഉപയോഗിക്കുക (പരീക്ഷണാത്മകം)"</string>
-    <string name="use_nuplayer_summary" msgid="1991479067478516714">"AwesomePlayer-ന് പകരം NuPlayer ഉപയോഗിക്കുക"</string>
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"AwesomePlayer ഉപയോഗിക്കുക (ഒഴിവാക്കിയത്)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"ഏറ്റവും മികച്ച മീഡിയ പ്ലേബാക്കിനായി NuPlayer-നുപകരം AwesomePlayer ഉപയോഗിക്കുക"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"USB ഓഡിയോ റൂട്ടിംഗ് പ്രവർത്തനരഹിതമാക്കുക"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"USB ഓഡിയോ പെരിഫറലുകളിലേക്കുള്ള യാന്ത്രിക റൂട്ടിംഗ് പ്രവർത്തനരഹിതമാക്കുക"</string>
     <string name="debug_layout" msgid="5981361776594526155">"ലേഔട്ട് ബൗണ്ടുകൾ ദൃശ്യമാക്കുക"</string>
@@ -2167,7 +2181,6 @@
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"ഉപയോക്താവിനെയോ പ്രൊഫൈലോ ചേർക്കുക"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"ഉപയോക്താവിനെ ചേര്‍ക്കുക"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"നിയന്ത്രിത പ്രൊഫൈൽ"</string>
-    <string name="user_summary_managed_profile" msgid="7369539529693048111">"ഔദ്യോഗിക പ്രൊഫൈൽ"</string>
     <string name="user_need_lock_message" msgid="2596365678651842785">"ഒരു നിയന്ത്രിത പ്രൊഫൈൽ സൃഷ്‌ടിക്കുന്നതിനുമുമ്പ്, നിങ്ങളുടെ അപ്ലിക്കേഷനുകളും വ്യക്തിഗത ഡാറ്റയും പരിരക്ഷിക്കുന്നതിന് ഒരു സ്‌ക്രീൻ ലോക്ക് സജ്ജീകരിക്കേണ്ടതുണ്ട്."</string>
     <string name="user_set_lock_button" msgid="8311219392856626841">"ലോക്ക് സജ്ജീകരിക്കുക"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"സജ്ജീകരിക്കരുത്"</string>
@@ -2298,11 +2311,13 @@
     <string name="sim_cellular_data_unavailable_summary" msgid="3654805961942166428">"ഒരു ഡാറ്റ സിം തിരഞ്ഞെടുക്കുന്നതിന് സ്‌പർശിക്കുക"</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"ഇത് എല്ലായ്‌പ്പോഴും കോളുകൾക്കായി ഉപയോഗിക്കുക"</string>
     <string name="select_sim_for_data" msgid="2366081042162853044">"ഡാറ്റയ്‌ക്കായി ഒരു SIM തിരഞ്ഞെടുക്കുക"</string>
+    <string name="data_switch_started" msgid="2040761479817166311">"ഡാറ്റാ SIM മാറുന്നു, ഇതിന് കുറച്ച് സമയടുത്തേക്കാം..."</string>
     <string name="select_sim_for_calls" msgid="3503094771801109334">"ഇത് ഉപയോഗിച്ച് വിളിക്കുക"</string>
     <string name="sim_select_card" msgid="211285163525563293">"ഒരു സിം കാർഡ് തിരഞ്ഞെടുക്കുക"</string>
     <string name="sim_card_number_title" msgid="7845379943474336488">"സിം <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"സിം ശൂന്യമാണ്"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"സിം പേര്"</string>
+    <string name="sim_name_hint" msgid="7038643345238968930">"SIM പേര് നൽകുക"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"SIM സ്‌ലോട്ട് %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"കാരിയര്‍"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"നമ്പർ"</string>
@@ -2312,7 +2327,6 @@
     <string name="color_purple" msgid="3888532466427762504">"പര്‍പ്പിള്‍"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"സിം കാർഡുകളൊന്നും ചേർത്തിട്ടില്ല"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"സിം നില"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"സിം അനുബന്ധ വിവരം"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"സ്ഥിര സിമ്മിൽ നിന്ന് തിരിച്ചുവിളിക്കുക"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"ഔട്ട്‌ഗോയിംഗ് കോളുകൾക്കുള്ള സിം"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"മറ്റ് കോൾ ക്രമീകരണങ്ങൾ"</string>
@@ -2320,8 +2334,11 @@
     <string name="preferred_network_offload_header" msgid="2321173571529106767">"നെറ്റ്‌വർക്ക് പേര് പ്രക്ഷേപണം പ്രവർത്തനരഹിതമാക്കുക"</string>
     <string name="preferred_network_offload_footer" msgid="5857279426054744020">"നെറ്റ്‌വർക്ക് പേര് പ്രക്ഷേപണം പ്രവർത്തനരഹിതമാക്കുന്നത്, മൂന്നാം കക്ഷികൾ നിങ്ങളുടെ നെറ്റ്‌വർക്ക് വിവരങ്ങളിലേയ്‌ക്ക് ആക്‌സസ്സ് നേടുന്നതിൽ നിന്നും പരിരക്ഷിക്കുന്നു."</string>
     <string name="preferred_network_offload_popup" msgid="2252915199889604600">"നെറ്റ്‌വർക്ക് പേര് പ്രക്ഷേപണം പ്രവർത്തനരഹിതമാക്കുന്നത്, മറച്ച നെറ്റ്‌വർക്കുകളിലേക്കുള്ള യാന്ത്രിക കണക്ഷനെ തടയും."</string>
+    <string name="sim_signal_strength" msgid="9144010043784767984">"<xliff:g id="DBM">%1$d</xliff:g> dBm <xliff:g id="ASU">%2$d</xliff:g> asu"</string>
+    <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>
@@ -2330,22 +2347,22 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"അടുത്തിടെയുള്ള തിരയലുകൾ"</string>
     <string name="search_results_label" msgid="4163304782363526148">"ഫലങ്ങള്‍"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"വൈഫൈ വൈഫൈ നെറ്റ്‌വർക്ക് കണക്ഷൻ"</string>
-    <string name="keywords_more_default_sms_app" msgid="2744404159003574745">"ടെക്‌സ്റ്റ് സന്ദേശം"</string>
-    <string name="keywords_more_mobile_networks" msgid="7813380887358745769">"സെല്ലുലാർ സെൽ കാരിയർ വയർലെസ്"</string>
+    <string name="keywords_more_default_sms_app" msgid="895656981962034647">"ടെക്‌സ്‌റ്റ് സന്ദേശം ടെക്സ്റ്റുചെയ്യൽ സന്ദേശങ്ങൾ സന്ദേശമയയ്‌ക്കൽ"</string>
+    <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"സെല്ലുലാർ സെൽ കാരിയർ വയർലെസ്സ് ഡാറ്റ 4g 3g 2g lte"</string>
     <string name="keywords_home" msgid="3626170808219458848">"ലോഞ്ചർ"</string>
     <string name="keywords_display" msgid="6709007669501628320">"സ്ക്രീൻ ടച്ച്സ്ക്രീൻ"</string>
-    <string name="keywords_display_brightness_level" msgid="8636451602230815191">"മങ്ങിയ സ്‌ക്രീൻ ടച്ച്‌സ്ക്രീൻ"</string>
-    <string name="keywords_display_auto_brightness" msgid="8070218600502753102">"മങ്ങിയ സ്‌ക്രീൻ ടച്ച്‌സ്ക്രീൻ"</string>
-    <string name="keywords_display_wallpaper" msgid="4315466287469834939">"പശ്ചാത്തലം"</string>
+    <string name="keywords_display_brightness_level" msgid="8923289340474728990">"മങ്ങിയ സ്‌ക്രീൻ ടച്ച്‌സ്‌ക്രീൻ ബാറ്ററി"</string>
+    <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"മങ്ങിയ സ്‌ക്രീൻ ടച്ച്‌സ്‌ക്രീൻ ബാറ്ററി"</string>
+    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"പശ്‌ചാത്തലം വ്യക്തിഗതമാക്കുക ഇഷ്‌ടാനുസൃതമാക്കുക ഡിസ്‌പ്ലേ"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"ടെക്‌സ്‌റ്റ് വലുപ്പം"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"പ്രോജക്റ്റ്"</string>
-    <string name="keywords_storage" msgid="7007275853993419928">"ഇടം ഡി‌സ്ക് ഹാർഡ് ഡ്രൈവ്"</string>
-    <string name="keywords_battery" msgid="3992479295298655138">"പവർ"</string>
-    <string name="keywords_spell_checker" msgid="4509482591225399210">"അക്ഷരവിന്യാസം"</string>
+    <string name="keywords_storage" msgid="6572905220031852173">"ഇടം ഡിസ്‌ക് ഹാർഡ് ഡ്രൈവ് ഉപകരണം ഉപയോഗം"</string>
+    <string name="keywords_battery" msgid="2096185085932675704">"പവർ ഉപയോഗ നിരക്ക്"</string>
+    <string name="keywords_spell_checker" msgid="6106749039734174140">"അക്ഷരവിന്യാസം നിഘണ്ടു അക്ഷര‌പ്പിശക് പരിശോധന സ്വയം തിരുത്തൽ"</string>
     <string name="keywords_voice_input" msgid="3519547605812413860">"തിരിച്ചറിയാനുള്ള ഉപകരണം ഇൻപുട്ട് സംഭാഷണം ഭാഷ സംസാരിക്കുക ഹാൻഡ്സ്-ഫ്രീ ഹാൻഡ് ഫ്രീ കുറ്റകരമായ പദം തിരിച്ചറിയൽ ഓഡിയോ ചരിത്രം ബ്ലൂടൂത്ത് ഹെഡ്‌സെറ്റ്"</string>
-    <string name="keywords_text_to_speech_output" msgid="8207889472282225512">"സ്ഥിര ഭാഷ റേറ്റുചെയ്യുക സംസാരിക്കുക സംസാരിക്കുന്നു"</string>
-    <string name="keywords_date_and_time" msgid="7666950126499155141">"ഘടികാരം"</string>
-    <string name="keywords_factory_data_reset" msgid="3693730656843989732">"വൈപ്പ് ഇല്ലാതാക്കൽ"</string>
+    <string name="keywords_text_to_speech_output" msgid="392447904221657930">"നിരക്ക് ഭാഷ സ്ഥിരം സംസാരിക്കുക സംസാരിക്കുന്നു tts പ്രവേശനക്ഷമത റീഡർ അന്ധൻ"</string>
+    <string name="keywords_date_and_time" msgid="2631808108134830066">"ക്‌ലോക്ക് മിലിറ്ററി"</string>
+    <string name="keywords_factory_data_reset" msgid="4355133848707691977">"മായ്ക്കുക ഇല്ലാതാക്കുക പുനഃസ്ഥാപിക്കുക മായ്‌ക്കുക നീക്കംചെയ്യുക"</string>
     <string name="keywords_printing" msgid="1701778563617114846">"പ്രിന്റർ"</string>
     <string name="keywords_sounds_and_notifications" msgid="5965996187974887000">"സ്‌പീക്കർ ബീപ്"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="2912933812460077912">"അരുത് ശല്യപ്പെടുത്തരുത് തടസപ്പെടുത്തുക തടസം ബ്രേക്ക്"</string>
@@ -2354,7 +2371,7 @@
     <string name="keywords_location_mode" msgid="8584992704568356084">"കൃത്യത"</string>
     <string name="keywords_accounts" msgid="1957925565953357627">"അക്കൗണ്ട്"</string>
     <string name="keywords_users" msgid="4673901601478559100">"നിയന്ത്രണം നിയന്ത്രിക്കുക നിയന്ത്രിച്ചു"</string>
-    <string name="keywords_keyboard_and_ime" msgid="1103378692379215672">"ടെക്‌സ്റ്റ് തിരുത്തൽ ശ‌ബ്‌ദം ശരിയാക്കുക വൈബ്രേറ്റുചെയ്യുക യാന്ത്രിക ഭാഷ സവിശേഷത നിർദ്ദേശ തീം നിർദ്ദേശിക്കുക കുറ്റകരമായ പദതരം ഇമോജി"</string>
+    <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"ടെക്‌സ്‌റ്റ് തിരുത്തൽ തിരുത്തുക ശബ്‌ദം വൈബ്രേറ്റുചെയ്യുക സ്വയമേവയുള്ള ഭഷ സവിശേഷത നിർദ്ദേശിക്കുക നിർദ്ദേശം തീം കുറ്റകരമായ പദം ടൈപ്പുചെയ്യൽ ഇമോജി അന്തർദ്ദേശീയം"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"പാസ്‌വേഡ് പാറ്റേൺ പിൻ സ്ലൈഡുചെയ്യുക"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC ടാഗ് സജ്ജമാക്കുക"</string>
     <string name="write_tag" msgid="8571858602896222537">"റൈറ്റുചെയ്യുക"</string>
@@ -2371,7 +2388,6 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"അറിയിപ്പ് വോളിയം"</string>
     <string name="zen_mode_settings_title" msgid="7014915558669122902">"തടസ്സങ്ങൾ"</string>
     <string name="zen_mode_option_title" msgid="5061978632306007914">"കോളുകളും അറിയിപ്പുകളും വരുമ്പോൾ"</string>
-    <string name="zen_mode_option_title_novoice" msgid="6680706009915204785">"അറിയിപ്പുകൾ വരുമ്പോൾ"</string>
     <string name="zen_mode_option_off" msgid="3167702608910820883">"എല്ലായ്‌പ്പോഴും തടസ്സം"</string>
     <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"മുൻഗണനാതടസ്സങ്ങൾ മാത്രമനുവദിക്കൂ"</string>
     <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"തടസ്സപ്പെടുത്തരുത്"</string>
@@ -2429,14 +2445,17 @@
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"പൂർത്തിയായി"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"നിങ്ങൾ ഇത് ഓ‌ഫാക്കും വരെ"</string>
     <string name="zen_mode_important_category" msgid="8123274463331022993">"മുൻഗണനാ തടസ്സങ്ങൾ"</string>
-    <string name="zen_mode_downtime_category" msgid="4730179065426038108">"പ്രവർത്തനരഹിതമായ സമയം (മുൻഗണനാ തടസ്സങ്ങൾ മാത്രം)"</string>
+    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"പ്രവർത്തനരഹിതമായ സമയം"</string>
     <string name="zen_mode_downtime_days" msgid="3361856902633311616">"ദിവസം"</string>
     <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"ഒന്നുമില്ല"</string>
+    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"തടസ്സങ്ങൾ അനുവദിച്ചിരിക്കുന്നു"</string>
+    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"മുൻഗണന മാത്രം"</string>
+    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"ഒന്നുമില്ല"</string>
     <string name="zen_mode_automation_category" msgid="4653551005950835761">"യാന്ത്രികമാക്കൽ"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"ഓട്ടോമാറ്റിക്കായി ഓണാക്കുക"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"ഒരിക്കലുമില്ല"</string>
-    <string name="zen_mode_phone_calls" msgid="8956214416859303966">"കോളുകൾ"</string>
+    <string name="zen_mode_calls" msgid="7051492091133751208">"കോളുകൾ"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"സന്ദേശങ്ങള്‍"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"ഇതിൽ നിന്നുള്ള കോളുകൾ/സന്ദേശങ്ങൾ"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"ആര്‍ക്കും"</string>
@@ -2450,7 +2469,9 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"ശനിയാഴ്‌ചയും ഞായറാഴ്‌ചയും അല്ലാത്ത ദിവസങ്ങളിലെ രാത്രികൾ"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"ആരംഭിക്കുന്ന സമയം"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"അവസാനിക്കുന്ന സമയം"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> അടുത്ത ദിവസം"</string>
+    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"അടുത്ത ദിവസം <xliff:g id="FORMATTED_TIME">%s</xliff:g>-ന്"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g>-ന് അല്ലെങ്കിൽ അതിനുമുമ്പുള്ള എതെങ്കിലും അലാറം"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"അടുത്ത ദിവസം <xliff:g id="FORMATTED_TIME">%s</xliff:g>-ന് അല്ലെങ്കിൽ അതിനുമുമ്പുള്ള ഏതെങ്കിലും അലാറം"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"അപ്ലിക്കേഷൻ അറിയിപ്പുകൾ"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"അറിയിപ്പ് ക്രമീകരണങ്ങൾ"</string>
     <string name="device_feedback" msgid="3238056036766293294">"ഈ ഉപകരണത്തെക്കുറിച്ചുള്ള ഫീഡ്‌ബാക്ക് അയയ്‌ക്കുക"</string>
@@ -2458,7 +2479,11 @@
     <string name="switch_on_text" msgid="1124106706920572386">"ഓണാക്കുക"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"ഓഫാക്കുക"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"സ്ക്രീൻ പിൻ ചെയ്യൽ"</string>
-    <string name="screen_pinning_description" msgid="7091642350452605379">"ഓണാക്കിയിരിക്കുമ്പോൾ, നിങ്ങൾ അൺപിൻ ചെയ്യുന്നതുവരെ നിലവിലുള്ള സ്‌ക്രീൻ കാണുന്നത് തുടരാൻ സ്ക്രീൻ പിൻ ചെയ്യൽ ഉപയോഗിക്കാനാകും.\n\nസ്‌ക്രീൻ പിൻ ചെയ്യൽ ഉപയോഗിക്കാൻ:\n\n1. സ്‌ക്രീൻ പിൻ ചെയ്യൽ ഓണാക്കിയെന്ന് ഉറപ്പുവരുത്തുക.\n\n2. നിങ്ങൾക്ക് പിൻ ചെയ്യേണ്ട സ്‌ക്രീൻ തുറക്കുക.\n\n3. കാഴ്ച സ്‌പർശിക്കുക.\n\n4. പിൻ ഐക്കൺ സ്‌പർശിക്കുക."</string>
+    <string name="screen_pinning_description" msgid="1137904524037468263">"ഈ ക്രമീകരണം ഓണാക്കിയിരിക്കുമ്പോൾ, നിങ്ങൾ അൺപിൻ ചെയ്യുന്നതുവരെ നിലവിലുള്ള സ്‌ക്രീൻ കാണുന്നത് തുടരാൻ സ്ക്രീൻ പിൻ ചെയ്യൽ ഉപയോഗിക്കാനാകും.\n\nസ്‌ക്രീൻ പിൻ ചെയ്യൽ ഉപയോഗിക്കാൻ:\n\n1. സ്‌ക്രീൻ പിൻ ചെയ്യൽ ഓണാക്കിയെന്ന് ഉറപ്പുവരുത്തുക.\n\n2. നിങ്ങൾക്ക് പിൻ ചെയ്യേണ്ട സ്‌ക്രീൻ തുറക്കുക.\n\n3. ചുരുക്കവിവരണം സ്‌പർശിക്കുക.\n\n4. മുകളിലേക്ക് സ്വൈപ്പുചെയ്‌ത ശേഷം പിൻ ഐക്കൺ സ്‌പർശിക്കുക."</string>
+    <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"അൺപിൻ ചെയ്യുന്നതിനുമുമ്പ് അൺലോക്ക് പാറ്റേൺ ആവശ്യപ്പെടുക"</string>
+    <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"അൺപിൻ ചെയ്യുന്നതിനുമുമ്പ് PIN ആവശ്യപ്പെടുക"</string>
+    <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"അൺപിൻ ചെയ്യുന്നതിനുമുമ്പ് പാസ്‌വേഡ് ആവശ്യപ്പെടുക"</string>
+    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"അൺപിൻ ചെയ്യുമ്പോൾ ഉപകരണം ലോക്കുചെയ്യുക"</string>
     <string name="managed_user_title" msgid="8101244883654409696">"ഔദ്യോഗിക പ്രൊഫൈൽ"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(പരീക്ഷണാത്മകം)"</string>
     <string name="display_auto_rotate_title" msgid="6176450657107806043">"ഉപകരണം തിരിക്കുമ്പോൾ"</string>
@@ -2467,7 +2492,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"ലാൻഡ്‌സ്‌കേപ്പ് കാഴ്‌ചയിൽ തുടരുക"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"നിലവിലുള്ള ഓറിയന്റേഷനിൽ തുടരുക"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI വിവരങ്ങൾ"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI അനുബന്ധ വിവരങ്ങൾ"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"എൻ‌ക്രിപ്ഷൻ"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"തുടരുക"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"ഉപകരണം ആരംഭിക്കുന്നതിനു‌മുമ്പ്, നിങ്ങളുടെ PIN ആവശ്യമായി വരുന്നതിനാൽ ഇത് തുടർന്നും പരിരക്ഷിക്കാനാകും. ഉപകരണം ആരംഭിക്കുന്നതുവരെ, ഇതിന് അലാറങ്ങൾ ഉൾപ്പെടെ കോളുകളോ സന്ദേശങ്ങളോ അറിയിപ്പുകളോ സ്വീകരിക്കാനാകില്ല.\n\nനഷ്‌‌ടമാകുകയോ മോഷ്‌ടിക്കപ്പെടുകയോ ചെയ്‌ത ഉപകരണങ്ങളിലെ ഡാറ്റ പരിരക്ഷിക്കാൻ ഇത് സഹായിക്കുന്നു."</string>
@@ -2485,4 +2509,7 @@
     <string name="encrypt_talkback_dialog_message_pin" msgid="1890374082842868489">"ഈ ഉപകരണം ആരംഭിക്കാൻ PIN നൽകുന്ന സമയത്ത്, <xliff:g id="SERVICE">%1$s</xliff:g> പോലുള്ള പ്രവേശനക്ഷമത സേവനങ്ങൾ ലഭ്യമാകില്ല."</string>
     <string name="encrypt_talkback_dialog_message_pattern" msgid="4474332516537386384">"ഈ ഉപകരണം ആരംഭിക്കാൻ പാറ്റേൺ നൽകുന്ന സമയത്ത്, <xliff:g id="SERVICE">%1$s</xliff:g> പോലുള്ള പ്രവേശനക്ഷമത സേവനങ്ങൾ ലഭ്യമാകില്ല."</string>
     <string name="encrypt_talkback_dialog_message_password" msgid="8166099418487083927">"ഈ ഉപകരണം ആരംഭിക്കാൻ പാസ്‌വേഡ് നൽകുന്ന സമയത്ത്, <xliff:g id="SERVICE">%1$s</xliff:g> പോലുള്ള പ്രവേശനക്ഷമത സേവനങ്ങൾ ലഭ്യമാകില്ല."</string>
+    <string name="imei_information_title" msgid="8499085421609752290">"IMEI വിവരങ്ങൾ"</string>
+    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI അനുബന്ധ വിവരങ്ങൾ"</string>
+    <string name="slot_number" msgid="3762676044904653577">"(സ്ലോട്ട്<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-mn-rMN/arrays.xml b/res/values-mn-rMN/arrays.xml
index 5d727f8..3e7b377 100644
--- a/res/values-mn-rMN/arrays.xml
+++ b/res/values-mn-rMN/arrays.xml
@@ -527,4 +527,12 @@
     <item msgid="4338089220026248848">"Кеш хийгдсэн (үйлдэлийн клиент)"</item>
     <item msgid="6652164677254579050">"Кеш хийгдсэн (хоосон)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Усан цэнхэр"</item>
+    <item msgid="8332294763632946560">"Цэнхэр"</item>
+    <item msgid="2023216417616991392">"Индиго"</item>
+    <item msgid="3170497246594232819">"Нил ягаан"</item>
+    <item msgid="4608643045752965568">"Ягаан"</item>
+    <item msgid="6131821495505931173">"Улаан"</item>
+  </string-array>
 </resources>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index 7a1379ff..3e861b2 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>
@@ -180,7 +180,6 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s таны зурвасуудад хандалт хийх хүсэлтэй байна. %2$s-д хандалт хийхийг зөвшөөрөх үү?"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Огноо &amp; цаг"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Цагийн бүсийг сонгоно уу"</string>
-    <string name="normal_date_format" msgid="7636406984925498359">"Бүс нутгийн (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Урдьчилж харах"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Фонтын хэмжээ:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -291,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>
@@ -322,8 +321,6 @@
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Цагийн бүсийг сонгоно уу"</string>
     <string name="date_time_set_date_title" msgid="6928286765325608604">"Огноо"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"Огноо оруулах"</string>
-    <string name="date_time_date_format_title" msgid="3976171711988766411">"Огнооны формат"</string>
-    <string name="date_time_date_format" msgid="6951498879879281102">"Огнооны форматыг сонгох"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Цагаан толгойн дарааллаар эрэмбэлэх"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Цагийн бүсээр эрэмбэлэх"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Огноо"</string>
@@ -372,7 +369,8 @@
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Таны утсыг шифрлэх хооронд хүлээнэ үү. <xliff:g id="PERCENT">^1</xliff:g>% гүйцсэн."</string>
     <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Таны таблетыг шифрлэх зуур хүлээнэ үү. Үлдсэн хугацаа: <xliff:g id="DURATION">^1</xliff:g>"</string>
     <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Таны утсыг шифрлэх зуур хүлээнэ үү. Үлдсэн хугацаа: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"<xliff:g id="DELAY">^1</xliff:g> секундын дараа дахин оролдоно уу."</string>
+    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"Та таблетаа түгжээнээс нь гаргахын тулд унтраагаад асаана уу."</string>
+    <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"Та утсаа түгжээнээс нь гаргахын тулд унтраагаад асаана уу."</string>
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"Анхааруулга: Түгжээ тайлах <xliff:g id="COUNT">^1</xliff:g> удаагийн оролдлого амжилтгүй болбол таны төхөөрөмжийн мэдээллийг арчих болно!"</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Өөрийн нууц үгийг оруулна уу"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Шифрлэлт амжилтгүй"</string>
@@ -401,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>
@@ -412,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>
@@ -556,13 +556,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Чанга яригч утсаар"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Хөгжим болон медианд зориулсан"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Тохиргоог сануулах"</string>
-    <string name="wifi_assistant_intro_setup" msgid="4605105515416995110">"Wi-Fi Туслагчийг\nтанилцуулж байна"</string>
-    <string name="wifi_assistant_no_thanks" msgid="2776983751990143934">"ҮГҮЙ"</string>
-    <string name="wifi_assistant_setup" msgid="3772423650475730906">"ТОХИРУУЛАХ"</string>
-    <string name="wifi_assistant_card_message" msgid="107811647784658536">"Wi‑Fi Туслагч ашиглан боломжтой сүлжээнд автоматаар холбогдох."</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi-Fi Туслагч"</string>
-    <string name="wifi_assistant_title_message" msgid="6240721017579074015">"<xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> таныг хамгийн боломжтой Wi‑Fi сүлжээнд холбоно"</string>
-    <string name="wifi_assistant_open_app" msgid="4803044899535675063">"AПП НЭЭХ"</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>
@@ -592,7 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Wi‑Fi тохиргоо"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Утасгүй хандалтын цэгүүдийг тохируулах &amp; удирдах"</string>
-    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Wi‑Fi сонгох"</string>
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Wi-Fi сүлжээ сонгоно уу"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Wi‑Fi сонгох"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Wi‑Fi-г асааж байна…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Wi‑Fi-г унтрааж байна…"</string>
@@ -607,8 +602,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"Скан хийхийг байнга идэвхжүүлэх"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Скан хийхийг байнга зөвшөөрөх"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Google-н байршлын үйлчилгээ болон бусад апп-уудад Wi‑Fi унтраатай үед ч сүлжээ скан хийхийг зөвшөөрөх"</string>
-    <string name="wifi_automatically_manage_title" msgid="6249976570008992746">"Wi‑Fi автоматаар удирдах"</string>
-    <string name="wifi_automatically_manage_summary" msgid="6952470763378312488">"<xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g>-р өөрийн Wi‑Fi холболтыг удирдуулна уу"</string>
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Нээлттэй Wi-Fi сүлжээг автоматаар ашигла"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Wi-Fi туслагчийг сүлжээ сайтай Wi-Fi сүлжээнүүдэд автоматаар холбогдохыг зөвшөөр."</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Туслагчийг сонгоно уу"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Сертификат суулгах"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Байршлын нарийвчлалыг сайжруулах болон бусад зорилгоор Google болон өөр апп-ууд Wi-Fi хаалттай байгаа хэдий ч ойролцоох сүлжээнүүдийг скан хийж болно. Та үүнийг хүсэхгүй байгаа бол Дэлгэрэнгүй &gt; Сканийг байнга боломжтой байлгах гэсэн рүү очно уу."</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Апп-ууд Wi-Fi хаалттай байгаа хэдий ч ойролцоох сүлжээнүүдийг скан хийж болно. Та үүнийг хүсэхгүй байгаа бол Дэлгэрэнгүй &gt; Сканийг байнга боломжтой байлгах гэсэн рүү очно уу."</string>
@@ -629,6 +625,7 @@
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Скан хийх"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Дэлгэрэнгүй"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Сүлжээнд холбогдох"</string>
+    <string name="wifi_menu_remember" msgid="8814185749388713796">"Сүлжээг сана"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Сүлжээг мартах"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Сүлжээг өөрчлөх"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"NFC тагьруу бичих"</string>
@@ -673,9 +670,11 @@
     <string name="wifi_unspecified" msgid="5431501214192991253">"(тодорхойлоогүй)"</string>
     <string name="wifi_remembered" msgid="4955746899347821096">"Хадгалагдсан"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"Идэвхгүйжүүлсэн"</string>
-    <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Муу Интернэт холболтыг алгассан"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP тохируулга амжилтгүй"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"WiFi холболт амжилтгүй"</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Гэрчлэлийн асуудал"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Хүрээнд байхгүй"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Интернэт холболт илэрсэнгүй, автоматаар дахин холболт хийгдэхгүй"</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS боломжтой"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS боломжтой)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Сүлжээний нууц үгээ оруулна уу"</string>
@@ -699,9 +698,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"АНХААРУУЛГА: Хэрэв та Wi‑Fi-г алгасвал таны таблет эхний татан авалтууд болон шинэчлэлтүүд хийхэд шаардлагатай интернэт холболт байхгүй болно. Дата төлбөр гарч болзошгүй тул Wi-Fi-д холбогдоно уу."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"АНХААРУУЛГА: Хэрэв та Wi‑Fi-г алгасвал таны төхөөрөмж эхний татан авалтууд болон шинэчлэлтүүд хийхэд шаардлагатай интернэт холболт байхгүй болно. Дата төлбөр гарч болзошгүй тул Wi-Fi-д холбогдоно уу."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"АНХААРУУЛГА: Хэрэв та Wi‑Fi-г алгасвал таны утас эхний татан авалтууд болон шинэчлэлтүүд хийхэд шаардлагатай интернэт холболт байхгүй болно. Дата төлбөр гарч болзошгүй тул Wi-Fi-д холбогдоно уу."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="2393880108322835846">"АНХААРУУЛГА: Хэрэв та Wi‑Fi-г алгасвал таны таблет эхний татан авалтууд болон шинэчлэлтүүд хийхэд шаардлагатай интернэт холболт байхгүй болно."</string>
-    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1707391993265558787">"АНХААРУУЛГА: Хэрэв та Wi‑Fi-г алгасвал таны төхөөрөмж эхний татан авалтууд болон шинэчлэлтүүд хийхэд шаардлагатай интернэт холболт байхгүй болно."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="1556858507920033022">"АНХААРУУЛГА: Хэрэв та Wi‑Fi-г алгасвал таны утас эхний татан авалтууд болон шинэчлэлтүүд хийхэд шаардлагатай интернэт холболт байхгүй болно."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Хэрэв та Wi-Fi: \n\n-ыг алгасвал таны таблет интернетэд холбогдохгүй. \n\n  Та интернетэд холбогдохгүйгээр програм хангамжаа шинэчилж чадахгүй. \n\n Та одоогоор төхөөрөмжийнхөө хамгаалалтын функцүүдийг идэвхжүүлэх боломжгүй."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Хэрэв та Wi-Fi:\n\n-ыг алгасвал таны төхөөрөмж интернетэд холбогдохгүй.  \n\n Та интернетэд холбогдохгүйгээр програм хангамжаа шинэчилж чадахгүй. \n\n Та одоогоор төхөөрөмжийнхөө хамгаалалтын функцүүдийг идэвхжүүлэх боломжгүй."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Хэрэв та Wi-Fi:\n\n-ыг алгасвал таны гар утас интернетэд холбогдохгүй.  \n\n Та интернетэд холбогдохгүйгээр програм хангамжаа шинэчилж чадахгүй. \n\n Та одоогоор төхөөрөмжийнхөө хамгаалалтын функцүүдийг идэвхжүүлэх боломжгүй."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Таблет энэ Wi-Fi сүлжээнд холбогдож чадсангүй."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"Энэ төхөөрөмж Wi-Fi сүлжээнд холбогдож чадсангүй."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Энэ утас Wi-Fi сүлжээнд холбогдож чадсангүй."</string>
@@ -761,7 +760,6 @@
     <string name="ring_volume_title" msgid="7938706566797464165">"Хонхны аяны чанга"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Дуугүй үед чичрэх"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Мэдэгдлийн хонхны үндсэн ая"</string>
-    <string name="heads_up_enabled_title" msgid="1031078221910921622">"Нэн тэргүүний ач холбогдолтой бол попап"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Хонхны ая"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Мэдэгдэл"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Ирж буй дуудлагын дууны хэмжээг мэдэгдэлд ашиглах"</string>
@@ -834,7 +832,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Автомат гэрэлтүүлэг"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Сэрээхийн тулд өргөх"</string>
     <string name="doze_title" msgid="2259176504273878294">"Орчинтой тохирсон дэлгэц"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"Төхөөрөмжийг барих эсхүл мэдэгдэл ирэх үед дэлгэцийг сэрээх"</string>
+    <string name="doze_summary" msgid="7128970177894383698">"Төхөөрөмжийг хөдөлгөх, мэдэгдэл хүлээн авахад дэлгэцийг асаах"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Фонтын хэмжээ"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Фонтын хэмжээ"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM картын түгжээний тохиргоо"</string>
@@ -862,6 +860,10 @@
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Цуцлах"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"Олон SIM байна"</string>
     <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-ийг гар утасны мэдээлэл, дуудлага, мессеж зэрэгт ашиглахыг хүсч байна уу?"</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>
@@ -1012,6 +1014,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Энэ таны таблетын "<b>"дотоод сангаас"</b>"таны \n\n"<li>"Google акаунт"</li>\n<li>"Системийн болон апп өгөгдөл болон тохиргоо"</li>\n<li>"Татаж авсан апп-уудыг"</li>" оруулан бүх өгөгдлийг устгах болно"</string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Энэ таны утасны "<b>"дотоод сангаас"</b>"таны \n\n"<li>"Google акаунт"</li>\n<li>"Системийн болон апп өгөгдөл болон тохиргоо"</li>\n<li>"Татаж авсан апп-уудыг"</li>" оруулан бүх өгөгдлийг устгах болно"</string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Та одоогоор дараах акаунтуудаар нэвтэрсэн байна:\n"</string>
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Энэ төхөөрөмж дээр өөр хэрэглэгчид байна.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Хөгжим"</li>\n<li>"Зураг"</li>\n<li>"Бусад хэрэглэгчийн өгөгдөл"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Хөгжим, зураг болон бусад хэрэглэгчийн өгөгдлийг цэвэрлэхийн тулд "<b>"USB санг"</b>" арилгах шаардлагатай."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Хөгжим, зураг болон бусад хэрэглэгчийн өгөгдлийг цэвэрлэхийн тулд "<b>"SD картыг"</b>" арилгах шаардлагатай."</string>
@@ -1023,7 +1026,6 @@
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Утсыг дахин шинэчлэх"</string>
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Таны бүх хувийн мэдээлэл болон татсан апп-уудыг устгах уу? Та энэ үйлдлийг дараа буцаах боломжгүй!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Бүгдийг устгах"</string>
-    <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Өөрийн тайлах хээг зурна уу"</string>
     <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Утасны дахин шинэчлэлтийг баталгаажуулахын тулд та өөрийн тайлах загвараа зурах шаардлагатай."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Системийг Цэвэрлэх үйлчилгээг ашиглах боломжгүй байгаа учраас дахин шинэчлэх үйлдлийг гүйцэтгээгүй."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Дахин шинэчлэх үү?"</string>
@@ -1041,7 +1043,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"USB санг арилгаж хадгалагдсан бүх файлыг устгах уу? Та энэ үйлдлийг буцаах боломжгүй!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"SD картыг арилгаж хадгалагдсан бүх файлыг устгах уу? Та энэ үйлдлийг буцаах боломжгүй!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Бүгдийг устгах"</string>
-    <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Өөрийн тайлах хээг зурна уу"</string>
     <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Та USB санг арилгахыг хүсэж байгаагаа баталгаажуулахын тулд өөрийн тайлах загварыг зурах шаардлагатай."</string>
     <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Та SD картыг арилгахыг хүсэж байгаагаа баталгаажуулахын тулд өөрийн тайлах загварыг зурах шаардлагатай."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Дуудлагын тохиргоо"</string>
@@ -1087,6 +1088,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"SIM карт оруулаад дахин эхлүүлнэ үү"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Интернэтэд холбогдоно уу"</string>
     <string name="location_title" msgid="1029961368397484576">"Миний Байршил"</string>
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Ажлын профайл"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Ажлын профайлын байршил"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Танай компаниас унтраасан байна"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Горим"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Өндөр нарийвчлалтай"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Батерей хэмнэх"</string>
@@ -1124,6 +1128,7 @@
     <string name="copyright_title" msgid="865906688917260647">"Зохиогчийн эрх"</string>
     <string name="license_title" msgid="1990487604356037871">"Лиценз"</string>
     <string name="terms_title" msgid="7697580845616764642">"Ерөнхий нөхцлүүд"</string>
+    <string name="webview_license_title" msgid="2813507464175738967">"Системийн WebView-ийн лиценз"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Ханын зураг"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Сансрын зураг нийлүүлэгчид: \n © 2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Нээлттэй Эхийн Лиценз"</string>
@@ -1237,7 +1242,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB сан"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"SD карт дээр"</string>
     <string name="disabled" msgid="9206776641295849915">"Идэвхгүйжүүлсэн"</string>
-    <string name="not_installed" msgid="1475144352069281880">"Суулгаагүй"</string>
+    <string name="not_installed" msgid="2797554494953450291">"Энэ хэрэглэгчид зориулан суулгаагүй байна"</string>
     <string name="no_applications" msgid="7336588977497084921">"Апп байхгүй."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Дотоод сан"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB сан"</string>
@@ -1434,8 +1439,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Цэнэглэж байх үед дэлгэц хэзээ ч амрахгүй"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Блютүүт HCI снүүп логыг идэвхжүүлэх"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Файл доторх бүх блютүүт HCI пакетуудыг унших"</string>
-    <string name="oem_unlock_enable" msgid="6629321276287913315">"OEM түгжээ тайлахыг идэвхжүүлэх"</string>
-    <string name="oem_unlock_enable_summary" msgid="3546686263996628110">"Төхөөрөмжийн OEM түгжээ тайлахыг зөвшөөрөх"</string>
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM түгжээ тайлагч"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Bootloader-н түгжээг тайлахыг зөвшөөрөх"</string>
+    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Пин кодоо оруул"</string>
+    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"OEM түгжээ тайлагчийг идэвхжүүлэхийн тулд төхөөрөмжийнхөө пин кодыг оруулна уу."</string>
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"OEM түгжээ тайлагчийг зөвшөөрөх үү?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"АНХААР: Энэ тохиргоо асаалттай байгаа үед тухайн төхөөрөмжийн хамгаалалтын функцүүд ажиллахгүй."</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Утасгүй дэлгэцийн сертификат"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Wi‑Fi Verbose лог-г идэвхжүүлэх"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Үүрэн шилжүүлэг рүү идэвхтэй Wi‑Fi"</string>
@@ -1538,6 +1547,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"Титрүүд дараахтай адил харагдана"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"Үндсэн"</string>
+    <string name="color_title" msgid="4258931051732243983">"Өнгө"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"Үндсэн"</string>
     <string name="color_none" msgid="3475640044925814795">"Хоосон"</string>
     <string name="color_white" msgid="8045195170201590239">"Цагаан"</string>
@@ -1595,12 +1605,12 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"<xliff:g id="REMAIN">%1$s</xliff:g> үлдсэн"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> цэнэглэх хүртэл"</string>
-    <string name="power_discharging_duration" msgid="7125493014448497620">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - ойролц. <xliff:g id="TIME">%2$s</xliff:g> үлдсэн"</string>
-    <string name="power_charging" msgid="712751285832976915">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="STATE">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration" msgid="4802183864773082009">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - дүүргэхэд <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration_ac" msgid="3611179931297824699">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - AC-р дүүргэхэд <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration_usb" msgid="1106605348913397583">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - USB-р дүүргэхэд <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration_wireless" msgid="633606920144617227">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - утасгүй цэнэглэгчээр дүүргэтэл <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> - ойролцоогоор <xliff:g id="TIME">%2$s</xliff:g> үлдсэн"</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>"</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>"</string>
+    <string name="power_charging_duration_usb" msgid="182405645340976546">"USB-р дүүртэл <xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="power_charging_duration_wireless" msgid="1829295708243159464">"утасгүй цэнэглэгчээр дүүртэл <xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="power_usage_list_summary" msgid="2409288197839512482">"Сүүлийн бүрэн цэнэглэлтээс хойшхи ашиглалт"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Салгаснаас хойшхи зайны ашиглалт"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Дахин ачаалснаас хойшхи зайны ашиглалт"</string>
@@ -1617,7 +1627,6 @@
     <string name="awake" msgid="387122265874485088">"Төхөөрөмжийн идэвхтэй байх хугацаа"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi цагтаа"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi цагтаа"</string>
-    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Түүхийн мэдээлэл"</string>
     <string name="details_title" msgid="3792801565213935385">"Ашиглалтын мэдээлэл"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Ашиглалтын мэдээлэл"</string>
@@ -1689,7 +1698,7 @@
     <string name="battery_saver" msgid="1426682272004907982">"Батарей хэмнэгч"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Автоматаар асаах"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Хэзээ ч үгүй"</string>
-    <string name="battery_saver_turn_on_automatically_pct" msgid="3033681629861428940">"%1$d%% батарей"</string>
+    <string name="battery_saver_turn_on_automatically_pct" msgid="7536784431655058267">"батерей %1$s болмогц"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Процессын статус"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Ажиллаж байгаа процессуудын талаарх статус"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Санах ойн ашиглалт"</string>
@@ -1813,7 +1822,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Техник хангамжаар дэмжигдсэн"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Зөвхөн програм"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"Энэ хэрэглэгчид итгэмжлэл байхгүй байна"</string>
-    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Өөрийн тайлах хээг зурна уу"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Та жуухын суулгалтыг баталгаажуулахын тулд өөрийн тайлах хээг зурах шаардлагатай."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Жуухын санд зориулсан нууц үгийг бичих."</string>
@@ -1843,6 +1851,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"Апп датаг оруулах"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Автоматаар сэргээх"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Апп дахин суулгах үед нөөцөлсөн тохиргоонууд болон өгөгдлийг сэргээгээрэй"</string>
+    <string name="backup_inactive_title" msgid="5355557151569037197">"Нөөцлөлт үйлчилгээ идэвхгүй байна."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"Үүнийг таны төхөөрөмжийн бодлогын дагуу суулгасан байна."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Десктоп нөөшлөлтийн нууц үг"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Десктоп бүрэн нөөцлөлт одоогоор хамгаалалтгүй байна"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Десктоп дээрх бүрэн нөөшлөлтийн нууц үгийг өөрчлөх буюу арилгахын тулд хүрнэ үү"</string>
@@ -1952,7 +1962,11 @@
     <string name="enter_password" msgid="8035706727471334122">"Андройдыг эхлүүлэхийн тулд нууц үгээ оруулна уу"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Андройдыг эхлүүлэхийн тулд PIN оруулна уу"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Андройдыг эхлүүлэхийн тулд хээгээ зурна уу"</string>
-    <string name="try_again" msgid="4272075051293936921">"Дахин оролдно уу."</string>
+    <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"Нууц хэв буруу байна"</string>
+    <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"Нууц үг буруу байна"</string>
+    <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"ПИН код буруу байна"</string>
+    <string name="checking_decryption" msgid="8287458611802609493">"Шалгаж байна..."</string>
+    <string name="starting_android" msgid="8581493237458496835">"Андройдыг эхлүүлж байна"</string>
     <string name="delete" msgid="4219243412325163003">"Устгах"</string>
     <string name="misc_files" msgid="6720680815969643497">"Янз бүрийн файлууд"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"<xliff:g id="TOTAL">%2$d</xliff:g>-с <xliff:g id="NUMBER">%1$d</xliff:g> нь сонгосон"</string>
@@ -1990,8 +2004,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Дэлгэц нийлүүлэхэд GPU-г байнга ашиглах"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"Өнгөний орчныг дууриах"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"OpenGL тэмдэглэлийг идэвхжүүлэх"</string>
-    <string name="use_nuplayer" msgid="5699257393367904387">"NuPlayer ашиглах (туршилтын)"</string>
-    <string name="use_nuplayer_summary" msgid="1991479067478516714">"AwesomePlayer-н оронд NuPlayer ашиглах"</string>
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"AwesomePlayer-г ашиглах (хялбаршуулсан)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"Ихэнх медиаг тоглуулахдаа NuPlayer-н оронд AwesomePlayer-г ашиглах"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"USB аудио роутинг идэвхгүйжүүлэх"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"USB аудио периферал руу автоматаар роутинг хийхийг идэвхгүйжүүлэх"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Байршлын хүрээг харуулах"</string>
@@ -2167,7 +2181,6 @@
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Хэрэглэгч буюу профайл нэмэх"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Хэрэглэгч нэмэх"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Хязгаарлагдсан профайл"</string>
-    <string name="user_summary_managed_profile" msgid="7369539529693048111">"Ажлын профайл"</string>
     <string name="user_need_lock_message" msgid="2596365678651842785">"Та хязгаарлагдсан профайл үүсгэхийн өмнө өөрийн апп-ууд болон хувийн өгөгдлийг хамгаалахын тулд дэлгэцийн түгжээг тохируулах шаардлагатай."</string>
     <string name="user_set_lock_button" msgid="8311219392856626841">"Түгжээг тохируулах"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Тохируулаагүй"</string>
@@ -2298,11 +2311,13 @@
     <string name="sim_cellular_data_unavailable_summary" msgid="3654805961942166428">"Дата SIM сонгохын тулд хүрнэ үү"</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"Дуудлагад байнга үүнийг ашиглах"</string>
     <string name="select_sim_for_data" msgid="2366081042162853044">"Датанд ашиглах SIM-г сонгоно уу"</string>
+    <string name="data_switch_started" msgid="2040761479817166311">"Мэдээллийн SIM-ийг сольж байна, энэ нь нэг минут орчим үргэлжилнэ..."</string>
     <string name="select_sim_for_calls" msgid="3503094771801109334">"Залгах"</string>
     <string name="sim_select_card" msgid="211285163525563293">"SIM карт сонгох"</string>
     <string name="sim_card_number_title" msgid="7845379943474336488">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"SIM хоосон"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"SIM нэр"</string>
+    <string name="sim_name_hint" msgid="7038643345238968930">"SIM-ийнхээ нэрийг оруулна уу"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"SIM слот %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Оператор компани"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Дугаар"</string>
@@ -2312,7 +2327,6 @@
     <string name="color_purple" msgid="3888532466427762504">"Ягаан"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"SIM карт байхгүй байна"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"SIM статус"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"SIM-тэй холбоотой мэдээлэл"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"Үндсэн SIM-с дахиж залгах"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"Гарах дуудлагын SIM"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Бусад дуудлагын тохиргоо"</string>
@@ -2320,8 +2334,11 @@
     <string name="preferred_network_offload_header" msgid="2321173571529106767">"Сүлжээний нэрийг унтраах"</string>
     <string name="preferred_network_offload_footer" msgid="5857279426054744020">"Сүлжээний нэрийг унтраах нь гуравдагч талаас сүлжээний мэдээлэлд хандахаас сэргийлнэ."</string>
     <string name="preferred_network_offload_popup" msgid="2252915199889604600">"Сүлжээний нэрийг унтраах нь нууц сүлжээнүүдэд автоматаар холбогдохоос сэргийлнэ."</string>
+    <string name="sim_signal_strength" msgid="9144010043784767984">"<xliff:g id="DBM">%1$d</xliff:g> dBm <xliff:g id="ASU">%2$d</xliff:g> asu"</string>
+    <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>
@@ -2330,22 +2347,22 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Саяхны хайлтууд"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Илэрцүүд"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi сүлжээний холболт"</string>
-    <string name="keywords_more_default_sms_app" msgid="2744404159003574745">"текст мессеж"</string>
-    <string name="keywords_more_mobile_networks" msgid="7813380887358745769">"үүрэн селл оператор утасгүй"</string>
+    <string name="keywords_more_default_sms_app" msgid="895656981962034647">"Зурвас зурвас бичих зурвасаар харилцах"</string>
+    <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"үүрэн холбоо үүрэн зөөгч утасгүй өгөгдөл 4g 3g 2g lte"</string>
     <string name="keywords_home" msgid="3626170808219458848">"ажиллуулагч"</string>
     <string name="keywords_display" msgid="6709007669501628320">"дэлгэц мэдрэгчтэй"</string>
-    <string name="keywords_display_brightness_level" msgid="8636451602230815191">"бүдэг дэлгэц мэдрэгчтэй"</string>
-    <string name="keywords_display_auto_brightness" msgid="8070218600502753102">"бүдэг дэлгэц мэдрэгчтэй"</string>
-    <string name="keywords_display_wallpaper" msgid="4315466287469834939">"дэвсгэр"</string>
+    <string name="keywords_display_brightness_level" msgid="8923289340474728990">"бүдэг дэлгэц мэдрэгчтэй дэлгэц тэжээл"</string>
+    <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"бүдэг дэлгэц мэдрэгчтэй дэлгэц тэжээл"</string>
+    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"Дэвсгэр тохируулах дэлгэц тохируулах"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"текстийн хэмжээ"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"төсөл"</string>
-    <string name="keywords_storage" msgid="7007275853993419928">"зай дискний хатуу диск"</string>
-    <string name="keywords_battery" msgid="3992479295298655138">"цэнэг"</string>
-    <string name="keywords_spell_checker" msgid="4509482591225399210">"үсэг"</string>
+    <string name="keywords_storage" msgid="6572905220031852173">"орон зай диск хатуу диск төхөөрөмж хэрэглээ"</string>
+    <string name="keywords_battery" msgid="2096185085932675704">"эрчим хүчний хэрэглээ цэнэглэлт"</string>
+    <string name="keywords_spell_checker" msgid="6106749039734174140">"үсэглэх толь үг үсгийн алдаа шалгах автоматиар засах"</string>
     <string name="keywords_voice_input" msgid="3519547605812413860">"танигч оролт яриа ярих хэл гар-ашиглахгүй гар ашиглахгүй танилт доромжилсон үг аудио түүх блютүүт чихэвч"</string>
-    <string name="keywords_text_to_speech_output" msgid="8207889472282225512">"хурд хэл үндсэн ярих ярьж байна"</string>
-    <string name="keywords_date_and_time" msgid="7666950126499155141">"цаг"</string>
-    <string name="keywords_factory_data_reset" msgid="3693730656843989732">"арчиж устгах"</string>
+    <string name="keywords_text_to_speech_output" msgid="392447904221657930">"түвшин хэл өгөгдмөл ярих ярьж байна хандалт уншигч сохор"</string>
+    <string name="keywords_date_and_time" msgid="2631808108134830066">"24 цагийн формат"</string>
+    <string name="keywords_factory_data_reset" msgid="4355133848707691977">"арчих устгах дахин хадгалах арилгах хасах"</string>
     <string name="keywords_printing" msgid="1701778563617114846">"хэвлэгч"</string>
     <string name="keywords_sounds_and_notifications" msgid="5965996187974887000">"чанга яригч бийп"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="2912933812460077912">"бүү бүү сайд бол саатуулах саатуулалт таслах"</string>
@@ -2354,7 +2371,7 @@
     <string name="keywords_location_mode" msgid="8584992704568356084">"нарийвчлал"</string>
     <string name="keywords_accounts" msgid="1957925565953357627">"акаунт"</string>
     <string name="keywords_users" msgid="4673901601478559100">"хязгаарлалт хязгаарлах хязгаарлагдсан"</string>
-    <string name="keywords_keyboard_and_ime" msgid="1103378692379215672">"текст залруулга залруулах дуу чичиргээ автомат хэл зангалт санал болгох санал болголт загвар доромжилсон үг бичих эможи"</string>
+    <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"Текст залруулах дууг залруулах чичиргээ авто хэл дохио зөвлөх дэвсгэр доромжилсон үг бичих дүрс олон улс"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"слайд нууц үг хээ пин"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC Tагь тохируулах"</string>
     <string name="write_tag" msgid="8571858602896222537">"Бичих"</string>
@@ -2371,7 +2388,6 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Мэдэгдлийн дууны хэмжээ"</string>
     <string name="zen_mode_settings_title" msgid="7014915558669122902">"Тасалдал"</string>
     <string name="zen_mode_option_title" msgid="5061978632306007914">"Дуудлага болон мэдэгдэл ирэх үед"</string>
-    <string name="zen_mode_option_title_novoice" msgid="6680706009915204785">"Мэдэгдэл ирэх үед"</string>
     <string name="zen_mode_option_off" msgid="3167702608910820883">"Тасалдлыг байнга зөвшөөрөх"</string>
     <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Зөвхөн нэн тэргүүний тасалдлыг зөвшөөрөх"</string>
     <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Тасалдалгүй байх"</string>
@@ -2429,14 +2445,17 @@
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Дууссан"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Таныг унтраах хүртэл"</string>
     <string name="zen_mode_important_category" msgid="8123274463331022993">"Нэн тэргүүний тасалдал"</string>
-    <string name="zen_mode_downtime_category" msgid="4730179065426038108">"Зогсолт (зөвхөн нэн тэргүүний тасалдалд)"</string>
+    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Сул зогсолт"</string>
     <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Өдөр"</string>
     <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Хоосон"</string>
+    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Зөвшөөрөгдсөн саатал"</string>
+    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Зөвхөн чухлыг нь"</string>
+    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Байхгүй"</string>
     <string name="zen_mode_automation_category" msgid="4653551005950835761">"Автоматжуулалт"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Автоматаар асаах"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Хэзээ ч үгүй"</string>
-    <string name="zen_mode_phone_calls" msgid="8956214416859303966">"Дуудлага"</string>
+    <string name="zen_mode_calls" msgid="7051492091133751208">"Дуудлага"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Зурвасууд"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Авсан дуудлага/зурвасууд"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Дурын хүн"</string>
@@ -2450,7 +2469,9 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Ажлын өдрүүдэд орой"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Эхлэх цаг"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Дуусах цаг"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"Дараагийн өдрийн <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
+    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> дараагийн өдөр"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> эсвэл өмнөх сэрүүлэг"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> дараагийн өдөр эсвэл өмнөх сэрүүлэг"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Aпп мэдэгдлүүд"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Мэдэгдлийн тохиргоо"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Энэ төхөөрөмжийн талаар санал илгээх"</string>
@@ -2458,7 +2479,11 @@
     <string name="switch_on_text" msgid="1124106706920572386">"Идэвхтэй"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Идэвхгүй"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"Дэлгэц хадгалах"</string>
-    <string name="screen_pinning_description" msgid="7091642350452605379">"Асаасан үед та одоогийн дэлгэцийг хадгалахын тулд дэлгэц тогтоохыг ашиглаж болно.\n\nДэлгэц тогтоохыг ашиглахын тулд:\n\n1. Дэлгэц тогтоогч идэвхжсэн эсэхийг шалгана.\n\n2. Тогтоохыг хүсэж буй дэлгэцийг нээнэ.\n\n3. Ерөнхий харагдацад хүрнэ.\n\n4. Тогтоогчийн дүрсэнд хүрнэ."</string>
+    <string name="screen_pinning_description" msgid="1137904524037468263">"Энэ тохиргоог асааснаар та унтраах хүртэл дэлгэц тогтоох функцийн тусламжтай одоогийн цонхыг дэлгэцэнд хараарай.\n\nДэлгэц тогтоох функцийг ашиглахын тулд:\n\n1. Дэлгэц тогтоох функц асаалттай байгаа эсэхийг шалгана уу.\n\n2. Дэлгэц тогтоох функцээр харахыг хүсэж буй дэлгэцээ нээ.\n\n3. Touch Overview.\n\n4. Дээшээ гүйлгээд дэлгэц тогтоох тэмдэг дээр дар."</string>
+    <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Тогтоосныг суллахаас өмнө түгжээ тайлах хээ асуух"</string>
+    <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Тогтоосныг суллахаас өмнө PIN асуух"</string>
+    <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Тогтоосныг суллахаас өмнө нууц үг асуух"</string>
+    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Unpinning хийх үед төхөөрөмжийг түгжинэ"</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Ажлын профайл"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Туршилтын)"</string>
     <string name="display_auto_rotate_title" msgid="6176450657107806043">"Төхөөрөмжийг эргүүлсэн үед"</string>
@@ -2467,7 +2492,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Хөндлөн харагдацаар хадгалах"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Одоогийн байрлалаар хадгалах"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI мэдээлэл"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI хамаарах мэдээлэл"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Шифрлэлт"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Үргэлжлүүлэх"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"Та энэ төхөөрөмжийг эхлүүлэхийн өмнө PIN шаардагддаг болгон хамгаалалтыг сайжруулах боломжтой. Төхөөрөмж асахаас өмнө дуудлага, зурвас, мэдэгдэл, сэрүүлэг хүлээн авах боломжгүй. \n\nЭнэ нь гээсэн буюу хулгайд алдсан төхөөрөмжийн датаг хамгаалахад шаардлагатай."</string>
@@ -2485,4 +2509,7 @@
     <string name="encrypt_talkback_dialog_message_pin" msgid="1890374082842868489">"Та энэ төхөөрөмжийг эхлүүлэхдээ PIN оруулах үед <xliff:g id="SERVICE">%1$s</xliff:g> мэтийн хандалтын үйлчилгээнүүд хараахан ашиглах боломжгүй байна."</string>
     <string name="encrypt_talkback_dialog_message_pattern" msgid="4474332516537386384">"Та энэ төхөөрөмжийг эхлүүлэхдээ хээ оруулах үед <xliff:g id="SERVICE">%1$s</xliff:g> мэтийн хандалтын үйлчилгээнүүд хараахан ашиглах боломжгүй байна."</string>
     <string name="encrypt_talkback_dialog_message_password" msgid="8166099418487083927">"Та энэ төхөөрөмжийг эхлүүлэхдээ нууц үг оруулах үед <xliff:g id="SERVICE">%1$s</xliff:g> мэтийн хандалтын үйлчилгээнүүд хараахан ашиглах боломжгүй байна."</string>
+    <string name="imei_information_title" msgid="8499085421609752290">"IMEI мэдээлэл"</string>
+    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI хамаарах мэдээлэл"</string>
+    <string name="slot_number" msgid="3762676044904653577">"(Слот<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-mr-rIN/arrays.xml b/res/values-mr-rIN/arrays.xml
index e9c43e2..69eb913 100644
--- a/res/values-mr-rIN/arrays.xml
+++ b/res/values-mr-rIN/arrays.xml
@@ -527,4 +527,12 @@
     <item msgid="4338089220026248848">"कॅशे केलेला (क्रियाकलाप क्लायंट)"</item>
     <item msgid="6652164677254579050">"कॅशे केलेला (रिक्त)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"हिरवट निळा"</item>
+    <item msgid="8332294763632946560">"निळा"</item>
+    <item msgid="2023216417616991392">"नीळ"</item>
+    <item msgid="3170497246594232819">"जांभळा"</item>
+    <item msgid="4608643045752965568">"गुलाबी"</item>
+    <item msgid="6131821495505931173">"लाल"</item>
+  </string-array>
 </resources>
diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr-rIN/strings.xml
index 2ec6da8..8a21532 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>
@@ -180,7 +180,6 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s ला आपल्या संदेशामध्ये प्रवेश करण्याची आवश्यकता आहे. %2$s ला प्रवेश करण्याची अनुमती द्यायची?"</string>
     <string name="date_and_time" msgid="9062980487860757694">"तारीख आणि वेळ"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"टाइम झोन निवडा"</string>
-    <string name="normal_date_format" msgid="7636406984925498359">"प्रादेशिक (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"पूर्वावलोकन:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"फॉन्ट आकार:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -291,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>
@@ -322,8 +321,6 @@
     <string name="date_time_set_timezone" msgid="5045627174274377814">"टाइम झोन निवडा"</string>
     <string name="date_time_set_date_title" msgid="6928286765325608604">"तारीख"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"तारीख सेट करा"</string>
-    <string name="date_time_date_format_title" msgid="3976171711988766411">"तारीख स्वरूप"</string>
-    <string name="date_time_date_format" msgid="6951498879879281102">"डेटा स्वरुपन निवडा"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"अक्षरानुक्रमे क्रमवारी लावा"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"टाइम झोन नुसार क्रमवारी लावा"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"तारीख"</string>
@@ -372,7 +369,8 @@
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"आपला फोन कूटबद्ध केला जात असताना प्रतीक्षा करा. <xliff:g id="PERCENT">^1</xliff:g>% पूर्ण."</string>
     <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"आपला टॅब्लेट कूटबद्ध केला जात असताना प्रतीक्षा करा. शिल्लक वेळ: <xliff:g id="DURATION">^1</xliff:g>"</string>
     <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"आपला फोन कूटबद्ध केला जात असताना प्रतीक्षा करा. शिल्लक वेळ: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"<xliff:g id="DELAY">^1</xliff:g> सेकंदांमध्ये पुन्हा प्रयत्न करा."</string>
+    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"आपला टॅब्लेट अनलॉक करण्‍यासाठी, तो बंद करा आणि नंतर चालू करा."</string>
+    <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"आपला फोन अनलॉक करण्‍यासाठी, तो बंद करा आणि नंतर चालू करा."</string>
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"चेतावणी: अनलॉक करण्‍याच्या आणखी <xliff:g id="COUNT">^1</xliff:g> अयशस्‍वी प्रयत्नांनंतर आपले डिव्‍हाइस पुसले जाईल."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"आपला संकेतशब्द टाइप करा"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"कूटबद्धीकरण अयशस्वी"</string>
@@ -401,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>
@@ -412,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>
@@ -556,13 +556,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"स्पीकर फोन म्हणून"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"संगीत आणि मीडियासाठी"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"सेटिंग्ज लक्षात ठेवा"</string>
-    <string name="wifi_assistant_intro_setup" msgid="4605105515416995110">\n"वाय-फाय सहाय्यकाचा परिचय करून देत आहोत"</string>
-    <string name="wifi_assistant_no_thanks" msgid="2776983751990143934">"नाही, धन्यवाद"</string>
-    <string name="wifi_assistant_setup" msgid="3772423650475730906">"सेट अप"</string>
-    <string name="wifi_assistant_card_message" msgid="107811647784658536">"एका वाय-फाय सहाय्यकासह उपलब्ध नेटवर्कशी स्वयंचलितपणे कनेक्ट करा."</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"वाय-फाय सहाय्यक"</string>
-    <string name="wifi_assistant_title_message" msgid="6240721017579074015">"<xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> आपल्‍याला सर्वोत्तम उपलब्‍ध वाय-फाय शी स्‍वयंचलितपणे कनेक्‍ट करतो"</string>
-    <string name="wifi_assistant_open_app" msgid="4803044899535675063">"अ‍ॅप उघडा"</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>
@@ -592,7 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"वाय-फाय सेटिंग्ज"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"वाय-फाय"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"वायरलेस प्रवेश बिंदू सेट करा आणि  व्यवस्थापित करा"</string>
-    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"वाय-फाय निवडा"</string>
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"वाय-फाय नेटवर्क निवडा"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"वाय-फाय निवडा"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"वाय-फाय चालू करीत आहे..."</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"वाय-फाय बंद करीत आहे…"</string>
@@ -607,8 +602,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"स्कॅनिंग नेहमी उपलब्ध"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"स्कॅनिंगला नेहमी अनुमती द्या"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Google ची स्थान सेवा आणि इतर अॅप्सना नेटवर्कसाठी स्कॅन करु द्या, वाय-फाय बंद असताना देखील"</string>
-    <string name="wifi_automatically_manage_title" msgid="6249976570008992746">"वाय-फाय स्वयंचलितपणे व्यवस्थापित करा"</string>
-    <string name="wifi_automatically_manage_summary" msgid="6952470763378312488">"<xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> ला आपले वाय-फाय कनेक्शन व्यवस्थापित करू द्या"</string>
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"खुले वाय‑फाय स्वयंचलितपणे वापरा"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"वाय-वाय सहाय्यकास स्वयंचलितपणे उच्च गुणवत्ता असण्यासाठी निर्धारित केलेल्‍या खुल्या नेटवर्कशी कनेक्‍ट करू द्या"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"सहाय्यक निवडा"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"प्रमाणपत्रे स्थापित करा"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"स्थान अचूकता सुधारण्यासाठी आणि इतर हेतूंसाठी Google आणि इतर अॅप्स जवळपासच्या नेटवर्कसाठी स्कॅन करु शकतात, वाय-फाय बंद असताना देखील. हे व्हावे असे आपण इच्छित नसल्यास प्रगत &gt; स्कॅनिंग नेहमी उपलब्ध वर जा."</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"अॅप्स जवळपासच्या नेटवर्कसाठी स्कॅन करु शकतात, वाय-फाय बंद असताना देखील. हे व्हावे असे आपण इच्छित नसल्यास प्रगत &gt; स्कॅनिंग नेहमी उपलब्ध वर जा."</string>
@@ -629,6 +625,7 @@
     <string name="wifi_menu_scan" msgid="1470911530412095868">"स्कॅन करा"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"प्रगत"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"नेटवर्कवर कनेक्ट करा"</string>
+    <string name="wifi_menu_remember" msgid="8814185749388713796">"नेटवर्क लक्षात ठेवा"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"नेटवर्क विसरा"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"नेटवर्क सुधारित करा"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"NFC टॅग वर लिहा"</string>
@@ -673,9 +670,11 @@
     <string name="wifi_unspecified" msgid="5431501214192991253">"(निर्दिष्ट न केलेले)"</string>
     <string name="wifi_remembered" msgid="4955746899347821096">"जतन केले"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"अक्षम"</string>
-    <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"खराब इंटरनेट कनेक्शन टाळले"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP कॉन्फिगरेशन अयशस्वी"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"WiFi कनेक्शन अयशस्वी"</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"प्रमाणीकरण समस्या"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"परिक्षेत्रामध्ये नाही"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"कोणताही इंटरनेट प्रवेश आढळला नाही, स्वयंचलितपणे रीकनेक्ट करणार नाही."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS उपलब्ध"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS उपलब्ध)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"आपला नेटवर्क संकेतशब्द प्रविष्ट करा"</string>
@@ -699,9 +698,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"चेतावणी: आपण वाय-फाय वगळल्‍यास, आपला टॅब्‍लेट केवळ सुरुवातीच्या डाउनलोडसाठी किंवा अद्यतनांसाठी सेल्‍युलर डेटाचा वापर करेल. संभाव्य असलेले डेटा शुल्क टाळण्‍यासाठी वाय-फाय शी कनेक्‍ट करा."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"चेतावणी: आपण वाय-फाय वगळल्‍यास, आपले डिव्‍हाइस केवळ सुरुवातीच्या डाउनलोडसाठी किंवा अद्यतनांसाठी सेल्‍युलर डेटाचा वापर करेल. संभाव्य असलेले डेटा शुल्क टाळण्‍यासाठी, वाय-फाय शी कनेक्‍ट करा."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"चेतावणी: आपण वाय-फाय वगळल्‍यास, आपला फोन केवळ सुरुवातीच्या डाउनलोडसाठी किंवा अद्यतनांसाठी सेल्‍युलर डेटाचा वापर करेल. संभाव्य असलेले डेटा शुल्क टाळण्‍यासाठी वाय-फाय शी कनेक्‍ट करा."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="2393880108322835846">"चेतावणी: आपण वाय-फाय वगळल्‍यास, आपल्‍या टॅब्‍लेटकडे कोणत्याही सुरवातीच्या डाउनलोडसाठी किंवा अद्यतनांसाठी वापरण्‍याकरिता इंटरनेट कनेक्‍शन नसेल."</string>
-    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1707391993265558787">"चेतावणी: आपण वाय-फाय वगळल्‍यास, आपल्‍या डिव्‍हाइसकडे कोणत्याही सुरुवातीच्या डाउनलोडसाठी किंवा अद्यतनांसाठी वापरण्‍याकरिता इंटरनेट कनेक्‍शन नसेल."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="1556858507920033022">"चेतावणी: आपण वाय-फाय वगळल्‍यास, आपल्‍या फोनकडे कोणत्याही सुरुवातीच्या डाउनलोडसाठी किंवा अद्यतनांसाठी वापरण्‍याकरिता इंटरनेट कनेक्‍शन नसेल."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"आपण वाय-फाय वगळल्यास:\n\nआपल्या टॅब्लेटवर इंटरनेट कनेक्शन नसेल.\n\nआपण इंटरनेटशी कनेक्ट करेपर्यंत आपल्याला सॉफ्टवेअर अद्यतने मिळणार नाहीत.\n\nआपण आत्ता डिव्हाइस संरक्षण वैशिष्ट्ये सक्रिय करू शकत नाही."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"आपण वाय-फाय वगळल्यास:\n\nआपल्या डिव्हाइसवर इंटरनेट कनेक्शन नसेल.\n\nआपण इंटरनेटशी कनेक्ट करेपर्यंत आपल्याला सॉफ्टवेअर अद्यतने मिळणार नाहीत.\n\nआपण आत्ता डिव्हाइस संरक्षण वैशिष्ट्ये सक्रिय करू शकत नाही."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"आपण वाय-फाय वगळल्यास:\n\nआपल्या फोनवर इंटरनेट कनेक्शन नसेल.\n\nआपण इंटरनेटशी कनेक्ट करेपर्यंत आपल्याला सॉफ्टवेअर अद्यतने मिळणार नाहीत.\n\nआपण आत्ता डिव्हाइस संरक्षण वैशिष्ट्ये सक्रिय करू शकत नाही."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"टॅब्लेट या वाय-फाय नेटवर्कशी कनेक्ट करण्यात अक्षम होता."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"डिव्हाइस या वाय-फाय नेटवर्कशी कनेक्ट करण्यात अक्षम होते."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"फोन या वाय-फाय नेटवर्कशी कनेक्ट करण्यात अक्षम होता."</string>
@@ -761,7 +760,6 @@
     <string name="ring_volume_title" msgid="7938706566797464165">"रींगर आवाज"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"शांत असताना कंपन"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"डीफॉल्ट सूचना ध्वनी"</string>
-    <string name="heads_up_enabled_title" msgid="1031078221910921622">"उच्च प्राथमिकता असल्यास पॉप अप करा"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"रिंगटोन"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"सूचना"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"सूचनांसाठी येणारा कॉल चे ध्वनिमान वापरा"</string>
@@ -834,7 +832,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"स्वयंचलित चकाकी"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"सक्रिय करण्‍यासाठी लिफ्‍ट"</string>
     <string name="doze_title" msgid="2259176504273878294">"अँबियन्ट प्रदर्शन"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"डिव्हाइस निवडले जाते किंवा सूचना येतात तेव्हा स्क्रीन सक्रिय करा"</string>
+    <string name="doze_summary" msgid="7128970177894383698">"आपण डिव्हाइस निवडता किंवा सूचना प्राप्त करता तेव्हा स्क्रीन सक्रिय करा"</string>
     <string name="title_font_size" msgid="4405544325522105222">"फॉन्ट आकार"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"फॉन्ट आकार"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"सिम कार्ड लॉक सेटिंग्ज"</string>
@@ -862,6 +860,10 @@
     <string name="sim_enter_cancel" msgid="6240422158517208036">"रद्द करा"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"एकाधिक सिम आढळली"</string>
     <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> हे एकमेव सिम आहे. आपण सेल्‍युलर डेटा, कॉल आणि SMS संदेशांसाठी हे सिम वापरू इच्छिता?"</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>
@@ -1012,6 +1014,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"हे आपल्या टॅब्लेटच्या "<b>"अंतर्गत संचयना"</b>" वरील सर्व डेटा मिटवेल,                                                                     यासह:\n\n"<li>"आपले Google खाते"</li>\n<li>"सिस्टम आणि अॅप डेटा आणि सेटिंग्ज"</li>\n<li>"डाउनलोड केलेले अॅप्स"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"हे आपल्या फोनच्या "<b>"अंतर्गत संचयन"</b>" वरील सर्व डेटा मिटवेल, यासह:\n\n"<li>"आपले Google खाते"</li>\n<li>"सिस्टम आणि अॅप डेटा सेटिंग्ज"</li>\n<li>"डाउनलोड केलेले अॅप्स"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"आपण खालील खात्यांवर सध्या साइन इन केले आहे:\n"</string>
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"या डिव्‍हाइसवर इतर वापरकर्ते उपस्‍थित आहेत.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"संगीत"</li>\n<li>"फोटो"</li>\n<li>"अन्य वापरकर्ता डेटा"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"संगीत, चित्रे आणि अन्य वापरकर्ता डेटा साफ करण्यासाठी, "<b>"USB संचयन"</b>" मिटविणे आवश्यक आहे."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"संगीत, चित्रे आणि अन्य वापरकर्ता डेटा साफ करण्यासाठी, "<b>"SD कार्ड"</b>" पुसण्याची आवश्यकता आहे."</string>
@@ -1023,7 +1026,6 @@
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"फोन रीसेट करा"</string>
     <string name="master_clear_final_desc" msgid="7209547812233487345">"आपली सर्व वैयक्तिक माहिती आणि डाउनलोड केलेले अॅप्स मिटवायचे? आपण ही क्रिया उलट करू शकत नाही!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"प्रत्येकगोष्ट मिटवा"</string>
-    <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"आपला अनलॉक नमुना रेखाटा"</string>
     <string name="master_clear_gesture_explanation" msgid="826193821455182780">"आपल्याला फॅक्टरी डेटा रीसेटची पुष्टी करण्यासाठी आपला अनलॉक नमुना रेखांकित करण्याची आवश्यकता आहे."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"सिस्टम साफ करा सेवा उपलब्ध नसल्यामुळे कोणतेही रीसेट केले नाही."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"रीसेट करायचे?"</string>
@@ -1041,7 +1043,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"USB संचयन मिटवायचे, तेथे संचयित केलेल्या सर्व फायली हटवून? आपण ही क्रिया उलट करू शकत नाही!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"SD कार्ड मिटवायचे, तेथे संचयित केलेल्या सर्व फायली हटवून? आपण ही क्रिया उलट करू शकत नाही!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"प्रत्येकगोष्ट मिटवा"</string>
-    <string name="media_format_gesture_prompt" msgid="3109349468816856670">"आपला अनलॉक नमुना रेखाटा"</string>
     <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"आपण USB संचयन मिटवू इच्छित असल्याची पुष्टी करण्यासाठी आपल्याला आपला अनलॉक नमूना रेखांकित करण्याची आवश्यकता आहे."</string>
     <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"आपण SD कार्ड मिटवू इच्छिता याची पुष्टी करण्यासाठी आपल्याला आपला अनलॉक नमुना रेखांकित करण्याची आवश्यकता आहे."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"कॉल सेटिंग्ज"</string>
@@ -1087,6 +1088,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"कृपया सिम कार्ड घाला आणि रीस्टार्ट करा"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"कृपया इंटरनेटशी कनेक्ट करा"</string>
     <string name="location_title" msgid="1029961368397484576">"माझे स्थान"</string>
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"कार्य प्रोफाईल"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"कार्य प्रोफाईलसाठी स्थान"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"आपल्या कंपनीने बंद केले आहे"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"मोड"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"उच्च अचूकता"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"बॅटरी बचत"</string>
@@ -1124,6 +1128,7 @@
     <string name="copyright_title" msgid="865906688917260647">"कॉपीराइट"</string>
     <string name="license_title" msgid="1990487604356037871">"परवाना"</string>
     <string name="terms_title" msgid="7697580845616764642">"अटी आणि नियम"</string>
+    <string name="webview_license_title" msgid="2813507464175738967">"सिस्टीम WebView परवाना"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"वॉलपेपर"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"उपग्रह प्रतिमा प्रदाते:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"मुक्त स्त्रोत परवाने"</string>
@@ -1237,7 +1242,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB संचयन"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"SD कार्डवर"</string>
     <string name="disabled" msgid="9206776641295849915">"अक्षम"</string>
-    <string name="not_installed" msgid="1475144352069281880">"स्थापित केले नाही"</string>
+    <string name="not_installed" msgid="2797554494953450291">"या वापरकर्त्यासाठी स्थापित केले नाही"</string>
     <string name="no_applications" msgid="7336588977497084921">"अॅप्स नाहीत."</string>
     <string name="internal_storage" msgid="1584700623164275282">"अंतर्गत संचयन"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB संचयन"</string>
@@ -1434,8 +1439,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"चार्ज होत असताना स्क्रीन कधीही निष्क्रिय होणार नाही"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"ब HCI स्नूप लॉग सक्षम करा"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"सर्व ब HCI पॅकेट एका फाईलमध्ये कॅप्चर करा"</string>
-    <string name="oem_unlock_enable" msgid="6629321276287913315">"OEM अनलॉक सक्षम करा"</string>
-    <string name="oem_unlock_enable_summary" msgid="3546686263996628110">"OEM अनलॉक होण्यासाठी डिव्हाइसला अनुमती द्या"</string>
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM अनलॉक करणे"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"बूटलोडर अनलॉक करण्यासाठी अनुमती द्या"</string>
+    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"आपला PIN प्रविष्ट करा"</string>
+    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"OEM अनलॉक सक्षम करण्यासाठी आपले डिव्हाइस PIN प्रविष्ट करा"</string>
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"OEM अनलॉक करण्यास अनुमती द्यायची?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"चेतावणी: ही सेटिंग चालू असताना या डिव्हाइसवर डिव्हाइस संरक्षण वैशिष्ट्ये कार्य करणार नाहीत."</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"वायरलेस प्रदर्शन प्रमाणीकरण"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"वाय-फाय शब्दपाल्हाळ लॉगिंग सक्षम करा"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"सेल्‍युलर सोपविण्‍यावरील आक्रमक वाय-फाय"</string>
@@ -1538,6 +1547,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"मथळे यासारखे दिसतील"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"डीफॉल्ट"</string>
+    <string name="color_title" msgid="4258931051732243983">"रंग"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"डीफॉल्ट"</string>
     <string name="color_none" msgid="3475640044925814795">"काहीही नाही"</string>
     <string name="color_white" msgid="8045195170201590239">"पांढरा"</string>
@@ -1595,12 +1605,12 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"<xliff:g id="REMAIN">%1$s</xliff:g> शिल्लक"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"चार्ज करण्यासाठी <xliff:g id="UNTIL_CHARGED">%1$s</xliff:g>"</string>
-    <string name="power_discharging_duration" msgid="7125493014448497620">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - अंदाजे <xliff:g id="TIME">%2$s</xliff:g> शिल्लक"</string>
-    <string name="power_charging" msgid="712751285832976915">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="STATE">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration" msgid="4802183864773082009">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - पूर्ण होण्यात <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration_ac" msgid="3611179931297824699">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> एसी वर पूर्ण होईपर्यंत"</string>
-    <string name="power_charging_duration_usb" msgid="1106605348913397583">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - USB वर पूर्ण होण्यात <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration_wireless" msgid="633606920144617227">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - वायरलेसवरून पूर्ण होण्यात <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> - अंदाजे. <xliff:g id="TIME">%2$s</xliff:g> शिल्लक"</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> पूर्ण होण्यात"</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> AC वरून पूर्ण होण्यात"</string>
+    <string name="power_charging_duration_usb" msgid="182405645340976546">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> USB वरून पूर्ण होण्यात"</string>
+    <string name="power_charging_duration_wireless" msgid="1829295708243159464">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> वायरलेसवरून पूर्ण होण्यात"</string>
     <string name="power_usage_list_summary" msgid="2409288197839512482">"पूर्ण चार्ज झाल्यानंतरचा वापर"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"अनप्लग केल्यापासून बॅटरी वापर"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"रीसेट केल्यापासून बॅटरी वापर"</string>
@@ -1617,7 +1627,6 @@
     <string name="awake" msgid="387122265874485088">"डिव्हाइस सक्रिय होण्याची वेळ"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"वाय-फाय चालू केल्याची वेळ"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"वाय-फाय चालू केल्याची वेळ"</string>
-    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"इतिहास तपशील"</string>
     <string name="details_title" msgid="3792801565213935385">"तपशील वापरा"</string>
     <string name="details_subtitle" msgid="32593908269911734">"तपशील वापरा"</string>
@@ -1689,7 +1698,7 @@
     <string name="battery_saver" msgid="1426682272004907982">"बॅटरी सेव्हर"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"स्वयंचलितपणे चालू करा"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"कधीही नाही"</string>
-    <string name="battery_saver_turn_on_automatically_pct" msgid="3033681629861428940">"%1$d%% बॅटरीवर"</string>
+    <string name="battery_saver_turn_on_automatically_pct" msgid="7536784431655058267">"%1$s बॅटरी वर"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"प्रक्रिया आकडेवारी"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"चालत असलेल्या प्रक्रियांबद्दल गीकी आकडेवारी"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"मेमरी वापर"</string>
@@ -1813,7 +1822,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"हार्डवेअर-बॅक अप घेतला"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"केवळ सॉफ्टवेअर"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"या वापरकर्त्यासाठी क्रेडेन्शियल उपलब्ध नाहीत"</string>
-    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"आपला अनलॉक नमुना रेखांकित करा"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"क्रेडेन्शियल स्थापनेची पुष्टी करण्यासाठी आपल्याला आपला अनलॉक नमूना रेखांकित करण्याची आवश्यकता आहे."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"क्रेडेन्शियल संचयनासाठी संकेतशब्द टाइप करा."</string>
@@ -1843,6 +1851,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"अॅप डेटा समाविष्ट करा"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"स्वयंचलित पुनर्संचयन"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"अॅप पुनर्स्थापित करताना, बॅक अप घेतलेल्या सेटिंग्ज आणि डेटा पुनर्संचयित करा"</string>
+    <string name="backup_inactive_title" msgid="5355557151569037197">"बॅकअप सेवा निष्क्रिय आहे."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"हे आपल्या डिव्हाइस धोरणानुसार सेट केले आहे."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"डेस्कटॉप बॅकअप संकेतशब्द"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"डेस्कटॉप पूर्ण बॅक अप सध्या संरक्षित नाहीत"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"डेस्कटॉपच्या पूर्ण बॅकअपसाठी असलेला संकेतशब्द बदलण्यासाठी किंवा काढून टाकण्यासाठी स्पर्श करा"</string>
@@ -1952,7 +1962,11 @@
     <string name="enter_password" msgid="8035706727471334122">"Android प्रारंभ करण्‍यासाठी, आपला संकेतशब्द प्रविष्‍ट करा"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Android प्रारंभ करण्‍यासाठी, आपला पिन प्रविष्‍ट करा"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Android प्रारंभ करण्‍यासाठी, आपल्या नमुन्याची रेखाटणी करा"</string>
-    <string name="try_again" msgid="4272075051293936921">"पुन्हा प्रयत्न करा."</string>
+    <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"चुकीचा नमुना"</string>
+    <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"चुकीचा संकेतशब्द"</string>
+    <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"चुकीचा पिन"</string>
+    <string name="checking_decryption" msgid="8287458611802609493">"तपासत आहे..."</string>
+    <string name="starting_android" msgid="8581493237458496835">"Android प्रारंभ करत आहोत"</string>
     <string name="delete" msgid="4219243412325163003">"हटवा"</string>
     <string name="misc_files" msgid="6720680815969643497">"संकीर्ण फायली"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"<xliff:g id="TOTAL">%2$d</xliff:g> पैकी <xliff:g id="NUMBER">%1$d</xliff:g> निवडले"</string>
@@ -1990,8 +2004,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"स्क्रीन तयार करण्यासाठी नेहमी GPU वापरा"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"रंग स्थानाची बतावणी करा"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"OpenGL ट्रेस सक्षम करा"</string>
-    <string name="use_nuplayer" msgid="5699257393367904387">"NuPlayer वापरा (प्रायोगिक)"</string>
-    <string name="use_nuplayer_summary" msgid="1991479067478516714">"AwesomePlayer च्याऐवजी NuPlayer वापरा"</string>
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"AwesomePlayer वापरा (नापसंत केलेले)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"बर्‍याच मीडिया प्लेबॅकसाठी NuPlayer ऐवजी AwesomePlayer वापरा"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"USB ऑडिओ राउटिंग अक्षम करा"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"USB ऑडिओ परिधीय वरील स्वयंचलित राउटिंग अक्षम करा"</string>
     <string name="debug_layout" msgid="5981361776594526155">"लेआउट सीमा दर्शवा"</string>
@@ -2167,7 +2181,6 @@
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"वापरकर्ता किंवा प्रोफाईल जोडा"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"वापरकर्ता जोडा"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"प्रतिबंधित प्रोफाईल"</string>
-    <string name="user_summary_managed_profile" msgid="7369539529693048111">"कार्य प्रोफाईल"</string>
     <string name="user_need_lock_message" msgid="2596365678651842785">"आपण एक प्रतिबंधित प्रोफाईल तयार करु शकण्यापूर्वी आपल्याला आपले अॅप्स आणि वैयक्तिक डेटा संरक्षित करण्यासाठी एक स्क्रीन लॉक सेट करण्याची आवश्यकता राहील."</string>
     <string name="user_set_lock_button" msgid="8311219392856626841">"लॉक सेट करा"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"सेट केलेले नाही"</string>
@@ -2298,11 +2311,13 @@
     <string name="sim_cellular_data_unavailable_summary" msgid="3654805961942166428">"एक डेटा सिम निवडण्यासाठी स्पर्श करा"</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"कॉल साठी हे नेहमी वापरा"</string>
     <string name="select_sim_for_data" msgid="2366081042162853044">"डेटासाठी एक सिम निवडा"</string>
+    <string name="data_switch_started" msgid="2040761479817166311">"डेटा सिम स्‍विच करीत आहे, यास सुमारे एक मिनिट लागेल..."</string>
     <string name="select_sim_for_calls" msgid="3503094771801109334">"यासह कॉल करा"</string>
     <string name="sim_select_card" msgid="211285163525563293">"एक सिम कार्ड निवडा"</string>
     <string name="sim_card_number_title" msgid="7845379943474336488">"सिम <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"सिम रिक्त"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"सिम नाव"</string>
+    <string name="sim_name_hint" msgid="7038643345238968930">"सिम नाव प्रविष्ट करा"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"सिम स्लॉट %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"वाहक"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"संख्या"</string>
@@ -2312,7 +2327,6 @@
     <string name="color_purple" msgid="3888532466427762504">"जांभळा"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"कोणतीही सिम कार्डे घातलेली नाहीत"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"सिम स्थिती"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"सिम संबंधित माहिती"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"डीफॉल्ट सिमवरून परत कॉल करा"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"केल्या जाणार्‍या कॉलसाठी सिम"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"इतर कॉल सेटिंग्ज"</string>
@@ -2320,8 +2334,11 @@
     <string name="preferred_network_offload_header" msgid="2321173571529106767">"नेटवर्क नाव प्रसारण अक्षम करा"</string>
     <string name="preferred_network_offload_footer" msgid="5857279426054744020">"नेटवर्क नाव प्रसारण अक्षम करा आपल्या नेटवर्क माहितीवर तृतीय पक्षांना प्रवेश मिळण्यापासून संरक्षित करते."</string>
     <string name="preferred_network_offload_popup" msgid="2252915199889604600">"नेटवर्क नाव प्रसारण अक्षम केल्याने लपलेल्या नेटवर्कवर स्वयंचलित कनेक्शन प्रतिबंधित होईल."</string>
+    <string name="sim_signal_strength" msgid="9144010043784767984">"<xliff:g id="DBM">%1$d</xliff:g> dBm <xliff:g id="ASU">%2$d</xliff:g> asu"</string>
+    <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>
+    <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>
@@ -2330,22 +2347,22 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"अलीकडील शोध"</string>
     <string name="search_results_label" msgid="4163304782363526148">"परिणाम"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"वायफाय वाय-फाय नेटवर्क कनेक्शन"</string>
-    <string name="keywords_more_default_sms_app" msgid="2744404159003574745">"मजकूर संदेश"</string>
-    <string name="keywords_more_mobile_networks" msgid="7813380887358745769">"सेल्युलर सेल वाहक वायरलेस"</string>
+    <string name="keywords_more_default_sms_app" msgid="895656981962034647">"मजकूर संदेश मजकूर पाठविणे संदेशन"</string>
+    <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"सेल्युलर सेल कॅरियर वायरलेस डेटा 4g 3g 2g lte"</string>
     <string name="keywords_home" msgid="3626170808219458848">"लाँचर"</string>
     <string name="keywords_display" msgid="6709007669501628320">"स्क्रीन स्पर्श स्क्रीन"</string>
-    <string name="keywords_display_brightness_level" msgid="8636451602230815191">"मंद स्क्रीन स्पर्श स्क्रीन"</string>
-    <string name="keywords_display_auto_brightness" msgid="8070218600502753102">"मंद स्क्रीन स्पर्श स्क्रीन"</string>
-    <string name="keywords_display_wallpaper" msgid="4315466287469834939">"पार्श्वभूमी"</string>
+    <string name="keywords_display_brightness_level" msgid="8923289340474728990">"मंद स्क्रीन टचस्क्रीन बॅटरी"</string>
+    <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"मंद स्क्रीन टचस्क्रीन बॅटरी"</string>
+    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"पार्श्वभूमी वैयक्तिकृत सानुकूल प्रदर्शन"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"मजकूर आकार"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"प्रोजेक्ट"</string>
-    <string name="keywords_storage" msgid="7007275853993419928">"स्थान डिस्क हार्ड ड्राइव्ह"</string>
-    <string name="keywords_battery" msgid="3992479295298655138">"उर्जा"</string>
-    <string name="keywords_spell_checker" msgid="4509482591225399210">"शब्दलेखन"</string>
+    <string name="keywords_storage" msgid="6572905220031852173">"स्थान डिस्क हार्ड ड्राइव्ह डिव्हाइस वापर"</string>
+    <string name="keywords_battery" msgid="2096185085932675704">"उर्जा वापर शुल्क"</string>
+    <string name="keywords_spell_checker" msgid="6106749039734174140">"शब्दलेखन शब्दकोश शब्दलेखन तपासणी स्वयं-दुरुस्ती"</string>
     <string name="keywords_voice_input" msgid="3519547605812413860">"ओळखकर्ता इनपुट उच्चारण बोलणे भाषा हँड्सफ्री हँड फ्री ओळख आक्रमक शब्द ऑडिओ इतिहास ब्लूटूथ हेडसेट"</string>
-    <string name="keywords_text_to_speech_output" msgid="8207889472282225512">"रेट करा भाषा डीफॉल्ट बोला बोलणे"</string>
-    <string name="keywords_date_and_time" msgid="7666950126499155141">"घड्याळ"</string>
-    <string name="keywords_factory_data_reset" msgid="3693730656843989732">"पुसा हटवा"</string>
+    <string name="keywords_text_to_speech_output" msgid="392447904221657930">"रेट करा भाषा डीफॉल्ट बोला बोलणे tts प्रवेशयोग्यता वाचक अंध"</string>
+    <string name="keywords_date_and_time" msgid="2631808108134830066">"क्लॉक मिलिटरी"</string>
+    <string name="keywords_factory_data_reset" msgid="4355133848707691977">"पुसणे हटविणे पुनर्संचयित करणे साफ करणे काढणे"</string>
     <string name="keywords_printing" msgid="1701778563617114846">"प्रिंटर"</string>
     <string name="keywords_sounds_and_notifications" msgid="5965996187974887000">"स्पीकर बीप"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="2912933812460077912">"करू नका करू नका व्यत्यय आणणे व्यत्तय खंड"</string>
@@ -2354,7 +2371,7 @@
     <string name="keywords_location_mode" msgid="8584992704568356084">"अचूकता"</string>
     <string name="keywords_accounts" msgid="1957925565953357627">"खाते"</string>
     <string name="keywords_users" msgid="4673901601478559100">"प्रतिबंध प्रतिबंध करा प्रतिबंधित"</string>
-    <string name="keywords_keyboard_and_ime" msgid="1103378692379215672">"मजकूर सुधारणा योग्य ध्वनी कंपन उत्पन्न स्वयं भाषा जेश्चर सुचवा सूचना थीम आक्षेपार्ह शब्द प्रकार इमोजी"</string>
+    <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"मजकूर सुधारणा योग्य ध्वनी कंपन स्वयं भाषा जेश्चर सुचवा सूचना थीम आक्षेपार्ह शब्द प्रकार इमोजी आंतरराष्ट्रीय"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"संकेतशब्द नमुना पिन स्लाइड करा"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"वाय-फाय NFC टॅग सेट अप"</string>
     <string name="write_tag" msgid="8571858602896222537">"लिहा"</string>
@@ -2371,7 +2388,6 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"सूचना व्हॉल्यूम"</string>
     <string name="zen_mode_settings_title" msgid="7014915558669122902">"व्यत्यय"</string>
     <string name="zen_mode_option_title" msgid="5061978632306007914">"कॉल आणि सूचना येतात तेव्‍हा"</string>
-    <string name="zen_mode_option_title_novoice" msgid="6680706009915204785">"सूचना येतात तेव्हा"</string>
     <string name="zen_mode_option_off" msgid="3167702608910820883">"नेहमी व्यत्यय आणा"</string>
     <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"केवळ प्राधान्य दिलेल्या व्‍यत्‍ययांना अनुमती द्या"</string>
     <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"व्यत्यय आणू नका"</string>
@@ -2429,14 +2445,17 @@
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"पूर्ण झाले"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"आपण हे बंद करेपर्यंत"</string>
     <string name="zen_mode_important_category" msgid="8123274463331022993">"प्राधान्य दिलेले व्यत्यय"</string>
-    <string name="zen_mode_downtime_category" msgid="4730179065426038108">"डाउनटाइम (केवळ प्राधान्य दिलेले व्यत्यय)"</string>
+    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"कार्य न करण्याचा कालावधी"</string>
     <string name="zen_mode_downtime_days" msgid="3361856902633311616">"दिवस"</string>
     <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"काहीही नाही"</string>
+    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"व्यत्ययांना अनुमती"</string>
+    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"केवळ प्राधान्य"</string>
+    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"काहीही नाही"</string>
     <string name="zen_mode_automation_category" msgid="4653551005950835761">"स्वयंचलन"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"स्वयंचलितपणे चालू करा"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"कधीही नाही"</string>
-    <string name="zen_mode_phone_calls" msgid="8956214416859303966">"कॉल"</string>
+    <string name="zen_mode_calls" msgid="7051492091133751208">"कॉल"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"संदेश"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"कडील कॉल/संदेश"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"कोणीही"</string>
@@ -2450,7 +2469,9 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"आठवड्याच्या रात्री"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"प्रारंभ वेळ"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"समाप्ती वेळ"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> दुसर्‍या दिवशी"</string>
+    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"पुढील दिवशी <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"किंवा त्यापूर्वीचा कोणताही अलार्म <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"पुढील दिवशी किंवा त्यापूर्वीचा कोणताही अलार्म <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"अॅप सूचना"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"सूचना सेटिंग्ज"</string>
     <string name="device_feedback" msgid="3238056036766293294">"या डिव्हाइस बद्दल अभिप्राय पाठवा"</string>
@@ -2458,7 +2479,11 @@
     <string name="switch_on_text" msgid="1124106706920572386">"चालू"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"बंद"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"स्‍क्रीन पिन करणे"</string>
-    <string name="screen_pinning_description" msgid="7091642350452605379">"आपण चालू करता, तेव्हा आपण अनपिन करेपर्यंत वर्तमान स्क्रीन दृश्यामध्ये ठेवण्यासाठी स्क्रीन पिन करणे वापरू शकता.\n\nस्क्रीन पिन करणे वापरण्यासाठी:\n\n1. स्क्रीन पिन करणे चालू असल्याचे सुनिश्चित करा.\n\n2. आपण पिन करू इच्छिता ती स्क्रीन उघडा.\n\n3. विहंगावलोकनास स्पर्श करा.\n\n4. पिन चिन्हास स्पर्श करा."</string>
+    <string name="screen_pinning_description" msgid="1137904524037468263">"ही सेटिंग चालू असते, तेव्हा आपण अनपिन करेपर्यंत दृश्यामध्ये वर्तमान स्क्रीन ठेवण्यासाठी आपण स्क्रीन पिन करणे वापरू शकता.\n\nस्क्रीन पिन करणे वापरण्यासाठी:\n\n1. स्क्रीन पिन करणे चालू असल्याचे सुनिश्चित करा.\n\n2. आपण पिन करू इच्छिता ती स्क्रीन उघडा.\n\n3. विहंगावलोकनास स्पर्श करा.\n\n4. स्वाइप करा आणि नंतर पिन चिन्हास स्पर्श करा."</string>
+    <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"अनपिन करण्‍यापूर्वी अनलॉक नमुन्यासाठी विचारा"</string>
+    <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"अनपिन करण्‍यापूर्वी पिन साठी विचारा"</string>
+    <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"अनपिन करण्‍यापूर्वी संकेतशब्दासाठी विचारा"</string>
+    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"अनपिन करताना डिव्हाइस लॉक करा"</string>
     <string name="managed_user_title" msgid="8101244883654409696">"कार्य प्रोफाईल"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(प्रायोगिक)"</string>
     <string name="display_auto_rotate_title" msgid="6176450657107806043">"डिव्हाइस फिरविलेले असताना"</string>
@@ -2467,7 +2492,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"भूदृश्य दृश्‍यामध्ये रहा"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"वर्तमान अभिमुखतेमध्ये रहा"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI माहिती"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI सापेक्ष माहिती"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"कूटबद्धीकरण"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"सुरु ठेवा"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"आपण या डिव्हाइसचा प्रारंभ करण्यापूर्वी आपला PIN आवश्यक करून हे डिव्हाइस अधिक संरक्षित करू शकता. डिव्हाइसचा प्रारंभ होईपर्यंत, ते अलार्मसह, कॉल, संदेश किंवा सूचना प्राप्त करू शकत नाही.\n\nयामुळे गहाळ किंवा चोरी झालेल्या डिव्हाइसेसवरील डेटा संरक्षित करण्यात मदत होते."</string>
@@ -2485,4 +2509,7 @@
     <string name="encrypt_talkback_dialog_message_pin" msgid="1890374082842868489">"या डिव्हाइसचा प्रारंभ करण्यासाठी आपण आपला PIN प्रविष्ट करता, तेव्हा <xliff:g id="SERVICE">%1$s</xliff:g> सारख्या सेवांची प्रवेशयोग्यता उपलब्धता असणार नाही."</string>
     <string name="encrypt_talkback_dialog_message_pattern" msgid="4474332516537386384">"या डिव्हाइसचा प्रारंभ करण्यासाठी आपण आपला नमुना प्रविष्ट करता, तेव्हा <xliff:g id="SERVICE">%1$s</xliff:g> सारख्या सेवांची प्रवेशयोग्यता उपलब्ध असणार नाही."</string>
     <string name="encrypt_talkback_dialog_message_password" msgid="8166099418487083927">"या डिव्हाइसचा प्रारंभ करण्यासाठी आपण आपला संकेतशब्द प्रविष्ट करता, तेव्हा <xliff:g id="SERVICE">%1$s</xliff:g> सारख्या सेवांची प्रवेशयोग्यता उपलब्ध असणार नाही."</string>
+    <string name="imei_information_title" msgid="8499085421609752290">"IMEI माहिती"</string>
+    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI सापेक्ष माहिती"</string>
+    <string name="slot_number" msgid="3762676044904653577">"(स्लॉट<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-ms-rMY/arrays.xml b/res/values-ms-rMY/arrays.xml
index 7c9eea2..f4d49d9 100644
--- a/res/values-ms-rMY/arrays.xml
+++ b/res/values-ms-rMY/arrays.xml
@@ -527,4 +527,12 @@
     <item msgid="4338089220026248848">"Cache (klien aktiviti)"</item>
     <item msgid="6652164677254579050">"Cache (kosong)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Hijau kebiruan"</item>
+    <item msgid="8332294763632946560">"Biru"</item>
+    <item msgid="2023216417616991392">"Biru nila"</item>
+    <item msgid="3170497246594232819">"Ungu"</item>
+    <item msgid="4608643045752965568">"Merah jambu"</item>
+    <item msgid="6131821495505931173">"Merah"</item>
+  </string-array>
 </resources>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index 597a314..bddc7ab 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>
@@ -180,7 +180,6 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s ingin mengakses mesej anda. Berikan akses kepada %2$s?"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Tarikh &amp; masa"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Pilih zon masa"</string>
-    <string name="normal_date_format" msgid="7636406984925498359">"Wilayah (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Pratonton:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Saiz fon:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -291,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>
@@ -322,8 +321,6 @@
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Pilih zon waktu"</string>
     <string name="date_time_set_date_title" msgid="6928286765325608604">"Tarikh"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"Tetapkan tarikh"</string>
-    <string name="date_time_date_format_title" msgid="3976171711988766411">"Format tarikh"</string>
-    <string name="date_time_date_format" msgid="6951498879879281102">"Pilih format tarikh"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Isih mengikut abjad"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Diisih mengikut zon waktu"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Tarikh"</string>
@@ -372,7 +369,8 @@
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Sila tunggu sementara telefon anda disulitkan. <xliff:g id="PERCENT">^1</xliff:g>% selesai."</string>
     <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Sila tunggu sementara tablet anda disulitkan. Masa yang tinggal: <xliff:g id="DURATION">^1</xliff:g>"</string>
     <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Sila tunggu sementara telefon anda disulitkan. Masa yang tinggal: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Cuba lagi dalam <xliff:g id="DELAY">^1</xliff:g> saat."</string>
+    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"Untuk membuka kunci tablet anda, matikan, kemudian hidupkan tablet itu."</string>
+    <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"Untuk membuka kunci telefon anda, matikan, kemudian hidupkan telefon itu."</string>
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"Amaran: Peranti anda akan disilih selepas <xliff:g id="COUNT">^1</xliff:g> lagi percubaan yang gagal untuk membuka kunci!"</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Taipkan kata laluan anda"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Penyulitan tidak berjaya"</string>
@@ -401,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>
@@ -412,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>
@@ -556,13 +556,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Sebagai telefon pembesar suara"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Untuk muzik dan media"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Ingat tetapan"</string>
-    <string name="wifi_assistant_intro_setup" msgid="4605105515416995110">"Mpknalkn\nPmbntu Wi‑Fi"</string>
-    <string name="wifi_assistant_no_thanks" msgid="2776983751990143934">"TIDAK, TERIMA KASIH"</string>
-    <string name="wifi_assistant_setup" msgid="3772423650475730906">"SEDIAKAN"</string>
-    <string name="wifi_assistant_card_message" msgid="107811647784658536">"Menyambung secara automatik kepada rangkaian yang tersedia dengan Pembantu Wi-Fi."</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Pembantu Wi-Fi"</string>
-    <string name="wifi_assistant_title_message" msgid="6240721017579074015">"<xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> menyambungkan peranti anda kepada Wi-Fi tersedia yang terbaik secara automatik"</string>
-    <string name="wifi_assistant_open_app" msgid="4803044899535675063">"BUKA APL"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Disambungkan melalui Pembantu Wi-Fi"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"Skrin Cast"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Dayakan paparan wayarles"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Tiada peranti berdekatan ditemui."</string>
@@ -592,7 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Tetapan Wi‑Fi"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Sediakan &amp; urus titik capaian wayarles"</string>
-    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Pilih Wi-Fi"</string>
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Pilih rangkaian Wi-Fi"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Pilih Wi-Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Menghidupkan Wi‑Fi…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Mematikan Wi‑Fi…"</string>
@@ -607,8 +602,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"Imbasan sentiasa tersedia"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Sentiasa benarkan pengimbasan"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Benarkan perkhidmatan lokasi Google dan apl lain mengimbas rangkaian, walaupun semasa Wi-Fi dimatikan"</string>
-    <string name="wifi_automatically_manage_title" msgid="6249976570008992746">"Urus Wi-Fi secara automatik"</string>
-    <string name="wifi_automatically_manage_summary" msgid="6952470763378312488">"Benarkan <xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> mengurus sambungan Wi-Fi anda"</string>
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Gunakan Wi-Fi terbuka secara automatik"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Biarkan pembantu Wi-Fi menyambung scr automatik ke rangkaian tbuka yg ditentukan sbg bkualiti tinggi"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Pilih pembantu"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Pasang sijil"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Untuk memperbaik ketepatan lokasi dan untuk tujuan lain, Google dan apl lain mungkin mengimbas rangkaian berhampiran walaupun semasa Wi-Fi dimatikan. Jika anda tidak mahu ini berlaku, pergi ke Terperinci &gt; Pengimbasan sentiasa tersedia."</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Apl mungkin mengimbas rangkaian berhampiran, walaupun semasa Wi-Fi dimatikan. Jika anda tidak mahu ini berlaku, pergi ke Terperinci &gt; Pengimbasan sentiasa tersedia."</string>
@@ -629,6 +625,7 @@
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Imbas"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Terperinci"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Sambung kepada rangkaian"</string>
+    <string name="wifi_menu_remember" msgid="8814185749388713796">"Ingat rangkaian"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Lupakan rangkaian"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Ubah suai"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Tulis kepada teg NFC"</string>
@@ -673,9 +670,11 @@
     <string name="wifi_unspecified" msgid="5431501214192991253">"(tidak ditentukan)"</string>
     <string name="wifi_remembered" msgid="4955746899347821096">"Disimpan"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"Dinyahdayakan"</string>
-    <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Sambungan Internet lemah dielakkan"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"Kegagalan Konfigurasi IP"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Kegagalan Sambungan WiFi"</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Masalah pengesahan"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Tidak dalam liputan"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Tiada Akses Internet Dikesan, tidak akan menyambung secara automatik."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS tersedia"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS tersedia)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Masukkan kata laluan rangkaian anda"</string>
@@ -699,9 +698,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"AMARAN: jika anda melangkau Wi-Fi, tablet anda hanya akan menggunakan data selular untuk muat turun awal dan kemas kini. Untuk mengelakkan kemungkinan caj data, sambung ke Wi-Fi."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"AMARAN: jika anda melangkau Wi-Fi, peranti anda hanya akan menggunakan data selular untuk muat turun awal dan kemas kini. Untuk mengelakkan kemungkinan caj data, sambung ke Wi-Fi."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"AMARAN: jika anda melangkau Wi-Fi, telefon anda hanya akan menggunakan data selular untuk muat turun awal dan kemas kini. Untuk mengelakkan kemungkinan caj data, sambung ke Wi-Fi."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="2393880108322835846">"AMARAN: Jika anda melangkau Wi-Fi, tablet anda tidak akan mempunyai sambungan Internet untuk digunakan bagi sebarang muat turun awal atau kemas kini."</string>
-    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1707391993265558787">"AMARAN: Jika anda melangkau Wi-Fi, peranti anda tidak akan mempunyai sambungan Internet untuk digunakan bagi sebarang muat turun awal atau kemas kini."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="1556858507920033022">"AMARAN: Jika anda melangkau Wi-Fi, telefon anda tidak akan mempunyai sambungan Internet untuk digunakan bagi sebarang muat turun awal atau kemas kini."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Jika anda melangkau Wi-Fi:\n\nTablet anda tidak akan mempunyai sambungan Internet.\n\nAnda tidak akan mendapat kemas kini perisian sehingga anda bersambung ke Internet.\n\nAnda tidak boleh mengaktifkan ciri perlindungan peranti pada masa ini."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Jika anda melangkau Wi-Fi:\n\nPeranti anda tidak akan mempunyai sambungan Internet.\n\nAnda tidak akan mendapat kemas kini perisian sehingga anda bersambung ke Internet.\n\nAnda tidak boleh mengaktifkan ciri perlindungan peranti pada masa ini."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Jika anda melangkau Wi-Fi:\n\nTelefon anda tidak akan mempunyai sambungan Internet.\n\nAnda tidak akan mendapat kemas kini perisian sehingga anda bersambung ke Internet.\n\nAnda tidak boleh mengaktifkan ciri perlindungan peranti pada masa ini."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Tablet tidak dapat menyambung ke rangkaian Wi-Fi ini."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"Peranti tidak dapat menyambung ke rangkaian Wi-Fi ini."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Telefon tidak dapat menyambung ke rangkaian Wi-Fi ini."</string>
@@ -761,7 +760,6 @@
     <string name="ring_volume_title" msgid="7938706566797464165">"Kelantangan pendering"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Getar apabila senyap"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Bunyi pemberitahuan lalai"</string>
-    <string name="heads_up_enabled_title" msgid="1031078221910921622">"Pop timbul jika keutamaan tggi"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Nada dering"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Pemberitahuan"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Gunakan kelantangan panggilan masuk untuk pemberitahuan"</string>
@@ -834,7 +832,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Kecerahan automatik"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Angkat untuk bangunkan"</string>
     <string name="doze_title" msgid="2259176504273878294">"Paparan ambien"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"Bangunkan skrin apabila peranti diangkat atau pemberitahuan tiba"</string>
+    <string name="doze_summary" msgid="7128970177894383698">"Aktifkan skrin apabila anda mengambil peranti atau menerima pemberitahuan"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Saiz fon"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Saiz fon"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Tetapan kunci kad SIM"</string>
@@ -862,6 +860,10 @@
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Batal"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"Berbilang SIM ditemui"</string>
     <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>
+    <string name="sim_preferred_title" msgid="5567909634636045268">"Kemas kini kad SIM pilihan?"</string>
+    <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> adalah satu-satunya SIM dalam peranti anda. Adakah anda ingin menggunakan SIM ini untuk data selular, panggilan dan mesej SMS?"</string>
     <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>
@@ -1012,6 +1014,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Ini akan memadamkan semua data dari "<b>"storan dalaman"</b>" tablet anda, termasuk:\n\n"<li>"Akaun Google anda"</li>\n<li>"Data dan tetapan sistem dan aplikasi"</li>\n<li>"Aplikasi yang dimuat turun"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Ini akan memadamkan semua data dari "<b>"storan dalaman"</b>" telefon anda, termasuk:\n\n"<li>"Akaun Google anda"</li>\n<li>"Data dan tetapan sistem dan aplikasi"</li>\n<li>"Aplikasi yang dimuat turun"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Anda melog masuk ke dalam akaun berikut buat masa ini:\n"</string>
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Terdapat pengguna lain pada peranti ini.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Muzik"</li>\n<li>"Foto"</li>\n<li>"Data pengguna yang lain"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Untuk memadam bersih muzik, gambar dan data pengguna lain, "<b>"storan USB"</b>" perlu dipadamkan."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Untuk turut memadam bersih muzik, gambar dan data pengguna lain, "<b>"kad SD"</b>" perlu dipadamkan."</string>
@@ -1023,7 +1026,6 @@
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Tetapkan semula telefon"</string>
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Padamkan semua maklumat peribadi anda dan aplikasi yang dimuat turun? Anda tidak boleh menterbalikkan tindakan ini!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Padamkan semua"</string>
-    <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Lukis corak buka kunci anda"</string>
     <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Anda perlu melukiskan corak buka kunci anda untuk mengesahkan tetapan semula data kilang."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Tiada penetapan semula dijalankan kerana perkhidmatan Padam Bersih Sistem tidak tersedia."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Tetapkan semula?"</string>
@@ -1041,7 +1043,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"Padamkan storan USB, memadamkan semua fail yang disimpan di sana? Anda tidak boleh menterbalikkan tindakan ini!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Padamkan kad SD, turut memadamkan semua fail yang tersimpan padanya? Anda tidak boleh menterbalikkan tindakan ini!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Padamkan semua"</string>
-    <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Lukis corak buka kunci anda"</string>
     <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Anda perlu melukis corak buka kunci anda untuk mengesahkan bahawa anda mahu memadamkan storan USB."</string>
     <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Anda perlu melukis corak buka kunci anda untuk mengesahkan bahawa anda mahu memadamkan kad SD."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Tetapan panggilan"</string>
@@ -1087,6 +1088,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Sila masukkan kad SIM dan mulakan semula"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Sila sambung ke internet"</string>
     <string name="location_title" msgid="1029961368397484576">"Lokasi Saya"</string>
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Profil kerja"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Lokasi untuk profil kerja"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Dimatikan oleh syarikat anda"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Mod"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Kejituan tinggi"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Penjimatan bateri"</string>
@@ -1124,6 +1128,7 @@
     <string name="copyright_title" msgid="865906688917260647">"Hak cipta"</string>
     <string name="license_title" msgid="1990487604356037871">"Lesen"</string>
     <string name="terms_title" msgid="7697580845616764642">"Terma dan Syarat"</string>
+    <string name="webview_license_title" msgid="2813507464175738967">"Lesen WebView Sistem"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Kertas dinding"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Pembekal imej satelit:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Lesen sumber terbuka"</string>
@@ -1237,7 +1242,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Storan USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Pada kad SD"</string>
     <string name="disabled" msgid="9206776641295849915">"Dilumpuhkan"</string>
-    <string name="not_installed" msgid="1475144352069281880">"Tidak dipasangkan"</string>
+    <string name="not_installed" msgid="2797554494953450291">"Tidak dipasang bg pengguna ini"</string>
     <string name="no_applications" msgid="7336588977497084921">"Tiada aplikasi."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Storan dalaman"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Storan USB"</string>
@@ -1434,8 +1439,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Skrin tidak sekali-kali akan tidur semasa pengecasan"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Dayakan log intip HCI Bluetooth"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Tangkap semua paket HCI bluetooth dalam fail"</string>
-    <string name="oem_unlock_enable" msgid="6629321276287913315">"Dayakan buka kunci OEM"</string>
-    <string name="oem_unlock_enable_summary" msgid="3546686263996628110">"Benarkan peranti dibuka kunci OEM"</string>
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"Pembukaan kunci OEM"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Benarkan pemuat but untuk dibuka kunci"</string>
+    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Masukkan PIN anda"</string>
+    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Masukkan PIN peranti anda untuk mendayakan buka kunci OEM"</string>
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Benarkan pembukaan kunci OEM?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"AMARAN: Ciri perlindungan peranti tidak akan berfungsi pada peranti ini semasa tetapan ini dihidupkan."</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Pensijilan paparan wayarles"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Dayakan Pengelogan Berjela-jela Wi-Fi"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Penyerahan Wi-Fi ke Selular agresif"</string>
@@ -1538,6 +1547,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"Kapsyen akan kelihatan seperti ini"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"Lalai"</string>
+    <string name="color_title" msgid="4258931051732243983">"Warna"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"Lalai"</string>
     <string name="color_none" msgid="3475640044925814795">"Tiada"</string>
     <string name="color_white" msgid="8045195170201590239">"Putih"</string>
@@ -1595,12 +1605,12 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"<xliff:g id="REMAIN">%1$s</xliff:g> yang tinggal"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> untuk mengecas"</string>
-    <string name="power_discharging_duration" msgid="7125493014448497620">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - kira-kira <xliff:g id="TIME">%2$s</xliff:g> yang tinggal"</string>
-    <string name="power_charging" msgid="712751285832976915">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="STATE">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration" msgid="4802183864773082009">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> sehingga penuh"</string>
-    <string name="power_charging_duration_ac" msgid="3611179931297824699">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> sehingga penuh di AC"</string>
-    <string name="power_charging_duration_usb" msgid="1106605348913397583">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> sehingga penuh melalui USB"</string>
-    <string name="power_charging_duration_wireless" msgid="633606920144617227">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> sehingga penuh dari wayarles"</string>
+    <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> - kira-kira. <xliff:g id="TIME">%2$s</xliff:g> yang tinggal"</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> sehingga penuh"</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> sehingga penuh di AC"</string>
+    <string name="power_charging_duration_usb" msgid="182405645340976546">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> sehingga penuh melalui USB"</string>
+    <string name="power_charging_duration_wireless" msgid="1829295708243159464">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> sehingga penuh dari wayarles"</string>
     <string name="power_usage_list_summary" msgid="2409288197839512482">"Digunakan sejak cas penuh yang lalu"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Bateri digunakan sejak palam dicabut"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Kegunaan bateri sejak ditetapkan semula"</string>
@@ -1617,7 +1627,6 @@
     <string name="awake" msgid="387122265874485088">"Waktu jaga peranti"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Masa hidup Wi-Fi"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Masa hidup Wi-Fi"</string>
-    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Butiran sejarah"</string>
     <string name="details_title" msgid="3792801565213935385">"Gunakan butiran"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Gunakan butiran"</string>
@@ -1689,7 +1698,7 @@
     <string name="battery_saver" msgid="1426682272004907982">"Penjimat bateri"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Hidupkan secara automatik"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Tidak sekali-kali"</string>
-    <string name="battery_saver_turn_on_automatically_pct" msgid="3033681629861428940">"pada %1$d%% bateri"</string>
+    <string name="battery_saver_turn_on_automatically_pct" msgid="7536784431655058267">"pada %1$s bateri"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Statistik Proses"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Statistik skema tentang proses yang sedang berjalan"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Penggunaan memori"</string>
@@ -1813,7 +1822,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Bersandarkan perkakasan"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Perisian sahaja"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"Bukti kelayakan tidak tersedia untuk pengguna ini"</string>
-    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Lukis corak buka kunci anda"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Anda perlu melukiskan corak buka kunci anda untuk mengesahkan pemasangan bukti kelayakan."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Taip kata laluan untuk storan bukti kelayakan."</string>
@@ -1843,6 +1851,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"Masukkan data apl"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Pemulihan automatik"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Apabila memasang semula aplikasi, pulihkan tetapan dan data yang disandarkan"</string>
+    <string name="backup_inactive_title" msgid="5355557151569037197">"Perkhidmatan sandaran tidak aktif."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"Ini ditetapkan oleh dasar peranti anda."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Kata laluan sandaran komputer meja"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Sandaran penuh meja komputer tidak dilindungi pada masa ini"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Sentuh untuk menukar atau mengalih keluar kata laluan untuk sandaran penuh komputer meja"</string>
@@ -1952,7 +1962,11 @@
     <string name="enter_password" msgid="8035706727471334122">"Untuk memulakan Android, masukkan kata laluan anda"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Untuk memulakan Android, masukkan PIN anda"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Untuk memulakan Android, lukis corak anda"</string>
-    <string name="try_again" msgid="4272075051293936921">"Cuba lagi."</string>
+    <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"Corak salah"</string>
+    <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"Kata Laluan salah"</string>
+    <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"PIN salah"</string>
+    <string name="checking_decryption" msgid="8287458611802609493">"Menyemak…"</string>
+    <string name="starting_android" msgid="8581493237458496835">"Memulakan Android"</string>
     <string name="delete" msgid="4219243412325163003">"Padam"</string>
     <string name="misc_files" msgid="6720680815969643497">"Fail Pelbagai"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"pilihan <xliff:g id="NUMBER">%1$d</xliff:g> dari <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -1990,8 +2004,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Sentiasa gunakan GPU untuk komposit skrin"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"Tiru ruang warna"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Dayakan kesan OpenGL"</string>
-    <string name="use_nuplayer" msgid="5699257393367904387">"Gunakan NuPlayer (ujian)"</string>
-    <string name="use_nuplayer_summary" msgid="1991479067478516714">"Gunakan NuPlayer bukannya AwesomePlayer"</string>
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"Gunakan AwesomePlayer (ditamatkan)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"Gunakan AwesomePlayer, bukan NuPlayer, untuk main balik media"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"Lmpuhkn phalaan audio USB"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"Lumpuhkn pghalaan automatik ke persisian audio USB"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Tunjukkan batas reka letak"</string>
@@ -2167,7 +2181,6 @@
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Tambah pengguna atau profil"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Tambah pengguna"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Profil terhad"</string>
-    <string name="user_summary_managed_profile" msgid="7369539529693048111">"Profil kerja"</string>
     <string name="user_need_lock_message" msgid="2596365678651842785">"Sebelum anda boleh membuat profil yang terhad, anda perlu menyediakan kunci skrin untuk melindungi apl dan data peribadi anda."</string>
     <string name="user_set_lock_button" msgid="8311219392856626841">"Tetapkan kunci"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Tidak disediakan"</string>
@@ -2298,11 +2311,13 @@
     <string name="sim_cellular_data_unavailable_summary" msgid="3654805961942166428">"Sentuh untuk memilih SIM data"</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"Sentiasa gunakan ini untuk panggilan"</string>
     <string name="select_sim_for_data" msgid="2366081042162853044">"Pilih SIM untuk data"</string>
+    <string name="data_switch_started" msgid="2040761479817166311">"Menukar SIM data, proses ini boleh mengambil masa sehingga satu minit…"</string>
     <string name="select_sim_for_calls" msgid="3503094771801109334">"Panggil dengan"</string>
     <string name="sim_select_card" msgid="211285163525563293">"Pilih kad SIM"</string>
     <string name="sim_card_number_title" msgid="7845379943474336488">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"SIM kosong"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"Nama SIM"</string>
+    <string name="sim_name_hint" msgid="7038643345238968930">"Masukkan nama SIM"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"Slot SIM %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Pembawa"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Nombor"</string>
@@ -2312,7 +2327,6 @@
     <string name="color_purple" msgid="3888532466427762504">"Ungu"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"Tiada kad SIM dimasukkan"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"Status SIM"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"Maklumat berkaitan SIM"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"Panggil balik dari SIM lalai"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"SIM untuk panggilan keluar"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Tetapan panggilan lain"</string>
@@ -2320,8 +2334,11 @@
     <string name="preferred_network_offload_header" msgid="2321173571529106767">"Lumpuh Siaran Nm Rgkaian"</string>
     <string name="preferred_network_offload_footer" msgid="5857279426054744020">"Lumpuhkan Siaran Nama Rangkaian menghalang akses pihak ketiga kepada maklumat rangkaian anda."</string>
     <string name="preferred_network_offload_popup" msgid="2252915199889604600">"Melumpuhkan Siaran Nama Rangkaian akan menghalang sambungan automatik ke rangkaian yang tersembunyi."</string>
+    <string name="sim_signal_strength" msgid="9144010043784767984">"<xliff:g id="DBM">%1$d</xliff:g> dBm <xliff:g id="ASU">%2$d</xliff:g> asu"</string>
+    <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>
+    <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Tanya setiap kali"</string>
     <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>
@@ -2330,22 +2347,22 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Carian terbaru"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Hasil"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi sambungan rangkaian"</string>
-    <string name="keywords_more_default_sms_app" msgid="2744404159003574745">"mesej teks"</string>
-    <string name="keywords_more_mobile_networks" msgid="7813380887358745769">"selular sel pembawa wayarles"</string>
+    <string name="keywords_more_default_sms_app" msgid="895656981962034647">"mesej teks menghantar mesej mesej pemesejan"</string>
+    <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"selular sel pembawa data wayarles 4g 3g 2g lte"</string>
     <string name="keywords_home" msgid="3626170808219458848">"pelancar"</string>
     <string name="keywords_display" msgid="6709007669501628320">"skrin skrin sentuh"</string>
-    <string name="keywords_display_brightness_level" msgid="8636451602230815191">"skrin sentuh skrin malap"</string>
-    <string name="keywords_display_auto_brightness" msgid="8070218600502753102">"skrin sentuh skrin malap"</string>
-    <string name="keywords_display_wallpaper" msgid="4315466287469834939">"latar"</string>
+    <string name="keywords_display_brightness_level" msgid="8923289340474728990">"skrin malap skrin sentuh bateri"</string>
+    <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"skrin malap skrin sentuh bateri"</string>
+    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"latar belakang peribadikan suaikan paparan"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"saiz teks"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"projek"</string>
-    <string name="keywords_storage" msgid="7007275853993419928">"ruang cakera keras pacuan"</string>
-    <string name="keywords_battery" msgid="3992479295298655138">"kuasa"</string>
-    <string name="keywords_spell_checker" msgid="4509482591225399210">"ejaan"</string>
+    <string name="keywords_storage" msgid="6572905220031852173">"ruang cakera pemacu keras peranti penggunaan"</string>
+    <string name="keywords_battery" msgid="2096185085932675704">"caj penggunaan kuasa"</string>
+    <string name="keywords_spell_checker" msgid="6106749039734174140">"ejaan kamus penyemak ejaan pembetulan auto"</string>
     <string name="keywords_voice_input" msgid="3519547605812413860">"pengecam input pertuturan cakap bahasa beban tangan bebas tangan pengecaman mengganggu perkataan audio sejarah bluetooth set kepala"</string>
-    <string name="keywords_text_to_speech_output" msgid="8207889472282225512">"nilai bahasa lalai cakap bercakap"</string>
-    <string name="keywords_date_and_time" msgid="7666950126499155141">"jam"</string>
-    <string name="keywords_factory_data_reset" msgid="3693730656843989732">"padam silih"</string>
+    <string name="keywords_text_to_speech_output" msgid="392447904221657930">"kadar bahasa lalai cakap bercakap tts kebolehaksesan pembaca buta"</string>
+    <string name="keywords_date_and_time" msgid="2631808108134830066">"jam tentera"</string>
+    <string name="keywords_factory_data_reset" msgid="4355133848707691977">"silih padam pulihkan kosongkan alih keluar"</string>
     <string name="keywords_printing" msgid="1701778563617114846">"pencetak"</string>
     <string name="keywords_sounds_and_notifications" msgid="5965996187974887000">"pembesar suara bip"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="2912933812460077912">"jangan jangan kacau ganggu gangguan pecah"</string>
@@ -2354,7 +2371,7 @@
     <string name="keywords_location_mode" msgid="8584992704568356084">"ketepatan"</string>
     <string name="keywords_accounts" msgid="1957925565953357627">"akaun"</string>
     <string name="keywords_users" msgid="4673901601478559100">"sekatan sekat terhad"</string>
-    <string name="keywords_keyboard_and_ime" msgid="1103378692379215672">"teks pembetulan betul bunyi bergetar auto suara gerak isyarat cadang cadangan tema mengganggu perkataan taip emoji"</string>
+    <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"pembetulan teks betul bunyi getaran auto bahasa gerak isyarat cadang cadangan tema perkataan mengganggu taip emoji antarabangsa"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"luncur kata laluan corak pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Sediakan Teg NFC Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Tulis"</string>
@@ -2371,7 +2388,6 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Kelantangan pemberitahuan"</string>
     <string name="zen_mode_settings_title" msgid="7014915558669122902">"Gangguan"</string>
     <string name="zen_mode_option_title" msgid="5061978632306007914">"Apabila panggilan dan pemberitahuan tiba"</string>
-    <string name="zen_mode_option_title_novoice" msgid="6680706009915204785">"Apabila pemberitahuan tiba"</string>
     <string name="zen_mode_option_off" msgid="3167702608910820883">"Sentiasa ganggu"</string>
     <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Benarkan gangguan keutamaan sahaja"</string>
     <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Jangan ganggu"</string>
@@ -2429,14 +2445,17 @@
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Selesai"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Sehingga anda matikan"</string>
     <string name="zen_mode_important_category" msgid="8123274463331022993">"Gangguan keutamaan"</string>
-    <string name="zen_mode_downtime_category" msgid="4730179065426038108">"Masalah (gangguan keutamaan sahaja)"</string>
+    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Waktu gendala"</string>
     <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Dari"</string>
     <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Tiada"</string>
+    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Gangguan yang dibenarkan"</string>
+    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Keutamaan sahaja"</string>
+    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Tiada"</string>
     <string name="zen_mode_automation_category" msgid="4653551005950835761">"Automasi"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Hidupkan secara automatik"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Tidak pernah"</string>
-    <string name="zen_mode_phone_calls" msgid="8956214416859303966">"Panggilan"</string>
+    <string name="zen_mode_calls" msgid="7051492091133751208">"Panggilan"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Mesej"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Panggilan/mesej daripada"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Sesiapa sahaja"</string>
@@ -2450,7 +2469,9 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Malam hari bekerja"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Masa mula"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Masa tamat"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> hari seterusnya"</string>
+    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> hari seterusnya"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> atau sebarang penggera sebelumnya"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> hari seterusnya atau sebarang penggera sebelumnya"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Pemberitahuan apl"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Tetapan pemberitahuan"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Hntr mklm balas mngenai peranti ini"</string>
@@ -2458,7 +2479,11 @@
     <string name="switch_on_text" msgid="1124106706920572386">"Dihidupkan"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Dimatikan"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"Penyematan skrin"</string>
-    <string name="screen_pinning_description" msgid="7091642350452605379">"Apabila dihidupkan, anda boleh menggunakan penyematan skrin untuk memastikan skrin semasa tetap kelihatan sehingga anda menyahsemat.\n\nUntuk menggunakan penyematan skrin:\n\n1. Pastikan penyematan skrin dihidupkan.\n\n2. Buka skrin yang ingin anda sematkan.\n\n3. Sentuh Ikhtisar.\n\n4. Sentuh ikon pin."</string>
+    <string name="screen_pinning_description" msgid="1137904524037468263">"Apbl tetapan ini dihidupkn, anda blh menggunakn penyematan skrin utk memastikn skrin semasa kelihatan sehingga anda menyahsemat.\n\nUtk menggunakn penyematan skrin:\n\n1. Pastikn penyematan skrin dihidupkn.\n\n2. Buka skrin yg ingin anda semat.\n\n3. Sentuh Gambaran Keseluruhan.\n\n4. Leret ke atas dan sentuh ikon pin."</string>
+    <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Minta corak buka kunci sebelum menyahsemat"</string>
+    <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Minta PIN sebelum menyahsemat"</string>
+    <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Minta kata laluan sebelum menyahsemat"</string>
+    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Kunci peranti semasa menyahsemat"</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Profil kerja"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Percubaan)"</string>
     <string name="display_auto_rotate_title" msgid="6176450657107806043">"Apabila peranti diputar"</string>
@@ -2467,7 +2492,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Kekal dalam paparan landskap"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Kekal dalam orientasi semasa"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"Maklumat IMEI"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"Maklumat relatif IMEI"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Penyulitan"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Teruskan"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"Anda boleh melindungi peranti ini selanjutnya dengan meminta PIN anda sebelum peranti dimulakan. Sehingga peranti dimulakan, peranti tidak boleh menerima panggilan, mesej atau pemberitahuan, termasuk penggera. \n\nIni membantu melindungi data pada peranti yang hilang atau dicuri."</string>
@@ -2485,4 +2509,7 @@
     <string name="encrypt_talkback_dialog_message_pin" msgid="1890374082842868489">"Apabila anda memasukkan PIN anda untuk memulakan peranti ini, perkhidmatan kebolehaksesan seperti <xliff:g id="SERVICE">%1$s</xliff:g> belum tersedia lagi."</string>
     <string name="encrypt_talkback_dialog_message_pattern" msgid="4474332516537386384">"Apabila anda memasukkan corak anda untuk memulakan peranti ini, perkhidmatan kebolehaksesan seperti <xliff:g id="SERVICE">%1$s</xliff:g> belum tersedia lagi."</string>
     <string name="encrypt_talkback_dialog_message_password" msgid="8166099418487083927">"Apabila anda memasukkan kata laluan anda untuk memulakan peranti ini, perkhidmatan kebolehaksesan seperti <xliff:g id="SERVICE">%1$s</xliff:g> belum tersedia lagi."</string>
+    <string name="imei_information_title" msgid="8499085421609752290">"Maklumat IMEI"</string>
+    <string name="imei_information_summary" msgid="2074095606556565233">"Maklumat relatif IMEI"</string>
+    <string name="slot_number" msgid="3762676044904653577">"(Slot<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-my-rMM/arrays.xml b/res/values-my-rMM/arrays.xml
index 1bca8a2..a043eec 100644
--- a/res/values-my-rMM/arrays.xml
+++ b/res/values-my-rMM/arrays.xml
@@ -527,4 +527,12 @@
     <item msgid="4338089220026248848">"ကက်ရှ လုပ်ထား (အသုံးပြုသူ ဖောက်သည်)"</item>
     <item msgid="6652164677254579050">"ကက်ရှ် လုပ်ထား (ဗလာ)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"စိမ်းပြာ"</item>
+    <item msgid="8332294763632946560">"အပြာ"</item>
+    <item msgid="2023216417616991392">"မဲနယ်"</item>
+    <item msgid="3170497246594232819">"ခရမ်း"</item>
+    <item msgid="4608643045752965568">"ပန်းရောင်"</item>
+    <item msgid="6131821495505931173">"အနီ"</item>
+  </string-array>
 </resources>
diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml
index efc0d62..7b044a3 100644
--- a/res/values-my-rMM/strings.xml
+++ b/res/values-my-rMM/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="yes" msgid="4676390750360727396">"ဟုတ်ကဲ့"</string>
-    <string name="no" msgid="6731231425810196216">"ဟင့်အင်း"</string>
+    <string name="no" msgid="6731231425810196216">"ဟင့်အင်း"</string>
     <string name="create" msgid="3578857613172647409">"ဖန်တီးရန်"</string>
     <string name="allow" msgid="3349662621170855910">"ခွင့်ပြုပါ"</string>
     <string name="deny" msgid="6947806159746484865">"ငြင်းပယ်ခြင်း"</string>
@@ -34,17 +34,17 @@
     <string name="header_category_personal" msgid="3310195187905720823">"ကိုယ်ရေး"</string>
     <string name="header_category_access" msgid="7580499097416970962">"ရယူသုံးခြင်း"</string>
     <string name="header_category_system" msgid="2816866961183068977">"စနစ်"</string>
-    <string name="turn_on_radio" msgid="8706561489788373676">"ရေဒီယိုကို ဖွင့်မည်"</string>
+    <string name="turn_on_radio" msgid="8706561489788373676">"ရေဒီယိုကို ဖွင့်မည်"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"ရေဒီယိုကို ပိတ်မည်"</string>
-    <string name="sms_over_ims_on" msgid="5085290395865632925">"SMS over IMS ကိုဖွင့်ခြင်း"</string>
+    <string name="sms_over_ims_on" msgid="5085290395865632925">"SMS over IMS ကိုဖွင့်ခြင်း"</string>
     <string name="sms_over_ims_off" msgid="8354792045992793959">"SMS over IMSကိုပိတ်ခြင်း"</string>
     <string name="ims_reg_required_on" msgid="3885152087309614653">"IMSစာရင်းသွင်းခြင်းဖွင့်ထားရန် လိုအပ်သည်"</string>
     <string name="ims_reg_required_off" msgid="1720570343422743943">"IMSစာရင်းသွင်းခြင်း လိုအပ်မှုကို ပိတ်မည်"</string>
-    <string name="lte_ram_dump_on" msgid="8568568019520172177">"lte ram dumpအားဖွင့်ရန်"</string>
+    <string name="lte_ram_dump_on" msgid="8568568019520172177">"lte ram dumpအားဖွင့်ရန်"</string>
     <string name="lte_ram_dump_off" msgid="2514507918652378283">"lte ram dumpအားပိတ်ရန်"</string>
-    <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"SIMကဒ်မှ လိပ်စာစာအုပ်ကို ကြည့်ရန်"</string>
-    <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"ခေါ်ဆိုသည့်အခြေစိုက်နံပါတ်အားကြည့်မည်"</string>
-    <string name="radioInfo_menu_viewSDN" msgid="7130280686244955669">"ခေါ်ဆိုသည့်ဝန်ဆောင်မှုနံပါတ်အားကြည့်မည်"</string>
+    <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"SIMကဒ်မှ လိပ်စာစာအုပ်ကို ကြည့်ရန်"</string>
+    <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"ခေါ်ဆိုသည့်အခြေစိုက်နံပါတ်အားကြည့်မည်"</string>
+    <string name="radioInfo_menu_viewSDN" msgid="7130280686244955669">"ခေါ်ဆိုသည့်ဝန်ဆောင်မှုနံပါတ်အားကြည့်မည်"</string>
     <string name="radioInfo_menu_getPDP" msgid="560610293888406317">"PDPစာရင်းကို ရယူမည်"</string>
     <string name="radioInfo_service_in" msgid="1915416319177520020">"ဝန်ဆောင်မှုရှိပါသည်"</string>
     <string name="radioInfo_service_out" msgid="5238736759641916278">"ဆက်သွယ်မှုဧရိယာပြင်ပ"</string>
@@ -86,14 +86,14 @@
     <string name="battery_info_voltage_units" msgid="8658490792208288107">"mV"</string>
     <string name="battery_info_temperature_label" msgid="1968383098818648037">"ဘက်ထရီအပူချိန်"</string>
     <string name="battery_info_temperature_units" msgid="9098950587249987550">"ဒီဂရီ စင်တီဂရိတ်"</string>
-    <string name="battery_info_uptime" msgid="5548545143573527992">"လုပ်ငန်းစနစ်ထည့်သွင်း၍ ပြန်လည်စတင်သည့် အချိန်မှစ၍"</string>
-    <string name="battery_info_awake_battery" msgid="2557725975486185849">"ဘက်ထရီပြန်လည်ဖွင့်မည့်အချိန်:"</string>
-    <string name="battery_info_awake_plugged" msgid="176716874713478188">"အားသွင်းနေစဉ်ပြန်လည်ဖွင့်မည့်အချိန်"</string>
-    <string name="battery_info_screen_on" msgid="376277447175613889">"ဖွင့်ထားသောအချိန်"</string>
+    <string name="battery_info_uptime" msgid="5548545143573527992">"လုပ်ငန်းစနစ်ထည့်သွင်း၍ ပြန်လည်စတင်သည့် အချိန်မှစ၍"</string>
+    <string name="battery_info_awake_battery" msgid="2557725975486185849">"ဘက်ထရီပြန်လည်ဖွင့်မည့်အချိန်:"</string>
+    <string name="battery_info_awake_plugged" msgid="176716874713478188">"အားသွင်းနေစဉ်ပြန်လည်ဖွင့်မည့်အချိန်"</string>
+    <string name="battery_info_screen_on" msgid="376277447175613889">"ဖွင့်ထားသောအချိန်"</string>
     <string name="battery_info_status_unknown" msgid="196130600938058547">"အကြောင်းအရာ မသိရှိ"</string>
     <string name="battery_info_status_charging" msgid="1705179948350365604">"အားသွင်းနေပါသည်"</string>
-    <string name="battery_info_status_charging_ac" msgid="2909861890674399949">"လျှပ်စစ်ဖြင့် အားသွင်းနေ"</string>
-    <string name="battery_info_status_charging_usb" msgid="2207489369680923929">"USBဖြင့် အားသွင်းနေ"</string>
+    <string name="battery_info_status_charging_ac" msgid="2909861890674399949">"လျှပ်စစ်ဖြင့် အားသွင်းနေ"</string>
+    <string name="battery_info_status_charging_usb" msgid="2207489369680923929">"USBဖြင့် အားသွင်းနေ"</string>
     <string name="battery_info_status_charging_wireless" msgid="3574032603735446573">"ကြိုးမဲ့ အားသွင်းနေ"</string>
     <string name="battery_info_status_discharging" msgid="310932812698268588">"အားသွင်းမနေပါ"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"အားသွင်းမနေပါ"</string>
@@ -116,21 +116,21 @@
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"အနီးတဝှက်ရှိဘလူးတုသ်စက်များအားလုံးမှ တွေ့ရှိစေရန်"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"တခြားဘလူးတုသ်စက်များမှ မတွေ့ရှိစေရန်"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"တွဲချိတ်ထားသောစက်များမှသာ မြင်တွေ့မည်"</string>
-    <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"မြင်နိုင်သော အချိန်ကန့်သတ်ချက်"</string>
-    <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"အသံဖြင့်ဖုန်းနံပါတ်ပြောကာဖုန်းဆက်ခြင်းကိုပိတ်ရန်"</string>
-    <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"မျက်နှာပြင်သော့ချထားသည့်အခါ ဘလူးတုသ်နံပါတ်ကွက်အား အသုံးပြုခြင်းကို ကာကွယ်မည်"</string>
+    <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"မြင်နိုင်သော အချိန်ကန့်သတ်ချက်"</string>
+    <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"အသံဖြင့်ဖုန်းနံပါတ်ပြောကာဖုန်းဆက်ခြင်းကိုပိတ်ရန်"</string>
+    <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"မျက်နှာပြင်သော့ချထားသည့်အခါ ဘလူးတုသ်နံပါတ်ကွက်အား အသုံးပြုခြင်းကို ကာကွယ်မည်"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"ဘလူးတူးသ်စက်ပစ္စည်းများ"</string>
     <string name="bluetooth_device_name" msgid="8415828355207423800">"စက်အမည်"</string>
     <string name="bluetooth_device_details" msgid="4594773497930028085">"စက်ပစ္စည်း ဆက်တင်းများ"</string>
     <string name="bluetooth_profile_details" msgid="6823621790324933337">"ကိုယ်ရေးအချက်အလက် ဆက်တင်များ"</string>
-    <string name="bluetooth_name_not_set" msgid="2653752006416027426">"မည်သည့်အမည်မှ သတ်မှတ်မထားပါ။ အကောင့်အမည်သုံးပါမည်။"</string>
+    <string name="bluetooth_name_not_set" msgid="2653752006416027426">"မည်သည့်အမည်မှ သတ်မှတ်မထားပါ။ အကောင့်အမည်သုံးပါမည်။"</string>
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"စက်များကိုရှာဖွေရန် စကင်ပြုလုပ်နေသည်"</string>
     <string name="bluetooth_rename_device" msgid="4352483834491958740">"ဤစက်ကို အမည်ပြောင်းရန်"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"အမည်ပြောင်းရန်"</string>
     <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_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="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>
@@ -147,13 +147,13 @@
     <string name="bluetooth_pairing" msgid="1426882272690346242">"တွဲချိတ်ပါ"</string>
     <string name="bluetooth_device" msgid="5291950341750186887">"အမည်မသိသောဘလူးတုသ်စက်"</string>
     <string name="progress_scanning" msgid="192587958424295789">"ရှာဖွေနေသည်…"</string>
-    <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"အနီးအနားတွင် မည်သည့်ဘလူးတုသ်စက်မှမရှိပါ"</string>
+    <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"အနီးအနားတွင် မည်သည့်ဘလူးတုသ်စက်မှမရှိပါ"</string>
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"ဘလူးတုသ်တွဲချိတ်ရန် တောင်းခံသည်"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"တွဲချိတ်ရန် တောင်းခံသည်"</string>
     <string name="bluetooth_notif_message" msgid="5300852675110479862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> နှင့် အတူတွဲချိတ်ရန် တို့ထိပါ။"</string>
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"ရရှိသောဖိုင်များကို ပြရန်"</string>
     <string name="device_picker" msgid="4978696506172252813">"ဘလူးတုသ် စက်ကိရိယာကို ရွေးပါ"</string>
-    <string name="bluetooth_permission_request" msgid="1523129741266262748">"ဘလူးတုသ်ခွင့်ပြုချက်တောင်းခံသည်"</string>
+    <string name="bluetooth_permission_request" msgid="1523129741266262748">"ဘလူးတုသ်ခွင့်ပြုချက်တောင်းခံသည်"</string>
     <string name="bluetooth_ask_enablement" msgid="637355677176904990">"အပလီကေးရှင်းတစ်ခုမှ ဘလူးတုသ် ဖွင့်လိုသည်။"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"အပလီကေးရှင်းတစ်ခုမှ သင်၏တက်ဘလက်ကို အခြားဘလူးတုသ်ပစ္စည်းများမှ <xliff:g id="TIMEOUT">%1$d</xliff:g> စက္ကန့် မြင်အောင် လုပ်လိုသည်။"</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"အပလီကေးရှင်းတစ်ခုမှ သင်၏ ဖုန်းကို အခြားဘလူးတုသ်ပစ္စည်းများမှ <xliff:g id="TIMEOUT">%1$d</xliff:g> စက္ကန့်ကြာစွာ မြင်အောင် လုပ်လိုသည်။"</string>
@@ -166,12 +166,12 @@
     <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"အပလီကေးရှင်းတစ်ခုမှ ဘလူးတုသ် ဖွင့်ပြီး သင်၏ ဖုန်းကို အခြား ပစ္စည်းများမှ <xliff:g id="TIMEOUT">%1$d</xliff:g> စက္ကန့် မြင်အောင် လုပ်လိုသည်။"</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"အပလီကေးရှင်းတစ်ခုမှ ဘလူးတုသ် ဖွင့်ပြီး သင်၏ တက်ဘလက်ကို အခြား ပစ္စည်းများမှ မြင်အောင် လုပ်လိုသည်။ သင် နောက်ပိုင်းတွင် ဘလူးတုသ်ဆက်တင်တွင် ပြန်လည် ပြင်ဆင်နိုင်သည်။"</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"အပလီကေးရှင်းတစ်ခုမှ ဘလူးတုသ် ဖွင့်ပြီး သင်၏ ဖုန်းကို အခြား ပစ္စည်းများမှ မြင်အောင် လုပ်လိုသည်။ သင် နောက်ပိုင်းတွင် ဘလူးတုသ်ဆက်တင်တွင် ပြန်လည် ပြင်ဆင်နိုင်သည်။"</string>
-    <string name="bluetooth_turning_on" msgid="4850574877288036646">"ဘလူးတုသ်ကို ဖွင့်နေစဉ်.."</string>
+    <string name="bluetooth_turning_on" msgid="4850574877288036646">"ဘလူးတုသ်ကို ဖွင့်နေစဉ်.."</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"ဘလူးတုသ်ကိုပိတ်ခြင်း"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"အလိုအလျောက်ချိတ်ဆက်မှု"</string>
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"ဘလူးတုသ်ချိတ်ဆက်ရန် တောင်းခံသည်။"</string>
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> နှင့် တွဲချိတ်ရန် တို့ထိပါ။"</string>
-    <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"နှင့်ချိတ်ဆက်ချင်ပါသလား"</string>
+    <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"နှင့်ချိတ်ဆက်ချင်ပါသလား"</string>
     <string name="bluetooth_phonebook_request" msgid="3951420080540915279">"ဖုန်းလိပ်စာစာအုပ်သုံးစွဲခွင့်တောင်းခံခြင်း"</string>
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s မှ သင်၏ အဆက်အသွယ်များနှင့် ယခင်ခေါ်ဆိုမှုမှတ်တမ်းကို သုံးစွဲခွင့် တောင်းခံနေသည်။ %2$s ကိုသုံးစွဲခွင့်ပေးမည်လား ?"</string>
     <string name="bluetooth_remember_choice" msgid="6198284561603824931">"နောက်ထပ်မမေးပါနှင့်"</string>
@@ -180,7 +180,6 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s သည် သင်၏ စာများကို ရယူအသုံးပြုလိုသည်။ %2$s ကို အသုံးပြုခွင့် ပေးမည်လား?"</string>
     <string name="date_and_time" msgid="9062980487860757694">"နေ့စွဲ&amp; အချိန်"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"အချိန်ဇုန်အား ရွေးချယ်ခြင်း"</string>
-    <string name="normal_date_format" msgid="7636406984925498359">"ဒေသအလိုက်(<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"အစမ်းကြည့်ရှုရန်"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"စာလုံးအရွယ်အစား"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -201,11 +200,11 @@
     <string name="proxy_hostname_hint" msgid="2076157057003936176">"proxy.example.com"</string>
     <string name="proxy_error" msgid="8926675299638611451">"သတိပြုရန်"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"ကောင်းပြီ"</string>
-    <string name="proxy_error_invalid_host" msgid="8052095511862922213">"သင်ရိုက်ထည့်သော အင်တာနက်လက်ခံဝန်ဆောင်ပေးသူအမည်မှာ မဆီလျော်ပါ"</string>
-    <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"ထုတ်ဖယ်မည့်စာရင်းမှာ မှန်ကန်စွာဖွဲ့စည်းထား၍ ရိုက်ထည့်ထားခြင်းမဟုတ်ပါ။ ပုဒ်ရပ်သကေင်္တ(ကော်မာ)ဖြင့်ခြားထားသော ထုတ်ဖယ်မည့်ဒိုမိန်းစာရင်းကို ရိုက်ထည့်ပါ။"</string>
+    <string name="proxy_error_invalid_host" msgid="8052095511862922213">"သင်ရိုက်ထည့်သော အင်တာနက်လက်ခံဝန်ဆောင်ပေးသူအမည်မှာ မဆီလျော်ပါ"</string>
+    <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"ထုတ်ဖယ်မည့်စာရင်းမှာ မှန်ကန်စွာဖွဲ့စည်းထား၍ ရိုက်ထည့်ထားခြင်းမဟုတ်ပါ။ ပုဒ်ရပ်သကေင်္တ(ကော်မာ)ဖြင့်ခြားထားသော ထုတ်ဖယ်မည့်ဒိုမိန်းစာရင်းကို ရိုက်ထည့်ပါ။"</string>
     <string name="proxy_error_empty_port" msgid="5539106187558215246">"သင် port field ကို ပြီးအောင်လုပ်ရန်လိုသည်။"</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"အကယ်၍ လက်ခံဝန်ဆောင်မှု(host)အကွက်မှာ ကွက်လပ်ဖြစ်နေလျှင် ပို့ နံပါတ် အကွက်မှာလည်းဘာမှမရှိရပါ"</string>
-    <string name="proxy_error_invalid_port" msgid="2671425042711054494">"သင်ရိုက်ထည့်သော ပို့ နံပါတ် မှာ မဆီလျော်ပါ"</string>
+    <string name="proxy_error_invalid_port" msgid="2671425042711054494">"သင်ရိုက်ထည့်သော ပို့ နံပါတ် မှာ မဆီလျော်ပါ"</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTPပရော်စီအား ဘရောင်ဇာမှအသုံးပြုနိုင်ပြီး တခြားအပလီကေးရှင်းမှ အသုံးပြု၍မရနိုင်ပါ"</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"PAC URL: "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"တည်နေရာ:"</string>
@@ -223,11 +222,11 @@
     <string name="radio_info_data_successes_label" msgid="4417894113689054945">"ဒေတာအောင်မြင်စွာရရှိမှုများ"</string>
     <string name="radio_info_ppp_received_label" msgid="3345184342444878849">"PPPရရှိသည်"</string>
     <string name="radio_info_gsm_service_label" msgid="2082332114596916985">"GSMဝန်ဆောင်မှု"</string>
-    <string name="radio_info_signal_strength_label" msgid="1931937920896925766">"ထုတ်လွင့်မှုအား:"</string>
+    <string name="radio_info_signal_strength_label" msgid="1931937920896925766">"ထုတ်လွင့်မှုအား:"</string>
     <string name="radio_info_call_status_label" msgid="4896238900685510883">"ခေါ်ဆိုမှုအခြေအနေ"</string>
     <string name="radio_info_ppp_sent_label" msgid="5009102250704375687">"PPPပို့ခြင်း:"</string>
     <string name="radio_info_radio_resets_label" msgid="9211343458143291617">"ရေဒီယိုအား အစမှပြန်စစေခြင်း"</string>
-    <string name="radio_info_message_waiting_label" msgid="6981842420058672207">"စာတိုအား စောင့်နေသည်"</string>
+    <string name="radio_info_message_waiting_label" msgid="6981842420058672207">"စာတိုအား စောင့်နေသည်"</string>
     <string name="radio_info_phone_number_label" msgid="7192944627907412169">"ဖုံးနံပါတ်"</string>
     <string name="radio_info_band_mode_label" msgid="441469694142042022">"ရေဒီယိုလှိုင်းအား ရွေးချယ်မည်"</string>
     <string name="radio_info_network_type_label" msgid="3706382548257257987">"ကွန်ယက်အမျိုးအစား"</string>
@@ -242,7 +241,7 @@
     <string name="radio_info_toggle_dns_check_label" msgid="8292252930563286858">"DNSစစ်ဆေးခြင်းကို ရွေးချယ်မည်"</string>
     <string name="oem_radio_info_label" msgid="6163141792477958941">"ထုတ်လုပ်သူနှင့် သက်ဆိုင်သော အချက်အလက်/ဆက်တင်များ"</string>
     <string name="band_mode_title" msgid="954174198903776205">"GSM/UMTS လှိုင်းခွင် သတ်မှတ်ခြင်း"</string>
-    <string name="band_mode_loading" msgid="548764766363847336">"လှိုင်းခွင်စာရင်းကို ဖွင့်နေပါသည်"</string>
+    <string name="band_mode_loading" msgid="548764766363847336">"လှိုင်းခွင်စာရင်းကို ဖွင့်နေပါသည်"</string>
     <string name="band_mode_set" msgid="5730560180249458484">"အတည်ပြုရန်"</string>
     <string name="band_mode_failed" msgid="1495968863884716379">"မအောင်မြင်ပါ"</string>
     <string name="band_mode_succeeded" msgid="2701016190055887575">"အောင်မြင်ပါသည်"</string>
@@ -287,18 +286,18 @@
     <string name="settings_shortcut" msgid="3936651951364030415">"ဆက်တင်အတိုကောက်"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"လေယာဉ်ပေါ်သုံးစနစ်"</string>
     <string name="radio_controls_title" msgid="3447085191369779032">"နောက်ထပ်"</string>
-    <string name="wireless_networks_settings_title" msgid="3643009077742794212">"ကြိုးမဲ့နှင့် ကွန်ယက်များ"</string>
+    <string name="wireless_networks_settings_title" msgid="3643009077742794212">"ကြိုးမဲ့နှင့် ကွန်ယက်များ"</string>
     <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="cellular_data_summary" msgid="4575500999626276446">"ဆယ်လူလာ ကွန်ရက် တစ်လျှောက် ဒေတာ သုံးစွဲမှု ခွင့်ပြုရန်"</string>
-    <string name="allow_data_usage_title" msgid="2238205944729213062">"ရိုမင်း လုပ်ချိန်မှာ ဒေတာ သုံးစွဲမှု ခွင့်ပြုရန်"</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>
     <string name="roaming_enable" msgid="3737380951525303961">"ရုန်းမင်းလုပ်နေစဉ်ဒေတာဝန်ဆောင်မှုအားချိတ်ဆက်ပါ"</string>
     <string name="roaming_disable" msgid="1295279574370898378">"ရုန်းမင်းပြုလုပ်နေစဉ် ဒေတာဝန်ဆောင်မှုများကို ဆက်သွယ်ခြင်း"</string>
-    <string name="roaming_reenable_message" msgid="9141007271031717369">"ဒေတာဆက်သွယ်မှုပြတ်တောက်သွားပါသည် အဘယ်ကြောင့်ဆိုသော် သင့်အိမ်၏ကွန်ယက်မှထွက်ကာ ဒေတာရုန်းမင်းကွန်ယက်ကိုလဲပိတ်ထားသောကြောင့်ဖြစ်သည်"</string>
-    <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"ဖွင့်မည်"</string>
+    <string name="roaming_reenable_message" msgid="9141007271031717369">"ဒေတာဆက်သွယ်မှုပြတ်တောက်သွားပါသည် အဘယ်ကြောင့်ဆိုသော် သင့်အိမ်၏ကွန်ယက်မှထွက်ကာ ဒေတာရုန်းမင်းကွန်ယက်ကိုလဲပိတ်ထားသောကြောင့်ဖြစ်သည်"</string>
+    <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"ဖွင့်မည်"</string>
     <string name="roaming_warning" msgid="7625933694709170887">"ကွန်ယက်ပြင်ပဒေတာအသုံးပြုခြင်းကို သင် ခွင့်ပြုလျှင် သိသာကြီးမာသောသုံးစွဲခ ကျခံရလိမ့်မည် !"</string>
     <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"ကွန်ယက်ပြင်ပဒေတာအသုံးပြုခြင်းကို သင် ခွင့်ပြုလျှင် သိသာကြီးမာသောသုံးစွဲခ ကျခံရလိမ့်မည် !\n\n ဤအစီအမံသည် ဤတက်ဘလက်မှ သူံးစွဲသူအားလုံးကို အကျိုးသက်ရောက်လိမ့်မည်။"</string>
     <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"ကွန်ယက်ပြင်ပဒေတာအသုံးပြုခြင်းကို သင် ခွင့်ပြုလျှင် သိသာကြီးမာသောသုံးစွဲခ ကျခံရလိမ့်မည် !\n\n ဤအစီအမံသည် ဤဖုန်းမှ သူံးစွဲသူအားလုံးကို အကျိုးသက်ရောက်လိမ့်မည်။"</string>
@@ -307,8 +306,8 @@
     <string name="sum_carrier_select" msgid="3616956422251879163">"ကွန်ယက်ဝန်ဆောင်မှုကို ရွေးချယ်ပါ"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"ရက်စွဲနှင့် အချိန်"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"ရက်စွဲနှင့် အချိန် သတ်မှတ်ရန်"</string>
-    <string name="date_and_time_settings_summary" msgid="7095318986757583584">"ရက်စွဲ အချိန် အချိန်ဇုန်နှင့် ပုံစံများအား သတ်မှတ်ရန်"</string>
-    <string name="date_time_auto" msgid="7076906458515908345">"ရက်စွဲနှင့် အချိန်အားအလိုအလျောက်ထည့်ခြင်း"</string>
+    <string name="date_and_time_settings_summary" msgid="7095318986757583584">"ရက်စွဲ အချိန် အချိန်ဇုန်နှင့် ပုံစံများအား သတ်မှတ်ရန်"</string>
+    <string name="date_time_auto" msgid="7076906458515908345">"ရက်စွဲနှင့် အချိန်အားအလိုအလျောက်ထည့်ခြင်း"</string>
     <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"ကွန်ယက်မှပေးပို့သောအချိန်ကို အသုံးပြုမည်"</string>
     <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"ကွန်ယက်မှပေးပို့သောအချိန်ကို အသုံးပြုမည်"</string>
     <string name="zone_auto" msgid="334783869352026648">"အလိုအလျောက်အချိန်ဇုန်နယ်"</string>
@@ -322,8 +321,6 @@
     <string name="date_time_set_timezone" msgid="5045627174274377814">"အချိန်ဇုန်အားသတ်မှတ်ရန်"</string>
     <string name="date_time_set_date_title" msgid="6928286765325608604">"ရက်စွဲ"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"ရက်စွဲ  သတ်မှတ်ရန်"</string>
-    <string name="date_time_date_format_title" msgid="3976171711988766411">"ရက်စွဲ ပုံစံ"</string>
-    <string name="date_time_date_format" msgid="6951498879879281102">"ရက်စွဲပုံစံရွေးချယ်ရန်"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"အက္ခရာစဉ်အလိုက်စီရန်"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"အချိန်ဇုန်နယ်အလိုက်စီရန်"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"ရက်စွဲ"</string>
@@ -333,7 +330,7 @@
     <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"သော့ဖွင့်စဉ် မျက်တောင်ခတ်ရန် လိုအပ်သည်"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"အလိုအလျောက်သော့ချပိတ်ရန်"</string>
     <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> ပိတ်ပြီးနောက်"</string>
-    <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> အိပ်ပြီးနောက်မှာ၊ <xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g>က သော့ဖွင့်ထားချိန်မှ လွဲပြီး"</string>
+    <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> အိပ်ပြီးနောက်မှာ၊ <xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g>က သော့ဖွင့်ထားချိန်မှ လွဲပြီး"</string>
     <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"သော့ခတ်ထားသောမျက်နှာပြင်ပေါ်ပိုင်ရှင်အကြောင်းပြရန်"</string>
     <string name="owner_info_settings_title" msgid="2723190010708381889">"ပိုင်ရှင်အချက်အလက်"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"ဝဒ်ဂျက်များဖွင့်ရန်"</string>
@@ -348,33 +345,34 @@
     <string name="location_settings_title" msgid="1369675479310751735">"တည်နေရာ"</string>
     <string name="account_settings_title" msgid="626177544686329806">"အကောင့်များ"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"လုံခြုံရေး"</string>
-    <string name="security_settings_summary" msgid="967393342537986570">"ကျွန်ုပ်၏တည်နေရာ စကရင်ကိုသော့ဖွင့်ခြင်း ဆင်းမ်ကဒ်သော့ချခြင်း ယုံကြည်စိတ်ချရသောသိုလှောင်ရာနေရာတို့ကို သတ်မှတ်မည်"</string>
-    <string name="cdma_security_settings_summary" msgid="6068799952798901542">"ကျွန်ုပ်၏တည်နေရာ၊ စကရင်ပြန်ဖွင့်ခြင်း၊ ယုံကြည်စိတ်ချရသောသိုလှောင်ရာနေရာတို့အား သတ်မှတ်မည်"</string>
+    <string name="security_settings_summary" msgid="967393342537986570">"ကျွန်ုပ်၏တည်နေရာ စကရင်ကိုသော့ဖွင့်ခြင်း ဆင်းမ်ကဒ်သော့ချခြင်း ယုံကြည်စိတ်ချရသောသိုလှောင်ရာနေရာတို့ကို သတ်မှတ်မည်"</string>
+    <string name="cdma_security_settings_summary" msgid="6068799952798901542">"ကျွန်ုပ်၏တည်နေရာ၊ စကရင်ပြန်ဖွင့်ခြင်း၊ ယုံကြည်စိတ်ချရသောသိုလှောင်ရာနေရာတို့အား သတ်မှတ်မည်"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"စကားဝှက်များ"</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"လျှို့ဝှက်အသွင်ပြောင်းခြင်း"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"တက်ပလက်ကိုလျှို့ဝှက်အသွင်ပြောင်းရန်"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"လျှို့ဝှက်အသွင်ပြောင်းထားသောဖုန်း"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"လျှို့ဝှက်အသွင်ပြောင်းထားပြီး"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="2876073029767953111">"သင်သည် သင်၏ အကောင့်များ၊ ဆက်တင်များ၊ ဒေါင်းလုဒ် appများ နှင့် ၎င်းတို့၏ ဒေတာများကို၊ ပြီးတော့ မီဒီယာ နှင့် အခြားဖိုင်များကို လျှို့ဝှက်ကုဒ်သွင်းနိုင်သည်။ သင်က သင့်တက်ဘလက်ကို လျှို့ဝှက်ကုဒ် သွင်းပြီးနောက်မှာ၊ သင်သည် မျက်နှာပြင် သော့ပိတ်မှု တစ်ခုခု (ပုံဆွဲပုံစံ သို့မဟုတ် ကိန်းဂဏန်း PIN သို့မဟုတ် စကားဝှက်) ကို သတ်မှတ်ဖွယ်ရာ ရှိလေရာ၊ သင်က တက်ဘလက်ကို ပါဝါဖွင့်တိုင်းမှာ သင်သည် လျှို့ဝှက်ကုဒ်ကို ပြန်ဖြေရန် အတွက် မျက်နှာပြင်ကို သော့ဖွင့်ရန် လိုပါလိမ့်မည်။ လျှို့ဝှက်ကုဒ်ကို ပြန်ဖြေရန် အတွက် တစ်ခုတည်းသော အခြား နည်းလမ်းမှာ စက်ရုံ အတိုင်း ပြန်ညှိမှု ဖြစ်လေရာ သင်၏ ဒေတာ အားလုံး ဖျက်ပစ်ခံရပါမည်။ \n\n  လျှို့ဝှက်ကုဒ်သွင်းမှုမှာ တစ်နာရီ သို့မဟုတ် ပိုကြာနိုင်ပါသည်။ သင်သည် အားသွင်းပြီး ဘက်ထရီဖြင့် စတင်ရန် လိုပြီး ထိုလုပ်ငန်းစဉ် တစ်ခုလုံး အတွင်းမှာ တက်ဘလက်ကို ပလပ်ထိုးထားရပါမည်။ သင်က ရပ်တန့်ပစ်ခဲ့လျှင်၊ သင်သည် ဒေတာ အချို့ သို့မဟုတ် အားလုံးကို ဆုံးရှုံးသွားနိုင်သည်။"</string>
-    <string name="crypt_keeper_desc" product="default" msgid="5573427498609458721">"သင်သည် သင်၏ အကောင့်များ၊ ဆက်တင်များ၊ ဒေါင်းလုဒ် appများ နှင့် ၎င်းတို့၏ ဒေတာများကို၊ ပြီးတော့ မီဒီယာ နှင့် အခြားဖိုင်များကို လျှို့ဝှက်ကုဒ်သွင်းနိုင်သည်။ သင်က သင့်ဖုန်းကို လျှို့ဝှက်ကုဒ် သွင်းပြီးနောက်မှာ၊ သင်သည် မျက်နှာပြင် သော့ပိတ်မှု တစ်ခုခု (ပုံစွဲဇယား သို့မဟုတ် ကိန်းဂဏန်း PIN သို့မဟုတ် စကားဝှက်) ကို သတ်မှတ်ဖွယ်ရာ ရှိလေရာ၊ သင်က ဖုန်းကို ပါဝါဖွင့်တိုင်းမှာ သင်သည် လျှို့ဝှက်ကုဒ်ကို ပြန်ဖြေရန် အတွက် မျက်နှာပြင်ကို သော့ဖွင့်ရန် လိုပါလိမ့်မည်။ လျှို့ဝှက်ကုဒ်ကို ပြန်ဖြေရန် အတွက် တစ်ခုတည်းသော အခြား နည်းလမ်းမှာ စက်ရုံ အတိုင်း ပြန်ညှိမှု ဖြစ်လေရာ သင်၏ ဒေတာ အားလုံး ဖျက်ပစ်ခံရပါမည်။ \n\n လျှို့ဝှက်ကုဒ်သွင်းမှုမှာ တစ်နာရီ သို့မဟုတ် ပိုကြာနိုင်ပါသည်။ သင်သည် အားသွင်းပြီး ဘက်ထရီဖြင့် စတင်ရန် လိုပြီး ထိုလုပ်ငန်းစဉ် တစ်ခုလုံး အတွင်းမှာ ဖုန်းကို ပလပ်ထိုးထားရပါမည်။ သင်က ရပ်တန့်ပစ်ခဲ့လျှင်၊ သင်သည် ဒေတာ အချို့ သို့မဟုတ် အားလုံးကို ဆုံးရှုံးသွားနိုင်သည်။"</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="2876073029767953111">"သင်သည် သင်၏ အကောင့်များ၊ ဆက်တင်များ၊ ဒေါင်းလုဒ် appများ နှင့် ၎င်းတို့၏ ဒေတာများကို၊ ပြီးတော့ မီဒီယာ နှင့် အခြားဖိုင်များကို လျှို့ဝှက်ကုဒ်သွင်းနိုင်သည်။ သင်က သင့်တက်ဘလက်ကို လျှို့ဝှက်ကုဒ် သွင်းပြီးနောက်မှာ၊ သင်သည် မျက်နှာပြင် သော့ပိတ်မှု တစ်ခုခု (ပုံဆွဲပုံစံ သို့မဟုတ် ကိန်းဂဏန်း PIN သို့မဟုတ် စကားဝှက်) ကို သတ်မှတ်ဖွယ်ရာ ရှိလေရာ၊ သင်က တက်ဘလက်ကို ပါဝါဖွင့်တိုင်းမှာ သင်သည် လျှို့ဝှက်ကုဒ်ကို ပြန်ဖြေရန် အတွက် မျက်နှာပြင်ကို သော့ဖွင့်ရန် လိုပါလိမ့်မည်။ လျှို့ဝှက်ကုဒ်ကို ပြန်ဖြေရန် အတွက် တစ်ခုတည်းသော အခြား နည်းလမ်းမှာ စက်ရုံ အတိုင်း ပြန်ညှိမှု ဖြစ်လေရာ သင်၏ ဒေတာ အားလုံး ဖျက်ပစ်ခံရပါမည်။ \n\n  လျှို့ဝှက်ကုဒ်သွင်းမှုမှာ တစ်နာရီ သို့မဟုတ် ပိုကြာနိုင်ပါသည်။ သင်သည် အားသွင်းပြီး ဘက်ထရီဖြင့် စတင်ရန် လိုပြီး ထိုလုပ်ငန်းစဉ် တစ်ခုလုံး အတွင်းမှာ တက်ဘလက်ကို ပလပ်ထိုးထားရပါမည်။ သင်က ရပ်တန့်ပစ်ခဲ့လျှင်၊ သင်သည် ဒေတာ အချို့ သို့မဟုတ် အားလုံးကို ဆုံးရှုံးသွားနိုင်သည်။"</string>
+    <string name="crypt_keeper_desc" product="default" msgid="5573427498609458721">"သင်သည် သင်၏ အကောင့်များ၊ ဆက်တင်များ၊ ဒေါင်းလုဒ် appများ နှင့် ၎င်းတို့၏ ဒေတာများကို၊ ပြီးတော့ မီဒီယာ နှင့် အခြားဖိုင်များကို လျှို့ဝှက်ကုဒ်သွင်းနိုင်သည်။ သင်က သင့်ဖုန်းကို လျှို့ဝှက်ကုဒ် သွင်းပြီးနောက်မှာ၊ သင်သည် မျက်နှာပြင် သော့ပိတ်မှု တစ်ခုခု (ပုံစွဲဇယား သို့မဟုတ် ကိန်းဂဏန်း PIN သို့မဟုတ် စကားဝှက်) ကို သတ်မှတ်ဖွယ်ရာ ရှိလေရာ၊ သင်က ဖုန်းကို ပါဝါဖွင့်တိုင်းမှာ သင်သည် လျှို့ဝှက်ကုဒ်ကို ပြန်ဖြေရန် အတွက် မျက်နှာပြင်ကို သော့ဖွင့်ရန် လိုပါလိမ့်မည်။ လျှို့ဝှက်ကုဒ်ကို ပြန်ဖြေရန် အတွက် တစ်ခုတည်းသော အခြား နည်းလမ်းမှာ စက်ရုံ အတိုင်း ပြန်ညှိမှု ဖြစ်လေရာ သင်၏ ဒေတာ အားလုံး ဖျက်ပစ်ခံရပါမည်။ \n\n လျှို့ဝှက်ကုဒ်သွင်းမှုမှာ တစ်နာရီ သို့မဟုတ် ပိုကြာနိုင်ပါသည်။ သင်သည် အားသွင်းပြီး ဘက်ထရီဖြင့် စတင်ရန် လိုပြီး ထိုလုပ်ငန်းစဉ် တစ်ခုလုံး အတွင်းမှာ ဖုန်းကို ပလပ်ထိုးထားရပါမည်။ သင်က ရပ်တန့်ပစ်ခဲ့လျှင်၊ သင်သည် ဒေတာ အချို့ သို့မဟုတ် အားလုံးကို ဆုံးရှုံးသွားနိုင်သည်။"</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"လျှို့ဝှက်အသွင်ပြောင်းထားသောတက်ပလက်"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"လျှို့ဝှက်အသွင်ပြောင်းထားသောဖုန်း"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"သင့်ဘက်ထရီကိုအားသွင်းပြီးနောက် နောက်ထပ်ကြိုးစားကြည့်ပါ"</string>
-    <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"သင့်အားသွင်းကြိုးကို ပလပ်တပ်ပြီး ထပ်မံကြိုးစားကြည့်ပါ။"</string>
+    <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"သင့်ဘက်ထရီကိုအားသွင်းပြီးနောက် နောက်ထပ်ကြိုးစားကြည့်ပါ"</string>
+    <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"သင့်အားသွင်းကြိုးကို ပလပ်တပ်ပြီး ထပ်မံကြိုးစားကြည့်ပါ။"</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"ဖန်သားပြင်အားပိတ်သောပင်နံပါတ်သို့မဟုတ် စကားဝှက် မရှိပါ"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"လျှို့ဝှက်အသွင်ပြောင်းခြင်းမစမီ သင်၏ မျက်နှာပြင်ကို သော့ချရန် ပင်နံပါတ် သို့ စကားဝှက် သတ်မှတ်ပေးရန် လိုအပ်သည်။"</string>
-    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"သင်သည် သင်၏ ကိရိယာ လျှို့ဝှက်ကုဒ်သွင်းမှကို အတည်ပြုရန် သင်၏ သော့ဖွင့်ရေး ဇယားပုံစံကိ ရွေးဆွဲပေးရန် လိုအပ်သည်။"</string>
+    <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"သင်သည် သင်၏ ကိရိယာ လျှို့ဝှက်ကုဒ်သွင်းမှကို အတည်ပြုရန် သင်၏ သော့ဖွင့်ရေး ဇယားပုံစံကိ ရွေးဆွဲပေးရန် လိုအပ်သည်။"</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"လျှို့ဝှက်အသွင်ပြောင်းမည်လား ?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"လျှို့ဝှက်အသွင်ပြောင်းခြင်းလုပ်ငန်းစဉ်သည် နောက်ကြောင်းပြန်လှည့်၍ မရနိုင်သောကြောင့် သင်ကြားဖြတ်နှောင့်ယှက်မိပါက အချက်အလက်များ ဆုံးရှုံးမည်ဖြစ်သည်။ လျှို့ဝှက်အသွင်ပြောင်းခြင်းသည် ၁နာရီ သို့ ၎င်းထက်ပိုကြာနိုင်ပြီး ၎င်းအချိန်အတွင်း တက်ဘလက်သည် ကြိမ်ဖန်များစွာ အစမှ ပြန်စလိမ့်မည်။"</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"လျှို့ဝှက်အသွင်ပြောင်းခြင်းလုပ်ငန်းစဉ်သည် နောက်ကြောင်းပြန်လှည့်၍ မရနိုင်သောကြောင့် သင်ကြားဖြတ်နှောင့်ယှက်မိပါက အချက်အလက်များ ဆုံးရှုံးမည်ဖြစ်သည်။ လျှို့ဝှက်အသွင်ပြောင်းခြင်းသည် ၁နာရီ သို့ ၎င်းထက်ပိုကြာနိုင်ပြီး ၎င်းအချိန်အတွင်း ဖုန်းသည် ကြိမ်ဖန်များစွာ အစမှ ပြန်စလိမ့်မည်။"</string>
     <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"လျှို့ဝှက်အသွင်ပြောင်းနေသည်"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"သင့်တက်ပလက်အား လျှို့ဝှက်အသွင်ပြောင်းနေခြင်းကို စောင့်ပါ။ <xliff:g id="PERCENT">^1</xliff:g>% ပြီးဆုံးပါပြီ။"</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"သင့်ဖုန်းအား လျှို့ဝှက်အသွင်ပြောင်းနေခြင်းကို စောင့်ပါ။ <xliff:g id="PERCENT">^1</xliff:g>% ပြီးဆုံးပါပြီ။"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"သင့် တက်ဘလက်ကို လျှို့ဝှက်ကုဒ် သွင်းနေစဉ် စောင့်ပါ။ ကျန်ရှိနေသည့် အချိန်: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"သင့် ဖုန်းကို လျှို့ဝှက်ကုဒ် သွင်းနေစဉ် စောင့်ပါ။ ကျန်ရှိနေသည့် အချိန်: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"<xliff:g id="DELAY">^1</xliff:g>စက္ကန့်အကြာတွင် ပြန်လည်ကြိုးစားကြည့်ပါ။"</string>
-    <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"သတိပေးချက်: သော့ဖွင့်ရန် ကြိုးပမ်းမှု နောက်ထပ် <xliff:g id="COUNT">^1</xliff:g>နောက်မှာ သင်၏ ကိရိယာမှာ ဖျက်ပစ်ခံရလိမ့်မည်!"</string>
-    <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"သင့်စကားဝှက်အား ထည့်ပါ"</string>
+    <string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"သင့်တက်ပလက်အား လျှို့ဝှက်အသွင်ပြောင်းနေခြင်းကို စောင့်ပါ။ <xliff:g id="PERCENT">^1</xliff:g>% ပြီးဆုံးပါပြီ။"</string>
+    <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"သင့်ဖုန်းအား လျှို့ဝှက်အသွင်ပြောင်းနေခြင်းကို စောင့်ပါ။ <xliff:g id="PERCENT">^1</xliff:g>% ပြီးဆုံးပါပြီ။"</string>
+    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"သင့် တက်ဘလက်ကို လျှို့ဝှက်ကုဒ် သွင်းနေစဉ် စောင့်ပါ။ ကျန်ရှိနေသည့် အချိန်: <xliff:g id="DURATION">^1</xliff:g>"</string>
+    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"သင့် ဖုန်းကို လျှို့ဝှက်ကုဒ် သွင်းနေစဉ် စောင့်ပါ။ ကျန်ရှိနေသည့် အချိန်: <xliff:g id="DURATION">^1</xliff:g>"</string>
+    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"သင့်တက်ဘလက် ဖွင့်ရန်၊ ပိတ်ပြီးမှ ပြန်ဖွင့်ပါ။"</string>
+    <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"သင့်ဖုန်း ဖွင့်ရန်၊ ပိတ်ပြီးမှ ပြန်ဖွင့်ပါ။"</string>
+    <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"သတိပေးချက်: သော့ဖွင့်ရန် ကြိုးပမ်းမှု နောက်ထပ် <xliff:g id="COUNT">^1</xliff:g>နောက်မှာ သင်၏ ကိရိယာမှာ ဖျက်ပစ်ခံရလိမ့်မည်!"</string>
+    <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"သင့်စကားဝှက်အား ထည့်ပါ"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"လျှို့ဝှက်အသွင်ပြောင်းခြင်း မအောင်မြင်ပါ"</string>
     <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"လျှို့ဝှက်အသွင်ပြောင်းခြင်းလုပ်ငန်းစဉ်ကို ကြားဖြတ်နှောင့်ယှက် ခံရသောကြောင့်  အပြီးမသတ်နိုင်ပါ။ ရလဒ်အနေဖြင့် သင်၏ တက်ဘလက်ပေါ်မှ အချက်အလက်များကို သုံးစွဲ၍ မရတော့ပါ။ \n\n သင်၏ တက်ဘလက်ကို ဆက်လက်အသုံးပြုလိုပါက စက်ရုံထုတ်အခြေအနေပြန်ယူခြင်း လုပ်ရန် လိုအပ်သည်။  သင်၏ တက်ဘလက်ကို အစမှ ပြန်စပြီးလျှင် သင်၏ဂူဂယ်လ်အကောင့်သို့ အရန်အဖြစ်သိမ်းထားခဲ့သော အချက်အလက်များကို ပြန်လည်ရယူရန် အခွင့်အရေး ရလာမည်ဖြစ်သည်။"</string>
     <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"လျှို့ဝှက်အသွင်ပြောင်းခြင်းလုပ်ငန်းစဉ်ကို ကြားဖြတ်နှောင့်ယှက် ခံရသောကြောင့် အပြီးမသတ်နိုင်ပါ။ ရလဒ်အနေဖြင့် သင်၏ ဖုန်းပေါ်မှ အချက်အလက်များကို သုံးစွဲ၍ မရတော့ပါ။ \n\n သင်၏ ဖုန်းကို ဆက်လက်အသုံးပြုလိုပါက စက်ရုံထုတ်အခြေအနေပြန်ယူခြင်း လုပ်ရန် လိုအပ်သည်။  သင်၏ ဖုန်းကို အစမှ ပြန်စပြီးလျှင် သင်၏ ဂူဂဲလ်အကောင့်သို့ အရန်အဖြစ်သိမ်းထားခဲ့သော အချက်အလက်များကို ပြန်လည်ရယူရန် အခွင့်အရေး ရလာမည်ဖြစ်သည်။"</string>
@@ -388,7 +386,7 @@
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"မျက်နှာပြင်သော့ပြောင်း"</string>
     <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"ပုံဖော်၊ပင်နံပါတ်၊စကားဝှက်ကို ပြောင်း၊ပိတ်မည်"</string>
     <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"မျက်နှာပြင်သော့ချနည်းကို  ရွေးချယ်မည်"</string>
-    <string name="unlock_backup_info_summary" msgid="108524727803788172">"မျက်နှာမှတ်ကာ သော့ဖွင့်ခြင်းတွင် သင့်အားမမြင်ရလျှင် မည်ကဲ့သို့ဖွင့်ချင်ပါသနည်း"</string>
+    <string name="unlock_backup_info_summary" msgid="108524727803788172">"မျက်နှာမှတ်ကာ သော့ဖွင့်ခြင်းတွင် သင့်အားမမြင်ရလျှင် မည်ကဲ့သို့ဖွင့်ချင်ပါသနည်း"</string>
     <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"တစ်ခုမှမဟုတ်ပါ"</string>
     <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
     <string name="unlock_set_unlock_none_title" msgid="5679243878975864640">"ပွတ်ဆွဲရန်"</string>
@@ -398,9 +396,10 @@
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"ပုံဖော်ခြင်း"</string>
     <string name="unlock_set_unlock_pattern_summary" msgid="7062696666227725593">"လုံခြုံရေး အတော်အသင့်"</string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"ပင်နံပါတ်"</string>
-    <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"အလယ်အလတ်မှ မြင့်သော လုံခြုံရေး"</string>
+    <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_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>
@@ -409,12 +408,13 @@
     <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"ပင်နံပါတ်"</string>
     <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"လျို့ဝှက် နံပါတ်"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"မျက်နှာပြင်သော့ပိတ်မည်"</string>
-    <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_change_lock_pattern_title" msgid="2044092014872741130">"သော့ဖွင့်ရန်ပုံဖော်မှုအား ပြောင်းမည်"</string>
+    <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>
+    <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"ဖွင့်ရန်စကားဝှက်အား ပြောင်းမည်"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"စကားဝှက်နံပါတ်မှာ အနည်းဆုံး အက္ခရာ%dရှိရမည်"</string>
     <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"ပင်နံပါတ်သည် အနည်းဆုံး ဂဏန်း %d လုံး ရှိရမည်။"</string>
     <string name="lockpassword_press_continue" msgid="122706614386757182">"ပြီးဆုံးလျှင် ဆက်ရန်အား ထိပါ"</string>
@@ -460,66 +460,66 @@
     <string name="lock_setup" msgid="3355847066343753943">"အစီအမံ ပြီးပါပြီ"</string>
     <string name="device_admin_title" msgid="3562216873644263804">"စက်ပိုင်းဆိုင်ရာ အုပ်ချုပ်မှု"</string>
     <string name="manage_device_admin" msgid="5059296715271077278">"စက်ပစ္စည်းထိန်းချုပ်မှုအား စီမံသူ"</string>
-    <string name="manage_device_admin_summary" msgid="7672709110988761075">"စက်ပစ္စည်းထိန်းချုပ်မှုအား စီမံသူကို ကြည့်ရန် သို့မဟုတ် အသုံးမရနိုင်စေရန်"</string>
-    <string name="manage_trust_agents" msgid="4629279457536987768">"ယုံကြည်မှု အေဂျင့်များ"</string>
+    <string name="manage_device_admin_summary" msgid="7672709110988761075">"စက်ပစ္စည်းထိန်းချုပ်မှုအား စီမံသူကို ကြည့်ရန် သို့မဟုတ် အသုံးမရနိုင်စေရန်"</string>
+    <string name="manage_trust_agents" msgid="4629279457536987768">"ယုံကြည်မှု အေဂျင့်များ"</string>
     <string name="disabled_because_no_backup_security" msgid="6877660253409580377">"သုံးရန်၊ ဖုန်းမျက်နှာပြင်အားသော့ချရန် ဦးစွာသတ်မှတ်ပါ"</string>
-    <string name="manage_trust_agents_summary" msgid="6804319935640148441">"ယုံကြည်မှု အေဂျင့်များကို ကြည့်ရန် သို့မဟုတ် သုံးနေမှုရပ်ပစ်ရန်"</string>
+    <string name="manage_trust_agents_summary" msgid="6804319935640148441">"ယုံကြည်မှု အေဂျင့်များကို ကြည့်ရန် သို့မဟုတ် သုံးနေမှုရပ်ပစ်ရန်"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"ဘလူးတုသ်"</string>
-    <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"ဘလူးတုသ်ကို ဖွင့်မည်"</string>
+    <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"ဘလူးတုသ်ကို ဖွင့်မည်"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"ဘလူးတုသ်"</string>
     <string name="bluetooth_settings_title" msgid="1908745291161353016">"ဘလူးတုသ်"</string>
-    <string name="bluetooth_settings_summary" msgid="2091062709530570462">"ချိတ်ဆက်ခြင်း၊ စက်အမည်နှင့်ရှာဖွေတွေ့နိုင်စွမ်းရည်တို့ကို စီမံခြင်း"</string>
+    <string name="bluetooth_settings_summary" msgid="2091062709530570462">"ချိတ်ဆက်ခြင်း၊ စက်အမည်နှင့်ရှာဖွေတွေ့နိုင်စွမ်းရည်တို့ကို စီမံခြင်း"</string>
     <string name="bluetooth_pairing_request" msgid="6385750334766370310">"ဘလူးတုသ်တွဲချိတ်ရန် တောင်းခံသည်"</string>
     <string name="bluetooth_enter_pin_msg" msgid="4954085254142996877">"ကိရိယာ"</string>
     <string name="bluetooth_pairing_key_msg" msgid="333005542843637754">"ချိတ်တွဲရေး ကုဒ်"</string>
-    <string name="bluetooth_enter_passkey_msg" msgid="6813273136442138444">"ချိတ်တွဲရေး ကုဒ်ကို ရိုက်ထည့်ပါ၊ ၎င်းနောက်မှာ ပြန်သွား သို့မဟုတ် အင်တာကို နှိပ်ပါ"</string>
-    <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"ပင်နံပါတ်မှာ စာနှင့်သင်္ကေတများပါဝင်သည်"</string>
-    <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"ပုံမှန်အားဖြင့် 0000 သို့မဟုတ် 1234"</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="6813273136442138444">"ချိတ်တွဲရေး ကုဒ်ကို ရိုက်ထည့်ပါ၊ ၎င်းနောက်မှာ ပြန်သွား သို့မဟုတ် အင်တာကို နှိပ်ပါ"</string>
+    <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"ပင်နံပါတ်မှာ စာနှင့်သင်္ကေတများပါဝင်သည်"</string>
+    <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"ပုံမှန်အားဖြင့် 0000 သို့မဟုတ် 1234"</string>
     <string name="bluetooth_enter_pin_other_device" msgid="4637977124526813470">"ဤပင်နံပါတ်ကို အခြား စက်ပစ္စည်းတွင်လည်း ရိုက်ထည့်ရန် လိုအပ်နိုင်သည်။"</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="2798719004030279602">"ဤ ဖြတ်သန်းခွင့်ကုဒ်ကို အခြား စက်ပစ္စည်းတွင်လည်း ရိုက်ထည့်ရန် လိုအပ်နိုင်သည်။"</string>
-    <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">":&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;များနှင့်တွဲချိတ်စေရန် &lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;ဖြတ်သန်းခွင့်ကီးပြသစေရန် သေချာပါစေ"</string>
-    <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">":&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;မှ ဤစက်နှင့်တွဲချိတ်မည်လား"</string>
-    <string name="bluetooth_display_passkey_pin_msg" msgid="2796550001376088433">":<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>နှင့်ချိတ်တွဲရန်:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>ကိုရိုက်ထည့်ကာ, Return သို့မဟုတ် Enterကိုနှိပ်ပါ"</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">":&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;များနှင့်တွဲချိတ်စေရန် &lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;ဖြတ်သန်းခွင့်ကီးပြသစေရန် သေချာပါစေ"</string>
+    <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">":&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;မှ ဤစက်နှင့်တွဲချိတ်မည်လား"</string>
+    <string name="bluetooth_display_passkey_pin_msg" msgid="2796550001376088433">":<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>နှင့်ချိတ်တွဲရန်:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>ကိုရိုက်ထည့်ကာ, Return သို့မဟုတ် Enterကိုနှိပ်ပါ"</string>
     <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"အတူတွဲပါ"</string>
     <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"ချိတ်တွဲရန်"</string>
     <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"ထားတော့"</string>
-    <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"ချိတ်တွဲမှုက ချိတ်ဆက်ထားလျှင် သင်၏ အဆက်အသွယ်များ နှင့် ခေါ်ဆိုမှု မှတ်တမ်းကို ရယူခွင့် ပြုသည်။"</string>
+    <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"ချိတ်တွဲမှုက ချိတ်ဆက်ထားလျှင် သင်၏ အဆက်အသွယ်များ နှင့် ခေါ်ဆိုမှု မှတ်တမ်းကို ရယူခွင့် ပြုသည်။"</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
-    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>နှင့် တွဲချိတ်မရပါ"</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"ပင်နံပါတ် သို့မဟုတ် ဖြတ်သန်းခွင့်ကီးမမှန်ကန်သောကြောင့်<xliff:g id="DEVICE_NAME">%1$s</xliff:g>နှင့် တွဲချိတ်မရပါ။"</string>
-    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>နှင့်ဆက်သွယ်မရပါ"</string>
-    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>နှင့်တွဲချိတ်ရန် ပယ်ချခံရသည်"</string>
+    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>နှင့် တွဲချိတ်မရပါ"</string>
+    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"ပင်နံပါတ် သို့မဟုတ် ဖြတ်သန်းခွင့်ကီးမမှန်ကန်သောကြောင့်<xliff:g id="DEVICE_NAME">%1$s</xliff:g>နှင့် တွဲချိတ်မရပါ။"</string>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>နှင့်ဆက်သွယ်မရပါ"</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>နှင့်တွဲချိတ်ရန် ပယ်ချခံရသည်"</string>
     <string name="bluetooth_connecting_error_message" msgid="229861986106185022">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ကို ချိတ်ဆက်မရပါ။"</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"စက်များကိုရှာဖွေရန် စကင်ပြုလုပ်နေသည်"</string>
     <string name="bluetooth_search_for_devices" msgid="2754007356491461674">"ပြန်လည်ဆန်းသစ်ရန်"</string>
     <string name="bluetooth_searching_for_devices" msgid="9203739709307871727">"ရှာဖွေနေသည်…"</string>
     <string name="bluetooth_preference_device_settings" msgid="907776049862799122">"စက်ပစ္စည်း အပြင်အဆင်များ"</string>
-    <string name="bluetooth_preference_paired_dialog_title" msgid="8875124878198774180">"ချိတ်တွဲထားသည့် ကိရိယာ"</string>
+    <string name="bluetooth_preference_paired_dialog_title" msgid="8875124878198774180">"ချိတ်တွဲထားသည့် ကိရိယာ"</string>
     <string name="bluetooth_preference_paired_dialog_name_label" msgid="8111146086595617285">"အမည်"</string>
     <string name="bluetooth_preference_paired_dialog_internet_option" msgid="7112953286863428412">"အင်တာနက် ချိတ်ဆက်မှု"</string>
     <string name="bluetooth_preference_paired_dialog_keyboard_option" msgid="2271954176947879628">"ကီးဘုတ်"</string>
-    <string name="bluetooth_preference_paired_dialog_contacts_option" msgid="7747163316331917594">"အဆက်အသွယ်များ နှင့် ခေါ်ဆိုမှု မှတ်တမ်း"</string>
-    <string name="bluetooth_pairing_dialog_title" msgid="1417255032435317301">"ဒီကိရိယာနှင့် ချိတ်တွဲမလား?"</string>
+    <string name="bluetooth_preference_paired_dialog_contacts_option" msgid="7747163316331917594">"အဆက်အသွယ်များ နှင့် ခေါ်ဆိုမှု မှတ်တမ်း"</string>
+    <string name="bluetooth_pairing_dialog_title" msgid="1417255032435317301">"ဒီကိရိယာနှင့် ချိတ်တွဲမလား?"</string>
     <string name="bluetooth_pairing_dialog_sharing_phonebook_title" msgid="7664141669886358618">"ဖုန်း စာအုပ်ကို မျှပေးရမလား?"</string>
-    <string name="bluetooth_pairing_dialog_contants_request" msgid="5531109163573611348">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> က သင်၏ အဆက်အသွယ်များ နှင့် ခေါ်ဆိုမှု မှတ်တမ်းကို ရယူလိုသည်။"</string>
-    <string name="bluetooth_pairing_dialog_paring_request" msgid="8451248193517851958">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> က ဘလူးတုသ်နှင့် တွဲချိတ်လိုသည်။ ချိတ်ဆက်ထားလျှင်၊ ၎င်းသည် သင်၏ အဆက်အသွယ်များ နှင့် ခေါ်ဆိုမှု မှတ်တမ်းကို ရယူသုံးနိုင်မည်။"</string>
+    <string name="bluetooth_pairing_dialog_contants_request" msgid="5531109163573611348">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> က သင်၏ အဆက်အသွယ်များ နှင့် ခေါ်ဆိုမှု မှတ်တမ်းကို ရယူလိုသည်။"</string>
+    <string name="bluetooth_pairing_dialog_paring_request" msgid="8451248193517851958">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> က ဘလူးတုသ်နှင့် တွဲချိတ်လိုသည်။ ချိတ်ဆက်ထားလျှင်၊ ၎င်းသည် သင်၏ အဆက်အသွယ်များ နှင့် ခေါ်ဆိုမှု မှတ်တမ်းကို ရယူသုံးနိုင်မည်။"</string>
     <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"စက်များ တွဲချိတ်ရန်"</string>
     <string name="bluetooth_preference_found_devices" msgid="1647983835063249680">"တွေ့ထားသောစက်များ"</string>
     <string name="bluetooth_preference_no_found_devices" msgid="7594339669961811591">"ကိရိယာများ မရှိ"</string>
     <string name="bluetooth_device_context_connect" msgid="3997659895003244941">"ချိတ်ဆက်ရန်"</string>
     <string name="bluetooth_device_context_disconnect" msgid="8220072022970148683">"ချိတ်ဆက်ခြင်းရပ်တန့်ရန်"</string>
-    <string name="bluetooth_device_context_pair_connect" msgid="7611522504813927727">"တွဲချိတ်ရန်နှင့် ချိတ်ဆက်ရန်"</string>
+    <string name="bluetooth_device_context_pair_connect" msgid="7611522504813927727">"တွဲချိတ်ရန်နှင့် ချိတ်ဆက်ရန်"</string>
     <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"တွဲချိတ်ခြင်းကိုပြတ်တောက်ရန်"</string>
-    <string name="bluetooth_device_context_disconnect_unpair" msgid="7644014238070043798">"ချိတ်ဆက်ခြင်းရပ်ဆိုင်းရန် နှင့် တွဲချိတ်ခြင်းကိုပြတ်တောက်ရန်"</string>
+    <string name="bluetooth_device_context_disconnect_unpair" msgid="7644014238070043798">"ချိတ်ဆက်ခြင်းရပ်ဆိုင်းရန် နှင့် တွဲချိတ်ခြင်းကိုပြတ်တောက်ရန်"</string>
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"ရွေးချယ်စရာများ"</string>
-    <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"အဆင့်မြင့်"</string>
-    <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"အဆင့်မြင့် ဘလူးတုသ်"</string>
-    <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"ဘလူးတုသ်ကို ဖွင့်ထားလျှင်၊ သင်၏ ကိရိယာသည် အနီးရှိ အခြား ဘလူးတုသ် ကိရိယာများဖြင့် ဆက်သွယ်နိုင်သည်။"</string>
+    <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"အဆင့်မြင့်"</string>
+    <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"အဆင့်မြင့် ဘလူးတုသ်"</string>
+    <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"ဘလူးတုသ်ကို ဖွင့်ထားလျှင်၊ သင်၏ ကိရိယာသည် အနီးရှိ အခြား ဘလူးတုသ် ကိရိယာများဖြင့် ဆက်သွယ်နိုင်သည်။"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"ကိုချိတ်ဆက်ရန်"</string>
     <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"မီဒီယာ အသံ"</string>
     <string name="bluetooth_profile_headset" msgid="8658779596261212609">"ဖုန်းအသံ"</string>
     <string name="bluetooth_profile_opp" msgid="9168139293654233697">"ဖိုင်လွဲပြောင်းခြင်း"</string>
-    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"ထည့်သွင်းသော စက်"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"ထည့်သွင်းသော စက်"</string>
     <string name="bluetooth_profile_pan" msgid="3391606497945147673">"အင်တာနက်ချိတ်ဆက်ခြင်း"</string>
     <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"အဆက်အသွယ်ကို မျှဝေရန်"</string>
     <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"အဆက်အသွယ်ကို မျှဝေရန် အတွက် သုံးရန်"</string>
@@ -527,8 +527,8 @@
     <string name="bluetooth_profile_map" msgid="5465271250454324383">"သတင်းရယူမှု"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"မီဒီယာအသံမှ <xliff:g id="DEVICE_NAME">%1$s</xliff:g>အား ချိတ်ဆက်မှုရပ်ဆိုင်းမည်"</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"လက်လွတ်ပြောဆိုမှုမှ <xliff:g id="DEVICE_NAME">%1$s</xliff:g>အား ချိတ်ဆက်မှုရပ်ဆိုင်းမည်"</string>
-    <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>အား ထည့်သွင်းထားသောစက် ချိတ်ဆက်မှုရပ်ဆိုင်းမည်"</string>
-    <string name="bluetooth_disconnect_pan_user_profile" msgid="8037627994382458698">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>မှတစ်ဆင့် အင်တာနက်ဆက်သွယ်မှုမှာ ပြတ်တောက်မည်"</string>
+    <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>အား ထည့်သွင်းထားသောစက် ချိတ်ဆက်မှုရပ်ဆိုင်းမည်"</string>
+    <string name="bluetooth_disconnect_pan_user_profile" msgid="8037627994382458698">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>မှတစ်ဆင့် အင်တာနက်ဆက်သွယ်မှုမှာ ပြတ်တောက်မည်"</string>
     <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="5455448395850929200">"တက်ဘလက်ဖုန်း၏အင်တာနက်ဆက်သွယ်မှုမျှဝေခြင်းမှ<xliff:g id="DEVICE_NAME">%1$s</xliff:g>အား ချိတ်ဆက်မှုရပ်ဆိုင်းမည်"</string>
     <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="5266851881175033601">"ဖုန်း၏အင်တာနက်ဆက်သွယ်မှုမျှဝေခြင်းမှ<xliff:g id="DEVICE_NAME">%1$s</xliff:g>အား ချိတ်ဆက်မှုရပ်ဆိုင်းမည်"</string>
     <string name="bluetooth_device_advanced_title" msgid="6066342531927499308">"ဘလူးတုသ်စက်ကို တွဲချိတ်ရန်"</string>
@@ -536,33 +536,28 @@
     <string name="bluetooth_device_advanced_online_mode_summary" msgid="1204424107263248336">"ဘလူးတုသ်စက်ကို ချိတ်ဆက်ပါ"</string>
     <string name="bluetooth_device_advanced_profile_header_title" msgid="102745381968579605">"အတွက် သုံးရန်"</string>
     <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"အမည်ပြောင်းရန်"</string>
-    <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"အဝင်ဖိုင်လွှဲခြင်းခွင့်ပြုသည်"</string>
+    <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"အဝင်ဖိုင်လွှဲခြင်းခွင့်ပြုသည်"</string>
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"မီဒီယာအသံအား ချိတ်ဆက်ရန်"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"ဖုန်းအသံအား ချိတ်ဆက်ရန်"</string>
-    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"ဖိုင်လွှဲပြောင်းမည့်ဆာဗာနှင့် ချိတ်ဆက်ထားပြီး"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"ဖိုင်လွှဲပြောင်းမည့်ဆာဗာနှင့် ချိတ်ဆက်ထားပြီး"</string>
     <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"မြေပုံနှင့် ချိတ်ဆက်ရန်"</string>
-    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"ဖိုင်လွှဲပြောင်းမည့်ဆာဗာနှင့် ချိတ်ဆက်မထားပါ"</string>
-    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"ထည့်သွင်းထားသောစက်ကို ချိတ်ဆက်မည်"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"ဖိုင်လွှဲပြောင်းမည့်ဆာဗာနှင့် ချိတ်ဆက်မထားပါ"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"ထည့်သွင်းထားသောစက်ကို ချိတ်ဆက်မည်"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"အင်တာနက်ဆက်သွယ်မှုရရန် စက်နှင်ချိတ်ဆက်မည်"</string>
-    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"စက်နှင့် ပုံမှန်အင်တာနက်ဆက်သွယ်မှုအား မျှဝေစေရန်"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"စက်နှင့် ပုံမှန်အင်တာနက်ဆက်သွယ်မှုအား မျှဝေစေရန်"</string>
     <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"မီဒီယာအသံအတွက်အသုံးပြုရန်"</string>
     <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"ဖုန်းအသံအားအသုံးပြုရန်"</string>
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"ဖိုင်လွဲပြောင်းရန်အတွက်အသုံးပြုရန်"</string>
-    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"ထည့်သွင်းရန်အသုံးပြုသည်"</string>
+    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"ထည့်သွင်းရန်အသုံးပြုသည်"</string>
     <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"အင်တာနက်ချိတ်ဆက်ရန်အသုံးပြုသည်"</string>
     <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"မြေပုံအတွက်သုံးရန်"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"အထိုင်ဆက်တင်များ"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"အသံအတွက်အထိုင်အားအသုံးပြုရန်"</string>
-    <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"စပီကာဖုန်းအနေဖြင့်"</string>
-    <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"သီချင်းနှင့်မီဒီယာအတွက်"</string>
+    <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"စပီကာဖုန်းအနေဖြင့်"</string>
+    <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"သီချင်းနှင့်မီဒီယာအတွက်"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"ဆက်တင်များအားမှတ်မိစေရန်"</string>
-    <string name="wifi_assistant_intro_setup" msgid="4605105515416995110">\n"ကြိုးမဲ့ ကူညီပေးသူကို မိတ်ဆက်ပေးခြင်း"</string>
-    <string name="wifi_assistant_no_thanks" msgid="2776983751990143934">"မလို၊ ကျေးဇူးပါပဲ"</string>
-    <string name="wifi_assistant_setup" msgid="3772423650475730906">"စဖွင့်သတ်မှတ်ရန်"</string>
-    <string name="wifi_assistant_card_message" msgid="107811647784658536">"ရှိကြသည့် ထဲက ကြိုးမဲ့ ကူညီပေးသူ ရှိသော ကွန်ရက်များကို အလိုအလျောက် ဆက်သွယ်ပါ။"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"ကြိုးမဲ့ ကူညီပေးသူ"</string>
-    <string name="wifi_assistant_title_message" msgid="6240721017579074015">"<xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> ရှိသည့် အကောင်းဆုံး ကြိုးမဲ့သို့ အလိုအလျောက် ချိတ်ဆက်ပေးသည်"</string>
-    <string name="wifi_assistant_open_app" msgid="4803044899535675063">"appကို ဖွင့်ရန်"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"ကြိုးမဲ့ကူညီသူမှတဆင့် ချိတ်ဆက်၏"</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>
@@ -579,11 +574,11 @@
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"တက်ဘလက်နှင့် အခြားစက်ပစ္စည်း ထိလိုက်လျှင် အချက်အလက် ဖလှယ်ရန် ခွင့်ပြုသည်"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"ဖုန်းနှင့် အခြားစက်ပစ္စည်း ထိလိုက်လျှင် အချက်အလက် ဖလှယ်ရန် ခွင့်ပြုသည်"</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android လှိုင်း"</string>
-    <string name="android_beam_on_summary" msgid="3618057099355636830">"NFCမှတဆင့် အပလီကေးရှင်း၏အကြောင်းအရာကိုထုတ်လွတ်ရန် အဆင်သင့်ဖြစ်နေပါသည်"</string>
+    <string name="android_beam_on_summary" msgid="3618057099355636830">"NFCမှတဆင့် အပလီကေးရှင်း၏အကြောင်းအရာကိုထုတ်လွတ်ရန် အဆင်သင့်ဖြစ်နေပါသည်"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"ပိတ်ထားသည်"</string>
-    <string name="android_beam_disabled_summary" msgid="1737782116894793393">"NFCကိုပိတ်ထားသောကြောင့် မရရှိနိုင်ပါ"</string>
+    <string name="android_beam_disabled_summary" msgid="1737782116894793393">"NFCကိုပိတ်ထားသောကြောင့် မရရှိနိုင်ပါ"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android လှိုင်း"</string>
-    <string name="android_beam_explained" msgid="6981652347448777459">"ဤလုပ်ဆောင်မှုကိုဖွင့်ထားလျှင် တခြားNFCတတ်နိုင်သောစက်အား အနီးအနားတွင်ကိုင်ထားပါက အပလီကေးရှင်းအကြောင်းအရာကိုလှိုင်းလွှင့်နိုင်သည်။ ဥပမာအားဖြင့် ဘရောင်ဇာစာမျက်နှာများ၊ ယူကျုးဘ်ဗွီဒီယုိများ၊ လူအဆက်အသွယ်များနှင့် တခြားများစွာကို လှိုင်းလွှင့်နိုင်သည်။\n\n စက်ကိုသာအတူတူ(ဖြစ်နိုင်လျှင် ကျောချင်းကပ်)ထားပြီး မျက်နှာပြင်ကိုထိပါ။ အပလီကေးရှင်းမှ ဘာကိုလှိုင်းလွှင့်မည်ကို ဆုံးဖြတ်ပါလိမ့်မည်။"</string>
+    <string name="android_beam_explained" msgid="6981652347448777459">"ဤလုပ်ဆောင်မှုကိုဖွင့်ထားလျှင် တခြားNFCတတ်နိုင်သောစက်အား အနီးအနားတွင်ကိုင်ထားပါက အပလီကေးရှင်းအကြောင်းအရာကိုလှိုင်းလွှင့်နိုင်သည်။ ဥပမာအားဖြင့် ဘရောင်ဇာစာမျက်နှာများ၊ ယူကျုးဘ်ဗွီဒီယုိများ၊ လူအဆက်အသွယ်များနှင့် တခြားများစွာကို လှိုင်းလွှင့်နိုင်သည်။\n\n စက်ကိုသာအတူတူ(ဖြစ်နိုင်လျှင် ကျောချင်းကပ်)ထားပြီး မျက်နှာပြင်ကိုထိပါ။ အပလီကေးရှင်းမှ ဘာကိုလှိုင်းလွှင့်မည်ကို ဆုံးဖြတ်ပါလိမ့်မည်။"</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"ကွန်ရက်ဆားဗစ်စူးစမ်းရှာဖွေခြင်း"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"ဤစက်ပေါ်မှ အပလီကေးရှင်းများကို အခြားစက်များမှ အပလီကေးရှင်းများမှ စူးစမ်းရှာဖွေခြင်းကို ခွင့်ပြုရန်"</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"ဝိုင်ဖိုင်"</string>
@@ -591,8 +586,8 @@
     <string name="wifi_settings" msgid="29722149822540994">"ဝိုင်ဖိုင်"</string>
     <string name="wifi_settings_category" msgid="8719175790520448014">"ဝိုင်ဖိုင်ဆက်တင်များ"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"ဝိုင်ဖိုင်"</string>
-    <string name="wifi_settings_summary" msgid="668767638556052820">"ကြိုးမဲ့ချိတ်ဆက်ပွိုင့်များအား သတ်မှတ်ခြင်း &amp;  စီမံခြင်း"</string>
-    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"ဝိုင်ဖိုင် ရွေးပါ"</string>
+    <string name="wifi_settings_summary" msgid="668767638556052820">"ကြိုးမဲ့ချိတ်ဆက်ပွိုင့်များအား သတ်မှတ်ခြင်း &amp;  စီမံခြင်း"</string>
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"ဝိုင်ဖိုင်ကွန်ယက် ရွေးချယ်ရန်"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"ကြိုးမဲ့ကို ရွေးချယ်ရန်"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"ဝိုင်ဖိုင်ဖွင့်နေသည် …"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"ဝိုင်ဖိုင်ပိတ်နေသည် …"</string>
@@ -603,32 +598,34 @@
     <string name="wifi_notify_open_networks_summary" msgid="3716818008370391253">"အများပြည်သူ ကွန်ရက် ရနိုင်တိုင်းမှာ အကြောင်းကြားပေးရန်"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"အားနည်းသော ချိတ်ဆက်မှုများကို ရှောင်ကြဉ်ရန်"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"ကောင်းမွန်သော အင်တာနက် ချိတ်ဆက်မှု မရှိသော ဝိုင်ဖိုင်ကွန်ရက်အား မသုံးပါနှင့်"</string>
-    <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"အင်တာနက် ချိတ်ဆက်မှု ကောင်းသည့် ကွန်ရက်များကိုသာ အသုံးပြုရန်"</string>
+    <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"အင်တာနက် ချိတ်ဆက်မှု ကောင်းသည့် ကွန်ရက်များကိုသာ အသုံးပြုရန်"</string>
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"စကင်န်လုပ်ခြင်း အမြဲတန်းရနိုင်ရန်"</string>
-    <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"စကင်လုပ်မှုကို အမြဲတမ်း ခွင့်ပြုရန်"</string>
-    <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"ကြိုးမဲ့ကို ပိတ်ထားချိန် မှာတောင်၊ Google တည်နေရာ ၀န်ဆောင်မှု နှင့် အခြား appများက ကွန်ရက်များကို ရှာကြည့်ပါစေ"</string>
-    <string name="wifi_automatically_manage_title" msgid="6249976570008992746">"ကြိုးမဲ့ကို အလိုအလျောက် စီမံကွပ်ကဲရန်"</string>
-    <string name="wifi_automatically_manage_summary" msgid="6952470763378312488">"<xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> က သင်၏ ကြိုးမဲ့ ချိတ်ဆက်မှုကို စီမံကွပ်ကဲပေးပါစေ"</string>
+    <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"စကင်လုပ်မှုကို အမြဲတမ်း ခွင့်ပြုရန်"</string>
+    <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"ကြိုးမဲ့ကို ပိတ်ထားချိန် မှာတောင်၊ Google တည်နေရာ ၀န်ဆောင်မှု နှင့် အခြား appများက ကွန်ရက်များကို ရှာကြည့်ပါစေ"</string>
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"ပွင့်လင်း ကြိုးမဲ့အင်တာနက် အလိုအလျောက် အသုံးပြုမည်"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"အရည်အသွေးမြင့်သည်ဟု သတ်မှတ်ထားသည့် ပွင့်လင်းကွန်ရက်များသို့  ကြိုးမဲ့ကူပေးသူမှ အလိုအလျောက် ချိတ်ဆက်စေပါ။"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"အကူ ရွေးချယ်ပါ"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"အသိအမှတ်ပြုလက်မှတ်များထည့်သွင်းရန်"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"တည်နေရာ တိကျမှုနှင့် အခြားရည်ရွယ်ချက်များ ပိုကောင်းလာစေရန် ဝိုင်ဖိုင်ကို ပိတ်ထားချိန်မှာပင်လျှင် ဂူးဂယ်နှင့် တခြား အပလီကေးရှင်းများသည် အနီးနားမှ ကွန်ရက်များကို ရှာဖွေနိုင်သည်။ ထိုသို့ မဖြစ်စေချင်လျှင် အဆင့်မြင့်သို့ သွားပြီး &gt; ရှာဖွေမှုအမြဲရနိုင်ရန်"</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"ဝိုင်ဖိုင်ပိတ်ထားချိန်မှာပင်လျှင် အပလီကေးရှင်းများသည် အနီးနားမှ ကွန်ရက်များကို ရှာဖွေလိမ့်မည်။ ထိုသို့ မဖြစ်စေချင်လျှင် အဆင့်မြင့်သို့ သွားပြီး &gt; ရှာဖွေမှုအမြဲရနိုင်ရန်"</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"နောက်ထပ်မပြပါနှင့်"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"စက်နားနေစဉ် ဝိုင်ဖိုင်ဖွင့်ထားပါ"</string>
-    <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"စက်နားနေစဉ် ကြိုးမဲ့ ဖွင့်ထားရန်"</string>
+    <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"စက်နားနေစဉ် ကြိုးမဲ့ ဖွင့်ထားရန်"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"ဆက်တင်ပြောင်းရာတွင် ပြသနာရှိပါသည်"</string>
-    <string name="wifi_suspend_efficiency_title" msgid="2338325886934703895">"ထိရောက်မှုကို မြှင့်တင်ရန်"</string>
+    <string name="wifi_suspend_efficiency_title" msgid="2338325886934703895">"ထိရောက်မှုကို မြှင့်တင်ရန်"</string>
     <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"ဝိုင်ဖိုင် သင့်တော်အောင်ဆောင်ရွက်ခြင်း"</string>
     <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"ဝိုင်ဖိုင်ဖွင့်ထားစဉ် ဘက်ထရီအသုံးပြုမှု အနည်းဆုံး ဖြစ်ရန်"</string>
-    <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"ကြိုးမဲ့မှ ဘက်ထရီ သုံးမှုကို ကန့်သတ်ရန်"</string>
-    <string name="wifi_add_network" msgid="6234851776910938957">"ကွန်ယက်ထပ်ထည့်ရန်"</string>
+    <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"ကြိုးမဲ့မှ ဘက်ထရီ သုံးမှုကို ကန့်သတ်ရန်"</string>
+    <string name="wifi_add_network" msgid="6234851776910938957">"ကွန်ယက်ထပ်ထည့်ရန်"</string>
     <string name="wifi_access_points" msgid="7053990007031968609">"ဝိုင်ဖိုင်ကွန်ရက်များ"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS နှိပ်ရန်ခလုတ်"</string>
     <string name="wifi_menu_more_options" msgid="2448097861752719396">"ပိုမိုရွေးချယ်စရာများ"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS ပင်နံပါတ်ထည့်ရန်"</string>
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"တိုက်ရိုက် ဝိုင်ဖိုင်"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"စကင်ပြုလုပ်ခြင်း"</string>
-    <string name="wifi_menu_advanced" msgid="7522252991919573664">"အဆင့်မြင့်"</string>
+    <string name="wifi_menu_advanced" msgid="7522252991919573664">"အဆင့်မြင့်"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"ကွန်ယက်အား ဆက်သွယ်မည်"</string>
+    <string name="wifi_menu_remember" msgid="8814185749388713796">"ကွန်ရက် မှတ်သားပါ"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"ကွန်ရက်အား မေ့ရန်"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"ကွန်ယက်အား ပြင်ရန်"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"NFC တဲဂ် သို့ ရေးရန်"</string>
@@ -638,8 +635,8 @@
     <string name="wifi_other_network" msgid="1484433183857764750">"အခြား ကွန်ရက်တစ်ခု သုံးရန်"</string>
     <string name="wifi_more" msgid="3195296805089107950">"နောက်ထပ်"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"အလိုအလျောက် အစီအမံ (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="7442238187557620087">"စဖွင့်သတ်မှတ်မှု ပြီးဆုံးရန် သင်၏ တက်ဘလက်သည် ကြိုးမဲ့ကို အသုံးပြုရန်လိုသည်။ စဖွင့်သတ်မှတ်မှု နောက်မှာ သင်သည် ကြိုးမဲ့ နှင့် မိုဘိုင်း ဒေတာ အကြားမှာ ပြောင်းသုံးနိုင်သည်။"</string>
-    <string name="wifi_show_advanced" msgid="3409422789616520979">"အဆင့်မြင့် ရွေးစရာများ"</string>
+    <string name="wifi_required_info_text" msgid="7442238187557620087">"စဖွင့်သတ်မှတ်မှု ပြီးဆုံးရန် သင်၏ တက်ဘလက်သည် ကြိုးမဲ့ကို အသုံးပြုရန်လိုသည်။ စဖွင့်သတ်မှတ်မှု နောက်မှာ သင်သည် ကြိုးမဲ့ နှင့် မိုဘိုင်း ဒေတာ အကြားမှာ ပြောင်းသုံးနိုင်သည်။"</string>
+    <string name="wifi_show_advanced" msgid="3409422789616520979">"အဆင့်မြင့် ရွေးစရာများ"</string>
     <string name="wifi_wps_setup_title" msgid="8207552222481570175">"ဝိုင်ဖိုင် ကာကွယ်ရေး အစီအမံ"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"WPS စတင်နေသည် …"</string>
     <string name="wifi_wps_onstart_pbc" msgid="5940801028985255304">"ရောက်တာပေါ်မှ ဝိုင်ဖိုင် ကာကွယ်ရေး အစီအမံခလုတ်ကို နှိပ်လိုက်ပါ။ \"WPS\" ဟုခေါ်ပါသည် (သို့) ဤသင်္ကေတ ပါရှိပါသည်:"</string>
@@ -655,13 +652,13 @@
     <string name="wifi_ssid" msgid="5519636102673067319">"ကွန်ရက် အမည်"</string>
     <string name="wifi_ssid_hint" msgid="897593601067321355">"SSID ထည့်သွင်းရန်"</string>
     <string name="wifi_security" msgid="6603611185592956936">"လုံခြုံရေး"</string>
-    <string name="wifi_signal" msgid="5514120261628065287">"ထုတ်လွင့်မှုအား"</string>
+    <string name="wifi_signal" msgid="5514120261628065287">"ထုတ်လွင့်မှုအား"</string>
     <string name="wifi_status" msgid="4824568012414605414">"အခြေအနေ"</string>
     <string name="wifi_speed" msgid="3526198708812322037">"လိုင်းအမြန်နှုန်း"</string>
     <string name="wifi_frequency" msgid="7791090119577812214">"လှိုင်းနှုန်း"</string>
     <string name="wifi_ip_address" msgid="1440054061044402918">"အိုင်ပီလိပ်စာ"</string>
     <string name="wifi_eap_method" msgid="8529436133640730382">"EAPနည်းလမ်း"</string>
-    <string name="please_select_phase2" msgid="5231074529772044898">"အဆင့်(၂) စစ်မှန်ကြောင်းအတည်ပြုခြင်း"</string>
+    <string name="please_select_phase2" msgid="5231074529772044898">"အဆင့်(၂) စစ်မှန်ကြောင်းအတည်ပြုခြင်း"</string>
     <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"CA လက်မှတ်"</string>
     <string name="wifi_eap_user_cert" msgid="1291089413368160789">"အသုံးပြုသူလက်မှတ်"</string>
     <string name="wifi_eap_identity" msgid="4359453783379679103">"တစ်ဦးတစ်ယောက်"</string>
@@ -673,15 +670,17 @@
     <string name="wifi_unspecified" msgid="5431501214192991253">"(သတ်မှတ်ထားခြင်းမရှိ)"</string>
     <string name="wifi_remembered" msgid="4955746899347821096">"သိမ်းဆည်းပြီး"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"သုံးမရအောင် ပိတ်ထားသည်"</string>
-    <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"အင်တာနက် ဆက်သွယ်မှု ကောင်းကောင်းမရှိခြင်းကို ရှောင်ရှားရန်"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP ပြုပြင်ခြင်း မအောင်မြင်ပါ"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"WiFi ချိတ်ဆက်မှု မအောင်မြင်ပါ"</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"စစ်မှန်ကြောင်းအတည်ပြုရန်၌ ပြသနာရှိခြင်း"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"စက်ကွင်းထဲတွင် မဟုတ်ပါ"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"မည်သည့် အင်တာနက်မျှမရှိပါ၊ အလိုအလျောက် ပြန်လည်မချိတ်ဆက်ပါ။"</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPSရရှိုနိုင်သည်"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPSရရှိုနိုင်သည်)"</string>
-    <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"သင်၏ ကွန်ရက် စကားဝှက်ကို ထည့်သွင်းရန်"</string>
+    <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"သင်၏ ကွန်ရက် စကားဝှက်ကို ထည့်သွင်းရန်"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"တစ်ခုမှမဟုတ်ပါ"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"တည်နေရာ တိကျမှုနှင့် တခြားရည်ရွယ်ချက်များအတွက် ပိုကောင်းစေရန် <xliff:g id="APP_NAME">%1$s</xliff:g> သည် ဝိုင်ဖိုင်ပိတ်ထားချိန်မှာပင်လျှင် ကွန်ရက်ရှာဖွေမှုကို ဖွင့်လိုသည်။\n\n အခြား ရှာဖွေလိုသော အပလီကေးရှင်းအားလုံးကို ခွင့်ပြုရမည်လား?"</string>
-    <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"ဒါကို ပိတ်ရန်၊ လျှံစီး မီနူးထဲက အဆင့်မြင့် ဆီကို သွားပါ။"</string>
+    <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"ဒါကို ပိတ်ရန်၊ လျှံစီး မီနူးထဲက အဆင့်မြင့် ဆီကို သွားပါ။"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"ခွင့်ပြုရန်"</string>
     <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"ငြင်းပယ်ရန်"</string>
     <string name="wifi_hotspot_title" msgid="7726205804813286950">"ချိတ်ဆက်ရန် လက်မှတ်ထိုး ဝင်မလား?"</string>
@@ -696,16 +695,16 @@
     <string name="wifi_cancel" msgid="6763568902542968964">"ထားတော့"</string>
     <string name="wifi_skip_anyway" msgid="6965361454438011190">"ကျော်ပါ"</string>
     <string name="wifi_dont_skip" msgid="7350341524881124808">"မကျော်ပါနှင့်"</string>
-    <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"သတိပေးချက်: သင်က ကြိုးမဲ့ကို ကျော်သွားလျင်၊ သင်၏ တက်ဘလက်မှာ ကနဦး ဒေါင်းလုဒ်များ နှင့်  မွမ်းမံမှုများ အတွက် ဆယ်လူလာ ဒေတာကို သုံးမည် မဟုတ်ပါ။ ဒေတာ အတွက် ငွေတောင်းခံ လာနိုင်တာကို ရှောင်ရှားရန်၊ ကြိုးမဲ့သို့  ချိတ်ဆက်ပါ။"</string>
-    <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"သတိပေးချက်: သင်က ကြိုးမဲ့ကို ကျော်သွားလျင်၊ သင်၏ ကိရိယာမှာ ကနဦး ဒေါင်းလုဒ်များ နှင့်  မွမ်းမံမှုများ အတွက် ဆယ်လူလာ ဒေတာကို သုံးမည် မဟုတ်ပါ။ ဒေတာ အတွက် ငွေတောင်းခံ လာနိုင်တာကို ရှောင်ရှားရန်၊ ကြိုးမဲ့သို့ ချိတ်ဆက်ပါ။"</string>
-    <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"သတိပေးချက်: သင်က ကြိုးမဲ့ကို ကျော်သွားလျင်၊ သင်၏ ဖုန်းမှာ ကနဦး ဒေါင်းလုဒ်များ နှင့်  မွမ်းမံမှုများ အတွက် ဆယ်လူလာ ဒေတာကို သုံးမည် မဟုတ်ပါ။ ဒေတာ အတွက် ငွေတောင်းခံ လာနိုင်တာကို ရှောင်ရှားရန်၊ ကြိုးမဲ့သို့  ချိတ်ဆက်ပါ။"</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="2393880108322835846">"သတိပေးချက်။ ဝိုင်ဖိုင်ကို ကျော်သွားပါက သင်၏ တက်ဘလက်တွင် ကနဦး ဒေါင်းလုဒ်များ၊  မွမ်းမံမှုများ ဆွဲယူရန် အင်တာနက် ချိတ်ဆက်မှု ရှိမည် မဟုတ်ပါ။"</string>
-    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1707391993265558787">"သတိပေးချက်။ ဝိုင်ဖိုင်ကို ကျော်သွားပါက သင်၏ စက်ပစ္စည်းတွင် ကနဦး ဒေါင်းလုဒ်များ၊  မွမ်းမံမှုများ ဆွဲယူရန် အင်တာနက် ချိတ်ဆက်မှု ရှိမည် မဟုတ်ပါ။"</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="1556858507920033022">"သတိပေးချက်။ ဝိုင်ဖိုင်ကို ကျော်သွားပါက သင်၏ ဖုန်းတွင် ကနဦး ဒေါင်းလုဒ်များ၊  မွမ်းမံမှုများ ဆွဲယူရန် အင်တာနက် ချိတ်ဆက်မှု ရှိမည် မဟုတ်ပါ။"</string>
+    <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"သတိပေးချက်: သင်က ကြိုးမဲ့ကို ကျော်သွားလျင်၊ သင်၏ တက်ဘလက်မှာ ကနဦး ဒေါင်းလုဒ်များ နှင့်  မွမ်းမံမှုများ အတွက် ဆယ်လူလာ ဒေတာကို သုံးမည် မဟုတ်ပါ။ ဒေတာ အတွက် ငွေတောင်းခံ လာနိုင်တာကို ရှောင်ရှားရန်၊ ကြိုးမဲ့သို့  ချိတ်ဆက်ပါ။"</string>
+    <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"သတိပေးချက်: သင်က ကြိုးမဲ့ကို ကျော်သွားလျင်၊ သင်၏ ကိရိယာမှာ ကနဦး ဒေါင်းလုဒ်များ နှင့်  မွမ်းမံမှုများ အတွက် ဆယ်လူလာ ဒေတာကို သုံးမည် မဟုတ်ပါ။ ဒေတာ အတွက် ငွေတောင်းခံ လာနိုင်တာကို ရှောင်ရှားရန်၊ ကြိုးမဲ့သို့ ချိတ်ဆက်ပါ။"</string>
+    <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"သတိပေးချက်: သင်က ကြိုးမဲ့ကို ကျော်သွားလျင်၊ သင်၏ ဖုန်းမှာ ကနဦး ဒေါင်းလုဒ်များ နှင့်  မွမ်းမံမှုများ အတွက် ဆယ်လူလာ ဒေတာကို သုံးမည် မဟုတ်ပါ။ ဒေတာ အတွက် ငွေတောင်းခံ လာနိုင်တာကို ရှောင်ရှားရန်၊ ကြိုးမဲ့သို့  ချိတ်ဆက်ပါ။"</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"ဝိုင်ဖိုင်အား ကျော်သွားလျှင်:\n\nသင့်တက်ဘလက်တွင် အင်တာနက်ချိတ်ဆက်မှုရှိမည် မဟုတ်ပါ။\n\nသင် အင်တာနက်ဖြင့် ချိတ်ဆက်မှသာ ဆော့ဖ်ဝဲအဆင့်မြှင့်မှုများ ရရှိနိုင်မည်။\n\nယခုမူ စက်ကိရိယာကာကွယ်ရေးအင်္ဂါရပ်များအား ဖွင့်လှစ်ရရှိနိုင်မည်မဟုတ်ပါ။"</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"ဝိုင်ဖိုင်အား ကျော်သွားလျှင်:\n\nသင့်ကိရိယာတွင် အင်တာနက်ချိတ်ဆက်မှုရှိမည် မဟုတ်ပါ။\n\nသင် အင်တာနက်ဖြင့် ချိတ်ဆက်မှသာ ဆော့ဖ်ဝဲအဆင့်မြှင့်မှုများ ရရှိနိုင်မည်။\n\nယခုမူ စက်ကိရိယာကာကွယ်ရေးအင်္ဂါရပ်များအား ဖွင့်လှစ်ရရှိနိုင်မည်မဟုတ်ပါ။"</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"ဝိုင်ဖိုင်အား ကျော်သွားလျှင်:\n\nသင့်ဖုန်းတွင် အင်တာနက်ချိတ်ဆက်မှုရှိမည် မဟုတ်ပါ။\n\nသင် အင်တာနက်ဖြင့် ချိတ်ဆက်မှသာ ဆော့ဖ်ဝဲအဆင့်မြှင့်မှုများ ရရှိနိုင်မည်။\n\nယခုမူ စက်ကိရိယာကာကွယ်ရေးအင်္ဂါရပ်များအား ဖွင့်လှစ်ရရှိနိုင်မည်မဟုတ်ပါ။"</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"တက်ဘလက်သည် ဤ ဝိုင်ဖိုင်ကွန်ရက်သို့ မချိတ်ဆက်နိုင်ပါ။"</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"ကိရိယာသည် လက်ရှိ ကြိုးမဲ့ ကွန်ရက်ကို ချိတ်ဆက် မရခဲ့ပါ။"</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"ဖုန်းသည် ဤဝိုင်ဖိုင်ကွန်ရက်သို့ ချိတ်ဆက်၍ မရနိုင်ပါ"</string>
-    <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"သိမ်းဆည်းခဲ့သည့် ကွန်ရက်များ"</string>
+    <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"သိမ်းဆည်းခဲ့သည့် ကွန်ရက်များ"</string>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"အဆင့်မြင့် ဝိုင်ဖိုင်"</string>
     <string name="wifi_setting_frequency_band_title" msgid="3655327399028584656">"ဝိုင်ဖိုင် ကြိမ်နှုန်းလိုက်စုဖွဲ့မှု"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"လုပ်ဆောင်ချက်၏ လှိုင်းစက်ကွင်းကို သတ်မှတ်ပါ"</string>
@@ -716,10 +715,10 @@
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"IP ဆက်တင်များ"</string>
     <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"သိမ်းပါ"</string>
     <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"ထားတော့"</string>
-    <string name="wifi_ip_settings_invalid_ip_address" msgid="2513142355364274970">"ခိုင်လုံသော အိုင်ပီလိပ်စာကို ရိုက်ထည့်ပါ"</string>
-    <string name="wifi_ip_settings_invalid_gateway" msgid="8164264988361096450">"ခိုင်လုံသောဝင်ပေါက် (gateway)လိပ်စာကို ရိုက်ထည့်ပါ"</string>
-    <string name="wifi_ip_settings_invalid_dns" msgid="8744583948328391047">"ခိုင်လုံသော DNS လိပ်စာကို ရိုက်ထည့်ပါ"</string>
-    <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="40470058023181052">"၀နှင့်၃၂အရှည်ရှိသော ကွန်ယက်အစပြုနံပတ်ကိုထည့်ပါ"</string>
+    <string name="wifi_ip_settings_invalid_ip_address" msgid="2513142355364274970">"ခိုင်လုံသော အိုင်ပီလိပ်စာကို ရိုက်ထည့်ပါ"</string>
+    <string name="wifi_ip_settings_invalid_gateway" msgid="8164264988361096450">"ခိုင်လုံသောဝင်ပေါက် (gateway)လိပ်စာကို ရိုက်ထည့်ပါ"</string>
+    <string name="wifi_ip_settings_invalid_dns" msgid="8744583948328391047">"ခိုင်လုံသော DNS လိပ်စာကို ရိုက်ထည့်ပါ"</string>
+    <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="40470058023181052">"၀နှင့်၃၂အရှည်ရှိသော ကွန်ယက်အစပြုနံပတ်ကိုထည့်ပါ"</string>
     <string name="wifi_dns1" msgid="7344118050720080045">"DNS 1"</string>
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"ဝင်ပေါက် (gateway)"</string>
@@ -748,7 +747,7 @@
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"ရွေ့ပြောင်းနိုင်သောဟော့စပေါ့<xliff:g id="NETWORK_SSID">%1$s</xliff:g>မှာ ရှိနေပါသည်"</string>
     <string name="wifi_tether_failed_subtext" msgid="1484941858530919002">"ခရီးဆောင် ဝိုင်ဖိုင် ဟော့စပေါ့ မှားယွင်းချက်"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"ဝိုင်ဖိုင်ဟော့စပေါ့ စီမံသည်"</string>
-    <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"ကြိုးမဲ့ ဟော့စပေါ့ စဖွင့်သတ်မှတ်ရန်"</string>
+    <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"ကြိုးမဲ့ ဟော့စပေါ့ စဖွင့်သတ်မှတ်ရန်"</string>
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5618031116920832182">"အန်ဒရွိုက်AP 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> ခရီးဆောင် ဝိုင်ဖိုင် ဟော့စပေါ့"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"Android ဟော့စပေါ့"</string>
@@ -761,14 +760,13 @@
     <string name="ring_volume_title" msgid="7938706566797464165">"ဖုန်းမြည်သံအတိုးအကျယ်"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"မြည်သံကိုပိတ်ထားလျှင် တုန်ခါမည်"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"မူရင်းအကြောင်းကြားသံ"</string>
-    <string name="heads_up_enabled_title" msgid="1031078221910921622">"ဦးစားပေးမှု မြင့်လျှင် ထွက်ပေါ်လာမည်"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"ဖုန်းမြည်သံ"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"အကြောင်းကြားချက်"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"အကြောင်းကြားချက်များအတွက် အဝင်ခေါ်ဆိုမှုအသံအတိုးအကျယ်အား အသုံးပြုမည်"</string>
     <string name="home_work_profile_not_supported" msgid="1357721012342357037">"အလုပ် ပရိုဖိုင်များကို မပံ့ပိုးပါ။"</string>
     <string name="notification_sound_dialog_title" msgid="3805140135741385667">"မူရင်းအကြောင်းကြားသံ"</string>
     <string name="media_volume_title" msgid="3576565767317118106">"မီဒီယာ"</string>
-    <string name="media_volume_summary" msgid="5363248930648849974">"တေးသီးချင်းနှင့် ဗွီဒီယိုအတွက် အသံသတ်မှတ်မည်"</string>
+    <string name="media_volume_summary" msgid="5363248930648849974">"တေးသီးချင်းနှင့် ဗွီဒီယိုအတွက် အသံသတ်မှတ်မည်"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"နှိုးစက်"</string>
     <string name="dock_settings_summary" msgid="455802113668982481">"တွဲဖက်အထိုင်အတွက် အသံဆက်တင်များ"</string>
     <string name="dtmf_tone_enable_title" msgid="8533399267725365088">"ခေါ်ဆိုမှုနံပါတ်ကွက်အချပ်မြည်သံများ"</string>
@@ -776,7 +774,7 @@
     <string name="lock_sounds_enable_title" msgid="450098505659399520">"စကရင်ပိတ် အသံ"</string>
     <string name="haptic_feedback_enable_title" msgid="2438293710530828760">"ထိကိုင်လျှင် တုန်ခါခြင်း"</string>
     <string name="audio_record_proc_title" msgid="4271091199976457534">"ဆူညံသံဖယ်ရှားခြင်း"</string>
-    <string name="volume_media_description" msgid="7949355934788807863">"သီချင်း ဗီဒွီယိုဂိမ်းနှင့် တခြားမီဒီယာ"</string>
+    <string name="volume_media_description" msgid="7949355934788807863">"သီချင်း ဗီဒွီယိုဂိမ်းနှင့် တခြားမီဒီယာ"</string>
     <string name="volume_ring_description" msgid="5936851631698298989">"ဖုန်းမည်သံ &amp; အကြောင်းကြားချက်များ"</string>
     <string name="volume_notification_description" msgid="5810902320215328321">"သတိပေးချက်များ"</string>
     <string name="volume_alarm_description" msgid="8322615148532654841">"နှိုးစက်များ"</string>
@@ -787,7 +785,7 @@
     <string name="dock_settings" msgid="1820107306693002541">"အထိုင်တွင်စိုက်ပါ"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"အထိုင်၏ဆက်တင်များ"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"အသံ"</string>
-    <string name="dock_audio_summary_desk" msgid="6487784412371139335">"တွဲဖက်စားပွဲတွင်ထားရှိမည့်အထိုင်အတွက် ဆက်တင်များ"</string>
+    <string name="dock_audio_summary_desk" msgid="6487784412371139335">"တွဲဖက်စားပွဲတွင်ထားရှိမည့်အထိုင်အတွက် ဆက်တင်များ"</string>
     <string name="dock_audio_summary_car" msgid="6740897586006248450">"တွဲဖက်ကားအထိုင်အတွက် အဆင်အပြင်များ"</string>
     <string name="dock_audio_summary_none" product="tablet" msgid="8215337394914283607">"တက်ပလက်အား အထိုင်တွင် မတပ်ထားပါ"</string>
     <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"ဖုန်းကို အထိုင်တွင်စိုက်မထားပါ"</string>
@@ -795,23 +793,23 @@
     <string name="dock_not_found_title" msgid="3290961741828952424">"အထိုင်အား ရှာမတွေ့ပါ"</string>
     <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"အထိုင်အသံထွက်ကို စီမံရန် သင်၏ တက်ဘလက်ကိုအထိုင်တွင် စိုက်ရန်လိုအပ်သည်။"</string>
     <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"အထိုင်အသံထွက်ကို စီမံရန် သင်၏ဖုန်းကိုအထိုင်တွင် စိုက်ရန်လိုအပ်သည်။"</string>
-    <string name="dock_sounds_enable_title" msgid="885839627097024110">"အထိုင်ထဲသို့ထည့်စဉ်မြည်သံ"</string>
-    <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"တက်ဘလက်အားအထိုင်ထဲသို့ထည့်စဥ် သို့မဟုတ်ဖြုတ်စဥ် အသံမြည်စေရန်"</string>
-    <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"ဖုန်းအားအထိုင်ထဲသို့ထည့်စဥ် သို့မဟုတ်ဖြုတ်စဥ် အသံမြည်စေရန်"</string>
-    <string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"တက်ဘလက်အားအထိုင်ထဲသို့ထည့်စဥ် သို့မဟုတ်ဖြုတ်စဥ် အသံမမြည်စေရန်"</string>
-    <string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"ဖုန်းအားအထိုင်ထဲသို့ထည့်စဉ် သို့မဟုတ်ဖြုတ်စဉ် အသံမမြည်စေရန်"</string>
+    <string name="dock_sounds_enable_title" msgid="885839627097024110">"အထိုင်ထဲသို့ထည့်စဉ်မြည်သံ"</string>
+    <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"တက်ဘလက်အားအထိုင်ထဲသို့ထည့်စဥ် သို့မဟုတ်ဖြုတ်စဥ် အသံမြည်စေရန်"</string>
+    <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"ဖုန်းအားအထိုင်ထဲသို့ထည့်စဥ် သို့မဟုတ်ဖြုတ်စဥ် အသံမြည်စေရန်"</string>
+    <string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"တက်ဘလက်အားအထိုင်ထဲသို့ထည့်စဥ် သို့မဟုတ်ဖြုတ်စဥ် အသံမမြည်စေရန်"</string>
+    <string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"ဖုန်းအားအထိုင်ထဲသို့ထည့်စဉ် သို့မဟုတ်ဖြုတ်စဉ် အသံမမြည်စေရန်"</string>
     <string name="account_settings" msgid="6403589284618783461">"အကောင့်များ"</string>
     <string name="category_personal" msgid="1299663247844969448">"ကိုယ်ရေး"</string>
     <string name="category_work" msgid="8699184680584175622">"အလုပ်အကိုင်"</string>
     <string name="search_settings" msgid="1910951467596035063">"ရှာဖွေခြင်း"</string>
-    <string name="search_settings_summary" msgid="9205656546570654169">"ရှာဖွေခြင်းဆက်တင်နှင့်ရာဇဝင်အား စီမံမည်"</string>
+    <string name="search_settings_summary" msgid="9205656546570654169">"ရှာဖွေခြင်းဆက်တင်နှင့်ရာဇဝင်အား စီမံမည်"</string>
     <string name="display_settings" msgid="7965901687241669598">"ဖန်သားပြင်"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"မျက်နှာပြင်ကို အော်တိုလှည့်"</string>
-    <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"တက်ဘလက်ကိုလှည့်လျှင် အနေအထားအားအလိုအလျောက်ပြောင်းရန်"</string>
-    <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"ဖုန်းကိုလှည့်သည့်အခါတွင် အနေအထားအား အလိုအလျောက်ပြောင်းရန်"</string>
-    <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"တက်ဘလက်ကိုလှည့်လျှင် အနေအထားအားအလိုအလျောက်ပြောင်းရန်"</string>
-    <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"ဖုန်းကိုလှည့်သည့်အခါတွင် အနေအထားအားအလိုအလျောက်ပြောင်းရန်"</string>
-    <string name="brightness" msgid="8480105032417444275">"တောက်ပမှု အဆင့်"</string>
+    <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"တက်ဘလက်ကိုလှည့်လျှင် အနေအထားအားအလိုအလျောက်ပြောင်းရန်"</string>
+    <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"ဖုန်းကိုလှည့်သည့်အခါတွင် အနေအထားအား အလိုအလျောက်ပြောင်းရန်"</string>
+    <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"တက်ဘလက်ကိုလှည့်လျှင် အနေအထားအားအလိုအလျောက်ပြောင်းရန်"</string>
+    <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"ဖုန်းကိုလှည့်သည့်အခါတွင် အနေအထားအားအလိုအလျောက်ပြောင်းရန်"</string>
+    <string name="brightness" msgid="8480105032417444275">"တောက်ပမှု အဆင့်"</string>
     <string name="brightness_title" msgid="5746272622112982836">"တောက်ပမှု"</string>
     <string name="brightness_summary" msgid="838917350127550703">"စကရင်၏ အလင်းကိုချိန်ရန်"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"အလိုက်သင့် တောက်ပမှု"</string>
@@ -834,7 +832,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"အလိုအလျောက်အလင်းချိန်ခြင်း။"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"နှိုးပေးဖို့ မ’ယူရန်"</string>
     <string name="doze_title" msgid="2259176504273878294">"ဝန်းကျင်ကို ပြကွက်"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"ကိရိယာကို ကောက်ယူလိုက်လျှင် သို့မဟုတ် အကြောင်းကြားချက် ရလျှင် မျက်နှာပြင်ကို နှိုးပေးရန်"</string>
+    <string name="doze_summary" msgid="7128970177894383698">"သင့် ကိရိယာအား ကောက်ယူစဉ် သို့မဟုတ် အကြောင်းကြားချက်များ ရရှိစဉ် ဖန်မျက်နှာပြင် တွင် အသိပေးရန်"</string>
     <string name="title_font_size" msgid="4405544325522105222">"စာလုံးအရွယ်အစား"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"စာလုံးအရွယ်အစား"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"ဆင်းကဒ် သော့ချရန်ဆက်တင်များ"</string>
@@ -861,7 +859,11 @@
     <string name="sim_enter_ok" msgid="6475946836899218919">"ကောင်းပြီ"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"ထားတော့"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"ဆင်းမ်များ အများအပြား တွေ့ထား"</string>
-    <string name="sim_multi_sims_summary" msgid="7018740080801483990">"ဆယ်လူလာ ဒေတာ အတွက် သင် ပိုနှစ်သက်သည့် ဆင်းမ်ကို ရွေးရန်"</string>
+    <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>
@@ -870,7 +872,7 @@
     <string name="pin_failed" msgid="1848423634948587645">"ဆင်းမ်ကဒ် ပင်လုပ်ငန်းဆောင်ရွက်မှု မအောင်မြင်ပါ!"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"တက်ဘလက်အခြေအနေ"</string>
     <string name="device_info_settings" product="default" msgid="475872867864762157">"ဖုန်းအခြေအနေ"</string>
-    <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"စနစ်အားတိုးမြင့်ခြင်း"</string>
+    <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"စနစ်အားတိုးမြင့်ခြင်း"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Androidဗားရှင်း"</string>
     <string name="model_number" msgid="3765737700545384794">"မော်ဒယ်နံပါတ်"</string>
@@ -882,12 +884,12 @@
     <string name="device_info_not_available" msgid="8062521887156825182">"မရရှိနိုင်ပါ"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"အခြေအနေ"</string>
     <string name="device_status" msgid="607405385799807324">"အခြေအနေ"</string>
-    <string name="device_status_summary" product="tablet" msgid="3292717754497039686">"ဘက်ထရီ၊ ကွန်ယက်နှင့် တစ်ခြားအချက်အလက်၏ အခြေအနေများ"</string>
-    <string name="device_status_summary" product="default" msgid="2599162787451519618">"ဖုန်းနံပါတ်၊ ထုတ်လွင့်မှု စသည်"</string>
+    <string name="device_status_summary" product="tablet" msgid="3292717754497039686">"ဘက်ထရီ၊ ကွန်ယက်နှင့် တစ်ခြားအချက်အလက်၏ အခြေအနေများ"</string>
+    <string name="device_status_summary" product="default" msgid="2599162787451519618">"ဖုန်းနံပါတ်၊ ထုတ်လွင့်မှု စသည်"</string>
     <string name="storage_settings" msgid="4211799979832404953">"သိုလှောင်မှုများ"</string>
     <string name="storage_settings_title" msgid="8746016738388094064">"သိုလှောင်မှု ဆက်တင်များ"</string>
-    <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"USBသိုလှောင်မှုကိရိယာအား အထိုင်မှဖြုတ်မည် သိုလှောင်နိုင်မှုအားကြည့်မည်"</string>
-    <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"SDကဒ်ကို အထိုင်မှဖြုတ်မည်။ သိုလှောင်နိုင်မှုအား ကြည့်မည်။"</string>
+    <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"USBသိုလှောင်မှုကိရိယာအား အထိုင်မှဖြုတ်မည် သိုလှောင်နိုင်မှုအားကြည့်မည်"</string>
+    <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"SDကဒ်ကို အထိုင်မှဖြုတ်မည်။ သိုလှောင်နိုင်မှုအား ကြည့်မည်။"</string>
     <string name="status_number" product="tablet" msgid="1138837891091222272">"MDNနံပါတ်"</string>
     <string name="status_number" product="default" msgid="5123197324870153205">"ကျွန်ုပ်၏ဖုန်းနံပါတ်"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MINနံပါတ်"</string>
@@ -899,7 +901,7 @@
     <string name="status_latest_area_info" msgid="7222470836568238054">"ဖုန်းလိုင်းကုမ္ပဏီအကြောင်း"</string>
     <string name="status_data_state" msgid="4578972321533789767">"ဆယ်လူလာ ကွန်ရက် အခြေအနေ"</string>
     <string name="status_service_state" msgid="2323931627519429503">"ဝန်ဆောင်မှု အခြေအနေ"</string>
-    <string name="status_signal_strength" msgid="3732655254188304547">"ထုတ်လွင့်မှုအား"</string>
+    <string name="status_signal_strength" msgid="3732655254188304547">"ထုတ်လွင့်မှုအား"</string>
     <string name="status_roaming" msgid="2638800467430913403">"ရုန်းမင်း"</string>
     <string name="status_operator" msgid="2274875196954742087">"ကွန်ရက်"</string>
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"ဝိုင်ဖိုင်၏ MAC လိပ်စာ"</string>
@@ -907,9 +909,9 @@
     <string name="status_serial_number" msgid="2257111183374628137">"စက်မှတ်ပုံတင်နံပါတ်"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"မရရှိနိုင်ပါ။"</string>
     <string name="status_up_time" msgid="7294859476816760399">"ဖွင့်ထားသောအချိန်"</string>
-    <string name="status_awake_time" msgid="2393949909051183652">"ပြန်ပွင့်မည်အချိန်"</string>
+    <string name="status_awake_time" msgid="2393949909051183652">"ပြန်ပွင့်မည်အချိန်"</string>
     <string name="internal_memory" msgid="9129595691484260784">"စက်တွင်း သိုလှောင်ထားမှု"</string>
-    <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"USBဖြင့် သိမ်းဆည်းခြင်း"</string>
+    <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"USBဖြင့် သိမ်းဆည်းခြင်း"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"SD ကဒ်"</string>
     <string name="memory_available" msgid="5052397223077021181">"နေရာလွတ်"</string>
     <string name="memory_available_read_only" msgid="6497534390167920206">"အသုံးပြုနိုင်သည် (ဖတ်ရန်သပ်သပ်)"</string>
@@ -918,14 +920,14 @@
     <string name="memory_apps_usage" msgid="2348501997988663688">"အပလီကေးရှင်းများ(အပလီကေးရှင်းဒေတာ &amp; မီဒီယာမာတိကာ)"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"မီဒီယာ"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"ဒေါင်းလုပ်များ"</string>
-    <string name="memory_dcim_usage" msgid="558887013613822577">"ဓါတ်ပုံနှင့်ဗွီဒီယိုများ"</string>
+    <string name="memory_dcim_usage" msgid="558887013613822577">"ဓါတ်ပုံနှင့်ဗွီဒီယိုများ"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"အသံ (သီချင်း၊ တီးလုံး စသည်ဖြင့်)"</string>
     <string name="memory_media_misc_usage" msgid="235452944021647124">"အသေးအဖွဲများ"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"မှတ်သိမ်းထားသော ဒေတာ"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"မျှဝေသုံးသောသိုလှောင်မှုအား အထိုင်မှဖြုတ်ခြင်း"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"SDကဒ်အားအထိုင်မှဖြုတ်ခြင်း"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"စက်အတွင်းUSBသိုလှောင်မှုအား အထိုင်မှဖြုတ်ခြင်း"</string>
-    <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"SDကဒ်ကိုအထိုင်မှဖြုတ်ယူခြင်းဖြင့် အန္တရာယ်ကင်းစွာဖယ်ရှားနုိင်မည်"</string>
+    <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"SDကဒ်ကိုအထိုင်မှဖြုတ်ယူခြင်းဖြင့် အန္တရာယ်ကင်းစွာဖယ်ရှားနုိင်မည်"</string>
     <string name="sd_insert_summary" product="nosdcard" msgid="5264016886409577313">"အထိုင်အတွက်USBထည့်ပါ"</string>
     <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"အထိုင်တွင်စိုက်ရန်အတွက် SDကဒ်ကို တပ်မည်"</string>
     <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"USBသိုလှောင်မှုကိုထိုင်ပါ"</string>
@@ -934,7 +936,7 @@
     <string name="sd_mount_summary" product="default" msgid="4673411327373419641"></string>
     <string name="sd_format" product="nosdcard" msgid="2148179271623099054">"USBသိုလှောင်မှု ဖျက်ခြင်း"</string>
     <string name="sd_format" product="default" msgid="2576054280507119870">"SDကတ်အား ဖျက်ရန်"</string>
-    <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"USBသိုလှောင်မှုထဲမှ သီချင်းနှင့် ဓါတ်ပုံကဲ့သို့ စက်တွင်းဒေတာအားလုံးအားဖျက်မည်"</string>
+    <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"USBသိုလှောင်မှုထဲမှ သီချင်းနှင့် ဓါတ်ပုံကဲ့သို့ စက်တွင်းဒေတာအားလုံးအားဖျက်မည်"</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"SDကဒ်ထဲရှိ သီးချင်းသို့မဟုတ် ဓါတ်ပုံကဲ့သို့ ဒေတာအားလုံးအား ဖျက်ရန်"</string>
     <string name="memory_clear_cache_title" msgid="5423840272171286191">"မှတ်သားထားသောအချက်အလက်များကို ရှင်းမည်လား?"</string>
     <string name="memory_clear_cache_message" msgid="4550262490807415948">"appsအားလုံးအတွက် မှတ်သားထားသော ဒေတာကို ရှင်းမည်။"</string>
@@ -942,11 +944,11 @@
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"USBသိမ်းဆည်းမှုဖြုတ်မလား"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"SDကဒ်အားအထိုင်မှဖြုတ်မည်လား?"</string>
     <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="4322636662873269018">"သင် ယူအက်စ်ဘီ နဲ့ သိမ်းဆည်းမှုကို အထိုင်မှဖြုတ်လိုက်ပါက တချို့ အပ်ပလီကေးရှင်းများ က ယူအက်စ်ဘီ နဲ့ သိမ်းဆည်းမှု ပြန်ပိတ်သည်အထိ အလုပ်မလုပ် သို့ သုံးစွဲရန် ရှိနေမည် မဟုတ်ပါ"</string>
-    <string name="dlg_confirm_unmount_text" product="default" msgid="6998379994779187692">"SDကဒ်ကို အထိုင်မှဖြုတ်လျှင် သင်အသုံးပြုနေသောတချို့အပ်ပလီကေးရှင်းများမှာ ရပ်ကာ ပြန်လည်အထိုင်တွင်မတပ်သည့်အထိ အလုပ်လုပ်မည်မဟုတ်ပါ။"</string>
+    <string name="dlg_confirm_unmount_text" product="default" msgid="6998379994779187692">"SDကဒ်ကို အထိုင်မှဖြုတ်လျှင် သင်အသုံးပြုနေသောတချို့အပ်ပလီကေးရှင်းများမှာ ရပ်ကာ ပြန်လည်အထိုင်တွင်မတပ်သည့်အထိ အလုပ်လုပ်မည်မဟုတ်ပါ။"</string>
     <string name="dlg_error_unmount_title" product="nosdcard" msgid="4642742385125426529"></string>
     <string name="dlg_error_unmount_title" product="default" msgid="4642742385125426529"></string>
-    <string name="dlg_error_unmount_text" product="nosdcard" msgid="4346280469528260684">"USBသိုလှောင်မှုကိရိယာအားအထိုင်မှ ဖြုတ်၍မရပါ။ ပြန်လည်ကြိုးစားလုပ်ကြည့်ပါ"</string>
-    <string name="dlg_error_unmount_text" product="default" msgid="3073562815631781894">"SDကဒ်အားအထိုင်မှ ဖြုတ်၍မရပါ ပြန်လည်ကြိုးစားလုပ်ကြည့်ပါ"</string>
+    <string name="dlg_error_unmount_text" product="nosdcard" msgid="4346280469528260684">"USBသိုလှောင်မှုကိရိယာအားအထိုင်မှ ဖြုတ်၍မရပါ။ ပြန်လည်ကြိုးစားလုပ်ကြည့်ပါ"</string>
+    <string name="dlg_error_unmount_text" product="default" msgid="3073562815631781894">"SDကဒ်အားအထိုင်မှ ဖြုတ်၍မရပါ ပြန်လည်ကြိုးစားလုပ်ကြည့်ပါ"</string>
     <string name="unmount_inform_text" product="nosdcard" msgid="7120241136790744265">"USBသိုလှောင်ကိရိယာအား အထိုင်မှဖြုတ်မည်"</string>
     <string name="unmount_inform_text" product="default" msgid="1904212716075458402">"SDကဒ်အား အထိုင်မှဖြုတ်မည်"</string>
     <string name="sd_ejecting_title" msgid="8824572198034365468">"အထိုင်မှဖြုတ်နေပါသည်"</string>
@@ -955,17 +957,17 @@
     <string name="storage_low_summary" msgid="7737465774892563129">"ထပ်တူညီအောင်လုပ်ခြင်းကဲ့သို့ အချို့ စနစ်လုပ်ဆောင်ချက်များသည် မှန်ကန်စွာ အလုပ်မလုပ်နိုင်ပါ။ သုံးနေကျမဟုတ်သော အပလီကေးရှင်းများ မီဒီယာအချက်အလက်များကို ဖျက်ခြင်းဖြင့်နေရာလွတ်ရရှိရန် ကြိုးစားကြည့်ပါ။"</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"USB ကွန်ပြုတာချိတ်ဆက်မှု"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB ကွန်ပြုတာချိတ်ဆက်မှု"</string>
-    <string name="usb_connection_category" msgid="7805945595165422882">"အနေဖြင့်ဆက်သွယ်ရန်"</string>
+    <string name="usb_connection_category" msgid="7805945595165422882">"အနေဖြင့်ဆက်သွယ်ရန်"</string>
     <string name="usb_mtp_title" msgid="3399663424394065964">"မီဒီယာစက်ပစ္စည်း (MTP)"</string>
-    <string name="usb_mtp_summary" msgid="4617321473211391236">"ဝင်းဒိုးထဲရှိမီဒီယာဖိုင်များကို လွှဲပြောင်းခြင်း သို့မဟုတ်မက်ခ်ထဲရှိAndroidဖိုင်လွှဲပြောင်းကို အသုံးပြုမည် (www.android.com/filetransferကို ကြည့်ပါ)"</string>
+    <string name="usb_mtp_summary" msgid="4617321473211391236">"ဝင်းဒိုးထဲရှိမီဒီယာဖိုင်များကို လွှဲပြောင်းခြင်း သို့မဟုတ်မက်ခ်ထဲရှိAndroidဖိုင်လွှဲပြောင်းကို အသုံးပြုမည် (www.android.com/filetransferကို ကြည့်ပါ)"</string>
     <string name="usb_ptp_title" msgid="3852760810622389620">"ကင်မရာ (PTP)"</string>
-    <string name="usb_ptp_summary" msgid="7673397474756664929">"ကင်မရာဆော့ဖ်ဝဲကိုအသုံးပြုကာ သင့်ဓာတ်ပုံများကိုလွှဲပြောင်းပြီး MTPမှအကူအညီမရသော သင့်ကွန်ပြုတာမှမည်သည့်ဖိုင်များကိုမဆို လွှဲပြောင်းမည်"</string>
-    <string name="usb_label_installer_cd" msgid="4331173824920630215">"ဖိုင်ရွှေ့ခြင်းကိရိယာကို ထည့်သွင်းမည်"</string>
+    <string name="usb_ptp_summary" msgid="7673397474756664929">"ကင်မရာဆော့ဖ်ဝဲကိုအသုံးပြုကာ သင့်ဓာတ်ပုံများကိုလွှဲပြောင်းပြီး MTPမှအကူအညီမရသော သင့်ကွန်ပြုတာမှမည်သည့်ဖိုင်များကိုမဆို လွှဲပြောင်းမည်"</string>
+    <string name="usb_label_installer_cd" msgid="4331173824920630215">"ဖိုင်ရွှေ့ခြင်းကိရိယာကို ထည့်သွင်းမည်"</string>
     <string name="storage_other_users" msgid="808708845102611856">"အခြားသုံးစွဲသူများ"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"ဘက်ထရီအခြေအနေ"</string>
-    <string name="battery_level_title" msgid="2965679202786873272">"ဘက်ထရီ အားအဆင့်"</string>
+    <string name="battery_level_title" msgid="2965679202786873272">"ဘက်ထရီ အားအဆင့်"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APNs"</string>
-    <string name="apn_edit" msgid="1354715499708424718">"ဝင်ရောက်မည့်ပွိုင့်အားပြင်ဆင်ရန်"</string>
+    <string name="apn_edit" msgid="1354715499708424718">"ဝင်ရောက်မည့်ပွိုင့်အားပြင်ဆင်ရန်"</string>
     <string name="apn_not_set" msgid="4974192007399968164">"မသတ်မှတ်ထားပါ"</string>
     <string name="apn_name" msgid="4115580098369824123">"အမည်"</string>
     <string name="apn_apn" msgid="2479425126733513353">"APN"</string>
@@ -1009,58 +1011,57 @@
     <string name="master_clear_title" msgid="5907939616087039756">"စက်ရုံထုတ်အခြေအနေပြန်ယူခြင်း"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"တက်ပလက်ထဲရှိဒေတာအားလုံးအားဖျက်မည်"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"ဖုန်းထဲရှိဒေတာအားလုံးအားဖျက်မည်"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"ဤသည်မှာ သင့်တက်ဘလက်ထဲရှိ"<b></b>"သင့်ဂူးဂဲလ်အကောင့်\n\n"<li>"စနစ်နှင့် အပ်ပလီကေးရှင်းဒေတာနှင့် ဆက်တင်များ"</li>\n<li>"ဒေါင်းလုပ်ပြုလုပ်ထားသော အပ်ပလီကေးရှင်း"</li>"iအပါအဝင်\n"<li>"စက်အတွင်းသိမ်းဆည်းထားခြင်း"</li>"များကို ဖျက်ပါလိမ့်မည်"</string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"ဤသည်မှာ သင့်ဖုန်းထဲရှိ\n"<li>"သင့်ဂူးဂဲလ်အကောင့်"</li>\n<li>"စနစ်နှင့် အပ်ပလီကေးရှင်းဒေတာနှင့် အဆင်အပြင်များ"</li>\n<li>"ဒေါင်းလုပ်ပြုလုပ်ထားသော အပ်ပလီကေးရှင်း"</li>"iအပါအဝင်\n"<b>"စက်အတွင်းသိမ်းဆည်းထားခြင်း"</b>"များကို ဖျက်ပါလိမ့်မည်"</string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"သင်သည် လက်ရှိဤအကောင့်များကို ဆိုင်းအင်လုပ်ထားပါသည်\n"</string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"ဤသည်မှာ သင့်တက်ဘလက်ထဲရှိ"<b></b>"သင့်ဂူးဂဲလ်အကောင့်\n\n"<li>"စနစ်နှင့် အပ်ပလီကေးရှင်းဒေတာနှင့် ဆက်တင်များ"</li>\n<li>"ဒေါင်းလုပ်ပြုလုပ်ထားသော အပ်ပလီကေးရှင်း"</li>"iအပါအဝင်\n"<li>"စက်အတွင်းသိမ်းဆည်းထားခြင်း"</li>"များကို ဖျက်ပါလိမ့်မည်"</string>
+    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"ဤသည်မှာ သင့်ဖုန်းထဲရှိ\n"<li>"သင့်ဂူးဂဲလ်အကောင့်"</li>\n<li>"စနစ်နှင့် အပ်ပလီကေးရှင်းဒေတာနှင့် အဆင်အပြင်များ"</li>\n<li>"ဒေါင်းလုပ်ပြုလုပ်ထားသော အပ်ပလီကေးရှင်း"</li>"iအပါအဝင်\n"<b>"စက်အတွင်းသိမ်းဆည်းထားခြင်း"</b>"များကို ဖျက်ပါလိမ့်မည်"</string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"သင်သည် လက်ရှိဤအကောင့်များကို ဆိုင်းအင်လုပ်ထားပါသည်\n"</string>
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"ဤစက်ပစ္စည်းပေါ်တွင် အခြားအသုံးပြုသူများလဲ ရှိသည်။\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"သီချင်း"</li>\n<li>"ဓာတ်ပုံများ"</li>\n<li>"အသုံးပြုသူ၏တခြားဒေတာ"</li></string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"သီချင်း၊ ပုံများနှင့် အသုံးပြုသူ၏တခြားဒေတာများကို ရှင်းလင်းရန်အတွက်"<b>"USBသိုလှောင်ကိရိယာ"</b>"အား ဖျက်ရန်လိုအပ်ပါသည်။"</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"သီချင်း၊ ပုံများနှင့် တခြားသောအသုံးပြုသူ၏ဒေတာများကို ရှင်းလင်းရန်အတွက်"<b>"SDကဒ်"</b>"အား ဖျက်ရန်လိုအပ်ပါသည်။"</string>
+    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"သီချင်း၊ ပုံများနှင့် အသုံးပြုသူ၏တခြားဒေတာများကို ရှင်းလင်းရန်အတွက်"<b>"USBသိုလှောင်ကိရိယာ"</b>"အား ဖျက်ရန်လိုအပ်ပါသည်။"</string>
+    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"သီချင်း၊ ပုံများနှင့် တခြားသောအသုံးပြုသူ၏ဒေတာများကို ရှင်းလင်းရန်အတွက်"<b>"SDကဒ်"</b>"အား ဖျက်ရန်လိုအပ်ပါသည်။"</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"USBသိုလှောင်ကိရိယာအား ဖျက်ခြင်း"</string>
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"SDကတ်အား ဖျက်ရန်"</string>
-    <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"USBသိုလှောင်မှုထဲမှ သီချင်းနှင့် ဓါတ်ပုံကဲ့သို့ စက်တွင်းဒေတာအားလုံးအားဖျက်မည်"</string>
+    <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"USBသိုလှောင်မှုထဲမှ သီချင်းနှင့် ဓါတ်ပုံကဲ့သို့ စက်တွင်းဒေတာအားလုံးအားဖျက်မည်"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"SDကဒ်ထဲရှိ သီချင်းသို့မဟုတ် ဓါတ်ပုံကဲ့သို့ ဒေတာအားလုံးအား ဖျက်ရန်"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"တက်ဘလက်ကို အစမှပြန်လည်စတင်စေရန်"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"ဖုန်းကို အစမှပြန်လည်စတင်စေရန်"</string>
-    <string name="master_clear_final_desc" msgid="7209547812233487345">"သင့်ကိုယ်ပိုင်အချက်အလက်များနှင့် ဒေါင်းလုပ်ပြုလုပ်ထားသောအပလီကေးရှင်းများကို ဖျက်မည်လား? ဤလုပ်ဆောင်ချက်ကို ပြန်လည်နောက်ပြန်၍မရပါ"</string>
+    <string name="master_clear_final_desc" msgid="7209547812233487345">"သင့်ကိုယ်ပိုင်အချက်အလက်များနှင့် ဒေါင်းလုပ်ပြုလုပ်ထားသောအပလီကေးရှင်းများကို ဖျက်မည်လား? ဤလုပ်ဆောင်ချက်ကို ပြန်လည်နောက်ပြန်၍မရပါ"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"အားလုံးကိုဖျက်ရန်"</string>
-    <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"သော့ဖွင့်သော ပုံဖော်မှုကို ဆွဲပါ"</string>
     <string name="master_clear_gesture_explanation" msgid="826193821455182780">"စက်ရုံထုတ်အခြေအနေအစသို့ ပြန်ရောက်ရန် သော့ဖွင့်သည့်ပုံစံကို ဆွဲပြီး အတည်ပြုရန် လိုအပ်သည်။"</string>
-    <string name="master_clear_failed" msgid="7959646179737950703">"စနစ်အားရှင်းလင်းခြင်းဝန်ဆောင်မှုမရှိသောကြောင့် အစမှပြန်လည်စတင်နိုင်ခြင်းအားမပြုလုပ်နိုင်ပါ"</string>
+    <string name="master_clear_failed" msgid="7959646179737950703">"စနစ်အားရှင်းလင်းခြင်းဝန်ဆောင်မှုမရှိသောကြောင့် အစမှပြန်လည်စတင်နိုင်ခြင်းအားမပြုလုပ်နိုင်ပါ"</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"ပြန်လည်စတင်ရန် ပြုလုပ်မလား?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"ဤအသုံးပြုသူအတွက် စက်ရုံပြန်လည် သတ်မှတ်မှု မရပါ"</string>
     <string name="master_clear_progress_title" msgid="5194793778701994634">"ဖျက်နေသည်"</string>
-    <string name="master_clear_progress_text" msgid="6559096229480527510">"ခဏစောင့်ပါ..."</string>
+    <string name="master_clear_progress_text" msgid="6559096229480527510">"ခဏစောင့်ပါ..."</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"USBသိုလှောင်မှုဖျက်ခြင်း"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"SDကတ်အား ဖျက်ရန်"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"USBသိုလှောင်မှုအားလုံးဖျက်မည်"</string>
     <string name="media_format_summary" product="default" msgid="3805714639375830120">"SDကဒ်ထဲရှိ ဒေတာအားလုံးကို ဖျက်မည်"</string>
-    <string name="media_format_desc" product="nosdcard" msgid="4557243156946319034">"USBသိုလှောင်ကိရိယာအား ဖျက်မလား? သင်သိုလှောင်ထားသော ဒေတာ"<b>"အားလုံး"</b>" အားဆုံးရှုံးပါလိမ့်မည်"</string>
-    <!-- syntax error in translation for media_format_desc (8764037252319942415) org.xmlpull.v1.XmlPullParserException: expected: /string read: b (position:END_TAG </b>@1:113 in     <string name="media_format_desc" product="default" msgid="8764037252319942415">"SDကဒ်ကိုဖျက်မည်လား။ သင့်"</b>"ကဒ်ထဲရှိဒေတာ"<b>"အားလုံးကို ဆုံးရှုံးမည်"</string>
+    <string name="media_format_desc" product="nosdcard" msgid="4557243156946319034">"USBသိုလှောင်ကိရိယာအား ဖျက်မလား? သင်သိုလှောင်ထားသော ဒေတာ"<b>"အားလုံး"</b>" အားဆုံးရှုံးပါလိမ့်မည်"</string>
+    <!-- syntax error in translation for media_format_desc (8764037252319942415) org.xmlpull.v1.XmlPullParserException: expected: /string read: b (position:END_TAG </b>@1:113 in     <string name="media_format_desc" product="default" msgid="8764037252319942415">"SDကဒ်ကိုဖျက်မည်လား။ သင့်"</b>"ကဒ်ထဲရှိဒေတာ"<b>"အားလုံးကို ဆုံးရှုံးမည်"</string>
 )  -->
     <string name="media_format_button_text" product="nosdcard" msgid="6293669371185352810">"USBသိုလှောင်မှုဖျက်ခြင်း"</string>
     <string name="media_format_button_text" product="default" msgid="6721544380069373626">"SDကတ်အား ဖျက်ရန်"</string>
-    <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"USBသိမ်းဆည်းသည့်ကဒ်ထဲရှိသိမ်းထားသောဖိုင်အားလုံးကိုဖျက်မည်လား။ ဤလုပ်ဆောင်ချက်ကို ပြန်လည်နောက်ပြန်ခြင်း မပြုနိုင်ပါ။"</string>
+    <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"USBသိမ်းဆည်းသည့်ကဒ်ထဲရှိသိမ်းထားသောဖိုင်အားလုံးကိုဖျက်မည်လား။ ဤလုပ်ဆောင်ချက်ကို ပြန်လည်နောက်ပြန်ခြင်း မပြုနိုင်ပါ။"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"SDကဒ်ထဲရှိသိမ်းထားသောဖိုင်အားလုံးကိုဖျက်မည်လား။ ဤလုပ်ဆောင်ချက်ကို ပြန်လည်နောက်ပြန်ခြင်း မပြုနိုင်ပါ။"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"အားလုံးကိုဖျက်ရန်"</string>
-    <string name="media_format_gesture_prompt" msgid="3109349468816856670">"သော့ဖွင့်သော ပုံဖော်မှုကို ဆွဲပါ"</string>
     <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"ယူအက်စ်ဘီ သိုလှောင်မှုကို ဖျက်လိုလျှင် သော့ဖွင့်သည့်ပုံစံကို ဆွဲပြီး အတည်ပြုရန် လိုအပ်သည်။"</string>
     <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"SDကဒ်ကို ဖျက်ပစ်ရန် သော့ဖွင့်သည့်ပုံစံကို ဆွဲပြီး အတည်ပြုရန် လိုအပ်သည်။"</string>
     <string name="call_settings_title" msgid="5188713413939232801">"ခေါ်ဆိုမှု ဆက်တင်များ"</string>
-    <string name="call_settings_summary" msgid="7291195704801002886">"အသံဖြင့်စာတိုပို့ခြင်း၊ အဝင်ခေါ်ဆိုမှုအားထပ်ဆင့်ပို့ခြင်း၊ ခေါ်ဆိုမှုစောင့်ဆိုင်းခြင်း၊ ခေါ်ဆိုသူ၏အမှတ်သညာအား သတ်မှတ်ခြင်း"</string>
-    <string name="tether_settings_title_usb" msgid="6688416425801386511">"USBမှတဆင့်ချိတ်ဆက်ခြင်း"</string>
+    <string name="call_settings_summary" msgid="7291195704801002886">"အသံဖြင့်စာတိုပို့ခြင်း၊ အဝင်ခေါ်ဆိုမှုအားထပ်ဆင့်ပို့ခြင်း၊ ခေါ်ဆိုမှုစောင့်ဆိုင်းခြင်း၊ ခေါ်ဆိုသူ၏အမှတ်သညာအား သတ်မှတ်ခြင်း"</string>
+    <string name="tether_settings_title_usb" msgid="6688416425801386511">"USBမှတဆင့်ချိတ်ဆက်ခြင်း"</string>
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"ရွေ့လျားနိုင်သောဟော့စပေါ့"</string>
-    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"ဘလူးတုသ်တဆင့်ပြန်ချိတ်ဆက်"</string>
-    <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"တဆင့်ပြန်လည်ချိတ်ဆက်ခြင်း"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"တဆင့်ချိတ်ဆက်ခြင်း၊ ဟော့စပေါ့"</string>
+    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"ဘလူးတုသ်တဆင့်ပြန်ချိတ်ဆက်"</string>
+    <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"တဆင့်ပြန်လည်ချိတ်ဆက်ခြင်း"</string>
+    <string name="tether_settings_title_all" msgid="8356136101061143841">"တဆင့်ချိတ်ဆက်ခြင်း၊ ဟော့စပေါ့"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
-    <string name="usb_tethering_button_text" msgid="585829947108007917">"USBမှတဆင့်ပြန်လည်ချိတ်ဆက်ခြင်း"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB ချိတ်ဆက်ထားပြီး၊ တဆင့်လွှင့်နိုင်ရန် စစ်ဆေးပါ"</string>
-    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"တဆင့်ပြန်လည်ချိတ်ဆက်မှု"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="5210094834194907094">"USBသိုလှောင်မှုကိရိယာကို အသုံးပြုနေချိန်တွင် တဆင့်လွှင့်နိုင်ခြင်း မပြုလုပ်နိုင်ပါ"</string>
+    <string name="usb_tethering_button_text" msgid="585829947108007917">"USBမှတဆင့်ပြန်လည်ချိတ်ဆက်ခြင်း"</string>
+    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB ချိတ်ဆက်ထားပြီး၊ တဆင့်လွှင့်နိုင်ရန် စစ်ဆေးပါ"</string>
+    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"တဆင့်ပြန်လည်ချိတ်ဆက်မှု"</string>
+    <string name="usb_tethering_storage_active_subtext" msgid="5210094834194907094">"USBသိုလှောင်မှုကိရိယာကို အသုံးပြုနေချိန်တွင် တဆင့်လွှင့်နိုင်ခြင်း မပြုလုပ်နိုင်ပါ"</string>
     <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USBအား ချိတ်ဆက်မထားပါ"</string>
-    <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"ဖွင့်ပေးရန် ချိတ်ဆက်ပါ"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"USBမှတဆင့်ပြန်လည်ချိတ်ဆက်ခြင်း အမှား"</string>
-    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"ဘလူးတုသ်မှတဆင့်ပြန်လည်ချိတ်ဆက်ခြင်း"</string>
+    <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"ဖွင့်ပေးရန် ချိတ်ဆက်ပါ"</string>
+    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"USBမှတဆင့်ပြန်လည်ချိတ်ဆက်ခြင်း အမှား"</string>
+    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"ဘလူးတုသ်မှတဆင့်ပြန်လည်ချိတ်ဆက်ခြင်း"</string>
     <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="8811610320942954709">"တက်ဘလက်၏အင်တာနက်ဆက်သွယ်မှုအား မျှဝေရန်"</string>
     <string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"ဖုန်း၏အင်တာနက်ဆက်သွယ်မှုအား မျှဝေရန်"</string>
     <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="2730938191906597896">"စက်၁လုံးထံ တက်ဘလက်၏အင်တာနက်ဆက်သွယ်မှုအား မျှဝေမည်"</string>
@@ -1070,8 +1071,8 @@
     <string name="bluetooth_tethering_off_subtext_config" msgid="1790242032929221788">"ဒီ<xliff:g id="DEVICE_NAME">%1$d</xliff:g>၏ အင်တာနက် ချိတ်ဆက်မှုကို မျှဝေနေ"</string>
     <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="2093881379028235555">"တက်ဘလက်၏အင်တာနက်ဆက်သွယ်မှုအား မျှဝေခြင်းမပြုရန်"</string>
     <string name="bluetooth_tethering_off_subtext" product="default" msgid="706860924389041342">"ဖုန်း၏အင်တာနက်ဆက်သွယ်မှုအား မျှဝေခြင်းမပြုရန်"</string>
-    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"တဆင့်ပြန်လည်ချိတ်ဆက်မထားပါ"</string>
-    <string name="bluetooth_tethering_overflow_error" msgid="6285122039489881969">"<xliff:g id="MAXCONNECTION">%1$d</xliff:g> စက်လုံးထက် ပို၍တဆင့်ပြန်လည်ချိတ်ဆက်မရပါ"</string>
+    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"တဆင့်ပြန်လည်ချိတ်ဆက်မထားပါ"</string>
+    <string name="bluetooth_tethering_overflow_error" msgid="6285122039489881969">"<xliff:g id="MAXCONNECTION">%1$d</xliff:g> စက်လုံးထက် ပို၍တဆင့်ပြန်လည်ချိတ်ဆက်မရပါ"</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> သည် ချိတ်ဆက်မှု ပြတ်တောက်မည်"</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"အကူအညီ"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"ဆယ်လူလာ ကွန်ရက်များ"</string>
@@ -1088,6 +1089,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"ကျေးဇူးပြု၍ ဆင်းမ်ကဒ်ထည့်၍ အစမှ ပြန်စပါ။"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"ကျေးဇူးပြု၍ အင်တာနက်ဖြင့် ချိတ်ဆက်ပါ။"</string>
     <string name="location_title" msgid="1029961368397484576">"ကျွန်ုပ်၏တည်နေရာ"</string>
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"အလုပ် ပရိုဖိုင်"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"အလုပ်ပရိုဖိုင်အတွက် တည်နေရာ"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"သင့်ကုမ္ပဏီမှပိတ်ထားခြင်းဖြစ်၏"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"စနစ်"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"တိကျမှုအမြင့်ဆုံး"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"ဘက်ထရီအသုံးပြုမှု ချွေတာရန်"</string>
@@ -1099,8 +1103,8 @@
     <string name="location_high_battery_use" msgid="517199943258508020">"ဘက်ထရီအသုံးပြုမှုမြင့်သော"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"ဘက်ထရီအသုံးပြုမှုနိမ့်သော"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"တည်နေရာပြစနစ်"</string>
-    <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"တည်နေရာကို ဆုံးဖြတ်ရန် GPS၊ ကြိုးမဲ့ နှင့် ဆယ်လူလာ ကွန်ရက်များကို သုံးရန်"</string>
-    <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"တည်နေရာကို ဆုံးဖြတ်ရန် ကြိုးမဲ့ နှင့် ဆယ်လူလာ ကွန်ရက်များကို သုံးရန်"</string>
+    <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"တည်နေရာကို ဆုံးဖြတ်ရန် GPS၊ ကြိုးမဲ့ နှင့် ဆယ်လူလာ ကွန်ရက်များကို သုံးရန်"</string>
+    <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"တည်နေရာကို ဆုံးဖြတ်ရန် ကြိုးမဲ့ နှင့် ဆယ်လူလာ ကွန်ရက်များကို သုံးရန်"</string>
     <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"တည်နေရာကို ဆုံးဖြတ်ရန် ဂျီပီအက်စ်ကို သုံးပါ။"</string>
     <string name="location_network_based" msgid="6010456018401296590">"ကြိုးမဲ့ &amp; ဆယ်လူလာ ကွန်ရက် တည်နေရာ"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"သင့်တည်နေရာကို ခန့်မှန်းရာတွင် ပိုမြန်စေရန် အပလီကေးရှင်းကို ဂူဂယ်လ်၏ တည်နေရာဝန်ဆောင်မှု အသုံးပြုပါစေ။ အမည်မသိ တည်နေရာ အချက်အလက်များကို စု၍ ဂူဂဲလ်သို့ ပို့ပေးပါမည်။"</string>
@@ -1109,46 +1113,47 @@
     <string name="location_street_level" product="tablet" msgid="1669562198260860802">"သင်၏တည်နေရာကို အတိအကျရှာရန် အပလီကေးရှင်းများကို သင့်တက်ဘလက်မှ ဂျီပီအက်စ် အသုံးပြုပါစေ။"</string>
     <string name="location_street_level" product="default" msgid="4617445745492014203">"သင်၏တည်နေရာကို အတိအကျရှာရန် အပလီကေးရှင်းများကို သင့်ဖုန်းမှ ဂျီပီအက်စ် အသုံးပြုပါစေ။"</string>
     <string name="assisted_gps" msgid="4649317129586736885">"အထောက်အကူပေးGPSကို အသုံးပြုခြင်း"</string>
-    <string name="assisted_gps_enabled" msgid="8751899609589792803">"GPSကိုအထောက်အကူပြုစေရန် ဆာဗာကို အသုံးပြုမည် (ကွန်ယက်အသုံးပြုခြင်းကို လျော့စေရန် အတွက် မရွေးချယ်ပါနှင့်)"</string>
-    <string name="assisted_gps_disabled" msgid="6982698333968010748">"GPSကိုအထောက်အကူပြုစေရန် ဆာဗာကို အသုံးပြုမည် (GPSစွမ်းရည်ကိုတိုးတက်စေရန်အတွက် မရွေးချယ်ပါနှင့်)"</string>
-    <string name="use_location_title" msgid="5206937465504979977">"တည်နေရာနှင့် ဂူးဂဲလ်ရှာဖွေခြင်း"</string>
-    <string name="use_location_summary" msgid="3978805802386162520">"ရှာဖွေမှုရလဒ်များနှင့် တခြားဝန်ဆောင်မှုများ ပိုမိုရရှိရန်အတွက် ဂူးဂဲလ်မှ သင့်တည်နေရာကိုအသုံးပြုစေမည်"</string>
+    <string name="assisted_gps_enabled" msgid="8751899609589792803">"GPSကိုအထောက်အကူပြုစေရန် ဆာဗာကို အသုံးပြုမည် (ကွန်ယက်အသုံးပြုခြင်းကို လျော့စေရန် အတွက် မရွေးချယ်ပါနှင့်)"</string>
+    <string name="assisted_gps_disabled" msgid="6982698333968010748">"GPSကိုအထောက်အကူပြုစေရန် ဆာဗာကို အသုံးပြုမည် (GPSစွမ်းရည်ကိုတိုးတက်စေရန်အတွက် မရွေးချယ်ပါနှင့်)"</string>
+    <string name="use_location_title" msgid="5206937465504979977">"တည်နေရာနှင့် ဂူးဂဲလ်ရှာဖွေခြင်း"</string>
+    <string name="use_location_summary" msgid="3978805802386162520">"ရှာဖွေမှုရလဒ်များနှင့် တခြားဝန်ဆောင်မှုများ ပိုမိုရရှိရန်အတွက် ဂူးဂဲလ်မှ သင့်တည်နေရာကိုအသုံးပြုစေမည်"</string>
     <string name="location_access_title" msgid="7064108942964081243">"ကျွန်ုပ်၏တည်နေရာကိုရယူရန်"</string>
     <string name="location_access_summary" msgid="69031404093194341">"သင်၏ တည်နေရာသတင်းအချက်အလက်အသုံးပြုရန် အပလီကေးရှင်းများကို သင်၏ ခွင့်ပြုချက်တောင်းခံပါစေ။"</string>
     <string name="location_sources_heading" msgid="1278732419851088319">"တည်နေရာ ရင်းမြစ်များ"</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"တက်ဘလက်အကြောင်း"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"ဖုန်းအကြောင်း"</string>
-    <string name="about_settings_summary" msgid="3371517697156165959">"ဥပဒေဆိုင်ရာအချက်အလက်၊ အခြေအနေ၊ ဆော့ဝဲလ်ဗားရှင်းအား ကြည့်ရှုရန်"</string>
+    <string name="about_settings_summary" msgid="3371517697156165959">"ဥပဒေဆိုင်ရာအချက်အလက်၊ အခြေအနေ၊ ဆော့ဝဲလ်ဗားရှင်းအား ကြည့်ရှုရန်"</string>
     <string name="legal_information" msgid="5769301644270604095">"ဥပဒေဆိုင်ရာအချက်အလက်များ"</string>
     <string name="contributors_title" msgid="5917703088825286504">"ထောက်ပံ့သူများ"</string>
     <string name="regulatory_information" msgid="5695464367088752150">"စံစည်းမျဉ်း လိုက်နာမှု"</string>
-    <string name="copyright_title" msgid="865906688917260647">"မူပိုင်ခွင့်"</string>
+    <string name="copyright_title" msgid="865906688917260647">"မူပိုင်ခွင့်"</string>
     <string name="license_title" msgid="1990487604356037871">"လိုင်စင်"</string>
-    <string name="terms_title" msgid="7697580845616764642">"သတ်မှတ်ချက်များနှင့် အခြေအနေများ"</string>
+    <string name="terms_title" msgid="7697580845616764642">"သတ်မှတ်ချက်များနှင့် အခြေအနေများ"</string>
+    <string name="webview_license_title" msgid="2813507464175738967">"စနစ် WebView လိုင်စင်"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"နောက်ခံပုံများ"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"ဂြိုဟ်တုပုံ ပေးပို့သူများ-\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
-    <string name="settings_license_activity_title" msgid="7553683406244228650">"အိုးပင်းဆော့လိုင်စင်များအားဖွင့်ရန်"</string>
+    <string name="settings_license_activity_title" msgid="7553683406244228650">"အိုးပင်းဆော့လိုင်စင်များအားဖွင့်ရန်"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"လိုင်စင်များကို ဖတ်တင်ရန် ပြသနာရှိနေပါသည်"</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"ဖွင့်နေစဉ်"</string>
     <string name="settings_safetylegal_title" msgid="1289483965535937431">"လုံခြုံမှုဆိုင်ရာအချက်အလက်များ"</string>
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"လုံခြုံမှုဆိုင်ရာအချက်အလက်များ"</string>
-    <string name="settings_safetylegal_activity_unreachable" msgid="232523852222964470">"သင့်တွင်ဒေတာဆက်သွယ်မှုမရှိပါ။ ဤကြောင်းကြားချက်ကိုကြည့်ရန်အတွက် အင်တာနက်ဆက်သွယ်မှုရှိသည့် မည်သည့်ကွန်ပြုတာမှမဆို %sထံသွားပါ။"</string>
+    <string name="settings_safetylegal_activity_unreachable" msgid="232523852222964470">"သင့်တွင်ဒေတာဆက်သွယ်မှုမရှိပါ။ ဤကြောင်းကြားချက်ကိုကြည့်ရန်အတွက် အင်တာနက်ဆက်သွယ်မှုရှိသည့် မည်သည့်ကွန်ပြုတာမှမဆို %sထံသွားပါ။"</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"ဖွင့်နေစဉ်"</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"သင့်စကားဝှက်ကိုရွေးချယ်ပါ"</string>
-    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"သင့်ပုံစံအား ရွေးပါ"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"သင့်ပင်နံပါတ်အား ရွေးပါ"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"သင့်စကားဝှက်ကို အတည်ပြုပါ"</string>
-    <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"သင့်ပုံဖော်မှုကို အတည်ပြုပါ"</string>
+    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"သင့်စကားဝှက်ကိုရွေးချယ်ပါ"</string>
+    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"သင့်ပုံစံအား ရွေးပါ"</string>
+    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"သင့်ပင်နံပါတ်အား ရွေးပါ"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"သင့်စကားဝှက်ကို အတည်ပြုပါ"</string>
+    <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"သင့်ပုံဖော်မှုကို အတည်ပြုပါ"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"ပင်နံပါတ်ကို  အတည်ပြုပါ"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="6850677112663979120">"စကားဝှက်များ မတူပါ။"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="4757532830594400147">"ပင်နံပါတ် မတူပါ။"</string>
-    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"ပြန်ဖွင့်သည့် ရွေးချယ်မှုများ"</string>
+    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"ပြန်ဖွင့်သည့် ရွေးချယ်မှုများ"</string>
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"စကားဝှက်အား သတ်မှတ်ပြီးပါပြီ"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"ပင်နံပါတ်အား သတ်မှတ်ပြီးပါပြီ"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"စကားဝှက်နံပါတ်အား သတ်မှတ်ပြီးပါပြီ"</string>
     <string name="lock_settings_title" msgid="335025124489630932">"မျက်နှာပြင်လုံခြုံရေး"</string>
-    <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"သော့ဖွင့်ရန်ပုံဖော်မှုအား ပြောင်းမည်"</string>
-    <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"သော့ဖွင့်ရန်ပင်နံပါတ်အား ပြောင်းမည်"</string>
+    <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"သော့ဖွင့်ရန်ပုံဖော်မှုအား ပြောင်းမည်"</string>
+    <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"သော့ဖွင့်ရန်ပင်နံပါတ်အား ပြောင်းမည်"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"သိမ်းဆည်းသောပုံဖော်မှုကို အတည်ပြုမည်"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"ပြန်ကြိုးစားပါ"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"သော့ဖွင့်သော ပုံဖော်မှုကို ဆွဲပါ"</string>
@@ -1164,33 +1169,33 @@
     <string name="lockpattern_continue_button_text" msgid="4723771754714471410">"ဆက်ရန်"</string>
     <string name="lockpattern_settings_title" msgid="3207750489460466680">"ပုံဖော်၍သော့ဖွင့်နည်း"</string>
     <string name="lockpattern_settings_enable_title" msgid="6920616873671115281">"ပုံဖော်မှု လိုအပ်သည်"</string>
-    <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"စကရင်ကိုသော့ဖွင့်ရန် ပုံဖော်ရမည်ဖြစ်သည်"</string>
+    <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"စကရင်ကိုသော့ဖွင့်ရန် ပုံဖော်ရမည်ဖြစ်သည်"</string>
     <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"ပုံဖော်ခြင်းအား မြင်နိုင်ရန်ပြုလုပ်မည်"</string>
     <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="8898518337442601027">"ထိကိုင်လျှင် တုန်ခါခြင်း"</string>
     <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"ဖွင့်ပိတ်ခလုတ်ဖြင့် အလိုအလျောက် သော့ချရန်"</string>
-    <string name="lockpattern_settings_power_button_instantly_locks_summary" msgid="8196258755143711694">"<xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g>က သော့ဖွင့်ထားချိန်မှ လွဲပြီး"</string>
-    <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"သော့ဖွင့်ရန်ပုံဖော်မှုအား သတ်မှတ်မည်"</string>
-    <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"သော့ဖွင့်ရန်ပုံဖော်မှုအား ပြောင်းမည်"</string>
-    <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"သော့ဖွင့်ရန်ပုံဖော်ခြင်းအား မည်ကဲ့သို့ဆွဲရမည်"</string>
+    <string name="lockpattern_settings_power_button_instantly_locks_summary" msgid="8196258755143711694">"<xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g>က သော့ဖွင့်ထားချိန်မှ လွဲပြီး"</string>
+    <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"သော့ဖွင့်ရန်ပုံဖော်မှုအား သတ်မှတ်မည်"</string>
+    <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"သော့ဖွင့်ရန်ပုံဖော်မှုအား ပြောင်းမည်"</string>
+    <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"သော့ဖွင့်ရန်ပုံဖော်ခြင်းအား မည်ကဲ့သို့ဆွဲရမည်"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"အကြိမ်ရေများစွာ မှားယွင်းပြီးဖွင့်ရန် ကြိုးစားခြင်း"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"<xliff:g id="NUMBER">%d</xliff:g> စက္ကန့်အကြာတွင် ပြန်ကြိုးစားပါ"</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"<xliff:g id="NUMBER">%d</xliff:g> စက္ကန့်အကြာတွင် ပြန်ကြိုးစားပါ"</string>
     <string name="activity_not_found" msgid="5551664692991605325">"သင့်ဖုန်းတွင် အပလီကေးရှင်း မထည့်ထားပါ"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"အပ်ပလီကေးရှင်းများအား စီမံခြင်း"</string>
-    <string name="manageapplications_settings_summary" msgid="1794401500935451259">"ထည့်သွင်းထားသောအပ်ပလီကေးရှင်းများကို စီမံခြင်းနှင့် ဖယ်ခြင်း"</string>
+    <string name="manageapplications_settings_summary" msgid="1794401500935451259">"ထည့်သွင်းထားသောအပ်ပလီကေးရှင်းများကို စီမံခြင်းနှင့် ဖယ်ခြင်း"</string>
     <string name="applications_settings" msgid="1721442176406964682">"အပ်ပလီကေးရှင်းများ"</string>
-    <string name="applications_settings_summary" msgid="6683465446264515367">"အပလီကေးရှင်းများကို စီမံမည်။ အမြန်သုံးနိုင်သောအတိုကောက်များကို ဖွင့်ခြင်းအား သတ်မှတ်မည်"</string>
+    <string name="applications_settings_summary" msgid="6683465446264515367">"အပလီကေးရှင်းများကို စီမံမည်။ အမြန်သုံးနိုင်သောအတိုကောက်များကို ဖွင့်ခြင်းအား သတ်မှတ်မည်"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"အပ်ပလီကေးရှင်းဆက်တင်များ"</string>
     <string name="install_applications" msgid="4872012136210802181">"မသိရှိသော တည်နေရာပင်ရင်း"</string>
-    <string name="install_applications_title" msgid="4987712352256508946">"app ရင်းမြစ်များ ခွင့်ပြုရန်"</string>
-    <string name="install_unknown_applications_title" msgid="663831043139080992">"သင့်အားGoogle Play မဟုတ်သည့် အခြား ရင်းမြစ်များမှ appများကို တပ်ဆင်ခွင့် ပြုသည်။"</string>
+    <string name="install_applications_title" msgid="4987712352256508946">"app ရင်းမြစ်များ ခွင့်ပြုရန်"</string>
+    <string name="install_unknown_applications_title" msgid="663831043139080992">"သင့်အားGoogle Play မဟုတ်သည့် အခြား ရင်းမြစ်များမှ appများကို တပ်ဆင်ခွင့် ပြုသည်။"</string>
     <string name="install_unknown_applications" msgid="176855644862942064">"အမည်မသိ ရင်းမြစ်များမှ အပလီကေးရှင်းများကို ထည့်သွင်းခွင့်ပြုရန်"</string>
-    <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"သင့်တက်ဘလက်နှင့် ကိုယ်ရေးအချက်အလက်များအား အရင်းအမြစ်မသိသောအပလီကေးရှင်းမှတိုက်ခိုက်ခြင်းခံရနိုင်ပါသည်။ ဤအပလီကေးရှင်းကိုအသုံးပြုခြင်းအတွက်ရရှိသောရလဒ်အနေဖြင့် သင့်တက်ဘလက်ဖျက်စီးခြင်းသို့မဟုတ် ဒေတာဆုံးရှုံးခြင်းအတွက် သင့်တဦးတည်းသာတာဝန်ရှိကြောင်း သင်သဘောတူရမည်ဖြစ်သည်။"</string>
-    <string name="install_all_warning" product="default" msgid="8113734576826384682">"သင့်ဖုန်းနှင့် ကိုယ်ပိုင်အချက်အလက်များအား မသိရှိသောအပ်ပလီကေးရှင်းများ၏ တိုက်ခိုက်ခြင်းကိုပိုပြီးခုခံနိုင်စွမ်းမရှိပါ။  ဤအပ်ပလီကေးရှင်းများကြောင့် သင့်ဖုန်းပျက်စီးခြင်း သို့မဟုတ် ဒေတာဆုံးရှုံးခြင်းစသည့်ဆုံးရှုံးမှုရလဒ်များကို တာဝန်ယူရန် သင်သဘောတူသည်ဖြစ်သည်။"</string>
-    <string name="advanced_settings" msgid="1777249286757067969">"အဆင့်မြင့်အပြင်အဆင်များ"</string>
+    <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"သင့်တက်ဘလက်နှင့် ကိုယ်ရေးအချက်အလက်များအား အရင်းအမြစ်မသိသောအပလီကေးရှင်းမှတိုက်ခိုက်ခြင်းခံရနိုင်ပါသည်။ ဤအပလီကေးရှင်းကိုအသုံးပြုခြင်းအတွက်ရရှိသောရလဒ်အနေဖြင့် သင့်တက်ဘလက်ဖျက်စီးခြင်းသို့မဟုတ် ဒေတာဆုံးရှုံးခြင်းအတွက် သင့်တဦးတည်းသာတာဝန်ရှိကြောင်း သင်သဘောတူရမည်ဖြစ်သည်။"</string>
+    <string name="install_all_warning" product="default" msgid="8113734576826384682">"သင့်ဖုန်းနှင့် ကိုယ်ပိုင်အချက်အလက်များအား မသိရှိသောအပ်ပလီကေးရှင်းများ၏ တိုက်ခိုက်ခြင်းကိုပိုပြီးခုခံနိုင်စွမ်းမရှိပါ။  ဤအပ်ပလီကေးရှင်းများကြောင့် သင့်ဖုန်းပျက်စီးခြင်း သို့မဟုတ် ဒေတာဆုံးရှုံးခြင်းစသည့်ဆုံးရှုံးမှုရလဒ်များကို တာဝန်ယူရန် သင်သဘောတူသည်ဖြစ်သည်။"</string>
+    <string name="advanced_settings" msgid="1777249286757067969">"အဆင့်မြင့်အပြင်အဆင်များ"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"ပိုမိုပြီးရွေးချယ်နိုင်သော အပြင်အဆင်များ ရရှိခြင်း"</string>
     <string name="application_info_label" msgid="5736524913065714880">"အက်ပ် အချက်အလက်များ"</string>
     <string name="storage_label" msgid="8700867073480107253">"သိုလှောင်မှုများ"</string>
-    <string name="auto_launch_label" msgid="3012617472833815382">"မူရင်းအတိုင်း ဖွင့်ရန်"</string>
+    <string name="auto_launch_label" msgid="3012617472833815382">"မူရင်းအတိုင်း ဖွင့်ရန်"</string>
     <string name="auto_launch_label_generic" msgid="3230569852551968694">"မူရင်းအတိုင်း"</string>
     <string name="screen_compatibility_label" msgid="663250687205465394">"ဖန်သားပြင် လိုက်ဖက်မှု"</string>
     <string name="permissions_label" msgid="2605296874922726203">"ခွင့်ပြုချက်များ"</string>
@@ -1212,12 +1217,12 @@
     <string name="enable_text" msgid="9217362512327828987">"ရနိုင်သည်"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"ဒေတာကို ရှင်းလင်းခြင်း"</string>
     <string name="app_factory_reset" msgid="6635744722502563022">"အဆင့်မြင့်မှုများကိုဖယ်ထုတ်မည်လား?"</string>
-    <string name="auto_launch_enable_text" msgid="2652825923953591251">"မူလကတည်းမှ တစ်ချို့လုပ်ဆောင်ချက်များအတွက် ဤအပလီကေးရှင်းကို ဖွင့်ရန်သင်ရွေး ချယ်ထားပြီးသားဖြစ်သည်"</string>
+    <string name="auto_launch_enable_text" msgid="2652825923953591251">"မူလကတည်းမှ တစ်ချို့လုပ်ဆောင်ချက်များအတွက် ဤအပလီကေးရှင်းကို ဖွင့်ရန်သင်ရွေး ချယ်ထားပြီးသားဖြစ်သည်"</string>
     <string name="always_allow_bind_appwidgets_text" msgid="3368654672141202604">"၀ဒ်ဂျက်များ ဖန်တီးရန်နှင့် ၎င်းတို့၏ အချက်အလက်များရယူရန် ဤအပလီကေးရှင်းကို ခွင့်ပြုကြောင်း သင်ရွေးချယ်ထားသည်။"</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"မူရင်း သတ်မှတ်ထားခြင်းမရှိ"</string>
     <string name="clear_activities" msgid="7408923511535174430">"မူရင်းများကို ရှင်းလင်းခြင်း"</string>
-    <string name="screen_compatibility_text" msgid="1616155457673106022">"သင့်ဖန်သားပြင်အတွက် ဤအပ်ပလီကေးရှင်းမှာ လိုက်ဖက်အောင် လုပ်ထားခြင်း မရှိနိုင်ပါ။ ဤနေရာတွင် သင့်ဖန်သားပြင်နှင့်ကိုက်ညီအောင် ထိန်းချုပ်နိုင်ပါသည်။"</string>
-    <string name="ask_compatibility" msgid="7225195569089607846">"ဖွင့်သည့်အခါ မေးမြန်းရန်။"</string>
+    <string name="screen_compatibility_text" msgid="1616155457673106022">"သင့်ဖန်သားပြင်အတွက် ဤအပ်ပလီကေးရှင်းမှာ လိုက်ဖက်အောင် လုပ်ထားခြင်း မရှိနိုင်ပါ။ ဤနေရာတွင် သင့်ဖန်သားပြင်နှင့်ကိုက်ညီအောင် ထိန်းချုပ်နိုင်ပါသည်။"</string>
+    <string name="ask_compatibility" msgid="7225195569089607846">"ဖွင့်သည့်အခါ မေးမြန်းရန်။"</string>
     <string name="enable_compatibility" msgid="5806819252068617811">"စကေးအပလီကေးရှင်း"</string>
     <string name="unknown" msgid="1592123443519355854">"အကြောင်းအရာ မသိရှိ"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"အမည်အလိုက် စီရန်"</string>
@@ -1238,14 +1243,14 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USBသိုလှောင်ကိရိယာ"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"SD ကဒ်ပေါ်တွင်"</string>
     <string name="disabled" msgid="9206776641295849915">"ပိတ်ထားပြီး"</string>
-    <string name="not_installed" msgid="1475144352069281880">"မထည့်သွင်းထားပါ"</string>
+    <string name="not_installed" msgid="2797554494953450291">"ဤအသုံးပြုသူအတွက် ထည့်သွင်းမထားပါ"</string>
     <string name="no_applications" msgid="7336588977497084921">"အပ်ပလီကေးရှင်းများမရှိပါ"</string>
     <string name="internal_storage" msgid="1584700623164275282">"စက်တွင်း သိုလှောင်ထားမှု"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USBသိုလှောင်မှု"</string>
     <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SDကဒ်သိုလှောင်မှုများ"</string>
     <string name="recompute_size" msgid="7722567982831691718">"အရွယ်အစားကို ပြန်လည်တွက်ချက်နေသည်"</string>
     <string name="clear_data_dlg_title" msgid="5605258400134511197">"အပ်ပလီကေးရှင်းဒေတာအား ပယ်ဖျက်မည်လား?"</string>
-    <string name="clear_data_dlg_text" msgid="8847257251846779938">"ဤအပလီကေးရှင်၏ဒေတာများအားလုံးကို ထာဝရဖျက်ပါမည်။ ဖိုင်များအားလုံး၊ ဆက်တင်များ၊ အကောင့်များ၊ ဒေတာဘေ့စ်စသည်တို့ပါဝင်ပါမည်။"</string>
+    <string name="clear_data_dlg_text" msgid="8847257251846779938">"ဤအပလီကေးရှင်၏ဒေတာများအားလုံးကို ထာဝရဖျက်ပါမည်။ ဖိုင်များအားလုံး၊ ဆက်တင်များ၊ အကောင့်များ၊ ဒေတာဘေ့စ်စသည်တို့ပါဝင်ပါမည်။"</string>
     <string name="dlg_ok" msgid="2402639055725653590">"ကောင်းပြီ"</string>
     <string name="dlg_cancel" msgid="1674753358972975911">"ထားတော့"</string>
     <string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
@@ -1255,8 +1260,8 @@
     <string name="app_factory_reset_dlg_text" msgid="6371247225487725860">"ဤAndroidစနစ်အပလီကေးရှင်းထဲရှိအဆင့်မြင့်မှုများအားလုံးအား ထုတ်မည်"</string>
     <string name="clear_failed_dlg_title" msgid="2387060805294783175">"ဒေတာကို ရှင်းလင်းခြင်း"</string>
     <string name="clear_failed_dlg_text" msgid="1092177570631523106">"အပ်ပလီကေးရှင်းဒေတာအား မရှင်းလင်းနိုင်ပါ"</string>
-    <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"ဤအပလီကေးရှင်းမှာ သင့်တက်ဘလက်၏အောက်ပါတို့ကို ဝင်ရောက်ကြည့်နိုင်သည်"</string>
-    <string name="security_settings_desc" product="default" msgid="61749028818785244">"ဤအပလီကေးရှင်းမှာ သင့်ဖုန်း၏အောက်ပါတို့ကို ဝင်ရောက်ကြည့်နိုင်သည်"</string>
+    <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"ဤအပလီကေးရှင်းမှာ သင့်တက်ဘလက်၏အောက်ပါတို့ကို ဝင်ရောက်ကြည့်နိုင်သည်"</string>
+    <string name="security_settings_desc" product="default" msgid="61749028818785244">"ဤအပလီကေးရှင်းမှာ သင့်ဖုန်း၏အောက်ပါတို့ကို ဝင်ရောက်ကြည့်နိုင်သည်"</string>
     <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"ဤအပလီကေးရှင်းသည် သင့်တက်ဘလက်ပေါ်မှ အောက်ပါတို့ကို ရယူအသုံးပြုနိုင်သည်။ စွမ်းဆောင်ရည်တိုးတက်ရန်နှင့် မှတ်ဉာဏ်အသုံးပြုမှုလျှော့ချရန် အလို့ငှာ <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> မှ အချို့ ခွင့်ပြုမိန့်များ လိုအပ်သည်။ အဘယ်ကြောင့်ဆိုသော် ၎င်းသည် <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g> ကဲ့သို့တူသော လုပ်ငန်းစဉ်ကို လုပ်ဆောင်နေသောကြောင့်ဖြစ်သည်။"</string>
     <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"ဤအပလီကေးရှင်းသည် သင့်ဖုန်းမှာ အောက်ပါအချက်များကို ရယူနိုင်သည်။ ဖုန်း၏ မှတ်ဉာဏ်သုံးစွဲမှုနှင့် စွမ်းဆောင်ရည် ပိုမိုတိုးတက်လာစေရန် <xliff:g id="BASE_APP_NAME">%1$s</xliff:g>သည် အချို့ ခွင့်ပြုချက်များ ရရှိနိုင်သည်။ အဘယ့်ကြောင့်ဆိုသော် ၎င်းသည် <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g> နှင့် လုပ်ငန်းစဉ်တူညီနေ၍ ဖြစ်သည်။"</string>
     <string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> နှင့် <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
@@ -1267,7 +1272,7 @@
     <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"အရည်အသွေးကောင်းသောစာတိုပို့ရန်"</string>
     <string name="computing_size" msgid="1599186977475211186">"တွက်ချက်နေသည်…"</string>
     <string name="invalid_size_value" msgid="7563537715280712285">"အချက်အလက်အစု ပမာဏကို တွက်ချက်မရပါ။"</string>
-    <string name="empty_list_msg" msgid="5993162337235907160">"သင့်တွင်မည်သည့် တတိယလူမှအပလီကေးရှင်းအားထည့်သွင်းထားခြင်းမရှိပါ"</string>
+    <string name="empty_list_msg" msgid="5993162337235907160">"သင့်တွင်မည်သည့် တတိယလူမှအပလီကေးရှင်းအားထည့်သွင်းထားခြင်းမရှိပါ"</string>
     <string name="version_text" msgid="9189073826278676425">"<xliff:g id="VERSION_NUM">%1$s</xliff:g>ဗားရှင်း"</string>
     <string name="move_app" msgid="5042838441401731346">"ရွေ့မည်"</string>
     <string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"တက်ဘလက်သို့ရွေ့မည်"</string>
@@ -1278,14 +1283,14 @@
     <string name="insufficient_storage" msgid="481763122991093080">"သိမ်းဆည်းရန်နေရာအလုံအလောက်မရှိပါ"</string>
     <string name="does_not_exist" msgid="3476487214886606748">"အပလီကေးရှင်းမှာ မရှိပါ"</string>
     <string name="app_forward_locked" msgid="6331564656683790866">"အပ်ပလီကေးရှင်းမှာ ကူးမယူနိုင်ရန်ပြုလုပ်ထားသည်။"</string>
-    <string name="invalid_location" msgid="2786030127356312746">"ထည့်သွင်းသည့်နေရာ မမှန်ကန်ပါ"</string>
-    <string name="system_package" msgid="6222593098063037137">"ပြင်ပမီဒီယာတွင် စနစ်တိုးမြင့်ခြင်းအား မပြုလုပ်နိုင်ပါ"</string>
+    <string name="invalid_location" msgid="2786030127356312746">"ထည့်သွင်းသည့်နေရာ မမှန်ကန်ပါ"</string>
+    <string name="system_package" msgid="6222593098063037137">"ပြင်ပမီဒီယာတွင် စနစ်တိုးမြင့်ခြင်းအား မပြုလုပ်နိုင်ပါ"</string>
     <string name="force_stop_dlg_title" msgid="977530651470711366">"မဖြစ်မနေ ရပ်ခိုင်းမည်လား?"</string>
     <string name="force_stop_dlg_text" msgid="7208364204467835578">"အကယ်၍အပ်ပလီကေးရှင်းအား မဖြစ်မနေရပ်ခိုင်းလျှင် အမှားအယွင်းဖြစ်နိုင်သည်"</string>
     <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
     <string name="move_app_failed_dlg_text" msgid="3465267182923054022">"အပ်ပလီကေးရှင်းရွေ့မရပါ <xliff:g id="REASON">%1$s</xliff:g>"</string>
-    <string name="app_install_location_title" msgid="2068975150026852168">"ပိုမိုလိုလားသောထည့်သွင်းမည့်နေရာ"</string>
-    <string name="app_install_location_summary" msgid="5155453752692959098">"အပလီကေးရှင်းအသစ်အတွက် လိုလားသောတည်နေရာထည့်သွင်းခြင်းကို ပြောင်းရန်။"</string>
+    <string name="app_install_location_title" msgid="2068975150026852168">"ပိုမိုလိုလားသောထည့်သွင်းမည့်နေရာ"</string>
+    <string name="app_install_location_summary" msgid="5155453752692959098">"အပလီကေးရှင်းအသစ်အတွက် လိုလားသောတည်နေရာထည့်သွင်းခြင်းကို ပြောင်းရန်။"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"နဂိုပါအပလီကေးရှင်းများပိတ်မလား"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"မူလကတည်းကပါသော အပလီကေးရှင်းတစ်ခု အလုပ်မလုပ်နိုင်အောင် ပိတ်လျှင် အခြား အပလီကေးရှင်းများ၏ လုပ်ဆောင်ချက်လည်း မမှန်မကန် ဖြစ်နိုင်သည်။"</string>
     <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"အချက်အလက်များကိုဖျက်၍ အပလီကေးရှင်းအား ပိတ်မည်လား ?"</string>
@@ -1296,9 +1301,9 @@
     <string name="app_ops_running" msgid="7706949900637284122">"အလုပ်လုပ်နေသည်"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(တစ်ခါမှမသုံးပါ)"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"အသုံးပြုနေသောသိုလှောင်မှု"</string>
-    <string name="storageuse_settings_summary" msgid="3748286507165697834">"အပလီကေးရှင်းများမှအသုံးပြုသော သိုလှောင်မှုကို ကြည့်ရန်။"</string>
+    <string name="storageuse_settings_summary" msgid="3748286507165697834">"အပလီကေးရှင်းများမှအသုံးပြုသော သိုလှောင်မှုကို ကြည့်ရန်။"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"အလုပ်လုပ်နေသောဝန်ဆောင်မှုများ"</string>
-    <string name="runningservices_settings_summary" msgid="854608995821032748">"ယခုအလုပ်လုပ်နေသောဝန်ဆောင်မှုကို ကြည့်ခြင်းနှင့် ထိန်းသိမ်းခြင်းအား ပြုလုပ်မည်လား?"</string>
+    <string name="runningservices_settings_summary" msgid="854608995821032748">"ယခုအလုပ်လုပ်နေသောဝန်ဆောင်မှုကို ကြည့်ခြင်းနှင့် ထိန်းသိမ်းခြင်းအား ပြုလုပ်မည်လား?"</string>
     <string name="service_restarting" msgid="2242747937372354306">"ပြန်လည်စတင်နေပါသည်"</string>
     <string name="cached" msgid="1059590879740175019">"ဖုံးထားသော နောက်ကွယ်လုပ်ငန်းစဥ်"</string>
     <string name="no_running_services" msgid="2059536495597645347">"ဘာအလုပ်မှ မလုပ်နေပါ"</string>
@@ -1312,10 +1317,10 @@
     <skip />
     <string name="running_process_item_user_label" msgid="3129887865552025943">"သုံးစွဲသူ၊ <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="running_process_item_removed_user_label" msgid="8250168004291472959">"သုံးစွဲသူကိုဖယ်လိုက်သညိ"</string>
-    <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> လုပ်ဆောင်ခြင်းနှင့် <xliff:g id="NUMSERVICES">%2$d</xliff:g> ဝန်ဆောင်မှုများ"</string>
-    <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> လုပ်ဆောင်ခြင်းနှင့် <xliff:g id="NUMSERVICES">%2$d</xliff:g> ဝန်ဆောင်မှုများ"</string>
-    <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> လုပ်ဆောင်ခြင်းနှင့် <xliff:g id="NUMSERVICES">%2$d</xliff:g> ဝန်ဆောင်မှုများ"</string>
-    <string name="running_processes_item_description_p_p" msgid="1607384595790852782">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> လုပ်ဆောင်ခြင်းနှင့် <xliff:g id="NUMSERVICES">%2$d</xliff:g> ဝန်ဆောင်မှုများ"</string>
+    <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> လုပ်ဆောင်ခြင်းနှင့် <xliff:g id="NUMSERVICES">%2$d</xliff:g> ဝန်ဆောင်မှုများ"</string>
+    <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> လုပ်ဆောင်ခြင်းနှင့် <xliff:g id="NUMSERVICES">%2$d</xliff:g> ဝန်ဆောင်မှုများ"</string>
+    <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> လုပ်ဆောင်ခြင်းနှင့် <xliff:g id="NUMSERVICES">%2$d</xliff:g> ဝန်ဆောင်မှုများ"</string>
+    <string name="running_processes_item_description_p_p" msgid="1607384595790852782">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> လုပ်ဆောင်ခြင်းနှင့် <xliff:g id="NUMSERVICES">%2$d</xliff:g> ဝန်ဆောင်မှုများ"</string>
     <string name="running_processes_header_title" msgid="6588371727640789560">"ကိရိယာ မှတ်ဉာဏ်"</string>
     <string name="running_processes_header_footer" msgid="723908176275428442">"App၏RAM သုံးစွဲမှု"</string>
     <string name="running_processes_header_system_prefix" msgid="6104153299581682047">"စနစ်"</string>
@@ -1331,19 +1336,19 @@
     <string name="service_stop" msgid="6369807553277527248">"ရပ်ရန်"</string>
     <string name="service_manage" msgid="1876642087421959194">"ဆက်တင်များ"</string>
     <string name="service_stop_description" msgid="9146619928198961643">"ဤဆားဗစ်ကို ထိုအပလီကေးရှင်းမှစတင်ပါသည် ရပ်လျှင်ထိုအပလီကေးရှင်းကို ဆုံးရှုံးစေမည်"</string>
-    <string name="heavy_weight_stop_description" msgid="2979218727598321095">"ဤအပလီကေးရှင်းကို အန္တရာယ်ကင်းစွာ မရပ်နုိင်ပါ အကယ်၍ရပ်စေလျှင် လက်ရှိအလုပ်တချို့များကို ဆုံးရှုံးပါလိမ့်မည်"</string>
-    <string name="background_process_stop_description" msgid="5034773197139654588">"အကယ်၍ နောက်ထပ်တခါလိုအပ်လျှင်အတွက် အပ်ပလီကေးရှင်းအဟောင်းမှာ ဆက်လက်အလုပ်လုပ်နေပါသည်။ ပုံမှန်အားဖြင့် ရပ်ဆိုင်းရန် အကြောင်းမရှိပါ။"</string>
+    <string name="heavy_weight_stop_description" msgid="2979218727598321095">"ဤအပလီကေးရှင်းကို အန္တရာယ်ကင်းစွာ မရပ်နုိင်ပါ အကယ်၍ရပ်စေလျှင် လက်ရှိအလုပ်တချို့များကို ဆုံးရှုံးပါလိမ့်မည်"</string>
+    <string name="background_process_stop_description" msgid="5034773197139654588">"အကယ်၍ နောက်ထပ်တခါလိုအပ်လျှင်အတွက် အပ်ပလီကေးရှင်းအဟောင်းမှာ ဆက်လက်အလုပ်လုပ်နေပါသည်။ ပုံမှန်အားဖြင့် ရပ်ဆိုင်းရန် အကြောင်းမရှိပါ။"</string>
     <string name="service_manage_description" msgid="7050092269951613102">"<xliff:g id="CLIENT_NAME">%1$s</xliff:g>: လက်ရှိအသုံးပြုနေသည်။ ထိန်းချုပ်ရန် အပြင်အဆင်များကိုထိပါ။"</string>
     <string name="main_running_process_description" msgid="1130702347066340890">"အဓိကလုပ်ငန်းစဉ်အား အသုံးပြုနေသည်"</string>
     <string name="process_service_in_use_description" msgid="8993335064403217080">"<xliff:g id="COMP_NAME">%1$s</xliff:g>ဝန်ဆောင်မှုအား အသုံးပြုနေသည်"</string>
     <string name="process_provider_in_use_description" msgid="5586603325677678940">"<xliff:g id="COMP_NAME">%1$s</xliff:g> ပံ့ပိုးသူမှ အသုံးပြုနေသည်"</string>
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"စနစ်၏ဝန်ဆောင်မှုကို ရပ်ဆိုင်းမည်လား?"</string>
-    <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"အကယ်၍ ဤဆားဗစ်ကိုရပ်ဆိုင်းလျှင် သင့်တက်ဘလက်ထဲမှတချို့လုပ်ဆောင်ချက်များမှာ ပါဝါပိတ်ကာ ပြန်လည်ဖွင့်သည့်အထိ အလုပ်လုပ်မည်မဟုတ်ပါ။"</string>
-    <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"အကယ်၍ဤဝန်ဆောင်မှုကိုရပ်ဆိုင်းလျှင် သင့်ဖုန်း၏အချို့သောလုပ်ဆောင်ချက်များမှာ ပါဝါပိတ်ပြီး နောက်တခါပြန်လည်ဖွင့်သည့်အထိ ကောင်းစွာအလုပ်လုပ်မည်မဟုတ်ပါ"</string>
-    <string name="language_settings" msgid="5292716747264442359">"ဘာသာစကားနှင့် ထည့်သွင်းခြင်း"</string>
-    <string name="language_keyboard_settings_title" msgid="243220021717425813">"ဘာသာစကားနှင့် ထည့်သွင်းခြင်း"</string>
+    <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"အကယ်၍ ဤဆားဗစ်ကိုရပ်ဆိုင်းလျှင် သင့်တက်ဘလက်ထဲမှတချို့လုပ်ဆောင်ချက်များမှာ ပါဝါပိတ်ကာ ပြန်လည်ဖွင့်သည့်အထိ အလုပ်လုပ်မည်မဟုတ်ပါ။"</string>
+    <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"အကယ်၍ဤဝန်ဆောင်မှုကိုရပ်ဆိုင်းလျှင် သင့်ဖုန်း၏အချို့သောလုပ်ဆောင်ချက်များမှာ ပါဝါပိတ်ပြီး နောက်တခါပြန်လည်ဖွင့်သည့်အထိ ကောင်းစွာအလုပ်လုပ်မည်မဟုတ်ပါ"</string>
+    <string name="language_settings" msgid="5292716747264442359">"ဘာသာစကားနှင့် ထည့်သွင်းခြင်း"</string>
+    <string name="language_keyboard_settings_title" msgid="243220021717425813">"ဘာသာစကားနှင့် ထည့်သွင်းခြင်း"</string>
     <string name="language_settings_category" msgid="2288258489940617043">"ဘာသာစကားဆက်တင်များ"</string>
-    <string name="keyboard_settings_category" msgid="8275523930352487827">"ကီးဘုတ်နှင့်ထည့်သွင်းရန်နည်းလမ်းများ"</string>
+    <string name="keyboard_settings_category" msgid="8275523930352487827">"ကီးဘုတ်နှင့်ထည့်သွင်းရန်နည်းလမ်းများ"</string>
     <string name="phone_language" msgid="8870144109924299673">"ဘာသာစကား"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
     <string name="auto_replace" msgid="6199184757891937822">"အလိုအလျောက်အစားသွင်းခြင်း"</string>
@@ -1352,10 +1357,10 @@
     <string name="auto_caps_summary" msgid="6358102538315261466">"စာကြောင်း၏ပထမစာလုံးအား အကြီးပြုလုပ်ရန်"</string>
     <string name="auto_punctuate" msgid="4595367243950425833">"ပုဒ်ဖြတ် ပုဒ်မ အလိုအလျောက်ပြင်ခြင်း"</string>
     <string name="hardkeyboard_category" msgid="5957168411305769899">"ခလုတ်ပါဝင်သောကီးဘုတ်ဆက်တင်များ"</string>
-    <string name="auto_punctuate_summary" msgid="4372126865670574837">"Space key အားနှစ်ခါနှိပ်ပါက  \".\" အား ထည့်မည်"</string>
+    <string name="auto_punctuate_summary" msgid="4372126865670574837">"Space key အားနှစ်ခါနှိပ်ပါက  \".\" အား ထည့်မည်"</string>
     <string name="show_password" msgid="3001113966880559611">"စကားဝှက်များ မြင်သာစေခြင်း"</string>
-    <string name="ime_security_warning" msgid="4135828934735934248">"ဤထည့်သွင်းမှုနည်းလမ်းမှာ သင့်ကိုယ်ရေးအချက်အလက်များဖြစ်သော စကားဝှက်များနှင့် ကရက်ဒစ်ကဒ်နံပါတ်စသည်တို့ကို ရယူသွားမည်ဖြစ်သည်။ <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>အပလီကေးရှင်းမှလာပါသည်။ ဤထည့်သွင်းမှုနည်းလမ်းကို အသုံးပြုမည်လား?"</string>
-    <string name="spellchecker_security_warning" msgid="9060897418527708922">"ဤစာလုံးပေါင်းစစ်ဆေးရာတွင် သင့်ကိုယ်ရေးအချက်အလက်များဖြစ်သော စကားဝှက်များနှင့် ကရက်ဒစ်ကဒ်နံပါတ်စသည်တို့အပါအဝင် သင်ရိုက်ထည့်သောစာများအားလုံးကို ရယူသွားမည်ဖြစ်သည်။ <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>ဤစာလုံးပေါင်းစစ်ဆေးခြင်းကို အသုံးပြုမည်လား?"</string>
+    <string name="ime_security_warning" msgid="4135828934735934248">"ဤထည့်သွင်းမှုနည်းလမ်းမှာ သင့်ကိုယ်ရေးအချက်အလက်များဖြစ်သော စကားဝှက်များနှင့် ကရက်ဒစ်ကဒ်နံပါတ်စသည်တို့ကို ရယူသွားမည်ဖြစ်သည်။ <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>အပလီကေးရှင်းမှလာပါသည်။ ဤထည့်သွင်းမှုနည်းလမ်းကို အသုံးပြုမည်လား?"</string>
+    <string name="spellchecker_security_warning" msgid="9060897418527708922">"ဤစာလုံးပေါင်းစစ်ဆေးရာတွင် သင့်ကိုယ်ရေးအချက်အလက်များဖြစ်သော စကားဝှက်များနှင့် ကရက်ဒစ်ကဒ်နံပါတ်စသည်တို့အပါအဝင် သင်ရိုက်ထည့်သောစာများအားလုံးကို ရယူသွားမည်ဖြစ်သည်။ <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>ဤစာလုံးပေါင်းစစ်ဆေးခြင်းကို အသုံးပြုမည်လား?"</string>
     <string name="spellchecker_quick_settings" msgid="246728645150092058">"ဆက်တင်များ"</string>
     <string name="spellchecker_language" msgid="6041050114690541437">"ဘာသာစကား"</string>
     <string name="failed_to_open_app_settings_toast" msgid="1251067459298072462">"<xliff:g id="SPELL_APPLICATION_NAME">%1$s</xliff:g>အတွက် ဆက်တင်းများဖွင့်ရန် မအောင်မြင်ပါ။"</string>
@@ -1385,38 +1390,38 @@
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"စာလုံးကို ပြင်ဆင်မည်"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"ပြင်ဆင်ရန်"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"ဖျက်ပါ"</string>
-    <string name="user_dict_settings_empty_text" msgid="8165273379942105271">"သင့်အဘိဓာန်ထဲတွင် မည်သည့်စာလုံးမှမရှိပါ။ ထပ်ထည့်ခြင်း(+)ခလုတ်ကို ထိ၍ စာလုံးထည့်ပါ။"</string>
+    <string name="user_dict_settings_empty_text" msgid="8165273379942105271">"သင့်အဘိဓာန်ထဲတွင် မည်သည့်စာလုံးမှမရှိပါ။ ထပ်ထည့်ခြင်း(+)ခလုတ်ကို ထိ၍ စာလုံးထည့်ပါ။"</string>
     <string name="user_dict_settings_all_languages" msgid="6742000040975959247">"ဘာသာစကားအားလုံးအတွက်"</string>
     <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"ဘာသာစကားပိုများများ…"</string>
     <string name="testing" msgid="6584352735303604146">"စမ်းသပ်မှု"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"တက်ဘလက်အကြောင်း"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"ဖုန်းအကြောင်း"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"ဘက်ထရီအကြောင်း"</string>
-    <string name="quick_launch_title" msgid="7904609846945905306">"အမြန်ဖွင့်ရန်"</string>
-    <string name="quick_launch_summary" msgid="8101133819188001190">"အပလီကေးရှင်းများဖွင့်ရန် ကီးဘုတ်အတိုကောက်အားသတ်မှတ်မည်"</string>
+    <string name="quick_launch_title" msgid="7904609846945905306">"အမြန်ဖွင့်ရန်"</string>
+    <string name="quick_launch_summary" msgid="8101133819188001190">"အပလီကေးရှင်းများဖွင့်ရန် ကီးဘုတ်အတိုကောက်အားသတ်မှတ်မည်"</string>
     <string name="quick_launch_assign_application" msgid="6240064079456617501">"အပလီကေးရှင်းကို တာဝန်ပေးမည်"</string>
     <string name="quick_launch_no_shortcut" msgid="5998005833838278693">"အတိုကောက် မရှိပါ"</string>
     <string name="quick_launch_shortcut" msgid="5090405067413522300">"ရှာဖွေခြင်း + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
     <string name="quick_launch_clear_dialog_title" msgid="5546543501250320220">"ရှင်းလင်းရန်"</string>
-    <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"<xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>)အတွက်သင့်အတိုကောက်ကို ပယ်ဖျက်ပါမည်"</string>
+    <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"<xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>)အတွက်သင့်အတိုကောက်ကို ပယ်ဖျက်ပါမည်"</string>
     <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"ကောင်းပြီ"</string>
     <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"ထားတော့"</string>
     <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"အပလီကေးရှင်းများ"</string>
     <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"အတိုကောက်များ"</string>
-    <string name="input_methods_settings_title" msgid="6800066636850553887">"စာသားဖြင့်ထည့်သွင်းခြင်း"</string>
-    <string name="input_method" msgid="5434026103176856164">"ထည့်သွင်းရန်နည်းလမ်း"</string>
+    <string name="input_methods_settings_title" msgid="6800066636850553887">"စာသားဖြင့်ထည့်သွင်းခြင်း"</string>
+    <string name="input_method" msgid="5434026103176856164">"ထည့်သွင်းရန်နည်းလမ်း"</string>
     <string name="current_input_method" msgid="2636466029213488159">"လက်ရှိ ကီးဘုတ်"</string>
-    <string name="input_method_selector" msgid="4311213129681430709">"ထည့်သွင်းရန်နည်းလမ်း ရွေးချယ်မှု"</string>
+    <string name="input_method_selector" msgid="4311213129681430709">"ထည့်သွင်းရန်နည်းလမ်း ရွေးချယ်မှု"</string>
     <string name="input_method_selector_show_automatically_title" msgid="1001612945471546158">"အလိုအလျောက်"</string>
     <string name="input_method_selector_always_show_title" msgid="3891824124222371634">"အမြဲပြသရန်"</string>
     <string name="input_method_selector_always_hide_title" msgid="7699647095118680424">"အမြဲဖုံးကွယ်ထားရန်"</string>
-    <string name="configure_input_method" msgid="1317429869771850228">"ထည့်သွင်းရန်နည်းလမ်းများကို သတ်မှတ်ခြင်း"</string>
+    <string name="configure_input_method" msgid="1317429869771850228">"ထည့်သွင်းရန်နည်းလမ်းများကို သတ်မှတ်ခြင်း"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"ဆက်တင်များ"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"ဆက်တင်များ"</string>
-    <string name="active_input_method_subtypes" msgid="3596398805424733238">"ရနိုင်သောထည့်သွင်းရန်နည်းလမ်းများ"</string>
+    <string name="active_input_method_subtypes" msgid="3596398805424733238">"ရနိုင်သောထည့်သွင်းရန်နည်းလမ်းများ"</string>
     <string name="use_system_language_to_select_input_method_subtypes" msgid="3346751753141428573">"စနစ်၏ဘာသာစကားကို အသုံးပြုမည်"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g>ဆက်တင်များ"</string>
-    <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"ရရှိနိုင်သောထည့်သွင်းရန်နည်းလမ်းများ"</string>
+    <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"ရရှိနိုင်သောထည့်သွင်းရန်နည်းလမ်းများ"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"ဖန်မျက်နှာပြင်ပေါ်ရှိကီးဘုတ် ဆက်တင်များ"</string>
     <string name="builtin_keyboard_settings_title" msgid="7688732909551116798">"ခလုတ်ပါရှိသောကီးဘုတ်"</string>
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"ခလုတ်ပါဝင်သောကီးဘုတ်ဆက်တင်များ"</string>
@@ -1425,9 +1430,9 @@
     <string name="development_settings_not_available" msgid="4308569041701535607">"ဤသုံးစွဲသူအတွက် တည်ဆောက်သူ ရွေးချယ်ခွင့်များ မရနိုင်ပါ"</string>
     <string name="vpn_settings_not_available" msgid="956841430176985598">"ဤ အသုံးပြုသူ အတွက် VPN ဆက်တင်များကို မရယူနိုင်"</string>
     <string name="tethering_settings_not_available" msgid="6765770438438291012">"ဤ အသုံးပြုသူ အတွက် ချိတ်တွဲရေး ဆက်တင်များကို မရယူနိုင်"</string>
-    <string name="apn_settings_not_available" msgid="7873729032165324000">"ဤ အသုံးပြုသူ အတွက် ဝင်လိုသည့် နေရာ အမည်၏ ဆက်တင်များကို မရယူနိုင်"</string>
+    <string name="apn_settings_not_available" msgid="7873729032165324000">"ဤ အသုံးပြုသူ အတွက် ဝင်လိုသည့် နေရာ အမည်၏ ဆက်တင်များကို မရယူနိုင်"</string>
     <string name="enable_adb" msgid="7982306934419797485">"ယူအက်စ်ဘီ အမှားရှာခြင်း"</string>
-    <string name="enable_adb_summary" msgid="4881186971746056635">"USBနှင့်ဆက်သွယ်ထားလျှင် အမှားရှာဖွေဖယ်ရှားမှုစနစ်စတင်ရန်"</string>
+    <string name="enable_adb_summary" msgid="4881186971746056635">"USBနှင့်ဆက်သွယ်ထားလျှင် အမှားရှာဖွေဖယ်ရှားမှုစနစ်စတင်ရန်"</string>
     <string name="clear_adb_keys" msgid="4038889221503122743">"ယူအက်စ်ဘီ အမှားရှာခြင်း ခွင့်ပြုချက်များ ပြန်ရုတ်သိမ်းရန်"</string>
     <string name="bugreport_in_power" msgid="7923901846375587241">"ဘာဂ် အစီရင်ခံရန် ဖြတ်လမ်း"</string>
     <string name="bugreport_in_power_summary" msgid="1778455732762984579">"ဘာဂ် အစီရင်ခံစာကို လက်ခံရန် ပါဝါ မီနူးထဲက ခလုတ်ကို ပြပါ"</string>
@@ -1435,8 +1440,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"အားသွင်းနေစဉ် ဖန်သားပြင်မှာဘယ်သောအခါမှ ပိတ်မည်မဟုတ်ပါ။"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"ဘလူးတုသ် HCI snoop မှတ်တမ်းကို ဖွင့်ရန်။"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"ဘလူးတုသ် HCI အစုလိုက်များကို ဖိုင်တစ်ခုတွင် ဖမ်းယူရန်"</string>
-    <string name="oem_unlock_enable" msgid="6629321276287913315">"OEM သော့ဖွင့်မှု ဖွင့်ထားရန်"</string>
-    <string name="oem_unlock_enable_summary" msgid="3546686263996628110">"ကိရိယာအား OEM သော့ဖွင့်ခွင့် ပြုရန်"</string>
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM သော့ဖွင့်ခြင်း"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"အစပြုခြင်းကိရိယာအား သော့ဖွင့်ရန် ခွင့်ပြုမည်"</string>
+    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"သင့်ပင်နံပါတ် ရိုက်ထည့်ပါ"</string>
+    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"OEM သော့ဖွင့်ခြင်း အသုံးပြုရန် သင့်ကိရိယာ ပင်နံပါတ်ရိုက်ထည့်ပါ။"</string>
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"OEM သော့ဖွင့်ခြင်း ခွင့်ပြုမလား?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"သတိပေးချက်: ဤချိန်ညှိချက်ဖွင့်ထားလျှင်၊ ဤစက်ပစ္စည်းပေါ်တွင် စက်ပစ္စည်းကာကွယ်သည့် အထူးပြုလုပ်ချက် အလုပ်လုပ်မည်မဟုတ်ပါ။"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"ကြိုးမဲ့ပြသမှု အသိအမှတ်ပြုလက်မှတ်"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Wi‑Fi Verbose မှတ်တမ်းတင်ခြင်းအား ဖွင့်မည်"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"ထိရောက်သည့် Wi‑Fi မှ ဆယ်လူလာ လွှဲပြောင်းမှု"</string>
@@ -1447,11 +1456,11 @@
     <string name="wifi_allow_scan_with_traffic_summary" msgid="2575101424972686310">"မျက်နှာပြင်တွင် ဖော်ပြသည့် အချက်လက် အသွားအလာ ပမာဏပေါ်တွင် အခြေခံ၍ WIFI ရွမ်းရှာဖွေမှုအား ဖွင့်/ပိတ်မည်"</string>
     <string name="select_logd_size_title" msgid="7433137108348553508">"လော့ဂါး ဘာဖား ဆိုက်များ"</string>
     <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"လော့ ဘာဖားတွက် လော့ဂါးဆိုက် ရွေး"</string>
-    <string name="allow_mock_location" msgid="2787962564578664888">"ပုံစံတုတည်နေရာများကို ခွင့်ပြုရန်"</string>
-    <string name="allow_mock_location_summary" msgid="317615105156345626">"ပုံစံတုတည်နေရာများကို ခွင့်ပြုရန်"</string>
-    <string name="debug_view_attributes" msgid="6485448367803310384">"အရည်အချင်းများ စူးစမ်းမှု မြင်ကွင်းကို ဖွင့်ပေးရန်"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"ပုံစံတုတည်နေရာများကို ခွင့်ပြုရန်"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"ပုံစံတုတည်နေရာများကို ခွင့်ပြုရန်"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"အရည်အချင်းများ စူးစမ်းမှု မြင်ကွင်းကို ဖွင့်ပေးရန်"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"USB ပြသနာရှာခြင်း ခွင့်ပြုပါမလား?"</string>
-    <string name="adb_warning_message" msgid="7316799925425402244">"USBအမှားရှားခြင်းမှာ ဆော့ဝဲလ်ရေးသားရန်အတွက်သာ ရည်ရွယ်ပါသည်။ သင့်ကွန်ပြုတာနှင့်သင့်စက်ကြားတွင် ဒေတာများကိုကူးယူရန်၊ အကြောင်းမကြားပဲနှင့် သင့်စက်အတွင်းသို့ အပလီကေးရှင်းများထည့်သွင်းခြင်းနှင့် ဒေတာမှတ်တမ်းများဖတ်ရန်အတွက် အသုံးပြုပါ"</string>
+    <string name="adb_warning_message" msgid="7316799925425402244">"USBအမှားရှားခြင်းမှာ ဆော့ဝဲလ်ရေးသားရန်အတွက်သာ ရည်ရွယ်ပါသည်။ သင့်ကွန်ပြုတာနှင့်သင့်စက်ကြားတွင် ဒေတာများကိုကူးယူရန်၊ အကြောင်းမကြားပဲနှင့် သင့်စက်အတွင်းသို့ အပလီကေးရှင်းများထည့်သွင်းခြင်းနှင့် ဒေတာမှတ်တမ်းများဖတ်ရန်အတွက် အသုံးပြုပါ"</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"သင် ယခင်က ခွင့်ပြုခဲ့သော ကွန်ပျူတာအားလုံးမှ ယူအက်စ်ဘီ အမှားစစ်ခွင့်ကို ရုတ်သိမ်းမည်လား ?"</string>
     <string name="dev_settings_warning_title" msgid="7244607768088540165">"တည်ဆောက်ပြုပြင်ရန်ဆက်တင်များကို အသုံးပြုခွင့်ပေးမည်လား?"</string>
     <string name="dev_settings_warning_message" msgid="2298337781139097964">"ဤဆက်တင်းများကို တည်ဆောက်ပြုပြင်ရာတွင် သုံးရန်အတွက်သာ ရည်ရွယ်သည်။ ၎င်းတို့သည် သင်၏စက်နှင့် အပလီကေးရှင်းများကို ရပ်စေခြင်း သို့ လုပ်ဆောင်ချက်မမှန်ကန်ခြင်းများ ဖြစ်ပေါ်စေနိုင်သည်။"</string>
@@ -1475,7 +1484,7 @@
     <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g>ရက် <xliff:g id="HOURS">%2$d</xliff:g>နာရီ <xliff:g id="MINUTES">%3$d</xliff:g>မိနစ် <xliff:g id="SECONDS">%4$d</xliff:g>စက်ကန့်"</string>
     <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>နာရီ <xliff:g id="MINUTES">%2$d</xliff:g>မိနစ် <xliff:g id="SECONDS">%3$d</xliff:g>စက်ကန့်"</string>
     <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>မိနစ် <xliff:g id="SECONDS">%2$d</xliff:g>စက်ကန့်"</string>
-    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g>စက္ကန့်"</string>
+    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g>စက္ကန့်"</string>
     <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g>d <xliff:g id="HOURS">%2$d</xliff:g>h <xliff:g id="MINUTES">%3$d</xliff:g>m"</string>
     <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g>h <xliff:g id="MINUTES">%2$d</xliff:g>m"</string>
     <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g>m"</string>
@@ -1498,7 +1507,7 @@
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"ပိတ်"</string>
     <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"ဤအစီအစဉ်ကို စလိုက်လျှင် သင်သည် နားလည်ရန်လွယ်ကူအောင် အထောက်ကူပြုသည့် အစီအစဉ်များကို အဆင့် ၂ဆင့်ဖြင့် လျှင်မြန်စွာ ဖွင့်နိုင်သည်။ \n\nအဆင့် (၁)၊ အဖွင့်ပိတ်ခလုတ်ကို နှိပ်ပြီး အသံတခု ကြားရသည်အထိ သို့ တုန်ခါသည်အထိဖိထားပါ။\n\nအဆင့် (၂)၊ အသံဖြင့် ထောက်ခံချက်ကြားသည်အထိ လက်နှစ်ချောင်းဖြင့် တို့ထိ၍ ဖိထားပါ။ \n\n အကယ်၍ စက်၌ သုံးစွဲသူအများအပြားရှိပါက စက်ပစ္စည်းသော့ဖွင့်သည်အထိ ဤ အတိုကောက်ကို သော့ချထားသော မျက်နှာပြင်ပေါ် သုံး၍ နားလည်ရန်လွယ်ကူအောင် အထောက်အကူပြုမှုကို ယာယီဖွင့်နိုင်သည်။"</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"စာလုံးအကြီးစား"</string>
-    <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="2567402942683463779">"အရောင်ခြားနားချက်မြင့် စာသား"</string>
+    <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="2567402942683463779">"အရောင်ခြားနားချက်မြင့် စာသား"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"မျက်နှာပြင်ချဲ့မှု"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"မျက်နှာပြင်ချဲ့မှု အော်တိုမြှင့်ရန်"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"appအကူးပြောင်းတွင်မျက်နှာပြင်ချဲ့မှုအဆင့်မြှင့်ရန်"</string>
@@ -1520,7 +1529,7 @@
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"ဆက်တင်များ"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"ပွင့်"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"ပိတ်"</string>
-    <string name="accessibility_feature_or_input_method_not_allowed" msgid="5950315477009501647">"သင်၏ အဖွဲ့အစည်းမှ ခွင့်မပြုပါ"</string>
+    <string name="accessibility_feature_or_input_method_not_allowed" msgid="5950315477009501647">"သင်၏ အဖွဲ့အစည်းမှ ခွင့်မပြုပါ"</string>
     <string name="captioning_preview_title" msgid="1234015253497016890">"အစမ်းကြည့်ရှုရန်"</string>
     <string name="captioning_standard_options_title" msgid="3284211791180335844">"ပုံမှန်ရွေးချယ်စရာများ"</string>
     <string name="captioning_locale" msgid="4559155661018823503">"ဘာသာစကား"</string>
@@ -1539,6 +1548,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"စာတန်းများကို ဤသို့ မြင်ရမည်"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"မူရင်းအတိုင်း"</string>
+    <string name="color_title" msgid="4258931051732243983">"အရောင်"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"ပုံသေ"</string>
     <string name="color_none" msgid="3475640044925814795">"တစ်ခုမှမဟုတ်ပါ"</string>
     <string name="color_white" msgid="8045195170201590239">"အဖြူ"</string>
@@ -1552,23 +1562,23 @@
     <string name="color_magenta" msgid="5059212823607815549">"ပန်းခရမ်း"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g>ကိုသုံးမည်လား?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> လိုအပ်သည်မှာ :"</string>
-    <string name="enable_service_encryption_warning" msgid="3064686622453974606">"သင် ဖွင့်လိုက်လျှင် <xliff:g id="SERVICE">%1$s</xliff:g>၊ သင့်ကိရိယာက သင်၏ မျက်နှာပြင် သော့ပိတ်မှုကို ဒေတာ လျှို့ဝှက်ကုဒ်သွင်းမှု မြှင့်တင်ရန် သုံးမည် မဟုတ်ပါ။"</string>
-    <string name="secure_lock_encryption_warning" msgid="464101518421886337">"သင်က ရယူသုံးစွဲရန် ဝန်ဆောင်မှုကို ဖွင့်ထား၍ ၊ သင့်ကိရိယာက သင်၏ မျက်နှာပြင် သော့ပိတ်မှုကို ဒေတာ လျှို့ဝှက်ကုဒ်သွင်းမှု မြှင့်တင်ရန် သုံးမည် မဟုတ်ပါ။"</string>
-    <string name="enable_service_pattern_reason" msgid="777577618063306751">"<xliff:g id="SERVICE">%1$s</xliff:g>အား ဖွင့်ခြင်းသည် ဒေတာများ လျှို့ဝှက်ကုဒ်အသွင်​​ပြောင်းခြင်းအား အကျိုးသက်ရောက်စေသော​ကြောင့်၊ သင့် ရေးဆွဲပုံစံဖြင့် အတည်ပြုရန် လိုသည်။"</string>
-    <string name="enable_service_pin_reason" msgid="7882035264853248228">"<xliff:g id="SERVICE">%1$s</xliff:g>အား ဖွင့်ခြင်းသည် ဒေတာများ လျှို့ဝှက်ကုဒ်အသွင်​​ပြောင်းခြင်းအား အကျိုးသက်ရောက်စေသော​ကြောင့်၊ သင့် PIN ဖြင့် အတည်ပြုရန် လိုသည်။"</string>
-    <string name="enable_service_password_reason" msgid="1224075277603097951">"<xliff:g id="SERVICE">%1$s</xliff:g>အား ဖွင့်ခြင်းသည် ဒေတာများ လျှို့ဝှက်ကုဒ်အသွင်​​ပြောင်းခြင်းအား အကျိုးသက်ရောက်စေသော​ကြောင့်၊ သင့် လျှို့ဝှက်ကုဒ်ဖြင့် အတည်ပြုရန် လိုသည်။"</string>
+    <string name="enable_service_encryption_warning" msgid="3064686622453974606">"သင် ဖွင့်လိုက်လျှင် <xliff:g id="SERVICE">%1$s</xliff:g>၊ သင့်ကိရိယာက သင်၏ မျက်နှာပြင် သော့ပိတ်မှုကို ဒေတာ လျှို့ဝှက်ကုဒ်သွင်းမှု မြှင့်တင်ရန် သုံးမည် မဟုတ်ပါ။"</string>
+    <string name="secure_lock_encryption_warning" msgid="464101518421886337">"သင်က ရယူသုံးစွဲရန် ဝန်ဆောင်မှုကို ဖွင့်ထား၍ ၊ သင့်ကိရိယာက သင်၏ မျက်နှာပြင် သော့ပိတ်မှုကို ဒေတာ လျှို့ဝှက်ကုဒ်သွင်းမှု မြှင့်တင်ရန် သုံးမည် မဟုတ်ပါ။"</string>
+    <string name="enable_service_pattern_reason" msgid="777577618063306751">"<xliff:g id="SERVICE">%1$s</xliff:g>အား ဖွင့်ခြင်းသည် ဒေတာများ လျှို့ဝှက်ကုဒ်အသွင်​​ပြောင်းခြင်းအား အကျိုးသက်ရောက်စေသော​ကြောင့်၊ သင့် ရေးဆွဲပုံစံဖြင့် အတည်ပြုရန် လိုသည်။"</string>
+    <string name="enable_service_pin_reason" msgid="7882035264853248228">"<xliff:g id="SERVICE">%1$s</xliff:g>အား ဖွင့်ခြင်းသည် ဒေတာများ လျှို့ဝှက်ကုဒ်အသွင်​​ပြောင်းခြင်းအား အကျိုးသက်ရောက်စေသော​ကြောင့်၊ သင့် PIN ဖြင့် အတည်ပြုရန် လိုသည်။"</string>
+    <string name="enable_service_password_reason" msgid="1224075277603097951">"<xliff:g id="SERVICE">%1$s</xliff:g>အား ဖွင့်ခြင်းသည် ဒေတာများ လျှို့ဝှက်ကုဒ်အသွင်​​ပြောင်းခြင်းအား အကျိုးသက်ရောက်စေသော​ကြောင့်၊ သင့် လျှို့ဝှက်ကုဒ်ဖြင့် အတည်ပြုရန် လိုသည်။"</string>
     <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"သင့်လှုပ်ရှားမှုများကို စောင့်ကြည့်လေ့လာရန်"</string>
-    <string name="capability_desc_receiveAccessibilityEvents" msgid="2095111008854376237">"အပလီကေးရှင်းတစ်ခုနှင့် သင်နှင့်အပြန်အလှန် ဆက်သွယ်နေချိန် အကြောင်းကြားချက်များကို လက်ခံရန်။"</string>
+    <string name="capability_desc_receiveAccessibilityEvents" msgid="2095111008854376237">"အပလီကေးရှင်းတစ်ခုနှင့် သင်နှင့်အပြန်အလှန် ဆက်သွယ်နေချိန် အကြောင်းကြားချက်များကို လက်ခံရန်။"</string>
     <string name="disable_service_title" msgid="3624005212728512896">"<xliff:g id="SERVICE">%1$s</xliff:g> ကိုရပ်မည်လား?"</string>
     <string name="disable_service_message" msgid="2012273739481042318">"သဘောတူပါသည် ကို တို့ထိခြင်းဖြင့် <xliff:g id="SERVICE">%1$s</xliff:g> ကိုရပ်စေသည်။"</string>
-    <string name="accessibility_no_services_installed" msgid="7200948194639038807">"မည်သည့်ဆားဗစ်မှမရှိပါ"</string>
-    <string name="accessibility_service_default_description" msgid="1072730037861494125">"မည်သည့်အကြောင်းအရာမှမရှိပါ"</string>
+    <string name="accessibility_no_services_installed" msgid="7200948194639038807">"မည်သည့်ဆားဗစ်မှမရှိပါ"</string>
+    <string name="accessibility_service_default_description" msgid="1072730037861494125">"မည်သည့်အကြောင်းအရာမှမရှိပါ"</string>
     <string name="settings_button" msgid="3006713718908152930">"ဆက်တင်များ"</string>
-    <string name="print_settings" msgid="4742428530112487843">"ပရင့်ထုတ်‌ခြင်း"</string>
-    <string name="print_settings_title" msgid="3685449667822217816">"ပရင့်ထုတ် ဆားဗစ်များ"</string>
+    <string name="print_settings" msgid="4742428530112487843">"ပရင့်ထုတ်‌ခြင်း"</string>
+    <string name="print_settings_title" msgid="3685449667822217816">"ပရင့်ထုတ် ဆားဗစ်များ"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"<xliff:g id="SERVICE">%1$s</xliff:g> ကိုအသုံးပြုမည်လား ?"</string>
     <string name="print_service_security_warning_summary" msgid="7567131958613064363">"သင့် စာရွက်စာတမ်းများသည် စာထုတ်စက်သို့ သွားရာတွင် တစ်ခုသို့ ထို့ထက်ပိုသော ဆာဗာများကို ဖြတ်သန်းရမည်။"</string>
-    <string name="print_no_services_installed" msgid="8443039625463872294">"မည်သည့်ဆားဗစ်မှမရှိပါ"</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"မည်သည့်ဆားဗစ်မှမရှိပါ"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"စာထုတ်စက် တစ်ခုမှ မတွေ့ရှိပါ"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"ဆက်တင်များ"</string>
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"ပရင်တာများထည့်ရန်"</string>
@@ -1596,29 +1606,28 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"<xliff:g id="REMAIN">%1$s</xliff:g> ကျန်ရှိနေ"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> အားသွင်းမည်"</string>
-    <string name="power_discharging_duration" msgid="7125493014448497620">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> နီးပါး ကျန်နေ"</string>
-    <string name="power_charging" msgid="712751285832976915">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="STATE">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration" msgid="4802183864773082009">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> ပြည့်ရန် အထိ"</string>
-    <string name="power_charging_duration_ac" msgid="3611179931297824699">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> လျှပ်စစ်အားဖြင့် ပြည့်ရန် အထိ"</string>
-    <string name="power_charging_duration_usb" msgid="1106605348913397583">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> USB ဖြင့် ပြည့်ရန် အထိ"</string>
-    <string name="power_charging_duration_wireless" msgid="633606920144617227">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> ကြိုးမဲ့ဖြင့် ပြည့်ရန် အထိ"</string>
-    <string name="power_usage_list_summary" msgid="2409288197839512482">"နောက်ဆုံး အားအပြည့် သွင်းမည့် အထိ သုံး"</string>
+    <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> - ခန့်မှန်းခြေ။ <xliff:g id="TIME">%2$s</xliff:g> ကျန်ရှိနေ"</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> အပြည့်အထိ"</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> လျှပ်စစ်ဖြင့် အပြည့်အထိ"</string>
+    <string name="power_charging_duration_usb" msgid="182405645340976546">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> USB ဖြင့် အပြည့်အထိ"</string>
+    <string name="power_charging_duration_wireless" msgid="1829295708243159464">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> ကြိုးမဲ့ဖြင့် အပြည့်အထိ"</string>
+    <string name="power_usage_list_summary" msgid="2409288197839512482">"နောက်ဆုံး အားအပြည့် သွင်းမည့် အထိ သုံး"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"အားသွင်းကြိုးဖြုတ်စဉ်မှဘတ္တရီအသုံးပြုနှုန်း"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"ပြန်လည်အစမှလုပ်စဉ်မှ ဘက်ထရီအသုံးပြုမှု"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g>ကြာ ဘက်ထရီအသုံးပြုထားသည်"</string>
     <string name="battery_stats_duration" msgid="7464501326709469282">"အားသွင်းကြိုးဖြုတ်စဉ်မှ <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="battery_stats_charging_label" msgid="4223311142875178785">"အားသွင်းနေပါသည်"</string>
-    <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"စကရင်ဖွင့်သည်"</string>
-    <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPSဖွင့်ထားသည်"</string>
+    <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"စကရင်ဖွင့်သည်"</string>
+    <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPSဖွင့်ထားသည်"</string>
     <string name="battery_stats_wifi_running_label" msgid="1845839195549226252">"ဝိုင်ဖိုင်"</string>
-    <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"ဖွင့်ထားနေစေရန်"</string>
-    <string name="battery_stats_phone_signal_label" msgid="3537569115723850618">"ဆယ်လူလာ ကွန်ရက် ထုတ်လွှင့်မှု အချက်ပြ"</string>
+    <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"ဖွင့်ထားနေစေရန်"</string>
+    <string name="battery_stats_phone_signal_label" msgid="3537569115723850618">"ဆယ်လူလာ ကွန်ရက် ထုတ်လွှင့်မှု အချက်ပြ"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
-    <string name="awake" msgid="387122265874485088">"စက်အား ဖွင့်မည့်အချိန်"</string>
+    <string name="awake" msgid="387122265874485088">"စက်အား ဖွင့်မည့်အချိန်"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"အချိန်ကိုက်ဝိုင်ဖိုင်"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"အချိန်ကိုက်ဝိုင်ဖိုင်"</string>
-    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"ရာဇဝင်အသေးစိတ်များ"</string>
     <string name="details_title" msgid="3792801565213935385">"အသေးစိတ်ကို အသုံးပြုမှု"</string>
     <string name="details_subtitle" msgid="32593908269911734">"အသေးစိတ် အသုံးပြုခြင်း"</string>
@@ -1628,10 +1637,10 @@
     <string name="power_flashlight" msgid="7794409781003567614">"ဖလက်ရှမီး"</string>
     <string name="power_wifi" msgid="1135085252964054957">"ဝိုင်ဖိုင်"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"ဘလူးတုသ်"</string>
-    <string name="power_cell" msgid="6596471490976003056">"ဖုန်းအရန်သင့်အခြေအနေ"</string>
-    <string name="power_phone" msgid="5392641106474567277">"အသံဖြင့်ခေါ်ဆိုမှုများ"</string>
-    <string name="power_idle" product="tablet" msgid="4612478572401640759">"တက်ဘလက်အားမသုံးသည့်အခါ"</string>
-    <string name="power_idle" product="default" msgid="9055659695602194990">"ဖုန်းအားမသုံးသည့်အခါ"</string>
+    <string name="power_cell" msgid="6596471490976003056">"ဖုန်းအရန်သင့်အခြေအနေ"</string>
+    <string name="power_phone" msgid="5392641106474567277">"အသံဖြင့်ခေါ်ဆိုမှုများ"</string>
+    <string name="power_idle" product="tablet" msgid="4612478572401640759">"တက်ဘလက်အားမသုံးသည့်အခါ"</string>
+    <string name="power_idle" product="default" msgid="9055659695602194990">"ဖုန်းအားမသုံးသည့်အခါ"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"အထွေထွေ အကြောင်းအရာများ"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"အပိုရေတွက်မှု"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"စုစုပေါင်းCPU"</string>
@@ -1647,38 +1656,38 @@
     <string name="usage_type_data_wifi_send" msgid="1847552143597396162">"ပို့ထားသော ဝိုင်ဖိုင်အစုအဖွဲ့များ"</string>
     <string name="usage_type_data_wifi_recv" msgid="5678475911549183829">"လက်ခံထားသော ဝိုင်ဖိုင်အစုအဖွဲ့များ"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"အသံ"</string>
-    <string name="usage_type_video" msgid="4295357792078579944">"ဗီ​ဒီ​ယို"</string>
-    <string name="usage_type_on_time" msgid="3351200096173733159">"အသုံးပြုသည့်အချိန်"</string>
-    <string name="usage_type_no_coverage" msgid="3797004252954385053">"ထုတ်လွင့်မှုမရရှိသော အချိန်"</string>
+    <string name="usage_type_video" msgid="4295357792078579944">"ဗီ​ဒီ​ယို​"</string>
+    <string name="usage_type_on_time" msgid="3351200096173733159">"အသုံးပြုသည့်အချိန်"</string>
+    <string name="usage_type_no_coverage" msgid="3797004252954385053">"ထုတ်လွင့်မှုမရရှိသော အချိန်"</string>
     <string name="usage_type_total_battery_capacity" msgid="3798285287848675346">"စုစုပေါင်းဘက်ထရီစွမ်းရည်"</string>
-    <string name="usage_type_computed_power" msgid="5862792259009981479">"တွက်ချက်ထားသည့် ပါဝါ သုံးစွဲမှု"</string>
-    <string name="usage_type_actual_power" msgid="7047814738685578335">"တွေ့မြင်ရသည့် ပါဝါ သုံးစွဲမှု"</string>
+    <string name="usage_type_computed_power" msgid="5862792259009981479">"တွက်ချက်ထားသည့် ပါဝါ သုံးစွဲမှု"</string>
+    <string name="usage_type_actual_power" msgid="7047814738685578335">"တွေ့မြင်ရသည့် ပါဝါ သုံးစွဲမှု"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"မဖြစ်မနေ ရပ်ခိုင်းခြင်း"</string>
     <string name="battery_action_app_details" msgid="7861051816778419018">"အက်ပ်အချက်အလက်များ"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"အပလီကေးရှင်းဆက်တင်များ"</string>
     <string name="battery_action_display" msgid="7338551244519110831">"မျက်နှာပြင်ဆက်တင်များ"</string>
     <string name="battery_action_wifi" msgid="8181553479021841207">"ဝိုင်ဖိုင်ဆက်တင်များ"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"ဘလူးတူးသ်အပြင်အဆင်များ"</string>
-    <string name="battery_desc_voice" msgid="8980322055722959211">"အသံဖြင့်ခေါ်ဆိုမှုများမှ အသုံးပြုသောဘက်ထရီ"</string>
+    <string name="battery_desc_voice" msgid="8980322055722959211">"အသံဖြင့်ခေါ်ဆိုမှုများမှ အသုံးပြုသောဘက်ထရီ"</string>
     <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"တက်ဘလက်မှာ မလှုပ်မရှားသောအခါတွင် ဘက်ထရီကို အသုံးပြုမည်"</string>
     <string name="battery_desc_standby" product="default" msgid="3009080001948091424">"ဖုန်းမှာ မလှုပ်မရှားသောအခါတွင် ဘက်ထရီကို အသုံးပြုမည်"</string>
     <string name="battery_desc_radio" msgid="5479196477223185367">"ဖုန်းရေဒီယိုမှအသုံးပြုသောဘက်ထရီ"</string>
-    <string name="battery_sugg_radio" msgid="8211336978326295047">"မိုဘိုင်းအသုံးပြုစက်ကွင်းမရှိသည့်နေရာများတွင် အားမကုန်စေရန် လေယဥ်ပျံပေါ်သုံးစနစ်ကို ပြောင်းစေမည်"</string>
+    <string name="battery_sugg_radio" msgid="8211336978326295047">"မိုဘိုင်းအသုံးပြုစက်ကွင်းမရှိသည့်နေရာများတွင် အားမကုန်စေရန် လေယဥ်ပျံပေါ်သုံးစနစ်ကို ပြောင်းစေမည်"</string>
     <string name="battery_desc_flashlight" msgid="2908579430841025494">"ဖလက်ရှမီးမှ အသုံးပြုသော ဘက်ထရီ"</string>
-    <string name="battery_desc_display" msgid="5432795282958076557">"မျက်နှာပြင်နှင့် နောက်ခံအလင်းမှ အသုံးပြုသောဘက်ထရီ"</string>
-    <string name="battery_sugg_display" msgid="3370202402045141760">"မျက်နှာပြင်အလင်းနှင့်/သို့မဟုတ် အမှောင်ချရန်အချိန်အား လျော့စေရန်"</string>
+    <string name="battery_desc_display" msgid="5432795282958076557">"မျက်နှာပြင်နှင့် နောက်ခံအလင်းမှ အသုံးပြုသောဘက်ထရီ"</string>
+    <string name="battery_sugg_display" msgid="3370202402045141760">"မျက်နှာပြင်အလင်းနှင့်/သို့မဟုတ် အမှောင်ချရန်အချိန်အား လျော့စေရန်"</string>
     <string name="battery_desc_wifi" msgid="2375567464707394131">"ဝိုင်ဖိုင်မှ ဘက်ထရီအသုံးပြုမှု"</string>
     <string name="battery_sugg_wifi" msgid="3355461362094706957">"ဝိုင်ဖိုင်ကို အသုံးမပြုချိန် သို့မဟုတ် ကွန်ယက်မရှိချိန်တွေမှာ ပိတ်ထားပါ။"</string>
     <string name="battery_desc_bluetooth" msgid="8069070756186680367">"ဘလူးတူးသ်မှအသုံးပြုသောဘက်ထရီ"</string>
-    <string name="battery_sugg_bluetooth_basic" msgid="1942935021750897422">"အသုံးမပြုသည့်အခါတွင် ဘလူးတုသ်ကိုပိတ်ထားပါ။"</string>
+    <string name="battery_sugg_bluetooth_basic" msgid="1942935021750897422">"အသုံးမပြုသည့်အခါတွင် ဘလူးတုသ်ကိုပိတ်ထားပါ။"</string>
     <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"မတူသော တခြားဘလူးတုသ်စက်ကိုချိတ်ဆက်ရန်ကြိုးစားပါ။"</string>
     <string name="battery_desc_apps" msgid="8530418792605735226">"အပ်ပလီကေးရှင်းမှအသုံးပြုသောဘက်ထရီ"</string>
     <string name="battery_sugg_apps_info" msgid="6907588126789841231">"အပ်ပလီကေးရှင်းကို ရပ်သည် သို့မဟုတ် ထုတ်သည်"</string>
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"ဘက်ထရီအသုံးပြုမှု ချွေတာသောစနစ်"</string>
-    <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"အပ်ပလီကေးရှင်းမှာ ဘက်ထရီအသုံးပြုမှုလျော့စေနိုင်သည့်ဆက်တင်ကို ကမ်းလှမ်းပါလိမ့်မည်။"</string>
+    <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"အပ်ပလီကေးရှင်းမှာ ဘက်ထရီအသုံးပြုမှုလျော့စေနိုင်သည့်ဆက်တင်ကို ကမ်းလှမ်းပါလိမ့်မည်။"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"သုံးစွဲသူမှ ဘက်ထရီအသုံးပြုမှု"</string>
     <string name="battery_desc_unaccounted" msgid="7404256448541818019">"အမျိုးမျိုးသော ပါဝါ သုံးမျု"</string>
-    <string name="battery_msg_unaccounted" msgid="1963583522633067961">"ဘက်ထရီ သုံးစွဲမှုမှာ ပါဝါ အသုံးပြုမှုကို ခန့်မှန်းမှု တစ်ခုသာ ဖြစ်ပြိး ဘက်ထရီ အားကုန်ရခြင်း ရင်းမြစ်တိုင်းကို ထည့်မတွက်ပါ။ အမျိုမျိုးသုံးမှုမှာ တွက်ချက်ထားသည့် ခန့်မှန်းခြေ ပါဝါ သုံးစွဲမှု နှင့် ဘက်ထရီ ထဲမှာ တွေ့မြင်ရသည့် လက်တွေ့ အားကုန်မှုတို့၏ ခြားနားချက် ဖြစ်သည်။"</string>
+    <string name="battery_msg_unaccounted" msgid="1963583522633067961">"ဘက်ထရီ သုံးစွဲမှုမှာ ပါဝါ အသုံးပြုမှုကို ခန့်မှန်းမှု တစ်ခုသာ ဖြစ်ပြိး ဘက်ထရီ အားကုန်ရခြင်း ရင်းမြစ်တိုင်းကို ထည့်မတွက်ပါ။ အမျိုမျိုးသုံးမှုမှာ တွက်ချက်ထားသည့် ခန့်မှန်းခြေ ပါဝါ သုံးစွဲမှု နှင့် ဘက်ထရီ ထဲမှာ တွေ့မြင်ရသည့် လက်တွေ့ အားကုန်မှုတို့၏ ခြားနားချက် ဖြစ်သည်။"</string>
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"အပိုရေတွက်မှု စွမ်းရည် အသုံးပြုမှု"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> အားသွင်းကြိုးဖြုတ်စဥ်မှ"</string>
@@ -1688,9 +1697,9 @@
     <string name="process_kernel_label" msgid="3916858646836739323">"Android စနစ်"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"မီဒီယာဆာဗာ"</string>
     <string name="battery_saver" msgid="1426682272004907982">"ဘက်ထရီ ချွေတာသူ"</string>
-    <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"အလိုအလျောက် ဖွင့်ရန်"</string>
-    <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"မည်သည့်အခါမှ"</string>
-    <string name="battery_saver_turn_on_automatically_pct" msgid="3033681629861428940">"ဘက်ထရီ %1$d%% မှာ"</string>
+    <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"အလိုအလျောက် ဖွင့်ရန်"</string>
+    <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"မည်သည့်အခါမှ"</string>
+    <string name="battery_saver_turn_on_automatically_pct" msgid="7536784431655058267">"ဘက်ထရီ %1$s မှာ"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"လုပ်ငန်းစဉ်ကိန်းဂဏန်းများ"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"အလုပ်လုပ်ခြင်းလုပ်ငန်းစဉ်များအကြောင်း ပညာရှင်အဆင့်စာရင်း"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"မှတ်ဉာဏ်သုံးခြင်း"</string>
@@ -1723,42 +1732,42 @@
     <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"နောက်ခံ"</string>
     <string name="menu_proc_stats_type_foreground" msgid="2286182659954958586">"အနီးမြင်ကွင်း"</string>
     <string name="menu_proc_stats_type_cached" msgid="5084272779786820693">"မှတ်သားထားသော"</string>
-    <string name="voice_input_output_settings" msgid="1336135218350444783">"အသံ ထည့်သွင်းခြင်းနှင့် ထုတ်လွှင့်ခြင်း"</string>
-    <string name="voice_input_output_settings_title" msgid="2442850635048676991">"အသံ ထည့်သွင်းခြင်းနှင့် ထုတ်လွှင့်ခြင်းဆက်တင်များ"</string>
+    <string name="voice_input_output_settings" msgid="1336135218350444783">"အသံ ထည့်သွင်းခြင်းနှင့် ထုတ်လွှင့်ခြင်း"</string>
+    <string name="voice_input_output_settings_title" msgid="2442850635048676991">"အသံ ထည့်သွင်းခြင်းနှင့် ထုတ်လွှင့်ခြင်းဆက်တင်များ"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"အသံဖြင့် ရှာဖွေခြင်း"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Androidလက်ကွက်"</string>
     <string name="voice_category" msgid="1430370497125803904">"စကားပြော"</string>
-    <string name="voice_input_settings" msgid="1099937800539324567">"အသံဖြင့် ထည့်သွင်းရေး ဆက်တင်များ"</string>
+    <string name="voice_input_settings" msgid="1099937800539324567">"အသံဖြင့် ထည့်သွင်းရေး ဆက်တင်များ"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"အသံဖြင့် စာရိုက်ထည့်ခြင်း"</string>
-    <string name="voice_service_preference_section_title" msgid="3778706644257601021">"အသံဖြင့် ထည့်သွင်းရေး ဝန်ဆောင်မှုများ"</string>
-    <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"စကားလုံးတို နှင့် ပြန်လှန်တုံ့ပြန်မှု အပြည့်"</string>
+    <string name="voice_service_preference_section_title" msgid="3778706644257601021">"အသံဖြင့် ထည့်သွင်းရေး ဝန်ဆောင်မှုများ"</string>
+    <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"စကားလုံးတို နှင့် ပြန်လှန်တုံ့ပြန်မှု အပြည့်"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"ရိုးရိုး စကားမှ စာသားသို့"</string>
-    <string name="voice_interaction_security_warning" msgid="6378608263983737325">"ဒီအသံဖြင့် ရိုက်သွင်းရေး ဝန်ဆောင်မှုက သင့်ကိုယ်စား အမြဲတမ်း အသံကို စောင့်ကြပ်ပေးလျက် အသံကို ဖွင့်ပေးထားသည့် အပလီကေးရှင်းများကို ထိန်းချုပ်ပေးသည်။ ၎င်းကို <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g> အပလီကေးရှင်းက ဆောင်ရွက်ပေးသည်။ ဒီဝန်ဆောင်မှု သုံးရန်ကို ဖွင့်ပေးရမလား?"</string>
+    <string name="voice_interaction_security_warning" msgid="6378608263983737325">"ဒီအသံဖြင့် ရိုက်သွင်းရေး ဝန်ဆောင်မှုက သင့်ကိုယ်စား အမြဲတမ်း အသံကို စောင့်ကြပ်ပေးလျက် အသံကို ဖွင့်ပေးထားသည့် အပလီကေးရှင်းများကို ထိန်းချုပ်ပေးသည်။ ၎င်းကို <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g> အပလီကေးရှင်းက ဆောင်ရွက်ပေးသည်။ ဒီဝန်ဆောင်မှု သုံးရန်ကို ဖွင့်ပေးရမလား?"</string>
     <string name="tts_settings" msgid="8186971894801348327">"စာသားမှစကားပြောပြောင်း ဆက်တင်များ"</string>
     <string name="tts_settings_title" msgid="1237820681016639683">"စာသားမှ အသံထွက်စေခြင်း"</string>
     <string name="use_default_tts_settings_title" msgid="1577063839539732930">"ကျွန်ုပ်၏အပြင်အဆင်များကို အမြဲသုံးရန်"</string>
     <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"အောက်ပါမူရင်းဆက်တင်များမှာ အပလီကေးရှင်းဆက်တင်များကို ပယ်ဖျက်မည်"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"မူရင်းအပြင်အဆင်များ"</string>
     <string name="tts_default_synth_title" msgid="4755558388333117572">"မူရင်းအင်ဂျင်"</string>
-    <string name="tts_default_synth_summary" msgid="6482936537135251690">"ပြောဆိုမည့်စာသားအတွက် အသုံးပြုမည့် စကားသံပေါင်းစပ်အင်ဂျင်အား သတ်မှတ်မည်။"</string>
+    <string name="tts_default_synth_summary" msgid="6482936537135251690">"ပြောဆိုမည့်စာသားအတွက် အသုံးပြုမည့် စကားသံပေါင်းစပ်အင်ဂျင်အား သတ်မှတ်မည်။"</string>
     <string name="tts_default_rate_title" msgid="6030550998379310088">"စကားပြောနှုန်း"</string>
     <string name="tts_default_rate_summary" msgid="4061815292287182801">"စာတမ်းအားပြောဆိုသော အမြန်နှုန်း"</string>
-    <string name="tts_default_pitch_title" msgid="6135942113172488671">"အသံအနိမ့်အမြင့်"</string>
-    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"ပြောဆိုမည့်စာသား အသံနေအသံထားအား အကျိုးသက်ရောက်မည်။"</string>
+    <string name="tts_default_pitch_title" msgid="6135942113172488671">"အသံအနိမ့်အမြင့်"</string>
+    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"ပြောဆိုမည့်စာသား အသံနေအသံထားအား အကျိုးသက်ရောက်မည်။"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"ဘာသာစကား"</string>
     <string name="tts_lang_use_system" msgid="2679252467416513208">"စနစ်၏ ဘာသာစကားကို အသုံးပြုရန်"</string>
     <string name="tts_lang_not_selected" msgid="7395787019276734765">"ဘာသာစကား မရွေးချယ်ထားပါ။"</string>
-    <string name="tts_default_lang_summary" msgid="5219362163902707785">"ဘာသာစကားကိုသတ်မှတ်မည်။ ပြောဆိုမည့်စာသားအတွက် သီးခြားအသံ"</string>
+    <string name="tts_default_lang_summary" msgid="5219362163902707785">"ဘာသာစကားကိုသတ်မှတ်မည်။ ပြောဆိုမည့်စာသားအတွက် သီးခြားအသံ"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"နမူနာကို နားထောင်မည်"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"အသံပေါင်းစပ်ခြင်းအတွက် တိုတောင်းသောသရုပ်ပြမှုကို ပြခြင်း"</string>
-    <string name="tts_install_data_title" msgid="4264378440508149986">"အသံဒေတာများကို ထည့်သွင်းခြင်း"</string>
+    <string name="tts_install_data_title" msgid="4264378440508149986">"အသံဒေတာများကို ထည့်သွင်းခြင်း"</string>
     <string name="tts_install_data_summary" msgid="5742135732511822589">"စကားသံပေါင်းစပ်မှုအတွက်လိုအပ်သောအသံဒေတာအား ထည့်သွင်းမည်"</string>
-    <string name="tts_data_installed_summary" msgid="9162111552859972809">"အသံပေါင်းစပ်ခြင်းအတွက်လိုအပ်သော အသံများကို သေချာစွာထည့်သွင်းပြီးပါပြီ"</string>
-    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"သင့်ဆက်တင်မှာ ပြောင်းသွားပါပြီ။ ဤသည်မှာ မည်ကဲ့သို့အသံထွက်သော နမူနာဖြစ်သည်။"</string>
+    <string name="tts_data_installed_summary" msgid="9162111552859972809">"အသံပေါင်းစပ်ခြင်းအတွက်လိုအပ်သော အသံများကို သေချာစွာထည့်သွင်းပြီးပါပြီ"</string>
+    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"သင့်ဆက်တင်မှာ ပြောင်းသွားပါပြီ။ ဤသည်မှာ မည်ကဲ့သို့အသံထွက်သော နမူနာဖြစ်သည်။"</string>
     <string name="tts_engine_error" msgid="3305141107104670703">"သင်ရွေးချယ်ထားသော အင်ဂျင်သည် အလုပ်မလုပ်နိုင်ပါ"</string>
     <string name="tts_engine_error_config" msgid="5820525416624637313">"ပုံပေါ်စေသည်"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"နောက်ထပ်အင်ဂျင်တခုအား ရွေးချယ်ပါ"</string>
-    <string name="tts_engine_security_warning" msgid="8786238102020223650">"ဤစကားသံပေါင်းစပ်အင်ဂျင်အားအသုံးပြုရာရာတွင် သင့်ကိုယ်ရေးအချက်အလက်များဖြစ်သော စကားဝှက်များနှင့် ကရက်ဒစ်ကဒ်နံပါတ်စသည်တို့အပါအဝင် သင်ပြောဆိုသောစာသားများအားလုံးကို ရယူသွားမည်ဖြစ်သည်။ <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>အင်ဂျင်မှ လာပါသည်။ ဤစကားသံပေါင်းစပ်အင်ဂျင်ကို အသုံးပြုမည်လား?"</string>
+    <string name="tts_engine_security_warning" msgid="8786238102020223650">"ဤစကားသံပေါင်းစပ်အင်ဂျင်အားအသုံးပြုရာရာတွင် သင့်ကိုယ်ရေးအချက်အလက်များဖြစ်သော စကားဝှက်များနှင့် ကရက်ဒစ်ကဒ်နံပါတ်စသည်တို့အပါအဝင် သင်ပြောဆိုသောစာသားများအားလုံးကို ရယူသွားမည်ဖြစ်သည်။ <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>အင်ဂျင်မှ လာပါသည်။ ဤစကားသံပေါင်းစပ်အင်ဂျင်ကို အသုံးပြုမည်လား?"</string>
     <string name="tts_engine_network_required" msgid="1190837151485314743">"ဤဘာသာစကားသည် စာသားမှ အသံထွက်ရန် အလုပ်လုပ်သော ကွန်ရက်ချိတ်ဆက်မှု လိုအပ်သည်။"</string>
     <string name="tts_default_sample_string" msgid="4040835213373086322">"ဤသည်မှာ အသံတုလုပ်ခြင်း ၏ နမူနာတစ်ခုဖြစ်သည်။"</string>
     <string name="tts_status_title" msgid="7268566550242584413">"လက်ရှိဘာသာစကားအခြေအနေ"</string>
@@ -1772,19 +1781,19 @@
     <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>ကို မရနိုင်ပါ"</string>
     <string name="tts_engine_settings_section" msgid="2346105138448751893">"အင်ဂျင်ဆက်တင်များ"</string>
     <string name="tts_engine_settings_title" msgid="3499112142425680334">"<xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>အတွက် ဆက်တင်များ"</string>
-    <string name="pico_languages_and_voices" msgid="4611320375917773238">"ဘာသာစကားနှင့် အသံများ"</string>
-    <string name="pico_installed" msgid="2452546687858267414">"ထည့်သွင်းပြီး"</string>
+    <string name="pico_languages_and_voices" msgid="4611320375917773238">"ဘာသာစကားနှင့် အသံများ"</string>
+    <string name="pico_installed" msgid="2452546687858267414">"ထည့်သွင်းပြီး"</string>
     <string name="pico_not_installed" msgid="6266845418419994311">"မထည့်သွင်းထားပါ"</string>
     <string name="pico_voice_summary_female" msgid="8047327176247727492">"အမျိုးသမီး"</string>
     <string name="pico_voice_summary_male" msgid="8331266854058577610">"အမျိုးသား"</string>
-    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"စကားပြော နားလည်ရေးအင်ဂျင် ထည့်သွင်းပြီး"</string>
+    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"စကားပြော နားလည်ရေးအင်ဂျင် ထည့်သွင်းပြီး"</string>
     <string name="tts_notif_engine_install_message" msgid="7250804349781973329">"အသုံးမပြုမီ အင်ဂျင်အသစ်ကို ဖွင့်ပါ"</string>
-    <string name="tts_engine_settings_button" msgid="1030512042040722285">"အင်ဂျင်ဆက်တင်များကိုဖွင့်ခြင်း"</string>
+    <string name="tts_engine_settings_button" msgid="1030512042040722285">"အင်ဂျင်ဆက်တင်များကိုဖွင့်ခြင်း"</string>
     <string name="tts_engine_preference_section_title" msgid="448294500990971413">"ဦးစားပေးအင်ဂျင်"</string>
     <string name="tts_general_section_title" msgid="4402572014604490502">"ယေဘုယျ"</string>
-    <string name="gadget_title" msgid="5519037532720577836">"ဖွင့်ပိတ်ထိန်းချုပ်မှု"</string>
+    <string name="gadget_title" msgid="5519037532720577836">"ဖွင့်ပိတ်ထိန်းချုပ်မှု"</string>
     <string name="gadget_toggle_wifi" msgid="319262861956544493">"ဝိုင်ဖိုင်ဆက်တင်းများကို နောက်ဆုံးအခြေရောက်အောင်လုပ်သည်"</string>
-    <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"ဘလူးတုသ်ဆက်တင်ကို တိုးမြင့်မှု"</string>
+    <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"ဘလူးတုသ်ဆက်တင်ကို တိုးမြင့်မှု"</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">"ပွင့်"</string>
     <string name="gadget_state_off" msgid="5220212352953066317">"ပိတ်"</string>
@@ -1801,49 +1810,50 @@
     <string name="gadget_brightness_state_off" msgid="946382262872753084">"ပိတ်"</string>
     <string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
     <string name="credentials_title" msgid="4446234003860769883">"ယုံကြည်စိတ်ချရသောသိုလှောင်နေရာ"</string>
-    <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"သိုလှောင်နေရာမှ ထည့်သွင်းမှု"</string>
-    <string name="credentials_install" product="default" msgid="953914549998062317">"SDကဒ်မှ ထည့်သွင်းခြင်း"</string>
-    <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"သိုလှောင်နေရာမှ အသိအမှတ်ပြုလက်မှတ်များကို ထည့်သွင်းခြင်း"</string>
-    <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"SDကဒ်မှ အသိအမှတ်ပြုလက်မှတ်များကို ထည့်သွင်းမှု"</string>
+    <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"သိုလှောင်နေရာမှ ထည့်သွင်းမှု"</string>
+    <string name="credentials_install" product="default" msgid="953914549998062317">"SDကဒ်မှ ထည့်သွင်းခြင်း"</string>
+    <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"သိုလှောင်နေရာမှ အသိအမှတ်ပြုလက်မှတ်များကို ထည့်သွင်းခြင်း"</string>
+    <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"SDကဒ်မှ အသိအမှတ်ပြုလက်မှတ်များကို ထည့်သွင်းမှု"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"အထောက်အထားများကို ရှင်းလင်းမည်"</string>
     <string name="credentials_reset_summary" msgid="3369361230171260282">"အသိအမှတ်ပြုလက်မှတ်အားလုံးအား ဖယ်ရှားမည်လား?"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"ယုံကြည်ရသောအကောင့်များ"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"ယုံကြည်ရသောCAလက်မှတ်အား ပြသမည်"</string>
-    <string name="advanced_security_title" msgid="2434776238010578865">"အဆင့်မြင့်"</string>
+    <string name="advanced_security_title" msgid="2434776238010578865">"အဆင့်မြင့်"</string>
     <string name="credential_storage_type" msgid="8629968543494001364">"သိမ်းဆည်းရာအမျိုးအစား"</string>
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"နောက်ခံဟာ့ဒ်ဝဲ"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"ဆော့ဖ်ဝဲသပ်သပ်"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"ဒီအသုံးပြုသူ အတွက် စိတ်ချရ အချက်များ မရှိ"</string>
-    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"သင့်ရဲ့ သော့ဖွင့်သော ပုံစံကို ဆွဲပါ"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"ယုံကြည်စိတ်ချရသောသိုလှောင်ရာနေရာကို အတည်မပြုမီ သင်၏ သော့ဖွင့်သောပုံစံကို ဆွဲရန်လိုအပ်သည်။"</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
-    <string name="credentials_unlock_hint" msgid="2301301378040499348">"ယုံကြည်စိတ်ချရသောသိုလှောင်ရာနေရာ၏ စကားဝှက်ကို ထည့်ပါ"</string>
+    <string name="credentials_unlock_hint" msgid="2301301378040499348">"ယုံကြည်စိတ်ချရသောသိုလှောင်ရာနေရာ၏ စကားဝှက်ကို ထည့်ပါ"</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"လက်ရှိ စကားဝှက်"</string>
     <string name="credentials_reset_hint" msgid="6297256880896133631">"အကြောင်းအရာအားလုံးအား ဖယ်ရှားမည်လား?"</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"စကားဝှက်မှာ အနည်းဆုံးအက္ခရာ(၈)ခုရှိရမည်"</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"စကားဝှက် မမှန်ကန်ပါ။"</string>
-    <string name="credentials_reset_warning" msgid="5320653011511797600">"စကားဝှက်မမှန်ကန်ပါ။ ယုံကြည်စိတ်ချရသောသိုလှောင်ရာမှုနေရာမဖျက်ခင် (၁)ကြိမ်သာ အခွင့်အရေးရှိပါသည်။"</string>
-    <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"စကားဝှက်မမှန်ကန်ပါ။ ယုံကြည်စိတ်ချရသောသိုလှောင်ရာမှုနေရာမဖျက်ခင် <xliff:g id="NUMBER">%1$d</xliff:g>ကြိမ်သာ အခွင့်အရေးရှိပါသည်။"</string>
+    <string name="credentials_reset_warning" msgid="5320653011511797600">"စကားဝှက်မမှန်ကန်ပါ။ ယုံကြည်စိတ်ချရသောသိုလှောင်ရာမှုနေရာမဖျက်ခင် (၁)ကြိမ်သာ အခွင့်အရေးရှိပါသည်။"</string>
+    <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"စကားဝှက်မမှန်ကန်ပါ။ ယုံကြည်စိတ်ချရသောသိုလှောင်ရာမှုနေရာမဖျက်ခင် <xliff:g id="NUMBER">%1$d</xliff:g>ကြိမ်သာ အခွင့်အရေးရှိပါသည်။"</string>
     <string name="credentials_erased" msgid="2907836028586342969">"ယုံကြည်စိတ်ချရသောသိုလှောင်ရာနေရာအား ဖျက်ပါမည်"</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"သိုလှောင်ရာနေရာအား ဖျက်၍မရပါ"</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"အကောင့်သိုလှောင်ရာနေရာရှိသည်"</string>
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"ယုံကြည်စိတ်ချရသောသိုလှောင်ရာနေရာမသုံးခင် မျက်နှာပြင်ကို ပိတ်ရန် ပင်နံပါတ် သို့မဟုတ် စကားဝှက် သတ်မှတ်ပါ။"</string>
-    <string name="usage_access_title" msgid="332333405495457839">"သုံးစွဲမှုကို ရယူသုံးနိုင်ကြသည့် Appများ"</string>
-    <string name="allow_usage_access_title" msgid="2134237975190472249">"ရယူသုံးခွင့် ပြုမလား?"</string>
-    <string name="allow_usage_access_message" msgid="2295847177051307496">"သင် သုံးခွင့်ပြုပါက၊ သင့်စက်ကိရိယာပေါ်ရှိ app များကို သင်အကြိမ်မည်မျှအသုံးပြုကြောင်း အစရှိသည့် အထွေထွေအချက်အလက်များကို ဤapp က မြင်နိုင်သည်။"</string>
+    <string name="usage_access_title" msgid="332333405495457839">"သုံးစွဲမှုကို ရယူသုံးနိုင်ကြသည့် Appများ"</string>
+    <string name="allow_usage_access_title" msgid="2134237975190472249">"ရယူသုံးခွင့် ပြုမလား?"</string>
+    <string name="allow_usage_access_message" msgid="2295847177051307496">"သင် သုံးခွင့်ပြုပါက၊ သင့်စက်ကိရိယာပေါ်ရှိ app များကို သင်အကြိမ်မည်မျှအသုံးပြုကြောင်း အစရှိသည့် အထွေထွေအချက်အလက်များကို ဤapp က မြင်နိုင်သည်။"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"အရေးပေါ်ခေါ်ဆိုမှုအတွက် မြည်သံ"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"အရေးပေါ်ခေါ်ဆိုမှုအတွက် လုပ်ဆောင်ပုံကို သတ်မှတ်ရန်"</string>
-    <string name="privacy_settings" msgid="5446972770562918934">"အရန်သိမ်းခြင်းနှင့် ပြန်စခြင်း"</string>
-    <string name="privacy_settings_title" msgid="4856282165773594890">"အရန်သိမ်းခြင်းနှင့် ပြန်စခြင်း"</string>
-    <string name="backup_section_title" msgid="7952232291452882740">"အရန်ပြုလုပ်ခြင်းနှင့် ပြန်လည်ရယူခြင်း"</string>
+    <string name="privacy_settings" msgid="5446972770562918934">"အရန်သိမ်းခြင်းနှင့် ပြန်စခြင်း"</string>
+    <string name="privacy_settings_title" msgid="4856282165773594890">"အရန်သိမ်းခြင်းနှင့် ပြန်စခြင်း"</string>
+    <string name="backup_section_title" msgid="7952232291452882740">"အရန်ပြုလုပ်ခြင်းနှင့် ပြန်လည်ရယူခြင်း"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"ကိုယ်ရေးအချက်အလက်"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"ကျွန်ုပ်ဒေတာများကို အရန်ထားခြင်း"</string>
     <string name="backup_data_summary" msgid="708773323451655666">"အက်ပ်ဒေတာ၊ ဝိုင်ဖိုင်စကားဝှက်များနှင့် အခြားဆက်တင်များကို ဂူဂယ်လ်ဆာဗာများတွင် အရန်သိမ်းထားပါ"</string>
-    <string name="backup_configure_account_title" msgid="3790872965773196615">"အရန်သိမ်း အကောင့်"</string>
-    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"လက်ရှိ မည်သည့်အကောင့်မှ ဒေတာကို အရန်သိုလှောင်ခြင်းမပြုလုပ်နေပါ။"</string>
-    <string name="include_app_data_title" msgid="2829970132260278394">"app ဒေတာကို ထည့်သွင်းရန်"</string>
+    <string name="backup_configure_account_title" msgid="3790872965773196615">"အရန်သိမ်း အကောင့်"</string>
+    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"လက်ရှိ မည်သည့်အကောင့်မှ ဒေတာကို အရန်သိုလှောင်ခြင်းမပြုလုပ်နေပါ။"</string>
+    <string name="include_app_data_title" msgid="2829970132260278394">"app ဒေတာကို ထည့်သွင်းရန်"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"အလိုအလျောက် ပြန်လည်ရယူမည်"</string>
-    <string name="auto_restore_summary" msgid="4235615056371993807">"အပလီကေးရှင်းကို ပြန်လည်ထုတ်လျှင် အရန်ပြုလုပ်ထားသောဆက်တင်များနှင့် ဒေတာများကို ပြန်လည်ရယူရန်ပြုလုပ်မည်။"</string>
+    <string name="auto_restore_summary" msgid="4235615056371993807">"အပလီကေးရှင်းကို ပြန်လည်ထုတ်လျှင် အရန်ပြုလုပ်ထားသောဆက်တင်များနှင့် ဒေတာများကို ပြန်လည်ရယူရန်ပြုလုပ်မည်။"</string>
+    <string name="backup_inactive_title" msgid="5355557151569037197">"အရန်သိမ်းဆည်းခြင်း ဝန်ဆောင်မှု အလုပ်မလုပ်ပါ။"</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"သင့်ကိရိယာ၏ မူဝါဒအရ ဖြစ်၏။"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Desktop အရန်စကားဝှက်"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"အလုပ်ခုံတွင် အရန်သိမ်းဆည်းခြင်းများကို လောလောဆယ် မကာကွယ်နိုင်ပါ။"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"အလုပ်ခုံ တွင် အရန်သိမ်းဆည်းခြင်းအပြည့်လုပ်ရန် အတွက် စကားဝှက်ဖယ်ရန် သို့ ပြောင်းရန် တို့ထိပါ။"</string>
@@ -1857,16 +1867,16 @@
     <string name="remove_device_admin" msgid="3596845261596451437">"အလုပ်မလုပ်ရန် ရပ်ဆိုင်းခြင်း"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"စက်ပစ္စည်းထိန်းချုပ်မှုအား စီမံသူ"</string>
     <string name="no_device_admins" msgid="702695100241728775">"စက်ပစ္စည်းထိန်းချုပ်မှုအား စီမံသူ မည်သူမှမရှိပါ"</string>
-    <string name="managed_profile_device_admin_info" msgid="5048846624960067582">"သင့်အလုပ်ပရိုဖိုင်အား <xliff:g id="APP_NAME">%1$s</xliff:g> မဝင်ရောက်နိုင်ရန်၊ ဆက်တင် &gt; အကောင့်များ အောက်ရှိ ပရိုဖိုင်ကို ဖယ်ရှားပါ"</string>
+    <string name="managed_profile_device_admin_info" msgid="5048846624960067582">"သင့်အလုပ်ပရိုဖိုင်အား <xliff:g id="APP_NAME">%1$s</xliff:g> မဝင်ရောက်နိုင်ရန်၊ ဆက်တင် &gt; အကောင့်များ အောက်ရှိ ပရိုဖိုင်ကို ဖယ်ရှားပါ"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"ကိုယ်ရေး"</string>
     <string name="managed_device_admin_title" msgid="7853955652864478435">"အလုပ်"</string>
-    <string name="no_trust_agents" msgid="7450273545568977523">"ယုံကြည်မှု အေဂျင့်များ မရှိ"</string>
+    <string name="no_trust_agents" msgid="7450273545568977523">"ယုံကြည်မှု အေဂျင့်များ မရှိ"</string>
     <string name="add_device_admin_msg" msgid="6246742476064507965">"စက်၏ ထိန်းချုပ်ကိုင်တွယ်သူအဖြစ် စတင်သုံးစွဲမည်လား?"</string>
     <string name="add_device_admin" msgid="7133327675884827091">"စတင်အသုံးပြုနိုင်စေရန် ပြုလုပ်မည်"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"စက်၏ ထိန်းချုပ်ကိုင်တွယ်သူ"</string>
-    <string name="device_admin_warning" msgid="2026747446313628233">"ဤထိန်းချုပ်ကိုင်တွယ်သူကို အသက်သွင်းခြင်းဖြင့် အပလီကေးရှင်း<xliff:g id="APP_NAME">%1$s</xliff:g>ကို အောက်ပါလုပ်ဆောင်ချက်များဆောင်ရွက်ရန် ခွင့်ပြုမည်"</string>
-    <string name="device_admin_status" msgid="4252975713178851910">"ထိန်းချုပ်ကိုင်တွယ်သူမှာ အလုပ်လုပ်ဆောင်နေပြီး  ဤအပ်ပလီကေးရှင်းကို<xliff:g id="APP_NAME">%1$s</xliff:g>ဖော်ပြပါတို့အား လုပ်ဆောင်ရန်ခွင့်ပြုသည်"</string>
-    <string name="profile_owner_add_title" msgid="6249331160676175009">"ပရိုဖိုင် မန်နေဂျာကို စဖွင့်ပေးရမလား?"</string>
+    <string name="device_admin_warning" msgid="2026747446313628233">"ဤထိန်းချုပ်ကိုင်တွယ်သူကို အသက်သွင်းခြင်းဖြင့် အပလီကေးရှင်း<xliff:g id="APP_NAME">%1$s</xliff:g>ကို အောက်ပါလုပ်ဆောင်ချက်များဆောင်ရွက်ရန် ခွင့်ပြုမည်"</string>
+    <string name="device_admin_status" msgid="4252975713178851910">"ထိန်းချုပ်ကိုင်တွယ်သူမှာ အလုပ်လုပ်ဆောင်နေပြီး  ဤအပ်ပလီကေးရှင်းကို<xliff:g id="APP_NAME">%1$s</xliff:g>ဖော်ပြပါတို့အား လုပ်ဆောင်ရန်ခွင့်ပြုသည်"</string>
+    <string name="profile_owner_add_title" msgid="6249331160676175009">"ပရိုဖိုင် မန်နေဂျာကို စဖွင့်ပေးရမလား?"</string>
     <string name="adding_profile_owner_warning" msgid="6469780138110334180">"ရှေ့ဆက်သွားပါက၊ သင့်ကိုယ်ရေးကိုယ်တာဒေတာအပြင် သက်ဆိုက်ရာဒေတာများကိုပါ သိမ်းနိုင်သည့် သင့်အက်ဒမင်က သင့်သုံးစွဲသူကို စီမံခန့်ခွဲမည်ဖြစ်သည်။\n\n ကွန်ယက်လှုပ်ရှားမှုနှင့် သင့်စက်ပစ္စည်း၏ နေရာပြအချက်အလက်များအပါအဝင် ဤသုံးစွဲသူနှင့် ပတ်သက်သော ဆက်တင်များ၊ ဝင်ရောက်သုံးခွင့်များ၊ appများနှင့် ဒေတာများကို သင့်အက်ဒမင်က စောင့်ကြပ် စီမံခန့်ခွဲနိုင်သည်။"</string>
     <string name="untitled_apn" msgid="1230060359198685513">"အမည်မသိ"</string>
     <string name="sound_category_sound_title" msgid="1488759370067953996">"ယေဘုယျ"</string>
@@ -1879,7 +1889,7 @@
     <string name="wifi_setup_title_connected_network" msgid="1608788657122010919">"ဝိုင်ဖိုင်ကွန်ရက် <xliff:g id="NETWORK_NAME">%s</xliff:g> ကို ချိတ်ဆက်ထားသည်"</string>
     <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"ကွန်ယက်အား ထပ်ထည့်ရန်"</string>
     <string name="wifi_setup_not_connected" msgid="6997432604664057052">"ဆက်သွယ်မှု  မရှိပါ"</string>
-    <string name="wifi_setup_add_network" msgid="5939624680150051807">"ကွန်ယက်ထပ်ထည့်ရန်"</string>
+    <string name="wifi_setup_add_network" msgid="5939624680150051807">"ကွန်ယက်ထပ်ထည့်ရန်"</string>
     <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"ပြန်လည်ဆန်းသစ်ရန် စာရင်း"</string>
     <string name="wifi_setup_skip" msgid="6661541841684895522">"ကျော်"</string>
     <string name="wifi_setup_next" msgid="3388694784447820477">"ရှေ့သို့"</string>
@@ -1893,31 +1903,31 @@
     <string name="wifi_setup_status_select_network" msgid="7519563569903137003">"ဆက်သွယ်လိုသောကွန်ယက်ကို ထိပါ"</string>
     <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"လက်ရှိကွန်ယက်အား ဆက်သွယ်မည်"</string>
     <string name="wifi_setup_status_unsecured_network" msgid="8143046977328718252">"လုံခြုံမှုမဲ့ကွန်ယက်အား ဆက်သွယ်မည်"</string>
-    <string name="wifi_setup_status_edit_network" msgid="4765340816724760717">"ကွန်ယက်ဖွဲ့စည်းပုံကို ထည့်သွင်းပါ"</string>
+    <string name="wifi_setup_status_edit_network" msgid="4765340816724760717">"ကွန်ယက်ဖွဲ့စည်းပုံကို ထည့်သွင်းပါ"</string>
     <string name="wifi_setup_status_new_network" msgid="7468952850452301083">"ကွန်ယက်အသစ်အား ဆက်သွယ်မည်"</string>
     <string name="wifi_setup_status_connecting" msgid="4971421484401530740">"ချိတ်ဆက်နေသည်"</string>
-    <string name="wifi_setup_status_proceed_to_next" msgid="6708250000342940031">"နောက်ထပ်အဆင့်သို့ သွားမည်"</string>
+    <string name="wifi_setup_status_proceed_to_next" msgid="6708250000342940031">"နောက်ထပ်အဆင့်သို့ သွားမည်"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"EAP အား အထောက်အကူမပြုပါ"</string>
     <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"စီမံနေစဉ်အတွင်းမှာ EAP ဝိုင်ဖိုင်ကို အသုံးပြုရန် စီစဉ် မရနိုင်ပါ။ အစီအမံ ပြီးသွားလျှင် ဆက်တင်များ &gt; ကြိုးမဲ့ &amp; ကွန်ရက်များထဲမှာ သွားလုပ်နိုင်သည်။"</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"ချိတ်ဆက်ရာတွင် မိနစ်အနည်းငယ်ကြာနိုင်ပါသည်"</string>
     <string name="wifi_setup_description_connected" msgid="736032046548460779">"အစီအမံနှင့် ရှေ့ဆက်ရန် "<b>" ပြီးတော့ "</b>" တို့ထိပါ။ \n\n အခြား မတူသော ဝိုင်ဖိုင်ကွန်ရက် ချိတ်ဆက်ရန် "<b>" နောက်ပြန်ပြီး "</b>" တို့ထိပါ။"</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"ထပ်တူကိုက်ညီအောင်ပြုလုပ်ခြင်းအား ပြုလုပ်နိုင်သည်"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"ထပ်တူကိုက်ညီအောင်ပြုလုပ်ခြင်းအား ပိတ်ထားသည်"</string>
-    <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"ယခု စင့်က် လုပ်နေ"</string>
+    <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"ယခု စင့်က် လုပ်နေ"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"ထပ်တူကိုက်ညီအောင်ပြုလုပ်မှုမှာ မှားယွင်းနေသည်"</string>
     <string name="sync_failed" msgid="1696499856374109647">"အလိုအလျောက်ထပ်တူညီအောင်လုပ်မှု မအောင်မြင်ပါ"</string>
     <string name="sync_active" msgid="8476943765960863040">"ထပ်တူကိုက်ညီအောင်လုပ်ခြင်းကို အသက်သွင်းရန်"</string>
     <string name="account_sync_settings_title" msgid="5131314922423053588">"ထပ်တူ ကိုက်ညီအောင်လုပ်ခြင်း"</string>
-    <string name="sync_is_failing" msgid="1591561768344128377">"ထပ်တူကိုက်ညီအောင်ပြုလုပ်ခြင်းသည် လက်ရှိပြသနာရှိနေပါသည်။ ခဏကြာလျှင်ပြန်လည်ရရှိပါလိမ့်မည်။"</string>
-    <string name="add_account_label" msgid="7811707265834013767">"အကောင့်ထပ်ထည့်ရန်"</string>
+    <string name="sync_is_failing" msgid="1591561768344128377">"ထပ်တူကိုက်ညီအောင်ပြုလုပ်ခြင်းသည် လက်ရှိပြသနာရှိနေပါသည်။ ခဏကြာလျှင်ပြန်လည်ရရှိပါလိမ့်မည်။"</string>
+    <string name="add_account_label" msgid="7811707265834013767">"အကောင့်ထပ်ထည့်ရန်"</string>
     <string name="managed_profile_not_available_label" msgid="3489771164851107822">"အလုပ် ပရိုဖိုင်ကို မရရှိနိုင်သေးပါ"</string>
     <string name="remove_managed_profile_label" msgid="3856519337797285325">"အလုပ် ပရိုဖိုင်ကို ဖယ်ရှားပစ်ရန်"</string>
     <string name="background_data" msgid="5779592891375473817">"နောက်ခံတွင်အသုံးပြုသောဒေတာ"</string>
-    <string name="background_data_summary" msgid="8328521479872763452">"ဒေတာကိုအချိန်မရွေး ထပ်တူ၊၊ပို့ နှင့်လက်ခံခြင်းလုပ်နိုင်သည်"</string>
+    <string name="background_data_summary" msgid="8328521479872763452">"ဒေတာကိုအချိန်မရွေး ထပ်တူ၊၊ပို့ နှင့်လက်ခံခြင်းလုပ်နိုင်သည်"</string>
     <string name="background_data_dialog_title" msgid="6059217698124786537">"နောက်ခံဒေတာဖျက်မလား"</string>
-    <string name="background_data_dialog_message" msgid="6981661606680941633">"နောက်ခံဒေတာကို မဖွင့်ထားလျှင် ဘက်ထရီသက်တမ်းကိုရှည်စေပြီး ဒေတာသုံးစွဲမှုလဲ လျော့စေသည်။ တချို့အပလီကေးရှင်းများမှာ နောက်ခံဒေတာဆက်သွယ်မှုအား ဆက်လက်သုံးစွဲနေပါလိမ့်မည်။"</string>
+    <string name="background_data_dialog_message" msgid="6981661606680941633">"နောက်ခံဒေတာကို မဖွင့်ထားလျှင် ဘက်ထရီသက်တမ်းကိုရှည်စေပြီး ဒေတာသုံးစွဲမှုလဲ လျော့စေသည်။ တချို့အပလီကေးရှင်းများမှာ နောက်ခံဒေတာဆက်သွယ်မှုအား ဆက်လက်သုံးစွဲနေပါလိမ့်မည်။"</string>
     <string name="sync_automatically" msgid="1682730255435062059">"အလိုအလျောက် ဒေတာထပ်တူညီအောင်ပြုလုပ်"</string>
-    <string name="sync_enabled" msgid="4551148952179416813">"ထပ်တူညီပြုလုပ်မှု  ဖွင့်မည်"</string>
+    <string name="sync_enabled" msgid="4551148952179416813">"ထပ်တူညီပြုလုပ်မှု  ဖွင့်မည်"</string>
     <string name="sync_disabled" msgid="8511659877596511991">"ထပ်တူညီပြုလုပ်မှု ပိတ်မည်"</string>
     <string name="sync_error" msgid="5060969083117872149">"ထပ်တူကူးယူမှု အမှား"</string>
     <string name="last_synced" msgid="4242919465367022234">"နောက်ဆုံးထပ်တူညီအောင်လုပ်ခဲ့သောအချိန် <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
@@ -1933,27 +1943,31 @@
     <string name="sync_contacts" msgid="9174914394377828043">"အဆက်အသွယ်များ"</string>
     <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"ဂူးဂယ်လ်ထပ်တူကိုက်ညီအောင်ပြုလုပ်ခြင်းမှ ကြိုဆိုပါသည် !"</font>" \n သင်ဘယ်နေရာမှာဖြစ်ဖြစ် သင့်အဆက်အသွယ်များ၊ ချိန်းဆိုမှုများနှင့် များစွာကို ရယူ၍ ထပ်တူညီအောင်ပြုလုပ်ရန် ဂူးဂယ်လ်နည်းလမ်း"</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"အပ်ပလီကေးရှင်းအပြင်အဆင်များ၏ ဆက်တင်များ"</string>
-    <string name="header_data_and_synchronization" msgid="5165024023936509896">"ဒေတာနှင့် ထပ်တူကိုက်ညီစေခြင်း"</string>
+    <string name="header_data_and_synchronization" msgid="5165024023936509896">"ဒေတာနှင့် ထပ်တူကိုက်ညီစေခြင်း"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"စကားဝှက်ပြောင်းမည်"</string>
-    <string name="header_account_settings" msgid="5382475087121880626">"အကောင့်ဆက်တင်များ"</string>
-    <string name="remove_account_label" msgid="5921986026504804119">"အကောင့်ကို ဖျက်မည်လား"</string>
-    <string name="header_add_an_account" msgid="756108499532023798">"အကောင့် ထပ်ဖြည့်ပါ"</string>
+    <string name="header_account_settings" msgid="5382475087121880626">"အကောင့်ဆက်တင်များ"</string>
+    <string name="remove_account_label" msgid="5921986026504804119">"အကောင့်ကို ဖျက်မည်လား"</string>
+    <string name="header_add_an_account" msgid="756108499532023798">"အကောင့် ထပ်ဖြည့်ပါ"</string>
     <string name="finish_button_label" msgid="481587707657751116">"ပြီးပြီ"</string>
-    <string name="really_remove_account_title" msgid="8800653398717172460">"အကောင့်ကို ဖျက်မည်လား?"</string>
-    <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"ဤအကောင့်အားဖယ်ခြင်းသည် တက်ဘလက်ထဲမှစာများ ဆက်သွယ်သူများနှင့်တခြားသောဒေတာများအားလုံးကို ဖျက်ပါမည်"</string>
-    <string name="really_remove_account_message" product="default" msgid="3483528757922948356">"ဤအကောင့်အားဖယ်ခြင်းသည် ဖုန်းထဲမှစာများ ဆက်သွယ်သူများနှင့်တခြားသောဒေတာများအားလုံးကို ဖျက်ပါမည်!"</string>
-    <string name="remove_account_failed" msgid="4010643669489606536">"ဒီအပြောင်းအလဲမျိုးကို သင့် စီမံအုပ်ချုပ်သူမှ ခွင့်မပြုပါ"</string>
+    <string name="really_remove_account_title" msgid="8800653398717172460">"အကောင့်ကို ဖျက်မည်လား?"</string>
+    <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"ဤအကောင့်အားဖယ်ခြင်းသည် တက်ဘလက်ထဲမှစာများ ဆက်သွယ်သူများနှင့်တခြားသောဒေတာများအားလုံးကို ဖျက်ပါမည်"</string>
+    <string name="really_remove_account_message" product="default" msgid="3483528757922948356">"ဤအကောင့်အားဖယ်ခြင်းသည် ဖုန်းထဲမှစာများ ဆက်သွယ်သူများနှင့်တခြားသောဒေတာများအားလုံးကို ဖျက်ပါမည်!"</string>
+    <string name="remove_account_failed" msgid="4010643669489606536">"ဒီအပြောင်းအလဲမျိုးကို သင့် စီမံအုပ်ချုပ်သူမှ ခွင့်မပြုပါ"</string>
     <string name="provider_label" msgid="7724593781904508866">"စာရင်းသွင်းထားမှုများ နှိပ်ရန်"</string>
     <!-- no translation found for sync_item_title (4782834606909853006) -->
     <skip />
-    <string name="cant_sync_dialog_title" msgid="8923508322291625282">"ထပ်တူကိုက်ညီရန် လူအားဖြင့်ပြုလုပ်၍မရပါ"</string>
-    <string name="cant_sync_dialog_message" msgid="1938380442159016449">"လက်ရှိဤအရာအား ထပ်တူကိုက်ညီစေရန်ပြုလုပ်မရပါ။ ထိုအပြင်အဆင်အားပြောင်းရန် နောက်ခံဒေတာနှင့် အလိုအလျောက်ထပ်တူကိုက်ညီစေရန်ပြုလုပ်ခြင်းတို့အား ခေတ္တဖွင့်ပါ။"</string>
+    <string name="cant_sync_dialog_title" msgid="8923508322291625282">"ထပ်တူကိုက်ညီရန် လူအားဖြင့်ပြုလုပ်၍မရပါ"</string>
+    <string name="cant_sync_dialog_message" msgid="1938380442159016449">"လက်ရှိဤအရာအား ထပ်တူကိုက်ညီစေရန်ပြုလုပ်မရပါ။ ထိုအပြင်အဆင်အားပြောင်းရန် နောက်ခံဒေတာနှင့် အလိုအလျောက်ထပ်တူကိုက်ညီစေရန်ပြုလုပ်ခြင်းတို့အား ခေတ္တဖွင့်ပါ။"</string>
     <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC၏လိပ်စာ"</string>
-    <string name="enter_password" msgid="8035706727471334122">"အန်ဒရွိုက်ကို စရန်၊ သင်၏ စကားဝှက်ကို ရိုက်ထည့်ပါ"</string>
-    <string name="enter_pin" msgid="5305333588093263790">"အန်ဒရွိုက်ကို စရန်၊ သင်၏ PIN ကို ရိုက်ထည့်ပါ"</string>
+    <string name="enter_password" msgid="8035706727471334122">"အန်ဒရွိုက်ကို စရန်၊ သင်၏ စကားဝှက်ကို ရိုက်ထည့်ပါ"</string>
+    <string name="enter_pin" msgid="5305333588093263790">"အန်ဒရွိုက်ကို စရန်၊ သင်၏ PIN ကို ရိုက်ထည့်ပါ"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"အန်ဒရွိုက်ကို စရန်၊ သင်၏ ပုံဆွဲပုံစံကို ရေးဆွဲပါ"</string>
-    <string name="try_again" msgid="4272075051293936921">"ပြန်ကြိုးစားပါ"</string>
+    <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"ပုံဆွဲအမှား"</string>
+    <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"စကားဝှက်အမှား"</string>
+    <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"ပင် နံပါတ်အမှား"</string>
+    <string name="checking_decryption" msgid="8287458611802609493">"စစ်ဆေးနေပါသည်…"</string>
+    <string name="starting_android" msgid="8581493237458496835">"Android အစပြုနေသည်"</string>
     <string name="delete" msgid="4219243412325163003">"ဖျက်ရန်"</string>
     <string name="misc_files" msgid="6720680815969643497">"အသေးအဖွဲဖိုင်များ"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"<xliff:g id="TOTAL">%2$d</xliff:g> ထဲမှ<xliff:g id="NUMBER">%1$d</xliff:g> ရွေးမည်"</string>
@@ -1977,7 +1991,7 @@
     <string name="strict_mode" msgid="1938795874357830695">"တင်းကြပ်သောစနစ် ဖြစ်နေမည်"</string>
     <string name="strict_mode_summary" msgid="142834318897332338">"ရှည်လျားသောလုပ်ဆောင်ချက်ပြုနေချိန်စကရင်တွင်ပြမည်"</string>
     <string name="pointer_location" msgid="6084434787496938001">"မြား၏တည်နေရာ"</string>
-    <string name="pointer_location_summary" msgid="840819275172753713">"လက်ရှိထိတွေ့မှုဒေတာကို မှန်သားပေါ်မှထပ်ဆင့်ပြသမှု"</string>
+    <string name="pointer_location_summary" msgid="840819275172753713">"လက်ရှိထိတွေ့မှုဒေတာကို မှန်သားပေါ်မှထပ်ဆင့်ပြသမှု"</string>
     <string name="show_touches" msgid="1356420386500834339">"ထိတွေ့ခြင်းများကို ပြရန်"</string>
     <string name="show_touches_summary" msgid="6684407913145150041">"ထိတွေ့ခြင်းအတွက် ရုပ်ပုံတုံ့ပြန်ချက်ကို ပြရန်"</string>
     <string name="show_screen_updates" msgid="5470814345876056420">"surface အဆင့်မြှင့်မှုများပြပါ"</string>
@@ -1991,8 +2005,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"GPU ကိုမျက်နှာပြင်ခင်းကျင်းရာတွင် အမြဲသုံးပါ။"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"အရောင်နေရာတူအောင် ဖန်တီးသည်"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"OpenGL ခြေရာခံခြင်းဖွင့်ပါ။"</string>
-    <string name="use_nuplayer" msgid="5699257393367904387">"NuPlayer (စမ်းသပ်နေဆဲ) ကို သုံးရန်"</string>
-    <string name="use_nuplayer_summary" msgid="1991479067478516714">"AwesomePlayer အစား NuPlayer ကို သုံးရန်"</string>
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"AwesomePlayer အသုံးပြုမည် (ကန့်ကွက်ပါသည်)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"မီဒီယာသီချင်း အများစုအတွက် NuPlayer အစား AwesomePlayer ကိုအသုံးပြုမည်"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"USB အသံ ရူးတင်း ပိတ်ရန်"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"USB အသံ အရံပစ္စည်းများသို့ အော်တိုရူးတင်း ပိတ်ရန်"</string>
     <string name="debug_layout" msgid="5981361776594526155">"ဖွဲ့စည်းပုံဘောင်များပြရန်"</string>
@@ -2012,44 +2026,44 @@
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"လှုပ်ရှားမှုကြာချိန်စကေး"</string>
     <string name="overlay_display_devices_title" msgid="5364176287998398539">"ဆင့်ပွားမျက်နှာပြင်များအသွင်ဆောင်သည်"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"အပလီကေးရှင်းများ"</string>
-    <string name="immediately_destroy_activities" msgid="8366775083630234121">"ဆောင်ရွက်မှုများကို မသိမ်းထားပါနှင့်"</string>
-    <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"အသုံးပြုသူထွက်ခွါသွားသည်နှင့် လုပ်ဆောင်ချက်များကို ဖျက်ပစ်မည်"</string>
-    <string name="app_process_limit_title" msgid="4280600650253107163">"နောက်ခံလုပ်ငန်းစဉ်ကန့်သတ်ခြင်း"</string>
+    <string name="immediately_destroy_activities" msgid="8366775083630234121">"ဆောင်ရွက်မှုများကို မသိမ်းထားပါနှင့်"</string>
+    <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"အသုံးပြုသူထွက်ခွါသွားသည်နှင့် လုပ်ဆောင်ချက်များကို ဖျက်ပစ်မည်"</string>
+    <string name="app_process_limit_title" msgid="4280600650253107163">"နောက်ခံလုပ်ငန်းစဉ်ကန့်သတ်ခြင်း"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"ANRsအားလုံးအား ပြသရန်"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"နောက်ခံအပ်ပလီကေးရှင်းအတွက်တုံ့ပြန်မှုမရှိပြရန်"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"ဒေတာအသုံးပြုမှု"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"App ဒေတာ သုံးစွဲမှု"</string>
-    <string name="data_usage_accounting" msgid="7170028915873577387">"စီမံပေးသူ၏ ဒေတာ စာရင်းမှာ သင့် ကိရိယာ ထဲကနှင့် ခြားနားနိုင်သည်။။"</string>
+    <string name="data_usage_accounting" msgid="7170028915873577387">"စီမံပေးသူ၏ ဒေတာ စာရင်းမှာ သင့် ကိရိယာ ထဲကနှင့် ခြားနားနိုင်သည်။။"</string>
     <string name="data_usage_app" msgid="4970478397515423303">"App သုံးစွဲမှု"</string>
     <string name="data_usage_app_info_label" msgid="3409931235687866706">"APP အင်ဖို"</string>
     <string name="data_usage_cellular_data" msgid="4859424346276043677">"ဆယ်လူလာ ဒေတာ"</string>
-    <string name="data_usage_data_limit" msgid="1193930999713192703">"ဒေတာ ကန့်သတ်ချက် သတ်မှတ်ရန်"</string>
+    <string name="data_usage_data_limit" msgid="1193930999713192703">"ဒေတာ ကန့်သတ်ချက် သတ်မှတ်ရန်"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"ဒေတာအသုံးပြုခြင်း လည်ပတ်မှု"</string>
     <string name="data_usage_app_items_header_text" msgid="5017850810459372828">"App သုံးစွဲမှု"</string>
     <string name="data_usage_menu_roaming" msgid="8042359966835203296">"ကွန်ယက်ပြင်ပဒေတာအသုံးပြုခြင်း"</string>
-    <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"နောက်ခံဒေတာ ကန့်သတ်ထားသည်"</string>
-    <string name="data_usage_menu_allow_background" msgid="2694761978633359223">"နောက်ခံ ဒေတာကို ခွင့်ပြုရန်"</string>
+    <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"နောက်ခံဒေတာ ကန့်သတ်ထားသည်"</string>
+    <string name="data_usage_menu_allow_background" msgid="2694761978633359223">"နောက်ခံ ဒေတာကို ခွင့်ပြုရန်"</string>
     <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"4Gအသုံးပြုမှုအားခွဲခြားရန်"</string>
     <string name="data_usage_menu_show_wifi" msgid="2296217964873872571">"ကြိုးမဲ့ကို ပြရန်"</string>
     <string name="data_usage_menu_hide_wifi" msgid="7290056718050186769">"ကြိုးမဲ့ကို ဝှက်ထားရန်"</string>
     <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Ethernetအသုံးပြုမှုအား ပြသရန်"</string>
     <string name="data_usage_menu_hide_ethernet" msgid="3326702187179943681">"အီသာနက် သုံးစွဲမှုကို ဝှက်ထားရန်"</string>
-    <string name="data_usage_menu_metered" msgid="6235119991372755026">"ကွန်ရက် ကန့်သတ်ချက်များ"</string>
+    <string name="data_usage_menu_metered" msgid="6235119991372755026">"ကွန်ရက် ကန့်သတ်ချက်များ"</string>
     <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"ဒေတာကို အလိုအလျောက်ထပ်တူညီအောင်လုပ်ခြင်း"</string>
     <string name="data_usage_menu_sim_cards" msgid="6410498422797244073">"ဆင်းမ် ကဒ်များ"</string>
     <string name="data_usage_menu_cellular_networks" msgid="5243515735055652279">"ဆယ်လူလာ ကွန်ရက်များ"</string>
-    <string name="account_settings_menu_auto_sync" msgid="6243013719753700377">"ဒေတာကို အော်တိ-စင့်က် လုပ်ရန်"</string>
-    <string name="account_settings_menu_auto_sync_personal" msgid="785541379617346438">"ကိုယ်ရေး ဒေတာကို အော်တိ-စင့်က် လုပ်ရန်"</string>
-    <string name="account_settings_menu_auto_sync_work" msgid="329565580969147026">"အလုပ် ဒေတာကို အော်တိ-စင့်က် လုပ်ရန်"</string>
+    <string name="account_settings_menu_auto_sync" msgid="6243013719753700377">"ဒေတာကို အော်တိ-စင့်က် လုပ်ရန်"</string>
+    <string name="account_settings_menu_auto_sync_personal" msgid="785541379617346438">"ကိုယ်ရေး ဒေတာကို အော်တိ-စင့်က် လုပ်ရန်"</string>
+    <string name="account_settings_menu_auto_sync_work" msgid="329565580969147026">"အလုပ် ဒေတာကို အော်တိ-စင့်က် လုပ်ရန်"</string>
     <string name="data_usage_change_cycle" msgid="7776556448920114866">"ရက်သတ်မှတ်နှုန်းကို ပြောင်းရန်"</string>
-    <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"ဒေတာအသုံးပြုခြင်း လည်ပတ်မှုအား ပြန်လည်စတင်စေမည့် လ၏နေ့ရက်"</string>
-    <string name="data_usage_empty" msgid="8621855507876539282">"ဤအချိန်ကာလအတွင်း မည်သည့်အပလီကေးရှင်းမှ ဒေတာကိုအသုံးမပြုပါ"</string>
+    <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"ဒေတာအသုံးပြုခြင်း လည်ပတ်မှုအား ပြန်လည်စတင်စေမည့် လ၏နေ့ရက်"</string>
+    <string name="data_usage_empty" msgid="8621855507876539282">"ဤအချိန်ကာလအတွင်း မည်သည့်အပလီကေးရှင်းမှ ဒေတာကိုအသုံးမပြုပါ"</string>
     <string name="data_usage_label_foreground" msgid="4938034231928628164">"အနီးမြင်ကွင်း"</string>
     <string name="data_usage_label_background" msgid="3225844085975764519">"နောက်ခံ"</string>
     <string name="data_usage_app_restricted" msgid="3568465218866589705">"ကန့်သတ်ထားသည်"</string>
     <string name="data_usage_disable_mobile" msgid="2613595056882494652">"ဆယ်လူလာ ဒေတာကို ပိတ်လိုက်ရမလား?"</string>
-    <string name="data_usage_disable_mobile_limit" msgid="3934211003105066167">"ဆယ်လူလာ ဒေတာ ကန့်သတ်ချက်ကို သတ်မှတ်ရန်"</string>
-    <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"4Gဒေတာသုံးကန့်သတ်ချက်အား သတ်မှတ်ရန်"</string>
+    <string name="data_usage_disable_mobile_limit" msgid="3934211003105066167">"ဆယ်လူလာ ဒေတာ ကန့်သတ်ချက်ကို သတ်မှတ်ရန်"</string>
+    <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"4Gဒေတာသုံးကန့်သတ်ချက်အား သတ်မှတ်ရန်"</string>
     <string name="data_usage_disable_3g_limit" msgid="2558557840444266906">"2G-3G ဒေတာလစ်မစ်သတ်မှတ်ရန်"</string>
     <string name="data_usage_disable_wifi_limit" msgid="1394901415264660888">"ဝိုင်ဖိုင်ဒေတာကန့်သတ်ချက်သတ်မှတ်ရန်"</string>
     <string name="data_usage_tab_wifi" msgid="481146038146585749">"ဝိုင်ဖိုင်"</string>
@@ -2065,43 +2079,43 @@
     <string name="data_usage_forground_label" msgid="7654319010655983591">"အရှေ့ပိုင်း:"</string>
     <string name="data_usage_background_label" msgid="2722008379947694926">"နောက်ခံ:"</string>
     <string name="data_usage_app_settings" msgid="2279171379771253165">"App ဆက်တင်များ"</string>
-    <string name="data_usage_app_restrict_background" msgid="7510046552380574925">"app နောက်ခံ ဒေတာကို ကန့်သတ်ရန်"</string>
+    <string name="data_usage_app_restrict_background" msgid="7510046552380574925">"app နောက်ခံ ဒေတာကို ကန့်သတ်ရန်"</string>
     <string name="data_usage_app_restrict_background_summary" msgid="3720075732277934106">"ဆယ်လူလာ ကွန်ရက်များမှာ နောက်ခံဒေတာကို ပိတ်ထားပါ။"</string>
-    <string name="data_usage_app_restrict_background_summary_disabled" msgid="1446565717342917727">"ဒီapp အတွက် နောက်ခံ ဒေတာကို ကန့်သတ်ရန်၊ ဦးစွာအနေနှင့် ဆယ်လူလာ ဒေတာ ကန့်သတ်ချက် တစ်ခုကို သတ်မှတ်ပါ။"</string>
-    <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"နောက်ခံဒေတာ ကန့်သတ်မည်လား?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="5871168521456832764">"ဒီအင်္ဂါရပ်ကြောင့် နောက်ခံ ဒေတာကို အားကိုးရသည့် app တစ်ခု၏ အလုပ်မှာ ဆယ်လူလာ ကွန်ရက်များသာ ရရှိချိန်မှာ ရပ်တန့်သွားနိုင်သည်။ \n\n app ထဲတွင် တွေ့ရှိနိုင်သည့် ဆက်တင်များ ထဲမှာ သင်သည် ဒေတာ သုံးစွဲမှု အတွက် ပိုပြီး ဆီလျော်သည့် ထိန်းချုပ်မှုများကို ရှာတွေ့နိုင်ပါသည်။"</string>
-    <string name="data_usage_restrict_denied_dialog" msgid="4674085030810350875">"သင်က ဆယ်လူလာ ဒေတာ ကန့်သတ်ချက်ကို သတ်မှတ်ထားမှသာ နောက်ခံ ဒေတာကို ကန့်သတ်၍ ရနိုင်ပါသည်။"</string>
-    <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"ဒေတာများကို အလိုလျောက်တူအောင်လုပ်ခြင်းကို ဖွင့်မည်လား?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"သင်က ဝက်ဘ် ပေါ်က သင်၏ အကောင့်ထဲ ပြုလုပ်သည့် အပြောင်းအလဲ မှန်သမျှကို သင့်တက်ဘလက်ထံသို့ အလိုအလျောက် ကူပေးမည်။ \n\nအချို့  အကောင့်များသည် သင်က သင့်တက်ဘလက်သို့ ပြုလုပ်လိုပ်သည့် အပြောင်းအလဲ မှန်သမျှကို ဝက်ဘ်ဆီသို့ အလိုအလျောက် ကူးပေးနိုင်ပါသေးသည်။ Google အကောင့် ထိုသို့ အလုပ်လုပ်ပါသည်။"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"သင်က ဝက်ဘ် ပေါ်က သင်၏ အကောင့်ထဲ ပြုလုပ်သည့် အပြောင်းအလဲ မှန်သမျှကို သင့်ဖုန်းထံသို့ အလိုအလျောက် ကူပေးမည်။ \n\nအချို့ အကောင့်များသည် သင်က ဖုန်းသို့ ပြုလုပ်လိုပ်သည့် အပြောင်းအလဲ မှန်သမျှကို ဝက်ဘ်ဆီသို့ အလိုအလျောက် ကူးပေးနိုင်ပါသေးသည်။ Google အကောင့် ထိုသို့ အလုပ်လုပ်ပါသည်။"</string>
+    <string name="data_usage_app_restrict_background_summary_disabled" msgid="1446565717342917727">"ဒီapp အတွက် နောက်ခံ ဒေတာကို ကန့်သတ်ရန်၊ ဦးစွာအနေနှင့် ဆယ်လူလာ ဒေတာ ကန့်သတ်ချက် တစ်ခုကို သတ်မှတ်ပါ။"</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"နောက်ခံဒေတာ ကန့်သတ်မည်လား?"</string>
+    <string name="data_usage_app_restrict_dialog" msgid="5871168521456832764">"ဒီအင်္ဂါရပ်ကြောင့် နောက်ခံ ဒေတာကို အားကိုးရသည့် app တစ်ခု၏ အလုပ်မှာ ဆယ်လူလာ ကွန်ရက်များသာ ရရှိချိန်မှာ ရပ်တန့်သွားနိုင်သည်။ \n\n app ထဲတွင် တွေ့ရှိနိုင်သည့် ဆက်တင်များ ထဲမှာ သင်သည် ဒေတာ သုံးစွဲမှု အတွက် ပိုပြီး ဆီလျော်သည့် ထိန်းချုပ်မှုများကို ရှာတွေ့နိုင်ပါသည်။"</string>
+    <string name="data_usage_restrict_denied_dialog" msgid="4674085030810350875">"သင်က ဆယ်လူလာ ဒေတာ ကန့်သတ်ချက်ကို သတ်မှတ်ထားမှသာ နောက်ခံ ဒေတာကို ကန့်သတ်၍ ရနိုင်ပါသည်။"</string>
+    <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"ဒေတာများကို အလိုလျောက်တူအောင်လုပ်ခြင်းကို ဖွင့်မည်လား?"</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"သင်က ဝက်ဘ် ပေါ်က သင်၏ အကောင့်ထဲ ပြုလုပ်သည့် အပြောင်းအလဲ မှန်သမျှကို သင့်တက်ဘလက်ထံသို့ အလိုအလျောက် ကူပေးမည်။ \n\nအချို့  အကောင့်များသည် သင်က သင့်တက်ဘလက်သို့ ပြုလုပ်လိုပ်သည့် အပြောင်းအလဲ မှန်သမျှကို ဝက်ဘ်ဆီသို့ အလိုအလျောက် ကူးပေးနိုင်ပါသေးသည်။ Google အကောင့် ထိုသို့ အလုပ်လုပ်ပါသည်။"</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"သင်က ဝက်ဘ် ပေါ်က သင်၏ အကောင့်ထဲ ပြုလုပ်သည့် အပြောင်းအလဲ မှန်သမျှကို သင့်ဖုန်းထံသို့ အလိုအလျောက် ကူပေးမည်။ \n\nအချို့ အကောင့်များသည် သင်က ဖုန်းသို့ ပြုလုပ်လိုပ်သည့် အပြောင်းအလဲ မှန်သမျှကို ဝက်ဘ်ဆီသို့ အလိုအလျောက် ကူးပေးနိုင်ပါသေးသည်။ Google အကောင့် ထိုသို့ အလုပ်လုပ်ပါသည်။"</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"ဒေတာများကို အလိုလျောက်တူအောင်လုပ်ခြင်းကို ပိတ်မည်လား?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"၎င်းသည် အချက်အလက်နှင့် ဘက်ထရီအသုံးပြုမှုကို ထိန်းသိမ်းစောင့်ရှောက်ပေးလိမ့်မည်၊ သို့သော် လတ်တလောသတင်းအချက်အလက်များကို စုဆောင်းရန် သင်ကိုယ်တိုင် အကောင့်တခုခြင်းကို ထပ်တူညီအောင်လုပ်ရန် လိုအပ်လိမ့်မည်။ အဆင့်မြှင့်မှုများ ထွက်ပေါ်ပါက အကြောင်းကြားချက်များ သင်လက်ခံနိင်မည်မဟုတ်ပါ။"</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"ဒေတာအသုံးပြုခြင်း လည်ပတ်မှုအား အစမှပြန်လည်စတင်စေရန်"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"လစဥ်၏ ရက်စွဲ"</string>
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"အတည်ပြုရန်"</string>
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"ဒေတာအသုံးပြုမှုသတိပေးချက်အား သတ်မှတ်ရန်"</string>
-    <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"ဒေတာအသုံးပြုမှုကန့်သတ်ချက်အား သတ်မှတ်ရန်"</string>
-    <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"ဒေတာအသုံးပြုမှုအား ကန့်သတ်ခြင်း"</string>
-    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="5788774061143636263">"သင်၏ တက်ဘလက်သည် သင် သတ်မှတ်ပေးခဲ့သည့် ဒေတာ ကန့်သတ်ချက်ကို ရောက်ရှိသည့်နှင့် ဆယ်လူလာ ဒေတာကို ပိတ်လိုက်ပါမည်။\n\nဒေတာ သုံးစွဲမှုကို သင့်တက်ဘလက်က တိုင်းထွာခြင်း ဖြစ်ကာ၊ သင်၏ စီမံပေးသူက သုံးစွဲမှုကိုတစ်မျိုး တွက်ချက်နိုင်ရာ၊ ကန့်သတ်ချက်ကို မယုတ်မလွန် ချမှတ်ရန်ကို စဉ်းစားပါ။ ."</string>
-    <string name="data_usage_limit_dialog_mobile" product="default" msgid="3511301596446820549">"သင်၏ ဖုန်းသည် သင် သတ်မှတ်ပေးခဲ့သည့် ဒေတာ ကန့်သတ်ချက်ကို ရောက်ရှိသည့်နှင့် ဆယ်လူလာ ဒေတာကို ပိတ်လိုက်ပါမည်။\n\nဒေတာ သုံးစွဲမှုကို သင့်ဖုန်းက တိုင်းထွာခြင်း ဖြစ်ကာ၊ သင်၏ စီမံပေးသူက သုံးစွဲမှုကို ခြားနားစွာ တွက်ချက်နိုင်ရာ၊ ကန့်သတ်ချက်ကို မယုတ်မလွန် ချမှတ်ရန်ကို စဉ်းစားပါ။"</string>
-    <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"နောက်ခံဒေတာ ကန့်သတ်မည်လား?"</string>
-    <string name="data_usage_restrict_background" msgid="8210134218644196511">"သင်က နောက်ခံ ဆယ်လူလာ ဒေတာကို ကန့်သတ်လျှင်၊ အချို့သော appများ နှင့် ဝန်ဆောင်မှုများက သင့်အနေနှင့် ကြိုးမဲ့နှင့် မချိတ်ဆက်မချင်း အလုပ်လုပ်ကြမည် မဟုတ်ပါ။"</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="3262993384666280985">"သင်က နောက်ခံ ဆယ်လူလာ ဒေတာကို ကန့်သတ်လျှင်၊ အချို့သော appများ နှင့် ဝန်ဆောင်မှုများက သင့်အနေနှင့် ကြိုးမဲ့နှင့် မချိတ်ဆက်မချင်း အလုပ်လုပ်ကြမည် မဟုတ်ပါ။ \n\nဒီဆက်တင်သည် ဒီတက်ဘလက်ထဲက အသုံးပြုသူ အားလုံးတို့ အပေါ် အကျုးသက်ရောက်ပါသည်။"</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="4352615206362479722">"သင်က နောက်ခံ ဆယ်လူလာ ဒေတာကို ကန့်သတ်လျှင်၊ အချို့သော appများ နှင့် ဝန်ဆောင်မှုများက သင့်အနေနှင့် ကြိုးမဲ့နှင့် မချိတ်ဆက်မချင်း အလုပ်လုပ်ကြမည် မဟုတ်ပါ။ \n\nဒီဆက်တင်သည် ဒီဖုန်းထဲက အသုံးပြုသူ အားလုံးတို့ အပေါ် အကျုးသက်ရောက်ပါသည်။"</string>
+    <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"ဒေတာအသုံးပြုမှုကန့်သတ်ချက်အား သတ်မှတ်ရန်"</string>
+    <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"ဒေတာအသုံးပြုမှုအား ကန့်သတ်ခြင်း"</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="5788774061143636263">"သင်၏ တက်ဘလက်သည် သင် သတ်မှတ်ပေးခဲ့သည့် ဒေတာ ကန့်သတ်ချက်ကို ရောက်ရှိသည့်နှင့် ဆယ်လူလာ ဒေတာကို ပိတ်လိုက်ပါမည်။\n\nဒေတာ သုံးစွဲမှုကို သင့်တက်ဘလက်က တိုင်းထွာခြင်း ဖြစ်ကာ၊ သင်၏ စီမံပေးသူက သုံးစွဲမှုကိုတစ်မျိုး တွက်ချက်နိုင်ရာ၊ ကန့်သတ်ချက်ကို မယုတ်မလွန် ချမှတ်ရန်ကို စဉ်းစားပါ။ ."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="3511301596446820549">"သင်၏ ဖုန်းသည် သင် သတ်မှတ်ပေးခဲ့သည့် ဒေတာ ကန့်သတ်ချက်ကို ရောက်ရှိသည့်နှင့် ဆယ်လူလာ ဒေတာကို ပိတ်လိုက်ပါမည်။\n\nဒေတာ သုံးစွဲမှုကို သင့်ဖုန်းက တိုင်းထွာခြင်း ဖြစ်ကာ၊ သင်၏ စီမံပေးသူက သုံးစွဲမှုကို ခြားနားစွာ တွက်ချက်နိုင်ရာ၊ ကန့်သတ်ချက်ကို မယုတ်မလွန် ချမှတ်ရန်ကို စဉ်းစားပါ။"</string>
+    <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"နောက်ခံဒေတာ ကန့်သတ်မည်လား?"</string>
+    <string name="data_usage_restrict_background" msgid="8210134218644196511">"သင်က နောက်ခံ ဆယ်လူလာ ဒေတာကို ကန့်သတ်လျှင်၊ အချို့သော appများ နှင့် ဝန်ဆောင်မှုများက သင့်အနေနှင့် ကြိုးမဲ့နှင့် မချိတ်ဆက်မချင်း အလုပ်လုပ်ကြမည် မဟုတ်ပါ။"</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="3262993384666280985">"သင်က နောက်ခံ ဆယ်လူလာ ဒေတာကို ကန့်သတ်လျှင်၊ အချို့သော appများ နှင့် ဝန်ဆောင်မှုများက သင့်အနေနှင့် ကြိုးမဲ့နှင့် မချိတ်ဆက်မချင်း အလုပ်လုပ်ကြမည် မဟုတ်ပါ။ \n\nဒီဆက်တင်သည် ဒီတက်ဘလက်ထဲက အသုံးပြုသူ အားလုံးတို့ အပေါ် အကျုးသက်ရောက်ပါသည်။"</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="4352615206362479722">"သင်က နောက်ခံ ဆယ်လူလာ ဒေတာကို ကန့်သတ်လျှင်၊ အချို့သော appများ နှင့် ဝန်ဆောင်မှုများက သင့်အနေနှင့် ကြိုးမဲ့နှင့် မချိတ်ဆက်မချင်း အလုပ်လုပ်ကြမည် မဟုတ်ပါ။ \n\nဒီဆက်တင်သည် ဒီဖုန်းထဲက အသုံးပြုသူ အားလုံးတို့ အပေါ် အကျုးသက်ရောက်ပါသည်။"</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">"သတိပေးချက်"</font></string>
-    <string name="data_usage_sweep_limit" msgid="860566507375933039"><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">"ကန့်သတ်မှု"</font></string>
+    <string name="data_usage_sweep_limit" msgid="860566507375933039"><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">"ကန့်သတ်မှု"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"ဖယ်ရှားထားသော အပ်ပလီကေးရှင်းများ"</string>
     <string name="data_usage_uninstalled_apps_users" msgid="7986294489899813194">"ဖယ်ရှားထားသော အပလီကေးရှင်းနှင့် သုံးစွဲသူများ"</string>
     <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> ရရှိသည် <xliff:g id="SENT">%2$s</xliff:g> ပို့သည်"</string>
     <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>: တွင် <xliff:g id="TOTAL">%1$s</xliff:g> သုံးစွဲခဲ့သည်။"</string>
     <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"သင့်တက်ဘလက်မှတိုင်းတာချက်အရ <xliff:g id="RANGE">%2$s</xliff:g>: တွင် <xliff:g id="TOTAL">%1$s</xliff:g> သုံးစွဲခဲ့သည်။သင့်ဖုန်းလိုင်းဌာန၏ ဒေတာအသုံးပြုမှုတွက်ချက်ပုံမှာ ကွဲပြားနိုင်သည်။"</string>
     <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"သင့်ဖုန်းမှတိုင်းတာချက်အရ <xliff:g id="RANGE">%2$s</xliff:g>: တွင် <xliff:g id="TOTAL">%1$s</xliff:g> သုံးစွဲခဲ့သည်။သင့်ဖုန်းလိုင်းဌာန၏ ဒေတာအသုံးပြုမှုတွက်ချက်ပုံမှာ ကွဲပြားနိုင်သည်။"</string>
-    <string name="data_usage_metered_title" msgid="7383175371006596441">"ကွန်ရက် ကန့်သတ်ချက်များ"</string>
-    <string name="data_usage_metered_body" msgid="3262343834446126044">"နောက်ခံ ဒေတာကို ကန့်သတ် ထားလျှင် ငွေပေးရသည့် ကွန်ရက်များကို ဆယ်လူလာ ကွန်ရက် အဖြစ် သဘောထားသည်။ Appများက ထိုကွန်ရက်များကို ကြီးမားသည့် ဒေါင်းလုဒ်များ အတွက် မသုံးခင်မှာ  သတိပေးနိုင်ကြသည်။"</string>
+    <string name="data_usage_metered_title" msgid="7383175371006596441">"ကွန်ရက် ကန့်သတ်ချက်များ"</string>
+    <string name="data_usage_metered_body" msgid="3262343834446126044">"နောက်ခံ ဒေတာကို ကန့်သတ် ထားလျှင် ငွေပေးရသည့် ကွန်ရက်များကို ဆယ်လူလာ ကွန်ရက် အဖြစ် သဘောထားသည်။ Appများက ထိုကွန်ရက်များကို ကြီးမားသည့် ဒေါင်းလုဒ်များ အတွက် မသုံးခင်မှာ  သတိပေးနိုင်ကြသည်။"</string>
     <string name="data_usage_metered_mobile" msgid="2326986339431119372">"ဆယ်လူလာ ကွန်ရက်များ"</string>
-    <string name="data_usage_metered_wifi" msgid="1761738002328299714">"ငွေပေးရသည့် ကြိုးမဲ့ ကွန်ရက်များ"</string>
-    <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"ငွေပေးရသည့် ကြိုးမဲ့ ကွန်ရက်များကို ရွေးရန်၊ ကြိုးမဲ့ကို ဖွင့်လိုက်ပါ။"</string>
-    <string name="data_usage_disclaimer" msgid="6887858149980673444">"စီမံပေးသူ၏ ဒေတာ စာရင်းမှာ သင့် ကိရိယာ ထဲကနှင့် ခြားနားနိုင်သည်။။"</string>
+    <string name="data_usage_metered_wifi" msgid="1761738002328299714">"ငွေပေးရသည့် ကြိုးမဲ့ ကွန်ရက်များ"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"ငွေပေးရသည့် ကြိုးမဲ့ ကွန်ရက်များကို ရွေးရန်၊ ကြိုးမဲ့ကို ဖွင့်လိုက်ပါ။"</string>
+    <string name="data_usage_disclaimer" msgid="6887858149980673444">"စီမံပေးသူ၏ ဒေတာ စာရင်းမှာ သင့် ကိရိယာ ထဲကနှင့် ခြားနားနိုင်သည်။။"</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"အရေးပေါ်ခေါ်ဆိုရန်"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"ခေါ်ဆိုမှုထံပြန်သွားရန်"</string>
     <string name="vpn_name" msgid="4689699885361002297">"အမည်"</string>
@@ -2114,15 +2128,15 @@
     <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"IPSecအသုံးပြုသူလက်မှတ်"</string>
     <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"IPSec CA အသိအမှတ်ပြုလက်မှတ်"</string>
     <string name="vpn_ipsec_server_cert" msgid="6599276718456935010">"IPSec ဆာဗာအသိအမှတ်ပြုလက်မှတ်"</string>
-    <string name="vpn_show_options" msgid="7182688955890457003">"အဆင့်မြင့်ရွေးချယ်မှုများကိုပြသရန်"</string>
+    <string name="vpn_show_options" msgid="7182688955890457003">"အဆင့်မြင့်ရွေးချယ်မှုများကိုပြသရန်"</string>
     <string name="vpn_search_domains" msgid="5391995501541199624">"DNS ရှာဖွေမှု ဒိုမိန်းများ"</string>
     <string name="vpn_dns_servers" msgid="5570715561245741829">"DNS ဆာဗာများ (e.g. 8.8.8.8)"</string>
-    <string name="vpn_routes" msgid="3818655448226312232">"တဆင့်ပို့လမ်းကြောင်းများ(ဥပမာ10.0.0.0/8)"</string>
+    <string name="vpn_routes" msgid="3818655448226312232">"တဆင့်ပို့လမ်းကြောင်းများ(ဥပမာ10.0.0.0/8)"</string>
     <string name="vpn_username" msgid="1863901629860867849">"သုံးစွဲသူ အမှတ်"</string>
     <string name="vpn_password" msgid="6756043647233596772">"စကားဝှက်"</string>
-    <string name="vpn_save_login" msgid="6350322456427484881">"အကောင့်အချက်အလက်များကို သိမ်းပါ"</string>
+    <string name="vpn_save_login" msgid="6350322456427484881">"အကောင့်အချက်အလက်များကို သိမ်းပါ"</string>
     <string name="vpn_not_used" msgid="9094191054524660891">"(မသုံးမပြု)"</string>
-    <string name="vpn_no_ca_cert" msgid="2095005387500126113">"(ဆာဗာကိုအတည်မပြုပါနှင့်)"</string>
+    <string name="vpn_no_ca_cert" msgid="2095005387500126113">"(ဆာဗာကိုအတည်မပြုပါနှင့်)"</string>
     <string name="vpn_no_server_cert" msgid="2167487440231913330">"(ဆာဗာမှ ရရှိထားသည်)"</string>
     <string name="vpn_cancel" msgid="1979937976123659332">"ထားတော့"</string>
     <string name="vpn_save" msgid="4233484051644764510">"သိမ်းပါ"</string>
@@ -2144,16 +2158,16 @@
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"ပိတ်ထားရန်"</string>
     <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"ရနိုင်သည်"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"ဖယ်ရှာခြင်း"</string>
-    <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"စနစ်၏CA လက်မှတ်အား ဖွင့်ထားမလား?"</string>
+    <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"စနစ်၏CA လက်မှတ်အား ဖွင့်ထားမလား?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"စနစ်၏CA လက်မှတ်အား ပိတ်ထားမည်"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"အသုံးပြုသူ၏CA လက်မှတ်အား ထာဝရဖယ်ရှားမည်လား?"</string>
     <string name="spellcheckers_settings_title" msgid="399981228588011501">"စာလုံးပေါင်းစစ်ခြင်း"</string>
-    <string name="current_backup_pw_prompt" msgid="7735254412051914576">"သင့်အရန်သိမ်းဆည်းမှု၏စကားဝှက်အပြည့်ကို ဤနေရာတွင်ထည့်ပါ။"</string>
-    <string name="new_backup_pw_prompt" msgid="8755501377391998428">"အရန်သိမ်းဆည်းရန်အတွက် ဤနေရာတွင်စကားဝှက်အသစ်ကို ရိုက်ထည့်ပါ"</string>
-    <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"သင့်အပိုဆောင်းစကားဝှက်အပြည့်အား ပြန်လည်ပြီး ထည့်ပါ။"</string>
+    <string name="current_backup_pw_prompt" msgid="7735254412051914576">"သင့်အရန်သိမ်းဆည်းမှု၏စကားဝှက်အပြည့်ကို ဤနေရာတွင်ထည့်ပါ။"</string>
+    <string name="new_backup_pw_prompt" msgid="8755501377391998428">"အရန်သိမ်းဆည်းရန်အတွက် ဤနေရာတွင်စကားဝှက်အသစ်ကို ရိုက်ထည့်ပါ"</string>
+    <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"သင့်အပိုဆောင်းစကားဝှက်အပြည့်အား ပြန်လည်ပြီး ထည့်ပါ။"</string>
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"အရန်သိမ်းဆည်းခြင်းအတွက် စကားဝှက်သတ်မှတ်ရန်"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"ထားတော့"</string>
-    <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"ဖြည့်စွက် စနစ်တိုးမြင့်မှုများ"</string>
+    <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"ဖြည့်စွက် စနစ်တိုးမြင့်မှုများ"</string>
     <string name="selinux_status_disabled" msgid="924551035552323327">"သုံးမရအောင် ပိတ်ထားခြင်း"</string>
     <string name="selinux_status_permissive" msgid="6004965534713398778">"ထိန်းချုပ်မှုမဲ့"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"ဖိအားပေးရန်"</string>
@@ -2168,8 +2182,7 @@
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"သုံးစွဲသူ သို့မဟုတ် ပရိုဖိုင်ကို ထည့်ရန်"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"သုံးစွဲသူကို ထည့်ရန်"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"ကန့်သတ်ထားသော ကိုယ်ရေးအချက်အလက်များ"</string>
-    <string name="user_summary_managed_profile" msgid="7369539529693048111">"အလုပ် ပရိုဖိုင်"</string>
-    <string name="user_need_lock_message" msgid="2596365678651842785">"ကန့်သတ်ကိုယ်ရေးအချက်အလက်တစ်ခုကို မပြုလုပ်မီ သင်၏ အပလီကေးရှင်းများနှင့် ကိုယ်ပိုင်အချက်အလက်များကို ကာကွယ်ရန် မျက်နှာပြင်သော့ချခြင်းကို စီမံရန် လိုအပ်လိမ့်မည်"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"ကန့်သတ်ကိုယ်ရေးအချက်အလက်တစ်ခုကို မပြုလုပ်မီ သင်၏ အပလီကေးရှင်းများနှင့် ကိုယ်ပိုင်အချက်အလက်များကို ကာကွယ်ရန် မျက်နှာပြင်သော့ချခြင်းကို စီမံရန် လိုအပ်လိမ့်မည်"</string>
     <string name="user_set_lock_button" msgid="8311219392856626841">"သော့ချရန် သတ်မှတ်ပါ"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"အစီအမံ မလုပ်ထားပါ"</string>
     <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"အစီအမံ မလုပ်ထားပါ- ကန့်သတ်ထားသော ကိုယ်ရေးအချက်အလက်များ"</string>
@@ -2182,19 +2195,19 @@
     <string name="user_add_profile_item_summary" msgid="5931663986889138941">"သင့်အကောင့်မှ အပလီကေးရှင်းများ နှင့် ပါရှိချက်များ ရယူသုံးစွဲခွင့်ကို သင်ကန့်သတ်ထိန်းချုပ်နိုင်သည်။"</string>
     <string name="user_add_user_item_title" msgid="8212199632466198969">"သုံးစွဲသူ"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"ကန့်သတ်ထားသော ကိုယ်ရေးအချက်အလက်များ"</string>
-    <string name="user_add_user_title" msgid="2108112641783146007">"အသုံးပြုသူ အသစ်ကို ထည့်ရမလား?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"သင်သည် ဒီကိရိယာကို ဖြည့်စွက် အသုံးပြုသူများကို ဖန်တီးပေးလျက် မျှဝေပေးနိုင်သည်။ အသုံးပြုသူတိုင်းဆီမှာ ၎င်း၏ ကိုယ်ပိုင် နေရာ ရှိမည် ဖြစ်ရာ သူတို့သည် ကိုယ်ပိုင် appများ၊ နောက်ခံပုံ၊ စသဖြင့် မိမိစိတ်ကြိုက် ပြုလုပ်နိုင်ကြမည်။ ထို့အပြင် အသုံးပြုသူတို့သည် လူတိုင်း အပေါ် အကျိုးသက်ရောက်နိုင်သည့် ကြိုးမဲ့လို ကိရိယာ ဆက်တင်များကိုပါ ညှိနှိုင်းနိုင်ကြသည်။\n\nသင်က အသုံးပြုသူ အသစ် တစ်ဦးကို ထည့်ပေးလိုက်လျှင်၊ ထိုသူသည် ၎င်း၏ နေရာကို သတ်မှတ်စီစဉ်ရန် လိုအပ်မည်။\n\n အသုံးပြုသူ မည်သူမဆို ကျန်အသုံးပြုသူ အားလုံးတို့အတွက် appများကို မွမ်းမံပေးနိုင်သည်။"</string>
-    <string name="user_add_user_message_short" msgid="1511354412249044381">"သင်က အသုံးပြုသူ အသစ် တစ်ဦးကို ထည့်ပေးလိုက်လျှင်၊ ထိုသူသည် ၎င်း၏ နေရာကို သတ်မှတ်စီစဉ်ရန် လိုအပ်မည်။\n\n အသုံးပြုသူ မည်သူမဆို ကျန်အသုံးပြုသူ အားလုံးတို့အတွက် appများကို မွမ်းမံပေးနိုင်သည်။"</string>
+    <string name="user_add_user_title" msgid="2108112641783146007">"အသုံးပြုသူ အသစ်ကို ထည့်ရမလား?"</string>
+    <string name="user_add_user_message_long" msgid="718192651887726259">"သင်သည် ဒီကိရိယာကို ဖြည့်စွက် အသုံးပြုသူများကို ဖန်တီးပေးလျက် မျှဝေပေးနိုင်သည်။ အသုံးပြုသူတိုင်းဆီမှာ ၎င်း၏ ကိုယ်ပိုင် နေရာ ရှိမည် ဖြစ်ရာ သူတို့သည် ကိုယ်ပိုင် appများ၊ နောက်ခံပုံ၊ စသဖြင့် မိမိစိတ်ကြိုက် ပြုလုပ်နိုင်ကြမည်။ ထို့အပြင် အသုံးပြုသူတို့သည် လူတိုင်း အပေါ် အကျိုးသက်ရောက်နိုင်သည့် ကြိုးမဲ့လို ကိရိယာ ဆက်တင်များကိုပါ ညှိနှိုင်းနိုင်ကြသည်။\n\nသင်က အသုံးပြုသူ အသစ် တစ်ဦးကို ထည့်ပေးလိုက်လျှင်၊ ထိုသူသည် ၎င်း၏ နေရာကို သတ်မှတ်စီစဉ်ရန် လိုအပ်မည်။\n\n အသုံးပြုသူ မည်သူမဆို ကျန်အသုံးပြုသူ အားလုံးတို့အတွက် appများကို မွမ်းမံပေးနိုင်သည်။"</string>
+    <string name="user_add_user_message_short" msgid="1511354412249044381">"သင်က အသုံးပြုသူ အသစ် တစ်ဦးကို ထည့်ပေးလိုက်လျှင်၊ ထိုသူသည် ၎င်း၏ နေရာကို သတ်မှတ်စီစဉ်ရန် လိုအပ်မည်။\n\n အသုံးပြုသူ မည်သူမဆို ကျန်အသုံးပြုသူ အားလုံးတို့အတွက် appများကို မွမ်းမံပေးနိုင်သည်။"</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"သုံးစွဲသူကို ယခုသတ်မှတ်မည်လား?"</string>
-    <string name="user_setup_dialog_message" msgid="1004068621380867148">"ထိုသူသည် ကိရိယာကို ယူ၍ သူတို့၏ နေရာများကို စဖွင့်သတ်မှတ် ထာတာ သေချာပါစေ"</string>
+    <string name="user_setup_dialog_message" msgid="1004068621380867148">"ထိုသူသည် ကိရိယာကို ယူ၍ သူတို့၏ နေရာများကို စဖွင့်သတ်မှတ် ထာတာ သေချာပါစေ"</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"ယခု ကိုယ်ရေးအချက်အလက်ကို အစီအမံလုပ်မည်လား?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"အခုပင် အစီအမံလုပ်လိုက်ပါ"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"ယခုမဟုတ်"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"တက်ဘလက်၏ ပိုင်ရှင်သာ သုံးစွဲသူများကို စီမံခန့်ခွဲနိုင်သည်"</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"ဖုန်း၏ ပိုင်ရှင်သာ သုံးစွဲသူများကို စီမံခန့်ခွဲနိုင်သည်"</string>
-    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"ကန့်သတ်ထားသော ကိုယ်ရေးအချက်အလက်များတွင် အကောင့်များ ထည့်၍မရပါ။"</string>
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"ကန့်သတ်ထားသော ကိုယ်ရေးအချက်အလက်များတွင် အကောင့်များ ထည့်၍မရပါ။"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"ဤစက်မှ <xliff:g id="USER_NAME">%1$s</xliff:g>ကို ဖျက်ရန်"</string>
-    <string name="user_add_on_lockscreen_menu" msgid="3025132738715222247">"ကိရိယာ သော့ပိတ်ထားစဉ် အသုံးပြုသူများကို ထည့်ရန်"</string>
+    <string name="user_add_on_lockscreen_menu" msgid="3025132738715222247">"ကိရိယာ သော့ပိတ်ထားစဉ် အသုံးပြုသူများကို ထည့်ရန်"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"သုံးစွဲသူအသစ်"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"ကိုယ်ရေးအချက်အလက်အသစ်"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"သင့်ကိုယ်သင် ဖျက်မည်လား?"</string>
@@ -2203,26 +2216,26 @@
     <string name="work_profile_confirm_remove_title" msgid="2017323555783522213">"အလုပ်ပရိုဖိုင် ဖယ်မည်လား?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"ဤ တက်ဘလက်ပေါ်မှ သင့်နေရာနှင့် အချက်အလက်များသည် ပျောက်သွားလိမ့်မည်။ ဤလုပ်ဆောင်ချက်ကို သင် နောက်ပြန်သွား၍ မရနိုင်ပါ။"</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"ဤဖုန်းပေါ်မှ သင့်နေရာနှင့် အချက်အလက်များသည် ပျောက်သွားလိမ့်မည်။ ဤလုပ်ဆောင်ချက်ကို သင် နောက်ပြန်သွား၍ မရနိုင်ပါ။"</string>
-    <string name="user_confirm_remove_message" msgid="1020629390993095037">"appများ အားလုံး နှင့် ဒေတာကို ဖျက်သွားမည်။"</string>
-    <string name="work_profile_confirm_remove_message" msgid="7593793549364168783">"ဤပရိုဖိုင်ရှိ appများအားလုံးနှင့် ဒေတာကို ဖျက်ပစ်မည်။"</string>
-    <string name="user_profile_confirm_remove_message" msgid="7373754145959298522">"appများ အားလုံး နှင့် ဒေတာကို ဖျက်သွားမည်။"</string>
+    <string name="user_confirm_remove_message" msgid="1020629390993095037">"appများ အားလုံး နှင့် ဒေတာကို ဖျက်သွားမည်။"</string>
+    <string name="work_profile_confirm_remove_message" msgid="7593793549364168783">"ဤပရိုဖိုင်ရှိ appများအားလုံးနှင့် ဒေတာကို ဖျက်ပစ်မည်။"</string>
+    <string name="user_profile_confirm_remove_message" msgid="7373754145959298522">"appများ အားလုံး နှင့် ဒေတာကို ဖျက်သွားမည်။"</string>
     <string name="user_adding_new_user" msgid="1521674650874241407">"သုံးစွဲသူအသစ်ထည့်နေပါသည် …"</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"သုံးစွဲသူကိုဖျက်ရန်"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"ဖျက်ပါ"</string>
     <string name="user_guest" msgid="8475274842845401871">"ဧည့်သည်"</string>
-    <string name="user_exit_guest_title" msgid="5613997155527410675">"ဧည့်သည်ကို ဖယ်ထုတ်ရန်"</string>
-    <string name="user_exit_guest_confirm_title" msgid="3405527634738147409">"ဧည့်သည်ကို ဖယ်ထုတ်လိုက်ရမလား?"</string>
-    <string name="user_exit_guest_confirm_message" msgid="2194459201944413257">"ဒီချိတ်ဆက်မှု ထဲက appများ အားလုံး နှင့် ဒေတာကို ဖျက်ပစ်မည်။"</string>
+    <string name="user_exit_guest_title" msgid="5613997155527410675">"ဧည့်သည်ကို ဖယ်ထုတ်ရန်"</string>
+    <string name="user_exit_guest_confirm_title" msgid="3405527634738147409">"ဧည့်သည်ကို ဖယ်ထုတ်လိုက်ရမလား?"</string>
+    <string name="user_exit_guest_confirm_message" msgid="2194459201944413257">"ဒီချိတ်ဆက်မှု ထဲက appများ အားလုံး နှင့် ဒေတာကို ဖျက်ပစ်မည်။"</string>
     <string name="user_exit_guest_dialog_remove" msgid="6351370829952745350">"ဖယ်ထုတ်ပါ"</string>
-    <string name="user_enable_calling" msgid="8310589470979488255">"ဖုန်း ခေါ်ဆိုမှုများ ခွင့်ပြုရန်"</string>
-    <string name="user_enable_calling_sms" msgid="794823380737672333">"ဖုန်း ခေါ်ဆိုမှုများ နှင့် SMSကို ခွင့်ပြုရန်"</string>
+    <string name="user_enable_calling" msgid="8310589470979488255">"ဖုန်း ခေါ်ဆိုမှုများ ခွင့်ပြုရန်"</string>
+    <string name="user_enable_calling_sms" msgid="794823380737672333">"ဖုန်း ခေါ်ဆိုမှုများ နှင့် SMSကို ခွင့်ပြုရန်"</string>
     <string name="user_remove_user" msgid="6490483480937295389">"သုံးစွဲသူ ဖယ်ရှားမည်"</string>
-    <string name="user_enable_calling_confirm_title" msgid="440218975766968124">"ဖုန်း ခေါ်ဆိုမှုများ ခွင့်ပြုရမလား?"</string>
+    <string name="user_enable_calling_confirm_title" msgid="440218975766968124">"ဖုန်း ခေါ်ဆိုမှုများ ခွင့်ပြုရမလား?"</string>
     <string name="user_enable_calling_confirm_message" msgid="8061594235219352787">"ခေါ်ဆိုမှု မှတ်တမ်းကို ဒီအသုံးပြုသူကို မျှဝေပေးမည်။"</string>
-    <string name="user_enable_calling_sms_confirm_title" msgid="188164598768941316">"ဖုန်း ခေါ်ဆိုမှုများ နှင့် SMSကို ခွင့်ပြုရမလား?"</string>
-    <string name="user_enable_calling_sms_confirm_message" msgid="9101983352082865696">"ခေါ်ဆိုမှု နှင့် SMS မှတ်တမ်းကို ဒီအသုံးပြုသူနှင့် မျှဝေပေးမည်။"</string>
+    <string name="user_enable_calling_sms_confirm_title" msgid="188164598768941316">"ဖုန်း ခေါ်ဆိုမှုများ နှင့် SMSကို ခွင့်ပြုရမလား?"</string>
+    <string name="user_enable_calling_sms_confirm_message" msgid="9101983352082865696">"ခေါ်ဆိုမှု နှင့် SMS မှတ်တမ်းကို ဒီအသုံးပြုသူနှင့် မျှဝေပေးမည်။"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"အပလီကေးရှင်းနှင့် ပါရှိချက်များကို ခွင့်ပြုရန်"</string>
-    <string name="apps_with_restrictions_header" msgid="3660449891478534440">"ကန့်သတ်ချက်များရှိသော အပလီကေးရှင်းများ"</string>
+    <string name="apps_with_restrictions_header" msgid="3660449891478534440">"ကန့်သတ်ချက်များရှိသော အပလီကေးရှင်းများ"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"အပလီကေးရှင်းဆက်တင်းများကိုချဲ့ပြပါ"</string>
     <string name="home_app_uninstall_button" msgid="6808453012607962899">"ဤအပလီကေးရှင်းကို ပြန်ဖြုတ်ပါ"</string>
     <string name="only_one_home_message" msgid="3538846733750242759">"အခြား မူလစာမျက်နှာ အပလီကေးရှင်းကို သင် ထည့်သွင်းသည်အထိ မူလစာမျက်နှာ ဆက်တင်းများကို ဖွက်ထားမည်။"</string>
@@ -2248,22 +2261,22 @@
     <string name="user_account_title" msgid="1127193807312271167">"မာတိကာ အကောင့်"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"ဓာတ်ပုံ အမှတ်သညာ"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"လွန်ကဲ အန္တရာယ်များ"</string>
-    <string name="extreme_threats_summary" msgid="8777860706500920667">"အသက် နှင့် အိမ်မြေများ အတွက် လွန်ကဲသည့် အန္တရာယ်များကို ရယူရန်"</string>
-    <string name="severe_threats_title" msgid="8362676353803170963">"လွန်ကဲသည့် အန္တရာယ်များ"</string>
-    <string name="severe_threats_summary" msgid="8848126509420177320">"အသက် နှင့် အိမ်မြေများ အတွက် လွန်ကဲသည့် အန္တရာယ်များကို ရယူရန်"</string>
+    <string name="extreme_threats_summary" msgid="8777860706500920667">"အသက် နှင့် အိမ်မြေများ အတွက် လွန်ကဲသည့် အန္တရာယ်များကို ရယူရန်"</string>
+    <string name="severe_threats_title" msgid="8362676353803170963">"လွန်ကဲသည့် အန္တရာယ်များ"</string>
+    <string name="severe_threats_summary" msgid="8848126509420177320">"အသက် နှင့် အိမ်မြေများ အတွက် လွန်ကဲသည့် အန္တရာယ်များကို ရယူရန်"</string>
     <string name="amber_alerts_title" msgid="2772220337031146529">"AMBER သတိပေးချက်များ"</string>
     <string name="amber_alerts_summary" msgid="4312984614037904489">"ကလေး လူခိုးမှုများ ဆိုင်ရာ သတင်းလွှာကို ရယူရန်"</string>
     <string name="repeat_title" msgid="6473587828597786996">"ထပ်လုပ်ရန်"</string>
-    <string name="call_manager_enable_title" msgid="7718226115535784017">"ခေါ်ဆိုမှု မန်နေဂျာကို ဖွင့်ပေးရန်"</string>
-    <string name="call_manager_enable_summary" msgid="8458447798019519240">"ဒီကိရိယာအား သင်က ခေါ်ဆိုမှုများ လုပ်ကိုင်ပုံကို စီမံကွပ်ကဲခွင့် ပြုပါ။"</string>
+    <string name="call_manager_enable_title" msgid="7718226115535784017">"ခေါ်ဆိုမှု မန်နေဂျာကို ဖွင့်ပေးရန်"</string>
+    <string name="call_manager_enable_summary" msgid="8458447798019519240">"ဒီကိရိယာအား သင်က ခေါ်ဆိုမှုများ လုပ်ကိုင်ပုံကို စီမံကွပ်ကဲခွင့် ပြုပါ။"</string>
     <string name="call_manager_title" msgid="4479949569744516457">"ခေါ်ဆိုမှု မန်နေဂျာ"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2451014351355183338">"အရေးပေါ် ထုတ်လွှင့်မှုများ"</string>
+    <string name="cell_broadcast_settings" msgid="2451014351355183338">"အရေးပေါ် ထုတ်လွှင့်မှုများ"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"ကွန်ရက် အော်ပရေတာများ"</string>
     <string name="access_point_names" msgid="1381602020438634481">"ချိတ်ဆက် နေရာ အမည်များ"</string>
-    <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"မြှင့်တင်ထား 4G LTE မုဒ်"</string>
-    <string name="enhanced_4g_lte_mode_summary" msgid="1376589643017218924">"အသံ နှင့် ဆက်သွယ်ပြောဆိုမှုများကို မြှင့်တင်ရန် LTE ဒေတာကို အသုံးပြုပါ (အကြံပြုထား)"</string>
+    <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"မြှင့်တင်ထား 4G LTE မုဒ်"</string>
+    <string name="enhanced_4g_lte_mode_summary" msgid="1376589643017218924">"အသံ နှင့် ဆက်သွယ်ပြောဆိုမှုများကို မြှင့်တင်ရန် LTE ဒေတာကို အသုံးပြုပါ (အကြံပြုထား)"</string>
     <string name="preferred_network_type_title" msgid="3431041717309776341">"ပိုနှစ်သက်သော ကွန်ရက်အမျိုးအစား"</string>
     <string name="preferred_network_type_summary" msgid="6564884693884755019">"LTE (အကြံပြုထား)"</string>
     <string name="work_sim_title" msgid="4843322164662606891">"အလုပ် ဆင်းမ်"</string>
@@ -2278,7 +2291,7 @@
     <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"ဘလူးတုသ်"</string>
     <string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"ဘလူးတုသ် အတူတွဲချိတ်ခြင်းကို ပြင်ဆင်ရန်နှင့် ဆက်တင်များ"</string>
     <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"NFC"</string>
-    <string name="restriction_nfc_enable_summary_config" msgid="3232480757215851738">"ဒီ<xliff:g id="DEVICE_NAME">%1$s</xliff:g>က အခြား NFC ကိရိယာကို ထိချိန်မှာ ဒေတာ ဖလှယ်မှု ခွင့်ပြုရန်"</string>
+    <string name="restriction_nfc_enable_summary_config" msgid="3232480757215851738">"ဒီ<xliff:g id="DEVICE_NAME">%1$s</xliff:g>က အခြား NFC ကိရိယာကို ထိချိန်မှာ ဒေတာ ဖလှယ်မှု ခွင့်ပြုရန်"</string>
     <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"တက်ဘလက်နှင့် အခြားစက်ပစ္စည်း ထိလိုက်လျှင် အချက်အလက် ဖလှယ်ရန် ခွင့်ပြုသည်"</string>
     <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"ဖုန်းနှင့် အခြားစက်ပစ္စည်း ထိလိုက်လျှင် အချက်အလက် ဖလှယ်ရန် ခွင့်ပြုသည်"</string>
     <string name="restriction_location_enable_title" msgid="5020268888245775164">"တည်နေရာ"</string>
@@ -2299,11 +2312,13 @@
     <string name="sim_cellular_data_unavailable_summary" msgid="3654805961942166428">"ဒေတာ ဆင်းမ်ကို ရွေးရန် ထိပါ"</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"ခေါ်ဆိုမှုများ အတွက် အမြဲတမ်း ဒါကို သုံးရန်"</string>
     <string name="select_sim_for_data" msgid="2366081042162853044">"ဒေတာ အတွက် SIM ကို ရွေးရန်"</string>
-    <string name="select_sim_for_calls" msgid="3503094771801109334">"ဖြင့် ခေါ်ဆိုရန်"</string>
+    <string name="data_switch_started" msgid="2040761479817166311">"ဒေတာ SIM သို့ပြောင်းနေသည်၊ ၎င်းသည် တစ်မိနစ်ခန့်ကြာနိုင်သည်..."</string>
+    <string name="select_sim_for_calls" msgid="3503094771801109334">"ဖြင့် ခေါ်ဆိုရန်"</string>
     <string name="sim_select_card" msgid="211285163525563293">"ဆင်းမ် ကဒ်ကို ရွေးရန်"</string>
     <string name="sim_card_number_title" msgid="7845379943474336488">"ဆင်းမ် <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"ဆင်းမ်ကဒ် မရှိ"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"ဆင်းမ် အမည်"</string>
+    <string name="sim_name_hint" msgid="7038643345238968930">"ဆင်းမ်အမည် ရိုက်ထည့်ပါ"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"ဆင်းမ် အထိုင် %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"စီမံပေးသူ"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"နံပါတ်"</string>
@@ -2311,18 +2326,20 @@
     <string name="sim_card_select_title" msgid="6668492557519243456">"ဆင်းမ် ကဒ်ကို ရွေးရန်"</string>
     <string name="color_orange" msgid="4417567658855022517">"လိမ္မော်"</string>
     <string name="color_purple" msgid="3888532466427762504">"ခရမ်း"</string>
-    <string name="sim_no_inserted_msg" msgid="210316755353227087">"ဆင်းမ် ကဒ်များ မထည့်သွင်းရသေး"</string>
+    <string name="sim_no_inserted_msg" msgid="210316755353227087">"ဆင်းမ် ကဒ်များ မထည့်သွင်းရသေး"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"ဆင်းမ် အခြေအနေ"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"ဆက်စပ် ဆင်းမ် အချက်အလက်များ မရှိ"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"ပုံသေ ဆင်းမ်ထံမှ ပြန်ခေါ်ဆိုမှု"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"အပြင်သို့ ခေါ်ဆိုမှု အတွက် ဆင်းမ်"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"ခေါ်ဆိုမှုဆိုင်ရာ တခြား ဆက်တင်"</string>
-    <string name="preferred_network_offload_title" msgid="1605829724169550275">"ပိုနှစ်သက်သည့် ကွန်ရက် ဖြုတ်ချမှု"</string>
-    <string name="preferred_network_offload_header" msgid="2321173571529106767">"ကွန်ရက် အမည် ထုတ်လွှင့်မှု ပိတ်ထားမှု"</string>
-    <string name="preferred_network_offload_footer" msgid="5857279426054744020">"ကွန်ရက် အမည် ထုတ်လွှင့်မှု ပိတ်ထားမှုက သင်၏ ကွန်ရက် အချက်အလက်များကို အခြားသူတို့မှ ရယူများမှ ကာကွယ်ပေးသည်။"</string>
-    <string name="preferred_network_offload_popup" msgid="2252915199889604600">"ကွန်ရက် အမည် ထုတ်လွှင့်မှု ပိတ်ထားမှုက ဝှက်ထားသည့် ကွန်ရက်များသို့ အလိုအလျောက် ချိတ်ဆက်မှုကို ဟန့်တားပေးမည်။"</string>
+    <string name="preferred_network_offload_title" msgid="1605829724169550275">"ပိုနှစ်သက်သည့် ကွန်ရက် ဖြုတ်ချမှု"</string>
+    <string name="preferred_network_offload_header" msgid="2321173571529106767">"ကွန်ရက် အမည် ထုတ်လွှင့်မှု ပိတ်ထားမှု"</string>
+    <string name="preferred_network_offload_footer" msgid="5857279426054744020">"ကွန်ရက် အမည် ထုတ်လွှင့်မှု ပိတ်ထားမှုက သင်၏ ကွန်ရက် အချက်အလက်များကို အခြားသူတို့မှ ရယူများမှ ကာကွယ်ပေးသည်။"</string>
+    <string name="preferred_network_offload_popup" msgid="2252915199889604600">"ကွန်ရက် အမည် ထုတ်လွှင့်မှု ပိတ်ထားမှုက ဝှက်ထားသည့် ကွန်ရက်များသို့ အလိုအလျောက် ချိတ်ဆက်မှုကို ဟန့်တားပေးမည်။"</string>
+    <string name="sim_signal_strength" msgid="9144010043784767984">"<xliff:g id="DBM">%1$d</xliff:g> dBm <xliff:g id="ASU">%2$d</xliff:g> asu"</string>
+    <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>
+    <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>
@@ -2331,39 +2348,39 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"မကြာမီက ရှာဖွေမှုများ"</string>
     <string name="search_results_label" msgid="4163304782363526148">"ရလဒ်များ"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"ဝိုင်ဖိုင်ကွန်ရက်ချိတ်ဆက်မှုဖြင့်"</string>
-    <string name="keywords_more_default_sms_app" msgid="2744404159003574745">"စာတို"</string>
-    <string name="keywords_more_mobile_networks" msgid="7813380887358745769">"ဆယ်လူလာ ဆဲလ် စီမံပေးသူ ကြိုးမဲ့"</string>
-    <string name="keywords_home" msgid="3626170808219458848">"ဖွင့်တင်ပေးသူ"</string>
+    <string name="keywords_more_default_sms_app" msgid="895656981962034647">"စာတို စာ စာတိုပို့ခြင်း စာများ စာပို့ခြင်း"</string>
+    <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"ဆဲလ်လူလာ ဆဲလ် မိုဘိုင်းဆက်သွယ်ရေးဝန်ဆောင်မှုဌာန ကြိုးမဲ့ ဒေတာ 4g 3g 2g lte"</string>
+    <string name="keywords_home" msgid="3626170808219458848">"ဖွင့်တင်ပေးသူ"</string>
     <string name="keywords_display" msgid="6709007669501628320">"မျက်နှာပြင် တာ့ချမျက်နှာပြင်"</string>
-    <string name="keywords_display_brightness_level" msgid="8636451602230815191">"မျက်နှာပြင် တာ့ချမျက်နှာပြင် မှိန်းပေးရန်"</string>
-    <string name="keywords_display_auto_brightness" msgid="8070218600502753102">"မျက်နှာပြင် တာ့ချမျက်နှာပြင် မှိန်းပေးရန်"</string>
-    <string name="keywords_display_wallpaper" msgid="4315466287469834939">"နောက်ခံ"</string>
+    <string name="keywords_display_brightness_level" msgid="8923289340474728990">"မြင်ကွင်းမိန်ခြင်း ထိတွေ့မြင်ကွင်း ဘတ်ထရီ"</string>
+    <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"မြင်ကွင်းမိန်ခြင်း ထိတွေ့မြင်ကွင်း ဘတ်ထရီ"</string>
+    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"အသုံးပြုသူစိတ်ကြိုက် ပြုလုပ်ထားသည့် နောက်ခံဖော်ပြချက်"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"စာလုံးအရွယ်အစား"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"စီမံကိန်း"</string>
-    <string name="keywords_storage" msgid="7007275853993419928">"နေရာ ဒီက်က် ဟာ့ဒ် ဒရိုက်ဗ်"</string>
-    <string name="keywords_battery" msgid="3992479295298655138">"ထပ်ကိန်း"</string>
-    <string name="keywords_spell_checker" msgid="4509482591225399210">"စာလုံးပေါင်း"</string>
+    <string name="keywords_storage" msgid="6572905220031852173">"နေရာ ဒစ် ဟက်ဒရိုက် စက်ပစ္စည်း အသုံးပြုမှု"</string>
+    <string name="keywords_battery" msgid="2096185085932675704">"ပါဝါအသုံးပြုမှု အားသွင်းခြင်း"</string>
+    <string name="keywords_spell_checker" msgid="6106749039734174140">"စာလုံးပေါင်း အဘိဓာန် သတ်ပုံစစ် အလိုအလျောက်အမှားပြင်"</string>
     <string name="keywords_voice_input" msgid="3519547605812413860">"သိမှတ်သူ ရိုက်သွင်းမှု နှုတ်စကား ပြောကြား ဘာသာစကား ဟန်းဖရီး သိမှတ်ရေး စော်ကားသော စကားလုံး အသံ မှတ်တမ်း ဘလူးတုသ် ဟက်ဆက်"</string>
-    <string name="keywords_text_to_speech_output" msgid="8207889472282225512">"နှုန်း ဘာသာစကား ပုံသေ ပြော ပြောနေ"</string>
-    <string name="keywords_date_and_time" msgid="7666950126499155141">"နာရီ"</string>
-    <string name="keywords_factory_data_reset" msgid="3693730656843989732">"ပွတ်တိုက် ဖျက်ရန်"</string>
+    <string name="keywords_text_to_speech_output" msgid="392447904221657930">"အဆင့်သတ်မှတ်ခြင်း ဘာသာစကား ပုံမှန် စကားပြော စကားပြောခြင်း tts အသုံးပြုနိုင်စွမ်း ဖတ်ကိရိယာ မျက်မမြင်"</string>
+    <string name="keywords_date_and_time" msgid="2631808108134830066">"စစ်တပ် နာရီ"</string>
+    <string name="keywords_factory_data_reset" msgid="4355133848707691977">"ရှင်းလင်း ဖျက် ပြန်လည်သိုလှေင် ရှင်း ဖယ်ရှား"</string>
     <string name="keywords_printing" msgid="1701778563617114846">"ပရင်တာ"</string>
     <string name="keywords_sounds_and_notifications" msgid="5965996187974887000">"စပီကာ မြည်သံ"</string>
-    <string name="keywords_sounds_and_notifications_interruptions" msgid="2912933812460077912">"မလုပ်နဲ့ မလုပ်ပါနှင့် နှောင့်ယှက် ကြားဖြတ်ဝင် ကြားဖြတ်ဝင်မှု ချိုးဖောက်"</string>
+    <string name="keywords_sounds_and_notifications_interruptions" msgid="2912933812460077912">"မလုပ်နဲ့ မလုပ်ပါနှင့် နှောင့်ယှက် ကြားဖြတ်ဝင် ကြားဖြတ်ဝင်မှု ချိုးဖောက်"</string>
     <string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
     <string name="keywords_location" msgid="782326973714313480">"အနီးတဝိုက် တည်နေရာ မှတ်တမ်း အစီရင်ခံနေ"</string>
     <string name="keywords_location_mode" msgid="8584992704568356084">"တိကျမှု"</string>
-    <string name="keywords_accounts" msgid="1957925565953357627">"အကောင့်"</string>
-    <string name="keywords_users" msgid="4673901601478559100">"ကန့်သတ်မှု ကန့်သတ် ကန့်သတ်ထား"</string>
-    <string name="keywords_keyboard_and_ime" msgid="1103378692379215672">"စာသား ပြင်ပေးမှု ပြင်ရန် အသံ တုန်ခါမှု အော်တို ဘာသာစကား လက်ဟန် အကြံပေး အကြံပေးချက် အပြင်ဆင် စော်ကားသည့် စကားလုံး ပုံစံ အီမိုဂျီ"</string>
+    <string name="keywords_accounts" msgid="1957925565953357627">"အကောင့်"</string>
+    <string name="keywords_users" msgid="4673901601478559100">"ကန့်သတ်မှု ကန့်သတ် ကန့်သတ်ထား"</string>
+    <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"စာတို အမှားပြင်ဆင်ခြင်း အမှန် အသံ တုန်ခါခြင်း အလိုအလျောက် ဘာသာစကား အမူအရာ အကြံပေး အကြံပြုခြင်း ပုံစံ ထိခိုက်နစ်နာစေသော စကားလုံး စာရိုက် အီမိုဂျီရုပ်ပုံ အပြည်ပြည်ဆိုင်ရာ"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"စကားဝှက် ပုံစံ ပင်ကို ရွှေ့ရန်"</string>
-    <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"ကြိုးမဲ့ NFC တဲဂ်ကို စဖွင့်သတ်မှတ်ရန်"</string>
+    <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"ကြိုးမဲ့ NFC တဲဂ်ကို စဖွင့်သတ်မှတ်ရန်"</string>
     <string name="write_tag" msgid="8571858602896222537">"ရေးရန်"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"ရေးရန် တဲဂ် တစ်ခုကို ပုပ်ပါ..."</string>
     <string name="status_invalid_password" msgid="2575271864572897406">"စကားဝှက် မမှန်ပါ၊ ထပ် စမ်းပါ။"</string>
     <string name="status_write_success" msgid="5228419086308251169">"အောင်မြင်သွားပြီ!"</string>
-    <string name="status_failed_to_write" msgid="8072752734686294718">"NFC တဲဂ် သို့  ဒေတာကို ရေးထည့် မရခဲ့ပါ။ ပြဿနာ ဆက်ရှိနေလျှင်၊ အခြား တဲဂ် တစ်ခုကို စမ်းကြည့်ပါ"</string>
-    <string name="status_tag_not_writable" msgid="2511611539977682175">"NFC တဲဂ်မှာ ရေးမရနိုင်ပါ။ ကျေးဇူးပြုပြီး အခြား တဲဂ် တစ်ခုကို စမ်းကြည့်ပါ။"</string>
+    <string name="status_failed_to_write" msgid="8072752734686294718">"NFC တဲဂ် သို့  ဒေတာကို ရေးထည့် မရခဲ့ပါ။ ပြဿနာ ဆက်ရှိနေလျှင်၊ အခြား တဲဂ် တစ်ခုကို စမ်းကြည့်ပါ"</string>
+    <string name="status_tag_not_writable" msgid="2511611539977682175">"NFC တဲဂ်မှာ ရေးမရနိုင်ပါ။ ကျေးဇူးပြုပြီး အခြား တဲဂ် တစ်ခုကို စမ်းကြည့်ပါ။"</string>
     <string name="default_sound" msgid="8821684447333687810">"ပုံသေ အသံ"</string>
     <string name="notification_settings" msgid="8791730980212496561">"အသံနှင့် အကြောင်းကြားချက်"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"မီဒီယာ ပမာဏ"</string>
@@ -2371,11 +2388,10 @@
     <string name="ring_volume_option_title" msgid="6767101703671248309">"ဖုန်းမြည်သံ ပမာဏ"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"အကြောင်းကြားချက်သံ ပမာဏ"</string>
     <string name="zen_mode_settings_title" msgid="7014915558669122902">"ကြားဖြတ်ဖုန်းဝင်မှု"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"ခေါ်ဆိုမှုများ နှင့် အကြောင်းကြားချက်များ ဝင်လာလျှင်"</string>
-    <string name="zen_mode_option_title_novoice" msgid="6680706009915204785">"အကြောင်းကြားချက်များ  ဝင်လာလျှင်"</string>
+    <string name="zen_mode_option_title" msgid="5061978632306007914">"ခေါ်ဆိုမှုများ နှင့် အကြောင်းကြားချက်များ ဝင်လာလျှင်"</string>
     <string name="zen_mode_option_off" msgid="3167702608910820883">"အမြဲတမ်း ကြားဖြတ်ဖုန်းဝင်ခွင့်ပေးရန်"</string>
-    <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"ဦးစားပေး ကြားဖြတ်ဖုန်းဝင်မှုများသာ ခွင့်ပြုရန်"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"ကြားဖြတ်ဖုန်း မဝင်ပါနှင့်"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"ဦးစားပေး ကြားဖြတ်ဖုန်းဝင်မှုများသာ ခွင့်ပြုရန်"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"ကြားဖြတ်ဖုန်း မဝင်ပါနှင့်"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"ဖုန်းဝင်တီးလုံး"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"အကြောင်းကြားချက် တီးလုံး"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"ဖုန်းဝင်လျှင် တုန်ခါရန်"</string>
@@ -2383,8 +2399,8 @@
     <string name="notification_pulse_title" msgid="1247988024534030629">"အကြောင်းကြားချက်ရှိလျှင် မီးမှိတ်တုပ်ဖွင့်ရန်"</string>
     <string name="lock_screen_notifications_title" msgid="9118805570775519455">"ကိရိယာကို သော့ပိတ်ထားစဉ်"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"အသိပေးချက် အကြောင်းအရာ အားလုံးကို ပြမည်"</string>
-    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"သိမ်မွေ့သည့် အသိပေးချက် အကြောင်းအရာကို ဝှက်ထားရန်"</string>
-    <string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"အသိပေးချက်များကို လုံးဝ မပြပါနှင့်"</string>
+    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"သိမ်မွေ့သည့် အသိပေးချက် အကြောင်းအရာကို ဝှက်ထားရန်"</string>
+    <string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"အသိပေးချက်များကို လုံးဝ မပြပါနှင့်"</string>
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"သင်၏ ကိရိယာကို သော့ပိတ်ထားလျှင်၊ အကြောင်းကြားချက်များကို သင် ဘယ်လို ပြစေလိုပါသလဲ?"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"အက်ပ် အသိပေးချက်များ"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"အခြားအသံများ"</string>
@@ -2399,7 +2415,7 @@
     <string name="emergency_tone_silent" msgid="1067515631635824291">"အသံတိတ်ရန်"</string>
     <string name="emergency_tone_alert" msgid="8941852695428130667">"သတိပေးချက်"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"တုန်ခါရန်"</string>
-    <string name="manage_notification_access_title" msgid="7510080164564944891">"အကြောင်းကြားချက်ကို ဖွင့်သုံးခြင်း"</string>
+    <string name="manage_notification_access_title" msgid="7510080164564944891">"အကြောင်းကြားချက်ကို ဖွင့်သုံးခြင်း"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"အကြောင်းကြားချက်များကို အပလီကေးရှင်းများက မဖတ်နိုင်ပါ။"</string>
   <plurals name="manage_notification_access_summary_nonzero">
     <item quantity="one" msgid="8344183614159211585">"%d အပလီကေးရှင်းသည် အကြောင်းကြားချက်များကို ဖတ်နိုင်သည်။"</item>
@@ -2409,17 +2425,17 @@
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"<xliff:g id="SERVICE">%1$s</xliff:g> ကိုဖွင့်မည်လား?"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> သည် စနစ် သို့မဟုတ် ထည့်သွင်းထားသော အပလီကေးရှင်းက ပို့သည့် အကြောင်းကြားချက်များအား ဖတ်နိုင်လိမ့်မည်၊၎င်းတွင် အဆက်အသွယ်၏ အမည်များနှင့် သင့်ကိုပို့ထားသည့်စာများ စသည့် ကိုယ်ရေးကိုယ်တာအချက်အလက်များ ပါ၀င်သည်။ ထိုအကြောင်းကြားချက်များကိုလည်း ထုတ်ပစ်နိုင်သည် သို့မဟုတ် ၎င်းတို့အတွင်းမှာ ပါရှိသော လုပ်ဆောင်ချက်ခလုတ်များကို နှိပ်လိုက်ပါ။"</string>
     <string name="manage_condition_providers" msgid="3039306415273606730">"အခြေအနေများကို စီမံပေးသူများ"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"မည်သည့် appကမှ အခြေအနေများကို စီမံမပေးပါ"</string>
+    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"မည်သည့် appကမှ အခြေအနေများကို စီမံမပေးပါ"</string>
   <plurals name="manage_condition_providers_summary_nonzero">
     <item quantity="one" msgid="7871716594997778198">"%d app အခြေအနေများကို စီမံပေးရန်"</item>
     <item quantity="other" msgid="358057362115673258">"%d app အခြေအနေများကို စီမံပေးရန်"</item>
   </plurals>
     <string name="no_condition_providers" msgid="6183782892066424125">"အခြေအနေ စီမံပေးသူများ တပ်ဆင် မထားပါ။"</string>
     <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"<xliff:g id="SERVICE">%1$s</xliff:g> ကိုဖွင့်မည်လား?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> သည် မနှောင့်ယှက်ပါနှင့် မုဒ် အထဲမှ ထွက်ရေး အခြေအနေများကို ထည့်ပေးနိုင်မည်။"</string>
+    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> သည် မနှောင့်ယှက်ပါနှင့် မုဒ် အထဲမှ ထွက်ရေး အခြေအနေများကို ထည့်ပေးနိုင်မည်။"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"appများကို တင်နေ..."</string>
     <string name="app_notification_block_title" msgid="172237877395761371">"ပိတ်ဆို့ရန်"</string>
-    <string name="app_notification_block_summary" msgid="9049487483231233726">"ဒီappမှ အကြောင်းကြားချက်များကို ဘယ်တော့မှ မပြနှင့်"</string>
+    <string name="app_notification_block_summary" msgid="9049487483231233726">"ဒီappမှ အကြောင်းကြားချက်များကို ဘယ်တော့မှ မပြနှင့်"</string>
     <string name="app_notification_priority_title" msgid="1967189807102076587">"ဦးစားပေးမှု"</string>
     <string name="app_notification_priority_summary" msgid="7513344552201639232">"အကြောင်းကြားချက်များကို စာရင်း ထိပ်မှာ တင်ထားကာ ကိရိယာကို ဦးစားပေး ကြားဖြတ်ဝင်မှုများ အတွက်သာ ဆိုပြီး သတ်မှတ်ထားလျှင် ၎င်းတို့ကို လက်ခံရယူနေရန်"</string>
     <string name="app_notification_sensitive_title" msgid="7707233094233553192">"သိမ်မွေ့သော"</string>
@@ -2428,30 +2444,35 @@
     <string name="app_notification_row_priority" msgid="7723839972982746568">"ဦးစားပေးမှု"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"သိမ်မွေ့သော"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"လုပ်ပြီး"</string>
-    <string name="zen_mode_default_option" msgid="6940069025071935243">"သင်က မပိတ်လိုက်သည့် အထိ"</string>
+    <string name="zen_mode_default_option" msgid="6940069025071935243">"သင်က မပိတ်လိုက်သည့် အထိ"</string>
     <string name="zen_mode_important_category" msgid="8123274463331022993">"ဦးစားပေး  ကြားဖြတ်ဖုန်းဝင်မှုများ"</string>
-    <string name="zen_mode_downtime_category" msgid="4730179065426038108">"ဖုန်းပိတ်ချိန် (ဦးစားပေး ကြားဖြတ်ဖုန်းများသာ)"</string>
+    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"ကျချိန်"</string>
     <string name="zen_mode_downtime_days" msgid="3361856902633311616">"ရက်"</string>
     <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"မရှိ"</string>
+    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"ကြားဖြတ်ခြင်းများ ခွင့်ပြုသည်"</string>
+    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"ဦးစားပေးများသာ"</string>
+    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"မရှိ"</string>
     <string name="zen_mode_automation_category" msgid="4653551005950835761">"အော်တိုမက်တစ် ပြုလုပ်ခြင်း"</string>
-    <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"အလိုအလျောက် ဖွင့်ရန်"</string>
+    <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"အလိုအလျောက် ဖွင့်ရန်"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">"၊ "</string>
-    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"မည်သည့်အခါမှ"</string>
-    <string name="zen_mode_phone_calls" msgid="8956214416859303966">"ခေါ်ဆိုမှုများ"</string>
+    <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"မည်သည့်အခါမှ"</string>
+    <string name="zen_mode_calls" msgid="7051492091133751208">"ခေါ်ဆိုမှုများ"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"စာများ"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"...ထံမှ ခေါ်ဆိုမှုများ/စာများ"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"မည်သူမဆို"</string>
     <string name="zen_mode_from_contacts" msgid="8751503728985572786">"အဆက်အသွယ်များ သာလျှင်"</string>
     <string name="zen_mode_from_starred" msgid="2168651127340381533">"ကြယ်တပ် အဆက်အသွယ်များ သာလျှင်"</string>
-    <string name="zen_mode_events" msgid="2456995649835437565">"ဖြစ်ရပ်များ နှင့် သတိပေးချက်များ"</string>
+    <string name="zen_mode_events" msgid="2456995649835437565">"ဖြစ်ရပ်များ နှင့် သတိပေးချက်များ"</string>
     <string name="zen_mode_alarm_info" msgid="3195430795475795398">"နှိုးစက်များကို ကြားဖြတ် ဝင်လာမှုများထဲမှာ အမြဲတမ်း ဦးစားပေးသည်"</string>
-    <string name="zen_mode_when" msgid="2767193283311106373">"အလိုအလျောက် ဖွင့်ရန်"</string>
-    <string name="zen_mode_when_never" msgid="8809494351918405602">"မည်သည့်အခါမှ"</string>
+    <string name="zen_mode_when" msgid="2767193283311106373">"အလိုအလျောက် ဖွင့်ရန်"</string>
+    <string name="zen_mode_when_never" msgid="8809494351918405602">"မည်သည့်အခါမှ"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"ညတိုင်း"</string>
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"ရုံးရက်ညများ"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"စတင်ချိန်"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"ပြီးဆုံးချိန်"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"နောက်နေ့ <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
+    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> နောက်န​ေ့"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> သို့မဟုတ် ၎င်းမတိုင်ခင် နှိုးစက်များ"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> နောက်တစ်နေ့ သို့မဟုတ် ထို့န​ေ့မတိုင်ခင် နှိုးစက်များ"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"App အကြောင်းကြားချက်များ"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"အကြောင်းကြားချက် ဆက်တင်များ"</string>
     <string name="device_feedback" msgid="3238056036766293294">"ဤကိရိယာအတွက် အကြံပြုချက် ပို့ရန်"</string>
@@ -2459,21 +2480,24 @@
     <string name="switch_on_text" msgid="1124106706920572386">"ပွင့်"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"ပိတ်"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"မျက်နှာပြင်ကို ပင်ထိုးပေးခြင်း"</string>
-    <string name="screen_pinning_description" msgid="7091642350452605379">"ဖွင့်လိုက်သည့် အခါမှာ၊ သင်သည် လက်ရှိ မျက်နှာပြင်၏ မြင်ကွင်းကို၊ သင်က ပင်ထိုးမှုကို မဖြုတ်မချင်း၊ ဆက်ထားရှိရန် သင်သည် မျက်နှာပြင် ပင်ထိုးမှုကို အသုံးပြုနိုင်သည်။\n\nမျက်နှာပြင် ပင်ထိုးမှုကို သုံးရန်:\n\n၁။ မျက်နှာပြင် ပင်ထိုးမှုကို ဖွင့်ထားတာ စစ်ဆေးကြည့်ပါ။\n\n၂။ သင်က ပင်ထိုးလိုသည့် မျက်နှာပြင်ကို ဖွင့်လိုက်ပါ။\n\n၃။ ခြုံကြည့်မှုကို ထိလိုက်ပါ။\n\n၄။ ပင် အိုင်ကွန်ကို ထိလိုက်ပါ။"</string>
+    <string name="screen_pinning_description" msgid="1137904524037468263">"ဤချိန်ညှိချက်အား ဖွင့်ထားလျှင်၊ သင်ပင်ဖြုတ်သည်အထိ မျက်နှာပြင် ပင်ထိုးမှုကို လက်ရှိမျက်နှာပြင် မြင်ကွင်းတွင် ရှိနေစေရန် အသုံးပြုနိင်သည် ။ \n\nမျက်နှာပြင် ပင်ထိုးမှု အသုံးပြုရန်:\n\n1။ မျက်နှာပြင် ပင်ထိုးမှုဖွင့်ထားကြောင်း သေချာစေပါ။\n\n2။ သင်ပင်ထိုးလိုသည့် မျက်နှာပြင်ကို ဖွင့်ပါ။\n\n3။ ခြုံငုံကြည့်ခြင်းအား ထိပါ။\n\n4။ အပေါ်သို့ပွတ်ဆွဲကာ ပင်အိုင်ကွန်အား ထိပါ။"</string>
+    <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"ပင်မဖြုတ်မီမှာ သော့ဖွင့် ပုံစံကွက်ကို မေးရန်"</string>
+    <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"ပင်မဖြုတ်မီမှာ PIN ကို မေးရန်"</string>
+    <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"ပင်မဖြုတ်မီမှာ စကားဝှက်ကို မေးကြည့်ရန်"</string>
+    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"သော့ခတ်ကိရိယာ ပင်ထိုးမှုဖြုတ်နေ"</string>
     <string name="managed_user_title" msgid="8101244883654409696">"အလုပ် ပရိုဖိုင်"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(စမ်းသပ်ရေး)"</string>
-    <string name="display_auto_rotate_title" msgid="6176450657107806043">"ကိရိယာကို လှည့်သည့် အခါမှာ"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"မျက်နှာပြင် အကြောင်းအရာ လှည့်ပြရန်"</string>
+    <string name="display_auto_rotate_title" msgid="6176450657107806043">"ကိရိယာကို လှည့်သည့် အခါမှာ"</string>
+    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"မျက်နှာပြင် အကြောင်းအရာ လှည့်ပြရန်"</string>
     <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"ဒေါင်လိုက် မြင်ကွင်း ထဲမှာ ရှိနေရန်"</string>
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"ဘေးတိုက် မြင်ကွင်း ထဲမှာ ရှိနေရန်"</string>
-    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"လက်ရှိ လှည့်ထားမှုအတိုင်း ရှိနေရန်"</string>
+    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"လက်ရှိ လှည့်ထားမှုအတိုင်း ရှိနေရန်"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI အချက်အလက်များ"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI ဆက်စပ် အချက်အလက်များ"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"လျှို့ဝှက်ကုဒ်သွင်းခြင်း"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"ဆက်သွားရန်"</string>
-    <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"ဤစက်ပစ္စည်းအား စဖွင့်သတ်မှတ်ခြင်းမပြုမီ PIN အသုံးပြုခြင်းဖြင့် ထပ်လောင်း ကာကွယ်နိုင်သည်။ ဤစက်ပစ္စည်းအား စဖွင့်သတ်မှတ်မည့်အချိန်အထိ၊ နှိုးစက်များ အပါအဝင် အသိပေးချက်များ၊ စာတိုများနှင့် ဖုန်းခေါ်ဆိုခြင်းများ လက်ခံရယူနိုင်ခြင်း မရှိပါ။\n\nဤနည်းဖြင့် ​ဒေတာ ပျောက်ဆုံးခြင်း သို့မဟုတ် စက်ပစ္စည်းအား ခိုးယူခံရခြင်းများမှ ကာကွယ်နိုင်သည်။"</string>
-    <string name="encryption_interstitial_message_pattern" msgid="2944051427890104942">"ဤစက်ပစ္စည်းအား စဖွင့်သတ်မှတ်ခြင်းမပြုမီ ရေးဆွဲပုံစံအသုံးပြုခြင်းဖြင့် ထပ်လောင်း ကာကွယ်နိုင်သည်။ ဤစက်ပစ္စည်းအား စဖွင့်သတ်မှတ်မည့်အချိန်အထိ၊ နှိုးစက်များ အပါအဝင် အသိပေးချက်များ၊ စာတိုများနှင့် ဖုန်းခေါ်ဆိုခြင်းများ လက်ခံရယူနိုင်ခြင်း မရှိပါ။\n\nဤနည်းဖြင့် ​ဒေတာ ပျောက်ဆုံးခြင်း သို့မဟုတ် စက်ပစ္စည်းအား ခိုးယူခံရခြင်းများမှ ကာကွယ်နိုင်သည်။"</string>
-    <string name="encryption_interstitial_message_password" msgid="1439296580879440802">"ဤစက်ပစ္စည်းအား စဖွင့်သတ်မှတ်ခြင်းမပြုမီ လျှို့ဝှက်ကုဒ်ထည့်သွင်းခြင်းဖြင့် ထပ်လောင်း ကာကွယ်နိုင်သည်။ ဤစက်ပစ္စည်းအား စဖွင့်သတ်မှတ်မည့်အချိန်အထိ၊ နှိုးစက်များ အပါအဝင် အသိပေးချက်များ၊ စာတိုများနှင့် ဖုန်းခေါ်ဆိုခြင်းများ လက်ခံရယူနိုင်ခြင်း မရှိပါ။\n\nဤနည်းဖြင့် ​ဒေတာ ပျောက်ဆုံးခြင်း သို့မဟုတ် စက်ပစ္စည်းအား ခိုးယူခံရခြင်းများမှ ကာကွယ်နိုင်သည်။"</string>
+    <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"ဤစက်ပစ္စည်းအား စဖွင့်သတ်မှတ်ခြင်းမပြုမီ PIN အသုံးပြုခြင်းဖြင့် ထပ်လောင်း ကာကွယ်နိုင်သည်။ ဤစက်ပစ္စည်းအား စဖွင့်သတ်မှတ်မည့်အချိန်အထိ၊ နှိုးစက်များ အပါအဝင် အသိပေးချက်များ၊ စာတိုများနှင့် ဖုန်းခေါ်ဆိုခြင်းများ လက်ခံရယူနိုင်ခြင်း မရှိပါ။\n\nဤနည်းဖြင့် ​ဒေတာ ပျောက်ဆုံးခြင်း သို့မဟုတ် စက်ပစ္စည်းအား ခိုးယူခံရခြင်းများမှ ကာကွယ်နိုင်သည်။"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="2944051427890104942">"ဤစက်ပစ္စည်းအား စဖွင့်သတ်မှတ်ခြင်းမပြုမီ ရေးဆွဲပုံစံအသုံးပြုခြင်းဖြင့် ထပ်လောင်း ကာကွယ်နိုင်သည်။ ဤစက်ပစ္စည်းအား စဖွင့်သတ်မှတ်မည့်အချိန်အထိ၊ နှိုးစက်များ အပါအဝင် အသိပေးချက်များ၊ စာတိုများနှင့် ဖုန်းခေါ်ဆိုခြင်းများ လက်ခံရယူနိုင်ခြင်း မရှိပါ။\n\nဤနည်းဖြင့် ​ဒေတာ ပျောက်ဆုံးခြင်း သို့မဟုတ် စက်ပစ္စည်းအား ခိုးယူခံရခြင်းများမှ ကာကွယ်နိုင်သည်။"</string>
+    <string name="encryption_interstitial_message_password" msgid="1439296580879440802">"ဤစက်ပစ္စည်းအား စဖွင့်သတ်မှတ်ခြင်းမပြုမီ လျှို့ဝှက်ကုဒ်ထည့်သွင်းခြင်းဖြင့် ထပ်လောင်း ကာကွယ်နိုင်သည်။ ဤစက်ပစ္စည်းအား စဖွင့်သတ်မှတ်မည့်အချိန်အထိ၊ နှိုးစက်များ အပါအဝင် အသိပေးချက်များ၊ စာတိုများနှင့် ဖုန်းခေါ်ဆိုခြင်းများ လက်ခံရယူနိုင်ခြင်း မရှိပါ။\n\nဤနည်းဖြင့် ​ဒေတာ ပျောက်ဆုံးခြင်း သို့မဟုတ် စက်ပစ္စည်းအား ခိုးယူခံရခြင်းများမှ ကာကွယ်နိုင်သည်။"</string>
     <string name="encrypt_require_pin" msgid="2063945047845243752">"စက်ပစ္စည်း စတင်ရန် PIN လိုအပ်၏"</string>
     <string name="encrypt_require_pattern" msgid="6898479411004015810">"စက်ပစ္စည်း စတင်ရန် ရေးဆွဲပုံစံ လိုအပ်၏"</string>
     <string name="encrypt_require_password" msgid="8770628366276570518">"စက်ပစ္စည်း စတင်ရန် လျှို့ဝှက်ကုဒ် လိုအပ်၏"</string>
@@ -2483,7 +2507,10 @@
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"PIN လိုပါသလား?"</string>
     <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"ရေးဆွဲပုံစံ လိုပါသလား?"</string>
     <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"လျှို့ဝှက်ကုဒ် လိုပါသလား?"</string>
-    <string name="encrypt_talkback_dialog_message_pin" msgid="1890374082842868489">"ဤစက်ပစ္စည်း စရန် သင့် PIN  ရိုက်ထည့်ပြီးသောအခါ၊<xliff:g id="SERVICE">%1$s</xliff:g> ကဲ့သို့သော ရယူသုံးခွင့်ရှိ ဝန်ဆောင်မှုများအား သုံးနိုင်မည်မဟုတ်သေးပါ။"</string>
-    <string name="encrypt_talkback_dialog_message_pattern" msgid="4474332516537386384">"ဤစက်ပစ္စည်း စရန် သင့် ပုံဆွဲရေးဆွဲပြီး သော့ဖွင့်သောအခါ၊<xliff:g id="SERVICE">%1$s</xliff:g> ကဲ့သို့သော ရယူသုံးခွင့်ရှိ ဝန်ဆောင်မှုများအား သုံးနိုင်မည်မဟုတ်သေးပါ။"</string>
-    <string name="encrypt_talkback_dialog_message_password" msgid="8166099418487083927">"ဤစက်ပစ္စည်း စရန် သင့် လျှို့ဝှက်ကုဒ် ရိုက်သွင်းသောအခါ၊<xliff:g id="SERVICE">%1$s</xliff:g> ကဲ့သို့သော ရယူသုံးခွင့်ရှိ ဝန်ဆောင်မှုများအား သုံးနိုင်မည်မဟုတ်သေးပါ။"</string>
+    <string name="encrypt_talkback_dialog_message_pin" msgid="1890374082842868489">"ဤစက်ပစ္စည်း စရန် သင့် PIN  ရိုက်ထည့်ပြီးသောအခါ၊<xliff:g id="SERVICE">%1$s</xliff:g> ကဲ့သို့သော ရယူသုံးခွင့်ရှိ ဝန်ဆောင်မှုများအား သုံးနိုင်မည်မဟုတ်သေးပါ။"</string>
+    <string name="encrypt_talkback_dialog_message_pattern" msgid="4474332516537386384">"ဤစက်ပစ္စည်း စရန် သင့် ပုံဆွဲရေးဆွဲပြီး သော့ဖွင့်သောအခါ၊<xliff:g id="SERVICE">%1$s</xliff:g> ကဲ့သို့သော ရယူသုံးခွင့်ရှိ ဝန်ဆောင်မှုများအား သုံးနိုင်မည်မဟုတ်သေးပါ။"</string>
+    <string name="encrypt_talkback_dialog_message_password" msgid="8166099418487083927">"ဤစက်ပစ္စည်း စရန် သင့် လျှို့ဝှက်ကုဒ် ရိုက်သွင်းသောအခါ၊<xliff:g id="SERVICE">%1$s</xliff:g> ကဲ့သို့သော ရယူသုံးခွင့်ရှိ ဝန်ဆောင်မှုများအား သုံးနိုင်မည်မဟုတ်သေးပါ။"</string>
+    <string name="imei_information_title" msgid="8499085421609752290">"IMEI အချက်အလက်များ"</string>
+    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI ဆက်စပ် အချက်အလက်များ"</string>
+    <string name="slot_number" msgid="3762676044904653577">"(အပေါက်<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-nb/arrays.xml b/res/values-nb/arrays.xml
index 26221f5..9c174ec 100644
--- a/res/values-nb/arrays.xml
+++ b/res/values-nb/arrays.xml
@@ -527,4 +527,12 @@
     <item msgid="4338089220026248848">"Bufret (aktivitetsklient)"</item>
     <item msgid="6652164677254579050">"Bufret (tom)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Blågrønn"</item>
+    <item msgid="8332294763632946560">"Blå"</item>
+    <item msgid="2023216417616991392">"Indigo"</item>
+    <item msgid="3170497246594232819">"Lilla"</item>
+    <item msgid="4608643045752965568">"Rosa"</item>
+    <item msgid="6131821495505931173">"Rød"</item>
+  </string-array>
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 78dc765..766c84a 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 for enheter i nærheten mens Bluetooth-innstillingene 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>
@@ -180,7 +180,6 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s ønsker adgang til meldingene dine. Vil du gi %2$s tilgang?"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Dato og klokkeslett"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Velg tidssone"</string>
-    <string name="normal_date_format" msgid="7636406984925498359">"Regional (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Forhåndsvisning:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Skriftstørrelse:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -291,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>
@@ -322,8 +321,6 @@
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Tidssone"</string>
     <string name="date_time_set_date_title" msgid="6928286765325608604">"Dato"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"Angi dato"</string>
-    <string name="date_time_date_format_title" msgid="3976171711988766411">"Datoformat"</string>
-    <string name="date_time_date_format" msgid="6951498879879281102">"Velg datoformat"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Sorter alfabetisk"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Sorter etter tidssone"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Dato"</string>
@@ -372,7 +369,8 @@
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Vent mens telefonen krypteres. <xliff:g id="PERCENT">^1</xliff:g> fullført."</string>
     <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Vent mens nettbrettet ditt krypteres. Tid som gjenstår: <xliff:g id="DURATION">^1</xliff:g>"</string>
     <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Vent mens telefonen din krypteres. Tid som gjenstår: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Prøv på nytt om <xliff:g id="DELAY">^1</xliff:g> sekunder."</string>
+    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"For å låse opp nettbrettet ditt må du slå det av og så på igjen."</string>
+    <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"For å låse opp telefonen din må du slå den av og så på igjen."</string>
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"Advarsel: Enheten din tømmes etter <xliff:g id="COUNT">^1</xliff:g> mislykkede opplåsningsforsøk til."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Skriv inn passordet"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Kryptering mislykket"</string>
@@ -401,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>
@@ -412,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>
@@ -556,13 +556,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Som høyttalertelefon"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"For musikk og medier"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Husk innstillinger"</string>
-    <string name="wifi_assistant_intro_setup" msgid="4605105515416995110">"Wi-Fi-assistent\n"</string>
-    <string name="wifi_assistant_no_thanks" msgid="2776983751990143934">"NEI TAKK"</string>
-    <string name="wifi_assistant_setup" msgid="3772423650475730906">"KONFIGURER"</string>
-    <string name="wifi_assistant_card_message" msgid="107811647784658536">"Koble deg automatisk til tilgjengelige nettverk med en Wi-Fi-assistent."</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi-Fi Assistant"</string>
-    <string name="wifi_assistant_title_message" msgid="6240721017579074015">"<xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> kobler automatisk til det beste tilgjengelige Wi‑Fi-nettverket"</string>
-    <string name="wifi_assistant_open_app" msgid="4803044899535675063">"ÅPNE APPEN"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Koblet til via en Wi-Fi-assistent"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"Cast skjermen"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Aktiver trådløs skjermdeling"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Finner ingen enheter i nærheten."</string>
@@ -592,7 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Innstillinger for Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Sett opp og styr trådløse aksesspunkt"</string>
-    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Velg Wi-Fi"</string>
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Velg Wi-Fi-nettverk"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Velg Wi-Fi-nettverk"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Slår på Wi-Fi …"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Slår av Wi-Fi …"</string>
@@ -607,8 +602,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"Skanning er alltid tilgjengelig"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Alltid tillat skanning"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Tillat at Googles posisjonstjeneste og andre apper skanner etter nettverk, selv når Wi-Fi er slått av"</string>
-    <string name="wifi_automatically_manage_title" msgid="6249976570008992746">"Administrer Wi-Fi automatisk"</string>
-    <string name="wifi_automatically_manage_summary" msgid="6952470763378312488">"La <xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> administrere Wi-Fi-tilkoblingen din"</string>
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Bruk åpen Wi‑Fi automatisk"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Tillat at en Wi‑Fi-assistent automatisk kobler til nettverk som ser ut til å være av høy kvalitet"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Velg assistent"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Installer sertifikater"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"For å forbedre posisjonsnøyaktigheten, og for andre formål, kan Google og andre apper søke etter nettverk i nærheten, selv når Wi-Fi er slått av. Hvis du ikke vil at dette skal skje, går du til Avansert &gt; Skanning alltid tilgjengelig."</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Apper kan søke etter nettverk i nærheten, selv når Wi-Fi er slått av. Hvis du ikke vil at dette skal skje, går du til Avansert &gt; Skanning alltid tilgjengelig."</string>
@@ -629,6 +625,7 @@
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Skann"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Avansert"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Koble til nettverket"</string>
+    <string name="wifi_menu_remember" msgid="8814185749388713796">"Husk nettverket"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Slett nettverk"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Endre nettverk"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Skriv til NFC-tag"</string>
@@ -673,9 +670,11 @@
     <string name="wifi_unspecified" msgid="5431501214192991253">"(ikke spesifisert)"</string>
     <string name="wifi_remembered" msgid="4955746899347821096">"Lagret"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"Deaktivert"</string>
-    <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Ungikk dårlig internettforbindelse"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP-konfigurasjonsfeil"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Wi-Fi-tilkoblingsfeil"</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Autentiseringsproblem"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Utenfor område"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Ingen Internett-tilgang ble funnet. Kan ikke koble til på nytt automatisk."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS tilgjengelig"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS tilgjengelig)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Skriv inn nettverkspassordet ditt"</string>
@@ -699,9 +698,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"ADVARSEL: Hvis du hopper over Wi-Fi, bruker nettbrettet ditt bare mobildata for automatiske nedlastinger og oppdateringer. For å unngå mulige datakostnader bør du koble til Wi-Fi."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"ADVARSEL: Hvis du hopper over Wi-Fi, bruker enheten din bare mobildata for automatiske nedlastinger og oppdateringer. For å unngå mulige datakostnader bør du koble til Wi-Fi."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"ADVARSEL: Hvis du hopper over Wi-Fi, bruker telefonen din bare mobildata for automatiske nedlastinger og oppdateringer. For å unngå mulige datakostnader bør du koble til Wi-Fi."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="2393880108322835846">"ADVARSEL: Hvis du hopper over Wi-Fi, har ikke nettbrettet ditt en nettilkobling å bruke til automatiske nedlastinger eller oppdateringer."</string>
-    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1707391993265558787">"ADVARSEL: Hvis du hopper over Wi-Fi, har ikke enheten din en nettilkobling å bruke til automatiske nedlastinger eller oppdateringer."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="1556858507920033022">"ADVARSEL: Hvis du hopper over Wi-Fi, har ikke telefonen din en nettilkobling å bruke til automatiske nedlastinger eller oppdateringer."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Hvis du hopper over Wi-Fi:\n\nNettbrettet får ikke Internett-tilkobling.\n\nDu får ikke programvareoppdateringer før du er tilkoblet Internett.\n\nDu kan ikke aktivere funksjonene for enhetsbeskyttelse nå."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Hvis du hopper over Wi-Fi:\n\nEnheten får ingen Internett-tilkobling.\n\nDu får ikke programvareoppdateringer før du er koblet til Internett.\n\nDu kan ikke aktivere funksjonene for enhetsbeskyttelse nå."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Hvis du hopper over Wi-Fi:\n\nTelefonen får ikke Internett-tilkobling.\n\nDu får ikke programvareoppdateringer før du er koblet til Internett.\n\nDu kan ikke aktivere funksjonene for enhetsbeskyttelse nå."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Nettbrettet kunne ikke koble til Wi-Fi-nettverket."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"Enheten kunne ikke koble til dette Wi-Fi-nettverket."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Telefonen kunne ikke koble til Wi-Fi-nettverket."</string>
@@ -750,7 +749,7 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Konfigurer Wi-Fi-sone"</string>
     <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"Konfigurasjon av Wi-Fi-sone"</string>
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5618031116920832182">"AndroidAP WPA2 PSK bærbar Wi-Fi-sone"</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> flyttbar Wi-Fi-sone"</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>"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="home_settings" msgid="212375129455718176">"Startside"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Skjerm"</string>
@@ -761,7 +760,6 @@
     <string name="ring_volume_title" msgid="7938706566797464165">"Ringevolum"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrer ved stille modus"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Standard varsellyd"</string>
-    <string name="heads_up_enabled_title" msgid="1031078221910921622">"Forgr.vindu ved høy prioritet"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Ringetone"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Varsel"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Bruk volum for innkommende anrop også for varslinger"</string>
@@ -834,7 +832,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatisk lysstyrke"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Aktiver enheten med løftebevegelser"</string>
     <string name="doze_title" msgid="2259176504273878294">"Omgivelsesskjerm"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"aktiver skjermen når enheten håndteres eller mottar varsler"</string>
+    <string name="doze_summary" msgid="7128970177894383698">"Slå på skjermen igjen når du gjenopptar bruken av enheten eller når du mottar varsler"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Skriftstørrelse"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Skriftstørrelse"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Innstillinger for SIM-kort-lås"</string>
@@ -862,6 +860,10 @@
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Avbryt"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"Flere SIM-kort er funnet"</string>
     <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>
@@ -877,7 +879,7 @@
     <string name="fcc_equipment_id" msgid="149114368246356737">"Utstyrs-ID"</string>
     <string name="baseband_version" msgid="1848990160763524801">"Basisbåndversjon"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Kjerneversjon"</string>
-    <string name="build_number" msgid="3075795840572241758">"Byggnummer"</string>
+    <string name="build_number" msgid="3075795840572241758">"Delversjonsnummer"</string>
     <string name="selinux_status" msgid="6212165375172061672">"SELinux-status"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Ikke tilgjengelig"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Status"</string>
@@ -1012,6 +1014,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Dette kommer til å slette alle data fra nettbrettets "<b>"interne lagringsplass"</b>", herunder:\n\n"<li>"Google-kontoen din"</li>\n<li>"Data og innstillinger for system og apper"</li>\n<li>"Nedlastede apper"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Dette vil slette alle data fra telefonens "<b>"interne lagringsplass"</b>", herunder:\n\n"<li>"Google-kontoen din"</li>\n<li>"Data og innstillinger for system og apper"</li>\n<li>"Nedlastede apper"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Du er for øyeblikket pålogget følgende kontoer:\n"</string>
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Det er andre brukere tilstede på denne enheten.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musikk"</li>\n<li>"Bilder"</li>\n<li>"Andre brukerdata"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"For å slette musikk, bilder og andre brukerdata må "<b>"USB-lageret"</b>" tømmes."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"For å slette musikk, bilder og andre brukerdata, må "<b>"SD-kortet"</b>" tømmes."</string>
@@ -1023,7 +1026,6 @@
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Tilbakestill telefonen"</string>
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Vil du slette alle dine personlige opplysninger og nedlastede apper? Du kan ikke reversere denne handlingen!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Fjern alt"</string>
-    <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Tegn opplåsingsmønsteret"</string>
     <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Du må tegne opplåsingsmønsteret for å bekrefte tilbakestillingen til fabrikkstandard."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Tilbakestilling ble ikke utført fordi tilbakestillingstjenesten ikke er tilgjengelig."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Vil du tilbakestille?"</string>
@@ -1041,7 +1043,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"Vil du tømme USB-lageret og slette alle filene som er lagret der? Du kan ikke reversere denne handlingen!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Vil du slette SD-kortet og alle filene som er lagret der? Du kan ikke reversere denne handlingen!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Slett alt"</string>
-    <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Tegn opplåsingsmønsteret"</string>
     <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Du må tegne opplåsingsmønsteret for å bekrefte formateringen av USB-lagring."</string>
     <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Du må tegne opplåsingsmønsteret for å bekrefte formateringen av SD-kortet."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Samtaleinnstillinger"</string>
@@ -1087,6 +1088,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Sett inn SIM-kortet og start enheten på nytt"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Koble deg til Internett"</string>
     <string name="location_title" msgid="1029961368397484576">"Min posisjon"</string>
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Jobbprofil"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Sted for arbeidsprofil"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Deaktivert av bedriften."</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Modus"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Stor nøyaktighet"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Batterisparing"</string>
@@ -1124,6 +1128,7 @@
     <string name="copyright_title" msgid="865906688917260647">"Opphavsrett"</string>
     <string name="license_title" msgid="1990487604356037871">"Lisens"</string>
     <string name="terms_title" msgid="7697580845616764642">"Betingelser"</string>
+    <string name="webview_license_title" msgid="2813507464175738967">"System WebView License"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Bakgrunner"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Leverandører av satellittbilder:\n©2014 CNES / Astrium, Digitalglobe, Bluesky"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Åpen kildekode-lisenser"</string>
@@ -1194,7 +1199,7 @@
     <string name="screen_compatibility_label" msgid="663250687205465394">"Skjermkompatibilitet"</string>
     <string name="permissions_label" msgid="2605296874922726203">"Rettigheter"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"Hurtiglager"</string>
-    <string name="clear_cache_btn_text" msgid="5756314834291116325">"Fjern hurtiglager"</string>
+    <string name="clear_cache_btn_text" msgid="5756314834291116325">"Tøm bufferen"</string>
     <string name="cache_size_label" msgid="7505481393108282913">"Hurtiglager"</string>
     <string name="controls_label" msgid="7611113077086853799">"Kontroller"</string>
     <string name="force_stop" msgid="7435006169872876756">"Tving avslutning"</string>
@@ -1237,7 +1242,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB-lagring"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"På minnekort"</string>
     <string name="disabled" msgid="9206776641295849915">"Deaktivert"</string>
-    <string name="not_installed" msgid="1475144352069281880">"Ikke installert"</string>
+    <string name="not_installed" msgid="2797554494953450291">"Ikke installert for brukeren"</string>
     <string name="no_applications" msgid="7336588977497084921">"Ingen apper."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Intern lagring"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB-lagring"</string>
@@ -1434,8 +1439,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Skjermen blir aldri svart under lading"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Aktiver Bluetooth HCI snoop-logg"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Samle alle Bluetooth HCI-pakker i en fil"</string>
-    <string name="oem_unlock_enable" msgid="6629321276287913315">"Aktiver OEM-opplåsing"</string>
-    <string name="oem_unlock_enable_summary" msgid="3546686263996628110">"Til at enheten låses opp med OEM"</string>
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM-opplåsing"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Tillat at oppstartsinnlasteren låses opp"</string>
+    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Tast inn PIN-koden"</string>
+    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Tast inn enhetens PIN-kode for å aktivere OEM-opplåsing"</string>
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Vil du tillate OEM-opplåsing?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"ADVARSEL: Enhetsbeskyttelse-funksjoner fungerer ikke på denne enheten mens denne innstillingen er slått på."</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Trådløs skjermsertifisering"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Aktiver detaljert Wi-Fi-loggføring"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Aggressiv overføring til Wi-Fi for mobil"</string>
@@ -1538,6 +1547,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"Tekstingen kommer til å se slik ut"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"Standard"</string>
+    <string name="color_title" msgid="4258931051732243983">"Farge"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"Standard"</string>
     <string name="color_none" msgid="3475640044925814795">"Ingen"</string>
     <string name="color_white" msgid="8045195170201590239">"Hvit"</string>
@@ -1595,12 +1605,12 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"<xliff:g id="REMAIN">%1$s</xliff:g> gjenstår"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"Batteriet er fulladet om <xliff:g id="UNTIL_CHARGED">%1$s</xliff:g>"</string>
-    <string name="power_discharging_duration" msgid="7125493014448497620">"<xliff:g id="LEVEL">%1$d</xliff:g> %% – ca. <xliff:g id="TIME">%2$s</xliff:g> gjenstår"</string>
-    <string name="power_charging" msgid="712751285832976915">"<xliff:g id="LEVEL">%1$d</xliff:g> %% – <xliff:g id="STATE">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration" msgid="4802183864773082009">"<xliff:g id="LEVEL">%1$d</xliff:g> %% – fulladet om <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration_ac" msgid="3611179931297824699">"<xliff:g id="LEVEL">%1$d</xliff:g> %% – fulladet om <xliff:g id="TIME">%2$s</xliff:g> på nettstrøm"</string>
-    <string name="power_charging_duration_usb" msgid="1106605348913397583">"<xliff:g id="LEVEL">%1$d</xliff:g> %% – fulladet om <xliff:g id="TIME">%2$s</xliff:g> via USB"</string>
-    <string name="power_charging_duration_wireless" msgid="633606920144617227">"<xliff:g id="LEVEL">%1$d</xliff:g> %% – fulladet om <xliff:g id="TIME">%2$s</xliff:g> via trådløs lading"</string>
+    <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> – ca. <xliff:g id="TIME">%2$s</xliff:g> igjen"</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> – fulladet om <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="power_charging_duration_ac" msgid="3969186192576594254">"<xliff:g id="LEVEL">%1$s</xliff:g> –  fulladet om <xliff:g id="TIME">%2$s</xliff:g> med vekselstrøm"</string>
+    <string name="power_charging_duration_usb" msgid="182405645340976546">"<xliff:g id="LEVEL">%1$s</xliff:g> – fulladet om <xliff:g id="TIME">%2$s</xliff:g> via USB"</string>
+    <string name="power_charging_duration_wireless" msgid="1829295708243159464">"<xliff:g id="LEVEL">%1$s</xliff:g> – fulladet om <xliff:g id="TIME">%2$s</xliff:g> via trådløs lading"</string>
     <string name="power_usage_list_summary" msgid="2409288197839512482">"Bruk siden forrige fullading"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Batteribruk siden strømmen ble trukket ut"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Batteribruk siden omstart"</string>
@@ -1617,7 +1627,6 @@
     <string name="awake" msgid="387122265874485088">"Tid enheten har vært våken"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi – aktivt i"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi – aktivt i"</string>
-    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> – <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Logg detaljer"</string>
     <string name="details_title" msgid="3792801565213935385">"Bruksdetaljer"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Bruksdetaljer"</string>
@@ -1689,9 +1698,7 @@
     <string name="battery_saver" msgid="1426682272004907982">"Batterisparing"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Slå på automatisk"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Aldri"</string>
-    <!-- String.format failed for translation -->
-    <!-- no translation found for battery_saver_turn_on_automatically_pct (3033681629861428940) -->
-    <skip />
+    <string name="battery_saver_turn_on_automatically_pct" msgid="7536784431655058267">"%1$s av batteriet gjenstår"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Prosess-statistikk"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Nerdete statistikk om prosesser som er i gang"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Minnebruk"</string>
@@ -1815,7 +1822,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Maskinvarebasert"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Bare programvare"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"Legitimasjon er ikke tilgjengelig for denne brukeren"</string>
-    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Tegn opplåsingsmønsteret"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Du må tegne opplåsingsmønsteret for å bekrefte installasjonen av legitimasjon."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Skriv inn passordet for legitimasjonslageret."</string>
@@ -1845,6 +1851,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"Inkluder appdata"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Auto-gjenoppretting"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Gjenopprett sikkerhetskopierte innstillinger og data når apper installeres"</string>
+    <string name="backup_inactive_title" msgid="5355557151569037197">"Sikkerhetskopieringstjenesten er inaktiv."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"Dette er angitt i retningslinjene for enheten."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Passord for sikkerhetskopiering på datamaskin"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Fullstendig sikkerhetskopiering på datamaskin beskyttes ikke for øyeblikket."</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Trykk for å endre eller fjerne passordet for fullstendige sikkerhetskopier på datamaskinen"</string>
@@ -1954,7 +1962,11 @@
     <string name="enter_password" msgid="8035706727471334122">"Skriv inn passordet ditt for å starte Android"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Skriv inn PIN-koden din for å starte Android"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Tegn mønsteret ditt for å starte Android"</string>
-    <string name="try_again" msgid="4272075051293936921">"Prøv på nytt."</string>
+    <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"Feil mønster"</string>
+    <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"Feil passord"</string>
+    <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"Feil PIN-kode"</string>
+    <string name="checking_decryption" msgid="8287458611802609493">"Kontrollerer …"</string>
+    <string name="starting_android" msgid="8581493237458496835">"Starter Android"</string>
     <string name="delete" msgid="4219243412325163003">"Slett"</string>
     <string name="misc_files" msgid="6720680815969643497">"Diverse filer"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"du har valgt <xliff:g id="NUMBER">%1$d</xliff:g> av <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -1992,8 +2004,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Bruk alltid GPU for skjermsammensetting"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"Simuler fargeområde"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Aktiver OpenGL-spor"</string>
-    <string name="use_nuplayer" msgid="5699257393367904387">"Bruk NuPlayer (eksperim.)"</string>
-    <string name="use_nuplayer_summary" msgid="1991479067478516714">"Bruk NuPlayer i stedet for AwesomePlayer"</string>
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"Bruk AwesomePlayer (avviklet)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"Bruk AwesomePlayer for de fleste typer medieavspilling, istedenfor NuPlayer"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"Deaktiver lyd via USB"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"Deaktiver automatisk bruk av USB-enheter for lyd"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Vis kantene i utformingen"</string>
@@ -2169,7 +2181,6 @@
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Legg til en bruker eller profil"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Legg til bruker"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Begrenset profil"</string>
-    <string name="user_summary_managed_profile" msgid="7369539529693048111">"Jobbprofil"</string>
     <string name="user_need_lock_message" msgid="2596365678651842785">"Før du kan opprette en begrenset profil, må du konfigurere skjermlåsen for å beskytte appene og de personlige dataene dine."</string>
     <string name="user_set_lock_button" msgid="8311219392856626841">"Angi lås"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Ikke konfigurert"</string>
@@ -2300,11 +2311,13 @@
     <string name="sim_cellular_data_unavailable_summary" msgid="3654805961942166428">"Trykk for å velge et SIM-kort for databruk"</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"Bruk alltid dette for samtaler"</string>
     <string name="select_sim_for_data" msgid="2366081042162853044">"Velg et SIM-kort for data"</string>
+    <string name="data_switch_started" msgid="2040761479817166311">"Bytter data-SIM-kort – dette kan ta opptil ett minutt …"</string>
     <string name="select_sim_for_calls" msgid="3503094771801109334">"Ring med"</string>
     <string name="sim_select_card" msgid="211285163525563293">"Velg et SIM-kort"</string>
     <string name="sim_card_number_title" msgid="7845379943474336488">"SIM-kort <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"Tomt SIM-kort"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"Navn på SIM-kort"</string>
+    <string name="sim_name_hint" msgid="7038643345238968930">"Skriv inn SIM-navn"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"SIM-kortspor %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Operatør"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Nummer"</string>
@@ -2314,7 +2327,6 @@
     <string name="color_purple" msgid="3888532466427762504">"Lilla"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"Det er ikke satt inn noe SIM-kort"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"SIM-status"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"SIM-relatert informasjon"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"Ring tilbake fra standard SIM-kort"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"SIM-kort for utgående anrop"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Andre anropsinnstillinger"</string>
@@ -2322,8 +2334,11 @@
     <string name="preferred_network_offload_header" msgid="2321173571529106767">"Deaktiver kringkasting av nettverksnavn"</string>
     <string name="preferred_network_offload_footer" msgid="5857279426054744020">"«Deaktiver kringkasting av nettverksnavn» beskytter mot at tredjeparter får tilgang til nettverksinformasjonen din."</string>
     <string name="preferred_network_offload_popup" msgid="2252915199889604600">"Deaktiver kringkasting av nettverksnavn hindrer automatisk tilkobling til skjulte nettverk."</string>
+    <string name="sim_signal_strength" msgid="9144010043784767984">"<xliff:g id="DBM">%1$d</xliff:g> dBm <xliff:g id="ASU">%2$d</xliff:g> asu"</string>
+    <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>
+    <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Spør hver gang"</string>
     <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>
@@ -2332,22 +2347,22 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Nylige søk"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Resultater"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi network connection"</string>
-    <string name="keywords_more_default_sms_app" msgid="2744404159003574745">"tekstmelding"</string>
-    <string name="keywords_more_mobile_networks" msgid="7813380887358745769">"mobiltelefon mobilleverandør trådløst"</string>
+    <string name="keywords_more_default_sms_app" msgid="895656981962034647">"sende melding sende tekstmelding meldinger"</string>
+    <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"mobiltelefon mobil operatør trådløs data 4g 3g 2g lte"</string>
     <string name="keywords_home" msgid="3626170808219458848">"appoversikt"</string>
     <string name="keywords_display" msgid="6709007669501628320">"berøringsskjerm"</string>
-    <string name="keywords_display_brightness_level" msgid="8636451602230815191">"nedtonet berøringsskjerm"</string>
-    <string name="keywords_display_auto_brightness" msgid="8070218600502753102">"nedtonet berøringsskjerm"</string>
-    <string name="keywords_display_wallpaper" msgid="4315466287469834939">"bakgrunn"</string>
+    <string name="keywords_display_brightness_level" msgid="8923289340474728990">"dimme skjerm berøringsskjerm batteri"</string>
+    <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"dimme skjerm berøringsskjerm batteri"</string>
+    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"bakgrunn gi personlig preg tilpasse skjerm"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"tekststørrelse"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"prosjekt"</string>
-    <string name="keywords_storage" msgid="7007275853993419928">"diskplass på harddisken"</string>
-    <string name="keywords_battery" msgid="3992479295298655138">"strøm"</string>
-    <string name="keywords_spell_checker" msgid="4509482591225399210">"stavemåte"</string>
+    <string name="keywords_storage" msgid="6572905220031852173">"plass disk harddisk enhetsbruk"</string>
+    <string name="keywords_battery" msgid="2096185085932675704">"strømforbruk lade"</string>
+    <string name="keywords_spell_checker" msgid="6106749039734174140">"stavemåte ordliste stavekontroll autokorrektur"</string>
     <string name="keywords_voice_input" msgid="3519547605812413860">"gjenkjenning inndata tale snakk språk håndfri hånd fri gjenkjenning støtende ord lydlogg bluetooth hodetelefoner"</string>
-    <string name="keywords_text_to_speech_output" msgid="8207889472282225512">"pris språk standard snakk snakke"</string>
-    <string name="keywords_date_and_time" msgid="7666950126499155141">"klokke"</string>
-    <string name="keywords_factory_data_reset" msgid="3693730656843989732">"slett alt"</string>
+    <string name="keywords_text_to_speech_output" msgid="392447904221657930">"takst språk standard snakk snakking tekst til tale tilgjengelighet leser blind"</string>
+    <string name="keywords_date_and_time" msgid="2631808108134830066">"24-timersklokke"</string>
+    <string name="keywords_factory_data_reset" msgid="4355133848707691977">"visk ut slett gjenopprett tøm fjern"</string>
     <string name="keywords_printing" msgid="1701778563617114846">"skriver"</string>
     <string name="keywords_sounds_and_notifications" msgid="5965996187974887000">"høyttalerpip"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="2912933812460077912">"ikke ikke avbryt avbrudd pause"</string>
@@ -2356,7 +2371,7 @@
     <string name="keywords_location_mode" msgid="8584992704568356084">"nøyaktighet"</string>
     <string name="keywords_accounts" msgid="1957925565953357627">"konto"</string>
     <string name="keywords_users" msgid="4673901601478559100">"begrensning begrens begrenset"</string>
-    <string name="keywords_keyboard_and_ime" msgid="1103378692379215672">"tekstretting korrekt lyd vibrer automatisk språk bevegelse foreslå forslag tema støtende ord skriv emoji"</string>
+    <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"sende melding korrigering korrekt lyd vibrer automatisk språk bevegelse foreslå forslag tema støtende ord type emoji internasjonal"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"dra passord mønster PIN-kode"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Konfigurer NFC-tag for Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Skriv"</string>
@@ -2373,7 +2388,6 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Varselvolum"</string>
     <string name="zen_mode_settings_title" msgid="7014915558669122902">"Forstyrrelser"</string>
     <string name="zen_mode_option_title" msgid="5061978632306007914">"Ved innkommende anrop og varsler"</string>
-    <string name="zen_mode_option_title_novoice" msgid="6680706009915204785">"Ved innkommende varsler"</string>
     <string name="zen_mode_option_off" msgid="3167702608910820883">"Forstyrr alltid"</string>
     <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Tillat bare prioriterte forstyrrelser"</string>
     <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Ikke forstyrr"</string>
@@ -2431,14 +2445,17 @@
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Ferdig"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Inntil du slår av funksjonen"</string>
     <string name="zen_mode_important_category" msgid="8123274463331022993">"Prioriterte forstyrrelser"</string>
-    <string name="zen_mode_downtime_category" msgid="4730179065426038108">"Nedetid (bare prioriterte forstyrrelser)"</string>
+    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Nedetid"</string>
     <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Dager"</string>
     <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Ingen"</string>
+    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Avbrudd tillatt"</string>
+    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Bare prioritet"</string>
+    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Ingen"</string>
     <string name="zen_mode_automation_category" msgid="4653551005950835761">"Automatisering"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Slå på automatisk"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Aldri"</string>
-    <string name="zen_mode_phone_calls" msgid="8956214416859303966">"Anrop"</string>
+    <string name="zen_mode_calls" msgid="7051492091133751208">"Anrop"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Meldinger"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Anrop/meldinger fra"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Alle"</string>
@@ -2452,7 +2469,9 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Kvelder på ukedager"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Starttidspunkt"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Sluttidspunkt"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"Kl. <xliff:g id="FORMATTED_TIME">%s</xliff:g> neste dag"</string>
+    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> neste dag"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> eller en alarm før"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> neste dag eller en alarm før"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Appvarsler"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Varselinnstillinger"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Send tilbakemelding om enheten"</string>
@@ -2460,7 +2479,11 @@
     <string name="switch_on_text" msgid="1124106706920572386">"På"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Av"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"Én-appsmodus"</string>
-    <string name="screen_pinning_description" msgid="7091642350452605379">"Når én-appsmodus er slått på, kan du låse den gjeldende skjermen til én side, helt til du avslutter modusen.\n\nSånn fungerer én-appsmodus:\n\n1. Sørg for at én-appsmodus er slått på.\n\n2. Åpne skjermen du vil låse.\n\n3. Trykk på Oversikt.\n\n4. Trykk på knappenålsikonet."</string>
+    <string name="screen_pinning_description" msgid="1137904524037468263">"Når denne innstillingen er slått på, kan du bruke én-appsmodus for å låse den nåværende skjermen frem til du avslutter modusen.\n\nSlik bruker du én-appsmodus:\n\n1. Påse at én-appsmodus er slått på.\n\n2. Åpne skjermen du vil låse.\n\n3. Trykk på Oversikt.\n\n4. Sveip opp, og trykk på låseikonet."</string>
+    <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Krev bruk av opplåsningsmønster for å løsne apper"</string>
+    <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Krev PIN-kode for å løsne apper"</string>
+    <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Krev passord for å løsne apper"</string>
+    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Lås enheten under løsning av apper"</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Jobbprofil"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Eksperimentell)"</string>
     <string name="display_auto_rotate_title" msgid="6176450657107806043">"Når enheten roteres"</string>
@@ -2469,7 +2492,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Behold liggende visning"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Behold gjeldende visningsretning"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI-informasjon"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI-relatert informasjon"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Kryptering"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Fortsett"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"Du kan beskytte denne enheten ved å kreve en PIN-kode ved oppstart. Frem til enheten starter kan den ikke motta oppringninger, meldinger eller varsler, inkludert alarmer. \n\nDette beskytter informasjonen på enheter som er mistet eller stjålet."</string>
@@ -2487,4 +2509,7 @@
     <string name="encrypt_talkback_dialog_message_pin" msgid="1890374082842868489">"Når du taster inn PIN-koden din for å starte denne enheten, er tilgjengelighetstjenester som <xliff:g id="SERVICE">%1$s</xliff:g> ikke tilgjengelige ennå."</string>
     <string name="encrypt_talkback_dialog_message_pattern" msgid="4474332516537386384">"Når du tegner mønsteret ditt for å starte denne enheten, er tilgjengelighetstjenester som <xliff:g id="SERVICE">%1$s</xliff:g> ikke tilgjengelige ennå."</string>
     <string name="encrypt_talkback_dialog_message_password" msgid="8166099418487083927">"Når du skriver inn passordet ditt for å starte denne enheten, er tilgjengelighetstjenester som <xliff:g id="SERVICE">%1$s</xliff:g> ikke tilgjengelige ennå."</string>
+    <string name="imei_information_title" msgid="8499085421609752290">"IMEI-informasjon"</string>
+    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI-relatert informasjon"</string>
+    <string name="slot_number" msgid="3762676044904653577">"(Spor <xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-ne-rNP/arrays.xml b/res/values-ne-rNP/arrays.xml
index fcdc490..32cdb7f 100644
--- a/res/values-ne-rNP/arrays.xml
+++ b/res/values-ne-rNP/arrays.xml
@@ -527,4 +527,12 @@
     <item msgid="4338089220026248848">"क्यास (गतिविधि ग्राहक)"</item>
     <item msgid="6652164677254579050">"क्यास (खाली)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"टिल"</item>
+    <item msgid="8332294763632946560">"नीलो"</item>
+    <item msgid="2023216417616991392">"इन्डिगो"</item>
+    <item msgid="3170497246594232819">"बैजनी"</item>
+    <item msgid="4608643045752965568">"गुलाबी"</item>
+    <item msgid="6131821495505931173">"रातो"</item>
+  </string-array>
 </resources>
diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml
index 0bc4e1d..5de2c94 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>
@@ -180,7 +180,6 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s तपाईँको सन्देशमा पहुँच चाहन्छ। %2$s मा पहुँच दिने हो?"</string>
     <string name="date_and_time" msgid="9062980487860757694">"मिति र समय"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"समय क्षेत्र चयन गर्नुहोस्"</string>
-    <string name="normal_date_format" msgid="7636406984925498359">"क्षेत्रीय ( <xliff:g id="DATE">%s</xliff:g> )"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"पूर्वावलोकन:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"फन्ट आकार:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -291,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>
@@ -322,8 +321,6 @@
     <string name="date_time_set_timezone" msgid="5045627174274377814">"समय क्षेत्र छान्नुहोस्"</string>
     <string name="date_time_set_date_title" msgid="6928286765325608604">"मिति"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"मिति सेट गर्नुहोस्"</string>
-    <string name="date_time_date_format_title" msgid="3976171711988766411">"मिति ढाँचा"</string>
-    <string name="date_time_date_format" msgid="6951498879879281102">"मिति ढाँचा छान्नुहोस्"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"क्रमबद्ध अनुसार मिलाउनुहोस्"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"समय क्षेत्रद्वारा क्रमबद्ध गर्नुहोस्"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"मिति"</string>
@@ -372,7 +369,8 @@
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"तपाईँको फोन इन्क्रिप्ट हुने बखत प्रतीक्षा गर्नुहोस्। <xliff:g id="PERCENT">^1</xliff:g> % पूरा भयो।"</string>
     <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"आफ्नो ट्याब्लेट इन्क्रिप्ट नहुन्जेलसम्म पर्खनुहोस्। बाँकी समय: <xliff:g id="DURATION">^1</xliff:g>"</string>
     <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"आफ्नो ट्याब्लेट इन्क्रिप्ट नहुन्जेलसम्म पर्खनुहोस्। बाँकी समय: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"<xliff:g id="DELAY">^1</xliff:g> सेकेन्डमा फेरि प्रयास गर्नुहोस्।"</string>
+    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"तपाईंको ट्याबलेट अनलक गर्न, यसलाई बन्द गरि अन गर्नुहोस्।"</string>
+    <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"तपाईंको फोन अनलक गर्न, यसलाई बन्द गरि अन गर्नुहोस्।"</string>
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"चेतावनी: खुला गर्न <xliff:g id="COUNT">^1</xliff:g> भन्दा बढी असफल प्रयासहरू पछि तपाईँको उपकरण पुछिने छ!"</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"तपाईँको पासवर्ड टाइप गर्नुहोस्"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"इन्क्रिप्सन असफल"</string>
@@ -401,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>
@@ -412,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>
@@ -556,13 +556,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"स्पिकर फोनको रूपमा"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"संगीत र मिडियाका लागि"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"सेटिङहरू सम्झनुहोस्"</string>
-    <string name="wifi_assistant_intro_setup" msgid="4605105515416995110">\n"वाइफाइ सहायक चिनाउदै"</string>
-    <string name="wifi_assistant_no_thanks" msgid="2776983751990143934">"होइन, धन्यवाद"</string>
-    <string name="wifi_assistant_setup" msgid="3772423650475730906">"SET UP"</string>
-    <string name="wifi_assistant_card_message" msgid="107811647784658536">"वाइफाइ सहायकसँग उपलब्ध सञ्जाल स्वचालित रूपमा जडान गर्नुहोस्।"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"वाइफाइ सहायक"</string>
-    <string name="wifi_assistant_title_message" msgid="6240721017579074015">"<xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> स्वचालित रूपमा तपाईं संग सर्बोकृष्ट उपलब्ध वाइफाइ गर्न जडान हुन्छ"</string>
-    <string name="wifi_assistant_open_app" msgid="4803044899535675063">"खुला अनुप्रयोग"</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>
@@ -592,7 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"वाइफाइ सेटिङहरू"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"वाइफाइ"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"ताररहित पहुँच बिन्दुहरू सेटअप र प्रबन्ध गर्नुहोस्"</string>
-    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"वाइफाइ चयन गर्नुहोस्"</string>
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Wi-Fi सञ्जाल चयन गर्नुहोस्"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"वाइफाइ चयन गर्नुहोस्"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"वाइफाइ खुला गर्दै..."</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"वाइफाइ निष्क्रिय पार्दै..."</string>
@@ -607,8 +602,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"स्क्यान गर्न सधैँ उपलव्ध छ"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"सधैँ स्क्यान गर्न अनुमति दिनुहोस्"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"वाइफाइ बन्द हुँदा पनि Googleको स्थान सेवा र अन्य अनुप्रयोगहरूलाई सञ्जाल स्क्यान गर्न दिनुहोस्"</string>
-    <string name="wifi_automatically_manage_title" msgid="6249976570008992746">"स्वचालित वाइफाइ व्यवस्थापन"</string>
-    <string name="wifi_automatically_manage_summary" msgid="6952470763378312488">"<xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> लाई तपाईँको वाइफाइ जडानको प्रबन्ध गर्न दिनुहोस्"</string>
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"खुला Wi-Fi लाई स्वत: प्रयोग गर्नुहोस्"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Wi-Fi सहायकलाई स्वतः उच्च गुणस्तर निर्धारण भएको खुला सञ्जालहरूसँग जडान गर्ने अनुमति दिनुहोस्"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"सहायक छान्नुहोस्"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"प्रमाणपत्रहरू स्थापना गर्नुहोस्"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"स्थान सटिकता सुधार गर्न र अन्य प्रायोजनहरूको लागि, Google र अन्य अनुप्रयोगहरूले नजिकका नेटवर्कहरू स्क्यान गर्न सक्दछ, वाइफाइ बन्द भएता पनि। यदि तपाईं यो भएको चाहनुहुन्न भने जटिलमा जानुहोस् र स्क्यान गर्न सधैँ उपलब्ध हुन्छ।"</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"वाइफाइ बन्द हुँदा पनि अनुप्रयोगहरूले आसपासका नेटवर्कहरूको स्क्यान गर्न सक्छ। यदि तपाईँ यस्तो हुन दिन चाहनुहुन्न भने जटिलमा जानुहोस्, स्क्यान गर्ने सधैं उपलब्ध हुन्छ।"</string>
@@ -629,6 +625,7 @@
     <string name="wifi_menu_scan" msgid="1470911530412095868">"स्क्यान"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"जटिल"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"नेटवर्कमा जोड्नुहोस्"</string>
+    <string name="wifi_menu_remember" msgid="8814185749388713796">"सञ्जाल सम्झनुहोस्"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"सञ्जाल बिर्सनुहोस्"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"नेटवर्क परिमार्जन गर्नुहोस्"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"NFC ट्यागमा लेख्नुहोस्"</string>
@@ -673,9 +670,11 @@
     <string name="wifi_unspecified" msgid="5431501214192991253">"(अनिर्दिष्टित)"</string>
     <string name="wifi_remembered" msgid="4955746899347821096">"बचत गरियो"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"असक्षम पारियो"</string>
-    <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"कमजोर इन्टरनेट जडान वेवास्ता गरियो"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP विन्यास असफल"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"वाईफाई जडान असफल"</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"प्रमाणीकरण समस्या"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"दायराभित्र छैन"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"कुनै इन्टरनेट पहुँच पाईएन, स्वचालित रूपमा पुन: जडान छैन।"</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS उपलब्ध छ"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS उपलब्ध)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"आफ्नो सञ्जाल पासवर्ड प्रविष्ट गर्नुहोस्"</string>
@@ -699,9 +698,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"चेतावनी: यदि तपाईँले वाइफाइ छोड्नु हुन्छ भने, तपाईँको ट्याब्लेटले प्रारम्भिक डाउनलोड र अद्यावधिकहरूको लागि सेलुलर डेटा मात्र प्रयोग गर्नेछ। सम्भावित डेटा शुल्क हटाउन, वाइफाइ जडान गर्नुहोस्।"</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"चेतावनी: यदि तपाईँले वाइफाइ छोड्नु हुन्छ भने, तपाईँको उपकरणले प्रारम्भिक डाउनलोड र अद्यावधिकहरूको लागि सेलुलर डेटा मात्र प्रयोग गर्नेछ। सम्भावित डेटा शुल्क हटाउन, वाइफाइ जडान गर्नुहोस्।"</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"चेतावनी: यदि तपाईँले वाइफाइ छोड्नु हुन्छ भने, तपाईँको फोनले प्रारम्भिक डाउनलोड र अद्यावधिकहरूको लागि सेलुलर डेटा मात्र प्रयोग गर्नेछ। सम्भावित डेटा शुल्क हटाउन, वाइफाइ जडान गर्नुहोस्।"</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="2393880108322835846">"चेतावनी: यदि तपाईँले वाइफाइ छोड्नु हुन्छ भने, तपाईँको ट्याब्लेटलाई कुनै प्रारम्भिक डाउनलोड वा अद्यावधिकहरूको लागि प्रयोग गर्न इन्टरनेट जडान हुनेछैन।"</string>
-    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1707391993265558787">"चेतावनी: यदि तपाईँले वाइफाइ छोड्नु हुन्छ भने, तपाईँको उपकरणलाई कुनै प्रारम्भिक डाउनलोड वा अद्यावधिकहरूको लागि प्रयोग गर्न इन्टरनेट जडान हुनेछैन।"</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="1556858507920033022">"चेतावनी: यदि तपाईँले वाइफाइ छोड्नु हुन्छ भने, तपाईँको फोनलाई कुनै प्रारम्भिक डाउनलोड वा अद्यावधिकहरूको लागि प्रयोग गर्न इन्टरनेट जडान हुनेछैन।"</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"यदि तपाईं Wi-Fi छोड्नुहुन्छ भने\n\n तपाईंको ट्याब्लेटमा इन्टरनेट जडान हुँदैन। \n\n तपाईंले इन्टरनेट जडान नगर्नु भएसम्म तपाईंले सफ्टवेयर अद्यावधिक प्राप्त गर्नु हुने छैन। \n\n तपाईंले यस समयमा यन्त्र सुरक्षा सुविधाहरु सक्रिय गर्न सक्नुहुन्न।"</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"यदि तपाईं Wi-Fi छाड्नुहुन्छ भने\n\n तपाईंको यन्त्र इन्टरनेटमा जडान हुने छैन। \n\n तपाईंले इन्टरनेट जडान नगर्नु भएसम्म तपाईंले सफ्टवेयर अद्यावधिक  प्राप्त गर्नु हुँदैन। \n\n तपाईंले यस समयमा यन्त्र सुरक्षा सुविधाहरु सक्रिय गर्न सक्नुहुन्न।"</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"यदि तपाईं Wi-Fi छोड्नुहुन्छ भने \n\n तपाईंको फोनमा इन्टरनेट जडान हुँदैन। \n\n तपाईं इन्टरनेटमा जडान नहुनु भएसम्म तपाईंले सफ्टवेयर अद्यावधिक प्राप्त गर्नु हुने छैन। \n\n तपाईंले यस समयमा यन्त्र सुरक्षा सुविधाहरु सक्रिय गर्न सक्नु हुँदैन।"</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"ट्याब्लेट यस वाइफाइ नेटवर्कसँग जडान गर्न असमर्थ भयो।"</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"यस वाइफाइ सञ्जालमा जडान गर्न उपकरण असमर्थ थियो।"</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"यस वाइफाइ नेटवर्कमा जडान गर्न फोन असमर्थ थियो।"</string>
@@ -761,7 +760,6 @@
     <string name="ring_volume_title" msgid="7938706566797464165">"रिङ्गर भोल्युम"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"मौन भएको बेला भाइब्रेट गर्नुहोस्"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"पूर्वनिर्धारित सूचना आवाज"</string>
-    <string name="heads_up_enabled_title" msgid="1031078221910921622">"उच्च प्राथमिकता भएमा पपअप"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"रिङटोन"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"सूचना"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"सूचनाहरूको लागि आगमन कल भोल्युम प्रयोग गर्नुहोस्"</string>
@@ -834,7 +832,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"स्वचालित उज्यालोपना"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"चालु गर्न उठाउनुहोस्"</string>
     <string name="doze_title" msgid="2259176504273878294">"परिवेश प्रदर्शन"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"जब उपकरणले टिप्छ वा अधिसूचनाहरू आउँछ पर्दा खोल्नुहोस्"</string>
+    <string name="doze_summary" msgid="7128970177894383698">"जागा स्क्रीन जब तपाईँ यन्त्र उठाउनु हुन्छ वा सूचनाहरू प्राप्त गर्नुहुन्छ"</string>
     <string name="title_font_size" msgid="4405544325522105222">"फन्ट आकार"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"फन्ट आकार"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM कार्ड लक सेटिङहरू"</string>
@@ -862,6 +860,10 @@
     <string name="sim_enter_cancel" msgid="6240422158517208036">"रद्द गर्नुहोस्"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"धेरै SIM हरू भेटियो"</string>
     <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>
@@ -1012,6 +1014,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"यस कार्यले तपाईँको सम्पूर्ण डेटा मेटाउँछ ट्याब्लेटको "<b>" आन्तरिक भण्डारणबाट "</b>" : जसमा, \n \n "<li>" तपाईँको गुगल खाता "</li>" \n "<li>" प्रणाली र अनुप्रयोग डेटा र सेटिङहरू"</li>" \n "<li>" डाउनलोड गरिएका अनुप्रयोगहरू "</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"यसले सबै डेटा तपाईंको "<b>"आन्तरिक भण्डारणबाट मेटाउँदछ"</b>", समावेश गर्दछ:\n\n"<li>"तपाईंको Google खाता"</li>\n<li>"प्रणाली र अनुप्रयोग डेटा र सेटिङहरू"</li>\n<li>"डाउनलोड गरिएका अनुप्रयोगहरू"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n" \nतपाईँले अहिले निम्न खाताहरूमा साइन इन गर्नुभयो:\n"</string>
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n" यस यन्त्रमा हाल अन्य प्रयोगकर्ताहरु छन्। \n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"संगीत"</li>\n<li>"तस्बिरहरू"</li>\n<li>"अन्य उपयोगकर्ता डेटा"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n" \n संगीत, चित्र र अन्य उपयोगकर्ता डेटा हटाउन "<b>"USB संग्रह"</b>" मेटाउन जरुरी छ।"</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n" \n संगीत, तस्वीरहरू, र अन्य प्रयोगकर्ता डेटा मेटाउनका लागि, "<b>" SD कार्ड "</b>" मेटाउनु पर्छ।"</string>
@@ -1023,7 +1026,6 @@
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"फोन पुनःसेट गर्नुहोस्"</string>
     <string name="master_clear_final_desc" msgid="7209547812233487345">"तपाईँका सम्पूर्ण व्यक्तिगत जानकारी र डाउनलोड गरिएका अनुप्रयोगहरू मेट्ने हो? तपाईँले यस कार्यलाई उल्ट्याउन सक्नुहुन्न!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"सबै मेटाउनुहोस्"</string>
-    <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"तपाईँको अनलक ढाँचा कोर्नुहोस्"</string>
     <string name="master_clear_gesture_explanation" msgid="826193821455182780">"तपाईँको एउटा फ्याक्ट्रि डेटा पुनःसेट पुष्टि गर्नको लागि तपाईँले अनलक ढाँचा बनाउनु पर्छ।"</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"कुनै पुनःसेट हुन सकेन किनभने सिस्टम क्लिएर सेवा उपलब्ध छैन।"</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"पुनःसेट गर्ने हो?"</string>
@@ -1041,7 +1043,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"USB भण्डारण मेट्ने हो, त्यहाँ भण्डारण गरिएका सम्पूर्ण फाइलहरू मेटाउँदै? तपाईँ यस कार्यलाई उल्ट्याउन सक्नुहुन्न!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"त्यहाँ संरक्षित सबै फाइलहरू हटाएर SD कार्ड मेटाउनुहुन्छ? तपाईं यो कार्यलाई उल्टाउन सक्नुहुन्न!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"सबै चीज मेटाउनुहोस्"</string>
-    <string name="media_format_gesture_prompt" msgid="3109349468816856670">"तपाईँको अनलक ढाँचा कोर्नुहोस्"</string>
     <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"तपाईँले आफ्नो अनलक ढाँचा कोर्नु पर्छ यो निश्चित गर्न तपाईँ USB भण्डारण मेटाउन चाहनु हुन्छ।"</string>
     <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"तपाईँ SD कार्ड मेटाउन चाहनुहुन्छ भन्ने पुष्टि गर्नको लागि तपाईँले अनलक ढाँचा बनाउनु पर्छ।"</string>
     <string name="call_settings_title" msgid="5188713413939232801">"कल सेटिङहरू"</string>
@@ -1087,6 +1088,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"कृपया SIM कार्ड भित्र राखेर पुनः स्टार्ट गर्नुहोस्"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"कृपया इन्टरनेटसँग जोड्नुहोस्"</string>
     <string name="location_title" msgid="1029961368397484576">"मेरो स्थान"</string>
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"कार्य प्रोफाइल"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"काम प्रोफाइलका लागि स्थान"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"तपाईँको कम्पनीद्वारा निस्क्रिय पारिएको छ"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"मोड"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"उच्च शुद्धता"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"ब्याट्री बचत"</string>
@@ -1124,6 +1128,7 @@
     <string name="copyright_title" msgid="865906688917260647">"प्रतिलिपि अधिकार"</string>
     <string name="license_title" msgid="1990487604356037871">"इजाजतपत्र"</string>
     <string name="terms_title" msgid="7697580845616764642">"सेवाका सर्तहरू"</string>
+    <string name="webview_license_title" msgid="2813507464175738967">"प्रणाली वेबभ्यु लाइसेन्स"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"वालपेपरहरु"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"स्याटलाइट कल्पना प्रदायकहरू:\n©२०१४ CNES / Astrium, DigitalGlobe, Bluesky"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"खुला स्रोत लाइसेन्स"</string>
@@ -1237,7 +1242,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB भण्डारण"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"SD कार्डमा"</string>
     <string name="disabled" msgid="9206776641295849915">"असक्षम पारियो"</string>
-    <string name="not_installed" msgid="1475144352069281880">"स्थापित छैन"</string>
+    <string name="not_installed" msgid="2797554494953450291">"यो प्रयोगकर्ताको लागि स्थापित गरिएको छैन"</string>
     <string name="no_applications" msgid="7336588977497084921">"कुनै अनुप्रयोगहरू छैनन्"</string>
     <string name="internal_storage" msgid="1584700623164275282">"आन्तरिक भण्डारण"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB भण्डारण"</string>
@@ -1434,8 +1439,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"चार्ज गर्ने बेलामा स्क्रिन कहिल्यै सुत्दैन।"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"ब्लुटुथ HCI snoop लग सक्षम पार्नुहोस्"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"सम्पूर्ण ब्लुटुथ HCI प्याकेटहरू एक फाइलमा कैद गर्नुहोस्"</string>
-    <string name="oem_unlock_enable" msgid="6629321276287913315">"OEM खोल्न सक्षम पार्नुहोस्"</string>
-    <string name="oem_unlock_enable_summary" msgid="3546686263996628110">"OEM खोल्नको लागि उपकरणलाई अनुमति दिइएकोछ"</string>
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM अनलक गर्दै"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"अनलक हुन बूटलोडरलाई अनुमति दिनुहोस्"</string>
+    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"तपाईँको PIN प्रविष्ट गर्नुहोस्"</string>
+    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"OEM अनलक सक्षम गर्न तपाईँको उपकरणको PIN प्रविष्ट गर्नुहोस्"</string>
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"OEM अनलक गर्न अनुमति दिने?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"चेतावनी: यो सेटिङ खुला हुँदा, यस उपकरणमा उपकरण सुरक्षा सुविधाहरूले काम गर्ने छैनन्।"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"ताररहित प्रदर्शन प्रमाणीकरण"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"वाइफाइ वर्बोज लग सक्षम पार्नुहोस्"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"सेलुलर समायोजनका लागि आक्रामक वाइफाइ"</string>
@@ -1538,6 +1547,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"क्याप्सन यस्तो देखिने छ"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"पूर्वनिर्धारित"</string>
+    <string name="color_title" msgid="4258931051732243983">"रङ्ग"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"पूर्वनिर्धारित"</string>
     <string name="color_none" msgid="3475640044925814795">"कुनै पनि होइन"</string>
     <string name="color_white" msgid="8045195170201590239">"सेतो"</string>
@@ -1595,12 +1605,12 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"<xliff:g id="REMAIN">%1$s</xliff:g> बाँकी"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> चार्जमा"</string>
-    <string name="power_discharging_duration" msgid="7125493014448497620">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - लगभग <xliff:g id="TIME">%2$s</xliff:g> बाँकी"</string>
-    <string name="power_charging" msgid="712751285832976915">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="STATE">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration" msgid="4802183864773082009">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> पूर्ण नभएसम्म"</string>
-    <string name="power_charging_duration_ac" msgid="3611179931297824699">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> AC मा पूर्ण नभएसम्म"</string>
-    <string name="power_charging_duration_usb" msgid="1106605348913397583">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> USB मा पूर्ण नभएसम्म"</string>
-    <string name="power_charging_duration_wireless" msgid="633606920144617227">"<xliff:g id="LEVEL">%1$d</xliff:g> %% - <xliff:g id="TIME">%2$s</xliff:g> वायरलेस बाट पूर्ण नभएसम्म"</string>
+    <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> - लगभग। <xliff:g id="TIME">%2$s</xliff:g> बायाँ"</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> पूर्ण नभए सम्म"</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> AC मा पूर्ण नभए सम्म"</string>
+    <string name="power_charging_duration_usb" msgid="182405645340976546">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> USB मा पूर्ण नभए सम्म"</string>
+    <string name="power_charging_duration_wireless" msgid="1829295708243159464">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> वायरलेसबाट पूर्ण नभए सम्म"</string>
     <string name="power_usage_list_summary" msgid="2409288197839512482">"पूर्ण रूपले चार्जपछि प्रयोग गर्नुहोस्"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"अनप्लग भएदेखि ब्याट्रि प्रयोग"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"पुनःसेट गरेदेखि ब्याट्रि प्रयोग"</string>
@@ -1617,7 +1627,6 @@
     <string name="awake" msgid="387122265874485088">"उपकरण जाग्ने समय"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"समयमा वाइफाइ"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"समयमा वाइफाइ"</string>
-    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> - <xliff:g id="NUMBER">%2$s</xliff:g> <xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"इतिहास विवरणहरू"</string>
     <string name="details_title" msgid="3792801565213935385">"विवरणहरू प्रयोग गर्नुहोस्"</string>
     <string name="details_subtitle" msgid="32593908269911734">"विवरणहरू प्रयोग गर्नुहोस्"</string>
@@ -1689,9 +1698,7 @@
     <string name="battery_saver" msgid="1426682272004907982">"ब्याट्री सेभर"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"स्वतः खोल्नुहोस्"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"कहिले पनि होइन"</string>
-    <!-- String.format failed for translation -->
-    <!-- no translation found for battery_saver_turn_on_automatically_pct (3033681629861428940) -->
-    <skip />
+    <string name="battery_saver_turn_on_automatically_pct" msgid="7536784431655058267">"%%१$ ब्याट्रीमा"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"प्रक्रिया तथ्याङ्क"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"चालु रहने प्रक्रियाहरूको बारेको geeky तथ्याङ्क"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"मेमोरी प्रयोग"</string>
@@ -1815,7 +1822,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"हार्डवेयर-ब्याक गरिएको"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"सफ्टवेयर मात्र"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"साखकर्ताहरू यस प्रयोगकर्ताका लागि उपलव्ध छैन"</string>
-    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"तपाईँको अनलक ढाँचा बनाउनुहोस्"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"तपाईँ प्रमाणपत्र स्थापनाको पुष्टि गर्न तपाईँको अनलक ढाँचा बनाउनु पर्छ।"</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"प्रमाणपत्र भण्डारणका लागि पासवर्ड टाइप गर्नुहोस्"</string>
@@ -1845,6 +1851,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"अनुप्रयोग डेटा समावेश"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"स्वतः पुनःप्राप्त"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"जब अनुप्रयोग पुनर्स्थापित गर्दा ब्याक अप गरिएका सेटिङहरू र डेटा पुनःप्राप्त गर्नुहोस्"</string>
+    <string name="backup_inactive_title" msgid="5355557151569037197">"जगेडा सेवा निष्क्रिय छ।"</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"यो तपाईँको यन्त्र नीतिले स्थापना गर्छ।"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"डेस्कटप ब्याकअप पासवर्ड"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"डेस्कटप पूर्ण जगेडाहरू हाललाई सुरक्षित छैनन्"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"डेस्कटप पूर्ण ब्याकअपको लागि पासवर्ड बदल्न वा हटाउन छुनुहोस्"</string>
@@ -1954,7 +1962,11 @@
     <string name="enter_password" msgid="8035706727471334122">"Android सुरु गर्न, आफ्नो पासवर्ड प्रविष्ट गर्नुहोस्"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Android सुरु गर्न, आफ्नो पिन प्रविष्ट गर्नुहोस्"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Android सुरु गर्न, आफ्नो ढाँचा कोर्नुहोस्"</string>
-    <string name="try_again" msgid="4272075051293936921">"फेरि प्रयोग गर्नुहोस्।"</string>
+    <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"गलत ढाँचा"</string>
+    <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"गलत पासवर्ड"</string>
+    <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"गलत PIN"</string>
+    <string name="checking_decryption" msgid="8287458611802609493">"जाँच गर्दै..."</string>
+    <string name="starting_android" msgid="8581493237458496835">"एन्ड्रोइड शुरुगर्दै"</string>
     <string name="delete" msgid="4219243412325163003">"मेट्नुहोस्"</string>
     <string name="misc_files" msgid="6720680815969643497">"विविध फाइलहरू"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"चयनित <xliff:g id="NUMBER">%1$d</xliff:g> यस <xliff:g id="TOTAL">%2$d</xliff:g>भन्दा बाहिर"</string>
@@ -1992,8 +2004,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"स्क्रिन कोम्पजिट गर्न लागि सधैँ GPU प्रयोग गर्नुहोस्"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"रंग स्पेस अनुकरण गर्नुहोस्"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"OpenGL ट्रेसहरू सक्षम गर्नुहोस्"</string>
-    <string name="use_nuplayer" msgid="5699257393367904387">"NuPlayer प्रयोग (प्रयोग)"</string>
-    <string name="use_nuplayer_summary" msgid="1991479067478516714">"AwesomePlayer को सट्टा NuPlayer प्रयोग गर्नुहोस्"</string>
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"AwesomePlayer प्रयोग गर्नुहोस् (निंदा गरिएको)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"धेरै जसो मिडिया प्लेब्याकको लागि NuPlayer को सट्टामा AwesomePlayer प्रयोग गर्नुहोस्"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"USB अडियो अनुमार्ग बन्द"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"USB अडियो परिधीयलाई स्वचालित अनुमार्ग असक्षम"</string>
     <string name="debug_layout" msgid="5981361776594526155">"लेआउट सीमाहरू देखाउनुहोस्"</string>
@@ -2169,7 +2181,6 @@
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"प्रयोगकर्ता वा प्रोफाइल थप गर्नुहोस्"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"प्रयोगकर्ता थप्नुहोस्"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"निषेध गरिएको प्रोफाइल"</string>
-    <string name="user_summary_managed_profile" msgid="7369539529693048111">"कार्य प्रोफाइल"</string>
     <string name="user_need_lock_message" msgid="2596365678651842785">"निषेधयुक्त प्रोफाइल बनाउनु अघि तपाईँको अनुप्रयोग र व्यक्तिगत डेटा सुरक्षा गर्नका लागि तपाईँले स्क्रिन लक सेटअप गर्नु पर्दछ ।"</string>
     <string name="user_set_lock_button" msgid="8311219392856626841">"लक सेट गर्नुहोस्"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"सेटअप छैन"</string>
@@ -2300,11 +2311,13 @@
     <string name="sim_cellular_data_unavailable_summary" msgid="3654805961942166428">"डेटा SIM चयन गर्न छुनुहोस्"</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"सधैं यो कलको लागि प्रयोग गर्नुहोस्"</string>
     <string name="select_sim_for_data" msgid="2366081042162853044">"डेटाको लागि सिम चयन गर्नुहोस्"</string>
+    <string name="data_switch_started" msgid="2040761479817166311">"डाटा सिम स्विच गर्दै, यसलाई करिब एक मिनेट लाग्न सक्छ ..."</string>
     <string name="select_sim_for_calls" msgid="3503094771801109334">"संग कल"</string>
     <string name="sim_select_card" msgid="211285163525563293">"SIM कार्ड चयन गर्नुहोस्"</string>
     <string name="sim_card_number_title" msgid="7845379943474336488">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"खाली SIM"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"SIM नाम"</string>
+    <string name="sim_name_hint" msgid="7038643345238968930">"SIM नाम प्रविष्ट गर्नुहोस्"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"SIM स्लट %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"वाहक"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"संख्या"</string>
@@ -2314,7 +2327,6 @@
     <string name="color_purple" msgid="3888532466427762504">"बैजनी"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"कुनै SIM कार्ड राखिएको छैन"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"सिम अवस्था"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"सिम कार्ड सम्बन्धित जानकारी"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"पूर्वनिर्धारित SIM बाट फिर्ता कल"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"बहिर्गमन कलको लागि SIM"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"अन्य कल सेटिङहरू"</string>
@@ -2322,8 +2334,11 @@
     <string name="preferred_network_offload_header" msgid="2321173571529106767">"सञ्जाल नाम प्रसारण असक्षम"</string>
     <string name="preferred_network_offload_footer" msgid="5857279426054744020">"आफ्नो सञ्जाल जानकारी तेस्रो दलको पहुँचबाट सञ्जाल नाम प्रसारण जोगाउने कार्य असक्षम पार्नुहोस्।"</string>
     <string name="preferred_network_offload_popup" msgid="2252915199889604600">"सञ्जाल नाम प्रसारणले लुकेका सञ्जालहरू स्वचालित जडान हुनमा रोक्ने असक्षम पार्दै।"</string>
+    <string name="sim_signal_strength" msgid="9144010043784767984">"<xliff:g id="DBM">%1$d</xliff:g> dBm <xliff:g id="ASU">%2$d</xliff:g> asu"</string>
+    <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>
@@ -2332,22 +2347,22 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"हालैका खोजहरू"</string>
     <string name="search_results_label" msgid="4163304782363526148">"परिणामहरू"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi सञ्जाल जडान"</string>
-    <string name="keywords_more_default_sms_app" msgid="2744404159003574745">"पाठ सन्देश"</string>
-    <string name="keywords_more_mobile_networks" msgid="7813380887358745769">"सेलुलर सेल वाहक ताररहित"</string>
+    <string name="keywords_more_default_sms_app" msgid="895656981962034647">"पाठ सन्देश पाठ सन्देशिकरण सन्देश पठाउदै"</string>
+    <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"सेलुलर सेल वाहक वायरलेस डेटा ४जी ३जी २जी lte"</string>
     <string name="keywords_home" msgid="3626170808219458848">"लन्चर"</string>
     <string name="keywords_display" msgid="6709007669501628320">"स्क्रिन टचस्क्रिन"</string>
-    <string name="keywords_display_brightness_level" msgid="8636451602230815191">"धमिलो स्क्रिन टचस्क्रिन"</string>
-    <string name="keywords_display_auto_brightness" msgid="8070218600502753102">"धमिलो स्क्रिन टचस्क्रिन"</string>
-    <string name="keywords_display_wallpaper" msgid="4315466287469834939">"पृष्ठभूमि"</string>
+    <string name="keywords_display_brightness_level" msgid="8923289340474728990">"मधुरो स्क्रिन छोएर चल्ने स्क्रिन ब्याट्री"</string>
+    <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"मधुरो स्क्रिन छोएर चल्ने स्क्रिन ब्याट्री"</string>
+    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"व्यक्तिगत अनुकूलित प्रदर्शन पृष्ठभूमि"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"पाठ आकार"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"परियोजना"</string>
-    <string name="keywords_storage" msgid="7007275853993419928">"हार्डड्राइभ डिस्कमा ठाउँ"</string>
-    <string name="keywords_battery" msgid="3992479295298655138">"शक्ति"</string>
-    <string name="keywords_spell_checker" msgid="4509482591225399210">"हिज्जे"</string>
+    <string name="keywords_storage" msgid="6572905220031852173">"ठाउँ डिस्क हार्ड ड्राइभ उपकरण उपयोग"</string>
+    <string name="keywords_battery" msgid="2096185085932675704">"शक्ति उपयोग चार्ज"</string>
+    <string name="keywords_spell_checker" msgid="6106749039734174140">"हिज्जे शब्दकोश हिज्जे परीक्षण स्वत सही"</string>
     <string name="keywords_voice_input" msgid="3519547605812413860">"पहिचानकर्ता निवेश बोली बोल्ने भाषा बिना हात बिना हात मान्यता आपत्तिजनक शब्द अडियो इतिहास ब्लूटूथ हेडसेट"</string>
-    <string name="keywords_text_to_speech_output" msgid="8207889472282225512">"पूर्वनिर्धारित बोल्ने कुरा भाषा मूल्याङ्कन"</string>
-    <string name="keywords_date_and_time" msgid="7666950126499155141">"घडी"</string>
-    <string name="keywords_factory_data_reset" msgid="3693730656843989732">"मेट्ने पुछ्नुहोस्"</string>
+    <string name="keywords_text_to_speech_output" msgid="392447904221657930">"दर भाषा पूर्वनिर्धारित बोल्नुहोस् बोल्दै tts पहुँच पाठक अन्धो"</string>
+    <string name="keywords_date_and_time" msgid="2631808108134830066">"सैन्य घडी"</string>
+    <string name="keywords_factory_data_reset" msgid="4355133848707691977">"पुछ्नुहोस् मेट्नुहोस् पुनर्स्थापना गर्नुहोस् सफा गर्नुहोस् हटाउनुहोस्"</string>
     <string name="keywords_printing" msgid="1701778563617114846">"प्रिन्टर"</string>
     <string name="keywords_sounds_and_notifications" msgid="5965996187974887000">"स्पिकर बिप"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="2912933812460077912">"नगर्नुहोस् अन्तरायन रुकावट ब्रेक नखलबलाउनुहोस्"</string>
@@ -2356,7 +2371,7 @@
     <string name="keywords_location_mode" msgid="8584992704568356084">"सटिकता"</string>
     <string name="keywords_accounts" msgid="1957925565953357627">"खाता"</string>
     <string name="keywords_users" msgid="4673901601478559100">"प्रतिबन्ध सीमित सीमित गरिएको"</string>
-    <string name="keywords_keyboard_and_ime" msgid="1103378692379215672">"पाठ सुधार सही ध्वनि कम्पन स्वतः भाषा इशारा सुझाव थिम आपत्तिजनक शब्द प्रकार इमोजी सुझाव"</string>
+    <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"पाठ सुधार सही ध्वनि कम्पन स्वतः भाषा इशारा सुझाव दिनु सुझाव विषय आपत्तिजनक शब्द प्रकार इमोजी अन्तर्राष्ट्रिय"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"पासवर्ड प्याटर्न पिन स्लाइड गर्नुहोस्"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC ट्याग सेट गर्नुहोस्"</string>
     <string name="write_tag" msgid="8571858602896222537">"लेख्नुहोस्"</string>
@@ -2373,7 +2388,6 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"ध्वनी सूचना"</string>
     <string name="zen_mode_settings_title" msgid="7014915558669122902">"रुकावटहरू"</string>
     <string name="zen_mode_option_title" msgid="5061978632306007914">"जब कल र अधिसूचनाहरू आइपुग्छन्"</string>
-    <string name="zen_mode_option_title_novoice" msgid="6680706009915204785">"जब अधिसूचनाहरू आइपुग्छन्"</string>
     <string name="zen_mode_option_off" msgid="3167702608910820883">"सधै रुकावट"</string>
     <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"प्राथमिकता रुकावटहरू मात्रमा अनुमति दिनुहोस्"</string>
     <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"रुकावट नगर्नुहोस्"</string>
@@ -2431,14 +2445,17 @@
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"भयो"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"तपाईँले यसलाई बन्द नगरेसम्म"</string>
     <string name="zen_mode_important_category" msgid="8123274463331022993">"प्राथमिकता रुकावटहरू"</string>
-    <string name="zen_mode_downtime_category" msgid="4730179065426038108">"डाउनटाइम (प्राथमिकता रुकावटहरू मात्र)"</string>
+    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"डाउनटाइम"</string>
     <string name="zen_mode_downtime_days" msgid="3361856902633311616">"दिन"</string>
     <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"कुनै पनि होइन"</string>
+    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"अवरोधहरू अनुमति दिइएको"</string>
+    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"प्राथमिकता मात्र"</string>
+    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"कुनै पनि होइन"</string>
     <string name="zen_mode_automation_category" msgid="4653551005950835761">"स्वचालन"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"स्वचालित रूपमा चालू"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"कहिले पनि होइन"</string>
-    <string name="zen_mode_phone_calls" msgid="8956214416859303966">"कलहरू"</string>
+    <string name="zen_mode_calls" msgid="7051492091133751208">"कलहरू"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"सन्देशहरू"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"बाट कल / सन्देशहरू"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"कोही पनि"</string>
@@ -2452,7 +2469,9 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"सप्ताहरात"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"सुरु हुने समय"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"समाप्ती समय"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> अर्को दिन"</string>
+    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> अर्को दिन"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> वा कुनै अलार्म अघि"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> अर्को दिन वा कुनै अलार्म अघि"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"अनुप्रयोग सूचनाहरू"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"सूचना सेटिङहरू"</string>
     <string name="device_feedback" msgid="3238056036766293294">"उपकरण बारेमा प्रतिक्रिया पठाउनुहोस्"</string>
@@ -2460,7 +2479,11 @@
     <string name="switch_on_text" msgid="1124106706920572386">"खुल्ला गर्नुहोस्"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"बन्द गर्नुहोस्"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"पर्दा पिन गर्दै"</string>
-    <string name="screen_pinning_description" msgid="7091642350452605379">"चालु हुने समय, तपाईँले अनपिन नगर्नु भएसम्म हालको पर्दालाई दृश्यमा राखी राख्न तपाईँले पर्दालाई पिन गरी प्रयोग गर्न सक्नुहुन्छ।\n\nपर्दा पिन गरी प्रयोग गर्न:\n\n1. पर्दा पिन चालु रहेको कुराको सु:निश्चित गर्नुहोस्।\n\n2. तपाईँले पिन गर्न चाहनु भएको पर्दा खोल्नुहोस्।\n\n3. सारांशमा छुनुहोस्।\n\n4. पिन आइकनमा छुनुहोस्। Translation help"</string>
+    <string name="screen_pinning_description" msgid="1137904524037468263">"जब यो सेटिङ् चालू हुन्छ, तपाईंले अनपिन गरे सम्म दृश्यमा हालको पर्दा राख्न तपाईंले पर्दा पिन प्रयोग गर्न सक्नुहुन्छ।\n\n पर्दामा पिन प्रयोग गर्न:\n\n१. पर्दा पिन खोलिएको छ भनि पक्का गर्नुहोस्।\n\n२. तपाईंले पिन गर्न चाहनुभएको पर्दा खोल्नुहोस्।\n\n३.सिंहावलोकन छुनुहोस्। \n\n४. जोडसँग माथितिर तान्नुहोस् र त्यसपछि पिन प्रतिमा छुनहोस्।"</string>
+    <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"पिन निकाल्नुअघि खोल्ने रूपरेखा सोध्नुहोस्"</string>
+    <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"पिन निकाल्नुअघि PIN सोध्नुहोस्"</string>
+    <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"पिन निकाल्नुअघि पासवर्ड सोध्नुहोस्"</string>
+    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"अनपिन गर्दा उपकरण लक गर्नुहोस्"</string>
     <string name="managed_user_title" msgid="8101244883654409696">"कार्य प्रोफाइल"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(प्रयोगात्मक)"</string>
     <string name="display_auto_rotate_title" msgid="6176450657107806043">"जब उपकरण घुमाइन्छ"</string>
@@ -2469,7 +2492,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"परिदृश्य दृष्टिकोणमा रहनुहोस्"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"वर्तमान अभिमुखिकरणमा रहनुहोस्"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI जानकारी"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI सान्दर्भिक जानकारी"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"गुप्तिकरण"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"जारी राख्नुहोस्"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"यस उपकरणलाई अझै सुरक्षित गर्न सुरु गर्नु भन्दा अगि आफ्नो पिन आवश्यक बनाउन सक्नुहुने छ। उपकरण सुरु नभए सम्म कल, सन्देश, वा सूचनाहरू, प्राप्त गर्न सक्दैन, अलार्म सहित चल्ने छैन। \n\n उपकरण हराएको वा चोरी भएको खण्डमा यसले डेटा जोगाउँछ।"</string>
@@ -2487,4 +2509,7 @@
     <string name="encrypt_talkback_dialog_message_pin" msgid="1890374082842868489">"यो उपकरण सुरु गर्न जब तपाईँले आफ्नो PIN प्रविष्टि गर्नुहुन्छ, पहुँच सेवा जस्तै <xliff:g id="SERVICE">%1$s</xliff:g> अझै उपलब्ध हुने छैन।"</string>
     <string name="encrypt_talkback_dialog_message_pattern" msgid="4474332516537386384">"यो उपकरण सुरु गर्न जब तपाईँले आफ्नो ढाँचा प्रविष्टि गर्नुहुन्छ, पहुँच सेवा जस्तै <xliff:g id="SERVICE">%1$s</xliff:g> अझै उपलब्ध हुने छैन।"</string>
     <string name="encrypt_talkback_dialog_message_password" msgid="8166099418487083927">"यो उपकरण सुरु गर्न जब तपाईँले आफ्नो पासवर्ड प्रविष्टि गर्नुहुन्छ, पहुँच सेवा <xliff:g id="SERVICE">%1$s</xliff:g> जस्तो अझै उपलब्ध हुने छैन।"</string>
+    <string name="imei_information_title" msgid="8499085421609752290">"IMEI जानकारी"</string>
+    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI सान्दर्भिक जानकारी"</string>
+    <string name="slot_number" msgid="3762676044904653577">"(घेरा<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-nl/arrays.xml b/res/values-nl/arrays.xml
index 56acd3d..6303425 100644
--- a/res/values-nl/arrays.xml
+++ b/res/values-nl/arrays.xml
@@ -527,4 +527,12 @@
     <item msgid="4338089220026248848">"Gecacht (activiteitsclient)"</item>
     <item msgid="6652164677254579050">"Gecacht (leeg)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Blauwgroen"</item>
+    <item msgid="8332294763632946560">"Blauw"</item>
+    <item msgid="2023216417616991392">"Indigo"</item>
+    <item msgid="3170497246594232819">"Paars"</item>
+    <item msgid="4608643045752965568">"Roze"</item>
+    <item msgid="6131821495505931173">"Rood"</item>
+  </string-array>
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 5fa0846..078903e 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>
@@ -180,7 +180,6 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s wil toegang tot uw berichten. Toegang geven aan %2$s?"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Datum en tijd"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Een tijdzone kiezen"</string>
-    <string name="normal_date_format" msgid="7636406984925498359">"Regionaal (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Voorbeeld:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Lettergrootte:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -291,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>
@@ -322,8 +321,6 @@
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Tijdzone selecteren"</string>
     <string name="date_time_set_date_title" msgid="6928286765325608604">"Datum"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"Datum instellen"</string>
-    <string name="date_time_date_format_title" msgid="3976171711988766411">"Datumnotatie"</string>
-    <string name="date_time_date_format" msgid="6951498879879281102">"Datumnotatie selecteren"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Alfabetisch sorteren"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Sorteren op tijdzone"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Datum"</string>
@@ -372,7 +369,8 @@
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Wacht totdat uw telefoon is gecodeerd. <xliff:g id="PERCENT">^1</xliff:g> procent voltooid."</string>
     <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Wacht terwijl uw tablet wordt versleuteld. Resterende tijd: <xliff:g id="DURATION">^1</xliff:g>"</string>
     <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Wacht terwijl uw telefoon wordt versleuteld. Resterende tijd: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Probeer het over <xliff:g id="DELAY">^1</xliff:g> seconden opnieuw."</string>
+    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"Als u uw tablet wilt ontgrendelen, schakelt u deze uit en weer in."</string>
+    <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"Als u uw telefoon wilt ontgrendelen, schakelt u deze uit en weer in."</string>
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"Waarschuwing: na nog <xliff:g id="COUNT">^1</xliff:g> mislukte pogingen om te ontgrendelen, wordt uw apparaat gewist."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Typ uw wachtwoord"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Encryptie mislukt"</string>
@@ -401,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>
@@ -412,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>
@@ -556,13 +556,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Als luidsprekertelefoon"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Voor muziek en media"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Instellingen onthouden"</string>
-    <string name="wifi_assistant_intro_setup" msgid="4605105515416995110">"Maak kennis met\nWi‑Fi Assistant"</string>
-    <string name="wifi_assistant_no_thanks" msgid="2776983751990143934">"NEE, BEDANKT"</string>
-    <string name="wifi_assistant_setup" msgid="3772423650475730906">"INSTELLEN"</string>
-    <string name="wifi_assistant_card_message" msgid="107811647784658536">"Automatisch verbinding maken met beschikbare netwerken via een wifi-assistent."</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi‑Fi Assistant"</string>
-    <string name="wifi_assistant_title_message" msgid="6240721017579074015">"<xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> maakt automatisch verbinding met het beste wifi-netwerk"</string>
-    <string name="wifi_assistant_open_app" msgid="4803044899535675063">"APP OPENEN"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Verbonden via wifi-assistent"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"Scherm casten"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Draadloze weergave inschakelen"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Geen apparaten in de buurt gevonden."</string>
@@ -592,7 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Wifi-instellingen"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wifi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Draadloze toegangspunten instellen en beheren"</string>
-    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Wifi selecteren"</string>
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Wifi-netwerk selecteren"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Wifi selecteren"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Wifi inschakelen…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Wifi uitschakelen…"</string>
@@ -607,8 +602,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"Scannen altijd beschikbaar"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Scannen altijd toestaan"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"De locatieservice en andere apps van Google laten scannen naar netwerken, ook wanneer wifi is uitgeschakeld"</string>
-    <string name="wifi_automatically_manage_title" msgid="6249976570008992746">"Wifi automatisch beheren"</string>
-    <string name="wifi_automatically_manage_summary" msgid="6952470763378312488">"Uw wifi-verbinding laten beheren door <xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g>"</string>
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Automatisch open wifi gebruiken"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Een Wifi-assistent automatisch verbinding laten maken met open netwerken van hoge kwaliteit"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Assistent kiezen"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Certificaten installeren"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Als u de nauwkeurigheid van locaties en voor andere doeleinden wilt verbeteren, kunnen Google en andere apps scannen naar netwerken in de buurt, ook wanneer wifi is uitgeschakeld. Als u niet wilt dat dit gebeurt, gaat u naar \'Geavanceerd\' &gt; \'Scannen altijd beschikbaar\'."</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Apps kunnen scannen naar netwerken in de buurt, ook wanneer wifi is uitgeschakeld. Als u niet wilt dat dit gebeurt, gaat u naar \'Geavanceerd\' &gt; \'Scannen altijd beschikbaar\'."</string>
@@ -629,6 +625,7 @@
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Scannen"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Geavanceerd"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Verbinding maken met netwerk"</string>
+    <string name="wifi_menu_remember" msgid="8814185749388713796">"Netwerk onthouden"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Netwerk vergeten"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Netwerk aanpassen"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Schrijven naar NFC-tag"</string>
@@ -673,9 +670,11 @@
     <string name="wifi_unspecified" msgid="5431501214192991253">"(niet opgegeven)"</string>
     <string name="wifi_remembered" msgid="4955746899347821096">"Opgeslagen"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"Uitgeschakeld"</string>
-    <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Slechte internetverbinding vermeden"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP-configuratie mislukt"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Wifi-verbinding mislukt"</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Authenticatieprobleem"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Niet binnen bereik"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Geen internettoegang gevonden. Er wordt niet automatisch opnieuw verbinding gemaakt."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS beschikbaar"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS beschikbaar)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Geef uw netwerkwachtwoord op"</string>
@@ -699,9 +698,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"WAARSCHUWING: als u wifi overslaat, gebruikt uw tablet alleen mobiele gegevens voor initiële downloads en updates. Maak verbinding met wifi om te voorkomen dat er gegevenskosten in rekening worden gebracht."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"WAARSCHUWING: als u wifi overslaat, gebruikt uw apparaat alleen mobiele gegevens voor initiële downloads en updates. Maak verbinding met wifi om te voorkomen dat er gegevenskosten in rekening worden gebracht."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"WAARSCHUWING: als u wifi overslaat, gebruikt uw telefoon alleen mobiele gegevens voor initiële downloads en updates. Maak verbinding met wifi om te voorkomen dat er gegevenskosten in rekening worden gebracht."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="2393880108322835846">"WAARSCHUWING: als u wifi overslaat, kan uw tablet geen verbinding maken met internet voor initiële downloads of updates."</string>
-    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1707391993265558787">"WAARSCHUWING: als u wifi overslaat, kan uw apparaat geen verbinding maken met internet voor initiële downloads of updates."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="1556858507920033022">"WAARSCHUWING: als u wifi overslaat, kan uw telefoon geen verbinding maken met internet voor initiële downloads of updates."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Als u wifi niet inschakelt:\n\nUw tablet heeft geen internetverbinding.\n\nU ontvangt pas software-updates nadat u verbinding maakt met internet.\n\nU kunt op dit moment geen apparaatbeschermingsfuncties activeren."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Als u wifi niet inschakelt:\n\nUw apparaat heeft geen internetverbinding.\n\nU ontvangt pas software-updates nadat u verbinding maakt met internet.\n\nU kunt op dit moment geen apparaatbeschermingsfuncties activeren."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Als u wifi niet inschakelt:\n\nUw telefoon heeft geen internetverbinding.\n\nU ontvangt pas software-updates nadat u verbinding maakt met internet.\n\nU kunt op dit moment geen apparaatbeschermingsfuncties activeren."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"De tablet kan geen verbinding maken met dit wifi-netwerk."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"Het apparaat kan geen verbinding maken met dit wifi-netwerk."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"De telefoon kan geen verbinding maken met dit wifi-netwerk."</string>
@@ -761,7 +760,6 @@
     <string name="ring_volume_title" msgid="7938706566797464165">"Belvolume"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Trillen indien stil"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Standaardmeldingsgeluid"</string>
-    <string name="heads_up_enabled_title" msgid="1031078221910921622">"Pop-up bij hoge prioriteit"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Beltoon"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Melding"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Volume van inkomende oproepen gebruiken voor meldingen"</string>
@@ -834,7 +832,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatische helderheid"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Optillen om te activeren"</string>
     <string name="doze_title" msgid="2259176504273878294">"Omgevingsdisplay"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"Scherm activeren als apparaat wordt opgepakt of als er meldingen binnenkomen"</string>
+    <string name="doze_summary" msgid="7128970177894383698">"Scherm activeren wanneer u het apparaat oppakt of meldingen ontvangt"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Lettergrootte"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Lettergrootte"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Instellingen SIM-kaartvergrendeling"</string>
@@ -862,6 +860,10 @@
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Annuleren"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"Meerdere simkaarten gevonden"</string>
     <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>
@@ -1012,6 +1014,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Hiermee worden alle gegevens in de "<b>"interne opslag"</b>" van uw tablet gewist, waaronder:\n\n"<li>"Uw Google-account"</li>\n<li>"Gegevens en instellingen van het systeem en de apps"</li>\n<li>"Gedownloade apps"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Hiermee worden alle gegevens in de "<b>"interne opslag"</b>" van uw telefoon gewist, waaronder:\n\n"<li>"Uw Google-account"</li>\n<li>"Gegevens en instellingen van het systeem en de apps"</li>\n<li>"Gedownloade apps"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"U bent momenteel aangemeld bij de volgende accounts:\n"</string>
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Er zijn andere gebruikers aanwezig op dit apparaat.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Muziek"</li>\n<li>"Foto\'s"</li>\n<li>"Andere gebruikersgegevens"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Als u muziek, foto\'s en andere gebruikersgegevens wilt wissen, moet de "<b>"USB-opslag"</b>" worden gewist."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Als u muziek, foto\'s en andere gebruikersgegevens wilt wissen, moet de "<b>"SD-kaart"</b>" worden gewist."</string>
@@ -1023,7 +1026,6 @@
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Telefoon opnieuw instellen"</string>
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Wilt u al uw persoonlijke gegevens en gedownloade apps verwijderen? U kunt deze actie niet ongedaan maken."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Alles wissen"</string>
-    <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Teken uw ontgrendelingspatroon"</string>
     <string name="master_clear_gesture_explanation" msgid="826193821455182780">"U moet uw ontgrendelingspatroon tekenen om het terugzetten op de fabrieksinstellingen te bevestigen."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Niet opnieuw ingesteld, omdat de service \'Systeem wissen\' niet beschikbaar is."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Opnieuw instellen?"</string>
@@ -1041,7 +1043,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"USB-opslag formatteren en alle opgeslagen bestanden wissen? U kunt deze actie niet ongedaan maken."</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"SD-kaart wissen en alle opgeslagen bestanden verwijderen? U kunt deze actie niet ongedaan maken."</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Alles wissen"</string>
-    <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Teken uw ontgrendelingspatroon"</string>
     <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"U moet het ontgrendelingspatroon tekenen om te bevestigen dat u de USB-opslag wilt wissen."</string>
     <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"U moet het ontgrendelingspatroon tekenen om te bevestigen dat u de SD-kaart wilt wissen."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Oproepinstellingen"</string>
@@ -1087,6 +1088,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Plaats een simkaart en start het apparaat opnieuw"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Maak verbinding met internet"</string>
     <string name="location_title" msgid="1029961368397484576">"Mijn locatie"</string>
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Werkprofiel"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Locatie voor werkprofiel"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Uitgeschakeld door uw bedrijf"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Modus"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Grote nauwkeurigheid"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Accubesparing"</string>
@@ -1124,6 +1128,7 @@
     <string name="copyright_title" msgid="865906688917260647">"Auteursrecht"</string>
     <string name="license_title" msgid="1990487604356037871">"Licentie"</string>
     <string name="terms_title" msgid="7697580845616764642">"Algemene voorwaarden"</string>
+    <string name="webview_license_title" msgid="2813507464175738967">"Systeemlicentie voor webweergave"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Achtergronden"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Providers van satellietbeelden:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Open-sourcelicenties"</string>
@@ -1237,7 +1242,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB-opslag"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Op SD-kaart"</string>
     <string name="disabled" msgid="9206776641295849915">"Uitgeschakeld"</string>
-    <string name="not_installed" msgid="1475144352069281880">"Niet geïnstalleerd"</string>
+    <string name="not_installed" msgid="2797554494953450291">"Niet geïnstalleerd voor deze gebruiker"</string>
     <string name="no_applications" msgid="7336588977497084921">"Geen apps."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Interne opslag"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB-opslag"</string>
@@ -1434,8 +1439,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Scherm gaat nooit uit tijdens het opladen"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Snoop-logbestand voor Bluetooth-HCI inschakelen"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Alle Bluetooth-HCI-pakketten tot één bestand samenvoegen"</string>
-    <string name="oem_unlock_enable" msgid="6629321276287913315">"OEM-ontgrendeling inschakelen"</string>
-    <string name="oem_unlock_enable_summary" msgid="3546686263996628110">"Toestaan dat het apparaat OEM-ontgrendeld wordt"</string>
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM-ontgrendeling"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Toestaan dat de bootloader wordt ontgrendeld"</string>
+    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Geef uw pincode op"</string>
+    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Geef de pincode van uw apparaat op om OEM-ontgrendeling in te schakelen"</string>
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"OEM-ontgrendeling toestaan?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"WAARSCHUWING: De apparaatbeveiligingsfuncties werken niet op dit apparaat wanneer deze instelling is ingeschakeld."</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Certificering van draadloze weergave"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Uitgebreide wifi-logregistratie insch."</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Agressieve handover van wifi naar mobiel"</string>
@@ -1538,6 +1547,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"Ondertiteling ziet er zo uit"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"Standaard"</string>
+    <string name="color_title" msgid="4258931051732243983">"Kleur"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"Standaard"</string>
     <string name="color_none" msgid="3475640044925814795">"Geen"</string>
     <string name="color_white" msgid="8045195170201590239">"Wit"</string>
@@ -1595,12 +1605,12 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"<xliff:g id="REMAIN">%1$s</xliff:g> tot accu leeg is"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> tot accu is opgeladen"</string>
-    <string name="power_discharging_duration" msgid="7125493014448497620">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - ca. <xliff:g id="TIME">%2$s</xliff:g> resterend"</string>
-    <string name="power_charging" msgid="712751285832976915">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="STATE">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration" msgid="4802183864773082009">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> tot vol"</string>
-    <string name="power_charging_duration_ac" msgid="3611179931297824699">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> tot vol via netvoeding"</string>
-    <string name="power_charging_duration_usb" msgid="1106605348913397583">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> tot vol via USB"</string>
-    <string name="power_charging_duration_wireless" msgid="633606920144617227">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> tot vol via draadloos"</string>
+    <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> - ca. <xliff:g id="TIME">%2$s</xliff:g> resterend"</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> tot vol"</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> tot vol via wisselstroom"</string>
+    <string name="power_charging_duration_usb" msgid="182405645340976546">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> tot vol via USB"</string>
+    <string name="power_charging_duration_wireless" msgid="1829295708243159464">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> tot vol via draadloos"</string>
     <string name="power_usage_list_summary" msgid="2409288197839512482">"Gebruik sinds laatste volledige lading"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Accugebruik sinds losgekoppeld"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Accugebruik sinds herstel"</string>
@@ -1617,7 +1627,6 @@
     <string name="awake" msgid="387122265874485088">"Stand-bytijd apparaat"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wifi op tijd"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wifi op tijd"</string>
-    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> - <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Geschiedenisdetails"</string>
     <string name="details_title" msgid="3792801565213935385">"Gebruiksdetails"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Gebruiksdetails"</string>
@@ -1689,7 +1698,7 @@
     <string name="battery_saver" msgid="1426682272004907982">"Accubesparing"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Automatisch inschakelen"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Nooit"</string>
-    <string name="battery_saver_turn_on_automatically_pct" msgid="3033681629861428940">"bij %1$d%% accu"</string>
+    <string name="battery_saver_turn_on_automatically_pct" msgid="7536784431655058267">"op %1$s acculading"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Processtatistieken"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Statistieken voor nerds over actieve processen"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Geheugengebruik"</string>
@@ -1813,7 +1822,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Ondersteund door hardware"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Alleen software"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"Er zijn geen inloggegevens beschikbaar voor deze gebruiker"</string>
-    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Teken uw ontgrendelingspatroon"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"U moet uw ontgrendelingspatroon tekenen om de identificatie-installatie te bevestigen."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Typ het wachtwoord voor referentieopslag."</string>
@@ -1843,6 +1851,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"Appgegevens opnemen"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Automatisch terugzetten"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"In een back-up opgeslagen instellingen of andere gegevens herstellen bij het opnieuw installeren van een app"</string>
+    <string name="backup_inactive_title" msgid="5355557151569037197">"Back-upservice is inactief."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"Dit wordt ingesteld door uw apparaatbeleid."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Wachtwoord desktopback-up"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Volledige back-ups naar desktops zijn momenteel niet beveiligd"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Raak dit aan om het wachtwoord voor volledige back-ups naar desktops te wijzigen of te verwijderen"</string>
@@ -1952,7 +1962,11 @@
     <string name="enter_password" msgid="8035706727471334122">"Geef uw wachtwoord op om Android te starten"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Geef uw pincode op om Android te starten"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Teken uw patroon om Android te starten"</string>
-    <string name="try_again" msgid="4272075051293936921">"Probeer het opnieuw."</string>
+    <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"Onjuist patroon"</string>
+    <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"Onjuist wachtwoord"</string>
+    <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"Onjuiste pincode"</string>
+    <string name="checking_decryption" msgid="8287458611802609493">"Controleren…"</string>
+    <string name="starting_android" msgid="8581493237458496835">"Android starten"</string>
     <string name="delete" msgid="4219243412325163003">"Verwijderen"</string>
     <string name="misc_files" msgid="6720680815969643497">"Diverse bestanden"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"<xliff:g id="NUMBER">%1$d</xliff:g> van <xliff:g id="TOTAL">%2$d</xliff:g> geselecteerd"</string>
@@ -1990,8 +2004,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"GPU altijd gebruiken voor schermcompositing"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"Kleurruimte simuleren"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"OpenGL-sporen inschakelen"</string>
-    <string name="use_nuplayer" msgid="5699257393367904387">"NuPlayer gebruiken (exp.)"</string>
-    <string name="use_nuplayer_summary" msgid="1991479067478516714">"NuPlayer gebruiken in plaats van AwesomePlayer"</string>
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"AwesomePlayer gebr. (veroud.)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"Meestal AwesomePlayer gebruiken i.p.v. NuPlayer"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"USB-audiorouting uitsch."</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"Autom. routing naar USB-randapparatuur uitsch."</string>
     <string name="debug_layout" msgid="5981361776594526155">"Indelingsgrenzen weerg."</string>
@@ -2167,7 +2181,6 @@
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Gebruiker of profiel toevoegen"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Gebruiker toevoegen"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Beperkt profiel"</string>
-    <string name="user_summary_managed_profile" msgid="7369539529693048111">"Werkprofiel"</string>
     <string name="user_need_lock_message" msgid="2596365678651842785">"Voordat u een beperkt profiel kunt maken, moet u een schermvergrendeling instellen om uw apps en persoonlijke gegevens te beschermen."</string>
     <string name="user_set_lock_button" msgid="8311219392856626841">"Vergrendeling instellen"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Niet ingesteld"</string>
@@ -2182,8 +2195,8 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Gebruiker"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Beperkt profiel"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"Nieuwe gebruiker toevoegen?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"U kunt dit apparaat met andere mensen delen door extra gebruikers te maken. Elke gebruiker heeft zijn eigen profiel dat ze onder andere kunnen aanpassen met hun eigen apps en achtergrond. Gebruikers kunnen ook apparaatinstellingen (zoals wifi) aanpassen, die invloed hebben op alle gebruikers.\n\nWanneer u een nieuwe gebruiker toevoegt, moet die persoon zijn eigen profiel instellen.\n\nElke gebruiker kan apps bijwerken voor alle andere gebruikers."</string>
-    <string name="user_add_user_message_short" msgid="1511354412249044381">"Wanneer u een nieuwe gebruiker toevoegt, moet die persoon zijn eigen profiel instellen.\n\nElke gebruiker kan apps bijwerken voor alle andere gebruikers."</string>
+    <string name="user_add_user_message_long" msgid="718192651887726259">"U kunt dit apparaat met andere mensen delen door extra gebruikers te maken. Elke gebruiker heeft zijn eigen profiel dat ze onder andere kunnen aanpassen met hun eigen apps en achtergrond. Gebruikers kunnen ook apparaatinstellingen (zoals wifi) aanpassen, die invloed hebben op alle gebruikers.\n\nWanneer u een nieuwe gebruiker toevoegt, moet die persoon zijn eigen profiel instellen.\n\nElke gebruiker kan apps updaten voor alle andere gebruikers."</string>
+    <string name="user_add_user_message_short" msgid="1511354412249044381">"Wanneer u een nieuwe gebruiker toevoegt, moet die persoon zijn eigen profiel instellen.\n\nElke gebruiker kan apps updaten voor alle andere gebruikers."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Gebruiker nu instellen?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"Zorg ervoor dat de persoon het apparaat kan overnemen om zijn profiel te configureren"</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Profiel nu instellen?"</string>
@@ -2298,11 +2311,13 @@
     <string name="sim_cellular_data_unavailable_summary" msgid="3654805961942166428">"Tik om een simkaart voor gegevens te selecteren"</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"Altijd gebruiken voor oproepen"</string>
     <string name="select_sim_for_data" msgid="2366081042162853044">"Selecteer een simkaart voor gegevens"</string>
+    <string name="data_switch_started" msgid="2040761479817166311">"Schakelen naar simkaart voor mobiele gegevens, dit kan even duren…"</string>
     <string name="select_sim_for_calls" msgid="3503094771801109334">"Bellen met"</string>
     <string name="sim_select_card" msgid="211285163525563293">"Een simkaart selecteren"</string>
     <string name="sim_card_number_title" msgid="7845379943474336488">"Simkaart <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"Simkaart leeg"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"Naam van simkaart"</string>
+    <string name="sim_name_hint" msgid="7038643345238968930">"Voer de SIM-naam in"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"Simkaartsleuf %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Provider"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Nummer"</string>
@@ -2312,7 +2327,6 @@
     <string name="color_purple" msgid="3888532466427762504">"Paars"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"Geen simkaarten geplaatst"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"Simkaartstatus"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"Simkaart-gerelateerde informatie"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"Terugbellen via standaard-simkaart"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"Simkaart voor uitgaande oproepen"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Andere instellingen voor bellen"</string>
@@ -2320,8 +2334,11 @@
     <string name="preferred_network_offload_header" msgid="2321173571529106767">"Broadcast v. netwerkn. uitsch."</string>
     <string name="preferred_network_offload_footer" msgid="5857279426054744020">"\'Broadcast van netwerknaam uitschakelen\' voorkomt dat derden toegang krijgen tot uw netwerkgegevens."</string>
     <string name="preferred_network_offload_popup" msgid="2252915199889604600">"\'Broadcast van netwerknaam uitschakelen\' voorkomt automatische verbinding met verborgen netwerken."</string>
+    <string name="sim_signal_strength" msgid="9144010043784767984">"<xliff:g id="DBM">%1$d</xliff:g> dBm <xliff:g id="ASU">%2$d</xliff:g> asu"</string>
+    <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>
+    <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Elke keer vragen"</string>
     <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>
@@ -2330,22 +2347,22 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Recente zoekopdrachten"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Resultaten"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi netwerk verbinding"</string>
-    <string name="keywords_more_default_sms_app" msgid="2744404159003574745">"sms"</string>
-    <string name="keywords_more_mobile_networks" msgid="7813380887358745769">"mobiel gsm provider draadloos"</string>
+    <string name="keywords_more_default_sms_app" msgid="895656981962034647">"tekst bericht tekstbericht sms sms\'en berichten verzenden sturen"</string>
+    <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"mobiel gsm provider draadloos gegevens 4g 3g 2g lte"</string>
     <string name="keywords_home" msgid="3626170808219458848">"launcher"</string>
     <string name="keywords_display" msgid="6709007669501628320">"scherm touchscreen"</string>
-    <string name="keywords_display_brightness_level" msgid="8636451602230815191">"dimmen scherm touchscreen"</string>
-    <string name="keywords_display_auto_brightness" msgid="8070218600502753102">"dimmen scherm touchscreen"</string>
-    <string name="keywords_display_wallpaper" msgid="4315466287469834939">"achtergrond"</string>
+    <string name="keywords_display_brightness_level" msgid="8923289340474728990">"dimmen scherm touchscreen accu"</string>
+    <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"dimmen scherm touchscreen accu"</string>
+    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"achtergrond personaliseren aanpassen weergave"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"tekstgrootte"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"projecteren"</string>
-    <string name="keywords_storage" msgid="7007275853993419928">"ruimte schijf vaste schijf"</string>
-    <string name="keywords_battery" msgid="3992479295298655138">"macht"</string>
-    <string name="keywords_spell_checker" msgid="4509482591225399210">"spelling"</string>
+    <string name="keywords_storage" msgid="6572905220031852173">"ruimte schijf harde schijf apparaat gebruik"</string>
+    <string name="keywords_battery" msgid="2096185085932675704">"stroomverbruik opladen"</string>
+    <string name="keywords_spell_checker" msgid="6106749039734174140">"spelling woordenboek spellingcontrole automatisch corrigeren"</string>
     <string name="keywords_voice_input" msgid="3519547605812413860">"herkenning invoer spraak spreken taal handsfree hands free herkenning aanstootgevend woord audio geschiedenis bluetooth headset"</string>
-    <string name="keywords_text_to_speech_output" msgid="8207889472282225512">"snelheid taal standaard spreken praten"</string>
-    <string name="keywords_date_and_time" msgid="7666950126499155141">"klok"</string>
-    <string name="keywords_factory_data_reset" msgid="3693730656843989732">"wissen verwijderen"</string>
+    <string name="keywords_text_to_speech_output" msgid="392447904221657930">"tarief taal standaard spreek spreken tts toegankelijkheid lezer blind"</string>
+    <string name="keywords_date_and_time" msgid="2631808108134830066">"militaire klok"</string>
+    <string name="keywords_factory_data_reset" msgid="4355133848707691977">"wissen verwijderen herstellen weggooien"</string>
     <string name="keywords_printing" msgid="1701778563617114846">"printer"</string>
     <string name="keywords_sounds_and_notifications" msgid="5965996187974887000">"luidspreker pieptoon"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="2912933812460077912">"niet storen verstoren onderbreking storing"</string>
@@ -2354,7 +2371,7 @@
     <string name="keywords_location_mode" msgid="8584992704568356084">"nauwkeurigheid"</string>
     <string name="keywords_accounts" msgid="1957925565953357627">"account"</string>
     <string name="keywords_users" msgid="4673901601478559100">"beperking beperken beperkt"</string>
-    <string name="keywords_keyboard_and_ime" msgid="1103378692379215672">"tekstcorrectie corrigeren geluid trillen automatisch taal gebaar voorstellen suggestie thema aanstootgevend woord typen emoji"</string>
+    <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"tekst correctie corrigeren geluid trillen automatisch taal gebaar voorstellen suggestie thema aanstootgevend woord type emoji internationaal"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"vegen wachtwoord patroon pincode"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wifi NFC-tag instellen"</string>
     <string name="write_tag" msgid="8571858602896222537">"Schrijven"</string>
@@ -2371,7 +2388,6 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Meldingsvolume"</string>
     <string name="zen_mode_settings_title" msgid="7014915558669122902">"Onderbrekingen"</string>
     <string name="zen_mode_option_title" msgid="5061978632306007914">"Bij inkomende oproepen en meldingen"</string>
-    <string name="zen_mode_option_title_novoice" msgid="6680706009915204785">"Bij inkomende meldingen"</string>
     <string name="zen_mode_option_off" msgid="3167702608910820883">"Altijd onderbreken"</string>
     <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Alleen prioriteitsonderbrekingen toestaan"</string>
     <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Niet onderbreken"</string>
@@ -2429,14 +2445,17 @@
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Gereed"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Totdat u dit uitschakelt"</string>
     <string name="zen_mode_important_category" msgid="8123274463331022993">"Prioriteitsonderbrekingen"</string>
-    <string name="zen_mode_downtime_category" msgid="4730179065426038108">"Downtime (alleen prioriteitsonderbr.)"</string>
+    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Downtime"</string>
     <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Dagen"</string>
     <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Geen"</string>
+    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Onderbrekingen toegestaan"</string>
+    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Alleen prioriteit"</string>
+    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Geen"</string>
     <string name="zen_mode_automation_category" msgid="4653551005950835761">"Automatisering"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Automatisch inschakelen"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Nooit"</string>
-    <string name="zen_mode_phone_calls" msgid="8956214416859303966">"Oproepen"</string>
+    <string name="zen_mode_calls" msgid="7051492091133751208">"Oproepen"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Berichten"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Oproepen/berichten van"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Iedereen"</string>
@@ -2450,7 +2469,9 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Doordeweekse avonden"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Starttijd"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Eindtijd"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> de volgende dag"</string>
+    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> de volgende dag"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> of een eerder alarm"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> de volgende dag of een eerder alarm"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"App-meldingen"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Instellingen voor meldingen"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Feedback sturen over dit apparaat"</string>
@@ -2458,7 +2479,11 @@
     <string name="switch_on_text" msgid="1124106706920572386">"Aan"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Uit"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"Een scherm vastzetten"</string>
-    <string name="screen_pinning_description" msgid="7091642350452605379">"Als u scherm vastzetten heeft ingeschakeld, kunt u deze functie gebruiken om het huidige scherm in beeld te houden totdat u het losmaakt.\n\nScherm vastzetten gebruiken:\n\n1. Zorg ervoor dat scherm vastzetten is ingeschakeld.\n\n2. Open het scherm dat u wilt vastzetten.\n\n3. Tik op \'Overzicht\'.\n\n4. Tik op het punaisepictogram."</string>
+    <string name="screen_pinning_description" msgid="1137904524037468263">"Wanneer deze instelling is ingeschakeld, kunt u de functie voor scherm vastzetten gebruiken om het huidige scherm in beeld te houden totdat u het losmaakt.\n\nDe functie voor scherm vastzetten gebruiken:\n\n1. Zorg ervoor dat de functie voor het vastzetten van het scherm is ingeschakeld.\n\n2. Open het scherm dat u wilt vastzetten.\n\n3. Tik op \'Overzicht\'.\n\n4. Veeg omhoog en tik op het punaisepictogram."</string>
+    <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Vragen om ontgrendelingspatroon voordat items worden losgemaakt"</string>
+    <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Vragen om pincode voordat items worden losgemaakt"</string>
+    <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Vragen om wachtwoord voordat items worden losgemaakt"</string>
+    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Apparaat vergrendelen wanneer items worden losgemaakt"</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Werkprofiel"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Experimenteel)"</string>
     <string name="display_auto_rotate_title" msgid="6176450657107806043">"Wanneer het apparaat wordt gedraaid"</string>
@@ -2467,7 +2492,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"In liggende stand blijven"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"In huidige stand blijven"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI-informatie"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"Relatieve IMEI-informatie"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Versleuteling"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Doorgaan"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"U kunt dit apparaat verder beveiligen door uw pincode te vereisen voordat het apparaat wordt opgestart. Het apparaat kan pas oproepen, berichten en meldingen, waaronder alarmen, ontvangen nadat het is opgestart. \n\nZo kunnen gegevens op verloren of gestolen apparaten worden beveiligd."</string>
@@ -2485,4 +2509,7 @@
     <string name="encrypt_talkback_dialog_message_pin" msgid="1890374082842868489">"Wanneer u uw pincode opgeeft om dit apparaat te starten, zijn toegankelijkheidsservices zoals <xliff:g id="SERVICE">%1$s</xliff:g> nog niet beschikbaar."</string>
     <string name="encrypt_talkback_dialog_message_pattern" msgid="4474332516537386384">"Wanneer u uw patroon opgeeft om dit apparaat te starten, zijn toegankelijkheidsservices zoals <xliff:g id="SERVICE">%1$s</xliff:g> nog niet beschikbaar."</string>
     <string name="encrypt_talkback_dialog_message_password" msgid="8166099418487083927">"Wanneer u uw wachtwoord opgeeft om dit apparaat te starten, zijn toegankelijkheidsservices zoals <xliff:g id="SERVICE">%1$s</xliff:g> nog niet beschikbaar."</string>
+    <string name="imei_information_title" msgid="8499085421609752290">"IMEI-informatie"</string>
+    <string name="imei_information_summary" msgid="2074095606556565233">"Relatieve IMEI-informatie"</string>
+    <string name="slot_number" msgid="3762676044904653577">"(Positie <xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-pl/arrays.xml b/res/values-pl/arrays.xml
index ed09287..0e6fe8b 100644
--- a/res/values-pl/arrays.xml
+++ b/res/values-pl/arrays.xml
@@ -527,4 +527,12 @@
     <item msgid="4338089220026248848">"Pamięć podręczna (klient aktywności)"</item>
     <item msgid="6652164677254579050">"Pamięć podręczna (pusta)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Morski"</item>
+    <item msgid="8332294763632946560">"Niebieski"</item>
+    <item msgid="2023216417616991392">"Indygo"</item>
+    <item msgid="3170497246594232819">"Fioletowy"</item>
+    <item msgid="4608643045752965568">"Różowy"</item>
+    <item msgid="6131821495505931173">"Czerwony"</item>
+  </string-array>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index e2feb4f..70ef2d4 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 ustawienia Bluetooth są otwarte."</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>
@@ -180,7 +180,6 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s chce uzyskać dostęp do Twoich wiadomości. Zezwolić na dostęp?"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Data i czas"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Wybierz strefę czasową"</string>
-    <string name="normal_date_format" msgid="7636406984925498359">"Regionalny (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Podgląd:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Rozmiar czcionki:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -291,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>
@@ -322,8 +321,6 @@
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Wybierz strefę czasową"</string>
     <string name="date_time_set_date_title" msgid="6928286765325608604">"Data"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"Ustaw datę"</string>
-    <string name="date_time_date_format_title" msgid="3976171711988766411">"Format daty"</string>
-    <string name="date_time_date_format" msgid="6951498879879281102">"Wybierz format daty"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Sortuj alfabetycznie"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Sortuj według strefy czasowej"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Data"</string>
@@ -372,7 +369,8 @@
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Czekaj, trwa szyfrowanie telefonu. Ukończono: <xliff:g id="PERCENT">^1</xliff:g>%."</string>
     <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Poczekaj, aż tablet zostanie zaszyfrowany. Pozostały czas: <xliff:g id="DURATION">^1</xliff:g>"</string>
     <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Poczekaj, aż telefon zostanie zaszyfrowany. Pozostały czas: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Spróbuj ponownie za <xliff:g id="DELAY">^1</xliff:g> s."</string>
+    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"Aby odblokować tablet, wyłącz go i włącz ponownie."</string>
+    <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"Aby odblokować telefon, wyłącz go i włącz ponownie."</string>
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"Ostrzeżenie: Twoje urządzenie zostanie wyczyszczone po <xliff:g id="COUNT">^1</xliff:g> następnych nieudanych próbach odblokowania!"</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Wpisz swoje hasło."</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Szyfrowanie zakończone niepowodzeniem"</string>
@@ -401,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>
@@ -412,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>
@@ -514,7 +514,7 @@
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"Opcje…"</string>
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Zaawansowane"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Bluetooth – zaawansowane"</string>
-    <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Po włączeniu Bluetootha urządzenie może komunikować się z urządzeniami Bluetooth w pobliżu."</string>
+    <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Po włączeniu Bluetootha urządzenie może komunikować się z innymi urządzeniami Bluetooth w pobliżu."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Połącz z siecią…"</string>
     <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Dźwięk multimediów"</string>
     <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Dźwięk telefonu"</string>
@@ -556,13 +556,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Jako telefon w trybie głośnika"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Dla muzyki i multimediów"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Zapamiętaj ustawienia"</string>
-    <string name="wifi_assistant_intro_setup" msgid="4605105515416995110">"Poznaj\nAsystenta Wi‑Fi"</string>
-    <string name="wifi_assistant_no_thanks" msgid="2776983751990143934">"NIE, DZIĘKUJĘ"</string>
-    <string name="wifi_assistant_setup" msgid="3772423650475730906">"SKONFIGURUJ"</string>
-    <string name="wifi_assistant_card_message" msgid="107811647784658536">"Automatycznie łącz się z dostępnymi sieciami dzięki Asystentowi Wi‑Fi."</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Asystent Wi‑Fi"</string>
-    <string name="wifi_assistant_title_message" msgid="6240721017579074015">"<xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> automatycznie łączy urządzenie z najlepszą dostępną siecią Wi‑Fi"</string>
-    <string name="wifi_assistant_open_app" msgid="4803044899535675063">"OTWÓRZ APLIKACJĘ"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Połączono przez Asystenta Wi‑Fi"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"Ekran Cast"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Wyświetlacz bezprzewodowy"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Brak urządzeń w pobliżu."</string>
@@ -592,7 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Ustawienia Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Konfiguruj punkty dostępowe sieci bezprzewodowej i zarządzaj nimi"</string>
-    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Wybierz Wi-Fi"</string>
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Wybierz sieć Wi‑Fi"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Wybierz Wi-Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Włączam Wi-Fi…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Wyłączam Wi-Fi…"</string>
@@ -607,8 +602,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"Skanowanie zawsze dostępne"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Zawsze zezwalaj na skanowanie"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Zezwalaj usłudze lokalizacyjnej Google i innym aplikacjom na skanowanie w poszukiwaniu sieci, nawet przy wyłączonej sieci Wi‑Fi"</string>
-    <string name="wifi_automatically_manage_title" msgid="6249976570008992746">"Automatycznie zarządzaj Wi‑Fi"</string>
-    <string name="wifi_automatically_manage_summary" msgid="6952470763378312488">"Pozwól, aby <xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> zarządzał połączeniem Wi-Fi"</string>
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Używaj otwartych sieci Wi‑Fi automatycznie"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Pozwól asystentowi Wi‑Fi automatycznie łączyć się z otwartymi sieciami wysokiej jakości"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Wybierz asystenta"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Instaluj certyfikaty"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Aby poprawić dokładność lokalizacji (i w innych celach), aplikacje Google i inne mogą skanować sieci w pobliżu, nawet gdy Wi-Fi jest wyłączone. Jeśli nie chcesz, aby tak się działo, wybierz Zaawansowane &gt; Skanowanie zawsze dostępne."</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Aplikacje mogą wyszukiwać sieci w pobliżu, nawet gdy Wi-Fi jest wyłączone. Jeśli nie chcesz, aby tak się działo, wybierz Zaawansowane &gt; Skanowanie zawsze dostępne."</string>
@@ -629,6 +625,7 @@
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Skanuj"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Zaawansowane"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Połącz z siecią"</string>
+    <string name="wifi_menu_remember" msgid="8814185749388713796">"Zapamiętaj sieć"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Zapomnij sieć"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Modyfikuj sieć"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Zapisz do tagu NFC"</string>
@@ -673,9 +670,11 @@
     <string name="wifi_unspecified" msgid="5431501214192991253">"(nie określono)"</string>
     <string name="wifi_remembered" msgid="4955746899347821096">"Zapisana"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"Wyłączona"</string>
-    <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Uniknięto połączenia internetowego o niskiej jakości."</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"Błąd konfiguracji IP"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Błąd połączenia Wi-Fi"</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Problem z uwierzytelnianiem"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Poza zasięgiem"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Nie wykryto dostępu do internetu. Nie można automatycznie przywrócić połączenia."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"Protokół WPS jest dostępny"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (protokół WPS dostępny)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Podaj hasło do sieci"</string>
@@ -699,9 +698,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"OSTRZEŻENIE: jeśli nie dodasz sieci Wi‑Fi, tablet będzie pobierać oprogramowanie i aktualizacje tylko przez sieć komórkową. Aby uniknąć opłat za przesył danych, połącz się z Wi-Fi."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"OSTRZEŻENIE: jeśli nie dodasz sieci Wi‑Fi, urządzenie będzie pobierać oprogramowanie i aktualizacje tylko przez sieć komórkową. Aby uniknąć opłat za przesył danych, połącz się z Wi-Fi."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"OSTRZEŻENIE: jeśli nie dodasz sieci Wi‑Fi, telefon będzie pobierać oprogramowanie i aktualizację tylko przez sieć komórkową. Aby uniknąć opłat za przesył danych, połącz się z Wi-Fi."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="2393880108322835846">"OSTRZEŻENIE: jeśli nie dodasz sieci Wi‑Fi, tablet nie będzie mieć połączenia z internetem, co uniemożliwi pobieranie oprogramowania i aktualizacji."</string>
-    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1707391993265558787">"OSTRZEŻENIE: jeśli nie dodasz sieci Wi‑Fi, urządzenie nie będzie mieć połączenia z internetem, co uniemożliwi pobieranie oprogramowania i aktualizacji."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="1556858507920033022">"OSTRZEŻENIE: jeśli nie dodasz sieci Wi‑Fi, telefon nie będzie mieć połączenia z internetem, co uniemożliwi pobieranie oprogramowania i aktualizacji."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Jeśli pominiesz Wi‑Fi:\n\nTablet nie będzie mieć połączenia z internetem.\n\nNie będzie można pobrać aktualizacji oprogramowania, dopóki nie połączysz się z internetem.\n\nNie możesz obecnie włączyć funkcji ochrony urządzenia."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Jeśli pominiesz Wi‑Fi:\n\nUrządzenie nie będzie mieć połączenia z internetem.\n\nNie będzie można pobrać aktualizacji oprogramowania, dopóki nie połączysz się z internetem.\n\nNie możesz obecnie włączyć funkcji ochrony urządzenia."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Jeśli nie wybierzesz sieci Wi‑Fi:\n\nTelefon nie będzie mieć połączenia z internetem.\n\nNie będzie można pobrać aktualizacji oprogramowania, dopóki nie połączysz się z internetem.\n\nNie będzie można włączyć funkcji ochrony urządzenia."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Tablet nie może nawiązać połączenia z tą siecią Wi-Fi."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"Urządzenie nie może połączyć się z tą siecią Wi-Fi."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Telefon nie może nawiązać połączenia z tą siecią Wi-Fi."</string>
@@ -752,7 +751,7 @@
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5618031116920832182">"Przenośny hotspot Wi‑Fi AndroidAP WPA2 PSK"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"Przenośny hotspot Wi-Fi <xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g>"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"Punkt dostępu Android"</string>
-    <string name="home_settings" msgid="212375129455718176">"Strona główna"</string>
+    <string name="home_settings" msgid="212375129455718176">"Ekran główny"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Wyświetlacz"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Dźwięk"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
@@ -761,7 +760,6 @@
     <string name="ring_volume_title" msgid="7938706566797464165">"Głośność dzwonka"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Wibracje po wyciszeniu"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Domyślny dźwięk powiadomienia"</string>
-    <string name="heads_up_enabled_title" msgid="1031078221910921622">"Z okienkiem (wysoki priorytet)"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Dzwonek"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Powiadomienie"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Użyj głośności połączeń przychodzących dla powiadomień"</string>
@@ -834,7 +832,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatyczna"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Podnieś, by wybudzić"</string>
     <string name="doze_title" msgid="2259176504273878294">"Ekran dostosowany do otoczenia"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"Wybudź ekran po podniesieniu urządzenia lub otrzymaniu powiadomienia"</string>
+    <string name="doze_summary" msgid="7128970177894383698">"Włącz ekran po podniesieniu urządzenia lub otrzymaniu powiadomień"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Rozmiar czcionki"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Rozmiar czcionki"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Ustawienia blokady karty SIM"</string>
@@ -862,6 +860,10 @@
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Anuluj"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"Znaleziono wiele kart SIM"</string>
     <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>
@@ -1012,6 +1014,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Zostaną usunięte wszystkie dane z "<b>"wewnętrznej pamięci"</b>" tabletu, w tym:\n\n"<li>"Dane konta Google"</li>\n<li>"Dane i ustawienia systemu oraz aplikacji"</li>\n<li>"Pobrane aplikacje"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Zostaną usunięte wszystkie dane z "<b>"wewnętrznej pamięci"</b>" telefonu, w tym:\n\n"<li>"Dane konta Google"</li>\n<li>"Dane i ustawienia systemu oraz aplikacji"</li>\n<li>"Pobrane aplikacje"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Zalogowano się na konta:\n"</string>
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Z tego urządzenia korzystają inni użytkownicy.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Muzyka"</li>\n<li>"Zdjęcia"</li>\n<li>"Inne dane użytkownika"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Aby usunąć muzykę, zdjęcia i inne dane użytkownika, należy wymazać "<b>"nośnik USB"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Aby usunąć muzykę, zdjęcia i inne dane użytkownika, należy wymazać "<b>"kartę SD"</b>"."</string>
@@ -1023,7 +1026,6 @@
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Resetuj telefon"</string>
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Wymazać wszystkie Twoje informacje osobiste i pobrane aplikacje? Tej czynności nie można cofnąć."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Wymaż wszystko"</string>
-    <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Narysuj wzór odblokowania"</string>
     <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Aby potwierdzić przywrócenie danych fabrycznych, musisz narysować wzór odblokowania."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Nie wykonano resetowania, ponieważ usługa czyszczenia systemu jest niedostępna."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Zresetować?"</string>
@@ -1041,7 +1043,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"Wymazać nośnik USB, usuwając wszystkie zapisane na nim pliki? Tej czynności nie można cofnąć."</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Wymazać kartę SD, usuwając wszystkie zapisane na niej pliki? Tej czynności nie można cofnąć."</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Wymaż wszystko"</string>
-    <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Narysuj wzór odblokowania"</string>
     <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Aby potwierdzić zamiar wyczyszczenia nośnika USB, musisz narysować wzór odblokowania."</string>
     <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Aby potwierdzić zamiar wyczyszczenia karty SD, musisz narysować wzór odblokowania."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Ustawienia połączeń"</string>
@@ -1087,6 +1088,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Włóż kartę SIM i zrestartuj urządzenie"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Połącz się z internetem"</string>
     <string name="location_title" msgid="1029961368397484576">"Moja lokalizacja"</string>
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Profil do pracy"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Lokalizacja dla profilu do pracy"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Wyłączone przez Twoją firmę"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Tryb lokalizacji"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Wysoka dokładność"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Oszczędzanie baterii"</string>
@@ -1124,6 +1128,7 @@
     <string name="copyright_title" msgid="865906688917260647">"Prawa autorskie"</string>
     <string name="license_title" msgid="1990487604356037871">"Licencja"</string>
     <string name="terms_title" msgid="7697580845616764642">"Warunki i zasady korzystania"</string>
+    <string name="webview_license_title" msgid="2813507464175738967">"Systemowa licencja na WebView"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Tapety"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Dostawcy zdjęć satelitarnych:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Licencje open source"</string>
@@ -1237,7 +1242,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Nośnik USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Na karcie SD"</string>
     <string name="disabled" msgid="9206776641295849915">"Wyłączone"</string>
-    <string name="not_installed" msgid="1475144352069281880">"Nie zainstalowano"</string>
+    <string name="not_installed" msgid="2797554494953450291">"Dla tego użytk. niezainstalowana"</string>
     <string name="no_applications" msgid="7336588977497084921">"Brak aplikacji"</string>
     <string name="internal_storage" msgid="1584700623164275282">"Pamięć wewnętrzna"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Nośnik USB"</string>
@@ -1434,8 +1439,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Ekran nie będzie gaszony podczas ładowania telefonu"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Włącz dziennik analizatora snoop Bluetooth HCI"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Przechwyć wszystkie pakiety Bluetooth HCI do pliku"</string>
-    <string name="oem_unlock_enable" msgid="6629321276287913315">"Włącz zdjęcie blokady OEM"</string>
-    <string name="oem_unlock_enable_summary" msgid="3546686263996628110">"Zezwól na zdjęcie blokady OEM urządzenia"</string>
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"Zdjęcie blokady OEM"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Umożliwia odblokowanie programu rozruchowego"</string>
+    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Wpisz kod PIN"</string>
+    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Aby włączyć zdjęcie blokady OEM, wpisz kod PIN urządzenia"</string>
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Zezwolić na zdjęcie blokady OEM?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"UWAGA: gdy to ustawienie jest włączone, na urządzeniu nie będą działać funkcje ochrony."</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Wyświetlacz bezprzewodowy"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Włącz szczegółowe rejestrowanie Wi-Fi"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Agresywne przeł. Wi‑Fi na sieć komórkową"</string>
@@ -1538,6 +1547,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"Tak będą wyglądać napisy"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"Domyślnie"</string>
+    <string name="color_title" msgid="4258931051732243983">"Kolor"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"Domyślny"</string>
     <string name="color_none" msgid="3475640044925814795">"Brak"</string>
     <string name="color_white" msgid="8045195170201590239">"Biały"</string>
@@ -1595,12 +1605,12 @@
     <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">"Pozostało <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> do naładowania"</string>
-    <string name="power_discharging_duration" msgid="7125493014448497620">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – zostało ok. <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="power_charging" msgid="712751285832976915">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – <xliff:g id="STATE">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration" msgid="4802183864773082009">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – <xliff:g id="TIME">%2$s</xliff:g> do pełnego naładowania"</string>
-    <string name="power_charging_duration_ac" msgid="3611179931297824699">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – <xliff:g id="TIME">%2$s</xliff:g> do pełnego naładowania z gniazdka"</string>
-    <string name="power_charging_duration_usb" msgid="1106605348913397583">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – <xliff:g id="TIME">%2$s</xliff:g> do pełnego naładowania przez USB"</string>
-    <string name="power_charging_duration_wireless" msgid="633606920144617227">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – <xliff:g id="TIME">%2$s</xliff:g> do naładowania bezprzewodowo"</string>
+    <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> – zostało ok. <xliff:g id="TIME">%2$s</xliff:g>"</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> do pełnego naładowania"</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> do pełnego naładowania z gniazdka"</string>
+    <string name="power_charging_duration_usb" msgid="182405645340976546">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> do pełnego naładowania przez USB"</string>
+    <string name="power_charging_duration_wireless" msgid="1829295708243159464">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> do pełnego naładowania bezprzewodowo"</string>
     <string name="power_usage_list_summary" msgid="2409288197839512482">"Wykorzystanie od ostatniego naładowania"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Użycie baterii od odłączenia"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Użycie baterii od zresetowania"</string>
@@ -1617,7 +1627,6 @@
     <string name="awake" msgid="387122265874485088">"Czas aktywności urządzenia"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Czas z włączonym Wi-Fi"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Czas z wł. Wi-Fi"</string>
-    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> – <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Historia – szczegóły"</string>
     <string name="details_title" msgid="3792801565213935385">"Szczegóły użycia"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Szczegóły użycia"</string>
@@ -1689,7 +1698,7 @@
     <string name="battery_saver" msgid="1426682272004907982">"Oszczędzanie baterii"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Włącz automatycznie"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Nigdy"</string>
-    <string name="battery_saver_turn_on_automatically_pct" msgid="3033681629861428940">"przy %1$d%% baterii"</string>
+    <string name="battery_saver_turn_on_automatically_pct" msgid="7536784431655058267">"przy %1$s baterii"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Statystyki procesów"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Rozbudowane statystyki uruchomionych procesów"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Użycie pamięci"</string>
@@ -1813,7 +1822,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Wspomagana sprzętowo"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Tylko programowa"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"Ten użytkownik nie ma dostępu do poświadczeń"</string>
-    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Narysuj wzór odblokowania"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Aby potwierdzić instalację danych logowania, musisz narysować wzór odblokowania."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Podaj hasło do magazynu danych logowania."</string>
@@ -1843,6 +1851,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"Dołącz dane aplikacji"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Autoprzywracanie"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Przy ponownej instalacji aplikacji przywróć ustawienia i dane z kopii zapasowej."</string>
+    <string name="backup_inactive_title" msgid="5355557151569037197">"Usługa kopii zapasowych jest nieaktywna."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"Jest to określone przez zasady dotyczące urządzeń."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Hasło kopii zapasowych"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Pełne kopie zapasowe na komputerze nie są obecnie chronione"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Wybierz, aby zmienić lub usunąć hasło pełnych kopii zapasowych na komputerze stacjonarnym."</string>
@@ -1952,7 +1962,11 @@
     <string name="enter_password" msgid="8035706727471334122">"Aby uruchomić Androida, wpisz hasło"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Aby uruchomić Androida, wpisz kod PIN"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Aby uruchomić Androida, narysuj wzór"</string>
-    <string name="try_again" msgid="4272075051293936921">"Spróbuj ponownie."</string>
+    <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"Nieprawidłowy wzór"</string>
+    <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"Nieprawidłowe hasło"</string>
+    <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"Nieprawidłowy kod PIN"</string>
+    <string name="checking_decryption" msgid="8287458611802609493">"Sprawdzam…"</string>
+    <string name="starting_android" msgid="8581493237458496835">"Uruchamianie Androida"</string>
     <string name="delete" msgid="4219243412325163003">"Usuń"</string>
     <string name="misc_files" msgid="6720680815969643497">"Różne pliki"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"wybrano <xliff:g id="NUMBER">%1$d</xliff:g> z <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -1990,8 +2004,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Zawsze używaj GPU do komponowania ekranu"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"Symuluj przestrzeń kolorów"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Włącz śledzenia OpenGL"</string>
-    <string name="use_nuplayer" msgid="5699257393367904387">"Użyj NuPlayera (eksperyment)"</string>
-    <string name="use_nuplayer_summary" msgid="1991479067478516714">"Używaj NuPlayera zamiast AwesomePlayera"</string>
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"Używaj AwesomePlayera (wycofane)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"Używaj AwesomePlayera zamiast NuPlayera do odtwarzania większości multimediów"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"Wyłącz kierowanie dźwiękowe USB"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"Wyłącz auto kierowanie do urządzeń per. audio USB"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Pokaż granice układu"</string>
@@ -2167,7 +2181,6 @@
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Dodaj użytkownika lub profil"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Dodaj użytkownika"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Profil ograniczony"</string>
-    <string name="user_summary_managed_profile" msgid="7369539529693048111">"Profil do pracy"</string>
     <string name="user_need_lock_message" msgid="2596365678651842785">"Zanim utworzysz profil z ograniczeniami, musisz skonfigurować ekran blokady, by chronić aplikacje i osobiste dane."</string>
     <string name="user_set_lock_button" msgid="8311219392856626841">"Ustaw blokadę"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Nieskonfigurowany"</string>
@@ -2298,11 +2311,13 @@
     <string name="sim_cellular_data_unavailable_summary" msgid="3654805961942166428">"Kliknij, by wybrać kartę SIM do transmisji danych"</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"Zawsze używaj do połączeń"</string>
     <string name="select_sim_for_data" msgid="2366081042162853044">"Wybierz kartę SIM do transmisji danych"</string>
+    <string name="data_switch_started" msgid="2040761479817166311">"Przełączanie karty SIM do danych, to może potrwać maksymalnie minutę..."</string>
     <string name="select_sim_for_calls" msgid="3503094771801109334">"Zadzwoń, używając"</string>
     <string name="sim_select_card" msgid="211285163525563293">"Wybierz kartę SIM"</string>
     <string name="sim_card_number_title" msgid="7845379943474336488">"Karta SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"Karta SIM pusta"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"Nazwa karty SIM"</string>
+    <string name="sim_name_hint" msgid="7038643345238968930">"Wpisz nazwę karty SIM"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"Gniazdo SIM %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Operator"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Numer"</string>
@@ -2312,7 +2327,6 @@
     <string name="color_purple" msgid="3888532466427762504">"Fioletowy"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"Brak włożonych kart SIM"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"Stan karty SIM"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"Informacje związane z kartą SIM"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"Oddzwoń za pomocą domyślnej karty SIM"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"Karta SIM do połączeń wychodzących"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Inne ustawienia połączenia"</string>
@@ -2320,8 +2334,11 @@
     <string name="preferred_network_offload_header" msgid="2321173571529106767">"Wyłącz rozgłaszanie nazwy sieci"</string>
     <string name="preferred_network_offload_footer" msgid="5857279426054744020">"Wyłączenie rozgłaszania nazwy sieci uniemożliwia innym osobom uzyskanie informacji o Twojej sieci."</string>
     <string name="preferred_network_offload_popup" msgid="2252915199889604600">"Wyłączenie rozgłaszania nazwy sieci zapobiega automatycznemu łączeniu się z ukrytymi sieciami."</string>
+    <string name="sim_signal_strength" msgid="9144010043784767984">"<xliff:g id="DBM">%1$d</xliff:g> dBm <xliff:g id="ASU">%2$d</xliff:g> asu"</string>
+    <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>
+    <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Pytaj za każdym razem"</string>
     <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>
@@ -2330,22 +2347,22 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Niedawno wyszukiwane hasła"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Wyniki"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi połączenie internet"</string>
-    <string name="keywords_more_default_sms_app" msgid="2744404159003574745">"wiadomość tekstowa"</string>
-    <string name="keywords_more_mobile_networks" msgid="7813380887358745769">"operator sieci komórkowej komórkowy bezprzewodowy"</string>
+    <string name="keywords_more_default_sms_app" msgid="895656981962034647">"SMS pisanie SMS-ów wiadomości SMS-owanie"</string>
+    <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"komórkowy komórka operator bezprzewodowe dane 4g 3g 2g lte"</string>
     <string name="keywords_home" msgid="3626170808219458848">"launcher"</string>
     <string name="keywords_display" msgid="6709007669501628320">"ekran dotykowy"</string>
-    <string name="keywords_display_brightness_level" msgid="8636451602230815191">"przyciemnij ekran dotykowy"</string>
-    <string name="keywords_display_auto_brightness" msgid="8070218600502753102">"przyciemnij ekran dotykowy"</string>
-    <string name="keywords_display_wallpaper" msgid="4315466287469834939">"tło"</string>
+    <string name="keywords_display_brightness_level" msgid="8923289340474728990">"przyciemnij ekran ekran dotykowy bateria"</string>
+    <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"przyciemnij ekran ekran dotykowy bateria"</string>
+    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"tło personalizuj dostosuj wyświetlacz"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"rozmiar tekstu"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"projekcja"</string>
-    <string name="keywords_storage" msgid="7007275853993419928">"miejsce dysk twardy"</string>
-    <string name="keywords_battery" msgid="3992479295298655138">"zasilanie"</string>
-    <string name="keywords_spell_checker" msgid="4509482591225399210">"pisownia"</string>
+    <string name="keywords_storage" msgid="6572905220031852173">"miejsce dysk dysk twardy urządzenie użycie"</string>
+    <string name="keywords_battery" msgid="2096185085932675704">"zasilanie zużycie ładuj"</string>
+    <string name="keywords_spell_checker" msgid="6106749039734174140">"pisownia słownik sprawdzanie pisowni autokorekta"</string>
     <string name="keywords_voice_input" msgid="3519547605812413860">"rozpoznawanie wejście wprowadzanie mowa mówić język zestaw głośnomówiący obsługa bez użycia rąk rozpoznawanie obraźliwe słowo historia dźwięku zestaw słuchawkowy bluetooth"</string>
-    <string name="keywords_text_to_speech_output" msgid="8207889472282225512">"szybkość język domyślny mowa mówienie"</string>
-    <string name="keywords_date_and_time" msgid="7666950126499155141">"zegar"</string>
-    <string name="keywords_factory_data_reset" msgid="3693730656843989732">"wymazywanie usuwanie"</string>
+    <string name="keywords_text_to_speech_output" msgid="392447904221657930">"ocena język domyślne mów mówienie tekst na mowę ułatwienia dostępu czytnik niewidomy"</string>
+    <string name="keywords_date_and_time" msgid="2631808108134830066">"zegar 24-godzinny"</string>
+    <string name="keywords_factory_data_reset" msgid="4355133848707691977">"wymaż usuń przywróć wyczyść skasuj"</string>
     <string name="keywords_printing" msgid="1701778563617114846">"drukarka"</string>
     <string name="keywords_sounds_and_notifications" msgid="5965996187974887000">"sygnał dźwiękowy"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="2912933812460077912">"nie przeszkadzać przerywać zakłócać"</string>
@@ -2354,7 +2371,7 @@
     <string name="keywords_location_mode" msgid="8584992704568356084">"dokładność"</string>
     <string name="keywords_accounts" msgid="1957925565953357627">"konto"</string>
     <string name="keywords_users" msgid="4673901601478559100">"ograniczenie ogranicz ograniczony"</string>
-    <string name="keywords_keyboard_and_ime" msgid="1103378692379215672">"poprawianie tekstu korekta dźwięk wibracje auto język gest podpowiadanie podpowiedź sugestia sugestie motyw obraźliwe słowo pisanie emotikon"</string>
+    <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"tekst poprawianie popraw dźwięk wibracje automatyczne język gest sugeruj sugestia motyw obraźliwe słowo typ emoji międzynarodowe"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"przesuwanie hasło wzór pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Skonfiguruj tag NFC Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Zapisz"</string>
@@ -2369,12 +2386,11 @@
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Głośność alarmu"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Głośność dzwonka"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Głośność powiadomień"</string>
-    <string name="zen_mode_settings_title" msgid="7014915558669122902">"Przerwy"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"Gdy ktoś dzwoni i przychodzą powiadomienia"</string>
-    <string name="zen_mode_option_title_novoice" msgid="6680706009915204785">"Gdy przychodzą powiadomienia"</string>
-    <string name="zen_mode_option_off" msgid="3167702608910820883">"Zawsze przerywaj"</string>
-    <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Zezwalaj tylko na przerwy priorytetowe"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Nie przerywaj"</string>
+    <string name="zen_mode_settings_title" msgid="7014915558669122902">"Dozwolone dźwięki"</string>
+    <string name="zen_mode_option_title" msgid="5061978632306007914">"Gdy ktoś dzwoni lub przychodzi powiadomienie"</string>
+    <string name="zen_mode_option_off" msgid="3167702608910820883">"Zezwalaj na wszystkie dźwięki"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Zezwalaj na dźwięki priorytetowe"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Nie zezwalaj na żadne dźwięki"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Dzwonek telefonu"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Domyślny dzwonek powiadomień"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Wibracja podczas połączeń"</string>
@@ -2428,29 +2444,34 @@
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Poufne"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Gotowe"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Dopóki nie wyłączysz"</string>
-    <string name="zen_mode_important_category" msgid="8123274463331022993">"Przerwy priorytetowe"</string>
-    <string name="zen_mode_downtime_category" msgid="4730179065426038108">"Brak aktywności (tylko przerwy priorytetowe)"</string>
+    <string name="zen_mode_important_category" msgid="8123274463331022993">"Dźwięki priorytetowe"</string>
+    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Powiadomienia wyłączone"</string>
     <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Dni"</string>
     <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Brak"</string>
+    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Dozwolone powiadomienia"</string>
+    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Tylko priorytetowe"</string>
+    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Brak"</string>
     <string name="zen_mode_automation_category" msgid="4653551005950835761">"Automatyzacja"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Włącz automatycznie"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Nigdy"</string>
-    <string name="zen_mode_phone_calls" msgid="8956214416859303966">"Połączenia"</string>
+    <string name="zen_mode_calls" msgid="7051492091133751208">"Połączenia"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Wiadomości"</string>
-    <string name="zen_mode_from" msgid="1033337300289871697">"Połączenia/wiadomości od"</string>
+    <string name="zen_mode_from" msgid="1033337300289871697">"Połączenia lub wiadomości od"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Każdy"</string>
     <string name="zen_mode_from_contacts" msgid="8751503728985572786">"Tylko kontakty"</string>
     <string name="zen_mode_from_starred" msgid="2168651127340381533">"Tylko kontakty z gwiazdką"</string>
     <string name="zen_mode_events" msgid="2456995649835437565">"Wydarzenia i przypomnienia"</string>
-    <string name="zen_mode_alarm_info" msgid="3195430795475795398">"Alarmy mają zawsze priorytet"</string>
+    <string name="zen_mode_alarm_info" msgid="3195430795475795398">"Alarmy mają zawsze priorytet."</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Włącz automatycznie"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Nigdy"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Każdej nocy"</string>
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Noce poza weekendem"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Godzina rozpoczęcia"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Godzina zakończenia"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> następnego dnia"</string>
+    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> następnego dnia"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> lub wcześniej w przypadku alarmu"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> następnego dnia lub wcześniej w przypadku alarmu"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Powiadom. aplikacji"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Ustawienia powiadomień"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Prześlij opinię o tym urządzeniu"</string>
@@ -2458,7 +2479,11 @@
     <string name="switch_on_text" msgid="1124106706920572386">"Wł."</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Wył."</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"Przypinanie ekranu"</string>
-    <string name="screen_pinning_description" msgid="7091642350452605379">"Kiedy włączysz przypięcie ekranu, bieżący ekran będzie ciągle widoczny, póki go nie odepniesz.\n\nAby skorzystać z przypięcia ekranu:\n\n1. Upewnij się, że funkcja przypinania ekranu jest włączona.\n\n2. Otwórz ekran, który chcesz przypiąć.\n\n3. Kliknij Przegląd.\n\n4. Kliknij ikonę pinezki."</string>
+    <string name="screen_pinning_description" msgid="1137904524037468263">"Gdy to ustawienie jest włączone, możesz użyć przypinania ekranu, by widzieć aktualny ekran do czasu, gdy go odepniesz.\n\nAby użyć przypinania ekranu:\n\n1. Upewnij się, że jest ono włączone.\n\n2. Otwórz ekran, który chcesz przypiąć.\n\n3. Kliknij Przegląd.\n\n4. Przesuń palcem w górę i kliknij ikonę pinezki."</string>
+    <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Aby odpiąć, poproś o wzór odblokowania"</string>
+    <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Aby odpiąć, poproś o PIN"</string>
+    <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Aby odpiąć, poproś o hasło"</string>
+    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Zablokuj urządzenie przy odpinaniu"</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Profil do pracy"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Eksperymentalne)"</string>
     <string name="display_auto_rotate_title" msgid="6176450657107806043">"Podczas obrotu urządzenia"</string>
@@ -2467,7 +2492,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Pozostaw orientację poziomą"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Pozostaw obecną orientację"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"Informacje o IMEI"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"Informacje związane z IMEI"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Szyfrowanie"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Dalej"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"Możesz wzmocnić ochronę urządzenia przez wymaganie kodu PIN do jego uruchomienia. Dopiero po uruchomieniu urządzenie może odbierać połączenia, wiadomości czy powiadomienia, w tym alarmy. \n\nZwiększa to bezpieczeństwo danych na zgubionym lub skradzionym urządzeniu."</string>
@@ -2485,4 +2509,7 @@
     <string name="encrypt_talkback_dialog_message_pin" msgid="1890374082842868489">"Gdy wpiszesz swój kod PIN, by włączyć to urządzenie, usługi ułatwień dostępu takie jak <xliff:g id="SERVICE">%1$s</xliff:g> nie będą jeszcze aktywne."</string>
     <string name="encrypt_talkback_dialog_message_pattern" msgid="4474332516537386384">"Gdy narysujesz swój wzór, by włączyć to urządzenie, usługi ułatwień dostępu takie jak <xliff:g id="SERVICE">%1$s</xliff:g> nie będą jeszcze aktywne."</string>
     <string name="encrypt_talkback_dialog_message_password" msgid="8166099418487083927">"Gdy wpiszesz swoje hasło, by włączyć to urządzenie, usługi ułatwień dostępu takie jak <xliff:g id="SERVICE">%1$s</xliff:g> nie będą jeszcze aktywne."</string>
+    <string name="imei_information_title" msgid="8499085421609752290">"Informacje o IMEI"</string>
+    <string name="imei_information_summary" msgid="2074095606556565233">"Informacje związane z IMEI"</string>
+    <string name="slot_number" msgid="3762676044904653577">"(Gniazdo <xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-pt-nokeys/strings.xml b/res/values-pt-nokeys/strings.xml
index 96d62c0..15c52f4 100644
--- a/res/values-pt-nokeys/strings.xml
+++ b/res/values-pt-nokeys/strings.xml
@@ -16,5 +16,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applications_settings_summary" msgid="6616938758022986257">"Gerenciar aplicativos"</string>
+    <string name="applications_settings_summary" msgid="6616938758022986257">"Gerenciar apps"</string>
 </resources>
diff --git a/res/values-pt-rPT/arrays.xml b/res/values-pt-rPT/arrays.xml
index 2c86b84..da8f603 100644
--- a/res/values-pt-rPT/arrays.xml
+++ b/res/values-pt-rPT/arrays.xml
@@ -527,4 +527,12 @@
     <item msgid="4338089220026248848">"Em cache (cliente de atividade)"</item>
     <item msgid="6652164677254579050">"Em cache (vazio)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Azul esverdeado"</item>
+    <item msgid="8332294763632946560">"Azul"</item>
+    <item msgid="2023216417616991392">"Índigo"</item>
+    <item msgid="3170497246594232819">"Roxo"</item>
+    <item msgid="4608643045752965568">"Cor-de-rosa"</item>
+    <item msgid="6131821495505931173">"Vermelho"</item>
+  </string-array>
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 9130033..dd5fd1a 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>
@@ -180,7 +180,6 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s pretende aceder às suas mensagens. Conceder acesso a %2$s?"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Data e hora"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Escolher o fuso horário"</string>
-    <string name="normal_date_format" msgid="7636406984925498359">"Regional (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Pré-visualização:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Tamanho do tipo de letra:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -291,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>
@@ -322,8 +321,6 @@
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Seleccionar fuso horário"</string>
     <string name="date_time_set_date_title" msgid="6928286765325608604">"Data"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"Definir data"</string>
-    <string name="date_time_date_format_title" msgid="3976171711988766411">"Formato da data"</string>
-    <string name="date_time_date_format" msgid="6951498879879281102">"Selecionar formato de data"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Ordenar alfabeticamente"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Ordenar por fuso horário"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Data"</string>
@@ -372,7 +369,8 @@
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Aguarde enquanto o telemóvel está a ser encriptado. <xliff:g id="PERCENT">^1</xliff:g>% concluído."</string>
     <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Aguarde enquanto o tablet está a ser encriptado. Tempo restante: <xliff:g id="DURATION">^1</xliff:g>"</string>
     <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Aguarde enquanto o telemóvel está a ser encriptado. Tempo restante: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Tente novamente dentro de <xliff:g id="DELAY">^1</xliff:g> segundos."</string>
+    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"Para desbloquear o tablet, desligue-o e volte a ligá-lo."</string>
+    <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"Para desbloquear o telemóvel, desligue-o e volte a ligá-lo."</string>
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"Aviso: O seu dispositivo será apagado após mais <xliff:g id="COUNT">^1</xliff:g> tentativa(s) falhada(s) de desbloqueio!"</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Introduza a palavra-passe"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Encriptação sem êxito"</string>
@@ -401,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>
@@ -412,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>
@@ -556,13 +556,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Como telefone com altifalante"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Para música e multimédia"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Memorizar definições"</string>
-    <string name="wifi_assistant_intro_setup" msgid="4605105515416995110">"Intro.\nAssist. Wi‑Fi"</string>
-    <string name="wifi_assistant_no_thanks" msgid="2776983751990143934">"NÃO, OBRIGADO"</string>
-    <string name="wifi_assistant_setup" msgid="3772423650475730906">"CONFIGURAR"</string>
-    <string name="wifi_assistant_card_message" msgid="107811647784658536">"Ligar automaticamente a redes disponíveis com um Assistente Wi-Fi."</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Assistente Wi-Fi"</string>
-    <string name="wifi_assistant_title_message" msgid="6240721017579074015">"O <xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> estabelece automaticamente ligação ao melhor Wi‑Fi disponível"</string>
-    <string name="wifi_assistant_open_app" msgid="4803044899535675063">"ABRIR APLICAÇÃO"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Ligado através do Assistente de Wi‑Fi"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"Transmitir ecrã"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Ativar display sem fios"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Nenhum dispositivo nas proximidades."</string>
@@ -592,7 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Definições de Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Configurar e gerir pontos de acesso sem fios"</string>
-    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Selecionar Wi-Fi"</string>
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Selecionar rede Wi‑Fi"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Selecionar Wi-Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"A ligar Wi-Fi..."</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"A desligar Wi-Fi..."</string>
@@ -607,8 +602,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"Procura de redes sempre disponível"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Permitir sempre procura"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Permitir que o serviço de localização da Google e outras aplicações procurem redes, mesmo quando o Wi-Fi está desativado"</string>
-    <string name="wifi_automatically_manage_title" msgid="6249976570008992746">"Gerir Wi-Fi automaticamente"</string>
-    <string name="wifi_automatically_manage_summary" msgid="6952470763378312488">"Deixe o <xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> gerir a sua ligação Wi‑Fi"</string>
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Utilizar automat. redes Wi-Fi abertas"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Permitir que um Assistente de Wi-Fi ligue automaticamente a redes abertas de alta qualidade"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Escolher assistente"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Instalar certificados"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Para melhorar a precisão de localização e para outros fins, a Google e outras aplicações poderão procurar redes nas proximidades, mesmo com o Wi-Fi desligado. Se não pretender que isto aconteça, aceda a Avançadas &gt; Procura de redes sempre disponível."</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"As aplicações poderão procurar redes nas proximidades, mesmo com o Wi-Fi desligado. Se não pretender que isto aconteça, aceda a Avançadas &gt; Procura sempre disponível."</string>
@@ -629,6 +625,7 @@
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Procurar"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Avançadas"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Ligar a uma rede"</string>
+    <string name="wifi_menu_remember" msgid="8814185749388713796">"Memorizar a rede"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Esquecer rede"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Modificar rede"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Escrever na etiqueta NFC"</string>
@@ -673,9 +670,11 @@
     <string name="wifi_unspecified" msgid="5431501214192991253">"(não especificado)"</string>
     <string name="wifi_remembered" msgid="4955746899347821096">"Guardada"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"Desativado"</string>
-    <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Evitada ligação à internet fraca"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"Falha de configuração de IP"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Falha de ligação Wi-Fi"</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Problema de autenticação"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Fora do alcance"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Nenhum acesso à Internet detetado; não será efetuada uma nova ligação automaticamente."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS disponível"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS disponível)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Introduzir a palavra-passe da rede"</string>
@@ -699,9 +698,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"AVISO: Se ignorar o Wi-Fi, o tablet utilizará apenas dados de rede móvel para as transferências e as atualizações iniciais. Para evitar possíveis taxas de dados, estabeleça ligação a uma rede Wi-Fi."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"AVISO: Se ignorar o Wi-Fi, o dispositivo utilizará apenas dados de rede móvel para as transferências e as atualizações iniciais. Para evitar possíveis taxas de dados, estabeleça ligação a uma rede Wi-Fi."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"AVISO: Se ignorar o Wi-Fi, o telemóvel utilizará apenas dados de rede móvel para as transferências e as atualizações iniciais. Para evitar possíveis taxas de dados, estabeleça ligação a uma rede Wi-Fi."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="2393880108322835846">"AVISO: Se ignorar o Wi-Fi, o tablet não terá uma ligação à Internet para as transferências ou as atualizações iniciais."</string>
-    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1707391993265558787">"AVISO: Se ignorar o Wi-Fi, o dispositivo não terá uma ligação à Internet para as transferências ou as atualizações iniciais."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="1556858507920033022">"AVISO: Se ignorar o Wi-Fi, o telemóvel não terá uma ligação à Internet para as transferências ou as atualizações iniciais."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Se ignorar o Wi‑Fi:\n\nO seu tablet não terá uma ligação à Internet.\n\nNão receberá atualizações de software até se ligar à Internet.\n\nNeste momento, não pode ativar as funcionalidades de proteção do dispositivo."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Se ignorar o Wi‑Fi:\n\nO seu dispositivo não terá uma ligação à Internet.\n\nNão receberá atualizações de software até se ligar à Internet.\n\nNeste momento, não pode ativar as funcionalidades de proteção do dispositivo."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Se ignorar o Wi‑Fi:\n\nO seu telemóvel não terá uma ligação à Internet.\n\nNão receberá atualizações de software até se ligar à Internet.\n\nNeste momento, não pode ativar as funcionalidades de proteção do dispositivo."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"O tablet não conseguiu estabelecer ligação a esta rede Wi-Fi."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"O dispositivo não conseguiu estabelecer ligação a esta rede Wi-Fi."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"O telemóvel não conseguiu estabelecer ligação a esta rede Wi-Fi."</string>
@@ -761,7 +760,6 @@
     <string name="ring_volume_title" msgid="7938706566797464165">"Volume da campainha"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrar quando estiver em silêncio"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Som de notificação predefinido"</string>
-    <string name="heads_up_enabled_title" msgid="1031078221910921622">"Pop-up se prioridade alta"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Toque"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Notificação"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Utilizar volume de chamadas recebidas para notificações"</string>
@@ -834,7 +832,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Brilho automático"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Ativar ao levantar"</string>
     <string name="doze_title" msgid="2259176504273878294">"Visualização de ambiente"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"Reativar ecrã quando se pegar no dispositivo ou forem recebidas notificações"</string>
+    <string name="doze_summary" msgid="7128970177894383698">"Ativar o ecrã quando pega no dispositivo ou recebe notificações"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Tamanho do tipo de letra"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Tamanho do tipo de letra"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Definições de bloqueio do cartão SIM"</string>
@@ -862,6 +860,10 @@
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Cancelar"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"Vários SIMs encontrados"</string>
     <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>
@@ -1012,6 +1014,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Serão apagados todos os dados do "<b>"armazenamento interno"</b>" do tablet, incluindo:\n\n"<li>"A conta Google"</li>\n<li>"Dados e definições do sistema e da aplicação"</li>\n<li>"Aplicações transferidas"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Serão apagados todos os dados do "<b>"armazenamento interno"</b>" do telemóvel, incluindo:\n\n"<li>"A conta Google"</li>\n<li>"Dados e definições do sistema e da aplicação"</li>\n<li>"Aplicações transferidas"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Actualmente, tem sessão iniciada nas seguintes contas:\n"</string>
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Existem outros utilizadores presentes neste dispositivo.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Música"</li>\n<li>"Fotografias"</li>\n<li>"Outros dados do utilizador"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Para limpar músicas, imagens e outros dados do utilizador, é necessário apagar a "<b>"memória de armazenamento USB"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Para limpar também músicas, imagens e outros dados do utilizador, é necessário apagar o "<b>"cartão SD"</b>"."</string>
@@ -1023,7 +1026,6 @@
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Repor telefone"</string>
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Apagar todas as informações pessoais e aplicações transferidas? Não é possível reverter esta ação!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Apagar tudo"</string>
-    <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Desenhe o seu padrão de desbloqueio"</string>
     <string name="master_clear_gesture_explanation" msgid="826193821455182780">"É necessário desenhar a sequência de desbloqueio para confirmar uma reposição de dados de fábrica."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Não foi efetuada nenhuma reposição porque o serviço System Clear não está disponível."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Repor?"</string>
@@ -1041,7 +1043,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"Apagar a memória de armazenamento USB, eliminando todos os ficheiros armazenados? Não é possível reverter esta ação!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Apagar o cartão SD, eliminando todos os ficheiros armazenados? Não é possível reverter esta ação!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Apagar tudo"</string>
-    <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Desenhe o seu padrão de desbloqueio"</string>
     <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"É necessário desenhar a sequência de desbloqueio para confirmar que pretende apagar a memória de armazenamento USB."</string>
     <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"É necessário desenhar a sequência de desbloqueio para confirmar que pretende apagar o cartão SD."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Definições de chamadas"</string>
@@ -1087,6 +1088,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Insira o cartão SIM e reinicie"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Ligue-se à Internet"</string>
     <string name="location_title" msgid="1029961368397484576">"A minha localização"</string>
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Perfil de trabalho"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Local. para perfil de trabalho"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Desativado pela sua empresa"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Modo"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Alta precisão"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Poupança de bateria"</string>
@@ -1124,6 +1128,7 @@
     <string name="copyright_title" msgid="865906688917260647">"Direitos de autor"</string>
     <string name="license_title" msgid="1990487604356037871">"Licença"</string>
     <string name="terms_title" msgid="7697580845616764642">"Termos e condições"</string>
+    <string name="webview_license_title" msgid="2813507464175738967">"Licença WebView do sistema"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Imagens de fundo"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Fornecedores de imagens de satélite:\n©2014 CNES/Astrium, DigitalGlobe, Bluesky"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Licenças open source"</string>
@@ -1237,7 +1242,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Armazenamento USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"No cartão SD"</string>
     <string name="disabled" msgid="9206776641295849915">"Desativada"</string>
-    <string name="not_installed" msgid="1475144352069281880">"Não instalada"</string>
+    <string name="not_installed" msgid="2797554494953450291">"Não instalado para utilizador"</string>
     <string name="no_applications" msgid="7336588977497084921">"Sem aplicações."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Armaz. interno"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Armaz. USB"</string>
@@ -1434,8 +1439,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"O ecrã nunca entrará em suspensão durante o carregamento"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Ativar registo de monit. Bluetooth HCI"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Capturar todos os pacotes Bluetooth HCI num ficheiro"</string>
-    <string name="oem_unlock_enable" msgid="6629321276287913315">"Ativar desbloqueio de OEM"</string>
-    <string name="oem_unlock_enable_summary" msgid="3546686263996628110">"Permitir que dispositivo seja desbloqueado por OEM"</string>
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"Desbloqueio de OEM"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Permitir o desbloqueio do carregador de arranque"</string>
+    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Introduza o seu PIN"</string>
+    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Introduza o PIN do dispositivo para ativar o desbloqueio do OEM"</string>
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Pretende permitir o desbloqueio de OEM?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"AVISO: as funcionalidades de proteção do dispositivo não funcionam neste dispositivo enquanto esta definição estiver ativada."</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Certificação de display sem fios"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Ativar o registo verboso de Wi-Fi"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Transm. agressiva de Wi-Fi p/ rede móvel"</string>
@@ -1538,6 +1547,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"As legendas terão este aspeto"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"Predefinição"</string>
+    <string name="color_title" msgid="4258931051732243983">"Cor"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"Predefinição"</string>
     <string name="color_none" msgid="3475640044925814795">"Nenhuma"</string>
     <string name="color_white" msgid="8045195170201590239">"Branco"</string>
@@ -1595,12 +1605,12 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"<xliff:g id="REMAIN">%1$s</xliff:g> restante(s)"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> a cobrar"</string>
-    <string name="power_discharging_duration" msgid="7125493014448497620">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – resta(m) aprox. <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="power_charging" msgid="712751285832976915">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="STATE">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration" msgid="4802183864773082009">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – <xliff:g id="TIME">%2$s</xliff:g> até ficar completa"</string>
-    <string name="power_charging_duration_ac" msgid="3611179931297824699">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – <xliff:g id="TIME">%2$s</xliff:g> até ficar completa através de CA"</string>
-    <string name="power_charging_duration_usb" msgid="1106605348913397583">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – <xliff:g id="TIME">%2$s</xliff:g> até ficar completa através de USB"</string>
-    <string name="power_charging_duration_wireless" msgid="633606920144617227">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – <xliff:g id="TIME">%2$s</xliff:g> até ficar compl. por rede s/ fios"</string>
+    <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> – resta(m) aprox. <xliff:g id="TIME">%2$s</xliff:g>"</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> até ficar completa"</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> até ficar completa através de CA"</string>
+    <string name="power_charging_duration_usb" msgid="182405645340976546">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> até ficar completa através de USB"</string>
+    <string name="power_charging_duration_wireless" msgid="1829295708243159464">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> até ficar compl. por rede s/ fios"</string>
     <string name="power_usage_list_summary" msgid="2409288197839512482">"Utilização desde a última carga completa"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Bateria utilizada desde que foi desligado"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Bateria utilizada desde a reposição"</string>
@@ -1617,7 +1627,6 @@
     <string name="awake" msgid="387122265874485088">"Hora de activação do dispositivo"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Tempo de ligação Wi-Fi"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Tempo de ligação Wi-Fi"</string>
-    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Detalhes do histórico"</string>
     <string name="details_title" msgid="3792801565213935385">"Utilizar detalhes"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Utilizar detalhes"</string>
@@ -1689,7 +1698,7 @@
     <string name="battery_saver" msgid="1426682272004907982">"Poupança de bateria"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Ligar automaticamente"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Nunca"</string>
-    <string name="battery_saver_turn_on_automatically_pct" msgid="3033681629861428940">"com %1$d%% de bateria"</string>
+    <string name="battery_saver_turn_on_automatically_pct" msgid="7536784431655058267">"com %1$s de bateria"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Estatísticas do Processo"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Estatísticas de peritos acerca dos processos em execução"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Utilização da memória"</string>
@@ -1813,7 +1822,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Suportado por hardware"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Apenas software"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"As credenciais não estão disponíveis para este utilizador"</string>
-    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Desenhe a sua sequência de desbloqueio"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"É necessário desenhar a sequência de desbloqueio para confirmar a instalação de credenciais."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Introduzir palavra-passe do armazenamento de credenciais."</string>
@@ -1843,6 +1851,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"Incluir dados de aplicações"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Restauro automático"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Ao reinstalar uma aplicação, restaurar definições e dados da cópia de segurança"</string>
+    <string name="backup_inactive_title" msgid="5355557151569037197">"O serviço de cópia de segurança está inativo."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"Isto é definido pela sua política do dispositivo."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Palavra-passe cópia do comp."</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"As cópias de segurança completas no ambiente de trabalho não estão atualmente protegidas"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Toque para alterar ou remover a palavra-passe para cópias de segurança completas no ambiente de trabalho"</string>
@@ -1952,7 +1962,11 @@
     <string name="enter_password" msgid="8035706727471334122">"Para iniciar o Android, introduza a palavra-passe"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Para iniciar o Android, introduza o PIN"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Para iniciar o Android, desenhe o padrão"</string>
-    <string name="try_again" msgid="4272075051293936921">"Tente novamente."</string>
+    <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"Sequência incorreta"</string>
+    <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"Palavra-passe incorreta"</string>
+    <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"PIN incorreto"</string>
+    <string name="checking_decryption" msgid="8287458611802609493">"A verificar…"</string>
+    <string name="starting_android" msgid="8581493237458496835">"A iniciar o Android"</string>
     <string name="delete" msgid="4219243412325163003">"Eliminar"</string>
     <string name="misc_files" msgid="6720680815969643497">"Ficheiros diversos"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"selecionado(s) <xliff:g id="NUMBER">%1$d</xliff:g> de <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -1990,8 +2004,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Utilizar sempre GPU para a composição do ecrã"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"Simular espaço de cor"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Ativar vestígios OpenGL"</string>
-    <string name="use_nuplayer" msgid="5699257393367904387">"Usar NuPlayer (experim.)"</string>
-    <string name="use_nuplayer_summary" msgid="1991479067478516714">"Usar o NuPlayer em vez do AwesomePlayer"</string>
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"Util. AwesomePlayer (descont.)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"Util. AwesomePlayer em vez do NuPlayer p/ maioria rep. mult."</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"Desativ. encam. áudio USB"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"Desativar encam. auto. para periféricos áudio USB"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Mostrar limit. do esquema"</string>
@@ -2167,7 +2181,6 @@
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Adicionar utilizador ou perfil"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Adicionar utilizador"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Perfil restrito"</string>
-    <string name="user_summary_managed_profile" msgid="7369539529693048111">"Perfil de trabalho"</string>
     <string name="user_need_lock_message" msgid="2596365678651842785">"Antes de poder criar um perfil restrito, tem de configurar um bloqueio de ecrã para proteger as suas aplicações e dados pessoais."</string>
     <string name="user_set_lock_button" msgid="8311219392856626841">"Definir bloqueio"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Não configurado"</string>
@@ -2298,11 +2311,13 @@
     <string name="sim_cellular_data_unavailable_summary" msgid="3654805961942166428">"Tocar para selecionar um SIM de dados"</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"Utilizar sempre este para chamadas"</string>
     <string name="select_sim_for_data" msgid="2366081042162853044">"Selecionar um SIM para dados"</string>
+    <string name="data_switch_started" msgid="2040761479817166311">"A mudar o SIM de dados. Esta ação pode demorar, no máximo, 1 minuto..."</string>
     <string name="select_sim_for_calls" msgid="3503094771801109334">"Telefonar com"</string>
     <string name="sim_select_card" msgid="211285163525563293">"Selecionar um cartão SIM"</string>
     <string name="sim_card_number_title" msgid="7845379943474336488">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"SIM vazio"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"Nome do SIM"</string>
+    <string name="sim_name_hint" msgid="7038643345238968930">"Introduzir nome do SIM"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"Ranhura para cartão SIM %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Operador"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Número"</string>
@@ -2312,7 +2327,6 @@
     <string name="color_purple" msgid="3888532466427762504">"Roxo"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"Nenhum cartão SIM inserido"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"Estado do SIM"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"Informações relacionadas com o SIM"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"Ligar de volta de SIM predefinido"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"SIM para chamadas efetuadas"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Outras definições de chamada"</string>
@@ -2320,8 +2334,11 @@
     <string name="preferred_network_offload_header" msgid="2321173571529106767">"Desativar a transmissão do nome da rede"</string>
     <string name="preferred_network_offload_footer" msgid="5857279426054744020">"Desativar a transmissão do nome da rede protege do acesso por terceiros às suas informações de rede."</string>
     <string name="preferred_network_offload_popup" msgid="2252915199889604600">"Desativar a transmissão do nome da rede irá evitar a ligação automática a redes ocultas."</string>
+    <string name="sim_signal_strength" msgid="9144010043784767984">"<xliff:g id="DBM">%1$d</xliff:g> dBm <xliff:g id="ASU">%2$d</xliff:g> asu"</string>
+    <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>
+    <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Perguntar sempre"</string>
     <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>
@@ -2330,22 +2347,22 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Pesquisas recentes"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Resultados"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"ligação a rede Wi-Fi"</string>
-    <string name="keywords_more_default_sms_app" msgid="2744404159003574745">"mensagem de texto"</string>
-    <string name="keywords_more_mobile_networks" msgid="7813380887358745769">"operador de telemóvel sem fios"</string>
+    <string name="keywords_more_default_sms_app" msgid="895656981962034647">"mensagem de texto mensagens de texto mensagens"</string>
+    <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"telemóvel operador de telemóvel dados sem fios 4g 3g 2g lte"</string>
     <string name="keywords_home" msgid="3626170808219458848">"iniciador"</string>
     <string name="keywords_display" msgid="6709007669501628320">"ecrã tátil"</string>
-    <string name="keywords_display_brightness_level" msgid="8636451602230815191">"escurecer ecrã tátil"</string>
-    <string name="keywords_display_auto_brightness" msgid="8070218600502753102">"escurecer ecrã tátil"</string>
-    <string name="keywords_display_wallpaper" msgid="4315466287469834939">"em segundo plano"</string>
+    <string name="keywords_display_brightness_level" msgid="8923289340474728990">"esbater ecrã ecrã tátil bateria"</string>
+    <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"esbater ecrã ecrã tátil bateria"</string>
+    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"fundo personalizar visor"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"tamanho do texto"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"projeto"</string>
-    <string name="keywords_storage" msgid="7007275853993419928">"espaço em disco disco rígido"</string>
-    <string name="keywords_battery" msgid="3992479295298655138">"energia"</string>
-    <string name="keywords_spell_checker" msgid="4509482591225399210">"ortografia"</string>
+    <string name="keywords_storage" msgid="6572905220031852173">"espaço disco disco rígido dispositivo utilização"</string>
+    <string name="keywords_battery" msgid="2096185085932675704">"carregar utilização energia"</string>
+    <string name="keywords_spell_checker" msgid="6106749039734174140">"ortografia dicionário verificação ortográfica correção automática"</string>
     <string name="keywords_voice_input" msgid="3519547605812413860">"reconhecimento entrada voz fala idioma mãos-livres reconhecimento mãos-livres palavra ofensiva áudio histórico auscultadores com microfone integrado bluetooth"</string>
-    <string name="keywords_text_to_speech_output" msgid="8207889472282225512">"classificar idioma voz predefinida falar"</string>
-    <string name="keywords_date_and_time" msgid="7666950126499155141">"relógio"</string>
-    <string name="keywords_factory_data_reset" msgid="3693730656843989732">"limpar eliminar"</string>
+    <string name="keywords_text_to_speech_output" msgid="392447904221657930">"classificar idioma predefinição falar fala tts acessibilidade leitor invisual"</string>
+    <string name="keywords_date_and_time" msgid="2631808108134830066">"relógio militar"</string>
+    <string name="keywords_factory_data_reset" msgid="4355133848707691977">"apagar eliminar restaurar limpar remover"</string>
     <string name="keywords_printing" msgid="1701778563617114846">"impressora"</string>
     <string name="keywords_sounds_and_notifications" msgid="5965996187974887000">"bip do altifalante"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="2912933812460077912">"não não perturbar interromper interrupção pausa"</string>
@@ -2354,7 +2371,7 @@
     <string name="keywords_location_mode" msgid="8584992704568356084">"precisão"</string>
     <string name="keywords_accounts" msgid="1957925565953357627">"conta"</string>
     <string name="keywords_users" msgid="4673901601478559100">"restrição restringir restrito"</string>
-    <string name="keywords_keyboard_and_ime" msgid="1103378692379215672">"correção de texto corrigir som vibrar idioma automático sugestão de toques sugestão tema palavra ofensiva tipo emoji"</string>
+    <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"correção de texto corrigir som vibração idioma automático toque sugerir sugestão tema palavra ofensiva escrever emoji internacional"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"deslizar lentamente palavra-passe sequência pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Config. etiqueta NFC p/ Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Escrever"</string>
@@ -2371,7 +2388,6 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Volume de notificações"</string>
     <string name="zen_mode_settings_title" msgid="7014915558669122902">"Interrupções"</string>
     <string name="zen_mode_option_title" msgid="5061978632306007914">"Ao receber chamadas e notificações"</string>
-    <string name="zen_mode_option_title_novoice" msgid="6680706009915204785">"Ao receber notificações"</string>
     <string name="zen_mode_option_off" msgid="3167702608910820883">"Interromper sempre"</string>
     <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Permitir apenas interrupções com prioridade"</string>
     <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Não interromper"</string>
@@ -2404,7 +2420,7 @@
     <item quantity="one" msgid="8344183614159211585">"%d aplicação consegue ler notificações"</item>
     <item quantity="other" msgid="980049191810249052">"%d aplicações conseguem ler notificações"</item>
   </plurals>
-    <string name="no_notification_listeners" msgid="2767405417723149879">"Nenhum serviço de escuta de notificações instalado."</string>
+    <string name="no_notification_listeners" msgid="2767405417723149879">"Nenhum ouvinte de notificações instalado."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Ativar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> conseguirá ler todas as notificações publicadas pelo sistema ou qualquer aplicação instalada, e poderão incluir informações pessoais, como nomes de contactos e o texto de mensagens que lhe foram enviadas. Conseguirá ainda ignorar estas notificações ou tocar nos respetivos botões de ação."</string>
     <string name="manage_condition_providers" msgid="3039306415273606730">"Fornecedores de condições"</string>
@@ -2429,14 +2445,17 @@
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Concluído"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Até que o utilizador desative"</string>
     <string name="zen_mode_important_category" msgid="8123274463331022993">"Interrupções com prioridade"</string>
-    <string name="zen_mode_downtime_category" msgid="4730179065426038108">"Inatividade (apenas interrupções com prioridade)"</string>
+    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Período de inatividade"</string>
     <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Dias"</string>
     <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Nenhum"</string>
+    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Interrupções permitidas"</string>
+    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Apenas prioridade"</string>
+    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Nenhum"</string>
     <string name="zen_mode_automation_category" msgid="4653551005950835761">"Automatização"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Ligar automaticamente."</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Nunca"</string>
-    <string name="zen_mode_phone_calls" msgid="8956214416859303966">"Chamadas"</string>
+    <string name="zen_mode_calls" msgid="7051492091133751208">"Chamadas"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Mensagens"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Chamadas/mensagens de"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Qualquer pessoa"</string>
@@ -2450,7 +2469,9 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Noites de dias úteis"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Hora de início"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Hora de fim"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> do dia seguinte"</string>
+    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> do dia seguinte"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> ou qualquer alarme antes"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> do dia seguinte ou qualquer alarme antes"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Not. da aplicação"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Definições de notificações"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Enviar comentários do dispositivo"</string>
@@ -2458,7 +2479,11 @@
     <string name="switch_on_text" msgid="1124106706920572386">"Ativado"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Desativado"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"Fixação do ecrã"</string>
-    <string name="screen_pinning_description" msgid="7091642350452605379">"Quando a funcionalidade está ativada, pode utilizar a fixação do ecrã para manter o ecrã atual visível até o soltar.\n\nPara utilizar a fixação do ecrã:\n\n1. Certifique-se de que a fixação do ecrã está ativada.\n\n2. Abra o ecrã que pretende fixar.\n\n3. Toque em Visão geral.\n\n4. Toque no ícone de alfinete."</string>
+    <string name="screen_pinning_description" msgid="1137904524037468263">"Quando esta funcionalidade está ativada, pode utilizar a afixação no ecrã para manter o ecrã atual visível até o soltar.\n\nPara utilizar a afixação no ecrã:\n\n1. Certifique-se de que a afixação no ecrã está ativada.\n\n2. Abra o ecrã que pretende fixar.\n\n3. Toque em Vista geral.\n\n4. Deslize rapidamente para cima e, em seguida, toque no ícone de alfinete."</string>
+    <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Pedir sequência de desbloqueio antes de soltar"</string>
+    <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Pedir PIN antes de soltar"</string>
+    <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Pedir palavra-passe antes de soltar"</string>
+    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Bloquear dispositivo ao soltar"</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Perfil de trabalho"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Experimental)"</string>
     <string name="display_auto_rotate_title" msgid="6176450657107806043">"Quando o dispositivo é rodado"</string>
@@ -2467,7 +2492,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Manter na vista de paisagem"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Manter na orientação atual"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"Informações do IMEI"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"Informações relativas do IMEI"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Encriptação"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Continuar"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"O utilizador pode proteger ainda mais este dispositivo, se solicitar o seu PIN antes do arranque. Até o dispositivo arrancar, não pode receber chamadas, mensagens ou notificações, incluindo alarmes. \n\nIsto ajuda a proteger dados em dispositivos perdidos ou roubados."</string>
@@ -2485,4 +2509,7 @@
     <string name="encrypt_talkback_dialog_message_pin" msgid="1890374082842868489">"Quando introduzir o seu PIN para iniciar este dispositivo, os serviços de acessibilidade, como o <xliff:g id="SERVICE">%1$s</xliff:g>, ainda não estarão disponíveis."</string>
     <string name="encrypt_talkback_dialog_message_pattern" msgid="4474332516537386384">"Quando introduzir a sua sequência para iniciar este dispositivo, os serviços de acessibilidade, como o <xliff:g id="SERVICE">%1$s</xliff:g>, ainda não estarão disponíveis."</string>
     <string name="encrypt_talkback_dialog_message_password" msgid="8166099418487083927">"Quando introduzir a sua palavra-passe para iniciar este dispositivo, os serviços de acessibilidade, como o <xliff:g id="SERVICE">%1$s</xliff:g>, ainda não estarão disponíveis."</string>
+    <string name="imei_information_title" msgid="8499085421609752290">"Informações do IMEI"</string>
+    <string name="imei_information_summary" msgid="2074095606556565233">"Informações relativas do IMEI"</string>
+    <string name="slot_number" msgid="3762676044904653577">"(Slot<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-pt/arrays.xml b/res/values-pt/arrays.xml
index 090c35f..d440a1d 100644
--- a/res/values-pt/arrays.xml
+++ b/res/values-pt/arrays.xml
@@ -527,4 +527,12 @@
     <item msgid="4338089220026248848">"Em cache (cliente de atividade)"</item>
     <item msgid="6652164677254579050">"Em cache (vazio)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Azul-petróleo"</item>
+    <item msgid="8332294763632946560">"Azul"</item>
+    <item msgid="2023216417616991392">"Indigo"</item>
+    <item msgid="3170497246594232819">"Roxo"</item>
+    <item msgid="4608643045752965568">"Rosa"</item>
+    <item msgid="6131821495505931173">"Vermelho"</item>
+  </string-array>
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 04e8e88..5cd0ce5 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>
@@ -180,7 +180,6 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s deseja acessar suas mensagens. Conceder acesso a %2$s?"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Data e hora"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Selecione o fuso horário"</string>
-    <string name="normal_date_format" msgid="7636406984925498359">"Regional (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Visualizar:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Tamanho da fonte:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -291,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>
@@ -322,8 +321,6 @@
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Selecionar fuso horário"</string>
     <string name="date_time_set_date_title" msgid="6928286765325608604">"Data"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"Definir data"</string>
-    <string name="date_time_date_format_title" msgid="3976171711988766411">"Formato de data"</string>
-    <string name="date_time_date_format" msgid="6951498879879281102">"Escolher formato de data"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Classificar em ordem alfabética"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Classificar por fuso horário"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Data"</string>
@@ -372,7 +369,8 @@
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Aguarde enquanto seu telefone está sendo criptografado. <xliff:g id="PERCENT">^1</xliff:g>% concluído."</string>
     <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Aguarde enquanto seu tablet é criptografado. Tempo restante: <xliff:g id="DURATION">^1</xliff:g>"</string>
     <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Aguarde enquanto seu telefone é criptografado. Tempo restante: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Tente novamente em <xliff:g id="DELAY">^1</xliff:g> segundos."</string>
+    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"Para desbloquear seu tablet, desligue-o e ligue-o novamente."</string>
+    <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"Para desbloquear seu smartphone, desligue-o e ligue-o novamente."</string>
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"Aviso: o dispositivo será apagado após mais <xliff:g id="COUNT">^1</xliff:g> tentativas fracassadas de ser desbloqueado!"</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Digite sua senha"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Falha na criptografia"</string>
@@ -401,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>
@@ -412,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>
@@ -556,13 +556,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Como viva-voz"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Para música e mídia"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Lembrar configurações"</string>
-    <string name="wifi_assistant_intro_setup" msgid="4605105515416995110">"Apresentação do\nAssistente de Wi-Fi"</string>
-    <string name="wifi_assistant_no_thanks" msgid="2776983751990143934">"NÃO, OBRIGADO"</string>
-    <string name="wifi_assistant_setup" msgid="3772423650475730906">"CONFIGURAR"</string>
-    <string name="wifi_assistant_card_message" msgid="107811647784658536">"Conectar automaticamente a redes disponíveis com o Assistente de Wi-Fi."</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Assistente de Wi-Fi"</string>
-    <string name="wifi_assistant_title_message" msgid="6240721017579074015">"<xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> conecta-se automaticamente à melhor rede Wi-Fi disponível"</string>
-    <string name="wifi_assistant_open_app" msgid="4803044899535675063">"ABRIR APP"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Conectado via assistente de Wi‑Fi"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"Transmitir tela"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Ativar Display sem fio"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Nenhum dispositivo próximo encontrado."</string>
@@ -592,7 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Configurações de Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Configurar e gerenciar pontos de acesso sem fio"</string>
-    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Selecionar Wi-Fi"</string>
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Selecionar rede Wi‑Fi"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Selecionar Wi-Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Ativando Wi-Fi..."</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Desativando Wi-Fi..."</string>
@@ -607,8 +602,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"Verificação sempre disponível"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Sempre permitir verificação"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Permitir que o serviço de localização do Google e outros apps verifiquem redes, mesmo que o Wi-Fi esteja desligado"</string>
-    <string name="wifi_automatically_manage_title" msgid="6249976570008992746">"Gerenciar o Wi-Fi automaticamente"</string>
-    <string name="wifi_automatically_manage_summary" msgid="6952470763378312488">"Permitir que <xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> gerencie sua conexão Wi‑Fi"</string>
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Usar Wi-F aberto automaticamente"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Deixar um assistente Wi-Fi conectar-se automaticamente a redes abertas de alta qualidade"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Escolher assistente"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Instalar certificados"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Para aumentar a precisão da localização e para outras finalidades, o Google e outros apps podem verificar redes próximas, mesmo que o Wi-Fi esteja desligado. Para impedir, vá para \"Avançado &gt; Verificação sempre disponível\"."</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Os apps podem verificar redes Wi-Fi próximas, mesmo que o Wi-Fi esteja desligado. Para impedir, vá para \"Avançado &gt; Verificação sempre disponível\"."</string>
@@ -629,6 +625,7 @@
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Verificar"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Avançado"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Conectar-se à rede"</string>
+    <string name="wifi_menu_remember" msgid="8814185749388713796">"Lembrar da rede"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Esquecer a rede"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Modificar rede"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Gravar na etiqueta NFC"</string>
@@ -673,9 +670,11 @@
     <string name="wifi_unspecified" msgid="5431501214192991253">"(não especificado)"</string>
     <string name="wifi_remembered" msgid="4955746899347821096">"Salva"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"Desativado"</string>
-    <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Conexão com a Internet de baixa qualidade evitada"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"Falha de configuração de IP"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Falha de conexão Wi-Fi"</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Problema de autenticação"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Fora do alcance"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Nenhum acesso à Internet detectado. O dispositivo não conectará automaticamente."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS disponível"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS disponível)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Insira a senha da rede"</string>
@@ -699,9 +698,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"AVISO: se você ignorar a configuração de Wi-Fi, o tablet usará somente dados da rede celular para fazer os downloads iniciais e as atualizações. Para evitar possíveis cobranças de dados, conecte-se ao Wi-Fi."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"AVISO: se você ignorar a configuração de Wi-Fi, o dispositivo usará somente dados da rede celular para fazer os downloads iniciais e as atualizações. Para evitar possíveis cobranças de dados, conecte-se ao Wi-Fi."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"AVISO: se você ignorar a configuração de Wi-Fi, o smartphone usará somente dados da rede celular para fazer os downloads iniciais e as atualizações. Para evitar possíveis cobranças de dados, conecte-se ao Wi-Fi."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="2393880108322835846">"ATENÇÃO: se você ignorar a configuração de Wi-Fi, o tablet não terá uma conexão com a Internet para fazer os downloads iniciais ou as atualizações."</string>
-    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1707391993265558787">"AVISO: se você ignorar a configuração de Wi-Fi, o dispositivo não terá uma conexão com a Internet para fazer os downloads iniciais ou as atualizações."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="1556858507920033022">"AVISO: se você ignorar a configuração de Wi-Fi, o smartphone não terá uma conexão com a Internet para fazer os downloads iniciais ou as atualizações."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Se pular Wi‑Fi:\n\nSeu tablet não terá conexão com a Internet.\n\nVocê não receberá atualizações de software enquanto não se conectar com a Internet.\n\nNão é possível ativar recursos de proteção de dispositivos no momento."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Se pular Wi‑Fi:\n\nseu dispositivo não terá uma conexão com a Internet.\n\nVocê não receberá atualizações de software enquanto não se conectar com a Internet.\nNão é possível ativar recursos de proteção de dispositivos\n no momento."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Se pular Wi‑Fi:\n\nseu smartphone não terá conexão com a Internet.\n\nVocê não receberá atualizações de software enquanto não se conectar com a Internet.\n\nNão é possível ativar recursos de proteção de dispositivos no momento."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"O tablet não foi capaz de conectar à rede Wi-Fi."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"Não foi possível conectar o dispositivo a essa rede Wi-Fi."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"O telefone não foi capaz de conectar à rede Wi-Fi."</string>
@@ -761,7 +760,6 @@
     <string name="ring_volume_title" msgid="7938706566797464165">"Volume da campainha"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrar no modo silencioso"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Som de notificação padrão"</string>
-    <string name="heads_up_enabled_title" msgid="1031078221910921622">"Pop-up para prioridade alta"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Toque"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Notificação"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Usar volume de chamada recebida para notificações"</string>
@@ -834,7 +832,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Brilho automático"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Levantar para ativar"</string>
     <string name="doze_title" msgid="2259176504273878294">"Exibição de ambiente"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"Ativar a tela quando o dispositivo for manuseado ou receber notificações"</string>
+    <string name="doze_summary" msgid="7128970177894383698">"Ligar a tela ao pegar dispositivo ou receber notificações"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Tamanho da fonte"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Tamanho da fonte"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Bloqueio do SIM"</string>
@@ -862,6 +860,10 @@
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Cancelar"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"Vários SIMs encontrados"</string>
     <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>
@@ -984,7 +986,7 @@
     <string name="apn_auth_type_pap" msgid="1666934536996033383">"PAP"</string>
     <string name="apn_auth_type_chap" msgid="3369626283789068360">"CHAP"</string>
     <string name="apn_auth_type_pap_chap" msgid="9102343063036134541">"PAP ou CHAP"</string>
-    <string name="apn_type" msgid="469613123902220544">"Tipo APN"</string>
+    <string name="apn_type" msgid="469613123902220544">"Tipo de APN"</string>
     <string name="apn_protocol" msgid="3272222921649348640">"Protocolo APN"</string>
     <string name="apn_roaming_protocol" msgid="3386954381510788422">"Protocolo de roaming do APN"</string>
     <string name="carrier_enabled" msgid="407655861175280806">"Ativar/Desativar APN"</string>
@@ -1012,6 +1014,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Essa ação apagará todos os dados do "<b>"armazenamento interno"</b>" do seu tablet, incluindo:\n\n"<li>"Sua Conta do Google"</li>\n<li>"Configurações e dados do sistema e dos apps"</li>\n<li>"Apps transferidos"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Essa ação apagará todos os dados do "<b>"armazenamento interno"</b>" de seu telefone, incluindo:\n\n"<li>"Sua Conta do Google"</li>\n<li>"Configurações e dados do sistema e dos apps"</li>\n<li>"Apps baixados"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"No momento você está conectado às seguintes contas:\n"</string>
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Há outros usuários presentes neste dispositivo.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Músicas"</li>\n<li>"Fotos"</li>\n<li>"Outros dados do usuário"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Para limpar músicas, fotos e outros dados de usuário, o "<b>"armazenamento USB"</b>" precisa ser apagado."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Para limpar músicas, imagens e outros dados de usuário, o conteúdo do "<b>"cartão SD"</b>" precisa ser apagado."</string>
@@ -1023,7 +1026,6 @@
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Redefinir telefone"</string>
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Apagar todas as suas informações pessoais e os apps transferidos? Não é possível reverter esta ação!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Apagar tudo"</string>
-    <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Desenhe o seu padrão de desbloqueio"</string>
     <string name="master_clear_gesture_explanation" msgid="826193821455182780">"É necessário que você desenhe seu padrão de desbloqueio para confirmar uma redefinição para configuração original."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Nenhuma redefinição foi realizada porque o serviço de Limpeza do sistema não está disponível."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Redefinir?"</string>
@@ -1041,7 +1043,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"Apagar o armazenamento USB, excluindo todos os arquivos armazenados nele? Não é possível reverter esta ação!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Apagar o cartão SD, excluindo todos os arquivos armazenados nele? Não é possível reverter esta ação!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Apagar tudo"</string>
-    <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Desenhe o seu padrão de desbloqueio"</string>
     <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"É necessário que você desenhe seu padrão de desbloqueio para confirmar que deseja apagar o armazenamento USB."</string>
     <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"É necessário que você desenhe seu padrão de desbloqueio para confirmar que deseja apagar o cartão SD."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Conf. de chamada"</string>
@@ -1087,6 +1088,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Insira o cartão SIM e reinicie"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Conecte-se à Internet"</string>
     <string name="location_title" msgid="1029961368397484576">"Meu Local"</string>
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Perfil de trabalho"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Local do perfil de trabalho"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Desativado por sua empresa"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Modo"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Alta precisão"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Economia de bateria"</string>
@@ -1124,6 +1128,7 @@
     <string name="copyright_title" msgid="865906688917260647">"Direitos autorais"</string>
     <string name="license_title" msgid="1990487604356037871">"Licença"</string>
     <string name="terms_title" msgid="7697580845616764642">"Termos e Condições"</string>
+    <string name="webview_license_title" msgid="2813507464175738967">"Licença do sistema Webview"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Planos de fundo"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Provedores de imagens de satélite:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Licenças código aberto"</string>
@@ -1237,7 +1242,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Armazenamento USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Cartão SD"</string>
     <string name="disabled" msgid="9206776641295849915">"Desativado"</string>
-    <string name="not_installed" msgid="1475144352069281880">"Não instalado"</string>
+    <string name="not_installed" msgid="2797554494953450291">"Não instalado para o usuário"</string>
     <string name="no_applications" msgid="7336588977497084921">"Nenhum app."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Espaço interno"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Armaz. USB"</string>
@@ -1434,8 +1439,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"A tela nunca entrará em inatividade enquanto estiver carregando."</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Ativar log de rastr. Bluetooth HCI"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Capturar todos os pacotes Bluetooth HCI em um arquivo"</string>
-    <string name="oem_unlock_enable" msgid="6629321276287913315">"Ativar desbloqueio para OEM"</string>
-    <string name="oem_unlock_enable_summary" msgid="3546686263996628110">"Permitir que o dispositivo seja desbloqueado para OEM"</string>
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"Desbloqueio de OEM"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Permitir que o bootloader seja desbloqueado"</string>
+    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Digite seu PIN"</string>
+    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Digite o PIN do dispositivo para ativar o desbloqueio de OEM"</string>
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Permitir desbloqueio de OEM?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"AVISO: os recursos de proteção do dispositivo não funcionarão neste dispositivo enquanto esta configuração estiver desativada."</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Certificação de Display sem fio"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Ativar registro extenso de Wi-Fi"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Transferência agressiva de Wi-Fi para celular"</string>
@@ -1538,6 +1547,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"As legendas ficarão assim"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"Padrão"</string>
+    <string name="color_title" msgid="4258931051732243983">"Cor"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"Padrão"</string>
     <string name="color_none" msgid="3475640044925814795">"Nenhum"</string>
     <string name="color_white" msgid="8045195170201590239">"Branco"</string>
@@ -1595,12 +1605,12 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"<xliff:g id="REMAIN">%1$s</xliff:g> restantes"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> até carregar"</string>
-    <string name="power_discharging_duration" msgid="7125493014448497620">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - cerca de <xliff:g id="TIME">%2$s</xliff:g> restantes"</string>
-    <string name="power_charging" msgid="712751285832976915">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="STATE">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration" msgid="4802183864773082009">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> até completar"</string>
-    <string name="power_charging_duration_ac" msgid="3611179931297824699">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> até completar em CA"</string>
-    <string name="power_charging_duration_usb" msgid="1106605348913397583">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> até completar por USB"</string>
-    <string name="power_charging_duration_wireless" msgid="633606920144617227">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> até completar sem fio"</string>
+    <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> - cerca de <xliff:g id="TIME">%2$s</xliff:g> restantes"</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> até concluir"</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> até concluir em CA"</string>
+    <string name="power_charging_duration_usb" msgid="182405645340976546">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> até concluir via USB"</string>
+    <string name="power_charging_duration_wireless" msgid="1829295708243159464">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> até concluir sem fio"</string>
     <string name="power_usage_list_summary" msgid="2409288197839512482">"Uso desde o último carregamento completo"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Uso da bateria desde a desconexão do aparelho"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Uso da bateria desde a redefinição"</string>
@@ -1617,7 +1627,6 @@
     <string name="awake" msgid="387122265874485088">"Tempo ativo do aparelho"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Tempo de ativação da rede Wi-Fi"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Tempo de ativação da rede Wi-Fi"</string>
-    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Detalhes do histórico"</string>
     <string name="details_title" msgid="3792801565213935385">"Detalhes de uso"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Detalhes de uso"</string>
@@ -1684,12 +1693,12 @@
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Quando foi desconectado pela última vez para <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Total de uso"</string>
     <string name="menu_stats_refresh" msgid="1676215433344981075">"Atualizar"</string>
-    <string name="process_kernel_label" msgid="3916858646836739323">"Sistema operacional do Android"</string>
+    <string name="process_kernel_label" msgid="3916858646836739323">"Sistema operacional Android"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Servidor de mídia"</string>
     <string name="battery_saver" msgid="1426682272004907982">"Economia de bateria"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Ativar automaticamente"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Nunca"</string>
-    <string name="battery_saver_turn_on_automatically_pct" msgid="3033681629861428940">"com %1$d%% de bateria"</string>
+    <string name="battery_saver_turn_on_automatically_pct" msgid="7536784431655058267">"com %1$s de bateria"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Estatísticas de processo"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Estatísticas detalhadas sobre os processos em execução"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Uso da memória"</string>
@@ -1813,7 +1822,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Suportado por hardware"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Somente software"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"As credenciais não estão disponíveis para este usuário"</string>
-    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Desenhe seu padrão de desbloqueio"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"É necessário que você desenhe seu padrão de desbloqueio para confirmar a instalação de credenciais."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Digite a senha para o armazenamento de credenciais."</string>
@@ -1843,6 +1851,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"Incluir dados de apps"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Restauração automática"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Ao reinstalar um app, restaura as configurações de backup e dados"</string>
+    <string name="backup_inactive_title" msgid="5355557151569037197">"O serviço de backup não está ativo."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"Isto é definido pela política do seu dispositivo."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Senha do backup local"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Os backups completos do computador não estão protegidos no momento"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Toque para alterar ou remover a senha de backups completos do desktop"</string>
@@ -1952,7 +1962,11 @@
     <string name="enter_password" msgid="8035706727471334122">"Para iniciar o Android, digite sua senha"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Para iniciar o Android, digite seu PIN"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Para iniciar o Android, desenhe seu padrão"</string>
-    <string name="try_again" msgid="4272075051293936921">"Tente novamente."</string>
+    <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"Padrão incorreto"</string>
+    <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"Senha incorreta"</string>
+    <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"PIN incorreto"</string>
+    <string name="checking_decryption" msgid="8287458611802609493">"Verificando..."</string>
+    <string name="starting_android" msgid="8581493237458496835">"Iniciando o Android"</string>
     <string name="delete" msgid="4219243412325163003">"Excluir"</string>
     <string name="misc_files" msgid="6720680815969643497">"Arquivos variados"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"selecionados <xliff:g id="NUMBER">%1$d</xliff:g> de <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -1990,8 +2004,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Sempre usar a GPU para composição de tela"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"Simular espaço de cores"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Ativar rastream. OpenGL"</string>
-    <string name="use_nuplayer" msgid="5699257393367904387">"Usar NuPlayer (experim.)"</string>
-    <string name="use_nuplayer_summary" msgid="1991479067478516714">"Usar o NuPlayer em vez do AwesomePlayer"</string>
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"Usar AwesomePlayer (susp)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"Usar AwesomePlayer, não NuPlayer, p/ reprod. mídia"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"Desat. roteam. áudio USB"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"Desativar roteam. autom. para/ perif. de áudio USB"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Mostrar limites de layout"</string>
@@ -2017,7 +2031,7 @@
     <string name="show_all_anrs" msgid="28462979638729082">"Mostrar todos os ANRS"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Exibir \"App não responde\" para app em 2º plano"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Uso de dados"</string>
-    <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Dados de uso de apps"</string>
+    <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Dados uso de apps"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"O cálculo da operadora poderá ser diferente de seu dispositivo."</string>
     <string name="data_usage_app" msgid="4970478397515423303">"Uso de apps"</string>
     <string name="data_usage_app_info_label" msgid="3409931235687866706">"INFORMAÇÕES DE APPS"</string>
@@ -2167,7 +2181,6 @@
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Adicionar usuário ou perfil"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Adicionar usuário"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Perfil restrito"</string>
-    <string name="user_summary_managed_profile" msgid="7369539529693048111">"Perfil de trabalho"</string>
     <string name="user_need_lock_message" msgid="2596365678651842785">"Antes de criar um perfil restrito, configure um bloqueio de tela para proteger seus apps e seus dados pessoais."</string>
     <string name="user_set_lock_button" msgid="8311219392856626841">"Definir bloqueio"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Não configurado"</string>
@@ -2298,11 +2311,13 @@
     <string name="sim_cellular_data_unavailable_summary" msgid="3654805961942166428">"Toque para selecionar um SIM de dados"</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"Sempre usar esta opção para chamadas"</string>
     <string name="select_sim_for_data" msgid="2366081042162853044">"Selecionar um SIM para dados"</string>
+    <string name="data_switch_started" msgid="2040761479817166311">"Trocando SIM de dados. Isso pode demorar um pouco..."</string>
     <string name="select_sim_for_calls" msgid="3503094771801109334">"Ligar com"</string>
     <string name="sim_select_card" msgid="211285163525563293">"Selecionar um cartão SIM"</string>
     <string name="sim_card_number_title" msgid="7845379943474336488">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"SIM vazio"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"Nome do SIM"</string>
+    <string name="sim_name_hint" msgid="7038643345238968930">"Inserir nome do SIM"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"SIM slot %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Operadora"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Número"</string>
@@ -2312,7 +2327,6 @@
     <string name="color_purple" msgid="3888532466427762504">"Roxo"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"Nenhum cartão SIM inserido"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"Status do SIM"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"Informações relacionadas ao SIM"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"Retornar chamada com o SIM padrão"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"SIM para chamadas de saída"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Outras configurações de chamada"</string>
@@ -2320,8 +2334,11 @@
     <string name="preferred_network_offload_header" msgid="2321173571529106767">"Des. transm. nome de rede"</string>
     <string name="preferred_network_offload_footer" msgid="5857279426054744020">"A opção \"Des. transm. nome de rede\" protege contra o acesso de terceiros a suas informações de rede."</string>
     <string name="preferred_network_offload_popup" msgid="2252915199889604600">"A desativação da transmissão de nome de rede impedirá uma conexão automática a redes ocultas."</string>
+    <string name="sim_signal_strength" msgid="9144010043784767984">"<xliff:g id="DBM">%1$d</xliff:g> dBm <xliff:g id="ASU">%2$d</xliff:g> asu"</string>
+    <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>
+    <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Perguntar sempre"</string>
     <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>
@@ -2330,22 +2347,22 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Pesquisas recentes"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Resultados"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi rede conexão"</string>
-    <string name="keywords_more_default_sms_app" msgid="2744404159003574745">"mensagem de texto"</string>
-    <string name="keywords_more_mobile_networks" msgid="7813380887358745769">"celular célula operadora sem fio"</string>
+    <string name="keywords_more_default_sms_app" msgid="895656981962034647">"mensagem de texto enviar mensagens de texto mensagens mensagens"</string>
+    <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"celular operadora de celular dados sem fio 4G 3G 2G LTE"</string>
     <string name="keywords_home" msgid="3626170808219458848">"tela de início"</string>
     <string name="keywords_display" msgid="6709007669501628320">"tela touchscreen"</string>
-    <string name="keywords_display_brightness_level" msgid="8636451602230815191">"escurecer tela touchscreen"</string>
-    <string name="keywords_display_auto_brightness" msgid="8070218600502753102">"escurecer tela touchscreen"</string>
-    <string name="keywords_display_wallpaper" msgid="4315466287469834939">"segundo plano"</string>
+    <string name="keywords_display_brightness_level" msgid="8923289340474728990">"escurecer tela touchscreen bateria"</string>
+    <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"escurecer tela touchscreen bateria"</string>
+    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"segundo plano personalizar personalizar exibir"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"tamanho do texto"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"projeto"</string>
-    <string name="keywords_storage" msgid="7007275853993419928">"espaço unidade disco rígido"</string>
-    <string name="keywords_battery" msgid="3992479295298655138">"potência"</string>
-    <string name="keywords_spell_checker" msgid="4509482591225399210">"ortografia"</string>
+    <string name="keywords_storage" msgid="6572905220031852173">"espaço em disco disco rígido uso do dispositivo"</string>
+    <string name="keywords_battery" msgid="2096185085932675704">"energia uso carregar"</string>
+    <string name="keywords_spell_checker" msgid="6106749039734174140">"ortografia dicionário verificação ortográfica correção automática"</string>
     <string name="keywords_voice_input" msgid="3519547605812413860">"reconhecedor entrada fala dizer idioma vivavoz viva voz reconhecimento ofensivo palavra áudio histórico bluetooth fone de ouvido"</string>
-    <string name="keywords_text_to_speech_output" msgid="8207889472282225512">"taxa idioma padrão falar falando"</string>
-    <string name="keywords_date_and_time" msgid="7666950126499155141">"relógio"</string>
-    <string name="keywords_factory_data_reset" msgid="3693730656843989732">"limpar excluir"</string>
+    <string name="keywords_text_to_speech_output" msgid="392447904221657930">"classificação idioma padrão falar conversão de texto em voz leitor de acessibilidade cego"</string>
+    <string name="keywords_date_and_time" msgid="2631808108134830066">"relógio militar"</string>
+    <string name="keywords_factory_data_reset" msgid="4355133848707691977">"apagar excluir restaurar limpar remover"</string>
     <string name="keywords_printing" msgid="1701778563617114846">"impressora"</string>
     <string name="keywords_sounds_and_notifications" msgid="5965996187974887000">"alto-falante aviso sonoro"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="2912933812460077912">"não perturbe interromper interrupção"</string>
@@ -2354,7 +2371,7 @@
     <string name="keywords_location_mode" msgid="8584992704568356084">"precisão"</string>
     <string name="keywords_accounts" msgid="1957925565953357627">"conta"</string>
     <string name="keywords_users" msgid="4673901601478559100">"restrição restringir restrito"</string>
-    <string name="keywords_keyboard_and_ime" msgid="1103378692379215672">"correção de texto corrigir som vibrar automático idioma gesto sugerir sugestão tema palavra ofensiva tipo emoji"</string>
+    <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"correção de texto corrigir som vibrar idioma automático gesto sugerir tema palavra ofensiva digitar emoji internacional"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"deslizar senha padrão pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Configurar etiqueta NFC Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Gravar"</string>
@@ -2371,7 +2388,6 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Volume das notificações"</string>
     <string name="zen_mode_settings_title" msgid="7014915558669122902">"Interrupções"</string>
     <string name="zen_mode_option_title" msgid="5061978632306007914">"Ao receber chamadas e notificações"</string>
-    <string name="zen_mode_option_title_novoice" msgid="6680706009915204785">"Ao receber notificações"</string>
     <string name="zen_mode_option_off" msgid="3167702608910820883">"Sempre interromper"</string>
     <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Permitir apenas interrupções prioritárias"</string>
     <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Não interromper"</string>
@@ -2429,14 +2445,17 @@
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Concluído"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Até você desativar"</string>
     <string name="zen_mode_important_category" msgid="8123274463331022993">"Interrupções prioritárias"</string>
-    <string name="zen_mode_downtime_category" msgid="4730179065426038108">"Inatividade (apenas interrupções prioritárias)"</string>
+    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Tempo de inatividade"</string>
     <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Dias"</string>
     <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Nenhum"</string>
+    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Interrupções permitidas"</string>
+    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Só prioridade"</string>
+    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Nenhum"</string>
     <string name="zen_mode_automation_category" msgid="4653551005950835761">"Automação"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Ativar automaticamente"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Nunca"</string>
-    <string name="zen_mode_phone_calls" msgid="8956214416859303966">"Chamadas"</string>
+    <string name="zen_mode_calls" msgid="7051492091133751208">"Chamadas"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Mensagens"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Chamadas/mensagens de"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Qualquer pessoa"</string>
@@ -2450,7 +2469,9 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Noites em dias úteis"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Horário de início"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Horário de término"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> do dia seguinte"</string>
+    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> do dia seguinte"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> ou qualquer alarme anterior"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> do dia seguinte ou qualquer alarme anterior"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Notificações de apps"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Configurações de notificação"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Enviar feedback sobre o dispositivo"</string>
@@ -2458,7 +2479,11 @@
     <string name="switch_on_text" msgid="1124106706920572386">"Ativado"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Desativado"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"Fixação de tela"</string>
-    <string name="screen_pinning_description" msgid="7091642350452605379">"Quando ativada, é possível usar a fixação de tela para manter a tela atual em exibição até você liberar a tela.\n\nPara usar a fixação de tela:\n\n1. Verifique se a fixação de tela está ativada.\n\n2. Abra a tela que você deseja fixar.\n\n3. Toque em \"Visão geral\".\n\n4. Toque no ícone de alfinete."</string>
+    <string name="screen_pinning_description" msgid="1137904524037468263">"Quando essa configuração está ativada, é possível usar a fixação de tela para manter a tela atual visível até que você a libere.\n\nPara usar a fixação de tela:\n\n1. Verifique se fixação está ativada.\n\n2. Abra a tela a ser fixada.\n\n3. Toque em \"Visão geral\".\n\n4. Deslize para cima e toque no ícone de alfinete."</string>
+    <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Pedir padrão de desbloqueio antes de desafixar"</string>
+    <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Pedir PIN antes de desafixar"</string>
+    <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Pedir senha antes de desafixar"</string>
+    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Bloquear dispositivo ao desafixar"</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Perfil de trabalho"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Experimental)"</string>
     <string name="display_auto_rotate_title" msgid="6176450657107806043">"Quando o dispositivo for girado"</string>
@@ -2467,7 +2492,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Manter o modo paisagem"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Manter a orientação atual"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"Informações de IMEI"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"Informações relativas de IMEI"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Criptografia"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Continuar"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"Para proteger ainda mais o dispositivo, solicite um PIN ao ligá-lo. Até que seja inicializado, o dispositivo não receberá chamadas, mensagens ou notificações, incluindo alarmes. \n\nIsso ajuda a proteger os dados em dispositivos perdidos ou roubados."</string>
@@ -2485,4 +2509,7 @@
     <string name="encrypt_talkback_dialog_message_pin" msgid="1890374082842868489">"Ao inserir seu PIN para iniciar o dispositivo, serviços de disponibilidade como o <xliff:g id="SERVICE">%1$s</xliff:g> ainda não estarão disponíveis."</string>
     <string name="encrypt_talkback_dialog_message_pattern" msgid="4474332516537386384">"Ao inserir seu padrão para iniciar o dispositivo, serviços de disponibilidade como o <xliff:g id="SERVICE">%1$s</xliff:g> ainda não estarão disponíveis."</string>
     <string name="encrypt_talkback_dialog_message_password" msgid="8166099418487083927">"Ao inserir sua senha para iniciar o dispositivo, serviços de disponibilidade como o <xliff:g id="SERVICE">%1$s</xliff:g> ainda não estarão disponíveis."</string>
+    <string name="imei_information_title" msgid="8499085421609752290">"Informações de IMEI"</string>
+    <string name="imei_information_summary" msgid="2074095606556565233">"Informações relativas de IMEI"</string>
+    <string name="slot_number" msgid="3762676044904653577">"(Slot<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-ro/arrays.xml b/res/values-ro/arrays.xml
index f66b057..76188ee 100644
--- a/res/values-ro/arrays.xml
+++ b/res/values-ro/arrays.xml
@@ -146,7 +146,7 @@
   </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Slab"</item>
-    <item msgid="5615082285463430971">"Corect"</item>
+    <item msgid="5615082285463430971">"Acceptabil"</item>
     <item msgid="3565079809875324621">"Bun"</item>
     <item msgid="5702329417707689835">"Excelent"</item>
   </string-array>
@@ -527,4 +527,12 @@
     <item msgid="4338089220026248848">"În cache (client de activitate)"</item>
     <item msgid="6652164677254579050">"În cache (gol)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Turcoaz"</item>
+    <item msgid="8332294763632946560">"Albastru"</item>
+    <item msgid="2023216417616991392">"Indigo"</item>
+    <item msgid="3170497246594232819">"Violet"</item>
+    <item msgid="4608643045752965568">"Roz"</item>
+    <item msgid="6131821495505931173">"Roșu"</item>
+  </string-array>
 </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 35b6c90..36cbbd2 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -112,8 +112,8 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Eroare necunoscută"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Golită"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Vizibil pt. dispoz. Bluetooth din aprop. (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
-    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Vizibil pt. toate disp. Bluetooth din apropiere"</string>
+    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Vizibil pt. toate dispoz. Bluetooth din apropiere (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Vizibil pt. toate dispoz. Bluetooth din apropiere"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Nu este vizibil pentru alte dispozitive Bluetooth"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Vizibil numai pe dispozitivele asociate"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Timp limită pentru vizibilitate"</string>
@@ -130,16 +130,16 @@
     <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>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Această acţiune va dezactiva:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;de pe:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"Conectat"</string>
     <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Conectat (fără telefon)"</string>
-    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Conectat (fără conţ. media)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Conectat (fără conţinut media)"</string>
     <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Conectat (fără acces la mesaje)"</string>
-    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Conectat (fără tel. sau conţ. media)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Conectat (fără telefon sau conţ. media)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Deconectat"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"În curs de deconectare..."</string>
     <string name="bluetooth_connecting" msgid="8555009514614320497">"Se conectează..."</string>
@@ -180,7 +180,6 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s dorește să acceseze mesajele dvs. Oferiți acces pentru %2$s?"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Data şi ora"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Selectaţi fusul orar"</string>
-    <string name="normal_date_format" msgid="7636406984925498359">"Regional (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Previzualizaţi:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Dimensiune font:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -256,10 +255,10 @@
     <string name="sdcard_settings_mass_storage_status" product="default" msgid="2742075324087038036">"Cardul SD este utilizat ca dispozitiv de stocare în masă."</string>
     <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="9191210735703409245">"Puteţi elimina stoc. USB în siguranţă"</string>
     <string name="sdcard_settings_unmounted_status" product="default" msgid="6462544066195404905">"Acum puteţi elimina cardul SD în siguranţă."</string>
-    <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"Stoc. USB elimin. în timpul funcţionării!"</string>
+    <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"Stoc. USB eliminată în timpul funcţionării!"</string>
     <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"Cardul SD a fost scos în timp ce era încă utilizat!"</string>
     <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"Octeţi utilizaţi:"</string>
-    <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"Se scan. stoc. USB pt. media..."</string>
+    <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"Se scanează stocare USB pt. media..."</string>
     <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"Se scanează cardul SD pentru a se identifica fişiere media..."</string>
     <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"Stoc.USB mont. numai în citire"</string>
     <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"Cardul SD montat este numai în citire."</string>
@@ -291,9 +290,9 @@
     <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="allow_data_usage_title" msgid="2238205944729213062">"Permiteți utilizare date în roaming"</string>
     <string name="roaming" msgid="3596055926335478572">"Roaming de date"</string>
     <string name="roaming_enable" msgid="3737380951525303961">"Conectaţi-vă la servicii de date în roaming"</string>
     <string name="roaming_disable" msgid="1295279574370898378">"Conectaţi-vă la serviciile de date în roaming"</string>
@@ -322,8 +321,6 @@
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Selectaţi un fus orar"</string>
     <string name="date_time_set_date_title" msgid="6928286765325608604">"Dată"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"Setaţi data"</string>
-    <string name="date_time_date_format_title" msgid="3976171711988766411">"Formatul datei"</string>
-    <string name="date_time_date_format" msgid="6951498879879281102">"Alegeţi formatul de dată"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Sortaţi în ordine alfabetică"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Sortaţi după fusul orar"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Data"</string>
@@ -372,7 +369,8 @@
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Aşteptaţi criptarea telefonului. Finalizat <xliff:g id="PERCENT">^1</xliff:g>%."</string>
     <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Așteptați criptarea tabletei. Finalizat: <xliff:g id="DURATION">^1</xliff:g>"</string>
     <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Așteptați criptarea telefonului. Finalizat: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Încercaţi din nou peste <xliff:g id="DELAY">^1</xliff:g> (de) secunde."</string>
+    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"Pentru a debloca tableta, opriți-o și reporniți-o."</string>
+    <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"Pentru a debloca telefonul, opriți-l și reporniți-l."</string>
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"Avertisment: datele de pe dispozitiv vor fi șterse după încă <xliff:g id="COUNT">^1</xliff:g> încercări nereușite de deblocare!"</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Introduceţi parola"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Criptare nereuşită"</string>
@@ -385,8 +383,8 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Alegeţi blocare ecran"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Aleg. blocare rezervă"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Blocarea ecranului"</string>
-    <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Schimbaţi bloc.ecran."</string>
-    <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Modificaţi sau dezactivaţi modelul, codul PIN sau siguranţa prin parolă"</string>
+    <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Schimbaţi bloc. ecran."</string>
+    <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Modificaţi sau dezactivaţi modelul, codul PIN sau parola"</string>
     <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Alegeţi o metodă pentru a bloca ecranul"</string>
     <string name="unlock_backup_info_summary" msgid="108524727803788172">"Când funcţia Deblocare facială nu vă poate vedea, cum doriţi să deblocaţi?"</string>
     <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"Fără"</string>
@@ -401,7 +399,8 @@
     <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_set_unlock_disabled_summary" msgid="2120729867788851674">"Dezactivată de admin./politică de criptare/date de conectare"</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/acreditări stocate"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Fără"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Glisare"</string>
     <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Deblocare facială"</string>
@@ -412,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>
@@ -526,7 +526,7 @@
     <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Distribuirea conexiunii la internet"</string>
     <string name="bluetooth_profile_map" msgid="5465271250454324383">"Acces la mesaje"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> va fi deconectat de la media audio."</string>
-    <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> va fi deconectat de la componenta audio handsfree."</string>
+    <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> va fi deconectat de la componenta audio mâini libere."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> va fi deconectat de la dispozitivul de intrare."</string>
     <string name="bluetooth_disconnect_pan_user_profile" msgid="8037627994382458698">"Va fi întrerupt accesul la internet prin <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="5455448395850929200">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> va fi deconectat de la conexiunea acestui telefon la internet."</string>
@@ -543,8 +543,8 @@
     <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Conectat la hartă"</string>
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Neconectat la serverul de transfer de fişiere"</string>
     <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Conectat la dispozitivul de intrare"</string>
-    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Conectat la disp. pt. acces internet"</string>
-    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Se perm. disp. acces la internet local"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Conectat la dispoz. pt. acces internet"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Se permite dispoz. acces la internet local"</string>
     <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Utilizaţi pentru profilul pentru conţinut media audio"</string>
     <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Utilizaţi pentru componenta audio a telefonului"</string>
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Utilizaţi pentru transferul de fişiere"</string>
@@ -556,13 +556,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Ca difuzor"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Pentru muzică şi fişiere media"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Reţineţi setările"</string>
-    <string name="wifi_assistant_intro_setup" msgid="4605105515416995110">"Iată\nAsistentul Wi‑Fi"</string>
-    <string name="wifi_assistant_no_thanks" msgid="2776983751990143934">"NU, MULȚUMESC"</string>
-    <string name="wifi_assistant_setup" msgid="3772423650475730906">"CONFIGURAȚI"</string>
-    <string name="wifi_assistant_card_message" msgid="107811647784658536">"Conectați-vă automat la rețelele disponibile cu un asistent Wi-Fi."</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Asistent Wi-Fi"</string>
-    <string name="wifi_assistant_title_message" msgid="6240721017579074015">"<xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> vă conectează automat la cea mai bună rețea disponibilă Wi-Fi."</string>
-    <string name="wifi_assistant_open_app" msgid="4803044899535675063">"DESCHIDEȚI APLICAȚIA"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Conexiune realizată printr-un asistent Wi-Fi"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"Proiectați ecranul"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Activați ecranul wireless"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Nu s-au găsit dispozitive în apropiere."</string>
@@ -592,7 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Setări Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Configuraţi şi gestionaţi punctele de acces wireless"</string>
-    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Selectați o rețea Wi-Fi"</string>
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Selectați rețeaua Wi‑Fi"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Selectați o rețea Wi-Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Se activează Wi-Fi…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Se dezactivează Wi-Fi…"</string>
@@ -607,8 +602,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"Scanare mereu disponibilă"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Permiteți întotdeauna scanarea"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Permiteți serviciului de localizare Google și altor aplicații să caute rețele, chiar dacă funcția Wi-Fi este dezactivată."</string>
-    <string name="wifi_automatically_manage_title" msgid="6249976570008992746">"Gestionați automat Wi-Fi"</string>
-    <string name="wifi_automatically_manage_summary" msgid="6952470763378312488">"Permiteți <xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> să gestioneze conexiunea dv. Wi-Fi"</string>
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Folosiți automat rețelele Wi‑Fi deschise"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Permiteți ca un asistent Wi‑Fi să conecteze automat dispozitivul la rețele de calitate deschise"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Alegeți asistentul"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Instalați certificate"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Pentru a îmbunătăți precizia locației, dar și în alte scopuri, Google și alte aplicații pot căuta rețele în apropiere, chiar dacă rețeaua Wi-Fi este dezactivată. Dacă nu doriți acest lucru, accesați Avansate &gt; Scanare mereu disponibilă."</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Aplicațiile pot căuta rețele în apropiere, chiar dacă rețeaua Wi-Fi este dezactivată. Dacă nu doriți acest lucru, accesați Avansate &gt; Scanare mereu disponibilă."</string>
@@ -629,6 +625,7 @@
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Scanaţi"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Avansate"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Conectaţi-vă la reţea"</string>
+    <string name="wifi_menu_remember" msgid="8814185749388713796">"Rețineți rețeaua"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Eliminaţi reţeaua"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Modificaţi reţeaua"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Scrieți într-o etichetă NFC"</string>
@@ -673,9 +670,11 @@
     <string name="wifi_unspecified" msgid="5431501214192991253">"(neindicat)"</string>
     <string name="wifi_remembered" msgid="4955746899347821096">"Salvată"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"Dezactivată"</string>
-    <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"S-a evitat o conexiune de internet slabă"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"Eroare de configurație IP"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Eroare de conexiune Wi-Fi"</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Problemă la autentificare"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"În afara ariei de acoperire"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Nu s-a detectat acces la internet, nu se va efectua reconectarea automată."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS disponibil"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS disponibil)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Introduceți parola de rețea"</string>
@@ -699,9 +698,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"AVERTISMENT: Dacă ignorați conexiunea Wi‑Fi, tableta dvs. va utiliza numai datele mobile pentru descărcările sau actualizările inițiale. Pentru a evita eventualele costuri pentru date, conectați-vă la Wi-Fi."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"AVERTISMENT: Dacă ignorați conexiunea Wi‑Fi, dispozitivul dvs. va utiliza numai datele mobile pentru descărcările sau actualizările inițiale. Pentru a evita eventualele costuri pentru date, conectați-vă la Wi-Fi."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"AVERTISMENT: Dacă ignorați conexiunea Wi‑Fi, telefonul dvs. va utiliza numai datele mobile pentru descărcările sau actualizările inițiale. Pentru a evita eventualele costuri pentru date, conectați-vă la Wi-Fi."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="2393880108322835846">"AVERTISMENT: Dacă ignorați conexiunea Wi‑Fi, tableta dvs. nu va avea o conexiune la internet pentru descărcările sau actualizările inițiale."</string>
-    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1707391993265558787">"AVERTISMENT: Dacă ignorați conexiunea Wi‑Fi, dispozitivul dvs. nu va avea o conexiune la internet pentru descărcările sau actualizările inițiale."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="1556858507920033022">"AVERTISMENT: Dacă ignorați conexiunea Wi‑Fi, telefonul dvs. nu va avea o conexiune la internet pentru descărcările sau actualizările inițiale."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Dacă nu folosiți Wi‑Fi:\n\ntableta nu va avea o conexiune la internet;\n\nnu veți primi actualizările de software decât după ce vă conectați la internet;\n\nnu puteți activa acum funcțiile de protecție a dispozitivului."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Dacă nu folosiți Wi‑Fi:\n\ndispozitivul nu va avea o conexiune la internet;\n\nnu veți primi actualizările de software decât după ce vă conectați la internet;\n\nnu puteți activa acum funcțiile de protecție a dispozitivului."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Dacă nu folosiți Wi‑Fi:\n\ntelefonul nu va avea o conexiune la internet;\n\nnu veți primi actualizările de software decât după ce vă conectați la internet;\n\nnu puteți activa acum funcțiile de protecție a dispozitivului."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Tableta nu s-a putut conecta la această rețea Wi-Fi."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"Dispozitivul nu s-a putut conecta la această rețea Wi-Fi."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Telefonul nu s-a putut conecta la această rețea Wi-Fi."</string>
@@ -742,7 +741,7 @@
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Eliminaţi acest grup?"</string>
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Hotspot Wi-Fi portabil"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Hotspot Wi-Fi"</string>
-    <string name="wifi_hotspot_checkbox_text_summary" msgid="3800646230853724318">"Utiliz. conex. mobilă pt. a furniza rețea Wi-Fi"</string>
+    <string name="wifi_hotspot_checkbox_text_summary" msgid="3800646230853724318">"Utilizați conexiunea mobilă pentru a furniza rețea Wi-Fi"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Se activează hotspotul..."</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Se dezactivează hotspotul..."</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Hotspot portabil <xliff:g id="NETWORK_SSID">%1$s</xliff:g> activ"</string>
@@ -761,7 +760,6 @@
     <string name="ring_volume_title" msgid="7938706566797464165">"Volum sonerie"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrează la profilul Silenţios"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Sunet de notificare prestabilit"</string>
-    <string name="heads_up_enabled_title" msgid="1031078221910921622">"Pop-up la prioritate ridicată"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Ton de apel"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Notificare"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Utilizaţi volumul apelurilor de intrare pentru notificări"</string>
@@ -834,7 +832,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Luminozitate automată"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Ridicați pentru a reactiva"</string>
     <string name="doze_title" msgid="2259176504273878294">"Afișare Ambient"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"Activează ecranul când dispozitivul este ridicat sau când sosesc notificări"</string>
+    <string name="doze_summary" msgid="7128970177894383698">"Activează ecranul când ridicați dispozitivul sau când primiți notificări"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Dimensiune font"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Dimensiune font"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Setări de blocare a cardului SIM"</string>
@@ -862,6 +860,10 @@
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Anulaţi"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"Mai multe carduri SIM găsite"</string>
     <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>
@@ -922,11 +924,11 @@
     <string name="memory_music_usage" msgid="1363785144783011606">"Audio (muzică, tonuri de sonerie, podcasturi etc.)"</string>
     <string name="memory_media_misc_usage" msgid="235452944021647124">"Diverse"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"Datele memorate în cache"</string>
-    <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Demontaţi stoc. distrib."</string>
+    <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Demontaţi stocare distribuită"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Demontaţi cardul SD"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Demontaţi stocarea USB internă"</string>
     <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"Demontaţi cardul SD, pentru a-l putea elimina în siguranţă"</string>
-    <string name="sd_insert_summary" product="nosdcard" msgid="5264016886409577313">"Inser. stoc. USB pt. montare"</string>
+    <string name="sd_insert_summary" product="nosdcard" msgid="5264016886409577313">"Inserați stocare USB pt. montare"</string>
     <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"Introduceţi un card SD pentru montare"</string>
     <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"Montaţi stocarea USB"</string>
     <string name="sd_mount" product="default" msgid="5940523765187704135">"Montaţi cardul SD"</string>
@@ -1012,6 +1014,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Această acţiune va şterge toate datele din "<b>"stocarea internă"</b>" a tabletei dvs., inclusiv:\n\n"<li>"Contul dvs. Google;"</li>\n<li>"datele şi setările sistemului şi ale aplicaţiilor;"</li>\n<li>"aplicaţiile descărcate."</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Această acţiune va şterge toate datele din "<b>"stocarea internă"</b>" a telefonului dvs., inclusiv:\n\n"<li>"Contul dvs. Google;"</li>\n<li>"datele şi setările sistemului şi ale aplicaţiilor;"</li>\n<li>"aplicaţiile descărcate."</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"În prezent sunteţi conectat(ă) la următoarele conturi:\n"</string>
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Pe acest dispozitiv sunt prezenți și alți utilizatori.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Muzică"</li>\n<li>"Fotografii"</li>\n<li>"Alte date ale utilizatorului"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Pentru a şterge muzică, imagini şi alte date ale utilizatorului, "<b>"stocarea USB"</b>" trebuie să fie ştearsă."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Pentru a şterge muzică, imagini şi alte date ale utilizatorului, "<b>"cardul SD"</b>" trebuie să fie şters."</string>
@@ -1023,7 +1026,6 @@
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Resetaţi telefonul"</string>
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Ștergeţi toate informaţiile personale şi aplicaţiile descărcate? Nu puteţi anula această acţiune!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Ștergeţi tot"</string>
-    <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Desenaţi modelul pentru deblocare"</string>
     <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Trebuie să desenaţi modelul de deblocare pentru a confirma resetarea configurării din fabrică."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Nu a fost efectuată nicio resetare, deoarece serviciul Golire sistem nu este disponibil."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Resetaţi?"</string>
@@ -1041,7 +1043,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"Ștergeţi stocarea USB şi toate fişierele stocate pe aceasta? Nu puteţi anula această acţiune!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Ștergeţi cardul SD şi toate fişierele stocate pe acesta? Acţiunea nu poate fi anulată!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Ștergeţi tot"</string>
-    <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Desenaţi modelul pentru deblocare"</string>
     <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Trebuie să desenaţi modelul de deblocare pentru a confirma că doriţi să ştergeţi stocarea USB."</string>
     <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Trebuie să desenaţi modelul de deblocare pentru a confirma că doriţi să ştergeţi cardul SD."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Setări apel"</string>
@@ -1062,13 +1063,13 @@
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Tethering prin Bluetooth"</string>
     <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="8811610320942954709">"Se permite acces la conexiunea internet a tabletei"</string>
     <string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"Se permite acces la conex. internet a telefonului"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="2730938191906597896">"Se permite acces la conex. internet a tabletei pt. 1 disp."</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="1666736165420290466">"Se permite acces la conex. internet a telef. pt. 1 disp."</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="1180765608259580143">"Se permite acces la conex.internet a tabletei pt. <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> disp."</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8248942539362173005">"Se permite acces la conex. internet a telef. pt. <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> disp."</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="2730938191906597896">"Se permite acces la conex. internet a tabletei pt. 1 dispoz."</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="1666736165420290466">"Se permite acces la conex. internet a telef. pt. 1 dispoz."</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="1180765608259580143">"Se permite acces la conex. internet a tabletei pt. <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> dispoz."</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8248942539362173005">"Se permite acces la conexiunea internet a telef. pt. <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> dispoz."</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="1790242032929221788">"Se utiliz. conex. la internet a dispozitivului <xliff:g id="DEVICE_NAME">%1$d</xliff:g>"</string>
     <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="2093881379028235555">"Nu se permite acces la conex. internet a tabletei"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="706860924389041342">"Nu se perm. acces la conex. internet a telefonului"</string>
+    <string name="bluetooth_tethering_off_subtext" product="default" msgid="706860924389041342">"Nu se permite acces la conex. internet a telefonului"</string>
     <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"Nu este conectat ca modem"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="6285122039489881969">"Este imposibil tethering cu peste <xliff:g id="MAXCONNECTION">%1$d</xliff:g> dispozitive."</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> va fi deconectat."</string>
@@ -1087,6 +1088,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Introduceți cartela SIM și reporniți"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Conectați-vă la internet"</string>
     <string name="location_title" msgid="1029961368397484576">"Locaţia mea"</string>
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Profil de serviciu"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Locație pt. profil de serviciu"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Dezactivată de companie"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Mod"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Precizie ridicată"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Economisirea bateriei"</string>
@@ -1095,8 +1099,8 @@
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Solicitări recente de localiz."</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Nicio aplicație nu a solicitat locația recent"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"Servicii de localizare"</string>
-    <string name="location_high_battery_use" msgid="517199943258508020">"Utilizarea intensă a bateriei"</string>
-    <string name="location_low_battery_use" msgid="8602232529541903596">"Utilizarea redusă a bateriei"</string>
+    <string name="location_high_battery_use" msgid="517199943258508020">"Utilizare intensă a bateriei"</string>
+    <string name="location_low_battery_use" msgid="8602232529541903596">"Utilizare redusă a bateriei"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Mod de localizare"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Utilizează GPS, Wi-Fi și rețelele mobile pentru determinarea locației"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Utilizează rețelele Wi-Fi și mobile pentru determinarea locației"</string>
@@ -1111,7 +1115,7 @@
     <string name="assisted_gps_enabled" msgid="8751899609589792803">"Utilizaţi serverul pentru a asista funcţia GPS (debifaţi pentru a reduce utilizarea reţelei)"</string>
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"Utilizaţi serverul pentru a asista funcţia GPS (debifaţi pentru a îmbunătăţi performanţa GPS)"</string>
     <string name="use_location_title" msgid="5206937465504979977">"Locaţie şi căutare Google"</string>
-    <string name="use_location_summary" msgid="3978805802386162520">"Permiteţi Google să utilizeze locaţia dvs. pt. îmbunăt. rezultatelor căutării şi serviciilor"</string>
+    <string name="use_location_summary" msgid="3978805802386162520">"Permiteţi Google să utilizeze locaţia dvs. pt. îmbunătățirea rezultatelor căutării şi a serviciilor"</string>
     <string name="location_access_title" msgid="7064108942964081243">"Acces la locaţia dvs."</string>
     <string name="location_access_summary" msgid="69031404093194341">"Acordaţi aplicaţiilor care v-au solicitat, permisiunea să utilizeze informaţiile dvs. de localizare"</string>
     <string name="location_sources_heading" msgid="1278732419851088319">"Surse de locaţii"</string>
@@ -1124,6 +1128,7 @@
     <string name="copyright_title" msgid="865906688917260647">"Drept de autor"</string>
     <string name="license_title" msgid="1990487604356037871">"Licenţă"</string>
     <string name="terms_title" msgid="7697580845616764642">"Termeni şi condiţii"</string>
+    <string name="webview_license_title" msgid="2813507464175738967">"Licență de sistem pentru WebView"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Imagini de fundal"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Furnizorii de imagini din satelit:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Licenţe open source"</string>
@@ -1141,7 +1146,7 @@
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Confirmaţi codul PIN"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="6850677112663979120">"Parolele nu corespund"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="4757532830594400147">"Codurile PIN nu corespund"</string>
-    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Select. metoda de deblocare"</string>
+    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Selectați metoda de deblocare"</string>
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Parola a fost setată"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"Codul PIN a fost setat"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Modelul a fost setat"</string>
@@ -1237,7 +1242,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Stocare USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Pe cardul SD"</string>
     <string name="disabled" msgid="9206776641295849915">"Dezactivată"</string>
-    <string name="not_installed" msgid="1475144352069281880">"Neinstalată"</string>
+    <string name="not_installed" msgid="2797554494953450291">"Nu este instal. pt. utilizator"</string>
     <string name="no_applications" msgid="7336588977497084921">"Nu există aplicaţii."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Stocare internă"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Stocare USB"</string>
@@ -1336,7 +1341,7 @@
     <string name="main_running_process_description" msgid="1130702347066340890">"Procesul principal în uz."</string>
     <string name="process_service_in_use_description" msgid="8993335064403217080">"Serviciul <xliff:g id="COMP_NAME">%1$s</xliff:g> se află în utilizare."</string>
     <string name="process_provider_in_use_description" msgid="5586603325677678940">"Furnizorul <xliff:g id="COMP_NAME">%1$s</xliff:g> se află în utilizare."</string>
-    <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Opriţi serviciul sistemului?"</string>
+    <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Opriţi serviciul de sistem?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"Dacă opriţi acest serviciu, este posibil ca unele funcţii ale tabletei să nu mai funcţioneze corect decât după ce o veţi închide şi redeschide."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Dacă opriţi acest serviciu, este posibil ca unele funcţii ale telefonului să nu mai funcţioneze corect decât după ce îl veţi închide şi redeschide."</string>
     <string name="language_settings" msgid="5292716747264442359">"Limbă și introducere de text"</string>
@@ -1435,8 +1440,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Ecranul nu va fi inactiv pe durata încărcării"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Activați jurnalul de examinare HCI Bluetooth"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Înregistrați toate pachetele HCI Bluetooth într-un fișier"</string>
-    <string name="oem_unlock_enable" msgid="6629321276287913315">"Activați deblocarea OEM"</string>
-    <string name="oem_unlock_enable_summary" msgid="3546686263996628110">"Permiteți dispozitivului să fie deblocat OEM"</string>
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"Deblocarea OEM"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Permiteți deblocarea bootloaderului"</string>
+    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Introduceți codul PIN"</string>
+    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Introduceți codul PIN al dispozitivului pentru a activa deblocarea OEM"</string>
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Permiteți deblocarea OEM?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"AVERTISMENT: funcțiile de protecție a dispozitivului nu vor funcționa pe acest dispozitiv cât timp setarea este activată."</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Certificare Ecran wireless"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Act. înr. prin Wi-Fi a vol. mari de date"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Înlocuire Wi-Fi cu mobil agresivă"</string>
@@ -1539,6 +1548,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"Subtitrările vor arăta așa"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"Prestabilit"</string>
+    <string name="color_title" msgid="4258931051732243983">"Culoare"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"Prestabilită"</string>
     <string name="color_none" msgid="3475640044925814795">"Niciuna"</string>
     <string name="color_white" msgid="8045195170201590239">"Alb"</string>
@@ -1596,12 +1606,12 @@
     <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">"Timp rămas: <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> până la finalizarea încărcării"</string>
-    <string name="power_discharging_duration" msgid="7125493014448497620">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – a mai rămas aproximativ <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="power_charging" msgid="712751285832976915">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – <xliff:g id="STATE">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration" msgid="4802183864773082009">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> până la încărcare completă"</string>
-    <string name="power_charging_duration_ac" msgid="3611179931297824699">"<xliff:g id="LEVEL">%1$d</xliff:g> %% - <xliff:g id="TIME">%2$s</xliff:g> până la încărc. completă la c.a."</string>
-    <string name="power_charging_duration_usb" msgid="1106605348913397583">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> până la încărc. completă prin USB"</string>
-    <string name="power_charging_duration_wireless" msgid="633606920144617227">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> până la încărc. completă wireless"</string>
+    <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> – timp rămas: aproximativ <xliff:g id="TIME">%2$s</xliff:g>"</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> până la încărcare completă"</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> până la încărcare completă la c.a."</string>
+    <string name="power_charging_duration_usb" msgid="182405645340976546">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> până la încărcare completă prin USB"</string>
+    <string name="power_charging_duration_wireless" msgid="1829295708243159464">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> până la încărcare completă wireless"</string>
     <string name="power_usage_list_summary" msgid="2409288197839512482">"Utilizare de la ultima încărc. completă"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Utilizarea bateriei de la deconectare"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Utilizarea bateriei de la resetare"</string>
@@ -1618,7 +1628,6 @@
     <string name="awake" msgid="387122265874485088">"Durată de activitate a dispozitivului"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Timp de funcționare Wi-Fi"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Timp de funcționare Wi-Fi"</string>
-    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Detalii istoric"</string>
     <string name="details_title" msgid="3792801565213935385">"Detalii despre utilizare"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Detalii despre utilizare"</string>
@@ -1690,7 +1699,7 @@
     <string name="battery_saver" msgid="1426682272004907982">"Economisirea energiei"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Activați automat"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Niciodată"</string>
-    <string name="battery_saver_turn_on_automatically_pct" msgid="3033681629861428940">"când bateria ajunge la %1$d%%"</string>
+    <string name="battery_saver_turn_on_automatically_pct" msgid="7536784431655058267">"când bateria ajunge la %1$s"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Statistici de proces"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Statistici inteligente despre procesele care rulează"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Utilizarea memoriei"</string>
@@ -1777,7 +1786,7 @@
     <string name="pico_not_installed" msgid="6266845418419994311">"Neinstalată"</string>
     <string name="pico_voice_summary_female" msgid="8047327176247727492">"Feminină"</string>
     <string name="pico_voice_summary_male" msgid="8331266854058577610">"Masculină"</string>
-    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"Motorul de sint. a vorb. instalat"</string>
+    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"Motor sintetiz. vorbire instalat"</string>
     <string name="tts_notif_engine_install_message" msgid="7250804349781973329">"Activ. mot. nou înaintea util."</string>
     <string name="tts_engine_settings_button" msgid="1030512042040722285">"Lansaţi setările motorului"</string>
     <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Motor preferat"</string>
@@ -1814,7 +1823,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Stocare hardware"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Stocare software"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"Datele de conectare nu sunt disponibile pentru acest utilizator"</string>
-    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Desenaţi modelul pentru deblocare"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Trebuie să desenaţi modelul pentru deblocare pentru a confirma instalarea acreditării."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Introduceţi parola pentru spaţiul de stocare a certificatelor."</string>
@@ -1822,13 +1830,13 @@
     <string name="credentials_reset_hint" msgid="6297256880896133631">"Eliminaţi întregul conţinut?"</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"Parola trebuie să conţină minimum 8 caractere."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Parolă incorectă."</string>
-    <string name="credentials_reset_warning" msgid="5320653011511797600">"Parolă incorectă. Mai aveţi dreptul la o singură încercare înainte ca stocarea acreditărilor să fie ştearsă."</string>
-    <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Parolă incorectă. Mai aveţi dreptul la <xliff:g id="NUMBER">%1$d</xliff:g> încercări înainte ca stocarea acreditărilor să fie ştearsă."</string>
-    <string name="credentials_erased" msgid="2907836028586342969">"Stoc. acredit. este ştearsă."</string>
-    <string name="credentials_not_erased" msgid="93461830775441220">"Nu s-a şters sp. stoc. cert."</string>
+    <string name="credentials_reset_warning" msgid="5320653011511797600">"Parolă incorectă. Mai aveţi dreptul la o singură încercare înainte ca acreditările stocate să fie şterse."</string>
+    <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Parolă incorectă. Mai aveţi dreptul la <xliff:g id="NUMBER">%1$d</xliff:g> încercări înainte ca acreditările stocate să fie şterse."</string>
+    <string name="credentials_erased" msgid="2907836028586342969">"Acreditările stocate sunt şterse."</string>
+    <string name="credentials_not_erased" msgid="93461830775441220">"Nu s-au șters acredit. stocate"</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Stocarea acreditărilor este activată."</string>
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Trebuie să setaţi un cod PIN sau o parolă pentru blocarea ecranului înainte de a putea utiliza spaţiul de stocare a certificatelor."</string>
-    <string name="usage_access_title" msgid="332333405495457839">"Apl. cu acces la date de util."</string>
+    <string name="usage_access_title" msgid="332333405495457839">"Apl. cu acces la date utilizare"</string>
     <string name="allow_usage_access_title" msgid="2134237975190472249">"Permiteţi accesul?"</string>
     <string name="allow_usage_access_message" msgid="2295847177051307496">"Dacă îi permiteți accesul, această aplicație poate vizualiza informații generale despre aplicațiile de pe dispozitivul dvs., cum ar fi frecvența cu care le utilizați."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Ton de urgenţă"</string>
@@ -1844,7 +1852,9 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"Includeți datele aplicației"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Restabilire automată"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"La reinstalarea unei aplicaţii, restabiliţi setările şi datele pentru care aţi creat o copie de rezervă"</string>
-    <string name="local_backup_password_title" msgid="3860471654439418822">"Parolă cop. rez. desktop"</string>
+    <string name="backup_inactive_title" msgid="5355557151569037197">"Serviciul de backup este inactiv."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"Acest serviciu este configurat de politica privind dispozitivele."</string>
+    <string name="local_backup_password_title" msgid="3860471654439418822">"Parolă copie rez. desktop"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"În prezent, copiile de rezervă complete pe desktop nu sunt protejate"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Atingeţi pentru a modifica sau pentru a elimina parola pentru copiile de rezervă complete pe desktop"</string>
     <string name="local_backup_password_toast_success" msgid="582016086228434290">"A fost setată o parolă de rezervă nouă"</string>
@@ -1892,7 +1902,7 @@
     <string name="wifi_setup_status_scanning" msgid="5317003416385428036">"Se scanează reţelele..."</string>
     <string name="wifi_setup_status_select_network" msgid="7519563569903137003">"Atingeţi o reţea pentru a vă conecta la aceasta"</string>
     <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"Conectaţi-vă la reţeaua existentă"</string>
-    <string name="wifi_setup_status_unsecured_network" msgid="8143046977328718252">"Conectaţi-vă la o reţea nesecuriz."</string>
+    <string name="wifi_setup_status_unsecured_network" msgid="8143046977328718252">"Conectaţi-vă la reţea nesecurizată"</string>
     <string name="wifi_setup_status_edit_network" msgid="4765340816724760717">"Introduceţi configuraţia reţelei"</string>
     <string name="wifi_setup_status_new_network" msgid="7468952850452301083">"Conectaţi-vă la o reţea nouă"</string>
     <string name="wifi_setup_status_connecting" msgid="4971421484401530740">"Se conectează..."</string>
@@ -1916,10 +1926,10 @@
     <string name="background_data_summary" msgid="8328521479872763452">"Aplicaţiile pot oricând sincroniza, trimite şi primi date"</string>
     <string name="background_data_dialog_title" msgid="6059217698124786537">"Dez. dat. de fundal?"</string>
     <string name="background_data_dialog_message" msgid="6981661606680941633">"Dezactivarea datelor de fundal creşte durata de viaţă a bateriei şi reduce nivelul de utilizare a datelor. Anumite aplicaţii pot utiliza în continuare conexiunea de date de fundal."</string>
-    <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_automatically" msgid="1682730255435062059">"Sinc. automată a datelor aplicaţiei"</string>
+    <string name="sync_enabled" msgid="4551148952179416813">"Sincronizarea e ACTIVATĂ"</string>
+    <string name="sync_disabled" msgid="8511659877596511991">"Sincroniz. e DEZACTIVATĂ"</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>
@@ -1953,14 +1963,18 @@
     <string name="enter_password" msgid="8035706727471334122">"Pentru a lansa sistemul de operare Android, introduceți parola"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Pentru a lansa sistemul de operare Android, introduceți codul PIN"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Pentru a lansa sistemul de operare Android, desenați șablonul"</string>
-    <string name="try_again" msgid="4272075051293936921">"Încercaţi din nou."</string>
+    <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"Model greșit"</string>
+    <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"Parolă greșită"</string>
+    <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"Cod PIN greșit"</string>
+    <string name="checking_decryption" msgid="8287458611802609493">"Se verifică..."</string>
+    <string name="starting_android" msgid="8581493237458496835">"Android este în curs de pornire"</string>
     <string name="delete" msgid="4219243412325163003">"Ștergeţi"</string>
     <string name="misc_files" msgid="6720680815969643497">"Fişiere diverse"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"au fost selectate <xliff:g id="NUMBER">%1$d</xliff:g> din <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> din <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Selectaţi-le pe toate"</string>
     <string name="hdcp_checking_title" msgid="8605478913544273282">"Verificare HDCP"</string>
-    <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Setaţi comp. verif. HDCP"</string>
+    <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Configurați verific. HDCP"</string>
     <string name="debug_debugging_category" msgid="6781250159513471316">"Depanare"</string>
     <string name="debug_app" msgid="8349591734751384446">"Selectaţi aplicaţia de depanare"</string>
     <string name="debug_app_not_set" msgid="718752499586403499">"Nu aţi setat o aplicaţie de depanare"</string>
@@ -1975,9 +1989,9 @@
     <string name="media_category" msgid="4388305075496848353">"Media"</string>
     <string name="debug_monitoring_category" msgid="7640508148375798343">"Monitorizare"</string>
     <string name="strict_mode" msgid="1938795874357830695">"Modul Strict activat"</string>
-    <string name="strict_mode_summary" msgid="142834318897332338">"Ilum. intermit. la operaţii lungi pe firul princ."</string>
+    <string name="strict_mode_summary" msgid="142834318897332338">"Iluminare intermitentă la operații lungi pe firul principal"</string>
     <string name="pointer_location" msgid="6084434787496938001">"Locaţia indicatorului"</string>
-    <string name="pointer_location_summary" msgid="840819275172753713">"Suprap. pe ecran indic. date curente pt. atingeri"</string>
+    <string name="pointer_location_summary" msgid="840819275172753713">"Suprapunere care indică date curente pt. atingeri"</string>
     <string name="show_touches" msgid="1356420386500834339">"Afişaţi atingerile"</string>
     <string name="show_touches_summary" msgid="6684407913145150041">"Afişaţi feedback vizual pentru atingeri"</string>
     <string name="show_screen_updates" msgid="5470814345876056420">"Afiş. actualiz. suprafeţe"</string>
@@ -1991,30 +2005,30 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Utilizaţi mereu GPU pentru compunerea ecranului"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"Simulați spațiu culoare"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Monitorizări OpenGL"</string>
-    <string name="use_nuplayer" msgid="5699257393367904387">"Utilizați NuPlayer (beta)"</string>
-    <string name="use_nuplayer_summary" msgid="1991479067478516714">"Utilizați NuPlayer în loc de AwesomePlayer"</string>
-    <string name="usb_audio_disable_routing" msgid="8114498436003102671">"Dezact. rutarea audio USB"</string>
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"Folosiți AwesomePlayer (vechi)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"Folosiți AwesomePlayer, nu NuPlayer pt. redările media"</string>
+    <string name="usb_audio_disable_routing" msgid="8114498436003102671">"Dezactivați rutarea audio USB"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"Dezact. rutarea automată către perif. audio USB"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Afişaţi limite aspect"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Afişaţi limitele clipului, marginile etc."</string>
     <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Direcție aspect dr. - st."</string>
     <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Direcție obligatorie aspect ecran dreapta - stânga"</string>
-    <string name="show_cpu_usage" msgid="2389212910758076024">"Afişaţi utiliz. procesor."</string>
-    <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Suprap. pe ecran indic. util. curentă a procesor."</string>
+    <string name="show_cpu_usage" msgid="2389212910758076024">"Afişaţi utiliz. procesor"</string>
+    <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Suprapunere care indică utilizare curentă procesor"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Forţaţi redarea cu GPU"</string>
     <string name="force_hw_ui_summary" msgid="5535991166074861515">"Forţaţi utilizarea GPU pentru desen în 2D"</string>
     <string name="force_msaa" msgid="7920323238677284387">"Forţaţi MSAA 4x"</string>
     <string name="force_msaa_summary" msgid="9123553203895817537">"Activaţi MSAA 4x în aplicaţiile OpenGL ES 2.0"</string>
     <string name="show_non_rect_clip" msgid="505954950474595172">"Remediați decupări nerectangulare"</string>
     <string name="track_frame_time" msgid="6146354853663863443">"Profil redare cu GPU"</string>
-    <string name="window_animation_scale_title" msgid="6162587588166114700">"Scara anim. în fereastră"</string>
-    <string name="transition_animation_scale_title" msgid="387527540523595875">"Scară pt. anim. cu tranz."</string>
+    <string name="window_animation_scale_title" msgid="6162587588166114700">"Scară animație fereastră"</string>
+    <string name="transition_animation_scale_title" msgid="387527540523595875">"Scară tranziție animații"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Scară durată Animator"</string>
     <string name="overlay_display_devices_title" msgid="5364176287998398539">"Simulaţi afişaje secundare"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Aplicaţii"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Nu păstraţi activităţile"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Elimină activitățile imediat ce utilizatorul le închide"</string>
-    <string name="app_process_limit_title" msgid="4280600650253107163">"Limita proces. de fundal"</string>
+    <string name="app_process_limit_title" msgid="4280600650253107163">"Limită procese fundal"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Afişaţi toate elem. ANR"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Afiş. dialog. Aplic. nu răsp. pt. aplic. de fundal"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Utilizarea datelor"</string>
@@ -2024,7 +2038,7 @@
     <string name="data_usage_app_info_label" msgid="3409931235687866706">"INFORMAȚII DESPRE APLICAȚIE"</string>
     <string name="data_usage_cellular_data" msgid="4859424346276043677">"Date mobile"</string>
     <string name="data_usage_data_limit" msgid="1193930999713192703">"Setați limita de date"</string>
-    <string name="data_usage_cycle" msgid="5652529796195787949">"Ciclul de util. a datelor"</string>
+    <string name="data_usage_cycle" msgid="5652529796195787949">"Ciclu utilizare date"</string>
     <string name="data_usage_app_items_header_text" msgid="5017850810459372828">"Utilizarea aplicațiilor"</string>
     <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Roaming de date"</string>
     <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Restricţionaţi datele de fundal"</string>
@@ -2032,8 +2046,8 @@
     <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"Utilizarea 4G afişată separat"</string>
     <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_show_ethernet" msgid="5181361208532314097">"Afişaţi utilizarea 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>
@@ -2067,7 +2081,7 @@
     <string name="data_usage_app_settings" msgid="2279171379771253165">"Setări aplicaţii"</string>
     <string name="data_usage_app_restrict_background" msgid="7510046552380574925">"Restr. datele de fundal ale apl."</string>
     <string name="data_usage_app_restrict_background_summary" msgid="3720075732277934106">"Dezactivați datele de fundal în rețelele mobile."</string>
-    <string name="data_usage_app_restrict_background_summary_disabled" msgid="1446565717342917727">"Pt. restr. date fundal pt. aplic., setați limita pt. date mobile"</string>
+    <string name="data_usage_app_restrict_background_summary_disabled" msgid="1446565717342917727">"Restrângeți traficul de fundal al aplicației după ce setați limita pt. date mobile."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Restricţionaţi datele de fundal?"</string>
     <string name="data_usage_app_restrict_dialog" msgid="5871168521456832764">"Această funcție poate face ca o aplicație care depinde de datele de fundal să nu mai funcționeze când sunt disponibile numai rețele mobile.\n\nPuteți găsi comenzi mai adecvate pentru utilizarea datelor în setările disponibile în aplicație."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="4674085030810350875">"Restricționarea datelor de fundal este posibilă numai dacă ați setat o limită de date mobile."</string>
@@ -2168,7 +2182,6 @@
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Adăugați un utilizator/un profil"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Adăugaţi utilizator"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Profil limitat"</string>
-    <string name="user_summary_managed_profile" msgid="7369539529693048111">"Profil de serviciu"</string>
     <string name="user_need_lock_message" msgid="2596365678651842785">"Înainte de a putea crea un profil cu permisiuni limitate, va trebui să configurați blocarea ecranului pentru a vă proteja aplicațiile și datele personale."</string>
     <string name="user_set_lock_button" msgid="8311219392856626841">"Configurați blocarea"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Neconfigurat"</string>
@@ -2193,7 +2206,7 @@
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"Numai proprietarul tabletei poate gestiona utilizatorii."</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"Numai proprietarul telefonului poate gestiona utilizatorii."</string>
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Profilurile cu permisiuni limitate nu pot adăuga conturi"</string>
-    <string name="user_remove_user_menu" msgid="6897150520686691355">"Ștergeţi <xliff:g id="USER_NAME">%1$s</xliff:g> de pe gadget"</string>
+    <string name="user_remove_user_menu" msgid="6897150520686691355">"Ștergeţi <xliff:g id="USER_NAME">%1$s</xliff:g> de pe dispoz."</string>
     <string name="user_add_on_lockscreen_menu" msgid="3025132738715222247">"Adăug. utiliz. pe disp. blocat"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Utilizator nou"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Profil nou"</string>
@@ -2299,11 +2312,13 @@
     <string name="sim_cellular_data_unavailable_summary" msgid="3654805961942166428">"Atingeți pentru a selecta un card SIM de date"</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"Utilizați întotdeauna pentru apeluri"</string>
     <string name="select_sim_for_data" msgid="2366081042162853044">"Selectați o cartelă SIM pentru date"</string>
+    <string name="data_switch_started" msgid="2040761479817166311">"Se comută cardul SIM pentru date. Poate dura până la un minut..."</string>
     <string name="select_sim_for_calls" msgid="3503094771801109334">"Apelați de pe"</string>
     <string name="sim_select_card" msgid="211285163525563293">"Selectați un card SIM"</string>
     <string name="sim_card_number_title" msgid="7845379943474336488">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"Card SIM gol"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"Numele cardului SIM"</string>
+    <string name="sim_name_hint" msgid="7038643345238968930">"Introduceți numele cardului SIM"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"Slot pentru SIM %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Operator"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Număr"</string>
@@ -2313,16 +2328,18 @@
     <string name="color_purple" msgid="3888532466427762504">"Violet"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"Nu a fost introdus niciun card SIM"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"Starea cardului SIM"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"Informații despre cardul SIM"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"Apelați de pe cardul SIM implicit"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"Card SIM pentru apeluri efectuate"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Alte setări de apel"</string>
     <string name="preferred_network_offload_title" msgid="1605829724169550275">"Descărc. rețea preferată"</string>
     <string name="preferred_network_offload_header" msgid="2321173571529106767">"Dezactivați trimiterea numelui rețelei"</string>
-    <string name="preferred_network_offload_footer" msgid="5857279426054744020">"Dezactivarea trimiterii numelui rețelei împiedică utiliz. terță parte să acceseze info. de rețea."</string>
+    <string name="preferred_network_offload_footer" msgid="5857279426054744020">"Dezactivarea trimiterii numelui rețelei împiedică utilizatorii terță parte să acceseze info. de rețea."</string>
     <string name="preferred_network_offload_popup" msgid="2252915199889604600">"Dezactivarea trimiterii numelui rețelei împiedică conectarea automată la rețele ascunse."</string>
+    <string name="sim_signal_strength" msgid="9144010043784767984">"<xliff:g id="DBM">%1$d</xliff:g> dBm <xliff:g id="ASU">%2$d</xliff:g> asu"</string>
+    <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>
+    <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Întreabă mereu"</string>
     <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>
@@ -2331,22 +2348,22 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Căutări recente"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Rezultate"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi conexiune la rețea"</string>
-    <string name="keywords_more_default_sms_app" msgid="2744404159003574745">"mesaj text"</string>
-    <string name="keywords_more_mobile_networks" msgid="7813380887358745769">"celulă celular operator wireless"</string>
+    <string name="keywords_more_default_sms_app" msgid="895656981962034647">"mesaj text trimitere de SMS-uri mesaje text trimitere de mesaje"</string>
+    <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"celular furnizor de servicii celulare date wireless 4g 3g 2g lte"</string>
     <string name="keywords_home" msgid="3626170808219458848">"lansator"</string>
     <string name="keywords_display" msgid="6709007669501628320">"ecran tactil"</string>
-    <string name="keywords_display_brightness_level" msgid="8636451602230815191">"estompați ecranul tactil"</string>
-    <string name="keywords_display_auto_brightness" msgid="8070218600502753102">"estompați ecranul tactil"</string>
-    <string name="keywords_display_wallpaper" msgid="4315466287469834939">"fundal"</string>
+    <string name="keywords_display_brightness_level" msgid="8923289340474728990">"reduceți luminozitatea ecranului ecran tactil baterie"</string>
+    <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"reduceți luminozitatea ecranului ecran tactil baterie"</string>
+    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"fundal personalizați afișare"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"dimensiunea textului"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"proiect"</string>
-    <string name="keywords_storage" msgid="7007275853993419928">"spațiu hard disk"</string>
-    <string name="keywords_battery" msgid="3992479295298655138">"putere"</string>
-    <string name="keywords_spell_checker" msgid="4509482591225399210">"ortografie"</string>
+    <string name="keywords_storage" msgid="6572905220031852173">"spațiu pe disc hard disk utilizarea dispozitivului"</string>
+    <string name="keywords_battery" msgid="2096185085932675704">"sarcină electrică"</string>
+    <string name="keywords_spell_checker" msgid="6106749039734174140">"ortografie dicționar verificare ortografică corectare automată"</string>
     <string name="keywords_voice_input" msgid="3519547605812413860">"recunoaștere introducere vorbire vorbit limbă hands-free mâini libere detectare cuvânt jignitor audio istoric bluetooth cască"</string>
-    <string name="keywords_text_to_speech_output" msgid="8207889472282225512">"evaluați limbă implicit vorbit vorbiți"</string>
-    <string name="keywords_date_and_time" msgid="7666950126499155141">"ceas"</string>
-    <string name="keywords_factory_data_reset" msgid="3693730656843989732">"estompare ștergere"</string>
+    <string name="keywords_text_to_speech_output" msgid="392447904221657930">"evaluați limbă implicit vorbi vorbire TTS accesibilitate cititor orb"</string>
+    <string name="keywords_date_and_time" msgid="2631808108134830066">"ceas militar"</string>
+    <string name="keywords_factory_data_reset" msgid="4355133848707691977">"ștergeți restabiliți elliminați"</string>
     <string name="keywords_printing" msgid="1701778563617114846">"imprimantă"</string>
     <string name="keywords_sounds_and_notifications" msgid="5965996187974887000">"difuzor bip"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="2912933812460077912">"nu deranjați întrerupeți pauză întrerupere"</string>
@@ -2355,7 +2372,7 @@
     <string name="keywords_location_mode" msgid="8584992704568356084">"precizie"</string>
     <string name="keywords_accounts" msgid="1957925565953357627">"cont"</string>
     <string name="keywords_users" msgid="4673901601478559100">"restricție restricționa restricționat"</string>
-    <string name="keywords_keyboard_and_ime" msgid="1103378692379215672">"corectarea textului corect vibrații sunet automat limbă gest sugestie sugerează temă tip cuvânt ofensator emoji"</string>
+    <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"corectarea textului corectați sunet vibrații auto limbă gest sugera sugestie temă cuvânt ofensator introducere de text emoji internațional"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"glisare parolă model PIN"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Configurarea etichetei NFC pentru Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Scrieți"</string>
@@ -2372,7 +2389,6 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Volumul notificărilor"</string>
     <string name="zen_mode_settings_title" msgid="7014915558669122902">"Întreruperi"</string>
     <string name="zen_mode_option_title" msgid="5061978632306007914">"La primirea apelurilor și notificărilor"</string>
-    <string name="zen_mode_option_title_novoice" msgid="6680706009915204785">"La primirea notificărilor"</string>
     <string name="zen_mode_option_off" msgid="3167702608910820883">"Întrerupeți întotdeauna"</string>
     <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Permiteți numai întreruperi cu prioritate"</string>
     <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Nu întrerupeți"</string>
@@ -2383,10 +2399,10 @@
     <string name="notification_pulse_title" msgid="1247988024534030629">"Indicator luminos intermitent"</string>
     <string name="lock_screen_notifications_title" msgid="9118805570775519455">"Când dispozitivul este blocat"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Afișați integral conținutul notificărilor"</string>
-    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Ascundeți conținutul confidențial din notificări"</string>
+    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Ascundeți conținutul notificărilor sensibile"</string>
     <string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"Nu afișați nicio notificare"</string>
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"Când dispozitivul este blocat, cum doriți să se afișeze notificările?"</string>
-    <string name="app_notifications_title" msgid="5810577805218003760">"Notificări despre aplicații"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Notificări din aplicații"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Alte sunete"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"Tonuri pentru tastatura numerică"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Sunete la blocarea ecranului"</string>
@@ -2430,14 +2446,17 @@
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Terminat"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Până la dezactivare"</string>
     <string name="zen_mode_important_category" msgid="8123274463331022993">"Întreruperi cu prioritate"</string>
-    <string name="zen_mode_downtime_category" msgid="4730179065426038108">"Inactivitate (numai întrer. cu priorit.)"</string>
+    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Inactivitate"</string>
     <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Zile"</string>
     <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Niciuna"</string>
+    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Întreruperile sunt permise"</string>
+    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Numai cu prioritate"</string>
+    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Niciunul"</string>
     <string name="zen_mode_automation_category" msgid="4653551005950835761">"Automatizare"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Activați automat"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Niciodată"</string>
-    <string name="zen_mode_phone_calls" msgid="8956214416859303966">"Apeluri"</string>
+    <string name="zen_mode_calls" msgid="7051492091133751208">"Apeluri"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Mesaje"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Apeluri/mesaje de la"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Oricine"</string>
@@ -2451,7 +2470,9 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Serile zilelor lucr."</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Ora de începere"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Ora de încheiere"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"A doua zi, la <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
+    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"La <xliff:g id="FORMATTED_TIME">%s</xliff:g> a doua zi"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"La <xliff:g id="FORMATTED_TIME">%s</xliff:g> sau la oricare alarmă anterioară"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"La <xliff:g id="FORMATTED_TIME">%s</xliff:g> a doua zi sau la oricare alarmă anterioară"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Notificări aplicații"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Setări pentru notificări"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Trimiteți feedback despre dispoz."</string>
@@ -2459,7 +2480,11 @@
     <string name="switch_on_text" msgid="1124106706920572386">"Activat"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Dezactivat"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"Fixarea ecranului"</string>
-    <string name="screen_pinning_description" msgid="7091642350452605379">"Când fixarea pe ecran este activată, o puteți utiliza pentru a menține ecranul actual în vizualizare până anulați fixarea.\n\nPentru a utiliza fixarea pe ecran:\n\n1. asigurați-vă că fixarea este activată;\n\n2. deschideți ecranul pentru fixare;\n\n3. atingeți Vizualizare generală;\n\n4. atingeți pictograma de fixare."</string>
+    <string name="screen_pinning_description" msgid="1137904524037468263">"Când fixarea pe ecran este activată, o puteți utiliza pentru a menține ecranul afișat până anulați fixarea.\n\nPentru a utiliza fixarea pe ecran:\n\n1. asigurați-vă că fixarea este activată;\n\n2. deschideți ecranul de fixat;\n\n3. atingeți Vizualizare generală;\n\n4. glisați în sus și atingeți pictograma de fixare."</string>
+    <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Solicitați modelul pentru deblocare înainte de a anula fixarea"</string>
+    <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Solicitați codul PIN înainte de a anula fixarea"</string>
+    <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Solicitați parola înainte de a anula fixarea"</string>
+    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Blocați dispozitivul la anularea fixării"</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Profil de serviciu"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Experimental)"</string>
     <string name="display_auto_rotate_title" msgid="6176450657107806043">"Când dispozitivul este rotit"</string>
@@ -2468,7 +2493,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Mențineți vizualizarea peisaj"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Mențineți orientarea actuală"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"Informații despre IMEI"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"Informații referitoare la IMEI"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Criptare"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Continuați"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"Puteți lua măsuri de protecție suplimentară pe acest dispozitiv solicitând codul PIN pentru a-l porni. Nu se pot primi apeluri, mesaje sau notificări, nici alarme, pe dispozitiv până când acesta nu pornește. \n\nAstfel vă puteți proteja datele de pe dispozitivele pierdute sau furate."</string>
@@ -2486,4 +2510,7 @@
     <string name="encrypt_talkback_dialog_message_pin" msgid="1890374082842868489">"Când introduceți codul PIN pentru a porni acest dispozitiv, serviciile de accesibilitate, cum ar fi <xliff:g id="SERVICE">%1$s</xliff:g>, nu vor fi disponibile."</string>
     <string name="encrypt_talkback_dialog_message_pattern" msgid="4474332516537386384">"Când introduceți modelul pentru a porni acest dispozitiv, serviciile de accesibilitate, cum ar fi <xliff:g id="SERVICE">%1$s</xliff:g>, nu vor fi disponibile."</string>
     <string name="encrypt_talkback_dialog_message_password" msgid="8166099418487083927">"Când introduceți parola pentru a porni acest dispozitiv, serviciile de accesibilitate, cum ar fi <xliff:g id="SERVICE">%1$s</xliff:g>, nu vor fi disponibile."</string>
+    <string name="imei_information_title" msgid="8499085421609752290">"Informații despre IMEI"</string>
+    <string name="imei_information_summary" msgid="2074095606556565233">"Informații referitoare la IMEI"</string>
+    <string name="slot_number" msgid="3762676044904653577">"(Slotul<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-ru/arrays.xml b/res/values-ru/arrays.xml
index 09c4356..3830fda 100644
--- a/res/values-ru/arrays.xml
+++ b/res/values-ru/arrays.xml
@@ -527,4 +527,12 @@
     <item msgid="4338089220026248848">"Кешировано (клиент)"</item>
     <item msgid="6652164677254579050">"Кешировано (пусто)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Сине-зеленый"</item>
+    <item msgid="8332294763632946560">"Синий"</item>
+    <item msgid="2023216417616991392">"Индиго"</item>
+    <item msgid="3170497246594232819">"Фиолетовый"</item>
+    <item msgid="4608643045752965568">"Розовый"</item>
+    <item msgid="6131821495505931173">"Красный"</item>
+  </string-array>
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 7e25391..65bbf5c 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>
@@ -180,7 +180,6 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s хочет получить доступ к вашим сообщениям. Предоставить доступ %2$s?"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Дата и время"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Выбрать часовой пояс"</string>
-    <string name="normal_date_format" msgid="7636406984925498359">"По умолчанию (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Предпросмотр:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Размер шрифта:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -291,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>
@@ -322,8 +321,6 @@
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Часовой пояс"</string>
     <string name="date_time_set_date_title" msgid="6928286765325608604">"Дата"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"Дата"</string>
-    <string name="date_time_date_format_title" msgid="3976171711988766411">"Формат даты"</string>
-    <string name="date_time_date_format" msgid="6951498879879281102">"Формат даты"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Упорядочить по алфавиту"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Упорядочить по часовому поясу"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Дата"</string>
@@ -333,7 +330,7 @@
     <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Нужно моргнуть, чтобы разблокировать экран"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"Автоблокировка"</string>
     <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> после перехода в спящий режим"</string>
-    <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"Через <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> после перехода в спящий режим, если экран не поддерживается в разблокированном состоянии службой <xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g>."</string>
+    <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> после перехода в спящий режим, если экран не поддерживается в разблокированном состоянии службой <xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g>."</string>
     <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Показывать данные о владельце на экране блокировки"</string>
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Сведения о владельце"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Включить виджеты"</string>
@@ -365,14 +362,15 @@
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Перед шифрованием необходимо задать PIN-код или пароль блокировки экрана."</string>
     <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"Чтобы зашифровать данные на устройстве, введите графический ключ."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Выполнить шифрование?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Если прервать шифрование, данные будут потеряны. Операция займет не менее часа, в течение которого устройство будет перезагружено несколько раз."</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Если прервать шифрование, данные будут потеряны. Операция займет не менее часа, в течение которого устройство будет перезагружено несколько раз."</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Если прервать шифрование, данные будут потеряны. Операция займет не менее часа. Устройство будет перезагружено несколько раз."</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Если прервать шифрование, данные будут потеряны. Операция займет не менее часа. Устройство будет перезагружено несколько раз."</string>
     <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Шифрование"</string>
     <string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"Дождитесь завершения шифрования планшета. Выполнено: <xliff:g id="PERCENT">^1</xliff:g>%."</string>
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Дождитесь завершения шифрования телефона. Выполнено: <xliff:g id="PERCENT">^1</xliff:g>%."</string>
     <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Шифрование завершится через <xliff:g id="DURATION">^1</xliff:g>."</string>
     <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Шифрование завершится через <xliff:g id="DURATION">^1</xliff:g>."</string>
-    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Повторите попытку через <xliff:g id="DELAY">^1</xliff:g> с."</string>
+    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"Чтобы разблокировать планшетный ПК, выключите его и снова включите."</string>
+    <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"Чтобы разблокировать телефон, выключите его и снова включите."</string>
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"Внимание! Осталось попыток: <xliff:g id="COUNT">^1</xliff:g>. Если вам не удастся выполнить авторизацию, память устройства будет очищена."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Введите пароль"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Сбой шифрования"</string>
@@ -401,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>
@@ -412,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>
@@ -460,10 +460,10 @@
     <string name="lock_setup" msgid="3355847066343753943">"Блокировка настроена."</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Администрирование устройства"</string>
     <string name="manage_device_admin" msgid="5059296715271077278">"Администраторы устройства"</string>
-    <string name="manage_device_admin_summary" msgid="7672709110988761075">"Просмотрите или отключите администраторов устройств"</string>
-    <string name="manage_trust_agents" msgid="4629279457536987768">"Trust agents"</string>
+    <string name="manage_device_admin_summary" msgid="7672709110988761075">"Просмотр/отключение администраторов"</string>
+    <string name="manage_trust_agents" msgid="4629279457536987768">"Агенты доверия"</string>
     <string name="disabled_because_no_backup_security" msgid="6877660253409580377">"Сначала необходимо настроить блокировку экрана"</string>
-    <string name="manage_trust_agents_summary" msgid="6804319935640148441">"Посмотреть или отключить Trust Agents"</string>
+    <string name="manage_trust_agents_summary" msgid="6804319935640148441">"Посмотреть или отключить агенты доверия"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Включить Bluetooth"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -534,7 +534,7 @@
     <string name="bluetooth_device_advanced_title" msgid="6066342531927499308">"Тип подключения"</string>
     <string name="bluetooth_device_advanced_online_mode_title" msgid="3689050071425683114">"Подключить"</string>
     <string name="bluetooth_device_advanced_online_mode_summary" msgid="1204424107263248336">"Подключиться к устройству Bluetooth"</string>
-    <string name="bluetooth_device_advanced_profile_header_title" msgid="102745381968579605">"Использовать для"</string>
+    <string name="bluetooth_device_advanced_profile_header_title" msgid="102745381968579605">"Использование"</string>
     <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"Переименовать"</string>
     <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"Разрешить получение файлов"</string>
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Подключено к мультимедийному аудиоустройству"</string>
@@ -556,13 +556,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Для громкой связи"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Для музыки и мультимедиа"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Запомнить настройки"</string>
-    <string name="wifi_assistant_intro_setup" msgid="4605105515416995110">"Представляем\nАссистент Wi‑Fi"</string>
-    <string name="wifi_assistant_no_thanks" msgid="2776983751990143934">"НЕТ"</string>
-    <string name="wifi_assistant_setup" msgid="3772423650475730906">"НАСТРОИТЬ"</string>
-    <string name="wifi_assistant_card_message" msgid="107811647784658536">"Ассистент Wi‑Fi автоматически подключает устройство к доступным сетям."</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Ассистент Wi‑Fi"</string>
-    <string name="wifi_assistant_title_message" msgid="6240721017579074015">"<xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> автоматически выбирает лучшую из доступных сетей Wi‑Fi"</string>
-    <string name="wifi_assistant_open_app" msgid="4803044899535675063">"ОТКРЫТЬ ПРИЛОЖЕНИЕ"</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>
@@ -592,7 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Настройки Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Настройка и управление точками доступа беспроводной сети"</string>
-    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Выбор сети Wi-Fi"</string>
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Выберите сеть Wi‑Fi"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Выбор сети Wi-Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Включение Wi-Fi…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Отключение Wi-Fi…"</string>
@@ -607,10 +602,11 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"Всегда искать сети"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Всегда искать сети"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Разрешить службе геопозиционирования Google и другим приложениям искать сети, даже когда модуль Wi‑Fi отключен"</string>
-    <string name="wifi_automatically_manage_title" msgid="6249976570008992746">"Включить автоматическое управление Wi‑Fi"</string>
-    <string name="wifi_automatically_manage_summary" msgid="6952470763378312488">"Разрешить приложению \"<xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g>\" управлять подключением к сети Wi‑Fi"</string>
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Подключаться к открытым сетям Wi-Fi"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Разрешить ассистенту Wi-Fi автоматически проверять открытые сети и подключаться к ним"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Выбор ассистента Wi-Fi"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Установка сертификатов"</string>
-    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Чтобы улучшить определение местоположения, а также для достижения других целей, Google и другие приложения могут выполнять поиск сетей поблизости, даже если сеть Wi-Fi отключена. Чтобы изменить эти настройки, перейдите в меню \"Дополнительно &gt; Всегда искать сети\"."</string>
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Чтобы точнее определять местоположение, а также и в других целях, приложение Google и другие приложения могут искать доступные сети даже при отключенном Wi-Fi. Изменить настройки можно в меню \"Дополнительно &gt; Всегда искать сети\"."</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Приложения могут выполнять поиск сетей поблизости, даже если сеть Wi-Fi отключена. Чтобы изменить эти настройки, перейдите в меню \"Дополнительно &gt; Всегда искать сети\"."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Больше не показывать"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Wi-Fi в спящем режиме"</string>
@@ -629,6 +625,7 @@
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Поиск"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Дополнительные функции"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Подключиться к сети"</string>
+    <string name="wifi_menu_remember" msgid="8814185749388713796">"Сохранить сеть"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Удалить эту сеть"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Изменить сеть"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Записать на NFC-метку"</string>
@@ -673,9 +670,11 @@
     <string name="wifi_unspecified" msgid="5431501214192991253">"(не указано)"</string>
     <string name="wifi_remembered" msgid="4955746899347821096">"Сохранено"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"Отключено"</string>
-    <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Включено"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"Ошибка IP-конфигурации"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Ошибка подключения Wi-Fi"</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Ошибка аутентификации"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Недоступна"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Подключение к Интернету отсутствует и не будет восстановлено автоматически."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"Поддерживает WPS"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (доступно WPS)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Введите пароль для подключения к сети."</string>
@@ -699,15 +698,15 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"ВНИМАНИЕ! Если вы не настроите Wi‑Fi, для скачивания приложений и обновлений будет использоваться мобильная сеть. Чтобы избежать лишних расходов, подключитесь к Wi-Fi."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"ВНИМАНИЕ! Если вы не настроите Wi‑Fi, для скачивания приложений и обновлений будет использоваться мобильная сеть. Чтобы избежать лишних расходов, подключитесь к Wi-Fi."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"ВНИМАНИЕ! Если вы не настроите Wi‑Fi, для скачивания приложений и обновлений будет использоваться мобильная сеть. Чтобы избежать лишних расходов, подключитесь к Wi-Fi."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="2393880108322835846">"ВНИМАНИЕ! Если вы не настроите Wi‑Fi, планшетный ПК не сможет подключаться к Интернету, чтобы скачивать приложения и обновления."</string>
-    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1707391993265558787">"ВНИМАНИЕ! Если вы не настроите Wi‑Fi, устройство не сможет подключаться к Интернету, чтобы скачивать приложения и обновления."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="1556858507920033022">"ВНИМАНИЕ! Если вы не настроите Wi‑Fi, смартфон не сможет подключаться к Интернету, чтобы скачивать приложения и обновления."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Если вы не настроите Wi‑Fi:\n\nПланшетный ПК не будет подключен к Интернету.\n\nПока подключение не восстановится, вы не сможете обновлять ПО.\n\nВы не сможете активировать защиту устройства."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Если вы не настроите Wi‑Fi:\n\nУстройство не будет подключено к Интернету.\n\nПока подключение не восстановится, вы не сможете обновлять ПО.\n\nВы не сможете активировать защиту устройства."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Если вы не настроите Wi‑Fi:\n\nТелефон не будет подключен к Интернету.\n\nПока подключение не восстановится, вы не сможете обновлять ПО.\n\nВы не сможете активировать защиту устройства."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Не удалось подключиться к сети Wi-Fi."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"Не удалось подключить устройство к этой сети Wi‑Fi"</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Не удалось подключиться к сети Wi-Fi."</string>
     <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"Сохраненные сети"</string>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Дополнительные функции"</string>
-    <string name="wifi_setting_frequency_band_title" msgid="3655327399028584656">"Полоса частот Wi-Fi"</string>
+    <string name="wifi_setting_frequency_band_title" msgid="3655327399028584656">"Диапазон частот Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Укажите рабочий диапазон частот"</string>
     <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"При настройке полосы частот возникла неполадка."</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC-адрес"</string>
@@ -761,7 +760,6 @@
     <string name="ring_volume_title" msgid="7938706566797464165">"Громкость звонка"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Виброзвонок без звука"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Звук уведомлений по умолчанию"</string>
-    <string name="heads_up_enabled_title" msgid="1031078221910921622">"Важные уведомления поверх окон"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Мелодия"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Уведомление"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Использовать этот уровень громкости также для уведомлений"</string>
@@ -827,14 +825,14 @@
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Во время зарядки"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"В док-станции"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Выкл."</string>
-    <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"Чтобы знать, что происходит с телефоном, когда он подключен к док-станции или находится в спящем режиме, включите заставку."</string>
+    <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"Чтобы настроить поведение телефона при подключении к док-станции и в спящем режиме, включите заставку."</string>
     <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Когда включать"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Включить"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Настройки"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Автонастройка"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Активация в вертикальном положении"</string>
     <string name="doze_title" msgid="2259176504273878294">"Запрет спящего режима"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"Включать экран, когда приходит новое оповещение или пользователь берет устройство"</string>
+    <string name="doze_summary" msgid="7128970177894383698">"Включение дисплея, когда вы берете устройство в руки или получаете уведомление"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Размер шрифта"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Размер шрифта"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Настройки блокировки SIM-карты"</string>
@@ -862,6 +860,10 @@
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Отмена"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"Обнаружено более одной SIM-карты"</string>
     <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>
+    <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-код. Осталось попыток: <xliff:g id="NUMBER">%d</xliff:g>. После этого SIM-карта будет заблокирована и вам придется обратиться к оператору связи."</item>
@@ -883,7 +885,7 @@
     <string name="device_status_activity_title" msgid="1411201799384697904">"Общая информация"</string>
     <string name="device_status" msgid="607405385799807324">"Общая информация"</string>
     <string name="device_status_summary" product="tablet" msgid="3292717754497039686">"Статус батареи, сети и другая информация"</string>
-    <string name="device_status_summary" product="default" msgid="2599162787451519618">"Номер телефона, уровень сигнала и т.д."</string>
+    <string name="device_status_summary" product="default" msgid="2599162787451519618">"Номер телефона, уровень сигнала и т. д."</string>
     <string name="storage_settings" msgid="4211799979832404953">"Память"</string>
     <string name="storage_settings_title" msgid="8746016738388094064">"Настройки хранилища"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"Отключить USB-накопитель, просмотреть доступные накопители"</string>
@@ -915,11 +917,11 @@
     <string name="memory_available_read_only" msgid="6497534390167920206">"Доступно (только для чтения)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Всего места"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Идет подсчет..."</string>
-    <string name="memory_apps_usage" msgid="2348501997988663688">"Данные приложений и файлы мультимедиа"</string>
+    <string name="memory_apps_usage" msgid="2348501997988663688">"Данные приложений и мультимедиа"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Мультимедиа"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"Загрузки"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Изображения и видео"</string>
-    <string name="memory_music_usage" msgid="1363785144783011606">"Аудио (музыка, рингтоны, подкасты и т. п.)"</string>
+    <string name="memory_music_usage" msgid="1363785144783011606">"Аудио (музыка, рингтоны и т. п.)"</string>
     <string name="memory_media_misc_usage" msgid="235452944021647124">"Прочее"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"Данные кеша"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Безопасное извлечение"</string>
@@ -937,7 +939,7 @@
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Удаление с внутреннего USB-накопителя телефона всех данных, включая музыку и фотографии."</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"Удаляет все данные с SD-карты, например музыку и фотографии"</string>
     <string name="memory_clear_cache_title" msgid="5423840272171286191">"Очистить кеш?"</string>
-    <string name="memory_clear_cache_message" msgid="4550262490807415948">"Будут удалены данные всех приложений."</string>
+    <string name="memory_clear_cache_message" msgid="4550262490807415948">"Будут удалены кешированные данные всех приложений."</string>
     <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"Функция MTP или PTP активирована"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"Отключить USB-накопитель?"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"Отключить SD-карту?"</string>
@@ -990,7 +992,7 @@
     <string name="carrier_enabled" msgid="407655861175280806">"Включить/выключить APN"</string>
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"APN вкл."</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"APN выкл."</string>
-    <string name="bearer" msgid="594270280031923558">"Владелец"</string>
+    <string name="bearer" msgid="594270280031923558">"Канал"</string>
     <string name="mvno_type" msgid="2543253857818336421">"Тип MVNO"</string>
     <string name="mvno_match_data" msgid="4560671695220540466">"Значение MVNO"</string>
     <string name="menu_delete" msgid="6981294422841124659">"Удалить APN"</string>
@@ -998,12 +1000,12 @@
     <string name="menu_save" msgid="8109345640668285399">"Сохранить"</string>
     <string name="menu_cancel" msgid="2194502410474697474">"Отменить"</string>
     <string name="error_title" msgid="7631322303341024692"></string>
-    <string name="error_name_empty" msgid="8418502878620394756">"Необходимо указать название."</string>
+    <string name="error_name_empty" msgid="8418502878620394756">"Необходимо указать имя."</string>
     <string name="error_apn_empty" msgid="6056233831214537267">"Необходимо указать APN."</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"Поле MCC должно содержать 3 цифры."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"Поле MNC должно содержать 2 или 3 цифры."</string>
-    <string name="restore_default_apn" msgid="8178010218751639581">"Восстановление настроек APN по умолчанию."</string>
-    <string name="menu_restore" msgid="8260067415075573273">"Восстановить настройки по умолчанию"</string>
+    <string name="restore_default_apn" msgid="8178010218751639581">"Восстановление настроек APN по умолчанию..."</string>
+    <string name="menu_restore" msgid="8260067415075573273">"Сбросить настройки"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Настройки по умолчанию восстановлены."</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Сбросить настройки"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Сброс настроек"</string>
@@ -1012,6 +1014,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Будут удалены все данные из "<b>"внутренней памяти"</b>" устройства, в том числе:\n\n"<li>"Ваш аккаунт Google"</li>\n<li>"Настройки/данные системы и приложений"</li>\n<li>"Загруженные приложения"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Будут удалены все данные из "<b>"внутренней памяти"</b>" устройства, в том числе:\n\n"<li>"Ваш аккаунт Google"</li>\n<li>"Настройки/данные системы и приложений"</li>\n<li>"Загруженные приложения"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Аккаунты, добавленные на этом устройстве:\n"</string>
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"На этом устройстве есть другие аккаунты пользователей.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Музыка"</li>\n<li>"Фото"</li>\n<li>"Другие данные"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Чтобы удалить музыку, изображения и другие пользовательские данные, необходимо очистить "<b>"USB-накопитель"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Чтобы удалить музыку, фотографии и другие пользовательские данные, необходимо очистить "<b>"SD-карту"</b>"."</string>
@@ -1023,7 +1026,6 @@
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Сбросить настройки телефона"</string>
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Удалить всю личную информацию и загруженные приложения без возможности восстановления?"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Стереть все"</string>
-    <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Начертить графический ключ"</string>
     <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Чтобы подтвердить сброс настроек, начертите графический ключ."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Сброс не выполнен, поскольку служба System Clear недоступна."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Выполнить сброс?"</string>
@@ -1041,7 +1043,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"Очистить USB-накопитель, удалив с него все файлы без возможности восстановления?"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Удалить с SD-карты все файлы без возможности восстановления?"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Стереть все"</string>
-    <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Начертить графический ключ разблокировки"</string>
     <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Чтобы подтвердить очистку USB-накопителя, начертите графический ключ."</string>
     <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Чтобы подтвердить очистку SD-карты, начертите графический ключ."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Вызовы"</string>
@@ -1087,6 +1088,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Вставьте SIM-карту и перезагрузите устройство"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Подключитесь к Интернету"</string>
     <string name="location_title" msgid="1029961368397484576">"Мое местоположение"</string>
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Рабочий профиль"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Место для рабочего профиля"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Отключено администратором"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Режим"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"По всем источникам"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"По координатам сети"</string>
@@ -1124,6 +1128,7 @@
     <string name="copyright_title" msgid="865906688917260647">"Авторские права"</string>
     <string name="license_title" msgid="1990487604356037871">"Лицензия"</string>
     <string name="terms_title" msgid="7697580845616764642">"Условия использования"</string>
+    <string name="webview_license_title" msgid="2813507464175738967">"Системная лицензия WebView"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Обои"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Фотографии со спутника:\n© CNES 2014/Astrium, DigitalGlobe, Bluesky"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Лицензии открытого ПО"</string>
@@ -1219,7 +1224,7 @@
     <string name="ask_compatibility" msgid="7225195569089607846">"Спрашивать при запуске"</string>
     <string name="enable_compatibility" msgid="5806819252068617811">"Масштабировать приложения"</string>
     <string name="unknown" msgid="1592123443519355854">"Неизвестно"</string>
-    <string name="sort_order_alpha" msgid="1410278099123670628">"Упорядочить по именам"</string>
+    <string name="sort_order_alpha" msgid="1410278099123670628">"Упорядочить по названию"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Упорядочить по размеру"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Показать активные службы"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Показать процессы в кеше"</string>
@@ -1237,7 +1242,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB-накопитель"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"На SD-карте"</string>
     <string name="disabled" msgid="9206776641295849915">"Отключено"</string>
-    <string name="not_installed" msgid="1475144352069281880">"Не установлено"</string>
+    <string name="not_installed" msgid="2797554494953450291">"Не установлено"</string>
     <string name="no_applications" msgid="7336588977497084921">"Нет приложений"</string>
     <string name="internal_storage" msgid="1584700623164275282">"Внутр. память"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB-память"</string>
@@ -1434,10 +1439,14 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Во время зарядки экран будет всегда включен"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Включить журнал трансляции операций HCI Bluetooth"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Сохранять все пакеты HCI Bluetooth в файле"</string>
-    <string name="oem_unlock_enable" msgid="6629321276287913315">"Заводская разблокировка"</string>
-    <string name="oem_unlock_enable_summary" msgid="3546686263996628110">"Разрешить заводскую разблокировку устройства"</string>
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"Заводская разблокировка"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Разрешить разблокировку загрузчика ОС"</string>
+    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Введите PIN-код"</string>
+    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Введите PIN-код устройства, чтобы разрешить заводскую разблокировку"</string>
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Разрешить заводскую разблокировку?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"ВНИМАНИЕ! Функции защиты не будут работать на устройстве, пока включен этот параметр."</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Серт. беспроводн. мониторов"</string>
-    <string name="wifi_verbose_logging" msgid="4203729756047242344">"Подробные сведения в журнале Wi‑Fi"</string>
+    <string name="wifi_verbose_logging" msgid="4203729756047242344">"Подробный журнал Wi‑Fi"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Переключаться на мобильную сеть"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Всегда включать поиск сетей Wi-Fi"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Показывать параметры сертификации беспроводных мониторов"</string>
@@ -1489,7 +1498,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>
@@ -1538,6 +1547,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"Титры будут выглядеть так"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Аа"</string>
     <string name="locale_default" msgid="2593883646136326969">"По умолчанию"</string>
+    <string name="color_title" msgid="4258931051732243983">"Цвет"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"По умолчанию"</string>
     <string name="color_none" msgid="3475640044925814795">"Нет"</string>
     <string name="color_white" msgid="8045195170201590239">"Белый"</string>
@@ -1595,12 +1605,12 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"Батарея будет разряжена через <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"Батарея будет заряжена через <xliff:g id="UNTIL_CHARGED">%1$s</xliff:g>"</string>
-    <string name="power_discharging_duration" msgid="7125493014448497620">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – осталось около <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="power_charging" msgid="712751285832976915">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – <xliff:g id="STATE">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration" msgid="4802183864773082009">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – <xliff:g id="TIME">%2$s</xliff:g> до полной зарядки"</string>
-    <string name="power_charging_duration_ac" msgid="3611179931297824699">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – <xliff:g id="TIME">%2$s</xliff:g> до полной зарядки (от сети)"</string>
-    <string name="power_charging_duration_usb" msgid="1106605348913397583">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – <xliff:g id="TIME">%2$s</xliff:g> до полной зарядки (через USB)"</string>
-    <string name="power_charging_duration_wireless" msgid="633606920144617227">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – <xliff:g id="TIME">%2$s</xliff:g> до полной зарядки (от б/п устройства)"</string>
+    <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> – осталось около <xliff:g id="TIME">%2$s</xliff:g>"</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> до полной зарядки"</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> до полной зарядки (от сети)"</string>
+    <string name="power_charging_duration_usb" msgid="182405645340976546">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> до полной зарядки (через USB)"</string>
+    <string name="power_charging_duration_wireless" msgid="1829295708243159464">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> до полной зарядки (беспроводная)"</string>
     <string name="power_usage_list_summary" msgid="2409288197839512482">"Использование с момента полной зарядки"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Расход заряда батареи с момента отключения от сети питания"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Расход заряда батареи с момента перезагрузки"</string>
@@ -1617,12 +1627,11 @@
     <string name="awake" msgid="387122265874485088">"Время включения устройства"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Время работы Wi-Fi"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Время работы Wi-Fi"</string>
-    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> – <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Подробная история"</string>
     <string name="details_title" msgid="3792801565213935385">"Расход батареи"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Расход батареи"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Режим энергопотребления"</string>
-    <string name="packages_subtitle" msgid="4736416171658062768">"Вложенные пакеты"</string>
+    <string name="packages_subtitle" msgid="4736416171658062768">"Пакеты"</string>
     <string name="power_screen" msgid="3023346080675904613">"Экран"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Фонарик"</string>
     <string name="power_wifi" msgid="1135085252964054957">"Wi-Fi"</string>
@@ -1671,7 +1680,7 @@
     <string name="battery_desc_bluetooth" msgid="8069070756186680367">"Использование батареи модулем Bluetooth"</string>
     <string name="battery_sugg_bluetooth_basic" msgid="1942935021750897422">"Отключите канал Bluetooth, если он не используется"</string>
     <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"Попробуйте подключиться к другому Bluetooth-устройству"</string>
-    <string name="battery_desc_apps" msgid="8530418792605735226">"Использование батареи приложениями"</string>
+    <string name="battery_desc_apps" msgid="8530418792605735226">"Использование батареи приложением"</string>
     <string name="battery_sugg_apps_info" msgid="6907588126789841231">"Остановите или удалите приложение"</string>
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Выберите режим экономии заряда батареи"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"В программе могут быть настройки режима энергосбережения"</string>
@@ -1689,7 +1698,7 @@
     <string name="battery_saver" msgid="1426682272004907982">"Режим энергосбережения"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Включать автоматически"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Никогда"</string>
-    <string name="battery_saver_turn_on_automatically_pct" msgid="3033681629861428940">"При уровне заряда %1$d%%"</string>
+    <string name="battery_saver_turn_on_automatically_pct" msgid="7536784431655058267">"при уровне заряда %1$s"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Статистика процессов"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Статистика запущенных процессов"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Использование памяти"</string>
@@ -1800,9 +1809,9 @@
     <string name="gadget_brightness_state_off" msgid="946382262872753084">"минимум"</string>
     <string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Хранилище учетных данных"</string>
-    <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Установить с карты памяти"</string>
+    <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Установить"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"Установка с SD-карты"</string>
-    <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"Установить сертификаты с карты памяти"</string>
+    <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"Установить сертификаты"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Установить сертификаты с SD-карты"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"Очистить учетные данные"</string>
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Удалить все сертификаты"</string>
@@ -1813,12 +1822,11 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Аппаратное"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Только программное"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"Этот пользователь не может изменять учетные данные"</string>
-    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Начертите графический ключ"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Чтобы подтвердить установку учетных данных, начертите графический ключ."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Введите пароль для хранилища учетных данных."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Текущий пароль:"</string>
-    <string name="credentials_reset_hint" msgid="6297256880896133631">"Удалить весь контент?"</string>
+    <string name="credentials_reset_hint" msgid="6297256880896133631">"Удалить все содержимое?"</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"В пароле должно быть не менее 8 символов."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Неправильный пароль."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Неверный пароль. У вас осталась одна попытка, после которой хранилище регистрационных данных будет очищено."</string>
@@ -1843,6 +1851,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"Учитывать данные приложений"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Автовосстановление"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"При переустановке приложения восстановить резервную копию настроек и данных"</string>
+    <string name="backup_inactive_title" msgid="5355557151569037197">"Служба резервного копирования неактивна"</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"В соответствии с политикой устройства."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Пароль для резервного копирования"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Полные резервные копии в настоящее время не защищены"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Изменить или удалить пароль для резервного копирования"</string>
@@ -1859,7 +1869,7 @@
     <string name="managed_profile_device_admin_info" msgid="5048846624960067582">"Откройте \"Настройки &gt; Аккаунты\" и удалите рабочий профиль, чтобы запретить приложению <xliff:g id="APP_NAME">%1$s</xliff:g> доступ к нему"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"Личный"</string>
     <string name="managed_device_admin_title" msgid="7853955652864478435">"Рабочий"</string>
-    <string name="no_trust_agents" msgid="7450273545568977523">"Ничего не найдено."</string>
+    <string name="no_trust_agents" msgid="7450273545568977523">"Нет агентов доверия."</string>
     <string name="add_device_admin_msg" msgid="6246742476064507965">"Удаленное управление Android"</string>
     <string name="add_device_admin" msgid="7133327675884827091">"Активировать"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"Администратор устройства"</string>
@@ -1952,10 +1962,14 @@
     <string name="enter_password" msgid="8035706727471334122">"Чтобы запустить Android, введите пароль"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Чтобы запустить Android, введите PIN-код"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Чтобы запустить Android, введите графический ключ"</string>
-    <string name="try_again" msgid="4272075051293936921">"Повторите попытку."</string>
+    <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"Неверный графический ключ"</string>
+    <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"Неверный пароль"</string>
+    <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"Неверный PIN-код"</string>
+    <string name="checking_decryption" msgid="8287458611802609493">"Проверка…"</string>
+    <string name="starting_android" msgid="8581493237458496835">"Запуск Android…"</string>
     <string name="delete" msgid="4219243412325163003">"Удалить"</string>
     <string name="misc_files" msgid="6720680815969643497">"Разное"</string>
-    <string name="misc_files_selected_count" msgid="4647048020823912088">"выбрано <xliff:g id="NUMBER">%1$d</xliff:g> из <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <string name="misc_files_selected_count" msgid="4647048020823912088">"Выбрано: <xliff:g id="NUMBER">%1$d</xliff:g> из <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> из <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Выбрать все"</string>
     <string name="hdcp_checking_title" msgid="8605478913544273282">"Проверка HDCP"</string>
@@ -1990,8 +2004,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Всегда использовать GPU при компоновке экрана"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"Имитировать аномалию"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Вкл. трассировку OpenGL"</string>
-    <string name="use_nuplayer" msgid="5699257393367904387">"Использовать NuPlayer (эксперимент)"</string>
-    <string name="use_nuplayer_summary" msgid="1991479067478516714">"Использовать NuPlayer вместо AwesomePlayer"</string>
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"Исп. AwesomePlayer (старый)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"Использовать AwesomePlayer вместо NuPlayer для воспроизведения большинства файлов мультимедиа"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"Откл. передачу аудио (USB)"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"Откл. автом. маршрутизацию на внеш. USB-устройства"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Показывать границы элементов"</string>
@@ -2127,7 +2141,7 @@
     <string name="vpn_save" msgid="4233484051644764510">"Сохранить"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"Подключиться"</string>
     <string name="vpn_edit" msgid="8647191407179996943">"Изменение профиля VPN"</string>
-    <string name="vpn_connect_to" msgid="5965299358485793260">"Подключение к профилю \"<xliff:g id="PROFILE">%s</xliff:g>\""</string>
+    <string name="vpn_connect_to" msgid="5965299358485793260">"Подключение к <xliff:g id="PROFILE">%s</xliff:g>"</string>
     <string name="vpn_title" msgid="6317731879966640551">"Настройки VPN"</string>
     <string name="vpn_create" msgid="5628219087569761496">"Добавить профиль VPN"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"Изменить профиль"</string>
@@ -2136,7 +2150,7 @@
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Выберите постоянную сеть VPN: трафик будет разрешен только при подключении к этой сети."</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"Сеть не выбрана"</string>
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Укажите IP-адрес для сервера и DNS."</string>
-    <string name="vpn_no_network" msgid="3050233675132726155">"Отсутствует сетевое соединение. Повторите попытку позже."</string>
+    <string name="vpn_no_network" msgid="3050233675132726155">"Нет подключения к сети. Повторите попытку позже."</string>
     <string name="vpn_missing_cert" msgid="7972907102570411501">"Отсутствует сертификат. Измените профиль."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Система"</string>
     <string name="trusted_credentials_user_tab" msgid="2244732111398939475">"Пользователь"</string>
@@ -2167,7 +2181,6 @@
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Добавить пользователя или профиль"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Добавить пользователя"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Профиль с ограниченным доступом"</string>
-    <string name="user_summary_managed_profile" msgid="7369539529693048111">"Рабочий профиль"</string>
     <string name="user_need_lock_message" msgid="2596365678651842785">"Чтобы создать профиль с ограниченным доступом, необходимо предварительно настроить блокировку экрана для защиты приложений и личных данных"</string>
     <string name="user_set_lock_button" msgid="8311219392856626841">"Включить блокировку"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Не настроено"</string>
@@ -2298,11 +2311,13 @@
     <string name="sim_cellular_data_unavailable_summary" msgid="3654805961942166428">"Нажмите, чтобы выбрать SIM-карту для мобильных данных"</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"Всегда использовать для звонков"</string>
     <string name="select_sim_for_data" msgid="2366081042162853044">"SIM-карта для передачи данных"</string>
+    <string name="data_switch_started" msgid="2040761479817166311">"Смена SIM-карты… Подождите минуту."</string>
     <string name="select_sim_for_calls" msgid="3503094771801109334">"SIM-карта для звонков"</string>
     <string name="sim_select_card" msgid="211285163525563293">"Выберите SIM-карту"</string>
     <string name="sim_card_number_title" msgid="7845379943474336488">"SIM-карта <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"Пустая SIM-карта"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"Название SIM-карты"</string>
+    <string name="sim_name_hint" msgid="7038643345238968930">"Укажите название SIM-карты"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"Слот для SIM-карты %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Оператор"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Номер"</string>
@@ -2312,7 +2327,6 @@
     <string name="color_purple" msgid="3888532466427762504">"Фиолетовый"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"SIM-карта не вставлена"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"Статус SIM-карты"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"Данные SIM-карты"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"Ответный звонок с SIM-карты по умолчанию"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"SIM-карта для исходящих звонков"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Другие настройки звонков"</string>
@@ -2320,8 +2334,11 @@
     <string name="preferred_network_offload_header" msgid="2321173571529106767">"Не показывать имя сети"</string>
     <string name="preferred_network_offload_footer" msgid="5857279426054744020">"Параметр \"Не показывать имя сети\" делает невозможным доступ третьих лиц к данным о сети."</string>
     <string name="preferred_network_offload_popup" msgid="2252915199889604600">"Параметр \"Не показывать имя сети\" делает невозможным автоматическое подключение к скрытым сетям."</string>
+    <string name="sim_signal_strength" msgid="9144010043784767984">"<xliff:g id="DBM">%1$d</xliff:g> дБмВт, asu: <xliff:g id="ASU">%2$d</xliff:g>"</string>
+    <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">"Выберите SIM-карту"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Настройки"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Настройки"</string>
@@ -2330,22 +2347,22 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Последние запросы"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Результаты"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi сетевое подключение"</string>
-    <string name="keywords_more_default_sms_app" msgid="2744404159003574745">"текстовое сообщение"</string>
-    <string name="keywords_more_mobile_networks" msgid="7813380887358745769">"сотовый оператор сотовой связи беспроводная сеть"</string>
+    <string name="keywords_more_default_sms_app" msgid="895656981962034647">"текст сообщение отправка текстовый SMS"</string>
+    <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"мобильный сотовый беспроводной оператор 4g 3g 2g lte"</string>
     <string name="keywords_home" msgid="3626170808219458848">"Google Старт"</string>
     <string name="keywords_display" msgid="6709007669501628320">"экран сенсорный экран"</string>
-    <string name="keywords_display_brightness_level" msgid="8636451602230815191">"затемнение экрана сенсорный экран"</string>
-    <string name="keywords_display_auto_brightness" msgid="8070218600502753102">"затемнение экрана сенсорный экран"</string>
-    <string name="keywords_display_wallpaper" msgid="4315466287469834939">"фон"</string>
+    <string name="keywords_display_brightness_level" msgid="8923289340474728990">"яркость сенсорный экран батарея"</string>
+    <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"яркость сенсорный экран батарея"</string>
+    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"фон настройка пользовательский"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"размер шрифта"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"проект"</string>
-    <string name="keywords_storage" msgid="7007275853993419928">"место диск жесткий диск"</string>
-    <string name="keywords_battery" msgid="3992479295298655138">"питание"</string>
-    <string name="keywords_spell_checker" msgid="4509482591225399210">"правописание"</string>
+    <string name="keywords_storage" msgid="6572905220031852173">"пространство диск жесткий устройство использование"</string>
+    <string name="keywords_battery" msgid="2096185085932675704">"электропитание расход зарядка"</string>
+    <string name="keywords_spell_checker" msgid="6106749039734174140">"правописание проверка словарь автозамена"</string>
     <string name="keywords_voice_input" msgid="3519547605812413860">"распознавание ввод речь произносить язык гарнитура нецензурное слово история голосовых запросов bluetooth"</string>
-    <string name="keywords_text_to_speech_output" msgid="8207889472282225512">"оценка язык по умолчанию говорить речь"</string>
-    <string name="keywords_date_and_time" msgid="7666950126499155141">"часы"</string>
-    <string name="keywords_factory_data_reset" msgid="3693730656843989732">"удалить все данные удалить"</string>
+    <string name="keywords_text_to_speech_output" msgid="392447904221657930">"скорость язык по умолчанию озвучивание чтение специальные возможности зрение синтез речи слепой"</string>
+    <string name="keywords_date_and_time" msgid="2631808108134830066">"часы формат"</string>
+    <string name="keywords_factory_data_reset" msgid="4355133848707691977">"удалить стереть восстановить очистить сбросить"</string>
     <string name="keywords_printing" msgid="1701778563617114846">"принтер"</string>
     <string name="keywords_sounds_and_notifications" msgid="5965996187974887000">"сигнал динамика"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="2912933812460077912">"не беспокоить прерывать перерыв пауза"</string>
@@ -2354,9 +2371,9 @@
     <string name="keywords_location_mode" msgid="8584992704568356084">"точность"</string>
     <string name="keywords_accounts" msgid="1957925565953357627">"аккаунт"</string>
     <string name="keywords_users" msgid="4673901601478559100">"ограничение ограничить ограничено"</string>
-    <string name="keywords_keyboard_and_ime" msgid="1103378692379215672">"исправление текста исправить звук вибросигнал авто язык жест подсказывать подсказка тема нецензурное слово ввод смайлики"</string>
+    <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"текст исправление автокоррекция звук вибрация авто язык жест подсказка тема неприемлемый слово ввод эмодзи смайлик интернациональный"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"провести пальцем по экрану пароль графический ключ PIN-код"</string>
-    <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"NFC-метка для настройки Wi-Fi"</string>
+    <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Настройка NFC-метки"</string>
     <string name="write_tag" msgid="8571858602896222537">"Записать"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Нажмите на метку, чтобы начать запись..."</string>
     <string name="status_invalid_password" msgid="2575271864572897406">"Неверный пароль. Повторите попытку."</string>
@@ -2371,7 +2388,6 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Громкость уведомлений"</string>
     <string name="zen_mode_settings_title" msgid="7014915558669122902">"Режимы оповещения"</string>
     <string name="zen_mode_option_title" msgid="5061978632306007914">"Звонки и уведомления"</string>
-    <string name="zen_mode_option_title_novoice" msgid="6680706009915204785">"Уведомления"</string>
     <string name="zen_mode_option_off" msgid="3167702608910820883">"Оповещать всегда"</string>
     <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Только важные оповещения"</string>
     <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Не беспокоить"</string>
@@ -2419,24 +2435,27 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"Загрузка..."</string>
     <string name="app_notification_block_title" msgid="172237877395761371">"Заблокировать"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Не показывать уведомления из этого приложения"</string>
-    <string name="app_notification_priority_title" msgid="1967189807102076587">"Приоритетные"</string>
-    <string name="app_notification_priority_summary" msgid="7513344552201639232">"Показывать уведомления в верхней части списка, в том числе когда разрешено получение только приоритетных уведомлений"</string>
+    <string name="app_notification_priority_title" msgid="1967189807102076587">"Важные"</string>
+    <string name="app_notification_priority_summary" msgid="7513344552201639232">"Показывать уведомления в верхней части списка, в том числе когда разрешено получение только важных оповещений"</string>
     <string name="app_notification_sensitive_title" msgid="7707233094233553192">"Конфиденциальные"</string>
     <string name="app_notification_sensitive_summary" msgid="2505314249332316395">"Не показывать конфиденциальные данные в уведомлениях этого приложения, когда устройство заблокировано"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Заблокированные"</string>
-    <string name="app_notification_row_priority" msgid="7723839972982746568">"Приоритетные"</string>
+    <string name="app_notification_row_priority" msgid="7723839972982746568">"Важные"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Конфиденциальные"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Готово"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Пока не будет отключено"</string>
     <string name="zen_mode_important_category" msgid="8123274463331022993">"Важные оповещения"</string>
-    <string name="zen_mode_downtime_category" msgid="4730179065426038108">"Расписание режима \"Только важные оповещения\""</string>
+    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Режим оповещения"</string>
     <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Дни"</string>
     <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"–"</string>
+    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Оповещения"</string>
+    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Только важные"</string>
+    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Не оповещать"</string>
     <string name="zen_mode_automation_category" msgid="4653551005950835761">"Автоматизация"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Включать автоматически"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Никогда"</string>
-    <string name="zen_mode_phone_calls" msgid="8956214416859303966">"Звонки"</string>
+    <string name="zen_mode_calls" msgid="7051492091133751208">"Вызовы"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Сообщения"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Звонки/сообщения от"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Все"</string>
@@ -2450,7 +2469,9 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Вечером по будням"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Время начала"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Время окончания"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"На след. день в <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
+    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"На следующий день в <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"В <xliff:g id="FORMATTED_TIME">%s</xliff:g> или при первом срабатывании будильника"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"В <xliff:g id="FORMATTED_TIME">%s</xliff:g> на следующий день или при первом срабатывании будильника"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Приложения"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Настройки уведомлений"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Отправить отзыв об устройстве"</string>
@@ -2458,16 +2479,19 @@
     <string name="switch_on_text" msgid="1124106706920572386">"ВКЛ"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"ВЫКЛ"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"Блокировка в приложении"</string>
-    <string name="screen_pinning_description" msgid="7091642350452605379">"При необходимости текущий экран можно зафиксировать.\n\nКак это сделать:\n\n1. Включите функцию блокировки в приложении.\n\n2. Откройте нужный экран.\n\n3. Нажмите \"Обзор\".\n\n4. Нажмите на значок канцелярской кнопки."</string>
+    <string name="screen_pinning_description" msgid="1137904524037468263">"Когда этот параметр включен, можно использовать блокировку, чтобы запретить переключаться между приложениями.\n\nИспользование блокировки в приложении:\n\n1. Включите функцию блокировки в приложении.\n\n2. Откройте нужный экран.\n\n3. Нажмите \"Обзор\".\n\n4. Проведите пальцем по экрану вверх и коснитесь значка булавки."</string>
+    <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Запрашивать графич. ключ для откл. блокировки в приложении"</string>
+    <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Запрашивать PIN-код для отключения блокировки в приложении"</string>
+    <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Запрашивать пароль для отключения блокировки в приложении"</string>
+    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Блокировать устройство при откл. блокировки в приложении"</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Рабочий профиль"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(экспериментальная настройка)"</string>
-    <string name="display_auto_rotate_title" msgid="6176450657107806043">"Поворот экрана"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Поворот экрана"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Зафиксировать в вертикальной ориентации"</string>
+    <string name="display_auto_rotate_title" msgid="6176450657107806043">"При повороте устройства"</string>
+    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Поворачивать изображение"</string>
+    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Сохранять вертикальную ориентацию"</string>
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Зафиксировать в горизонтальной ориентации"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Зафиксировать в текущей ориентации"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"Данные IMEI-кода"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"Сведения, касающиеся IMEI-кода"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Шифрование"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Продолжить"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"Для защиты данных вы можете активировать запрос PIN-кода при включении. Звонки, сообщения и оповещения, в том числе будильники, будут недоступны, пока вы не разблокируете устройство.\n\nЭто помогает защитить данные на утерянном или украденном устройстве."</string>
@@ -2485,4 +2509,7 @@
     <string name="encrypt_talkback_dialog_message_pin" msgid="1890374082842868489">"При вводе PIN-кода для запуска устройства службы специальных возможностей, такие как <xliff:g id="SERVICE">%1$s</xliff:g>, не будут включаться автоматически."</string>
     <string name="encrypt_talkback_dialog_message_pattern" msgid="4474332516537386384">"При вводе графического ключа для запуска устройства службы специальных возможностей, такие как <xliff:g id="SERVICE">%1$s</xliff:g>, не будут включаться автоматически."</string>
     <string name="encrypt_talkback_dialog_message_password" msgid="8166099418487083927">"При вводе пароля для запуска устройства службы специальных возможностей, такие как <xliff:g id="SERVICE">%1$s</xliff:g>, не будут включаться автоматически."</string>
+    <string name="imei_information_title" msgid="8499085421609752290">"Данные IMEI-кода"</string>
+    <string name="imei_information_summary" msgid="2074095606556565233">"Сведения, касающиеся IMEI-кода"</string>
+    <string name="slot_number" msgid="3762676044904653577">"(разъем <xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-si-rLK/arrays.xml b/res/values-si-rLK/arrays.xml
index 67a505b..ab5408e 100644
--- a/res/values-si-rLK/arrays.xml
+++ b/res/values-si-rLK/arrays.xml
@@ -527,4 +527,12 @@
     <item msgid="4338089220026248848">"හැඹිලි ගත කළ (ක්‍රියාකාරකම් සේවාලාභියා)"</item>
     <item msgid="6652164677254579050">"හැඹිලි ගත කළ (හිස්)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"සේරා"</item>
+    <item msgid="8332294763632946560">"නිල්"</item>
+    <item msgid="2023216417616991392">"ඉන්ඩිගෝ"</item>
+    <item msgid="3170497246594232819">"දම්"</item>
+    <item msgid="4608643045752965568">"රෝස"</item>
+    <item msgid="6131821495505931173">"රතු"</item>
+  </string-array>
 </resources>
diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml
index a581fd6..77988bd 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>
@@ -180,7 +180,6 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s හට ඔබගේ පණිවිඩ වෙත ප්‍රවේශ විමට අවශ්‍යයි. %2$s හට ප්‍රවේශය දෙන්නද?"</string>
     <string name="date_and_time" msgid="9062980487860757694">"දිනය සහ වේලාව"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"වේලා කලාපය තෝරන්න"</string>
-    <string name="normal_date_format" msgid="7636406984925498359">"ප්‍රාදේශික (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"පෙරදසුන:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"අකුරු ප්‍රමාණය:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -291,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>
@@ -322,8 +321,6 @@
     <string name="date_time_set_timezone" msgid="5045627174274377814">"කාල කලාපය තෝරන්න"</string>
     <string name="date_time_set_date_title" msgid="6928286765325608604">"දිනය"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"දිනය සකසන්න"</string>
-    <string name="date_time_date_format_title" msgid="3976171711988766411">"දින ආකාරය"</string>
-    <string name="date_time_date_format" msgid="6951498879879281102">"දින ආකෘතිය තෝරන්න"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"අකුරු අනුපිළිවෙලට සකසන්න"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"වේලා කලාපය අනුව පෙළගස්වන්න"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"දිනය"</string>
@@ -372,7 +369,8 @@
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"ඔබගේ දුරකථනය සංකේතනය වන අතරතුර රැඳී සිටින්න. <xliff:g id="PERCENT">^1</xliff:g>% සම්පූර්ණයි."</string>
     <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"ඔබගේ ටැබ්ලටය සංකේතිත වන තෙක් රැදී සිටින්න. ඉතිරි කාලය: <xliff:g id="DURATION">^1</xliff:g>"</string>
     <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"ඔබගේ දුරකථනය සංකේතිත වන තෙක් රැදී සිටින්න. ඉතිරි කාලය: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"තත්පර <xliff:g id="DELAY">^1</xliff:g> කින් නැවත උත්සාහ කරන්න."</string>
+    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"ඔබේ තල පරිගණකය අගුලු හැරීමට, එය අක්‍රිය කර අනතුරුව සක්‍රිය කරන්න."</string>
+    <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"ඔබේ දුරකථනය අගුලු හැරීමට, එය අක්‍රිය කර අනතුරුව සක්‍රිය කරන්න."</string>
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"අවවාදය: ඔබගේ උපාංගය අඟුල ඇරීමට අවස්ථා <xliff:g id="COUNT">^1</xliff:g> වඩා අසාර්ථක වූ හොත් එය පිසදමන්න!"</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"ඔබගේ මුරපදය ටයිප් කරන්න"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"සංකේතනය අසාර්ථකයි"</string>
@@ -401,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>
@@ -412,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>
@@ -556,13 +556,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"නාදක දුරකථනයක් ලෙස"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"සංගීතය සහ මාධ්‍යය සඳහා"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"සැකසීම් මතක තබාගන්න"</string>
-    <string name="wifi_assistant_intro_setup" msgid="4605105515416995110">"Wi‑Fi සහායක\nහඳුන්වා දෙමින්"</string>
-    <string name="wifi_assistant_no_thanks" msgid="2776983751990143934">"එපා, ස්තූතියි."</string>
-    <string name="wifi_assistant_setup" msgid="3772423650475730906">"ස්ථාපනය කරන්න"</string>
-    <string name="wifi_assistant_card_message" msgid="107811647784658536">"Wi‑Fi සහායක සමඟ තිබෙන ජාල වලට ස්වයන්ක්‍රියව සම්බන්ධ වන්න."</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi‑Fi සහායක"</string>
-    <string name="wifi_assistant_title_message" msgid="6240721017579074015">"Wi‑Fi සහායක තිබෙන හොඳම <xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> වෙත ඔබව ස්වයංක්‍රීයව සම්බන්ධ කරයි"</string>
-    <string name="wifi_assistant_open_app" msgid="4803044899535675063">"යෙදුම විවෘත කරන්න"</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>
@@ -592,7 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Wi-Fi සැකසුම්"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"රැහැන් රහිත ප්‍රවේශ තැන් සකසන්න සහ කළමනාකරණය කරන්න"</string>
-    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Wi-Fi තෝරන්න"</string>
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Wi‑Fi ජාලය තෝරන්න"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Wi-Fi තෝරන්න"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Wi‑Fi සක්‍රිය කරමින්..."</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Wi-Fi අක්‍රිය කරමින්..."</string>
@@ -607,8 +602,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"පරිලෝකනය සැමවිට ලබාගත හැක"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"සැමවිටම පරිලෝකනය කිරීමට ඉඩ දෙන්න"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Wi-Fi අක්‍රිය විටත් Google ගේ ස්ථාන සේවා සහ වෙනත් යෙදුම් ජාල සඳහා පරිලෝකනය කරන්න"</string>
-    <string name="wifi_automatically_manage_title" msgid="6249976570008992746">"Wi‑Fi ස්වයන්ක්‍රියව කළමනාකරණය කරන්න"</string>
-    <string name="wifi_automatically_manage_summary" msgid="6952470763378312488">"<xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> ට ඔබගේ Wi-Fi සම්බන්ධතාවය කළමනාකරණය කිරීමට ඉඩ දෙන්න"</string>
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"විවෘත Wi‑Fi ස්වයංක්‍රියව භාවිතා කරන්න"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"විවෘත ජාල තත්ත්වයෙන් උසස් යැයි නිර්ණය කර ඒවාට ස්වයංක්‍රියව සම්බන්ධ වීමට Wi‑Fi සහායකට ඉඩ දෙන්න"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"සහායක තෝරන්න"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"සහතික ස්ථාපනය කරන්න"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"ස්ථාන නිරවද්‍යතාවය වැඩි කිරීමට සහ වෙනත් අරමුණු සඳහා Wi-Fi අක්‍රිය වුවද, Google සහ අනෙකුත් යෙදුම් ආසන්න ජාල සඳහා පරිලෝකනය කරයි. ඔබට මෙය සිදු වීමට අවශ්‍ය නොවේ නම්, උසස් &gt; පරිලෝකනය සැමවෙලේම පවතී."</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Wi-Fi අක්‍රිය විටදී පවා යෙදුම් ආසන්න ජාල සඳහා පරිලෝකනය කරනු ඇත. ඔබ මෙය සිදුවනවාට අකමැති නම්, උසස් &gt; පරිලෝකනය සෑමවිටම පවතී වෙත යන්න."</string>
@@ -629,6 +625,7 @@
     <string name="wifi_menu_scan" msgid="1470911530412095868">"පරිලෝකනය කරන්න"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"උසස්"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"ජාලයට සම්බන්ධ කරන්න"</string>
+    <string name="wifi_menu_remember" msgid="8814185749388713796">"ජාලය මතක තබාගන්න"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"ජාලය අමතක කරන්න"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"ජාලය වෙනස් කරන්න"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"ටැගය වෙත ලියන්න"</string>
@@ -673,9 +670,11 @@
     <string name="wifi_unspecified" msgid="5431501214192991253">"(සඳහන් නොකළ)"</string>
     <string name="wifi_remembered" msgid="4955746899347821096">"සුරකින ලදි"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"අබලයි"</string>
-    <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"දුර්වල අන්තර්ජාල සම්බන්ධය මඟ හරින ලදි"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP වින්‍යාස කිරීම අසාර්ථකයි"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"WiFi සම්බන්ධතාව අසාර්ථකයි"</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"සත්‍යාපනයේ ගැටලුවකි"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"පරාසයේ නැත"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"අන්තර්ජාල ප්‍රවේශය අනාවරණය වුයේ නැත, ස්වයංක්‍රිය නැවත සම්බන්ධ වීම වූ නැත"</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS ඇත"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS පවතී)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"ඔබගේ ජාල මුරපදය ඇතුළත් කරන්න"</string>
@@ -699,9 +698,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"අවවාදයයි: ඔබ Wi‑Fi මඟ හැරියා නම්, මුල් බාගැනීම් හෝ යාවත්කාලීන කිරීම් සඳහා ඔබගේ ටැබ්ලටය සෙලියුලර් දත්ත පමණක් භාවිතා කරයි. අය විය හැකි දත්ත වැළක්වීමට Wi‑Fi වෙත සම්බන්ධ වෙන්න."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"අවවාදයයි: ඔබ Wi‑Fi මඟ හැරියා නම්, මුල් බාගැනීම් හෝ යාවත්කාලීන කිරීම් සඳහා ඔබගේ උපාංගය සෙලියුලර් දත්ත පමණක් භාවිතා කරයි. අය විය හැකි දත්ත වැළක්වීමට Wi‑Fi වෙත සම්බන්ධ වෙන්න."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"අවවාදයයි: ඔබ Wi‑Fi මඟ හැරියා නම්, මුල් බාගැනීම් හෝ යාවත්කාලීන කිරීම් සඳහා ඔබගේ දුරකථනය සෙලියුලර් දත්ත පමණක් භාවිතා කරයි. අය විය හැකි දත්ත වැළක්වීමට Wi‑Fi වෙත සම්බන්ධ වෙන්න."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="2393880108322835846">"අවවාදයයි: ඔබ Wi‑Fi මඟ හැරියා නම්, කවර මුල් බාගැනීම් හෝ යාවත්කාලීන කිරීම් සඳහා භාවිතා කිරීමට ඔබගේ ටැබ්ලටට අන්තර්ජාල සම්බන්ධතාවයක් නොමැත."</string>
-    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1707391993265558787">"අවවාදයයි: ඔබ Wi‑Fi මඟ හැරියා නම්, කවර මුල් බාගැනීම් හෝ යාවත්කාලීන කිරීම් සඳහා භාවිතා කිරීමට ඔබගේ උපාංගයට අන්තර්ජාල සම්බන්ධතාවයක් නොමැත."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="1556858507920033022">"අවවාදයයි: ඔබ Wi‑Fi මඟ හැරියා නම්, කවර මුල් බාගැනීම් හෝ යාවත්කාලීන කිරීම් සඳහා භාවිතා කිරීමට ඔබගේ දුරකථනයට අන්තර්ජාල සම්බන්ධතාවයක් නොමැත."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"ඔබ Wi‑Fi මගහැර ගියහොත්:\n\nඔබගේ ටැබ්ලටයට අන්තර්ජාල සබඳතාවක් නොතිබෙනු ඇත.\n\nඔබගේ අන්තර්ජාලයට සම්බන්ධ වන තුරු ඔබට මෘදුකාංග යාවත්කාලීන කිරීම් නොලැබෙනු ඇත.\n\nඔබට මේ මොහොතේ උපාංග ආරක්ෂණ විශේෂාංග සක්‍රිය කළ නොහැක."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"ඔබ Wi‑Fi මගහැර ගියහොත්:\n\nඔබගේ උපාංගයට අන්තර්ජාල සබඳතාවක් නොතිබෙනු ඇත.\n\nඔබගේ අන්තර්ජාලයට සම්බන්ධ වන තුරු ඔබට මෘදුකාංග යාවත්කාලීන කිරීම් නොලැබෙනු ඇත.\n\nඔබට මේ මොහොතේ උපාංග ආරක්ෂණ විශේෂාංග සක්‍රිය කළ නොහැක."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"ඔබ Wi‑Fi මගහැර ගියහොත්:\n\nඔබගේ දුරකථනයට අන්තර්ජාල සබඳතාවක් නොතිබෙනු ඇත.\n\nඔබගේ අන්තර්ජාලයට සම්බන්ධ වන තුරු ඔබට මෘදුකාංග යාවත්කාලීන කිරීම් නොලැබෙනු ඇත.\n\nඔබට මේ මොහොතේ උපාංග ආරක්ෂණ විශේෂාංග සක්‍රිය කළ නොහැක."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"ටැබ්ලටයට මෙම Wi-Fi ජාලයට සම්බන්ධ වීමට නොහැකි වී ඇත."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"මෙම Wi-Fi ජාලය වෙත සම්බන්ධ වීමට උපාංගයට නොහැකි විය."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"මෙම Wi-Fi ජාලය වෙත සම්බන්ධ වීමට දුරකථනයට නොහැකි විය."</string>
@@ -761,7 +760,6 @@
     <string name="ring_volume_title" msgid="7938706566797464165">"හඬ නඟනයේ තීව්‍රතාවය"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"නිශ්ශබ්ධ විටදී කම්පනය කරන්න"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"සුපුරුදු දැනුම්දීම් නාදය"</string>
-    <string name="heads_up_enabled_title" msgid="1031078221910921622">"ඉහළ ප්‍රමුඛතාවෙන් නම් උත්පතනය කරන්න"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"රිගින්ටෝනය"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"දැනුම් දීම"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"දැනුම් දීම් සඳහා එන ඇමතුම්වල ශබ්ද ප්‍රමාණය යොදාගන්න"</string>
@@ -834,7 +832,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"ස්වයංක්‍රිය දීප්තිය"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"අවදි කිරීමට ඔසවන්න"</string>
     <string name="doze_title" msgid="2259176504273878294">"ස්ථානික දර්ශනය"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"උපාංගය ලබාගත් විට හෝ දැනුම්දීම් පැමිණි විට තිරය නැඟිට්ට වන්න"</string>
+    <string name="doze_summary" msgid="7128970177894383698">"ඔබ උපාංගය අතට ගත් විට හෝ දැනුම් දීම් ලැබුණු විට තිරය අවදි කරන්න"</string>
     <string name="title_font_size" msgid="4405544325522105222">"අකුරු ප්‍රමාණය"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"අකුරු ප්‍රමාණය"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM කාඩ් පතෙහි අඟුළු සැකසුම්"</string>
@@ -862,6 +860,10 @@
     <string name="sim_enter_cancel" msgid="6240422158517208036">"අවලංගු කරන්න"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"SIM කිහිපයක් සොයාගන්නා ලදි."</string>
     <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>
+    <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> පමණක් ඔබගේ උපාංගය තුළ තිබේ. සෙල්‍යුලර් දත්ත, ඇමතුම්, සහ 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>
@@ -1012,6 +1014,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"ඔබගේ ටැබ්ලටයේ "<b>"අභ්‍යන්තර ආචනය"</b>", සියලු දත්ත මකයි:\n\n"<li>"ඔබගේ Google ගිණුම"</li>\n<li>"පද්ධති සහ යෙදුම් දත්ත සහ සැකසීම්"</li>\n<li>"බාගත යෙදුම්"</li>" අන්තර්ගතය."</string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"මෙය ඔබගේ දුරකථනයේ "<b>"අභ්‍යන්තර ගබඩාවේ"</b>" සියලු දත්ත මකයි:\n\n"<li>"ඔබගේ Google ගිණුම"</li>\n<li>"පද්ධති සහ යෙදුම් දත්ත සහ සැකසීම්"</li>\n<li>"බාගත යෙදුම්"</li>" අන්තර්ගතය."</string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"ඔබ දැනට පහත ගිණුම් වෙත පුරනය වී සිටියි:\n"</string>
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"මෙම උපාංගයේ වෙනත් පරිශීලකයින් සිටි.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"සංගීතය"</li>\n<li>"ඡායාරූප"</li>\n<li>"වෙනත් පරිශීලක දත්ත"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"සංගීත, පින්තූර, සහ වෙනත් පරිශීලක දත්ත මැකීමට, "<b>"USB ආචයනය"</b>" මැකීමට අවශ්‍යය."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"සංගීතය, පින්තූර, සහ වෙනත් පරිශීලක දත්ත ඉවත් කිරීමට, "<b>"SD කාඩ් පත"</b>" මැකිය යුතුවේ."</string>
@@ -1023,7 +1026,6 @@
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"දුරකථනය නැවත සකසන්න"</string>
     <string name="master_clear_final_desc" msgid="7209547812233487345">"ඔබගේ සියලු පෞද්ගලික තොරතුරු සහ බාගත කළ යෙදුම් මකන්නද? ඔබට මෙම ක්‍රියාව ආපසු හැරවිය නොහැක!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"සියලු දේම මකන්න"</string>
-    <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"ඔබගේ අඟුළු ඇරීමේ රටාව අඳින්න"</string>
     <string name="master_clear_gesture_explanation" msgid="826193821455182780">"නිෂ්පාදන දත්ත යළි පිහිටුවීම තහවුරු කිරීමට ඔබගේ අගුළු ඇරීමේ රටාව ඔබට ඇඳීමට සිදුවේ."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"පද්ධති ඉවත් කෙරුම් සේවාව නොමැති නිසා නැවත සැකසුමක් සිදු නොකෙරුණි"</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"යළි සකසන්නද?"</string>
@@ -1041,7 +1043,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"සියළුම ගොනු මකා දමමින් USB ආචයනය මකන්නද? ඔබට මෙම ක්‍රියාව ආපසු හැරවිය නොහැක!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"ගබඩා කර ඇති සියලු ගොනු මකමින් SD කාඩ් පත මකා දමන්න ද? මෙම ක්‍රියාව ඔබට ප්‍රතිවර්ත කළ නොහැක!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"සියල්ල මකන්න"</string>
-    <string name="media_format_gesture_prompt" msgid="3109349468816856670">"ඔබගේ අඟුළු ඇරීමේ රටාව අඳින්න"</string>
     <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"ඔබට USB ආචයනය මැකිය යුතු බව තහවුරු කිරීමට ඔබ ඔබගේ අඟුළු හැරීමේ රටාව ඇඳීමට අවශ්‍ය වේ."</string>
     <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"ඔබට SD කාඩ් පත මැකිය යුතු බව තහවුරු කිරීමට ඔබ ඔබගේ අඟුළු හැරීමේ රටාව ඇඳීමට අවශ්‍ය වේ."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"ඇමතුම් සැකසීම්"</string>
@@ -1089,6 +1090,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"කරුණාකර SIM කාඩ් පතක් ඇතුල් කරන්න සහ නැවත අරඹන්න"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"කරුණාකර අන්තර්ජාලය වෙත සම්බන්ධ වන්න"</string>
     <string name="location_title" msgid="1029961368397484576">"මගේ ස්ථානය"</string>
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"කාර්යාල පැතිකඩ"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"කාර්යාල පැතිකඩ සඳහා ස්ථානය"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"ඔබගේ සමාගම මගින් අක්‍රිය කර ඇත"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"ආකාරය"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"ඉහළ නිරවද්‍යතාවය"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"බැටරි සුරැකීම"</string>
@@ -1126,6 +1130,7 @@
     <string name="copyright_title" msgid="865906688917260647">"ප්‍රකාශන හිමිකම"</string>
     <string name="license_title" msgid="1990487604356037871">"බලපත්‍රය"</string>
     <string name="terms_title" msgid="7697580845616764642">"නියමයන් සහ කොන්දේසි"</string>
+    <string name="webview_license_title" msgid="2813507464175738967">"පද්ධති WebView බලපත"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"වෝල්පේපර"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"චන්‍ද්‍රිකා රූප සපයන්නන්:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"විවෘත කේත බලපත්‍ර"</string>
@@ -1239,7 +1244,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB ආචයනය"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"SD කාඩ් පතෙහි තිබෙන"</string>
     <string name="disabled" msgid="9206776641295849915">"අබල කර ඇත"</string>
-    <string name="not_installed" msgid="1475144352069281880">"ස්ථාපනය කර නැත"</string>
+    <string name="not_installed" msgid="2797554494953450291">"මෙම පරිශීලකයා සඳහා ස්ථාපනය කර නොමැත"</string>
     <string name="no_applications" msgid="7336588977497084921">"යෙදුම් නොමැත."</string>
     <string name="internal_storage" msgid="1584700623164275282">"අභ්‍යන්තර ආචයනය"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB ආචයනය"</string>
@@ -1436,8 +1441,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"ආරෝපණය වන අතර තුර තීරය නිද්‍රාවට නොයනු ඇත"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"බ්ලූටූත් HCI ස්නුප් ලොගය සබල කරන්න"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"ගොනුවක් තුළ ඇති බ්ලූටූත් HCI පැකට්ටු සියල්ලම ග්‍රහණය කරගන්න"</string>
-    <string name="oem_unlock_enable" msgid="6629321276287913315">"OEM අඟුල අරිම සබල කරන්න"</string>
-    <string name="oem_unlock_enable_summary" msgid="3546686263996628110">"OEM අඟුල අරිමට උපාංගයට ඉඩ දෙන්න"</string>
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM අඟුල ඇරීම"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"බුට්ලොඩරයට අගුළු ඇර තිබීමට ඉඩ දෙන්න"</string>
+    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"ඔබගේ PIN එක ඇතුළු කරන්න"</string>
+    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"OEM අගුළු ඇරීම සබල කිරීම ඔබගේ උපාංගයේ PIN එක ඇතුළු කරන්න"</string>
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"OEM අඟුල ඇරීමට ඉඩ දෙන්න?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"අවවාදයයි: මෙම සැකසීම සක්‍රිය විට මෙම උපාංගයේ උපාංගය ආරක්ෂා කිරීමේ විශේෂාංගය වැඩනොකරයි."</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"නොරැහැන් සංදර්ශක සහතිකය"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"විස්තරාත්මක Wi‑Fi ලොග් කිරීම සබල කරන්න"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"ආක්‍රමණික Wi‑Fi සිට සෙලියුලර් බාර දීම"</string>
@@ -1540,6 +1549,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"සිරස්තල මෙවැනි ආකාරයට පෙනේ"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"සුපුරුදු"</string>
+    <string name="color_title" msgid="4258931051732243983">"වර්ණය"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"සුපුරුදු"</string>
     <string name="color_none" msgid="3475640044925814795">"කිසිවක් නැත"</string>
     <string name="color_white" msgid="8045195170201590239">"සුදු"</string>
@@ -1597,12 +1607,12 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"<xliff:g id="REMAIN">%1$s</xliff:g> ක් ඉතිරියි"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> වෙත වෙනස් කරන්න"</string>
-    <string name="power_discharging_duration" msgid="7125493014448497620">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - ආසන්න වශයෙන් <xliff:g id="TIME">%2$s</xliff:g> ක් ඉතිරිව ඇත"</string>
-    <string name="power_charging" msgid="712751285832976915">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="STATE">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration" msgid="4802183864773082009">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> සම්පූර්ණ වන තෙක්"</string>
-    <string name="power_charging_duration_ac" msgid="3611179931297824699">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> සම්පූර්ණ වන තෙක් AC සක්‍රිය කරන්න"</string>
-    <string name="power_charging_duration_usb" msgid="1106605348913397583">"USB හරහා <xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> සම්පූර්ණ වන තෙක්"</string>
-    <string name="power_charging_duration_wireless" msgid="633606920144617227">"රේඩියෝව වෙතින් <xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> සම්පූර්ණ වන තෙක්"</string>
+    <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> - ආසන්න <xliff:g id="TIME">%2$s</xliff:g> වම"</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> සම්පුර්ණ වන තෙක්"</string>
+    <string name="power_charging_duration_ac" msgid="3969186192576594254">"AC හි <xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> සම්පුර්ණ වන තෙක්"</string>
+    <string name="power_charging_duration_usb" msgid="182405645340976546">"USB හරහ <xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> සම්පුර්ණ වන තෙක්"</string>
+    <string name="power_charging_duration_wireless" msgid="1829295708243159464">"රේඩියෝව වෙතින් <xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> සම්පූර්ණ වන තෙක්"</string>
     <string name="power_usage_list_summary" msgid="2409288197839512482">"අවසාන සම්පූර්ණ ආරෝපණය තෙක් භාවිත කරන්න"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"පේනුවෙන් ඉවත් කළ පසු බැටරි භාවිතය"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"ප්‍රත්‍යාරම්භ කිරීමට පසු බැටරි භාවිතය"</string>
@@ -1619,7 +1629,6 @@
     <string name="awake" msgid="387122265874485088">"උපාංග අවදි කාලය"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi‑Fi සක්‍රිය කාලය"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"ප්‍රමාද නොවී Wi-Fi"</string>
-    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"ඉතිහාස විස්තර"</string>
     <string name="details_title" msgid="3792801565213935385">"විස්තර භාවිත කරන්න"</string>
     <string name="details_subtitle" msgid="32593908269911734">"විස්තර භාවිත කරන්න"</string>
@@ -1691,7 +1700,7 @@
     <string name="battery_saver" msgid="1426682272004907982">"බැටරිය සුරකින්නා"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"ස්වයන්ක්‍රියව සක්‍රිය කරන්න"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"කවදාවත් නෑ"</string>
-    <string name="battery_saver_turn_on_automatically_pct" msgid="3033681629861428940">"බැටරිය %1$d%% ක් විට"</string>
+    <string name="battery_saver_turn_on_automatically_pct" msgid="7536784431655058267">"හි %1$s බැටරිය"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"ක්‍රියාවලි සංඛ්‍යා ලේඛන"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"ධාවන ක්‍රියාවලි පිළිබඳ ගීක සංඛ්‍යා ලේඛන"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"මතක භාවිතය"</string>
@@ -1815,7 +1824,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"දෘඩාංග රක්ෂිත"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"මෘදුකාංග පමණි"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"මෙම පරිශීලකයාට අක්තපත්‍ර නොතිබේ"</string>
-    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"ඔබගේ අඟුළු ඇරීමේ රටාව අඳින්න"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"අක්තපත්‍ර ස්ථාපනය තහවුරු කිරීමට ඔබ ඔබගේ අඟුළු හැරීමේ රටාව ඇඳිය යුතුවේ."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"සහතික ආචයනය සඳහා මුරපදය ටයිප් කරන්න."</string>
@@ -1845,6 +1853,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"යෙදුම් දත්ත ඇතුළත් කරන්න"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"ස්වයංක්‍රීය යළි පිහිටුවීම"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"යෙදුමක් නැවත ස්ථාපනය කරද්දී, උපස්ථ කළ සැකසීම් සහ දත්ත නැවත පිහිටුවන්න"</string>
+    <string name="backup_inactive_title" msgid="5355557151569037197">"උපස්ථ සේවය අක්‍රිය වේ."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"මෙය ඔබගේ උපාංග ප්‍රතිපත්තිය සමග සකසා ඇත."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"ඩෙස්ක්ටොප් උපස්ථ මුරපදය"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"ඩෙස්ක්ටොප් සම්පූර්ණ උපස්ථ දැනට ආරක්ෂා කර නොමැත"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"ඩෙස්ක්ටොප් සම්පූර්ණ උපස්ථ සඳහා මුරපදය වෙනස් කිරීමට හෝ ඉවත් කිරීමට ස්පර්ශ කරන්න"</string>
@@ -1954,7 +1964,11 @@
     <string name="enter_password" msgid="8035706727471334122">"Android ආරම්භ කිරීමට, ඔබගේ මුරපදය ඇතුළු කරන්න"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Android ආරම්භ කිරීමට, ඔබගේ PIN එක ඇතුළු කරන්න"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Android ආරම්භ කිරීමට, ඔබගේ රටාව අදින්න"</string>
-    <string name="try_again" msgid="4272075051293936921">"නැවත උත්සාහ කරන්න."</string>
+    <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"වැරදි රටාවකි"</string>
+    <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"වැරදි මුරපදය"</string>
+    <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"PIN එක වැරදියි"</string>
+    <string name="checking_decryption" msgid="8287458611802609493">"පරික්ෂා කරමින්..."</string>
+    <string name="starting_android" msgid="8581493237458496835">"Android ආරම්භ කරමින්"</string>
     <string name="delete" msgid="4219243412325163003">"මකන්න"</string>
     <string name="misc_files" msgid="6720680815969643497">"විවිධ ගොනු"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"<xliff:g id="TOTAL">%2$d</xliff:g> වලින් තෝරා ගත් <xliff:g id="NUMBER">%1$d</xliff:g>"</string>
@@ -1992,8 +2006,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"තිර සංයුක්ත කිරීමට සැමවිටම GPU භාවිතා කරන්න"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"වර්ණ අවකාශය අනුකරණය කරන්න"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"OpenGL අනුරේඛන සබල කරන්න"</string>
-    <string name="use_nuplayer" msgid="5699257393367904387">"NuPlayer භාවිත කරන්න (පරීක්ෂණාත්මක)"</string>
-    <string name="use_nuplayer_summary" msgid="1991479067478516714">"AwesomePlayer වෙනුවට NuPlayer භාවිත කරන්න"</string>
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"AwesomePlayer  භාවිතා කරන්න (ඉවත් කර තිබේ)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"බොහොමයක් මාධ්‍යය ධාවනය සඳහා NuPlayer වෙනුවට AwesomePlayer භාවිතා කරන්න"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"USB ශ්‍රව්‍ය මාර්ගගත කිරීම කිරීම අබල කරන්න"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"USB ශ්‍රව්‍ය පර්යන්ත වෙත ස්වයංක්‍රිය මාර්ගගත කිරීම කිරීම අබල කරන්න"</string>
     <string name="debug_layout" msgid="5981361776594526155">"පිරිසැලසුම් සීමා පෙන්වන්න"</string>
@@ -2169,7 +2183,6 @@
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"පරිශීලයෙකු හෝ ගිණුමක් එකතු කරන්න"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"පරිශීලකයෙක් එක් කරන්න"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"සීමිත පැතිකඩ"</string>
-    <string name="user_summary_managed_profile" msgid="7369539529693048111">"කාර්යාල පැතිකඩ"</string>
     <string name="user_need_lock_message" msgid="2596365678651842785">"සීමිත පැතිකඩක් නිර්මාණය කිරීමට කලින්. ඔබගේ යෙදුම් සහ පෞද්ගලික දත්ත ආරක්ෂා කිරීමට තිර අගුලක් සැකසිය යුතුයි."</string>
     <string name="user_set_lock_button" msgid="8311219392856626841">"අගුල සකසන්න"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"සකසා නැත"</string>
@@ -2300,11 +2313,13 @@
     <string name="sim_cellular_data_unavailable_summary" msgid="3654805961942166428">"දත්ත SIM එක තේරීමට ස්පර්ශ කරන්න"</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"ඇමතුම් සඳහා මෙම එක සැමවිටම භාවිතා කරන්න"</string>
     <string name="select_sim_for_data" msgid="2366081042162853044">"දත්ත සඳහා SIM එක තෝරන්න"</string>
+    <string name="data_switch_started" msgid="2040761479817166311">"දත්ත SIM මාරු කරමින්, මෙය මිනිත්තුවක් දක්වා ගත හැකිය..."</string>
     <string name="select_sim_for_calls" msgid="3503094771801109334">"සමඟ අමතන්න"</string>
     <string name="sim_select_card" msgid="211285163525563293">"SIM කාඩ් පත තෝරන්න"</string>
     <string name="sim_card_number_title" msgid="7845379943474336488">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"SIM හිස්"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"SIM නම"</string>
+    <string name="sim_name_hint" msgid="7038643345238968930">"SIM නම ඇතුළත් කරන්න"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"SIM විවරය %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"වාහකයා"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"අංකය"</string>
@@ -2314,7 +2329,6 @@
     <string name="color_purple" msgid="3888532466427762504">"දම්"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"SIM කාඩ්පත් ඇතුළත් කර නොමැත"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"SIM තත්ත්වය"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"SIM අදාළ තොරතුරු"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"සුපුරුදු SIM එකෙන් ආපසු අමතන්න"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"පිටතට යන ඇමතුම් සඳහා SIM"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"වෙනත් ඇමතුම් සැකසුම්"</string>
@@ -2322,8 +2336,11 @@
     <string name="preferred_network_offload_header" msgid="2321173571529106767">"ජාලයේ නම විකාශනය අබල කරන්න"</string>
     <string name="preferred_network_offload_footer" msgid="5857279426054744020">"ජාලයේ නම විකාශනය අබල කිරීමෙන් ඔබගේ ජාල තොරතුරු තුන්වැනි පාර්ශව ලබාගැනීමෙන් ආරක්ෂා වේ."</string>
     <string name="preferred_network_offload_popup" msgid="2252915199889604600">"ජාලයේ නම විකාශනය කිරීම අබල කිරීමෙන් සැඟවුණු ජාල වලට ස්වයංක්‍රිය සම්බන්ධ වීම වලක්වයි."</string>
+    <string name="sim_signal_strength" msgid="9144010043784767984">"<xliff:g id="DBM">%1$d</xliff:g> dBm <xliff:g id="ASU">%2$d</xliff:g> asu"</string>
+    <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>
@@ -2332,22 +2349,22 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"මෑත සෙවුම්"</string>
     <string name="search_results_label" msgid="4163304782363526148">"ප්‍රතිඵල"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi ජාලයේ  සම්බන්ධතාවය"</string>
-    <string name="keywords_more_default_sms_app" msgid="2744404159003574745">"පෙළ පණිවිඩය"</string>
-    <string name="keywords_more_mobile_networks" msgid="7813380887358745769">"සෙලියුලර් සෙල් වාහකයා නොරැහැන්"</string>
+    <string name="keywords_more_default_sms_app" msgid="895656981962034647">"කෙටි පණිවිඩ කෙටි පණිවිඩ යැවීම පණිවිඩ යැවීම"</string>
+    <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"සෙල්‍යුලර් සෙල් වාහකයා රැහැන් රහිත දත්ත 4g 3g 2g lte"</string>
     <string name="keywords_home" msgid="3626170808219458848">"ආරම්භකය"</string>
     <string name="keywords_display" msgid="6709007669501628320">"තිරය ස්පර්ශ තිරයකි"</string>
-    <string name="keywords_display_brightness_level" msgid="8636451602230815191">"දීප්තිය නැති තිරය ස්පර්ශ තිරයකි"</string>
-    <string name="keywords_display_auto_brightness" msgid="8070218600502753102">"දීප්තිය නැති තිරය ස්පර්ශ තිරයකි"</string>
-    <string name="keywords_display_wallpaper" msgid="4315466287469834939">"පසුබිම"</string>
+    <string name="keywords_display_brightness_level" msgid="8923289340474728990">"අඳුරු තීරය ස්පර්ෂ තීරය බැටරිය"</string>
+    <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"අඳුරු තීරය ස්පර්ෂ තීරය බැටරිය"</string>
+    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"පසුබිම පෞද්ගලීකරණය අභිරුචිකරණය දර්ශනය"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"පෙළ ප්‍රමාණය"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"ව්‍යාපෘතිය"</string>
-    <string name="keywords_storage" msgid="7007275853993419928">"ඉඩ ධාවකය දෘඩ ධාවකය"</string>
-    <string name="keywords_battery" msgid="3992479295298655138">"බලය"</string>
-    <string name="keywords_spell_checker" msgid="4509482591225399210">"අකුරු වින්‍යාසය"</string>
+    <string name="keywords_storage" msgid="6572905220031852173">"ඩිස්කය ඉඩ දෘඨ තැටිය උපාංගයේ භාවිතය"</string>
+    <string name="keywords_battery" msgid="2096185085932675704">"බල භාවිතය වෙනස් කරන්න"</string>
+    <string name="keywords_spell_checker" msgid="6106749039734174140">"ශබ්දකෝෂයේ අක්ෂර වින්‍යාසය අක්ෂර වින්‍යාසය පරික්ෂා කරන්න ස්වයං-නිවැරදි කිරීම"</string>
     <string name="keywords_voice_input" msgid="3519547605812413860">"හඳුනාගැනීම ආදානය කථනය කතා භාෂාව හැන්ඩ්ස්-ෆ්‍රී හැන්ඩ්ස් ෆ්‍රී හඳුනා ගැනීම විෂම වචන ශ්‍රව්‍ය ඉතිහාසය බ්ලූටූත් හෙඩ්සෙටය"</string>
-    <string name="keywords_text_to_speech_output" msgid="8207889472282225512">"භාෂාව අගයන්න සුපුරුදු කථා කරනවා කථාව"</string>
-    <string name="keywords_date_and_time" msgid="7666950126499155141">"ඔරලෝසුව"</string>
-    <string name="keywords_factory_data_reset" msgid="3693730656843989732">"පිසදැමීම මකන ලදි"</string>
+    <string name="keywords_text_to_speech_output" msgid="392447904221657930">"භාෂාව අගයන්න සුපුරුදු කථාව කථා කිරීම tts ප්‍රවේශතාව කියවන්නා අන්ධය"</string>
+    <string name="keywords_date_and_time" msgid="2631808108134830066">"හමුදා ඔරලෝසුව"</string>
+    <string name="keywords_factory_data_reset" msgid="4355133848707691977">"පිසදමන්න මකන්න ප්‍රතිස්ථාපනය කරන්න පිරිසිදු කරන්න ඉවත් කරන්න"</string>
     <string name="keywords_printing" msgid="1701778563617114846">"මුද්‍රණ යන්ත්‍ර"</string>
     <string name="keywords_sounds_and_notifications" msgid="5965996187974887000">"ශබ්දවාහිනීයේ නාදය"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="2912933812460077912">"එපා කරදර අතුරු බිඳීම් වලට කරන්න එපා අතුරු බිඳීම බෙදීම"</string>
@@ -2356,7 +2373,7 @@
     <string name="keywords_location_mode" msgid="8584992704568356084">"නිරවද්‍යතාවය"</string>
     <string name="keywords_accounts" msgid="1957925565953357627">"ගිණුම"</string>
     <string name="keywords_users" msgid="4673901601478559100">"සීමා කිරීම සීමා කරනවා සීමා කරන ලදි"</string>
-    <string name="keywords_keyboard_and_ime" msgid="1103378692379215672">"පෙළ නිවැරදිකරණය ශබ්ද කම්පනය නිවැරදි කරන්න ස්වයංක්‍රීය භාෂා ඉංගිතය යෝජනා කරන්න තේමාව යෝජනා කිරීම අහිතකර වචන වර්ග ඉමොජි"</string>
+    <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"පෙළ නිවැරදි කිරීම ශබ්ද නිවැරදි කරන්න කම්පනය වන්න ස්වයං භාෂා ඉංගිතය යෝජනා කරන්න යෝජනා කළ තේමා අහිතකර වචන ඉමොජි වර්ග අන්තර්ජාතික"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"සර්පණය මුරපදය රටාව pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC ටැගයක් ස්ථාපනය කරන්න"</string>
     <string name="write_tag" msgid="8571858602896222537">"ලියනවා"</string>
@@ -2373,7 +2390,6 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"දැනුම්දීමේ ශබ්ද ත්‍රීවතාව"</string>
     <string name="zen_mode_settings_title" msgid="7014915558669122902">"අතුරු බිඳීම්"</string>
     <string name="zen_mode_option_title" msgid="5061978632306007914">"ඇමතුම් සහ දැනුම්දීම් පැමිණි විට"</string>
-    <string name="zen_mode_option_title_novoice" msgid="6680706009915204785">"දැනුම්දීම් පැමිණි විට"</string>
     <string name="zen_mode_option_off" msgid="3167702608910820883">"සැමවිටම අතුරු බිඳීම"</string>
     <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"ප්‍රමුඛ අතුරු බිඳීම් වලට පමණක් අනුමත කරන්න"</string>
     <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"අතුරු බිඳීම නැත"</string>
@@ -2431,14 +2447,17 @@
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"අවසන්"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"ඔබ මෙය අක්‍රිය කරන තුරු"</string>
     <string name="zen_mode_important_category" msgid="8123274463331022993">"ප්‍රමුඛ අතුරු බිඳීම්"</string>
-    <string name="zen_mode_downtime_category" msgid="4730179065426038108">"අක්‍රිය කාලය (ප්‍රමුඛ අතුරු බිඳීම් පමණයි)"</string>
+    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"බිදවැටුම් කාලය"</string>
     <string name="zen_mode_downtime_days" msgid="3361856902633311616">"දින"</string>
     <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"කිසිවක් නැත"</string>
+    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"අතුරු බිඳීම් වලට අවසර දෙන ලදි"</string>
+    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"ප්‍රමුඛතාව පමණයි"</string>
+    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"කිසිවක් නැත"</string>
     <string name="zen_mode_automation_category" msgid="4653551005950835761">"ස්වයන්ක්රියකරණය"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"ස්වයන්ක්‍රියව සක්‍රිය කරන්න"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"කවදාවත් නෑ"</string>
-    <string name="zen_mode_phone_calls" msgid="8956214416859303966">"ඇමතුම්"</string>
+    <string name="zen_mode_calls" msgid="7051492091133751208">"ඇමතුම්"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"පණිවිඩ"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"වෙතින් ඇමතුම්/පණිවිඩ"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"ඕනෑම කෙනෙක්"</string>
@@ -2452,7 +2471,9 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"සතියේ රාත්‍රි වල"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"ආරම්භක වේලාව"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"අවසන් වන වේලාව"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"මීලඟ දිනයේ <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
+    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"මීලඟ දිනයේ <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> හෝ පෙර ඕනෑම සීනුවක්"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"ඊළඟ දින <xliff:g id="FORMATTED_TIME">%s</xliff:g> හෝ පෙර ඕනෑම සීනුවක්"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"යෙදුම් දැනුම්දීම්"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"දැනුම්දීම් සැකසීම්"</string>
     <string name="device_feedback" msgid="3238056036766293294">"මෙම උපාංගය පිළිබඳ ප්‍රතිපෝෂණ යවන්න"</string>
@@ -2460,7 +2481,11 @@
     <string name="switch_on_text" msgid="1124106706920572386">"සක්‍රියයි"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"අක්‍රියයි"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"තිරය ඇමිණීම"</string>
-    <string name="screen_pinning_description" msgid="7091642350452605379">"ඔබ ක්‍රියාත්මක කරන විට, ඔබ ඇමුණුම ඉවත් කරන තෙක් දැනට තිබෙන තීරය දර්ශනය තුළ තබාගැනීමට ඔබට තීර ඇමුණුම භාවිතා කළ හැක.\n\nතීර ඇමුණුම භාවිතා කිරීමට:\n\n1. තීර ඇමුණුම සක්‍රිය කර ඇති බව සහතික කරගන්න.\n\n2. ඔබට අමිණිමට අවශ්‍ය තීරය විවෘත කරන්න.\n\n3. Overview ස්පර්ශ කරන්න.\n\n4. ඇමුණුම් නිරුපකය ස්පර්ශ කරන්න."</string>
+    <string name="screen_pinning_description" msgid="1137904524037468263">"මෙම සැකසීම සක්‍රිය විට, ඔබ ගලවන තෙක් දැන් තිබෙන තීරය දර්ශනයක් තුළ තබාගැනීමට ඔබට තීර ඇමිණීම භාවිතා කළ හැක. \n\nතීර ඇමිණීම භාවිතා කිරීමට: \n\n1. තීර ඇමිණීම සක්‍රියව තිබෙන බව සහතික කරගන්න. \n\n2. අමිණිමට අවශ්‍ය තීරය අරින්න \n\n3. දළ විශ්ලේෂණය ස්පර්ශ කරන්න. \n\n4. ඉහළට ස්වයිප් කරන්න සහ ඉන්පසු අමුණන නිරූපකය ස්පර්ශ කරන්න."</string>
+    <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"ගැලවීමට පෙර අගුළු අරින රටාව සඳහා අසන්න"</string>
+    <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"ගැලවීමට පෙර PIN විමසන්න"</string>
+    <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"ගැලවීමට පෙර මුරපදය විමසන්න"</string>
+    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"ගැලවීමට උපාංගය අගුළු දමා ඇත"</string>
     <string name="managed_user_title" msgid="8101244883654409696">"කාර්යාල පැතිකඩ"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(පරීක්ෂණාත්මක)"</string>
     <string name="display_auto_rotate_title" msgid="6176450657107806043">"උපංගය කරකැවූ විට"</string>
@@ -2469,7 +2494,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"තිරස් දසුන තුළ සිටින්න"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"දැනට තිබෙන දිශානතියේ සිටින්න"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI තොරතුරු"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI සාපේක්ෂ තොරතුරු"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"සංකේතනය"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"ඉදිරියට යන්න"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"උපාංගය ආරම්භ වීමට පෙර ඔබගේ PIN එක අවශ්‍ය වීම මඟින් ඔබට එය තව දුරටත් ආරක්ෂා කළ හැක. උපාංගය ආරම්භ වන තෙක්, එයට සීනු ඇතුළත්ව ඇමතුම්, පණිවිඩ හෝ දැනුම්දීම් ලබාගත නොහැක.\n\nනැතිවූ හෝ සොරකම් කළ උපාංග වල දත්ත ආරක්ෂා කිරීමට මෙය උදව් කරයි."</string>
@@ -2487,4 +2511,7 @@
     <string name="encrypt_talkback_dialog_message_pin" msgid="1890374082842868489">"මෙම උපාංගය ආරම්භ කිරීමට ඔබගේ PIN එක ඔබ ඇතුළු කරන විට, ප්‍රවේශතා සේවාව වැනි <xliff:g id="SERVICE">%1$s</xliff:g> තවම තිබිය නොහැක."</string>
     <string name="encrypt_talkback_dialog_message_pattern" msgid="4474332516537386384">"මෙම උපාංගය ආරම්භ කිරීමට ඔබගේ රටාව ඔබ ඇතුළු කරන විට, ප්‍රවේශතා සේවාව වැනි <xliff:g id="SERVICE">%1$s</xliff:g> තවම තිබිය නොහැක."</string>
     <string name="encrypt_talkback_dialog_message_password" msgid="8166099418487083927">"මෙම උපාංගය ආරම්භ කිරීමට ඔබගේ මුරපදය ඔබ ඇතුළු කරන විට, ප්‍රවේශතා සේවාව වැනි <xliff:g id="SERVICE">%1$s</xliff:g> තවම තිබිය නොහැක."</string>
+    <string name="imei_information_title" msgid="8499085421609752290">"IMEI තොරතුරු"</string>
+    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI සාපේක්ෂ තොරතුරු"</string>
+    <string name="slot_number" msgid="3762676044904653577">"(විවර<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-sk/arrays.xml b/res/values-sk/arrays.xml
index aa03a08..68a2252 100644
--- a/res/values-sk/arrays.xml
+++ b/res/values-sk/arrays.xml
@@ -527,4 +527,12 @@
     <item msgid="4338089220026248848">"Vo vyrovnávacej pamäti (klient aktivity)"</item>
     <item msgid="6652164677254579050">"Vo vyrovnávacej pamäti (prázdne)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Modrozelená"</item>
+    <item msgid="8332294763632946560">"Modrá"</item>
+    <item msgid="2023216417616991392">"Indigo"</item>
+    <item msgid="3170497246594232819">"Purpurová"</item>
+    <item msgid="4608643045752965568">"Ružová"</item>
+    <item msgid="6131821495505931173">"Červená"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 7d3817f..19c4120 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>
@@ -180,7 +180,6 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"Zariadenie %1$s chce získať prístup k vašim správam. Chcete zariadeniu %2$s tento prístup umožniť?"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Dátum a čas"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Zvoľte časové pásmo"</string>
-    <string name="normal_date_format" msgid="7636406984925498359">"Miestne nastavenie (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Ukážka:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Veľkosť písma:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -291,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>
@@ -322,8 +321,6 @@
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Voľba časového pásma"</string>
     <string name="date_time_set_date_title" msgid="6928286765325608604">"Dátum"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"Nastavenia dátumu"</string>
-    <string name="date_time_date_format_title" msgid="3976171711988766411">"Formát dátumu"</string>
-    <string name="date_time_date_format" msgid="6951498879879281102">"Vyberte formát dátumu"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Zoradiť v abecednom poradí"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Zoradiť podľa časového pásma"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Dátum"</string>
@@ -372,7 +369,8 @@
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Čakajte na dokončenie šifrovania telefónu. Dokončené: <xliff:g id="PERCENT">^1</xliff:g>%."</string>
     <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Počkajte na dokončenie šifrovania tabletu. Zostávajúci čas: <xliff:g id="DURATION">^1</xliff:g>"</string>
     <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Počkajte na dokončenie šifrovania telefónu. Zostávajúci čas: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Počet sekúnd zostávajúcich do ďalšieho pokusu: <xliff:g id="DELAY">^1</xliff:g>."</string>
+    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"Ak chcete odomknúť svoj tablet, vypnite ho a potom ho zapnite."</string>
+    <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"Ak chcete odomknúť svoj telefón, vypnite ho a potom ho zapnite."</string>
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"Upozornenie: Po viac ako <xliff:g id="COUNT">^1</xliff:g> neúspešných pokusoch o odomknutie bude vaše zariadenie vymazané!"</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Zadajte svoje heslo"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Šifrovanie bolo neúspešné"</string>
@@ -401,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>
@@ -412,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>
@@ -461,9 +461,9 @@
     <string name="device_admin_title" msgid="3562216873644263804">"Správa zariadenia"</string>
     <string name="manage_device_admin" msgid="5059296715271077278">"Správcovia zariadenia"</string>
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Zobraziť alebo deaktivovať správcov zariadenia"</string>
-    <string name="manage_trust_agents" msgid="4629279457536987768">"Zástupcovia dôveryhodnosti"</string>
+    <string name="manage_trust_agents" msgid="4629279457536987768">"Agenty dôvery"</string>
     <string name="disabled_because_no_backup_security" msgid="6877660253409580377">"Pred použitím musíte najskôr nastaviť zámku obrazovky"</string>
-    <string name="manage_trust_agents_summary" msgid="6804319935640148441">"Zobrazenie alebo deaktivácia zástupcov dôveryhodnosti"</string>
+    <string name="manage_trust_agents_summary" msgid="6804319935640148441">"Zobrazenie alebo deaktivácia agentov dôvery"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Zapnúť Bluetooth"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -556,13 +556,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Ako reproduktor telefónu"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Pre hudbu a médiá"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Zapamätať nastavenia"</string>
-    <string name="wifi_assistant_intro_setup" msgid="4605105515416995110">"Predstavujeme\nsl. Wi‑Fi Assistant"</string>
-    <string name="wifi_assistant_no_thanks" msgid="2776983751990143934">"NIE, ĎAKUJEM"</string>
-    <string name="wifi_assistant_setup" msgid="3772423650475730906">"NASTAVIŤ"</string>
-    <string name="wifi_assistant_card_message" msgid="107811647784658536">"Pripojte sa k dostupným sieťam automaticky pomocou aplikácie Wi-Fi Assistant."</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi‑Fi Assistant"</string>
-    <string name="wifi_assistant_title_message" msgid="6240721017579074015">"Aplikácia <xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> vás automaticky pripojí k najlepšej dostupnej sieti Wi-Fi."</string>
-    <string name="wifi_assistant_open_app" msgid="4803044899535675063">"SPUSTIŤ APLIKÁCIU"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Pripojené pomocou Asistenta Wi-Fi"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"Prenos obrazovky"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Povoliť bezdrôtový displej"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"V okolí sa nenašli žiadne zariadenia."</string>
@@ -592,7 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Nastavenia Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Umožňuje nastaviť a spravovať prístupové body bezdrôtovej siete"</string>
-    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Výber siete Wi-Fi"</string>
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Výber siete Wi-Fi"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Vybrať sieť Wi-Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Prebieha zapínanie siete Wi-Fi..."</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Prebieha vypínanie Wi-Fi..."</string>
@@ -607,8 +602,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"Vyhľadávanie vždy zapnuté"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Vyhľadávanie vždy zapnuté"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Povoliť službe určovania polohy Google a ostatným aplikáciám vyhľadávať siete aj v prípade, že je sieť Wi-Fi vypnutá"</string>
-    <string name="wifi_automatically_manage_title" msgid="6249976570008992746">"Automaticky spravovať pripojenie Wi-Fi"</string>
-    <string name="wifi_automatically_manage_summary" msgid="6952470763378312488">"Nechať nástroj <xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> spravovať pripojenie Wi-Fi"</string>
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Automaticky používať otvor. siete Wi‑Fi"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Umožniť asistentovi Wi‑Fi automaticky sa pripojiť k otvoreným sieťam, ktoré určí ako vysokokvalitné"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Výber asistenta"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Inštalácia certifikátov"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Služby Google a ďalšie aplikácie môžu s cieľom zvýšenia presnosti a inými cieľmi vyhľadávať siete v blízkosti aj v prípade, že je sieť Wi-Fi vypnutá. Ak chcete nastavenie zmeniť, prejdite do časti Rozšírené &gt; Vyhľadávanie vždy zapnuté"</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Aplikácie môžu vyhľadávať siete v blízkosti aj v prípade, že je sieť Wi-Fi vypnutá. Ak chcete nastavenie zmeniť, prejdite do časti Rozšírené &gt; Vyhľadávanie vždy zapnuté."</string>
@@ -629,6 +625,7 @@
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Vyhľadávanie"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Rozšírené"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Pripojiť k sieti"</string>
+    <string name="wifi_menu_remember" msgid="8814185749388713796">"Zapamätať sieť"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Odstrániť záznam siete"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Upraviť sieť"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Zápis do značky NFC"</string>
@@ -673,9 +670,11 @@
     <string name="wifi_unspecified" msgid="5431501214192991253">"(neurčené)"</string>
     <string name="wifi_remembered" msgid="4955746899347821096">"Uložené"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"Zakázané"</string>
-    <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Bolo zabránené slabému internetovému pripojeniu"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"Zlyhanie konfigurácie adresy IP"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Zlyhanie pripojenia Wi-Fi"</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Problém s overením totožnosti"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Mimo dosah"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Nenašiel sa žiadny prístup k internetu, preto nedôjde k automatickému opätovnému pripojeniu"</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS je k dispozícii"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS je k dispozícii)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Zadajte heslo siete"</string>
@@ -699,9 +698,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"UPOZORNENIE: Ak nastavenie siete Wi‑Fi preskočíte, tablet na stiahnutie počiatočných súborov a aktualizácií použije iba mobilné dátové pripojenie. Ak chcete zabrániť možným poplatkom za prenos dát, pripojte sa k sieti Wi-Fi."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"UPOZORNENIE: Ak nastavenie siete Wi‑Fi preskočíte, zariadenie na stiahnutie počiatočných súborov a aktualizácií použije iba mobilné dátové pripojenie. Ak chcete zabrániť možným poplatkom za prenos dát, pripojte sa k sieti Wi-Fi."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"UPOZORNENIE: Ak nastavenie siete Wi‑Fi preskočíte, telefón na stiahnutie počiatočných súborov a aktualizácií použije iba mobilné dátové pripojenie. Ak chcete zabrániť možným poplatkom za prenos dát, pripojte sa k sieti Wi-Fi."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="2393880108322835846">"UPOZORNENIE: Ak nastavenie siete Wi‑Fi preskočíte, tablet nebude mať k dispozícii pripojenie k internetu na stiahnutie počiatočných súborov a aktualizácií."</string>
-    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1707391993265558787">"UPOZORNENIE: Ak nastavenie siete Wi‑Fi preskočíte, zariadenie nebude mať k dispozícii pripojenie k internetu na stiahnutie počiatočných súborov a aktualizácií."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="1556858507920033022">"UPOZORNENIE: Ak nastavenie siete Wi‑Fi preskočíte, telefón nebude mať k dispozícii pripojenie k internetu na stiahnutie počiatočných súborov a aktualizácií."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Ak preskočíte pripojenie Wi‑Fi:\n\nváš tablet nebude pripojený k internetu;\n\naktualizácie softvéru získate až po pripojení k internetu;\n\nnebudete môcť aktivovať funkcie ochrany zariadenia."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Ak preskočíte pripojenie Wi‑Fi:\n\nvaše zariadenie nebude pripojené k internetu;\n\naktualizácie softvéru získate až po pripojení k internetu;\n\nnebudete môcť aktivovať funkcie ochrany zariadenia."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Ak preskočíte pripojenie Wi‑Fi:\n\nváš telefón nebude pripojený k internetu;\n\naktualizácie softvéru získate až po pripojení k internetu;\n\nnebudete môcť aktivovať funkcie ochrany zariadenia."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Tablet sa k tejto sieti Wi-Fi nedokázal pripojiť."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"Zariadenie sa k tejto sieti Wi-Fi nedokázalo pripojiť."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Telefón sa k tejto sieti Wi-Fi nedokázal pripojiť."</string>
@@ -761,7 +760,6 @@
     <string name="ring_volume_title" msgid="7938706566797464165">"Hlasitosť vyzváňania"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrovať v tichom režime"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Predvolené zvukové upozornenie"</string>
-    <string name="heads_up_enabled_title" msgid="1031078221910921622">"Prioritné v kontextovom okne"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Tón zvonenia"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Upozornenie"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Použije hlasitosť prichádzajúcich hovorov aj pre upozornenia"</string>
@@ -834,7 +832,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatický jas"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Prebudiť zdvihnutím"</string>
     <string name="doze_title" msgid="2259176504273878294">"Ambientné zobrazenie"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"Prebudiť obrazovku pri zdvihnutí zariadenia alebo pri novom upozornení"</string>
+    <string name="doze_summary" msgid="7128970177894383698">"Zobudiť obrazovku pri zodvihnutí zariadenia alebo prijatí upozornení"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Veľkosť písma"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Veľkosť písma"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Nastavenia zámky karty SIM"</string>
@@ -862,6 +860,10 @@
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Zrušiť"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"Našlo sa viacero SIM kariet"</string>
     <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>
+    <string name="sim_preferred_title" msgid="5567909634636045268">"Aktualizovať pref. SIM kartu?"</string>
+    <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> je jediná SIM karta vo vašom zariadení. Chcete použiť túto SIM kartu pre mobilné dáta, hovory a správy SMS?"</string>
     <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>
@@ -1012,6 +1014,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Táto operácia vymaže všetky údaje v "<b>"internom úložisku"</b>" tabletu, vrátane:\n\n"<li>"účtu Google"</li>\n<li>"údajov a nastavení systému a aplikácií"</li>\n<li>"prevzatých aplikácií"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Táto operácia vymaže všetky údaje v "<b>"internom úložisku"</b>" telefónu, vrátane:\n\n"<li>"účtu Google"</li>\n<li>"údajov a nastavení systému a aplikácií"</li>\n<li>"prevzatých aplikácií"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Aktuálne ste prihlásení do nasledujúcich účtov:\n"</string>
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Na tomto zariadení sú prítomní ďalší používatelia.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Hudba"</li>\n<li>"Fotografie"</li>\n<li>"Iné používateľské údaje"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Ak chcete vymazať hudbu, obrázky a ďalšie používateľské údaje, musíte vymazať "<b>"úložisko USB"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Ak chcete vymazať hudbu, obrázky a ďalšie používateľské údaje, musíte vymazať "<b>"kartu SD"</b>"."</string>
@@ -1023,7 +1026,6 @@
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Obnoviť telefón"</string>
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Chcete vymazať všetky osobné údaje a stiahnuté aplikácie? Túto akciu nebude možné vrátiť späť."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Vymazať všetko"</string>
-    <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Nakreslite bezpečnostný vzor"</string>
     <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Obnovenie továrenských nastavení musíte potvrdiť nakreslením bezpečnostného vzoru."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Pokus o obnovenie sa neuskutočnil, pretože služba System Clear nie je k dispozícii."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Obnoviť?"</string>
@@ -1041,7 +1043,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"Chcete úložisko USB vymazať a odstrániť tak všetky súbory, ktoré sú na ňom uložené? Túto akciu nebude možné vrátiť späť."</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Chcete kartu SD vymazať a odstrániť tak všetky súbory, ktoré sú na nej uložené? Túto akciu nebude možné vrátiť späť."</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Odstrániť všetko"</string>
-    <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Nakreslite bezpečnostný vzor"</string>
     <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Vymazanie úložiska USB musíte potvrdiť nakreslením bezpečnostného vzoru."</string>
     <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Vymazanie karty SD musíte potvrdiť nakreslením bezpečnostného vzoru."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Nastavenia hovorov"</string>
@@ -1087,6 +1088,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Vložte kartu SIM a reštartujte"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Pripojte sa k internetu"</string>
     <string name="location_title" msgid="1029961368397484576">"Moja poloha"</string>
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Pracovný profil"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Poloha pre pracovný profil"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Deaktivovala vaša spoločnosť"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Režim"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Vysoká presnosť"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Úspora batérie"</string>
@@ -1124,6 +1128,7 @@
     <string name="copyright_title" msgid="865906688917260647">"Autorské práva"</string>
     <string name="license_title" msgid="1990487604356037871">"Licencia"</string>
     <string name="terms_title" msgid="7697580845616764642">"Zmluvné podmienky"</string>
+    <string name="webview_license_title" msgid="2813507464175738967">"Licencia systému WebView"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Tapety"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Poskytovatelia satelitných snímok:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Licencie otvoreného zdroja"</string>
@@ -1237,7 +1242,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Ukladací priestor USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Na karte SD"</string>
     <string name="disabled" msgid="9206776641295849915">"Zakázané"</string>
-    <string name="not_installed" msgid="1475144352069281880">"Nenainštalované"</string>
+    <string name="not_installed" msgid="2797554494953450291">"Pre tohto používateľa nenainš."</string>
     <string name="no_applications" msgid="7336588977497084921">"Žiadne aplikácie."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Interný ukl. priestor"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Ukladací priestor USB"</string>
@@ -1311,15 +1316,15 @@
     <skip />
     <string name="running_process_item_user_label" msgid="3129887865552025943">"Používateľ: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="running_process_item_removed_user_label" msgid="8250168004291472959">"Odstránený používateľ"</string>
-    <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"Počet procesov: <xliff:g id="NUMPROCESS">%1$d</xliff:g>; počet služieb: <xliff:g id="NUMSERVICES">%2$d</xliff:g>"</string>
-    <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"Počet procesov: <xliff:g id="NUMPROCESS">%1$d</xliff:g>; počet služieb: <xliff:g id="NUMSERVICES">%2$d</xliff:g>"</string>
-    <string name="running_processes_item_description_p_s" msgid="744424668287252915">"Počet procesov: <xliff:g id="NUMPROCESS">%1$d</xliff:g>; počet služieb: <xliff:g id="NUMSERVICES">%2$d</xliff:g>"</string>
-    <string name="running_processes_item_description_p_p" msgid="1607384595790852782">"Počet procesov: <xliff:g id="NUMPROCESS">%1$d</xliff:g>; počet služieb: <xliff:g id="NUMSERVICES">%2$d</xliff:g>"</string>
+    <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"procesy: <xliff:g id="NUMPROCESS">%1$d</xliff:g>, služby: <xliff:g id="NUMSERVICES">%2$d</xliff:g>"</string>
+    <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"procesy: <xliff:g id="NUMPROCESS">%1$d</xliff:g>, služby: <xliff:g id="NUMSERVICES">%2$d</xliff:g>"</string>
+    <string name="running_processes_item_description_p_s" msgid="744424668287252915">"procesy: <xliff:g id="NUMPROCESS">%1$d</xliff:g>, služby: <xliff:g id="NUMSERVICES">%2$d</xliff:g>"</string>
+    <string name="running_processes_item_description_p_p" msgid="1607384595790852782">"procesy: <xliff:g id="NUMPROCESS">%1$d</xliff:g>, služby: <xliff:g id="NUMSERVICES">%2$d</xliff:g>"</string>
     <string name="running_processes_header_title" msgid="6588371727640789560">"Pamäť zariadenia"</string>
     <string name="running_processes_header_footer" msgid="723908176275428442">"Využitie pamäte RAM (aplikácia)"</string>
     <string name="running_processes_header_system_prefix" msgid="6104153299581682047">"Systém"</string>
     <string name="running_processes_header_apps_prefix" msgid="5787594452716832727">"Aplikácie"</string>
-    <string name="running_processes_header_free_prefix" msgid="4620613031737078415">"Zadarmo"</string>
+    <string name="running_processes_header_free_prefix" msgid="4620613031737078415">"Voľné"</string>
     <string name="running_processes_header_used_prefix" msgid="5924288703085123978">"Použité"</string>
     <string name="running_processes_header_cached_prefix" msgid="7950853188089434987">"V pamäti"</string>
     <string name="running_processes_header_ram" msgid="996092388884426817">"RAM: <xliff:g id="RAM_0">%1$s</xliff:g>"</string>
@@ -1434,8 +1439,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Obrazovka sa pri nabíjaní neprepne do režimu spánku"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Povoliť sledovanie Bluetooth HCI"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Zaznamenať všetky pakety Bluetooth HCI do súboru"</string>
-    <string name="oem_unlock_enable" msgid="6629321276287913315">"Povoliť odomknutie OEM"</string>
-    <string name="oem_unlock_enable_summary" msgid="3546686263996628110">"Povoliť odomknutie zariadenia OEM"</string>
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"Odblokovať OEM"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Povoliť odblokovanie ponuky bootloader"</string>
+    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Zadajte svoj kód PIN"</string>
+    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Ak chcete aktivovať odomknutie OEM, zadajte kód PIN zariadenia"</string>
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Povoliť odblokovanie OEM?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"UPOZORNENIE: V prípade, že bude toto nastavenie zapnuté, funkcie ochrany zariadenia nebudú na tomto zariadení fungovať."</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Certifikácia bezdrôtového displeja"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Povoliť prihlasovanie Wi-Fi Verbose"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Agres. odovzdávať Wi-Fi na mobilnú sieť"</string>
@@ -1538,6 +1547,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"Titulky budú vyzerať takto."</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"Predvolené"</string>
+    <string name="color_title" msgid="4258931051732243983">"Farba"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"Predvolené"</string>
     <string name="color_none" msgid="3475640044925814795">"Žiadna"</string>
     <string name="color_white" msgid="8045195170201590239">"Biela"</string>
@@ -1595,12 +1605,12 @@
     <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">"Zostáva <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> do nabitia"</string>
-    <string name="power_discharging_duration" msgid="7125493014448497620">"<xliff:g id="LEVEL">%1$d</xliff:g> %% – zostáva cca. <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="power_charging" msgid="712751285832976915">"<xliff:g id="LEVEL">%1$d</xliff:g> %% – <xliff:g id="STATE">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration" msgid="4802183864773082009">"<xliff:g id="LEVEL">%1$d</xliff:g> %% – úplné nabitie batérie o <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration_ac" msgid="3611179931297824699">"<xliff:g id="LEVEL">%1$d</xliff:g> %% – úplné nabitie z el. zásuvky o <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration_usb" msgid="1106605348913397583">"<xliff:g id="LEVEL">%1$d</xliff:g> %% – úplné nabitie pomocou kábla USB o <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration_wireless" msgid="633606920144617227">"<xliff:g id="LEVEL">%1$d</xliff:g> %% – úplné bezdrôtové nabitie o <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> – zostáva približne <xliff:g id="TIME">%2$s</xliff:g>"</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> do úplného nabitia"</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> do úplného nabitia zo zásuvky"</string>
+    <string name="power_charging_duration_usb" msgid="182405645340976546">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> do úplného nabitia cez USB"</string>
+    <string name="power_charging_duration_wireless" msgid="1829295708243159464">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> do úplného nabitia bezdrôtovo"</string>
     <string name="power_usage_list_summary" msgid="2409288197839512482">"Využitie od posledného úplného dobitia"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Využitie batérie od odpojenia"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Využitie batérie od obnovenia"</string>
@@ -1617,7 +1627,6 @@
     <string name="awake" msgid="387122265874485088">"Doba používania zariadenia"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Čas prevádzky siete Wi-Fi"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Čas prevádzky siete Wi-Fi"</string>
-    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> – <xliff:g id="NUMBER">%2$s</xliff:g> <xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Podrobnosti histórie"</string>
     <string name="details_title" msgid="3792801565213935385">"Podrobnosti používania"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Podrobnosti používania"</string>
@@ -1689,7 +1698,7 @@
     <string name="battery_saver" msgid="1426682272004907982">"Šetrič batérie"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Zapnúť automaticky"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Nikdy"</string>
-    <string name="battery_saver_turn_on_automatically_pct" msgid="3033681629861428940">"Pri %1$d%% batérie"</string>
+    <string name="battery_saver_turn_on_automatically_pct" msgid="7536784431655058267">"%1$s batérie"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Štatistiky procesov"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Podrobné štatistiky spustených procesov"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Využitie pamäte"</string>
@@ -1710,7 +1719,7 @@
     <string name="mem_use_native_type" msgid="5976704902328347400">"Natívne"</string>
     <string name="mem_use_kernel_cache_type" msgid="6411475064463957513">"Vyrovnávacie pamäte jadra Kernel"</string>
     <string name="mem_use_zram_type" msgid="9087217476795358232">"ZRam swap"</string>
-    <string name="mem_use_free_type" msgid="717708548454880840">"Zadarmo"</string>
+    <string name="mem_use_free_type" msgid="717708548454880840">"Voľné"</string>
     <string name="mem_use_total" msgid="6308786055749777934">"Celkové"</string>
     <string name="menu_duration_3h" msgid="4714866438374738385">"3 hodiny"</string>
     <string name="menu_duration_6h" msgid="1940846763432184132">"6 hodín"</string>
@@ -1813,7 +1822,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Hardvérové"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Iba softvérový"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"Poverenia nie sú pre tohto používateľa k dispozícii"</string>
-    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Nakreslite bezpečnostný vzor"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Inštaláciu poverení je potrebné potvrdiť nakreslením bezpečnostného vzoru."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Zadajte heslo pre úložisko poverení."</string>
@@ -1843,6 +1851,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"Zahrnúť dáta aplikácií"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Automatické obnovenie"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Pri preinštalovaní aplikácie obnoviť zálohované údaje a nastavenia"</string>
+    <string name="backup_inactive_title" msgid="5355557151569037197">"Služba zálohovania nie je aktívna."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"Túto možnosť nastavujú pravidlá pre zariadenie."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Heslo záloh v počítači"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Úplné zálohy na počítači nie sú momentálne chránené"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Dotykom zmeníte alebo odstránite heslo pre úplné zálohy do počítača"</string>
@@ -1859,7 +1869,7 @@
     <string name="managed_profile_device_admin_info" msgid="5048846624960067582">"Ak chcete zakázať aplikácii <xliff:g id="APP_NAME">%1$s</xliff:g> prístup k vášmu pracovnému profilu, odstráňte profil v časti Nastavenia &gt; Účty"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"Osobné"</string>
     <string name="managed_device_admin_title" msgid="7853955652864478435">"Práca"</string>
-    <string name="no_trust_agents" msgid="7450273545568977523">"Nie sú k dispozícii žiadni zástupcovia dôveryhodnosti"</string>
+    <string name="no_trust_agents" msgid="7450273545568977523">"Nie sú k dispozícii žiadne agenty dôvery"</string>
     <string name="add_device_admin_msg" msgid="6246742476064507965">"Aktivovať správcu zariadenia?"</string>
     <string name="add_device_admin" msgid="7133327675884827091">"Aktivovať"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"Správca zariadení"</string>
@@ -1952,7 +1962,11 @@
     <string name="enter_password" msgid="8035706727471334122">"Ak chcete spustiť Android, zadajte heslo."</string>
     <string name="enter_pin" msgid="5305333588093263790">"Ak chcete spustiť Android, zadajte číslo PIN."</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Ak chcete spustiť Android, nakreslite vzor."</string>
-    <string name="try_again" msgid="4272075051293936921">"Skúste to znova"</string>
+    <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"Nesprávny vzor"</string>
+    <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"Nesprávne heslo"</string>
+    <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"Nesprávny kód PIN"</string>
+    <string name="checking_decryption" msgid="8287458611802609493">"Kontroluje sa…"</string>
+    <string name="starting_android" msgid="8581493237458496835">"Spúšta sa Android"</string>
     <string name="delete" msgid="4219243412325163003">"Odstrániť"</string>
     <string name="misc_files" msgid="6720680815969643497">"Rôzne súbory"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"vybraté: <xliff:g id="NUMBER">%1$d</xliff:g> z <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -1990,8 +2004,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Vždy používať GPU na skladanie obrazovky"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"Simulácia far. priestoru"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Trasovanie OpenGL"</string>
-    <string name="use_nuplayer" msgid="5699257393367904387">"Použiť NuPlayer (experiment.)"</string>
-    <string name="use_nuplayer_summary" msgid="1991479067478516714">"Namiesto prehrávača AwesomePlayer použiť NuPlayer"</string>
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"Použiť AwesomePlayer (zastarané)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"Použiť na prehrávanie médií AwesomePlayer (nie NuPlayer)"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"Vyp. smer. zvuku do USB"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"Vyp. aut. smer. zvuku do zvukových periférií USB"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Zobraziť ohraničenia"</string>
@@ -2167,7 +2181,6 @@
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Pridať používateľa alebo profil"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Pridať používateľa"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Obmedzený profil"</string>
-    <string name="user_summary_managed_profile" msgid="7369539529693048111">"Pracovný profil"</string>
     <string name="user_need_lock_message" msgid="2596365678651842785">"Pred vytvorením obmedzeného profilu je nutné najprv nastaviť zámku obrazovky na ochranu aplikácií a osobných údajov."</string>
     <string name="user_set_lock_button" msgid="8311219392856626841">"Nastaviť uzamknutie"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Nenastavené"</string>
@@ -2298,11 +2311,13 @@
     <string name="sim_cellular_data_unavailable_summary" msgid="3654805961942166428">"Klepnutím vyberiete dátovú SIM kartu"</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"Vždy používať pre hovory"</string>
     <string name="select_sim_for_data" msgid="2366081042162853044">"Vyberte SIM kartu pre údaje"</string>
+    <string name="data_switch_started" msgid="2040761479817166311">"Prepínajú sa dátové SIM karty, môže to chvíľu trvať..."</string>
     <string name="select_sim_for_calls" msgid="3503094771801109334">"Volať pomocou služby"</string>
     <string name="sim_select_card" msgid="211285163525563293">"Výber SIM karty"</string>
     <string name="sim_card_number_title" msgid="7845379943474336488">"SIM karta <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"SIM karta je prázdna"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"Názov SIM karty"</string>
+    <string name="sim_name_hint" msgid="7038643345238968930">"Zadajte názov SIM karty"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"Slot pre SIM kartu %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Operátor"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Číslo"</string>
@@ -2312,7 +2327,6 @@
     <string name="color_purple" msgid="3888532466427762504">"Purpurová"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"Nie sú vložené žiadne SIM karty"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"Stav SIM karty"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"Informácie týkajúce sa SIM karty"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"Volať späť z predvolenej SIM karty"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"SIM karta pre odchádzajúce hovory"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Ďalšie nastavenia hovorov"</string>
@@ -2320,8 +2334,11 @@
     <string name="preferred_network_offload_header" msgid="2321173571529106767">"Zakázať vysiel. názvu siete"</string>
     <string name="preferred_network_offload_footer" msgid="5857279426054744020">"Zakázaním vysielania názvu siete zabránite tretím stranám v zobrazení informácií o svojej sieti."</string>
     <string name="preferred_network_offload_popup" msgid="2252915199889604600">"Zakázaním vysielania názvu siete zabránite automatického pripojeniu ku skrytým sieťam."</string>
+    <string name="sim_signal_strength" msgid="9144010043784767984">"<xliff:g id="DBM">%1$d</xliff:g> dBm <xliff:g id="ASU">%2$d</xliff:g> asu"</string>
+    <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>
+    <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Vždy sa opýtať"</string>
     <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>
@@ -2330,22 +2347,22 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Posledné vyhľadávania"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Výsledky"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi sieť pripojenie"</string>
-    <string name="keywords_more_default_sms_app" msgid="2744404159003574745">"textová správa"</string>
-    <string name="keywords_more_mobile_networks" msgid="7813380887358745769">"mobilná sieť mobilný operátor bezdrôtový"</string>
+    <string name="keywords_more_default_sms_app" msgid="895656981962034647">"textová správa poslať správy SMS a MMS"</string>
+    <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"mobilný operátor mobilné dáta bezdrôtový prenos 4g 3g 2g lte"</string>
     <string name="keywords_home" msgid="3626170808219458848">"launcher"</string>
     <string name="keywords_display" msgid="6709007669501628320">"obrazovka dotyková obrazovka"</string>
-    <string name="keywords_display_brightness_level" msgid="8636451602230815191">"stlmiť obrazovka dotyková obrazovka"</string>
-    <string name="keywords_display_auto_brightness" msgid="8070218600502753102">"stlmiť obrazovka dotyková obrazovka"</string>
-    <string name="keywords_display_wallpaper" msgid="4315466287469834939">"tapeta"</string>
+    <string name="keywords_display_brightness_level" msgid="8923289340474728990">"stlmiť displej dotyková obrazovka batéria"</string>
+    <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"stlmiť displej dotyková obrazovka batéria"</string>
+    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"pozadie personalizácia prispôsobenie displej"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"veľkosť textu"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"projekt"</string>
-    <string name="keywords_storage" msgid="7007275853993419928">"miesto disk pevný disk"</string>
-    <string name="keywords_battery" msgid="3992479295298655138">"batéria"</string>
-    <string name="keywords_spell_checker" msgid="4509482591225399210">"pravopis"</string>
+    <string name="keywords_storage" msgid="6572905220031852173">"miesto disk pevný disk zariadenie využitie"</string>
+    <string name="keywords_battery" msgid="2096185085932675704">"využitie energie nabitia"</string>
+    <string name="keywords_spell_checker" msgid="6106749039734174140">"pravopis slovník kontrola pravopisu automatické opravy"</string>
     <string name="keywords_voice_input" msgid="3519547605812413860">"rozpoznávač vstup reč hovoriť jazyk súprava hands-free hand free rozpoznávanie nevhodné slovo história zvuku bluetooth náhlavná súprava"</string>
-    <string name="keywords_text_to_speech_output" msgid="8207889472282225512">"miera jazyk predvolené hovoriť hovorenie"</string>
-    <string name="keywords_date_and_time" msgid="7666950126499155141">"hodiny"</string>
-    <string name="keywords_factory_data_reset" msgid="3693730656843989732">"vymazať odstrániť"</string>
+    <string name="keywords_text_to_speech_output" msgid="392447904221657930">"sadzba jazyk predvolená reč hovoriť tts zjednodušenie ovládania čítačka slepota"</string>
+    <string name="keywords_date_and_time" msgid="2631808108134830066">"hodiny čas"</string>
+    <string name="keywords_factory_data_reset" msgid="4355133848707691977">"vymazať odstrániť obnoviť vymazanie odstránenie"</string>
     <string name="keywords_printing" msgid="1701778563617114846">"tlačiareň"</string>
     <string name="keywords_sounds_and_notifications" msgid="5965996187974887000">"zvukový signál reproduktora"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="2912933812460077912">"nie nerušiť vyrušiť vyrušenie prestávka"</string>
@@ -2354,7 +2371,7 @@
     <string name="keywords_location_mode" msgid="8584992704568356084">"presnosť"</string>
     <string name="keywords_accounts" msgid="1957925565953357627">"účet"</string>
     <string name="keywords_users" msgid="4673901601478559100">"obmedzenie obmedziť obmedzené"</string>
-    <string name="keywords_keyboard_and_ime" msgid="1103378692379215672">"text oprava opraviť zvuk vibrovať automaticky jazyk gesto navrhnúť návrh motív urážlivé slovo typ emodži"</string>
+    <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"oprava textu opraviť zvuk vibrácie automatický výber jazyka návrh navrhovanie motív nevhodné slovo písanie emodži medzinárodné"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"prejsť prstom heslo vzor pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Nastavenie značky NFC (Wi-Fi)"</string>
     <string name="write_tag" msgid="8571858602896222537">"Zapísať"</string>
@@ -2371,7 +2388,6 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Hlasitosť upozornení"</string>
     <string name="zen_mode_settings_title" msgid="7014915558669122902">"Vyrušenia"</string>
     <string name="zen_mode_option_title" msgid="5061978632306007914">"Pri prichádzajúcom hovore alebo upozornení"</string>
-    <string name="zen_mode_option_title_novoice" msgid="6680706009915204785">"Pri prijatí upozornení"</string>
     <string name="zen_mode_option_off" msgid="3167702608910820883">"Vždy prerušiť"</string>
     <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Povoliť iba prioritné vyrušenia"</string>
     <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Neprerušovať"</string>
@@ -2429,14 +2445,17 @@
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Hotovo"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Dokým túto funkciu nevypnete"</string>
     <string name="zen_mode_important_category" msgid="8123274463331022993">"Prioritné vyrušenia"</string>
-    <string name="zen_mode_downtime_category" msgid="4730179065426038108">"Prestoje (iba prioritné vyrušenia)"</string>
+    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Odstávka"</string>
     <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Dni"</string>
     <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Žiadne"</string>
+    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Prerušenia sú povolené"</string>
+    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Iba prioritné"</string>
+    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Žiadna"</string>
     <string name="zen_mode_automation_category" msgid="4653551005950835761">"Automatizácia"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Automaticky zapnúť"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Nikdy"</string>
-    <string name="zen_mode_phone_calls" msgid="8956214416859303966">"Hovory"</string>
+    <string name="zen_mode_calls" msgid="7051492091133751208">"Hovory"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Správy"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Hovory a správy od"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Ktokoľvek"</string>
@@ -2450,15 +2469,21 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Noci cez týždeň"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Čas začiatku"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Čas ukončenia"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> ďalší deň"</string>
+    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> nasledujúci deň"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> alebo ľubovoľný predchádzajúci budík"</string>
+    <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>
     <string name="screen_pinning_title" msgid="2292573232264116542">"Pripnutie k obrazovke"</string>
-    <string name="screen_pinning_description" msgid="7091642350452605379">"Keď je funkcia pripnutie obrazovky zapnutá, môžete pomocou nej ponechať obrazovku zobrazenú, dokým ju neuvoľníte.\n\nAko funkciu použiť:\n\n1. Skontrolujte, či je pripnutie obrazovky zapnuté.\n\n2. Prejdite na obrazovku, ktorú chcete pripnúť.\n\n3. Klepnite na položku Prehľad.\n\n4. Klepnite na ikonu špendlíka."</string>
+    <string name="screen_pinning_description" msgid="1137904524037468263">"Ak je toto nastavenie zapnuté, pomocou pripnutia k obrazovke môžete zaistiť zobrazenie aktuálnej obrazovky, dokým ju neuvoľníte.\n\nPostup pripnutia k obrazovke:\n\n1. Skontrolujte, či je funkcia pripnutia k obrazovke zapnutá.\n\n2. Otvorte obrazovku, ktorú chcete pripnúť.\n\n3. Klepnite na možnosť Prehľad.\n\n4. Prejdite prstom nahor a potom klepnite na ikonu špendlíka."</string>
+    <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Pred uvoľnením požiadať o bezpečnostný vzor"</string>
+    <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Pred uvoľnením požiadať o číslo PIN"</string>
+    <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Pred uvoľnením požiadať o heslo"</string>
+    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Uzamknúť zariadenie počas uvoľňovania"</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Pracovný profil"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Experimentálne)"</string>
     <string name="display_auto_rotate_title" msgid="6176450657107806043">"Pri otáčaní zariadenia"</string>
@@ -2467,7 +2492,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Ponechať obrazovku v zobrazení na šírku"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Ponechať obrazovku v súčasnej orentácii"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"Informácie o kóde IMEI"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"Informácie súvisiace s kódom IMEI"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Šifrovanie"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Pokračovať"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"Ďalšiu ochranu tohto zariadenia zabezpečíte požadovaním kódu PIN pred spustením. Toto zariadenie nemôže prijímať hovory, správy ani upozornenia (vrátane budíkov), dokým sa nespustí. \n\nPomáha to chrániť údaje na stratených alebo ukradnutých zariadeniach."</string>
@@ -2485,4 +2509,7 @@
     <string name="encrypt_talkback_dialog_message_pin" msgid="1890374082842868489">"Pri zadávaní kódu PIN na spustenie zariadenia ešte nebudú k dispozícii služby dostupnosti, ako napríklad <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="encrypt_talkback_dialog_message_pattern" msgid="4474332516537386384">"Pri zadávaní vzoru na spustenie zariadenia ešte nebudú k dispozícii služby dostupnosti, ako napríklad <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="encrypt_talkback_dialog_message_password" msgid="8166099418487083927">"Pri zadávaní hesla na spustenie zariadenia ešte nebudú k dispozícii služby dostupnosti, ako napríklad <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
+    <string name="imei_information_title" msgid="8499085421609752290">"Informácie o kóde IMEI"</string>
+    <string name="imei_information_summary" msgid="2074095606556565233">"Informácie súvisiace s kódom IMEI"</string>
+    <string name="slot_number" msgid="3762676044904653577">"(Slot <xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-sl-nokeys/strings.xml b/res/values-sl-nokeys/strings.xml
index 49e27e3..4f73cd7 100644
--- a/res/values-sl-nokeys/strings.xml
+++ b/res/values-sl-nokeys/strings.xml
@@ -16,5 +16,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applications_settings_summary" msgid="6616938758022986257">"Upravljanje programov"</string>
+    <string name="applications_settings_summary" msgid="6616938758022986257">"Upravljanje aplikacij"</string>
 </resources>
diff --git a/res/values-sl/arrays.xml b/res/values-sl/arrays.xml
index 10f61ec..471e2ed 100644
--- a/res/values-sl/arrays.xml
+++ b/res/values-sl/arrays.xml
@@ -527,4 +527,12 @@
     <item msgid="4338089220026248848">"Predpomnjeno (odjemalec dejavnosti)"</item>
     <item msgid="6652164677254579050">"Predpomnjeno (prazno)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Zelenomodra"</item>
+    <item msgid="8332294763632946560">"Modra"</item>
+    <item msgid="2023216417616991392">"Indigo"</item>
+    <item msgid="3170497246594232819">"Vijolična"</item>
+    <item msgid="4608643045752965568">"Rožnata"</item>
+    <item msgid="6131821495505931173">"Rdeča"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 518fb0c..3fefacb 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>
@@ -180,7 +180,6 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s želi dostopati do vaših sporočil. Želite omogočiti dostop za %2$s?"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Datum in čas"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Izberite časovni pas"</string>
-    <string name="normal_date_format" msgid="7636406984925498359">"Območni (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Predogled:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Velikost pisave:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -291,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>
@@ -322,8 +321,6 @@
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Izberite časovni pas"</string>
     <string name="date_time_set_date_title" msgid="6928286765325608604">"Datum"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"Nastavi datum"</string>
-    <string name="date_time_date_format_title" msgid="3976171711988766411">"Oblika datuma"</string>
-    <string name="date_time_date_format" msgid="6951498879879281102">"Izbira oblike datuma"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Razvrsti po abecedi"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Razvrsti po časovnem pasu"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Datum"</string>
@@ -372,7 +369,8 @@
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Počakajte, telefon se šifrira. Dokončano: <xliff:g id="PERCENT">^1</xliff:g>%."</string>
     <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Počakajte, poteka šifriranje tabličnega računalnika. Preostane še: <xliff:g id="DURATION">^1</xliff:g>"</string>
     <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Počakajte, poteka šifriranje telefona. Preostane še: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Poskusite znova čez <xliff:g id="DELAY">^1</xliff:g> sekund."</string>
+    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"Če želite odkleniti tablični računalnik, ga izklopite in nato vklopite."</string>
+    <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"Če želite odkleniti telefon, ga izklopite in nato vklopite."</string>
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"Opozorilo: Podatki v napravi bodo izbrisani po še toliko neuspešnih poskusih odklepanja: <xliff:g id="COUNT">^1</xliff:g>."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Vnesite geslo"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Šifriranje ni uspelo"</string>
@@ -401,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>
@@ -412,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>
@@ -556,13 +556,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Kot zvočnik"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Za glasbo in predstavnost"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Zapomni si nastavitve"</string>
-    <string name="wifi_assistant_intro_setup" msgid="4605105515416995110">"Predstavitev\npomočnika za Wi‑Fi"</string>
-    <string name="wifi_assistant_no_thanks" msgid="2776983751990143934">"NE, HVALA"</string>
-    <string name="wifi_assistant_setup" msgid="3772423650475730906">"NASTAVI"</string>
-    <string name="wifi_assistant_card_message" msgid="107811647784658536">"Samodejno povezovanje v razpoložljiva omrežja s Pomočnikom za Wi‑Fi."</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Pomočnik za Wi‑Fi"</string>
-    <string name="wifi_assistant_title_message" msgid="6240721017579074015">"<xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> vas samodejno poveže z najboljšim razpoložljivim omrežjem Wi-Fi"</string>
-    <string name="wifi_assistant_open_app" msgid="4803044899535675063">"ODPRI APLIKACIJO"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Povezava vzpostavljena prek pomočnika za Wi-Fi"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"Zaslon za predvajanje"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Omogočanje brezžičnega zaslona"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"V bližini ni naprav."</string>
@@ -592,7 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Nastavitve za Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Nastavi in upravljaj brezžične dostopne točke"</string>
-    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Izberi Wi-Fi"</string>
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Izberi omrežje Wi‑Fi"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Izberi Wi-Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Vklapljanje povezave Wi‑Fi …"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Izklapljanje povezave Wi‑Fi …"</string>
@@ -607,8 +602,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"Iskanje vedno na voljo"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Vedno dovoli iskanje"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Googlova lokacijska storitev in druge aplikacije naj poiščejo omrežja, tudi če je Wi-Fi izklopljen"</string>
-    <string name="wifi_automatically_manage_title" msgid="6249976570008992746">"Samodejno upravljanje Wi‑Fi-ja"</string>
-    <string name="wifi_automatically_manage_summary" msgid="6952470763378312488">"Naj <xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> upravlja povezavo z omrežjem Wi-Fi"</string>
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Samodejno uporabi odprto omrežje Wi‑Fi"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Naj pomočnik za Wi-Fi samodejno vzpostavi povezavo z odprtimi omrežji visoke kakovosti"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Izbira pomočnika"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Namestitev potrdil"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Za večjo natančnost in druge namene dovolite Googlovi lokacijski storitvi in drugim aplikacijam, da iščejo omrežja Wi-Fi v bližini, tudi če je Wi-Fi izklopljen. Če tega ne želite, odprite Dodatno &gt; Iskanje vedno na voljo."</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Aplikacije lahko iščejo omrežja Wi-Fi v bližini, tudi če je Wi-Fi izklopljen. Če tega ne želite, odprite Dodatno &gt; Iskanje vedno na voljo."</string>
@@ -629,6 +625,7 @@
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Išči"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Dodatno"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Vzpostavi povezavo z omrežjem"</string>
+    <string name="wifi_menu_remember" msgid="8814185749388713796">"Zapomni si omrežje"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Pozabi omrežje"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Spremeni omrežje"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Zapisovanje na oznako NFC"</string>
@@ -673,9 +670,11 @@
     <string name="wifi_unspecified" msgid="5431501214192991253">"(ni navedeno)"</string>
     <string name="wifi_remembered" msgid="4955746899347821096">"Shranjeno"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"Onemogočeno"</string>
-    <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Slaba internetna povezava je bila izpuščena"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"Konfiguracija IP-ja ni uspela"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Povezava prek Wi-Fi-ja ni uspela"</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Težava s preverjanjem pristnosti"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Ni v obsegu"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Ni zaznanega dostopa do interneta; samodejna vnovična vzpostavitev povezave se ne bo izvedla."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS je na voljo"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS je na voljo)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Vnesite geslo za omrežje"</string>
@@ -699,9 +698,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"OPOZORILO: Če preskočite povezavo Wi‑Fi, bo tablični računalnik za začetne prenose in posodobitve uporabljal prenos podatkov v mobilnem omrežju. Če se želite izogniti morebitnim stroškom za prenos podatkov, se povežite v omrežje Wi-Fi."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"OPOZORILO: Če preskočite povezavo Wi‑Fi, bo naprava za začetne prenose in posodobitve uporabljala prenos podatkov v mobilnem omrežju. Če se želite izogniti morebitnim stroškom za prenos podatkov, se povežite v omrežje Wi-Fi."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"OPOZORILO: Če preskočite povezavo Wi‑Fi, bo telefon za začetne prenose in posodobitve uporabljal prenos podatkov v mobilnem omrežju. Če se želite izogniti morebitnim stroškom za prenos podatkov, se povežite v omrežje Wi-Fi."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="2393880108322835846">"OPOZORILO: Če preskočite povezavo Wi-Fi, tablični računalnik ne bo imel internetne povezave za začetne prenose ali posodobitve."</string>
-    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1707391993265558787">"OPOZORILO: Če preskočite povezavo Wi-Fi, naprava ne bo imela internetne povezave za začetne prenose ali posodobitve."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="1556858507920033022">"OPOZORILO: Če preskočite povezavo Wi-Fi, telefon ne bo imel internetne povezave za začetne prenose ali posodobitve."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Če preskočite Wi‑Fi:\n\nv tabličnem računalniku ne bo na voljo internetna povezava.\n\nDokler ne vzpostavite internetne povezave, ne boste prejemali posodobitev programske opreme.\n\nTrenutno ni mogoče aktivirati zaščitnih funkcij naprave."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Če preskočite Wi‑Fi:\n\nv napravi ne bo na voljo internetna povezava.\n\nDokler ne vzpostavite internetne povezave, ne boste prejemali posodobitev programske opreme.\n\nTrenutno ni mogoče aktivirati zaščitnih funkcij naprave."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Če preskočite Wi‑Fi:\n\nv telefonu ne bo na voljo internetna povezava.\n\nDokler ne vzpostavite internetne povezave, ne boste prejemali posodobitev programske opreme.\n\nTrenutno ni mogoče aktivirati zaščitnih funkcij naprave."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Tablični računalnik se ni mogel povezati v to omrežje Wi-Fi."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"Naprava se ni mogla povezati v to omrežje Wi-Fi."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Telefon se ni mogel povezati v to omrežje Wi-Fi."</string>
@@ -761,7 +760,6 @@
     <string name="ring_volume_title" msgid="7938706566797464165">"Glasnost zvonjenja"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibriraj v tihem načinu"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Privzeti zvok obvestila"</string>
-    <string name="heads_up_enabled_title" msgid="1031078221910921622">"Pojavi se, če je zelo pomembno"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Zvonjenje"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Obvestilo"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Za obvestila uporabljaj glasnost dohodnih klicev"</string>
@@ -834,7 +832,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Samodejna svetlost"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Preklop iz stanja pripravlj. z dviganjem"</string>
     <string name="doze_title" msgid="2259176504273878294">"Prikaz na podlagi okolja"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"Preklopi zaslon iz stanja pripravljenosti ob prijemu naprave ali prispetju obvestil"</string>
+    <string name="doze_summary" msgid="7128970177894383698">"Preklop zaslona iz stanja pripravljenosti, ko primete napravo ali prejmete obvestila"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Velikost pisave"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Velikost pisave"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Nastavitve zaklepanja kartice SIM"</string>
@@ -862,6 +860,10 @@
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Prekliči"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"Najdenih je bilo več kartic SIM"</string>
     <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>
+    <string name="sim_preferred_title" msgid="5567909634636045268">"Želite sprem. pred. kart. SIM?"</string>
+    <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> je edina kartica SIM v napravi. Želite uporabljati to kartico SIM za prenos podatkov v mobilnih omrežjih, klice in sporočila SMS?"</string>
     <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>
@@ -1012,6 +1014,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"S tem boste iz "<b>"notranjega pomnilnika"</b>" tabličnega računalnika izbrisali vse podatke:\n\n"<li>"Google Račun"</li>\n<li>"Podatke in nastavitve sistema in aplikacij"</li>\n<li>"Prenesene aplikacije"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"S tem boste iz "<b>"notranjega pomnilnika"</b>" telefona izbrisali vse podatke:\n\n"<li>"Google Račun"</li>\n<li>"Podatke in nastavitve sistema in aplikacij"</li>\n<li>"Prenesene aplikacije"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Trenutno ste prijavljeni v te račune:\n"</string>
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"V napravi so prisotni drugi uporabniki.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Glasba"</li>\n<li>"Fotografije"</li>\n<li>"Drugi uporabniški podatki"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Če želite izbrisati glasbo, slike in druge uporabniške podatke, morate izbrisati "<b>"pomnilnik USB"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Če želite izbrisati glasbo, slike in druge uporabniške podatke, morate izbrisati "<b>"kartico SD"</b>"."</string>
@@ -1023,7 +1026,6 @@
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Ponastavi telefon"</string>
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Želite izbrisati vse osebne podatke in prenesene aplikacije? Tega dejanja ni mogoče razveljaviti."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Izbriši vse"</string>
-    <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Narišite vzorec za odklepanje"</string>
     <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Če želite potrditi ponastavitev na tovarniške nastavitve, morate narisati vzorec za odklepanje."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Ponastavitev ni opravljena, ker storitev System Clear ni na voljo."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Želite ponastaviti?"</string>
@@ -1041,7 +1043,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"Ali želite izbrisati vse datoteke, shranjene na pomnilniku USB? Dejanja ni mogoče razveljaviti."</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Ali želite izbrisati vse datoteke, shranjene na kartici SD? Dejanja ni mogoče razveljaviti."</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Izbriši vse"</string>
-    <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Narišite vzorec za odklepanje"</string>
     <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Če želite potrditi brisanje pomnilnika USB, morate narisati vzorec za odklepanje."</string>
     <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Če želite potrditi brisanje kartice SD, morate narisati vzorec za odklepanje."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Nastavitve klicanja"</string>
@@ -1087,6 +1088,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Vstavite SIM in znova zaženite"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Vzpostavite internetno povezavo"</string>
     <string name="location_title" msgid="1029961368397484576">"Moja lokacija"</string>
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Delovni profil"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Mesto za delovni profil"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Izklopilo podjetje"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Način"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Visoka natančnost"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Varč. z energijo akumulatorja"</string>
@@ -1124,6 +1128,7 @@
     <string name="copyright_title" msgid="865906688917260647">"Avtorska pravica"</string>
     <string name="license_title" msgid="1990487604356037871">"Licenca"</string>
     <string name="terms_title" msgid="7697580845616764642">"Določila in pogoji"</string>
+    <string name="webview_license_title" msgid="2813507464175738967">"Licenca za WebView v sistemu"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Ozadja"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Ponudniki satelitskih posnetkov: \n©2014 CNES/Astrium, DigitalGlobe, Bluesky"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Licence za odprto kodo"</string>
@@ -1237,7 +1242,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Pomnilnik USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Na kartici SD"</string>
     <string name="disabled" msgid="9206776641295849915">"Onemogočeno"</string>
-    <string name="not_installed" msgid="1475144352069281880">"Ni nameščeno"</string>
+    <string name="not_installed" msgid="2797554494953450291">"Ni namešč. za tega uporabnika"</string>
     <string name="no_applications" msgid="7336588977497084921">"Ni aplikacij."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Notranji pomnilnik"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Pomnilnik USB"</string>
@@ -1434,8 +1439,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Med polnjenjem se zaslon ne bo nikoli zaklenil"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Omogoči dnevnik vohljanja Bluetooth HCI"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Zajemi vse pakete Bluetooth HCI v datoteko"</string>
-    <string name="oem_unlock_enable" msgid="6629321276287913315">"Omogočanje odklepanja OEM"</string>
-    <string name="oem_unlock_enable_summary" msgid="3546686263996628110">"Omogoči odklepanje OEM naprave"</string>
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"Odklepanje OEM"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Dovoli odklepanje zagonskega nalagalnika"</string>
+    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Vnesite kodo PIN"</string>
+    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Če želite omogočiti odklepanje OEM, vnesite kodo PIN naprave"</string>
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Želite omogočiti odklepanje OEM?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"OPOZORILO: Ko je vklopljena ta nastavitev, funkcije za zaščito naprave v tej napravi ne bodo delovale."</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Potrdilo brezžičnega zaslona"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Omogoči podrob. zapis. dnevnika za Wi-Fi"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Odločen prehod iz Wi-Fi-ja v mobil. omr."</string>
@@ -1538,6 +1547,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"Napisi bodo videti tako:"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"Privzeto"</string>
+    <string name="color_title" msgid="4258931051732243983">"Barva"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"Privzeto"</string>
     <string name="color_none" msgid="3475640044925814795">"Brez"</string>
     <string name="color_white" msgid="8045195170201590239">"Bela"</string>
@@ -1595,12 +1605,12 @@
     <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">"Preostali čas: <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> do napolnjenosti"</string>
-    <string name="power_discharging_duration" msgid="7125493014448497620">"<xliff:g id="LEVEL">%1$d</xliff:g> %% – še približno <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="power_charging" msgid="712751285832976915">"<xliff:g id="LEVEL">%1$d</xliff:g> %% – <xliff:g id="STATE">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration" msgid="4802183864773082009">"<xliff:g id="LEVEL">%1$d</xliff:g> %% – <xliff:g id="TIME">%2$s</xliff:g> do napolnjenosti"</string>
-    <string name="power_charging_duration_ac" msgid="3611179931297824699">"<xliff:g id="LEVEL">%1$d</xliff:g> %% – <xliff:g id="TIME">%2$s</xliff:g> do napolnjenosti prek izm. toka"</string>
-    <string name="power_charging_duration_usb" msgid="1106605348913397583">"<xliff:g id="LEVEL">%1$d</xliff:g> %% – <xliff:g id="TIME">%2$s</xliff:g> do napolnjenosti prek USB-ja"</string>
-    <string name="power_charging_duration_wireless" msgid="633606920144617227">"<xliff:g id="LEVEL">%1$d</xliff:g> %% – <xliff:g id="TIME">%2$s</xliff:g> do napolnjenosti prek brezž. pol."</string>
+    <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> – še približno <xliff:g id="TIME">%2$s</xliff:g>"</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> do napolnjenosti"</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> do napolnjenosti prek napajalnika"</string>
+    <string name="power_charging_duration_usb" msgid="182405645340976546">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> do napolnjenosti prek USB-ja"</string>
+    <string name="power_charging_duration_wireless" msgid="1829295708243159464">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> do napolnjenosti prek brezž. pol."</string>
     <string name="power_usage_list_summary" msgid="2409288197839512482">"Uporaba od zadnje polne napolnjenosti"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Uporaba baterije po odklopu"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Uporaba baterije od ponastavitve"</string>
@@ -1617,7 +1627,6 @@
     <string name="awake" msgid="387122265874485088">"Čas odklenjenega zaslona"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Čas z vklopljenim Wi-Fi-jem"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Čas z vklopljenim Wi-Fi-jem"</string>
-    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> –  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Podrobnosti zgodovine"</string>
     <string name="details_title" msgid="3792801565213935385">"Podrobnosti uporabe"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Podrobnosti uporabe"</string>
@@ -1689,7 +1698,7 @@
     <string name="battery_saver" msgid="1426682272004907982">"Varčevanje z energijo akumulatorja"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Samodejni vklop"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Nikoli"</string>
-    <string name="battery_saver_turn_on_automatically_pct" msgid="3033681629861428940">"pri %1$d%% napolnjenosti akumulatorja"</string>
+    <string name="battery_saver_turn_on_automatically_pct" msgid="7536784431655058267">"pri %1$s akumulatorja"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Statistični podatki o procesih"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Statistični podatki o procesih, ki se izvajajo"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Poraba pomnilnika"</string>
@@ -1813,7 +1822,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Strojna"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Samo programska"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"Za tega uporabnika niso na voljo poverilnice"</string>
-    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Narišite vzorec za odklepanje"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Če želite potrditi ponastavitev na tovarniške nastavitve, morate narisati vzorec za odklepanje."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Vnesite geslo za shrambo poverilnic."</string>
@@ -1843,6 +1851,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"Vključi podatke aplikacije"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Samodejna obnovitev"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Pri vnovični namestitvi aplikacije obnovite varnostno kopirane nastavitve in podatke"</string>
+    <string name="backup_inactive_title" msgid="5355557151569037197">"Storitev za varnostno kopiranje je nedejavna."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"To je nastavljeno s pravilnikom za naprave."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Geslo za varn. kop. rač."</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Popolne varnostne kopije namizja trenutno niso zaščitene"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Dotaknite se, če želite spremeniti ali odstraniti geslo za popolno varnostno kopiranje namizja."</string>
@@ -1952,7 +1962,11 @@
     <string name="enter_password" msgid="8035706727471334122">"Če želite zagnati Android, vnesite geslo"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Če želite zagnati Android, vnesite PIN"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Če želite zagnati Android, narišite vzorec"</string>
-    <string name="try_again" msgid="4272075051293936921">"Poskusite znova."</string>
+    <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"Napačen vzorec"</string>
+    <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"Napačno geslo"</string>
+    <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"Napačna koda PIN"</string>
+    <string name="checking_decryption" msgid="8287458611802609493">"Preverjanje ..."</string>
+    <string name="starting_android" msgid="8581493237458496835">"Zagon Androida"</string>
     <string name="delete" msgid="4219243412325163003">"Izbriši"</string>
     <string name="misc_files" msgid="6720680815969643497">"Razne datoteke"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"izbrano: <xliff:g id="NUMBER">%1$d</xliff:g> od <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -1990,8 +2004,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Za sestavljanje slike vedno uporabi graf. procesor"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"Simul. barvnega prostora"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Omogoči sledi OpenGL"</string>
-    <string name="use_nuplayer" msgid="5699257393367904387">"Uporabi NuPlayer (presk.)"</string>
-    <string name="use_nuplayer_summary" msgid="1991479067478516714">"Uporabi NuPlayer namesto AwesomePlayerja"</string>
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"Uporabi AwesomePlayer (zastarelo)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"Uporaba AwesomePlayerja namesto NuPlayerja za predvajanje večine predstavnosti"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"On. us. zvoka prek USB-ja"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"Onem. samod. usmerjanja na zun. zvoč. naprave USB"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Prikaz mej postavitve"</string>
@@ -2167,7 +2181,6 @@
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Dodajanje uporabnika ali profila"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Dodaj uporabnika"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Omejen profil"</string>
-    <string name="user_summary_managed_profile" msgid="7369539529693048111">"Delovni profil"</string>
     <string name="user_need_lock_message" msgid="2596365678651842785">"Preden lahko ustvarite profil z omejitvami, morate nastaviti zaklepanje zaslona, da zaščitite aplikacije in osebne podatke."</string>
     <string name="user_set_lock_button" msgid="8311219392856626841">"Nastavi zaklepanje"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Uporabnik ni nastavljen"</string>
@@ -2298,11 +2311,13 @@
     <string name="sim_cellular_data_unavailable_summary" msgid="3654805961942166428">"Dotaknite se, da izberete SIM za prenos podatkov"</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"Vedno uporabi to možnost za klice"</string>
     <string name="select_sim_for_data" msgid="2366081042162853044">"Izbira kartice SIM za prenos podatkov"</string>
+    <string name="data_switch_started" msgid="2040761479817166311">"Preklop podatkovne kartice SIM. Lahko traja kakšno minuto …"</string>
     <string name="select_sim_for_calls" msgid="3503094771801109334">"Klicanje z …"</string>
     <string name="sim_select_card" msgid="211285163525563293">"Izberite kartico SIM"</string>
     <string name="sim_card_number_title" msgid="7845379943474336488">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"Kartica SIM je prazna"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"Ime kartice SIM"</string>
+    <string name="sim_name_hint" msgid="7038643345238968930">"Vnesite ime kartice SIM"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"Reža za SIM %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Operater"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Številka"</string>
@@ -2312,7 +2327,6 @@
     <string name="color_purple" msgid="3888532466427762504">"Vijolična"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"Ni vstavljenih kartic SIM"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"Stanje kartice SIM"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"Podatki, povezani s kartico SIM"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"Povratni klic s privzete kartice SIM"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"Kartica SIM za odhodne klice"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Druge nastavitve klicev"</string>
@@ -2320,8 +2334,11 @@
     <string name="preferred_network_offload_header" msgid="2321173571529106767">"Onemog. odd. imena omrež."</string>
     <string name="preferred_network_offload_footer" msgid="5857279426054744020">"Če onemogočite oddajanje imena omrežja, tretjim osebam onemogočite dostop do podatkov o omrežju."</string>
     <string name="preferred_network_offload_popup" msgid="2252915199889604600">"Če onemogočite oddajanje imena omrežja, preprečite samodejno povezovanje s skritimi omrežji."</string>
+    <string name="sim_signal_strength" msgid="9144010043784767984">"<xliff:g id="DBM">%1$d</xliff:g> dBm <xliff:g id="ASU">%2$d</xliff:g> asu"</string>
+    <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>
@@ -2330,22 +2347,22 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Zadnja iskanja"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Rezultati"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi omrežna povezava"</string>
-    <string name="keywords_more_default_sms_app" msgid="2744404159003574745">"sms"</string>
-    <string name="keywords_more_mobile_networks" msgid="7813380887358745769">"mobilno mobilni operater brezžično"</string>
+    <string name="keywords_more_default_sms_app" msgid="895656981962034647">"sporočilo SMS pošiljanje sporočil SMS sporočila SMS izmenjava sporočil SMS"</string>
+    <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"mobilno mobilni operater brezžični podatki 4G 3G 2G LTE"</string>
     <string name="keywords_home" msgid="3626170808219458848">"zaganjalnik"</string>
     <string name="keywords_display" msgid="6709007669501628320">"zaslon zaslon na dotik"</string>
-    <string name="keywords_display_brightness_level" msgid="8636451602230815191">"zatemnitev zaslona zaslon na dotik"</string>
-    <string name="keywords_display_auto_brightness" msgid="8070218600502753102">"zatemnitev zaslona zaslon na dotik"</string>
-    <string name="keywords_display_wallpaper" msgid="4315466287469834939">"ozadje"</string>
+    <string name="keywords_display_brightness_level" msgid="8923289340474728990">"zatemnitev zaslona zaslon na dotik akumulator"</string>
+    <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"zatemnitev zaslona zaslon na dotik akumulator"</string>
+    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"ozadje prilagajanje prilagajanje po meri zaslon"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"velikost besedila"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"projekt"</string>
-    <string name="keywords_storage" msgid="7007275853993419928">"prostor disk trdi disk"</string>
-    <string name="keywords_battery" msgid="3992479295298655138">"energija"</string>
-    <string name="keywords_spell_checker" msgid="4509482591225399210">"črkovanje"</string>
+    <string name="keywords_storage" msgid="6572905220031852173">"prostor disk trdi disk uporaba naprave"</string>
+    <string name="keywords_battery" msgid="2096185085932675704">"poraba energije polnjenje"</string>
+    <string name="keywords_spell_checker" msgid="6106749039734174140">"črkovanje slovar preverjanje črkovanja samodejno popravljanje"</string>
     <string name="keywords_voice_input" msgid="3519547605812413860">"prepoznavalnik vnos govor govori jezik prostoročno prosto ročno prepoznavanje žaljivka zvočna zgodovina slušalka bluetooth"</string>
-    <string name="keywords_text_to_speech_output" msgid="8207889472282225512">"ocena jezik privzeto govori govor"</string>
-    <string name="keywords_date_and_time" msgid="7666950126499155141">"ura"</string>
-    <string name="keywords_factory_data_reset" msgid="3693730656843989732">"brisanje izbris"</string>
+    <string name="keywords_text_to_speech_output" msgid="392447904221657930">"hitrost jezik privzeto govor govorjenje pretvorba besedila v govor dostopnost bralnik slep"</string>
+    <string name="keywords_date_and_time" msgid="2631808108134830066">"vojaška ura"</string>
+    <string name="keywords_factory_data_reset" msgid="4355133848707691977">"brisanje izbris obnovitev čiščenje odstranjevanje"</string>
     <string name="keywords_printing" msgid="1701778563617114846">"tiskalnik"</string>
     <string name="keywords_sounds_and_notifications" msgid="5965996187974887000">"pisk zvočnika"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="2912933812460077912">"ne moti prekinjaj prekinitev motnja"</string>
@@ -2354,7 +2371,7 @@
     <string name="keywords_location_mode" msgid="8584992704568356084">"natančnost"</string>
     <string name="keywords_accounts" msgid="1957925565953357627">"račun"</string>
     <string name="keywords_users" msgid="4673901601478559100">"omejitev omeji omejeno"</string>
-    <string name="keywords_keyboard_and_ime" msgid="1103378692379215672">"popravljanje besedila popravi zvok vibriranje samodejni jezik kretnje predvidevaj predvidevanje tema žaljiva beseda vnašanje znak emoji"</string>
+    <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"popravljanje besedila pravilno zvok vibriranje samodejno jezik poteza predlaganje predlog tema žaljiva beseda vrsta znak emoji mednarodno"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"podrsanje geslo vzorec pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Nastavitev brezžič. oznake NFC"</string>
     <string name="write_tag" msgid="8571858602896222537">"Zapiši"</string>
@@ -2371,7 +2388,6 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Glasnost obvestila"</string>
     <string name="zen_mode_settings_title" msgid="7014915558669122902">"Prekinitve"</string>
     <string name="zen_mode_option_title" msgid="5061978632306007914">"Ob prejemu klicev in obvestil"</string>
-    <string name="zen_mode_option_title_novoice" msgid="6680706009915204785">"Ob prejemu obvestil"</string>
     <string name="zen_mode_option_off" msgid="3167702608910820883">"Vedno prekini"</string>
     <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Dovoli samo prednostne prekinitve"</string>
     <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Ne prekinjaj"</string>
@@ -2429,14 +2445,17 @@
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Končano"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Dokler tega ne izklopite"</string>
     <string name="zen_mode_important_category" msgid="8123274463331022993">"Prednostne prekinitve"</string>
-    <string name="zen_mode_downtime_category" msgid="4730179065426038108">"Čas nedelovanja (samo predn. prekinitve)"</string>
+    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Čas nedelovanja"</string>
     <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Dnevi"</string>
     <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Nič"</string>
+    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Motnje so dovoljene"</string>
+    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Samo prednostno"</string>
+    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Brez"</string>
     <string name="zen_mode_automation_category" msgid="4653551005950835761">"Avtomatizacija"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Samodejni vklop"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Nikoli"</string>
-    <string name="zen_mode_phone_calls" msgid="8956214416859303966">"Klici"</string>
+    <string name="zen_mode_calls" msgid="7051492091133751208">"Klici"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Sporočila"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Klici/sporočila od:"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Vsi"</string>
@@ -2450,7 +2469,9 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Noči med tednom"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Ura začetka"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Ura konca"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> naslednji dan"</string>
+    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> naslednji dan"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> ali kateri koli alarm prej"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> naslednji dan ali kateri koli alarm prej"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Obvestila aplikacij"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Nastavitve obvestil"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Pošlji povratne info. o tej napravi"</string>
@@ -2458,7 +2479,11 @@
     <string name="switch_on_text" msgid="1124106706920572386">"Vklopljeno"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Izklopljeno"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"Pripenjanje zaslona"</string>
-    <string name="screen_pinning_description" msgid="7091642350452605379">"Če je vklopljeno pripenjanje zaslona, ga lahko uporabite, da ohranite prikaz trenutnega zaslona, dokler ga ne odpnete.\n\nUporaba pripenjanja zaslona:\n\n1. Pripenjanje zaslona mora biti vklopljeno.\n\n2. Odprite zaslon, ki ga želite pripeti.\n\n3. Dotaknite se tipke Pregled.\n\n4. Dotaknite se ikone žebljička."</string>
+    <string name="screen_pinning_description" msgid="1137904524037468263">"Ko je pripenjanje zaslona vklopljeno, lahko z njim ohranite prikaz trenutnega zaslona, dokler ga ne odpnete.\n\nUporaba prip. zaslona:\n\n1. Pripenjanje zaslona mora biti vklopljeno.\n\n2. Odprite zaslon, ki ga želite pripeti.\n\n3. Dotaknite se tipke za pregled.\n\n4. Povlecite navzgor in se dotaknite ikone žebljička."</string>
+    <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Pred odpenjanjem vprašaj za vzorec za odklepanje"</string>
+    <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Pred odpenjanjem vprašaj za PIN"</string>
+    <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Pred odpenjanjem vprašaj za geslo"</string>
+    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Pri odpenjanju zakleni napravo"</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Delovni profil"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Poskusno)"</string>
     <string name="display_auto_rotate_title" msgid="6176450657107806043">"Ko se naprava zasuka"</string>
@@ -2467,7 +2492,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Ohrani ležeči pogled"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Ohrani trenutno postavitev"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"Podatki o IMEI"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"Relativni podatki o IMEI"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Šifriranje"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Naprej"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"Napravo lahko še dodatno zaščitite, tako da je treba pred zagonom naprave vnesti kodo PIN. Dokler se naprava ne zažene, ne more prejemati klicev, sporočil ali obvestil, vključno z alarmi. \n\nTo pomaga pri zaščiti podatkov, če naprave izgubite ali jih ukradejo."</string>
@@ -2485,4 +2509,7 @@
     <string name="encrypt_talkback_dialog_message_pin" msgid="1890374082842868489">"Ko vnesete kodo PIN za zagon te naprave, storitve za osebe s posebnimi potrebami, kot je <xliff:g id="SERVICE">%1$s</xliff:g>, še ne bodo na voljo."</string>
     <string name="encrypt_talkback_dialog_message_pattern" msgid="4474332516537386384">"Ko vnesete vzorec za zagon te naprave, storitve za osebe s posebnimi potrebami, kot je <xliff:g id="SERVICE">%1$s</xliff:g>, še ne bodo na voljo."</string>
     <string name="encrypt_talkback_dialog_message_password" msgid="8166099418487083927">"Ko vnesete geslo za zagon te naprave, storitve za osebe s posebnimi potrebami, kot je <xliff:g id="SERVICE">%1$s</xliff:g>, še ne bodo na voljo."</string>
+    <string name="imei_information_title" msgid="8499085421609752290">"Podatki o IMEI"</string>
+    <string name="imei_information_summary" msgid="2074095606556565233">"Relativni podatki o IMEI"</string>
+    <string name="slot_number" msgid="3762676044904653577">"(Reža <xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-sr/arrays.xml b/res/values-sr/arrays.xml
index 504cef9..3399cf9 100644
--- a/res/values-sr/arrays.xml
+++ b/res/values-sr/arrays.xml
@@ -147,7 +147,7 @@
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Слаба"</item>
     <item msgid="5615082285463430971">"Задовољавајућа"</item>
-    <item msgid="3565079809875324621">"Добро"</item>
+    <item msgid="3565079809875324621">"Добра"</item>
     <item msgid="5702329417707689835">"Одлично"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries">
@@ -527,4 +527,12 @@
     <item msgid="4338089220026248848">"Кеширана (клијент активности)"</item>
     <item msgid="6652164677254579050">"Кеширана (празно)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Плавозелена"</item>
+    <item msgid="8332294763632946560">"Плава"</item>
+    <item msgid="2023216417616991392">"Тамноплава"</item>
+    <item msgid="3170497246594232819">"Љубичаста"</item>
+    <item msgid="4608643045752965568">"Розе"</item>
+    <item msgid="6131821495505931173">"Црвена"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 26a0f12..3225e56 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>
@@ -180,7 +180,6 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s жели да приступи порукама. Желите ли да одобрите приступ за %2$s?"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Датум и време"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Избор временске зоне"</string>
-    <string name="normal_date_format" msgid="7636406984925498359">"Регионално (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Преглед:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Величина фонта:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -291,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>
@@ -322,8 +321,6 @@
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Избор временске зоне"</string>
     <string name="date_time_set_date_title" msgid="6928286765325608604">"Датум"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"Подешавање датума"</string>
-    <string name="date_time_date_format_title" msgid="3976171711988766411">"Формат датума"</string>
-    <string name="date_time_date_format" msgid="6951498879879281102">"Избор формата датума"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Сортирај према абецеди"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Сортирај према временској зони"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Датум"</string>
@@ -372,7 +369,8 @@
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Сачекајте да се телефон шифрује. Довршено је <xliff:g id="PERCENT">^1</xliff:g>%."</string>
     <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Сачекајте док се таблет шифрује. Преостало време: <xliff:g id="DURATION">^1</xliff:g>"</string>
     <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Сачекајте док се телефон шифрује. Преостало време: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Покушајте поново за <xliff:g id="DELAY">^1</xliff:g> секунди."</string>
+    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"Да бисте откључали таблет, искључите га, па га поново укључите."</string>
+    <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"Да бисте откључали телефон, искључите га, па га поново укључите."</string>
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"Упозорење: Подаци са уређаја ће бити обрисани ако не успете да га откључате још <xliff:g id="COUNT">^1</xliff:g> пута!"</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Унесите лозинку"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Шифровање није успело"</string>
@@ -401,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>
@@ -412,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>
@@ -556,13 +556,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Као звучник телефона"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"За музику и медије"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Запамти подешавања"</string>
-    <string name="wifi_assistant_intro_setup" msgid="4605105515416995110">"Представљамо\nWi‑Fi Assistant"</string>
-    <string name="wifi_assistant_no_thanks" msgid="2776983751990143934">"НЕ, ХВАЛА"</string>
-    <string name="wifi_assistant_setup" msgid="3772423650475730906">"ПОДЕСИ"</string>
-    <string name="wifi_assistant_card_message" msgid="107811647784658536">"Аутоматски се повезујте са доступним мрежама помоћу Wi‑Fi Assistant-а."</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi‑Fi Assistant"</string>
-    <string name="wifi_assistant_title_message" msgid="6240721017579074015">"<xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> вас аутоматски повезује са најбољом доступном Wi‑Fi мрежом"</string>
-    <string name="wifi_assistant_open_app" msgid="4803044899535675063">"ОТВОРИ АПЛИКАЦИЈУ"</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>
@@ -592,7 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Wi-Fi подешавања"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Подешавање и управљање бежичним приступним тачкама"</string>
-    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Избор Wi-Fi мреже"</string>
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Изаберите Wi-Fi мрежу"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Изабери Wi-Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Укључивање Wi-Fi-ја..."</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Искључивање Wi-Fi-ja..."</string>
@@ -607,8 +602,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"Скенирање је увек доступно"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Увек дозвољавај скенирање"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Дозволите Google-овој услузи лоцирања и другим апликацијама да скенирају мреже, чак и када је Wi-Fi искључен"</string>
-    <string name="wifi_automatically_manage_title" msgid="6249976570008992746">"Аутоматски управљај Wi‑Fi-јем"</string>
-    <string name="wifi_automatically_manage_summary" msgid="6952470763378312488">"Допустите да <xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> управља Wi‑Fi везом"</string>
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Аутоматски користи отворени Wi‑Fi"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Омогућ. аутоматског повезивања са отвореним мрежама које се покажу као квалитетне за Wi‑Fi помоћника"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Изаберите помоћника"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Инсталирај сертификате"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Да би, између осталог, побољшале тачност локације, Google и друге апликације могу да скенирају оближње мреже, чак и када је Wi-Fi искључен. Ако не желите да се то дешава, идите на Напредно &gt; Скенирање је увек доступно."</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Апликације могу да скенирају оближње мреже, чак и када је Wi-Fi искључен. Ако не желите да се то дешава, идите на Напредно &gt; Скенирање је увек доступно."</string>
@@ -629,6 +625,7 @@
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Скенирај"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Напредно"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Повежи са мрежом"</string>
+    <string name="wifi_menu_remember" msgid="8814185749388713796">"Запамти мрежу"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Заборави мрежу"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Измени мрежу"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Пиши у NFC ознаку"</string>
@@ -673,9 +670,11 @@
     <string name="wifi_unspecified" msgid="5431501214192991253">"(није наведено)"</string>
     <string name="wifi_remembered" msgid="4955746899347821096">"Сачувано"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"Онемогућено"</string>
-    <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Онемогућено због лоше интернет везе"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP конфигурација је отказала"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Wi-Fi веза је отказала"</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Проблем са потврдом аутентичности"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Није у опсегу"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Приступ интернету није откривен, аутоматско повезивање није могуће."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS је доступан"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS је доступан)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Унесите лозинку за мрежу"</string>
@@ -699,9 +698,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"УПОЗОРЕЊЕ: Ако прескочите Wi‑Fi, таблет ће користити само податке за мобилне уређаје при почетним ажурирањима и преузимањима. Да бисте избегли евентуалне трошкове за пренос података, повежите се са Wi‑Fi-јем."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"УПОЗОРЕЊЕ: Ако прескочите Wi‑Fi, уређај ће користити само податке за мобилне уређаје при почетним ажурирањима и преузимањима. Да бисте избегли евентуалне трошкове за пренос података, повежите се са Wi‑Fi-јем."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"УПОЗОРЕЊЕ: Ако прескочите Wi‑Fi, телефон ће користити само податке за мобилне уређаје при почетним ажурирањима и преузимањима. Да бисте избегли евентуалне трошкове за пренос података, повежите се са Wi‑Fi-јем."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="2393880108322835846">"УПОЗОРЕЊЕ: Ако прескочите Wi‑Fi, таблет неће имати интернет везу за почетна преузимања или ажурирања."</string>
-    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1707391993265558787">"УПОЗОРЕЊЕ: Ако прескочите Wi‑Fi, уређај неће имати интернет везу за почетна преузимања или ажурирања."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="1556858507920033022">"УПОЗОРЕЊЕ: Ако прескочите Wi‑Fi, телефон неће имати интернет везу за почетна преузимања или ажурирања."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Ако прескочите Wi-Fi:\n\nТаблет неће имати интернет везу.\n\nНећете добити ажурирања софтвера док се не повежете на интернет.\n\nТренутно не можете да активирате функције заштите уређаја."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Ако прескочите Wi-Fi:\n\nУређај неће имати интернет везу.\n\nНећете добити ажурирања софтвера док се не повежете на интернет.\n\nТренутно не можете да активирате функције заштите уређаја."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Ако прескочите Wi-Fi:\n\nТелефон неће имати интернет везу.\n\nНећете добити ажурирања софтвера док се не повежете на интернет.\n\nТренутно не можете да активирате функције заштите уређаја."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Таблет није могао да се повеже са овом Wi-Fi мрежом."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"Уређај није могао да се повеже са овом Wi-Fi мрежом."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Телефон није могао да се повеже са овом Wi-Fi мрежом."</string>
@@ -761,7 +760,6 @@
     <string name="ring_volume_title" msgid="7938706566797464165">"Јачина звука звона"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Вибрација у нечујном режиму"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Подразумевани звук обавештења"</string>
-    <string name="heads_up_enabled_title" msgid="1031078221910921622">"Искаче за висок приоритет"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Звук звона"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Обавештење"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Користи јачину звука долазног позива за обавештења"</string>
@@ -834,7 +832,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Аутоматски ниво осветљености"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Подигни за активацију"</string>
     <string name="doze_title" msgid="2259176504273878294">"Амбијентални екран"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"Буђење екрана када узмете уређај или стигну обавештења"</string>
+    <string name="doze_summary" msgid="7128970177894383698">"Пробудите екран када узмете уређај или примите обавештења"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Величина фонта"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Величина фонта"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Подешавања закључавања SIM картице"</string>
@@ -862,6 +860,10 @@
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Откажи"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"Пронађено је више SIM картица"</string>
     <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 PIN кôд. Сада морате да контактирате мобилног оператера да бисте откључали уређај."</string>
   <plurals name="wrong_pin_code">
     <item quantity="one" msgid="4840607930166101114">"Нетачан SIM PIN кôд. Имате још <xliff:g id="NUMBER">%d</xliff:g> покушај, а онда морате да контактирате мобилног оператера да бисте откључали уређај."</item>
@@ -1012,6 +1014,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Овим бришете све податке из "<b>"интерне меморије"</b>" таблета, укључујући:\n\n"<li>"Google налог"</li>\n<li>"Податке и подешавања система и апликација"</li>\n<li>"Преузете апликације"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Овим бришете све податке из "<b>"интерне меморије"</b>" телефона, укључујући:\n\n"<li>"Google налог"</li>\n<li>"Податке и подешавања система и апликација"</li>\n<li>"Преузете апликације"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Тренутно сте пријављени на следеће налоге:\n"</string>
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"На овом уређају су присутни и други корисници.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Музика"</li>\n<li>"Фотографије"</li>\n<li>"Други кориснички подаци"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Да бисте обрисали музику, слике и друге корисничке податке, треба да избришете "<b>"USB меморију"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Да бисте обрисали музику, слике и друге корисничке податке, треба да избришете садржај "<b>"SD картице"</b>"."</string>
@@ -1023,7 +1026,6 @@
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Поново постави телефон"</string>
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Желите ли да избришете све личне информације и преузете апликације? Не можете да опозовете ову радњу!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Избриши све"</string>
-    <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Нацртајте шаблон за откључавање"</string>
     <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Треба да нацртате шаблон за откључавање да бисте потврдили ресетовање на фабричка подешавања."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Није обављено враћање на почетне вредности зато што услуга брисања система није доступна."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Враћање на почетне вредности?"</string>
@@ -1041,7 +1043,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"Желите ли да избришете USB меморију и све датотеке ускладиштене у њој? Не можете да опозовете ову радњу!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Желите ли да избришете SD картицу, бришући на тај начин све датотеке ускладиштене на њој? Не можете да опозовете ту радњу!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Избриши све"</string>
-    <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Нацртајте шаблон за откључавање"</string>
     <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Потребно је да нацртате шаблон за откључавање да бисте потврдили да желите да избришете USB меморију."</string>
     <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Треба да нацртате шаблон за откључавање да бисте потврдили да желите да избришете SD картицу."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Подешавања позива"</string>
@@ -1087,6 +1088,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Убаците SIM картицу и рестартујте"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Повежите се са интернетом"</string>
     <string name="location_title" msgid="1029961368397484576">"Мојa локацијa"</string>
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Пословни профил"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Локација за пословни профил"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Искључила ваша компанија"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Режим"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Велика прецизност"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Уштеда батерије"</string>
@@ -1124,6 +1128,7 @@
     <string name="copyright_title" msgid="865906688917260647">"Ауторска права"</string>
     <string name="license_title" msgid="1990487604356037871">"Лиценца"</string>
     <string name="terms_title" msgid="7697580845616764642">"Услови и одредбе"</string>
+    <string name="webview_license_title" msgid="2813507464175738967">"Лиценца за системски WebView"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Позадине"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Добављачи сателитских слика:\n©2014 CNES/Astrium, DigitalGlobe, Bluesky"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Лиценца отвореног кода"</string>
@@ -1237,7 +1242,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB меморија"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"На SD картици"</string>
     <string name="disabled" msgid="9206776641295849915">"Онемогућено"</string>
-    <string name="not_installed" msgid="1475144352069281880">"Није инсталирано"</string>
+    <string name="not_installed" msgid="2797554494953450291">"Није инстал. за овог корисника"</string>
     <string name="no_applications" msgid="7336588977497084921">"Нема апликација."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Интерна меморија"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB меморија"</string>
@@ -1312,7 +1317,7 @@
     <string name="running_process_item_user_label" msgid="3129887865552025943">"Корисник: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="running_process_item_removed_user_label" msgid="8250168004291472959">"Уклоњени корисник"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> процес и <xliff:g id="NUMSERVICES">%2$d</xliff:g> услуга"</string>
-    <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> процес и <xliff:g id="NUMSERVICES">%2$d</xliff:g> услуге"</string>
+    <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> процес и <xliff:g id="NUMSERVICES">%2$d</xliff:g> услуге(а)"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> процеса и <xliff:g id="NUMSERVICES">%2$d</xliff:g> услуга"</string>
     <string name="running_processes_item_description_p_p" msgid="1607384595790852782">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> процеса и <xliff:g id="NUMSERVICES">%2$d</xliff:g> услуга"</string>
     <string name="running_processes_header_title" msgid="6588371727640789560">"Меморија уређаја"</string>
@@ -1434,8 +1439,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Екран неће бити у режиму спавања током пуњења"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Омогући snoop евиденцију за Bluetooth HCI"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Сними све Bluetooth HCI пакете у датотеци"</string>
-    <string name="oem_unlock_enable" msgid="6629321276287913315">"Омогући OEM откључавање"</string>
-    <string name="oem_unlock_enable_summary" msgid="3546686263996628110">"Дозволите OEM откључавање уређаја"</string>
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"Откључавање OEM-a"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Дозволи откључавање функције за покретање"</string>
+    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Унесите PIN"</string>
+    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Унесите PIN уређаја да бисте омогућили откључавање од стране произвођача оригиналне опреме (OEM)"</string>
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Желите ли да дозволите откључавање произвођача оригиналне опреме (OEM)?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"УПОЗОРЕЊЕ: Функције за заштиту уређаја неће функционисати на овом уређају док је ово подешавање укључено."</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Сертификација бежичног екрана"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Омогући детаљнију евиденцију за Wi‑Fi"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Агресиван прелаз са Wi‑Fi мреже на мобилну"</string>
@@ -1538,6 +1547,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"Титл ће изгледати овако"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"Подразумевано"</string>
+    <string name="color_title" msgid="4258931051732243983">"Боја"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"Подразумевана"</string>
     <string name="color_none" msgid="3475640044925814795">"Ништа"</string>
     <string name="color_white" msgid="8045195170201590239">"Бела"</string>
@@ -1595,12 +1605,12 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"Још <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"Пуни се још <xliff:g id="UNTIL_CHARGED">%1$s</xliff:g>"</string>
-    <string name="power_discharging_duration" msgid="7125493014448497620">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – још око <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="power_charging" msgid="712751285832976915">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – <xliff:g id="STATE">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration" msgid="4802183864773082009">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – <xliff:g id="TIME">%2$s</xliff:g> док се не напуни"</string>
-    <string name="power_charging_duration_ac" msgid="3611179931297824699">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – <xliff:g id="TIME">%2$s</xliff:g> док се не напуни пуњачем"</string>
-    <string name="power_charging_duration_usb" msgid="1106605348913397583">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – <xliff:g id="TIME">%2$s</xliff:g> док се не напуни преко USB-а"</string>
-    <string name="power_charging_duration_wireless" msgid="633606920144617227">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – <xliff:g id="TIME">%2$s</xliff:g> док се не напуни бежично"</string>
+    <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> – преостало око <xliff:g id="TIME">%2$s</xliff:g>"</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> док се не напуни"</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> док се не напуни пуњачем"</string>
+    <string name="power_charging_duration_usb" msgid="182405645340976546">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> док се не напуни преко USB-а"</string>
+    <string name="power_charging_duration_wireless" msgid="1829295708243159464">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> док се не напуни бежично"</string>
     <string name="power_usage_list_summary" msgid="2409288197839512482">"Коришћење од последњег пуњења до краја"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Коришћење батерије након искључивања"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Коришћење батерије након поновног постављања"</string>
@@ -1617,7 +1627,6 @@
     <string name="awake" msgid="387122265874485088">"Време буђења уређаја"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi на време"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi на време"</string>
-    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> – <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Детаљи историје"</string>
     <string name="details_title" msgid="3792801565213935385">"Коришћење детаља"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Коришћење детаља"</string>
@@ -1689,7 +1698,7 @@
     <string name="battery_saver" msgid="1426682272004907982">"Штедња батерије"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Аутоматски укључи"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Никада"</string>
-    <string name="battery_saver_turn_on_automatically_pct" msgid="3033681629861428940">"на %1$d%% батерије"</string>
+    <string name="battery_saver_turn_on_automatically_pct" msgid="7536784431655058267">"батерија је на %1$s"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Статистика процеса"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Штреберска статистика о активним процесима"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Искоришћеност меморије"</string>
@@ -1813,7 +1822,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Подржан хардвером"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Само софтверски"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"Акредитиви нису доступни за овог корисника"</string>
-    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Нацртајте шаблон за откључавање"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Потребно је да нацртате шаблон за откључавање да бисте потврдили инсталацију акредитива."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Унесите лозинку за складиште акредитива."</string>
@@ -1831,7 +1839,7 @@
     <string name="allow_usage_access_title" msgid="2134237975190472249">"Желите да дозволите приступ?"</string>
     <string name="allow_usage_access_message" msgid="2295847177051307496">"Ако дозволите приступ, ова апликација ће моћи да прегледа опште информације у вези са апликацијама на уређају, на пример, колико их често користите."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Тон за хитне позиве"</string>
-    <string name="emergency_tone_summary" msgid="722259232924572153">"Подешавање понашања када се успоставља хитни позив"</string>
+    <string name="emergency_tone_summary" msgid="722259232924572153">"Подешавање понашања када се успоставља хитан позив"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Резервна копија и ресетовање"</string>
     <string name="privacy_settings_title" msgid="4856282165773594890">"Резервна копија и ресетовање"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Резервна копија и ресетовање"</string>
@@ -1843,6 +1851,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"Уврштавање података апликација"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Аутоматско враћање"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Када поново инсталирате апликацију, вратите резервне копије подешавања и података"</string>
+    <string name="backup_inactive_title" msgid="5355557151569037197">"Услуга прављења резервне копије није активна."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"Ово одређују смернице за уређај."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Рез. копија лоз. рачунара"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Резервне копије читавог система тренутно нису заштићене"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Додирните да бисте променили или уклонили лозинку за прављење резервних копија читавог система на рачунару"</string>
@@ -1952,7 +1962,11 @@
     <string name="enter_password" msgid="8035706727471334122">"Да бисте покренули Android, унесите лозинку"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Да бисте покренули Android, унесите PIN"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Да бисте покренули Android, нацртајте шаблон"</string>
-    <string name="try_again" msgid="4272075051293936921">"Покушајте поново."</string>
+    <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"Погрешан шаблон"</string>
+    <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"Погрешна лозинка"</string>
+    <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"Погрешан PIN"</string>
+    <string name="checking_decryption" msgid="8287458611802609493">"Проверава се..."</string>
+    <string name="starting_android" msgid="8581493237458496835">"Покрећемо Android"</string>
     <string name="delete" msgid="4219243412325163003">"Избриши"</string>
     <string name="misc_files" msgid="6720680815969643497">"Разне датотеке"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"изабрано је <xliff:g id="NUMBER">%1$d</xliff:g> од <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -1990,8 +2004,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Увек користи GPU за компоновање екрана"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"Симулирај простор боје"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Омогући OpenGL трагове"</string>
-    <string name="use_nuplayer" msgid="5699257393367904387">"Користи NuPlayer (експ.)"</string>
-    <string name="use_nuplayer_summary" msgid="1991479067478516714">"Користи NuPlayer а не AwesomePlayer"</string>
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"Користи AwesomePlayer (застарело)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"Користи AwesomePlayer уместо NuPlayer-а за пуштање већине медија"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"Онемогући USB преусм. звука"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"Онемогући аутомат. преусмер. на USB аудио периферне уређаје"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Прикажи границе распореда"</string>
@@ -2101,7 +2115,7 @@
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Wi‑Fi мреже са ограничењем"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Да бисте изабрали мреже са ограничењем, укључите Wi-Fi."</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"Обрачун података код мобилног оператера се можда разликује од вашег уређаја."</string>
-    <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Хитни позив"</string>
+    <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Хитан позив"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Назад на позив"</string>
     <string name="vpn_name" msgid="4689699885361002297">"Назив"</string>
     <string name="vpn_type" msgid="5435733139514388070">"Тип"</string>
@@ -2167,7 +2181,6 @@
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Додај корисника или профил"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Додај корисника"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Ограничени профил"</string>
-    <string name="user_summary_managed_profile" msgid="7369539529693048111">"Пословни профил"</string>
     <string name="user_need_lock_message" msgid="2596365678651842785">"Да бисте могли да направите ограничени профил, треба да подесите закључавање екрана да бисте заштитили апликације и личне податке."</string>
     <string name="user_set_lock_button" msgid="8311219392856626841">"Подеси закључавање"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Није подешено"</string>
@@ -2298,11 +2311,13 @@
     <string name="sim_cellular_data_unavailable_summary" msgid="3654805961942166428">"Додирните да бисте изабрали SIM картицу за податке"</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"Увек користи ово за позиве"</string>
     <string name="select_sim_for_data" msgid="2366081042162853044">"Изаберите SIM картицу за податке"</string>
+    <string name="data_switch_started" msgid="2040761479817166311">"Пребацује се SIM за податке. То може да потраје до један минут..."</string>
     <string name="select_sim_for_calls" msgid="3503094771801109334">"Позови помоћу"</string>
     <string name="sim_select_card" msgid="211285163525563293">"Избор SIM картице"</string>
     <string name="sim_card_number_title" msgid="7845379943474336488">"SIM картица <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"Отвор за SIM картицу је празан"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"Назив SIM картице"</string>
+    <string name="sim_name_hint" msgid="7038643345238968930">"Унесите име SIM картице"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"Отвор за SIM картицу %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Мобилни оператер"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Број"</string>
@@ -2312,7 +2327,6 @@
     <string name="color_purple" msgid="3888532466427762504">"Љубичаста"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"Није убачена ниједна SIM картица"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"Статус SIM картице"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"Информације у вези са SIM картицом"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"Повратни позив са подразумеване SIM картице"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"SIM картица за одлазне позиве"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Друга подешавања позива"</string>
@@ -2320,8 +2334,11 @@
     <string name="preferred_network_offload_header" msgid="2321173571529106767">"Онемогући емитов. назива мреже"</string>
     <string name="preferred_network_offload_footer" msgid="5857279426054744020">"Опција Онемогући емитовање назива мреже спречава треће стране да приступају информацијама о мрежи."</string>
     <string name="preferred_network_offload_popup" msgid="2252915199889604600">"Онемогућавањем емитовања назива мреже спречавате аутоматско повезивање са скривеним мрежама."</string>
+    <string name="sim_signal_strength" msgid="9144010043784767984">"<xliff:g id="DBM">%1$d</xliff:g> dBm <xliff:g id="ASU">%2$d</xliff:g> asu"</string>
+    <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>
@@ -2330,22 +2347,22 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Недавне претраге"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Резултати"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi мрежа веза"</string>
-    <string name="keywords_more_default_sms_app" msgid="2744404159003574745">"SMS"</string>
-    <string name="keywords_more_mobile_networks" msgid="7813380887358745769">"мобилни мобилни оператер бежични"</string>
+    <string name="keywords_more_default_sms_app" msgid="895656981962034647">"текст порука слање SMS-а поруке размена порука"</string>
+    <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"мобилни мобилни оператер бежично подаци 4g 3g 2g lte"</string>
     <string name="keywords_home" msgid="3626170808219458848">"покретач"</string>
     <string name="keywords_display" msgid="6709007669501628320">"екран додирни екран"</string>
-    <string name="keywords_display_brightness_level" msgid="8636451602230815191">"затамнити екран додирни екран"</string>
-    <string name="keywords_display_auto_brightness" msgid="8070218600502753102">"затамнити екран додирни екран"</string>
-    <string name="keywords_display_wallpaper" msgid="4315466287469834939">"позадина"</string>
+    <string name="keywords_display_brightness_level" msgid="8923289340474728990">"затамнити екран додирни екран батерија"</string>
+    <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"затамнити екран додирни екран батерија"</string>
+    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"позадина персонализовати прилагодити екран"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"величина текста"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"пребацити"</string>
-    <string name="keywords_storage" msgid="7007275853993419928">"простор диск хард диск"</string>
-    <string name="keywords_battery" msgid="3992479295298655138">"снага"</string>
-    <string name="keywords_spell_checker" msgid="4509482591225399210">"правопис"</string>
+    <string name="keywords_storage" msgid="6572905220031852173">"простор диск хард диск уређај коришћење"</string>
+    <string name="keywords_battery" msgid="2096185085932675704">"напајање коришћење пунити"</string>
+    <string name="keywords_spell_checker" msgid="6106749039734174140">"правопис речник провера правописа аутоматски исправити"</string>
     <string name="keywords_voice_input" msgid="3519547605812413860">"препознавање унос говор говорити језик хендсфри рука без препознавање увредљива реч аудио историја bluetooth слушалице"</string>
-    <string name="keywords_text_to_speech_output" msgid="8207889472282225512">"брзина језик подразумевано говорити говор"</string>
-    <string name="keywords_date_and_time" msgid="7666950126499155141">"сат"</string>
-    <string name="keywords_factory_data_reset" msgid="3693730656843989732">"трајно избрисати избрисати"</string>
+    <string name="keywords_text_to_speech_output" msgid="392447904221657930">"брзина језик подразумевано говорити говор претварање текста у говор приступачност читач слеп"</string>
+    <string name="keywords_date_and_time" msgid="2631808108134830066">"сат војно"</string>
+    <string name="keywords_factory_data_reset" msgid="4355133848707691977">"брисати избрисати вратити обрисати уклонити"</string>
     <string name="keywords_printing" msgid="1701778563617114846">"штампач"</string>
     <string name="keywords_sounds_and_notifications" msgid="5965996187974887000">"звучник звучни сигнал"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="2912933812460077912">"немојте ометати прекидати прекид прекинути"</string>
@@ -2354,7 +2371,7 @@
     <string name="keywords_location_mode" msgid="8584992704568356084">"прецизност"</string>
     <string name="keywords_accounts" msgid="1957925565953357627">"налог"</string>
     <string name="keywords_users" msgid="4673901601478559100">"ограничење ограничити ограничено"</string>
-    <string name="keywords_keyboard_and_ime" msgid="1103378692379215672">"исправка текста исправити звук вибрирати аутоматски језик покрет предлагати предлог тема увредљива реч куцати емоџи"</string>
+    <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"текст исправка исправити звук вибрирати аутоматски језик покрет предлагати предлог тема увредљиво реч куцати емоџи међународно"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"превлачење лозинка шаблон pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Подесите Wi-Fi NFC ознаку"</string>
     <string name="write_tag" msgid="8571858602896222537">"Напиши"</string>
@@ -2371,7 +2388,6 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Јачина звука за обавештења"</string>
     <string name="zen_mode_settings_title" msgid="7014915558669122902">"Прекиди"</string>
     <string name="zen_mode_option_title" msgid="5061978632306007914">"Само приоритетни прекиди"</string>
-    <string name="zen_mode_option_title_novoice" msgid="6680706009915204785">"Када обавештења стигну"</string>
     <string name="zen_mode_option_off" msgid="3167702608910820883">"Увек прекини"</string>
     <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Дозволи само приоритетне прекиде"</string>
     <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Не прекидај"</string>
@@ -2429,14 +2445,17 @@
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Готово"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Док не искључите"</string>
     <string name="zen_mode_important_category" msgid="8123274463331022993">"Приоритетни прекиди"</string>
-    <string name="zen_mode_downtime_category" msgid="4730179065426038108">"Прекид рада (само приоритетни прекиди)"</string>
+    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Време одмора"</string>
     <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Дана"</string>
     <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Ниједан"</string>
+    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Дозвољени прекиди"</string>
+    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Само приоритетни прекиди"</string>
+    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Нема"</string>
     <string name="zen_mode_automation_category" msgid="4653551005950835761">"Аутоматизација"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Аутоматски укључи"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Никада"</string>
-    <string name="zen_mode_phone_calls" msgid="8956214416859303966">"Позиви"</string>
+    <string name="zen_mode_calls" msgid="7051492091133751208">"Позиви"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Поруке"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Позиви/поруке од"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Свих"</string>
@@ -2450,7 +2469,9 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Радним данима увече"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Време почетка"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Време завршетка"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> следећег дана"</string>
+    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> следећег дана"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> или било који аларм пре тога"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> следећег дана или било који аларм пре тога"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Обавешт. апликација"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Подешавања обавештења"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Шаљи повратне информације о уређају"</string>
@@ -2458,7 +2479,11 @@
     <string name="switch_on_text" msgid="1124106706920572386">"Укључено"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Искључено"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"Качење екрана"</string>
-    <string name="screen_pinning_description" msgid="7091642350452605379">"Када је качење екрана укључено, можете да га користите да би вам се и даље приказивао актуелни екран док га не откачите.\n\nДа бисте користили качење екрана:\n\n1. Проверите да ли је качење екрана укључено.\n\n2. Отворите екран који желите да закачите.\n\n3. Додирните Преглед.\n\n4. Додирните икону чиоде."</string>
+    <string name="screen_pinning_description" msgid="1137904524037468263">"Када је ово подешавање укључено, можете да користите качење екрана да би актуелни екран био приказан док га не откачите.\n\nДа бисте користили качење екрана:\n\n1. Проверите да ли је оно укључено.\n\n2. Отворите екран који желите да закачите.\n\n3. Додирните Преглед.\n\n4. Превуците нагоре, па додирните икону чиоде."</string>
+    <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Тражи шаблон за откључавање пре откачињања"</string>
+    <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Тражи PIN пре откачињања"</string>
+    <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Тражи лозинку пре откачињања"</string>
+    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Закључај уређај пре откачињања"</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Профил за посао"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Експериментално)"</string>
     <string name="display_auto_rotate_title" msgid="6176450657107806043">"Када се уређај ротира"</string>
@@ -2467,7 +2492,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Задржи водоравни приказ"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Задржи актуелни положај"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"Информације за IMEI"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"Релативне информације за IMEI"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Шифровање"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Настави"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"Можете додатно да заштитите овај уређај тако што ћете га подесити да тражи PIN пре покретања. Док се уређај не покрене, не може да прима позиве, поруке нити обавештења, укључујући аларме. \n\nНа тај начин штитите податке на изгубљеним или украденим уређајима."</string>
@@ -2485,4 +2509,7 @@
     <string name="encrypt_talkback_dialog_message_pin" msgid="1890374082842868489">"Када унесете PIN да бисте покренули овај уређај, услуге приступачности, као што је <xliff:g id="SERVICE">%1$s</xliff:g>, неће још увек бити доступне."</string>
     <string name="encrypt_talkback_dialog_message_pattern" msgid="4474332516537386384">"Када унесете шаблон да бисте покренули овај уређај, услуге приступачности, као што је <xliff:g id="SERVICE">%1$s</xliff:g>, неће још увек бити доступне."</string>
     <string name="encrypt_talkback_dialog_message_password" msgid="8166099418487083927">"Када унесете лозинку да бисте покренули овај уређај, услуге приступачности, као што је <xliff:g id="SERVICE">%1$s</xliff:g>, неће још увек бити доступне."</string>
+    <string name="imei_information_title" msgid="8499085421609752290">"Информације за IMEI"</string>
+    <string name="imei_information_summary" msgid="2074095606556565233">"Релативне информације за IMEI"</string>
+    <string name="slot_number" msgid="3762676044904653577">"(Отвор <xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-sv/arrays.xml b/res/values-sv/arrays.xml
index e41760a..07fb8b4 100644
--- a/res/values-sv/arrays.xml
+++ b/res/values-sv/arrays.xml
@@ -527,4 +527,12 @@
     <item msgid="4338089220026248848">"Cachelagrad (aktivitetsklient)"</item>
     <item msgid="6652164677254579050">"Cachelagrad (tom)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Blågrön"</item>
+    <item msgid="8332294763632946560">"Blå"</item>
+    <item msgid="2023216417616991392">"Indigo"</item>
+    <item msgid="3170497246594232819">"Lila"</item>
+    <item msgid="4608643045752965568">"Rosa"</item>
+    <item msgid="6131821495505931173">"Röd"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 996a430..35c35aa 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>
@@ -180,7 +180,6 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s vill ha åtkomst till dina meddelanden. Vill du ge %2$s åtkomst?"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Datum och tid"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Välj tidszon"</string>
-    <string name="normal_date_format" msgid="7636406984925498359">"Lokalt (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Förhandsgranska:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Teckenstorlek:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -291,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>
@@ -322,8 +321,6 @@
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Välj tidszon"</string>
     <string name="date_time_set_date_title" msgid="6928286765325608604">"Datum"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"Ange datum"</string>
-    <string name="date_time_date_format_title" msgid="3976171711988766411">"Datumformat"</string>
-    <string name="date_time_date_format" msgid="6951498879879281102">"Välj datumformat"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Sortera i bokstavsordning"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Sortera efter tidszon"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Datum"</string>
@@ -372,7 +369,8 @@
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Vänta medan mobilen krypteras. <xliff:g id="PERCENT">^1</xliff:g> % klart."</string>
     <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Vänta tills surfplattan har krypterats. Återstående tid: <xliff:g id="DURATION">^1</xliff:g>"</string>
     <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Vänta tills mobilen har krypterats. Återstående tid: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Försök igen om <xliff:g id="DELAY">^1</xliff:g> sekunder."</string>
+    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"Lås upp surfplattan genom att stänga av och slå på den."</string>
+    <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"Lås upp mobilen genom att stänga av och slå på den."</string>
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"Varning! Efter <xliff:g id="COUNT">^1</xliff:g> misslyckade upplåsningsförsök till raderas data på enheten."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Ange ditt lösenord"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Krypteringen misslyckades"</string>
@@ -401,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>
@@ -412,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>
@@ -556,13 +556,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Som högtalartelefon"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"För musik och media"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Kom ihåg inställningarna"</string>
-    <string name="wifi_assistant_intro_setup" msgid="4605105515416995110">\n"Wi‑Fi Assistant!"</string>
-    <string name="wifi_assistant_no_thanks" msgid="2776983751990143934">"NEJ TACK"</string>
-    <string name="wifi_assistant_setup" msgid="3772423650475730906">"KONFIGURATION"</string>
-    <string name="wifi_assistant_card_message" msgid="107811647784658536">"Anslut automatiskt till tillgängliga nätverk med Wi-Fi Assistant."</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi‑Fi Assistant"</string>
-    <string name="wifi_assistant_title_message" msgid="6240721017579074015">"Du ansluts automatiskt till bästa tillgängliga Wi-Fi via <xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g>"</string>
-    <string name="wifi_assistant_open_app" msgid="4803044899535675063">"ÖPPNA APP"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Ansluten via Wi-Fi-assistent"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"Casta skärmen"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Aktivera Wi-Fi-skärmdelning"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Inga enheter fanns i närheten."</string>
@@ -592,7 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Wi-Fi-inställningar"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Ställ in och hantera trådlösa åtkomstpunkter"</string>
-    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Välj Wi-Fi"</string>
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Välj Wi‑Fi-nätverk"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Välj Wi-Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Wi-Fi aktiveras …"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Wi‑Fi inaktiveras …"</string>
@@ -607,8 +602,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"Inställningen \"sök alltid\" är tillgänglig"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Tillåt alltid skanning"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Tillåt att Googles platstjänst och andra appar söker efter nätverk, även när Wi-Fi inte har aktiverats"</string>
-    <string name="wifi_automatically_manage_title" msgid="6249976570008992746">"Hantera Wi-Fi automatiskt"</string>
-    <string name="wifi_automatically_manage_summary" msgid="6952470763378312488">"Låt <xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> hantera Wi-Fi-anslutningen"</string>
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Använd automatiskt öppna Wi-Fi"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Tillåt att en Wi-Fi-assistent ansluter till öppna nätverk som bedöms vara av hög kvalitet."</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Välja assistent"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Installera certifikat"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"För att bland annat noggrannheten i platsangivelsen ska förbättras kan Google och vissa appar söka efter nätverk i närheten även när Wi-Fi är avstängt. Om du inte vill att detta ska ske väljer du Avancerat &gt; Inställningen \"sök alltid\" är tillgänglig."</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Appar kan söka efter nätverk i närheten även om Wi-Fi är avstängt. Om du inte vill att det ska hända väljer du Avancerat &gt; Inställningen \"sök alltid\" är tillgänglig."</string>
@@ -629,6 +625,7 @@
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Skanna"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Avancerad"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Anslut till nätverk"</string>
+    <string name="wifi_menu_remember" msgid="8814185749388713796">"Kom ihåg nätverket"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Glöm nätverk"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Ändra nätverk"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Skriv till en NFC-tagg"</string>
@@ -673,9 +670,11 @@
     <string name="wifi_unspecified" msgid="5431501214192991253">"(ospecificerat)"</string>
     <string name="wifi_remembered" msgid="4955746899347821096">"Sparat"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"Inaktiverad"</string>
-    <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Undvek dålig Internetanslutning"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP-konfigurationsfel"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Wi-Fi-anslutningsfel"</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Autentiseringsproblem"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Utom räckhåll"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Ingen internetåtkomst hittades. Det går inte att återansluta automatiskt."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS tillgängligt"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS tillgängligt)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Ange nätverkslösenordet"</string>
@@ -699,9 +698,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"VARNING: Om du inaktiverar Wi‑Fi använder surfplattan bara mobildata för hämtningar och uppdateringar. Anslut till Wi-Fi-nätverket om du vill undvika eventuella dataavgifter."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"VARNING: Om du inaktiverar Wi‑Fi använder enheten bara mobildata för hämtningar och uppdateringar. Anslut till Wi-Fi-nätverket om du vill undvika eventuella dataavgifter."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"VARNING: Om du inaktiverar Wi‑Fi använder mobilen bara mobildata för hämtningar och uppdateringar. Anslut till Wi-Fi-nätverket om du vill undvika eventuella dataavgifter."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="2393880108322835846">"VARNING: Om du inaktiverar Wi‑Fi har surfplattan ingen internetanslutning för eventuella hämtningar eller uppdateringar."</string>
-    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1707391993265558787">"VARNING: Om du inaktiverar Wi‑Fi har enheten inte någon internetanslutning för eventuella hämtningar eller uppdateringar."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="1556858507920033022">"VARNING: Om du inaktiverar Wi‑Fi har mobilen ingen internetanslutning för eventuella hämtningar eller uppdateringar."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Om du inte använder Wi‑Fi:\n\nSurfplattan kommer inte att ha någon internetanslutning.\n\nDu får inte programvaruuppdateringar förrän du ansluter till internet.\n\nFunktioner för enhetsskydd kan inte aktiveras."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Om du inte använder Wi‑Fi:\n\nEnheten kommer inte att ha någon internetanslutning.\n\nDu får inga programvaruuppdateringar förrän du är ansluten till internet.\n\nFunktioner för enhetsskydd kan inte aktiveras."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Om du inte använder Wi‑Fi:\n\nMobilen kommer inte att ha någon internetanslutning.\n\nDu får inte programvaruuppdateringar förrän du ansluter till internet.\n\nFunktioner för enhetsskydd kan inte aktiveras."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Det gick inte att ansluta surfplattan till Wi-Fi-nätverket."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"Det gick inte att ansluta enheten till Wi-Fi-nätverket."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Det gick inte att ansluta mobilen till Wi-Fi-nätverket."</string>
@@ -761,7 +760,6 @@
     <string name="ring_volume_title" msgid="7938706566797464165">"Ringvolym"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrera vid tyst"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Standardljud för meddelanden"</string>
-    <string name="heads_up_enabled_title" msgid="1031078221910921622">"Popupfönster vid hög prioritet"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Ringsignal"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Avisering"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Använd volymen för inkommande samtal vid avisering"</string>
@@ -834,7 +832,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatisk ljusstyrka"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Gå ur viloläget vid lyft"</string>
     <string name="doze_title" msgid="2259176504273878294">"Omgivningsskärm"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"Väck skärm när en enheten upptäcks eller meddelanden kommer"</string>
+    <string name="doze_summary" msgid="7128970177894383698">"Aktivera skärmen när du tar upp enheten eller får aviseringar"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Teckenstorlek"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Teckenstorlek"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Låsinställningar för SIM-kort"</string>
@@ -862,6 +860,10 @@
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Avbryt"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"Flera SIM-kort har hittats"</string>
     <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>
@@ -1012,6 +1014,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Detta raderar all data från enhetens "<b>"interna lagringsutrymme"</b>", bland annat:\n\n"<li>"ditt Google-konto"</li>\n<li>"system- och appdata och inställningar"</li>\n<li>"hämtade appar"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Detta raderar all data från enhetens "<b>"interna lagringsutrymme"</b>", bland annat:\n\n"<li>"ditt Google-konto"</li>\n<li>"system- och appdata och inställningar"</li>\n<li>"hämtade appar"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Du är inloggad på följande konton:\n"</string>
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Det finns andra användare på enheten.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musik"</li>\n<li>"Foton"</li>\n<li>"Andra användardata"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Om du vill ta bort musik, bilder och andra användardata måste du radera "<b>"USB-lagringsenheten"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Om du vill ta bort musik, bilder och andra användardata måste du radera "<b>"SD-kortet"</b>"."</string>
@@ -1023,7 +1026,6 @@
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Återställ telefonen"</string>
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Vill du radera all personlig information och alla hämtade appar? Åtgärden kan inte ångras."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Radera allt"</string>
-    <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Rita ditt grafiska lösenord"</string>
     <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Du måste rita ditt grafiska lösenord om du vill återställa standardinställningarna."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Återställningen utfördes inte eftersom tjänsten för systemrensning inte är tillgänglig."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Vill du återställa?"</string>
@@ -1041,7 +1043,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"Vill du radera USB-lagringsenheten och ta bort alla filer? Åtgärden kan inte ångras."</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Vill du radera SD-kortet och alla filer på kortet? Åtgärden kan inte ångras."</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Radera allt"</string>
-    <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Rita ditt grafiska lösenord"</string>
     <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Du måste bekräfta att du vill rensa USB-lagringsenheten genom att rita ditt grafiska lösenord."</string>
     <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Du måste bekräfta att du vill rensa SD-kortet genom att rita ditt grafiska lösenord."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Samtalsinställningar"</string>
@@ -1087,6 +1088,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"För in SIM-kortet och starta om"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Anslut till internet"</string>
     <string name="location_title" msgid="1029961368397484576">"Min plats"</string>
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Jobbprofil"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Plats för jobbprofil"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Har inaktiverats av företaget"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Läge"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Hög precision"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Batterisparläge"</string>
@@ -1124,6 +1128,7 @@
     <string name="copyright_title" msgid="865906688917260647">"Upphovsrätt"</string>
     <string name="license_title" msgid="1990487604356037871">"Licens"</string>
     <string name="terms_title" msgid="7697580845616764642">"Användarvillkor"</string>
+    <string name="webview_license_title" msgid="2813507464175738967">"Systemets WebView-licens"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Bakgrunder"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Satellitbildsleverantörer:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Öppen källkodslicens"</string>
@@ -1237,7 +1242,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB-lagring"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"På SD-kort"</string>
     <string name="disabled" msgid="9206776641295849915">"Inaktiverat"</string>
-    <string name="not_installed" msgid="1475144352069281880">"Inte installerade"</string>
+    <string name="not_installed" msgid="2797554494953450291">"Ej installerad för användaren"</string>
     <string name="no_applications" msgid="7336588977497084921">"Inga appar."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Intern lagring"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB-lagring"</string>
@@ -1434,8 +1439,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Skärmen vilar aldrig när laddning pågår"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Aktivera HCI snoop-logg för Bluetooth"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Samla alla HCI-paket för Bluetooth i en fil"</string>
-    <string name="oem_unlock_enable" msgid="6629321276287913315">"Aktivera OEM-upplåsning"</string>
-    <string name="oem_unlock_enable_summary" msgid="3546686263996628110">"Tillåt OEM-upplåsning på enheten"</string>
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM-upplåsning"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Tillåt att bootloadern låses upp"</string>
+    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Ange pinkoden"</string>
+    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Ange enhetens pinkod om du vill aktivera OEM-upplåsning"</string>
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Vill du tillåta OEM-upplåsning?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"Varning! Funktionerna för enhetsskydd fungerar inte på enheten när den här inställningen är aktiverad."</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Certifiering för Wi-Fi-skärmdelning"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Aktivera utförlig loggning för Wi-Fi"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Aggressiv överlämning fr. Wi-Fi t. mobil"</string>
@@ -1538,6 +1547,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"Textstilen kommer att se ut så här"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"Standard"</string>
+    <string name="color_title" msgid="4258931051732243983">"Färg"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"Standard"</string>
     <string name="color_none" msgid="3475640044925814795">"Ingen"</string>
     <string name="color_white" msgid="8045195170201590239">"Vit"</string>
@@ -1595,12 +1605,12 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"<xliff:g id="REMAIN">%1$s</xliff:g> återstår"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"Ladda i <xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> till"</string>
-    <string name="power_discharging_duration" msgid="7125493014448497620">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – ca <xliff:g id="TIME">%2$s</xliff:g> kvar"</string>
-    <string name="power_charging" msgid="712751285832976915">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – <xliff:g id="STATE">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration" msgid="4802183864773082009">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – <xliff:g id="TIME">%2$s</xliff:g> till fulladdat"</string>
-    <string name="power_charging_duration_ac" msgid="3611179931297824699">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – <xliff:g id="TIME">%2$s</xliff:g> till fulladdat via laddare"</string>
-    <string name="power_charging_duration_usb" msgid="1106605348913397583">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – <xliff:g id="TIME">%2$s</xliff:g> till fulladdat via USB"</string>
-    <string name="power_charging_duration_wireless" msgid="633606920144617227">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – <xliff:g id="TIME">%2$s</xliff:g> till fulladdat m. trådlös laddning"</string>
+    <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> – ca <xliff:g id="TIME">%2$s</xliff:g> kvar"</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> till fulladdat"</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> till fulladdat via laddare"</string>
+    <string name="power_charging_duration_usb" msgid="182405645340976546">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> till fulladdat via USB"</string>
+    <string name="power_charging_duration_wireless" msgid="1829295708243159464">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> till fulladdat via trådlös laddning"</string>
     <string name="power_usage_list_summary" msgid="2409288197839512482">"Användning sedan senaste fulladdning"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Batteriförbrukning sedan bortkoppling"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Batteriförbrukning sedan återställning"</string>
@@ -1617,7 +1627,6 @@
     <string name="awake" msgid="387122265874485088">"Aktiv tid för enheten"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi i tid"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi i tid"</string>
-    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Detaljerad historik"</string>
     <string name="details_title" msgid="3792801565213935385">"Information om förbrukning"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Information om användning"</string>
@@ -1689,7 +1698,7 @@
     <string name="battery_saver" msgid="1426682272004907982">"Batterisparläge"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Aktivera automatiskt"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Aldrig"</string>
-    <string name="battery_saver_turn_on_automatically_pct" msgid="3033681629861428940">"vid batteri på %1$d%%"</string>
+    <string name="battery_saver_turn_on_automatically_pct" msgid="7536784431655058267">"när batteriet är på %1$s"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Processtatistik"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Nördig statistik om processer som körs"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Minnesanvändning"</string>
@@ -1710,7 +1719,7 @@
     <string name="mem_use_native_type" msgid="5976704902328347400">"Inbyggt"</string>
     <string name="mem_use_kernel_cache_type" msgid="6411475064463957513">"Cacheminne (kärna)"</string>
     <string name="mem_use_zram_type" msgid="9087217476795358232">"ZRam-växling"</string>
-    <string name="mem_use_free_type" msgid="717708548454880840">"Gratis"</string>
+    <string name="mem_use_free_type" msgid="717708548454880840">"Tillgängligt"</string>
     <string name="mem_use_total" msgid="6308786055749777934">"Totalt"</string>
     <string name="menu_duration_3h" msgid="4714866438374738385">"3 timmar"</string>
     <string name="menu_duration_6h" msgid="1940846763432184132">"6 timmar"</string>
@@ -1813,7 +1822,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Maskinvarustöd"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Endast programvara"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"Användaruppgifter är inte tillgängliga för den här användaren"</string>
-    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Rita ditt grafiska lösenord"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Du måste rita ditt grafiska lösenord för att bekräfta uppgifterna."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Ange lösenordet för uppgiftslagring."</string>
@@ -1843,6 +1851,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"Inkludera appdata"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Automatisk återställning"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"När du installerar om en app återställs säkerhetskopierade inställningar och data"</string>
+    <string name="backup_inactive_title" msgid="5355557151569037197">"Säkerhetskopieringstjänsten är inaktiv."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"Detta anges i enhetspolicyn."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Lösenord för säkerhetskopia av datorn"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"De fullständiga säkerhetskopiorna av datorn är för närvarande inte skyddade"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Tryck om du vill ändra eller ta bort lösenordet för fullständig säkerhetskopiering av datorn"</string>
@@ -1952,7 +1962,11 @@
     <string name="enter_password" msgid="8035706727471334122">"Starta Android genom att ange ditt lösenord"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Starta Android genom att ange din pinkod"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Starta Android genom att rita ditt mönster"</string>
-    <string name="try_again" msgid="4272075051293936921">"Försök igen."</string>
+    <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"Fel grafiskt lösenord"</string>
+    <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"Fel lösenord"</string>
+    <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"Fel pinkod"</string>
+    <string name="checking_decryption" msgid="8287458611802609493">"Kontrollerar …"</string>
+    <string name="starting_android" msgid="8581493237458496835">"Android startas"</string>
     <string name="delete" msgid="4219243412325163003">"Ta bort"</string>
     <string name="misc_files" msgid="6720680815969643497">"Misc-filer"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"<xliff:g id="NUMBER">%1$d</xliff:g> av <xliff:g id="TOTAL">%2$d</xliff:g> har valts"</string>
@@ -1990,8 +2004,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Använd alltid GPU för skärmsammansättning"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"Simulera färgrymd"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Aktivera OpenGL-spår"</string>
-    <string name="use_nuplayer" msgid="5699257393367904387">"Använd NuPlayer (exp.)"</string>
-    <string name="use_nuplayer_summary" msgid="1991479067478516714">"Använd NuPlayer i stället för AwesomePlayer"</string>
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"Använd AwesomePlayer (utfasad)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"Använd AwesomePlayer i stället för NuPlayer"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"Inaktivera ljud via USB"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"Inaktivera autom. ljudomkoppling till USB-enheter"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Visa layoutgränser"</string>
@@ -2167,7 +2181,6 @@
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Lägg till användare eller profil"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Lägg till användare"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Begränsad profil"</string>
-    <string name="user_summary_managed_profile" msgid="7369539529693048111">"Jobbprofil"</string>
     <string name="user_need_lock_message" msgid="2596365678651842785">"Innan du skapar en begränsad profil måste du konfigurera ett skärmlås för att skydda dina appar och personliga data."</string>
     <string name="user_set_lock_button" msgid="8311219392856626841">"Konfigurera lås"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Inte konfigurerad"</string>
@@ -2298,11 +2311,13 @@
     <string name="sim_cellular_data_unavailable_summary" msgid="3654805961942166428">"Tryck om du vill välja ett SIM-kort för mobildata"</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"Använd alltid för samtal"</string>
     <string name="select_sim_for_data" msgid="2366081042162853044">"Välj ett SIM-kort för data"</string>
+    <string name="data_switch_started" msgid="2040761479817166311">"Byter data-SIM-kort. Det kan ta upp till en minut ..."</string>
     <string name="select_sim_for_calls" msgid="3503094771801109334">"Ring med"</string>
     <string name="sim_select_card" msgid="211285163525563293">"Välj ett SIM-kort"</string>
     <string name="sim_card_number_title" msgid="7845379943474336488">"SIM-kort <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"SIM-kortet är tomt"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"Namn på SIM-kort"</string>
+    <string name="sim_name_hint" msgid="7038643345238968930">"Ange SIM-namn"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"SIM-kortsplats %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Operatör"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Nummer"</string>
@@ -2312,7 +2327,6 @@
     <string name="color_purple" msgid="3888532466427762504">"Lila"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"Inga SIM-kort har anslutits"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"Status för SIM-kort"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"Information om SIM-kort"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"Ring upp från standard-SIM-kort"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"SIM-kort för utgående samtal"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Övriga samtalsinställningar"</string>
@@ -2320,8 +2334,11 @@
     <string name="preferred_network_offload_header" msgid="2321173571529106767">"Inakt. nätverksnamnsändn."</string>
     <string name="preferred_network_offload_footer" msgid="5857279426054744020">"Inaktivera Sändning av nätverksnamn och skydda dig från att tredje part får tillgång till nätverksinformation."</string>
     <string name="preferred_network_offload_popup" msgid="2252915199889604600">"Inaktivera sändning av nätverksnamn om du vill förhindra automatisk anslutning till dolda nätverk."</string>
+    <string name="sim_signal_strength" msgid="9144010043784767984">"<xliff:g id="DBM">%1$d</xliff:g> dBm <xliff:g id="ASU">%2$d</xliff:g> asu"</string>
+    <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>
+    <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Fråga varje gång"</string>
     <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>
@@ -2330,22 +2347,22 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Senaste sökningar"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Resultat"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi-nätverksanslutning"</string>
-    <string name="keywords_more_default_sms_app" msgid="2744404159003574745">"sms"</string>
-    <string name="keywords_more_mobile_networks" msgid="7813380887358745769">"mobiltelefon mobiloperatör trådlös"</string>
+    <string name="keywords_more_default_sms_app" msgid="895656981962034647">"textmeddelande sms:a meddelanden skicka sms"</string>
+    <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"mobiltelefon mobil operatör trådlös data 4g 3g 2g lte"</string>
     <string name="keywords_home" msgid="3626170808219458848">"översikt"</string>
     <string name="keywords_display" msgid="6709007669501628320">"skärm pekskärm"</string>
-    <string name="keywords_display_brightness_level" msgid="8636451602230815191">"sänk ljusstyrka skärm pekskärm"</string>
-    <string name="keywords_display_auto_brightness" msgid="8070218600502753102">"sänk ljusstyrka skärm pekskärm"</string>
-    <string name="keywords_display_wallpaper" msgid="4315466287469834939">"bakgrund"</string>
+    <string name="keywords_display_brightness_level" msgid="8923289340474728990">"tona ned skärm pekskärm batteri"</string>
+    <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"tona ned skärm pekskärm batteri"</string>
+    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"bakgrund anpassa skärm"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"textstorlek"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"projekt"</string>
-    <string name="keywords_storage" msgid="7007275853993419928">"utrymme lagringsenhet hårddisk"</string>
-    <string name="keywords_battery" msgid="3992479295298655138">"strömförsörjning"</string>
-    <string name="keywords_spell_checker" msgid="4509482591225399210">"stavning"</string>
+    <string name="keywords_storage" msgid="6572905220031852173">"utrymme disk hårddisk enhet användning"</string>
+    <string name="keywords_battery" msgid="2096185085932675704">"energianvändning laddning"</string>
+    <string name="keywords_spell_checker" msgid="6106749039734174140">"stavning ordbok stavningskontroll autokorrigering"</string>
     <string name="keywords_voice_input" msgid="3519547605812413860">"igenkännare inmatning tal tala språk handsfree hands-free igenkänning stötande ord ljud historik bluetooth mikrofonlurar"</string>
-    <string name="keywords_text_to_speech_output" msgid="8207889472282225512">"frekvens språk standard tala talar"</string>
-    <string name="keywords_date_and_time" msgid="7666950126499155141">"klocka"</string>
-    <string name="keywords_factory_data_reset" msgid="3693730656843989732">"rensa radera"</string>
+    <string name="keywords_text_to_speech_output" msgid="392447904221657930">"betyg språk standardinställning tala talar tts tillgänglighet läsare blind"</string>
+    <string name="keywords_date_and_time" msgid="2631808108134830066">"klocka 24-timmarsformat"</string>
+    <string name="keywords_factory_data_reset" msgid="4355133848707691977">"rensa radera återställa ta bort"</string>
     <string name="keywords_printing" msgid="1701778563617114846">"skrivare"</string>
     <string name="keywords_sounds_and_notifications" msgid="5965996187974887000">"högtalare pip"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="2912933812460077912">"stör inte avbryt avbrott paus"</string>
@@ -2354,7 +2371,7 @@
     <string name="keywords_location_mode" msgid="8584992704568356084">"exakthet"</string>
     <string name="keywords_accounts" msgid="1957925565953357627">"konto"</string>
     <string name="keywords_users" msgid="4673901601478559100">"begränsning begränsa begränsad"</string>
-    <string name="keywords_keyboard_and_ime" msgid="1103378692379215672">"textkorrigering korrigera ljud vibrera automatiskt språk rörelse föreslå förslag tema stötande ord skriva emoji"</string>
+    <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"textkorrigering korrigera ljud vibrera automatiskt språk gest föreslå förslag tema stötande ord skriva emoji internationell"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"dra lösenord mönster pinkod"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Ange en NFC-tagg för Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Skriv"</string>
@@ -2371,7 +2388,6 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Aviseringsvolym"</string>
     <string name="zen_mode_settings_title" msgid="7014915558669122902">"Avbrott"</string>
     <string name="zen_mode_option_title" msgid="5061978632306007914">"Vid inkommande samtal och aviseringar"</string>
-    <string name="zen_mode_option_title_novoice" msgid="6680706009915204785">"När aviseringar tas emot"</string>
     <string name="zen_mode_option_off" msgid="3167702608910820883">"Avbryt alltid"</string>
     <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Tillåt bara prioriterade avbrott"</string>
     <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Avbryt inte"</string>
@@ -2429,14 +2445,17 @@
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Klart"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Tills du inaktiverar detta"</string>
     <string name="zen_mode_important_category" msgid="8123274463331022993">"Prioriterade avbrott"</string>
-    <string name="zen_mode_downtime_category" msgid="4730179065426038108">"Avbrottstid (endast prioriterade avbrott)"</string>
+    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Avbrottstid"</string>
     <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Dagar"</string>
     <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Ingen"</string>
+    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Avbrott tillåts"</string>
+    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Endast prioriterade"</string>
+    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Ingen"</string>
     <string name="zen_mode_automation_category" msgid="4653551005950835761">"Automatisering"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Aktivera automatiskt"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Aldrig"</string>
-    <string name="zen_mode_phone_calls" msgid="8956214416859303966">"Samtal"</string>
+    <string name="zen_mode_calls" msgid="7051492091133751208">"Samtal"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Meddelanden"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Samtal/meddelanden från"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Vem som helst"</string>
@@ -2450,15 +2469,21 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Veckodagskvällar"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Starttid"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Sluttid"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> nästa dag"</string>
+    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> nästa dag"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> eller vid tidigare alarm"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> nästa dag eller vid tidigare alarm"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Appaviseringar"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Aviseringsinställningar"</string>
-    <string name="device_feedback" msgid="3238056036766293294">"Skicka feedback om den här enhet"</string>
+    <string name="device_feedback" msgid="3238056036766293294">"Skicka feedback om den här enheten"</string>
     <string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Ange administratörspinkod"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"På"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Av"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"Fästa skärmen"</string>
-    <string name="screen_pinning_description" msgid="7091642350452605379">"När funktionen är aktiverad kan du fästa skärmen så att den visas tills du lossar den igen.\n\nSå här fäster du skärmen:\n\n1. Kontrollera att funktionen är aktiverad.\n\n2. Öppna skärmen som du vill fästa.\n\n3. Tryck på Översikt.\n\n4. Tryck på nålikonen."</string>
+    <string name="screen_pinning_description" msgid="1137904524037468263">"När inställningen är aktiverad kan du fästa skärmen så att den visas tills du lossar den igen.\n\nSå här fäster du skärmen:\n\n1. Kontrollera att funktionen är aktiverad.\n\n2. Öppna skärmen som du vill fästa.\n\n3. Tryck på Översikt.\n\n4. Dra uppåt och tryck sedan på nålikonen."</string>
+    <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Be om grafiskt lösenordet innan skärmen lossas"</string>
+    <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Be om pinkod innan skärmen lossas"</string>
+    <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Be om lösenord innan skärmen lossas"</string>
+    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Lås enheten när skärmen lossas"</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Arbetsprofil"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(experimentellt)"</string>
     <string name="display_auto_rotate_title" msgid="6176450657107806043">"När enheten roterar"</string>
@@ -2467,7 +2492,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Fortsätt använda liggande riktning"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Fortsätt använda aktuell riktning"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"Information om IMEI-kod"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"Relativ information om IMEI-kod"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Kryptering"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Fortsätt"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"Du kan skydda enheten ytterligare genom att kräva att pinkoden ska anges innan den startar. Det går inte att ta emot samtal, meddelanden eller aviseringar, inklusive alarm, innan enheten har startats. \n\nDetta skyddar data i enheter som har kommit bort eller stulits."</string>
@@ -2485,4 +2509,7 @@
     <string name="encrypt_talkback_dialog_message_pin" msgid="1890374082842868489">"Tillgänglighetstjänster som <xliff:g id="SERVICE">%1$s</xliff:g> kommer inte att vara tillgängliga när du anger pinkoden och startar enheten."</string>
     <string name="encrypt_talkback_dialog_message_pattern" msgid="4474332516537386384">"Tillgänglighetstjänster som <xliff:g id="SERVICE">%1$s</xliff:g> kommer inte att vara tillgängliga när du ritar ditt mönster och startar enheten."</string>
     <string name="encrypt_talkback_dialog_message_password" msgid="8166099418487083927">"Tillgänglighetstjänster som <xliff:g id="SERVICE">%1$s</xliff:g> kommer inte att vara tillgängliga när du anger lösenordet och startar enheten."</string>
+    <string name="imei_information_title" msgid="8499085421609752290">"Information om IMEI-kod"</string>
+    <string name="imei_information_summary" msgid="2074095606556565233">"Relativ information om IMEI-kod"</string>
+    <string name="slot_number" msgid="3762676044904653577">"(Plats <xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-sw/arrays.xml b/res/values-sw/arrays.xml
index 4213a18..2ef1f02 100644
--- a/res/values-sw/arrays.xml
+++ b/res/values-sw/arrays.xml
@@ -527,4 +527,12 @@
     <item msgid="4338089220026248848">"Imewekwa akiba (kiteja cha shughuli)"</item>
     <item msgid="6652164677254579050">"Imewekwa akiba (tupu)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Teal"</item>
+    <item msgid="8332294763632946560">"Samawati"</item>
+    <item msgid="2023216417616991392">"Bluu"</item>
+    <item msgid="3170497246594232819">"Zambarau"</item>
+    <item msgid="4608643045752965568">"Waridi"</item>
+    <item msgid="6131821495505931173">"Nyekundu"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index eeea70c..d2abdc9 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>
@@ -182,7 +182,6 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s inataka kufikia ujumbe wako. Ruhusu ufikiaji kwa %2$s?"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Tarehe na saa"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Chagua saa za eneo"</string>
-    <string name="normal_date_format" msgid="7636406984925498359">"Mkoa ( <xliff:g id="DATE">%s</xliff:g> )"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Hakiki:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Ukubwa wa maandishi:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -293,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>
@@ -324,8 +323,6 @@
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Chagua saa za eneo"</string>
     <string name="date_time_set_date_title" msgid="6928286765325608604">"Tarehe"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"Weka tarehe"</string>
-    <string name="date_time_date_format_title" msgid="3976171711988766411">"Mpangilio wa tarehe"</string>
-    <string name="date_time_date_format" msgid="6951498879879281102">"Chagua mpangilio wa tarehe"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Panga kialfabeti"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Panga kulingana na saa za eneo"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Tarehe"</string>
@@ -374,7 +371,8 @@
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Tafadhali subiri wakati simu yako inasimba. Asilimia <xliff:g id="PERCENT">^1</xliff:g> imekamilika."</string>
     <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Tafadhali subiri wakati kompyuta yako kibao inasimbwa kwa njia fiche. Muda uliosalia: <xliff:g id="DURATION">^1</xliff:g>"</string>
     <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Tafadhali subiri wakati simu yako inasimbwa kwa njia fiche. Muda uliosalia: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Jaribu tena baada ya sekunde <xliff:g id="DELAY">^1</xliff:g>."</string>
+    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"Ili ufungue komputa kibao yako, izime na kisha uwashe."</string>
+    <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"Ili ufungue simu yako, izime na kisha uwashe."</string>
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"Onyo: Data iliyomo kwenye kifaa chako itafutwa baada ya kushindikana kwa majaribio <xliff:g id="COUNT">^1</xliff:g> zaidi ya kukifungua!"</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Andika nenosiri yako"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Usimbaji fiche haujafanikiwa"</string>
@@ -403,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>
@@ -414,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>
@@ -548,13 +548,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Kama simu ya spika"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Kwa muziki na midia"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Kumbuka mipangilio"</string>
-    <string name="wifi_assistant_intro_setup" msgid="4605105515416995110">"Mpya\nKisaidizi cha Wi‑Fi"</string>
-    <string name="wifi_assistant_no_thanks" msgid="2776983751990143934">"HAPANA, ASANTE"</string>
-    <string name="wifi_assistant_setup" msgid="3772423650475730906">"SANIDI"</string>
-    <string name="wifi_assistant_card_message" msgid="107811647784658536">"Unganisha kiotomatiki kwenye mitandao inayopatikana kwa kutumia programu ya Kisaidizi cha Wi-Fi."</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Kisaidizi cha Wi-Fi"</string>
-    <string name="wifi_assistant_title_message" msgid="6240721017579074015">"<xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> hukuunganisha kiotomatiki kwenye Wi-Fi bora zaidi inayopatikana"</string>
-    <string name="wifi_assistant_open_app" msgid="4803044899535675063">"FUNGUA PROGRAMU"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Imeunganishwa kupitia Kisaidizi cha Wi-Fi"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"Utumaji wa Skrini"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Washa kuonyesha skrini bila kutumia waya"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Hakuna vifaa vilivyopatikana karibu."</string>
@@ -584,7 +579,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Mipangilio ya Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Weka na udhibiti vituo vya kufikia mitandao-hewa"</string>
-    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Chagua Wi-Fi"</string>
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Chagua mtandao wa Wi-Fi"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Chagua Wi-Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Inawasha Wi-Fi..."</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Inazima Wi-Fi..."</string>
@@ -599,8 +594,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"Angalia Mitandao Inayopatikana"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Ruhusu uchanganuzi wakati wote"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Ruhusu huduma ya Google ya kutambua mahali na programu zingine ziangalie mitandao inayopatikana, hata wakati Wi-Fi imezimwa"</string>
-    <string name="wifi_automatically_manage_title" msgid="6249976570008992746">"Simamia Wi-Fi kiotomatiki"</string>
-    <string name="wifi_automatically_manage_summary" msgid="6952470763378312488">"Ruhusu <xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> isimamie muunganisho wako wa Wi-Fi"</string>
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Tumia Wi-Fi huru kiotomatiki"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Ruhusu kisaidizi cha Wi-Fi kiunganishe kiotomatiki kwenye mitandao huru iliyotambuliwa kuwa ya ubora wa juu"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Chagua kisaidizi"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Sakinisha vyeti"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Ili kuboresha usahihi wa eneo na kwa ajili ya madhumuni mengine, Google na programu nyingine huchanganua kutafuta mitandao iliyokaribu, hata wakati Wi-Fi imezimwa. Ikiwa hutaki hili litokee, nenda kwenye &gt; Uchanganuzi Mahiri unapatikana wakati wote."</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Programu zinaweza kuchanganua kutafuta mitandao iliyokaribu, hata wakati Wi-Fi imezimwa. Ikiwa hutaki hili litokee, nenda kwenye &gt; Uchanganuzi Mahiri unapatikana wakati wote."</string>
@@ -621,6 +617,7 @@
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Tafuta"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Mipangilio ya kina"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Unganisha kwa mtandao"</string>
+    <string name="wifi_menu_remember" msgid="8814185749388713796">"Kumbuka mtandao"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Sahau mtandao"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Mtandao umerekebishwa"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Andika kwenye tagi ya NFC"</string>
@@ -665,9 +662,11 @@
     <string name="wifi_unspecified" msgid="5431501214192991253">"(haijabainishwa)"</string>
     <string name="wifi_remembered" msgid="4955746899347821096">"Imehifadhiwa"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"Imelemazwa"</string>
-    <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Kuepukwa muunganisho mbaya wa Tovuti"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"Haikuweza Kusanidi IP"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Haikuweza Kuunganisha kwenye WiFi"</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Tatizo la uthibitishaji"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Haiko karibu"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Hakuna Ufikiaji kwa Intaneti Uliogunduliwa, haitaweza kuunganisha kiotomatiki."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS inapatikana"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" WPS inapatikana"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Weka nenosiri la mtandao wako"</string>
@@ -691,9 +690,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"ONYO: Kama utaruka hatua ya kuunganisha Wi-Fi, kompyuta kibao itatumia intaneti ya mitandao ya simu pekee kupakua programu na masasisho ya kwanza. Ili uepuke uwezekano wa kutozwa kwa matumizi ya data, unganisha Wi-Fi."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"ONYO: Kama utaruka hatua ya kuunganisha Wi-Fi, kifaa chako kitatumia intaneti ya mitandao ya simu pekee kupakua programu na masasisho ya kwanza. Ili uepuke uwezekano wa kutozwa kwa matumizi ya data, unganisha Wi-Fi."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"ONYO: Kama utaruka hatua ya kuunganisha Wi-Fi, kifaa chako kitatumia intaneti ya mitandao ya simu pekee kupakua programu na masasisho ya kwanza. Ili uepuke uwezekano wa kutozwa kwa matumizi ya data, unganisha Wi-Fi."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="2393880108322835846">"ONYO: Kama utaruka hatua ya kuunganisha Wi-Fi, kompyuta kibao haitakuwa na muunganisho wa Intaneti wa kutumia kupakua programu au masasisho yoyote ya kwanza."</string>
-    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1707391993265558787">"ONYO: Kama utaruka hatua ya kuunganisha Wi-Fi, kifaa chako hakitakuwa na muunganisho wa Intaneti wa kutumia kupakua programu au masasisho yoyote ya kwanza."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="1556858507920033022">"ONYO: Kama utaruka hatua ya kuunganisha Wi-Fi, simu yako haitakua na muunganisho wa Intaneti wa kutumia kufanya upakuaji au masasisho yoyote ya mwanzo."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Ukiruka Wi-Fi:\n\nKompyuta yako kibao haitakuwa na muuganisho wa Intaneti.\n\nHutapata masasisho ya programu hadi utakapounganisha kwenye Intaneti.\n\nHuwezi kuanza kutumia vipengele vya ulinzi wa kifaa kwa wakati huu."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Ukiruka Wi-Fi:\n\nKifaa chako hakitakuwa na muuganisho wa Intaneti.\n\nHutapata masasisho ya programu hadi utakapounganisha kwenye Intaneti.\n\nHuwezi kuanza kutumia vipengele vya ulinzi wa kifaa kwa wakati huu."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Ukiruka Wi-Fi:\n\nSimu yako haitakuwa na muuganisho wa Intaneti.\n\nHutapata masasisho ya programu hadi utakapounganisha kwenye Intaneti.\n\nHuwezi kuanza kutumia vipengele vya ulinzi wa kifaa kwa wakati huu."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Kompyuta kibao haikuweza kuunganishwa kwenye mtandao huu wa Wi-Fi."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"Kifaa hakikuweza kuunganisha kwenye mtandao huu wa Wi-Fi."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Simu haikuweza kuunganishwa kwenye mtandao huu wa Wi-Fi."</string>
@@ -753,7 +752,6 @@
     <string name="ring_volume_title" msgid="7938706566797464165">"Sauti ya Mlio"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Tetema wakati imenyamaza"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Sauti chaguo-msingi ya arifa"</string>
-    <string name="heads_up_enabled_title" msgid="1031078221910921622">"Chomoza ikiwa kipaumbele cha kwanza"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Mlio wa simu"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Arifa"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Tumia sauti ya simu inayoingia kwa arifa"</string>
@@ -826,7 +824,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Mwangaza wa kiotomatiki"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Inua ili uondoe kifaa katika hali tuli"</string>
     <string name="doze_title" msgid="2259176504273878294">"Onyesho la vipengele vyote"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"Anzisha skrini kifaa kinapoinuliwa au arifa zinapowasili"</string>
+    <string name="doze_summary" msgid="7128970177894383698">"Ondoa skrini katika hali tuli unapopokea simu kwenye kifaa au kupokea arifa"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Ukubwa wa maandishi"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Ukubwa wa fonti"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Mipangilio ya kuzima SIM"</string>
@@ -854,6 +852,10 @@
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Ghairi"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"SIM nyingi zimepatikana"</string>
     <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">"Unataka kubadili SIM kadi?"</string>
+    <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> ndiyo SIM ya pekee katika kifaa chako. Unataka kutumia SIM hii kupata huduma ya data, 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>
@@ -869,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>
@@ -1004,6 +1006,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Hii itafuta data yote kutoka hifadhi yako iliyo "<b>"ndani ya kompyuta kibao"</b>", pamoja na:\n \n "<li>" Akaunti yako ya Google"</li>" \n "<li>"Data na mipangilio ya mfumo na programu"</li>" \n "<li>"Programu zilizopakuliwa"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Hii itafuta data yote kutoka hifadhi yako iliyo "<b>"ndani ya simu"</b>", pamoja na:\n \n "<li>"Akaunti yako ya Google"</li>" \n "<li>"Data na mipangilio ya mfumo na programu"</li>" \n "<li>"programu zilizopakuliwa"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Kwa sasa umeingia kwenye akaunti zifuatazo:\n"</string>
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Kuna watumiaji wengine waliopo kwenye kifaa hiki.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Muziki"</li>\n<li>"Picha"</li>\n<li>"data nyingine ya mtumiaji"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Ili kufuta pia muziki, picha, na data zingine za mtumiaji, "<b>" hifadhi ya "</b>" inahitaji kufutwa."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Ili kufuta muziki, picha, na data zingine za mtumiaji, "<b>"kadi ya"</b>" inahitaji kufutwa."</string>
@@ -1015,7 +1018,6 @@
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Rejesha mipangilio ya mwanzoni ya simu"</string>
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Ungependa kufuta taarifa zako zote za kibinafsi na zilizopakuliwa? Hauwezi kutendua hatua hii!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Futa kila kitu"</string>
-    <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Mchoro wa kufungua"</string>
     <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Unahitaji kuweka mchoro wa kufungua ili uthibitishe urejeshaji mipangilio ambayo ilitoka nayo kiwandani."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Hakuna mpangilio mpya uliofanywa kwa sababu huduma ya Mfumo wa Kufuta haipatikani."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Iwekwe upya?"</string>
@@ -1033,7 +1035,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"Futa hifadhi ya USB, inafuta faili zote zilizohifadhiwa hapo? Hatua hii haiwezi kutenguliwa!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Futa kadi ya SD, inafuta faili zote zilizohifadhiwa huko? Hauwezi kutengua hatua hii!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Futa kila kitu"</string>
-    <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Chora mchoro wako wa kufungua"</string>
     <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Unahitaji kuweka mchoro wako wa kufungua ili uthibitishe kwamba unataka kufuta hifadhi ya USB."</string>
     <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Unahitaji kuweka mchoro wako wa kufungua ili uthibitishe kwamba unataka kufuta kadi ya SD."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Mipangilio ya simu"</string>
@@ -1081,6 +1082,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Tafadhali weka SIM kadi kisha uzime na uwashe"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Tafadhali unganisha kwenye Intaneti"</string>
     <string name="location_title" msgid="1029961368397484576">"Mahali pangu"</string>
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Wasifu wa kazini"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Eneo la wasifu wa kazini"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Imezimwa na kampuni yako"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Hali"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Usahihi wa hali ya juu"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Inayookoa betri"</string>
@@ -1115,9 +1119,10 @@
     <string name="legal_information" msgid="5769301644270604095">"Maelezo ya kisheria"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Wachangiaji"</string>
     <string name="regulatory_information" msgid="5695464367088752150">"Maelezo ya udhibiti"</string>
-    <string name="copyright_title" msgid="865906688917260647">"Hakimilki"</string>
+    <string name="copyright_title" msgid="865906688917260647">"Hakimiliki"</string>
     <string name="license_title" msgid="1990487604356037871">"Leseni"</string>
     <string name="terms_title" msgid="7697580845616764642">"Sheria na Masharti"</string>
+    <string name="webview_license_title" msgid="2813507464175738967">"Leseni ya WebView ya Mfumo"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Mandhari"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Watoa huduma wa picha za setilaiti: \n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Chanzo cha leseni huria"</string>
@@ -1200,7 +1205,7 @@
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"Kadi ya SD"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Ondoa"</string>
     <string name="uninstall_all_users_text" msgid="851857393177950340">"Ondolea watumiaji wote"</string>
-    <string name="install_text" msgid="884360662922471113">"Sakinisha"</string>
+    <string name="install_text" msgid="884360662922471113">"Weka"</string>
     <string name="disable_text" msgid="6544054052049395202">"Zima"</string>
     <string name="enable_text" msgid="9217362512327828987">"Washa"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Futa data"</string>
@@ -1231,7 +1236,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Hifadhi ya USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Kwenye kadi ya SD"</string>
     <string name="disabled" msgid="9206776641295849915">"Imelemazwa"</string>
-    <string name="not_installed" msgid="1475144352069281880">"Haijasakinishwa"</string>
+    <string name="not_installed" msgid="2797554494953450291">"Haijasanidiwa kwa mtumiaji huyu"</string>
     <string name="no_applications" msgid="7336588977497084921">"Hakuna programu."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Hifadhi ya ndani"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Hifadhi ya USB"</string>
@@ -1428,8 +1433,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Skrini haitawahi kuzima wakati unachaji"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Washa kumbukumbu ya Bluetooth HCI Snoop"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Nasa pakiti zote za Bluetooth HCI katika faili"</string>
-    <string name="oem_unlock_enable" msgid="6629321276287913315">"Washa kufungua kwa OEM"</string>
-    <string name="oem_unlock_enable_summary" msgid="3546686263996628110">"Ruhusu kifaa kifunguliwe kwa OEM"</string>
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"Ufunguaji wa OEM"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Ruhusu bootloader ifunguliwe"</string>
+    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Weka PIN yako"</string>
+    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Weka PIN ya kifaa chako ili uwashe kipengele cha fungua kwa OEM"</string>
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Je, ungependa kuruhusu ufunguaji wa OEM?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"ONYO: Vipengele vya ulinzi wa kifaa havitafanya kazi kwenye kifaa hiki wakati mpangilio huu umewashwa."</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Chaguo za cheti cha kuonyesha pasiwaya"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Washa Uwekaji kumbukumbu za WiFi kutumia Sauti"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Ukabidhi kutoka Wifi kwenda Mtandao wa Simu"</string>
@@ -1532,6 +1541,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"Manukuu yataonekana hivi"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"Chaguo-msingi"</string>
+    <string name="color_title" msgid="4258931051732243983">"Rangi"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"Chaguo-msingi"</string>
     <string name="color_none" msgid="3475640044925814795">"Hakuna"</string>
     <string name="color_white" msgid="8045195170201590239">"Nyeupe"</string>
@@ -1589,12 +1599,12 @@
     <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">"Imesalia <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> chaji ijae"</string>
-    <string name="power_discharging_duration" msgid="7125493014448497620">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - imesalia takribani <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="power_charging" msgid="712751285832976915">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="STATE">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration" msgid="4802183864773082009">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - imebakisha <xliff:g id="TIME">%2$s</xliff:g> ijae"</string>
-    <string name="power_charging_duration_ac" msgid="3611179931297824699">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - imebakisha <xliff:g id="TIME">%2$s</xliff:g> ijae kupitia AC"</string>
-    <string name="power_charging_duration_usb" msgid="1106605348913397583">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - imebakisha <xliff:g id="TIME">%2$s</xliff:g> ijae kupitia USB"</string>
-    <string name="power_charging_duration_wireless" msgid="633606920144617227">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - imebakisha <xliff:g id="TIME">%2$s</xliff:g> ijae kupitia chaja isiyotumia waya"</string>
+    <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> - imesalia takriban <xliff:g id="TIME">%2$s</xliff:g>"</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> - imesalia <xliff:g id="TIME">%2$s</xliff:g> hadi ijae"</string>
+    <string name="power_charging_duration_ac" msgid="3969186192576594254">"<xliff:g id="LEVEL">%1$s</xliff:g> - imesalia <xliff:g id="TIME">%2$s</xliff:g> hadi ijae kwa kutumia AC"</string>
+    <string name="power_charging_duration_usb" msgid="182405645340976546">"<xliff:g id="LEVEL">%1$s</xliff:g>%% - imesalia <xliff:g id="TIME">%2$s</xliff:g> hadi ijae kwa kutumia USB"</string>
+    <string name="power_charging_duration_wireless" msgid="1829295708243159464">"<xliff:g id="LEVEL">%1$s</xliff:g> - imesalia <xliff:g id="TIME">%2$s</xliff:g> hadi ijae kwa isiyotumia waya"</string>
     <string name="power_usage_list_summary" msgid="2409288197839512482">"Matumizi tangu mwisho ilipojazwa chaji"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Utumizi wa betri tangu kuchopolewa"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Utumiaji wa betri tangu iliposetiwa upya"</string>
@@ -1611,7 +1621,6 @@
     <string name="awake" msgid="387122265874485088">"Muda wa kuamka kwa kifaa"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fia kwa wakati unaofaa"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi wakati unaofaa"</string>
-    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Maelezo ya historia"</string>
     <string name="details_title" msgid="3792801565213935385">"Tumia maelezo"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Tumia maelezo"</string>
@@ -1683,7 +1692,7 @@
     <string name="battery_saver" msgid="1426682272004907982">"Kiokoa betri"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Kijiwashe kiotomatiki"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Isiwahi kuwashwa"</string>
-    <string name="battery_saver_turn_on_automatically_pct" msgid="3033681629861428940">"betri ikifika %1$d%%"</string>
+    <string name="battery_saver_turn_on_automatically_pct" msgid="7536784431655058267">"betri %1$s"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Takwimu za Mchakato"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Takwimu za kitaalamu kuhusu michakato inayoendeshwa"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Kumbukumbu iliyotumika"</string>
@@ -1807,7 +1816,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Inaweza kutumiwa na maunzi"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Programu pekee"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"Kitambulisho hakipatikani kwa mtumiaji huyu"</string>
-    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Chora mchoro wako wa kufungua"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Unahitaji kuweka mchoro wako wa kufungua ili uthibitishe usakinishaji wa hati tambulishi."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Weka nenosiri ili stakabadhi zihifadhiwe"</string>
@@ -1837,6 +1845,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"Jumuisha data ya programu"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Onyesha upya otomatiki"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Wakati wa kusanidi upya programu, rejesha mipangilio na data ambazo zina nakala rudufu"</string>
+    <string name="backup_inactive_title" msgid="5355557151569037197">"Huduma ya kuhifadhi nakala rudufu haifanyi kazi."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"Hii huweka na sera ya kifaa yako."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Nenosiri la hifadhi rudufu ya eneo kazi"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Hifadhi rudufu kamili za eneo kazi hazijalindwa kwa sasa"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Gusa ili ubadilishe au uondoe nenosiri la hifadhi rudufu kamili za eneo kazi"</string>
@@ -1946,7 +1956,11 @@
     <string name="enter_password" msgid="8035706727471334122">"Ili uanzishe Android, weka nenosiri lako"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Ili uanzishe Android, weka PIN yako"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Ili uanzishe Android, chora mchoro wako"</string>
-    <string name="try_again" msgid="4272075051293936921">"Jaribu tena."</string>
+    <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"Mchoro huo si sahihi"</string>
+    <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"Nenosiri Lisilo sahihi"</string>
+    <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"Nambari ya PIN si sahihi"</string>
+    <string name="checking_decryption" msgid="8287458611802609493">"Inakagua..."</string>
+    <string name="starting_android" msgid="8581493237458496835">"Inaanzisha Android"</string>
     <string name="delete" msgid="4219243412325163003">"Futa"</string>
     <string name="misc_files" msgid="6720680815969643497">"Faili Nyinginezo"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"Imechaguliwa <xliff:g id="NUMBER">%1$d</xliff:g> juu ya <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -1984,8 +1998,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Daima tumia GPU kwa mchanganyiko wa skrini"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"Kuiga nafasi ya rangi"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Wezesha ufuatiliaji wa OpenGL"</string>
-    <string name="use_nuplayer" msgid="5699257393367904387">"Tumia NuPlayer (majaribio)"</string>
-    <string name="use_nuplayer_summary" msgid="1991479067478516714">"Tumia NuPlayer badala ya AwesomePlayer"</string>
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"Tumia AwesomePlayer (imeacha kuendesha huduma)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"Tumia AwesomePlayer badala ya NuPlayer kwa uchezaji wa maudhui mengi"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"Zima utumaji sauti kwa USB"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"Zima utumaji otomatiki kwenda vifaa vya sauti vya USB"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Onyesha mipaka ya mpangilio"</string>
@@ -2161,7 +2175,6 @@
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Ongeza mtumiaji au wasifu"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Ongeza mtumiaji"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Wasifu uliozuiwa"</string>
-    <string name="user_summary_managed_profile" msgid="7369539529693048111">"Wasifu wa kazini"</string>
     <string name="user_need_lock_message" msgid="2596365678651842785">"Kabla uunde wasifu uliowekekwa vikwazo, utahitajika kuweka skrini iliyofungwa ili kulinda programu zako na data binafsi."</string>
     <string name="user_set_lock_button" msgid="8311219392856626841">"Weka ufunguo"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Haijasanidiwa"</string>
@@ -2219,8 +2232,8 @@
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Panua mipangilio ya programu"</string>
     <string name="home_app_uninstall_button" msgid="6808453012607962899">"Ondoa programu hii"</string>
     <string name="only_one_home_message" msgid="3538846733750242759">"Mipangilio ya mwanzo itafichwa hadi utakaposakinisha programu nyingine ya mwanzo."</string>
-    <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Mpangilio huu unaathiri watumiaji wote kwenye kompyuta hii ndogo."</string>
-    <string name="global_change_warning" product="default" msgid="2461264421590324675">"Mpangilio huu unaathiri watumiaji wote kwenye simu hii."</string>
+    <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Mipangilio hii unawaathiri watumiaji wote kwenye kompyuta kibao hii."</string>
+    <string name="global_change_warning" product="default" msgid="2461264421590324675">"Mipangilio hii unawaathiri watumiaji wote kwenye simu hii."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Badilisha lugha"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Badilisha ukubwa wa fonti"</string>
     <string name="nfc_payment_settings_title" msgid="1807298287380821613">"Gusisha ili ulipe"</string>
@@ -2292,11 +2305,13 @@
     <string name="sim_cellular_data_unavailable_summary" msgid="3654805961942166428">"Gusa ili uchague SIM ya data"</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"Tumia hii kwa simu wakati wote"</string>
     <string name="select_sim_for_data" msgid="2366081042162853044">"Chagua SIM ya data"</string>
+    <string name="data_switch_started" msgid="2040761479817166311">"Inabadili SIM ya data, hii inaweza kuchukua hadi dakika moja..."</string>
     <string name="select_sim_for_calls" msgid="3503094771801109334">"Piga simu ukitumia"</string>
     <string name="sim_select_card" msgid="211285163525563293">"Chagua SIM kadi"</string>
     <string name="sim_card_number_title" msgid="7845379943474336488">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"SIM kadi isiyo na kitu"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"Jina la SIM"</string>
+    <string name="sim_name_hint" msgid="7038643345238968930">"Weka jina la SIM"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"Nafasi ya SIM %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Mtoa huduma"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Nambari"</string>
@@ -2306,7 +2321,6 @@
     <string name="color_purple" msgid="3888532466427762504">"Zambarau"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"Hakuna SIM kadi zilizoingizwa"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"Hali ya SIM"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"Maelezo yanayohusiana na SIM"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"Piga simu kwa kutumia SIM kadi chaguo-msingi"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"SIM ya kutumia kupiga simu"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Mipangilio mingine ya simu"</string>
@@ -2314,8 +2328,11 @@
     <string name="preferred_network_offload_header" msgid="2321173571529106767">"Zima Utangazaji wa Jina la Mtandao"</string>
     <string name="preferred_network_offload_footer" msgid="5857279426054744020">"Zima Utangazaji wa Jina la Mtandao hukulinda watu wengine wasifikie maelezo ya mtandao wako."</string>
     <string name="preferred_network_offload_popup" msgid="2252915199889604600">"Zima Utangazaji wa Jina la Mtandao itazuia uunganishaji otomatiki kwenye mitandao iliyofichika."</string>
+    <string name="sim_signal_strength" msgid="9144010043784767984">"dBm <xliff:g id="DBM">%1$d</xliff:g> asu <xliff:g id="ASU">%2$d</xliff:g>"</string>
+    <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>
+    <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Uliza kila wakati"</string>
     <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>
@@ -2324,22 +2341,22 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Utafutaji wa hivi majuzi"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Matokeo"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"muunganisho wa mtandao wa wi-fi"</string>
-    <string name="keywords_more_default_sms_app" msgid="2744404159003574745">"ujumbe wa maandishi"</string>
-    <string name="keywords_more_mobile_networks" msgid="7813380887358745769">"mtandao wa simu wa mtoa huduma usiotumia waya"</string>
+    <string name="keywords_more_default_sms_app" msgid="895656981962034647">"ujumbe wa maandishi ujumbe ujumbe ujumbe"</string>
+    <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"simu ya mkononi simu mtoa huduma isiyotumia waya data 4g 3g 2g lte"</string>
     <string name="keywords_home" msgid="3626170808219458848">"kifungua programu"</string>
     <string name="keywords_display" msgid="6709007669501628320">"skrini ya kugusa"</string>
-    <string name="keywords_display_brightness_level" msgid="8636451602230815191">"srini iliyofifia ya kugusa"</string>
-    <string name="keywords_display_auto_brightness" msgid="8070218600502753102">"srini iliyofifia ya kugusa"</string>
-    <string name="keywords_display_wallpaper" msgid="4315466287469834939">"chini chini"</string>
+    <string name="keywords_display_brightness_level" msgid="8923289340474728990">"fifiliza skrini skrini ya kugusa betri"</string>
+    <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"fifiliza skrini skrini ya kugusa betri"</string>
+    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"mandhari weka mapendeleo geuza ikufae onyesho"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"ukubwa wa maandishi"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"mradi"</string>
-    <string name="keywords_storage" msgid="7007275853993419928">"hifadhi ya nafasi ya diski"</string>
-    <string name="keywords_battery" msgid="3992479295298655138">"kipeo"</string>
-    <string name="keywords_spell_checker" msgid="4509482591225399210">"tahajia"</string>
+    <string name="keywords_storage" msgid="6572905220031852173">"nafasi diski diski kuu kifaa matumizi"</string>
+    <string name="keywords_battery" msgid="2096185085932675704">"chaji ya matumizi ya nishati"</string>
+    <string name="keywords_spell_checker" msgid="6106749039734174140">"tahajia kamusi kagua tahajia sahihisha kiotomatiki"</string>
     <string name="keywords_voice_input" msgid="3519547605812413860">"king\'amuzi vifaa vya kuingiza sauti usemi ongea lugha tumia bila kugusa utambuzi wa kutumia bila kugusa neno baya sauti"</string>
-    <string name="keywords_text_to_speech_output" msgid="8207889472282225512">"kadiria lugha chaguo-msingi ongea inaongea"</string>
-    <string name="keywords_date_and_time" msgid="7666950126499155141">"saa"</string>
-    <string name="keywords_factory_data_reset" msgid="3693730656843989732">"futa ili kurejesha kwenye mipangilio ya kiwandani"</string>
+    <string name="keywords_text_to_speech_output" msgid="392447904221657930">"kadiria lugha chaguo-msingi zungumza tts ufikiaji msomaji kipofu"</string>
+    <string name="keywords_date_and_time" msgid="2631808108134830066">"saa ya kijeshi"</string>
+    <string name="keywords_factory_data_reset" msgid="4355133848707691977">"futa kufuta rejesha futa ondoa"</string>
     <string name="keywords_printing" msgid="1701778563617114846">"printa"</string>
     <string name="keywords_sounds_and_notifications" msgid="5965996187974887000">"mlio wa spika"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="2912933812460077912">"usisumbue katiza pumziko la ukatizaji"</string>
@@ -2348,7 +2365,7 @@
     <string name="keywords_location_mode" msgid="8584992704568356084">"usahihi"</string>
     <string name="keywords_accounts" msgid="1957925565953357627">"akaunti"</string>
     <string name="keywords_users" msgid="4673901601478559100">"zuio zuia imezuiwa"</string>
-    <string name="keywords_keyboard_and_ime" msgid="1103378692379215672">"marekebisho ya maadishi rekebisha sauti mtetemo wa kiotomatiki lugha ya ishara pendekeza mapendekezo ya mandhari neno la kukera"</string>
+    <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"kusahihisha maandishi sahihi sauti tetema otomatiki lugha ishara pendekeza pendekezo mandhari kukera neno chapa emoji kimataifa"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"telezesha kidole nenosiri mchoro pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Sanidi tagi ya NFC ya Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Andika"</string>
@@ -2365,7 +2382,6 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Sauti ya arifa"</string>
     <string name="zen_mode_settings_title" msgid="7014915558669122902">"Kukatizwa"</string>
     <string name="zen_mode_option_title" msgid="5061978632306007914">"Simu na arifa zinapoingia"</string>
-    <string name="zen_mode_option_title_novoice" msgid="6680706009915204785">"Arifa zinapopokelewa"</string>
     <string name="zen_mode_option_off" msgid="3167702608910820883">"Katiza wakati wote"</string>
     <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Ruhusu kukatizwa na vipaumbele pekee"</string>
     <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Usikatize"</string>
@@ -2423,14 +2439,17 @@
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Nimemaliza"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Hadi utakapozima hili"</string>
     <string name="zen_mode_important_category" msgid="8123274463331022993">"Kukatizwa na vipaumbele pekee"</string>
-    <string name="zen_mode_downtime_category" msgid="4730179065426038108">"Kipindi cha kutofanya kazi (kukatizwa na vipaumbele pekee)"</string>
+    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Wakati wa hali tuli"</string>
     <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Siku"</string>
     <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Hamna"</string>
+    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Makatizo yanaruhusiwa"</string>
+    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Kipaumbele tu"</string>
+    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Hamna"</string>
     <string name="zen_mode_automation_category" msgid="4653551005950835761">"Uwekaji otomatiki"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Washa kiotomatiki"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Isiwahi kamwe"</string>
-    <string name="zen_mode_phone_calls" msgid="8956214416859303966">"Simu zilizopigwa"</string>
+    <string name="zen_mode_calls" msgid="7051492091133751208">"Simu zilizopigwa"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Barua pepe"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Simu au ujumbe kutoka"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Mtu yeyote"</string>
@@ -2444,7 +2463,9 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Usiku wa siku za wiki"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Wakati wa Kuanza"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Wakati wa kuisha"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> siku inayofuata"</string>
+    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> siku inayofuata"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> au kengele yoyote kabla"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> siku inayofuata au kengele yoyote kabla"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Arifa za programu"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Mipangilio ya arifa"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Tuma maoni kuhusu kifaa hiki"</string>
@@ -2452,7 +2473,11 @@
     <string name="switch_on_text" msgid="1124106706920572386">"Imewashwa"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Imezimwa"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"Ubandikaji wa skrini"</string>
-    <string name="screen_pinning_description" msgid="7091642350452605379">"Inapowashwa, unaweza kutumia ubandikaji wa skrini ili kuweka skrini ya sasa iendelee kuonekana hadi uibanue. \n\n Ili utumie ubandikaji wa skrini: \n\n 1. Hakikisha umewasha ubandikaji wa skrini. \n\n 2. Fungua skrini unayotaka kubandika. \n\n 3 Gusa Muhtasari. \n\n 4 Gusa aikoni ya kubandika."</string>
+    <string name="screen_pinning_description" msgid="1137904524037468263">"Mpangilio huu ukiwashwa, unaweza kutumia ubandikaji wa skrini ili kuweka skrini ya sasa iendelee kuonekana hadi uibandue.\n\nIli utumie ubandikaji wa skrini:\n\n1. Hakikisha umewasha ubandikaji wa skrini.\n\n2. Fungua skrini unayotaka kubandika.\n\n3. Gusa Muhtasari.\n\n4. Gusa aikoni ya kubandika."</string>
+    <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Omba mchoro wa kufungua kabla hujabandua"</string>
+    <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Omba PIN kabla hujabandua"</string>
+    <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Omba nenosiri kabla hujabandua"</string>
+    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Funga kifaa wakati wa kubandua"</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Wasifu wa kazi"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Majaribio)"</string>
     <string name="display_auto_rotate_title" msgid="6176450657107806043">"Kifaa kinapozungushwa"</string>
@@ -2461,7 +2486,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Baki katika onyesho la mlalo"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Baki katika mkao wa sasa"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"Maelezo ya IMEI"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"Maelezo ya IMEI yanayohusiana"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Usimbaji kwa njia fiche"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Endelea"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"Unaweza kulinda kifaa hiki zaidi kwa kuweka PIN yako kabla hujakiwasha. Hadi uwashe kifaa, hakiwezi kupokea simu, ujumbe, au arifa, pamoja na kengele. \n\nHii husaidia kulinda data kwenye vifaa vinavyopotea au kuibiwa."</string>
@@ -2479,4 +2503,7 @@
     <string name="encrypt_talkback_dialog_message_pin" msgid="1890374082842868489">"Unapoweka PIN ili uanzishe kifaa hiki, huduma za ufikiaji kama <xliff:g id="SERVICE">%1$s</xliff:g> hazitapatikana."</string>
     <string name="encrypt_talkback_dialog_message_pattern" msgid="4474332516537386384">"Unapoweka mchoro ili uanzishe kifaa hiki, huduma za ufikiaji kama <xliff:g id="SERVICE">%1$s</xliff:g> hazitapatikana."</string>
     <string name="encrypt_talkback_dialog_message_password" msgid="8166099418487083927">"Unapoweka nenosiri ili uanzishe kifaa hiki, huduma za ufikiaji kama <xliff:g id="SERVICE">%1$s</xliff:g> hazitapatikana."</string>
+    <string name="imei_information_title" msgid="8499085421609752290">"Maelezo ya IMEI"</string>
+    <string name="imei_information_summary" msgid="2074095606556565233">"Maelezo ya IMEI yanayohusiana"</string>
+    <string name="slot_number" msgid="3762676044904653577">"(Nafasi<xliff:g id="SLOT_NUM">%1$d</xliff:g> )"</string>
 </resources>
diff --git a/res/values-sw600dp-land/styles.xml b/res/values-sw600dp-land/styles.xml
index 55fbe04..1a4a40e 100644
--- a/res/values-sw600dp-land/styles.xml
+++ b/res/values-sw600dp-land/styles.xml
@@ -34,13 +34,13 @@
         <item name="android:textSize">14sp</item>
         <item name="android:textAlignment">viewStart</item>
         <item name="android:textAppearance">@android:style/TextAppearance.Material.Body1</item>
-        <item name="android:textColor">@*android:color/secondary_text_default_material_light</item>
+        <item name="android:textColor">?android:attr/textColorSecondary</item>
     </style>
 
     <style name="wifi_item_content">
         <item name="android:textAlignment">viewStart</item>
         <item name="android:textAppearance">@android:style/TextAppearance.Material.Subhead</item>
-        <item name="android:textColor">@*android:color/primary_text_default_material_light</item>
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
     </style>
 
     <style name="wifi_item_edit_content">
diff --git a/res/values-sw600dp/styles.xml b/res/values-sw600dp/styles.xml
index 6862690..d09b23e 100644
--- a/res/values-sw600dp/styles.xml
+++ b/res/values-sw600dp/styles.xml
@@ -26,7 +26,7 @@
         <item name="android:layout_marginTop">8dip</item>
         <item name="android:layout_marginStart">16dip</item>
         <item name="android:layout_marginEnd">16dip</item>
-        <item name="android:orientation">horizontal</item>
+        <item name="android:orientation">vertical</item>
         <item name="android:gravity">center_vertical</item>
     </style>
 
diff --git a/res/values-sw720dp/styles.xml b/res/values-sw720dp/styles.xml
index 55fbe04..1a4a40e 100644
--- a/res/values-sw720dp/styles.xml
+++ b/res/values-sw720dp/styles.xml
@@ -34,13 +34,13 @@
         <item name="android:textSize">14sp</item>
         <item name="android:textAlignment">viewStart</item>
         <item name="android:textAppearance">@android:style/TextAppearance.Material.Body1</item>
-        <item name="android:textColor">@*android:color/secondary_text_default_material_light</item>
+        <item name="android:textColor">?android:attr/textColorSecondary</item>
     </style>
 
     <style name="wifi_item_content">
         <item name="android:textAlignment">viewStart</item>
         <item name="android:textAppearance">@android:style/TextAppearance.Material.Subhead</item>
-        <item name="android:textColor">@*android:color/primary_text_default_material_light</item>
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
     </style>
 
     <style name="wifi_item_edit_content">
diff --git a/res/values-ta-rIN/arrays.xml b/res/values-ta-rIN/arrays.xml
index 8873ceb..ac6f5b5 100644
--- a/res/values-ta-rIN/arrays.xml
+++ b/res/values-ta-rIN/arrays.xml
@@ -527,4 +527,12 @@
     <item msgid="4338089220026248848">"தற்காலிகச் சேமிப்பு (செயல்பாட்டு கிளையன்ட்)"</item>
     <item msgid="6652164677254579050">"தற்காலிகச் சேமிப்பு (காலி)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"பசும் நீலம்"</item>
+    <item msgid="8332294763632946560">"நீலம்"</item>
+    <item msgid="2023216417616991392">"அடர் நீலம்"</item>
+    <item msgid="3170497246594232819">"ஊதா"</item>
+    <item msgid="4608643045752965568">"பிங்க்"</item>
+    <item msgid="6131821495505931173">"சிவப்பு"</item>
+  </string-array>
 </resources>
diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta-rIN/strings.xml
index 23485a8..21f128c 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>
@@ -180,7 +180,6 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"உங்கள் செய்திகளை %1$s அணுக விரும்புகிறது. %2$s க்கு அணுகலை வழங்கவா?"</string>
     <string name="date_and_time" msgid="9062980487860757694">"தேதி &amp; நேரம்"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"நேரமண்டலத்தைத் தேர்வுசெய்க"</string>
-    <string name="normal_date_format" msgid="7636406984925498359">"மண்டலம் (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"மாதிரிக்காட்சி:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"எழுத்துரு அளவு:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -291,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>
@@ -322,8 +321,6 @@
     <string name="date_time_set_timezone" msgid="5045627174274377814">"நேரமண்டலத்தை அமை"</string>
     <string name="date_time_set_date_title" msgid="6928286765325608604">"தேதி"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"தேதியை அமை"</string>
-    <string name="date_time_date_format_title" msgid="3976171711988766411">"தேதி வடிவம்"</string>
-    <string name="date_time_date_format" msgid="6951498879879281102">"தேதி வடிவமைப்பைத் தேர்வுசெய்யவும்"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"அகர வரிசைப்படி வரிசைப்படுத்து"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"நேர மண்டலத்தின்படி வரிசைப்படுத்து"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"தேதி"</string>
@@ -372,7 +369,8 @@
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"உங்கள் மொபைல் முறைமையாக்கம் செய்யப்படுகிறது, காத்திருக்கவும். <xliff:g id="PERCENT">^1</xliff:g>% முடிந்தது."</string>
     <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"டேப்லெட் குறியாக்கப்படும் வரை காத்திருக்கவும். மீதமுள்ள நேரம்: <xliff:g id="DURATION">^1</xliff:g>"</string>
     <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"ஃபோன் குறியாக்கப்படும் வரை காத்திருக்கவும். மீதமுள்ள நேரம்: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"<xliff:g id="DELAY">^1</xliff:g> வினாடிகள் கழித்து முயற்சிக்கவும்."</string>
+    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"டேப்லெட்டைத் திறக்க, அதை முடக்கி, பின் இயக்கவும்."</string>
+    <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"மொபைலைத் திறக்க, அதை முடக்கி, பின் இயக்கவும்."</string>
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"எச்சரிக்கை: சாதனத்தைத் திறப்பதற்கான <xliff:g id="COUNT">^1</xliff:g> முயற்சிகளும் தோல்வி அடைந்தால், சாதனத்தின் தரவு அழிக்கப்படும்!"</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"உங்கள் கடவுச்சொல்லை உள்ளிடவும்"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"முறைமையாக்கம் தோல்வி"</string>
@@ -401,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>
@@ -412,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>
@@ -556,13 +556,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"ஸ்பீக்கர் ஃபோனாக"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"இசை மற்றும் மீடியாவிற்காக"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"அமைப்புகளை நினைவில்கொள்"</string>
-    <string name="wifi_assistant_intro_setup" msgid="4605105515416995110">"அறிமுகம்:\nவைஃபை அசிஸ்டண்ட்"</string>
-    <string name="wifi_assistant_no_thanks" msgid="2776983751990143934">"வேண்டாம், நன்றி"</string>
-    <string name="wifi_assistant_setup" msgid="3772423650475730906">"அமைப்பு"</string>
-    <string name="wifi_assistant_card_message" msgid="107811647784658536">"வைஃபை அசிஸ்டண்ட் மூலம் கிடைக்கும் நெட்வொர்க்குகளுடன் தானாக இணைக்கும்."</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"வைஃபை அசிஸ்டண்ட்"</string>
-    <string name="wifi_assistant_title_message" msgid="6240721017579074015">"கிடைக்கும் சிறந்த வைஃபையுடன், <xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> தானாகவே இணைக்கிறது"</string>
-    <string name="wifi_assistant_open_app" msgid="4803044899535675063">"பயன்பாட்டைத் திற"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"வைஃபை அசிஸ்டண்ட் மூலம் இணைக்கப்பட்டது"</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>
@@ -592,7 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"வைஃபை அமைப்பு"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"வைஃபை"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"வயர்லெஸ் ஆக்சஸ் பாயிண்ட்களை அமைத்து &amp; நிர்வகிக்கவும்"</string>
-    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"வைஃபை ஐத் தேர்ந்தெடுக்கவும்"</string>
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"வைஃபை நெட்வொர்க்கைத் தேர்ந்தெடுக்கவும்"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"வைஃபையைத் தேர்ந்தெடு"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"வைஃபையை இயக்குகிறது…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"வைஃபையை முடக்குகிறது…"</string>
@@ -607,8 +602,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"எப்போதும் ஸ்கேன் செய்"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"எப்போதும் தேட அனுமதி"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"வைஃபை முடக்கப்பட்டிருந்தாலும் கூட Google இடச் சேவையும், பிற பயன்பாடுகளும் நெட்வொர்க்குகளைத் தேட அனுமதி"</string>
-    <string name="wifi_automatically_manage_title" msgid="6249976570008992746">"தானாகவே வைஃபையை நிர்வகி"</string>
-    <string name="wifi_automatically_manage_summary" msgid="6952470763378312488">"எனது வைஃபை இணைப்பை நிர்வகிக்க <xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g>ஐ அனுமதி"</string>
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"பொது வைஃபையைத் தானாக பயன்படுத்து"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"உயர் தரமான பொது வைஃபை நெட்வொர்க்குகள் கண்டறியப்படும்போது, தானாக அவற்றுடன் இணைப்பதற்கு வைஃபை அசிஸ்டண்ட்டை அனுமதி"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"அசிஸ்டண்ட்டைத் தேர்வுசெய்க"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"சான்றிதழ்களை நிறுவு"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"இருப்பிடத்தைத் துல்லியமாக அறிவதற்கு மேம்படுத்த மற்றும் பிற காரணங்களுக்காக, வைஃபை முடக்கத்தில் இருக்கும்போதும் Google மற்றும் பிற பயன்பாடுகள் அருகிலுள்ள நெட்வொர்க்குகளை ஸ்கேன் செய்யலாம். இவ்வாறு செய்ய வேண்டாம் என நீங்கள் விரும்பினால், எப்போதும் கிடைக்கும் மேம்பட்ட &gt; ஸ்கேனிங் என்பதற்குச் செல்லவும்."</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"வைஃபை முடக்கத்தில் இருக்கும்போதும் அருகிலுள்ள நெட்வொர்க்குகளைப் பயன்பாடுகள் ஸ்கேன் செய்யலாம். இவ்வாறு செய்ய வேண்டாம் என நீங்கள் விரும்பினால், எப்போதும் கிடைக்கும் மேம்பட்ட &gt; ஸ்கேனிங் என்பதற்குச் செல்லவும்."</string>
@@ -629,6 +625,7 @@
     <string name="wifi_menu_scan" msgid="1470911530412095868">"ஸ்கேன் செய்"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"மேம்பட்டவை"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"நெட்வொர்க்குடன் இணை"</string>
+    <string name="wifi_menu_remember" msgid="8814185749388713796">"நெட்வொர்க்கை நினைவில்கொள்"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"நெட்வொர்க்கை நீக்கு"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"நெட்வொர்க்கை மாற்று"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"NFC குறியில் எழுது"</string>
@@ -673,9 +670,11 @@
     <string name="wifi_unspecified" msgid="5431501214192991253">"(குறிப்பிடப்படாதது)"</string>
     <string name="wifi_remembered" msgid="4955746899347821096">"சேமிக்கப்பட்டது"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"முடக்கப்பட்டது"</string>
-    <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"வேகம் குறைவான இணைய இணைப்பு தவிர்க்கப்பட்டது"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP உள்ளமைவில் தோல்வி"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"வைஃபை இணைப்பில் தோல்வி"</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"அங்கீகரிப்புச் சிக்கல்"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"தொடர்பு எல்லையில் இல்லை"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"இணைய அணுகல் இல்லை, மீண்டும் தானாக இணையாது."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS கிடைக்கிறது"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS கிடைக்கிறது)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"நெட்வொர்க் கடவுச்சொல்லை உள்ளிடவும்"</string>
@@ -699,9 +698,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"எச்சரிக்கை: வைஃபை அமைப்பதைத் தவிர்த்தால், தொடக்க இறக்கங்கள் மற்றும் புதுப்பிப்புகளுக்காக உங்கள் டேப்லெட் செல்லுலார் தரவை மட்டுமே பயன்படுத்தும். ஏற்படக்கூடிய தரவுக் கட்டணங்களைத் தவிர்க்க, வைஃபையுடன் இணைக்கவும்."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"எச்சரிக்கை: வைஃபை அமைப்பதைத் தவிர்த்தால், தொடக்க இறக்கங்கள் மற்றும் புதுப்பிப்புகளுக்காக உங்கள் சாதனம் செல்லுலார் தரவை மட்டுமே பயன்படுத்தும். ஏற்படக்கூடிய தரவுக் கட்டணங்களைத் தவிர்க்க, வைஃபையுடன் இணைக்கவும்."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"எச்சரிக்கை: வைஃபை அமைப்பதைத் தவிர்த்தால், தொடக்க இறக்கங்கள் மற்றும் புதுப்பிப்புகளுக்காக உங்கள் மொபைல் செல்லுலார் தரவை மட்டுமே பயன்படுத்தும். ஏற்படக்கூடிய தரவுக் கட்டணங்களைத் தவிர்க்க, வைஃபையுடன் இணைக்கவும்."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="2393880108322835846">"எச்சரிக்கை: வைஃபை அமைப்பதைத் தவிர்த்தால், தொடக்க இறக்கங்களையோ, புதுப்பிப்புகளையோ பயன்படுத்த உங்கள் டேப்லெட்டில் இணைய இணைப்பு இருக்காது."</string>
-    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1707391993265558787">"எச்சரிக்கை: வைஃபை அமைப்பதைத் தவிர்த்தால், தொடக்க இறக்கங்களையோ, புதுப்பிப்புகளையோ பயன்படுத்த உங்கள் சாதனத்தில் இணைய இணைப்பு இருக்காது."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="1556858507920033022">"எச்சரிக்கை: வைஃபை அமைப்பதைத் தவிர்த்தால், தொடக்க இறக்கங்களையோ, புதுப்பிப்புகளையோ பயன்படுத்த உங்கள் மொபைலில் இணைய இணைப்பு இருக்காது."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"வைஃபையைப் பயன்படுத்தவில்லை எனில்:\n\nடேப்லெட்டில் இணைய இணைப்பு இருக்காது.\n\nஇணையத்துடன் இணைக்கப்படும் வரை மென்பொருள் புதுப்பிப்புகளைப் பெற மாட்டீர்கள்.\n\nசாதனப் பாதுகாப்பு அம்சங்களை இப்போது இயக்க முடியாது."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"வைஃபையைப் பயன்படுத்தவில்லை எனில்:\n\nசாதனத்தில் இணைய இணைப்பு இருக்காது.\n\nஇணையத்துடன் இணைக்கப்படும் வரை மென்பொருள் புதுப்பிப்புகளைப் பெற மாட்டீர்கள்.\n\nசாதனப் பாதுகாப்பு அம்சங்களை இப்போது இயக்க முடியாது."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"வைஃபையைப் பயன்படுத்தவில்லை எனில்:\n\nமொபைலில் இணைய இணைப்பு இருக்காது.\n\nஇணையத்துடன் இணைக்கப்படும் வரை மென்பொருள் புதுப்பிப்புகளைப் பெற மாட்டீர்கள்.\n\nசாதனப் பாதுகாப்பு அம்சங்களை இப்போது இயக்க முடியாது."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"வைஃபை நெட்வொர்க்குடன் டேப்லெட்டை இணைக்க முடியவில்லை."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"வைஃபை நெட்வொர்க்குடன் சாதனத்தை இணைக்க முடியவில்லை."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"வைஃபை நெட்வொர்க்குடன் தொலைபேசியை இணைக்க முடியவில்லை."</string>
@@ -761,7 +760,6 @@
     <string name="ring_volume_title" msgid="7938706566797464165">"அழைப்பின் ஒலியளவு"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"அமைதியாக இருக்கும்போது அதிர்வடை"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"இயல்புநிலை அறிவிப்பிற்கான ஒலி"</string>
-    <string name="heads_up_enabled_title" msgid="1031078221910921622">"உயர் முன்னுரிமை எனில் பாப் அப் செய்"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"ரிங்டோன்"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"அறிவிப்புகள்"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"அறிவிப்புகளுக்கு, உள்வரும் அழைப்பின் ஒலியளவைப் பயன்படுத்து"</string>
@@ -834,7 +832,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"தானாக ஒளிர்வைச் சரிசெய்தல்"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"விரலை எடுக்கும் போது இயங்கு"</string>
     <string name="doze_title" msgid="2259176504273878294">"சூழல்சார் திரை"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"சாதனத்தை எடுக்கும் போது அல்லது அறிவிப்புகள் வரும் போது திரையை இயக்கும்"</string>
+    <string name="doze_summary" msgid="7128970177894383698">"சாதனத்தை எடுக்கும் போது அல்லது அறிவிப்புகளைப் பெறும் போது திரையை இயக்கு"</string>
     <string name="title_font_size" msgid="4405544325522105222">"எழுத்துரு அளவு"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"எழுத்துரு அளவு"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"சிம் கார்டின் பூட்டு அமைப்பு"</string>
@@ -862,6 +860,10 @@
     <string name="sim_enter_cancel" msgid="6240422158517208036">"ரத்துசெய்"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"பல SIMகள் உள்ளன"</string>
     <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> சிம் மட்டுமே உள்ளது. செல்லுலார் தரவு, அழைப்புகள் மற்றும் SMS செய்திகளுக்கு இந்தச் சிம்மைப் பயன்படுத்தவா?"</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>
@@ -1012,6 +1014,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"இது, உங்கள் டேப்லெடின் "<b>"அகச் சேமிப்பிடத்தில்"</b>" உள்ள எல்லா தரவையும் அழித்துவிடும், இவற்றில் உள்ளடங்குவன:\n\n"<li>"உங்கள் Google கணக்கு"</li>\n<li>"அமைப்பு மற்றும் பயன்பாட்டுத் தரவு, மற்றும் அமைப்புகள்"</li>\n<li>"பதிவிறக்கப்பட்டப் பயன்பாடுகள்"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"இது, உங்கள் மொபைலின் "<b>"அகச் சேமிப்பிடத்தில்"</b>" உள்ள எல்லா தரவையும் அழித்துவிடும், இவற்றில் உள்ளடங்குவன:\n\n"<li>"உங்கள் Google கணக்கு"</li>\n<li>"கணினி மற்றும் பயன்பாட்டுத் தரவு மற்றும் அமைப்புகள்"</li>\n<li>"பதிவிறக்கப்பட்டப் பயன்பாடுகள்"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"தற்போது, பின்வரும் கணக்குகளில் உள்நுழைந்துள்ளீர்கள்:\n"</string>
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"இந்தச் சாதனத்தில் பிற பயனர்கள் உள்ளனர்.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"இசை"</li>\n<li>"படங்கள்"</li>\n<li>"பிற பயனர் தரவு"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"இசை, படங்கள் மற்றும் பிற பயனர் தரவை அழிப்பதற்கு, "<b>"USB சேமிப்பிடத்தை"</b>" அழிக்க வேண்டியிருக்கும்."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"இசை, படங்கள் மற்றும் பிற பயனர் தரவை அழிக்க "<b>"SD கார்டு"</b>" அழிக்கப்பட வேண்டும்."</string>
@@ -1023,7 +1026,6 @@
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"மொபைலை மீட்டமை"</string>
     <string name="master_clear_final_desc" msgid="7209547812233487345">"உங்களின் தனிப்பட்ட எல்லா தகவல் மற்றும் பதிவிறக்கப்பட்ட பயன்பாடுகள் எல்லாவற்றையும் அழிக்கவா? நீங்கள் இந்தச் செயலை மீட்டமைக்க முடியாது!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"எல்லாவற்றையும் அழி"</string>
-    <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"திறப்பதற்கான வடிவத்தை வரையவும்"</string>
     <string name="master_clear_gesture_explanation" msgid="826193821455182780">"ஆரம்பநிலைத் தரவு மீட்டமைவை உறுதிப்படுத்துவதற்கு, திறப்பதற்கான வடிவத்தை நீங்கள் வரைய வேண்டும்."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"System Clear சேவை இல்லை என்பதால் மீட்டமைவைச் செயற்படுத்தப்படவில்லை."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"மீட்டமைக்கவா?"</string>
@@ -1041,7 +1043,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"USB சேமிப்பிடத்தை அழித்து, அதில் சேமிக்கப்பட்ட எல்லா கோப்புகளையும் நீக்கவா? இந்தச் செயலை நீங்கள் மாற்றியமைக்க முடியாது!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"SD கார்டை அழித்து, அதில் சேமிக்கப்பட்ட எல்லா கோப்புகளையும் நீக்கவா? இந்தச் செயலை நீங்கள் மாற்றியமைக்க முடியாது!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"எல்லாவற்றையும் அழி"</string>
-    <string name="media_format_gesture_prompt" msgid="3109349468816856670">"திறப்பதற்கான வடிவத்தை வரையவும்"</string>
     <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"நீங்கள் USB சேமிப்பிடத்தை அழிக்க விரும்புவதை உறுதிப்படுத்துவதற்கு சாதனத்தைத் திறப்பதற்கான வடிவத்தை வரைய வேண்டும்."</string>
     <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"நீங்கள் SD கார்டை அழிக்க விரும்புவதை உறுதிப்படுத்துவதற்கு, திறப்பதற்கான வடிவத்தை நீங்கள் வரைய வேண்டும்."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"அழைப்பு அமைப்பு"</string>
@@ -1087,6 +1088,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"சிம் கார்டைச் செருகி மீண்டும் தொடங்கவும்"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"இணையத்துடன் இணைக்கவும்"</string>
     <string name="location_title" msgid="1029961368397484576">"எனது இருப்பிடம்"</string>
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"பணி சுயவிவரம்"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"பணி சுயவிவரத்திற்கான இருப்பிடம்"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"உங்கள் நிறுவனம் முடக்கியுள்ளது"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"பயன்முறை"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"அதிக துல்லியத்தன்மை"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"பேட்டரி சேமிப்பு"</string>
@@ -1124,6 +1128,7 @@
     <string name="copyright_title" msgid="865906688917260647">"பதிப்புரிமை"</string>
     <string name="license_title" msgid="1990487604356037871">"உரிமம்"</string>
     <string name="terms_title" msgid="7697580845616764642">"விதிமுறைகளும் நிபந்தனைகளும்"</string>
+    <string name="webview_license_title" msgid="2813507464175738967">"சிஸ்டம் WebView உரிமம்"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"வால்பேப்பர்கள்"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"செயற்கை கோள் படங்களை வழங்குபவர்கள்:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"ஓப்பன் சோர்ஸ் உரிமங்கள்"</string>
@@ -1237,7 +1242,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB சேமிப்பகம்"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"SD கார்டில் உள்ளவை"</string>
     <string name="disabled" msgid="9206776641295849915">"முடக்கப்பட்டது"</string>
-    <string name="not_installed" msgid="1475144352069281880">"நிறுவப்படவில்லை"</string>
+    <string name="not_installed" msgid="2797554494953450291">"இவருக்கு நிறுவப்படவில்லை"</string>
     <string name="no_applications" msgid="7336588977497084921">"பயன்பாடுகள் இல்லை."</string>
     <string name="internal_storage" msgid="1584700623164275282">"அகச் சேமிப்பிடம்"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB சேமிப்பிடம்"</string>
@@ -1434,8 +1439,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"சார்ஜ் ஏறும்போது திரை எப்போதும் உறக்கநிலைக்குச் செல்லாது"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"புளூடூத் HCI ஸ்னுப் பதிவை இயக்கு"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"கோப்பில் உள்ள எல்லா புளூடூத் HCI தொகுதிகளையும் படமெடு"</string>
-    <string name="oem_unlock_enable" msgid="6629321276287913315">"OEM திறப்பை இயக்கு"</string>
-    <string name="oem_unlock_enable_summary" msgid="3546686263996628110">"OEM திறந்த நிலையில் இருக்கும்படி சாதனத்தை அனுமதி"</string>
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM திறத்தல்"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"பூட்லோடரைத் திறக்க அனுமதி"</string>
+    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"பின்னை உள்ளிடவும்"</string>
+    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"OEM திறப்பை இயக்க, சாதனத்தின் பின்னை உள்ளிடவும்"</string>
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"OEM திறத்தலை அனுமதிக்கவா?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"எச்சரிக்கை: இந்த அமைப்பு இயக்கப்பட்டிருக்கும்போது, சாதன பாதுகாப்பு அம்சங்கள் இந்தச் சாதனத்தில் இயங்காது."</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"வயர்லெஸ் காட்சிக்கான சான்றிதழ்"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"வைஃபை அதிவிவர நுழைவை இயக்கு"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"ஒத்துழைக்காத வைஃபையிலிருந்து செல்லுலாருக்கு மாறு"</string>
@@ -1538,6 +1547,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"தலைப்புகள் இப்படி இருக்கும்"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"இயல்புநிலை"</string>
+    <string name="color_title" msgid="4258931051732243983">"நிறம்"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"இயல்புநிலை"</string>
     <string name="color_none" msgid="3475640044925814795">"ஏதுமில்லை"</string>
     <string name="color_white" msgid="8045195170201590239">"வெள்ளை"</string>
@@ -1595,12 +1605,12 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"<xliff:g id="REMAIN">%1$s</xliff:g> மீதமுள்ளது"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"சார்ஜ் செய்வதற்கு <xliff:g id="UNTIL_CHARGED">%1$s</xliff:g>"</string>
-    <string name="power_discharging_duration" msgid="7125493014448497620">"<xliff:g id="LEVEL">%1$d</xliff:g>%%-தோராயமாக <xliff:g id="TIME">%2$s</xliff:g> வரை வரும்"</string>
-    <string name="power_charging" msgid="712751285832976915">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="STATE">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration" msgid="4802183864773082009">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - முழு சார்ஜாக <xliff:g id="TIME">%2$s</xliff:g> ஆகும்"</string>
-    <string name="power_charging_duration_ac" msgid="3611179931297824699">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - AC மூலம் முழு சார்ஜாக <xliff:g id="TIME">%2$s</xliff:g> ஆகும்"</string>
-    <string name="power_charging_duration_usb" msgid="1106605348913397583">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - USB மூலம் முழு சார்ஜாக <xliff:g id="TIME">%2$s</xliff:g> ஆகும்"</string>
-    <string name="power_charging_duration_wireless" msgid="633606920144617227">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - வயர்லெஸ் மூலம் முழு சார்ஜாக <xliff:g id="TIME">%2$s</xliff:g> ஆகும்"</string>
+    <string name="power_discharging_duration" msgid="1605929174734600590">"தோராயம்: <xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> உள்ளது"</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>"</string>
+    <string name="power_charging_duration_ac" msgid="3969186192576594254">"முழு AC சார்ஜிற்கு: <xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="power_charging_duration_usb" msgid="182405645340976546">"முழு USB சார்ஜிற்கு: <xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="power_charging_duration_wireless" msgid="1829295708243159464">"முழு வயர்லெஸ் சார்ஜிற்கு: <xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="power_usage_list_summary" msgid="2409288197839512482">"முழு சார்ஜ் ஆனதிலிருந்து இயங்கும் பயன்பாடுகள்"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"செருகல் நீக்கப்பட்டதிலிருந்து பேட்டரியின் பயன்பாடு"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"மீட்டமைக்கப்பட்டதிலிருந்து பேட்டரி பயன்பாடு"</string>
@@ -1617,7 +1627,6 @@
     <string name="awake" msgid="387122265874485088">"சாதனம் விழித்திருக்கும் நேரம்"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"வைஃபை இயக்க நேரம்"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"வைஃபை இயக்க நேரம்"</string>
-    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> - <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"வரலாறு விவரங்கள்"</string>
     <string name="details_title" msgid="3792801565213935385">"பயன்படுத்திய விவரங்கள்"</string>
     <string name="details_subtitle" msgid="32593908269911734">"விவரங்களைப் பயன்படுத்து"</string>
@@ -1689,7 +1698,7 @@
     <string name="battery_saver" msgid="1426682272004907982">"பேட்டரி சேமிப்பான்"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"தானாகவே இயக்கு"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"எப்போதும் வேண்டாம்"</string>
-    <string name="battery_saver_turn_on_automatically_pct" msgid="3033681629861428940">"%1$d%% பேட்டரியில்"</string>
+    <string name="battery_saver_turn_on_automatically_pct" msgid="7536784431655058267">"%1$s பேட்டரியில்"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"செயல்முறைப் புள்ளிவிவரங்கள்"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"இயங்கும் செயல்முறைகள் குறித்த ஜிகி புள்ளிவிவரங்கள்"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"நினைவகப் பயன்பாடு"</string>
@@ -1813,7 +1822,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"வன்பொருள்-காப்புப் பிரதியெடுக்கப்பட்டது"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"மென்பொருள் மட்டும்"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"இவருக்கு நற்சான்றுகளை அணுக அனுமதியில்லை"</string>
-    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"திறப்பதற்கான வடிவத்தை வரையவும்"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"உங்கள் நற்சான்றின் நிறுவலை உறுதிசெய்வதற்கு, திறப்பதற்கான வடிவத்தை வரைய வேண்டும்."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"நற்சான்று சேமிப்பிடத்திற்கான கடவுச்சொல்லை உள்ளிடவும்."</string>
@@ -1843,6 +1851,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"பயன்பாட்டுத் தரவு உட்பட"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"தானியங்கு மீட்டெடுப்பு"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"பயன்பாட்டை மீண்டும் நிறுவும்போது, காப்புப் பிரதி எடுத்த அமைப்புகளையும் தரவையும் மீட்டெடு"</string>
+    <string name="backup_inactive_title" msgid="5355557151569037197">"காப்புப்பிரதி சேவை செயல்படவில்லை."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"இது உங்கள் சாதனக் கொள்கையால் அமைக்கப்பட்டுள்ளது."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"டெஸ்க்டாப் மாற்று கடவுச்சொல்"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"டெஸ்க்டாப்பின் மொத்த காப்புப் பிரதிகளும் தற்போது பாதுகாக்கப்படவில்லை"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"டெஸ்க்டாப்பின் முழுமையான காப்புப்பிரதிகளுக்கான கடவுச்சொல்லை மாற்றுவதற்கு அல்லது அகற்றுவதற்குத் தொடவும்"</string>
@@ -1952,7 +1962,11 @@
     <string name="enter_password" msgid="8035706727471334122">"Androidஐத் தொடங்க, கடவுச்சொல்லை உள்ளிடவும்"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Androidஐத் தொடங்க, PINஐ உள்ளிடவும்"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Androidஐத் தொடங்க, வடிவத்தை வரையவும்"</string>
-    <string name="try_again" msgid="4272075051293936921">"மீண்டும் முயற்சிக்கவும்."</string>
+    <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"தவறான வடிவம்"</string>
+    <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"தவறான கடவுச்சொல்"</string>
+    <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"தவறான பின்"</string>
+    <string name="checking_decryption" msgid="8287458611802609493">"சரிபார்க்கிறது..."</string>
+    <string name="starting_android" msgid="8581493237458496835">"Android தொடங்குகிறது"</string>
     <string name="delete" msgid="4219243412325163003">"நீக்கு"</string>
     <string name="misc_files" msgid="6720680815969643497">"மற்ற கோப்புகள்"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"<xliff:g id="TOTAL">%2$d</xliff:g> இல் <xliff:g id="NUMBER">%1$d</xliff:g> தேர்ந்தெடுக்கப்பட்டது"</string>
@@ -1990,8 +2004,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"திரைத் தொகுத்தலுக்கு எப்போதும் GPU ஐப் பயன்படுத்து"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"வண்ணத்தின் இடைவெளியை உருவகப்படுத்து"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"OpenGL தடயங்களை இயக்கு"</string>
-    <string name="use_nuplayer" msgid="5699257393367904387">"NuPlayer ஐப் பயன்படுத்து (சோதனைக்குரியது)"</string>
-    <string name="use_nuplayer_summary" msgid="1991479067478516714">"AwesomePlayer க்கு பதிலாக NuPlayer ஐப் பயன்படுத்து"</string>
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"AwesomePlayerஐப் பயன்படுத்து (தடுக்கப்பட்டது)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"மீடியா பிளேபேக்கிற்கு NuPlayerக்கு பதிலாக AwesomePlayerஐ பயன்படுத்து"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"USB ஆடியோ ரூட்டிங்கை முடக்கு"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"USB ஆடியோ உபகரணத்திற்கு தன்னியக்க ரூட்டிங்கை முடக்கு"</string>
     <string name="debug_layout" msgid="5981361776594526155">"தளவமைப்பு எல்லைகளைக் காட்டு"</string>
@@ -2167,7 +2181,6 @@
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"பயனர் அல்லது சுயவிவரத்தைச் சேர்"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"பயனரைச் சேர்"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"வரையறுக்கப்பட்ட சுயவிவரம்"</string>
-    <string name="user_summary_managed_profile" msgid="7369539529693048111">"பணி சுயவிவரம்"</string>
     <string name="user_need_lock_message" msgid="2596365678651842785">"நீங்கள் வரையறுக்கப்பட்டச் சுயவிவரத்தை உருவாக்குவதற்கு முன்பு, உங்கள் பயன்பாடுகள் மற்றும் தனிப்பட்ட தரவைப் பாதுகாக்கும் வகையில் நீங்கள் திரைப் பூட்டை அமைக்க வேண்டும்."</string>
     <string name="user_set_lock_button" msgid="8311219392856626841">"பூட்டை அமை"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"அமைக்கவில்லை"</string>
@@ -2298,11 +2311,13 @@
     <string name="sim_cellular_data_unavailable_summary" msgid="3654805961942166428">"தரவு சிம் ஐத் தேர்வுசெய்ய தொடவும்"</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"அழைப்புகளுக்கு எப்போதும் இதை பயன்படுத்து"</string>
     <string name="select_sim_for_data" msgid="2366081042162853044">"தரவுக்கான SIMஐத் தேர்ந்தெடுக்கவும்"</string>
+    <string name="data_switch_started" msgid="2040761479817166311">"தரவு சிம் மாறுகிறது, இதற்கு ஒரு நிமிடம் வரை ஆகலாம்..."</string>
     <string name="select_sim_for_calls" msgid="3503094771801109334">"இந்த SIM வழியாக அழை"</string>
     <string name="sim_select_card" msgid="211285163525563293">"சிம் கார்டைத் தேர்வுசெய்யவும்"</string>
     <string name="sim_card_number_title" msgid="7845379943474336488">"சிம் <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"சிம் இல்லை"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"சிம் பெயர்"</string>
+    <string name="sim_name_hint" msgid="7038643345238968930">"சிம் பெயரை உள்ளிடுக"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"SIM ஸ்லாட் %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"சேவை வழங்குநர்"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"எண்"</string>
@@ -2312,7 +2327,6 @@
     <string name="color_purple" msgid="3888532466427762504">"ஊதா"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"சிம் கார்டுகள் செருகப்படவில்லை"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"சிம் நிலை"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"சிம் தொடர்பான தகவல்"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"இயல்புநிலை சிம் இலிருந்து திருப்பி அழை"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"வெளிச்செல்லும் அழைப்புகளுக்கான சிம்"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"பிற அழைப்பு அமைப்பு"</string>
@@ -2320,8 +2334,11 @@
     <string name="preferred_network_offload_header" msgid="2321173571529106767">"நெட்வொர்க் பெயர் அலைபரப்பை முடக்கு"</string>
     <string name="preferred_network_offload_footer" msgid="5857279426054744020">"நெட்வொர்க் பெயர் அலைபரப்பை முடக்குவது, மூன்றாம் தரப்பினர் உங்கள் நெட்வொர்க் தகவலின் அணுகலைப் பெறுவதைத் தடுக்கும்."</string>
     <string name="preferred_network_offload_popup" msgid="2252915199889604600">"நெட்வொர்க் பெயர் அலைபரப்புவதை முடக்குவது, மறைக்கப்பட்ட நெட்வொர்க்குகளுடன் தானாக இணைப்பதைத் தடுக்கும்."</string>
+    <string name="sim_signal_strength" msgid="9144010043784767984">"<xliff:g id="DBM">%1$d</xliff:g> dBm <xliff:g id="ASU">%2$d</xliff:g> asu"</string>
+    <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>
+    <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>
@@ -2330,22 +2347,22 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"சமீபத்திய தேடல்கள்"</string>
     <string name="search_results_label" msgid="4163304782363526148">"முடிவுகள்"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"வைஃபை நெட்வொர்க் இணைப்பு"</string>
-    <string name="keywords_more_default_sms_app" msgid="2744404159003574745">"உரை செய்தி"</string>
-    <string name="keywords_more_mobile_networks" msgid="7813380887358745769">"செல்லுலார் செல் மொபைல் நிறுவனம் வயர்லெஸ்"</string>
+    <string name="keywords_more_default_sms_app" msgid="895656981962034647">"உரை செய்தி செய்தியிடல் செய்திகள் செய்தி அனுப்புதல்"</string>
+    <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"செல்லுலார் செல் கேரியர் வயர்லெஸ் டேட்டா 4g 3g 2g lte"</string>
     <string name="keywords_home" msgid="3626170808219458848">"துவக்கி"</string>
     <string name="keywords_display" msgid="6709007669501628320">"திரை டச்ஸ்கிரீன்"</string>
-    <string name="keywords_display_brightness_level" msgid="8636451602230815191">"ஒளிமங்கல் திரை டச்ஸ்கிரீன்"</string>
-    <string name="keywords_display_auto_brightness" msgid="8070218600502753102">"ஒளிமங்கல் திரை டச்ஸ்கிரீன்"</string>
-    <string name="keywords_display_wallpaper" msgid="4315466287469834939">"பின்னணி"</string>
+    <string name="keywords_display_brightness_level" msgid="8923289340474728990">"ஒளிமங்கல் திரை டச்ஸ்கிரீன் பேட்டரி"</string>
+    <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"ஒளிமங்கல் திரை டச்ஸ்கிரீன் பேட்டரி"</string>
+    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"பின்னணி தனிப்பட்ட தனிப்பயனாக்கு காட்சி"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"உரை அளவு"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"பரிமாற்றம்"</string>
-    <string name="keywords_storage" msgid="7007275853993419928">"இடம் வட்டு வன் தட்டு"</string>
-    <string name="keywords_battery" msgid="3992479295298655138">"பவர்"</string>
-    <string name="keywords_spell_checker" msgid="4509482591225399210">"எழுத்துக் கோர்வை"</string>
+    <string name="keywords_storage" msgid="6572905220031852173">"இடம் டிஸ்க் வட்டு இயக்ககம் சாதனம் பயன்பாடு"</string>
+    <string name="keywords_battery" msgid="2096185085932675704">"பவர் பயன்பாடு சார்ஜ்"</string>
+    <string name="keywords_spell_checker" msgid="6106749039734174140">"உச்சரிப்பு அகராதி எழுத்துச்சரிபார்ப்பு தன்னியக்க திருத்தம்"</string>
     <string name="keywords_voice_input" msgid="3519547605812413860">"கண்டறிவான் உள்ளீடு பேச்சு பேசு மொழி ஹேண்ட்ஸ்-ஃப்ரீ ஹேண்ட்ஃப்ரீ அறிதல் தீய வார்த்தை ஆடியோ வரலாறு புளுடூத் ஹெட்செட்"</string>
-    <string name="keywords_text_to_speech_output" msgid="8207889472282225512">"வீதம் மொழி இயல்புநிலை பேசுக பேசுதல்"</string>
-    <string name="keywords_date_and_time" msgid="7666950126499155141">"கடிகாரம்"</string>
-    <string name="keywords_factory_data_reset" msgid="3693730656843989732">"அகற்று நீக்கு"</string>
+    <string name="keywords_text_to_speech_output" msgid="392447904221657930">"வீதம் மொழி இயல்பு பேசு பேசுதல் tts அணுகல்தன்மை ரீடர் பார்வையற்றவர்"</string>
+    <string name="keywords_date_and_time" msgid="2631808108134830066">"கடிகாரம் மிலிட்டரி"</string>
+    <string name="keywords_factory_data_reset" msgid="4355133848707691977">"அழி நீக்கு மீட்டமை அழி அகற்று"</string>
     <string name="keywords_printing" msgid="1701778563617114846">"பிரிண்டர்"</string>
     <string name="keywords_sounds_and_notifications" msgid="5965996187974887000">"ஸ்பீக்கர் பீப்"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="2912933812460077912">"வேண்டாம் தொந்தரவு செய்யாதே குறுக்கீடு குறுக்கிடல் இடைநிறுத்தம்"</string>
@@ -2354,7 +2371,7 @@
     <string name="keywords_location_mode" msgid="8584992704568356084">"துல்லியம்"</string>
     <string name="keywords_accounts" msgid="1957925565953357627">"கணக்கு"</string>
     <string name="keywords_users" msgid="4673901601478559100">"வரம்பிடல் வரம்பு வரம்பிட்டது"</string>
-    <string name="keywords_keyboard_and_ime" msgid="1103378692379215672">"உரை திருத்தம் சரிசெய்தல் ஒலி அதிர்வு தானியங்கு மொழி சைகை பரிந்துரை பரிந்துரைப்பு தீம் தீங்கு சொல் வகை ஈமோஜி"</string>
+    <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"உரை திருத்தம் சரிசெய் ஒலி அதிர்வு தானியங்கு மொழி சைகை பரிந்துரை பரிந்துரைப்பு தீம் வன்மொழி சொல் வகை ஈமோஜி சர்வதேசம்"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"ஸ்லைடு கடவுச்சொல் வடிவம் pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"வைஃபை NFC குறியை அமை"</string>
     <string name="write_tag" msgid="8571858602896222537">"எழுது"</string>
@@ -2371,7 +2388,6 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"அறிவிப்பின் ஒலியளவு"</string>
     <string name="zen_mode_settings_title" msgid="7014915558669122902">"குறுக்கீடுகள்"</string>
     <string name="zen_mode_option_title" msgid="5061978632306007914">"அழைப்பு, அறிவிப்பின் போது"</string>
-    <string name="zen_mode_option_title_novoice" msgid="6680706009915204785">"அறிவிப்புகள் வரும்போது"</string>
     <string name="zen_mode_option_off" msgid="3167702608910820883">"எப்போதும் தெரிவி"</string>
     <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"முக்கியமானவற்றை மட்டும் அனுமதி"</string>
     <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"தெரிவிக்காதே"</string>
@@ -2429,14 +2445,17 @@
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"முடிந்தது"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"இதை முடக்கும்வரை"</string>
     <string name="zen_mode_important_category" msgid="8123274463331022993">"முக்கிய அறிவிப்புகள்"</string>
-    <string name="zen_mode_downtime_category" msgid="4730179065426038108">"செயல்படாத நேரம் (முக்கிய அறிவிப்புகள்)"</string>
+    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"செயலற்ற நேரம்"</string>
     <string name="zen_mode_downtime_days" msgid="3361856902633311616">"நாட்கள்"</string>
     <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"ஏதுமில்லை"</string>
+    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"குறுக்கீடுகளுக்கு அனுமதியுண்டு"</string>
+    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"முதன்மை மட்டும்"</string>
+    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"ஏதுமில்லை"</string>
     <string name="zen_mode_automation_category" msgid="4653551005950835761">"தன்னியக்கம்"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"தானாகவே இயக்கு"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"எப்போதும் வேண்டாம்"</string>
-    <string name="zen_mode_phone_calls" msgid="8956214416859303966">"அழைப்புகள்"</string>
+    <string name="zen_mode_calls" msgid="7051492091133751208">"அழைப்புகள்"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"செய்திகள்"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"இவரிடமிருந்து அழைப்புகள்/செய்திகள்"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"எவரிடம் இருந்தும்"</string>
@@ -2450,7 +2469,9 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"வார இறுதிநாட்கள்"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"தொடக்க நேரம்"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"முடிவு நேரம்"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"அடுத்த நாள் <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
+    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"அடுத்த நாள் <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> அல்லது அலாரத்திற்கு முன்"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"அடுத்த நாள் <xliff:g id="FORMATTED_TIME">%s</xliff:g> அல்லது அலாரத்திற்கு முன்"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"பயன்பாட்டு அறிவிப்புகள்"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"அறிவிப்பு அமைப்பு"</string>
     <string name="device_feedback" msgid="3238056036766293294">"சாதனம் பற்றி கருத்தை அனுப்பு"</string>
@@ -2458,7 +2479,11 @@
     <string name="switch_on_text" msgid="1124106706920572386">"இயக்கு"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"முடக்கு"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"திரையைப் பொருத்துதல்"</string>
-    <string name="screen_pinning_description" msgid="7091642350452605379">"இயக்கத்தில் இருக்கும்போது, நடப்புத் திரையை காட்சியில் வைத்திருக்க, திரை பொருத்துதலைப் பயன்படுத்தலாம், பொருத்தியதை விலக்கும்வரை நடப்புத் திரை, காட்சியில் தோன்றும்.\n\nதிரை பொருத்துதலைப் பயன்படுத்த:\n\n1. திரை பொருத்துதல் இயக்கத்தில் இருப்பதை உறுதிப்படுத்தவும்.\n\n2. பொருத்த விரும்பும் திரையைத் திறக்கவும்.\n\n3. மேலோட்டப் பார்வை என்பதைத் தொடவும்.\n\n4. பொருத்து என்ற ஐகானைத் தொடவும்."</string>
+    <string name="screen_pinning_description" msgid="1137904524037468263">"இந்த அமைப்பு இயக்கத்தில் இருக்கும்போது, நடப்புத் திரையைக் காட்சியில் வைத்திருக்க, திரை பொருத்துதலைப் பயன்படுத்தலாம், பொருத்தியதை விலக்கும்வரை நடப்புத் திரை, காட்சியில் தோன்றும்.\n\nதிரை பொருத்துதலைப் பயன்படுத்த:\n\n1. திரை பொருத்துதல் இயக்கத்தில் இருப்பதை உறுதிப்படுத்தவும்.\n\n2. பொருத்த விரும்பும் திரையை திறக்கவும்.\n\n3. மேலோட்டப் பார்வை என்பதைத் தொடவும்.\n\n4. மேற்புறம் ஸ்வைப் செய்து, பொருத்து என்ற ஐகானைத் தொடவும்."</string>
+    <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"அகற்றும் முன் திறத்தல் வடிவத்தைக் கேள்"</string>
+    <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"அகற்றும் முன் பின்னைக் கேள்"</string>
+    <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"அகற்றும் முன் கடவுச்சொல்லைக் கேள்"</string>
+    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"திரையை விலக்கும்போது சாதனத்தைப் பூட்டு"</string>
     <string name="managed_user_title" msgid="8101244883654409696">"பணி சுயவிவரம்"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(சோதனை முயற்சி)"</string>
     <string name="display_auto_rotate_title" msgid="6176450657107806043">"சாதனத்தைச் சுழற்றும் போது"</string>
@@ -2467,7 +2492,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"அகலவாக்கில் வை"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"தற்போதைய திசையமைப்பில் வை"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI தகவல்"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI தொடர்புடைய தகவல்"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"குறியாக்கம்"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"தொடர்"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"இந்தச் சாதனத்தைத் துவக்க, பின் தேவைப்படுமாறு அமைத்து, இதை மேலும் பாதுகாக்கலாம். சாதனம் துவங்கும்வரை, அழைப்புகள், செய்திகள் அல்லது அலாரங்கள் உள்ளிட்ட அறிவிப்புகளை இதில் பெற முடியாது. \n\nஇவ்வாறு செய்வதால், காணாமல் போன அல்லது களவு போன சாதனங்களில் தரவைப் பாதுகாக்கலாம்."</string>
@@ -2485,4 +2509,7 @@
     <string name="encrypt_talkback_dialog_message_pin" msgid="1890374082842868489">"இந்தச் சாதனத்தைத் துவக்க பின்னை நீங்கள் பயன்படுத்தினால், <xliff:g id="SERVICE">%1$s</xliff:g> போன்ற அணுகல்தன்மை சேவைகள் கிடைக்காது."</string>
     <string name="encrypt_talkback_dialog_message_pattern" msgid="4474332516537386384">"இந்தச் சாதனத்தைத் துவக்க வடிவத்தை நீங்கள் பயன்படுத்தினால், <xliff:g id="SERVICE">%1$s</xliff:g> போன்ற அணுகல்தன்மை சேவைகள் கிடைக்காது."</string>
     <string name="encrypt_talkback_dialog_message_password" msgid="8166099418487083927">"இந்தச் சாதனத்தைத் துவக்க கடவுச்சொல்லை நீங்கள் பயன்படுத்தினால், <xliff:g id="SERVICE">%1$s</xliff:g> போன்ற அணுகல்தன்மை சேவைகள் கிடைக்காது."</string>
+    <string name="imei_information_title" msgid="8499085421609752290">"IMEI தகவல்"</string>
+    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI தொடர்புடைய தகவல்"</string>
+    <string name="slot_number" msgid="3762676044904653577">"(ஸ்லாட்<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-te-rIN/arrays.xml b/res/values-te-rIN/arrays.xml
index 3819abb..cb09f6f 100644
--- a/res/values-te-rIN/arrays.xml
+++ b/res/values-te-rIN/arrays.xml
@@ -527,4 +527,12 @@
     <item msgid="4338089220026248848">"కాష్ చేసినవి (కార్యాచరణ క్లయింట్)"</item>
     <item msgid="6652164677254579050">"కాష్ చేసినవి (ఖాళీ)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"నీలి ఆకుపచ్చ"</item>
+    <item msgid="8332294763632946560">"నీలం"</item>
+    <item msgid="2023216417616991392">"నీలిరంగు"</item>
+    <item msgid="3170497246594232819">"ఊదా"</item>
+    <item msgid="4608643045752965568">"గులాబీ"</item>
+    <item msgid="6131821495505931173">"ఎరుపు"</item>
+  </string-array>
 </resources>
diff --git a/res/values-te-rIN/strings.xml b/res/values-te-rIN/strings.xml
index 6664d50..3d8fe0c 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>
@@ -180,7 +180,6 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s మీ సందేశాలను ప్రాప్యత చేయాలనుకుంటోంది. %2$sకు ప్రాప్యత అందించాలా?"</string>
     <string name="date_and_time" msgid="9062980487860757694">"తేదీ &amp; సమయం"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"సమయ మండలిని ఎంచుకోండి"</string>
-    <string name="normal_date_format" msgid="7636406984925498359">"ప్రాంతీయం (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"పరిదృశ్యం:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"ఫాంట్ పరిమాణం:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -291,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>
@@ -322,8 +321,6 @@
     <string name="date_time_set_timezone" msgid="5045627174274377814">"సమయ మండలిని ఎంచుకోండి"</string>
     <string name="date_time_set_date_title" msgid="6928286765325608604">"తేదీ"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"తేదీని సెట్ చేయి"</string>
-    <string name="date_time_date_format_title" msgid="3976171711988766411">"తేదీ ఆకృతి"</string>
-    <string name="date_time_date_format" msgid="6951498879879281102">"తేదీ ఆకృతిని ఎంచుకోండి"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"అక్షరక్రమంలో క్రమబద్ధీకరించు"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"సమయ మండలి ద్వారా క్రమబద్ధీకరించు"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"తేదీ"</string>
@@ -372,7 +369,8 @@
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"మీ ఫోన్ గుప్తీకరించబడుతున్నప్పుడు వేచి ఉండండి. <xliff:g id="PERCENT">^1</xliff:g>% పూర్తయింది."</string>
     <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"మీ టాబ్లెట్ గుప్తీకరించబడుతున్నప్పుడు వేచి ఉండండి. మిగిలి ఉన్న సమయం: <xliff:g id="DURATION">^1</xliff:g>"</string>
     <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"మీ ఫోన్ గుప్తీకరించబడుతున్నప్పుడు వేచి ఉండండి. మిగిలి ఉన్న సమయం: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"<xliff:g id="DELAY">^1</xliff:g> సెకన్లలో మళ్లీ ప్రయత్నించండి."</string>
+    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"మీ టాబ్లెట్‌ను అన్‌లాక్ చేయడానికి దాన్ని ఆఫ్ చేసి, ఆపై ఆన్ చేయండి."</string>
+    <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"మీ ఫోన్‌ను అన్‌లాక్ చేయడానికి దాన్ని ఆఫ్ చేసి, ఆపై ఆన్ చేయండి."</string>
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"హెచ్చరిక: మీరు అన్‌లాక్ చేయడానికి చేసే ప్రయత్నాల్లో మరో <xliff:g id="COUNT">^1</xliff:g> సార్లు విఫలమైతే మీ పరికరం తొలగించబడుతుంది!"</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"మీ పాస్‌వర్డ్‌ను టైప్ చేయండి"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"గుప్తీకరణ విఫలమైంది"</string>
@@ -401,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>
@@ -412,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>
@@ -556,13 +556,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"స్పీకర్ ఫోన్ వలె"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"సంగీతం మరియు మీడియా కోసం"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"సెట్టింగ్‌లను గుర్తుంచుకో"</string>
-    <string name="wifi_assistant_intro_setup" msgid="4605105515416995110">"Wi‑Fi సహాయకాన్ని\n పరిచయం చేస్తున్నాము"</string>
-    <string name="wifi_assistant_no_thanks" msgid="2776983751990143934">"వద్దు, ధన్యవాదాలు"</string>
-    <string name="wifi_assistant_setup" msgid="3772423650475730906">"సెటప్ చేయి"</string>
-    <string name="wifi_assistant_card_message" msgid="107811647784658536">"Wi‑Fi సహాయకంతో అందుబాటులో ఉన్న నెట్‌వర్క్‌లకు స్వయంచాలకంగా కనెక్ట్ చేయండి."</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi‑Fi సహాయకం"</string>
-    <string name="wifi_assistant_title_message" msgid="6240721017579074015">"<xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> అందుబాటులో ఉన్న ఉత్తమ Wi‑Fiకి మిమ్మల్ని స్వయంచాలకంగా కనెక్ట్ చేస్తుంది"</string>
-    <string name="wifi_assistant_open_app" msgid="4803044899535675063">"అనువర్తనాన్ని తెరువు"</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>
@@ -592,7 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Wi‑Fi సెట్టింగ్‌లు"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"వైర్‌లెస్ ప్రాప్యత స్థానాలను సెటప్ చేయండి &amp; నిర్వహించండి"</string>
-    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Wi‑Fiను ఎంచుకోండి"</string>
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Wi‑Fi నెట్‌వర్క్‌ను ఎంచుకోండి"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Wi‑Fiను ఎంచుకోండి"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Wi‑Fiను ప్రారంభిస్తోంది…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Wi‑Fiని ఆపివేస్తోంది…"</string>
@@ -607,8 +602,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"స్కానింగ్‌ను ఎల్లప్పుడూ అందుబాటులో ఉంచు"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"ఎల్లప్పుడూ స్కాన్ చేయడాన్ని అనుమతించు"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Wi‑Fi ఆఫ్‌లో ఉన్నప్పటికీ నెట్‌వర్క్‌ల కోసం స్కాన్ చేయడానికి Google స్థాన సేవ మరియు ఇతర అనువర్తనాలను అనుమతించు"</string>
-    <string name="wifi_automatically_manage_title" msgid="6249976570008992746">"Wi‑Fiని స్వయంచాలకంగా నిర్వహించు"</string>
-    <string name="wifi_automatically_manage_summary" msgid="6952470763378312488">"మీ Wi‑Fi కనెక్షన్‌ను నిర్వహించడానికి <xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> అనుమతించండి"</string>
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"స్వయంచాలకంగా బహిరంగ Wi‑Fiని ఉపయోగించు"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Wi‑Fi సహాయకం అధిక నాణ్యమైనవిగా గుర్తించిన బహిరంగ నెట్‌వర్క్‌లకు స్వయం. కనెక్ట్ కావడానికి అనుమతించండి"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"సహాయకాన్ని ఎంచుకోండి"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"ప్రమాణపత్రాలను ఇన్‌స్టాల్ చేయి"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"స్థాన ఖచ్చితత్వాన్ని మెరుగుపరచడానికి మరియు ఇతర ప్రయోజనాల దృష్ట్యా, Google మరియు ఇతర అనువర్తనాలు Wi-Fi ఆఫ్‌లో ఉన్నప్పటికీ, నెట్‌వర్క్‌ల కోసం అనువర్తనాలు స్కాన్ చేయవచ్చు. మీరు ఇలా జరగకూడదనుకుంటే, అధునాతనం &gt; స్కానింగ్‌ ఎల్లప్పుడూ అందుబాటులో ఉంచుకు వెళ్లండి."</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Wi-Fi ఆఫ్‌లో ఉన్నప్పటికీ సమీపంలోని నెట్‌వర్క్‌ల కోసం అనువర్తనాలు స్కాన్ చేయవచ్చు. మీరు ఇలా జరగకూడదనుకుంటే, అధునాతనం &gt; స్కానింగ్‌ ఎల్లప్పుడూ అందుబాటులో ఉంచుకు వెళ్లండి."</string>
@@ -629,6 +625,7 @@
     <string name="wifi_menu_scan" msgid="1470911530412095868">"స్కాన్ చేయి"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"అధునాతనం"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"నెట్‌‍వర్క్‌కు కనెక్ట్ చేయి"</string>
+    <string name="wifi_menu_remember" msgid="8814185749388713796">"నెట్‌వర్క్‌ను గుర్తుంచుకో"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"నెట్‌వర్క్‌ను విస్మరించు"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"నెట్‌వర్క్‌ను సవరించు"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"NFC ట్యాగ్‌కు వ్రాయండి"</string>
@@ -673,9 +670,11 @@
     <string name="wifi_unspecified" msgid="5431501214192991253">"(పేర్కొనబడనివి)"</string>
     <string name="wifi_remembered" msgid="4955746899347821096">"సేవ్ చేయబడింది"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"నిలిపివేయబడింది"</string>
-    <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"బలహీన ఇంటర్నెట్ కనెక్షన్ విస్మరించబడింది"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP కాన్ఫిగరేషన్ వైఫల్యం"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"WiFi కనెక్షన్ వైఫల్యం"</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"ప్రామాణీకరణ సమస్య"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"పరిధిలో లేదు"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"ఇంటర్నెట్ ప్రాప్యత కనుగొనబడలేదు, స్వయంచాలకంగా మళ్లీ కనెక్ట్ చేయబడదు."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS అందుబాటులో ఉంది"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS అందుబాటులో ఉంది)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"మీ నెట్‌వర్క్ పాస్‌వర్డ్‌ను నమోదు చేయండి"</string>
@@ -699,9 +698,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"హెచ్చరిక: మీరు Wi‑Fiని దాటవేస్తే, మీ టాబ్లెట్ ప్రాథమిక డౌన్‌లోడ్‌లు మరియు నవీకరణల కోసం సెల్యులార్ డేటాని మాత్రమే ఉపయోగిస్తుంది. సంభావ్య డేటా ఛార్జీలను నివారించడానికి, Wi‑Fiకి కనెక్ట్ చేయండి."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"హెచ్చరిక: మీరు Wi‑Fiని దాటవేస్తే, మీ పరికరం ప్రాథమిక డౌన్‌లోడ్‌లు మరియు నవీకరణల కోసం సెల్యులార్ డేటాని మాత్రమే ఉపయోగిస్తుంది. సంభావ్య డేటా ఛార్జీలను నివారించడానికి, Wi‑Fiకి కనెక్ట్ చేయండి."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"హెచ్చరిక: మీరు Wi‑Fiని దాటవేస్తే, మీ ఫోన్ ప్రాథమిక డౌన్‌లోడ్‌లు మరియు నవీకరణల కోసం సెల్యులార్ డేటాని మాత్రమే ఉపయోగిస్తుంది. సంభావ్య డేటా ఛార్జీలను నివారించడానికి, Wi‑Fiకి కనెక్ట్ చేయండి."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="2393880108322835846">"హెచ్చరిక: మీరు Wi‑Fiని దాటవేస్తే, మీ టాబ్లెట్ ఏవైనా ప్రాథమిక డౌన్‌లోడ్‌లు లేదా నవీకరణల కోసం ఉపయోగించడానికి ఇంటర్నెట్ కనెక్షన్‌ని కలిగి ఉండదు."</string>
-    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1707391993265558787">"హెచ్చరిక: మీరు Wi‑Fiని దాటవేస్తే, మీ పరికరం ఏవైనా ప్రాథమిక డౌన్‌లోడ్‌లు లేదా నవీకరణల కోసం ఉపయోగించడానికి ఇంటర్నెట్ కనెక్షన్‌ని కలిగి ఉండదు."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="1556858507920033022">"హెచ్చరిక: మీరు Wi‑Fiని దాటవేస్తే, మీ ఫోన్ ఏవైనా ప్రాథమిక డౌన్‌లోడ్‌లు లేదా నవీకరణల కోసం ఉపయోగించడానికి ఇంటర్నెట్ కనెక్షన్‌ని కలిగి ఉండదు."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"మీరు Wi‑Fiని దాటవేస్తే:\n\nమీ టాబ్లెట్‌కు ఇంటర్నెట్ కనెక్షన్ ఉండదు.\n\nమీరు ఇంటర్నెట్‌కు కనెక్ట్ చేసే వరకు సాఫ్ట్‌వేర్ నవీకరణలను పొందరు.\n\nమీరు ఈ సమయంలో పరికర రక్షణ లక్షణాలను సక్రియం చేయలేరు."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"మీరు Wi‑Fiని దాటవేస్తే:\n\nమీ పరికరానికి ఇంటర్నెట్ కనెక్షన్ ఉండదు.\n\nమీరు ఇంటర్నెట్‌కు కనెక్ట్ చేసే వరకు సాఫ్ట్‌వేర్ నవీకరణలను పొందరు.\n\nమీరు ఈ సమయంలో పరికర రక్షణ లక్షణాలను సక్రియం చేయలేరు."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"మీరు Wi‑Fiని దాటవేస్తే:\n\nమీ ఫోన్‌కి ఇంటర్నెట్ కనెక్షన్ ఉండదు.\n\nమీరు ఇంటర్నెట్‌కు కనెక్ట్ చేసే వరకు సాఫ్ట్‌వేర్ నవీకరణలను పొందరు.\n\nమీరు ఈ సమయంలో పరికర రక్షణ లక్షణాలను సక్రియం చేయలేరు."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"టాబ్లెట్‌ను ఈ Wi‑Fi నెట్‌వర్క్‌కు కనెక్ట్ చేయడం సాధ్యపడలేదు."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"పరికరాన్ని ఈ Wi‑Fi నెట్‌వర్క్‌కి కనెక్ట్ చేయడం సాధ్యపడలేదు."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"ఫోన్‌ను ఈ Wi‑Fi నెట్‌వర్క్‌కు కనెక్ట్ చేయడం సాధ్యపడలేదు."</string>
@@ -761,7 +760,6 @@
     <string name="ring_volume_title" msgid="7938706566797464165">"రింగర్ వాల్యూమ్"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"నిశ్శబ్దంగా ఉన్నప్పుడు వైబ్రేట్ చేయి"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"డిఫాల్ట్ నోటిఫికేషన్ ధ్వని"</string>
-    <string name="heads_up_enabled_title" msgid="1031078221910921622">"అధిక ప్రాధాన్యత ఉంటే పాప్ అప్ చేయి"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"రింగ్‌టోన్"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"నోటిఫికేషన్"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"నోటిఫికేషన్‌ల కోసం ఇన్‌కమింగ్ కాల్ వాల్యూమ్‌ను ఉపయోగించు"</string>
@@ -834,7 +832,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"స్వయంచాలక ప్రకాశం"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"సక్రియం చేయడానికి వేళ్లను తీసివేయండి"</string>
     <string name="doze_title" msgid="2259176504273878294">"యాంబియెంట్ డిస్‌ప్లే"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"పరికరాన్ని చేతిలోకి తీసుకున్నప్పుడు లేదా నోటిఫికేషన్‌లు వచ్చినప్పుడు స్క్రీన్‌ను సక్రియం చేయి"</string>
+    <string name="doze_summary" msgid="7128970177894383698">"పరికరాన్ని చేతిలోకి తీసుకున్నప్పుడు లేదా నోటిఫికేషన్‌లు వచ్చినప్పుడు స్క్రీన్‌ను సక్రియం చేయి"</string>
     <string name="title_font_size" msgid="4405544325522105222">"ఫాంట్ పరిమాణం"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"ఫాంట్ పరిమాణం"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"సిమ్ కార్డు లాక్ సెట్టింగ్‌లు"</string>
@@ -862,6 +860,10 @@
     <string name="sim_enter_cancel" msgid="6240422158517208036">"రద్దు చేయి"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"బహుళ SIMలు కనుగొనబడ్డాయి"</string>
     <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>
+    <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>
@@ -1012,6 +1014,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"ఇందువలన మీ టాబ్లెట్ యొక్క "<b>"అంతర్గత నిల్వ"</b>" నుండి వీటితో సహా, మొత్తం డేటా ఎరేజ్ చేయబడుతుంది:\n\n"<li>"మీ Google ఖాతా"</li>\n<li>"సిస్టమ్ మరియు అనువర్తన డేటా మరియు సెట్టింగ్‌లు"</li>\n<li>"డౌన్‌లోడ్ చేయబడిన అనువర్తనాలు"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"ఇందువలన మీ ఫోన్ "<b>"అంతర్గత నిల్వ"</b>" నుండి వీటితో సహా మొత్తం డేటా ఎరేజ్ చేయబడుతుంది:\n\n"<li>"Google ఖాతా"</li>\n<li>"సిస్టమ్ మరియు అనువర్తన డేటా మరియు సెట్టింగ్‌లు"</li>\n<li>"డౌన్‌లోడ్ చేయబడిన అనువర్తనాలు"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"మీరు ప్రస్తుతం క్రింది ఖాతాలకు సైన్ ఇన్ చేసారు:\n"</string>
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"ఈ పరికరంలో ఇతర వినియోగదారులు ఉన్నారు.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"సంగీతం"</li>\n<li>"ఫోటోలు"</li>\n<li>"ఇతర వినియోగదారు డేటా"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"సంగీతం, చిత్రాలు మరియు ఇతర వినియోగదారు డేటాను క్లియర్ చేయడానికి, "<b>"USB నిల్వ"</b>"ను ఎరేజ్ చేయాల్సి ఉంటుంది."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"సంగీతం, చిత్రాలు మరియు ఇతర వినియోగదారు డేటాను క్లియర్ చేయడానికి, "<b>"SD కార్డు"</b>"ను ఎరేజ్ చేయాల్సి ఉంటుంది."</string>
@@ -1023,7 +1026,6 @@
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"ఫోన్‌ను రీసెట్ చేయి"</string>
     <string name="master_clear_final_desc" msgid="7209547812233487345">"మీ మొత్తం వ్యక్తిగత సమాచారాన్ని మరియు అన్ని డౌన్‌లోడ్ చేయబడిన అనువర్తనాలను ఎరేజ్ చేయాలా? మీరు ఈ చర్యను రద్దు చేయలేరు!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"ప్రతిదాన్ని ఎరేజ్ చేయి"</string>
-    <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"మీ అన్‌లాక్ నమూనాను గీయండి"</string>
     <string name="master_clear_gesture_explanation" msgid="826193821455182780">"మీరు ఫ్యాక్టరీ డేటా రీసెట్‌ను నిర్ధారించడానికి మీ అన్‌లాక్ నమూనాను గీయాల్సి ఉంటుంది."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"సిస్టమ్ క్లియర్ సేవ అందుబాటులో లేనందున రీసెట్ చేయడం అమలు కాలేదు."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"రీసెట్ చేయాలా?"</string>
@@ -1041,7 +1043,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"USB నిల్వలో నిల్వ చేసిన అన్ని ఫైల్‌లను తొలగిస్తూ, దాన్ని ఎరేజ్ చేయాలా? మీరు ఈ చర్యను రద్దు చేయలేరు!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"SD కార్డు‌లో నిల్వ చేసిన అన్ని ఫైల్‌లను తొలగిస్తూ దాన్ని ఎరేజ్ చేయాలా? మీరు ఈ చర్యను రద్దు చేయలేరు!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"ప్రతిదీ ఎరేజ్ చేయి"</string>
-    <string name="media_format_gesture_prompt" msgid="3109349468816856670">"మీ అన్‌లాక్ నమూనాను గీయండి"</string>
     <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"మీరు USB నిల్వను ఎరేజ్ చేయాలనుకుంటున్నారని నిర్ధారించడానికి మీరు మీ అన్‌లాక్ నమూనాను గీయాల్సి ఉంటుంది."</string>
     <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"మీరు SD కార్డును ఎరేజ్ చేయాలనుకుంటున్నట్లు నిర్ధారించడానికి మీ అన్‌లాక్ నమూనాను గీయాల్సి ఉంటుంది."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"కాల్ సెట్టింగ్‌లు"</string>
@@ -1087,6 +1088,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"దయచేసి సిమ్ కార్డును చొప్పించి, పునఃప్రారంభించండి"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"దయచేసి ఇంటర్నెట్‌కు కనెక్ట్ చేయండి"</string>
     <string name="location_title" msgid="1029961368397484576">"నా స్థానం"</string>
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"కార్యాలయ ప్రొఫైల్‌"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"కార్యాలయ ప్రొఫైల్ యొక్క స్థానం"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"మీ కంపెనీ ద్వారా ఆఫ్ చేయబడింది"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"మోడ్"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"అధిక నిర్దుష్టత"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"బ్యాటరీ ఆదా"</string>
@@ -1124,6 +1128,7 @@
     <string name="copyright_title" msgid="865906688917260647">"కాపీరైట్"</string>
     <string name="license_title" msgid="1990487604356037871">"లైసెన్స్"</string>
     <string name="terms_title" msgid="7697580845616764642">"నిబంధనలు మరియు షరతులు"</string>
+    <string name="webview_license_title" msgid="2813507464175738967">"సిస్టమ్ వెబ్‌వ్యూ లైసెన్స్"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"వాల్‌పేపర్‌లు"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"ఉపగ్రహ చిత్రాల ప్రదాతలు:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"ఓపెన్ సోర్స్ లైసెన్స్‌లు"</string>
@@ -1237,7 +1242,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB నిల్వ"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"SD కార్డులో"</string>
     <string name="disabled" msgid="9206776641295849915">"నిలిపివేయబడింది"</string>
-    <string name="not_installed" msgid="1475144352069281880">"ఇన్‌స్టాల్ చేయబడలేదు"</string>
+    <string name="not_installed" msgid="2797554494953450291">"ఈ విని. కోసం ఇన్‌స్టా. చేయలేదు"</string>
     <string name="no_applications" msgid="7336588977497084921">"అనువర్తనాలు లేవు."</string>
     <string name="internal_storage" msgid="1584700623164275282">"అంతర్గత నిల్వ"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB నిల్వ"</string>
@@ -1434,8 +1439,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"ఛార్జ్ చేస్తున్నప్పుడు స్క్రీన్ ఎప్పటికీ నిద్రావస్థలోకి వెళ్లదు"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"బ్లూటూత్ HCI రహస్య లాగ్‌ను ప్రారంభించు"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"ఫైల్‌లో అన్ని బ్లూటూత్ HCI ప్యాకెట్‌లను క్యాప్చర్ చేయి"</string>
-    <string name="oem_unlock_enable" msgid="6629321276287913315">"OEM అన్‌లాక్‌ను ప్రారంభించు"</string>
-    <string name="oem_unlock_enable_summary" msgid="3546686263996628110">"OEM అన్‌లాక్ చేయబడిన పరికరాన్ని అనుమతించు"</string>
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM అన్‌లాకింగ్"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"బూట్‌లోడర్ అన్‌లాక్ కావడానికి అనుమతించు"</string>
+    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"మీ PINను నమోదు చేయండి"</string>
+    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"OEM అన్‌లాక్‌ను ప్రారంభించడానికి మీ పరికరం PINను నమోదు చేయండి"</string>
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"OEM అన్‌లాకింగ్‌ను అనుమతించాలా?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"హెచ్చరిక: ఈ సెట్టింగ్ ఆన్ చేయబడినప్పుడు పరికరం రక్షణ లక్షణాలు ఈ పరికరంలో పని చేయవు."</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"వైర్‌లెస్ ప్రదర్శన ప్రమాణీకరణ"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Wi‑Fi విశదీకృత లాగింగ్‌ను ప్రారంభించండి"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Wi‑Fi నుండి సెల్యులార్‌కి తీవ్ర ఒత్తిడితో మారడం"</string>
@@ -1538,6 +1547,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"శీర్షికలు ఈ విధంగా కనిపిస్తాయి"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"డిఫాల్ట్"</string>
+    <string name="color_title" msgid="4258931051732243983">"రంగు"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"డిఫాల్ట్"</string>
     <string name="color_none" msgid="3475640044925814795">"ఏదీ కాదు"</string>
     <string name="color_white" msgid="8045195170201590239">"తెలుపు రంగు"</string>
@@ -1595,12 +1605,12 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"<xliff:g id="REMAIN">%1$s</xliff:g> ఉంది"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g>లోపు ఛార్జ్ చేయాలి"</string>
-    <string name="power_discharging_duration" msgid="7125493014448497620">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - సుమారు <xliff:g id="TIME">%2$s</xliff:g> మిగిలి ఉంటుంది"</string>
-    <string name="power_charging" msgid="712751285832976915">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="STATE">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration" msgid="4802183864773082009">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - పూర్తిగా నిండే వరకు <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration_ac" msgid="3611179931297824699">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - ACలో పూర్తిగా నిండే వరకు <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration_usb" msgid="1106605348913397583">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - USB ద్వారా పూర్తిగా నిండే వరకు <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration_wireless" msgid="633606920144617227">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - వైర్‌లెస్ పద్ధతిలో పూర్తిగా నిండే వరకు <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> - సుమారు <xliff:g id="TIME">%2$s</xliff:g> మిగిలి ఉంది"</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>"</string>
+    <string name="power_charging_duration_ac" msgid="3969186192576594254">"<xliff:g id="LEVEL">%1$s</xliff:g> - ACలో పూర్తిగా నిండటానికి <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="power_charging_duration_usb" msgid="182405645340976546">"<xliff:g id="LEVEL">%1$s</xliff:g> - USB ద్వారా పూర్తిగా నిండటానికి <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="power_charging_duration_wireless" msgid="1829295708243159464">"<xliff:g id="LEVEL">%1$s</xliff:g> - వైర్‌లెస్ నుండి పూర్తిగా నిండటానికి <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="power_usage_list_summary" msgid="2409288197839512482">"పూర్తిగా ఛార్జ్ అయినప్పటి నుండి ఉపయోగిస్తున్నవి"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"అన్‌ప్లగ్ చేసినప్పటి నుండి బ్యాటరీ వినియోగం"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"రీసెట్ చేసినప్పటి నుండి బ్యాటరీ వినియోగం"</string>
@@ -1617,7 +1627,6 @@
     <string name="awake" msgid="387122265874485088">"పరికరం మేల్కొని ఉండాల్సిన సమయం"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi‑Fi ఆన్‌లో ఉండే సమయం"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi‑Fi ఆన్‌లో ఉండే సమయం"</string>
-    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"చరిత్ర వివరాలు"</string>
     <string name="details_title" msgid="3792801565213935385">"వివరాలను ఉపయోగించండి"</string>
     <string name="details_subtitle" msgid="32593908269911734">"వినియోగ వివరాలు"</string>
@@ -1689,7 +1698,7 @@
     <string name="battery_saver" msgid="1426682272004907982">"బ్యాటరీ సేవర్"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"స్వయంచాలకంగా ఆన్ చేయి"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"ఎప్పటికీ వద్దు"</string>
-    <string name="battery_saver_turn_on_automatically_pct" msgid="3033681629861428940">"బ్యాటరీ %1$d%% ఉన్నప్పుడు"</string>
+    <string name="battery_saver_turn_on_automatically_pct" msgid="7536784431655058267">"%1$s బ్యాటరీలో"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"ప్రాసెస్ గణాంకాలు"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"అమలవుతున్న ప్రాసెస్‌ల గురించి అసాధారణమైన గణాంకాలు"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"మెమరీ వినియోగం"</string>
@@ -1813,7 +1822,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"హార్డ్‌వేర్ మద్దతు గలది"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"సాప్ట్‌వేర్ మాత్రమే"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"ఈ వినియోగదారు కోసం ఆధారాలు అందుబాటులో లేవు"</string>
-    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"మీ అన్‌లాక్ నమూనాను గీయండి"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"మీరు ఆధారాల ఇన్‌స్టాలేషన్‌ను నిర్ధారించడానికి మీ అన్‌లాక్ నమూనాను గీయాల్సి ఉంటుంది."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"ఆధారాల నిల్వ కోసం పాస్‌వర్డ్‌ను టైప్ చేయండి."</string>
@@ -1843,6 +1851,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"అనువర్తన డేటాను చేర్చు"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"స్వీయ పునరుద్ధరణ"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"అనువర్తనాన్ని మళ్లీ ఇన్‌స్టాల్ చేస్తున్నప్పుడు, బ్యాకప్ చేయబడిన సెట్టింగ్‌లను మరియు డేటాను పునరుద్ధరించండి"</string>
+    <string name="backup_inactive_title" msgid="5355557151569037197">"బ్యాకప్ సేవ నిష్క్రియంగా ఉంది."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"ఇది మీ పరికరం విధానం ద్వారా సెట్ చేయబడింది."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"డెస్క్‌టాప్ బ్యాకప్ పాస్‌వర్డ్"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"డెస్క్‌టాప్ పూర్తి బ్యాకప్‌లు ప్రస్తుతం రక్షించబడలేదు"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"డెస్క్‌టాప్ పూర్తి బ్యాకప్‌ల కోసం పాస్‌వర్డ్‌ను మార్చడానికి లేదా తీసివేయడానికి తాకండి"</string>
@@ -1952,7 +1962,11 @@
     <string name="enter_password" msgid="8035706727471334122">"Androidని ప్రారంభించడానికి, మీ పాస్‌వర్డ్‌ని నమోదు చేయండి"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Androidని ప్రారంభించడానికి, మీ పిన్‌ను నమోదు చేయండి"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Androidని ప్రారంభించడానికి, మీ నమూనాను గీయండి"</string>
-    <string name="try_again" msgid="4272075051293936921">"మళ్లీ ప్రయత్నించండి."</string>
+    <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"నమూనా తప్పు"</string>
+    <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"పాస్‌వర్డ్ తప్పు"</string>
+    <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"PIN తప్పు"</string>
+    <string name="checking_decryption" msgid="8287458611802609493">"తనిఖీ చేస్తున్నాము..."</string>
+    <string name="starting_android" msgid="8581493237458496835">"Androidని ప్రారంభిస్తున్నాము"</string>
     <string name="delete" msgid="4219243412325163003">"తొలగించు"</string>
     <string name="misc_files" msgid="6720680815969643497">"నానావిధమైన ఫైల్‌లు"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"<xliff:g id="TOTAL">%2$d</xliff:g>లో <xliff:g id="NUMBER">%1$d</xliff:g> ఎంచుకోబడ్డాయి"</string>
@@ -1990,8 +2004,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"స్క్రీన్ కంపోజిషనింగ్ కోసం ఎల్లప్పుడూ GPUని ఉపయోగించు"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"రంగు అంతరాన్ని అనుకరించు"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"OpenGL ట్రేస్‌లను ప్రారంభించండి"</string>
-    <string name="use_nuplayer" msgid="5699257393367904387">"NuPlayerని ఉపయోగించండి (ప్రయోగాత్మకం)"</string>
-    <string name="use_nuplayer_summary" msgid="1991479067478516714">"AwesomePlayerకి బదులుగా NuPlayerని ఉపయోగించండి"</string>
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"AwesomePlayerని (నిలిపివేయబడింది) ఉపయోగించు"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"దాదాపు అన్ని రకాల మీడియా ప్లేబ్యాక్ కోసం NuPlayerకి బదులుగా AwesomePlayerని ఉపయోగించు"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"USB ఆడియో రూటిం. నిలిపి."</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"USB ఆడియో పరికరాలకు స్వయం. రూటింగ్‌ను నిలిపివేయండి"</string>
     <string name="debug_layout" msgid="5981361776594526155">"లేఅవుట్ బౌండ్‌లను చూపండి"</string>
@@ -2167,7 +2181,6 @@
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"వినియోగదారు లేదా ప్రొఫైల్‌ను జోడించు"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"వినియోగదారును జోడించు"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"పరిమితం చేయబడిన ప్రొఫైల్"</string>
-    <string name="user_summary_managed_profile" msgid="7369539529693048111">"కార్యాలయ ప్రొఫైల్‌"</string>
     <string name="user_need_lock_message" msgid="2596365678651842785">"మీరు పరిమితం చేయబడిన ప్రొఫైల్‌ను సృష్టించడానికి ముందు, మీ అనువర్తనాలు మరియు వ్యక్తిగత డేటాను రక్షించడానికి స్క్రీన్ లాక్‌ను సెటప్ చేయాల్సి ఉంటుంది."</string>
     <string name="user_set_lock_button" msgid="8311219392856626841">"లాక్‌ను సెట్ చేయి"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"సెటప్ చేయలేదు"</string>
@@ -2298,11 +2311,13 @@
     <string name="sim_cellular_data_unavailable_summary" msgid="3654805961942166428">"డేటా సిమ్‌ను ఎంచుకోవడానికి తాకండి"</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"కాల్‌ల కోసం దీన్ని ఎల్లప్పుడూ ఉపయోగించు"</string>
     <string name="select_sim_for_data" msgid="2366081042162853044">"డేటా కోసం SIMను ఎంచుకోండి"</string>
+    <string name="data_switch_started" msgid="2040761479817166311">"డేటా SIMని మార్చుతోంది, ఇందుకు ఒక నిమిషం పట్టవచ్చు..."</string>
     <string name="select_sim_for_calls" msgid="3503094771801109334">"దీనితో కాల్ చేయండి"</string>
     <string name="sim_select_card" msgid="211285163525563293">"సిమ్ కార్డును ఎంచుకోండి"</string>
     <string name="sim_card_number_title" msgid="7845379943474336488">"సిమ్ <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"సిమ్ లేదు"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"సిమ్ పేరు"</string>
+    <string name="sim_name_hint" msgid="7038643345238968930">"SIM పేరు నమోదు చేయండి"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"SIM స్లాట్ %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"క్యారియర్"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"నంబర్"</string>
@@ -2312,7 +2327,6 @@
     <string name="color_purple" msgid="3888532466427762504">"వంగ రంగు"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"సిమ్ కార్డులు ఏవీ చొప్పించబడలేదు"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"సిమ్ స్థితి"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"సిమ్ సంబంధిత సమాచారం"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"డిఫాల్ట్ సిమ్ నుండి తిరిగి కాల్ చేయి"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"అవుట్‌గోయింగ్ కాల్‌ల కోసం సిమ్"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"ఇతర కాల్ సెట్టింగ్‌లు"</string>
@@ -2320,8 +2334,11 @@
     <string name="preferred_network_offload_header" msgid="2321173571529106767">"నెట్‌వర్క్ పేరు ప్రసారాన్ని నిలిపివేయండి"</string>
     <string name="preferred_network_offload_footer" msgid="5857279426054744020">"మీ నెట్‌వర్క్ సమాచారానికి ప్రాప్యత పొందే మూడవ పార్టీల నుండి రక్షించబడే నెట్‌వర్క్ పేరు ప్రసారాన్ని నిలిపివేయండి."</string>
     <string name="preferred_network_offload_popup" msgid="2252915199889604600">"నెట్‌వర్క్ పేరు ప్రసారం నిలిపివేయడం వలన దాచబడిన నెట్‌వర్క్‌లకు స్వయంచాలక కనెక్షన్ నిరోధించబడుతుంది."</string>
+    <string name="sim_signal_strength" msgid="9144010043784767984">"<xliff:g id="DBM">%1$d</xliff:g> dBm <xliff:g id="ASU">%2$d</xliff:g> asu"</string>
+    <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>
@@ -2330,22 +2347,22 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"ఇటీవలి శోధనలు"</string>
     <string name="search_results_label" msgid="4163304782363526148">"ఫలితాలు"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"వైఫై వై-ఫై నెట్‌వర్క్ కనెక్షన్"</string>
-    <string name="keywords_more_default_sms_app" msgid="2744404159003574745">"వచన సందేశం"</string>
-    <string name="keywords_more_mobile_networks" msgid="7813380887358745769">"సెల్యులార్ సెల్ క్యారియర్ వైర్‌లెస్"</string>
+    <string name="keywords_more_default_sms_app" msgid="895656981962034647">"వచన సందేశం వచనం పంపడం సందేశాలు సందేశం పంపడం"</string>
+    <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"సెల్యులార్ సెల్ క్యారియర్ వైర్‌లెస్ డేటా 4g 3g 2g lte"</string>
     <string name="keywords_home" msgid="3626170808219458848">"లాంచర్"</string>
     <string name="keywords_display" msgid="6709007669501628320">"స్క్రీన్‌లో టచ్‌స్క్రీన్ భాగం"</string>
-    <string name="keywords_display_brightness_level" msgid="8636451602230815191">"స్క్రీన్‌లో టచ్‌స్క్రీన్ భాగాన్ని కాంతిహీనం చేయడం"</string>
-    <string name="keywords_display_auto_brightness" msgid="8070218600502753102">"స్క్రీన్‌లో టచ్‌స్క్రీన్ భాగాన్ని కాంతిహీనం చేయడం"</string>
-    <string name="keywords_display_wallpaper" msgid="4315466287469834939">"నేపథ్యం"</string>
+    <string name="keywords_display_brightness_level" msgid="8923289340474728990">"కాంతివిహీన స్క్రీన్ టచ్‌స్క్రీన్ బ్యాటరీ"</string>
+    <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"కాంతివిహీన స్క్రీన్ టచ్‌స్క్రీన్ బ్యాటరీ"</string>
+    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"నేపథ్యం వ్యక్తిగతీకరించు అనుకూలీకరించు ప్రదర్శించు"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"వచన పరిమాణం"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"ప్రాజెక్ట్"</string>
-    <string name="keywords_storage" msgid="7007275853993419928">"ఖాళీ డిస్క్ హార్డ్ డ్రైవ్"</string>
-    <string name="keywords_battery" msgid="3992479295298655138">"పవర్"</string>
-    <string name="keywords_spell_checker" msgid="4509482591225399210">"అక్షరక్రమం"</string>
+    <string name="keywords_storage" msgid="6572905220031852173">"స్థలం డిస్క్ హార్డ్ డిస్క్ పరికరం వినియోగం"</string>
+    <string name="keywords_battery" msgid="2096185085932675704">"పవర్ వినియోగం ఛార్జ్"</string>
+    <string name="keywords_spell_checker" msgid="6106749039734174140">"అక్షరక్రమం నిఘంటువు అక్షరక్రమ తనిఖీ స్వీయ-దిద్దుబాటు"</string>
     <string name="keywords_voice_input" msgid="3519547605812413860">"గుర్తింపు ఇన్‌పుట్ ప్రసంగం మాట్లాడటం భాష హ్యాండ్స్-ఫ్రీ హ్యాండ్ ఫ్రీ గుర్తింపు అభ్యంతరకరమైన పదం ఆడియో చరిత్ర బ్లూటూత్ హెడ్‌సెట్"</string>
-    <string name="keywords_text_to_speech_output" msgid="8207889472282225512">"రేట్ చేయడం భాష డిఫాల్ట్ ప్రసంగించు ప్రసంగించడం"</string>
-    <string name="keywords_date_and_time" msgid="7666950126499155141">"గడియారం"</string>
-    <string name="keywords_factory_data_reset" msgid="3693730656843989732">"తొలగించడం తొలగించు"</string>
+    <string name="keywords_text_to_speech_output" msgid="392447904221657930">"రేటు భాష డిఫాల్ట్ మాట్లాడు మాట్లాడటం tts ప్రాప్యత రీడర్ అంధులు"</string>
+    <string name="keywords_date_and_time" msgid="2631808108134830066">"గడియారం మిలిటరీ"</string>
+    <string name="keywords_factory_data_reset" msgid="4355133848707691977">"తుడిచివేయి తొలగించు పునరుద్ధరించు క్లియర్ చేయి తీసివేయి"</string>
     <string name="keywords_printing" msgid="1701778563617114846">"ప్రింటర్"</string>
     <string name="keywords_sounds_and_notifications" msgid="5965996187974887000">"స్పీకర్ బీప్ ధ్వని"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="2912933812460077912">"వద్దు ఆటంకం కలిగించవద్దు అంతరాయం కలిగించు అంతరాయం విరామం"</string>
@@ -2354,7 +2371,7 @@
     <string name="keywords_location_mode" msgid="8584992704568356084">"ఖచ్చితత్వం"</string>
     <string name="keywords_accounts" msgid="1957925565953357627">"ఖాతా"</string>
     <string name="keywords_users" msgid="4673901601478559100">"పరిమితి పరిమితం చేయి పరిమితం చేయబడింది"</string>
-    <string name="keywords_keyboard_and_ime" msgid="1103378692379215672">"వచన దిద్దుబాటు ధ్వని దిద్దుబాటు వైబ్రేట్ చేయడం స్వీయ భాష సంజ్ఞ సూచించడం సూచన థీమ్ ఆక్షేపణీయ పదం ఎమోజీ టైప్ చేయడం"</string>
+    <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"వచన దిద్దుబాటు దిద్దుబాటు చేయి ధ్వని వైబ్రేట్ స్వయంచాలకం భాష సంజ్ఞ సూచించు సూచన థీమ్ అభ్యంతరకరమైన పదం రకం ఎమోజీ అంతర్జాతీయం"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"స్లయిడ్ చేయడం పాస్‌వర్డ్ నమూనా పిన్"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC ట్యాగ్‌ను సెటప్ చేయండి"</string>
     <string name="write_tag" msgid="8571858602896222537">"వ్రాయి"</string>
@@ -2371,7 +2388,6 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"నోటిఫికేషన్ వాల్యూమ్"</string>
     <string name="zen_mode_settings_title" msgid="7014915558669122902">"అంతరాయాలు"</string>
     <string name="zen_mode_option_title" msgid="5061978632306007914">"కాల్‌లు మరియు నోటిఫికేషన్‌లు వచ్చినప్పుడు"</string>
-    <string name="zen_mode_option_title_novoice" msgid="6680706009915204785">"నోటిఫికేషన్‌లు వచ్చినప్పుడు"</string>
     <string name="zen_mode_option_off" msgid="3167702608910820883">"ఎల్లప్పుడూ అంతరాయం కలిగించు"</string>
     <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"ప్రాధాన్య అంతరాయాలను మాత్రమే అనుమతించు"</string>
     <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"అంతరాయం కలిగించవద్దు"</string>
@@ -2429,14 +2445,17 @@
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"పూర్తయింది"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"మీరు దీన్ని ఆఫ్ చేసేవరకు"</string>
     <string name="zen_mode_important_category" msgid="8123274463331022993">"ప్రాధాన్య అంతరాయాలు"</string>
-    <string name="zen_mode_downtime_category" msgid="4730179065426038108">"వృధా సమయం (ప్రాధాన్య అంతరాయాలు మాత్రమే)"</string>
+    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"వృథా సమయం"</string>
     <string name="zen_mode_downtime_days" msgid="3361856902633311616">"రోజులు"</string>
     <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"ఏదీ లేదు"</string>
+    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"అంతరాయాలు అనుమతించబడ్డాయి"</string>
+    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"ప్రాధాన్యత మాత్రమే"</string>
+    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"ఏదీ వద్దు"</string>
     <string name="zen_mode_automation_category" msgid="4653551005950835761">"స్వయంచాలితం"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"స్వయంచాలకంగా ఆన్ చేయి"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"ఎప్పటికీ వద్దు"</string>
-    <string name="zen_mode_phone_calls" msgid="8956214416859303966">"కాల్‌లు"</string>
+    <string name="zen_mode_calls" msgid="7051492091133751208">"కాల్‌లు"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"సందేశాలు"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"వీరి నుండి కాల్‌లు/సందేశాలు"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"ఎవరైనా"</string>
@@ -2450,7 +2469,9 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"వారపురాత్రులు"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"ప్రారంభ సమయం"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"ముగింపు సమయం"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> తదుపరి రోజు"</string>
+    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> తదుపరి రోజు"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> లేదా ఏదైనా మునుపు అలారం"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> తదుపరి రోజు లేదా ఏదైనా మునుపు అలారం"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"అనువర్తన నోటిఫికేషన్‌లు"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"నోటిఫికేషన్ సెట్టింగ్‌లు"</string>
     <string name="device_feedback" msgid="3238056036766293294">"ఈ పరికరం గురించి అభిప్రాయం పంపండి"</string>
@@ -2458,7 +2479,11 @@
     <string name="switch_on_text" msgid="1124106706920572386">"ఆన్‌లో ఉంది"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"ఆఫ్‌‌లో ఉంది"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"స్క్రీన్‌ను పిన్ చేయడం"</string>
-    <string name="screen_pinning_description" msgid="7091642350452605379">"ఆన్ చేసినప్పుడు, మీరు అన్‌పిన్ చేసే వరకు ప్రస్తుత స్క్రీన్‌ను వీక్షణలో ఉంచటానికి స్క్రీన్‌ పిన్నింగ్‌ను ఉపయోగించవచ్చు.\n\nస్క్రీన్ పిన్నింగ్‌ను ఉపయోగించడానికి చేయాల్సినవి:\n\n1. స్క్రీన్ పిన్నింగ్ ఆన్‌లో ఉందని నిర్ధారించుకోండి.\n\n2. మీరు పిన్ చేయాలనుకుంటున్న స్క్రీన్‌ని తెరవండి.\n\n3. అవలోకనంను తాకండి.\n\n4. పిన్ చిహ్నాన్ని తాకండి."</string>
+    <string name="screen_pinning_description" msgid="1137904524037468263">"ఈ సెట్టింగ్ ఆన్ చేయబడినప్పుడు, మీరు అన్‌పిన్ చేసే వరకు ప్రస్తుత స్క్రీన్‌ను వీక్షణలో ఉంచడానికి స్క్రీన్ పిన్ చేయడం ఉపయోగించవచ్చు.\n\nస్క్రీన్ పిన్ చేయడం ఉపయోగించడానికి ఇలా చేయండి:\n\n1. స్క్రీన్ పిన్ చేయడం ఆన్‌లో ఉందని నిర్ధారించుకోండి.\n\n2. మీరు పిన్ చేయాలనుకునే స్క్రీన్‌ను తెరవండి.\n\n3. స్థూలదృష్టిని తాకండి.\n\n4. పైకి స్వైప్ చేసి, ఆపై పిన్ చిహ్నాన్ని తాకండి."</string>
+    <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"అన్‌పిన్ చేయడానికి ముందు అన్‌లాక్ నమూనా కోసం అడుగు"</string>
+    <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"అన్‌పిన్ చేయడానికి ముందు PIN కోసం అడుగు"</string>
+    <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"అన్‌పిన్ చేయడానికి ముందు పాస్‌వర్డ్ కోసం అడుగు"</string>
+    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"అన్‌పిన్ చేస్తున్నప్పుడు పరికరాన్ని లాక్ చేయి"</string>
     <string name="managed_user_title" msgid="8101244883654409696">"కార్యాలయ ప్రొఫైల్‌"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(ప్రయోగాత్మకం)"</string>
     <string name="display_auto_rotate_title" msgid="6176450657107806043">"పరికరాన్ని తిప్పినప్పుడు"</string>
@@ -2467,7 +2492,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"ల్యాండ్‌స్కేప్ వీక్షణలో ఉంచు"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"ప్రస్తుత దృగ్విన్యాసంలో ఉంచు"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI సమాచారం"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI సంబంధిత సమాచారం"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"గుప్తీకరణ"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"కొనసాగించండి"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"మీరు ఈ పరికరం ప్రారంభం కావడానికి ముందు మీ PIN అవసరమయ్యే విధంగా చేయడం ద్వారా దీనికి మరింత రక్షణను అందించవచ్చు. పరికరం ప్రారంభించబడే వరకు, ఇది అలారాలతో సహా కాల్‌లు, సందేశాలు లేదా నోటిఫికేషన్‌లను స్వీకరించలేదు. \n\nకోల్పోయిన లేదా దొంగిలించబడిన పరికరాల్లోని డేటాను సంరక్షించడంలో ఇది సహాయకరంగా ఉంటుంది."</string>
@@ -2485,4 +2509,7 @@
     <string name="encrypt_talkback_dialog_message_pin" msgid="1890374082842868489">"మీరు ఈ పరికరాన్ని ప్రారంభించడానికి మీ పిన్‌ను నమోదు చేసినప్పుడు, <xliff:g id="SERVICE">%1$s</xliff:g> వంటి ప్రాప్యత సేవలు అప్పటికి అందుబాటులో ఉండవు."</string>
     <string name="encrypt_talkback_dialog_message_pattern" msgid="4474332516537386384">"మీరు ఈ పరికరాన్ని ప్రారంభించడానికి మీ నమూనాను నమోదు చేసినప్పుడు, <xliff:g id="SERVICE">%1$s</xliff:g> వంటి ప్రాప్యత సేవలు అప్పటికి అందుబాటులో ఉండవు."</string>
     <string name="encrypt_talkback_dialog_message_password" msgid="8166099418487083927">"మీరు ఈ పరికరాన్ని ప్రారంభించడానికి మీ పాస్‌వర్డ్‌ను నమోదు చేసినప్పుడు, <xliff:g id="SERVICE">%1$s</xliff:g> వంటి ప్రాప్యత సేవలు అప్పటికి అందుబాటులో ఉండవు."</string>
+    <string name="imei_information_title" msgid="8499085421609752290">"IMEI సమాచారం"</string>
+    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI సంబంధిత సమాచారం"</string>
+    <string name="slot_number" msgid="3762676044904653577">"(స్లాట్<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-th/arrays.xml b/res/values-th/arrays.xml
index 8d7ef10..48af783 100644
--- a/res/values-th/arrays.xml
+++ b/res/values-th/arrays.xml
@@ -527,4 +527,12 @@
     <item msgid="4338089220026248848">"แคชไว้ (ไคลเอ็นต์กิจกรรม)"</item>
     <item msgid="6652164677254579050">"แคชไว้ (ว่างเปล่า)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"น้ำเงินอมเขียว"</item>
+    <item msgid="8332294763632946560">"น้ำเงิน"</item>
+    <item msgid="2023216417616991392">"น้ำเงินอมม่วง"</item>
+    <item msgid="3170497246594232819">"ม่วง"</item>
+    <item msgid="4608643045752965568">"ชมพู"</item>
+    <item msgid="6131821495505931173">"แดง"</item>
+  </string-array>
 </resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index acdd69b..5fb0116 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>
@@ -180,7 +180,6 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s ต้องการเข้าถึงข้อความของคุณ ให้สิทธิ์เข้าถึงแก่ %2$s ไหม"</string>
     <string name="date_and_time" msgid="9062980487860757694">"วันที่และเวลา"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"เลือกเขตเวลา"</string>
-    <string name="normal_date_format" msgid="7636406984925498359">"ท้องถิ่น (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"แสดงตัวอย่าง:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"ขนาดอักษร:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -291,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>
@@ -322,8 +321,6 @@
     <string name="date_time_set_timezone" msgid="5045627174274377814">"เลือกเขตเวลา"</string>
     <string name="date_time_set_date_title" msgid="6928286765325608604">"วันที่"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"ตั้งวันที่"</string>
-    <string name="date_time_date_format_title" msgid="3976171711988766411">"รูปแบบวันที่"</string>
-    <string name="date_time_date_format" msgid="6951498879879281102">"เลือกรูปแบบวันที่"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"เรียงตามลำดับอักษร"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"จัดเรียงตามเขตเวลา"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"วันที่"</string>
@@ -372,7 +369,8 @@
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"รอสักครู่ขณะกำลังเข้ารหัสโทรศัพท์ของคุณ เสร็จสมบูรณ์ <xliff:g id="PERCENT">^1</xliff:g>%"</string>
     <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"โปรดรอสักครู่ขณะเข้ารหัสแท็บเล็ต เหลืออีก <xliff:g id="DURATION">^1</xliff:g>"</string>
     <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"โปรดรอสักครู่ขณะเข้ารหัสโทรศัพท์ เหลืออีก <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"ลองใหม่อีกครั้งใน <xliff:g id="DELAY">^1</xliff:g> วินาที"</string>
+    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"ปิดแท็บเล็ตแล้วเปิดอีกครั้งเพื่อปลดล็อก"</string>
+    <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"ปิดโทรศัพท์แล้วเปิดอีกครั้งเพื่อปลดล็อก"</string>
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"คำเตือน: ระบบจะล้างข้อมูลในอุปกรณ์หลังจากปลดล็อกไม่สำเร็จอีก <xliff:g id="COUNT">^1</xliff:g> ครั้ง!"</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"พิมพ์รหัสผ่านของคุณ"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"การเข้ารหัสไม่สำเร็จ"</string>
@@ -401,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>
@@ -412,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>
@@ -556,13 +556,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"เป็นลำโพง"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"สำหรับเพลงและสื่อ"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"จำการตั้งค่า"</string>
-    <string name="wifi_assistant_intro_setup" msgid="4605105515416995110">"ขอแนะนำ\nWi‑Fi Assistant"</string>
-    <string name="wifi_assistant_no_thanks" msgid="2776983751990143934">"ไม่เป็นไร ขอบคุณ"</string>
-    <string name="wifi_assistant_setup" msgid="3772423650475730906">"ตั้งค่า"</string>
-    <string name="wifi_assistant_card_message" msgid="107811647784658536">"เชื่อมต่อกับเครือข่ายที่สามารถใช้ได้ด้วย Wi-Fi Assistant โดยอัตโนมัติ"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi‑Fi Assistant"</string>
-    <string name="wifi_assistant_title_message" msgid="6240721017579074015">"<xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> เชื่อมต่อ Wi‑Fi ที่ดีที่สุดให้คุณโดยอัตโนมัติ"</string>
-    <string name="wifi_assistant_open_app" msgid="4803044899535675063">"เปิดแอป"</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>
@@ -592,7 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"การตั้งค่า WiFi"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"WiFi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"ตั้งค่าและจัดการจุดเข้าใช้งานระบบไร้สาย"</string>
-    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"เลือก WiFi"</string>
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"เลือกเครือข่าย Wi‑Fi"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"เลือก Wi-Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"กำลังเปิด WiFi…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"กำลังปิด WiFi…"</string>
@@ -607,8 +602,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"ใช้การสแกนได้เสมอ"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"อนุญาตให้สแกนได้เสมอ"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"ให้บริการตำแหน่งของ Google และแอปอื่นๆ สามารถสแกนหาเครือข่ายได้ แม้ว่า Wi-Fi จะปิดอยู่"</string>
-    <string name="wifi_automatically_manage_title" msgid="6249976570008992746">"จัดการ Wi-Fi โดยอัตโนมัติ"</string>
-    <string name="wifi_automatically_manage_summary" msgid="6952470763378312488">"ให้ <xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> จัดการการตั้งค่า Wi‑Fi"</string>
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"ใช้ Wi-Fi แบบเปิดโดยอัตโนมัติ"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"ให้ Wi‑Fi Assistant เชื่อมต่อโดยอัตโนมัติเพื่อเปิดเครือข่ายที่กำหนดไว้เป็นแบบคุณภาพสูง"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"เลือกผู้ช่วย"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"ติดตั้งใบรับรอง"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"เพื่อปรับปรุงความแม่นยำของตำแหน่งและเพื่อวัตถุประสงค์อื่น Google และแอปอื่นๆ อาจสแกนหาเครือข่ายใกล้เคียงแม้ในเวลาที่ปิด WiFi หากคุณไม่ต้องการให้สิ่งนี้เกิดขึ้น ให้ไปที่ ขั้นสูง &gt; การสแกนพร้อมใช้งานตลอดเวลา"</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"แอปอาจสแกนหาเครือข่ายใกล้เคียง แม้ในเวลาที่ปิด WiFi หากคุณไม่ต้องการให้สิ่งนี้เกิดขึ้น ให้ไปที่ ขั้นสูง &gt; การสแกนพร้อมใช้งานตลอดเวลา"</string>
@@ -629,6 +625,7 @@
     <string name="wifi_menu_scan" msgid="1470911530412095868">"สแกน"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"ขั้นสูง"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"เชื่อมต่อกับเครือข่าย"</string>
+    <string name="wifi_menu_remember" msgid="8814185749388713796">"จดจำเครือข่ายไว้"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"ไม่จำเครือข่าย"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"แก้ไขเครือข่าย"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"เขียนไปยังแท็ก NFC"</string>
@@ -673,9 +670,11 @@
     <string name="wifi_unspecified" msgid="5431501214192991253">"(ไม่ได้ระบุ)"</string>
     <string name="wifi_remembered" msgid="4955746899347821096">"บันทึกแล้ว"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"ปิดอยู่"</string>
-    <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"หลีกเลี่ยงการเชื่อมต่ออินเทอร์เน็ตที่สัญญาณไม่แรงพอ"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"การกำหนดค่า IP ล้มเหลว"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"การเชื่อมต่อ Wi-Fi ล้มเหลว"</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"ปัญหาในการตรวจสอบสิทธิ์"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"ไม่อยู่ในพื้นที่ให้บริการ"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"ไม่พบการเข้าถึงอินเทอร์เน็ต ระบบจะไม่เชื่อมต่อใหม่โดยอัตโนมัติ"</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS ใช้งานได้"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS ใช้งานได้)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"ป้อนรหัสผ่านเครือข่าย"</string>
@@ -699,9 +698,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"คำเตือน: หากไม่ใช้ Wi-Fi แท็บเล็ตของคุณจะใช้เฉพาะข้อมูลมือถือสำหรับการดาวน์โหลดและการอัปเดตเริ่มต้น หากต้องการหลีกเลี่ยงการเรียกเก็บค่าบริการข้อมูลที่อาจเกิดขึ้น โปรดเชื่อมต่อ Wi-Fi"</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"คำเตือน: หากไม่ใช้ Wi-Fi อุปกรณ์ของคุณจะใช้เฉพาะข้อมูลมือถือสำหรับการดาวน์โหลดและการอัปเดตเริ่มต้น หากต้องการหลีกเลี่ยงการเรียกเก็บค่าบริการข้อมูลที่อาจเกิดขึ้น โปรดเชื่อมต่อ Wi-Fi"</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"คำเตือน: หากไม่ใช้ Wi-Fi โทรศัพท์ของคุณจะใช้เฉพาะข้อมูลมือถือสำหรับการดาวน์โหลดและการอัปเดตเริ่มต้น หากต้องการหลีกเลี่ยงการเรียกเก็บค่าบริการข้อมูลที่อาจเกิดขึ้น โปรดเชื่อมต่อ Wi-Fi"</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="2393880108322835846">"คำเตือน: หากไม่ใช้ Wi-Fi แท็บเล็ตของคุณจะไม่มีการเชื่อมต่ออินเทอร์เน็ตเพื่อใช้ดาวน์โหลดหรืออัปเดตสิ่งใดในเบื้องต้น"</string>
-    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1707391993265558787">"คำเตือน: หากไม่ใช้ Wi-Fi อุปกรณ์ของคุณจะไม่มีการเชื่อมต่ออินเทอร์เน็ตเพื่อใช้ดาวน์โหลดหรืออัปเดตสิ่งใดในเบื้องต้น"</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="1556858507920033022">"คำเตือน: หากไม่ใช้ Wi-Fi โทรศัพท์ของคุณจะไม่มีการเชื่อมต่ออินเทอร์เน็ตเพื่อใช้ดาวน์โหลดหรืออัปเดตสิ่งใดในเบื้องต้น"</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"หากคุณข้าม Wi‑Fi:\n\nแท็บเล็ตจะไม่มีการเชื่อมต่ออินเทอร์เน็ต\n\nคุณจะไม่ได้รับการอัปเดตซอฟต์แวร์จนกว่าจะเชื่อมต่ออินเทอร์เน็ต\n\nคุณไม่สามารถเปิดใช้งานคุณลักษณะการปกป้องอุปกรณ์ได้ในขณะนี้"</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"หากคุณข้าม Wi‑Fi:\n\nอุปกรณ์จะไม่มีการเชื่อมต่ออินเทอร์เน็ต\n\nคุณจะไม่ได้รับการอัปเดตซอฟต์แวร์จนกว่าจะเชื่อมต่ออินเทอร์เน็ต\n\nคุณไม่สามารถเปิดใช้งานคุณลักษณะการปกป้องอุปกรณ์ได้ในขณะนี้"</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"หากคุณข้าม Wi‑Fi:\n\nโทรศัพท์จะไม่มีการเชื่อมต่ออินเทอร์เน็ต\n\nคุณจะไม่ได้รับการอัปเดตซอฟต์แวร์จนกว่าจะเชื่อมต่ออินเทอร์เน็ต\n\nคุณไม่สามารถเปิดใช้งานคุณลักษณะการปกป้องอุปกรณ์ได้ในขณะนี้"</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"แท็บเล็ตไม่สามารถเชื่อมต่อกับเครือข่าย WiFi นี้"</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"อุปกรณ์ไม่สามารถเชื่อมต่อกับเครือข่าย Wi-Fi นี้"</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"โทรศัพท์ไม่สามารถเชื่อมต่อกับเครือข่าย WiFi นี้"</string>
@@ -761,7 +760,6 @@
     <string name="ring_volume_title" msgid="7938706566797464165">"ระดับความดังเสียงเรียกเข้า"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"สั่นเตือนเมื่อปิดเสียง"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"เสียงแจ้งเตือนเริ่มต้น"</string>
-    <string name="heads_up_enabled_title" msgid="1031078221910921622">"แสดงป๊อปอัปเมื่อมีความสำคัญมาก"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"เสียงเรียกเข้า"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"การแจ้งเตือน"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"ใช้ระดับเสียงของสายเรียกเข้าเพื่อแจ้งเตือน"</string>
@@ -834,7 +832,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"ปรับความสว่างอัตโนมัติ"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"ยกขึ้นเพื่อเวก"</string>
     <string name="doze_title" msgid="2259176504273878294">"หน้าจอแอมเบียนท์"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"ปลุกหน้าจอเมื่อมีการหยิบอุปกรณ์หรือมีการแจ้งเตือน"</string>
+    <string name="doze_summary" msgid="7128970177894383698">"ปลุกหน้าจอเมื่อคุณหยิบอุปกรณ์หรือได้รับการแจ้งเตือน"</string>
     <string name="title_font_size" msgid="4405544325522105222">"ขนาดอักษร"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"ขนาดตัวอักษร"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"การตั้งค่าการล็อกซิมการ์ด"</string>
@@ -862,6 +860,10 @@
     <string name="sim_enter_cancel" msgid="6240422158517208036">"ยกเลิก"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"พบหลายซิม"</string>
     <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> เป็นเพียงซิมเดียวในอุปกรณ์ของคุณ คุณต้องการใช้ซิมนี้สำหรับข้อมูลมือถือ การโทร และข้อความ SMS ไหม"</string>
     <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>
@@ -1012,6 +1014,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"การดำเนินการนี้จะลบข้อมูลทั้งหมดออกจาก"<b>"ที่จัดเก็บข้อมูลภายใน"</b>"ของแท็บเล็ตของคุณ ซึ่งประกอบด้วย\n\n"<li>"บัญชี Google ของคุณ"</li>\n<li>"ข้อมูลและการตั้งค่าของระบบและแอปพลิเคชัน"</li>\n<li>"แอปพลิเคชันที่ดาวน์โหลด"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"การดำเนินการนี้จะลบข้อมูลทั้งหมดออกจาก"<b>"ที่จัดเก็บข้อมูลภายใน"</b>"ของโทรศัพท์ของคุณ ซึ่งประกอบด้วย\n\n"<li>"บัญชี Google ของคุณ"</li>\n<li>"ข้อมูลและการตั้งค่าของระบบและแอปพลิเคชัน"</li>\n<li>"แอปพลิเคชันที่ดาวน์โหลด"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"ขณะนี้คุณได้ลงชื่อเข้าใช้บัญชีต่อไปนี้แล้ว:\n"</string>
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"มีผู้ใช้รายอื่นอยู่บนอุปกรณ์เครื่องนี้\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"เพลง"</li>\n<li>"รูปภาพ"</li>\n<li>"ข้อมูลผู้ใช้อื่นๆ"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"หากต้องการล้างข้อมูลเพลง รูปภาพ และข้อมูลผู้ใช้อื่นๆ จะต้องลบ"<b>"ที่จัดเก็บข้อมูล USB"</b></string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"หากต้องการล้างข้อมูลเพลง รูปภาพ และข้อมูลผู้ใช้อื่นๆ คุณต้องลบ"<b>"การ์ด SD"</b></string>
@@ -1023,7 +1026,6 @@
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"รีเซ็ตโทรศัพท์"</string>
     <string name="master_clear_final_desc" msgid="7209547812233487345">"ลบข้อมูลส่วนบุคคลและแอปพลิเคชันที่ดาวน์โหลดของคุณทั้งหมดหรือไม่ คุณไม่สามารถย้อนกลับการทำงานนี้ได้!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"ลบทุกอย่าง"</string>
-    <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"วาดรูปแบบการปลดล็อก"</string>
     <string name="master_clear_gesture_explanation" msgid="826193821455182780">"คุณต้องวาดรูปแบบการปลดล็อกเพื่อยืนยันการรีเซ็ตข้อมูลเป็นค่าเริ่มต้น"</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"ไม่มีการรีเซ็ตเนื่องจากบริการล้างข้อมูลระบบไม่พร้อมใช้งาน"</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"รีเซ็ตหรือไม่"</string>
@@ -1041,7 +1043,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"ลบที่จัดเก็บข้อมูล USB ซึ่งจะเป็นการลบไฟล์ทั้งหมดที่จัดเก็บอยู่ในนั้นหรือไม่ คุณไม่สามารถกลับการทำงานนี้ได้!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"ต้องการลบการ์ด SD ซึ่งจะเป็นการลบไฟล์ทั้งหมดที่จัดเก็บไว้หรือไม่ คุณไม่สามารถย้อนกลับการทำงานนี้ได้!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"ลบทุกอย่าง"</string>
-    <string name="media_format_gesture_prompt" msgid="3109349468816856670">"วาดรูปแบบการปลดล็อก"</string>
     <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"คุณต้องวาดรูปแบบการปลดล็อกเพื่อยืนยันว่าคุณต้องการลบที่จัดเก็บข้อมูล USB"</string>
     <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"คุณต้องวาดรูปแบบการปลดล็อกเพื่อยืนยันว่าคุณต้องการลบการด์ SD"</string>
     <string name="call_settings_title" msgid="5188713413939232801">"การตั้งค่าการโทร"</string>
@@ -1087,6 +1088,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"โปรดใส่ซิมการ์ดและรีสตาร์ท"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"โปรดเชื่อมต่ออินเทอร์เน็ต"</string>
     <string name="location_title" msgid="1029961368397484576">"ตำแหน่งของฉัน"</string>
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"โปรไฟล์งาน"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"สถานที่สำหรับโปรไฟล์งาน"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"บริษัทของคุณเป็นผู้ปิด"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"โหมด"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"ความแม่นยำสูง"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"ประหยัดแบตเตอรี่"</string>
@@ -1124,6 +1128,7 @@
     <string name="copyright_title" msgid="865906688917260647">"ลิขสิทธิ์"</string>
     <string name="license_title" msgid="1990487604356037871">"สัญญาอนุญาต"</string>
     <string name="terms_title" msgid="7697580845616764642">"ข้อกำหนดในการให้บริการ"</string>
+    <string name="webview_license_title" msgid="2813507464175738967">"ใบอนุญาต WebView ของระบบ"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"วอลเปเปอร์"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"ผู้ให้บริการภาพถ่ายดาวเทียม:\n©2014 CNES/Astrium, DigitalGlobe, Bluesky"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"สัญญาอนุญาตสำหรับโอเพนซอร์ส"</string>
@@ -1237,7 +1242,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"ที่เก็บข้อมูล USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"บนการ์ด SD"</string>
     <string name="disabled" msgid="9206776641295849915">"ปิดอยู่"</string>
-    <string name="not_installed" msgid="1475144352069281880">"ไม่ได้ติดตั้ง"</string>
+    <string name="not_installed" msgid="2797554494953450291">"ไม่ได้ติดตั้งสำหรับผู้ใช้นี้"</string>
     <string name="no_applications" msgid="7336588977497084921">"ไม่มีแอปพลิเคชัน"</string>
     <string name="internal_storage" msgid="1584700623164275282">"ที่เก็บข้อมูลภายใน"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"ที่เก็บข้อมูล USB"</string>
@@ -1434,8 +1439,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"หน้าจอจะไม่เข้าสู่โหมดสลีปขณะชาร์จ"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"เปิดใช้งานบันทึกสอดแนมบลูทูธ HCI"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"บันทึกแพ็คเก็ตบลูทูธ HCI ทั้งหมดในไฟล์"</string>
-    <string name="oem_unlock_enable" msgid="6629321276287913315">"เปิดใช้การปลดล็อกแบบ OEM"</string>
-    <string name="oem_unlock_enable_summary" msgid="3546686263996628110">"อนุญาตให้ปลดล็อกอุปกรณ์แบบ OEM"</string>
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"การปลดล็อก OEM"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"อนุญาตให้ปลดล็อกตัวโหลดการเปิดเครื่อง"</string>
+    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"ป้อน PIN ของคุณ"</string>
+    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"ป้อน PIN ของอุปกรณ์เพื่อเปิดใช้การปลดล็อก OEM"</string>
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"อนุญาตการปลดล็อก OEM ไหม"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"คำเตือน: คุณลักษณะการปกป้องอุปกรณ์จะไม่ทำงานบนอุปกรณ์นี้ขณะที่การตั้งค่านี้เปิดอยู่"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"การรับรองการแสดงผลแบบไร้สาย"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"เปิดใช้การบันทึกรายละเอียด Wi-Fi"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"สลับ Wi‑Fi เป็นมือถือเมื่อสัญญาณอ่อน"</string>
@@ -1538,6 +1547,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"คำอธิบายภาพจะมีหน้าตาแบบนี้"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"ค่าเริ่มต้น"</string>
+    <string name="color_title" msgid="4258931051732243983">"สี"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"ค่าเริ่มต้น"</string>
     <string name="color_none" msgid="3475640044925814795">"ไม่มีสี"</string>
     <string name="color_white" msgid="8045195170201590239">"ขาว"</string>
@@ -1595,12 +1605,12 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"เหลืออีก <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"อีก <xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> จะชาร์จเต็ม"</string>
-    <string name="power_discharging_duration" msgid="7125493014448497620">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - เหลืออีกประมาณ <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="power_charging" msgid="712751285832976915">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="STATE">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration" msgid="4802183864773082009">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> จนกว่าจะเต็ม"</string>
-    <string name="power_charging_duration_ac" msgid="3611179931297824699">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> จนกว่าจะเต็มด้วยไฟ AC"</string>
-    <string name="power_charging_duration_usb" msgid="1106605348913397583">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> จนกว่าจะเต็มผ่านทาง USB"</string>
-    <string name="power_charging_duration_wireless" msgid="633606920144617227">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> จนกว่าจะเต็มจากระบบไร้สาย"</string>
+    <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> - เหลือประมาณ <xliff:g id="TIME">%2$s</xliff:g>"</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> จนกว่าจะเต็ม"</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> จนกว่าจะเต็มเมื่อชาร์จผ่าน AC"</string>
+    <string name="power_charging_duration_usb" msgid="182405645340976546">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> จนกว่าจะเต็มเมื่อชาร์จผ่าน USB"</string>
+    <string name="power_charging_duration_wireless" msgid="1829295708243159464">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> จนกว่าจะเต็มเมื่อชาร์จผ่านระบบไร้สาย"</string>
     <string name="power_usage_list_summary" msgid="2409288197839512482">"ใช้ตั้งแต่ชาร์จเต็มครั้งล่าสุด"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"การใช้แบตเตอรี่ตั้งแต่ถอดปลั๊ก"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"การใช้แบตเตอรี่ตั้งแต่รีเซ็ต"</string>
@@ -1617,7 +1627,6 @@
     <string name="awake" msgid="387122265874485088">"เวลาการทำงานของอุปกรณ์"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"เวลาเปิดใช้ WiFi"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"เวลาเปิดใช้ WiFi"</string>
-    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"รายละเอียดประวัติ"</string>
     <string name="details_title" msgid="3792801565213935385">"ใช้รายละเอียด"</string>
     <string name="details_subtitle" msgid="32593908269911734">"ใช้รายละเอียด"</string>
@@ -1689,7 +1698,7 @@
     <string name="battery_saver" msgid="1426682272004907982">"โหมดประหยัดแบตเตอรี่"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"เปิดอัตโนมัติ"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"ไม่ใช้เลย"</string>
-    <string name="battery_saver_turn_on_automatically_pct" msgid="3033681629861428940">"เมื่อแบตเตอรี่เหลือ %1$d%%"</string>
+    <string name="battery_saver_turn_on_automatically_pct" msgid="7536784431655058267">"ที่แบตเตอรี่ %1$s"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"สถิติเกี่ยวกับกระบวนงาน"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"สถิติเชิงลึกเกี่ยวกับกระบวนงานที่ทำงานอยู่"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"การใช้หน่วยความจำ"</string>
@@ -1813,7 +1822,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"ใช้ฮาร์ดแวร์"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"ซอฟต์แวร์เท่านั้น"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"ข้อมูลรับรองไม่พร้อมใช้งานสำหรับผู้ใช้รายนี้"</string>
-    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"วาดรูปแบบการปลดล็อกของคุณ"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"คุณจำเป็นต้องวาดรูปแบบการปลดล็อกของคุณเพื่อยืนยันการติดตั้งข้อมูลรับรอง"</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"พิมพ์รหัสผ่านสำหรับที่เก็บข้อมูลรับรอง"</string>
@@ -1843,6 +1851,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"รวมข้อมูลแอป"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"คืนค่าอัตโนมัติ"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"เมื่อติดตั้งแอปพลิเคชันใหม่อีกครั้ง ให้คืนค่าการตั้งค่าและข้อมูลที่สำรองไว้"</string>
+    <string name="backup_inactive_title" msgid="5355557151569037197">"บริการสำรองข้อมูลไม่มีการใช้งาน"</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"ค่านี้ตั้งโดยนโยบายด้านอุปกรณ์ของคุณ"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"รหัสผ่านการสำรองข้อมูลในเดสก์ท็อป"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"การสำรองข้อมูลเต็มรูปแบบในเดสก์ท็อป ไม่ได้รับการป้องกันในขณะนี้"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"แตะเพื่อเปลี่ยนหรือลบรหัสผ่านสำหรับการสำรองข้อมูลเต็มรูปแบบในเดสก์ท็อป"</string>
@@ -1952,7 +1962,11 @@
     <string name="enter_password" msgid="8035706727471334122">"ป้อนรหัสผ่านเพื่อเริ่มต้นใช้งาน Android"</string>
     <string name="enter_pin" msgid="5305333588093263790">"ป้อน PIN เพื่อเริ่มต้นใช้งาน Android"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"วาดรูปแบบเพื่อเริ่มต้นใช้งาน Android"</string>
-    <string name="try_again" msgid="4272075051293936921">"ลองอีกครั้ง"</string>
+    <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"รูปแบบไม่ถูกต้อง"</string>
+    <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"รหัสผ่านไม่ถูกต้อง"</string>
+    <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"PIN ไม่ถูกต้อง"</string>
+    <string name="checking_decryption" msgid="8287458611802609493">"กำลังตรวจสอบ…"</string>
+    <string name="starting_android" msgid="8581493237458496835">"กำลังเริ่มต้น Android"</string>
     <string name="delete" msgid="4219243412325163003">"ลบ"</string>
     <string name="misc_files" msgid="6720680815969643497">"ไฟล์เบ็ดเตล็ด"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"เลือก <xliff:g id="NUMBER">%1$d</xliff:g> จาก <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -1990,8 +2004,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"ใช้ GPU ในการจัดวางองค์ประกอบหน้าจอเสมอ"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"จำลองระบบสี"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"เปิดใช้ร่องรอยใน OpenGL"</string>
-    <string name="use_nuplayer" msgid="5699257393367904387">"ใช้ NuPlayer (ทดลอง)"</string>
-    <string name="use_nuplayer_summary" msgid="1991479067478516714">"ใช้ NuPlayer แทน AwesomePlayer"</string>
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"ใช้ Awesome (เลิกใช้แล้ว)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"ใช้ AwesomePlayer แทน NuPlayer ในการเล่นสื่อทั่วไป"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"ปิดการกำหนดเส้นทางเสียงทาง USB"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"ปิดการกำหนดเส้นทางโดยอัตโนมัติไปยังอุปกรณ์ต่อพ่วงเสียงทาง USB"</string>
     <string name="debug_layout" msgid="5981361776594526155">"แสดงขอบของการจัดวาง"</string>
@@ -2167,7 +2181,6 @@
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"เพิ่มผู้ใช้หรือโปรไฟล์"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"เพิ่มผู้ใช้"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"โปรไฟล์ที่ถูกจำกัด"</string>
-    <string name="user_summary_managed_profile" msgid="7369539529693048111">"โปรไฟล์งาน"</string>
     <string name="user_need_lock_message" msgid="2596365678651842785">"ก่อนที่คุณจะสามารถสร้างโปรไฟล์ที่ถูกจำกัดได้ คุณจะต้องตั้งค่าล็อกหน้าจอเพื่อปกป้องแอปและข้อมูลส่วนตัวของคุณ"</string>
     <string name="user_set_lock_button" msgid="8311219392856626841">"ตั้งค่าล็อก"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"ไม่ได้ตั้งค่า"</string>
@@ -2298,11 +2311,13 @@
     <string name="sim_cellular_data_unavailable_summary" msgid="3654805961942166428">"แตะเพื่อเลือกซิมข้อมูล"</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"ใช้ในการโทรทุกครั้ง"</string>
     <string name="select_sim_for_data" msgid="2366081042162853044">"เลือกซิมสำหรับข้อมูล"</string>
+    <string name="data_switch_started" msgid="2040761479817166311">"กำลังสลับซิมข้อมูล การดำเนินการนี้อาจใช้เวลาถึง 1 นาที..."</string>
     <string name="select_sim_for_calls" msgid="3503094771801109334">"โทรด้วย"</string>
     <string name="sim_select_card" msgid="211285163525563293">"เลือกซิมการ์ด"</string>
     <string name="sim_card_number_title" msgid="7845379943474336488">"ซิมหมายเลข <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"ซิมว่าง"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"ชื่อซิม"</string>
+    <string name="sim_name_hint" msgid="7038643345238968930">"ป้อนชื่อซิม"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"ช่องใส่ซิม %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"ผู้ให้บริการ"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"หมายเลข"</string>
@@ -2312,7 +2327,6 @@
     <string name="color_purple" msgid="3888532466427762504">"ม่วง"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"ไม่ได้เสียบซิมการ์ด"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"สถานะซิม"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"ข้อมูลเกี่ยวกับซิม"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"โทรกลับจากซิมเริ่มต้น"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"ซิมสำหรับการโทรออก"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"การตั้งค่าการโทรอื่นๆ"</string>
@@ -2320,8 +2334,11 @@
     <string name="preferred_network_offload_header" msgid="2321173571529106767">"ปิดการเผยแพร่ชื่อเครือข่าย"</string>
     <string name="preferred_network_offload_footer" msgid="5857279426054744020">"ปิดการป้องกันการเผยแพร่ชื่อเครือข่ายจากบุคคลที่สามที่สามารถเข้าถึงข้อมูลเครือข่ายของคุณ"</string>
     <string name="preferred_network_offload_popup" msgid="2252915199889604600">"การปิดการเผยแพร่ชื่อเครือข่ายจะป้องกันการเชื่อมต่ออัตโนมัติกับเครือข่ายที่ซ่อนอยู่"</string>
+    <string name="sim_signal_strength" msgid="9144010043784767984">"<xliff:g id="DBM">%1$d</xliff:g> dBm <xliff:g id="ASU">%2$d</xliff:g> asu"</string>
+    <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>
+    <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>
@@ -2330,22 +2347,22 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"การค้นหาล่าสุด"</string>
     <string name="search_results_label" msgid="4163304782363526148">"ผลลัพธ์"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"การเชื่อมต่อเครือข่าย wifi wi-fi"</string>
-    <string name="keywords_more_default_sms_app" msgid="2744404159003574745">"ข้อความ"</string>
-    <string name="keywords_more_mobile_networks" msgid="7813380887358745769">"เครือข่ายมือถือ มือถือ ผู้ให้บริการ ระบบไร้สาย"</string>
+    <string name="keywords_more_default_sms_app" msgid="895656981962034647">"ข้อความ การส่งข้อความ ข้อความ การส่งข้อความ"</string>
+    <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"มือถือ ผู้ให้บริการมือถือ ไร้สาย ข้อมูล 4g 3g 2g lte"</string>
     <string name="keywords_home" msgid="3626170808219458848">"Launcher"</string>
     <string name="keywords_display" msgid="6709007669501628320">"หน้าจอ หน้าจอสัมผัส"</string>
-    <string name="keywords_display_brightness_level" msgid="8636451602230815191">"หรี่แสงหน้าจอ หน้าจอสัมผัส"</string>
-    <string name="keywords_display_auto_brightness" msgid="8070218600502753102">"หรี่แสงหน้าจอ หน้าจอสัมผัส"</string>
-    <string name="keywords_display_wallpaper" msgid="4315466287469834939">"พื้นหลัง"</string>
+    <string name="keywords_display_brightness_level" msgid="8923289340474728990">"หน้าจอสลัว หน้าจอสัมผัส แบตเตอรี่"</string>
+    <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"หน้าจอสลัว หน้าจอสัมผัส แบตเตอรี่"</string>
+    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"พื้นหลัง ปรับเปลี่ยนในแบบของคุณ กำหนดค่า หน้าจอ"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"ขนาดข้อความ"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"ฉาย"</string>
-    <string name="keywords_storage" msgid="7007275853993419928">"ที่ว่าง ดิสก์ ฮาร์ดไดรฟ์"</string>
-    <string name="keywords_battery" msgid="3992479295298655138">"พลังงาน"</string>
-    <string name="keywords_spell_checker" msgid="4509482591225399210">"การสะกดคำ"</string>
+    <string name="keywords_storage" msgid="6572905220031852173">"ที่ว่าง ดิสก์ ฮาร์ดไดร์ฟ อุปกรณ์ การใช้"</string>
+    <string name="keywords_battery" msgid="2096185085932675704">"พลังงาน การใช้ ชาร์จ"</string>
+    <string name="keywords_spell_checker" msgid="6106749039734174140">"การสะกด พจนานุกรม ตรวจการสะกด แก้ไขอัตโนมัติ"</string>
     <string name="keywords_voice_input" msgid="3519547605812413860">"ระบบจดจำ อินพุต คำพูด พูด ภาษา แฮนด์ฟรี แฮนด์ฟรี การจดจำ ล่วงละเมิด คำ เสียง ประวัติ บลูทูธ ชุดหูฟัง"</string>
-    <string name="keywords_text_to_speech_output" msgid="8207889472282225512">"ให้คะแนน ภาษา ค่าเริ่มต้น พูด การพูด"</string>
-    <string name="keywords_date_and_time" msgid="7666950126499155141">"นาฬิกา"</string>
-    <string name="keywords_factory_data_reset" msgid="3693730656843989732">"ล้างข้อมูล ลบ"</string>
+    <string name="keywords_text_to_speech_output" msgid="392447904221657930">"ราคา ภาษา ค่าเริ่มต้น พูด การพูด tts การเข้าถึง โปรแกรมอ่าน ตาบอด"</string>
+    <string name="keywords_date_and_time" msgid="2631808108134830066">"นาฬิกา แบบ 24 ชั่วโมง"</string>
+    <string name="keywords_factory_data_reset" msgid="4355133848707691977">"ล้างข้อมูล ลบ กู้คืน ล้าง นำออก"</string>
     <string name="keywords_printing" msgid="1701778563617114846">"เครื่องพิมพ์"</string>
     <string name="keywords_sounds_and_notifications" msgid="5965996187974887000">"เสียงเตือนจากลำโพง"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="2912933812460077912">"ห้าม อย่า รบกวน แทรก การรบกวน การพัก"</string>
@@ -2354,7 +2371,7 @@
     <string name="keywords_location_mode" msgid="8584992704568356084">"ความแม่นยำ"</string>
     <string name="keywords_accounts" msgid="1957925565953357627">"บัญชี"</string>
     <string name="keywords_users" msgid="4673901601478559100">"การจำกัด จำกัด ถูกจำกัด"</string>
-    <string name="keywords_keyboard_and_ime" msgid="1103378692379215672">"การแก้ไขข้อความ แก้ไข เสียง สั่น ภาษาอัตโนมัติ ท่าทางสัมผัส แนะนำ คำแนะนำ ธีม คำที่ไม่เหมาะสม พิมพ์ อีโมจิ"</string>
+    <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"การแก้ไขข้อความ แก้ไข เสียง สั่น อัตโนมัติ ภาษา ท่าทางสัมผัส แนะนำ คำแนะนำ ธีม คำที่ไม่เหมาะสม พิมพ์ อีโมจิ นานาชาติ"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"เลื่อน รหัสผ่าน รูปแบบ PIN"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"ตั้งค่าแท็ก NFC สำหรับ Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"เขียน"</string>
@@ -2371,7 +2388,6 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"ระดับเสียงของการแจ้งเตือน"</string>
     <string name="zen_mode_settings_title" msgid="7014915558669122902">"เสียงแทรก"</string>
     <string name="zen_mode_option_title" msgid="5061978632306007914">"เมื่อมีสายเรียกเข้าหรือการแจ้งเตือน"</string>
-    <string name="zen_mode_option_title_novoice" msgid="6680706009915204785">"เมื่อมีการแจ้งเตือน"</string>
     <string name="zen_mode_option_off" msgid="3167702608910820883">"รบกวนได้เสมอ"</string>
     <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"อนุญาตเฉพาะเรื่องสำคัญเท่านั้น"</string>
     <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"ห้ามรบกวน"</string>
@@ -2429,14 +2445,17 @@
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"เสร็จสิ้น"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"จนกว่าคุณจะปิดฟังก์ชันนี้"</string>
     <string name="zen_mode_important_category" msgid="8123274463331022993">"เรื่องสำคัญ"</string>
-    <string name="zen_mode_downtime_category" msgid="4730179065426038108">"หยุดทำงาน (ยกเว้นเรื่องสำคัญ)"</string>
+    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"ช่วงเวลาเครื่องไม่ทำงาน"</string>
     <string name="zen_mode_downtime_days" msgid="3361856902633311616">"วัน"</string>
     <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"ไม่มี"</string>
+    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"อนุญาตให้ขัดจังหวะ"</string>
+    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"ลำดับความสำคัญสูงเท่านั้น"</string>
+    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"ไม่มี"</string>
     <string name="zen_mode_automation_category" msgid="4653551005950835761">"ระบบอัตโนมัติ"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"เปิดโดยอัตโนมัติ"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"ไม่ใช้เลย"</string>
-    <string name="zen_mode_phone_calls" msgid="8956214416859303966">"การโทร"</string>
+    <string name="zen_mode_calls" msgid="7051492091133751208">"การโทร"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"ข้อความ"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"สาย/ข้อความจาก"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"ใครก็ได้"</string>
@@ -2450,7 +2469,9 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"คืนวันจันทร์-ศุกร์"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"เวลาเริ่มต้น"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"เวลาสิ้นสุด"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> ของวันถัดไป"</string>
+    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> วันถัดไป"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> หรือเมื่อถึงเวลาตั้งปลุกก่อน"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> วันถัดไปหรือเมื่อถึงเวลาตั้งปลุกก่อน"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"การแจ้งเตือนของแอป"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"การตั้งค่าการแจ้งเตือน"</string>
     <string name="device_feedback" msgid="3238056036766293294">"ส่งความคิดเห็นเกี่ยวกับอุปกรณ์นี้"</string>
@@ -2458,7 +2479,11 @@
     <string name="switch_on_text" msgid="1124106706920572386">"เปิด"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"ปิด"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"การตรึงหน้าจอ"</string>
-    <string name="screen_pinning_description" msgid="7091642350452605379">"เมื่อเปิด คุณสามารถใช้การตรึงหน้าจอเพื่อเปิดหน้าจอปัจจุบันไว้จนกว่าคุณจะเลิกตรึง\n\nหากต้องการใช้การตรึงหน้าจอ ให้ทำดังนี้:\n\n1. เปิดการตรึงหน้าจอ\n\n2. เปิดหน้าจอที่คุณต้องการตรึง\n\n3. แตะภาพรวม\n\n4. แตะไอคอนหมุด"</string>
+    <string name="screen_pinning_description" msgid="1137904524037468263">"เมื่อเปิดใช้การตั้งค่านี้ คุณสามารถใช้การตรึงหน้าจอเพื่อให้หน้าจอปัจจุบันเปิดอยู่เสมอจนกว่าคุณจะเลิกตรึง\n\nหากต้องการใช้การตรีงหน้าจอ ให้ทำดังนี้:\n\n1. ตรวจสอบว่าเปิดการตรึงหน้าจออยู่\n\n2. เปิดหน้าจอที่คุณต้องการตรึง\n\n3. แตะภาพรวม\n\n4. กวาดขึ้น จากนั้นแตะไอคอนตรึง"</string>
+    <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"ขอรูปแบบการปลดล็อกก่อนเลิกตรึง"</string>
+    <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"ขอ PIN ก่อนเลิกตรึง"</string>
+    <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"ขอรหัสผ่านก่อนเลิกตรึง"</string>
+    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"ล็อกอุปกรณ์เมื่อเลิกตรึง"</string>
     <string name="managed_user_title" msgid="8101244883654409696">"โปรไฟล์งาน"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(ทดลอง)"</string>
     <string name="display_auto_rotate_title" msgid="6176450657107806043">"เมื่อหมุนอุปกรณ์"</string>
@@ -2467,7 +2492,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"ใช้มุมมองแนวนอน"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"ใช้การวางแนวเดิม"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"ข้อมูล IMEI"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"ข้อมูลที่เกี่ยวข้องกับ IMEI"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"การเข้ารหัส"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"ต่อไป"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"นอกจากนี้คุณยังสามารถปกป้องอุปกรณ์เครื่องนี้เพิ่มเติมโดยกำหนดให้ต้องป้อน PIN ก่อนที่อุปกรณ์จะเริ่มต้นขึ้น อุปกรณ์จะไม่สามารถรับสาย ข้อความ หรือการแจ้งเตือน รวมถึงเสียงเตือนได้จนกว่าอุปกรณ์จะเริ่มต้นขึ้น \n\nซึ่งจะช่วยปกป้องข้อมูลในอุปกรณ์ที่สูญหายหรือถูกขโมย"</string>
@@ -2485,4 +2509,7 @@
     <string name="encrypt_talkback_dialog_message_pin" msgid="1890374082842868489">"เมื่อคุณป้อน PIN เพื่อเริ่มใช้งานอุปกรณ์นี้ บริการความสามารถในการเข้าถึงอย่างเช่น <xliff:g id="SERVICE">%1$s</xliff:g> จะยังไม่พร้อมใช้งาน"</string>
     <string name="encrypt_talkback_dialog_message_pattern" msgid="4474332516537386384">"เมื่อคุณป้อนรูปแบบเพื่อเริ่มใช้งานอุปกรณ์นี้ บริการความสามารถในการเข้าถึงอย่างเช่น <xliff:g id="SERVICE">%1$s</xliff:g> จะยังไม่พร้อมใช้งาน"</string>
     <string name="encrypt_talkback_dialog_message_password" msgid="8166099418487083927">"เมื่อคุณป้อนรหัสผ่านเพื่อเริ่มใช้งานอุปกรณ์นี้ บริการความสามารถในการเข้าถึงอย่างเช่น <xliff:g id="SERVICE">%1$s</xliff:g> จะยังไม่พร้อมใช้งาน"</string>
+    <string name="imei_information_title" msgid="8499085421609752290">"ข้อมูล IMEI"</string>
+    <string name="imei_information_summary" msgid="2074095606556565233">"ข้อมูลที่เกี่ยวข้องกับ IMEI"</string>
+    <string name="slot_number" msgid="3762676044904653577">"(ช่อง<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-tl/arrays.xml b/res/values-tl/arrays.xml
index 5c9a5ef..bdc7b38 100644
--- a/res/values-tl/arrays.xml
+++ b/res/values-tl/arrays.xml
@@ -527,4 +527,12 @@
     <item msgid="4338089220026248848">"Naka-cache (client ng gawain)"</item>
     <item msgid="6652164677254579050">"Naka-cache (walang laman)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Teal"</item>
+    <item msgid="8332294763632946560">"Asul"</item>
+    <item msgid="2023216417616991392">"Indigo"</item>
+    <item msgid="3170497246594232819">"Lila"</item>
+    <item msgid="4608643045752965568">"Pink"</item>
+    <item msgid="6131821495505931173">"Pula"</item>
+  </string-array>
 </resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 6898fe0..470edee 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>
@@ -180,7 +180,6 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"Gustong i-access ni %1$s ang iyong mga mensahe. Bigyan ng access si %2$s?"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Petsa at oras"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Pumili ng time zone"</string>
-    <string name="normal_date_format" msgid="7636406984925498359">"Panrehiyon (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Preview:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Laki ng font:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -291,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>
@@ -322,8 +321,6 @@
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Pumili ng time zone"</string>
     <string name="date_time_set_date_title" msgid="6928286765325608604">"Petsa"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"Magtakda ng petsa"</string>
-    <string name="date_time_date_format_title" msgid="3976171711988766411">"Format ng petsa"</string>
-    <string name="date_time_date_format" msgid="6951498879879281102">"Pumili ng format ng petsa"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Pag-uri-uriin nang ayon sa alpabeto"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Pag-uri-uriin ayon sa time zone"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Petsa"</string>
@@ -372,7 +369,8 @@
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Maghintay habang ine-encrypt ang iyong telepono. <xliff:g id="PERCENT">^1</xliff:g>% (na) kumpleto."</string>
     <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Maghintay habang ine-encrypt ang iyong tablet. Natitirang oras: <xliff:g id="DURATION">^1</xliff:g>"</string>
     <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Maghintay habang ine-encrypt ang iyong telepono. Natitirang oras: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Subukang muli sa loob ng <xliff:g id="DELAY">^1</xliff:g> (na) segundo."</string>
+    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"Upang i-unlock ang iyong tablet, i-off ito at pagkatapos ay i-on."</string>
+    <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"Upang i-unlock ang iyong telepono, i-off ito at pagkatapos ay i-on."</string>
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"Babala: Mabubura ang iyong device pagkatapos ng <xliff:g id="COUNT">^1</xliff:g> pang hindi matagumpay na pagsubok na mag-unlock!"</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"I-type ang iyong password"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Hindi matagumpay ang pag-encrypt"</string>
@@ -401,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>
@@ -412,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>
@@ -556,13 +556,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Bilang speaker phone"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Para sa musika at media"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Tandaan ang mga setting"</string>
-    <string name="wifi_assistant_intro_setup" msgid="4605105515416995110">"Introducing\nWi‑Fi Assistant"</string>
-    <string name="wifi_assistant_no_thanks" msgid="2776983751990143934">"HINDI, SALAMAT"</string>
-    <string name="wifi_assistant_setup" msgid="3772423650475730906">"I-SET UP"</string>
-    <string name="wifi_assistant_card_message" msgid="107811647784658536">"Awtomatikong kumonekta sa mga available na network gamit ang Wi-Fi Assistant."</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi‑Fi Assistant"</string>
-    <string name="wifi_assistant_title_message" msgid="6240721017579074015">"Awtomatiko kang ikokonekta ng <xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> sa pinakamahusay na available na Wi‑Fi"</string>
-    <string name="wifi_assistant_open_app" msgid="4803044899535675063">"BUKSAN ANG APP"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Nakakonekta sa pamamagitan ng Wi‑Fi assistant"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"I-cast ang screen"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"I-enable ang wireless display"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Walang nakitang mga kalapit na device."</string>
@@ -592,7 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Mga setting ng Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Mag-set up &amp; mamahala ng mga wireless na access point"</string>
-    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Pumili ng Wi-Fi"</string>
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Pumili ng Wi‑Fi network"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Pumili ng Wi-Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Ino-on ang Wi‑Fi…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Ino-off ang Wi-Fi..."</string>
@@ -607,8 +602,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"Palaging available ang pag-scan"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Palaging payagan ang pag-i-scan"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Hayaang mag-scan ng mga network ang serbisyo sa lokasyon ng Google at iba pang mga app, kahit na naka-off ang Wi-Fi"</string>
-    <string name="wifi_automatically_manage_title" msgid="6249976570008992746">"Awtomatikong pamahalaan ang Wi-Fi"</string>
-    <string name="wifi_automatically_manage_summary" msgid="6952470763378312488">"Hayaan ang <xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> na pamahalaan ang iyong koneksyon sa Wi‑Fi"</string>
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Awtomatikong gamitin ang bukas na Wi‑Fi"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Hayaan ang Wi‑Fi assistant na awtomatikong kumonekta sa bukas na network na mataas ang kalidad."</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Pumili ng assistant"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Mag-install ng mga certificate"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Upang mapahusay ang katumpakan ng lokasyon at para sa iba pang mga layunin, maaaring mag-scan ang Google at ang iba pang app kung may mga network sa malapit, kahit na naka-off ang Wi-Fi. Kung hindi mo ito gustong mangyari, pumunta sa Advanced &gt; Palaging available ang pag-scan."</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Maaaring mag-scan ang apps kung may mga network sa malapit, kahit na naka-off ang Wi-Fi. Kung hindi mo ito gustong mangyari, pumunta sa Advanced &gt; Palaging available ang pag-scan."</string>
@@ -629,6 +625,7 @@
     <string name="wifi_menu_scan" msgid="1470911530412095868">"I-scan"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Advanced"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Kumonekta sa network"</string>
+    <string name="wifi_menu_remember" msgid="8814185749388713796">"Tandaan ang network"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Kalimutan ang network"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Baguhin ang network"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Isulat sa tag ng NFC"</string>
@@ -673,9 +670,11 @@
     <string name="wifi_unspecified" msgid="5431501214192991253">"(di-tukoy)"</string>
     <string name="wifi_remembered" msgid="4955746899347821096">"Na-save"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"Hindi Pinagana"</string>
-    <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Iniwasan ang mahinang koneksyon sa Internet"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"Pagkabigo ng Configuration ng IP"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Pagkabigo ng Koneksyon sa WiFi"</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Problema sa pagpapatotoo"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Wala sa sakop"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Walang Natukoy na Access sa Internet, hindi awtomatikong muling kumonekta."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"Available ang WPS"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (Available ang WPS)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Ilagay ang iyong password sa network"</string>
@@ -699,9 +698,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"BABALA: kung lalaktawan mo ang Wi‑Fi, gagamitin lang ng iyong tablet ang mobile data para sa mga paunang pag-download at pag-update. Upang maiwasan ang mga posibleng karagdagang pagsingil sa data, kumonekta sa Wi‑Fi."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"BABALA: kung lalaktawan mo ang Wi‑Fi, gagamitin lang ng iyong device ang mobile data para sa mga paunang pag-download at pag-update. Upang maiwasan ang mga posibleng karagdagang pagsingil sa data, kumonekta sa Wi‑Fi."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"BABALA: kung lalaktawan mo ang Wi‑Fi, gagamitin lang ng iyong telepono ang mobile data para sa mga paunang pag-download at pag-update. Upang maiwasan ang mga posibleng karagdagang pagsingil sa data, kumonekta sa Wi‑Fi."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="2393880108322835846">"BABALA: Kung lalaktawan mo ang Wi‑Fi, walang magagamit na koneksyon sa Internet ang iyong tablet para sa anumang mga paunang pag-download o pag-update."</string>
-    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1707391993265558787">"BABALA: Kung lalaktawan mo ang Wi‑Fi, walang magagamit na koneksyon sa Internet ang iyong device para sa anumang mga paunang pag-download o pag-update."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="1556858507920033022">"BABALA: Kung lalaktawan mo ang Wi‑Fi, walang magagamit na koneksyon sa Internet ang iyong telepono para sa anumang mga paunang pag-download o pag-update."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Kung lalaktawan mo ang Wi‑Fi:\n\nHindi magkakaroon ng koneksyon sa Internet ang iyong tablet.\n\nHindi ka makakatanggap ng mga update sa software hanggang sa kumonekta ka sa Internet.\n\nHindi ka makakapag-activate ng mga feature para sa proteksyon ng device sa ngayon."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Kung lalaktawan mo ang Wi‑Fi:\n\nHindi magkakaroon ng koneksyon sa Internet ang iyong device.\n\nHindi ka makakatanggap ng mga update sa software hanggang sa kumonekta ka sa Internet.\n\nHindi ka makakapag-activate ng mga feature para sa proteksyon ng device sa ngayon."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Kung lalaktawan mo ang Wi‑Fi:\n\nHindi magkakaroon ng koneksyon sa Internet ang iyong telepono.\n\nHindi ka makakatanggap ng mga update sa software hanggang sa kumonekta ka sa Internet.\n\nHindi ka makakapag-activate ng mga feature para sa proteksyon ng device sa ngayon."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Hindi nakakonekta sa Wi-Fi network na ito ang tablet."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"Hindi nakakonekta ang device na ito sa Wi‑Fi network na ito."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Hindi nakakonekta sa Wi-Fi network na ito ang telepono."</string>
@@ -761,7 +760,6 @@
     <string name="ring_volume_title" msgid="7938706566797464165">"Volume ng ringer"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"I-vibrate kapag naka-silent"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Default na tunog ng notification"</string>
-    <string name="heads_up_enabled_title" msgid="1031078221910921622">"Pop up kung mataas priyoridad"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Ringtone"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Notification"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Gumamit ng lakas ng tunog ng papasok na tawag para sa mga notification"</string>
@@ -834,7 +832,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Awtomatikong pagliwanag"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Angatin upang paganahin"</string>
     <string name="doze_title" msgid="2259176504273878294">"Ambient na display"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"Paganahin ang screen kapag kinuha ang device o may dumating na mga notification"</string>
+    <string name="doze_summary" msgid="7128970177894383698">"Gisingin ang screen kapag kinukuha mo ang device o tumatanggap ng mga notification."</string>
     <string name="title_font_size" msgid="4405544325522105222">"Laki ng font"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Laki ng font"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Mga setting ng lock ng SIM card"</string>
@@ -862,6 +860,10 @@
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Kanselahin"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"Maraming SIM ang nakita"</string>
     <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>
+    <string name="sim_preferred_title" msgid="5567909634636045268">"I-update ang gustong SIM card?"</string>
+    <string name="sim_preferred_message" msgid="301251431163650167">"Ang <xliff:g id="NEW_SIM">%1$s</xliff:g> ay ang nag-iisang SIM sa iyong device. Gusto mo bang gamitin ang SIM na ito para sa cellular data, mga tawag at mensaheng SMS?"</string>
     <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>
@@ -1012,6 +1014,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Buburahin nito ang lahat ng data mula sa "<b>"panloob na storage"</b>" ng iyong tablet, kabilang ang:\n\n"<li>"Iyong Google account"</li>\n<li>"System at data ng app at mga setting"</li>\n<li>"Na-download na apps"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Buburahin nito ang lahat ng data mula sa "<b>"panloob na storage"</b>" ng iyong telepono, kabilang ang:\n\n"<li>"Iyong Google account"</li>\n<li>"System at data ng app at mga setting"</li>\n<li>"Na-download na apps"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Kasalukuyan kang naka-sign in sa mga sumusunod na account:\n"</string>
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"May iba pang mga user sa device na ito.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musika"</li>\n<li>"Mga Larawan"</li>\n<li>"Ibang data ng user"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Upang i-clear ang musika, mga larawan, at iba pang data ng user, kailangang mabura ang "<b>"USB storage"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Upang i-clear ang musika, mga larawan, at ibang data ng user, kailangang mabura ang "<b>"SD card"</b>"."</string>
@@ -1023,7 +1026,6 @@
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"I-reset ang telepono"</string>
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Burahin ang lahat ng iyong personal na impormasyon at na-download na apps? Hindi mo mababawi ang pagkilos na ito!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Burahin ang lahat"</string>
-    <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Kunin ang iyong naka-unlock na pattern"</string>
     <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Kailangan mong iguhit ang iyong pattern ng pag-unlock upang magkumpirma ng factory data reset."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Walang isinagawang pag-reset dahil hindi available ang serbisyong System Clear."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"I-reset?"</string>
@@ -1041,7 +1043,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"Burahin ang USB storage, na tinatanggal ang lahat ng file na nakaimbak doon? Hindi mo mababawi ang pagkilos na ito!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Burahin ang SD card, na tinatanggal ang lahat ng file na nakaimbak doon? Hindi mo mababawi ang pagkilos na ito!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Burahin ang lahat"</string>
-    <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Kunin ang iyong naka-unlock na pattern"</string>
     <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Dapat mong iguhit ang iyong pattern ng pag-unlock upang kumpirmahin na nais mong burahin ang USB storage."</string>
     <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Kailangan mong iguhit ang iyong pattern ng pag-unlock upang kumpirmahin na nais mong burahin ang SD card."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Mga setting ng tawag"</string>
@@ -1087,6 +1088,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Mangyaring magpasok ng SIM card at mag-restart"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Mangyaring kumonekta sa Internet"</string>
     <string name="location_title" msgid="1029961368397484576">"Aking Lokasyon"</string>
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Profile sa trabaho"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Lokayon ng profile sa trabaho"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Na-off ng iyong kumpanya"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Mode"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Napakatumpak"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Pagtitipid ng baterya"</string>
@@ -1124,6 +1128,7 @@
     <string name="copyright_title" msgid="865906688917260647">"Copyright"</string>
     <string name="license_title" msgid="1990487604356037871">"Lisensya"</string>
     <string name="terms_title" msgid="7697580845616764642">"Mga Tuntunin at kundisyon"</string>
+    <string name="webview_license_title" msgid="2813507464175738967">"Lisensya ng System WebView"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Mga Wallpaper"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Mga provider ng koleksyon ng imahe na galing sa satellite:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Mga lisensya ng bukas na pinagmumulan"</string>
@@ -1237,7 +1242,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Imbakan na USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Sa SD card"</string>
     <string name="disabled" msgid="9206776641295849915">"Hindi Pinagana"</string>
-    <string name="not_installed" msgid="1475144352069281880">"Hindi naka-install"</string>
+    <string name="not_installed" msgid="2797554494953450291">"Hindi naka-install para sa user na ito"</string>
     <string name="no_applications" msgid="7336588977497084921">"Walang apps."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Panloob na storage"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Imbakan na USB"</string>
@@ -1434,8 +1439,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Hindi kailanman hihinto ang screen kapag kinakargahan"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"I-enable ang Bluetooth HCI snoop log"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"I-capture ang lahat ng bluetooth HCI packet sa isang file"</string>
-    <string name="oem_unlock_enable" msgid="6629321276287913315">"I-enable ang OEM unlock"</string>
-    <string name="oem_unlock_enable_summary" msgid="3546686263996628110">"Payagan ang device na ma-unlock ng OEM"</string>
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"Pag-a-unlock ng OEM"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Payagan na ma-unlock ang bootloader"</string>
+    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Ilagay ang iyong PIN"</string>
+    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Ilagay ang PIN ng iyong device upang ma-enable ang pag-unlock na OEM"</string>
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Payagan ang pag-a-unlock ng OEM?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"BABALA: Hindi gagana ang mga feature sa pagprotekta sa device sa device na ito habang naka-on ang setting na ito."</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Certification ng wireless display"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"I-enable ang Pagla-log sa Wi‑Fi Verbose"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Agresibong paglipat ng Wi‑Fi sa Cellular"</string>
@@ -1538,6 +1547,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"Ganito ang magiging hitsura ng mga caption"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"Default"</string>
+    <string name="color_title" msgid="4258931051732243983">"Kulay"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"Default"</string>
     <string name="color_none" msgid="3475640044925814795">"Wala"</string>
     <string name="color_white" msgid="8045195170201590239">"Puti"</string>
@@ -1595,12 +1605,12 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"<xliff:g id="REMAIN">%1$s</xliff:g> natitira"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> upang ma-charge"</string>
-    <string name="power_discharging_duration" msgid="7125493014448497620">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - approx. <xliff:g id="TIME">%2$s</xliff:g> ang nalalabi"</string>
-    <string name="power_charging" msgid="712751285832976915">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="STATE">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration" msgid="4802183864773082009">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> hanggang mapuno"</string>
-    <string name="power_charging_duration_ac" msgid="3611179931297824699">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> hanggang mapuno sa AC"</string>
-    <string name="power_charging_duration_usb" msgid="1106605348913397583">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> hanggang mapuno gamit ang USB"</string>
-    <string name="power_charging_duration_wireless" msgid="633606920144617227">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> hanggang mapuno mula sa wireless"</string>
+    <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> - humigit kumulang <xliff:g id="TIME">%2$s</xliff:g> ang natitira"</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> bago mapuno"</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> bago mapuno sa AC"</string>
+    <string name="power_charging_duration_usb" msgid="182405645340976546">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> bago mapuno sa USB"</string>
+    <string name="power_charging_duration_wireless" msgid="1829295708243159464">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> bago mapuno mula sa wireless"</string>
     <string name="power_usage_list_summary" msgid="2409288197839512482">"Gumagana noong huling full charge pa"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Paggamit ng baterya mula nang hindi nakasaksak"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Paggamit ng baterya mula ng ini-reset"</string>
@@ -1617,7 +1627,6 @@
     <string name="awake" msgid="387122265874485088">"Device ng oras ng paggising"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi na nasa oras"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi na nasa oras"</string>
-    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Mga detalye ng kasaysayan"</string>
     <string name="details_title" msgid="3792801565213935385">"Gamitin ang mga detalye"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Gamitin ang mga detalye"</string>
@@ -1689,7 +1698,7 @@
     <string name="battery_saver" msgid="1426682272004907982">"Battery saver"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Awtomatikong i-on"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Hindi Kailanman"</string>
-    <string name="battery_saver_turn_on_automatically_pct" msgid="3033681629861428940">"sa %1$d%% na baterya"</string>
+    <string name="battery_saver_turn_on_automatically_pct" msgid="7536784431655058267">"%1$s na lang ang natitirang baterya"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Mga Istatistika ng Proseso"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Mahahalagang istatistika tungkol sa mga tumatakbong proseso"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Memory na ginamit"</string>
@@ -1813,7 +1822,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Hardware-backed"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Software lang"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"Hindi available ang mga kredensyal para sa user na ito"</string>
-    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Iguhit ang iyong pattern sa pag-unlock"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Kailangan mong iguhit ang iyong pattern sa pag-unlock upang kumpirmahin ang pag-install ng kredensyal."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"I-type ang password para sa storage ng kredensyal."</string>
@@ -1843,6 +1851,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"Isama ang data ng app"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Awtomatikong pagbalik"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Kapag muling ini-install ang isang app, ipanumbalik ang mga na-back up na setting at data"</string>
+    <string name="backup_inactive_title" msgid="5355557151569037197">"Hindi aktibo ang backup na serbisyo."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"Itinatakda ito ng iyong patakaran sa device."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Password ng pag-backup ng desktop"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Kasalukuyang hindi pinoprotektahan ang mga buong pag-backup ng desktop"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Pindutin upang baguhin o alisin ang password para sa mga buong pag-backup ng desktop"</string>
@@ -1952,7 +1962,11 @@
     <string name="enter_password" msgid="8035706727471334122">"Upang magsimula sa Android, ilagay ang iyong password"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Upang magsimula sa Android, ilagay ang iyong PIN"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Upang magsimula sa Android, iguhit ang iyong pattern"</string>
-    <string name="try_again" msgid="4272075051293936921">"Subukang muli."</string>
+    <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"Maling Pattern"</string>
+    <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"Maling Password"</string>
+    <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"Maling PIN"</string>
+    <string name="checking_decryption" msgid="8287458611802609493">"Sinusuri…"</string>
+    <string name="starting_android" msgid="8581493237458496835">"Sinisimulan ang Android"</string>
     <string name="delete" msgid="4219243412325163003">"Tanggalin"</string>
     <string name="misc_files" msgid="6720680815969643497">"Misc na mga file"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"pinili <xliff:g id="NUMBER">%1$d</xliff:g> sa <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -1990,8 +2004,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Laging gamitin ang GPU para sa screen compositing"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"Gayahin ang color space"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Paganahin trace ng OpenGL"</string>
-    <string name="use_nuplayer" msgid="5699257393367904387">"Gamitin ang NuPlayer (pang-eksperimento)"</string>
-    <string name="use_nuplayer_summary" msgid="1991479067478516714">"Gamitin ang NuPlayer sa halip na AwesomePlayer"</string>
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"Gamitin ang AwesomePlayer (di na ginagamit)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"Gamitin ang AwesomePlayer sa halip na NuPlayer sa karamihan ng media playback"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"I-disable USB audio routing"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"I-disable automatic routing sa USB audio peripheral"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Ipakita mga layout bound"</string>
@@ -2167,7 +2181,6 @@
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Magdagdag ng user o profile"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Idagdag ang user"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Pinaghihigpitang profile"</string>
-    <string name="user_summary_managed_profile" msgid="7369539529693048111">"Profile sa trabaho"</string>
     <string name="user_need_lock_message" msgid="2596365678651842785">"Bago ka makakalikha ng pinaghihigpitang profile, kakailanganin mong mag-set up ng lock ng screen upang protektahan ang iyong apps at personal na data."</string>
     <string name="user_set_lock_button" msgid="8311219392856626841">"Itakda ang lock"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Hindi naka-set up"</string>
@@ -2298,11 +2311,13 @@
     <string name="sim_cellular_data_unavailable_summary" msgid="3654805961942166428">"Pindutin upang pumili ng data SIM"</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"Palaging gamitin ito para sa mga tawag"</string>
     <string name="select_sim_for_data" msgid="2366081042162853044">"Pumili ng SIM para sa data"</string>
+    <string name="data_switch_started" msgid="2040761479817166311">"Lumilipat ng data SIM, maaari itong magtagal nang hanggang isang minuto..."</string>
     <string name="select_sim_for_calls" msgid="3503094771801109334">"Tumawag gamit ang"</string>
     <string name="sim_select_card" msgid="211285163525563293">"Pumili ng SIM card"</string>
     <string name="sim_card_number_title" msgid="7845379943474336488">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"Walang laman ang SIM"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"Pangalan ng SIM"</string>
+    <string name="sim_name_hint" msgid="7038643345238968930">"Ilagay ang pangalan ng SIM"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"Slot ng SIM %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Carrier"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Numero"</string>
@@ -2312,7 +2327,6 @@
     <string name="color_purple" msgid="3888532466427762504">"Lila"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"Walang nakalagay na mga SIM card"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"Status ng SIM"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"Impormasyong kaugnay sa SIM"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"Pagtawag mula sa default na SIM"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"SIM para sa mga papalabas na tawag"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Iba pang mga setting ng tawag"</string>
@@ -2320,8 +2334,11 @@
     <string name="preferred_network_offload_header" msgid="2321173571529106767">"I-disable ang Pag-broadcast ng Pangalan ng Network"</string>
     <string name="preferred_network_offload_footer" msgid="5857279426054744020">"Pinipigilan ng Disable Network Name Broadcast ang pag-access ng third party sa iyong network info."</string>
     <string name="preferred_network_offload_popup" msgid="2252915199889604600">"Pipigilan ng Pag-disable sa Network Name Broadcast ang awtomatikong pagkonekta sa tagong network."</string>
+    <string name="sim_signal_strength" msgid="9144010043784767984">"<xliff:g id="DBM">%1$d</xliff:g> dBm <xliff:g id="ASU">%2$d</xliff:g> asu"</string>
+    <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>
+    <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Itanong palagi"</string>
     <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>
@@ -2330,22 +2347,22 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Mga kamakailang paghahanap"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Mga Resulta"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi network connection"</string>
-    <string name="keywords_more_default_sms_app" msgid="2744404159003574745">"text message"</string>
-    <string name="keywords_more_mobile_networks" msgid="7813380887358745769">"cellular cell carrier wireless"</string>
+    <string name="keywords_more_default_sms_app" msgid="895656981962034647">"text message pagte-text mga mensahe pagmemensahe"</string>
+    <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"cellular cell carrier wireless na data 4g 3g 2g lte"</string>
     <string name="keywords_home" msgid="3626170808219458848">"launcher"</string>
     <string name="keywords_display" msgid="6709007669501628320">"screen na touchscreen"</string>
-    <string name="keywords_display_brightness_level" msgid="8636451602230815191">"i-dim ang screen na touchscreen"</string>
-    <string name="keywords_display_auto_brightness" msgid="8070218600502753102">"i-dim ang screen na touchscreen"</string>
-    <string name="keywords_display_wallpaper" msgid="4315466287469834939">"background"</string>
+    <string name="keywords_display_brightness_level" msgid="8923289340474728990">"i-dim ang screen touchscreen baterya"</string>
+    <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"i-dim ang screen touchscreen baterya"</string>
+    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"background i-personalize i-customize ang display"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"laki ng text"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"proyekto"</string>
-    <string name="keywords_storage" msgid="7007275853993419928">"hard drive ng space disk"</string>
-    <string name="keywords_battery" msgid="3992479295298655138">"power"</string>
-    <string name="keywords_spell_checker" msgid="4509482591225399210">"spelling"</string>
+    <string name="keywords_storage" msgid="6572905220031852173">"espasyo disk hard drive device paggamit"</string>
+    <string name="keywords_battery" msgid="2096185085932675704">"paggamit ng baterya i-charge"</string>
+    <string name="keywords_spell_checker" msgid="6106749039734174140">"pagbabaybay diksyunaryo spellcheck auto-correct"</string>
     <string name="keywords_voice_input" msgid="3519547605812413860">"recognizer input speech speak language hands-free hand free recognition offensive word audio history bluetooth headset"</string>
-    <string name="keywords_text_to_speech_output" msgid="8207889472282225512">"rate wika default magsalita pagsasalita"</string>
-    <string name="keywords_date_and_time" msgid="7666950126499155141">"orasan"</string>
-    <string name="keywords_factory_data_reset" msgid="3693730656843989732">"i-wipe delete"</string>
+    <string name="keywords_text_to_speech_output" msgid="392447904221657930">"rate wika default magsalita nagsasalita tts na accessibility reader bulag"</string>
+    <string name="keywords_date_and_time" msgid="2631808108134830066">"orasan military"</string>
+    <string name="keywords_factory_data_reset" msgid="4355133848707691977">"i-wipe i-delete i-restore i-clear alisin"</string>
     <string name="keywords_printing" msgid="1701778563617114846">"printer"</string>
     <string name="keywords_sounds_and_notifications" msgid="5965996187974887000">"pag-beep ng speaker"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="2912933812460077912">"hindi huwag abalahin pag-abala putol"</string>
@@ -2354,7 +2371,7 @@
     <string name="keywords_location_mode" msgid="8584992704568356084">"katumpakan"</string>
     <string name="keywords_accounts" msgid="1957925565953357627">"account"</string>
     <string name="keywords_users" msgid="4673901601478559100">"paghihigpit paghigpitan pinaghigpitan"</string>
-    <string name="keywords_keyboard_and_ime" msgid="1103378692379215672">"pagwawasto ng text tamang tunog pag-vibrate galaw ng auto language magmungkahi suhestyon tema nakakapanakit na salit i-type ang emoji"</string>
+    <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"pagwawasto ng text tama tunog i-vibrate awtomatiko wika galaw magmungkahi suhestyon tema nakakapanakit na salita i-type emoji international"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"i-slide password pattern pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"I-set up ang Tag ng NFC sa Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Magsulat"</string>
@@ -2371,7 +2388,6 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Volume ng notification"</string>
     <string name="zen_mode_settings_title" msgid="7014915558669122902">"Mga Paggambala"</string>
     <string name="zen_mode_option_title" msgid="5061978632306007914">"Kapag dumating ang mga tawag at notification"</string>
-    <string name="zen_mode_option_title_novoice" msgid="6680706009915204785">"Kapag dumating ang mga notification"</string>
     <string name="zen_mode_option_off" msgid="3167702608910820883">"Palaging manggambala"</string>
     <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Payagan lang ang mga may priyoridad na paggambala"</string>
     <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Huwag manggambala"</string>
@@ -2429,14 +2445,17 @@
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Tapos na"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Hanggang sa i-off mo ito"</string>
     <string name="zen_mode_important_category" msgid="8123274463331022993">"Mga may priyoridad na paggambala"</string>
-    <string name="zen_mode_downtime_category" msgid="4730179065426038108">"Downtime (gambalang may priyoridad lang)"</string>
+    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Walang serbisyo"</string>
     <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Mga Araw"</string>
     <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Wala"</string>
+    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Pinapayagan ang mga pagkaantala"</string>
+    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Priyoridad lang"</string>
+    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Wala"</string>
     <string name="zen_mode_automation_category" msgid="4653551005950835761">"Pag-automate"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Awtomatikong i-on"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Hindi Kailanman"</string>
-    <string name="zen_mode_phone_calls" msgid="8956214416859303966">"Mga Tawag"</string>
+    <string name="zen_mode_calls" msgid="7051492091133751208">"Mga Tawag"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Mga Mensahe"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Mga tawag/mensahe mula kay"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Sinuman"</string>
@@ -2450,7 +2469,9 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Mga Weeknight"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Oras ng pagsisimula"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Oras ng pagtatapos"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> sa susunod na araw"</string>
+    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> sa susunod na araw"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> o anumang alarm dati"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> sa susunod na araw o anumang alarm dati"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Notification sa app"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Mga setting ng notification"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Magpadala ng feedback tungkol sa device na ito"</string>
@@ -2458,7 +2479,11 @@
     <string name="switch_on_text" msgid="1124106706920572386">"Naka-on"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Naka-off"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"Pagpi-pin ng screen"</string>
-    <string name="screen_pinning_description" msgid="7091642350452605379">"Kapag naka-on, magagamit ang pagpi-pin ng screen upang panatilihing nakikita ang kasalukuyang screen hanggang ia-unpin mo.\n\nUpang magamit ang pagpi-pin ng screen:\n\n1. Tiyaking naka-on ang pagpi-pin ng screen.\n\n2. Buksan ang screen na ipi-pin.\n\n3. Pindutin ang Overview.\n\n4. Pindutin ang pin icon."</string>
+    <string name="screen_pinning_description" msgid="1137904524037468263">"Kapag naka-on ang setting na ito, maaari mong gamitin ang pagpi-pin sa screen para panatilihing nasa view ang kasalukuyang screen hanggang sa mag-unpin ka.\n\nPara magamit ang pagpi-pin sa screen:\n\n1. Siguraduhing naka-on ang pagpi-pin sa screen.\n\n2. Buksan ang screen na gusto mong i-pin.\n\n3. Pindutin ang Pangkalahatang-ideya.\n\n4. Mag-swipe pataas, pagkatapos ay pindutin ang icon na pin."</string>
+    <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Humingi ng pattern sa pag-unlock bago mag-unpin"</string>
+    <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Humingi ng PIN bago mag-unpin"</string>
+    <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Humingi ng password bago mag-unpin"</string>
+    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"I-lock ang device kapag nag-a-unpin"</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Profile sa trabaho"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Pang-eksperimento)"</string>
     <string name="display_auto_rotate_title" msgid="6176450657107806043">"Kapag inikot ang device"</string>
@@ -2467,7 +2492,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Manatili sa landscape na view"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Manatili sa kasalukuyang oryentasyon"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"Impormasyon ng IMEI"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"Kaugnay na impormasyon ng IMEI"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Pag-encrypt"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Magpatuloy"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"Maaari mong higit pang maprotektahan ang device na ito sa pamamagitan ng paghingi ng iyong PIN bago ito magbukas. Hanggang sa magbukas ang device, hindi ito makakatanggap ng mga tawag, mensahe o notification, kasama ang mga alarm. \n\nNakakatulong itong protektahan ang data sa mga nawala o nanakaw na device."</string>
@@ -2485,4 +2509,7 @@
     <string name="encrypt_talkback_dialog_message_pin" msgid="1890374082842868489">"Kapag inilagay mo ang PIN upang buksan ang device na ito, hindi pa magiging available ang mga serbisyo sa pagiging naa-access tulad ng <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="encrypt_talkback_dialog_message_pattern" msgid="4474332516537386384">"Kapag inilagay mo ang pattern upang buksan ang device na ito, hindi pa magiging available ang mga serbisyo sa pagiging naa-access tulad ng <xliff:g id="SERVICE">%1$s</xliff:g> ."</string>
     <string name="encrypt_talkback_dialog_message_password" msgid="8166099418487083927">"Kapag inilagay mo ang iyong password upang buksan ang device na ito, hindi pa magiging available ang mga serbisyo sa pagiging naa-access tulad ng <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
+    <string name="imei_information_title" msgid="8499085421609752290">"Impormasyon ng IMEI"</string>
+    <string name="imei_information_summary" msgid="2074095606556565233">"Kaugnay na impormasyon ng IMEI"</string>
+    <string name="slot_number" msgid="3762676044904653577">"(Slot<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-tr/arrays.xml b/res/values-tr/arrays.xml
index c10a063..f0f29f7 100644
--- a/res/values-tr/arrays.xml
+++ b/res/values-tr/arrays.xml
@@ -527,4 +527,12 @@
     <item msgid="4338089220026248848">"Önbelleğe alındı (etkinlik istemcisi)"</item>
     <item msgid="6652164677254579050">"Önbelleğe alındı (boş)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Camgöbeği"</item>
+    <item msgid="8332294763632946560">"Mavi"</item>
+    <item msgid="2023216417616991392">"Çivit mavisi"</item>
+    <item msgid="3170497246594232819">"Mor"</item>
+    <item msgid="4608643045752965568">"Pembe"</item>
+    <item msgid="6131821495505931173">"Kırmızı"</item>
+  </string-array>
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index cdcfdf3..407a01f 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>
@@ -180,7 +180,6 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s, iletilerinize erişmek istiyor. %2$s için erişim izni veriyor musunuz?"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Tarih ve saat"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Saat dilimini seçin"</string>
-    <string name="normal_date_format" msgid="7636406984925498359">"Bölgesel (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Önizleme:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Yazı tipi boyutu:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -291,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>
@@ -322,8 +321,6 @@
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Saat dilimi seçin"</string>
     <string name="date_time_set_date_title" msgid="6928286765325608604">"Tarih"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"Tarihi ayarlayın"</string>
-    <string name="date_time_date_format_title" msgid="3976171711988766411">"Tarih biçimi"</string>
-    <string name="date_time_date_format" msgid="6951498879879281102">"Tarih biçimi seçin"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Alfabetik olarak sırala"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Saat dilimine göre sırala"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Tarih"</string>
@@ -372,7 +369,8 @@
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Telefonunuz şifrelenirken lütfen bekleyin. %<xliff:g id="PERCENT">^1</xliff:g> tamamlandı."</string>
     <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Tabletiniz şifrelenirken bekleyin. Kalan süre: <xliff:g id="DURATION">^1</xliff:g>"</string>
     <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Telefonunuz şifrelenirken bekleyin. Kalan süre: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"<xliff:g id="DELAY">^1</xliff:g> saniye içinde yeniden deneyin."</string>
+    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"Tabletinizin kilidini açmak için tableti kapatıp tekrar açın."</string>
+    <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"Telefonunuzun kilidini açmak için telefonu kapatıp tekrar açın."</string>
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"Uyarı: Cihazınız, <xliff:g id="COUNT">^1</xliff:g> kez daha başarısız kilit açma denemesinden sonra silinecek!"</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Şifrenizi yazın"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Şifreleme başarısız oldu"</string>
@@ -401,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>
@@ -412,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>
@@ -556,13 +556,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Telefon hoparlörü olarak"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Müzik ve medya için"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Ayarları anımsa"</string>
-    <string name="wifi_assistant_intro_setup" msgid="4605105515416995110">"Wi‑Fi Assistant\nile Tanışın"</string>
-    <string name="wifi_assistant_no_thanks" msgid="2776983751990143934">"HAYIR, TEŞEKKÜRLER"</string>
-    <string name="wifi_assistant_setup" msgid="3772423650475730906">"YAPILANDIR"</string>
-    <string name="wifi_assistant_card_message" msgid="107811647784658536">"Bir Wi-Fi Assistant ile kullanılabilir ağlara her zaman bağlanın."</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi‑Fi Assistant"</string>
-    <string name="wifi_assistant_title_message" msgid="6240721017579074015">"<xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> sizi, kullanılabilir durumdaki en iyi Kablosuz ağa otomatik olarak bağlar"</string>
-    <string name="wifi_assistant_open_app" msgid="4803044899535675063">"UYGULAMAYI AÇ"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Kablosuz bağlantı yardımcısıyla bağlandı"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"Yayınlama ekranı"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Kablosuz görüntülemeyi etkinleştir"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Yakınlarda cihaz bulunamadı."</string>
@@ -592,7 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Kablosuz ayarları"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Kablosuz"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Kablosuz erişim noktalarını kur ve yönet"</string>
-    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Kablosuz seç"</string>
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Kablosuz ağ seçin"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Kablosuz bağlantı seç"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Kablosuz açılıyor…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Kablosuz kapatılıyor…"</string>
@@ -607,8 +602,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"Tarama her zaman kullanılabilir"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Taramaya her zaman izin ver"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Kablosuz özelliği kapalıyken dahi Google\'ın konum hizmetinin ve diğer uygulamaların ağları taramasına izin verin"</string>
-    <string name="wifi_automatically_manage_title" msgid="6249976570008992746">"Kablosuz\'u otomatik olarak yönet"</string>
-    <string name="wifi_automatically_manage_summary" msgid="6952470763378312488">"<xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> uygulamasının Kablosuz bağlantınızı yönetmesine izin ver"</string>
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Açık Kablosuz bağlantıyı otomatik kullan"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Bir Kablosuz bağlantı yardımcısı, yüksek kaliteli olduğu belirlenen açık ağlara otomatik bağlansın"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Yardımcı seçin"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Sertifika yükle"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Konum doğruluğunu iyileştirmek için ve diğer amaçlarla, Google ve diğer uygulamalar, Kablosuz kapalı olduğunda dahi yakınlardaki ağları tarayabilir. Bunu istemiyorsanız, Gelişmiş &gt; Tarama her zaman kullanılabilir seçeneğine gidin."</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Uygulamalar, Kablosuz bağlantı kapalı olduğunda dahi yakınlardaki ağları tarayabilir. Bunu istemiyorsanız, Gelişmiş &gt; Tarama her zaman kullanılabilir seçeneğine gidin."</string>
@@ -629,6 +625,7 @@
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Tara"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Gelişmiş"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Ağa bağlan"</string>
+    <string name="wifi_menu_remember" msgid="8814185749388713796">"Ağı hatırla"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Ağı unut"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Ağı değiştir"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"NFC etiketine yaz"</string>
@@ -673,9 +670,11 @@
     <string name="wifi_unspecified" msgid="5431501214192991253">"(belirtilmemiş)"</string>
     <string name="wifi_remembered" msgid="4955746899347821096">"Kaydedildi"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"Devre dışı"</string>
-    <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Kötü İnternet bağlantısından kaçınıldı"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP Yapılandırması Hatası"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Kablosuz Bağlantı Hatası"</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Kimlik doğrulama sorunu"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Kapsama alanı dışında"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"İnternet Erişimi algılanmadı, otomatik olarak tekrar bağlanmayacak."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS kullanılabilir"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS kullanılabilir)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Ağ şifrenizi girin"</string>
@@ -699,9 +698,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"UYARI: Kablosuz bağlantıyı atlarsanız tabletiniz ilk indirme ve güncelleme işlemleri için yalnızca hücresel verileri kullanır. Olası veri ücretlerinden kaçınmak için Kablosuz ağa bağlanın."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"UYARI: Kablosuz bağlantıyı atlarsanız cihazınız ilk indirme ve güncelleme işlemleri için yalnızca hücresel verileri kullanır. Olası veri ücretlerinden kaçınmak için Kablosuz ağa bağlanın."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"UYARI: Kablosuz bağlantıyı atlarsanız telefonunuz ilk indirme ve güncelleme işlemleri için yalnızca hücresel verileri kullanır. Olası veri ücretlerinden kaçınmak için Kablosuz ağa bağlanın."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="2393880108322835846">"UYARI: Kablosuz bağlantıyı atlarsanız, tabletinizin ilk indirme ve güncelleme işlemleri için kullanabileceği bir İnternet bağlantısı olmaz."</string>
-    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1707391993265558787">"UYARI: Kablosuz bağlantıyı atlarsanız cihazınızın ilk indirme veya güncelleme işlemleri için kullanabileceği bir İnternet bağlantısı olmaz."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="1556858507920033022">"UYARI: Kablosuz bağlantıyı atlarsanız telefonunuzun ilk indirme ve güncelleme işlemleri için kullanabileceği bir İnternet bağlantısı olmaz."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Kablosuz\'u atlarsanız:\n\nTabletinizin İnternet bağlantısı olmaz.\n\nİnternet\'e bağlanana kadar yazılım güncellemeleri almazsınız.\n\nBu sırada cihaz koruma özelliklerini etkinleştiremezsiniz."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Kablosuz\'u atlarsanız:\n\nCihazınızın İnternet bağlantısı olmaz.\n\nİnternet\'e bağlanana kadar yazılım güncellemeleri almazsınız.\n\nBu sırada cihaz koruma özelliklerini etkinleştiremezsiniz."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Kablosuz\'u atlarsanız:\n\nTelefonunuzun İnternet bağlantısı olmaz.\n\nİnternet\'e bağlanana kadar yazılım güncellemeleri almazsınız.\n\nBu arada cihaz koruma özelliklerini etkinleştiremezsiniz."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Tablet bu Kablosuz ağa bağlanamadı."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"Cihaz bu Kablosuz ağa bağlanamadı."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Telefon bu Kablosuz ağa bağlanamadı."</string>
@@ -761,7 +760,6 @@
     <string name="ring_volume_title" msgid="7938706566797464165">"Zil sesi düzeyi"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Sessizken titret"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Varsayılan bildirim sesi"</string>
-    <string name="heads_up_enabled_title" msgid="1031078221910921622">"Yüksek öncelikliyse pop-up kullan"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Zil sesi"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Bildirim"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Bildirimlerde gelen çağrı ses düzeyini kullan"</string>
@@ -834,7 +832,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Otomatik parlaklık"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Kaldırarak uyandır"</string>
     <string name="doze_title" msgid="2259176504273878294">"Ortam ekranı"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"Cihaz ele alındığında ya da bildirim geldiğinde ekranı uyandır"</string>
+    <string name="doze_summary" msgid="7128970177894383698">"Cihazı elime aldığımda veya bildirim geldiğinde ekranı uyandır"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Yazı tipi boyutu"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Yazı tipi boyutu"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM kart kilit ayarları"</string>
@@ -862,6 +860,10 @@
     <string name="sim_enter_cancel" msgid="6240422158517208036">"İptal"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"Birden çok SIM bulundu"</string>
     <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>
+    <string name="sim_preferred_title" msgid="5567909634636045268">"Tercih edilen SIM kart güncellensin mi?"</string>
+    <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g>, cihazınızdaki tek SIM karttır. Hücresel veriler, çağrılar ve SMS iletileri için bu SIM kartı kullanmak ister misiniz?"</string>
     <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>
@@ -1012,6 +1014,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Bu işlem tablet bilgisayarınızın "<b>"dahili depolama alanından"</b>"şu verilerin tümünü siler:\n\n"<li>"Google hesabınız"</li>\n<li>"Sistem ve uygulama verileri ile ayarları"</li>\n<li>"İndirilen uygulamalar"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Bu işlem, telefonunuzun "<b>"dahili depolama alanından"</b>" şu verilerin tümünü siler:\n\n"<li>"Google hesabınız"</li>\n<li>"Sistem ve uygulama verileri ile ayarları"</li>\n<li>"İndirilen uygulamalar"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Şu anda aşağıdaki hesaplarda oturum açmış durumdasınız:\n"</string>
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Bu cihazda başka kullanıcılar da var.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Müzik"</li>\n<li>"Fotoğraflar"</li>\n<li>"Diğer kullanıcı verileri"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Müzik, resimler ve diğer kullanıcı verilerinin temizlenmesi için "<b>"USB belleğin"</b>" silinmesi gerekir."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Müzik, resimler ve diğer kullanıcı verilerinin temizlenmesi için "<b>"SD kartın"</b>" silinmesi gerekir."</string>
@@ -1023,7 +1026,6 @@
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Telefonu sıfırla"</string>
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Tüm kişisel bilgilerinizi ve indirilen tüm uygulamaları silmek istiyor musunuz? Bu işlem geri döndürülemez!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Her şeyi sil"</string>
-    <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Kilit açma deseninizi çizin"</string>
     <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Fabrika verilerine sıfırlamayı onaylamak için kilit açma deseninizi çizmeniz gerekir."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Sistem Temizleme hizmeti kullanılamadığından sıfırlama yapılmadı."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Sıfırlansın mı?"</string>
@@ -1041,7 +1043,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"USB bellek silinsin mi? Depolama biriminde saklanan tüm dosyalar silinir. Bu işlemi geri alamazsınız!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"SD kart silinsin mi? Burada saklanan tüm dosyalar silinir. Geri alınamaz!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Her şeyi sil"</string>
-    <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Kilit açma deseninizi çizin"</string>
     <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"USB belleği silmek istediğinizi onaylamak için kilit açma deseninizi çizmeniz gerekir."</string>
     <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"SD kartı silmek istediğinizi onaylamak için kilit açma deseninizi çizmeniz gerekir."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Çağrı ayarları"</string>
@@ -1087,6 +1088,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Lütfen SIM kartı takın ve yeniden başlatın"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Lütfen İnternet\'e bağlanın"</string>
     <string name="location_title" msgid="1029961368397484576">"Konumum"</string>
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"İş profili"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"İş profili konumu"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Firmanız tarafından kapatıldı"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Mod"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Yüksek doğruluk"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Pil tasarrufu"</string>
@@ -1124,6 +1128,7 @@
     <string name="copyright_title" msgid="865906688917260647">"Telif Hakkı"</string>
     <string name="license_title" msgid="1990487604356037871">"Lisans"</string>
     <string name="terms_title" msgid="7697580845616764642">"Şartlar ve koşullar"</string>
+    <string name="webview_license_title" msgid="2813507464175738967">"Sistem WebView Lisansı"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Duvar kağıtları"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Uydu görüntüleri sağlayıcıları:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Açık kaynak lisansları"</string>
@@ -1237,7 +1242,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB bellek"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"SD kartta"</string>
     <string name="disabled" msgid="9206776641295849915">"Devre dışı"</string>
-    <string name="not_installed" msgid="1475144352069281880">"Yüklü değil"</string>
+    <string name="not_installed" msgid="2797554494953450291">"Bu kullanıcı için yüklü değil"</string>
     <string name="no_applications" msgid="7336588977497084921">"Uygulama yok"</string>
     <string name="internal_storage" msgid="1584700623164275282">"Dahili Bellek"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB bellek"</string>
@@ -1434,8 +1439,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Şarj edilirken ekran hiçbir zaman uykuya geçmez"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Bluetooth HCI araştırmayı etkinleştir"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Bir dosyadaki tüm Bluetooth HCI paketlerini yakala"</string>
-    <string name="oem_unlock_enable" msgid="6629321276287913315">"OEM kilidini açma etkin"</string>
-    <string name="oem_unlock_enable_summary" msgid="3546686263996628110">"Cihazın OEM kilidinin açılmasına izin ver"</string>
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM kilit açma"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Önyükleyicinin kilidinin açılmasına izin ver"</string>
+    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"PIN kodunuzu girin"</string>
+    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"OEM kilit açma özelliğini etkinleştirmek için cihazınızın PIN kodunu girin."</string>
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"OEM kilit açmaya izin verilsin mi?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"UYARI: Bu ayar açıkken cihaz koruma özellikleri bu cihazda çalışmayacaktır."</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Kablosuz ekran sertifikası"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Kablosuz Ayrıntılı Günlük Kaydını etkinleştir"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Kablosuz\'dan Hücresel Ağa agresif geçiş"</string>
@@ -1491,7 +1500,7 @@
     <string name="accessibility_display_title" msgid="7610175687949675162">"Ekran"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"Altyazılar"</string>
     <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Büyüteç hareketleri"</string>
-    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Bu özellik açıldığında ekrana üç kez hafifçe vurarak görüntüyü yakınlaştırabilir ve uzaklaştırabilirsiniz.\n\nYakınlaştırdığınızda şunları yapabilirsiniz\n"<ul><li>"Kaydırma: İki veya daha fazla parmağınızı ekranda sürükleyin."</li>\n<li>"Yakınlaştırrma düzeyini ayarlama: İki veya daha fazla parmağınızı birbirine yaklaştırın veya uzaklaştırın."</li></ul>\n\n"Ayrıca, üç kez hafifçe vurup parmağınızı basılı tutarak parmağınızın altındakini geçici olarak büyütebilirsiniz. Önceki duruma dönmek için parmağınızı kaldırın.\n\nNot: Üç kez hafifçe vurarak büyütme özelliği klavye ve gezinme çubuğu hariç her yerde kullanılabilir."</string>
+    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Bu özellik açıldığında ekrana üç kez hafifçe dokunarak görüntüyü yakınlaştırabilir ve uzaklaştırabilirsiniz.\n\nYakınlaştırdığınızda şunları yapabilirsiniz\n"<ul><li>"Kaydırma: İki veya daha fazla parmağınızı ekranda sürükleyin."</li>\n<li>"Yakınlaştırrma düzeyini ayarlama: İki veya daha fazla parmağınızı birbirine yaklaştırın veya uzaklaştırın."</li></ul>\n\n"Ayrıca, üç kez hafifçe vurup parmağınızı basılı tutarak parmağınızın altındakini geçici olarak büyütebilirsiniz. Önceki duruma dönmek için parmağınızı kaldırın.\n\nNot: Üç kez hafifçe dokunarak büyütme özelliği klavye ve gezinme çubuğu hariç her yerde kullanılabilir."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Erişilebilirlik kısayolu"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Açık"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Kapalı"</string>
@@ -1538,6 +1547,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"Altyazılar şöyle görünecek"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"Varsayılan"</string>
+    <string name="color_title" msgid="4258931051732243983">"Renk"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"Varsayılan"</string>
     <string name="color_none" msgid="3475640044925814795">"Hiçbiri"</string>
     <string name="color_white" msgid="8045195170201590239">"Beyaz"</string>
@@ -1595,12 +1605,12 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"<xliff:g id="REMAIN">%1$s</xliff:g> kaldı"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"Şarj olmasına <xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> var"</string>
-    <string name="power_discharging_duration" msgid="7125493014448497620">"%%<xliff:g id="LEVEL">%1$d</xliff:g> - yaklaşık <xliff:g id="TIME">%2$s</xliff:g> kaldı"</string>
-    <string name="power_charging" msgid="712751285832976915">"%%<xliff:g id="LEVEL">%1$d</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration" msgid="4802183864773082009">"%%<xliff:g id="LEVEL">%1$d</xliff:g> - Tamamen şarj olmasına <xliff:g id="TIME">%2$s</xliff:g> kaldı"</string>
-    <string name="power_charging_duration_ac" msgid="3611179931297824699">"%%<xliff:g id="LEVEL">%1$d</xliff:g> - AC\'de tamamen şarj olmasına <xliff:g id="TIME">%2$s</xliff:g> kaldı"</string>
-    <string name="power_charging_duration_usb" msgid="1106605348913397583">"%%<xliff:g id="LEVEL">%1$d</xliff:g> - USB\'den tamamen şarj olmasına <xliff:g id="TIME">%2$s</xliff:g> kaldı"</string>
-    <string name="power_charging_duration_wireless" msgid="633606920144617227">"%%<xliff:g id="LEVEL">%1$d</xliff:g> - kablosuzdan tamamen şarj olmasına <xliff:g id="TIME">%2$s</xliff:g> kaldı"</string>
+    <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> - yaklaşık <xliff:g id="TIME">%2$s</xliff:g> kaldı"</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> - tam şarj olmasına <xliff:g id="TIME">%2$s</xliff:g> var"</string>
+    <string name="power_charging_duration_ac" msgid="3969186192576594254">"<xliff:g id="LEVEL">%1$s</xliff:g> - prize takılı, tam şarj olmasına <xliff:g id="TIME">%2$s</xliff:g> var"</string>
+    <string name="power_charging_duration_usb" msgid="182405645340976546">"<xliff:g id="LEVEL">%1$s</xliff:g> - USB üzerinden şarj olmasına <xliff:g id="TIME">%2$s</xliff:g> var"</string>
+    <string name="power_charging_duration_wireless" msgid="1829295708243159464">"<xliff:g id="LEVEL">%1$s</xliff:g> - kablosuzdan tam şarj olmasına <xliff:g id="TIME">%2$s</xliff:g> var"</string>
     <string name="power_usage_list_summary" msgid="2409288197839512482">"Tamamen şarj olduktan sonra kullanım"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Fişten çekildikten sonra pil kullanımı"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Sıfırlamadan itibaren pil kullanımı"</string>
@@ -1617,7 +1627,6 @@
     <string name="awake" msgid="387122265874485088">"Cihazın açılma zamanı"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Zamanında Kablosuz"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Zamanında Kablosuz"</string>
-    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Geçmiş ayrıntıları"</string>
     <string name="details_title" msgid="3792801565213935385">"Ayrıntıları kullan"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Ayrıntıları kullan"</string>
@@ -1689,7 +1698,7 @@
     <string name="battery_saver" msgid="1426682272004907982">"Pil tasarrufu"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Otomatik olarak aç"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Hiçbir zaman"</string>
-    <string name="battery_saver_turn_on_automatically_pct" msgid="3033681629861428940">"%%%1$d pil gücü"</string>
+    <string name="battery_saver_turn_on_automatically_pct" msgid="7536784431655058267">"pil kullanıyor (%1$s)"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"İşlem İstatistikleri"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Meraklısı için, çalışan işlemlerle ilgili istatistikler"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Bellek kullanımı"</string>
@@ -1813,7 +1822,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Donanım destekli"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Yalnızca yazılım"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"Bu kullanıcı için kimlik bilgileri kullanılamıyor"</string>
-    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Kilit açma deseninizi çizin"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Kimlik bilgisi yüklemesini onaylamak için kilit açma desenini çizmeniz gerekiyor."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Kimlik bilgileri deposu için şifreyi yazın."</string>
@@ -1843,6 +1851,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"Uygulama verilerini dahil et"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Otomatik geri yükle"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Bir uygulama yeniden yüklendiğinde, yedeklenen ayarları ve diğer verileri geri yükle"</string>
+    <string name="backup_inactive_title" msgid="5355557151569037197">"Yedekleme hizmeti etkin değil."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"Bu, cihaz politikanız tarafından ayarlanır."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Masaüstü yedekleme şifresi"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Masaüstü tam yedeklemeleri şu an korunmuyor"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Masaüstü tam yedeklemelerinin şifresini değiştirmek veya kaldırmak için dokunun"</string>
@@ -1952,7 +1962,11 @@
     <string name="enter_password" msgid="8035706727471334122">"Android\'i başlatmak için şifrenizi girin"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Android\'i başlatmak için PIN\'inizi girin"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Android\'i başlatmak için deseninizi çizin"</string>
-    <string name="try_again" msgid="4272075051293936921">"Tekrar deneyin."</string>
+    <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"Yanlış Desen"</string>
+    <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"Yanlış Şifre"</string>
+    <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"Yanlış PIN"</string>
+    <string name="checking_decryption" msgid="8287458611802609493">"Kontrol ediliyor…"</string>
+    <string name="starting_android" msgid="8581493237458496835">"Android başlatılıyor"</string>
     <string name="delete" msgid="4219243412325163003">"Sil"</string>
     <string name="misc_files" msgid="6720680815969643497">"Çeşitli dosyalar"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"toplam <xliff:g id="TOTAL">%2$d</xliff:g> dosyadan <xliff:g id="NUMBER">%1$d</xliff:g> tanesi seçildi"</string>
@@ -1990,8 +2004,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Ekran oluştururken her zaman GPU\'yu kullan"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"Renk uzayını simüle et"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"OpenGL izlerini etkinleştir"</string>
-    <string name="use_nuplayer" msgid="5699257393367904387">"NuPlayer\'ı kullan (deneysel)"</string>
-    <string name="use_nuplayer_summary" msgid="1991479067478516714">"AwesomePlayer yerine NuPlayer\'ı kullan"</string>
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"AwesomePlayer\'ı kullan (kullanımdan kaldırıldı)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"Çoğu medya oynatma işleminde NuPlayer yerine AwesomePlayer\'ı kullan"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"USB ses yönlendirmesini kapat"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"USB ses çevre birimlerine otomatik yönlendirmeyi kapat"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Düzen sınırlarını göster"</string>
@@ -2167,7 +2181,6 @@
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Kullanıcı veya profil ekle"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Kullanıcı ekle"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Kısıtlı profil"</string>
-    <string name="user_summary_managed_profile" msgid="7369539529693048111">"İş profili"</string>
     <string name="user_need_lock_message" msgid="2596365678651842785">"Kısıtlanmış bir profil oluşturabilmeniz için uygulamalarınızı ve kişisel verilerinizi korumak üzere bir ekran kilidi oluşturmanız gerekir."</string>
     <string name="user_set_lock_button" msgid="8311219392856626841">"Kilidi ayarla"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Yapılandırılmadı"</string>
@@ -2298,11 +2311,13 @@
     <string name="sim_cellular_data_unavailable_summary" msgid="3654805961942166428">"Bir veri SIM\'i seçmek için dokunun"</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"Çağrılar için her zaman bunu kullan"</string>
     <string name="select_sim_for_data" msgid="2366081042162853044">"Veri için bir SIM kart seçin"</string>
+    <string name="data_switch_started" msgid="2040761479817166311">"Veri için kullanılan SIM kart değiştiriliyor. Bu işlem bir dakika kadar sürebilir..."</string>
     <string name="select_sim_for_calls" msgid="3503094771801109334">"Telefon etmek için şu SIM kartı kullan:"</string>
     <string name="sim_select_card" msgid="211285163525563293">"Bir SIM kart seçin"</string>
     <string name="sim_card_number_title" msgid="7845379943474336488">"SIM: <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"SIM boş"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"SIM kart adı"</string>
+    <string name="sim_name_hint" msgid="7038643345238968930">"SIM adı girin"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"SIM yuvası %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Operatör"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Numara"</string>
@@ -2312,7 +2327,6 @@
     <string name="color_purple" msgid="3888532466427762504">"Mor"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"SIM kart takılı değil"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"SIM durumu"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"SIM ile ilgili bilgiler"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"Varsayılan SIM\'den geri ara"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"Giden çağrılar için SIM"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Diğer çağrı ayarları"</string>
@@ -2320,8 +2334,11 @@
     <string name="preferred_network_offload_header" msgid="2321173571529106767">"Ağ Adı Yayınını Devre Dışı Bırak"</string>
     <string name="preferred_network_offload_footer" msgid="5857279426054744020">"Ağ Adı Yayınını Devre Dışı Bırak seçeneği, üçüncü tarafların ağ bilgilerinize erişmesini engeller."</string>
     <string name="preferred_network_offload_popup" msgid="2252915199889604600">"Ağ Adı Yayınının Devre Dışı Bırakılması, gizli ağlara otomatik olarak bağlanmayı engeller."</string>
+    <string name="sim_signal_strength" msgid="9144010043784767984">"<xliff:g id="DBM">%1$d</xliff:g> dBm <xliff:g id="ASU">%2$d</xliff:g> asu"</string>
+    <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>
+    <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Her zaman sor"</string>
     <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>
@@ -2330,22 +2347,22 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Son aramalar"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Sonuçlar"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi kablosuz ağ bağlantısı"</string>
-    <string name="keywords_more_default_sms_app" msgid="2744404159003574745">"kısa mesaj"</string>
-    <string name="keywords_more_mobile_networks" msgid="7813380887358745769">"hücresel hücre operatör kablosuz"</string>
+    <string name="keywords_more_default_sms_app" msgid="895656981962034647">"kısa mesaj yazma mesajlar mesajlaşma"</string>
+    <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"hücresel hücre operatör kablosuz veri 4g 3g 2g lte"</string>
     <string name="keywords_home" msgid="3626170808219458848">"başlatıcı"</string>
     <string name="keywords_display" msgid="6709007669501628320">"ekran dokunmatik ekran"</string>
-    <string name="keywords_display_brightness_level" msgid="8636451602230815191">"ekranı dokunmatik ekranı karartma"</string>
-    <string name="keywords_display_auto_brightness" msgid="8070218600502753102">"ekranı dokunmatik ekranı karartma"</string>
-    <string name="keywords_display_wallpaper" msgid="4315466287469834939">"arka plan"</string>
+    <string name="keywords_display_brightness_level" msgid="8923289340474728990">"karartma ekran dokunmatik ekran pil"</string>
+    <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"karartma ekran dokunmatik ekran pil"</string>
+    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"arka plan kişiselleştirme özelleştirme ekran"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"metin boyutu"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"proje"</string>
-    <string name="keywords_storage" msgid="7007275853993419928">"alan disk sabit sürücü"</string>
-    <string name="keywords_battery" msgid="3992479295298655138">"güç"</string>
-    <string name="keywords_spell_checker" msgid="4509482591225399210">"yazım"</string>
+    <string name="keywords_storage" msgid="6572905220031852173">"alan disk sabit sürücü cihaz kullanım"</string>
+    <string name="keywords_battery" msgid="2096185085932675704">"güç kullanım şarj"</string>
+    <string name="keywords_spell_checker" msgid="6106749039734174140">"yazım sözlük yazım denetimi otomatik düzeltme"</string>
     <string name="keywords_voice_input" msgid="3519547605812413860">"tanıyıcı giriş konuşma söyleme dil eller serbest el serbest tanıma rahatsız edici kelime ses geçmiş bluetooth mikrofonlu kulaklık"</string>
-    <string name="keywords_text_to_speech_output" msgid="8207889472282225512">"kullanıcı oyu dil varsayılan konuşun konuşma"</string>
-    <string name="keywords_date_and_time" msgid="7666950126499155141">"saat"</string>
-    <string name="keywords_factory_data_reset" msgid="3693730656843989732">"temizleme silme"</string>
+    <string name="keywords_text_to_speech_output" msgid="392447904221657930">"hız dil varsayılan konuş konuşma tts erişilebilirlik okuyucu görme özürlü"</string>
+    <string name="keywords_date_and_time" msgid="2631808108134830066">"24 saatlik biçim"</string>
+    <string name="keywords_factory_data_reset" msgid="4355133848707691977">"temizleme silme geri yükleme kaldırma"</string>
     <string name="keywords_printing" msgid="1701778563617114846">"yazıcı"</string>
     <string name="keywords_sounds_and_notifications" msgid="5965996187974887000">"hoparlör bip"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="2912933812460077912">"yapmayın rahatsız etmeyin kesme kesinti kopma"</string>
@@ -2354,11 +2371,11 @@
     <string name="keywords_location_mode" msgid="8584992704568356084">"doğruluk"</string>
     <string name="keywords_accounts" msgid="1957925565953357627">"hesap"</string>
     <string name="keywords_users" msgid="4673901601478559100">"kısıtlama kısıtla kısıtlı"</string>
-    <string name="keywords_keyboard_and_ime" msgid="1103378692379215672">"metin düzeltme düzeltme ses titreşim otomatik dil hareket önerme öneri tema rahatsız edici kelime tür emoji"</string>
+    <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"metin düzeltme düzelt ses titreşim otomatik dil hareket öner öneri tema rahatsız edici kelime türü emoji uluslararası"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"kaydırma şifre desen pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Kablosuz NFC Etiketini ayarla"</string>
     <string name="write_tag" msgid="8571858602896222537">"Yaz"</string>
-    <string name="status_awaiting_tap" msgid="2130145523773160617">"Yazmak için bir etikete hafifçe vurun..."</string>
+    <string name="status_awaiting_tap" msgid="2130145523773160617">"Yazmak için bir etikete hafifçe dokunun..."</string>
     <string name="status_invalid_password" msgid="2575271864572897406">"Geçersiz şifre. Tekrar deneyin."</string>
     <string name="status_write_success" msgid="5228419086308251169">"Başarıyla yazıldı!"</string>
     <string name="status_failed_to_write" msgid="8072752734686294718">"NFC etiketine veri yazılamıyor. Sorun devam ederse başka bir etiket deneyin"</string>
@@ -2371,7 +2388,6 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Bildirim sesi düzeyi"</string>
     <string name="zen_mode_settings_title" msgid="7014915558669122902">"Kesintiler"</string>
     <string name="zen_mode_option_title" msgid="5061978632306007914">"Çağrı ve bildirim geldiğinde"</string>
-    <string name="zen_mode_option_title_novoice" msgid="6680706009915204785">"Bildirim geldiğinde"</string>
     <string name="zen_mode_option_off" msgid="3167702608910820883">"Her zaman kes"</string>
     <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Sadece öncelikli kesintilere izin ver"</string>
     <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Kesme"</string>
@@ -2429,14 +2445,17 @@
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Tamam"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Siz bunu kapatana kadar"</string>
     <string name="zen_mode_important_category" msgid="8123274463331022993">"Öncelikli kesintiler"</string>
-    <string name="zen_mode_downtime_category" msgid="4730179065426038108">"Kapalı kalma süresi (sadece öncelikli kesintiler)"</string>
+    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Kesinti"</string>
     <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Gün"</string>
     <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Yok"</string>
+    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Kesintilere izin verilir"</string>
+    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Yalnızca öncelikli"</string>
+    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Yok"</string>
     <string name="zen_mode_automation_category" msgid="4653551005950835761">"Otomasyon"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Otomatik olarak aç"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Hiçbir zaman"</string>
-    <string name="zen_mode_phone_calls" msgid="8956214416859303966">"Çağrılar"</string>
+    <string name="zen_mode_calls" msgid="7051492091133751208">"Çağrılar"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"İletiler"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Şuradan çağrılar/iletiler"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Herkes"</string>
@@ -2450,7 +2469,9 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Hafta içi her gece"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Başlangıç zamanı"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Bitiş zamanı"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g>, sonraki gün"</string>
+    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"Ertesi gün <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> veya öncesinde herhangi bir alarm"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"Ertesi gün saat <xliff:g id="FORMATTED_TIME">%s</xliff:g> veya öncesinde herhangi bir alarm"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Uygulama bildirimleri"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Bildirim ayarları"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Bu cihazla ilgili geri bildirim gönder"</string>
@@ -2458,7 +2479,11 @@
     <string name="switch_on_text" msgid="1124106706920572386">"Açık"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Kapalı"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"Ekran sabitleme"</string>
-    <string name="screen_pinning_description" msgid="7091642350452605379">"Açıldığında, geçerli ekranın görüntülenmeye devam etmesini sağlamak için ekran sabitleme özelliğini kullanabilirsiniz.\n\nEkran sabitleme özelliğini kullanmak için:\n\n1. Ekran sabitleme özelliğinin açık olduğundan emin olun.\n\n2. Sabitlemek istediğiniz ekranı açın.\n\n3. Genel Bakış\'a dokunun.\n\n4. Raptiye simgesine dokunun."</string>
+    <string name="screen_pinning_description" msgid="1137904524037468263">"Bu ayar açıkken, geçerli ekranın sabitlemesi kaldırılana kadar görünmesi için ekran sabitlemeyi kullanabilirsiniz.\n\nSabitlemeyi kullanmak için:\n\n1. Ekran sabitlemenin açık olduğundan emin olun.\n\n2. Sabitlemek istediğiniz ekranı açın.\n\n3. Genel Bakış\'a dokunun.\n\n4. Hızlıca yukarı kaydırın ve raptiyeye dokunun."</string>
+    <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Sabitlemeyi kaldırmadan önce kilit açma desenini sor"</string>
+    <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Sabitlemeyi kaldırmadan önce PIN\'i sor"</string>
+    <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Sabitlemeyi kaldırmadan önce şifre sor"</string>
+    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Sabitlemeyi kaldırırken cihazı kilitle"</string>
     <string name="managed_user_title" msgid="8101244883654409696">"İş profili"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Deneysel)"</string>
     <string name="display_auto_rotate_title" msgid="6176450657107806043">"Cihaz döndürüldüğünde"</string>
@@ -2467,7 +2492,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Yatay görünümde kal"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Geçerli yönde kal"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI bilgileri"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI göreli bilgileri"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Şifreleme"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Devam"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"Başlatılmadan önce PIN\'inizin girilmesini isteyerek bu cihazı daha ileri düzeyde koruyabilirsiniz. Cihaz başlayana kadar çağrılar, iletiler veya bildirimler alınamaz. \n\nBu tedbir, kaybedilen veya çalınan cihazlardaki verileri korumaya yardımcı olur."</string>
@@ -2485,4 +2509,7 @@
     <string name="encrypt_talkback_dialog_message_pin" msgid="1890374082842868489">"Bu cihazı başlatmak için PIN\'inizi girdiğinizde <xliff:g id="SERVICE">%1$s</xliff:g> gibi erişilebilirlik hizmetleri henüz kullanılabilir olmayacaktır."</string>
     <string name="encrypt_talkback_dialog_message_pattern" msgid="4474332516537386384">"Bu cihazı başlatmak için deseninizi girdiğinizde <xliff:g id="SERVICE">%1$s</xliff:g> gibi erişilebilirlik hizmetleri henüz kullanılabilir olmayacaktır."</string>
     <string name="encrypt_talkback_dialog_message_password" msgid="8166099418487083927">"Bu cihazı başlatmak için şifrenizi girdiğinizde <xliff:g id="SERVICE">%1$s</xliff:g> gibi erişilebilirlik hizmetleri henüz kullanılabilir olmayacaktır."</string>
+    <string name="imei_information_title" msgid="8499085421609752290">"IMEI bilgileri"</string>
+    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI göreli bilgileri"</string>
+    <string name="slot_number" msgid="3762676044904653577">"(Yuva<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-uk/arrays.xml b/res/values-uk/arrays.xml
index 7798cce..b32c0ac 100644
--- a/res/values-uk/arrays.xml
+++ b/res/values-uk/arrays.xml
@@ -527,4 +527,12 @@
     <item msgid="4338089220026248848">"Кеш (дії клієнта)"</item>
     <item msgid="6652164677254579050">"Кеш (порожньо)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Бірюзовий"</item>
+    <item msgid="8332294763632946560">"Синій"</item>
+    <item msgid="2023216417616991392">"Індиго"</item>
+    <item msgid="3170497246594232819">"Пурпуровий"</item>
+    <item msgid="4608643045752965568">"Рожевий"</item>
+    <item msgid="6131821495505931173">"Червоний"</item>
+  </string-array>
 </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index a552554..7d907bf 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>
@@ -180,7 +180,6 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s хоче отримати доступ до ваших повідомлень. Надати %2$s доступ?"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Дата й час"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Вибрати часовий пояс"</string>
-    <string name="normal_date_format" msgid="7636406984925498359">"Регіональний (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Перегляд:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Розм. шрифту:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -291,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>
@@ -322,8 +321,6 @@
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Вибір час. поясу"</string>
     <string name="date_time_set_date_title" msgid="6928286765325608604">"Дата"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"Дата"</string>
-    <string name="date_time_date_format_title" msgid="3976171711988766411">"Формат дати"</string>
-    <string name="date_time_date_format" msgid="6951498879879281102">"Вибрати формат дати"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Сортувати за алфавітом"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Сорт. за час. поясом"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Дата"</string>
@@ -372,7 +369,8 @@
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Зачекайте, поки ваш телефон зашифрується. Виконано <xliff:g id="PERCENT">^1</xliff:g>%."</string>
     <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Зачекайте, поки ваш планшет буде зашифровано. Залишилося часу: <xliff:g id="DURATION">^1</xliff:g>"</string>
     <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Зачекайте, поки ваш телефон буде зашифровано. Залишилося часу: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Спробуйте ще через <xliff:g id="DELAY">^1</xliff:g> сек."</string>
+    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"Щоб розблокувати планшет, вимкніть його, а потім знову ввімкніть."</string>
+    <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"Щоб розблокувати телефон, вимкніть його, а потім знову ввімкніть."</string>
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"Застереження. Після кількох невдалих спроб (<xliff:g id="COUNT">^1</xliff:g>) розблокувати пристрій із нього буде стерто всі дані."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Введіть пароль"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Шифрування не виконано"</string>
@@ -401,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>
@@ -412,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>
@@ -556,13 +556,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Як пристр.гучн.зв’язку"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Для музики та медіа"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Запам\'ятати налашт."</string>
-    <string name="wifi_assistant_intro_setup" msgid="4605105515416995110">"Представляємо\nWi‑Fi Assistant"</string>
-    <string name="wifi_assistant_no_thanks" msgid="2776983751990143934">"НІ, ДЯКУЮ"</string>
-    <string name="wifi_assistant_setup" msgid="3772423650475730906">"НАЛАШТУВАТИ"</string>
-    <string name="wifi_assistant_card_message" msgid="107811647784658536">"Автоматично під‘єднуйтеся до доступних мереж за допомогою Wi‑Fi Assistant."</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi‑Fi Assistant"</string>
-    <string name="wifi_assistant_title_message" msgid="6240721017579074015">"<xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> автоматично під’єднує ваш пристрій до найкращої доступної мережі Wi-Fi"</string>
-    <string name="wifi_assistant_open_app" msgid="4803044899535675063">"ВІДКРИТИ ДОДАТОК"</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>
@@ -592,7 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Налаштування Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Налашт. і керуйте бездрот. точками доступу"</string>
-    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Вибрати Wi‑Fi"</string>
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Виберіть мережу Wi-Fi"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Вибрати Wi‑Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Увімкнення Wi‑Fi…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Вимкнення Wi‑Fi…"</string>
@@ -607,8 +602,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"Сканування завжди доступне"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Завжди дозволяти сканування"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Дозволити службі локації Google та іншим додаткам сканувати мережі, навіть якщо Wi-Fi вимкнено"</string>
-    <string name="wifi_automatically_manage_title" msgid="6249976570008992746">"Автоматично керувати Wi‑Fi"</string>
-    <string name="wifi_automatically_manage_summary" msgid="6952470763378312488">"Дозволити додатку <xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> керувати вашим з’єднанням Wi‑Fi"</string>
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Під’єднуватися до відкритих мереж Wi-Fi"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Дозволити Wi‑Fi Assistant автоматично під’єднуватися до відкритих мереж із потужним сигналом"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Вибрати помічника"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Установити сертифікати"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Щоб покращити точність даних про місцезнаходження, а також для інших цілей Google та інші програми можуть шукати мережі поблизу, навіть якщо Wi-Fi вимкнено. Щоб скасувати цей дозвіл, перейдіть у меню Розширені &gt; Сканування завжди доступне."</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Програми можуть шукати мережі поблизу, навіть якщо Wi-Fi вимкнено. Щоб скасувати цей дозвіл, перейдіть у меню Розширені &gt; Сканування завжди доступне."</string>
@@ -629,6 +625,7 @@
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Сканув."</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Додатково"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Підключ. до мережі"</string>
+    <string name="wifi_menu_remember" msgid="8814185749388713796">"Зберегти мережу"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Видалити мережу"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Змінити мережу"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Записати дані в NFC-тег"</string>
@@ -673,9 +670,11 @@
     <string name="wifi_unspecified" msgid="5431501214192991253">"(не вказано)"</string>
     <string name="wifi_remembered" msgid="4955746899347821096">"Збережено"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"Вимкнено"</string>
-    <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Слабке з’єднання з Інтернетом не встановлено"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"Помилка конфігурації IP-адреси"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Помилка з’єднання Wi-Fi"</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Проблема з автентифікацією"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Не в діапазоні"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Немає доступу до Інтернету. Спроба під’єднання не здійснюватиметься автоматично."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"Є доступ до WPS"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" Є доступ до WPS"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Введіть пароль своєї мережі"</string>
@@ -699,9 +698,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"ЗАСТЕРЕЖЕННЯ. Якщо вимкнути Wi‑Fi, планшет використовуватиме лише мобільну мережу для початкових завантажень і оновлень. Щоб уникнути можливого стягнення плати, під’єднайтеся до Wi‑Fi."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"ЗАСТЕРЕЖЕННЯ. Якщо вимкнути Wi‑Fi, пристрій використовуватиме лише мобільну мережу для початкових завантажень і оновлень. Щоб уникнути можливого стягнення плати, під’єднайтеся до Wi‑Fi."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"ЗАСТЕРЕЖЕННЯ. Якщо вимкнути Wi‑Fi, телефон використовуватиме лише мобільну мережу для початкових завантажень і оновлень. Щоб уникнути можливого стягнення плати, під’єднайтеся до Wi‑Fi."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="2393880108322835846">"ЗАСТЕРЕЖЕННЯ. Якщо вимкнути Wi‑Fi, планшет не матиме з’єднання з Інтернетом для початкових завантажень або оновлень."</string>
-    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1707391993265558787">"ЗАСТЕРЕЖЕННЯ. Якщо вимкнути Wi‑Fi, пристрій не матиме з’єднання з Інтернетом для початкових завантажень або оновлень."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="1556858507920033022">"ЗАСТЕРЕЖЕННЯ. Якщо вимкнути Wi‑Fi, телефон не матиме з’єднання з Інтернетом для початкових завантажень або оновлень."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Якщо вимкнути Wi‑Fi:\n\nваш планшет не матиме з’єднання з Інтернетом;\n\nви не отримуватимете оновлення програмного забезпечення, доки не під’єднаєтеся до Інтернету;\n\nви не зможете активувати функції захисту пристрою."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Якщо вимкнути Wi‑Fi:\n\nваш пристрій не матиме з’єднання з Інтернетом;\n\nви не отримуватимете оновлення програмного забезпечення, доки не під’єднаєтеся до Інтернету;\n\nви не зможете активувати функції захисту пристрою."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Якщо вимкнути Wi‑Fi:\n\nваш телефон не матиме з’єднання з Інтернетом;\n\nви не отримуватимете оновлення програмного забезпечення, доки не під’єднаєтеся до Інтернету;\n\nви не зможете активувати функції захисту пристрою."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Планшетний ПК не зміг під’єднатися до цієї мережі Wi-Fi."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"Пристрій не зміг під’єднатися до цієї мережі Wi-Fi."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Телефон не зміг під’єднатися до цієї мережі Wi-Fi."</string>
@@ -761,7 +760,6 @@
     <string name="ring_volume_title" msgid="7938706566797464165">"Гучність дзвінка"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Вібр. в беззвуч. реж."</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Звук сповіщення за умовчанням"</string>
-    <string name="heads_up_enabled_title" msgid="1031078221910921622">"Важливі сповіщення поверх вікон"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Мелодія"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Сповіщення"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Викор. гучність вхідних дзвінків для сповіщень"</string>
@@ -834,7 +832,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Автоматична яскравість"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Підняти, щоб активувати"</string>
     <string name="doze_title" msgid="2259176504273878294">"Активація екрана"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"Активувати екран, коли користувач бере пристрій або коли надходять сповіщення"</string>
+    <string name="doze_summary" msgid="7128970177894383698">"Активувати екран, коли користувач бере пристрій або коли надходять сповіщення"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Розмір шрифту"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Розмір шрифту"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Налашт. блокув. SIM-карти"</string>
@@ -862,6 +860,10 @@
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Скасувати"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"Виявлено декілька SIM-карт"</string>
     <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>
@@ -1012,6 +1014,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Це зітре всі дані з "<b>"внутрішньої пам’яті"</b>" вашого планшетного ПК, зокрема:\n\n"<li>"ваш обліковий запис Google"</li>\n<li>"дані й налаштування системи та програм"</li>\n<li>"завантажені програми"</li>"."</string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Буде видалено всі дані з "<b>"внутрішньої пам’яті"</b>" вашого телефона, зокрема:\n\n"<li>"Ваш обліковий запис Google"</li>\n<li>"Дані й налаштування системи та програм"</li>\n<li>"Завантажені програми"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Наразі ви ввійшли в такі облікові записи:\n"</string>
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"На цьому пристрої є інші користувачі.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Музика"</li>\n<li>"Фото"</li>\n<li>"Інші дані користувача"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Щоб видалити музику, зображення й інші дані користувача, треба стерти "<b>"носій USB"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Щоб видалити музику, зображення й інші дані користувача, треба стерти "<b>"карту SD"</b>"."</string>
@@ -1023,7 +1026,6 @@
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Скинути налаштування"</string>
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Стерти всю особисту інформацію та завантажені програми? Цю дію не можна скасувати!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Видалити все"</string>
-    <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Намалюйте ключ розблокування"</string>
     <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Щоб підтвердити відновлення заводських налаштувань, потрібно намалювати ключ розблокування."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Скидання не виконано, оскільки служба очищення системи не доступна."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Скинути?"</string>
@@ -1041,7 +1043,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"Стерти носій USB, видаливши всі збережені на ньому файли? Цю дію не можна скасувати!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Стерти карту SD, видаливши всі збережені на ній файли? Цю дію не можна скасувати!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Видалити все"</string>
-    <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Намалюйте ключ розблокування"</string>
     <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Щоб підтвердити очищення носія USB, треба намалювати ключ розблокування."</string>
     <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Щоб підтвердити очищення карти SD, треба намалювати ключ розблокування."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Виклики"</string>
@@ -1087,6 +1088,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Вставте SIM-карту та перезапустіть"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Під’єднайтеся до Інтернету"</string>
     <string name="location_title" msgid="1029961368397484576">"Моє місцезнах."</string>
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Робочий профіль"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Місцезнах.для робочого профілю"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Вимкнено вашою компанією"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Режим"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Висока точність"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Економія заряду акумулятора"</string>
@@ -1124,6 +1128,7 @@
     <string name="copyright_title" msgid="865906688917260647">"Автор. право"</string>
     <string name="license_title" msgid="1990487604356037871">"Ліцензія"</string>
     <string name="terms_title" msgid="7697580845616764642">"Заг. положення й умови"</string>
+    <string name="webview_license_title" msgid="2813507464175738967">"Ліцензія компонента WebView"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Фонові малюнки"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Постачальники супутникових зображень:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Ліцензії з відкр. кодом"</string>
@@ -1237,7 +1242,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Носій USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"На карті SD"</string>
     <string name="disabled" msgid="9206776641295849915">"Вимкнено"</string>
-    <string name="not_installed" msgid="1475144352069281880">"Не встановлено"</string>
+    <string name="not_installed" msgid="2797554494953450291">"Не встановлено для цього користувача"</string>
     <string name="no_applications" msgid="7336588977497084921">"Програм немає."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Внутр. пам\'ять"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Носій USB"</string>
@@ -1434,8 +1439,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Екран не засинатиме під час заряджання"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Увімкнути журнал відстеження інтерфейсу Bluetooth"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Робити знімки всіх пакетів інтерфейсу Bluetooth у файлі"</string>
-    <string name="oem_unlock_enable" msgid="6629321276287913315">"Увімкнути розблокув. OEM"</string>
-    <string name="oem_unlock_enable_summary" msgid="3546686263996628110">"Дозволити розблокування пристрою виробником (OEM)"</string>
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"Розблокування виробником"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Дозволити розблокування завантажувача"</string>
+    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Введіть PIN-код"</string>
+    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Щоб увімкнути розблокування OEM, введіть PIN-код пристрою"</string>
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Дозволити виробникові розблоковувати пристрій?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"ЗАСТЕРЕЖЕННЯ. Функції захисту пристрою не працюватимуть, поки ввімкнено це налаштування."</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Сертифікація бездротового екрана"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Докладний запис у журнал Wi-Fi"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Перемикатись із Wi-Fi на моб. мережу"</string>
@@ -1538,6 +1547,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"Субтитри виглядатимуть так:"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Аа"</string>
     <string name="locale_default" msgid="2593883646136326969">"За умовчанням"</string>
+    <string name="color_title" msgid="4258931051732243983">"Колір"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"За умовчанням"</string>
     <string name="color_none" msgid="3475640044925814795">"Немає"</string>
     <string name="color_white" msgid="8045195170201590239">"Білий"</string>
@@ -1595,12 +1605,12 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"Залишилося <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"Залишилося заряджати <xliff:g id="UNTIL_CHARGED">%1$s</xliff:g>"</string>
-    <string name="power_discharging_duration" msgid="7125493014448497620">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – залишилося близько <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="power_charging" msgid="712751285832976915">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – <xliff:g id="STATE">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration" msgid="4802183864773082009">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – <xliff:g id="TIME">%2$s</xliff:g> до повного зарядження"</string>
-    <string name="power_charging_duration_ac" msgid="3611179931297824699">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – <xliff:g id="TIME">%2$s</xliff:g> до повного зарядження з розетки"</string>
-    <string name="power_charging_duration_usb" msgid="1106605348913397583">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – <xliff:g id="TIME">%2$s</xliff:g> до повного зарядження через USB"</string>
-    <string name="power_charging_duration_wireless" msgid="633606920144617227">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – <xliff:g id="TIME">%2$s</xliff:g> до повного заряд. через бездр. прис."</string>
+    <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> – залишилось близько <xliff:g id="TIME">%2$s</xliff:g>"</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> до повного зарядження"</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> до повного зарядження з розетки"</string>
+    <string name="power_charging_duration_usb" msgid="182405645340976546">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> до повного зарядження через USB"</string>
+    <string name="power_charging_duration_wireless" msgid="1829295708243159464">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> до повного з бездротового зарядження"</string>
     <string name="power_usage_list_summary" msgid="2409288197839512482">"Використання після ост. повного зарядж."</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Споживання акумулятора з часу відключення"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Споживання акумулятора з моменту перезавантаження"</string>
@@ -1617,7 +1627,6 @@
     <string name="awake" msgid="387122265874485088">"Час активн. пристрою"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Час роботи Wi-Fi"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Час роботи Wi-Fi"</string>
-    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> –  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Деталі історії"</string>
     <string name="details_title" msgid="3792801565213935385">"Деталі використання"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Вжиток"</string>
@@ -1689,7 +1698,7 @@
     <string name="battery_saver" msgid="1426682272004907982">"Заощадження заряду акумулятора"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Вмикати автоматично"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Ніколи"</string>
-    <string name="battery_saver_turn_on_automatically_pct" msgid="3033681629861428940">"якщо заряд акумулятора %1$d%%"</string>
+    <string name="battery_saver_turn_on_automatically_pct" msgid="7536784431655058267">"заряд акумулятора – %1$s"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Статистика про процеси"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Статистика про запущені процеси"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Використання пам’яті"</string>
@@ -1813,7 +1822,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Апаратне забезпечення"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Лише програмне забезпечення"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"Облікові дані недоступні для цього користувача"</string>
-    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Намалюйте ключ розблокування"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Щоб підтвердити встановлення облікових даних, потрібно намалювати ключ розблокування."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Ввести пароль для сховища облікових даних."</string>
@@ -1843,6 +1851,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"Включити дані додатка"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Автомат. відновлення"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"У разі повторного встановлення програми відновлювати налаштування та дані з резервних копій"</string>
+    <string name="backup_inactive_title" msgid="5355557151569037197">"Служба резервного копіювання неактивна."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"Це налаштування встановлено політикою пристрою."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Пароль резерв.копії на ПК"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Повні резервні копії на комп’ютері наразі не захищені"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Торкніться, щоб змінити чи видалити пароль для повного резервного копіювання на комп’ютер"</string>
@@ -1952,7 +1962,11 @@
     <string name="enter_password" msgid="8035706727471334122">"Введіть пароль, щоб запустити пристрій Android"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Введіть PIN-код, щоб запустити пристрій Android"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Намалюйте ключ, щоб запустити пристрій Android"</string>
-    <string name="try_again" msgid="4272075051293936921">"Повторіть спробу."</string>
+    <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"Неправильний ключ"</string>
+    <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"Неправильний пароль"</string>
+    <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"Неправильний PIN-код"</string>
+    <string name="checking_decryption" msgid="8287458611802609493">"Перевірка…"</string>
+    <string name="starting_android" msgid="8581493237458496835">"Запуск Android"</string>
     <string name="delete" msgid="4219243412325163003">"Видалити"</string>
     <string name="misc_files" msgid="6720680815969643497">"Різні файли"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"вибрано <xliff:g id="NUMBER">%1$d</xliff:g> з <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -1990,8 +2004,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Завжди використовувати GPU для компонування екрана"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"Моделювання кольорів"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Увімк. трасування OpenGL"</string>
-    <string name="use_nuplayer" msgid="5699257393367904387">"Запускати NuPlayer"</string>
-    <string name="use_nuplayer_summary" msgid="1991479067478516714">"Запускати NuPlayer замість AwesomePlayer"</string>
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"Використовувати AwesomePlayer"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"Використовувати AwesomePlayer замість NuPlayer"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"Вимкнути звук через USB"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"Вимкн. передавання звуку на зовнішні USB-пристрої"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Показувати межі макета"</string>
@@ -2167,7 +2181,6 @@
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Додати користувача чи профіль"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Додати користувача"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Профіль з обмеженням"</string>
-    <string name="user_summary_managed_profile" msgid="7369539529693048111">"Робочий профіль"</string>
     <string name="user_need_lock_message" msgid="2596365678651842785">"Перш ніж створювати обмежений профіль, потрібно налаштувати блокування екрана, щоб захистити свої програми та особисті дані."</string>
     <string name="user_set_lock_button" msgid="8311219392856626841">"Налаштувати блокування"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Не створено"</string>
@@ -2298,11 +2311,13 @@
     <string name="sim_cellular_data_unavailable_summary" msgid="3654805961942166428">"Торкніться, щоб вибрати SIM-карту з даними"</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"Завжди телефонувати через цю SIM-карту"</string>
     <string name="select_sim_for_data" msgid="2366081042162853044">"Виберіть SIM-карту для даних"</string>
+    <string name="data_switch_started" msgid="2040761479817166311">"Змінення SIM-карти для мобільного Інтернету. Це може зайняти до хвилини…"</string>
     <string name="select_sim_for_calls" msgid="3503094771801109334">"Телефонувати за допомогою"</string>
     <string name="sim_select_card" msgid="211285163525563293">"Виберіть SIM-карту"</string>
     <string name="sim_card_number_title" msgid="7845379943474336488">"SIM-карта <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"SIM-карта порожня"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"Назва SIM-карти"</string>
+    <string name="sim_name_hint" msgid="7038643345238968930">"Введіть назву SIM-карти"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"Гніздо для SIM-карти %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Оператор"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Номер"</string>
@@ -2312,7 +2327,6 @@
     <string name="color_purple" msgid="3888532466427762504">"Пурпуровий"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"SIM-карту не вставлено"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"Статус SIM-карти"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"Інформація про SIM-карту"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"Телефонувати із SIM-карти за умовчанням"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"SIM-карта для вихідних дзвінків"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Інші налаштування виклику"</string>
@@ -2320,8 +2334,11 @@
     <string name="preferred_network_offload_header" msgid="2321173571529106767">"Не показувати назву мережі"</string>
     <string name="preferred_network_offload_footer" msgid="5857279426054744020">"Вимкнення показу назви мережі захищає від доступу до інформації про неї третіми сторонами."</string>
     <string name="preferred_network_offload_popup" msgid="2252915199889604600">"Вимкнення показу назви мережі запобігатиме автоматичному з’єднанню з прихованими мережами."</string>
+    <string name="sim_signal_strength" msgid="9144010043784767984">"<xliff:g id="DBM">%1$d</xliff:g> дБм <xliff:g id="ASU">%2$d</xliff:g> asu"</string>
+    <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>
@@ -2330,22 +2347,22 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Останні пошукові запити"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Результати"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi network connection"</string>
-    <string name="keywords_more_default_sms_app" msgid="2744404159003574745">"текстове повідомлення"</string>
-    <string name="keywords_more_mobile_networks" msgid="7813380887358745769">"стільниковий мобільний оператор бездротові мережі"</string>
+    <string name="keywords_more_default_sms_app" msgid="895656981962034647">"текстове повідомлення писати текстові повідомлення обмін повідомленнями"</string>
+    <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"стільниковий мобільний оператор бездротові мережі дані 4G 3G 2G LTE"</string>
     <string name="keywords_home" msgid="3626170808219458848">"панель запуску"</string>
     <string name="keywords_display" msgid="6709007669501628320">"сенсорний екран дисплея"</string>
-    <string name="keywords_display_brightness_level" msgid="8636451602230815191">"сенсорний екран затемненого дисплея"</string>
-    <string name="keywords_display_auto_brightness" msgid="8070218600502753102">"сенсорний екран затемненого дисплея"</string>
-    <string name="keywords_display_wallpaper" msgid="4315466287469834939">"фон"</string>
+    <string name="keywords_display_brightness_level" msgid="8923289340474728990">"затемнити дисплей сенсорний екран акумулятор"</string>
+    <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"затемнити дисплей сенсорний екран акумулятор"</string>
+    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"фон персоналізувати налаштувати дисплей"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"розмір шрифту"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"проект"</string>
-    <string name="keywords_storage" msgid="7007275853993419928">"місце диск жорсткий диск"</string>
-    <string name="keywords_battery" msgid="3992479295298655138">"живлення"</string>
-    <string name="keywords_spell_checker" msgid="4509482591225399210">"перевірка орфографії"</string>
+    <string name="keywords_storage" msgid="6572905220031852173">"місце на диску жорсткий диск використання пристрою"</string>
+    <string name="keywords_battery" msgid="2096185085932675704">"використання акумулятора зарядити"</string>
+    <string name="keywords_spell_checker" msgid="6106749039734174140">"орфографічний словник перевірка правопису автоматичне виправлення"</string>
     <string name="keywords_voice_input" msgid="3519547605812413860">"розпізнавач ввід мовлення диктувати мова гарнітура розпізнавання образливе слово аудіо історія bluetooth динамік"</string>
-    <string name="keywords_text_to_speech_output" msgid="8207889472282225512">"швидкість мова за умовчанням диктувати диктування"</string>
-    <string name="keywords_date_and_time" msgid="7666950126499155141">"годинник"</string>
-    <string name="keywords_factory_data_reset" msgid="3693730656843989732">"стерти"</string>
+    <string name="keywords_text_to_speech_output" msgid="392447904221657930">"швидкість мова за умовчанням диктувати диктування синтез мовлення доступність читач із вадами зору"</string>
+    <string name="keywords_date_and_time" msgid="2631808108134830066">"годинник 24-годинний формат часу"</string>
+    <string name="keywords_factory_data_reset" msgid="4355133848707691977">"стерти видалити відновити очистити вилучити"</string>
     <string name="keywords_printing" msgid="1701778563617114846">"принтер"</string>
     <string name="keywords_sounds_and_notifications" msgid="5965996187974887000">"сигнал динаміка"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="2912933812460077912">"не турбувати переривати переривання пріоритетні сповіщення втручатися"</string>
@@ -2354,7 +2371,7 @@
     <string name="keywords_location_mode" msgid="8584992704568356084">"точність"</string>
     <string name="keywords_accounts" msgid="1957925565953357627">"обліковий запис"</string>
     <string name="keywords_users" msgid="4673901601478559100">"обмеження обмежувати обмежено"</string>
-    <string name="keywords_keyboard_and_ime" msgid="1103378692379215672">"виправлення тексту виправляти звук вібросигнал автоматично мова жест пропонувати пропозиція тема образливе слово водити смайли emoji"</string>
+    <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"виправлення тексту виправити звук вібросигнал автоматично мова жест пропонувати пропозиція тема образливе слово ввести смайли emoji міжнародний"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"провести пальцем пароль ключ PIN-код"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Налаштувати NFC-тег для Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Записати"</string>
@@ -2371,7 +2388,6 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Гучність сповіщень"</string>
     <string name="zen_mode_settings_title" msgid="7014915558669122902">"Сповіщення"</string>
     <string name="zen_mode_option_title" msgid="5061978632306007914">"Коли надходять дзвінки та сповіщення"</string>
-    <string name="zen_mode_option_title_novoice" msgid="6680706009915204785">"Коли надходять сповіщення"</string>
     <string name="zen_mode_option_off" msgid="3167702608910820883">"Завжди переривати"</string>
     <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Дозволити лише пріоритетні сповіщення"</string>
     <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Не турбувати"</string>
@@ -2429,14 +2445,17 @@
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Готово"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Доки ви не вимкнете"</string>
     <string name="zen_mode_important_category" msgid="8123274463331022993">"Пріоритетні сповіщення"</string>
-    <string name="zen_mode_downtime_category" msgid="4730179065426038108">"Простій (лише пріоритетні сповіщення)"</string>
+    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Простій"</string>
     <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Дні"</string>
     <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Немає"</string>
+    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Сповіщення дозволено"</string>
+    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Лише пріоритетні"</string>
+    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Немає"</string>
     <string name="zen_mode_automation_category" msgid="4653551005950835761">"Автоматизація"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Вмикати автоматично"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Ніколи"</string>
-    <string name="zen_mode_phone_calls" msgid="8956214416859303966">"Дзвінки"</string>
+    <string name="zen_mode_calls" msgid="7051492091133751208">"Дзвінки"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Повідомлення"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Дзвінки або повідомлення від користувача"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Усі"</string>
@@ -2450,7 +2469,9 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"увечері в робочі дні"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Час початку"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Час завершення"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"Наступного дня о <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
+    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"Наступного дня о <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"О <xliff:g id="FORMATTED_TIME">%s</xliff:g> або перед будь-яким сигналом"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"Наступного дня о <xliff:g id="FORMATTED_TIME">%s</xliff:g> або перед будь-яким сигналом"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Сповіщення додатків"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Налаштування сповіщень"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Надіслати відгук про цей пристрій"</string>
@@ -2458,7 +2479,11 @@
     <string name="switch_on_text" msgid="1124106706920572386">"Увімкнено"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Вимкнено"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"Закріплення екрана"</string>
-    <string name="screen_pinning_description" msgid="7091642350452605379">"Коли цю функцію ввімкнено, ви можете закріпити поточний екран, щоб постійно бачити його, доки не відкріпите.\n\nВиконайте вказані нижче дії.\n\n1. Переконайтеся, що функцію закріплення екрана ввімкнено.\n\n2. Відкрийте екран, який ви хочете закріпити.\n\n3. Торкніться опції \"Огляд\".\n\n4. Торкніться значка шпильки."</string>
+    <string name="screen_pinning_description" msgid="1137904524037468263">"Якщо цю функцію ввімкнено, ви можете закріпити поточний екран, щоб постійно бачити його, доки не відкріпите.\n\nВиконайте такі дії:\n\n1. Переконайтеся, що функцію закріплення екрана ввімкнено.\n\n2. Відкрийте екран, який потрібно закріпити.\n\n3. Торкніться опції \"Огляд\".\n\n4. Проведіть пальцем угору й торкніться значка шпильки."</string>
+    <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Запитувати ключ розблокування перед відкріпленням"</string>
+    <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Запитувати PIN-код перед відкріпленням"</string>
+    <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Запитувати пароль перед відкріпленням"</string>
+    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Блокувати пристрій після відкріплення"</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Робочий профіль"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Експериментальна функція)"</string>
     <string name="display_auto_rotate_title" msgid="6176450657107806043">"Коли пристрій обертають"</string>
@@ -2467,7 +2492,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Залишити альбомну орієнтацію"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Залишити поточну орієнтацію"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"Інформація про IMEI"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"Інформація про IMEI"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Шифрування"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Продовжити"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"Можна додатково захистити пристрій, якщо вводити PIN-код перед увімкненням. Вимкнений пристрій не зможе приймати дзвінки, повідомлення або сповіщення, зокрема сигнали будильника. \n\nЦе допомагає захистити дані на загублених або викрадених пристроях."</string>
@@ -2485,4 +2509,7 @@
     <string name="encrypt_talkback_dialog_message_pin" msgid="1890374082842868489">"Коли ви введете PIN-код і запустите пристрій, служби доступності (як-от <xliff:g id="SERVICE">%1$s</xliff:g>) ще не ввімкнуться."</string>
     <string name="encrypt_talkback_dialog_message_pattern" msgid="4474332516537386384">"Коли ви введете ключ і запустите пристрій, служби доступності (як-от <xliff:g id="SERVICE">%1$s</xliff:g>) ще не ввімкнуться."</string>
     <string name="encrypt_talkback_dialog_message_password" msgid="8166099418487083927">"Коли ви введете пароль і запустите пристрій, служби доступності (як-от <xliff:g id="SERVICE">%1$s</xliff:g>) ще не ввімкнуться."</string>
+    <string name="imei_information_title" msgid="8499085421609752290">"Інформація про IMEI"</string>
+    <string name="imei_information_summary" msgid="2074095606556565233">"Інформація про IMEI"</string>
+    <string name="slot_number" msgid="3762676044904653577">"(Гніздо <xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-ur-rPK/arrays.xml b/res/values-ur-rPK/arrays.xml
index a03fc17..159504b 100644
--- a/res/values-ur-rPK/arrays.xml
+++ b/res/values-ur-rPK/arrays.xml
@@ -527,4 +527,12 @@
     <item msgid="4338089220026248848">"کیش کی ہوئی (سرگرمی کلائنٹ)"</item>
     <item msgid="6652164677254579050">"کیش کی ہوئی (خالی)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"نیلگوں سبز"</item>
+    <item msgid="8332294763632946560">"نیلا"</item>
+    <item msgid="2023216417616991392">"گہرا نیلا"</item>
+    <item msgid="3170497246594232819">"جامنی"</item>
+    <item msgid="4608643045752965568">"گلابی"</item>
+    <item msgid="6131821495505931173">"سرخ"</item>
+  </string-array>
 </resources>
diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur-rPK/strings.xml
index 97e6ecf..30c1204 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>
@@ -180,7 +180,6 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"‏%1$s آپ کے پیغامات تک رسائی حاصل کرنا چاہتا ہے۔ ‎%2$s کو رسائی دیں؟"</string>
     <string name="date_and_time" msgid="9062980487860757694">"تاریخ اور وقت"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"ٹائم زون منتخب کریں"</string>
-    <string name="normal_date_format" msgid="7636406984925498359">"علاقائی (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"پیش منظر:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"فونٹ سائز:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -291,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>
@@ -322,8 +321,6 @@
     <string name="date_time_set_timezone" msgid="5045627174274377814">"اپنا ٹائم زون منتخب کریں"</string>
     <string name="date_time_set_date_title" msgid="6928286765325608604">"تاریخ"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"تاریخ سیٹ کریں"</string>
-    <string name="date_time_date_format_title" msgid="3976171711988766411">"تاریخ کا فارمیٹ"</string>
-    <string name="date_time_date_format" msgid="6951498879879281102">"تاریخ کا فارمیٹ منتخب کریں"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"حروف تہجی کے لحاظ سے ترتیب دیں"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"ٹائم زون کے لحاظ سے ترتیب دیں"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"تاریخ"</string>
@@ -372,7 +369,8 @@
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"اپنے فون کی مرموز کاری کے وقت انتظار کریں۔ <xliff:g id="PERCENT">^1</xliff:g>% مکمل۔"</string>
     <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"اپنے ٹیبلیٹ کی مرموز کاری کے وقت انتظار کریں۔ باقی وقت: <xliff:g id="DURATION">^1</xliff:g>"</string>
     <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"اپنے فون کی مرموز کاری کے وقت انتظار کریں۔ باقی وقت: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"<xliff:g id="DELAY">^1</xliff:g> سیکنڈ میں دوبارہ کوشش کریں۔"</string>
+    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"اپنا ٹیبلیٹ غیر مقفل کرنے کیلئے، اسے آف اور پھر آن کریں۔"</string>
+    <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"اپنا فون غیر مقفل کرنے کیلئے، اسے آف اور پھر آن کریں۔"</string>
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"وارننگ: غیر مقفل کیے جانے کی <xliff:g id="COUNT">^1</xliff:g> مزید ناکام کوششوں کے بعد آپ کا آلہ صاف کر دیا جائے گا!"</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"اپنا پاس ورڈ ٹائپ کریں"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"مرموز کاری ناکام ہوگئی"</string>
@@ -401,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>
@@ -412,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>
@@ -556,13 +556,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"بطور اسپیکر فون"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"موسیقی اور میڈیا کیلئے"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"ترتیبات کو یاد رکھیں"</string>
-    <string name="wifi_assistant_intro_setup" msgid="4605105515416995110">"‏پیشِ خدمت ہے\nWi‑Fi اسسٹنٹ"</string>
-    <string name="wifi_assistant_no_thanks" msgid="2776983751990143934">"نہیں، شکریہ"</string>
-    <string name="wifi_assistant_setup" msgid="3772423650475730906">"ترتیب دیں"</string>
-    <string name="wifi_assistant_card_message" msgid="107811647784658536">"‏Wi‑Fi اسسٹنٹ کے ساتھ دستیاب نیٹ ورکس سے خود بخود مربوط ہوں۔"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"‏Wi‑Fi اسسٹنٹ"</string>
-    <string name="wifi_assistant_title_message" msgid="6240721017579074015">"‏<xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> آپ کو خود کار طور پر بہترین دستیاب Wi‑Fi سے منسلک کر دیتا ہے"</string>
-    <string name="wifi_assistant_open_app" msgid="4803044899535675063">"ایپ کھولیں"</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>
@@ -592,7 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"‏Wi‑Fi ترتیبات"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"وائرلیس رسائی پوائنٹس کو ترتیب دیں اور ان کا نظم کریں"</string>
-    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"‏Wi‑Fi منتخب کریں"</string>
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"‏Wi‑Fi نیٹ ورک منتخب کریں"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"‏Wi‑Fi منتخب کریں"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"‏Wi‑Fi آن ہو رہا ہے…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"‏Wi‑Fi آف ہو رہا ہے…"</string>
@@ -607,8 +602,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"اسکین کرنا ہمیشہ دستیاب رہے"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"ہمیشہ اسکیننگ کی اجازت دیں"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"‏Google کی مقام کی سروس اور دوسری ایپس کو Wi-Fi آف ہونے پر بھی نیٹ ورکس اسکین کرنے دیں"</string>
-    <string name="wifi_automatically_manage_title" msgid="6249976570008992746">"‏خود کار طریقے سے Wi‑Fi کا نظم کریں"</string>
-    <string name="wifi_automatically_manage_summary" msgid="6952470763378312488">"‏<xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> کو اپنے Wi‑Fi کنکشن کا نظم کرنے دیں"</string>
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"‏عوامی Wi‑Fi خودکار طور پر استعمال کریں"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"‏Wi Fi اسسٹنٹ کو اعلی معیار کے عوامی نیٹ ورکس سے خودکار طور پر منسلک ہونے دیں"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"اسسٹنٹ منتخب کریں"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"سرٹیفکیٹس انسٹال کریں"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"‏مقام کی قطعیت کو بہتر بنانے اور دوسرے مقاصد کیلئے، Google اور دوسری ایپس Wi-Fi آف ہونے پر بھی قریبی نیٹ ورکس کو اسکین کرسکتی ہیں۔ اگر آپ نہیں چاہتے ہیں کہ ایسا ہوا تو جدید &gt; اسکیننگ ہمیشہ دستیاب ہے پر جائیں۔"</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"‏Wi-Fi آف ہونے پر بھی ایپس قریبی نیٹ ورکس کو اسکین کرسکتی ہیں۔ اگر آپ نہیں چاہتے ہیں کہ ایسا ہوا تو جدید &gt; اسکیننگ ہمیشہ دستیاب ہے پر جائیں۔"</string>
@@ -629,6 +625,7 @@
     <string name="wifi_menu_scan" msgid="1470911530412095868">"اسکین کریں"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"جدید ترین"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"نیٹ ورک سے مربوط ہوں"</string>
+    <string name="wifi_menu_remember" msgid="8814185749388713796">"نیٹ ورک یاد رکھیں"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"نیٹ ورک بھول جائیں"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"نیٹ ورک میں ترمیم کریں"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"‏NFC ٹیگ میں لکھیں"</string>
@@ -673,9 +670,11 @@
     <string name="wifi_unspecified" msgid="5431501214192991253">"(غیر متعینہ)"</string>
     <string name="wifi_remembered" msgid="4955746899347821096">"محفوظ کردیا گیا"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"غیر فعال"</string>
-    <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"خراب انٹرنیٹ کنکشن سے اجتناب کیا"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"‏IP کنفیگریشن کی ناکامی"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"‏WiFi کنکشن کی ناکامی"</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"توثیق کا مسئلہ"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"رینج میں نہیں ہے"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"انٹرنیٹ تک کسی رسائی کا پتہ نہیں چلا، خود بخود دوبارہ منسلک نہیں ہوگا۔"</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"‏WPS دستیاب ہے"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" ‏ (WPS دستیاب ہے)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"اپنا نیٹ ورک پاس ورڈ درج کریں"</string>
@@ -699,9 +698,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"‏وارننگ: اگر آپ Wi‑Fi کو نظر انداز کر دیتے ہیں تو آپ کا ٹیبلیٹ ابتدائی ڈاؤن لوڈز اور اپ ڈیٹس کیلئے صرف سیلولر ڈیٹا استعمال کرے گا۔ ممکنہ ڈیٹا چارجز سے بچنے کیلئے، Wi‑Fi سے مربوط ہوں۔"</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"‏وارننگ: اگر آپ Wi‑Fi کو نظر انداز کر دیتے ہیں تو آپ کا آلہ ابتدائی ڈاؤن لوڈز اور اپ ڈیٹس کیلئے صرف سیلولر ڈیٹا استعمال کرے گا۔ ممکنہ ڈیٹا چارجز سے بچنے کیلئے، Wi‑Fi سے مربوط ہوں۔"</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"‏وارننگ: اگر آپ Wi‑Fi کو نظر انداز کر دیتے ہیں تو آپ کا فون ابتدائی ڈاؤن لوڈز اور اپ ڈیٹس کیلئے صرف سیلولر ڈیٹا استعمال کرے گا۔ ممکنہ ڈیٹا چارجز سے بچنے کیلئے، Wi‑Fi سے مربوط ہوں۔"</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="2393880108322835846">"‏وارننگ: اگر آپ Wi‑Fi کو نظر انداز کر دیتے ہیں تو کسی ابتدائی ڈاؤن لوڈز یا اپ ڈیٹس کیلئے آپ کے ٹیبلیٹ پر کوئی انٹرنیٹ کنکشن نہیں ہوگا۔"</string>
-    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1707391993265558787">"‏وارننگ: اگر آپ Wi‑Fi کو نظر انداز کر دیتے ہیں تو کسی ابتدائی ڈاؤن لوڈز یا اپ ڈیٹس کیلئے آپ کے آلہ پر کوئی انٹرنیٹ کنکشن نہیں ہوگا۔"</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="1556858507920033022">"‏وارننگ: اگر آپ Wi‑Fi کو نظر انداز کر دیتے ہیں تو کسی ابتدائی ڈاؤن لوڈز یا اپ ڈیٹس کیلئے آپ کے فون پر کوئی انٹرنیٹ کنکشن نہیں ہوگا۔"</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"‏اگر آپ Wi‑Fi کو نظر انداز کر دیتے ہیں تو:\n\nآپ کے ٹیبلیٹ میں ایک انٹرنیٹ کنکشن نہیں ہوگا۔\n\nآپ کو اس وقت تک سافٹ ویئر سے متعلق اپ ڈیٹس موصول نہیں ہونگی جب تک آپ انٹرنیٹ سے منسلک نہیں ہو جاتے ہیں۔\n\nآپ اس وقت آلہ کے تحفظ سے متعلق خصوصیات کو فعال نہیں کر سکتے ہیں۔"</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"‏اگر آپ Wi‑Fi کو نظر انداز کر دیتے ہیں تو:\n\nآپ کے آلہ میں ایک انٹرنیٹ کنکشن نہیں ہوگا۔\n\nآپ کو اس وقت تک سافٹ ویئر سے متعلق اپ ڈیٹس موصول نہیں ہونگی جب تک آپ انٹرنیٹ سے منسلک نہیں ہو جاتے۔\n\nآپ اس وقت آلہ کے تحفظ سے متعلق خصوصیات کو فعال نہیں کر سکتے ہیں۔"</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"‏اگر آپ Wi‑Fi کو نظر انداز کر دیتے ہیں تو:\n\nآپ کے فون میں ایک انٹرنیٹ کنکشن نہیں ہوگا۔\n\nآپ کو اس وقت تک سافٹ ویئر سے متعلق اپ ڈیٹس موصول نہیں ہونگی جب تک آپ انٹرنیٹ سے منسلک نہیں ہو جاتے ہیں۔\n\nآپ اس وقت آلہ کے تحفظ سے متعلق خصوصیات کو فعال نہیں کر سکتے ہیں۔"</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"‏ٹیبلٹ اس Wi‑Fi نیٹ ورک سے مربوط نہیں ہو سکا۔"</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"‏آلہ اس Wi‑Fi نیٹ ورک سے مربوط نہیں ہو سکا۔"</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"‏فون اس Wi‑Fi نیٹ ورک سے مربوط نہیں ہو سکا۔"</string>
@@ -761,7 +760,6 @@
     <string name="ring_volume_title" msgid="7938706566797464165">"رنگر والیوم"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"خاموش ہونے پر وائبریٹ کریں"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"ڈیفالٹ اطلاع کی آواز"</string>
-    <string name="heads_up_enabled_title" msgid="1031078221910921622">"اعلی ترجیح ہونے پر پاپ اپ کریں"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"رنگ ٹون"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"اطلاع"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"اطلاعات کیلئے آنے والی کال کا والیوم استعمال کریں"</string>
@@ -834,7 +832,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"خود کار چمک"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"جگانے کیلئے اٹھائیں"</string>
     <string name="doze_title" msgid="2259176504273878294">"ایمبی اینٹ ڈسپلے"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"آلہ اٹھانے یا اطلاعات پہنچنے پر اسکرین کو آن کریں"</string>
+    <string name="doze_summary" msgid="7128970177894383698">"آلہ کو اٹھانے یا اطلاعات موصول ہونے پر اسکرین کو آن کریں"</string>
     <string name="title_font_size" msgid="4405544325522105222">"فونٹ سائز"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"فونٹ سائز"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"‏SIM کارڈ لاک کی ترتیبات"</string>
@@ -862,6 +860,10 @@
     <string name="sim_enter_cancel" msgid="6240422158517208036">"منسوخ کریں"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"‏متعدد SIMs ملے"</string>
     <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>
+    <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 کا غلط PIN اب آپ کو اپنا آلہ غیر مقفل کرنے کیلئے اپنے کیریئر سے رابطہ کرنا چاہیے۔"</string>
   <plurals name="wrong_pin_code">
     <item quantity="one" msgid="4840607930166101114">"‏SIM کا غلط PIN کوڈ، اپنے آلے کو غیر مقفل کرنے کیلئے اپنے کیریئر سے رابطہ کرنے سے پہلے آپ کے پاس <xliff:g id="NUMBER">%d</xliff:g> کوشش باقی بچی ہے۔"</item>
@@ -1012,6 +1014,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"‏یہ آپ کے ٹیبلٹ کے "<b>"داخلی اسٹوریج"</b>" سے سبھی ڈیٹا کو حذف کر دے گا، بشمول:\n\n"<li>"آپ کا Google اکاؤنٹ"</li>\n<li>"سسٹم اور ایپ ڈیٹا اور ترتیبات"</li>\n<li>"ڈاؤن لوڈ کردہ ایپس"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"‏یہ آپ کے فون کے "<b>"داخلی اسٹوریج"</b>" سے سبھی ڈیٹا کو حذف کر دے گا، بشمول:\n\n"<li>"آپ کا Google اکاؤنٹ"</li>\n<li>"سسٹم اور ایپ ڈیٹا اور ترتیبات"</li>\n<li>"ڈاؤن لوڈ کردہ ایپس"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"آپ فی الحال مندرجہ ذیل اکاؤنٹس میں سائن ان ہیں:\n"</string>
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"اس آلہ پر دوسرے صارفین موجود ہیں۔\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"موسیقی"</li>\n<li>"تصاویر"</li>\n<li>"صارف کا دیگر ڈیٹا"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">"‏\n\nموسیقی، تصاویر اور صارف کا دیگر ڈیٹا، "<b>"USB اسٹوریج"</b>" کو حذف کیے جانے کی ضرورت ہے۔"</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">"‏\n\nموسیقی، تصاویر اور صارف کا دیگر ڈیٹا صاف کرنے کیلئے، "<b>"SD کارڈ"</b>" کو حذف کیے جانے کی ضرورت ہے۔"</string>
@@ -1023,7 +1026,6 @@
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"فون کو دوبارہ ترتیب دیں"</string>
     <string name="master_clear_final_desc" msgid="7209547812233487345">"اپنی سبھی ذاتی معلومات اور ڈاؤن لوڈ کردہ ایپس کو حذف کریں؟ آپ اس عمل کو لوٹا نہیں سکتے ہیں!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"ہر چیز کو حذف کریں"</string>
-    <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"غیر مقفل کرنے کا پیٹرن ڈرا کریں"</string>
     <string name="master_clear_gesture_explanation" msgid="826193821455182780">"آپ کو ایک فیکٹری ڈیٹا ری سیٹ کی توثیق کرنے کیلئے اپنا غیر مقفل کرنے کا پیٹرن ڈرا کرنے کی ضرورت ہے۔"</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"کوئی ری سیٹ انجام نہیں دیا گیا کیونکہ سسٹم صاف کریں سروس دستیاب نہیں ہے۔"</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"دوبارہ ترتیب دیں؟"</string>
@@ -1041,7 +1043,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"‏USB اسٹوریج پر اسٹور کردہ سبھی فائلوں کو حذف کرتے ہوئے، اسے حذف کریں؟ آپ اس کارروائی کو لوٹا نہيں سکتے ہیں!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"‏SD کارڈ پر اسٹور کردہ سبھی فائلوں کو حذف کرتے ہوئے، اسے حذف کریں؟ آپ اس کارروائی کو لوٹا نہيں سکتے ہیں!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"ہر چیز حذف کریں"</string>
-    <string name="media_format_gesture_prompt" msgid="3109349468816856670">"غیر مقفل کرنے کا پیٹرن ڈرا کریں"</string>
     <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"‏اس بات کی توثیق کرنے کیلئے کہ آپ USB اسٹوریج کو صاف کرنا چاہتے ہیں، آپ کو اپنا غیر مقفل کرنے کا پیٹرن ڈرا کرنا ہوگا۔"</string>
     <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"‏اس بات کی توثیق کرنے کیلئے کہ آپ SD کارڈ صاف کرنا چاہتے ہیں، آپ کو اپنا غیر مقفل کرنے کا پیٹرن ڈرا کرنے کی ضرورت ہے۔"</string>
     <string name="call_settings_title" msgid="5188713413939232801">"کال کی ترتیبات"</string>
@@ -1087,6 +1088,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"‏براہ کرم SIM کارڈ داخل کرکے دوبارہ شروع کریں"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"براہ کرم انٹرنیٹ سے مربوط کریں"</string>
     <string name="location_title" msgid="1029961368397484576">"میرا مقام"</string>
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"دفتری پروفائل"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"دفتری پروفائل کیلئے مقام"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"آپ کی کمپنی نے آف کر دیا"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"وضع"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"اعلی درستگی"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"بیٹری کی بچت"</string>
@@ -1124,6 +1128,7 @@
     <string name="copyright_title" msgid="865906688917260647">"کاپی رائٹ"</string>
     <string name="license_title" msgid="1990487604356037871">"لائسنس"</string>
     <string name="terms_title" msgid="7697580845616764642">"شرائط و ضوابط"</string>
+    <string name="webview_license_title" msgid="2813507464175738967">"‏سسٹم WebView کا لائسنس"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"وال پیپرز"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"‏سیٹلائٹ تصاویر کے فراہم کنندگان:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"اوپن سورس لائسنسز"</string>
@@ -1237,7 +1242,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"‏USB اسٹوریج"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"‏SD کارڈ پر"</string>
     <string name="disabled" msgid="9206776641295849915">"غیر فعال"</string>
-    <string name="not_installed" msgid="1475144352069281880">"انسٹال نہیں ہے"</string>
+    <string name="not_installed" msgid="2797554494953450291">"اس صارف کیلئے انسٹال نہیں ہے"</string>
     <string name="no_applications" msgid="7336588977497084921">"کوئی ایپس ہیں۔"</string>
     <string name="internal_storage" msgid="1584700623164275282">"داخلی اسٹوریج"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"‏USB اسٹوریج"</string>
@@ -1434,8 +1439,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"چارج ہوتے وقت اسکرین کبھی بھی سلیپ وضع میں نہيں جائے گی"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"‏بلوٹوتھ HCI کا جاسوسی لاگ فعال کریں"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"‏سبھی بلوٹوتھ HCI کے پیکٹس ایک فائل میں قید کریں"</string>
-    <string name="oem_unlock_enable" msgid="6629321276287913315">"‏OEM اَن لاک کو فعال کریں"</string>
-    <string name="oem_unlock_enable_summary" msgid="3546686263996628110">"‏آلہ کو OEM کے ذریعے غیر مقفل ہونے کی اجازت دیں"</string>
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"‏OEM اَن لاکنگ"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"بوٹ لوڈر کو غیر مقفل ہونے کی اجازت دیں"</string>
+    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"‏اپنا PIN درج کریں"</string>
+    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"‏OEM اَن لاک کو فعال کرنے کیلئے اپنے آلے کا PIN درج کریں۔"</string>
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"‏OEM اَن لاکنگ کی اجازت دیں؟"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"انتباہ: یہ ترتیب آن ہونے پر آلہ کے تحفظ کی خصوصیات اس آلہ پر کام نہیں کریں گی۔"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"وائرلیس ڈسپلے سرٹیفیکیشن"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"‏Wi‑Fi وربوس لاگنگ فعال کریں"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"‏جارحانہ Wi‑Fi سے سیلولر ہینڈ اوور"</string>
@@ -1538,6 +1547,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"کیپشنز اس طرح دکھائی دیں گی"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"ڈیفالٹ"</string>
+    <string name="color_title" msgid="4258931051732243983">"رنگ"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"ڈیفالٹ"</string>
     <string name="color_none" msgid="3475640044925814795">"کوئی نہیں"</string>
     <string name="color_white" msgid="8045195170201590239">"سفید"</string>
@@ -1595,12 +1605,12 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"<xliff:g id="REMAIN">%1$s</xliff:g> باقی"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> چارج کرنے کیلئے"</string>
-    <string name="power_discharging_duration" msgid="7125493014448497620">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - تقریباً <xliff:g id="TIME">%2$s</xliff:g> باقی ہے"</string>
-    <string name="power_charging" msgid="712751285832976915">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="STATE">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration" msgid="4802183864773082009">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> پورا ہونے تک"</string>
-    <string name="power_charging_duration_ac" msgid="3611179931297824699">"‏<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> AC پر پورا ہونے تک"</string>
-    <string name="power_charging_duration_usb" msgid="1106605348913397583">"‏<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> USB پر پورا ہونے تک"</string>
-    <string name="power_charging_duration_wireless" msgid="633606920144617227">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> وائرلیس سے پورا ہونے تک"</string>
+    <string name="power_discharging_duration" msgid="1605929174734600590">"‏‎<xliff:g id="LEVEL">%1$s</xliff:g>‎ - تقریبا <xliff:g id="TIME">%2$s</xliff:g> باقی"</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>‎ پورا ہونے تک"</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> AC‎ پر پورا ہونے تک"</string>
+    <string name="power_charging_duration_usb" msgid="182405645340976546">"‏‎<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> USB‎ پر پورا ہونے تک"</string>
+    <string name="power_charging_duration_wireless" msgid="1829295708243159464">"‏‎<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g>‎ وائرلیس سے پورا ہونے تک"</string>
     <string name="power_usage_list_summary" msgid="2409288197839512482">"پچھلے مکمل چارج کے بعد سے استعمال"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"پلگ ہٹانے کے بعد سے بیٹری کا استعمال"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"دوبارہ ترتیب دیے جانے کے بعد سے بیٹری کا استعمال"</string>
@@ -1617,7 +1627,6 @@
     <string name="awake" msgid="387122265874485088">"آلہ کے سلیپ وضع میں نہ ہونے کا وقت"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"‏وقت پر Wi‑Fi"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"‏وقت پر Wi‑Fi"</string>
-    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"سرگزشت کی تفصیلات"</string>
     <string name="details_title" msgid="3792801565213935385">"تفصیلات استعمال کریں"</string>
     <string name="details_subtitle" msgid="32593908269911734">"تفصیلات استعمال کریں"</string>
@@ -1689,7 +1698,7 @@
     <string name="battery_saver" msgid="1426682272004907982">"بیٹری سیور"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"خود کار طور پر آن کریں"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"کبھی نہیں"</string>
-    <string name="battery_saver_turn_on_automatically_pct" msgid="3033681629861428940">"‏%1$d%% بیٹری پر"</string>
+    <string name="battery_saver_turn_on_automatically_pct" msgid="7536784431655058267">"‏‎%1$s‎ بیٹری پر"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"پروسیس کے اعداد و شمار"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"جاری پروسیسز کے بارے میں بے ڈھب اعداد و شمار"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"میموری کا استعمال"</string>
@@ -1813,7 +1822,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"ہارڈ ویئر کے ذریعے تعاون یافتہ"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"صرف سافٹ ویئر"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"اس صارف کیلئے اسنادات دستیاب نہیں ہیں"</string>
-    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"غیر مقفل کرنے کا پیٹرن ڈرا کریں"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"آپ کو اسنادات کی انسٹالیشن کی توثیق کرنے کیلئے اپنا غیر مقفل کرنے کا پیٹرن ڈرا کرنا ہوگا۔"</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"اسناد اسٹوریج کیلئے پاس ورڈ ٹائپ کریں۔"</string>
@@ -1843,6 +1851,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"ایپ کا ڈیٹا شامل کریں"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"خود کار طور بحال کریں"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"کسی ایپ کو دوبارہ انسٹال کرتے وقت بیک اپ ترتیبات اور ڈیٹا کو بحال کریں"</string>
+    <string name="backup_inactive_title" msgid="5355557151569037197">"بیک اپ سروس غیر فعال ہے۔"</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"اسے آپ کے آلہ کی پالیسی کے ذریعے سیٹ کیا جاتا ہے۔"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"ڈیسک ٹاپ کا بیک اپ پاس ورڈ"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"ڈیسک ٹاپ کے مکمل بیک اپس فی الحال محفوظ کیے ہوئے نہیں ہیں"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"ڈیسک ٹاپ کے مکمل بیک اپس کیلئے پاس ورڈ کو تبدیل کرنے یا ہٹانے کیلئے ٹچ کریں"</string>
@@ -1952,7 +1962,11 @@
     <string name="enter_password" msgid="8035706727471334122">"‏Android کو شروع کرنے کیلئے، اپنا پاس ورڈ درج کریں"</string>
     <string name="enter_pin" msgid="5305333588093263790">"‏Android کو شروع کرنے کیلئے، اپنا PIN درج کریں"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"‏Android کو شروع کرنے کیلئے، اپنا پیٹرن ڈرا کریں"</string>
-    <string name="try_again" msgid="4272075051293936921">"دوبارہ کوشش کریں۔"</string>
+    <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"غلط پیٹرن"</string>
+    <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"غلط پاس ورڈ"</string>
+    <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"‏غلط PIN"</string>
+    <string name="checking_decryption" msgid="8287458611802609493">"چیک کیا جا رہا ہے…"</string>
+    <string name="starting_android" msgid="8581493237458496835">"‏Android شروع ہو رہا ہے"</string>
     <string name="delete" msgid="4219243412325163003">"حذف کریں"</string>
     <string name="misc_files" msgid="6720680815969643497">"متفرق فائلیں"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"<xliff:g id="NUMBER">%1$d</xliff:g> از <xliff:g id="TOTAL">%2$d</xliff:g> کو منتخب کیا گیا"</string>
@@ -1990,8 +2004,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"‏سکرین کی ساخت بنانے کیلئے ہمیشہ GPU استعمال کریں"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"رنگ کی جگہ کو تحریک دیں"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"‏OpenGL ٹریسز کو فعال کریں"</string>
-    <string name="use_nuplayer" msgid="5699257393367904387">"‏NuPlayer استعمال کریں (تجرباتی)"</string>
-    <string name="use_nuplayer_summary" msgid="1991479067478516714">"‏AwesomePlayer کے بجائے NuPlayer استعمال کریں"</string>
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"‏AwesomePlayer استعمال کریں (فرسودہ)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"‏اکثر میڈیا پلے بیک کیلئے NuPlayer کی بجائے AwesomePlayer استعمال کریں"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"‏USB آڈیو روٹنگ غیر فعال کریں"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"‏USB آڈیو پیریفیرلز کیلئے خودکار روٹنگ غیرفعال کریں"</string>
     <string name="debug_layout" msgid="5981361776594526155">"لے آؤٹ کی حدیں دکھائیں"</string>
@@ -2167,7 +2181,6 @@
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"صارف یا پروفائل شامل کریں"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"صارف کو شامل کریں"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"محدود پروفائل"</string>
-    <string name="user_summary_managed_profile" msgid="7369539529693048111">"دفتری پروفائل"</string>
     <string name="user_need_lock_message" msgid="2596365678651842785">"ایک محدود پروفائل بنانے سے پہلے، آپ کو اپنی ایپس اور ذاتی ڈیٹا کو محفوظ کرنے کیلئے ایک اسکرین لاک سیٹ اپ کرنا ہوگا۔"</string>
     <string name="user_set_lock_button" msgid="8311219392856626841">"لاک سیٹ کریں"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"ترتیب نہیں دی گئی"</string>
@@ -2298,11 +2311,13 @@
     <string name="sim_cellular_data_unavailable_summary" msgid="3654805961942166428">"‏ایک ڈیٹا SIM منتخب کرنے کیلئے ٹچ کریں"</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"کالز کیلئے ہمیشہ اس کا استعمال کریں"</string>
     <string name="select_sim_for_data" msgid="2366081042162853044">"‏ڈیٹا کیلئے ایک SIM منتخب کریں"</string>
+    <string name="data_switch_started" msgid="2040761479817166311">"‏ڈیٹا SIM کو سوئچ کیا جا رہا ہے، اس میں ایک منٹ تک کا وقت لگ سکتا ہے…"</string>
     <string name="select_sim_for_calls" msgid="3503094771801109334">"کال کریں مع"</string>
     <string name="sim_select_card" msgid="211285163525563293">"‏ایک SIM کارڈ منتخب کریں"</string>
     <string name="sim_card_number_title" msgid="7845379943474336488">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"‏SIM خالی ہے"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"‏SIM کا نام"</string>
+    <string name="sim_name_hint" msgid="7038643345238968930">"‏SIM کا نام درج کریں"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"‏SIM سلاٹ ‎%1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"کیریئر"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"نمبر"</string>
@@ -2312,7 +2327,6 @@
     <string name="color_purple" msgid="3888532466427762504">"جامنی"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"‏کوئی SIM کارڈز داخل نہیں کیے گئے"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"‏SIM کی صورتحال"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"‏SIM سے متعلق معلومات"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"‏ڈیفالٹ SIM سے واپسی کال کریں"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"‏آؤٹ گوئنگ کالز کیلئے SIM"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"کال کی دیگر ترتیبات"</string>
@@ -2320,8 +2334,11 @@
     <string name="preferred_network_offload_header" msgid="2321173571529106767">"نیٹورک نام نشریہ غیر فعال کریں"</string>
     <string name="preferred_network_offload_footer" msgid="5857279426054744020">"نیٹ ورک کے نام کا نشریہ غیر فعال کریں تیسرے فریقوں کو آپ کی نیٹ ورک کی معلومات تک رسائی سے روکتا ہے۔"</string>
     <string name="preferred_network_offload_popup" msgid="2252915199889604600">"نیٹ ورک کے نام کا نشریہ غیر فعال کرنا مخفی نیٹ ورکس کیلئے خودکار کنکشن کو روک دے گا۔"</string>
+    <string name="sim_signal_strength" msgid="9144010043784767984">"‎<xliff:g id="DBM">%1$d</xliff:g> dBm <xliff:g id="ASU">%2$d</xliff:g> asu"</string>
+    <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>
@@ -2330,22 +2347,22 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"حالیہ تلاشیاں"</string>
     <string name="search_results_label" msgid="4163304782363526148">"نتائج"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"‏wifi wi-fi نیٹ ورک کنکشن"</string>
-    <string name="keywords_more_default_sms_app" msgid="2744404159003574745">"متنی پیغام"</string>
-    <string name="keywords_more_mobile_networks" msgid="7813380887358745769">"سیلولر سیل کیریئر وائرلیس"</string>
+    <string name="keywords_more_default_sms_app" msgid="895656981962034647">"متنی پیغام پیغام بھیجنا پیغام رسانی"</string>
+    <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"‏سیلولر سیل کیریئر وائرلیس ڈیٹا 4g 3g 2g lte"</string>
     <string name="keywords_home" msgid="3626170808219458848">"لانچر"</string>
     <string name="keywords_display" msgid="6709007669501628320">"اسکرین ٹچ اسکرین"</string>
-    <string name="keywords_display_brightness_level" msgid="8636451602230815191">"اسکرین ٹچ اسکرین کو مدھم کریں"</string>
-    <string name="keywords_display_auto_brightness" msgid="8070218600502753102">"اسکرین ٹچ اسکرین کو مدھم کریں"</string>
-    <string name="keywords_display_wallpaper" msgid="4315466287469834939">"پس منظر"</string>
+    <string name="keywords_display_brightness_level" msgid="8923289340474728990">"مدھم اسکرین ٹچ اسکرین بیٹری"</string>
+    <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"مدھم اسکرین ٹچ اسکرین بیٹری"</string>
+    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"پس منظر ذاتی نوعیت کا بنائیں حسب ضرورت بنائیں ڈسپلے"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"متن کا سائز"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"پروجیکٹ"</string>
-    <string name="keywords_storage" msgid="7007275853993419928">"اسپیس ڈسک ہارڈ ڈرائیو"</string>
-    <string name="keywords_battery" msgid="3992479295298655138">"پاور"</string>
-    <string name="keywords_spell_checker" msgid="4509482591225399210">"ہجے"</string>
+    <string name="keywords_storage" msgid="6572905220031852173">"اسپیس ڈسک ہارڈ ڈرائیو آلہ کا استعمال"</string>
+    <string name="keywords_battery" msgid="2096185085932675704">"پاور کے استعمال کا چارج"</string>
+    <string name="keywords_spell_checker" msgid="6106749039734174140">"ہجے لغت ہجے چیک خودکار طور پر درست کریں"</string>
     <string name="keywords_voice_input" msgid="3519547605812413860">"شناخت کار ان پٹ تقریر بولیں زبان ہینڈز فری ہینڈ فری شناخت ناگوار لفظ آڈیو سرگزشت بلوٹوتھ ہیڈ سیٹ"</string>
-    <string name="keywords_text_to_speech_output" msgid="8207889472282225512">"درجہ زبان ڈیفالٹ بولیں بولنا"</string>
-    <string name="keywords_date_and_time" msgid="7666950126499155141">"کلاک"</string>
-    <string name="keywords_factory_data_reset" msgid="3693730656843989732">"مکمل طور پر حذف کریں"</string>
+    <string name="keywords_text_to_speech_output" msgid="392447904221657930">"‏درجہ دیں زبان ڈیفالٹ بولیں بولنا tts حالت رسائی نابینا"</string>
+    <string name="keywords_date_and_time" msgid="2631808108134830066">"گھڑی فوجی"</string>
+    <string name="keywords_factory_data_reset" msgid="4355133848707691977">"ختم کریں حذف کریں بحال کریں صاف کریں ہٹائیں"</string>
     <string name="keywords_printing" msgid="1701778563617114846">"پرنٹر"</string>
     <string name="keywords_sounds_and_notifications" msgid="5965996187974887000">"اسپیکر بیپ"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="2912933812460077912">"نہ ڈسٹرب کریں نہ مداخلت کریں مداخلت بریک"</string>
@@ -2354,7 +2371,7 @@
     <string name="keywords_location_mode" msgid="8584992704568356084">"قطعیت"</string>
     <string name="keywords_accounts" msgid="1957925565953357627">"اکاؤنٹ"</string>
     <string name="keywords_users" msgid="4673901601478559100">"پابندی پابندی لگائیں پابندی عائد کردہ"</string>
-    <string name="keywords_keyboard_and_ime" msgid="1103378692379215672">"‏متن اصلاح اصلاح کریں آواز وائبریٹ کریں خود کار زبان اشارہ تجویز کریں تجویز تھیم ناگوار لفظ قسم emoji"</string>
+    <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"‏متن کی اصلاح آواز درست کریں وائبریٹ کریں خودکار زبان اشارہ تجویز کریں تجویز تھیم ناگوار لفظ ٹائپ کریں emoji بین الاقوامی"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"‏سلائیڈ پاس ورڈ پیٹرن pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"‏Wi-Fi NFC ٹیگ ترتیب دیں"</string>
     <string name="write_tag" msgid="8571858602896222537">"تحریر کریں"</string>
@@ -2371,7 +2388,6 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"اطلاع کا والیوم"</string>
     <string name="zen_mode_settings_title" msgid="7014915558669122902">"مداخلتیں"</string>
     <string name="zen_mode_option_title" msgid="5061978632306007914">"جب کالز اور اطلاعات موصول ہوں"</string>
-    <string name="zen_mode_option_title_novoice" msgid="6680706009915204785">"جب اطلاعات موصول ہوں"</string>
     <string name="zen_mode_option_off" msgid="3167702608910820883">"ہمیشہ مداخلت کریں"</string>
     <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"صرف ترجیحی مداخلتوں کو اجازت دیں"</string>
     <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"مداخلت نہ کریں"</string>
@@ -2429,14 +2445,17 @@
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"ہوگیا"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"جب تک آپ اسے آف نہ کر دیں"</string>
     <string name="zen_mode_important_category" msgid="8123274463331022993">"ترجیحی مداخلتیں"</string>
-    <string name="zen_mode_downtime_category" msgid="4730179065426038108">"ڈاؤن ٹائم (صرف ترجیحی مداخلتیں)"</string>
+    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"ڈاؤن ٹائم"</string>
     <string name="zen_mode_downtime_days" msgid="3361856902633311616">"دن"</string>
     <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"کوئی نہیں"</string>
+    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"مداخلتوں کی اجازت ہے"</string>
+    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"صرف ترجیحی"</string>
+    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"کوئی نہیں"</string>
     <string name="zen_mode_automation_category" msgid="4653551005950835761">"آٹومیشن"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"خود کار طور پر آن کریں"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">"، "</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"کبھی نہیں"</string>
-    <string name="zen_mode_phone_calls" msgid="8956214416859303966">"کالز"</string>
+    <string name="zen_mode_calls" msgid="7051492091133751208">"کالز"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"پیغامات"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"کالز/پیغامات منجانب"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"کوئی بھی"</string>
@@ -2450,7 +2469,9 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"ہفتہ کی راتوں کو"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"وقت آغاز"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"وقت اختتام"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> اگلے دن"</string>
+    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> اگلے دن"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> یا اس سے پہلے کوئی بھی الارم"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> اگلے دن یا اس سے پہلے کوئی بھی الارم"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"ایپ کی اطلاعات"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"اطلاع کی ترتیبات"</string>
     <string name="device_feedback" msgid="3238056036766293294">"اس آلہ کے بارے میں تاثرات بھیجیں"</string>
@@ -2458,7 +2479,11 @@
     <string name="switch_on_text" msgid="1124106706920572386">"آن"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"آف"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"اسکرین کو پن کرنا"</string>
-    <string name="screen_pinning_description" msgid="7091642350452605379">"آن ہونے پر، آپ جب تک پن ہٹا نہیں دیتے ہیں، موجودہ اسکرین کو اس وقت تک منظر میں رکھنے کیلئے اسکرین پن کرنے کا استعمال کر سکتے ہیں۔\n\nاسکرین پن کرنے کا استعمال کرنے کیلئے:\n\n1۔ یقینی بنائیں کہ اسکرین پن کرنا آن ہے۔\n\n2۔ وہ اسکرین کھولیں جسے آپ پن کرنا چاہتے ہیں۔\n\n3۔ مجموعی جائزہ کو ٹچ کریں۔\n\n4۔ پن آئیکن کو ٹچ کریں۔"</string>
+    <string name="screen_pinning_description" msgid="1137904524037468263">"یہ ترتیب آن ہونے پر، آپ اسکرین پن کرنے کا استعمال موجودہ اسکرین کو اس وقت تک منظر میں رکھنے کیلئے کر سکتے ہیں جب تک آپ پن ہٹا نہ دیں۔ \n\nاسکرین پن کرنے کا استعمال کرنے کیلئے:\n\n1۔ اس بات کو یقینی بنائیں کہ اسکرین پن کرنا آن ہے۔\n\n2۔ وہ اسکرین کھولیں جسے آپ پن کرنا چاہتے ہیں۔\n\n3۔ عمومی جائزہ کو ٹچ کریں۔\n\n4۔ اوپر سوائپ کریں اور پھر پن آئیکن کو ٹچ کریں۔"</string>
+    <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"پن ہٹانے سے پہلے غیر مقفل کرنے کا پیٹرن طلب کریں"</string>
+    <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"‏پن ہٹانے سے پہلے PIN طلب کریں"</string>
+    <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"پن ہٹانے سے پہلے پاس ورڈ طلب کریں"</string>
+    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"پن ہٹاتے وقت آلہ کو مقفل کریں"</string>
     <string name="managed_user_title" msgid="8101244883654409696">"دفتر کا پروفائل"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(تجرباتی)"</string>
     <string name="display_auto_rotate_title" msgid="6176450657107806043">"جب آلہ گھمایا جائے"</string>
@@ -2467,7 +2492,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"لینڈ اسکیپ منظر میں رہیں"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"موجودہ سمت بندی میں رہیں"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"‏IMEI کی معلومات"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"‏IMEI سے متعلق معلومات"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"مرموز کاری"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"جاری رکھیں"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"‏آپ یہ آلہ شروع ہونے سے پہلے اپنے PIN کا تقاضہ کر کے، اسے مزید محفوظ بنا سکتے ہیں۔ جب تک آلہ شروع نہیں ہو جاتا ہے، یہ الارمز سمیت، کالیں، پیغامات یا اطلاعات موصول نہیں کر سکتا ہے۔\n\nاس سے گمشدہ یا چوری ہوئے آلات پر ڈیٹا کی حفاظت کرنے میں مدد ملتی ہے۔"</string>
@@ -2485,4 +2509,7 @@
     <string name="encrypt_talkback_dialog_message_pin" msgid="1890374082842868489">"‏جب آپ یہ آلہ شروع کرنے کیلئے اپنا PIN داخل کریں گے تو <xliff:g id="SERVICE">%1$s</xliff:g> جیسی رسائی سروسز اس وقت ابھی دستیاب نہیں ہوں گی۔"</string>
     <string name="encrypt_talkback_dialog_message_pattern" msgid="4474332516537386384">"یہ آلہ شروع کرنے کیلئے جب آپ اپنا پیٹرن داخل کریں گے تو <xliff:g id="SERVICE">%1$s</xliff:g> جیسی رسائی سروسز اس وقت ابھی دستیاب نہیں ہوں گی۔"</string>
     <string name="encrypt_talkback_dialog_message_password" msgid="8166099418487083927">"اس آلہ کو شروع کرنے کیلئے جب آپ اپنا پاس ورڈ درج کریں گے تو <xliff:g id="SERVICE">%1$s</xliff:g> جیسی رسائی سروسز اس وقت ابھی دستیاب نہیں ہوں گی۔"</string>
+    <string name="imei_information_title" msgid="8499085421609752290">"‏IMEI کی معلومات"</string>
+    <string name="imei_information_summary" msgid="2074095606556565233">"‏IMEI سے متعلق معلومات"</string>
+    <string name="slot_number" msgid="3762676044904653577">"(سلاٹ<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-uz-rUZ/arrays.xml b/res/values-uz-rUZ/arrays.xml
index d1f5d56..924dae8 100644
--- a/res/values-uz-rUZ/arrays.xml
+++ b/res/values-uz-rUZ/arrays.xml
@@ -527,4 +527,12 @@
     <item msgid="4338089220026248848">"Keshlangan (harakat mijozi)"</item>
     <item msgid="6652164677254579050">"Keshlangan (bo‘sh)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Moviy"</item>
+    <item msgid="8332294763632946560">"Havorang"</item>
+    <item msgid="2023216417616991392">"To‘q ko‘k"</item>
+    <item msgid="3170497246594232819">"Binafsharang"</item>
+    <item msgid="4608643045752965568">"Pushti"</item>
+    <item msgid="6131821495505931173">"Qizil"</item>
+  </string-array>
 </resources>
diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml
index 90ad43f..c5693da 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>
@@ -180,7 +180,6 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s xabarlaringizni ochmoqchi. %2$s‘ga ruxsat berilsinmi?"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Sana va vaqt"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Vaqt zonasini tanlang"</string>
-    <string name="normal_date_format" msgid="7636406984925498359">"Mahalliy sana (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Ko‘rinishi:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Shrift xajmi:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -291,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>
@@ -322,8 +321,6 @@
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Vaqt zonasini tanlang"</string>
     <string name="date_time_set_date_title" msgid="6928286765325608604">"Sana"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"Sana o‘rnatish"</string>
-    <string name="date_time_date_format_title" msgid="3976171711988766411">"Sana formati"</string>
-    <string name="date_time_date_format" msgid="6951498879879281102">"Sana formatini tanlash"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Alifbo bo‘yicha saralash"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Vaqt zonasi bo‘yicha saralash"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Sana"</string>
@@ -372,7 +369,8 @@
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Telefoningiz shifrlanishini kuting. <xliff:g id="PERCENT">^1</xliff:g>% bajarildi."</string>
     <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Planshetingiz shifrlanmoqda. Iltimos, kuting. Qolgan vaqt: <xliff:g id="DURATION">^1</xliff:g>"</string>
     <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Telefoningiz shifrlanmoqda. Iltimos, kuting. Qolgan vaqt: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"<xliff:g id="DELAY">^1</xliff:g> soniyadan so‘ng yana urinib ko‘ring."</string>
+    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"Planshetingizni qulfdan chiqarish uchun uni o‘chirib, keyin qayta yoqing."</string>
+    <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"Telefoningizni qulfdan chiqarish uchun uni o‘chirib, keyin qayta yoqing."</string>
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"Ogohlantirish: Agar yana <xliff:g id="COUNT">^1</xliff:g> marta muvaffaqiyatsiz urinish qilsangiz, qurilmangiz ma’lumotlari o‘chirib tashlanadi!"</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Parolingizni tering"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Shifrlanmadi"</string>
@@ -401,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>
@@ -412,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>
@@ -556,13 +556,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Telefon karnayi sifatida"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Musiqa va media uchun"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Sozlamalarni eslab qolish"</string>
-    <string name="wifi_assistant_intro_setup" msgid="4605105515416995110">"Wi-Fi yordamchisini\nkutib oling"</string>
-    <string name="wifi_assistant_no_thanks" msgid="2776983751990143934">"YO‘Q, KERAK EMAS"</string>
-    <string name="wifi_assistant_setup" msgid="3772423650475730906">"SOZLASH"</string>
-    <string name="wifi_assistant_card_message" msgid="107811647784658536">"Wi‑Fi yordamchisi bilan mavjud tarmoqlarga avtomatik tarzda ulanish."</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi‑Fi yordamchisi"</string>
-    <string name="wifi_assistant_title_message" msgid="6240721017579074015">"<xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> sizni avtomatik ravishda eng yaxshi Wi-Fi tarmog‘iga ulaydi"</string>
-    <string name="wifi_assistant_open_app" msgid="4803044899535675063">"ILOVANI OCHISH"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Wi‑Fi yordamchisi orqali ulangan"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"Aks beruvchi erkan"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Simsiz displeyni yoqish"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Atrofda qurilmalar topilmadi."</string>
@@ -592,7 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Wi‑Fi sozlamalari"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Ulanish nuqtalarini sozlash &amp; boshqarish"</string>
-    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Wi‑Fi tarmog‘ini tanlash"</string>
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Wi-Fi tarmog‘ini tanlang"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Wi‑Fi tarmog‘ini tanlash"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Wi‑Fi yoqilmoqda…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Wi‑Fi o‘chirilmoqda…"</string>
@@ -607,8 +602,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"Scanlash har doim yoqilgan"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Har doim izlashga ruxsat berilsin"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Wi-Fi moduli o‘chirilgan bo‘lsa-da, Google joylashuvni aniqlash xizmati va boshqa ilovalarga tarmoqlarni izlashga ruxsat berish"</string>
-    <string name="wifi_automatically_manage_title" msgid="6249976570008992746">"Wi‑Fi’ni avtomatik tarzda boshqarish"</string>
-    <string name="wifi_automatically_manage_summary" msgid="6952470763378312488">"<xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> ilovasiga Wi-Fi ulanishini boshqarish uchun ruxsat berilsin"</string>
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Ochiq Wi-Fi tarmog‘iga avtomatik ulanish"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Wi-Fi yordamchisiga ochiq tarmoqlar ichidan eng kuchlisiga avtomatik ulanishi uchun ruxsat bering"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Yordamchini tanlang"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Sertifikatlarni o‘rnatish"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Joylashuv aniqligini yana ham yaxshilash va boshqa maqsadlar uchun, Wi-Fi o‘chirilgan bo‘lsada Google va boshqa ilovlar atrofdagi tarmoqlarni skanlashlari mumkin. Buni istamasangiz, Qoshimcha &gt; Har doim mavjud tarmoqlarni skanlash menusiga o‘ting."</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Wi-Fi o‘chirilgan bo‘lsada, ilovalar atrofdagi tarmoqlarni skanlashlari mumkin. Buni istamasangiz, Qoshimcha &gt; Har doim mavjud tarmoqlarni skanlash menusiga o‘ting."</string>
@@ -629,6 +625,7 @@
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Tekshirish"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Kengaytirilgan"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Tarmoqqa ulanish"</string>
+    <string name="wifi_menu_remember" msgid="8814185749388713796">"Tarmoqni eslab qolish"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Tarmoqni unutish"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Tarmoqni o‘zgartirish"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"NFC yorliqqa yozish"</string>
@@ -673,9 +670,11 @@
     <string name="wifi_unspecified" msgid="5431501214192991253">"(ko‘rsatilmagan)"</string>
     <string name="wifi_remembered" msgid="4955746899347821096">"Saqlandi"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"O\'chirilgan"</string>
-    <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Juda past internet tezlikdan saqlanildi"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP manzilini sozlab bo‘lmadi"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Wi-Fi ulanishini o‘rnatib bo‘lmadi"</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Tasdiqdan o‘tishda muammo"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Aloqada emas"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Internetga ulanish aniqlanmadi, avtomatik ravishda qayta ulana olmaydi."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS mavjud"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS mavjud)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Tarmoqqa ulanish uchun parolni kiriting"</string>
@@ -699,9 +698,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"OGOHLANTIRISH: Agar Wi-Fi tarmog‘iga ulanmasdan o‘tkazib yuborsangiz, planshetingiz dastlabki yuklab olinadigan narsalar va yangilanishlarni olish uchun faqat mobil internetdan foydalana oladi xolos. Mobil internet xarajatlarining oldini olish uchun Wi-Fi tarmog‘iga ulaning."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"OGOHLANTIRISH: Agar Wi-Fi tarmog‘iga ulanmasdan o‘tkazib yuborsangiz, qurilmangiz dastlabki yuklab olinadigan narsalar va yangilanishlarni olish uchun faqat mobil internetdan foydalana oladi xolos. Mobil internet xarajatlarining oldini olish uchun Wi-Fi tarmog‘iga ulaning."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"OGOHLANTIRISH: Agar Wi-Fi tarmog‘iga ulanmasdan o‘tkazib yuborsangiz, telefonngiz dastlabki yuklab olinadigan narsalar va yangilanishlarni olish uchun faqat mobil internetdan foydalana oladi xolos. Mobil internet xarajatlarining oldini olish uchun Wi-Fi tarmog‘iga ulaning."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="2393880108322835846">"OGOHLANTIRISH: Agar Wi-Fi tarmog‘iga ulanmasdan o‘tkazib yuborsangiz, dastlabki yuklab olinadigan narsalar va yangilanishlarni olish uchun planshetgizda internet bo‘lmaydi."</string>
-    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1707391993265558787">"OGOHLANTIRISH: Agar Wi-Fi tarmog‘iga ulanmasdan o‘tkazib yuborsangiz, dastlabki yuklab olinadigan narsalar va yangilanishlarni olish uchun qurilmangizda internet bo‘lmaydi."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="1556858507920033022">"OGOHLANTIRISH: Agar Wi-Fi tarmog‘iga ulanmasdan o‘tkazib yuborsangiz, dastlabki yuklab olinadigan narsalar va yangilanishlarni olish uchun telefoningizda internet bo‘lmaydi."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Agar Wi‑Fi o‘tkazib yuborilsa:\n\nPlanshetingiz internetga ulana olmaydi.\n\nInternetga ulanmaguncha, dasturiy yangilanishlarni o‘rnata olmaysiz.\n\nQurilmani himoyalash funksiyalarini faollashtira olmaysiz."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Agar Wi‑Fi o‘tkazib yuborilsa:\n\nQurilmangiz internetga ulana olmaydi.\n\nInternetga ulanmaguncha, dasturiy yangilanishlarni o‘rnata olmaysiz.\n\nQurilmani himoyalash funksiyalarini faollashtira olmaysiz."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Agar Wi‑Fi o‘tkazib yuborilsa:\n\nTelefoningiz internetga ulana olmaydi.\n\nInternetga ulanmaguncha, dasturiy yangilanishlarni o‘rnata olmaysiz.\n\nQurilmani himoyalash funksiyalarini faollashtira olmaysiz."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Planshet bu Wi‑Fi tarmog‘iga ulanmadi."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"Qurilma ushbu Wi-Fi tarmog‘iga ulana olmadi."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Telefon bu Wi‑Fi tarmog‘iga ulanmadi."</string>
@@ -761,7 +760,6 @@
     <string name="ring_volume_title" msgid="7938706566797464165">"Qo‘ng‘iroq ovozi balandligi"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Ovozsizligida tebranish"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Standart xabarnoma tovushi"</string>
-    <string name="heads_up_enabled_title" msgid="1031078221910921622">"Muhimlari ajralib chiqsin"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Rington"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Xabarnoma"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Kirish qo‘ng‘irog‘i ovoz balandligidan xabarnomalar uchun foydalanish"</string>
@@ -834,7 +832,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Avtomatik yorqinlik"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Tik holatda faollashtirish"</string>
     <string name="doze_title" msgid="2259176504273878294">"Tashqi ekran"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"Qurilma qo‘lga olinganda yoki bildirishnoma kelganda ekran uyg‘otilsin"</string>
+    <string name="doze_summary" msgid="7128970177894383698">"Qurilmani qo‘limga olsam yoki bildirishnoma kelsa, ekran uyqu rejimidan chiqarilsin"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Shrift xajmi"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Shrift hajmi"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM karta qulfi sozlamalari"</string>
@@ -862,6 +860,10 @@
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Bekor qilish"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"Bir nechta SIM karta topildi"</string>
     <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>
+    <string name="sim_preferred_title" msgid="5567909634636045268">"Ma’qul SIM karta o‘zg-sinmi?"</string>
+    <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> – qurilmangizdagi yagona SIM karta. Undan qo‘ng‘iroqlar, mobil internet va SMS xabarlar uchun foydalanmoqchimisiz?"</string>
     <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>
@@ -1012,6 +1014,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Bu planshetning "<b>"ichki xotirasi"</b>"dagi barcha ma\'lumotlarni o\'chirib yuboradi, jumladan:\n\n"<li>"Sizning Google hisobingiz"</li>\n<li>"Tizim va ilovalar ma\'lumotlari va sozlamalari"</li>\n<li>"Ko\'chirib olingan ilovalar"</li>"ni."</string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Bu telefoningizdagi "<b>"ichki xotira"</b>"dan,\n\n"<li>" Google hisobingiz"</li>\n<li>"Tizim va ilovalar sozlamalari"</li>\n<li>"Ko‘chirib olingan ilovalar"</li>" kabi barcha ma‘lumotlarni o‘chirib yuboradi."</string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Siz hozir tizimga quyidagi hisoblardan kirgansiz:\n"</string>
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Bu qurilmada boshqa foydalanuvchilar ham bor.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musiqa"</li>\n<li>"Rasmlar"</li>\n<li>"Foydalanuvchining boshqa ma\'lumotlari"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Musiqa, rasmlar, foydalanuvchining boshqa ma\'lumotlarini o\'chirish uchun, "<b>"USB xotira"</b>" tozalanishi kerak."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Musiqa, rasmlar, va boshqa ma\'lumotlarni o‘chirish uchun, "<b>"SD karta"</b>"ni tozalash kerak."</string>
@@ -1023,7 +1026,6 @@
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Telefonni zavod sozlamalariga tiklash"</string>
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Barcha shaxsiy ma\'lumotlaringiz va ko\'chirib olingan ilovalarni o\'chirilishiga rozimisiz? Keyin ortga qaytarishni iloji yo\'q bo\'ladi!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Hamma narsani o‘chirish"</string>
-    <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Qulfni ochish chizmasini chizing"</string>
     <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Dastlabki sozlamalarga qaytarishni tasdiqlash uchun qulfni ochadigan chizmangizni chizishingiz lozim."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Dastlabki sozlamalarni qaytarib bo\'lmadi, chunki Tizimni tozalash xizmati javob bermayapti."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Tozalanilsinmi?"</string>
@@ -1041,7 +1043,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"USB xotira ichidagi barcha ma\'lumotlarni o‘chirib, tozalamoqchimisiz? Keyin umuman tiklab bo‘lmaydi!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"SD karta ichidagi barcha ma\'lumotlarni o‘chirib, tozalamoqchimisiz? Keyin umuman tiklab bo‘lmaydi!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Hamma narsa o\'chirilsin"</string>
-    <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Qulfni ochish chizmasini chizing"</string>
     <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"USB xotirasidagi ma‘lumotlarni o‘chirib tashlashni tasdiqlash uchun qulfni ochadigan chizmangizni chizishingiz lozim."</string>
     <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"SD xotira kartasidagi ma‘lumotlarni o‘chirib tashlashni tasdiqlash uchun qulfni ochadigan chizmangizni chizishingiz lozim."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Qo‘ng‘iroq sozlamalari"</string>
@@ -1087,6 +1088,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Iltimos, SIM kartani joylashtirib, qurilmani ochirib-yoqing"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Iltimos, Internetga ulaning"</string>
     <string name="location_title" msgid="1029961368397484576">"Mening joylashuvim"</string>
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Ishchi profil"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Ishchi profil joyi"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Kompaniya tomonidan o‘ch-gan"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Rejim"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Yuqori darajadagi aniqlik"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Batareyani tejash"</string>
@@ -1124,6 +1128,7 @@
     <string name="copyright_title" msgid="865906688917260647">"Mualliflik huquqi"</string>
     <string name="license_title" msgid="1990487604356037871">"Litsenziya"</string>
     <string name="terms_title" msgid="7697580845616764642">"Foydalanish shartlari"</string>
+    <string name="webview_license_title" msgid="2813507464175738967">"WebView litsenziyasi"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Orqa fon rasmlari"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Sun’iy yo‘ldosh rasmlarini taqdim etuvchilar:\n©2014 CNES/Astrium, DigitalGlobe, Bluesky"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Erkin va ochiq kodli litsenziyalar"</string>
@@ -1237,7 +1242,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB xotira"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"SD kartada"</string>
     <string name="disabled" msgid="9206776641295849915">"O‘chirilgan"</string>
-    <string name="not_installed" msgid="1475144352069281880">"O‘rnatilmagan"</string>
+    <string name="not_installed" msgid="2797554494953450291">"Bu foyd-chi u-n o‘rnatilmagan"</string>
     <string name="no_applications" msgid="7336588977497084921">"Ilovalar - yo‘q."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Ichki xotira"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB xotira"</string>
@@ -1434,8 +1439,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Ekran quvvatlanish paytida hech qachon o‘chmaydi"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Bluetooth HCI kuzatish jurnalini yoqish"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Barcha bluetooth HCI paketlarini bitta faylda jamlash"</string>
-    <string name="oem_unlock_enable" msgid="6629321276287913315">"OEM blokdan chiqarishni ishga tushirish"</string>
-    <string name="oem_unlock_enable_summary" msgid="3546686263996628110">"OEM qurilmani blokdan chiqarishga ruxsat berish"</string>
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM qulfini yechish"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Operatsion tizimni yuklovchi dastur qulfini yechish"</string>
+    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"PIN kodni kiriting"</string>
+    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"“OEM qulfini yechish” funksiyasini yoqish uchun qurilmangiz PIN kodini kiriting"</string>
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"“OEM qulfini yechish” funksiyasi yoqilsinmi?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"OGOHLANTIRISH: Ushbu funksiya yoqilsa, qurilmani himoyalash funksiyasi ishlamay qoladi."</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Displeyning simsiz sertifikatsiyasi"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Wi-Fi jurnalidagi batafsil ma’lumot"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Wi-Fi’dan mob. internetga majburiy o‘tish"</string>
@@ -1538,6 +1547,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"Sarlavlahar quyidagicha ko‘rinadi"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"Standart bo‘yicha"</string>
+    <string name="color_title" msgid="4258931051732243983">"Rang"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"Birlamchi"</string>
     <string name="color_none" msgid="3475640044925814795">"Hech biri"</string>
     <string name="color_white" msgid="8045195170201590239">"Oq"</string>
@@ -1595,12 +1605,12 @@
     <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">"Batareya quvvati <xliff:g id="REMAIN">%1$s</xliff:g>dan so‘ng tugaydi"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"Batareya quvvati <xliff:g id="UNTIL_CHARGED">%1$s</xliff:g>dan so‘ng to‘ladi"</string>
-    <string name="power_discharging_duration" msgid="7125493014448497620">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – taxminan <xliff:g id="TIME">%2$s</xliff:g> qoldi"</string>
-    <string name="power_charging" msgid="712751285832976915">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – <xliff:g id="STATE">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration" msgid="4802183864773082009">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – <xliff:g id="TIME">%2$s</xliff:g>da to‘ladi"</string>
-    <string name="power_charging_duration_ac" msgid="3611179931297824699">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – o‘zgaruvchan tok bilan <xliff:g id="TIME">%2$s</xliff:g>da to‘ladi"</string>
-    <string name="power_charging_duration_usb" msgid="1106605348913397583">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – USB orqali <xliff:g id="TIME">%2$s</xliff:g>da to‘ladi"</string>
-    <string name="power_charging_duration_wireless" msgid="633606920144617227">"<xliff:g id="LEVEL">%1$d</xliff:g>%% – simsiz quvvatlaganda <xliff:g id="TIME">%2$s</xliff:g>da to‘ladi"</string>
+    <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> – taxminan <xliff:g id="TIME">%2$s</xliff:g> qoldi"</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>, to‘lguncha"</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>, o‘zgaruvchan tok orqali to‘lguncha"</string>
+    <string name="power_charging_duration_usb" msgid="182405645340976546">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g>, USB orqali to‘lguncha"</string>
+    <string name="power_charging_duration_wireless" msgid="1829295708243159464">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g>, simsiz quvvatlash orqali to‘lguncha"</string>
     <string name="power_usage_list_summary" msgid="2409288197839512482">"To‘liq quvvat olgandan so‘ng ishlayotgan"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Zaryadlanish to‘xtatilgandan keyingi batareya sarfi"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Statistika tozalandan keyingi batareya sarfi"</string>
@@ -1617,7 +1627,6 @@
     <string name="awake" msgid="387122265874485088">"Qurilmaning uyg‘oqlik vaqti"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi‑Fi o‘z vaqtida"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi‑Fi o‘z vaqtida"</string>
-    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Batareya sarfi tarixi tafsilotlari"</string>
     <string name="details_title" msgid="3792801565213935385">"Tafsilotlardan foydalanish"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Tafsilotlardan foydalanish"</string>
@@ -1689,7 +1698,7 @@
     <string name="battery_saver" msgid="1426682272004907982">"Quvvat tejash"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Avtomatik ravishda yoqish"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Hech qachon"</string>
-    <string name="battery_saver_turn_on_automatically_pct" msgid="3033681629861428940">"batareya quvvati %1$d%% qolganda"</string>
+    <string name="battery_saver_turn_on_automatically_pct" msgid="7536784431655058267">"batareya quvvati %1$s qolganda"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Jarayon statistikalari"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Ish jarayonlari haqidagi g‘alati statistikalar"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Band xotira"</string>
@@ -1813,7 +1822,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Apparat bilan qo‘llab-quvvatlangan"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Faqat dasturda"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"Ushbu foydalanuvchi uchun hisob ma’lumotlari mavjud emas"</string>
-    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Qulfni ochadigan chizmani chizish"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Hisob ma‘lumoti o‘rnatilganini tasdiqlash uchun qulfni ochadigan chizmani ekranda chizish lozim."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Hisob ma’lumotlari ombori uchun parol tering."</string>
@@ -1843,6 +1851,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"Ilova ma’lumotini ham qo‘shish"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Avtomatik qayta tiklash"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Ilovani qayta o‘rnatish paytida, zahiralangan sozlamalar va ma’lumotlarni tiklang"</string>
+    <string name="backup_inactive_title" msgid="5355557151569037197">"Zaxiralash xizmati faol emas."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"Bu qurilma siyosati tomonidan o‘rnatilgan."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Ish stolini zahiralash paroli"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Kompyuterdagi zaxira nusxalar hozirgi vaqtda himoyalanmagan"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Ish stoli to\'liq zaxira nusxalari parolini o‘zgartirish yoki o‘chirish uchun bu yerni bosing."</string>
@@ -1952,7 +1962,11 @@
     <string name="enter_password" msgid="8035706727471334122">"Androidni ishga tushirish uchun parolni kiriting"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Androidni ishga tushirish uchun PIN kodni kiriting"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Androidni ishga tushirish uchun chizmali parolni chizing"</string>
-    <string name="try_again" msgid="4272075051293936921">"Qayta urinib ko‘ring"</string>
+    <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"Chizmali parol noto‘g‘ri"</string>
+    <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"Parol noto‘g‘ri"</string>
+    <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"PIN kod noto‘g‘ri"</string>
+    <string name="checking_decryption" msgid="8287458611802609493">"Tekshirilmoqda…"</string>
+    <string name="starting_android" msgid="8581493237458496835">"Android ishga tushmoqda"</string>
     <string name="delete" msgid="4219243412325163003">"O‘chirish"</string>
     <string name="misc_files" msgid="6720680815969643497">"Boshqa fayllar"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"<xliff:g id="TOTAL">%2$d</xliff:g>dan <xliff:g id="NUMBER">%1$d</xliff:g>tasi belgilandi"</string>
@@ -1990,8 +2004,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Ekranda tasvirlarni biriktirish uchun har doim GPU‘dan foydalanish"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"Rang maydonini simulyatsiyalash"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"OpenGL tahlil dasturini yoqish"</string>
-    <string name="use_nuplayer" msgid="5699257393367904387">"NuPlayer orqali (tajriba)"</string>
-    <string name="use_nuplayer_summary" msgid="1991479067478516714">"AwesomePlayer o‘rniga NuPlayer’dan foydalanilsin"</string>
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"AwesomePlayer foyd-sh (tav. etilmaydi)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"Ijro qilish u-n NuPlayer o‘rniga AwesomePlayer’dan foyd-sh"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"USB audio-yo‘naltirishni o‘chirish"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"Tashqi USB audio qur-ga avto-yo‘naltirishni o‘chirish"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Joylashuv chegaralarini ko‘rsatish"</string>
@@ -2167,7 +2181,6 @@
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Foydalanuvchi yoki profil qo‘shish"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Foydalanuvchi qo‘shish"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Cheklangan profil"</string>
-    <string name="user_summary_managed_profile" msgid="7369539529693048111">"Ishchi profil"</string>
     <string name="user_need_lock_message" msgid="2596365678651842785">"Cheklangan profil yaratish uchun, shaxsiy ilovlar va ma‘lumotlarni himoyalash maqsadida avval ekran qulfini yaratish lozim."</string>
     <string name="user_set_lock_button" msgid="8311219392856626841">"Qulf o‘rnatish"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Sozlanmagan"</string>
@@ -2298,11 +2311,13 @@
     <string name="sim_cellular_data_unavailable_summary" msgid="3654805961942166428">"Mobil internet SIM kartasini tanlash uchun bosing"</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"Bundan doim qo‘ng‘iroqlar uchun foyd-sin"</string>
     <string name="select_sim_for_data" msgid="2366081042162853044">"Internet uchun SIM kartani tanlang"</string>
+    <string name="data_switch_started" msgid="2040761479817166311">"Mobil internet uchun SIM karta almashtirilmoqda. Bu bir necha daqiqa vaqt olishi mumkin..."</string>
     <string name="select_sim_for_calls" msgid="3503094771801109334">"Quyidagi bilan qo‘ng‘iroq qilish"</string>
     <string name="sim_select_card" msgid="211285163525563293">"SIM kartani tanlang"</string>
     <string name="sim_card_number_title" msgid="7845379943474336488">"<xliff:g id="CARD_NUMBER">%1$d</xliff:g>-SIM"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"SIM karta uyasi bo‘sh"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"SIM karta nomi"</string>
+    <string name="sim_name_hint" msgid="7038643345238968930">"SIM karta nomini kiriting"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"%1$d-SIM karta teshigi"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Aloqa operatori"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Raqam"</string>
@@ -2312,7 +2327,6 @@
     <string name="color_purple" msgid="3888532466427762504">"Binafsharang"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"SIM karta solinmagan"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"SIM karta holati"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"SIM kartaga aloqador ma’lumotlar"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"Birlamchi SIM kartadan qaytarib qo‘ng‘iroq qilish"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"Chiqish qo‘ng‘iroqlari uchun mo‘ljallangan SIM karta"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Boshqa qo‘ng‘iroq sozlamalari"</string>
@@ -2320,8 +2334,11 @@
     <string name="preferred_network_offload_header" msgid="2321173571529106767">"Tarmoq nomi ko‘rsatilmasin"</string>
     <string name="preferred_network_offload_footer" msgid="5857279426054744020">"“Tarmoq nomi ko‘rsatilmasin” funksiyasi begonalarning tarmoq ma’lumotlariga kirishidan himoya qiladi"</string>
     <string name="preferred_network_offload_popup" msgid="2252915199889604600">"“Tarmoq nomi ko‘rsatilmasin” funksiyasi yashirin tarmoqlarga avtomatik ulanishdan himoya qiladi."</string>
+    <string name="sim_signal_strength" msgid="9144010043784767984">"<xliff:g id="DBM">%1$d</xliff:g> dBm <xliff:g id="ASU">%2$d</xliff:g> sh.s.b"</string>
+    <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>
+    <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Har safar so‘ralsin"</string>
     <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>
@@ -2330,22 +2347,22 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"So‘nggi qidiruvlar"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Qidiruv natijalari"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi tarmoq ulanishi"</string>
-    <string name="keywords_more_default_sms_app" msgid="2744404159003574745">"matnli xabar"</string>
-    <string name="keywords_more_mobile_networks" msgid="7813380887358745769">"uyali telefon simsiz operatori"</string>
+    <string name="keywords_more_default_sms_app" msgid="895656981962034647">"matn, xabar, xabarlashuv, xabarlar"</string>
+    <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"uyali, uyali aloqa operatori, simsiz internet, 4g, 3g, 2g, lte"</string>
     <string name="keywords_home" msgid="3626170808219458848">"ishga tushirish paneli"</string>
     <string name="keywords_display" msgid="6709007669501628320">"ekran tegish ekrani"</string>
-    <string name="keywords_display_brightness_level" msgid="8636451602230815191">"dim ekrani tegish ekrani"</string>
-    <string name="keywords_display_auto_brightness" msgid="8070218600502753102">"dim ekrani tegish ekrani"</string>
-    <string name="keywords_display_wallpaper" msgid="4315466287469834939">"fon"</string>
+    <string name="keywords_display_brightness_level" msgid="8923289340474728990">"xira, ekran, sensorli ekran, batareya"</string>
+    <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"xira, ekran, sensorli ekran, batareya"</string>
+    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"orqa fon, moslashtirish, ekran"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"matn o\'lchami"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"loyiha"</string>
-    <string name="keywords_storage" msgid="7007275853993419928">"disk bo\'sh joyi qattiq disk"</string>
-    <string name="keywords_battery" msgid="3992479295298655138">"darajada"</string>
-    <string name="keywords_spell_checker" msgid="4509482591225399210">"imloni tekshirish"</string>
+    <string name="keywords_storage" msgid="6572905220031852173">"joy, disk, qattiq disk, qurilmadan foydalanish"</string>
+    <string name="keywords_battery" msgid="2096185085932675704">"quvvat, foydalanish, quvvatlash"</string>
+    <string name="keywords_spell_checker" msgid="6106749039734174140">"imlo lug‘ati, imloni tekshirish, avtomatik tuzatish"</string>
     <string name="keywords_voice_input" msgid="3519547605812413860">"aniqlagich, matn kiritish, nutq, gapirish, til, qo‘l tekkizmay, aniqlash, haqoratomuz so‘z, audio, tarix, bluetooth, moslama"</string>
-    <string name="keywords_text_to_speech_output" msgid="8207889472282225512">"tilni baholash sukut bo\'yicha gapirish"</string>
-    <string name="keywords_date_and_time" msgid="7666950126499155141">"soat"</string>
-    <string name="keywords_factory_data_reset" msgid="3693730656843989732">"surib o\'chirish"</string>
+    <string name="keywords_text_to_speech_output" msgid="392447904221657930">"baho, til, birlamchi, gapirish, nutq, matndan-nutqqa, maxsus imkoniyatlar, o‘qish vositasi, ko‘r"</string>
+    <string name="keywords_date_and_time" msgid="2631808108134830066">"soat, harbiy"</string>
+    <string name="keywords_factory_data_reset" msgid="4355133848707691977">"tozalash, o‘chirish, qayta tiklash, olib tashlash"</string>
     <string name="keywords_printing" msgid="1701778563617114846">"printer"</string>
     <string name="keywords_sounds_and_notifications" msgid="5965996187974887000">"karnay signali"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="2912933812460077912">"bezovta qilmang uzib qo\'ymang uzib qo\'yish tanaffusi"</string>
@@ -2354,7 +2371,7 @@
     <string name="keywords_location_mode" msgid="8584992704568356084">"aniqlik"</string>
     <string name="keywords_accounts" msgid="1957925565953357627">"hisob"</string>
     <string name="keywords_users" msgid="4673901601478559100">"cheklov cheklash cheklangan"</string>
-    <string name="keywords_keyboard_and_ime" msgid="1103378692379215672">"matnni sozlash to\'g\'ri tovush tebranish avtomatik til shakl taklifi taklif qilingan mavzu haqoratli so\'z turi emotsi"</string>
+    <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"matnni tuzatish, to‘g‘ri, ovoz, tebranish, avto, til, imo-ishora, taklif qilish, taklif, mavzu, haqoratomuz so‘z, yozish, kulgich, xalqaro"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"surish, parol, chizmali parol, PIN kod"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi’ni sozlash u-n NFC yorliq"</string>
     <string name="write_tag" msgid="8571858602896222537">"Yozish"</string>
@@ -2371,7 +2388,6 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Bildirishnomalar ovozi"</string>
     <string name="zen_mode_settings_title" msgid="7014915558669122902">"Tanaffuslar"</string>
     <string name="zen_mode_option_title" msgid="5061978632306007914">"Qo‘ng‘iroq yoki bildirishnomalar kelganda"</string>
-    <string name="zen_mode_option_title_novoice" msgid="6680706009915204785">"Bildirishnomalar kelganda"</string>
     <string name="zen_mode_option_off" msgid="3167702608910820883">"Har doim bezovta qilinsin"</string>
     <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Faqat ustuvor tanaffuslarga ruxsat berilsin"</string>
     <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Bezovta qilinmasin"</string>
@@ -2429,14 +2445,17 @@
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Tayyor"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Siz o‘chirguncha"</string>
     <string name="zen_mode_important_category" msgid="8123274463331022993">"Ustuvor tanaffuslar"</string>
-    <string name="zen_mode_downtime_category" msgid="4730179065426038108">"Harakatsizlik (faqat ustuvor tanaffuslar)"</string>
+    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Nofaol vaqt"</string>
     <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Kunlar soni"</string>
     <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Hech biri"</string>
+    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Bildirishnomalarga ruxsat berilgan"</string>
+    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Faqat birlamchi"</string>
+    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Hech biri"</string>
     <string name="zen_mode_automation_category" msgid="4653551005950835761">"Avtomatlashtirish"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Avtomatik ravishda yoqish"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Hech qachon"</string>
-    <string name="zen_mode_phone_calls" msgid="8956214416859303966">"Qo‘ng‘iroqlar"</string>
+    <string name="zen_mode_calls" msgid="7051492091133751208">"Qo‘ng‘iroqlar"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Xabarlar"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Qo‘ng‘iroqlar/xabarlar:"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Barcha"</string>
@@ -2450,7 +2469,9 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Ish kunlari kechasi"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Boshlanish vaqti"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Tugash vaqti"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"Keyingi kun <xliff:g id="FORMATTED_TIME">%s</xliff:g> da"</string>
+    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"Keyingi kun <xliff:g id="FORMATTED_TIME">%s</xliff:g> da"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> da yoki undan oldingi biror uyg‘otkich vaqtida"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"Keyingi kun <xliff:g id="FORMATTED_TIME">%s</xliff:g> da yoki undan oldingi biror uyg‘otkich vaqtida"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Ilova bildirish-lari"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Bildirishnoma sozlamalari"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Qurilma haqida mulohaza yuborish"</string>
@@ -2458,7 +2479,11 @@
     <string name="switch_on_text" msgid="1124106706920572386">"Yoqilgan"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"O‘chirilgan"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"Ekranni qadab qo‘yish"</string>
-    <string name="screen_pinning_description" msgid="7091642350452605379">"Agar u yoqilsa, ekranni qadab qo‘yish funksiyasi yordamida faqat joriy ekran ko‘rinadigan qilib qo‘yish mumkin.\n\nEkranni qadab qo‘yish uchun:\n\n1. Ekranni qadab qo‘yish yoqilganligini tekshiring.\n\n2. Qadab qo‘ymoqchi bo‘lgan ekranni oching.\n\n3. “Umumiy nazar” tugmasini bosing.\n\n4. Qadash tugmasini bosing."</string>
+    <string name="screen_pinning_description" msgid="1137904524037468263">"Ushbu sozlama yoqilgach, ekranni qadash funk-si yordamida faqat joriy ekran ko‘rinadigan qilib qo‘yish m-n.\n\nEkranni qadash uchun:\n\n1. Ekranni qadash funk-si yoqilganini tekshiring.\n\n2. Qadamoqchi bo‘lgan ekranni oching.\n\n3. “Umumiy nazar” tugmasini bosing.\n\n4. Yuqoriga suring va qadash tugmasini bosing."</string>
+    <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Yechishdan oldin chizmali parol so‘ralsin"</string>
+    <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Yechishdan oldin PIN kod so‘ralsin"</string>
+    <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Yechishdan oldin parol so‘ralsin"</string>
+    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Yechish vaqtida qurilma qulflansin"</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Ishchi profil"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Tajribaviy)"</string>
     <string name="display_auto_rotate_title" msgid="6176450657107806043">"Qurilma aylanganda"</string>
@@ -2467,7 +2492,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Yotiq holatda qolsin"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Joriy holatda qolsin"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI ma’lumotlari"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI raqamiga aloqador ma’lumotlar"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Shifrlash"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Davom etish"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"Qurilmani ishga tushirishda PIN-kod talab qilish orqali uni yanada kuchliroq himoyalashingiz mumkin. Qurilma ishga tushmaguncha, u qo‘ng‘iroqlar, xabarlar yoki bildirishnomalar, jumladan, uyg‘otkich signallarini qabul qila olmaydi. \n\nBu yo‘qolgan yoki o‘g‘irlangan qurilmadagi ma’lumotlarni himoyalashga yordam beradi."</string>
@@ -2485,4 +2509,7 @@
     <string name="encrypt_talkback_dialog_message_pin" msgid="1890374082842868489">"Ushbu qurilmani ishga tushirish uchun PIN-kodni kiritganingizda, “<xliff:g id="SERVICE">%1$s</xliff:g>” kabi maxsus xizmatlar hali yoqilmagan bo‘ladi."</string>
     <string name="encrypt_talkback_dialog_message_pattern" msgid="4474332516537386384">"Ushbu qurilmani ishga tushirish uchun chizmali parolni kiritganingizda, “<xliff:g id="SERVICE">%1$s</xliff:g>” kabi maxsus xizmatlar hali yoqilmagan bo‘ladi."</string>
     <string name="encrypt_talkback_dialog_message_password" msgid="8166099418487083927">"Ushbu qurilmani ishga tushirish uchun parolni kiritganingizda, “<xliff:g id="SERVICE">%1$s</xliff:g>” kabi maxsus xizmatlar hali yoqilmagan bo‘ladi."</string>
+    <string name="imei_information_title" msgid="8499085421609752290">"IMEI ma’lumotlari"</string>
+    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI raqamiga aloqador ma’lumotlar"</string>
+    <string name="slot_number" msgid="3762676044904653577">"(<xliff:g id="SLOT_NUM">%1$d</xliff:g>-uya)"</string>
 </resources>
diff --git a/res/values-vi/arrays.xml b/res/values-vi/arrays.xml
index 25f556c..3bbd6c5 100644
--- a/res/values-vi/arrays.xml
+++ b/res/values-vi/arrays.xml
@@ -527,4 +527,12 @@
     <item msgid="4338089220026248848">"Được lưu trong bộ nhớ cache (máy khách hoạt động)"</item>
     <item msgid="6652164677254579050">"Được lưu trong bộ nhớ cache (trống)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Xanh két"</item>
+    <item msgid="8332294763632946560">"Màu lam"</item>
+    <item msgid="2023216417616991392">"Màu chàm"</item>
+    <item msgid="3170497246594232819">"Tía"</item>
+    <item msgid="4608643045752965568">"Hồng"</item>
+    <item msgid="6131821495505931173">"Đỏ"</item>
+  </string-array>
 </resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 2163dc8..35f47a9 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>
@@ -180,7 +180,6 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s muốn truy cập tin nhắn của bạn. Bạn có muốn cấp quyền truy cập cho %2$s không?"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Ngày và giờ"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Chọn múi giờ"</string>
-    <string name="normal_date_format" msgid="7636406984925498359">"Khu vực (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Xem trước:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Kích thước phông chữ:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -291,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>
@@ -322,8 +321,6 @@
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Chọn múi giờ"</string>
     <string name="date_time_set_date_title" msgid="6928286765325608604">"Ngày"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"Đặt ngày"</string>
-    <string name="date_time_date_format_title" msgid="3976171711988766411">"Định dạng ngày"</string>
-    <string name="date_time_date_format" msgid="6951498879879281102">"Chọn định dạng ngày"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Sắp xếp theo vần"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Sắp xếp theo múi giờ"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Ngày"</string>
@@ -372,7 +369,8 @@
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Vui lòng đợi trong khi điện thoại của bạn được mã hóa. Hoàn tất <xliff:g id="PERCENT">^1</xliff:g>%."</string>
     <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Chờ trong khi máy tính bảng của bạn đang được mã hóa. Thời gian còn lại: <xliff:g id="DURATION">^1</xliff:g>"</string>
     <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Chờ trong khi điện thoại của bạn đang được mã hóa. Thời gian còn lại: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Hãy thử lại sau <xliff:g id="DELAY">^1</xliff:g> giây."</string>
+    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"Để mở khóa máy tính bảng của bạn, hãy tắt rồi bật máy tính bảng."</string>
+    <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"Để mở khóa điện thoại của bạn, hãy tắt rồi bật điện thoại."</string>
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"Cảnh báo: Thiết bị của bạn sẽ bị xóa sau <xliff:g id="COUNT">^1</xliff:g> lần mở khóa không thành công nữa!"</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Nhập mật khẩu của bạn"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Mã hóa không thành công"</string>
@@ -401,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>
@@ -412,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>
@@ -556,13 +556,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Làm loa ngoài"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Cho nhạc và phương tiện"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Nhớ cài đặt"</string>
-    <string name="wifi_assistant_intro_setup" msgid="4605105515416995110">"Về\nTrình hỗ trợ Wi‑Fi"</string>
-    <string name="wifi_assistant_no_thanks" msgid="2776983751990143934">"KHÔNG, CẢM ƠN"</string>
-    <string name="wifi_assistant_setup" msgid="3772423650475730906">"THIẾT LẬP"</string>
-    <string name="wifi_assistant_card_message" msgid="107811647784658536">"Tự động kết nối với các mạng có sẵn bằng Trình hỗ trợ Wi‑Fi."</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Trình hỗ trợ Wi‑Fi"</string>
-    <string name="wifi_assistant_title_message" msgid="6240721017579074015">"<xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> tự động kết nối bạn với mạng Wi‑Fi tốt nhất có sẵn"</string>
-    <string name="wifi_assistant_open_app" msgid="4803044899535675063">"MỞ ỨNG DỤNG"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Được kết nối qua trình hỗ trợ Wi‑Fi"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"Màn hình truyền"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Bật hiển thị không dây"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Không tìm thấy thiết bị lân cận nào."</string>
@@ -592,7 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Cài đặt Wi‑Fi"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Thiết lập &amp; quản lý điểm truy cập mạng"</string>
-    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Chọn Wi‑Fi"</string>
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Chọn mạng Wi‑Fi"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Chọn Wi‑Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Đang bật Wi‑Fi…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Đang tắt Wi‑Fi…"</string>
@@ -607,8 +602,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"Luôn quét"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Luôn cho phép quét"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Cho phép dịch vụ định vị và các ứng dụng khác của Google quét tìm mạng, ngay cả khi Wi-Fi bị tắt"</string>
-    <string name="wifi_automatically_manage_title" msgid="6249976570008992746">"Tự động quản lý Wi-Fi"</string>
-    <string name="wifi_automatically_manage_summary" msgid="6952470763378312488">"Cho phép <xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> quản lý kết nối Wi‑Fi của bạn"</string>
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Tự động sử dụng Wi‑Fi mở"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Cho phép Trợ lý Wi‑Fi tự động kết nối với mạng mở được xác định là có chất lượng cao"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Chọn trợ lý"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Cài đặt chứng chỉ"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Để nâng cao độ chính xác và cho các mục đích khác, Google và các ứng dụng khác có thể quét tìm các mạng gần đó, ngay cả khi Wi-Fi bị tắt. Nếu bạn không muốn điều này xảy ra, hãy đi đến Nâng cao &gt; Luôn quét."</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Ứng dụng có thể quét tìm các mạng gần đó, ngay cả khi Wi-Fi bị tắt. Nếu bạn không muốn điều này xảy ra, hãy đi đến Nâng cao &gt; Luôn quét."</string>
@@ -629,6 +625,7 @@
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Dò"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Nâng cao"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Kết nối tới mạng"</string>
+    <string name="wifi_menu_remember" msgid="8814185749388713796">"Nhớ mạng"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Quên mạng"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Sửa đổi mạng"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Ghi vào thẻ NFC"</string>
@@ -673,9 +670,11 @@
     <string name="wifi_unspecified" msgid="5431501214192991253">"(không xác định)"</string>
     <string name="wifi_remembered" msgid="4955746899347821096">"Đã lưu"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"Đã tắt"</string>
-    <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Đã tránh kết nối Internet kém"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"Lỗi cấu hình IP"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Lỗi kết nối WiFi"</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Sự cố xác thực"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Ngoài vùng phủ sóng"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Không phát hiện thấy truy cập Internet nào, mạng sẽ không được tự động kết nối lại."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"Có WPS"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (Có WPS)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Nhập mật khẩu mạng của bạn"</string>
@@ -699,9 +698,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"CẢNH BÁO: Nếu bạn bỏ qua Wi‑Fi, máy tính bảng của bạn sẽ chỉ sử dụng dữ liệu di động cho bản cập nhật và tải xuống ban đầu. Để không phải trả phí dữ liệu, hãy kết nối với Wi‑Fi."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"CẢNH BÁO: Nếu bạn bỏ qua Wi‑Fi, thiết bị của bạn sẽ chỉ sử dụng dữ liệu di động cho bản cập nhật và tải xuống ban đầu. Để không phải trả phí dữ liệu, hãy kết nối với Wi‑Fi."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"CẢNH BÁO: Nếu bạn bỏ qua Wi‑Fi, điện thoại của bạn sẽ chỉ sử dụng dữ liệu di động cho bản cập nhật và tải xuống ban đầu. Để không phải trả phí dữ liệu, hãy kết nối với Wi‑Fi."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="2393880108322835846">"CẢNH BÁO: Nếu bạn bỏ qua Wi‑Fi, máy tính bảng của bạn sẽ không có kết nối Internet để sử dụng cho bất kỳ bản cập nhật hoặc tải xuống ban đầu nào."</string>
-    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1707391993265558787">"CẢNH BÁO: Nếu bạn bỏ qua Wi‑Fi, thiết bị của bạn sẽ không có kết nối Internet để sử dụng cho bất kỳ bản cập nhật hoặc tải xuống ban đầu nào."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="1556858507920033022">"CẢNH BÁO: Nếu bạn bỏ qua Wi‑Fi, điện thoại của bạn sẽ không có kết nối Internet để sử dụng cho bất kỳ bản cập nhật hoặc tải xuống ban đầu nào."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Nếu bạn bỏ qua Wi-Fi:\n\nMáy tính bảng của bạn sẽ không có kết nối Internet.\n\nBạn sẽ không nhận được bản cập nhật phần mềm cho đến khi bạn kết nối Internet.\n\nTại thời điểm này, bạn không thể kích hoạt tính năng bảo vệ thiết bị."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Nếu bạn bỏ qua Wi-Fi:\n\nThiết bị của bạn sẽ không có kết nối Internet.\n\nBạn sẽ không nhận được bản cập nhật phần mềm cho đến khi bạn kết nối Internet.\n\nTại thời điểm này, bạn không thể kích hoạt tính năng bảo vệ thiết bị."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Nếu bạn bỏ qua Wi-Fi:\n\nĐiện thoại của bạn sẽ không có kết nối Internet.\n\nBạn sẽ không nhận được bản cập nhật phần mềm cho đến khi bạn kết nối Internet.\n\nTại thời điểm này, bạn không thể kích hoạt tính năng bảo vệ thiết bị."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Máy tính bảng không thể kết nối với mạng Wi‑Fi này."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"Thiết bị không thể kết nối với mạng Wi‑Fi này."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Điện thoại không thể kết nối với mạng Wi‑Fi này."</string>
@@ -761,7 +760,6 @@
     <string name="ring_volume_title" msgid="7938706566797464165">"Âm lượng chuông"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Rung khi im lặng"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Âm thanh thông báo mặc định"</string>
-    <string name="heads_up_enabled_title" msgid="1031078221910921622">"Bật lên nếu mức độ ưu tiên cao"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Nhạc chuông"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Thông báo"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Sử dụng âm lượng cuộc gọi đến cho thông báo"</string>
@@ -834,7 +832,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Độ sáng tự động"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Nhấc lên để đánh thức"</string>
     <string name="doze_title" msgid="2259176504273878294">"Màn hình xung quanh"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"Đánh thức màn hình khi chạm vào thiết bị hoặc khi có thông báo"</string>
+    <string name="doze_summary" msgid="7128970177894383698">"Bật màn hình khi bạn cầm thiết bị hoặc nhận được thông báo"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Kích thước phông chữ"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Kích thước phông chữ"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Cài đặt khóa thẻ SIM"</string>
@@ -862,6 +860,10 @@
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Hủy"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"Tìm thấy nhiều SIM"</string>
     <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>
+    <string name="sim_preferred_title" msgid="5567909634636045268">"Cập nhật thẻ SIM ưu tiên?"</string>
+    <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> là SIM duy nhất trong thiết bị của bạn. Bạn có muốn sử dụng SIM này cho dữ liệu di động, cuộc gọi và tin nhắn SMS không?"</string>
     <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>
@@ -1012,6 +1014,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Tác vụ này sẽ xóa tất cả dữ liệu từ "<b>"bộ nhớ trong"</b>" của máy tính bảng, bao gồm:\n\n"<li>"Tài khoản Google của bạn"</li>\n<li>"Dữ liệu và cài đặt hệ thống và ứng dụng"</li>\n<li>"Ứng dụng đã tải xuống"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Tác vụ này sẽ xóa tất cả dữ liệu từ "<b>"bộ nhớ trong"</b>" của điện thoại, bao gồm:\n\n"<li>"Tài khoản Google của bạn"</li>\n<li>"Dữ liệu và cài đặt hệ thống và ứng dụng"</li>\n<li>"Ứng dụng đã tải xuống"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Bạn hiện đã đăng nhập vào các tài khoản sau đây:\n"</string>
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Có người dùng khác trên thiết bị này.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Nhạc"</li>\n<li>"Ảnh"</li>\n<li>"Dữ liệu người dùng khác"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Để xóa nhạc, hình ảnh và dữ liệu người dùng khác, cần xóa "<b>"bộ lưu trữ USB"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Đồng thời, để xóa nhạc, hình ảnh và dữ liệu người dùng khác, cần xóa "<b>"thẻ"</b>"."</string>
@@ -1023,7 +1026,6 @@
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Đặt lại điện thoại"</string>
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Xóa tất cả thông tin cá nhân và ứng dụng đã tải xuống của bạn? Bạn không thể hoàn nguyên tác vụ này!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Xóa mọi thứ"</string>
-    <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Vẽ hình mở khóa của bạn"</string>
     <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Bạn cần vẽ hình mở khóa để xác nhận thiết lập lại dữ liệu ban đầu."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Không có tác vụ đặt lại nào được thực hiện vì dịch vụ Xóa hệ thống không khả dụng."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Đặt lại?"</string>
@@ -1041,7 +1043,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"Xóa bộ lưu trữ USB, xóa tất cả các tệp được lưu trữ ở đó? Bạn không thể hoàn nguyên tác vụ này!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Xóa thẻ SD, xóa tất cả các tệp được lưu trữ ở đó? Bạn không thể hoàn nguyên tác vụ này!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Xóa mọi thứ"</string>
-    <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Vẽ hình mở khóa của bạn"</string>
     <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Bạn cần vẽ hình mở khóa để xác nhận rằng bạn muốn xóa bộ lưu trữ USB."</string>
     <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Bạn cần vẽ hình mở khóa để xác nhận rằng bạn muốn xóa thẻ SD."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Cài đặt cuộc gọi"</string>
@@ -1087,6 +1088,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Vui lòng lắp thẻ SIM và khởi động lại"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Vui lòng kết nối internet"</string>
     <string name="location_title" msgid="1029961368397484576">"Vị trí của tôi"</string>
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Hồ sơ công việc"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Vị trí của hồ sơ công việc"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Đã được công ty bạn tắt"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Chế độ"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Độ chính xác cao"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Tiết kiệm pin"</string>
@@ -1124,6 +1128,7 @@
     <string name="copyright_title" msgid="865906688917260647">"Bản quyền"</string>
     <string name="license_title" msgid="1990487604356037871">"Giấy phép"</string>
     <string name="terms_title" msgid="7697580845616764642">"Điều khoản và điều kiện"</string>
+    <string name="webview_license_title" msgid="2813507464175738967">"Giấy phép WebView hệ thống"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Hình nền"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Nhà cung cấp ảnh vệ tinh:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Giấy phép nguồn mở"</string>
@@ -1237,7 +1242,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Bộ nhớ USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Trên thẻ SD"</string>
     <string name="disabled" msgid="9206776641295849915">"Đã tắt"</string>
-    <string name="not_installed" msgid="1475144352069281880">"Chưa cài đặt"</string>
+    <string name="not_installed" msgid="2797554494953450291">"Chưa c.đặt cho người dùng này"</string>
     <string name="no_applications" msgid="7336588977497084921">"Không có ứng dụng."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Bộ nhớ trong"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Bộ nhớ USB"</string>
@@ -1434,8 +1439,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Màn hình sẽ không bao giờ chuyển sang chế độ nghỉ khi sạc"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Bật nhật ký theo dõi HCI Bluetooth"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Giữ tất cả các gói HCI bluetooth trong một tệp"</string>
-    <string name="oem_unlock_enable" msgid="6629321276287913315">"Cho phép mở khóa OEM"</string>
-    <string name="oem_unlock_enable_summary" msgid="3546686263996628110">"Cho phép thiết bị được mở khóa OEM"</string>
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"Mở khóa OEM"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Cho phép mở khóa trình khởi động"</string>
+    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Nhập mã PIN của bạn"</string>
+    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Nhập mã PIN thiết bị của bạn để bật tính năng mở khóa OEM"</string>
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Cho phép mở khóa OEM?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"CẢNH BÁO: Tính năng Bảo vệ thiết bị sẽ không hoạt động trên thiết bị này trong khi bạn bật cài đặt này."</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Chứng nhận hiển thị không dây"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Bật ghi nhật ký chi tiết Wi‑Fi"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Chuyển vùng Wi‑Fi tích cực sang mạng DĐ"</string>
@@ -1538,6 +1547,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"Phụ đề sẽ trông như thế này"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"Mặc định"</string>
+    <string name="color_title" msgid="4258931051732243983">"Màu"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"Mặc định"</string>
     <string name="color_none" msgid="3475640044925814795">"Không có"</string>
     <string name="color_white" msgid="8045195170201590239">"Trắng"</string>
@@ -1595,12 +1605,12 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"<xliff:g id="REMAIN">%1$s</xliff:g> còn lại"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> để tính phí"</string>
-    <string name="power_discharging_duration" msgid="7125493014448497620">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - còn khoảng <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="power_charging" msgid="712751285832976915">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="STATE">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration" msgid="4802183864773082009">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> cho đến khi đầy"</string>
-    <string name="power_charging_duration_ac" msgid="3611179931297824699">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> cho đến khi đầy trên AC"</string>
-    <string name="power_charging_duration_usb" msgid="1106605348913397583">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> cho đến khi đầy qua USB"</string>
-    <string name="power_charging_duration_wireless" msgid="633606920144617227">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> cho đến khi đầy từ không dây"</string>
+    <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> - còn khoảng <xliff:g id="TIME">%2$s</xliff:g>"</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> cho đến khi đầy"</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> cho đến khi đầy khi cắm vào nguồn AC"</string>
+    <string name="power_charging_duration_usb" msgid="182405645340976546">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> cho đến khi đầy qua USB"</string>
+    <string name="power_charging_duration_wireless" msgid="1829295708243159464">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> cho đến khi đầy từ không dây"</string>
     <string name="power_usage_list_summary" msgid="2409288197839512482">"Sử dụng kể từ lần sạc đầy cuối cùng"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Sử dụng pin từ khi tháo đầu cắm"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Sử dụng pin từ khi đặt lại"</string>
@@ -1617,7 +1627,6 @@
     <string name="awake" msgid="387122265874485088">"Thời gian thức của thiết bị"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Thời gian bật Wi-Fi"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Thời gian bật Wi‑Fi"</string>
-    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Chi tiết lịch sử"</string>
     <string name="details_title" msgid="3792801565213935385">"Sử dụng các chi tiết"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Sử dụng các chi tiết"</string>
@@ -1689,7 +1698,7 @@
     <string name="battery_saver" msgid="1426682272004907982">"Trình tiết kiệm pin"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Tự động bật"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Không bao giờ"</string>
-    <string name="battery_saver_turn_on_automatically_pct" msgid="3033681629861428940">"ở %1$d%% pin"</string>
+    <string name="battery_saver_turn_on_automatically_pct" msgid="7536784431655058267">"ở mức pin %1$s"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Số liệu thống kê về quy trình"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Số liệu thống kê chi tiết về các quy trình đang chạy"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Mức sử dụng bộ nhớ"</string>
@@ -1813,7 +1822,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Dựa trên phần cứng"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Chỉ phần mềm"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"Không có thông tin đăng nhập cho người dùng này"</string>
-    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Vẽ hình mở khóa của bạn"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Bạn cần vẽ hình mở khóa của mình để xác nhận cài đặt thông tin xác thực."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Nhập mật khẩu cho vùng lưu trữ thông tin xác thực."</string>
@@ -1843,6 +1851,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"Bao gồm dữ liệu ứng dụng"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Tự động khôi phục"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Khi cài đặt lại một ứng dụng, khôi phục dữ liệu và cài đặt đã sao lưu"</string>
+    <string name="backup_inactive_title" msgid="5355557151569037197">"Dịch vụ sao lưu không hoạt động."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"Tùy chọn này do chính sách thiết bị của bạn đặt."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"MK sao lưu của m.tính"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Sao lưu toàn bộ tới máy tính hiện không được bảo vệ"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Chạm để thay đổi hoặc xóa mật khẩu dành cho bộ sao lưu toàn bộ tới máy tính"</string>
@@ -1952,7 +1962,11 @@
     <string name="enter_password" msgid="8035706727471334122">"Để bắt đầu sử dụng thiết bị Android, hãy nhập mật khẩu của bạn"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Để bắt đầu sử dụng thiết bị Android, hãy nhập mã PIN của bạn"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Để bắt đầu sử dụng thiết bị Android, hãy vẽ hình mẫu của bạn"</string>
-    <string name="try_again" msgid="4272075051293936921">"Thử lại."</string>
+    <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"Hình sai"</string>
+    <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"Mật khẩu sai"</string>
+    <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"Mã PIN sai"</string>
+    <string name="checking_decryption" msgid="8287458611802609493">"Đang kiểm tra…"</string>
+    <string name="starting_android" msgid="8581493237458496835">"Đang khởi động Android"</string>
     <string name="delete" msgid="4219243412325163003">"Xóa"</string>
     <string name="misc_files" msgid="6720680815969643497">"Tệp khác"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"đã chọn <xliff:g id="NUMBER">%1$d</xliff:g> trong tổng số <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -1990,8 +2004,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Luôn sử dụng GPU để tổng hợp màn hình"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"Mô phỏng không gian màu"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Bật theo dõi OpenGL"</string>
-    <string name="use_nuplayer" msgid="5699257393367904387">"Sử dụng NuPlayer (thử nghiệm)"</string>
-    <string name="use_nuplayer_summary" msgid="1991479067478516714">"Sử dụng NuPlayer thay vì AwesomePlayer"</string>
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"Dùng AwesomePlayer (ko dùng nữa)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"Dùng AwesomePlayer thay vì NuPlayer cho hầu hết phát lại phương tiện"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"Tắt định tuyến âm thanh USB"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"Tắt định tuyến tự động tới thiết bị âm thanh ngoại vi USB"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Hiển thị ranh giới bố cục"</string>
@@ -2167,7 +2181,6 @@
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Thêm người dùng hoặc tiểu sử"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Thêm người dùng"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Tiểu sử bị hạn chế"</string>
-    <string name="user_summary_managed_profile" msgid="7369539529693048111">"Hồ sơ công việc"</string>
     <string name="user_need_lock_message" msgid="2596365678651842785">"Trước khi bạn có thể tạo tiểu sử bị hạn chế, bạn sẽ cần thiết lập một màn hình khóa để bảo vệ các ứng dụng và dữ liệu cá nhân của bạn."</string>
     <string name="user_set_lock_button" msgid="8311219392856626841">"Thiết lập khóa"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Chưa thiết lập"</string>
@@ -2298,11 +2311,13 @@
     <string name="sim_cellular_data_unavailable_summary" msgid="3654805961942166428">"Chạm để chọn SIM dữ liệu"</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"Luôn sử dụng SIM này để gọi"</string>
     <string name="select_sim_for_data" msgid="2366081042162853044">"Chọn SIM cho dữ liệu"</string>
+    <string name="data_switch_started" msgid="2040761479817166311">"Đang chuyển SIM dữ liệu, quá trình này có thể mất tới một phút..."</string>
     <string name="select_sim_for_calls" msgid="3503094771801109334">"Gọi bằng"</string>
     <string name="sim_select_card" msgid="211285163525563293">"Chọn thẻ SIM"</string>
     <string name="sim_card_number_title" msgid="7845379943474336488">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"Không có SIM"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"Tên SIM"</string>
+    <string name="sim_name_hint" msgid="7038643345238968930">"Nhập tên SIM"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"Khe cắm thẻ SIM %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Nhà cung cấp dịch vụ"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Số"</string>
@@ -2312,7 +2327,6 @@
     <string name="color_purple" msgid="3888532466427762504">"Tía"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"Không có thẻ SIM nào được lắp"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"Trạng thái SIM"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"Thông tin liên quan tới SIM"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"Gọi lại từ SIM mặc định"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"SIM cho các cuộc gọi đi"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Cài đặt cuộc gọi khác"</string>
@@ -2320,8 +2334,11 @@
     <string name="preferred_network_offload_header" msgid="2321173571529106767">"Tắt phát sóng tên mạng"</string>
     <string name="preferred_network_offload_footer" msgid="5857279426054744020">"Tắt phát sóng tên mạng sẽ ngăn các bên thứ ba truy cập vào thông tin mạng của bạn."</string>
     <string name="preferred_network_offload_popup" msgid="2252915199889604600">"Việc tắt phát sóng tên mạng sẽ ngăn kết nối tự động với các mạng ẩn."</string>
+    <string name="sim_signal_strength" msgid="9144010043784767984">"<xliff:g id="DBM">%1$d</xliff:g> dBm <xliff:g id="ASU">%2$d</xliff:g> asu"</string>
+    <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>
+    <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Hỏi mỗi lần gọi"</string>
     <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>
@@ -2330,22 +2347,22 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Tìm kiếm gần đây"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Kết quả"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi kết nối mạng"</string>
-    <string name="keywords_more_default_sms_app" msgid="2744404159003574745">"tin nhắn văn bản"</string>
-    <string name="keywords_more_mobile_networks" msgid="7813380887358745769">"di động ô nhà cung cấp không dây"</string>
+    <string name="keywords_more_default_sms_app" msgid="895656981962034647">"tin nhắn văn bản nhắn tin tin nhắn nhắn tin"</string>
+    <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"di động điện thoại nhà cung cấp không dây dữ liệu 4g 3g 2g lte"</string>
     <string name="keywords_home" msgid="3626170808219458848">"trình chạy"</string>
     <string name="keywords_display" msgid="6709007669501628320">"màn hình màn hình cảm ứng"</string>
-    <string name="keywords_display_brightness_level" msgid="8636451602230815191">"làm mờ màn hình màn hình cảm ứng"</string>
-    <string name="keywords_display_auto_brightness" msgid="8070218600502753102">"làm mờ màn hình màn hình cảm ứng"</string>
-    <string name="keywords_display_wallpaper" msgid="4315466287469834939">"nền"</string>
+    <string name="keywords_display_brightness_level" msgid="8923289340474728990">"làm mờ màn hình màn hình cảm ứng pin"</string>
+    <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"làm mờ màn hình màn hình cảm ứng pin"</string>
+    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"nền cá nhân hóa tùy chỉnh màn hình"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"kích thước văn bản"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"chiếu"</string>
-    <string name="keywords_storage" msgid="7007275853993419928">"dung lượng ổ đĩa ổ đĩa cứng"</string>
-    <string name="keywords_battery" msgid="3992479295298655138">"nguồn"</string>
-    <string name="keywords_spell_checker" msgid="4509482591225399210">"chính tả"</string>
+    <string name="keywords_storage" msgid="6572905220031852173">"dung lượng đĩa ổ đĩa cứng thiết bị sử dụng"</string>
+    <string name="keywords_battery" msgid="2096185085932675704">"phí sử dụng năng lượng"</string>
+    <string name="keywords_spell_checker" msgid="6106749039734174140">"chính tả từ điển kiểm tra chính tả tự động sửa"</string>
     <string name="keywords_voice_input" msgid="3519547605812413860">"trình nhận dạng nhập giọng nói nói ngôn ngữ thiết bị rảnh tay nhận dạng thiết bị rảnh tay từ xúc phạm âm thanh lịch sử tai nghe bluetooth"</string>
-    <string name="keywords_text_to_speech_output" msgid="8207889472282225512">"tốc độ ngôn ngữ mặc định nói đang nói"</string>
-    <string name="keywords_date_and_time" msgid="7666950126499155141">"đồng hồ"</string>
-    <string name="keywords_factory_data_reset" msgid="3693730656843989732">"xóa bỏ xóa"</string>
+    <string name="keywords_text_to_speech_output" msgid="392447904221657930">"xếp hạng ngôn ngữ mặc định nói đang nói tts trợ năng trình đọc khiếm thị"</string>
+    <string name="keywords_date_and_time" msgid="2631808108134830066">"đồng hồ quân sự"</string>
+    <string name="keywords_factory_data_reset" msgid="4355133848707691977">"xóa sạch xóa bỏ khôi phục xóa loại bỏ"</string>
     <string name="keywords_printing" msgid="1701778563617114846">"máy in"</string>
     <string name="keywords_sounds_and_notifications" msgid="5965996187974887000">"loa tiếng bíp"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="2912933812460077912">"không không làm phiền gián đoạn gián đoạn ngắt"</string>
@@ -2354,7 +2371,7 @@
     <string name="keywords_location_mode" msgid="8584992704568356084">"độ chính xác"</string>
     <string name="keywords_accounts" msgid="1957925565953357627">"tài khoản"</string>
     <string name="keywords_users" msgid="4673901601478559100">"hạn chế hạn chế bị hạn chế"</string>
-    <string name="keywords_keyboard_and_ime" msgid="1103378692379215672">"sửa văn bản sửa âm thanh rung tự động ngôn ngữ cử chỉ đề xuất đề xuất chủ đề từ xúc phạm nhập biểu tượng cảm xúc"</string>
+    <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"sửa văn bản sửa âm thanh rung tự động ngôn ngữ cử chỉ đề xuất đề xuất chủ đề từ xúc phạm nhập biểu tượng cảm xúc quốc tế"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"trượt mật khẩu hình mẫu mã pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Thiết lập thẻ NFC Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Ghi"</string>
@@ -2371,7 +2388,6 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Âm lượng thông báo"</string>
     <string name="zen_mode_settings_title" msgid="7014915558669122902">"Gián đoạn"</string>
     <string name="zen_mode_option_title" msgid="5061978632306007914">"Khi cuộc gọi và thông báo đến"</string>
-    <string name="zen_mode_option_title_novoice" msgid="6680706009915204785">"Khi thông báo đến"</string>
     <string name="zen_mode_option_off" msgid="3167702608910820883">"Luôn cho phép gián đoạn"</string>
     <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Chỉ cho phép các gián đoạn ưu tiên"</string>
     <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Không cho phép gián đoạn"</string>
@@ -2429,14 +2445,17 @@
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Xong"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Cho đến khi bạn tắt tính năng này"</string>
     <string name="zen_mode_important_category" msgid="8123274463331022993">"Gián đoạn ưu tiên"</string>
-    <string name="zen_mode_downtime_category" msgid="4730179065426038108">"T.gian ko hoạt động (chỉ g.đoạn ưu tiên)"</string>
+    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Thời gian ngừng hoạt động"</string>
     <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Ngày"</string>
     <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Không có"</string>
+    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Được phép gián đoạn"</string>
+    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Chỉ ưu tiên"</string>
+    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Không có"</string>
     <string name="zen_mode_automation_category" msgid="4653551005950835761">"Tự động hóa"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Tự động bật"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Không bao giờ"</string>
-    <string name="zen_mode_phone_calls" msgid="8956214416859303966">"Cuộc gọi"</string>
+    <string name="zen_mode_calls" msgid="7051492091133751208">"Cuộc gọi"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Tin nhắn"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Cuộc gọi/tin nhắn từ"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Bất kỳ ai"</string>
@@ -2450,7 +2469,9 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Buổi tối cuối tuần"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Thời gian bắt đầu"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Thời gian kết thúc"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> ngày hôm sau"</string>
+    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> ngày tiếp theo"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> hoặc mọi báo thức trước đây"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> ngày tiếp theo hoặc mọi báo thức trước đây"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Thông báo ứng dụng"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Cài đặt thông báo"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Gửi phản hồi về thiết bị này"</string>
@@ -2458,7 +2479,11 @@
     <string name="switch_on_text" msgid="1124106706920572386">"Bật"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Tắt"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"Ghim màn hình"</string>
-    <string name="screen_pinning_description" msgid="7091642350452605379">"Khi được bật, bạn có thể sử dụng khóa màn hình để tiếp tục xem màn hình hiện tại cho đến khi bạn bỏ khóa.\n\nĐể sử dụng khóa màn hình:\n\n1. Đảm bảo khóa màn hình được bật.\n\n2. Mở màn hình mà bạn muốn khóa.\n\n3. Chạm vào Tổng quan.\n\n4. Chạm vào biểu tượng khóa."</string>
+    <string name="screen_pinning_description" msgid="1137904524037468263">"Khi bật cài đặt này, bạn có thể sử dụng tính năng ghim màn hình để duy trì hiển thị màn hình hiện tại cho đến khi bạn bỏ ghim.\n\nĐể sử dụng tính năng ghim màn hình:\n\n1. Nhớ bật tính năng ghim màn hình.\n\n2. Mở màn hình bạn muốn ghim.\n\n3. Chạm vào Tổng quan.\n\n4. Vuốt lên rồi chạm vào biểu tượng ghim."</string>
+    <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Hỏi hình mở khóa trước khi bỏ khóa màn hình"</string>
+    <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Hỏi mã PIN trước khi bỏ khóa màn hình"</string>
+    <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Hỏi mật khẩu trước khi bỏ khóa màn hình"</string>
+    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Khóa thiết bị khi bỏ khóa màn hình"</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Hồ sơ công việc"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Thử nghiệm)"</string>
     <string name="display_auto_rotate_title" msgid="6176450657107806043">"Khi xoay thiết bị"</string>
@@ -2467,7 +2492,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Giữ nguyên chế độ xem ngang"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Giữ nguyên hướng hiện tại"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"Thông tin IMEI"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"Thông tin liên quan đến IMEI"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Mã hóa"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Tiếp tục"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"Bạn có thể bảo vệ thiết bị này hơn nữa bằng cách yêu cầu mã PIN của mình trước khi khởi động thiết bị. Thiết bị không thể nhận cuộc gọi, tin nhắn hoặc thông báo, bao gồm cả báo thức cho đến khi khởi động thiết bị. \n\nĐiều này giúp bảo vệ dữ liệu trên các thiết bị bị mất hoặc lấy cắp."</string>
@@ -2485,4 +2509,7 @@
     <string name="encrypt_talkback_dialog_message_pin" msgid="1890374082842868489">"Khi bạn nhập mã PIN của mình để khởi động thiết bị này, các dịch vụ trợ năng như <xliff:g id="SERVICE">%1$s</xliff:g> sẽ chưa khả dụng."</string>
     <string name="encrypt_talkback_dialog_message_pattern" msgid="4474332516537386384">"Khi bạn nhập mẫu của mình để khởi động thiết bị này, các dịch vụ trợ năng như <xliff:g id="SERVICE">%1$s</xliff:g> sẽ chưa khả dụng."</string>
     <string name="encrypt_talkback_dialog_message_password" msgid="8166099418487083927">"Khi bạn nhập mật khẩu của mình để khởi động thiết bị này, các dịch vụ trợ năng như <xliff:g id="SERVICE">%1$s</xliff:g> sẽ chưa khả dụng."</string>
+    <string name="imei_information_title" msgid="8499085421609752290">"Thông tin IMEI"</string>
+    <string name="imei_information_summary" msgid="2074095606556565233">"Thông tin liên quan đến IMEI"</string>
+    <string name="slot_number" msgid="3762676044904653577">"(Khe cắm<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-zh-rCN/arrays.xml b/res/values-zh-rCN/arrays.xml
index 98e956e..c53a0e9 100644
--- a/res/values-zh-rCN/arrays.xml
+++ b/res/values-zh-rCN/arrays.xml
@@ -527,4 +527,12 @@
     <item msgid="4338089220026248848">"已缓存（活动客户端）"</item>
     <item msgid="6652164677254579050">"已缓存（空）"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"青色"</item>
+    <item msgid="8332294763632946560">"蓝色"</item>
+    <item msgid="2023216417616991392">"靛青色"</item>
+    <item msgid="3170497246594232819">"紫色"</item>
+    <item msgid="4608643045752965568">"粉红色"</item>
+    <item msgid="6131821495505931173">"红色"</item>
+  </string-array>
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index b7adb01..d6b81af 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>
@@ -180,7 +180,6 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"“%1$s”想要查看您的消息。要向“%2$s”授予权限吗？"</string>
     <string name="date_and_time" msgid="9062980487860757694">"日期和时间"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"选择时区"</string>
-    <string name="normal_date_format" msgid="7636406984925498359">"所在区域 (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"预览:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"字号："</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -291,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>
@@ -322,8 +321,6 @@
     <string name="date_time_set_timezone" msgid="5045627174274377814">"选择时区"</string>
     <string name="date_time_set_date_title" msgid="6928286765325608604">"日期"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"设置日期"</string>
-    <string name="date_time_date_format_title" msgid="3976171711988766411">"日期格式"</string>
-    <string name="date_time_date_format" msgid="6951498879879281102">"选择日期格式"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"按字母顺序排序"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"按时区排序"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"日期"</string>
@@ -372,7 +369,8 @@
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"正在加密您的手机（已完成 <xliff:g id="PERCENT">^1</xliff:g>%），请耐心等待。"</string>
     <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"您的平板电脑正在加密，请耐心等待。剩余时间：<xliff:g id="DURATION">^1</xliff:g>"</string>
     <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"您的手机正在加密，请耐心等待。剩余时间：<xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"<xliff:g id="DELAY">^1</xliff:g>秒后重试。"</string>
+    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"要解锁您的平板电脑，请将其关机然后再重启。"</string>
+    <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"要解锁您的手机，请将其关机然后再重启。"</string>
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"警告：如果解锁尝试再失败<xliff:g id="COUNT">^1</xliff:g>次，您的设备将被清空！"</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"键入密码"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"加密失败"</string>
@@ -385,9 +383,9 @@
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"选择屏幕锁定方式"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"选择备份锁"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"屏幕锁定方式"</string>
-    <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"更改锁定屏幕"</string>
+    <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"更改屏幕锁定方式"</string>
     <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"更改或关闭图案、PIN码或密码保护"</string>
-    <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"选择锁定屏幕的方法"</string>
+    <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"选择屏幕锁定方式"</string>
     <string name="unlock_backup_info_summary" msgid="108524727803788172">"当人脸解锁识别不出您时，您希望如何解锁？"</string>
     <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"无"</string>
     <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
@@ -401,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>
@@ -412,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>
@@ -556,13 +556,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"将基座用作免提电话"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"用于音乐和媒体"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"记住设置"</string>
-    <string name="wifi_assistant_intro_setup" msgid="4605105515416995110">"全新功能\nWLAN助手"</string>
-    <string name="wifi_assistant_no_thanks" msgid="2776983751990143934">"不用了"</string>
-    <string name="wifi_assistant_setup" msgid="3772423650475730906">"设置"</string>
-    <string name="wifi_assistant_card_message" msgid="107811647784658536">"WLAN助手可帮助您自动连接到可用网络。"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"WLAN助手"</string>
-    <string name="wifi_assistant_title_message" msgid="6240721017579074015">"<xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g>会自动将您的设备连接到可用的最佳WLAN网络"</string>
-    <string name="wifi_assistant_open_app" msgid="4803044899535675063">"打开应用"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"已连接（通过 WLAN 助手）"</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>
@@ -592,7 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"WLAN设置"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"WLAN"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"设置和管理无线接入点"</string>
-    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"选择WLAN网络"</string>
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"选择 WLAN 网络"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"选择WLAN网络"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"正在打开WLAN…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"正在关闭WLAN…"</string>
@@ -607,8 +602,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"随时都可扫描"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"始终允许扫描网络"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"允许Google的位置信息服务和其他应用扫描网络（即使WLAN已关闭）"</string>
-    <string name="wifi_automatically_manage_title" msgid="6249976570008992746">"自动管理WLAN"</string>
-    <string name="wifi_automatically_manage_summary" msgid="6952470763378312488">"允许<xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g>管理您的WLAN网络连接"</string>
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"自动使用开放的 WLAN 网络"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"允许 WLAN 助手自动连接到评定为优质的开放网络上"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"选择助手"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"安装证书"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"为了提高位置信息精确度以及其他目的，Google 和其他应用可扫描附近的网络（在关闭了WLAN时也可进行扫描）。如果您不希望应用这么做，请进入“高级”&gt;“随时都可扫描”进行设置。"</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"应用可扫描附近的网络（在关闭了WLAN时也可进行扫描）。如果您不希望应用这么做，请进入“高级”&gt;“随时都可扫描”进行设置。"</string>
@@ -629,6 +625,7 @@
     <string name="wifi_menu_scan" msgid="1470911530412095868">"扫描"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"高级"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"连接到网络"</string>
+    <string name="wifi_menu_remember" msgid="8814185749388713796">"记住网络"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"取消保存网络"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"修改网络"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"写入NFC标签"</string>
@@ -673,9 +670,11 @@
     <string name="wifi_unspecified" msgid="5431501214192991253">"（未指定）"</string>
     <string name="wifi_remembered" msgid="4955746899347821096">"已保存"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"已停用"</string>
-    <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"已停用（互联网连接状况不佳）"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP 配置失败"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"WLAN 连接失败"</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"身份验证出现问题"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"不在范围内"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"未检测到任何互联网连接，因此不会自动重新连接。"</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"可使用 WPS"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" （可使用 WPS）"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"请输入您的网络密码"</string>
@@ -699,9 +698,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"警告：如果您跳过WLAN网络设置，您的平板电脑将只能通过移动数据网络进行初始下载和更新。为了避免产生数据流量费，请连接到WLAN网络。"</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"警告：如果您跳过WLAN网络设置，您的设备将只能通过移动数据网络进行初始下载和更新。为了避免产生数据流量费，请连接到WLAN网络。"</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"警告：如果您跳过WLAN网络设置，您的手机将只能通过移动数据网络进行初始下载和更新。为了避免产生数据流量费，请连接到WLAN网络。"</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="2393880108322835846">"警告：如果您跳过WLAN网络设置，您的平板电脑将无法连接到互联网进行任何初始下载或更新。"</string>
-    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1707391993265558787">"警告：如果您跳过WLAN网络设置，您的设备将无法连接到互联网进行任何初始下载或更新。"</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="1556858507920033022">"警告：如果您跳过WLAN网络设置，您的手机将无法连接到互联网进行任何初始下载或更新。"</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"如果您跳过 WLAN 网络设置：\n\n您的平板电脑将不会连接到互联网。\n\n您必须先连接到互联网，才能获取软件更新。\n\n您目前将无法启用设备保护功能。"</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"如果您跳过 WLAN 网络设置：\n\n您的设备将不会连接到互联网。\n\n您必须先连接到互联网，才能获取软件更新。\n\n您目前将无法启用设备保护功能。"</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"如果您跳过 WLAN 网络设置：\n\n您的手机将不会连接到互联网。\n\n您必须先连接到互联网，才能获取软件更新。\n\n您目前将无法启用设备保护功能。"</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"平板电脑无法连接到此WLAN网络。"</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"设备无法连接到此WLAN网络。"</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"手机无法连接到此WLAN网络。"</string>
@@ -761,7 +760,6 @@
     <string name="ring_volume_title" msgid="7938706566797464165">"铃声音量"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"静音时振动"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"默认通知提示音"</string>
-    <string name="heads_up_enabled_title" msgid="1031078221910921622">"弹出显示高优先级的通知"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"铃声"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"通知"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"将来电音量用作通知音量"</string>
@@ -834,7 +832,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"自动调整亮度"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"拿起设备时唤醒"</string>
     <string name="doze_title" msgid="2259176504273878294">"主动显示"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"拿起设备或收到通知时唤醒屏幕"</string>
+    <string name="doze_summary" msgid="7128970177894383698">"拿起设备或收到通知时唤醒屏幕"</string>
     <string name="title_font_size" msgid="4405544325522105222">"字体大小"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"字体大小"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM卡锁定设置"</string>
@@ -862,6 +860,10 @@
     <string name="sim_enter_cancel" msgid="6240422158517208036">"取消"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"找到多张SIM卡"</string>
     <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>
+    <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 卡用于连接移动数据网络、通话或发送短信吗？"</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>
@@ -1012,6 +1014,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"此操作会清除您平板电脑"<b>"内部存储设备"</b>"中的所有数据，包括：\n\n"<li>"您的Google帐户"</li>\n<li>"系统和应用的数据和设置"</li>\n<li>"下载的应用"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"此操作会清除您手机"<b>"内部存储设备"</b>"中的所有数据，包括：\n\n"<li>"您的Google帐户"</li>\n<li>"系统和应用的数据和设置"</li>\n<li>"下载的应用"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"目前，您已登录以下帐户：\n"</string>
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"此设备上目前还有其他用户。\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"音乐"</li>\n<li>"照片"</li>\n<li>"其他的用户数据"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"要清除音乐、照片和其他用户数据，请清空该 "<b>"USB存储设备"</b>"。"</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"要清除音乐、图片和其他用户数据，您需要清空该 "<b>"SD卡"</b>"。"</string>
@@ -1023,7 +1026,6 @@
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"恢复手机出厂设置"</string>
     <string name="master_clear_final_desc" msgid="7209547812233487345">"要清除所有个人信息和下载的应用吗？请注意，此操作无法撤消！"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"清除全部内容"</string>
-    <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"绘制您的解锁图案"</string>
     <string name="master_clear_gesture_explanation" msgid="826193821455182780">"您需要绘制解锁图案以确认要恢复出厂设置。"</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"“系统清除”服务不可用，因此未执行恢复出厂设置操作。"</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"要恢复出厂设置吗？"</string>
@@ -1041,7 +1043,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"要清空USB存储设备（此操作会删除其中存储的全部文件）吗？请注意，此操作无法撤消！"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"要清空该SD卡（此操作会删除其中存储的全部文件）吗？请注意，此操作无法撤消！"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"清除全部内容"</string>
-    <string name="media_format_gesture_prompt" msgid="3109349468816856670">"绘制您的解锁图案"</string>
     <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"您需要绘制解锁图案以确认要清空USB存储设备。"</string>
     <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"您需要绘制解锁图案以确认要清空SD卡。"</string>
     <string name="call_settings_title" msgid="5188713413939232801">"通话设置"</string>
@@ -1087,6 +1088,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"请插入SIM卡，然后重新启动"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"请连接到互联网"</string>
     <string name="location_title" msgid="1029961368397484576">"我的位置"</string>
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"工作资料"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"工作资料存储位置"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"您的公司已将其关闭"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"模式"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"准确度高"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"耗电量低"</string>
@@ -1124,6 +1128,7 @@
     <string name="copyright_title" msgid="865906688917260647">"版权"</string>
     <string name="license_title" msgid="1990487604356037871">"许可"</string>
     <string name="terms_title" msgid="7697580845616764642">"条款"</string>
+    <string name="webview_license_title" msgid="2813507464175738967">"系统 WebView 许可"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"壁纸"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"卫星图像提供商：\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"开放源代码许可"</string>
@@ -1237,7 +1242,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB存储设备"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"SD卡中"</string>
     <string name="disabled" msgid="9206776641295849915">"已停用"</string>
-    <string name="not_installed" msgid="1475144352069281880">"未安装"</string>
+    <string name="not_installed" msgid="2797554494953450291">"未针对此用户安装"</string>
     <string name="no_applications" msgid="7336588977497084921">"无应用。"</string>
     <string name="internal_storage" msgid="1584700623164275282">"内部存储空间"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB存储设备"</string>
@@ -1434,8 +1439,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"充电时屏幕不会休眠"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"启用蓝牙 HCI 信息收集日志"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"捕获单个文件中的所有蓝牙 HCI 包"</string>
-    <string name="oem_unlock_enable" msgid="6629321276287913315">"启用OEM解锁"</string>
-    <string name="oem_unlock_enable_summary" msgid="3546686263996628110">"允许OEM解锁设备"</string>
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM 解锁"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"允许解锁引导加载程序"</string>
+    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"输入您的 PIN 码"</string>
+    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"输入您的设备 PIN 码即可启用 OEM 解锁"</string>
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"要允许 OEM 解锁吗？"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"警告：如果开启此设置，此设备上的设备保护功能将无法使用。"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"无线显示认证"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"启用WLAN详细日志记录功能"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"主动从WLAN网络切换到移动数据网络"</string>
@@ -1484,18 +1493,18 @@
     <string name="app_name_label" msgid="5440362857006046193">"应用"</string>
     <string name="last_time_used_label" msgid="8459441968795479307">"上次使用时间"</string>
     <string name="usage_time_label" msgid="295954901452833058">"使用时间"</string>
-    <string name="accessibility_settings" msgid="3975902491934816215">"辅助功能"</string>
-    <string name="accessibility_settings_title" msgid="2130492524656204459">"辅助功能设置"</string>
+    <string name="accessibility_settings" msgid="3975902491934816215">"无障碍"</string>
+    <string name="accessibility_settings_title" msgid="2130492524656204459">"无障碍设置"</string>
     <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_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>
+    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"无障碍快捷方式"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"开启"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"关闭"</string>
-    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"启用该功能后，您只需两步即可迅速启用辅助功能：\n\n步骤 1：持续按住电源按钮，直到您听到提示音或感觉到震动。\n\n步骤 2：用两根手指触摸屏幕并按住，直到您听到确认提示音。\n\n如果该设备有多个用户，在锁定屏幕上进行此快捷操作可暂时启用辅助功能，直到该设备解锁。"</string>
+    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"启用该功能后，您只需两步即可迅速启用无障碍功能：\n\n步骤 1：持续按住电源按钮，直到您听到提示音或感觉到震动。\n\n步骤 2：用两根手指触摸屏幕并按住，直到您听到确认提示音。\n\n如果该设备有多个用户，在锁定屏幕上进行此快捷操作可暂时启用无障碍功能，直到该设备解锁。"</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"大号字体"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="2567402942683463779">"高对比度文字"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"屏幕放大"</string>
@@ -1538,6 +1547,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"字幕外观示例"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"默认"</string>
+    <string name="color_title" msgid="4258931051732243983">"颜色"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"默认"</string>
     <string name="color_none" msgid="3475640044925814795">"无"</string>
     <string name="color_white" msgid="8045195170201590239">"白色"</string>
@@ -1552,7 +1562,7 @@
     <string name="enable_service_title" msgid="3061307612673835592">"要启用<xliff:g id="SERVICE">%1$s</xliff:g>吗？"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g>需要："</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"如果您开启<xliff:g id="SERVICE">%1$s</xliff:g>，您的设备将无法使用屏幕锁定来增强数据加密。"</string>
-    <string name="secure_lock_encryption_warning" msgid="464101518421886337">"由于您已开启辅助功能服务，因此您的设备将无法使用屏幕锁定来增强数据加密。"</string>
+    <string name="secure_lock_encryption_warning" msgid="464101518421886337">"由于您已开启无障碍服务，因此您的设备将无法使用屏幕锁定来增强数据加密。"</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"由于开启<xliff:g id="SERVICE">%1$s</xliff:g>会影响数据加密，因此您需要确认您的解锁图案。"</string>
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"由于开启<xliff:g id="SERVICE">%1$s</xliff:g>会影响数据加密，因此您需要确认您的 PIN 码。"</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"由于开启<xliff:g id="SERVICE">%1$s</xliff:g>会影响数据加密，因此您需要确认您的密码。"</string>
@@ -1595,12 +1605,12 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"电池剩余使用时间：<xliff:g id="REMAIN">%1$s</xliff:g>"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"充电剩余时间：<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g>"</string>
-    <string name="power_discharging_duration" msgid="7125493014448497620">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - 还可用大约<xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="power_charging" msgid="712751285832976915">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="STATE">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration" msgid="4802183864773082009">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - 还需<xliff:g id="TIME">%2$s</xliff:g>充满"</string>
-    <string name="power_charging_duration_ac" msgid="3611179931297824699">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - 还需<xliff:g id="TIME">%2$s</xliff:g>充满（交流电充电）"</string>
-    <string name="power_charging_duration_usb" msgid="1106605348913397583">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - 还需<xliff:g id="TIME">%2$s</xliff:g>充满（USB充电）"</string>
-    <string name="power_charging_duration_wireless" msgid="633606920144617227">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - 还需<xliff:g id="TIME">%2$s</xliff:g>充满（无线充电）"</string>
+    <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> - 还可用大约<xliff:g id="TIME">%2$s</xliff:g>"</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>充满"</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>充满（交流电充电）"</string>
+    <string name="power_charging_duration_usb" msgid="182405645340976546">"<xliff:g id="LEVEL">%1$s</xliff:g> - 还需<xliff:g id="TIME">%2$s</xliff:g>充满（USB充电）"</string>
+    <string name="power_charging_duration_wireless" msgid="1829295708243159464">"<xliff:g id="LEVEL">%1$s</xliff:g> - 还需<xliff:g id="TIME">%2$s</xliff:g>充满（无线充电）"</string>
     <string name="power_usage_list_summary" msgid="2409288197839512482">"上次充满后的电量使用情况"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"拔下电源后的电量消耗情况"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"重置后的电量消耗情况"</string>
@@ -1617,7 +1627,6 @@
     <string name="awake" msgid="387122265874485088">"设备唤醒时间"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"WLAN开启时间"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"WLAN开启时间"</string>
-    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> - <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"详细电量使用记录"</string>
     <string name="details_title" msgid="3792801565213935385">"详细使用情况"</string>
     <string name="details_subtitle" msgid="32593908269911734">"详细使用情况"</string>
@@ -1689,7 +1698,7 @@
     <string name="battery_saver" msgid="1426682272004907982">"节电助手"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"自动开启"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"一律不"</string>
-    <string name="battery_saver_turn_on_automatically_pct" msgid="3033681629861428940">"剩余%1$d%%电量时"</string>
+    <string name="battery_saver_turn_on_automatically_pct" msgid="7536784431655058267">"电量剩余%1$s时"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"进程统计信息"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"运行中进程的相关技术统计信息"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"内存用量"</string>
@@ -1813,7 +1822,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"硬件支持"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"仅限软件"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"此用户无法查看或修改凭据"</string>
-    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"绘制您的解锁图案"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"您需要绘制解锁图案，以确认凭据安装操作。"</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"键入凭据存储的密码。"</string>
@@ -1843,6 +1851,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"包括应用数据"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"自动还原"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"重新安装某个应用后，系统会还原已经备份的设置和数据"</string>
+    <string name="backup_inactive_title" msgid="5355557151569037197">"备份服务未启用。"</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"这是由您的设备规范所设定的。"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"桌面备份密码"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"桌面完整备份当前未设置密码保护"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"触摸可更改或删除用于桌面完整备份的密码"</string>
@@ -1952,7 +1962,11 @@
     <string name="enter_password" msgid="8035706727471334122">"要启动Android，请输入您的密码"</string>
     <string name="enter_pin" msgid="5305333588093263790">"要启动Android，请输入您的PIN码"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"要启动Android，请绘制您的解锁图案"</string>
-    <string name="try_again" msgid="4272075051293936921">"请重试。"</string>
+    <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"图案错误"</string>
+    <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"密码错误"</string>
+    <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"PIN 码错误"</string>
+    <string name="checking_decryption" msgid="8287458611802609493">"正在检查…"</string>
+    <string name="starting_android" msgid="8581493237458496835">"正在启动 Android"</string>
     <string name="delete" msgid="4219243412325163003">"删除"</string>
     <string name="misc_files" msgid="6720680815969643497">"其他文件"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"已选择 <xliff:g id="NUMBER">%1$d</xliff:g> 个，共 <xliff:g id="TOTAL">%2$d</xliff:g> 个"</string>
@@ -1990,8 +2004,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"始终使用 GPU 进行屏幕合成"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"模拟颜色空间"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"启用 OpenGL 跟踪"</string>
-    <string name="use_nuplayer" msgid="5699257393367904387">"使用NuPlayer（实验性功能）"</string>
-    <string name="use_nuplayer_summary" msgid="1991479067478516714">"使用NuPlayer代替AwesomePlayer"</string>
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"使用 AwesomePlayer（已弃用）"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"使用 AwesomePlayer（取代 NuPlayer）播放大多数媒体内容"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"关闭USB音频转接"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"关闭自动转接至USB音频外围设备的功能"</string>
     <string name="debug_layout" msgid="5981361776594526155">"显示布局边界"</string>
@@ -2167,7 +2181,6 @@
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"添加用户或个人资料"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"添加用户"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"受限个人资料"</string>
-    <string name="user_summary_managed_profile" msgid="7369539529693048111">"工作资料"</string>
     <string name="user_need_lock_message" msgid="2596365678651842785">"您需要先设置锁定屏幕来保护您的应用和个人数据，然后才可以创建受限个人资料。"</string>
     <string name="user_set_lock_button" msgid="8311219392856626841">"设置屏幕锁定方式"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"未设置"</string>
@@ -2292,17 +2305,19 @@
     <string name="sim_setup_wizard_title" msgid="1732682852692274928">"SIM卡"</string>
     <string name="sim_settings_title" msgid="6822745211458959756">"SIM卡"</string>
     <string name="sim_settings_summary" msgid="4050372057097516088">"<xliff:g id="SIM_NAME">%1$s</xliff:g> - <xliff:g id="SIM_NUMBER">%2$s</xliff:g>"</string>
-    <string name="sim_cards_changed_message" msgid="7900721153345139783">"SIM卡已更换"</string>
+    <string name="sim_cards_changed_message" msgid="7900721153345139783">"SIM 卡已更改"</string>
     <string name="sim_cards_changed_message_summary" msgid="5452545583546944683">"触摸即可进行设置"</string>
     <string name="sim_cellular_data_unavailable" msgid="9018555543451203035">"无法使用移动数据网络"</string>
     <string name="sim_cellular_data_unavailable_summary" msgid="3654805961942166428">"触摸即可选择上网用的SIM卡"</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"一律使用这张卡进行通话"</string>
     <string name="select_sim_for_data" msgid="2366081042162853044">"选择用于数据网络的 SIM 卡"</string>
+    <string name="data_switch_started" msgid="2040761479817166311">"正在切换用于连接数据网络的 SIM 卡，这最多可能需要 1 分钟的时间…"</string>
     <string name="select_sim_for_calls" msgid="3503094771801109334">"选择用于通话的 SIM 卡"</string>
     <string name="sim_select_card" msgid="211285163525563293">"选择SIM卡"</string>
     <string name="sim_card_number_title" msgid="7845379943474336488">"SIM卡<xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"未插入SIM卡"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"SIM卡名称"</string>
+    <string name="sim_name_hint" msgid="7038643345238968930">"输入 SIM 卡名称"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"SIM 卡插槽 %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"运营商"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"号码"</string>
@@ -2312,7 +2327,6 @@
     <string name="color_purple" msgid="3888532466427762504">"紫色"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"尚未插入SIM卡"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"SIM卡状态"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"SIM卡相关信息"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"使用默认SIM卡回电"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"用于外拨电话的SIM卡"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"其他通话设置"</string>
@@ -2320,8 +2334,11 @@
     <string name="preferred_network_offload_header" msgid="2321173571529106767">"关闭网络名称广播"</string>
     <string name="preferred_network_offload_footer" msgid="5857279426054744020">"关闭网络名称广播可防止第三方获取您的网络信息。"</string>
     <string name="preferred_network_offload_popup" msgid="2252915199889604600">"关闭网络名称广播可防止设备自动连接到隐藏的网络。"</string>
+    <string name="sim_signal_strength" msgid="9144010043784767984">"<xliff:g id="DBM">%1$d</xliff:g> dBm <xliff:g id="ASU">%2$d</xliff:g> asu"</string>
+    <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>
@@ -2330,22 +2347,22 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"最近执行的搜索"</string>
     <string name="search_results_label" msgid="4163304782363526148">"搜索结果"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"WLAN网络连接"</string>
-    <string name="keywords_more_default_sms_app" msgid="2744404159003574745">"短信 信息"</string>
-    <string name="keywords_more_mobile_networks" msgid="7813380887358745769">"蜂窝网络 手机运营商 无线 移动网络"</string>
+    <string name="keywords_more_default_sms_app" msgid="895656981962034647">"短信 信息 发短信 消息 发送消息"</string>
+    <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"蜂窝网络 手机运营商 无线 移动网络 数据网络 4G 3G 2G LTE"</string>
     <string name="keywords_home" msgid="3626170808219458848">"启动器 桌面"</string>
     <string name="keywords_display" msgid="6709007669501628320">"屏幕 触摸屏"</string>
-    <string name="keywords_display_brightness_level" msgid="8636451602230815191">"变暗 调暗 屏幕 触摸屏"</string>
-    <string name="keywords_display_auto_brightness" msgid="8070218600502753102">"变暗 调暗 屏幕 触摸屏"</string>
-    <string name="keywords_display_wallpaper" msgid="4315466287469834939">"背景 墙纸"</string>
+    <string name="keywords_display_brightness_level" msgid="8923289340474728990">"变暗 调暗 屏幕 触摸屏 电池"</string>
+    <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"变暗 调暗 屏幕 触摸屏 电池"</string>
+    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"背景 墙纸 个性化 自定义 显示 显示屏"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"字体大小"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"投影 投射"</string>
-    <string name="keywords_storage" msgid="7007275853993419928">"空间 磁盘 硬盘"</string>
-    <string name="keywords_battery" msgid="3992479295298655138">"电源"</string>
-    <string name="keywords_spell_checker" msgid="4509482591225399210">"拼写"</string>
+    <string name="keywords_storage" msgid="6572905220031852173">"空间 磁盘 硬盘 设备 使用量 使用情况"</string>
+    <string name="keywords_battery" msgid="2096185085932675704">"耗电量 充电"</string>
+    <string name="keywords_spell_checker" msgid="6106749039734174140">"拼写 字典 词典 拼写检查 自动更正"</string>
     <string name="keywords_voice_input" msgid="3519547605812413860">"识别程序 输入 语音 说出 语言 免触摸 识别 令人反感的字词 音频记录 蓝牙耳机"</string>
-    <string name="keywords_text_to_speech_output" msgid="8207889472282225512">"语速 语言 默认 说出 语音"</string>
-    <string name="keywords_date_and_time" msgid="7666950126499155141">"时钟"</string>
-    <string name="keywords_factory_data_reset" msgid="3693730656843989732">"擦除 删除"</string>
+    <string name="keywords_text_to_speech_output" msgid="392447904221657930">"语速 语言 默认 说出 语音 TTS 无障碍 阅读器 读者 盲人"</string>
+    <string name="keywords_date_and_time" msgid="2631808108134830066">"时钟 军用"</string>
+    <string name="keywords_factory_data_reset" msgid="4355133848707691977">"擦除 删除 恢复 清除 移除"</string>
     <string name="keywords_printing" msgid="1701778563617114846">"打印机"</string>
     <string name="keywords_sounds_and_notifications" msgid="5965996187974887000">"扬声器 提示音"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="2912933812460077912">"勿扰 请勿打扰 打扰 打断"</string>
@@ -2354,7 +2371,7 @@
     <string name="keywords_location_mode" msgid="8584992704568356084">"精确度 准确度"</string>
     <string name="keywords_accounts" msgid="1957925565953357627">"帐户"</string>
     <string name="keywords_users" msgid="4673901601478559100">"限制 受限"</string>
-    <string name="keywords_keyboard_and_ime" msgid="1103378692379215672">"文字 更正 提示音 振动 自动 语言 手势 建议 主题 令人反感的字词 输入 表情符号"</string>
+    <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"文字 文本 更正 声音 提示音 振动 自动 语言 手势 推荐 建议 主题 主题背景 令人反感的字词 输入 表情符号 国际 打字"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"滑动 密码 图案 PIN码"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"设置WLAN NFC标签"</string>
     <string name="write_tag" msgid="8571858602896222537">"写入"</string>
@@ -2371,7 +2388,6 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"通知音量"</string>
     <string name="zen_mode_settings_title" msgid="7014915558669122902">"打扰"</string>
     <string name="zen_mode_option_title" msgid="5061978632306007914">"收到来电和通知时"</string>
-    <string name="zen_mode_option_title_novoice" msgid="6680706009915204785">"收到通知时"</string>
     <string name="zen_mode_option_off" msgid="3167702608910820883">"一律允许打扰"</string>
     <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"仅允许优先打扰内容"</string>
     <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"禁止打扰"</string>
@@ -2429,14 +2445,17 @@
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"完成"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"直到您将其关闭"</string>
     <string name="zen_mode_important_category" msgid="8123274463331022993">"优先打扰内容"</string>
-    <string name="zen_mode_downtime_category" msgid="4730179065426038108">"休息时间（仅限优先打扰内容）"</string>
+    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"休息时间"</string>
     <string name="zen_mode_downtime_days" msgid="3361856902633311616">"星期几"</string>
     <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"无"</string>
+    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"允许打扰"</string>
+    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"仅限优先打扰"</string>
+    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"无"</string>
     <string name="zen_mode_automation_category" msgid="4653551005950835761">"自动"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"自动开启"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">"， "</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"一律不"</string>
-    <string name="zen_mode_phone_calls" msgid="8956214416859303966">"通话"</string>
+    <string name="zen_mode_calls" msgid="7051492091133751208">"通话"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"消息"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"来电者/消息发送者"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"任何人"</string>
@@ -2450,7 +2469,9 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"周一至周五夜间"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"开始时间"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"结束时间"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"次日<xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
+    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"次日 <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> 或早于该时间的闹钟响铃时"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"次日 <xliff:g id="FORMATTED_TIME">%s</xliff:g> 或早于该时间的闹钟响铃时"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"应用通知"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"通知设置"</string>
     <string name="device_feedback" msgid="3238056036766293294">"发送有关此设备的反馈"</string>
@@ -2458,7 +2479,11 @@
     <string name="switch_on_text" msgid="1124106706920572386">"开启"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"关闭"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"屏幕固定"</string>
-    <string name="screen_pinning_description" msgid="7091642350452605379">"开启固定屏幕功能后，您可以让设备一直显示某个屏幕，直到取消固定屏幕为止。\n\n要使用固定屏幕功能，请执行以下操作：\n\n1. 确保固定屏幕功能已开启。\n\n2. 打开您要固定的屏幕。\n\n3. 触摸“概览”按钮。\n\n4. 触摸图钉图标。"</string>
+    <string name="screen_pinning_description" msgid="1137904524037468263">"开启这项设置后，您可以使用固定屏幕功能让设备一直显示当前屏幕，直到取消固定为止。\n\n要使用固定屏幕功能，请执行以下操作：\n\n1. 确保固定屏幕功能已开启。\n\n2. 打开您要固定的屏幕。\n\n3. 触摸“概览”。\n\n4. 向上滑动，然后触摸图钉图标。"</string>
+    <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"取消固定屏幕前要求绘制解锁图案"</string>
+    <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"取消固定屏幕前要求输入 PIN 码"</string>
+    <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"取消固定屏幕前要求输入密码"</string>
+    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"取消固定屏幕时锁定设备"</string>
     <string name="managed_user_title" msgid="8101244883654409696">"工作资料"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"（实验性）"</string>
     <string name="display_auto_rotate_title" msgid="6176450657107806043">"设备旋转时"</string>
@@ -2467,7 +2492,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"保持横向"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"保持当前方向"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI信息"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI相关信息"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"加密"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"继续"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"您可以要求在设备启动前输入 PIN 码，为此设备提供进一步的保护。在启动前，该设备将无法接听电话、接收短信或通知（包括闹钟提醒）。\n\n这有助于保护丢失或被盗设备上的数据。"</string>
@@ -2482,7 +2506,10 @@
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"要求输入 PIN 码吗？"</string>
     <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"要求绘制图案吗？"</string>
     <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"要求输入密码吗？"</string>
-    <string name="encrypt_talkback_dialog_message_pin" msgid="1890374082842868489">"当您输入 PIN 码以启动此设备时，<xliff:g id="SERVICE">%1$s</xliff:g>等辅助功能服务还未开启。"</string>
-    <string name="encrypt_talkback_dialog_message_pattern" msgid="4474332516537386384">"当您绘制解锁图案以启动此设备时，<xliff:g id="SERVICE">%1$s</xliff:g>等辅助功能服务还未开启。"</string>
-    <string name="encrypt_talkback_dialog_message_password" msgid="8166099418487083927">"当您输入密码以启动此设备时，<xliff:g id="SERVICE">%1$s</xliff:g>等辅助功能服务还未开启。"</string>
+    <string name="encrypt_talkback_dialog_message_pin" msgid="1890374082842868489">"当您输入 PIN 码以启动此设备时，<xliff:g id="SERVICE">%1$s</xliff:g>等无障碍服务还未开启。"</string>
+    <string name="encrypt_talkback_dialog_message_pattern" msgid="4474332516537386384">"当您绘制解锁图案以启动此设备时，<xliff:g id="SERVICE">%1$s</xliff:g>等无障碍服务还未开启。"</string>
+    <string name="encrypt_talkback_dialog_message_password" msgid="8166099418487083927">"当您输入密码以启动此设备时，<xliff:g id="SERVICE">%1$s</xliff:g>等无障碍服务还未开启。"</string>
+    <string name="imei_information_title" msgid="8499085421609752290">"IMEI信息"</string>
+    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI相关信息"</string>
+    <string name="slot_number" msgid="3762676044904653577">"（插槽<xliff:g id="SLOT_NUM">%1$d</xliff:g>）"</string>
 </resources>
diff --git a/res/values-zh-rHK/arrays.xml b/res/values-zh-rHK/arrays.xml
index b61451a..64e3bf7 100644
--- a/res/values-zh-rHK/arrays.xml
+++ b/res/values-zh-rHK/arrays.xml
@@ -527,4 +527,12 @@
     <item msgid="4338089220026248848">"快取 (活動使用者端)"</item>
     <item msgid="6652164677254579050">"快取 (清空)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"藍綠色"</item>
+    <item msgid="8332294763632946560">"藍色"</item>
+    <item msgid="2023216417616991392">"靛藍色"</item>
+    <item msgid="3170497246594232819">"紫色"</item>
+    <item msgid="4608643045752965568">"粉紅色"</item>
+    <item msgid="6131821495505931173">"紅色"</item>
+  </string-array>
 </resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 85d4d17..ffaac2c 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>
@@ -180,7 +180,6 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s 想存取您的訊息，要授予 %2$s 存取權嗎？"</string>
     <string name="date_and_time" msgid="9062980487860757694">"日期與時間"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"選擇時區"</string>
-    <string name="normal_date_format" msgid="7636406984925498359">"區域 (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"預覽："</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"字型大小："</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -291,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>
@@ -322,8 +321,6 @@
     <string name="date_time_set_timezone" msgid="5045627174274377814">"選取時區"</string>
     <string name="date_time_set_date_title" msgid="6928286765325608604">"日期"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"設定日期"</string>
-    <string name="date_time_date_format_title" msgid="3976171711988766411">"日期格式"</string>
-    <string name="date_time_date_format" msgid="6951498879879281102">"選擇日期格式"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"按英文字母排序"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"按時區排序"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"日期"</string>
@@ -372,7 +369,8 @@
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"手機正在進行加密，請稍候 (已完成 <xliff:g id="PERCENT">^1</xliff:g>%)。"</string>
     <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"平板電腦加密作業正在進行中，請稍候 (剩餘時間：<xliff:g id="DURATION">^1</xliff:g>)"</string>
     <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"手機加密作業正在進行中，請稍候 (剩餘時間：<xliff:g id="DURATION">^1</xliff:g>)"</string>
-    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"<xliff:g id="DELAY">^1</xliff:g> 秒後再試一次。"</string>
+    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"如要解鎖您的平板電腦，請先將其關閉再開啟。"</string>
+    <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"如要解鎖您的手機，請先將其關閉再開啟。"</string>
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"警告：解鎖嘗試次數只剩 <xliff:g id="COUNT">^1</xliff:g> 次！如果持續失敗，您的裝置將被清除。"</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"輸入密碼"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"加密失敗"</string>
@@ -401,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>
@@ -412,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>
@@ -556,13 +556,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"作為手機揚聲器"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"用於音樂與媒體"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"記住設定"</string>
-    <string name="wifi_assistant_intro_setup" msgid="4605105515416995110">"全新推出\nWi‑Fi Assistant"</string>
-    <string name="wifi_assistant_no_thanks" msgid="2776983751990143934">"不用了，謝謝"</string>
-    <string name="wifi_assistant_setup" msgid="3772423650475730906">"設定"</string>
-    <string name="wifi_assistant_card_message" msgid="107811647784658536">"透過 Wi‑Fi Assistant 自動連線至可用網絡。"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi‑Fi Assistant"</string>
-    <string name="wifi_assistant_title_message" msgid="6240721017579074015">"<xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> 會自動將您的裝置連線至可用的最佳 Wi‑Fi 網絡"</string>
-    <string name="wifi_assistant_open_app" msgid="4803044899535675063">"開啟應用程式"</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>
@@ -592,7 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Wi-Fi 設定"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"設定和管理無線網絡接入點"</string>
-    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"選取 Wi-Fi"</string>
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"選取 Wi-Fi 網絡"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"選取 Wi-Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"正在開啟 Wi-Fi..."</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"正在關閉 Wi-Fi…"</string>
@@ -607,8 +602,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"永遠可掃瞄"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"永遠執行掃描"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"允許 Google 的位置服務和其他應用程式掃描網絡 (即使 Wi-Fi 已關閉)"</string>
-    <string name="wifi_automatically_manage_title" msgid="6249976570008992746">"自動管理 Wi‑Fi"</string>
-    <string name="wifi_automatically_manage_summary" msgid="6952470763378312488">"允許 <xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> 管理您的 Wi-Fi 連線"</string>
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"自動使用開放的 Wi-Fi"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"讓 Wi‑Fi 小幫手自動連線至優質的開放網絡"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"選擇小幫手"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"安裝憑證"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"為了提高位置精確度並用作其他用途，即使 Wi-Fi 已關閉，Google 和其他應用程式亦可能會掃瞄附近的網絡。如不想啟用此功能，可前往 [進階] &gt; [永遠可掃瞄] 更改設定。"</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"即使 Wi-Fi 已關閉，應用程式亦可能會掃瞄附近的網絡。如不想啟用此功能，可前往 [進階] &gt; [永遠可掃瞄] 更改設定。"</string>
@@ -629,6 +625,7 @@
     <string name="wifi_menu_scan" msgid="1470911530412095868">"掃瞄"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"進階設定"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"連線至網絡"</string>
+    <string name="wifi_menu_remember" msgid="8814185749388713796">"記住網絡"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"刪除網絡"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"修改網絡"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"寫入 NFC 標籤"</string>
@@ -673,9 +670,11 @@
     <string name="wifi_unspecified" msgid="5431501214192991253">"(未指定)"</string>
     <string name="wifi_remembered" msgid="4955746899347821096">"已儲存"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"已停用"</string>
-    <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"避免使用欠佳的互聯網連線"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP 設定失敗"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"WiFi 連線失敗"</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"驗證問題"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"超出可用範圍"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"未能偵測到互聯網連線，因此不會自動重新連線。"</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"有 WPS 可供使用"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (有 WPS 可供使用)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"輸入您的網絡密碼"</string>
@@ -699,9 +698,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"警告：如果略過 Wi-Fi 設定，平板電腦將只能透過流動數據連線，以作初始下載及更新。如要避免產生數據傳輸費用，請連線至 Wi-Fi 網絡。"</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"警告：如果略過 Wi-Fi 設定，裝置將只能透過流動數據連線，以作初始下載及更新。如要避免產生數據傳輸費用，請連線至 Wi-Fi 網絡。"</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"警告：如果略過 Wi-Fi 設定，手機將只能透過流動數據連線，以作初始下載及更新。如要避免產生數據傳輸費用，請連線至 Wi-Fi 網絡。"</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="2393880108322835846">"警告：如果略過 Wi-Fi 設定，平板電腦將無法連線至互聯網，以進行初始下載或更新。"</string>
-    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1707391993265558787">"警告：如果略過 Wi-Fi 設定，裝置將無法連線至互聯網，以進行初始下載或更新。"</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="1556858507920033022">"警告：如果略過 Wi-Fi 設定，手機將無法連線至互聯網，以進行初始下載或更新。"</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"如果略過 Wi-Fi 設定：\n\n您的平板電腦將無法連線至互聯網。\n\n您必須連線至互聯網，才能取得軟件更新。\n\n目前無法啟用裝置保護功能。"</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"如果略過 Wi-Fi 設定：\n\n您的裝置將無法連線至互聯網。\n\n您必須連線至互聯網，才能取得軟件更新。\n\n這時，您無法啟用裝置保護功能。"</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"如果略過 Wi-Fi 設定：\n\n您的手機將無法連線至互聯網。\n\n您必須連線至互聯網，才能取得軟件更新。\n\n目前無法啟用裝置保護功能。"</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"平板電腦無法連接這個 Wi-Fi 網絡。"</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"裝置無法連線至這個 Wi-Fi 網絡。"</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"手機無法連接這個 Wi-Fi 網絡。"</string>
@@ -761,7 +760,6 @@
     <string name="ring_volume_title" msgid="7938706566797464165">"鈴聲音量"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"靜音時震動"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"預設通知音效"</string>
-    <string name="heads_up_enabled_title" msgid="1031078221910921622">"彈出重要通知"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"鈴聲"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"通知"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"通知音量與來電音量相同"</string>
@@ -834,7 +832,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"自動調整亮度"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"舉起即可喚醒"</string>
     <string name="doze_title" msgid="2259176504273878294">"環境顯示"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"提起裝置或收到通知時，喚醒螢幕"</string>
+    <string name="doze_summary" msgid="7128970177894383698">"當您拿起裝置或收到通知時，喚醒螢幕"</string>
     <string name="title_font_size" msgid="4405544325522105222">"字型大小"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"字型大小"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM 卡鎖定設定"</string>
@@ -862,6 +860,10 @@
     <string name="sim_enter_cancel" msgid="6240422158517208036">"取消"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"找到多張 SIM 卡"</string>
     <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 卡用於流動數據、通話和短訊嗎？"</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>
@@ -1012,6 +1014,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"這會清除您平板電腦"<b>"內部儲存裝置"</b>"中的所有資料，包括：\n\n"<li>"您的 Google 帳戶"</li>\n<li>"系統和應用程式資料及設定"</li>\n<li>"已下載的應用程式"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"這會清除您手機"<b>"內部儲存裝置"</b>"中的所有資料，包括：\n\n"<li>"您的 Google 帳戶"</li>\n<li>"系統和應用程式資料及設定"</li>\n<li>"已下載的應用程式"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"您目前已登入下列帳戶：\n"</string>
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"這部裝置上還有其他使用者。\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"音樂"</li>\n<li>"相片"</li>\n<li>"其他使用者資料"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"如要一併清除音樂、圖片及其他使用者資料，則需清除 "<b>"USB 儲存裝置"</b>"資料。"</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"如要一併清除音樂、圖片及其他使用者資料，則需清除 "<b>"SD 記憶卡"</b>"資料。"</string>
@@ -1023,7 +1026,6 @@
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"重設手機"</string>
     <string name="master_clear_final_desc" msgid="7209547812233487345">"您要清除所有個人資訊和已下載的應用程式嗎？您無法復原這項操作！"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"全部清除"</string>
-    <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"畫出解鎖圖形"</string>
     <string name="master_clear_gesture_explanation" msgid="826193821455182780">"您必須畫出解鎖圖案，確認恢復原廠設定。"</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"System Clear 服務暫停，因此無法重設。"</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"重設？"</string>
@@ -1041,7 +1043,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"清除 USB 儲存裝置時，是否一併刪除所有儲存的檔案？您無法復原這項操作！"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"清除 SD 記憶卡時，是否刪除其中儲存的所有檔案？這項操作無法復原！"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"全部清除"</string>
-    <string name="media_format_gesture_prompt" msgid="3109349468816856670">"畫出解鎖圖形"</string>
     <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"您必須畫出解鎖圖案，確認要清除 USB 儲存裝置的資料。"</string>
     <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"您必須畫出解鎖圖案，確認您要清除 SD 記憶卡的資料。"</string>
     <string name="call_settings_title" msgid="5188713413939232801">"通話設定"</string>
@@ -1087,6 +1088,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"請插入 SIM 卡，並重新啟動裝置"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"請連接互聯網"</string>
     <string name="location_title" msgid="1029961368397484576">"我的位置"</string>
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"工作設定檔"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"工作設定檔的位置"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"已由貴公司關閉"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"模式"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"高精確度"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"省電模式"</string>
@@ -1124,6 +1128,7 @@
     <string name="copyright_title" msgid="865906688917260647">"版權"</string>
     <string name="license_title" msgid="1990487604356037871">"授權"</string>
     <string name="terms_title" msgid="7697580845616764642">"條款及細則"</string>
+    <string name="webview_license_title" msgid="2813507464175738967">"System WebView License"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"桌布"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"衛星影像供應商：\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"開放原始碼授權"</string>
@@ -1237,7 +1242,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB 儲存裝置"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"於 SD 卡"</string>
     <string name="disabled" msgid="9206776641295849915">"已停用"</string>
-    <string name="not_installed" msgid="1475144352069281880">"未安裝"</string>
+    <string name="not_installed" msgid="2797554494953450291">"沒有為此使用者安裝"</string>
     <string name="no_applications" msgid="7336588977497084921">"沒有應用程式。"</string>
     <string name="internal_storage" msgid="1584700623164275282">"內部儲存空間"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB 儲存裝置"</string>
@@ -1434,8 +1439,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"充電時螢幕永不休眠"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"啟用藍牙 HCI 窺探記錄"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"擷取單一檔案內的所有藍牙 HCI 封包"</string>
-    <string name="oem_unlock_enable" msgid="6629321276287913315">"啟用 OEM 解鎖"</string>
-    <string name="oem_unlock_enable_summary" msgid="3546686263996628110">"允許使用 OEM 解鎖裝置"</string>
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"原始設備製造商 (OEM) 解鎖"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"允許 Bootloader 被解鎖"</string>
+    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"請輸入 PIN"</string>
+    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"請輸入您的裝置 PIN，以啟用原始設備製造商 (OEM) 解鎖"</string>
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"允許原始設備製造商 (OEM) 解鎖嗎？"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"警告：這項設定開啟時，這部裝置上的裝置保護功能將無法運作。"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"無線螢幕分享認證"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"啟用 Wi‑Fi 詳細記錄"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"加強 Wi-Fi 至流動數據轉換"</string>
@@ -1538,6 +1547,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"字幕將會是這樣："</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"預設"</string>
+    <string name="color_title" msgid="4258931051732243983">"顏色"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"預設"</string>
     <string name="color_none" msgid="3475640044925814795">"無"</string>
     <string name="color_white" msgid="8045195170201590239">"白色"</string>
@@ -1595,12 +1605,12 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"剩餘 <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g>後完成充電"</string>
-    <string name="power_discharging_duration" msgid="7125493014448497620">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - 尚餘大約 <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="power_charging" msgid="712751285832976915">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="STATE">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration" msgid="4802183864773082009">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g>後完成充電"</string>
-    <string name="power_charging_duration_ac" msgid="3611179931297824699">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g>後完成充電 (透過 AC 充電)"</string>
-    <string name="power_charging_duration_usb" msgid="1106605348913397583">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g>後完成充電 (透過 USB 充電)"</string>
-    <string name="power_charging_duration_wireless" msgid="633606920144617227">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g>後完成充電 (透過無線方式充電)"</string>
+    <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> - 尚餘大約 <xliff:g id="TIME">%2$s</xliff:g>"</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> 後完成充電"</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> 後完成充電 (透過插頭充電)"</string>
+    <string name="power_charging_duration_usb" msgid="182405645340976546">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> 後完成充電 (透過 USB 充電)"</string>
+    <string name="power_charging_duration_wireless" msgid="1829295708243159464">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> 後完成充電 (無線充電)"</string>
     <string name="power_usage_list_summary" msgid="2409288197839512482">"上次完成充電後的使用情況"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"拔除插頭後的電池使用狀況"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"重設後的電池使用狀況"</string>
@@ -1617,14 +1627,13 @@
     <string name="awake" msgid="387122265874485088">"裝置啟用時間"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi 開啟時間"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi 開啟時間"</string>
-    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> - <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"詳細記錄"</string>
     <string name="details_title" msgid="3792801565213935385">"詳細使用狀況"</string>
     <string name="details_subtitle" msgid="32593908269911734">"詳細使用狀況"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"調整電力使用"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"已包含套件"</string>
     <string name="power_screen" msgid="3023346080675904613">"螢幕"</string>
-    <string name="power_flashlight" msgid="7794409781003567614">"閃光燈"</string>
+    <string name="power_flashlight" msgid="7794409781003567614">"手電筒"</string>
     <string name="power_wifi" msgid="1135085252964054957">"Wi‑Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"藍牙"</string>
     <string name="power_cell" msgid="6596471490976003056">"手機待命"</string>
@@ -1689,7 +1698,7 @@
     <string name="battery_saver" msgid="1426682272004907982">"省電模式"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"自動開啟"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"永不"</string>
-    <string name="battery_saver_turn_on_automatically_pct" msgid="3033681629861428940">"電量剩 %1$d%% 時"</string>
+    <string name="battery_saver_turn_on_automatically_pct" msgid="7536784431655058267">"電量為 %1$s"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"程序統計資料"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"執行中程序的技術統計資料"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"記憶體用量"</string>
@@ -1817,7 +1826,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"硬件支援"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"只限軟件"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"這位使用者無法存取憑證"</string>
-    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"畫出解鎖圖案"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"您必須畫出解鎖圖案，才能確認安裝憑證。"</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"輸入憑證儲存空間的密碼。"</string>
@@ -1847,6 +1855,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"包括應用程式數據"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"自動還原"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"當重新安裝應用程式時，還原已備份的設定和資料"</string>
+    <string name="backup_inactive_title" msgid="5355557151569037197">"備份服務目前停用。"</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"本服務由您的裝置政策設定。"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"桌面電腦備份密碼"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"桌上電腦的完整備份目前未受保護"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"輕觸即可更改或移除桌上電腦完整備份的密碼"</string>
@@ -1956,7 +1966,11 @@
     <string name="enter_password" msgid="8035706727471334122">"如要啟動 Android，請輸入密碼"</string>
     <string name="enter_pin" msgid="5305333588093263790">"如要啟動 Android，請輸入您的 PIN"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"如要啟動 Android，請畫出解鎖圖案"</string>
-    <string name="try_again" msgid="4272075051293936921">"請再試一次。"</string>
+    <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"圖案錯誤"</string>
+    <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"密碼錯誤"</string>
+    <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"PIN 錯誤"</string>
+    <string name="checking_decryption" msgid="8287458611802609493">"正在檢查…"</string>
+    <string name="starting_android" msgid="8581493237458496835">"正在啟動 Andriod"</string>
     <string name="delete" msgid="4219243412325163003">"刪除"</string>
     <string name="misc_files" msgid="6720680815969643497">"其他檔案"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"已選取 <xliff:g id="NUMBER">%1$d</xliff:g> 個，共 <xliff:g id="TOTAL">%2$d</xliff:g> 個"</string>
@@ -1994,8 +2008,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"永遠使用 GPU 進行畫面合成"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"模擬色彩空間"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"啟用 OpenGL 追蹤"</string>
-    <string name="use_nuplayer" msgid="5699257393367904387">"使用 NuPlayer (實驗版)"</string>
-    <string name="use_nuplayer_summary" msgid="1991479067478516714">"使用 NuPlayer 取代 AwesomePlayer"</string>
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"使用 AwesomePlayer (已淘汰)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"使用 AwesomePlayer 代替 NuPlayer 播放大部分媒體"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"停用 USB 音效檔案路由功能"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"停用 USB 音效檔案周邊設備的自動路由功能"</string>
     <string name="debug_layout" msgid="5981361776594526155">"顯示版面界限"</string>
@@ -2171,7 +2185,6 @@
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"新增使用者或個人檔案"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"新增使用者"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"限制存取的個人檔案"</string>
-    <string name="user_summary_managed_profile" msgid="7369539529693048111">"公司檔案"</string>
     <string name="user_need_lock_message" msgid="2596365678651842785">"建立限制存取的個人檔案前，您必須先設定上鎖畫面來保護您的應用程式和個人資料。"</string>
     <string name="user_set_lock_button" msgid="8311219392856626841">"設定上鎖畫面"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"未設定"</string>
@@ -2302,11 +2315,13 @@
     <string name="sim_cellular_data_unavailable_summary" msgid="3654805961942166428">"輕觸即可選取用於數據連線的 SIM 卡"</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"永遠使用這張 SIM 卡通話"</string>
     <string name="select_sim_for_data" msgid="2366081042162853044">"選取用於流動數據的 SIM 卡"</string>
+    <string name="data_switch_started" msgid="2040761479817166311">"正在切換數據 SIM，過程最多可能需要 1 分鐘…"</string>
     <string name="select_sim_for_calls" msgid="3503094771801109334">"選取用於撥號的 SIM 卡："</string>
     <string name="sim_select_card" msgid="211285163525563293">"選取 SIM 卡"</string>
     <string name="sim_card_number_title" msgid="7845379943474336488">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"未插入 SIM 卡"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"SIM 卡名稱"</string>
+    <string name="sim_name_hint" msgid="7038643345238968930">"輸入 SIM 名稱"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"SIM 卡插槽 %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"流動網絡供應商"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"電話號碼"</string>
@@ -2316,7 +2331,6 @@
     <string name="color_purple" msgid="3888532466427762504">"紫色"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"尚未插入 SIM 卡"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"SIM 卡狀態"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"SIM 卡相關資料"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"使用預設 SIM 卡回撥"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"用於撥出電話的 SIM 卡"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"其他通話設定"</string>
@@ -2324,8 +2338,11 @@
     <string name="preferred_network_offload_header" msgid="2321173571529106767">"停用網絡名稱廣播"</string>
     <string name="preferred_network_offload_footer" msgid="5857279426054744020">"停用網絡名稱廣播以防止第三方取得您的網絡資料。"</string>
     <string name="preferred_network_offload_popup" msgid="2252915199889604600">"停用網絡名稱廣播將無法自動連線至隱藏的網絡。"</string>
+    <string name="sim_signal_strength" msgid="9144010043784767984">"<xliff:g id="DBM">%1$d</xliff:g> dBm <xliff:g id="ASU">%2$d</xliff:g> asu"</string>
+    <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>
@@ -2334,22 +2351,22 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"最近的搜尋查詢"</string>
     <string name="search_results_label" msgid="4163304782363526148">"搜尋結果"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"WiFi Wi-Fi 網絡連線"</string>
-    <string name="keywords_more_default_sms_app" msgid="2744404159003574745">"短訊"</string>
-    <string name="keywords_more_mobile_networks" msgid="7813380887358745769">"手機 流動網絡供應商 無線"</string>
+    <string name="keywords_more_default_sms_app" msgid="895656981962034647">"文字訊息 訊息 傳送文字訊息 簡訊 傳送短訊"</string>
+    <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"流動網絡 手機網絡 流動網絡供應商 無線 網絡數據 4G 3G 2G LTE"</string>
     <string name="keywords_home" msgid="3626170808219458848">"應用程式啟動器"</string>
     <string name="keywords_display" msgid="6709007669501628320">"觸控式螢幕"</string>
-    <string name="keywords_display_brightness_level" msgid="8636451602230815191">"變暗 螢幕 觸控式螢幕"</string>
-    <string name="keywords_display_auto_brightness" msgid="8070218600502753102">"變暗 螢幕 觸控式螢幕"</string>
-    <string name="keywords_display_wallpaper" msgid="4315466287469834939">"背景"</string>
+    <string name="keywords_display_brightness_level" msgid="8923289340474728990">"變暗 螢幕 觸控螢幕 電池"</string>
+    <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"變暗 螢幕 觸控螢幕 電池"</string>
+    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"背景 個人化 自訂 顯示"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"文字大小"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"投影"</string>
-    <string name="keywords_storage" msgid="7007275853993419928">"空間 磁碟 雲端硬碟"</string>
-    <string name="keywords_battery" msgid="3992479295298655138">"電源"</string>
-    <string name="keywords_spell_checker" msgid="4509482591225399210">"拼字檢查"</string>
+    <string name="keywords_storage" msgid="6572905220031852173">"空間 磁碟 硬碟 裝置 使用量"</string>
+    <string name="keywords_battery" msgid="2096185085932675704">"電源 使用量 充電"</string>
+    <string name="keywords_spell_checker" msgid="6106749039734174140">"拼寫 字典 拼字檢查 自動修正"</string>
     <string name="keywords_voice_input" msgid="3519547605812413860">"辨識器 輸入 語音 說話 語言 免提耳機 免提 辨識 不雅字詞 音效記錄 藍牙耳機"</string>
-    <string name="keywords_text_to_speech_output" msgid="8207889472282225512">"語言分級 預設 說出 語音"</string>
-    <string name="keywords_date_and_time" msgid="7666950126499155141">"時鐘"</string>
-    <string name="keywords_factory_data_reset" msgid="3693730656843989732">"清除 刪除"</string>
+    <string name="keywords_text_to_speech_output" msgid="392447904221657930">"速度 語言 預設 說話 語音 文字轉語音 無障礙功能 閱讀器 失明"</string>
+    <string name="keywords_date_and_time" msgid="2631808108134830066">"時鐘 軍用"</string>
+    <string name="keywords_factory_data_reset" msgid="4355133848707691977">"掃除 刪除 還原 清除 移除"</string>
     <string name="keywords_printing" msgid="1701778563617114846">"打印機"</string>
     <string name="keywords_sounds_and_notifications" msgid="5965996187974887000">"揚聲器提示音"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="2912933812460077912">"不得干擾 中斷 中斷"</string>
@@ -2358,7 +2375,7 @@
     <string name="keywords_location_mode" msgid="8584992704568356084">"精確度"</string>
     <string name="keywords_accounts" msgid="1957925565953357627">"帳戶"</string>
     <string name="keywords_users" msgid="4673901601478559100">"限制 限制 受限"</string>
-    <string name="keywords_keyboard_and_ime" msgid="1103378692379215672">"文字修正 修正 音效 震動 自動 語言 手勢 建議 建議 主題 令人反感的字詞 類型 表情符號"</string>
+    <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"文字 更正 修正 聲音 震動 自動 語言 手勢 建議 字詞建議 主題背景 令人反感的文字 輸入 表情圖案 國際"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"滑動 密碼 圖案 PIN"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"設定 Wi-Fi NFC 標籤"</string>
     <string name="write_tag" msgid="8571858602896222537">"寫入"</string>
@@ -2375,7 +2392,6 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"通知音量"</string>
     <string name="zen_mode_settings_title" msgid="7014915558669122902">"干擾"</string>
     <string name="zen_mode_option_title" msgid="5061978632306007914">"當收到來電和通知時"</string>
-    <string name="zen_mode_option_title_novoice" msgid="6680706009915204785">"當收到通知時"</string>
     <string name="zen_mode_option_off" msgid="3167702608910820883">"一律允許干擾"</string>
     <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"只允許重要干擾"</string>
     <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"不允許干擾"</string>
@@ -2433,14 +2449,17 @@
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"完成"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"直至您關閉這項設定"</string>
     <string name="zen_mode_important_category" msgid="8123274463331022993">"重要干擾"</string>
-    <string name="zen_mode_downtime_category" msgid="4730179065426038108">"休息時間 (只限重要干擾)"</string>
+    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"停機時間"</string>
     <string name="zen_mode_downtime_days" msgid="3361856902633311616">"星期幾"</string>
     <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"無"</string>
+    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"允許干擾"</string>
+    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"僅限優先"</string>
+    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"無"</string>
     <string name="zen_mode_automation_category" msgid="4653551005950835761">"自動化"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"自動開啟"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">"、 "</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"永不"</string>
-    <string name="zen_mode_phone_calls" msgid="8956214416859303966">"通話"</string>
+    <string name="zen_mode_calls" msgid="7051492091133751208">"通話"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"訊息"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"來電者/訊息傳送者"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"所有人"</string>
@@ -2454,7 +2473,9 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"星期一至星期五晚"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"開始時間"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"完結時間"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"下一天 <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
+    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"下一天<xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g>或任何之前的鬧鐘"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"下一天<xliff:g id="FORMATTED_TIME">%s</xliff:g>或任何之前的鬧鐘"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"應用程式通知"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"通知設定"</string>
     <string name="device_feedback" msgid="3238056036766293294">"傳送您對這部裝置的意見"</string>
@@ -2462,7 +2483,11 @@
     <string name="switch_on_text" msgid="1124106706920572386">"開啟"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"關閉"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"螢幕固定"</string>
-    <string name="screen_pinning_description" msgid="7091642350452605379">"開啟時，您可以使用螢幕固定功能讓目前的畫面持續顯示，直到取消固定為止。\n\n如何使用螢幕固定功能：\n\n1. 確認螢幕固定功能已開啟。\n\n2. 開啟您要固定的畫面。\n\n3. 輕觸 [概覽]。\n\n4. 輕觸圖釘圖示。"</string>
+    <string name="screen_pinning_description" msgid="1137904524037468263">"開啟這項設定時，您可以使用螢幕固定功能讓目前的畫面持續顯示，直至您取消固定。\n\n如何使用螢幕固定功能：\n\n1. 確認螢幕固定功能已開啟。\n\n2. 開啟您要固定的畫面。\n\n3. 輕觸 [概覽]。\n\n4. 向上快速滑動並輕觸圖釘圖示。"</string>
+    <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"取消固定時必須畫出解鎖圖案"</string>
+    <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"取消固定時必須輸入 PIN"</string>
+    <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"取消固定時必須輸入密碼"</string>
+    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"取消固定時鎖定裝置"</string>
     <string name="managed_user_title" msgid="8101244883654409696">"公司檔案"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(實驗性)"</string>
     <string name="display_auto_rotate_title" msgid="6176450657107806043">"當裝置旋轉時"</string>
@@ -2471,7 +2496,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"保持橫向畫面"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"保持目前方向"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI 資料"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI 相對資料"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"加密"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"繼續"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"您可以在裝置啟動前要求輸入 PIN，以進一步保障這部裝置的安全。裝置在啟動前，將無法接收來電、短訊或通知，包括鬧鐘。\n\n在裝置遺失或被盜時，這個設定有助保障資料安全。"</string>
@@ -2489,4 +2513,7 @@
     <string name="encrypt_talkback_dialog_message_pin" msgid="1890374082842868489">"輸入您的 PIN 碼以啟動裝置後，您將無法直接使用 <xliff:g id="SERVICE">%1$s</xliff:g> 等協助工具服務。"</string>
     <string name="encrypt_talkback_dialog_message_pattern" msgid="4474332516537386384">"輸入您的解鎖圖案以啟動裝置後，您將無法直接使用 <xliff:g id="SERVICE">%1$s</xliff:g> 等協助工具服務。"</string>
     <string name="encrypt_talkback_dialog_message_password" msgid="8166099418487083927">"輸入您的密碼以啟動裝置後，您將無法直接使用 <xliff:g id="SERVICE">%1$s</xliff:g> 等協助工具服務。"</string>
+    <string name="imei_information_title" msgid="8499085421609752290">"IMEI 資料"</string>
+    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI 相對資料"</string>
+    <string name="slot_number" msgid="3762676044904653577">"(插槽 <xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-zh-rTW/arrays.xml b/res/values-zh-rTW/arrays.xml
index 1b2cbda..6677d8c 100644
--- a/res/values-zh-rTW/arrays.xml
+++ b/res/values-zh-rTW/arrays.xml
@@ -527,4 +527,12 @@
     <item msgid="4338089220026248848">"快取 (活動用戶端)"</item>
     <item msgid="6652164677254579050">"快取 (清空)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"藍綠色"</item>
+    <item msgid="8332294763632946560">"藍色"</item>
+    <item msgid="2023216417616991392">"靛藍色"</item>
+    <item msgid="3170497246594232819">"紫色"</item>
+    <item msgid="4608643045752965568">"粉紅色"</item>
+    <item msgid="6131821495505931173">"紅色"</item>
+  </string-array>
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 5e2eff8..ad0bbda 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>
@@ -180,7 +180,6 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s 要求存取您的訊息。要將存取權授予 %2$s 嗎？"</string>
     <string name="date_and_time" msgid="9062980487860757694">"日期和時間"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"選擇時區"</string>
-    <string name="normal_date_format" msgid="7636406984925498359">"本地 (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"預覽："</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"字型大小："</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -291,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>
@@ -322,8 +321,6 @@
     <string name="date_time_set_timezone" msgid="5045627174274377814">"選取時區"</string>
     <string name="date_time_set_date_title" msgid="6928286765325608604">"日期"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"設定日期"</string>
-    <string name="date_time_date_format_title" msgid="3976171711988766411">"日期格式"</string>
-    <string name="date_time_date_format" msgid="6951498879879281102">"選擇日期格式"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"依照字母排序"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"依時區排序"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"日期"</string>
@@ -372,7 +369,8 @@
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"正在對手機加密，請稍候 (已完成 <xliff:g id="PERCENT">^1</xliff:g>%)。"</string>
     <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"平板電腦加密作業正在進行中，請稍候 (剩餘時間：<xliff:g id="DURATION">^1</xliff:g>)"</string>
     <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"手機加密作業正在進行中，請稍候 (剩餘時間：<xliff:g id="DURATION">^1</xliff:g>)"</string>
-    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"<xliff:g id="DELAY">^1</xliff:g> 秒內再試一次。"</string>
+    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"如要將平板電腦解除鎖定，請關閉平板電腦後再開機。"</string>
+    <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"如要將手機解除鎖定，請關閉手機後再開機。"</string>
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"警告：解鎖嘗試次數還剩 <xliff:g id="COUNT">^1</xliff:g> 次！如果持續失敗，您的裝置將會遭到清除。"</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"輸入密碼"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"加密失敗"</string>
@@ -401,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>
@@ -412,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>
@@ -556,13 +556,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"當成手機喇叭"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"使用於音樂與媒體"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"記住設定"</string>
-    <string name="wifi_assistant_intro_setup" msgid="4605105515416995110">"Wi‑Fi Assistant\n隆重登場"</string>
-    <string name="wifi_assistant_no_thanks" msgid="2776983751990143934">"不用了，謝謝"</string>
-    <string name="wifi_assistant_setup" msgid="3772423650475730906">"設定"</string>
-    <string name="wifi_assistant_card_message" msgid="107811647784658536">"透過 Wi‑Fi Assistant 自動連線到可用網路。"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi‑Fi Assistant"</string>
-    <string name="wifi_assistant_title_message" msgid="6240721017579074015">"<xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g>可自動將您的裝置連上目前可用的最佳 Wi-Fi 網路"</string>
-    <string name="wifi_assistant_open_app" msgid="4803044899535675063">"開啟應用程式"</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>
@@ -592,7 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Wi-Fi 設定"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"設定、管理無線網路存取點"</string>
-    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"選取 Wi-Fi"</string>
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"選取 Wi-Fi 網路"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"選取 Wi-Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"正在開啟 Wi-Fi…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"正在關閉 Wi-Fi…"</string>
@@ -607,8 +602,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"一律執行掃描"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"一律執行掃描"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"允許 Google 的定位服務和其他應用程式掃描網路 (即使 Wi-Fi 已關閉仍允許掃描)"</string>
-    <string name="wifi_automatically_manage_title" msgid="6249976570008992746">"自動管理 Wi‑Fi"</string>
-    <string name="wifi_automatically_manage_summary" msgid="6952470763378312488">"允許 <xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> 管理您的 Wi-Fi 連線"</string>
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"自動使用開放 Wi-Fi"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"允許 Wi‑Fi 小幫手自動連線到系統測定為高品質的開放網路"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"選擇小幫手"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"安裝憑證"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"為了提升定位精確度及用於其他用途，Google 和其他應用程式可能會掃描附近的 Wi-Fi 網路 (即使 Wi-Fi 連線功能已關閉)。如果您不想授予這項權限，可隨時前往 [進階] &gt; [掃描] 變更設定。"</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"應用程式可能會掃描附近的網路 (即使 Wi-Fi 連線功能已關閉)。如果您不想授予這項權限，可隨時前往 [進階] &gt; [掃描] 變更設定。"</string>
@@ -624,11 +620,12 @@
     <string name="wifi_access_points" msgid="7053990007031968609">"Wi-Fi 網路"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS 按鈕"</string>
     <string name="wifi_menu_more_options" msgid="2448097861752719396">"更多選項"</string>
-    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"輸入 WPS 個人識別碼"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"輸入 WPS 驗證碼"</string>
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi-Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"掃描"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"進階"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"連線至網路"</string>
+    <string name="wifi_menu_remember" msgid="8814185749388713796">"記住這個網路"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"清除網路"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"修改網路"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"寫入 NFC 標記"</string>
@@ -673,9 +670,11 @@
     <string name="wifi_unspecified" msgid="5431501214192991253">"(未指定)"</string>
     <string name="wifi_remembered" msgid="4955746899347821096">"已儲存"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"已停用"</string>
-    <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"已避開品質不佳的網際網路連線"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP 設定失敗"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"WiFi 連線失敗"</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"驗證問題"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"不在有效範圍內"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"未偵測到可用的網際網路連線，系統無法為您自動重新連線。"</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"可使用 WPS"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (可使用 WPS)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"輸入您的網路密碼"</string>
@@ -699,9 +698,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"警告：如果略過 Wi-Fi 設定，平板電腦將只能透過行動數據連線進行初始下載及更新。如要避免產生數據傳輸費用，請連線至 Wi-Fi 網路。"</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"警告：如果略過 Wi-Fi 設定，裝置將只能透過行動數據連線進行初始下載及更新。如要避免產生數據傳輸費用，請連線至 Wi-Fi 網路。"</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"警告：如果略過 Wi-Fi 設定，手機將只能透過行動數據連線進行初始下載及更新。如要避免產生數據傳輸費用，請連線至 Wi-Fi 網路。"</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="2393880108322835846">"警告：如果略過 Wi-Fi 設定，平板電腦將無法連上網際網路進行任何初始下載或更新。"</string>
-    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1707391993265558787">"警告：如果略過 Wi-Fi 設定，裝置將無法連上網際網路進行任何初始下載或更新。"</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="1556858507920033022">"警告：如果略過 Wi-Fi 設定，手機將無法連上網際網路進行任何初始下載或更新。"</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"如果您不使用 Wi‑Fi：\n\n您的平板電腦將不會連線至網際網路。\n\n您必須連上網際網路，才能更新軟體。\n\n您目前無法啟用裝置保護功能。"</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"如果您不使用 Wi‑Fi：\n\n您的裝置將不會連線至網際網路。\n\n您必須連上網際網路，才能更新軟體。\n\n您目前無法啟用裝置保護功能。"</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"如果您不使用 Wi‑Fi：\n\n您的手機將不會連線至網際網路。\n\n您必須連上網際網路，才能更新軟體。\n\n您目前無法啟用裝置保護功能。"</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"您的平板電腦無法連線至這個 Wi-Fi 網路。"</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"裝置無法連線至這個 Wi-Fi 網路。"</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"您的手機無法連線至這個 Wi-Fi 網路。"</string>
@@ -761,7 +760,6 @@
     <string name="ring_volume_title" msgid="7938706566797464165">"鈴聲音量"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"靜音時震動"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"預設通知音效"</string>
-    <string name="heads_up_enabled_title" msgid="1031078221910921622">"彈出顯示高優先順序的通知"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"鈴聲"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"通知"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"通知音量與來電音量相同"</string>
@@ -834,7 +832,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"自動調整亮度"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"舉起即可喚醒"</string>
     <string name="doze_title" msgid="2259176504273878294">"環境顯示"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"拾起裝置或收到通知時，喚醒螢幕"</string>
+    <string name="doze_summary" msgid="7128970177894383698">"拿起裝置或收到通知時喚醒螢幕"</string>
     <string name="title_font_size" msgid="4405544325522105222">"字型大小"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"字型大小"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM 卡鎖定設定"</string>
@@ -862,6 +860,10 @@
     <string name="sim_enter_cancel" msgid="6240422158517208036">"取消"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"找到多張 SIM 卡"</string>
     <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>
+    <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 卡連線到行動網路、通話及傳送簡訊嗎？"</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>
@@ -1012,6 +1014,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"這會清除您平板電腦"<b>"內部儲存裝置"</b>"中的所有資料，包括：\n\n"<li>"您的 Google 帳戶"</li>\n<li>"系統和應用程式資料及設定"</li>\n<li>"已下載的應用程式"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"這會清除您手機"<b>"內部儲存裝置"</b>"中的所有資料，包括：\n\n"<li>"您的 Google 帳戶"</li>\n<li>"系統和應用程式資料及設定"</li>\n<li>"已下載的應用程式"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"您目前已登入下列帳戶：\n"</string>
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"這個裝置上還有其他使用者。\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"音樂"</li>\n<li>"相片"</li>\n<li>"其他使用者資料"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"如要一併清除音樂、圖片及其他用戶資料，則需清除 "<b>"USB 儲存裝置"</b>"資料。"</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"如要清除音樂、圖片及其他使用者資料，必須先清除 "<b>"SD 卡"</b>"。"</string>
@@ -1023,7 +1026,6 @@
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"重設手機"</string>
     <string name="master_clear_final_desc" msgid="7209547812233487345">"您要清除所有個人資訊和已下載的應用程式嗎？您無法復原這個動作！"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"全部清除"</string>
-    <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"畫出解鎖圖形"</string>
     <string name="master_clear_gesture_explanation" msgid="826193821455182780">"請畫出解鎖圖形，確認您要恢復原廠設定。"</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"無法使用 System Clear 服務，因此未執行任何重設。"</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"您要重設嗎？"</string>
@@ -1041,7 +1043,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"清除 USB 儲存裝置時，是否一併刪除所有儲存的檔案？您無法復原這個動作！"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"清除 SD 卡時，是否刪除其中儲存的所有檔案？這項動作無法復原！"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"全部清除"</string>
-    <string name="media_format_gesture_prompt" msgid="3109349468816856670">"畫出解鎖圖形"</string>
     <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"您必須畫出解鎖圖形以確認要清除 USB 儲存裝置的資料。"</string>
     <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"請畫出解鎖圖形，確認您要清除 SD 卡中的資料。"</string>
     <string name="call_settings_title" msgid="5188713413939232801">"通話設定"</string>
@@ -1087,6 +1088,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"請插入 SIM 卡，並重新啟動裝置"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"請連線至網際網路"</string>
     <string name="location_title" msgid="1029961368397484576">"我的位置"</string>
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Work 設定檔"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Work 設定檔位置資訊"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"已經由貴公司關閉"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"模式"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"高精確度"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"節約耗電量"</string>
@@ -1124,6 +1128,7 @@
     <string name="copyright_title" msgid="865906688917260647">"版權"</string>
     <string name="license_title" msgid="1990487604356037871">"授權"</string>
     <string name="terms_title" msgid="7697580845616764642">"條款及細則"</string>
+    <string name="webview_license_title" msgid="2813507464175738967">"系統 WebView 授權"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"桌布"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"衛星影像提供者：\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"開放原始碼授權"</string>
@@ -1237,7 +1242,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB 儲存裝置"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"於 SD 卡"</string>
     <string name="disabled" msgid="9206776641295849915">"已停用"</string>
-    <string name="not_installed" msgid="1475144352069281880">"未安裝"</string>
+    <string name="not_installed" msgid="2797554494953450291">"這位使用者並未安裝"</string>
     <string name="no_applications" msgid="7336588977497084921">"沒有應用程式。"</string>
     <string name="internal_storage" msgid="1584700623164275282">"內部儲存空間"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB 儲存裝置"</string>
@@ -1434,8 +1439,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"充電時螢幕不會進入休眠"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"啟用藍牙 HCI 窺探紀錄"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"擷取單一檔案內的所有藍牙 HCI 封包"</string>
-    <string name="oem_unlock_enable" msgid="6629321276287913315">"啟用 OEM 解鎖"</string>
-    <string name="oem_unlock_enable_summary" msgid="3546686263996628110">"允許使用 OEM 解鎖裝置"</string>
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM 解鎖"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"允許解除鎖定開機載入器"</string>
+    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"輸入您的 PIN"</string>
+    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"如要啟用 OEM 解鎖設定，請輸入您的裝置 PIN"</string>
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"要允許 OEM 解鎖嗎？"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"警告：開啟這項設定時，您將無法使用這個裝置的防盜功能。"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"無線螢幕分享認證"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"啟用 Wi‑Fi 詳細紀錄設定"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Wi-Fi 至行動數據轉換強化"</string>
@@ -1484,7 +1493,7 @@
     <string name="app_name_label" msgid="5440362857006046193">"應用程式"</string>
     <string name="last_time_used_label" msgid="8459441968795479307">"上次使用時間"</string>
     <string name="usage_time_label" msgid="295954901452833058">"使用時間"</string>
-    <string name="accessibility_settings" msgid="3975902491934816215">"協助工具"</string>
+    <string name="accessibility_settings" msgid="3975902491934816215">"無障礙設定"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"協助工具設定"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"服務"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"系統"</string>
@@ -1538,6 +1547,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"字幕外觀範例"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"預設"</string>
+    <string name="color_title" msgid="4258931051732243983">"顏色"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"預設"</string>
     <string name="color_none" msgid="3475640044925814795">"無"</string>
     <string name="color_white" msgid="8045195170201590239">"白色"</string>
@@ -1595,12 +1605,12 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"還剩 <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g>後充電完畢"</string>
-    <string name="power_discharging_duration" msgid="7125493014448497620">"<xliff:g id="LEVEL">%1$d</xliff:g>%%：還剩大約 <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="power_charging" msgid="712751285832976915">"<xliff:g id="LEVEL">%1$d</xliff:g>%%：<xliff:g id="STATE">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration" msgid="4802183864773082009">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g>後充飽"</string>
-    <string name="power_charging_duration_ac" msgid="3611179931297824699">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g>後充飽 (透過 AC 變壓器充電)"</string>
-    <string name="power_charging_duration_usb" msgid="1106605348913397583">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g>後充飽 (透過 USB 充電)"</string>
-    <string name="power_charging_duration_wireless" msgid="633606920144617227">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g>後充飽 (透過無線方式充電)"</string>
+    <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> - 大約還剩 <xliff:g id="TIME">%2$s</xliff:g>"</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>後充飽"</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>後充飽 (AC)"</string>
+    <string name="power_charging_duration_usb" msgid="182405645340976546">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g>後充飽 (USB)"</string>
+    <string name="power_charging_duration_wireless" msgid="1829295708243159464">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g>後充飽 (無線充電)"</string>
     <string name="power_usage_list_summary" msgid="2409288197839512482">"上次充飽後的使用情形"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"拔除插頭後的電池使用狀況"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"重設後的電池使用狀況"</string>
@@ -1617,7 +1627,6 @@
     <string name="awake" msgid="387122265874485088">"裝置清醒時間"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"開啟 Wi-Fi 的時間"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"開啟 Wi-Fi 的時間"</string>
-    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"詳細記錄"</string>
     <string name="details_title" msgid="3792801565213935385">"詳細使用狀況"</string>
     <string name="details_subtitle" msgid="32593908269911734">"使用狀況詳細資訊"</string>
@@ -1689,7 +1698,7 @@
     <string name="battery_saver" msgid="1426682272004907982">"節約耗電量"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"自動開啟"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"永遠不要"</string>
-    <string name="battery_saver_turn_on_automatically_pct" msgid="3033681629861428940">"電量剩 %1$d%% 時"</string>
+    <string name="battery_saver_turn_on_automatically_pct" msgid="7536784431655058267">"電量為 %1$s 時"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"處理程序統計資料"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"執行中處理程序的相關完善統計資料"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"記憶體用量"</string>
@@ -1817,7 +1826,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"硬體備份"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"僅限軟體"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"這位使用者無法存取憑證"</string>
-    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"畫出解鎖圖形"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"您必須畫出解鎖圖形，才能確認安裝憑證。"</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"輸入認證儲存空間的密碼。"</string>
@@ -1847,6 +1855,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"包括應用程式資料"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"自動還原功能"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"重新安裝應用程式時，還原備份的設定和資料"</string>
+    <string name="backup_inactive_title" msgid="5355557151569037197">"目前無法使用備份服務。"</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"這是由您的裝置政策所設定。"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"電腦備份密碼"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"電腦完整備份目前未受保護"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"輕觸即可變更或移除電腦完整備份的密碼"</string>
@@ -1956,7 +1966,11 @@
     <string name="enter_password" msgid="8035706727471334122">"如要啟動 Android，請輸入您的密碼"</string>
     <string name="enter_pin" msgid="5305333588093263790">"如要啟動 Android，請輸入您的 PIN"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"如要啟動 Android，請畫出解鎖圖形"</string>
-    <string name="try_again" msgid="4272075051293936921">"請再試一次。"</string>
+    <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"圖形錯誤"</string>
+    <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"密碼錯誤"</string>
+    <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"PIN 錯誤"</string>
+    <string name="checking_decryption" msgid="8287458611802609493">"檢查中…"</string>
+    <string name="starting_android" msgid="8581493237458496835">"正在啟動 Android"</string>
     <string name="delete" msgid="4219243412325163003">"刪除"</string>
     <string name="misc_files" msgid="6720680815969643497">"其他檔案"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"已選取 <xliff:g id="NUMBER">%1$d</xliff:g> 個，共 <xliff:g id="TOTAL">%2$d</xliff:g> 個"</string>
@@ -1994,8 +2008,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"一律使用 GPU 進行畫面合成"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"模擬色彩空間"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"啟用 OpenGL 追蹤"</string>
-    <string name="use_nuplayer" msgid="5699257393367904387">"使用 NuPlayer (實驗性)"</string>
-    <string name="use_nuplayer_summary" msgid="1991479067478516714">"使用 NuPlayer 取代 AwesomePlayer"</string>
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"使用 AwesomePlayer (已淘汰)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"使用 AwesomePlayer (取代 NuPlayer) 播放大多數媒體"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"停用 USB 音訊路由"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"停用 USB 音訊周邊設備的自動路由功能"</string>
     <string name="debug_layout" msgid="5981361776594526155">"顯示版面配置界限"</string>
@@ -2171,7 +2185,6 @@
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"新增使用者或個人資料"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"新增使用者"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"設有限制的個人資料"</string>
-    <string name="user_summary_managed_profile" msgid="7369539529693048111">"工作設定檔"</string>
     <string name="user_need_lock_message" msgid="2596365678651842785">"如要建立設有限制的個人資料，您必須先設定螢幕鎖定來保護您的應用程式和個人資料。"</string>
     <string name="user_set_lock_button" msgid="8311219392856626841">"設定鎖定"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"尚未設定"</string>
@@ -2302,11 +2315,13 @@
     <string name="sim_cellular_data_unavailable_summary" msgid="3654805961942166428">"輕觸即可選取用於數據連線的 SIM 卡"</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"一律使用這張 SIM 卡通話"</string>
     <string name="select_sim_for_data" msgid="2366081042162853044">"選擇數據連線 SIM 卡"</string>
+    <string name="data_switch_started" msgid="2040761479817166311">"正在切換行動數據連線 SIM 卡，這可能需要一點時間..."</string>
     <string name="select_sim_for_calls" msgid="3503094771801109334">"選擇通話 SIM 卡"</string>
     <string name="sim_select_card" msgid="211285163525563293">"選取 SIM 卡"</string>
     <string name="sim_card_number_title" msgid="7845379943474336488">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"未插入 SIM 卡"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"SIM 卡名稱"</string>
+    <string name="sim_name_hint" msgid="7038643345238968930">"輸入 SIM 卡名稱"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"SIM 卡插槽 %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"行動通訊業者"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"號碼"</string>
@@ -2316,7 +2331,6 @@
     <string name="color_purple" msgid="3888532466427762504">"紫色"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"尚未插入 SIM 卡"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"SIM 卡狀態"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"SIM 卡相關資訊"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"使用預設 SIM 卡回撥"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"用於撥出電話的 SIM 卡"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"其他通話設定"</string>
@@ -2324,8 +2338,11 @@
     <string name="preferred_network_offload_header" msgid="2321173571529106767">"停用網路名稱廣播"</string>
     <string name="preferred_network_offload_footer" msgid="5857279426054744020">"停用網路名稱廣播以防第三方取得您的網路資訊。"</string>
     <string name="preferred_network_offload_popup" msgid="2252915199889604600">"停用網路名稱廣播將無法自動連線到隱藏的網路。"</string>
+    <string name="sim_signal_strength" msgid="9144010043784767984">"<xliff:g id="DBM">%1$d</xliff:g> dBm <xliff:g id="ASU">%2$d</xliff:g> asu"</string>
+    <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>
@@ -2334,22 +2351,22 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"最近的搜尋查詢"</string>
     <string name="search_results_label" msgid="4163304782363526148">"搜尋結果"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi 網路連線"</string>
-    <string name="keywords_more_default_sms_app" msgid="2744404159003574745">"簡訊"</string>
-    <string name="keywords_more_mobile_networks" msgid="7813380887358745769">"手機 行動通訊業者 無線"</string>
+    <string name="keywords_more_default_sms_app" msgid="895656981962034647">"文字訊息 訊息 傳送文字訊息 簡訊 傳送簡訊"</string>
+    <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"行動通訊 行動網路 行動通訊業者 無線 數據 4G 3G 2G LTE"</string>
     <string name="keywords_home" msgid="3626170808219458848">"啟動器"</string>
     <string name="keywords_display" msgid="6709007669501628320">"螢幕 觸控式螢幕"</string>
-    <string name="keywords_display_brightness_level" msgid="8636451602230815191">"變暗 螢幕 觸控式螢幕"</string>
-    <string name="keywords_display_auto_brightness" msgid="8070218600502753102">"變暗 螢幕 觸控式螢幕"</string>
-    <string name="keywords_display_wallpaper" msgid="4315466287469834939">"背景"</string>
+    <string name="keywords_display_brightness_level" msgid="8923289340474728990">"變暗 螢幕 觸控螢幕 電池"</string>
+    <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"變暗 螢幕 觸控螢幕 電池"</string>
+    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"背景 個人化 自訂 顯示"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"文字大小"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"投影"</string>
-    <string name="keywords_storage" msgid="7007275853993419928">"空間 磁碟 硬碟"</string>
-    <string name="keywords_battery" msgid="3992479295298655138">"電源"</string>
-    <string name="keywords_spell_checker" msgid="4509482591225399210">"拼字檢查"</string>
+    <string name="keywords_storage" msgid="6572905220031852173">"空間 磁碟 硬碟 裝置 使用量"</string>
+    <string name="keywords_battery" msgid="2096185085932675704">"電源 使用量 充電"</string>
+    <string name="keywords_spell_checker" msgid="6106749039734174140">"拼寫 字典 拼字檢查 自動更正"</string>
     <string name="keywords_voice_input" msgid="3519547605812413860">"辨識器 輸入 語音 說話 語言 免持模式 免持 辨識 不雅字詞 音訊 紀錄 藍牙 耳機"</string>
-    <string name="keywords_text_to_speech_output" msgid="8207889472282225512">"語言分級 預設 說出 語音"</string>
-    <string name="keywords_date_and_time" msgid="7666950126499155141">"時鐘"</string>
-    <string name="keywords_factory_data_reset" msgid="3693730656843989732">"清除 刪除"</string>
+    <string name="keywords_text_to_speech_output" msgid="392447904221657930">"速度 語言 預設 說話 語音 文字轉語音 協助工具 閱讀器 視障"</string>
+    <string name="keywords_date_and_time" msgid="2631808108134830066">"時鐘 軍用"</string>
+    <string name="keywords_factory_data_reset" msgid="4355133848707691977">"抹除 刪除 還原 清除 移除"</string>
     <string name="keywords_printing" msgid="1701778563617114846">"印表機"</string>
     <string name="keywords_sounds_and_notifications" msgid="5965996187974887000">"喇叭提示音"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="2912933812460077912">"不得干擾 中斷 中斷"</string>
@@ -2358,7 +2375,7 @@
     <string name="keywords_location_mode" msgid="8584992704568356084">"精確度"</string>
     <string name="keywords_accounts" msgid="1957925565953357627">"帳戶"</string>
     <string name="keywords_users" msgid="4673901601478559100">"限制 限制 受限"</string>
-    <string name="keywords_keyboard_and_ime" msgid="1103378692379215672">"文字修正 修正 音效 震動 自動 語言 手勢 建議 建議 主題 令人反感的字詞 類型 表情符號"</string>
+    <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"文字 更正 修正 音效 震動 自動 語言 手勢 建議 字詞建議 主題 令人反感 字詞 輸入 表情符號 國際"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"滑動 密碼 圖形 PIN"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"設定 Wi-Fi NFC 標記"</string>
     <string name="write_tag" msgid="8571858602896222537">"寫入"</string>
@@ -2375,7 +2392,6 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"通知音量"</string>
     <string name="zen_mode_settings_title" msgid="7014915558669122902">"干擾"</string>
     <string name="zen_mode_option_title" msgid="5061978632306007914">"收到來電和通知時"</string>
-    <string name="zen_mode_option_title_novoice" msgid="6680706009915204785">"收到通知時"</string>
     <string name="zen_mode_option_off" msgid="3167702608910820883">"一律允許干擾"</string>
     <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"僅允許優先干擾"</string>
     <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"不允許干擾"</string>
@@ -2433,14 +2449,17 @@
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"完成"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"手動關閉這項設定前一律啟用"</string>
     <string name="zen_mode_important_category" msgid="8123274463331022993">"優先干擾"</string>
-    <string name="zen_mode_downtime_category" msgid="4730179065426038108">"休息時間 (僅限優先干擾)"</string>
+    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"停機"</string>
     <string name="zen_mode_downtime_days" msgid="3361856902633311616">"星期幾"</string>
     <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"無"</string>
+    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"允許干擾"</string>
+    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"僅限優先干擾"</string>
+    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"無"</string>
     <string name="zen_mode_automation_category" msgid="4653551005950835761">"自動化"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"自動開啟"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">"、 "</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"永遠不要"</string>
-    <string name="zen_mode_phone_calls" msgid="8956214416859303966">"來電"</string>
+    <string name="zen_mode_calls" msgid="7051492091133751208">"來電"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"訊息"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"來電者/訊息傳送者"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"所有人"</string>
@@ -2454,7 +2473,9 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"週一至週五夜間"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"開始時間"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"結束時間"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"隔天 <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
+    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"隔天 <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> 或任何早於該時間的鬧鐘鈴響時"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"隔天 <xliff:g id="FORMATTED_TIME">%s</xliff:g> 或任何早於該時間的鬧鐘鈴響時"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"應用程式通知"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"通知設定"</string>
     <string name="device_feedback" msgid="3238056036766293294">"傳送您對這個裝置的意見回饋"</string>
@@ -2462,7 +2483,11 @@
     <string name="switch_on_text" msgid="1124106706920572386">"開啟"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"關閉"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"螢幕固定"</string>
-    <string name="screen_pinning_description" msgid="7091642350452605379">"開啟時，您可以使用螢幕固定功能讓目前的畫面持續顯示，直到取消固定為止。\n\n如何使用螢幕固定功能：\n\n1. 確認螢幕固定功能已開啟。\n\n2. 開啟您要固定的畫面。\n\n3. 輕觸總覽按鈕。\n\n4. 輕觸圖釘圖示。"</string>
+    <string name="screen_pinning_description" msgid="1137904524037468263">"開啟這項設定時，您可以使用螢幕固定功能讓目前的畫面保持顯示狀態，直到取消固定為止。\n\n如何使用螢幕固定功能：\n\n1. 確認螢幕固定功能已開啟。\n\n2. 開啟您要固定的畫面。\n\n3. 輕觸總覽按鈕。\n\n4. 向上滑動並輕觸圖釘圖示。"</string>
+    <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"取消固定時必須畫出解鎖圖形"</string>
+    <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"取消固定時必須輸入 PIN"</string>
+    <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"取消固定時必須輸入密碼"</string>
+    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"取消固定時鎖定裝置"</string>
     <string name="managed_user_title" msgid="8101244883654409696">"工作設定檔"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(實驗性)"</string>
     <string name="display_auto_rotate_title" msgid="6176450657107806043">"當裝置旋轉時"</string>
@@ -2471,7 +2496,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"保持橫向畫面"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"保持目前方向"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI 資訊"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI 相關資訊"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"加密"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"繼續"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"如果要進一步保護裝置，您可以將裝置設為需要輸入 PIN 才能啟動，等裝置啟動後方可接收來電、訊息或通知 (包括警告)。\n\n這樣一來，即使裝置遺失或遭竊，其中的資料仍安全無虞。"</string>
@@ -2489,4 +2513,7 @@
     <string name="encrypt_talkback_dialog_message_pin" msgid="1890374082842868489">"輸入您的 PIN 啟動裝置後，您將無法使用 <xliff:g id="SERVICE">%1$s</xliff:g> 等各項協助工具服務。"</string>
     <string name="encrypt_talkback_dialog_message_pattern" msgid="4474332516537386384">"畫出解鎖圖形啟動裝置後，您將無法使用 <xliff:g id="SERVICE">%1$s</xliff:g> 等各項協助工具服務。"</string>
     <string name="encrypt_talkback_dialog_message_password" msgid="8166099418487083927">"輸入您的密碼啟動裝置後，您將無法使用 <xliff:g id="SERVICE">%1$s</xliff:g> 等各項協助工具服務。"</string>
+    <string name="imei_information_title" msgid="8499085421609752290">"IMEI 資訊"</string>
+    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI 相關資訊"</string>
+    <string name="slot_number" msgid="3762676044904653577">"(插槽 <xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-zu/arrays.xml b/res/values-zu/arrays.xml
index 6c68e20..f3a81bf 100644
--- a/res/values-zu/arrays.xml
+++ b/res/values-zu/arrays.xml
@@ -527,4 +527,12 @@
     <item msgid="4338089220026248848">"Kulondoloziwe (iklayenti lomsebenzi)"</item>
     <item msgid="6652164677254579050">"Kulondoloziwe (lutho)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Okuluhlaza ngokujiyile"</item>
+    <item msgid="8332294763632946560">"Okuluhlaza okwesibhakabhaka"</item>
+    <item msgid="2023216417616991392">"I-Indigo"</item>
+    <item msgid="3170497246594232819">"Phephuli"</item>
+    <item msgid="4608643045752965568">"Ophinki"</item>
+    <item msgid="6131821495505931173">"Okubomvu"</item>
+  </string-array>
 </resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 8adde44..a17569f 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>
@@ -180,7 +180,6 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"I-%1$s ifuna ukufinyelela kumilayezo yakho. Nikeza ukufinyelela ku-%2$s?"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Idethi nesikhathi"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Khetha isikhathi sendawo"</string>
-    <string name="normal_date_format" msgid="7636406984925498359">"Okwesifunda (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Buka kuqala:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Usayizi wefonti:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -291,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>
@@ -322,8 +321,6 @@
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Khetha umkhawulo wesikhathi"</string>
     <string name="date_time_set_date_title" msgid="6928286765325608604">"Idethi"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"Setha idethi"</string>
-    <string name="date_time_date_format_title" msgid="3976171711988766411">"Ifomethi yedethi"</string>
-    <string name="date_time_date_format" msgid="6951498879879281102">"Khetha ifomethi yedethi"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Hlunga ngama-alfabethi"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Hlunga ngesikhathi somkhawulo"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Idethi"</string>
@@ -372,7 +369,8 @@
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Sicela ulinde ngenkathi ifoni ihlelwa ngokubhala ngokufihlekileyo <xliff:g id="PERCENT">^1</xliff:g> % iqedile."</string>
     <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Linda ngenkathi ithebulethi yakho ibhalwa ngekhodi. Isikhathi esisele: <xliff:g id="DURATION">^1</xliff:g>"</string>
     <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Linda ngenkathi ifoni yakho ibhalwa ngekhodi. Isikhathi esisele: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Zama futhi emasekhondini angu-<xliff:g id="DELAY">^1</xliff:g>."</string>
+    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"Ukuze uvule ithebulethi yakho, ivale bese uyayivula."</string>
+    <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"Ukuze uvule ifoni yakho, ivale bese uyayivula."</string>
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"Isexwayiso: Idivayisi yakho izosulwa ngemuva kwemizamo ehlulekayo engaphezu kwengu-<xliff:g id="COUNT">^1</xliff:g> ukuze ivulwe!"</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Thayipha iphasiwedi yakho"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Ubhala ngokufihlekileyo akuphumelelanga"</string>
@@ -401,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>
@@ -412,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>
@@ -556,13 +556,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Njenge sipikhafoni"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Komculo nemidiya"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Khumbula izilungiselelo"</string>
-    <string name="wifi_assistant_intro_setup" msgid="4605105515416995110">"Kwethulwa i-\nWi‑Fi Assistant"</string>
-    <string name="wifi_assistant_no_thanks" msgid="2776983751990143934">"CHA, NGIYABONGA"</string>
-    <string name="wifi_assistant_setup" msgid="3772423650475730906">"SETHA"</string>
-    <string name="wifi_assistant_card_message" msgid="107811647784658536">"Xhuma ngokuzenzakalelayo kumanethiwekhi atholakalayo ngomsizi we-Wi‑Fi."</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Umsizi we-Google Wi‑Fi"</string>
-    <string name="wifi_assistant_title_message" msgid="6240721017579074015">"<xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> ikuxhuma ngokuzenzakalelayo ku-Wi-Fi enhle etholakalayo"</string>
-    <string name="wifi_assistant_open_app" msgid="4803044899535675063">"VULA UHLELO LOKUSEBENZA"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Ixhunywe ngomsizi we-Wi-FI"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"Isikrini sabalingisi"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Nika amandla ukubukeka okungenantambo "</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Awekho amadivayisi aseduze atholakele."</string>
@@ -592,7 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Izilungiselelo ze-Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"I-Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Hlela, uphathe izindawo zokungena ezingenantambo"</string>
-    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Khetha i-Wi-Fi"</string>
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Khetha inethiwekhi ye-Wi-Fi"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Khetha i-Wi-Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Ivula i-Wi-Fi..."</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Ivala i-Wi-Fi..."</string>
@@ -607,8 +602,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"Ukuskena kuhlala njalo kutholakala"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Njalo vumela ukuskena"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Vumela isevisi yendawo ye-Google nezinye izinhlelo zokusebenza ukuthi ziskene amanethiwekhi, noma ngabe i-Wi-Fi ivaliwe"</string>
-    <string name="wifi_automatically_manage_title" msgid="6249976570008992746">"Phatha ngokuzenzakalelayo i-Wi‑Fi"</string>
-    <string name="wifi_automatically_manage_summary" msgid="6952470763378312488">"Vumela i-<xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> ukuthi iphathe uxhumo lwakho le-Wi‑Fi"</string>
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Sebenzisa ukuvula i-Wi-Fi ngokuzenzakalela"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Vumela umsizi we-Wi-Fi axhumeke ngokuzenzakalela kumanethiwekhi avulekile anqunywa ngokuthi ayikhwalithi ephezulu."</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Khetha umsizi"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Faka izitifiketi"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Ukuthuthukisa ukulunga kwendawo nezinye izinjongo, i-Google nezinye izinhlelo zokusebenza zingaskenela amanethiwekhi aseduze, noma ngabe i-Wi-Fi ivaliwe. Uma ungafuni ukuthi lokhu kwenzeke, hamba ekuskeneni okuthuthukisiwe &gt; okuhlala kutholakala."</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Izinhlelo zokusebenza zingaskenela amanethiwekhi aseduze, noma ngabe i-Wi-Fi ivaliwe. Uma ungafuni ukuthi lokhu kwenzeke, hamba ekuskeneni okuthuthukisiwe &gt; okuhlala kutholakala."</string>
@@ -629,6 +625,7 @@
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Skena"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Thuthukisiwe"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Xhuma kwinethiwekhi"</string>
+    <string name="wifi_menu_remember" msgid="8814185749388713796">"Khumbula inethiwekhi"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Khohlwa inethiwekhi"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Guqula inethiwekhi"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Bhalela kumaka we-NFC"</string>
@@ -673,9 +670,11 @@
     <string name="wifi_unspecified" msgid="5431501214192991253">"(okungacacisiwe)"</string>
     <string name="wifi_remembered" msgid="4955746899347821096">"Kulondoloziwe"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"Akusebenzi"</string>
-    <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Kugwenyiwe ukungaxhumeki kahle"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"Ukwehluleka kokulungiswa kwe-IP"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Ukwehlulekla koxhumo le-WiFi"</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Inkinga yokufakazela ubuqiniso"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Ayikho ebubanzini"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Ukufinyeela okungekhona kwe-inthanethi kutholakele, ngeke kuxhumeke ngokuzenzakalelayo."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"i-WPS iyatholakala"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (i-WPS iyatholakala)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Faka iphasiwedi yakho yenethiwekhi"</string>
@@ -699,9 +698,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"ISEXWAYISO: Uma weqa i-Wi‑Fi, itebhulethi yakho ngeke ibe noxhumo lwe-inthanethi olungasetshenziselwa noma yikuphi ukulanda kokuqala noma izibuyekezo. Ukuze ugweme izindleko zedatha ezingenzeka, xhuma ku-Wi-Fi."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"ISEXWAYISO: Uma weqa i-Wi‑Fi, idivayisi yakho ngeke ibe noxhumo lwe-inthanethi olungasetshenziselwa noma yikuphi ukulanda kokuqala noma izibuyekezo. Ukuze ugweme izindleko zedatha ezingenzeka, xhuma ku-Wi-Fi."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"ISEXWAYISO: Uma weqa i-Wi‑Fi, ifoni yakho ngeke ibe noxhumo lwe-inthanethi olungasetshenziselwa noma yikuphi ukulanda kokuqala noma izibuyekezo. Ukuze ugweme izindleko zedatha ezingenzeka, xhuma ku-Wi-Fi."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="2393880108322835846">"ISEXWAYISO: Uma weqa i-Wi‑Fi, ithebhulethi yakho ngeke ibe noxhumo lwe-inthanethi olungasetshenziselwa noma yikuphi ukulanda kokuqala noma izibuyekezo."</string>
-    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1707391993265558787">"ISEXWAYISO: Uma weqa i-Wi‑Fi, idivayisi yakho ngeke ibe noxhumo lwe-inthanethi olungasetshenziselwa noma yikuphi ukulanda kokuqala noma izibuyekezo."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="1556858507920033022">"ISEXWAYISO: Uma weqa i-Wi‑Fi, ifoni yakho ngeke ibe noxhumo lwe-inthanethi olungasetshenziselwa noma yikuphi ukulanda kokuqala noma izibuyekezo."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Uma weqa i-Wi‑Fi:\n\nIthebulethi yakho ngeke ibe nokuxhumeka kwe-inthanethi.\n\nNgeke uze uthole izibuyekezo zesofthiwe uze uxhumeke ku-inthanethi.\n\nAwukwazi ukwenza kusebenze izici zokuvikela idivayisi ngalesi sikhathi."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Uma weqa i-Wi‑Fi:\n\nIdivayisi yakho ngeke ibe nokuxhumeka kwe-inthanethi.\n\nNgeke uze uthole izibuyekezo zesofthiwe uze uxhumeke ku-inthanethi.\n\nAwukwazi ukwenza kusebenze izici zokuvikela idivayii ngalesi sikhathi."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Uma weqa i-Wi‑Fi:\n\nIfoni yakho ngeke ibe nokuxhumeka kwe-inthanethi.\n\nNgeke uze uthole izibuyekezo zesofthiwe uze uxhumeke ku-inthanethi.\n\nAwukwazi ukwenza kusebenze izici zokuvikela idivayisi ngalesi sikhathi."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Ithebhulethi ayikwazanga ukuxhuma kule nethiwekhi ye-Wi-Fi."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"Idivayisi ayikwazanga ukuxhuma kule nethiwekhi ye-Wi‑Fi."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Ifoni ayikwazanga ukuxhuma kule nethiwekhi ye-Wi-Fi."</string>
@@ -761,7 +760,6 @@
     <string name="ring_volume_title" msgid="7938706566797464165">"Ivolumu yesikhali"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Idlidliza uma ithulile"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Umsindo wokwazisa ozenzakalelayo"</string>
-    <string name="heads_up_enabled_title" msgid="1031078221910921622">"Vela uma kubalulekile"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Iringithoni"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Isaziso"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Sebenzisa ivolumu yocingo olungenayo yezaziso"</string>
@@ -834,7 +832,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Ukukhanya okuzenzakalelayo"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Ilifti yokuvuka"</string>
     <string name="doze_title" msgid="2259176504273878294">"Isibonisi esi-Ambient"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"Vusa isikrini uma idivayisi iphakanyisiwe noma uma kufika izaziso"</string>
+    <string name="doze_summary" msgid="7128970177894383698">"Vusa isikrini uma uthatha idivayisi noma uthola izaziso"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Usayizi wefonti"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Ubukhulu befonti"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Izilungiselelo zokuvala ikhadi le-SIM"</string>
@@ -862,6 +860,10 @@
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Khansela"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"Kutholakele ama-SIM amaningi"</string>
     <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>
@@ -1013,6 +1015,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Lokhu kuzosusa yonke idatha "<b>"ekwistoreji sangaphakathi kuthebhulethi yakho"</b>", ehlanganisa:\n\n"<li>"I-akhawunti yakho ye-Google"</li>\n<li>"Uhlelo lokusebenza kanye nezilungiselelo"</li>\n<li>"Izinhlelo zokusebenza ezilayishiwe"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Lokhu kuzosusa yonke idatha "<b>"ekwisitoreji sangaphakathi sefoni yakho"</b>", ehlanganisa:\n\n"<li>"I-akhawunti yakho ye-Google"</li>\n<li>"Uhlelo lokusebenza kanye nezilungiselelo"</li>\n<li>"Izinhlelo zokusebenza ezilayishiwe"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n"Okwamanje ungene ngemvume kuma-akhawunti alandelayo:\n\n"</string>
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Kukhona abanye abasebenzisi abakhona kule divayisi.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Umculo"</li>\n<li>"Izithombe"</li>\n<li>"Enye idatha yomsebenzisi"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Ukusula futhi umculo, izithombe, nenye idatha yomsebenzisi, "<b>" indawo yokugcina ye-USB"</b>"idinga ukusulwa."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Ukusula umculo, izithombe, nenye imininingo yomsebenzisi, "<b>"ikhadi le-SD"</b>"kumele lisuswe."</string>
@@ -1024,7 +1027,6 @@
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Setha kabusha ifoni"</string>
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Susa lonke ulwazi lomuntu kanye nezinhlelo zokusebenza ezilayishiwe? Ngeke ukwazi ukuguqula lokhu!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Sula yonke into"</string>
-    <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Dweba iphathini yakho yokuvula"</string>
     <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Udinga ukudweba iphethini yakho yokuvula ukuqinisekisa ukwenza kabusha idatha yonkampani."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Akukho ukusetha kabusha okwenziwe ngoba isevisi Yokwesula Isistimu ayitholakali."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Setha kabusha"</string>
@@ -1042,7 +1044,6 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"Sula isitoreji se-USB, isula wonke amafayela agcinwe lapho? Isinyathelo asikwazi ukuguqulwa!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Sula ikhadi le-SD, isula wonke amafayela agcinwe lapho? Isinyathelo asikwazi ukuguqulwa!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Sula yonke into"</string>
-    <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Dweba iphathini yokuvula"</string>
     <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Kumele udwebe iphathini yakho yokuvula ukuqinisekisa ukuthi ufuna ukusula isitoreji se-USB."</string>
     <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Kumele udwebe iphathini yakho yokuvula ukuqinisekisa ukuba ufuna ukusula ikhadi le-SD."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Izilungiselelo zekholi"</string>
@@ -1088,6 +1089,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Sicela ufake ikhadi le-SIM bese uqala kabusha"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Sicela uxhume ku-inthanethi"</string>
     <string name="location_title" msgid="1029961368397484576">"Indawo Yami"</string>
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Iphrofayela yomsebenzi"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Indawo yephrofayela yokusebenza"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Ivalwe yinkampani yakho"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Imodi"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Ukunemba okuphezulu"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Ukulondolozwa kwebhetri"</string>
@@ -1125,6 +1129,7 @@
     <string name="copyright_title" msgid="865906688917260647">"I-copyright"</string>
     <string name="license_title" msgid="1990487604356037871">"Ilayisensi"</string>
     <string name="terms_title" msgid="7697580845616764642">"Imigomo nemibandela"</string>
+    <string name="webview_license_title" msgid="2813507464175738967">"Ilayisense yesistimu ye-WebView"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Izithombe zangemuva"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Abanikezeli bezithombe zesathelayithi:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Vula amalayisensi omthombo"</string>
@@ -1238,7 +1243,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Isitoreji se-USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Ekhadini le-SD"</string>
     <string name="disabled" msgid="9206776641295849915">"Akusebenzi"</string>
-    <string name="not_installed" msgid="1475144352069281880">"Akufakiwe"</string>
+    <string name="not_installed" msgid="2797554494953450291">"Akufakiwe kulo msebenzisi"</string>
     <string name="no_applications" msgid="7336588977497084921">"Azikho izinhlelo zokusebenza"</string>
     <string name="internal_storage" msgid="1584700623164275282">"Isitoreji sangaphakathi"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Isitoreji se-USB"</string>
@@ -1441,8 +1446,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Isikrini asisoze salala ngenkathi sishaja"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Nika amandla i-Bluetooth HCI yelogu lokuhlola"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Shutha wonke amaphakethe we-bluetooth HCI kufayela"</string>
-    <string name="oem_unlock_enable" msgid="6629321276287913315">"Nika amandla ukuvula kwe-OEM"</string>
-    <string name="oem_unlock_enable_summary" msgid="3546686263996628110">"Vumela idivayisi ukuthi ivulelwe i-OEM"</string>
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"Ukuvula i-OEM"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Vumela ukuthi i-bootloader ivulwe"</string>
+    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Faka i-PIN yakho"</string>
+    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Faka i-PIN yedivayisi yakho ukuze unike amandla ukuvula kwe-OEM"</string>
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Vumela ukuvula i-OEM?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"ISEXWAYISO: Izici zokuvikela idivayisi ngeke zisebenze kule divayisi ngenkathi le sethingi ivuliwe."</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Ukunikezwa isitifiketi sokubukeka okungenantambo"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Nika amandlaukungena kwe-Wi-Fi Verbose"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Ukunikezela kwe-Wi-Fi kuya kuselula okunamandla"</string>
@@ -1545,6 +1554,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"Amazwibela azobukeka ngale ndlela"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"Okuzenzakalelayo"</string>
+    <string name="color_title" msgid="4258931051732243983">"Umbala"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"Okuzenzakalelayo"</string>
     <string name="color_none" msgid="3475640044925814795">"Lutho"</string>
     <string name="color_white" msgid="8045195170201590239">"Okumhlophe"</string>
@@ -1602,12 +1612,12 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"<xliff:g id="REMAIN">%1$s</xliff:g> osele"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> ukuze lishajiwe"</string>
-    <string name="power_discharging_duration" msgid="7125493014448497620">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - isilinganiso esingu-<xliff:g id="TIME">%2$s</xliff:g> esisele"</string>
-    <string name="power_charging" msgid="712751285832976915">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="STATE">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration" msgid="4802183864773082009">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> kuze kugcwale"</string>
-    <string name="power_charging_duration_ac" msgid="3611179931297824699">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> kuze kugcwale ku-AC"</string>
-    <string name="power_charging_duration_usb" msgid="1106605348913397583">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> kuze kugcwale nge-USB"</string>
-    <string name="power_charging_duration_wireless" msgid="633606920144617227">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> kuze kugcwale kusuka kokungenantambo"</string>
+    <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> - isilinganiso esingu-<xliff:g id="TIME">%2$s</xliff:g> esisele"</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> kuze igcwale"</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> kuze igcwale ku-AC"</string>
+    <string name="power_charging_duration_usb" msgid="182405645340976546">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> kuze igcwale ngaphezulu kwe-USB"</string>
+    <string name="power_charging_duration_wireless" msgid="1829295708243159464">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> kuze igcwale kusukela kokungenantambo"</string>
     <string name="power_usage_list_summary" msgid="2409288197839512482">"Ukusebenza kusuka ekugcineni kokushaja okugcwele"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Ukusebenzisa ibhetri kusukela inqamuliwe"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Ukusebenzisa ibhetri kusukela ekuhleleni futhi"</string>
@@ -1624,7 +1634,6 @@
     <string name="awake" msgid="387122265874485088">"Isikhathi sokuvuka kwedivaysi"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"I-Wi-Fi isesikhathini"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"I-Wi-Fi isesikhathini"</string>
-    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Imininingwane yomlando"</string>
     <string name="details_title" msgid="3792801565213935385">"Sebenzisa imininingwane"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Sebenzisa imininingwane"</string>
@@ -1696,7 +1705,7 @@
     <string name="battery_saver" msgid="1426682272004907982">"Isilondolozi sebhethri"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Vula ngokuzenzakalela"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Akusoze"</string>
-    <string name="battery_saver_turn_on_automatically_pct" msgid="3033681629861428940">"ku-%1$d%% ibhethri"</string>
+    <string name="battery_saver_turn_on_automatically_pct" msgid="7536784431655058267">"kubhethri le-%1$s"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Izibalo zenqubo"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Izibalo ze-Geeky mayelana nezinqubo zokuqalisa"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Ukusetshenziswa kwememori"</string>
@@ -1820,7 +1829,6 @@
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Izingxenyekazi zekhompyutha zisekelwe ngokulondoloza"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Isofthiwe kuphela"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"Izifakazo azitholakaleli lo msebenzisi"</string>
-    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Dweba iphethini yakho yokuvula"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Udinga ukudweba iphethini yakho yokuvula ukuze uqinisekise ukufakwa kwezincwadi ezichaza ngomuntu."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Thayipha iphasiwedi yokulondoloza ukufakazela ubuqiniso"</string>
@@ -1850,6 +1858,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"Bandakanya idatha yohlelo lokusebenza"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Ukubuyisela esimweni okuzenzakalelayo"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Uma ufaka futhi uhlelo lokusebenza, buyisela okuhlelwe ukusebenza kwezipele kanye nemininingo"</string>
+    <string name="backup_inactive_title" msgid="5355557151569037197">"Isevisi yesipele ayisebenzi."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"Lokhu kusethwa yinqubomgomo yedivayisi yakho."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Iphasiwedi yokusekela ngokulondoloza ye-Desktop"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Ukusekela ngokulondoloza okugcwele kwe-Desktop akuvikelekile okwamanje."</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Khetha ukushintsha noma ukususa iphasiwedi yokwenziwa kwezipele ngokugcwele kwideskithophu"</string>
@@ -1959,7 +1969,11 @@
     <string name="enter_password" msgid="8035706727471334122">"Ukuze uqale i-Android, faka iphasiwedi yakho"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Ukuze uqale i-Android, faka iphinikhodi yakho"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Ukuze uqale i-Android, dweba iphethini yakho"</string>
-    <string name="try_again" msgid="4272075051293936921">"Zama futhi."</string>
+    <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"Iphethini engalungile"</string>
+    <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"Iphasiwedi engalungile"</string>
+    <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"Iphinikhodi engalungile"</string>
+    <string name="checking_decryption" msgid="8287458611802609493">"Iyahlola..."</string>
+    <string name="starting_android" msgid="8581493237458496835">"Ukuqalisa i-Android"</string>
     <string name="delete" msgid="4219243412325163003">"Susa"</string>
     <string name="misc_files" msgid="6720680815969643497">"Amafayela axubene"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"kukhethwe <xliff:g id="NUMBER">%1$d</xliff:g> kokuyi <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -1997,8 +2011,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Njalo sebenzisa i-GPU ukwakha isikrini"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"Qoqa isikhala sombala"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Nika amandla ukulandelwa komkhondo kwe-OpenGL"</string>
-    <string name="use_nuplayer" msgid="5699257393367904387">"Sebenzisa i-NuPlayer (lokuhlola)"</string>
-    <string name="use_nuplayer_summary" msgid="1991479067478516714">"Sebenzisa i-NuPlayer esikhundleni se-AwesomePlayer"</string>
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"Sebenzisa i-AwesomePlayer (kuhoxisiwe)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"Sebenzisa i-AwesomePlayer esikhundleni se-NuPlayer ukudlala ividiyo"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"Khubaza umzila womsindo we-USB"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"Khubaza ukwenza umzila ngokuzenzakalelayo kuma-pheripherals womsindo we-USB"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Khombisa imingcele yokumiseka"</string>
@@ -2174,7 +2188,6 @@
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Engeza umsebenzisi noma iphrofayela"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Engeza umsebenzisi"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Iphrofayela evinjelwe"</string>
-    <string name="user_summary_managed_profile" msgid="7369539529693048111">"Iphrofayela yomsebenzi"</string>
     <string name="user_need_lock_message" msgid="2596365678651842785">"Ngaphambi kokuthi ungadala iphrofayela ekhawulelwe, kuzomele usethe ukukhiya isikrini ukuze uvikele izinhlelo zakho zokusebenza nedatha yakho yomuntu siqu."</string>
     <string name="user_set_lock_button" msgid="8311219392856626841">"Setha ukukhiya"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Akukho ukusetha"</string>
@@ -2305,11 +2318,13 @@
     <string name="sim_cellular_data_unavailable_summary" msgid="3654805961942166428">"Thinta ukuze ukhethe i-SIM yedatha"</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"Njalo sebenzisa lokhu kumakholi"</string>
     <string name="select_sim_for_data" msgid="2366081042162853044">"Khetha i-SIM yedatha"</string>
+    <string name="data_switch_started" msgid="2040761479817166311">"Ishintsha i-SIM yedatha, lokhu kungathatha kufikela kuminithi..."</string>
     <string name="select_sim_for_calls" msgid="3503094771801109334">"Shaya nge"</string>
     <string name="sim_select_card" msgid="211285163525563293">"Khetha ikhadi le-SIM"</string>
     <string name="sim_card_number_title" msgid="7845379943474336488">"I-SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"I-SIM ayinalutho"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"Igama le-SIM"</string>
+    <string name="sim_name_hint" msgid="7038643345238968930">"Faka igama le-SIM"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"Isikhala se-SIM %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Inkampani yenethiwekhi"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Inombolo"</string>
@@ -2319,7 +2334,6 @@
     <string name="color_purple" msgid="3888532466427762504">"Phephuli"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"Awekho amakhadi we-SIM afakiwe"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"Isimo se-SIM"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"Ulwazi oluhlobene ne-SIM"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"Shayela emuva kusuka ku-SIM yokuzenzakalelayo"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"I-SIM yamakholi aphumayo"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Ezinye izilungiselelo zekholi"</string>
@@ -2327,8 +2341,11 @@
     <string name="preferred_network_offload_header" msgid="2321173571529106767">"Khubaza ukusakaza kwegama lenethiwekhi"</string>
     <string name="preferred_network_offload_footer" msgid="5857279426054744020">"Ukukhubaza ukusakaza kwegama lenethiwekhi kuvikela izinkampani zangaphandle ukufinyelela ulwazi lenethiwekhi yakho."</string>
     <string name="preferred_network_offload_popup" msgid="2252915199889604600">"Ukukhubaza ukusakaza kwegama lenethiwekhi kuzovikela uxhumo oluzenzakalelayo ukufihla amanethiwekhi."</string>
+    <string name="sim_signal_strength" msgid="9144010043784767984">"<xliff:g id="DBM">%1$d</xliff:g> dBm <xliff:g id="ASU">%2$d</xliff:g> asu"</string>
+    <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>
+    <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Buza njalo"</string>
     <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>
@@ -2337,22 +2354,22 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Usesho lwakamuva"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Imiphumela"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"ukuxhumeka kwenethiwekhi ye-wi-fi"</string>
-    <string name="keywords_more_default_sms_app" msgid="2744404159003574745">"umlayezo wombhalo"</string>
-    <string name="keywords_more_mobile_networks" msgid="7813380887358745769">"ukungabi nantambo kwenkampani yenethiwekhi yeseli"</string>
+    <string name="keywords_more_default_sms_app" msgid="895656981962034647">"umlayezo wombhalo ukubhala imilayezo umlayezo"</string>
+    <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"iselula iseli inkampathi yenethiwekhi idatha engenantambo  4g 3g 2g lte"</string>
     <string name="keywords_home" msgid="3626170808219458848">"isiqalisi"</string>
     <string name="keywords_display" msgid="6709007669501628320">"isikrini sesikrini sokuthinta"</string>
-    <string name="keywords_display_brightness_level" msgid="8636451602230815191">"fiphaza isikrini sesikrini sokuthinta"</string>
-    <string name="keywords_display_auto_brightness" msgid="8070218600502753102">"fiphaza isikrini sesikrini sokuthinta"</string>
-    <string name="keywords_display_wallpaper" msgid="4315466287469834939">"ingemuva"</string>
+    <string name="keywords_display_brightness_level" msgid="8923289340474728990">"ibhethri lesikrini esithintwayo lokucisha isikrini"</string>
+    <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"ibhethri lesikrini esithintwayo lokucisha isikrini"</string>
+    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"isibonisi sokwenza ngezifiso okwsemuva"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"usayizi wombhalo"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"iphrojekthi"</string>
-    <string name="keywords_storage" msgid="7007275853993419928">"idiski lesikhala se-hard drayivu"</string>
-    <string name="keywords_battery" msgid="3992479295298655138">"amandla"</string>
-    <string name="keywords_spell_checker" msgid="4509482591225399210">"isipelingi"</string>
+    <string name="keywords_storage" msgid="6572905220031852173">"isikhala idiski eliqinile ukusetshenziswa kwedivayisi"</string>
+    <string name="keywords_battery" msgid="2096185085932675704">"ukushaja kokusebenzisa kwamandla"</string>
+    <string name="keywords_spell_checker" msgid="6106749039734174140">"isipelingi isichazamazwi isihloli sokupela ukulungisa ngokuzenzakalela"</string>
     <string name="keywords_voice_input" msgid="3519547605812413860">"recognizer input speech speak language hands-free hand free recognition offensive word audio history bluetooth headset"</string>
-    <string name="keywords_text_to_speech_output" msgid="8207889472282225512">"linganisela ukukhuluma okuzenzakalelayo kolimi"</string>
-    <string name="keywords_date_and_time" msgid="7666950126499155141">"iwashi"</string>
-    <string name="keywords_factory_data_reset" msgid="3693730656843989732">"sula ukususa"</string>
+    <string name="keywords_text_to_speech_output" msgid="392447904221657930">"isilinganiso ulimi okuzenzakalelayo khuluma ukukhuluma ukufinyelela kwe-tts umfundi ukungaboni"</string>
+    <string name="keywords_date_and_time" msgid="2631808108134830066">"iwashi lamasosha"</string>
+    <string name="keywords_factory_data_reset" msgid="4355133848707691977">"sula susa buyisa sula susa"</string>
     <string name="keywords_printing" msgid="1701778563617114846">"iphrinta"</string>
     <string name="keywords_sounds_and_notifications" msgid="5965996187974887000">"ukubhipha kwesipikha"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="2912933812460077912">"ungaphazamisi iphutha lekhefu lokuphazamisa"</string>
@@ -2361,7 +2378,7 @@
     <string name="keywords_location_mode" msgid="8584992704568356084">"ukunemba"</string>
     <string name="keywords_accounts" msgid="1957925565953357627">"i-akhawunti"</string>
     <string name="keywords_users" msgid="4673901601478559100">"umkhawulo wokukhawulela ukhawulelwe"</string>
-    <string name="keywords_keyboard_and_ime" msgid="1103378692379215672">"ukulungiswa kombhalo kulungisa ukudlidlizela komsindo kokuthinta kwezwi okuzenzakalelayo kokuphakamisa isiphakamiso setimu segama eliyinhlamba lohlobo lwe-emoji"</string>
+    <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"ukulungiswa kombhalo ukulungisa imsindo ukudlidliza ulimi lokuzenzakalelayo ukuthinta ukuphakamisa isiphakamiso itimu igama elingalungile uhlobo i-emoji okwamazwe"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"slayida iphini yephethini yephasiwedi"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Setha umaka we-Wi-Fi NFC"</string>
     <string name="write_tag" msgid="8571858602896222537">"Bhala"</string>
@@ -2378,7 +2395,6 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Ivolumu yesaziso"</string>
     <string name="zen_mode_settings_title" msgid="7014915558669122902">"Iziphazamiso"</string>
     <string name="zen_mode_option_title" msgid="5061978632306007914">"Uma kufika amakholi nezaziso"</string>
-    <string name="zen_mode_option_title_novoice" msgid="6680706009915204785">"Uma kufika izaziso"</string>
     <string name="zen_mode_option_off" msgid="3167702608910820883">"Phazamisa njalo"</string>
     <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Vumela iziphazamiso ezibalulekile kuphela"</string>
     <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Ungaphazamisi"</string>
@@ -2436,14 +2452,17 @@
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Kwenziwe"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Uze uvale lokhu"</string>
     <string name="zen_mode_important_category" msgid="8123274463331022993">"Iziphazamiso ezibalulekile"</string>
-    <string name="zen_mode_downtime_category" msgid="4730179065426038108">"Isikhathi sokuphumula (iziphazamiso ezibalulekile kuphela)"</string>
+    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Isikhathi sokuphumula"</string>
     <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Izinsuku"</string>
     <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Lutho"</string>
+    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Ukuphazamisa kuvunyelwe"</string>
+    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Okubalulekile kuphela"</string>
+    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Lutho"</string>
     <string name="zen_mode_automation_category" msgid="4653551005950835761">"Okokuzenzakalela"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Vula ngokuzenzakalela"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Akusoze"</string>
-    <string name="zen_mode_phone_calls" msgid="8956214416859303966">"Amakholi"</string>
+    <string name="zen_mode_calls" msgid="7051492091133751208">"Amakholi"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Imilayezo"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"Amakholi/imilayezo evela ku-"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Noma ubani"</string>
@@ -2457,7 +2476,9 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Ubusuku baphakathi neviki"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Isikhathi sokuqala"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Isikhathi sokugcina"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> usuku olulandelayo"</string>
+    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> ngosuku olulandelayo"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> noma iyiphi i-alamu yangaphambilini"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> ngosuku olulandelayo noma iyiphi i-alamu yangaphambilini"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Izaziso zohlelo lokusebenza"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Izilungiselelo zesaziso"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Thumela impendulo mayelana nale divayisi"</string>
@@ -2465,7 +2486,11 @@
     <string name="switch_on_text" msgid="1124106706920572386">"Vuliwe"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Valiwe"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"Ukuphina isikrini"</string>
-    <string name="screen_pinning_description" msgid="7091642350452605379">"Uma ivuliwe, ungasebenzisa ukuphina kwezikrini ukugcina isikrini samanje ekubukweni uze ususe ukuphina.\n\nUkuze usebenzise ukuphina kwesikrini:\n\n1. Qiniseka ukuthi ukuphina kwesikrini kuvuliwe.\n\n2. Vula isikrini ofuna ukusiphina.\n\n3. Thinta Buka konke.\n\n4. Thinta isithonjana sephini."</string>
+    <string name="screen_pinning_description" msgid="1137904524037468263">"Uma lesi silungiselelo sivuliwe, ungasebenzisa ukuphina kwesikrini ukugcina isikrini samanje sibukeka uze ususe ukuphina.\n\nUkuze usebenzisa ukuphina kwesikrini:\n\n1. Qinisekisa ukuthi isikrini kuvuliwe.\n\n2. Vula isikrini ofuna ukusiphina.\n\n3. Ukubuka konke kokuthinta.\n\n4. Swayiphela phezulu bese uthinte isithonjana sokuphina."</string>
+    <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Cela iphethini yokuvula ngaphambi kokususa ukuphina"</string>
+    <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Cela iphinikhodi ngaphambi kokuphina"</string>
+    <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Cela iphasiwedi ngaphambi kokususa ukuphina"</string>
+    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Khiya idivayisi uma ususa ukuphina"</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Iphrofayela yomsebenzi"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Ukuhlola)"</string>
     <string name="display_auto_rotate_title" msgid="6176450657107806043">"Uma idivayisi ijikeleziswa"</string>
@@ -2474,7 +2499,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Hlala ekubukweni kokwakheka kwezwe"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Hlala kumumo wamanje"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"Ulwazi le-IMEI"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"Ulwazi oluhlobene lwe-IMEI"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Ukubethelwa"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Qhubeka"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"Ungavikela ngokuthuthukile le divayisi ngokudinga iphasiwedi yakho ngaphambi kokuthi iqale. Ize iqale idivayisi, ayikwazi ukuthola amakholi, imilayezo, noma izaziso kufaka phakathi ama-alamu. \n\nLokhu kusiza ukuvikela idatha kumadivayisi alahlekile noma atshontshiwe."</string>
@@ -2492,4 +2516,7 @@
     <string name="encrypt_talkback_dialog_message_pin" msgid="1890374082842868489">"Uma ufaka iphinikhodi yakho ukuqala le divayisi, amasevisi wokufinyelela njenge-<xliff:g id="SERVICE">%1$s</xliff:g> ngeke atholakale okwamanje."</string>
     <string name="encrypt_talkback_dialog_message_pattern" msgid="4474332516537386384">"Uma ufaka iphethini yakho ukuqala le divayisi, amasevisi wokufinyelela njenge-<xliff:g id="SERVICE">%1$s</xliff:g> ngeke atholakale okwamanje."</string>
     <string name="encrypt_talkback_dialog_message_password" msgid="8166099418487083927">"Uma ufaka phasiwedi yakho ukuqala le divayisi, amasevisi wokufinyelela njenge-<xliff:g id="SERVICE">%1$s</xliff:g> ngeke atholakale okwamanje."</string>
+    <string name="imei_information_title" msgid="8499085421609752290">"Ulwazi le-IMEI"</string>
+    <string name="imei_information_summary" msgid="2074095606556565233">"Ulwazi oluhlobene lwe-IMEI"</string>
+    <string name="slot_number" msgid="3762676044904653577">"(Isilothi<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
 </resources>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 580143e..f0462f3 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -39,15 +39,6 @@
         <item>All</item>
     </string-array>
 
-    <!-- There is a setting to control the format of dates displayed throughout the system.  This is in the Date & Time Settings screen.  These will be adjusted to use punctuation appropriate to the user's locale. -->
-    <string-array name="date_format_values" translatable="false">
-        <!-- The blank item means to use whatever the locale calls for. -->
-        <item></item>
-        <item>MM-dd-yyyy</item>
-        <item>dd-MM-yyyy</item>
-        <item>yyyy-MM-dd</item>
-    </string-array>
-
     <!-- Display settings.  The delay in inactivity before the screen is turned off. These are shown in a list dialog. -->
     <string-array name="screen_timeout_entries">
         <item>15 seconds</item>
@@ -1260,21 +1251,13 @@
         <item>Cached (empty)</item>
     </string-array>
 
-    <!-- Multi-SIM titles for captioning color preference. -->
-    <string-array name="sim_info_picker_color_titles" translatable="false" >
-        <item>@string/color_blue</item>
-        <item>@string/color_green</item>
-        <item>@string/color_purple</item>
-        <item>@string/color_red</item>
-        <item>@string/color_orange</item>
+    <!-- Array of titles for sim color for multi-sim -->
+    <string-array name="color_picker">
+        <item>Teal</item>
+        <item>Blue</item>
+        <item>Indigo</item>
+        <item>Purple</item>
+        <item>Pink</item>
+        <item>Red</item>
     </string-array>
-
-    <!-- Multi-SIM colors. -->
-    <integer-array name="sim_info_picker_color_values" translatable="false" >
-        <item>@color/blue_500</item>
-        <item>@color/green_500</item>
-        <item>@color/purple_500</item>
-        <item>@color/red_500</item>
-        <item>@color/orange_500</item>
-    </integer-array>
 </resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index da54c3e..70fc4a0 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -22,12 +22,12 @@
 
     <color name="memory_used">#F00</color>
     <color name="memory_avail">@color/material_empty_color_light</color>
-    <color name="memory_apps_usage">#77831A</color>
-    <color name="memory_downloads">#476093</color>
-    <color name="memory_dcim">#793A7F</color>
-    <color name="memory_music">#8E562A</color>
-    <color name="memory_cache">#479392</color>
-    <color name="memory_misc">#7C3030</color>
+    <color name="memory_apps_usage">#00796B</color>
+    <color name="memory_downloads">#3367D6</color>
+    <color name="memory_dcim">#0097A7</color>
+    <color name="memory_music">#689F38</color>
+    <color name="memory_cache">#283593</color>
+    <color name="memory_misc">#7B1FA2</color>
     <color name="memory_user_light">#479392</color>
     <color name="memory_user_dark">#316665</color>
 
@@ -40,13 +40,17 @@
     <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>
     <color name="setup_wizard_wifi_color_light">#ff0096a6</color>
 
-    <color name="wifi_assistant_color_accent">#ff009587</color>
-
     <color name="circle_avatar_frame_color">#ffffffff</color>
     <color name="circle_avatar_frame_shadow_color">#80000000</color>
     <color name="circle_avatar_frame_pressed_color">#ffffffff</color>
@@ -74,12 +78,6 @@
     <color name="switch_accent_color">#ff7fcac3</color>
 
     <color name="wifi_divider">#ffe0e0e0</color>
-
-    <!-- Multi-SIM colors -->
-    <color name="blue_500">#5677fc</color>
-    <color name="green_500">#259b24</color>
-    <color name="purple_500">#9c27b0</color>
-    <color name="red_500">#e51c23</color>
-    <color name="orange_500">#ff9800</color>
+    <color name="sim_noitification">@*android:color/material_deep_teal_500</color>
 
 </resources>
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/dimens.xml b/res/values/dimens.xml
index e6bbdf9..4c4dbda 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -205,14 +205,13 @@
     <!-- SIM Dialog padding -->
     <dimen name="sim_dialog_padding">8dip</dimen>
     <dimen name="sim_label_padding">16dip</dimen>
-    <dimen name="sim_content_padding">12dip</dimen>
+    <dimen name="sim_content_padding">24dip</dimen>
     <!-- Sim Card Name length -->
     <integer name="sim_name_length">32</integer>
 
     <!-- Height of a user icon view -->
     <dimen name="user_icon_view_height">56dp</dimen>
-    <!-- User spinner offset-->
-    <dimen name="user_spinner_offset">-64dp</dimen>
+    <!-- User spinner -->
     <dimen name="user_spinner_height">72dp</dimen>
     <dimen name="user_spinner_padding">8dp</dimen>
     <dimen name="user_spinner_item_height">56dp</dimen>
@@ -228,4 +227,9 @@
 
     <dimen name="wifi_divider_height">1px</dimen>
 
+    <!-- Color picker -->
+    <dimen name="color_swatch_size">16dp</dimen>
+    <dimen name="color_swatch_stroke_width">4dp</dimen>
+    <dimen name="color_picker_width">156dp</dimen>
+
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 8454ed5..c8e2a1b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -72,6 +72,11 @@
     <!-- Phone IMS registration required off. Only shown in diagnostic screen, so precise translation is not needed. -->
     <string name="ims_reg_required_off">Turn off IMS registration required</string>
 
+    <!-- VoLTE provisioning flag on. Only shown in diagnostic screen, so precise translation is not needed. -->
+    <string name="volte_provisioned_flag_on">Turn on VoLTE provisioned flag</string>
+    <!-- VoLTE provisioning flag off. Only shown in diagnostic screen, so precise translation is not needed. -->
+    <string name="volte_provisioned_flag_off">Turn off VoLTE provisioned flag</string>
+
     <!-- Phone ram dump on. Only shown in diagnostic screen, so precise translation is not needed. -->
     <string name="lte_ram_dump_on">Turn on lte ram dump</string>
     <!-- Phone ram dump off. Only shown in diagnostic screen, so precise translation is not needed. -->
@@ -270,7 +275,7 @@
     <string name="bluetooth_empty_list_user_restricted">You don\'t have permission to change Bluetooth settings.</string>
 
     <!-- Bluetooth Visibility message.  This message informs the user that their device is now visible to other bluetooth devices.  [CHAR LIMIT=NONE] -->
-    <string name="bluetooth_is_visible_message"><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"><xliff:g id="device_name">%1$s</xliff:g> is visible to nearby devices while Bluetooth settings is open.</string>
     <!-- Bluetooth Visibility discoonect question.  Asks the user if they wish to disconnect a paired bluetooth device.  [CHAR LIMIT=50] -->
     <string name="bluetooth_is_disconnect_question">Disconnect <xliff:g id="device_name">%1$s</xliff:g>?</string>
     <!-- Bluetooth broadcasting settings, option to enable/disable broadcasting -->
@@ -388,12 +393,6 @@
     <string name="date_and_time">Date &amp; time</string>
     <!-- The title of the activity to pick a time zone. -->
     <string name="choose_timezone">Choose time zone</string>
-    <!-- Do not translate. Used as the value for a setting. -->
-    <string name="default_date_format"><xliff:g id="default_date_format">MM/dd/yyyy</xliff:g></string>
-
-    <!-- The option in the date-format picker for using the normal format
-         called for by the user's locale. -->
-    <string name="normal_date_format">Regional (<xliff:g id="date" example="12-31-2009">%s</xliff:g>)</string>
 
     <!-- Label of preview text when tweaking font size -->
     <string name="display_preview_label">Preview:</string>
@@ -644,7 +643,7 @@
     <!-- check box Calls title [CHAR LIMIT=30] -->
     <string name="calls_title">Calls</string>
     <!-- check box SMS Messges title [CHAR LIMIT=30] -->
-    <string name="sms_messages_title">SMS Messages</string>
+    <string name="sms_messages_title">SMS messages</string>
     <!-- check box cellular data summary [CHAR LIMIT=41] -->
     <string name="cellular_data_summary">Allow data usage over cellular network</string>
     <!-- check box to allow data usage when roaming [CHAR LIMIT=41] -->
@@ -711,10 +710,6 @@
     <string name="date_time_set_date_title">Date</string>
     <!-- Date & time setting screen setting option title -->
     <string name="date_time_set_date">Set date</string>
-    <!-- Date & time setting screen setting option title.  This setting allows the user to choose how the date should be displayed in apps (what ordering for month and day, etc.)  [CHAR LIMIT=30] -->
-    <string name="date_time_date_format_title">Date format</string>
-    <!-- Date & time setting screen setting option title.  This setting allows the user to choose how the date should be displayed in apps (what ordering for month and day, etc.) -->
-    <string name="date_time_date_format">Choose date format</string>
     <!-- Menu item on Select time zone screen -->
     <string name="zone_list_menu_sort_alphabetically">Sort alphabetically</string>
     <!-- Menu item on Select time zone screen -->
@@ -855,8 +850,9 @@
     <string name="crypt_keeper_setup_time_remaining" product="default">Wait while your phone
     is being encrypted. Time remaining: <xliff:g id="duration" example="1:23">^1</xliff:g></string>
 
-    <!-- Informational text on the password entry screen when password entry fails-->
-    <string name="crypt_keeper_cooldown">Try again in <xliff:g id="delay" example="15">^1</xliff:g> seconds.</string>
+    <string name="crypt_keeper_force_power_cycle" product="tablet">To unlock your tablet, turn it off and then on.</string>
+    <string name="crypt_keeper_force_power_cycle" product="default">To unlock your phone, turn it off and then on.</string>
+
 
     <!-- Warn user their device will be wiped if they make x more failed attempts -->
     <string name="crypt_keeper_warn_wipe">Warning: Your device will be wiped after
@@ -967,6 +963,9 @@
     <!-- Title for preference that guides the user through creating an unlock password [CHAR LIMIT=45] -->
     <string name="unlock_set_unlock_password_summary">High security</string>
 
+    <!--  Content of warning dialog about disabling device protection features when user is switching from a secure unlock method to an insecure one. [CHAR LIMIT=NONE] -->
+    <string name="unlock_disable_frp_warning_content">Device protection features will no longer work.</string>
+
     <!-- Summary for preference that has been disabled by because of the DevicePolicyAdmin, or because device encryption is enabled, or because there are credentials in the credential storage [CHAR LIMIT=50] -->
     <string name="unlock_set_unlock_disabled_summary">Disabled by administrator, encryption policy, or credential storage</string>
 
@@ -992,6 +991,8 @@
     <string name="unlock_disable_lock_pin_summary">Remove unlock PIN</string>
     <!-- Summary shown under unlock_disable_lock_title when password is in use and can be removed [CHAR LIMIT=45]-->
     <string name="unlock_disable_lock_password_summary">Remove unlock password</string>
+    <!-- Summary shown under unlock_disable_lock_title when an unknown secure unlocking method is in use and can be removed [CHAR LIMIT=45]-->
+    <string name="unlock_disable_lock_unknown_summary">Remove screen lock</string>
 
     <!-- Title shown on security settings to allow the user to change their lockscreen pattern [CHAR LIMIT=22] -->
     <string name="unlock_change_lock_pattern_title">Change unlock pattern</string>
@@ -1328,20 +1329,10 @@
     <!-- Bluetooth settings.  Dock Setting Dialog - Remember setting and don't ask user again -->
     <string name="bluetooth_dock_settings_remember">Remember settings</string>
 
-    <!-- Wifi Assistant title string.  [CHAR LIMIT=40] -->
-    <string name="wifi_assistant_intro_setup">Introducing\nWi\u2011Fi Assistant</string>
-    <!-- Wifi Assistant No, thanks string.  Text to say no to wifi assistant. [CHAR LIMIT=20] -->
-    <string name="wifi_assistant_no_thanks">NO, THANKS</string>
-    <!-- Wifi Assistant setup string.  Text to say yes to wifi assistant and begin setup. [CHAR LIMIT=20] -->
-    <string name="wifi_assistant_setup">SET UP</string>
-    <!-- Wifi Assistant card message.  [CHAR LIMIT=200] -->
-    <string name="wifi_assistant_card_message">Automatically connect to available networks with a Wi\u2011Fi Assistant.</string>
     <!-- Wifi Assistant title.  [CHAR LIMIT=40] -->
     <string name="wifi_assistant_title">Wi\u2011Fi Assistant</string>
-    <!-- Wifi Assistant title message.  First piece of text on the Wifi Assistant setup wizard.  [CHAR LIMIT=200] -->
-    <string name="wifi_assistant_title_message"><xliff:g id="wifi_assistant">%1$s</xliff:g> automatically connects you to the best available Wi\u2011Fi</string>
-    <!-- Wifi Assistant open app button text.  [CHAR LIMIT=40] -->
-    <string name="wifi_assistant_open_app">OPEN APP</string>
+    <!-- Status message of Wi-Fi when it is connected by a Wi-Fi assistant application. [CHAR LIMIT=NONE] -->
+    <string name="connected_via_wfa">Connected via Wi\u2011Fi assistant</string>
 
     <!-- Wifi Display settings. The title of the screen. [CHAR LIMIT=40] -->
     <string name="wifi_display_settings_title">Cast screen</string>
@@ -1434,7 +1425,7 @@
     <!-- Summary text of the Wi-fi settings screen -->
     <string name="wifi_settings_summary">Set up &amp; manage wireless access points</string>
     <!-- Used in the 1st-level settings screen to turn on Wi-Fi  [CHAR LIMIT=60] -->
-    <string name="wifi_setup_wizard_title">Select Wi\u2011Fi</string>
+    <string name="wifi_setup_wizard_title">Select Wi\u2011Fi network</string>
     <!-- Used by Account creation for turning on Wi-Fi  [CHAR LIMIT=60] -->
     <string name="wifi_select_network">Select Wi\u2011Fi</string>
     <!-- Summary text when turning Wi-Fi or bluetooth on -->
@@ -1463,10 +1454,12 @@
     <string name="wifi_scan_always_available_title">Always allow scanning</string>
     <!-- Checkbox summary for option to toggle scan always available setting -->
     <string name="wifi_scan_always_available_summary">Let Google\'s location service and other apps scan for networks, even when Wi\u2011Fi is off</string>
-    <!-- Checkbox title for option to Automatically manage Wi\u2011Fi  [CHAR LIMIT=40] -->
-    <string name="wifi_automatically_manage_title">Automatically manage Wi\u2011Fi</string>
-    <!-- Checkbox summary for option to Automatically manage Wi\u2011Fi  [CHAR LIMIT=100] -->
-    <string name="wifi_automatically_manage_summary">Let <xliff:g id="wifi_assistant">%1$s</xliff:g> manage your Wi\u2011Fi connection</string>
+    <!-- Checkbox title for option to connect to open Wi-Fi automatically [CHAR LIMIT=40] -->
+    <string name="wifi_automatically_connect_title">Use open Wi\u2011Fi automatically</string>
+    <!-- Checkbox summary for option to connect to open Wi-Fi automatically  [CHAR LIMIT=100] -->
+    <string name="wifi_automatically_connect_summary">Let a Wi\u2011Fi assistant automatically connect to open networks determined to be high quality</string>
+    <!-- Dialog title for option to select an app which connects to open Wi-Fi automatically [CHAR LIMIT=40] -->
+    <string name="wifi_select_assistant_dialog_title">Choose assistant</string>
     <!-- Preference title for option to install certificates -->
     <string name="wifi_install_credentials">Install certificates</string>
     <string name="wifi_scan_notify_text_location_on">To improve location accuracy and for other purposes, Google and other apps may scan for nearby networks, even when Wi-Fi is off. If you don\'t want this to happen, go to Advanced &gt; Scanning always available.</string>
@@ -1505,6 +1498,8 @@
     <string name="wifi_menu_advanced">Advanced</string>
     <!-- Menu option to connect to a Wi-Fi network -->
     <string name="wifi_menu_connect">Connect to network</string>
+    <!-- Menu option to remember a temporary Wi-Fi network -->
+    <string name="wifi_menu_remember">Remember network</string>
     <!-- Menu option to delete a Wi-Fi network -->
     <string name="wifi_menu_forget">Forget network</string>
     <!-- Menu option to modify a Wi-Fi network configuration -->
@@ -1598,12 +1593,16 @@
     <!-- Status for networks disabled for unknown reason -->
     <string name="wifi_disabled_generic">Disabled</string>
     <!-- Status for networked disabled from a DNS or DHCP failure -->
-    <string name="wifi_disabled_network_failure">Avoided poor Internet connection</string>
+    <string name="wifi_disabled_network_failure">IP Configuration Failure</string>
+    <!-- Status for networked disabled from a wifi association failure -->
+    <string name="wifi_disabled_wifi_failure">WiFi Connection Failure</string>
     <!-- Status for networks disabled from authentication failure (wrong password
          or certificate). -->
     <string name="wifi_disabled_password_failure">Authentication problem</string>
     <!-- Summary for the remembered network but currently not in range. -->
     <string name="wifi_not_in_range">Not in range</string>
+    <!-- Summary for the remembered network but no internet connection was detected. -->
+    <string name="wifi_no_internet">No Internet Access Detected, won\'t automatically reconnect.</string>
     <!-- Substring of status line when Wi-Fi Protected Setup (WPS) is available and
          string is listed first [CHAR LIMIT=20]-->
     <string name="wifi_wps_available_first_item">WPS available</string>
@@ -1680,12 +1679,13 @@
     <string name="wifi_skipped_message" product="device">WARNING: if you skip Wi\u2011Fi, your device will only use cellular data for initial downloads and updates. To avoid possible data charges, connect to Wi\u2011Fi.</string>
     <!-- Text warning about skipping Wi-Fi with a mobile connect (phone) [CHAR LIMIT=NONE]-->
     <string name="wifi_skipped_message" product="default">WARNING: if you skip Wi\u2011Fi, your phone will only use cellular data for initial downloads and updates. To avoid possible data charges, connect to Wi\u2011Fi.</string>
+
     <!-- Text warning about skipping Wi-Fi without a mobile connect (tablet) [CHAR LIMIT=NONE] -->
-    <string name="wifi_and_mobile_skipped_message" product="tablet">WARNING: If you skip Wi\u2011Fi, your tablet won\'t have an Internet connection to use for any initial downloads or updates.</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet">If you skip Wi\u2011Fi:\n\nYour tablet won\'t have an Internet connection.\n\nYou won\'t get software updates until you connect to the Internet.\n\nYou can\'t activate device protection features at this time.</string>
     <!-- Text warning about skipping Wi-Fi without a mobile connect (device) [CHAR LIMIT=NONE] -->
-    <string name="wifi_and_mobile_skipped_message" product="device">WARNING: If you skip Wi\u2011Fi, your device won\'t have an Internet connection to use for any initial downloads or updates.</string>
+    <string name="wifi_and_mobile_skipped_message" product="device">If you skip Wi\u2011Fi:\n\nYour device won\'t have an Internet connection.\n\nYou won\'t get software updates until you connect to the Internet.\n\nYou can\'t activate device protection features at this time.</string>
     <!-- Text warning about skipping Wi-Fi without a mobile connect (phone) [CHAR LIMIT=NONE] -->
-    <string name="wifi_and_mobile_skipped_message" product="default">WARNING: If you skip Wi\u2011Fi, your phone won\'t have an Internet connection to use for any initial downloads or updates.</string>
+    <string name="wifi_and_mobile_skipped_message" product="default">If you skip Wi\u2011Fi:\n\nYour phone won\'t have an Internet connection.\n\nYou won\'t get software updates until you connect to the Internet.\n\nYou can\'t activate device protection features at this time.</string>
     <!-- Text alerting that Wi-Fi couldn't connect (tablet) [CHAR LIMIT=NONE] -->
     <string name="wifi_connect_failed_message" product="tablet">The tablet was unable to connect to this Wi\u2011Fi network.</string>
     <!-- Text alerting that Wi-Fi couldn't connect (device) [CHAR LIMIT=NONE] -->
@@ -1903,8 +1903,6 @@
     <string name="vibrate_in_silent_title">Vibrate when silent</string>
     <!-- Sound settings screen, setting option name -->
     <string name="notification_sound_title">Default notification sound</string>
-    <!-- Display settings screen, notification popups are enabled [CHAR LIMIT=30] -->
-    <string name="heads_up_enabled_title">Pop up if high priority</string>
     <!-- Sound settings screen, the title of the volume bar to adjust the incoming call volume -->
     <string name="incoming_call_volume_title">Ringtone</string>
     <!-- Sound settings screen, the title of the volume bar to adjust the notification volume -->
@@ -2058,7 +2056,7 @@
     <!-- [CHAR LIMIT=30] Display settings screen, setting option name to change whether the ambient display feature is enabled. -->
     <string name="doze_title">Ambient display</string>
     <!-- [CHAR LIMIT=NONE] Display settings screen, setting description for the ambient display feature. -->
-    <string name="doze_summary">Wake screen when device picked up or notifications arrive</string>
+    <string name="doze_summary">Wake screen when you pick up device or receive notifications</string>
     <!-- [CHAR LIMIT=30] Sound & display settings screen, setting option name to change font size -->
     <string name="title_font_size">Font size</string>
     <!-- Sound & display settings screen, setting option summary displaying the currently selected font size -->
@@ -2116,6 +2114,14 @@
     <string name="sim_multi_sims_title">Multiple SIMs found</string>
     <!-- Multiple SIMs found summary.  [CHAR LIMIT=100] -->
     <string name="sim_multi_sims_summary">Choose the SIM you prefer for cellular data.</string>
+    <!-- Title asking user if they wish to change the default sim for cellular data.  [CHAR LIMIT=30] -->
+    <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] -->
@@ -2438,6 +2444,8 @@
     <string name="master_clear_desc" product="default">"This will erase all data from your phone\'s <b>internal storage</b>, including:\n\n<li>Your Google account</li>\n<li>System and app data and settings</li>\n<li>Downloaded apps"</li></string>
     <!-- SD card & phone storage settings screen, instructions and list of current accounts.  The list of accounts follows this text[CHAR LIMIT=NONE] -->
     <string name="master_clear_accounts" product="default">"\n\nYou are currently signed into the following accounts:\n"</string>
+    <!-- SD card & phone storage settings screen, notification if other users are present on the device [CHAR LIMIT=NONE] -->
+    <string name="master_clear_other_users_present" product="default">"\n\nThere are other users present on this device.\n"</string>
     <!-- SD card & phone storage settings screen, list of items in user data storage (USB storage or SD card) that will be erased during this operation [CHAR LIMIT=NONE] -->
     <string name="master_clear_desc_also_erases_external">"<li>Music</li>\n<li>Photos</li>\n<li>Other user data</li>"</string>
     <!-- SD card & phone storage settings screen, instructions about whether to also erase the external storage (SD card) when erasing the internal storage [CHAR LIMIT=NONE] -->
@@ -2460,8 +2468,6 @@
     <string name="master_clear_final_desc">Erase all your personal information and downloaded apps? You can\'t reverse this action!</string>
     <!-- SD card & phone storage settings screen, button on screen after user selects Reset phone button -->
     <string name="master_clear_final_button_text">Erase everything</string>
-    <!-- Message to draw an unlock pattern before clearing the device -->
-    <string name="master_clear_gesture_prompt">Draw your unlock pattern</string>
     <!-- Explanation of drawing unlock pattern to reset phone -->
     <string name="master_clear_gesture_explanation">You need to draw your unlock pattern to confirm a factory data reset.</string>
     <!-- Master clear failed message -->
@@ -2498,8 +2504,6 @@
     <string name="media_format_final_desc" product="default">Erase the SD card, deleting all files stored there? You can\'t reverse this action!</string>
     <!-- SD card & phone storage settings screen, button on screen after user selects Format media button -->
     <string name="media_format_final_button_text">Erase everything</string>
-    <!-- Message to draw an unlock pattern before clearing the device -->
-    <string name="media_format_gesture_prompt">Draw your unlock pattern</string>
     <!-- Explanation of drawing unlock pattern to format card [CHAR LIMIT=NONE] -->
     <string name="media_format_gesture_explanation" product="nosdcard">You need to draw your unlock pattern to confirm that you want to erase the USB storage.</string>
     <!-- Explanation of drawing unlock pattern to format card [CHAR LIMIT=NONE] -->
@@ -2602,6 +2606,12 @@
 
     <!-- Security & location settings screen, section header for settings relating to location -->
     <string name="location_title">My Location</string>
+    <!-- Title for managed profile preference category [CHAR_LIMIT=25] -->
+    <string name="managed_profile_location_category">Work profile</string>
+    <!-- [CHAR LIMIT=30] Title for managed profile location switch  -->
+    <string name="managed_profile_location_switch_title">Location for work profile</string>
+    <!-- [CHAR LIMIT=30] Text to show on managed profile location switch if MDM has locked down location access for managed profile-->
+    <string name="managed_profile_location_switch_lockdown">Turned off by your company</string>
     <!-- [CHAR LIMIT=30] Location settings screen, setting preference screen box label for location mode -->
     <string name="location_mode_title">Mode</string>
     <!-- [CHAR LIMIT=30] Location settings screen, high accuracy location mode -->
@@ -2682,6 +2692,9 @@
     <!-- Note: this may be replaced by a more-specific title of the activity that will get launched --> <skip />
     <!-- About phone settings screen, setting option name to see terms and conditions -->
     <string name="terms_title">Terms and conditions</string>
+    <!-- Note: this may be replaced by a more-specific title of the activity that will get launched --> <skip />
+    <!-- About phone settings screen, setting option name to see licensing info for WebView component. [CHAR LIMIT=35] -->
+    <string name="webview_license_title">System WebView License</string>
     <!-- About phone settings screen, setting option name to see wallpapers attributions -->
     <string name="wallpaper_attributions">Wallpapers</string>
     <!-- About phone settings screen, setting option name to see wallpapers attributions values -->
@@ -2938,8 +2951,8 @@
     <string name="filter_apps_onsdcard" product="default">On SD card</string>
     <!-- [CHAR LIMIT=25] Manage applications, text telling using an application is disabled. -->
     <string name="disabled">Disabled</string>
-    <!-- [CHAR LIMIT=25] Manage applications, text telling using an application is not installed. -->
-    <string name="not_installed">Not installed</string>
+    <!-- [CHAR LIMIT=30] Manage applications, text telling using an application is not installed for the current user. -->
+    <string name="not_installed">Not installed for this user</string>
     <!-- [CHAR LIMIT=25] Text shown when there are no applications to display. -->
     <string name="no_applications">No apps.</string>
     <!-- [CHAR LIMIT=15] Manage applications, label for chart showing internal storage use. -->
@@ -3391,9 +3404,18 @@
     <!-- setting Checkbox summary whether to capture all bluetooth HCI packets in a file -->
     <string name="bt_hci_snoop_log_summary">Capture all bluetooth HCI packets in a file</string>
     <!-- setting Checkbox title whether to enable OEM unlock [CHAR_LIMIT=35] -->
-    <string name="oem_unlock_enable">Enable OEM unlock</string>
+    <string name="oem_unlock_enable">OEM unlocking</string>
     <!-- setting Checkbox summary whether to enable OEM unlock [CHAR_LIMIT=50] -->
-    <string name="oem_unlock_enable_summary">Allow the device to be OEM unlocked</string>
+    <string name="oem_unlock_enable_summary">Allow the bootloader to be unlocked</string>
+    <!-- Message to enter device PIN to enable OEM unlock -->
+    <string name="oem_unlock_enable_pin_prompt">Enter your PIN</string>
+    <!-- Explanation to enter device pin to enable OEM unlock -->
+    <string name="oem_unlock_enable_pin_description">Enter your device PIN to enable OEM unlock</string>
+    <!-- Confirmation dialog title to ensure user wishes to enable OEM unlock and disable theft protection features -->
+    <string name="confirm_enable_oem_unlock_title">Allow OEM unlocking?</string>
+    <!-- Warning dialog message to confirm user wishes to enable OEM unlock and disable theft protection features -->
+    <string name="confirm_enable_oem_unlock_text">WARNING: Device protection features will not work on this device while this setting is turned on.</string>
+
 
     <!-- Setting Checkbox title whether to show options for wireless display certification -->
     <string name="wifi_display_certification">Wireless display certification</string>
@@ -3633,6 +3655,8 @@
     <!-- Label for the default device locale. [CHAR LIMIT=35] -->
     <string name="locale_default">Default</string>
 
+    <!-- Label for color selection title in sim settings [CHAR LIMIT=35] -->
+    <string name = "color_title">Color</string>
     <!-- Label for default color. This lets the app pick the color. [CHAR LIMIT=35] -->
     <string name="color_unspecified">Default</string>
     <!-- Label for no color (transparent). [CHAR LIMIT=35] -->
@@ -3810,22 +3834,22 @@
     <!-- Display time remaining until battery is charged [CHAR_LIMIT=60] -->
     <string name="power_charge_remaining"><xliff:g id="until_charged">%1$s</xliff:g> to charge</string>
     <!-- [CHAR_LIMIT=40] Label for battery level chart when discharging with duration -->
-    <string name="power_discharging_duration"><xliff:g id="level">%1$d</xliff:g>%%
+    <string name="power_discharging_duration"><xliff:g id="level">%1$s</xliff:g>
             - approx. <xliff:g id="time">%2$s</xliff:g> left</string>
     <!-- [CHAR_LIMIT=40] Label for battery level chart when charging -->
-    <string name="power_charging"><xliff:g id="level">%1$d</xliff:g>%% -
+    <string name="power_charging"><xliff:g id="level">%1$s</xliff:g> -
             <xliff:g id="state">%2$s</xliff:g></string>
     <!-- [CHAR_LIMIT=40] Label for battery level chart when charging with duration -->
-    <string name="power_charging_duration"><xliff:g id="level">%1$d</xliff:g>%% -
+    <string name="power_charging_duration"><xliff:g id="level">%1$s</xliff:g> -
             <xliff:g id="time">%2$s</xliff:g> until full</string>
     <!-- [CHAR_LIMIT=40] Label for battery level chart when charging with duration -->
-    <string name="power_charging_duration_ac"><xliff:g id="level">%1$d</xliff:g>%% -
+    <string name="power_charging_duration_ac"><xliff:g id="level">%1$s</xliff:g> -
             <xliff:g id="time">%2$s</xliff:g> until full on AC</string>
     <!-- [CHAR_LIMIT=40] Label for battery level chart when charging with duration -->
-    <string name="power_charging_duration_usb"><xliff:g id="level">%1$d</xliff:g>%% -
+    <string name="power_charging_duration_usb"><xliff:g id="level">%1$s</xliff:g> -
             <xliff:g id="time">%2$s</xliff:g> until full over USB</string>
     <!-- [CHAR_LIMIT=40] Label for battery level chart when charging with duration -->
-    <string name="power_charging_duration_wireless"><xliff:g id="level">%1$d</xliff:g>%% -
+    <string name="power_charging_duration_wireless"><xliff:g id="level">%1$s</xliff:g> -
             <xliff:g id="time">%2$s</xliff:g> until full from wireless</string>
     <!-- [CHAR_LIMIT=40] Label for list of apps using battery in power use UI -->
     <string name="power_usage_list_summary">Use since last full charge</string>
@@ -3857,9 +3881,6 @@
     <string name="wifi_on_time">Wi\u2011Fi on time</string>
     <!-- Bluetooth on time -->
     <string name="bluetooth_on_time">Wi\u2011Fi on time</string>
-    <!-- Application name and battery usage percentage -->
-    <string name="usage_name_percent"><xliff:g id="name">%1$s</xliff:g>" - "
-            <xliff:g id="number" example="30">%2$s</xliff:g><xliff:g id="percent" example="%">%%</xliff:g></string>
 
     <!-- Activity title for battery usage history details -->
     <string name="history_details_title">History details</string>
@@ -4027,7 +4048,7 @@
     <string name="battery_saver_turn_on_automatically_never">Never</string>
 
     <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: pct% battery -->
-    <string name="battery_saver_turn_on_automatically_pct">at %1$d%% battery</string>
+    <string name="battery_saver_turn_on_automatically_pct">at %1$s battery</string>
 
     <!-- Process Stats strings -->
     <skip />
@@ -4321,8 +4342,6 @@
     <!-- Error message for users that aren't allowed to see or modify credentials [CHAR LIMIT=none] -->
     <string name="credentials_settings_not_available">Credentials are not available for this user</string>
 
-    <!-- Message to draw an unlock pattern when installing credentials -->
-    <string name="credentials_install_gesture_prompt">Draw your unlock pattern</string>
     <!-- Explanation of drawing unlock pattern to install credentials -->
     <string name="credentials_install_gesture_explanation">You need to draw your unlock pattern to confirm credential installation.</string>
 
@@ -4385,6 +4404,10 @@
     <string name="auto_restore_title">Automatic restore</string>
     <!-- Summary text of the "automatic restore" setting -->
     <string name="auto_restore_summary">When reinstalling an app, restore backed up settings and data</string>
+    <!-- Title of the preference informing the user about the backup service being inactive [CHAR LIMIT=50]-->
+    <string name="backup_inactive_title">Backup service is inactive.</string>
+    <!-- Summary text of the preference informing the user about the backup service being inactive, explaining that this is likely set by device policy [CHAR LIMIT=150]-->
+    <string name="backup_inactive_summary">This is set by your device policy.</string>
 
     <!-- Local (desktop) backup password menu title [CHAR LIMIT=25] -->
     <string name="local_backup_password_title">Desktop backup password</string>
@@ -4669,8 +4692,19 @@
     <string name="enter_pin">To start Android, enter your PIN</string>
     <!-- Informational text on the pattern entry screen prompting the user for their pattern -->
     <string name="enter_pattern">To start Android, draw your pattern</string>
-    <!-- This is displayed when the password is entered incorrectly -->
-    <string name="try_again">Try again.</string>
+
+    <!-- Message shown when user enters wrong pattern -->
+    <string name="cryptkeeper_wrong_pattern">Wrong Pattern</string>
+    <!-- Message shown when user enters wrong password -->
+    <string name="cryptkeeper_wrong_password">Wrong Password</string>
+    <!-- Message shown when user enters wrong PIN -->
+    <string name="cryptkeeper_wrong_pin">Wrong PIN</string>
+
+    <!-- Shown when a password has been entered, and we're checking it -->
+    <string name="checking_decryption">Checking\u2026</string>
+    <!-- Shown when password is correct, and we're starting Android -->
+    <string name="starting_android">Starting Android</string>
+
 
     <!-- the following are for Settings Storage screen -->
     <!-- Menu item/button 'delete' -->
@@ -4770,10 +4804,10 @@
     <!-- UI debug setting: enable various types of OpenGL traces [CHAR LIMIT=25] -->
     <string name="enable_opengl_traces_title">Enable OpenGL traces</string>
 
-    <!-- UI debug setting: force use of NuPlayer [CHAR LIMIT=25] -->
-    <string name="use_nuplayer">Use NuPlayer (experimental)</string>
-    <!-- UI debug setting: force use of NuPlayer summary [CHAR LIMIT=50] -->
-    <string name="use_nuplayer_summary">Use NuPlayer instead of AwesomePlayer</string>
+    <!-- UI debug setting: force use of AwesomePlayer [CHAR LIMIT=25] -->
+    <string name="use_awesomeplayer">Use AwesomePlayer (deprecated)</string>
+    <!-- UI debug setting: force use of AwesomePlayer summary [CHAR LIMIT=50] -->
+    <string name="use_awesomeplayer_summary">Use AwesomePlayer instead of NuPlayer for most media playback</string>
 
     <!-- UI debug setting: disable USB audio routing title [CHAR LIMIT=32] -->
     <string name="usb_audio_disable_routing">Disable USB audio routing</string>
@@ -5180,8 +5214,6 @@
     <string name="user_add_user_menu">Add user</string>
     <!-- User settings summary for a restricted profile [CHAR LIMIT=50] -->
     <string name="user_summary_restricted_profile">Restricted profile</string>
-    <!-- User settings summary for a work profile [CHAR LIMIT=50] -->
-    <string name="user_summary_managed_profile">Work profile</string>
     <!-- User settings warning that restricted profile needs a screen lock [CHAR LIMIT=NONE] -->
     <string name="user_need_lock_message">Before you can create a restricted profile, you\'ll need to set up a screen lock to protect your apps and personal data.</string>
     <!-- User settings dialog button to set screen lock [CHAR LIMIT=25] -->
@@ -5495,6 +5527,8 @@
     <string name="sim_calls_always_use">Always use this for calls</string>
     <!-- Message for selecting sim for data in settings.  [CHAR LIMIT=40] -->
     <string name="select_sim_for_data">Select a SIM for data</string>
+    <!-- Message for switching data SIM; switching takes a while -->
+    <string name="data_switch_started">Switching data SIM, this may take up to a minute...</string>
     <!-- Message for selecting sim for call in settings.  [CHAR LIMIT=40] -->
     <string name="select_sim_for_calls">Call with</string>
     <!-- Title for selecting a SIM card.  [CHAR LIMIT=40] -->
@@ -5505,6 +5539,8 @@
     <string name="sim_slot_empty">SIM empty</string>
     <!-- Name label of Sim Editor.  [CHAR LIMIT=40] -->
     <string name="sim_editor_name">SIM name</string>
+    <!-- Hint for SIM name in sim name editor dialog.  [CHAR LIMIT=40] -->
+    <string name="sim_name_hint">Enter SIM name</string>
     <!-- Title label of Sim Editor.  [CHAR LIMIT=40] -->
     <string name="sim_editor_title">SIM slot %1$d</string>
     <!-- Carrier label of Sim Editor.  [CHAR LIMIT=40] -->
@@ -5523,8 +5559,6 @@
     <string name="sim_no_inserted_msg">No SIM cards inserted</string>
     <!-- SIM status title  [CHAR LIMIT=40] -->
     <string name="sim_status_title">SIM status</string>
-    <!-- SIM status summary [CHAR LIMIT=60] -->
-    <string name="sim_status_summary">SIM related information</string>
     <!-- Title for call back. [CHAR LIMIT=60] -->
     <string name="sim_call_back_title">Call back from default SIM</string>
     <!-- Title for outgoing back. [CHAR LIMIT=60] -->
@@ -5539,11 +5573,17 @@
     <string name="preferred_network_offload_footer">Disable Network Name Broadcast protects from third parties getting access to your network information.</string>
     <!-- Preferred Network offload Popup.  [CHAR LIMIT=100] -->
     <string name="preferred_network_offload_popup">Disabling Network Name Broadcast will prevent automatic connection to hidden networks.</string>
+    <!-- Summary text describing signal strength to the user.  [CHAR LIMIT=60] -->
+    <string name="sim_signal_strength"><xliff:g id="dbm">%1$d</xliff:g> dBm <xliff:g id="asu">%2$d</xliff:g> asu</string>
+    <!-- Title for SIM card notification.  [CHAR LIMIT=40] -->
+    <string name="sim_notification_title">SIM cards changed.</string>
+    <!-- Message under title informing the user to touch to go to SIM Cards in Settings.  [CHAR LIMIT=40] -->
+    <string name="sim_notification_summary">Touch to set up</string>
 
     <!-- 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>
 
@@ -5566,22 +5606,22 @@
 
     <!--Search Keywords [CHAR LIMIT=NONE]-->
     <string name="keywords_wifi">wifi wi-fi network connection</string>
-    <string name="keywords_more_default_sms_app">text message</string>
-    <string name="keywords_more_mobile_networks">cellular cell carrier wireless</string>
+    <string name="keywords_more_default_sms_app">text message texting messages messaging</string>
+    <string name="keywords_more_mobile_networks">cellular cell carrier wireless data 4g 3g 2g lte</string>
     <string name="keywords_home">launcher</string>
     <string name="keywords_display">screen touchscreen</string>
-    <string name="keywords_display_brightness_level">dim screen touchscreen</string>
-    <string name="keywords_display_auto_brightness">dim screen touchscreen</string>
-    <string name="keywords_display_wallpaper">background</string>
+    <string name="keywords_display_brightness_level">dim screen touchscreen battery</string>
+    <string name="keywords_display_auto_brightness">dim screen touchscreen battery</string>
+    <string name="keywords_display_wallpaper">background personalize customize diplay</string>
     <string name="keywords_display_font_size">text size</string>
     <string name="keywords_display_cast_screen">project</string>
-    <string name="keywords_storage">space disk hard drive</string>
-    <string name="keywords_battery">power</string>
-    <string name="keywords_spell_checker">spelling</string>
+    <string name="keywords_storage">space disk hard drive device usage</string>
+    <string name="keywords_battery">power usage charge</string>
+    <string name="keywords_spell_checker">spelling dictionary spellcheck auto-correct</string>
     <string name="keywords_voice_input">recognizer input speech speak language hands-free hand free recognition offensive word audio history bluetooth headset</string>
-    <string name="keywords_text_to_speech_output">rate language default speak speaking</string>
-    <string name="keywords_date_and_time">clock</string>
-    <string name="keywords_factory_data_reset">wipe delete</string>
+    <string name="keywords_text_to_speech_output">rate language default speak speaking tts accessibility reader blind</string>
+    <string name="keywords_date_and_time">clock military</string>
+    <string name="keywords_factory_data_reset">wipe delete restore clear remove</string>
     <string name="keywords_printing">printer</string>
     <string name="keywords_sounds_and_notifications">speaker beep</string>
     <string name="keywords_sounds_and_notifications_interruptions">dont don\'t disturb interrupt interruption break</string>
@@ -5590,7 +5630,7 @@
     <string name="keywords_location_mode">accuracy</string>
     <string name="keywords_accounts">account</string>
     <string name="keywords_users">restriction restrict restricted</string>
-    <string name="keywords_keyboard_and_ime">text correction correct sound vibrate auto language gesture suggest suggestion theme offensive word type emoji</string>
+    <string name="keywords_keyboard_and_ime">text correction correct sound vibrate auto language gesture suggest suggestion theme offensive word type emoji international</string>
     <!-- Search keywords for different screen unlock modes : slide to unlock, password, pattern and PIN [CHAR LIMIT=none] -->
     <string name="keywords_lockscreen">slide password pattern pin</string>
 
@@ -5638,9 +5678,6 @@
     <!-- Sound & notification > Sound section: Title for the zen mode option. [CHAR LIMIT=60] -->
     <string name="zen_mode_option_title">When calls and notifications arrive</string>
 
-    <!-- Sound & notification > Sound section: Title for the zen mode option for devices without voice. [CHAR LIMIT=60] -->
-    <string name="zen_mode_option_title_novoice">When notifications arrive</string>
-
     <!-- Sound & notification > Sound section: Zen mode option: Off [CHAR LIMIT=60] -->
     <string name="zen_mode_option_off">Always interrupt</string>
 
@@ -5819,7 +5856,7 @@
     <string name="zen_mode_important_category">Priority interruptions</string>
 
     <!-- [CHAR LIMIT=60] Zen mode settings: Downtime category text -->
-    <string name="zen_mode_downtime_category">Downtime (priority interruptions only)</string>
+    <string name="zen_mode_downtime_category">Downtime</string>
 
     <!-- [CHAR LIMIT=40] Zen mode settings: Downtime days option title -->
     <string name="zen_mode_downtime_days">Days</string>
@@ -5827,6 +5864,15 @@
     <!-- [CHAR LIMIT=40] Zen mode settings: Downtime days option value, no days set -->
     <string name="zen_mode_downtime_days_none">None</string>
 
+    <!-- [CHAR LIMIT=60] Zen mode settings: Downtime mode option title -->
+    <string name="zen_mode_downtime_mode_title">Interruptions allowed</string>
+
+    <!-- [CHAR LIMIT=40] Zen mode settings: Downtime mode option value, priority only -->
+    <string name="zen_mode_downtime_mode_priority">Priority only</string>
+
+    <!-- [CHAR LIMIT=40] Zen mode settings: Downtime mode option value, none -->
+    <string name="zen_mode_downtime_mode_none">None</string>
+
     <!-- [CHAR LIMIT=40] Zen mode settings: Automation category text -->
     <string name="zen_mode_automation_category">Automation</string>
 
@@ -5839,8 +5885,8 @@
     <!-- [CHAR LIMIT=40] Zen mode settings: Entry conditions option: value when blank -->
     <string name="zen_mode_entry_conditions_summary_none">Never</string>
 
-    <!-- [CHAR LIMIT=20] Zen mode settings: Phone calls option -->
-    <string name="zen_mode_phone_calls">Calls</string>
+    <!-- [CHAR LIMIT=20] Zen mode settings: Calls option -->
+    <string name="zen_mode_calls">Calls</string>
 
     <!-- [CHAR LIMIT=20] Zen mode settings: Messages option -->
     <string name="zen_mode_messages">Messages</string>
@@ -5881,8 +5927,14 @@
     <!-- [CHAR LIMIT=20] Zen mode settings: End time option -->
     <string name="zen_mode_end_time">End time</string>
 
-    <!-- [CHAR LIMIT=20] Zen mode settings: End time option: Summary text value format -->
-    <string name="zen_mode_end_time_summary_format"><xliff:g id="formatted_time">%s</xliff:g> next day</string>
+    <!-- [CHAR LIMIT=60] Zen mode settings: End time option: Summary text value format when downtime mode = priority and end time = next day -->
+    <string name="zen_mode_end_time_priority_next_day_summary_format"><xliff:g id="formatted_time">%s</xliff:g> next day</string>
+
+    <!-- [CHAR LIMIT=60] Zen mode settings: End time option: Summary text value format when downtime mode = none and end time = same day -->
+    <string name="zen_mode_end_time_none_same_day_summary_format"><xliff:g id="formatted_time">%s</xliff:g> or any alarm before</string>
+
+    <!-- [CHAR LIMIT=60] Zen mode settings: End time option: Summary text value format when downtime mode = none and end time = next day -->
+    <string name="zen_mode_end_time_none_next_day_summary_format"><xliff:g id="formatted_time">%s</xliff:g> next day or any alarm before</string>
 
     <!-- [CHAR LIMIT=20] Notifications settings: Apps section header -->
     <string name="notification_settings_apps_title">App notifications</string>
@@ -5908,7 +5960,15 @@
     <!-- [CHAR LIMIT=28] Screen pinning title -->
     <string name="screen_pinning_title">Screen pinning</string>
     <!-- [CHAR LIMIT=300] Screen pinning description -->
-    <string name="screen_pinning_description">When turned on, you can use screen pinning to keep the current screen in view until you unpin.\n\nTo use screen pinning:\n\n1. Make sure screen pinning is turned on.\n\n2. Open the screen you want to pin.\n\n3. Touch Overview.\n\n4. Touch the pin icon.</string>
+    <string name="screen_pinning_description">When this setting is turned on, you can use screen pinning to keep the current screen in view until you unpin.\n\nTo use screen pinning:\n\n1. Make sure screen pinning is turned on.\n\n2. Open the screen you want to pin.\n\n3. Touch Overview.\n\n4. Swipe up and then touch the pin icon.</string>
+    <!-- [CHAR LIMIT=60] Unlock setting for screen pinning -->
+    <string name="screen_pinning_unlock_pattern">Ask for unlock pattern before unpinning</string>
+    <!-- [CHAR LIMIT=60] Unlock setting for screen pinning -->
+    <string name="screen_pinning_unlock_pin">Ask for PIN before unpinning</string>
+    <!-- [CHAR LIMIT=60] Unlock setting for screen pinning -->
+    <string name="screen_pinning_unlock_password">Ask for password before unpinning</string>
+    <!-- [CHAR LIMIT=60] Unlock setting for screen pinning -->
+    <string name="screen_pinning_unlock_none">Lock device when unpinning</string>
 
     <!-- Title for a work profile. [CHAR LIMIT=25] -->
     <string name="managed_user_title">Work profile</string>
@@ -5930,8 +5990,6 @@
     <!-- Title and summary for SIM Status -->
     <!-- Title for IMEI preference [CHAR LIMIT=30] -->
     <string name="imei_information_title">IMEI information</string>
-    <!-- Description for IMEI preference [CHAR LIMIT=40] -->
-    <string name="imei_information_summary">IMEI relative information</string>
 
     <!-- Encryption interstitial title [CHAR LIMIT=30] -->
     <string name="encryption_interstitial_header">Encryption</string>
@@ -5987,4 +6045,9 @@
    <!-- Message for encryption dialog telling the user that Talkback and other accessibility services will be disabled. -->
    <string name="encrypt_talkback_dialog_message_password">When you enter your password to start this device, accessibility services like <xliff:g id="service" example="TalkBack">%1$s</xliff:g> won\'t yet be available.</string>
 
+   <!-- Title and summary for SIM Status -->
+   <string name="imei_information_title">IMEI information</string>
+   <string name="imei_information_summary">IMEI relative information</string>
+   <string name="slot_number">(Slot<xliff:g id="slot_num">%1$d</xliff:g>)</string>
+
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index cd6883f..626fc27 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -234,13 +234,13 @@
         <item name="android:textSize">14sp</item>
         <item name="android:textAlignment">viewStart</item>
         <item name="android:textAppearance">@android:style/TextAppearance.Material.Body1</item>
-        <item name="android:textColor">@*android:color/secondary_text_default_material_light</item>
+        <item name="android:textColor">?android:attr/textColorSecondary</item>
     </style>
 
     <style name="wifi_item_content">
         <item name="android:textAlignment">viewStart</item>
         <item name="android:textAppearance">@android:style/TextAppearance.Material.Subhead</item>
-        <item name="android:textColor">@*android:color/primary_text_default_material_light</item>
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
     </style>
 
     <style name="wifi_item_edit_content">
@@ -305,27 +305,6 @@
         <item name="android:textSize">18sp</item>
     </style>
 
-    <style name="WifiAssistantText">
-        <item name="android:textAppearance">?android:attr/textAppearanceMedium</item>
-        <item name="android:textColor">@android:color/white</item>
-    </style>
-
-    <style name="WifiAssistantButton">
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_width">wrap_content</item>
-        <item name="android:background">@android:color/white</item>
-        <item name="android:paddingStart">@dimen/wifi_assistant_text_padding</item>
-        <item name="android:paddingEnd">@dimen/wifi_assistant_text_padding</item>
-        <item name="android:textAppearance">?android:attr/textAppearanceMedium</item>
-    </style>
-
-    <style name="WifiAssistantButton.Negative">
-    </style>
-
-    <style name="WifiAssistantButton.Positive">
-        <item name="android:textColor">@color/wifi_assistant_color_accent</item>
-    </style>
-
     <!-- Scrollbar style OUTSIDE_OVERLAY -->
     <integer name="preference_scrollbar_style">33554432</integer>
 
@@ -333,6 +312,10 @@
         <item name="android:layout">@layout/apn_preference_layout</item>
     </style>
 
+    <style name="AppListSwitchPreference" parent="@*android:style/Preference.Material.DialogPreference">
+        <item name="android:widgetLayout">@*android:layout/preference_widget_switch</item>
+    </style>
+
     <style name="TextAppearance.Medium" parent="@android:style/TextAppearance.Material.Medium">
     </style>
 
@@ -362,5 +345,4 @@
     <style name="Widget.TimePicker" parent="@*android:style/Widget.Material.Light.TimePicker">
         <item name="@android:numbersBackgroundColor">@android:color/white</item>
     </style>
-
 </resources>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index b4fb388..18cc40e 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -19,6 +19,7 @@
     <attr name="ic_menu_moreoverflow" format="reference" />
     <attr name="ic_wps" format="reference" />
     <attr name="setup_divider_color" format="reference" />
+    <attr name="side_margin" format="reference|dimension" />
     <attr name="wifi_signal_color" format="reference" />
     <attr name="wifi_signal" format="reference" />
 
@@ -28,11 +29,12 @@
         <item name="android:windowBackground">@null</item>
     </style>
 
-    <style name="SetupWizardWifiTheme" parent="android:Theme.Material.NoActionBar">
+    <style name="SetupWizardTheme" parent="android:Theme.Material.NoActionBar">
         <item name="android:alertDialogTheme">@style/Theme.WifiDialog</item>
         <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>
@@ -40,16 +42,23 @@
         <item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_material</item>
         <item name="ic_wps">@drawable/ic_wps_dark</item>
         <item name="setup_divider_color">@color/setup_divider_color_dark</item>
+        <item name="side_margin">0dip</item>
         <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="SetupWizardWifiTheme.Light" parent="android:Theme.Material.Light.NoActionBar">
+    <style name="SetupWizardTheme.Light" parent="android:Theme.Material.Light.NoActionBar">
         <item name="android:alertDialogTheme">@style/Theme.Light.WifiDialog</item>
         <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>
@@ -57,9 +66,22 @@
         <item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_material</item>
         <item name="ic_wps">@drawable/ic_wps_light</item>
         <item name="setup_divider_color">@color/setup_divider_color_light</item>
+        <item name="side_margin">0dip</item>
         <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">
@@ -96,8 +118,9 @@
 
         <item name="ic_menu_add">@drawable/ic_menu_add_dark</item>
         <item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_holo_dark</item>
-        <item name="ic_wps">@drawable/ic_wps_dark</item>
+        <item name="ic_wps">@drawable/ic_wps_light</item>
         <item name="wifi_signal">@drawable/wifi_signal_teal</item>
+        <item name="side_margin">@dimen/settings_side_margin</item>
 
         <!-- Redefine the ActionBar style for contentInsetStart -->
         <item name="android:actionBarStyle">@style/Theme.ActionBar</item>
diff --git a/res/xml/accessibility_settings.xml b/res/xml/accessibility_settings.xml
index d2d7711..cd9d471 100644
--- a/res/xml/accessibility_settings.xml
+++ b/res/xml/accessibility_settings.xml
@@ -37,28 +37,28 @@
             android:key="screen_magnification_preference_screen"
             android:title="@string/accessibility_screen_magnification_title"/>
 
-        <CheckBoxPreference
+        <SwitchPreference
                 android:key="toggle_large_text_preference"
                 android:title="@string/accessibility_toggle_large_text_preference_title"
                 android:persistent="false"/>
 
-        <CheckBoxPreference
+        <SwitchPreference
                 android:key="toggle_high_text_contrast_preference"
                 android:title="@string/accessibility_toggle_high_text_contrast_preference_title"
                 android:summary="@string/experimental_preference"
                 android:persistent="false"/>
 
-        <CheckBoxPreference
+        <SwitchPreference
                 android:key="toggle_power_button_ends_call_preference"
                 android:title="@string/accessibility_power_button_ends_call_prerefence_title"
                 android:persistent="false"/>
 
-        <CheckBoxPreference
+        <SwitchPreference
                 android:key="toggle_lock_screen_rotation_preference"
                 android:title="@string/accelerometer_title"
                 android:persistent="false"/>
 
-        <CheckBoxPreference
+        <SwitchPreference
                 android:key="toggle_speak_password_preference"
                 android:title="@string/accessibility_toggle_speak_password_preference_title"
                 android:persistent="false"/>
diff --git a/res/xml/apn_editor.xml b/res/xml/apn_editor.xml
index 745a83e..979e1da 100644
--- a/res/xml/apn_editor.xml
+++ b/res/xml/apn_editor.xml
@@ -128,7 +128,7 @@
         android:entries="@array/apn_protocol_entries"
         android:entryValues="@array/apn_protocol_values"
         />
-    <CheckBoxPreference
+    <SwitchPreference
         android:title="@string/carrier_enabled"
         android:key="carrier_enabled"
         android:enabled="false"
diff --git a/res/xml/battery_saver_settings.xml b/res/xml/battery_saver_settings.xml
index 929053f..cb923c8 100644
--- a/res/xml/battery_saver_settings.xml
+++ b/res/xml/battery_saver_settings.xml
@@ -25,7 +25,7 @@
             android:persistent="false" />
 
     <!-- Feature description text -->
-    <Preference
+    <com.android.settings.fuelgauge.WallOfTextPreference
             android:key="description"
             android:summary="@*android:string/battery_saver_description"
             android:persistent="false"
diff --git a/res/xml/date_time_prefs.xml b/res/xml/date_time_prefs.xml
index 5bf3c9a..d359d84 100644
--- a/res/xml/date_time_prefs.xml
+++ b/res/xml/date_time_prefs.xml
@@ -19,13 +19,13 @@
         android:title="@string/date_and_time"
         settings:keywords="@string/keywords_date_and_time">
 
-    <CheckBoxPreference android:key="auto_time"
+    <SwitchPreference android:key="auto_time"
         android:title="@string/date_time_auto"
         android:summaryOn="@string/date_time_auto_summaryOn"
         android:summaryOff="@string/date_time_auto_summaryOff"
         />
 
-    <CheckBoxPreference android:key="auto_zone"
+    <SwitchPreference android:key="auto_zone"
         android:title="@string/zone_auto"
         android:summaryOn="@string/zone_auto_summaryOn"
         android:summaryOff="@string/zone_auto_summaryOff"
@@ -48,13 +48,8 @@
         android:summary="GMT-8:00"
         />
 
-    <CheckBoxPreference android:key="24 hour"
+    <SwitchPreference android:key="24 hour"
         android:title="@string/date_time_24hour"
         />
 
-    <ListPreference
-        android:key="date_format"
-        android:title="@string/date_time_date_format"
-        android:summary="mm/dd/yyyy"/>
-
 </PreferenceScreen>
diff --git a/res/xml/development_prefs.xml b/res/xml/development_prefs.xml
index 128aa5f..f31d556 100644
--- a/res/xml/development_prefs.xml
+++ b/res/xml/development_prefs.xml
@@ -32,7 +32,7 @@
                 android:targetClass="com.android.settings.SetFullBackupPassword" />
     </PreferenceScreen>
 
-    <CheckBoxPreference
+    <SwitchPreference
         android:key="keep_screen_on"
         android:title="@string/keep_screen_on"
         android:summary="@string/keep_screen_on_summary"/>
@@ -44,12 +44,12 @@
         android:entries="@array/hdcp_checking_titles"
         android:entryValues="@array/hdcp_checking_values" />
 
-    <CheckBoxPreference
+    <SwitchPreference
         android:key="bt_hci_snoop_log"
         android:title="@string/bt_hci_snoop_log"
         android:summary="@string/bt_hci_snoop_log_summary"/>
 
-    <CheckBoxPreference
+    <SwitchPreference
         android:key="oem_unlock_enable"
         android:title="@string/oem_unlock_enable"
         android:summary="@string/oem_unlock_enable_summary"/>
@@ -63,7 +63,7 @@
     <PreferenceCategory android:key="debug_debugging_category"
             android:title="@string/debug_debugging_category">
 
-        <CheckBoxPreference
+        <SwitchPreference
             android:key="enable_adb"
             android:title="@string/enable_adb"
             android:summary="@string/enable_adb_summary"/>
@@ -71,54 +71,54 @@
         <Preference android:key="clear_adb_keys"
                 android:title="@string/clear_adb_keys" />
 
-        <CheckBoxPreference
+        <SwitchPreference
             android:key="enable_terminal"
             android:title="@string/enable_terminal_title"
             android:summary="@string/enable_terminal_summary" />
 
-        <CheckBoxPreference
+        <SwitchPreference
             android:key="bugreport_in_power"
             android:title="@string/bugreport_in_power"
             android:summary="@string/bugreport_in_power_summary"/>
 
-        <CheckBoxPreference
+        <SwitchPreference
             android:key="allow_mock_location"
             android:title="@string/allow_mock_location"
             android:summary="@string/allow_mock_location_summary"/>
 
-        <CheckBoxPreference
+        <SwitchPreference
                 android:key="debug_view_attributes"
                 android:title="@string/debug_view_attributes" />
 
         <PreferenceScreen android:key="debug_app"
                 android:title="@string/debug_app" />
 
-        <CheckBoxPreference
+        <SwitchPreference
             android:key="wait_for_debugger"
             android:title="@string/wait_for_debugger"
             android:summary="@string/wait_for_debugger_summary"/>
 
-        <CheckBoxPreference
+        <SwitchPreference
             android:key="verify_apps_over_usb"
             android:title="@string/verify_apps_over_usb_title"
             android:summary="@string/verify_apps_over_usb_summary"/>
 
-        <CheckBoxPreference
+        <SwitchPreference
             android:key="wifi_display_certification"
             android:title="@string/wifi_display_certification"
             android:summary="@string/wifi_display_certification_summary"/>
 
-        <CheckBoxPreference
+        <SwitchPreference
             android:key="wifi_verbose_logging"
             android:title="@string/wifi_verbose_logging" />
             android:summary="@string/wifi_verbose_logging_summary"/>
 
-        <CheckBoxPreference
+        <SwitchPreference
             android:key="wifi_aggressive_handover"
             android:title="@string/wifi_aggressive_handover" />
             android:summary="@string/wifi_aggressive_handover_summary"/>
 
-       <CheckBoxPreference
+       <SwitchPreference
             android:key="wifi_allow_scan_with_traffic"
             android:title="@string/wifi_allow_scan_with_traffic" />
             android:summary="@string/wifi_allow_scan_with_traffic_summary"/>
@@ -135,12 +135,12 @@
     <PreferenceCategory android:key="debug_input_category"
             android:title="@string/debug_input_category">
 
-        <CheckBoxPreference
+        <SwitchPreference
             android:key="show_touches"
             android:title="@string/show_touches"
             android:summary="@string/show_touches_summary"/>
 
-        <CheckBoxPreference
+        <SwitchPreference
             android:key="pointer_location"
             android:title="@string/pointer_location"
             android:summary="@string/pointer_location_summary"/>
@@ -150,17 +150,17 @@
     <PreferenceCategory android:key="debug_drawing_category"
             android:title="@string/debug_drawing_category">
 
-        <CheckBoxPreference
+        <SwitchPreference
             android:key="show_screen_updates"
             android:title="@string/show_screen_updates"
             android:summary="@string/show_screen_updates_summary"/>
 
-        <CheckBoxPreference
+        <SwitchPreference
             android:key="debug_layout"
             android:title="@string/debug_layout"
             android:summary="@string/debug_layout_summary"/>
 
-        <CheckBoxPreference
+        <SwitchPreference
             android:key="force_rtl_layout_all_locales"
             android:title="@string/force_rtl_layout_all_locales"
             android:summary="@string/force_rtl_layout_all_locales_summary"/>
@@ -198,17 +198,17 @@
     <PreferenceCategory android:key="debug_hw_drawing_category"
             android:title="@string/debug_hw_drawing_category">
 
-        <CheckBoxPreference
+        <SwitchPreference
                 android:key="force_hw_ui"
                 android:title="@string/force_hw_ui"
                 android:summary="@string/force_hw_ui_summary"/>
 
-        <CheckBoxPreference
+        <SwitchPreference
                 android:key="show_hw_screen_udpates"
                 android:title="@string/show_hw_screen_updates"
                 android:summary="@string/show_hw_screen_updates_summary"/>
 
-        <CheckBoxPreference
+        <SwitchPreference
                 android:key="show_hw_layers_udpates"
                 android:title="@string/show_hw_layers_updates"
                 android:summary="@string/show_hw_layers_updates_summary"/>
@@ -227,12 +227,12 @@
                 android:entries="@array/show_non_rect_clip_entries"
                 android:entryValues="@array/show_non_rect_clip_values" />
 
-        <CheckBoxPreference
+        <SwitchPreference
                 android:key="force_msaa"
                 android:title="@string/force_msaa"
                 android:summary="@string/force_msaa_summary"/>
 
-        <CheckBoxPreference
+        <SwitchPreference
                 android:key="disable_overlays"
                 android:title="@string/disable_overlays"
                 android:summary="@string/disable_overlays_summary"/>
@@ -250,12 +250,12 @@
     <PreferenceCategory android:key="media_category"
             android:title="@string/media_category">
 
-        <CheckBoxPreference
-                android:key="use_nuplayer"
-                android:title="@string/use_nuplayer"
-                android:summary="@string/use_nuplayer_summary"/>
+        <SwitchPreference
+                android:key="use_awesomeplayer"
+                android:title="@string/use_awesomeplayer"
+                android:summary="@string/use_awesomeplayer_summary"/>
 
-        <CheckBoxPreference
+        <SwitchPreference
                 android:key="usb_audio"
                 android:title="@string/usb_audio_disable_routing"
                 android:summary="@string/usb_audio_disable_routing_summary" />
@@ -265,12 +265,12 @@
     <PreferenceCategory android:key="debug_monitoring_category"
             android:title="@string/debug_monitoring_category">
 
-        <CheckBoxPreference
+        <SwitchPreference
             android:key="strict_mode"
             android:title="@string/strict_mode"
             android:summary="@string/strict_mode_summary"/>
 
-        <CheckBoxPreference
+        <SwitchPreference
             android:key="show_cpu_usage"
             android:title="@string/show_cpu_usage"
             android:summary="@string/show_cpu_usage_summary"/>
@@ -294,7 +294,7 @@
     <PreferenceCategory android:key="debug_applications_category"
             android:title="@string/debug_applications_category">
 
-        <CheckBoxPreference
+        <SwitchPreference
             android:key="immediately_destroy_activities"
             android:title="@string/immediately_destroy_activities"
             android:summary="@string/immediately_destroy_activities_summary"/>
@@ -306,7 +306,7 @@
             android:entries="@array/app_process_limit_entries"
             android:entryValues="@array/app_process_limit_values" />
 
-        <CheckBoxPreference
+        <SwitchPreference
             android:key="show_all_anrs"
             android:title="@string/show_all_anrs"
             android:summary="@string/show_all_anrs_summary"/>
diff --git a/res/xml/device_info_phone_status.xml b/res/xml/device_info_phone_status.xml
new file mode 100644
index 0000000..21c5af1
--- /dev/null
+++ b/res/xml/device_info_phone_status.xml
@@ -0,0 +1,47 @@
+<?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.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+        android:title="@string/imei_information_title">
+
+    <!-- This menu item is only for CDMA phone -->
+    <Preference android:key="min_number"
+        android:title="@string/status_min_number"
+        android:summary="@string/device_info_not_available" />
+
+    <!-- This menu item is only for CDMA phone -->
+    <Preference android:key="prl_version"
+        android:title="@string/status_prl_version"
+        android:summary="@string/device_info_not_available" />
+
+    <!-- This menu item is only for CDMA phone -->
+    <Preference android:key="meid_number"
+        android:title="@string/status_meid_number"
+        android:summary="@string/device_info_not_available" />
+
+    <Preference android:key="imei"
+        android:title="@string/status_imei"
+        android:summary="@string/device_info_not_available" />
+
+    <Preference android:key="imei_sv"
+        android:title="@string/status_imei_sv"
+        android:summary="@string/device_info_not_available" />
+
+    <Preference android:key="icc_id"
+        android:title="@string/status_icc_id"
+        android:summary="@string/device_info_not_available" />
+
+</PreferenceScreen>
diff --git a/res/xml/device_info_settings.xml b/res/xml/device_info_settings.xml
index 2c47c40..46992a4 100644
--- a/res/xml/device_info_settings.xml
+++ b/res/xml/device_info_settings.xml
@@ -72,6 +72,13 @@
                 <intent android:action="android.settings.TERMS" />
             </PreferenceScreen>
 
+            <!-- System WebView License information -->
+            <PreferenceScreen
+                    android:key="webview_license"
+                    android:title="@string/webview_license_title">
+                <intent android:action="android.settings.WEBVIEW_LICENSE" />
+            </PreferenceScreen>
+
             <Preference
                     android:key="wallpaper_attributions"
                     android:title="@string/wallpaper_attributions"
@@ -81,12 +88,6 @@
         </PreferenceScreen>
 
         <PreferenceScreen
-                android:key="safetylegal"
-                android:title="@string/settings_safetylegal_title">
-            <intent android:action="android.settings.SAFETY" />
-        </PreferenceScreen>
-
-        <PreferenceScreen
                 android:key="regulatory_info"
                 android:title="@string/regulatory_information">
             <intent android:action="android.settings.SHOW_REGULATORY_INFO" />
diff --git a/res/xml/device_info_sim_status.xml b/res/xml/device_info_sim_status.xml
new file mode 100644
index 0000000..9e9444d
--- /dev/null
+++ b/res/xml/device_info_sim_status.xml
@@ -0,0 +1,80 @@
+<?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.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+        android:title="@string/sim_status_title">
+
+    <Preference android:key="operator_name"
+        style="?android:attr/preferenceInformationStyle"
+        android:title="@string/status_operator"
+        android:summary="@string/device_info_not_available"
+        android:persistent="false" />
+
+    <Preference android:key="signal_strength"
+        style="?android:attr/preferenceInformationStyle"
+        android:title="@string/status_signal_strength"
+        android:summary="@string/device_info_not_available"
+        android:persistent="false" />
+
+    <Preference android:key="network_type"
+        style="?android:attr/preferenceInformationStyle"
+        android:title="@string/status_network_type"
+        android:summary="@string/device_info_not_available"
+        android:persistent="false" />
+
+    <Preference android:key="latest_area_info"
+        style="?android:attr/preferenceInformationStyle"
+        android:title="@string/status_latest_area_info"
+        android:summary="@string/device_info_not_available"
+        android:persistent="false" />
+
+    <Preference android:key="service_state"
+        style="?android:attr/preferenceInformationStyle"
+        android:title="@string/status_service_state"
+        android:summary="@string/device_info_not_available"
+        android:persistent="false" />
+
+    <Preference android:key="roaming_state"
+        style="?android:attr/preferenceInformationStyle"
+        android:title="@string/status_roaming"
+        android:summary="@string/device_info_not_available"
+        android:persistent="false" />
+
+    <Preference android:key="data_state"
+        style="?android:attr/preferenceInformationStyle"
+        android:title="@string/status_data_state"
+        android:summary="@string/device_info_not_available"
+        android:persistent="false" />
+
+    <Preference android:key="number"
+        style="?android:attr/preferenceInformationStyle"
+        android:title="@string/status_number"
+        android:summary="@string/device_info_not_available"
+        android:persistent="false" />
+
+    <Preference android:key="imei"
+        style="?android:attr/preferenceInformationStyle"
+        android:title="@string/status_imei"
+        android:summary="@string/device_info_not_available"
+        android:persistent="false" />
+
+    <Preference android:key="imei_sv"
+        style="?android:attr/preferenceInformationStyle"
+        android:title="@string/status_imei_sv"
+        android:summary="@string/device_info_not_available"
+        android:persistent="false" />
+
+</PreferenceScreen>
diff --git a/res/xml/device_info_status.xml b/res/xml/device_info_status.xml
index 26b067b..fc6016f 100644
--- a/res/xml/device_info_status.xml
+++ b/res/xml/device_info_status.xml
@@ -29,14 +29,12 @@
         android:persistent="false" />
     <PreferenceScreen android:key="sim_status"
         android:title="@string/sim_status_title"
-        android:summary="@string/sim_status_summary"
         android:persistent="false">
         <intent android:targetPackage="com.android.settings"
             android:targetClass="com.android.settings.deviceinfo.SimStatus" />
     </PreferenceScreen>
     <PreferenceScreen android:key="imei_info"
         android:title="@string/imei_information_title"
-        android:summary="@string/imei_information_summary"
         android:persistent="false">
         <intent android:targetPackage="com.android.settings"
             android:targetClass="com.android.settings.deviceinfo.ImeiInformation" />
diff --git a/res/xml/language_settings.xml b/res/xml/language_settings.xml
index 46072bf..5cc8a4a 100644
--- a/res/xml/language_settings.xml
+++ b/res/xml/language_settings.xml
@@ -31,7 +31,6 @@
     <PreferenceScreen
             android:key="spellcheckers_settings"
             android:title="@string/spellcheckers_settings_title"
-            settings:keywords="@string/keywords_spell_checker"
             android:persistent="false"
             />
 
@@ -43,8 +42,7 @@
 
     <PreferenceCategory
             android:key="keyboard_settings_category"
-            android:title="@string/keyboard_settings_category"
-            settings:keywords="@string/keywords_keyboard_and_ime">
+            android:title="@string/keyboard_settings_category">
 
         <PreferenceScreen
                 android:key="current_input_method"
@@ -68,14 +66,12 @@
         <PreferenceScreen
                 android:key="voice_input_settings"
                 android:title="@string/voice_input_settings_title"
-                settings:keywords="@string/keywords_voice_input"
                 android:fragment="com.android.settings.voice.VoiceInputSettings"
                 />
 
         <PreferenceScreen
                 android:key="tts_settings"
                 android:title="@string/tts_settings_title"
-                settings:keywords="@string/keywords_text_to_speech_output"
                 android:fragment="com.android.settings.tts.TextToSpeechSettings"
                 />
 
@@ -97,7 +93,7 @@
             android:key="game_controller_settings_category"
             android:title="@string/game_controller_settings_category">
 
-        <CheckBoxPreference
+        <SwitchPreference
                 android:key="vibrate_input_devices"
                 android:title="@string/vibrate_input_devices"
                 android:summaryOn="@string/vibrate_input_devices_summary"
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/notification_settings.xml b/res/xml/notification_settings.xml
index 3f9b40c..e5dda19 100644
--- a/res/xml/notification_settings.xml
+++ b/res/xml/notification_settings.xml
@@ -27,25 +27,25 @@
         <!-- Media volume -->
         <com.android.settings.notification.VolumeSeekBarPreference
                 android:key="media_volume"
-                android:icon="@drawable/ic_audio_vol_24dp"
+                android:icon="@*android:drawable/ic_audio_vol"
                 android:title="@string/media_volume_option_title" />
 
         <!-- Alarm volume -->
         <com.android.settings.notification.VolumeSeekBarPreference
                 android:key="alarm_volume"
-                android:icon="@drawable/ic_audio_alarm_24dp"
+                android:icon="@*android:drawable/ic_audio_alarm"
                 android:title="@string/alarm_volume_option_title" />
 
         <!-- Ring volume -->
         <com.android.settings.notification.VolumeSeekBarPreference
                 android:key="ring_volume"
-                android:icon="@drawable/ring_notif"
+                android:icon="@*android:drawable/ic_audio_ring_notif"
                 android:title="@string/ring_volume_option_title" />
 
         <!-- Notification volume -->
         <com.android.settings.notification.VolumeSeekBarPreference
                 android:key="notification_volume"
-                android:icon="@drawable/ring_notif"
+                android:icon="@*android:drawable/ic_audio_ring_notif"
                 android:title="@string/notification_volume_option_title" />
 
         <!-- Also vibrate for calls -->
diff --git a/res/xml/privacy_settings.xml b/res/xml/privacy_settings.xml
index 44894e7..4760300 100644
--- a/res/xml/privacy_settings.xml
+++ b/res/xml/privacy_settings.xml
@@ -43,6 +43,14 @@
                 android:summary="@string/auto_restore_summary"
                 android:persistent="false" />
 
+        <Preference
+                android:key="backup_inactive"
+                android:title="@string/backup_inactive_title"
+                android:summary="@string/backup_inactive_summary"
+                android:persistent="false"
+                android:enabled="false"
+                android:selectable="false" />
+
     </PreferenceCategory>
 
     <PreferenceCategory android:key="personal_data_category"
diff --git a/res/drawable/setup_illustration_wifi.xml b/res/xml/screen_pinning_settings.xml
similarity index 60%
rename from res/drawable/setup_illustration_wifi.xml
rename to res/xml/screen_pinning_settings.xml
index 9db2f13..6727687 100644
--- a/res/drawable/setup_illustration_wifi.xml
+++ b/res/xml/screen_pinning_settings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2014 The Android Open Source Project
+<!-- 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.
@@ -15,6 +14,12 @@
      limitations under the License.
 -->
 
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:autoMirrored="true"
-    android:src="@drawable/setup_illustration_wifi_image" />
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+        android:title="@string/screen_pinning_title">
+
+        <SwitchPreference
+                android:key="use_screen_lock"
+                android:title="@string/screen_pinning_unlock_none"
+                android:persistent="false" />
+
+</PreferenceScreen>
diff --git a/res/xml/sim_lock_settings.xml b/res/xml/sim_lock_settings.xml
index 0e43fcd..0246ea2 100644
--- a/res/xml/sim_lock_settings.xml
+++ b/res/xml/sim_lock_settings.xml
@@ -17,8 +17,8 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
         android:title="@string/sim_lock_settings">
-    
-    <CheckBoxPreference
+
+    <SwitchPreference
             android:key="sim_toggle"
             android:title="@string/sim_pin_toggle"
             android:summaryOn="@string/sim_lock_on"
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/res/xml/testing_settings.xml b/res/xml/testing_settings.xml
index 9c0a68b..c55cb46 100644
--- a/res/xml/testing_settings.xml
+++ b/res/xml/testing_settings.xml
@@ -36,7 +36,7 @@
             android:title="@string/testing_usage_stats">
         <intent android:action="android.intent.action.MAIN"
                 android:targetPackage="com.android.settings"
-                android:targetClass="com.android.settings.UsageStats" />
+                android:targetClass="com.android.settings.UsageStatsActivity" />
     </PreferenceScreen>
 
     <PreferenceScreen
diff --git a/res/xml/usb_settings.xml b/res/xml/usb_settings.xml
index 4d6ccc9..4b0268b 100644
--- a/res/xml/usb_settings.xml
+++ b/res/xml/usb_settings.xml
@@ -15,7 +15,7 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        android:title="@string/location_settings_title">
+        android:title="@string/storage_title_usb">
 
     <PreferenceCategory
             android:title="@string/usb_connection_category" />
diff --git a/res/xml/wifi_advanced_settings.xml b/res/xml/wifi_advanced_settings.xml
index 5b81d25..a7f47b1 100644
--- a/res/xml/wifi_advanced_settings.xml
+++ b/res/xml/wifi_advanced_settings.xml
@@ -30,11 +30,6 @@
             android:summary="@string/wifi_scan_always_available_summary"
             android:persistent="false" />
 
-    <SwitchPreference
-            android:key="wifi_assistant"
-            android:title="@string/wifi_automatically_manage_title"
-            android:persistent="false" />
-
     <ListPreference
             android:key="sleep_policy"
             android:title="@string/wifi_setting_sleep_policy_title"
@@ -42,6 +37,13 @@
             android:entries="@array/wifi_sleep_policy_entries"
             android:entryValues="@array/wifi_sleep_policy_values" />
 
+    <com.android.settings.AppListSwitchPreference
+            android:key="wifi_assistant"
+            android:title="@string/wifi_automatically_connect_title"
+            android:summary="@string/wifi_automatically_connect_summary"
+            android:dialogTitle="@string/wifi_select_assistant_dialog_title"
+            android:persistent="false" />
+
     <ListPreference
             android:key="frequency_band"
             android:title="@string/wifi_setting_frequency_band_title"
diff --git a/res/xml/wireless_settings.xml b/res/xml/wireless_settings.xml
index 7db1ed7..a5f722b 100644
--- a/res/xml/wireless_settings.xml
+++ b/res/xml/wireless_settings.xml
@@ -77,7 +77,7 @@
             android:targetClass="com.android.settings.wimax.WimaxSettings" />
     </PreferenceScreen>
 
-    <CheckBoxPreference
+    <SwitchPreference
         android:key="toggle_nsd"
         android:title="@string/nsd_quick_toggle_title"
         android:summary="@string/nsd_quick_toggle_summary"
diff --git a/res/xml/zen_mode_settings.xml b/res/xml/zen_mode_settings.xml
index 8761d10..7514565 100644
--- a/res/xml/zen_mode_settings.xml
+++ b/res/xml/zen_mode_settings.xml
@@ -37,8 +37,8 @@
             android:switchTextOn="" />
 
         <SwitchPreference
-            android:key="phone_calls"
-            android:title="@string/zen_mode_phone_calls"
+            android:key="calls"
+            android:title="@string/zen_mode_calls"
             android:persistent="false"
             android:switchTextOff=""
             android:switchTextOn="" />
@@ -65,15 +65,25 @@
 
     </PreferenceCategory>
 
+    <!-- Downtime -->
     <PreferenceCategory
         android:key="downtime"
         android:title="@string/zen_mode_downtime_category" >
 
+        <!-- Days -->
         <Preference
             android:key="days"
             android:title="@string/zen_mode_downtime_days"
             android:persistent="false" />
 
+        <!-- Start time/End time added and removed here! :-) -->
+
+        <!-- Interruptions allowed -->
+        <com.android.settings.notification.DropDownPreference
+                android:key="downtime_mode"
+                android:title="@string/zen_mode_downtime_mode_title"
+                android:order="100"
+                android:persistent="false" />
     </PreferenceCategory>
 
     <PreferenceCategory
diff --git a/src/com/android/settings/ActiveNetworkScorerDialog.java b/src/com/android/settings/ActiveNetworkScorerDialog.java
index e47f8e3..2cd224f 100644
--- a/src/com/android/settings/ActiveNetworkScorerDialog.java
+++ b/src/com/android/settings/ActiveNetworkScorerDialog.java
@@ -23,6 +23,7 @@
 import android.net.NetworkScorerAppManager;
 import android.net.NetworkScorerAppManager.NetworkScorerAppData;
 import android.os.Bundle;
+import android.os.UserHandle;
 import android.text.TextUtils;
 import android.util.Log;
 
@@ -69,6 +70,10 @@
     }
 
     private boolean buildDialog() {
+        if (UserHandle.myUserId() != UserHandle.USER_OWNER) {
+            Log.i(TAG, "Can only set scorer for owner user.");
+            return false;
+        }
         NetworkScorerAppData newScorer = NetworkScorerAppManager.getScorer(this, mNewPackageName);
         if (newScorer == null) {
             Log.e(TAG, "New package " + mNewPackageName + " is not a valid scorer.");
diff --git a/src/com/android/settings/ActivityPicker.java b/src/com/android/settings/ActivityPicker.java
index edbccc3..7c26923 100644
--- a/src/com/android/settings/ActivityPicker.java
+++ b/src/com/android/settings/ActivityPicker.java
@@ -159,7 +159,7 @@
                     Resources res = packageManager.getResourcesForApplication(
                             iconResource.packageName);
                     icon = res.getDrawable(res.getIdentifier(
-                            iconResource.resourceName, null, null));
+                            iconResource.resourceName, null, null), null);
                 } catch (NameNotFoundException e) {
                     // Ignore
                 }
diff --git a/src/com/android/settings/AirplaneModeEnabler.java b/src/com/android/settings/AirplaneModeEnabler.java
index 4ce5198..5b8ad0d 100644
--- a/src/com/android/settings/AirplaneModeEnabler.java
+++ b/src/com/android/settings/AirplaneModeEnabler.java
@@ -23,7 +23,6 @@
 import android.os.Message;
 import android.os.SystemProperties;
 import android.os.UserHandle;
-import android.preference.CheckBoxPreference;
 import android.preference.Preference;
 import android.preference.SwitchPreference;
 import android.provider.Settings;
@@ -59,12 +58,12 @@
         }
     };
 
-    public AirplaneModeEnabler(Context context, SwitchPreference airplaneModeCheckBoxPreference) {
+    public AirplaneModeEnabler(Context context, SwitchPreference airplaneModeSwitchPreference) {
         
         mContext = context;
-        mSwitchPref = airplaneModeCheckBoxPreference;
-        
-        airplaneModeCheckBoxPreference.setPersistent(false);
+        mSwitchPref = airplaneModeSwitchPreference;
+
+        airplaneModeSwitchPreference.setPersistent(false);
     
         mPhoneStateReceiver = new PhoneStateIntentReceiver(mContext, mHandler);
         mPhoneStateReceiver.notifyServiceState(EVENT_SERVICE_STATE_CHANGED);
diff --git a/src/com/android/settings/ApnEditor.java b/src/com/android/settings/ApnEditor.java
index 8cfee92..4e14c60 100644
--- a/src/com/android/settings/ApnEditor.java
+++ b/src/com/android/settings/ApnEditor.java
@@ -32,7 +32,9 @@
 import android.preference.CheckBoxPreference;
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
+import android.preference.SwitchPreference;
 import android.provider.Telephony;
+import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
 import android.util.Log;
 import android.view.KeyEvent;
@@ -81,7 +83,7 @@
     private EditTextPreference mApnType;
     private ListPreference mProtocol;
     private ListPreference mRoamingProtocol;
-    private CheckBoxPreference mCarrierEnabled;
+    private SwitchPreference mCarrierEnabled;
     private ListPreference mBearer;
     private ListPreference mMvnoType;
     private EditTextPreference mMvnoMatchData;
@@ -93,6 +95,7 @@
     private Cursor mCursor;
     private boolean mNewApn;
     private boolean mFirstTime;
+    private int mSubId;
     private Resources mRes;
     private TelephonyManager mTelephonyManager;
 
@@ -177,7 +180,7 @@
         mRoamingProtocol = (ListPreference) findPreference(KEY_ROAMING_PROTOCOL);
         mRoamingProtocol.setOnPreferenceChangeListener(this);
 
-        mCarrierEnabled = (CheckBoxPreference) findPreference(KEY_CARRIER_ENABLED);
+        mCarrierEnabled = (SwitchPreference) findPreference(KEY_CARRIER_ENABLED);
 
         mBearer = (ListPreference) findPreference(KEY_BEARER);
         mBearer.setOnPreferenceChangeListener(this);
@@ -190,6 +193,7 @@
 
         final Intent intent = getIntent();
         final String action = intent.getAction();
+        mSubId = intent.getIntExtra("sub_id", SubscriptionManager.INVALID_SUBSCRIPTION_ID);
 
         mFirstTime = icicle == null;
 
@@ -262,8 +266,7 @@
             mMnc.setText(mCursor.getString(MNC_INDEX));
             mApnType.setText(mCursor.getString(TYPE_INDEX));
             if (mNewApn) {
-                String numeric =
-                    SystemProperties.get(TelephonyProperties.PROPERTY_ICC_OPERATOR_NUMERIC);
+                String numeric = mTelephonyManager.getSimOperator(mSubId);
                 // MCC is first 3 chars and then in 2 - 3 chars of MNC
                 if (numeric != null && numeric.length() > 4) {
                     // Country code
@@ -386,8 +389,7 @@
                 if (values[mvnoIndex].equals("SPN")) {
                     mMvnoMatchData.setText(mTelephonyManager.getSimOperatorName());
                 } else if (values[mvnoIndex].equals("IMSI")) {
-                    String numeric =
-                            SystemProperties.get(TelephonyProperties.PROPERTY_ICC_OPERATOR_NUMERIC);
+                    String numeric = mTelephonyManager.getSimOperator(mSubId);
                     mMvnoMatchData.setText(numeric + "x");
                 } else if (values[mvnoIndex].equals("GID")) {
                     mMvnoMatchData.setText(mTelephonyManager.getGroupIdLevel1());
diff --git a/src/com/android/settings/ApnSettings.java b/src/com/android/settings/ApnSettings.java
index 0c0e53c..670924c 100644
--- a/src/com/android/settings/ApnSettings.java
+++ b/src/com/android/settings/ApnSettings.java
@@ -39,6 +39,8 @@
 import android.preference.PreferenceGroup;
 import android.preference.PreferenceScreen;
 import android.provider.Telephony;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -52,6 +54,7 @@
 import com.android.internal.telephony.PhoneConstants;
 import com.android.internal.telephony.TelephonyIntents;
 import com.android.internal.telephony.TelephonyProperties;
+import android.telephony.TelephonyManager;
 
 import java.util.ArrayList;
 
@@ -88,6 +91,7 @@
     private RestoreApnUiHandler mRestoreApnUiHandler;
     private RestoreApnProcessHandler mRestoreApnProcessHandler;
     private HandlerThread mRestoreDefaultApnThread;
+    private SubscriptionInfo mSubscriptionInfo;
 
     private UserManager mUm;
 
@@ -128,6 +132,9 @@
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
+        final Activity activity = getActivity();
+        final int subId = activity.getIntent().getIntExtra("sub_id",
+                SubscriptionManager.INVALID_SUBSCRIPTION_ID);
 
         mUm = (UserManager) getSystemService(Context.USER_SERVICE);
 
@@ -137,6 +144,8 @@
         if (!mUm.hasUserRestriction(UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS)) {
             setHasOptionsMenu(true);
         }
+
+        mSubscriptionInfo = Utils.findRecordBySubId(activity, subId);
     }
 
     @Override
@@ -196,9 +205,13 @@
     }
 
     private void fillList() {
-        String where = "numeric=\""
-            + android.os.SystemProperties.get(TelephonyProperties.PROPERTY_ICC_OPERATOR_NUMERIC, "")
-            + "\"";
+        final TelephonyManager tm = (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE);
+        final String mccmnc = mSubscriptionInfo == null ? ""
+            : tm.getSimOperator(mSubscriptionInfo.getSubscriptionId());
+        Log.d(TAG, "mccmnc = " + mccmnc);
+        final String where = "numeric=\""
+            + mccmnc
+            + "\" AND NOT (type='ia' AND (apn=\"\" OR apn IS NULL))";
 
         Cursor cursor = getContentResolver().query(Telephony.Carriers.CONTENT_URI, new String[] {
                 "_id", "name", "apn", "type"}, where, null,
@@ -276,7 +289,11 @@
     }
 
     private void addNewApn() {
-        startActivity(new Intent(Intent.ACTION_INSERT, Telephony.Carriers.CONTENT_URI));
+        Intent intent = new Intent(Intent.ACTION_INSERT, Telephony.Carriers.CONTENT_URI);
+        int subId = mSubscriptionInfo != null ? mSubscriptionInfo.getSubscriptionId()
+                : SubscriptionManager.INVALID_SUBSCRIPTION_ID;
+        intent.putExtra("sub_id", subId);
+        startActivity(intent);
     }
 
     @Override
diff --git a/src/com/android/settings/AppListPreference.java b/src/com/android/settings/AppListPreference.java
index 2180983..96897ae 100644
--- a/src/com/android/settings/AppListPreference.java
+++ b/src/com/android/settings/AppListPreference.java
@@ -67,6 +67,11 @@
         }
     }
 
+    public AppListPreference(Context context, AttributeSet attrs,
+            int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+    }
+
     public AppListPreference(Context context, AttributeSet attrs) {
         super(context, attrs);
     }
@@ -105,6 +110,8 @@
         setEntryValues(packageNames);
         if (selectedIndex != -1) {
             setValueIndex(selectedIndex);
+        } else {
+            setValue(null);
         }
     }
 
diff --git a/src/com/android/settings/AppListSwitchPreference.java b/src/com/android/settings/AppListSwitchPreference.java
new file mode 100644
index 0000000..f9f1ba0
--- /dev/null
+++ b/src/com/android/settings/AppListSwitchPreference.java
@@ -0,0 +1,59 @@
+package com.android.settings;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.View;
+import android.widget.Checkable;
+
+/**
+ * A hybrid of AppListPreference and SwitchPreference, representing a preference which can be on or
+ * off but must have a selected value when turned on.
+ *
+ * It is invalid to show this preference when zero valid apps are present.
+ */
+public class AppListSwitchPreference extends AppListPreference {
+    private static final String TAG = "AppListSwitchPref";
+
+    private Checkable mSwitch;
+
+    public AppListSwitchPreference(Context context, AttributeSet attrs) {
+        super(context, attrs, 0, R.style.AppListSwitchPreference);
+    }
+
+    @Override
+    protected void onBindView(View view) {
+        super.onBindView(view);
+        mSwitch = (Checkable) view.findViewById(com.android.internal.R.id.switchWidget);
+        mSwitch.setChecked(getValue() != null);
+    }
+
+    @Override
+    protected void showDialog(Bundle state) {
+        if (getValue() != null) {
+            // Turning off the current value.
+            if (callChangeListener(null)) {
+                setValue(null);
+            }
+        } else if (getEntryValues() == null || getEntryValues().length == 0) {
+            Log.e(TAG, "Attempting to show dialog with zero entries: " + getKey());
+        } else if (getEntryValues().length == 1) {
+            // Suppress the dialog and just toggle the preference with the only choice.
+            String value = getEntryValues()[0].toString();
+            if (callChangeListener(value)) {
+                setValue(value);
+            }
+        } else {
+            super.showDialog(state);
+        }
+    }
+
+    @Override
+    public void setValue(String value) {
+        super.setValue(value);
+        if (mSwitch != null) {
+            mSwitch.setChecked(value != null);
+        }
+    }
+}
diff --git a/src/com/android/settings/ChooseLockGeneric.java b/src/com/android/settings/ChooseLockGeneric.java
index e3a9932..b289e7a 100644
--- a/src/com/android/settings/ChooseLockGeneric.java
+++ b/src/com/android/settings/ChooseLockGeneric.java
@@ -18,21 +18,25 @@
 
 import android.accessibilityservice.AccessibilityServiceInfo;
 import android.app.Activity;
-import android.app.ActivityManagerNative;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.app.DialogFragment;
+import android.app.Fragment;
+import android.app.FragmentManager;
 import android.app.PendingIntent;
 import android.app.admin.DevicePolicyManager;
 import android.content.Context;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.UserInfo;
 import android.os.Bundle;
 import android.os.Process;
-import android.os.RemoteException;
-import android.os.UserHandle;
 import android.os.UserManager;
 import android.preference.Preference;
 import android.preference.PreferenceScreen;
 import android.security.KeyStore;
 import android.util.EventLog;
+import android.util.Log;
 import android.util.MutableBoolean;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -50,7 +54,7 @@
     @Override
     public Intent getIntent() {
         Intent modIntent = new Intent(super.getIntent());
-        modIntent.putExtra(EXTRA_SHOW_FRAGMENT, ChooseLockGenericFragment.class.getName());
+        modIntent.putExtra(EXTRA_SHOW_FRAGMENT, getFragmentClass().getName());
         return modIntent;
     }
 
@@ -60,6 +64,10 @@
         return false;
     }
 
+    /* package */ Class<? extends Fragment> getFragmentClass() {
+        return ChooseLockGenericFragment.class;
+    }
+
     public static class InternalActivity extends ChooseLockGeneric {
     }
 
@@ -79,9 +87,11 @@
 
         private static final String WAITING_FOR_CONFIRMATION = "waiting_for_confirmation";
         private static final String FINISH_PENDING = "finish_pending";
+        private static final String TAG = "ChooseLockGenericFragment";
         public static final String MINIMUM_QUALITY_KEY = "minimum_quality";
         public static final String ENCRYPT_REQUESTED_QUALITY = "encrypt_requested_quality";
         public static final String ENCRYPT_REQUESTED_DISABLED = "encrypt_requested_disabled";
+        public static final String TAG_FRP_WARNING_DIALOG = "frp_warning_dialog";
 
         private static final boolean ALWAY_SHOW_TUTORIAL = true;
 
@@ -148,32 +158,15 @@
         public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen,
                 Preference preference) {
             final String key = preference.getKey();
-            boolean handled = true;
 
-            EventLog.writeEvent(EventLogTags.LOCK_SCREEN_TYPE, key);
-
-            if (KEY_UNLOCK_SET_OFF.equals(key)) {
-                updateUnlockMethodAndFinish(
-                        DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED, true);
-            } else if (KEY_UNLOCK_SET_NONE.equals(key)) {
-                updateUnlockMethodAndFinish(
-                        DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED, false);
-            } else if (KEY_UNLOCK_SET_BIOMETRIC_WEAK.equals(key)) {
-                maybeEnableEncryption(
-                        DevicePolicyManager.PASSWORD_QUALITY_BIOMETRIC_WEAK, false);
-            }else if (KEY_UNLOCK_SET_PATTERN.equals(key)) {
-                maybeEnableEncryption(
-                        DevicePolicyManager.PASSWORD_QUALITY_SOMETHING, false);
-            } else if (KEY_UNLOCK_SET_PIN.equals(key)) {
-                maybeEnableEncryption(
-                        DevicePolicyManager.PASSWORD_QUALITY_NUMERIC, false);
-            } else if (KEY_UNLOCK_SET_PASSWORD.equals(key)) {
-                maybeEnableEncryption(
-                        DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC, false);
+            if (!isUnlockMethodSecure(key) && mLockPatternUtils.isSecure()) {
+                // Show the disabling FRP warning only when the user is switching from a secure
+                // unlock method to an insecure one
+                showFactoryResetProtectionWarningDialog(key);
+                return true;
             } else {
-                handled = false;
+                return setUnlockMethod(key);
             }
-            return handled;
         }
 
         /**
@@ -187,13 +180,13 @@
             if (Process.myUserHandle().isOwner() && LockPatternUtils.isDeviceEncryptionEnabled()) {
                 mEncryptionRequestQuality = quality;
                 mEncryptionRequestDisabled = disabled;
+                final Context context = getActivity();
                 // If accessibility is enabled and the user hasn't seen this dialog before, set the
                 // default state to agree with that which is compatible with accessibility
                 // (password not required).
-                final boolean accEn = AccessibilityManager.getInstance(getActivity()).isEnabled();
+                final boolean accEn = AccessibilityManager.getInstance(context).isEnabled();
                 final boolean required = mLockPatternUtils.isCredentialRequiredToDecrypt(!accEn);
-                Intent intent = EncryptionInterstitial.createStartIntent(
-                        getActivity(), quality, required);
+                Intent intent = getEncryptionInterstitialIntent(context, quality, required);
                 startActivityForResult(intent, ENABLE_ENCRYPTION_REQUEST);
             } else {
                 mRequirePassword = false; // device encryption not enabled or not device owner.
@@ -295,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();
 
@@ -333,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) {
@@ -399,6 +411,24 @@
             return intent;
         }
 
+        protected Intent getLockPasswordIntent(Context context, int quality,
+                final boolean isFallback, int minLength, final int maxLength,
+                boolean requirePasswordToDecrypt, boolean confirmCredentials) {
+            return ChooseLockPassword.createIntent(context, quality, isFallback, minLength,
+                    maxLength, requirePasswordToDecrypt, confirmCredentials);
+        }
+
+        protected Intent getLockPatternIntent(Context context, final boolean isFallback,
+                final boolean requirePassword, final boolean confirmCredentials) {
+            return ChooseLockPattern.createIntent(context, isFallback, requirePassword,
+                    confirmCredentials);
+        }
+
+        protected Intent getEncryptionInterstitialIntent(Context context, int quality,
+                boolean required) {
+            return EncryptionInterstitial.createStartIntent(context, quality, required);
+        }
+
         /**
          * Invokes an activity to change the user's pattern, password or PIN based on given quality
          * and minimum quality specified by DevicePolicyManager. If quality is
@@ -419,14 +449,15 @@
 
             quality = upgradeQuality(quality, null);
 
+            final Context context = getActivity();
             if (quality >= DevicePolicyManager.PASSWORD_QUALITY_NUMERIC) {
                 int minLength = mDPM.getPasswordMinimumLength(null);
                 if (minLength < MIN_PASSWORD_LENGTH) {
                     minLength = MIN_PASSWORD_LENGTH;
                 }
                 final int maxLength = mDPM.getPasswordMaximumLength(quality);
-                Intent intent = ChooseLockPassword.createIntent(getActivity(), quality, isFallback,
-                        minLength, maxLength, mRequirePassword, false /* confirm credentials */);
+                Intent intent = getLockPasswordIntent(context, quality, isFallback, minLength,
+                        maxLength, mRequirePassword,  /* confirm credentials */false);
                 if (isFallback) {
                     startActivityForResult(intent, FALLBACK_REQUEST);
                     return;
@@ -436,8 +467,8 @@
                     startActivity(intent);
                 }
             } else if (quality == DevicePolicyManager.PASSWORD_QUALITY_SOMETHING) {
-                Intent intent = ChooseLockPattern.createIntent(getActivity(),
-                        isFallback, mRequirePassword, false /* confirm credentials */);
+                Intent intent = getLockPatternIntent(context, isFallback, mRequirePassword,
+                        /* confirm credentials */false);
                 if (isFallback) {
                     startActivityForResult(intent, FALLBACK_REQUEST);
                     return;
@@ -465,5 +496,113 @@
             return R.string.help_url_choose_lockscreen;
         }
 
+        private int getResIdForFactoryResetProtectionWarningTitle() {
+            switch (mLockPatternUtils.getKeyguardStoredPasswordQuality()) {
+                case DevicePolicyManager.PASSWORD_QUALITY_SOMETHING:
+                    return R.string.unlock_disable_lock_pattern_summary;
+                case DevicePolicyManager.PASSWORD_QUALITY_NUMERIC:
+                case DevicePolicyManager.PASSWORD_QUALITY_NUMERIC_COMPLEX:
+                    return R.string.unlock_disable_lock_pin_summary;
+                case DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC:
+                case DevicePolicyManager.PASSWORD_QUALITY_ALPHANUMERIC:
+                case DevicePolicyManager.PASSWORD_QUALITY_COMPLEX:
+                    return R.string.unlock_disable_lock_password_summary;
+                default:
+                    return R.string.unlock_disable_lock_unknown_summary;
+            }
+        }
+
+        private boolean isUnlockMethodSecure(String unlockMethod) {
+            return !(KEY_UNLOCK_SET_OFF.equals(unlockMethod) ||
+                    KEY_UNLOCK_SET_NONE.equals(unlockMethod));
+        }
+
+        private boolean setUnlockMethod(String unlockMethod) {
+            EventLog.writeEvent(EventLogTags.LOCK_SCREEN_TYPE, unlockMethod);
+
+            if (KEY_UNLOCK_SET_OFF.equals(unlockMethod)) {
+                updateUnlockMethodAndFinish(
+                        DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED, true /* disabled */ );
+            } else if (KEY_UNLOCK_SET_NONE.equals(unlockMethod)) {
+                updateUnlockMethodAndFinish(
+                        DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED, false /* disabled */ );
+            } else if (KEY_UNLOCK_SET_BIOMETRIC_WEAK.equals(unlockMethod)) {
+                maybeEnableEncryption(
+                        DevicePolicyManager.PASSWORD_QUALITY_BIOMETRIC_WEAK, false);
+            } else if (KEY_UNLOCK_SET_PATTERN.equals(unlockMethod)) {
+                maybeEnableEncryption(
+                        DevicePolicyManager.PASSWORD_QUALITY_SOMETHING, false);
+            } else if (KEY_UNLOCK_SET_PIN.equals(unlockMethod)) {
+                maybeEnableEncryption(
+                        DevicePolicyManager.PASSWORD_QUALITY_NUMERIC, false);
+            } else if (KEY_UNLOCK_SET_PASSWORD.equals(unlockMethod)) {
+                maybeEnableEncryption(
+                        DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC, false);
+            } else {
+                Log.e(TAG, "Encountered unknown unlock method to set: " + unlockMethod);
+                return false;
+            }
+            return true;
+        }
+
+        private void showFactoryResetProtectionWarningDialog(String unlockMethodToSet) {
+            int title = getResIdForFactoryResetProtectionWarningTitle();
+            FactoryResetProtectionWarningDialog dialog =
+                    FactoryResetProtectionWarningDialog.newInstance(title, unlockMethodToSet);
+            dialog.show(getChildFragmentManager(), TAG_FRP_WARNING_DIALOG);
+        }
+
+        public static class FactoryResetProtectionWarningDialog extends DialogFragment {
+
+            private static final String ARG_TITLE_RES = "titleRes";
+            private static final String ARG_UNLOCK_METHOD_TO_SET = "unlockMethodToSet";
+
+            public static FactoryResetProtectionWarningDialog newInstance(int title,
+                    String unlockMethodToSet) {
+                FactoryResetProtectionWarningDialog frag =
+                        new FactoryResetProtectionWarningDialog();
+                Bundle args = new Bundle();
+                args.putInt(ARG_TITLE_RES, title);
+                args.putString(ARG_UNLOCK_METHOD_TO_SET, unlockMethodToSet);
+                frag.setArguments(args);
+                return frag;
+            }
+
+            @Override
+            public void show(FragmentManager manager, String tag) {
+                if (manager.findFragmentByTag(tag) == null) {
+                    // Prevent opening multiple dialogs if tapped on button quickly
+                    super.show(manager, tag);
+                }
+            }
+
+            @Override
+            public Dialog onCreateDialog(Bundle savedInstanceState) {
+                final Bundle args = getArguments();
+
+                return new AlertDialog.Builder(getActivity())
+                        .setTitle(args.getInt(ARG_TITLE_RES))
+                        .setMessage(R.string.unlock_disable_frp_warning_content)
+                        .setPositiveButton(R.string.okay,
+                                new DialogInterface.OnClickListener() {
+                                    @Override
+                                    public void onClick(DialogInterface dialog, int whichButton) {
+                                        ((ChooseLockGenericFragment) getParentFragment())
+                                                .setUnlockMethod(
+                                                        args.getString(ARG_UNLOCK_METHOD_TO_SET));
+                                    }
+                                }
+                        )
+                        .setNegativeButton(R.string.cancel,
+                                new DialogInterface.OnClickListener() {
+                                    @Override
+                                    public void onClick(DialogInterface dialog, int whichButton) {
+                                        dismiss();
+                                    }
+                                }
+                        )
+                        .create();
+            }
+        }
     }
 }
diff --git a/src/com/android/settings/ChooseLockPassword.java b/src/com/android/settings/ChooseLockPassword.java
index b72d5c5..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;
@@ -61,7 +59,7 @@
     @Override
     public Intent getIntent() {
         Intent modIntent = new Intent(super.getIntent());
-        modIntent.putExtra(EXTRA_SHOW_FRAGMENT, ChooseLockPasswordFragment.class.getName());
+        modIntent.putExtra(EXTRA_SHOW_FRAGMENT, getFragmentClass().getName());
         return modIntent;
     }
 
@@ -84,6 +82,10 @@
         return false;
     }
 
+    /* package */ Class<? extends Fragment> getFragmentClass() {
+        return ChooseLockPasswordFragment.class;
+    }
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         // TODO: Fix on phones
@@ -200,8 +202,12 @@
         @Override
         public View onCreateView(LayoutInflater inflater, ViewGroup container,
                 Bundle savedInstanceState) {
+            return inflater.inflate(R.layout.choose_lock_password, container, false);
+        }
 
-            View view = inflater.inflate(R.layout.choose_lock_password, null);
+        @Override
+        public void onViewCreated(View view, Bundle savedInstanceState) {
+            super.onViewCreated(view, savedInstanceState);
 
             mCancelButton = (Button) view.findViewById(R.id.cancel_button);
             mCancelButton.setOnClickListener(this);
@@ -254,8 +260,6 @@
                 CharSequence title = getText(id);
                 sa.setTitle(title);
             }
-
-            return view;
         }
 
         @Override
@@ -293,6 +297,10 @@
             }
         }
 
+        protected Intent getRedactionInterstitialIntent(Context context) {
+            return RedactionInterstitial.createStartIntent(context);
+        }
+
         protected void updateStage(Stage stage) {
             final Stage previousStage = mUiStage;
             mUiStage = stage;
@@ -406,7 +414,7 @@
             return null;
         }
 
-        private void handleNext() {
+        public void handleNext() {
             if (mDone) return;
 
             final String pin = mPasswordEntry.getText().toString();
@@ -425,6 +433,7 @@
                 if (mFirstPin.equals(pin)) {
                     final boolean isFallback = getActivity().getIntent().getBooleanExtra(
                             LockPatternUtils.LOCKSCREEN_BIOMETRIC_WEAK_FALLBACK, false);
+                    boolean wasSecureBefore = mLockPatternUtils.isSecure();
                     mLockPatternUtils.clearLock(isFallback);
                     final boolean required = getActivity().getIntent().getBooleanExtra(
                             EncryptionInterstitial.EXTRA_REQUIRE_PASSWORD, true);
@@ -433,7 +442,9 @@
                     getActivity().setResult(RESULT_FINISHED);
                     getActivity().finish();
                     mDone = true;
-                    startActivity(RedactionInterstitial.createStartIntent(getActivity()));
+                    if (!wasSecureBefore) {
+                        startActivity(getRedactionInterstitialIntent(getActivity()));
+                    }
                 } else {
                     CharSequence tmp = mPasswordEntry.getText();
                     if (tmp != null) {
@@ -447,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:
@@ -489,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 3d3ef16..38f908e 100644
--- a/src/com/android/settings/ChooseLockPattern.java
+++ b/src/com/android/settings/ChooseLockPattern.java
@@ -65,7 +65,7 @@
     @Override
     public Intent getIntent() {
         Intent modIntent = new Intent(super.getIntent());
-        modIntent.putExtra(EXTRA_SHOW_FRAGMENT, ChooseLockPatternFragment.class.getName());
+        modIntent.putExtra(EXTRA_SHOW_FRAGMENT, getFragmentClass().getName());
         return modIntent;
     }
 
@@ -85,6 +85,10 @@
         return false;
     }
 
+    /* package */ Class<? extends Fragment> getFragmentClass() {
+        return ChooseLockPatternFragment.class;
+    }
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         // requestWindowFeature(Window.FEATURE_NO_TITLE);
@@ -146,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.
@@ -327,9 +339,12 @@
         @Override
         public View onCreateView(LayoutInflater inflater, ViewGroup container,
                 Bundle savedInstanceState) {
+            return inflater.inflate(R.layout.choose_lock_pattern, container, false);
+        }
 
-            // setupViews()
-            View view = inflater.inflate(R.layout.choose_lock_pattern, null);
+        @Override
+        public void onViewCreated(View view, Bundle savedInstanceState) {
+            super.onViewCreated(view, savedInstanceState);
             mHeaderText = (TextView) view.findViewById(R.id.headerText);
             mLockPatternView = (LockPatternView) view.findViewById(R.id.lockPattern);
             mLockPatternView.setOnPatternListener(mChooseNewLockPatternListener);
@@ -377,46 +392,57 @@
                 updateStage(Stage.values()[savedInstanceState.getInt(KEY_UI_STAGE)]);
             }
             mDone = false;
-            return view;
+        }
+
+        protected Intent getRedactionInterstitialIntent(Context context) {
+            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();
             }
         }
 
@@ -479,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) {
@@ -540,20 +566,24 @@
             final boolean isFallback = getActivity().getIntent()
                 .getBooleanExtra(LockPatternUtils.LOCKSCREEN_BIOMETRIC_WEAK_FALLBACK, false);
 
+            boolean wasSecureBefore = utils.isSecure();
+
             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);
             }
 
+            if (!wasSecureBefore) {
+                startActivity(getRedactionInterstitialIntent(getActivity()));
+            }
             getActivity().setResult(RESULT_FINISHED);
             getActivity().finish();
             mDone = true;
-            startActivity(RedactionInterstitial.createStartIntent(getActivity()));
         }
     }
 }
diff --git a/src/com/android/settings/CredentialStorage.java b/src/com/android/settings/CredentialStorage.java
index 57b5384..40bed90 100644
--- a/src/com/android/settings/CredentialStorage.java
+++ b/src/com/android/settings/CredentialStorage.java
@@ -22,11 +22,13 @@
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.pm.UserInfo;
 import android.content.res.Resources;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.RemoteException;
 import android.os.Process;
+import android.os.UserHandle;
 import android.os.UserManager;
 import android.security.Credentials;
 import android.security.KeyChain.KeyChainConnection;
@@ -126,8 +128,7 @@
             if (ACTION_RESET.equals(action)) {
                 new ResetDialog();
             } else {
-                if (ACTION_INSTALL.equals(action)
-                        && "com.android.certinstaller".equals(getCallingPackage())) {
+                if (ACTION_INSTALL.equals(action) && checkCallerIsCertInstallerOrSelfInProfile()) {
                     mInstallBundle = intent.getExtras();
                 }
                 // ACTION_UNLOCK also handled here in addition to ACTION_INSTALL
@@ -215,54 +216,74 @@
      * Install credentials if available, otherwise do nothing.
      */
     private void installIfAvailable() {
-        if (mInstallBundle != null && !mInstallBundle.isEmpty()) {
-            Bundle bundle = mInstallBundle;
-            mInstallBundle = null;
-
-            final int uid = bundle.getInt(Credentials.EXTRA_INSTALL_AS_UID, -1);
-
-            if (bundle.containsKey(Credentials.EXTRA_USER_PRIVATE_KEY_NAME)) {
-                String key = bundle.getString(Credentials.EXTRA_USER_PRIVATE_KEY_NAME);
-                byte[] value = bundle.getByteArray(Credentials.EXTRA_USER_PRIVATE_KEY_DATA);
-
-                int flags = KeyStore.FLAG_ENCRYPTED;
-                if (uid == Process.WIFI_UID && isHardwareBackedKey(value)) {
-                    // Hardware backed keystore is secure enough to allow for WIFI stack
-                    // to enable access to secure networks without user intervention
-                    Log.d(TAG, "Saving private key with FLAG_NONE for WIFI_UID");
-                    flags = KeyStore.FLAG_NONE;
-                }
-
-                if (!mKeyStore.importKey(key, value, uid, flags)) {
-                    Log.e(TAG, "Failed to install " + key + " as user " + uid);
-                    return;
-                }
-            }
-
-            int flags = (uid == Process.WIFI_UID) ? KeyStore.FLAG_NONE : KeyStore.FLAG_ENCRYPTED;
-
-            if (bundle.containsKey(Credentials.EXTRA_USER_CERTIFICATE_NAME)) {
-                String certName = bundle.getString(Credentials.EXTRA_USER_CERTIFICATE_NAME);
-                byte[] certData = bundle.getByteArray(Credentials.EXTRA_USER_CERTIFICATE_DATA);
-
-                if (!mKeyStore.put(certName, certData, uid, flags)) {
-                    Log.e(TAG, "Failed to install " + certName + " as user " + uid);
-                    return;
-                }
-            }
-
-            if (bundle.containsKey(Credentials.EXTRA_CA_CERTIFICATES_NAME)) {
-                String caListName = bundle.getString(Credentials.EXTRA_CA_CERTIFICATES_NAME);
-                byte[] caListData = bundle.getByteArray(Credentials.EXTRA_CA_CERTIFICATES_DATA);
-
-                if (!mKeyStore.put(caListName, caListData, uid, flags)) {
-                    Log.e(TAG, "Failed to install " + caListName + " as user " + uid);
-                    return;
-                }
-            }
-
-            setResult(RESULT_OK);
+        if (mInstallBundle == null || mInstallBundle.isEmpty()) {
+            return;
         }
+
+        Bundle bundle = mInstallBundle;
+        mInstallBundle = null;
+
+        final int uid = bundle.getInt(Credentials.EXTRA_INSTALL_AS_UID, -1);
+
+        if (!UserHandle.isSameUser(uid, Process.myUid())) {
+            int dstUserId = UserHandle.getUserId(uid);
+            int myUserId = UserHandle.myUserId();
+
+            // Restrict install target to the wifi uid.
+            if (uid != Process.WIFI_UID) {
+                Log.e(TAG, "Failed to install credentials as uid " + uid + ": cross-user installs"
+                        + " may only target wifi uids");
+                return;
+            }
+
+            Intent installIntent = new Intent(ACTION_INSTALL)
+                    .setFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT)
+                    .putExtras(bundle);
+            startActivityAsUser(installIntent, new UserHandle(dstUserId));
+            return;
+        }
+
+        if (bundle.containsKey(Credentials.EXTRA_USER_PRIVATE_KEY_NAME)) {
+            String key = bundle.getString(Credentials.EXTRA_USER_PRIVATE_KEY_NAME);
+            byte[] value = bundle.getByteArray(Credentials.EXTRA_USER_PRIVATE_KEY_DATA);
+
+            int flags = KeyStore.FLAG_ENCRYPTED;
+            if (uid == Process.WIFI_UID && isHardwareBackedKey(value)) {
+                // Hardware backed keystore is secure enough to allow for WIFI stack
+                // to enable access to secure networks without user intervention
+                Log.d(TAG, "Saving private key with FLAG_NONE for WIFI_UID");
+                flags = KeyStore.FLAG_NONE;
+            }
+
+            if (!mKeyStore.importKey(key, value, uid, flags)) {
+                Log.e(TAG, "Failed to install " + key + " as uid " + uid);
+                return;
+            }
+        }
+
+        int flags = (uid == Process.WIFI_UID) ? KeyStore.FLAG_NONE : KeyStore.FLAG_ENCRYPTED;
+
+        if (bundle.containsKey(Credentials.EXTRA_USER_CERTIFICATE_NAME)) {
+            String certName = bundle.getString(Credentials.EXTRA_USER_CERTIFICATE_NAME);
+            byte[] certData = bundle.getByteArray(Credentials.EXTRA_USER_CERTIFICATE_DATA);
+
+            if (!mKeyStore.put(certName, certData, uid, flags)) {
+                Log.e(TAG, "Failed to install " + certName + " as uid " + uid);
+                return;
+            }
+        }
+
+        if (bundle.containsKey(Credentials.EXTRA_CA_CERTIFICATES_NAME)) {
+            String caListName = bundle.getString(Credentials.EXTRA_CA_CERTIFICATES_NAME);
+            byte[] caListData = bundle.getByteArray(Credentials.EXTRA_CA_CERTIFICATES_DATA);
+
+            if (!mKeyStore.put(caListName, caListData, uid, flags)) {
+                Log.e(TAG, "Failed to install " + caListName + " as uid " + uid);
+                return;
+            }
+        }
+
+        setResult(RESULT_OK);
     }
 
     /**
@@ -371,13 +392,48 @@
     }
 
     /**
+     * Check that the caller is either certinstaller or Settings running in a profile of this user.
+     */
+    private boolean checkCallerIsCertInstallerOrSelfInProfile() {
+        if (TextUtils.equals("com.android.certinstaller", getCallingPackage())) {
+            // CertInstaller is allowed to install credentials
+            return true;
+        }
+
+        final int launchedFromUserId;
+        try {
+            int launchedFromUid = android.app.ActivityManagerNative.getDefault()
+                    .getLaunchedFromUid(getActivityToken());
+            if (launchedFromUid == -1) {
+                Log.e(TAG, ACTION_INSTALL + " must be started with startActivityForResult");
+                return false;
+            }
+            if (!UserHandle.isSameApp(launchedFromUid, Process.myUid())) {
+                // Not the same app
+                return false;
+            }
+            launchedFromUserId = UserHandle.getUserId(launchedFromUid);
+        } catch (RemoteException re) {
+            // Error talking to ActivityManager, just give up
+            return false;
+        }
+
+        UserManager userManager = (UserManager) getSystemService(Context.USER_SERVICE);
+        UserInfo parentInfo = userManager.getProfileParent(launchedFromUserId);
+        if (parentInfo == null || parentInfo.id != UserHandle.myUserId()) {
+            // Caller is not running in a profile of this user
+            return false;
+        }
+        return true;
+    }
+
+    /**
      * Confirm existing key guard, returning password via onActivityResult.
      */
     private boolean confirmKeyGuard() {
         Resources res = getResources();
         boolean launched = new ChooseLockSettingsHelper(this)
-                .launchConfirmationActivity(CONFIRM_KEY_GUARD_REQUEST,
-                                            res.getText(R.string.credentials_install_gesture_prompt),
+                .launchConfirmationActivity(CONFIRM_KEY_GUARD_REQUEST, null,
                                             res.getText(R.string.credentials_install_gesture_explanation),
                                             true);
         return launched;
diff --git a/src/com/android/settings/CryptKeeper.java b/src/com/android/settings/CryptKeeper.java
index 2242fad..f08ed5a 100644
--- a/src/com/android/settings/CryptKeeper.java
+++ b/src/com/android/settings/CryptKeeper.java
@@ -61,8 +61,6 @@
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
-import com.android.internal.statusbar.StatusBarIcon;
-import com.android.internal.telephony.Phone;
 import com.android.internal.telephony.PhoneConstants;
 import com.android.internal.widget.LockPatternUtils;
 import com.android.internal.widget.LockPatternView;
@@ -90,17 +88,15 @@
     private static final String TAG = "CryptKeeper";
 
     private static final String DECRYPT_STATE = "trigger_restart_framework";
+
     /** Message sent to us to indicate encryption update progress. */
     private static final int MESSAGE_UPDATE_PROGRESS = 1;
-    /** Message sent to us to cool-down (waste user's time between password attempts) */
-    private static final int MESSAGE_COOLDOWN = 2;
     /** Message sent to us to indicate alerting the user that we are waiting for password entry */
-    private static final int MESSAGE_NOTIFY = 3;
+    private static final int MESSAGE_NOTIFY = 2;
 
     // Constants used to control policy.
     private static final int MAX_FAILED_ATTEMPTS = 30;
     private static final int COOL_DOWN_ATTEMPTS = 10;
-    private static final int COOL_DOWN_INTERVAL = 30; // 30 seconds
 
     // Intent action for launching the Emergency Dialer activity.
     static final String ACTION_EMERGENCY_DIAL = "com.android.phone.EmergencyDialer.DIAL";
@@ -121,7 +117,10 @@
     private boolean mCorrupt;
     /** A flag to indicate when the back event should be ignored */
     private boolean mIgnoreBack = false;
-    private int mCooldown;
+    /** When set, blocks unlocking. Set every COOL_DOWN_ATTEMPTS attempts, only cleared
+        by power cycling phone. */
+    private boolean mCooldown = false;
+
     PowerManager.WakeLock mWakeLock;
     private EditText mPasswordEntry;
     private LockPatternView mLockPatternView;
@@ -140,6 +139,7 @@
     // When the user enters a short pin/password, run this to show an error,
     // but don't count it against attempts.
     private final Runnable mFakeUnlockAttemptRunnable = new Runnable() {
+        @Override
         public void run() {
             handleBadAttempt(1 /* failedAttempt */);
         }
@@ -148,7 +148,8 @@
     // TODO: this should be tuned to match minimum decryption timeout
     private static final int FAKE_ATTEMPT_DELAY = 1000;
 
-    private Runnable mClearPatternRunnable = new Runnable() {
+    private final Runnable mClearPatternRunnable = new Runnable() {
+        @Override
         public void run() {
             mLockPatternView.clearPattern();
         }
@@ -174,6 +175,12 @@
         }
 
         @Override
+        protected void onPreExecute() {
+            super.onPreExecute();
+            beginAttempt();
+        }
+
+        @Override
         protected Integer doInBackground(String... params) {
             final IMountService service = getMountService();
             try {
@@ -193,10 +200,11 @@
                     mLockPatternView.removeCallbacks(mClearPatternRunnable);
                     mLockPatternView.postDelayed(mClearPatternRunnable, RIGHT_PATTERN_CLEAR_TIMEOUT_MS);
                 }
+                final TextView status = (TextView) findViewById(R.id.status);
+                status.setText(R.string.starting_android);
                 hide(R.id.passwordEntry);
                 hide(R.id.switch_ime_button);
                 hide(R.id.lockPattern);
-                hide(R.id.status);
                 hide(R.id.owner_info);
                 hide(R.id.emergencyCallButton);
             } else if (failedAttempts == MAX_FAILED_ATTEMPTS) {
@@ -216,6 +224,11 @@
         }
     }
 
+    private void beginAttempt() {
+        final TextView status = (TextView) findViewById(R.id.status);
+        status.setText(R.string.checking_decryption);
+    }
+
     private void handleBadAttempt(Integer failedAttempts) {
         // Wrong entry. Handle pattern case.
         if (mLockPatternView != null) {
@@ -224,7 +237,9 @@
             mLockPatternView.postDelayed(mClearPatternRunnable, WRONG_PATTERN_CLEAR_TIMEOUT_MS);
         }
         if ((failedAttempts % COOL_DOWN_ATTEMPTS) == 0) {
-            mCooldown = COOL_DOWN_INTERVAL;
+            mCooldown = true;
+            // No need to setBackFunctionality(false) - it's already done
+            // at this point.
             cooldown();
         } else {
             final TextView status = (TextView) findViewById(R.id.status);
@@ -236,12 +251,28 @@
                         Integer.toString(remainingAttempts));
                 status.setText(warning);
             } else {
-                status.setText(R.string.try_again);
+                int passwordType = StorageManager.CRYPT_TYPE_PASSWORD;
+                try {
+                    final IMountService service = getMountService();
+                    passwordType = service.getPasswordType();
+                } catch (Exception e) {
+                    Log.e(TAG, "Error calling mount service " + e);
+                }
+
+                if (passwordType == StorageManager.CRYPT_TYPE_PIN) {
+                    status.setText(R.string.cryptkeeper_wrong_pin);
+                } else if (passwordType == StorageManager.CRYPT_TYPE_PATTERN) {
+                    status.setText(R.string.cryptkeeper_wrong_pattern);
+                } else {
+                    status.setText(R.string.cryptkeeper_wrong_password);
+                }
             }
 
             if (mLockPatternView != null) {
                 mLockPatternView.setDisplayMode(DisplayMode.Wrong);
+                mLockPatternView.setEnabled(true);
             }
+
             // Reenable the password entry
             if (mPasswordEntry != null) {
                 mPasswordEntry.setEnabled(true);
@@ -250,9 +281,6 @@
                 imm.showSoftInput(mPasswordEntry, 0);
                 setBackFunctionality(true);
             }
-            if (mLockPatternView != null) {
-                mLockPatternView.setEnabled(true);
-            }
         }
     }
 
@@ -298,10 +326,6 @@
                 updateProgress();
                 break;
 
-            case MESSAGE_COOLDOWN:
-                cooldown();
-                break;
-
             case MESSAGE_NOTIFY:
                 notifyUser();
                 break;
@@ -451,7 +475,7 @@
             encryptionProgressInit();
         } else if (mValidationComplete || isDebugView(FORCE_VIEW_PASSWORD)) {
             new AsyncTask<Void, Void, Void>() {
-                int type = StorageManager.CRYPT_TYPE_PASSWORD;
+                int passwordType = StorageManager.CRYPT_TYPE_PASSWORD;
                 String owner_info;
                 boolean pattern_visible;
 
@@ -459,9 +483,9 @@
                 public Void doInBackground(Void... v) {
                     try {
                         final IMountService service = getMountService();
-                        type = service.getPasswordType();
-                        owner_info = service.getField("OwnerInfo");
-                        pattern_visible = !("0".equals(service.getField("PatternVisible")));
+                        passwordType = service.getPasswordType();
+                        owner_info = service.getField(StorageManager.OWNER_INFO_KEY);
+                        pattern_visible = !("0".equals(service.getField(StorageManager.PATTERN_VISIBLE_KEY)));
                     } catch (Exception e) {
                         Log.e(TAG, "Error calling mount service " + e);
                     }
@@ -471,10 +495,10 @@
 
                 @Override
                 public void onPostExecute(java.lang.Void v) {
-                    if(type == StorageManager.CRYPT_TYPE_PIN) {
+                    if (passwordType == StorageManager.CRYPT_TYPE_PIN) {
                         setContentView(R.layout.crypt_keeper_pin_entry);
                         mStatusString = R.string.enter_pin;
-                    } else if (type == StorageManager.CRYPT_TYPE_PATTERN) {
+                    } else if (passwordType == StorageManager.CRYPT_TYPE_PATTERN) {
                         setContentView(R.layout.crypt_keeper_pattern_entry);
                         setBackFunctionality(false);
                         mStatusString = R.string.enter_pattern;
@@ -494,11 +518,12 @@
                     if (mLockPatternView != null) {
                         mLockPatternView.setInStealthMode(!pattern_visible);
                     }
-
-                    if (mCooldown > 0) {
+                    if (mCooldown) {
+                        // in case we are cooling down and coming back from emergency dialler
                         setBackFunctionality(false);
-                        cooldown(); // in case we are cooling down and coming back from emergency dialler
+                        cooldown();
                     }
+
                 }
             }.execute();
         } else if (!mValidationRequested) {
@@ -511,7 +536,6 @@
     @Override
     public void onStop() {
         super.onStop();
-        mHandler.removeMessages(MESSAGE_COOLDOWN);
         mHandler.removeMessages(MESSAGE_UPDATE_PROGRESS);
         mHandler.removeMessages(MESSAGE_NOTIFY);
     }
@@ -648,39 +672,20 @@
         mHandler.sendEmptyMessageDelayed(MESSAGE_UPDATE_PROGRESS, 1000);
     }
 
-    /** Disable password input for a while to force the user to waste time between retries */
+    /** Insist on a power cycle to force the user to waste time between retries.
+     *
+     * Call setBackFunctionality(false) before calling this. */
     private void cooldown() {
-        final TextView status = (TextView) findViewById(R.id.status);
-
-        if (mCooldown <= 0) {
-            // Re-enable the password entry and back presses.
-            if (mPasswordEntry != null) {
-                mPasswordEntry.setEnabled(true);
-                final InputMethodManager imm = (InputMethodManager) getSystemService(
-                                          Context.INPUT_METHOD_SERVICE);
-                imm.showSoftInput(mPasswordEntry, 0);
-                setBackFunctionality(true);
-            }
-            if (mLockPatternView != null) {
-                mLockPatternView.setEnabled(true);
-            }
-            status.setText(mStatusString);
-        } else {
-            // Disable the password entry and back presses.
-            if (mPasswordEntry != null) {
-                mPasswordEntry.setEnabled(false);
-            }
-            if (mLockPatternView != null) {
-                mLockPatternView.setEnabled(false);
-            }
-
-            CharSequence template = getText(R.string.crypt_keeper_cooldown);
-            status.setText(TextUtils.expandTemplate(template, Integer.toString(mCooldown)));
-
-            mCooldown--;
-            mHandler.removeMessages(MESSAGE_COOLDOWN);
-            mHandler.sendEmptyMessageDelayed(MESSAGE_COOLDOWN, 1000); // Tick every second
+        // Disable the password entry.
+        if (mPasswordEntry != null) {
+            mPasswordEntry.setEnabled(false);
         }
+        if (mLockPatternView != null) {
+            mLockPatternView.setEnabled(false);
+        }
+
+        final TextView status = (TextView) findViewById(R.id.status);
+        status.setText(R.string.crypt_keeper_force_power_cycle);
     }
 
     /**
@@ -697,6 +702,7 @@
     }
 
     private void fakeUnlockAttempt(View postingView) {
+        beginAttempt();
         postingView.postDelayed(mFakeUnlockAttemptRunnable, FAKE_ATTEMPT_DELAY);
     }
 
@@ -785,7 +791,7 @@
 
         // Asynchronously throw up the IME, since there are issues with requesting it to be shown
         // immediately.
-        if (mLockPatternView == null && mCooldown <= 0) {
+        if (mLockPatternView == null && !mCooldown) {
             mHandler.postDelayed(new Runnable() {
                 @Override public void run() {
                     imm.showSoftInputUnchecked(0, null);
@@ -878,7 +884,6 @@
             setBackFunctionality(false);
 
             if (password.length() >= LockPatternUtils.MIN_LOCK_PATTERN_SIZE) {
-                Log.d(TAG, "Attempting to send command to decrypt");
                 new DecryptTask().execute(password);
             } else {
                 // Allow user to make as many of these as they want.
diff --git a/src/com/android/settings/CryptKeeperSettings.java b/src/com/android/settings/CryptKeeperSettings.java
index c572738..d962446 100644
--- a/src/com/android/settings/CryptKeeperSettings.java
+++ b/src/com/android/settings/CryptKeeperSettings.java
@@ -16,8 +16,6 @@
 
 package com.android.settings;
 
-import com.android.internal.widget.LockPatternUtils;
-
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Fragment;
@@ -81,7 +79,7 @@
      * is no keyguard available, we prompt the user to set a password.
      */
     private Button.OnClickListener mInitiateListener = new Button.OnClickListener() {
-
+        @Override
         public void onClick(View v) {
             if (!runKeyguardConfirmation(KEYGUARD_REQUEST)) {
                 // TODO replace (or follow) this dialog with an explicit launch into password UI
@@ -162,8 +160,7 @@
             return true;
         }
 
-        return helper.launchConfirmationActivity(request,
-                res.getText(R.string.master_clear_gesture_prompt),
+        return helper.launchConfirmationActivity(request, null,
                 res.getText(R.string.crypt_keeper_confirm_encrypt),
                 true);
     }
diff --git a/src/com/android/settings/DataUsageSummary.java b/src/com/android/settings/DataUsageSummary.java
index e9aaf0f..ce68e3d 100644
--- a/src/com/android/settings/DataUsageSummary.java
+++ b/src/com/android/settings/DataUsageSummary.java
@@ -62,6 +62,7 @@
 import android.content.Loader;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
+import android.content.pm.UserInfo;
 import android.content.res.Resources;
 import android.content.res.TypedArray;
 import android.graphics.Color;
@@ -88,7 +89,7 @@
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.preference.Preference;
-import android.telephony.SubInfoRecord;
+import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
 import android.text.TextUtils;
@@ -140,6 +141,8 @@
 import com.android.settings.sim.SimSettings;
 import com.android.settings.widget.ChartDataUsageView;
 import com.android.settings.widget.ChartDataUsageView.DataUsageChartListener;
+import com.android.settings.widget.ChartNetworkSeriesView;
+
 import com.google.android.collect.Lists;
 
 import libcore.util.Objects;
@@ -195,6 +198,7 @@
     private INetworkStatsService mStatsService;
     private NetworkPolicyManager mPolicyManager;
     private TelephonyManager mTelephonyManager;
+    private SubscriptionManager mSubscriptionManager;
 
     private INetworkStatsSession mStatsSession;
 
@@ -208,6 +212,8 @@
     private ViewGroup mTabsContainer;
     private TabWidget mTabWidget;
     private ListView mListView;
+    private ChartNetworkSeriesView mSeries;
+    private ChartNetworkSeriesView mDetailedSeries;
     private DataUsageAdapter mAdapter;
 
     /** Distance to inset content from sides, when needed. */
@@ -267,14 +273,19 @@
     private MenuItem mMenuSimCards;
     private MenuItem mMenuCellularNetworks;
 
-    private List<SubInfoRecord> mSubInfoList;
-    private Map<Long,String> mMobileTagMap;
+    private List<SubscriptionInfo> mSubInfoList;
+    private Map<Integer,String> mMobileTagMap;
 
     /** Flag used to ignore listeners during binding. */
     private boolean mBinding;
 
     private UidDetailProvider mUidDetailProvider;
 
+    /**
+     * Local cache of data enabled for subId, used to work around delays.
+     */
+    private final Map<String, Boolean> mMobileDataEnabled = new HashMap<String, Boolean>();
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -286,13 +297,14 @@
                 ServiceManager.getService(Context.NETWORK_STATS_SERVICE));
         mPolicyManager = NetworkPolicyManager.from(context);
         mTelephonyManager = TelephonyManager.from(context);
+        mSubscriptionManager = SubscriptionManager.from(context);
 
         mPrefs = getActivity().getSharedPreferences(PREF_FILE, Context.MODE_PRIVATE);
 
         mPolicyEditor = new NetworkPolicyEditor(mPolicyManager);
         mPolicyEditor.read();
 
-        mSubInfoList = SimSettings.getSortedSubInfoList(getActivity());
+        mSubInfoList = mSubscriptionManager.getActiveSubscriptionInfoList();
         mMobileTagMap = initMobileTabTag(mSubInfoList);
 
         try {
@@ -398,6 +410,8 @@
             mCycleSpinner.setOnItemSelectedListener(mCycleListener);
             mCycleSummary = (TextView) mCycleView.findViewById(R.id.cycle_summary);
             mNetworkSwitches.addView(mCycleView);
+            mSeries = (ChartNetworkSeriesView)view.findViewById(R.id.series);
+            mDetailedSeries = (ChartNetworkSeriesView)view.findViewById(R.id.detail_series);
         }
 
         mChart = (ChartDataUsageView) mHeader.findViewById(R.id.chart);
@@ -656,16 +670,17 @@
         final Context context = getActivity();
         mTabHost.clearAllTabs();
 
-        final boolean mobileSplit = isMobilePolicySplit();
-        if (mobileSplit && hasReadyMobile4gRadio(context)) {
-            mTabHost.addTab(buildTabSpec(TAB_3G, R.string.data_usage_tab_3g));
-            mTabHost.addTab(buildTabSpec(TAB_4G, R.string.data_usage_tab_4g));
-        } else if (hasReadyMobileRadio(context)) {
-            addMobileTab(context, mSubInfoList);
+        for (int i = 0; i < mTelephonyManager.getSimCount(); i++) {
+            final SubscriptionInfo sir = Utils.findRecordBySlotId(context, i);
+            if (sir != null) {
+                addMobileTab(context, sir);
+            }
         }
+
         if (mShowWifi && hasWifiRadio(context)) {
             mTabHost.addTab(buildTabSpec(TAB_WIFI, R.string.data_usage_tab_wifi));
         }
+
         if (mShowEthernet && hasEthernet(context)) {
             mTabHost.addTab(buildTabSpec(TAB_ETHERNET, R.string.data_usage_tab_ethernet));
         }
@@ -710,7 +725,7 @@
     /**
      * Build {@link TabSpec} with thin indicator, and empty content.
      */
-    private TabSpec buildTabSpec(String tag, String title) {
+    private TabSpec buildTabSpec(String tag, CharSequence title) {
         return mTabHost.newTabSpec(tag).setIndicator(title).setContent(
                 mEmptyTabContent);
     }
@@ -734,6 +749,7 @@
         if (!isAdded()) return;
 
         final Context context = getActivity();
+        final Resources resources = context.getResources();
         final String currentTab = mTabHost.getCurrentTabTag();
         final boolean isOwner = ActivityManager.getCurrentUser() == UserHandle.USER_OWNER;
 
@@ -752,20 +768,32 @@
         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));
+
+            // Match mobile traffic for this subscriber, but normalize it to
+            // catch any other merged subscribers.
+            mTemplate = buildTemplateMobileAll(
+                    getActiveSubscriberId(context, getSubId(currentTab)));
+            mTemplate = NetworkTemplate.normalize(mTemplate,
+                    mTelephonyManager.getMergedSubscriberIds());
+
         } 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
@@ -773,17 +801,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);
         }
 
@@ -797,6 +828,23 @@
         getActivity().invalidateOptionsMenu();
 
         mBinding = false;
+
+        int seriesColor = resources.getColor(R.color.sim_noitification);
+        if (mCurrentTab != null && mCurrentTab.length() > TAB_MOBILE.length() ){
+            final int slotId = Integer.parseInt(mCurrentTab.substring(TAB_MOBILE.length(),
+                    mCurrentTab.length()));
+            final SubscriptionInfo sir = com.android.settings.Utils.findRecordBySlotId(context,
+                    slotId);
+
+            if (sir != null) {
+                seriesColor = sir.getIconTint();
+            }
+        }
+
+        final int secondaryColor = Color.argb(127, Color.red(seriesColor), Color.green(seriesColor),
+                Color.blue(seriesColor));
+        mSeries.setChartColor(Color.BLACK, seriesColor, secondaryColor);
+        mDetailedSeries.setChartColor(Color.BLACK, seriesColor, secondaryColor);
     }
 
     private boolean isAppDetailMode() {
@@ -926,30 +974,33 @@
         updatePolicy(false);
     }
 
-    /**
-     * Local cache of value, used to work around delay when
-     * {@link ConnectivityManager#setMobileDataEnabled(boolean)} is async.
-     */
-    private Boolean mMobileDataEnabled;
-
-    private boolean isMobileDataEnabled(long subId) {
+    private boolean isMobileDataEnabled(int subId) {
+        if (LOGD) Log.d(TAG, "isMobileDataEnabled:+ subId=" + subId);
         boolean isEnable = false;
-        if (mMobileDataEnabled != null) {
-            // TODO: deprecate and remove this once enabled flag is on policy
-            // Multiple Subscriptions, the value need to be reseted
-            isEnable = mMobileDataEnabled.booleanValue();
-            mMobileDataEnabled = null;
+        if (mMobileDataEnabled.get(String.valueOf(subId)) != null) {
+            //TODO: deprecate and remove this once enabled flag is on policy
+            //Multiple Subscriptions, the value need to be reseted
+            isEnable = mMobileDataEnabled.get(String.valueOf(subId)).booleanValue();
+            if (LOGD) {
+                Log.d(TAG, "isMobileDataEnabled: != null, subId=" + subId
+                        + " isEnable=" + isEnable);
+            }
+            mMobileDataEnabled.put(String.valueOf(subId), null);
         } else {
-            //SUB SELECT
-            isEnable = mTelephonyManager.getDataEnabled() && isMobileDataAvailable(subId);
+            // SUB SELECT
+            isEnable = mTelephonyManager.getDataEnabled(subId);
+            if (LOGD) {
+                Log.d(TAG, "isMobileDataEnabled: == null, subId=" + subId
+                        + " isEnable=" + isEnable);
+            }
         }
         return isEnable;
     }
 
-    private void setMobileDataEnabled(boolean enabled) {
+    private void setMobileDataEnabled(int subId, boolean enabled) {
         if (LOGD) Log.d(TAG, "setMobileDataEnabled()");
-        mTelephonyManager.setDataEnabled(enabled);
-        mMobileDataEnabled = enabled;
+        mTelephonyManager.setDataEnabled(subId, enabled);
+        mMobileDataEnabled.put(String.valueOf(subId), enabled);
         updatePolicy(false);
     }
 
@@ -1102,6 +1153,16 @@
         }
     }
 
+    private void disableDataForOtherSubscriptions(SubscriptionInfo currentSir) {
+        if (mSubInfoList != null) {
+            for (SubscriptionInfo subInfo : mSubInfoList) {
+                if (subInfo.getSubscriptionId() != currentSir.getSubscriptionId()) {
+                    setMobileDataEnabled(subInfo.getSubscriptionId(), false);
+                }
+            }
+        }
+    }
+
     private View.OnClickListener mDataEnabledListener = new View.OnClickListener() {
         @Override
         public void onClick(View v) {
@@ -1111,11 +1172,16 @@
             final String currentTab = mCurrentTab;
             if (isMobileTab(currentTab)) {
                 if (dataEnabled) {
-                    setMobileDataEnabled(true);
+                    // If we are showing the Sim Card tile then we are a Multi-Sim device.
+                    if (Utils.showSimCardTile(getActivity())) {
+                        handleMultiSimDataDialog();
+                    } else {
+                        setMobileDataEnabled(getSubId(currentTab), true);
+                    }
                 } else {
                     // disabling data; show confirmation dialog which eventually
                     // calls setMobileDataEnabled() once user confirms.
-                    ConfirmDataDisableFragment.show(DataUsageSummary.this);
+                    ConfirmDataDisableFragment.show(DataUsageSummary.this, getSubId(mCurrentTab));
                 }
             }
 
@@ -1123,6 +1189,56 @@
         }
     };
 
+    private void handleMultiSimDataDialog() {
+        final Context context = getActivity();
+        final SubscriptionInfo currentSir = getCurrentTabSubInfo(context);
+
+        //If sim has not loaded after toggling data switch, return.
+        if (currentSir == null) {
+            return;
+        }
+
+        final SubscriptionInfo nextSir = mSubscriptionManager.getActiveSubscriptionInfo(
+                mSubscriptionManager.getDefaultDataSubId());
+
+        // If the device is single SIM or is enabling data on the active data SIM then forgo
+        // the pop-up.
+        if (!Utils.showSimCardTile(context) ||
+                (nextSir != null && currentSir != null &&
+                currentSir.getSubscriptionId() == nextSir.getSubscriptionId())) {
+            setMobileDataEnabled(currentSir.getSubscriptionId(), true);
+            if (nextSir != null && currentSir != null &&
+                currentSir.getSubscriptionId() == nextSir.getSubscriptionId()) {
+                disableDataForOtherSubscriptions(currentSir);
+            }
+            updateBody();
+            return;
+        }
+
+        final String previousName = (nextSir == null)
+            ? context.getResources().getString(R.string.sim_selection_required_pref)
+            : nextSir.getDisplayName().toString();
+
+        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+
+        builder.setTitle(R.string.sim_change_data_title);
+        builder.setMessage(getActivity().getResources().getString(R.string.sim_change_data_message,
+                    currentSir.getDisplayName(), previousName));
+
+        builder.setPositiveButton(R.string.okay, new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int id) {
+                mSubscriptionManager.setDefaultDataSubId(currentSir.getSubscriptionId());
+                setMobileDataEnabled(currentSir.getSubscriptionId(), true);
+                disableDataForOtherSubscriptions(currentSir);
+                updateBody();
+            }
+        });
+        builder.setNegativeButton(R.string.cancel, null);
+
+        builder.create().show();
+    }
+
     private View.OnClickListener mDisableAtLimitListener = new View.OnClickListener() {
         @Override
         public void onClick(View v) {
@@ -1326,35 +1442,19 @@
         }
     };
 
-    @Deprecated
-    private boolean isMobilePolicySplit() {
-        final Context context = getActivity();
-        if (hasReadyMobileRadio(context)) {
-            final TelephonyManager tele = TelephonyManager.from(context);
-            return mPolicyEditor.isMobilePolicySplit(getActiveSubscriberId(context));
-        } else {
-            return false;
-        }
-    }
-
-    @Deprecated
-    private void setMobilePolicySplit(boolean split) {
-        final Context context = getActivity();
-        if (hasReadyMobileRadio(context)) {
-            final TelephonyManager tele = TelephonyManager.from(context);
-            mPolicyEditor.setMobilePolicySplit(getActiveSubscriberId(context), split);
-        }
-    }
-
     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, long subId) {
+    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() {
@@ -1605,9 +1705,16 @@
                         collapseKey = uid;
                         category = AppItem.CATEGORY_APP;
                     } else {
-                        // Add to other user item.
-                        collapseKey = UidDetailProvider.buildKeyForUser(userId);
-                        category = AppItem.CATEGORY_USER;
+                        // If it is a removed user add it to the removed users' key
+                        final UserInfo info = mUm.getUserInfo(userId);
+                        if (info == null) {
+                            collapseKey = UID_REMOVED;
+                            category = AppItem.CATEGORY_APP;
+                        } else {
+                            // Add to other user item.
+                            collapseKey = UidDetailProvider.buildKeyForUser(userId);
+                            category = AppItem.CATEGORY_USER;
+                        }
                     }
                 } else if (uid == UID_REMOVED || uid == UID_TETHERING) {
                     collapseKey = uid;
@@ -2068,7 +2175,9 @@
      * Dialog to request user confirmation before disabling data.
      */
     public static class ConfirmDataDisableFragment extends DialogFragment {
-        public static void show(DataUsageSummary parent) {
+        static int mSubId;
+        public static void show(DataUsageSummary parent, int subId) {
+            mSubId = subId;
             if (!parent.isAdded()) return;
 
             final ConfirmDataDisableFragment dialog = new ConfirmDataDisableFragment();
@@ -2089,7 +2198,7 @@
                     final DataUsageSummary target = (DataUsageSummary) getTargetFragment();
                     if (target != null) {
                         // TODO: extend to modify policy enabled flag.
-                        target.setMobileDataEnabled(false);
+                        target.setMobileDataEnabled(mSubId, false);
                     }
                 }
             });
@@ -2209,9 +2318,9 @@
     private static String computeTabFromIntent(Intent intent) {
         final NetworkTemplate template = intent.getParcelableExtra(EXTRA_NETWORK_TEMPLATE);
         if (template == null) {
-            final long subId = intent.getLongExtra(PhoneConstants.SUBSCRIPTION_KEY,
-                    SubscriptionManager.INVALID_SUB_ID);
-            if (SubscriptionManager.isValidSubId(subId)) {
+            final int subId = intent.getIntExtra(PhoneConstants.SUBSCRIPTION_KEY,
+                    SubscriptionManager.INVALID_SUBSCRIPTION_ID);
+            if (SubscriptionManager.isValidSubscriptionId(subId)) {
                 return TAB_MOBILE + String.valueOf(subId);
             }
             return null;
@@ -2303,23 +2412,33 @@
         final ConnectivityManager conn = ConnectivityManager.from(context);
         final TelephonyManager tele = TelephonyManager.from(context);
 
-        final List<SubInfoRecord> subInfoList = SubscriptionManager.getActiveSubInfoList();
-        // No activated Subscription
+        final List<SubscriptionInfo> subInfoList =
+                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 (SubInfoRecord subInfo : subInfoList) {
-            isReady = isReady & tele.getSimState(subInfo.slotId) == SIM_STATE_READY;
+        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;
     }
 
     /*
      * TODO: consider adding to TelephonyManager or SubscritpionManager.
      */
-    public static boolean hasReadyMobileRadio(Context context, long subId) {
+    public static boolean hasReadyMobileRadio(Context context, int subId) {
         if (TEST_RADIOS) {
             return SystemProperties.get(TEST_RADIOS_PROP).contains("mobile");
         }
@@ -2329,7 +2448,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;
     }
 
     /**
@@ -2549,15 +2672,30 @@
             }
         };
 
-        private void addMobileTab(Context context, List<SubInfoRecord> subInfoList) {
-            if (subInfoList != null) {
-                for (SubInfoRecord subInfo : mSubInfoList) {
-                    if (hasReadyMobileRadio(context,subInfo.subId)) {
-                        mTabHost.addTab(buildTabSpec(mMobileTagMap.get(subInfo.subId),
-                                subInfo.displayName));
+        private void addMobileTab(Context context, SubscriptionInfo subInfo) {
+            if (subInfo != null && mMobileTagMap != null) {
+                if (hasReadyMobileRadio(context, subInfo.getSubscriptionId())) {
+                    mTabHost.addTab(buildTabSpec(mMobileTagMap.get(subInfo.getSubscriptionId()),
+                            subInfo.getDisplayName()));
+                }
+            } else {
+                if (LOGD) Log.d(TAG, "addMobileTab: subInfoList is null");
+            }
+        }
+
+        private SubscriptionInfo getCurrentTabSubInfo(Context context) {
+            if (mSubInfoList != null && mTabHost != null) {
+                final int currentTagIndex = mTabHost.getCurrentTab();
+                int i = 0;
+                for (SubscriptionInfo subInfo : mSubInfoList) {
+                    if (hasReadyMobileRadio(context, subInfo.getSubscriptionId())) {
+                        if (i++ == currentTagIndex) {
+                            return subInfo;
+                        }
                     }
                 }
             }
+            return null;
         }
 
         /**
@@ -2565,14 +2703,14 @@
          * @param subInfoList The subscription Info List
          * @return The map or null if no activated subscription
          */
-        private Map<Long, String> initMobileTabTag(List<SubInfoRecord> subInfoList) {
-            Map<Long,String> map = null;
+        private Map<Integer, String> initMobileTabTag(List<SubscriptionInfo> subInfoList) {
+            Map<Integer, String> map = null;
             if (subInfoList != null) {
                 String mobileTag;
-                map = new HashMap<Long, String>();
-                for (SubInfoRecord subInfo : subInfoList) {
-                    mobileTag = TAB_MOBILE + String.valueOf(subInfo.subId);
-                    map.put(subInfo.subId,mobileTag);
+                map = new HashMap<Integer, String>();
+                for (SubscriptionInfo subInfo : subInfoList) {
+                    mobileTag = TAB_MOBILE + String.valueOf(subInfo.getSubscriptionId());
+                    map.put(subInfo.getSubscriptionId(), mobileTag);
                 }
             }
             return map;
@@ -2582,11 +2720,13 @@
             return currentTab != null ? currentTab.contains(TAB_MOBILE) : false;
         }
 
-        private long getSubId(String currentTab) {
-            Set<Long> set = mMobileTagMap.keySet();
-            for (Long subId : set) {
-                if (mMobileTagMap.get(subId).equals(currentTab)) {
-                    return subId;
+        private int getSubId(String currentTab) {
+            if (mMobileTagMap != null) {
+                Set<Integer> set = mMobileTagMap.keySet();
+                for (Integer subId : set) {
+                    if (mMobileTagMap.get(subId).equals(currentTab)) {
+                        return subId;
+                    }
                 }
             }
             Log.e(TAG, "currentTab = " + currentTab + " non mobile tab called this function");
@@ -2595,7 +2735,20 @@
 
         //SUB SELECT
         private boolean isMobileDataAvailable(long subId) {
-            long[] subIds = SubscriptionManager.getSubId(PhoneConstants.SUB1);
-            return subIds[0] == subId;
+            int[] subIds = SubscriptionManager.getSubId(PhoneConstants.SUB1);
+            if (subIds != null && subIds[0] == subId) {
+                return true;
+            }
+
+            subIds = SubscriptionManager.getSubId(PhoneConstants.SUB2);
+            if (subIds != null && subIds[0] == subId) {
+                return true;
+            }
+
+            subIds = SubscriptionManager.getSubId(PhoneConstants.SUB3);
+            if (subIds != null && subIds[0] == subId) {
+                return true;
+            }
+            return false;
         }
 }
diff --git a/src/com/android/settings/DateTimeSettings.java b/src/com/android/settings/DateTimeSettings.java
index 8eb9c52..6f41fd5 100644
--- a/src/com/android/settings/DateTimeSettings.java
+++ b/src/com/android/settings/DateTimeSettings.java
@@ -29,10 +29,10 @@
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
 import android.os.Bundle;
-import android.preference.CheckBoxPreference;
 import android.preference.ListPreference;
 import android.preference.Preference;
 import android.preference.PreferenceScreen;
+import android.preference.SwitchPreference;
 import android.provider.Settings;
 import android.provider.Settings.SettingNotFoundException;
 import android.text.BidiFormatter;
@@ -59,7 +59,6 @@
     // The date value is dummy (independent of actual date).
     private Calendar mDummyDate;
 
-    private static final String KEY_DATE_FORMAT = "date_format";
     private static final String KEY_AUTO_TIME = "auto_time";
     private static final String KEY_AUTO_TIME_ZONE = "auto_zone";
 
@@ -69,13 +68,12 @@
     // have we been launched from the setup wizard?
     protected static final String EXTRA_IS_FIRST_RUN = "firstRun";
 
-    private CheckBoxPreference mAutoTimePref;
+    private SwitchPreference mAutoTimePref;
     private Preference mTimePref;
     private Preference mTime24Pref;
-    private CheckBoxPreference mAutoTimeZonePref;
+    private SwitchPreference mAutoTimeZonePref;
     private Preference mTimeZone;
     private Preference mDatePref;
-    private ListPreference mDateFormat;
 
     @Override
     public void onCreate(Bundle icicle) {
@@ -90,7 +88,7 @@
         boolean autoTimeEnabled = getAutoState(Settings.Global.AUTO_TIME);
         boolean autoTimeZoneEnabled = getAutoState(Settings.Global.AUTO_TIME_ZONE);
 
-        mAutoTimePref = (CheckBoxPreference) findPreference(KEY_AUTO_TIME);
+        mAutoTimePref = (SwitchPreference) findPreference(KEY_AUTO_TIME);
 
         DevicePolicyManager dpm = (DevicePolicyManager) getSystemService(Context
                 .DEVICE_POLICY_SERVICE);
@@ -108,7 +106,7 @@
         mDummyDate = Calendar.getInstance();
 
         mAutoTimePref.setChecked(autoTimeEnabled);
-        mAutoTimeZonePref = (CheckBoxPreference) findPreference(KEY_AUTO_TIME_ZONE);
+        mAutoTimeZonePref = (SwitchPreference) findPreference(KEY_AUTO_TIME_ZONE);
         // Override auto-timezone if it's a wifi-only device or if we're still in setup wizard.
         // TODO: Remove the wifiOnly test when auto-timezone is implemented based on wifi-location.
         if (Utils.isWifiOnly(getActivity()) || isFirstRun) {
@@ -121,41 +119,10 @@
         mTime24Pref = findPreference("24 hour");
         mTimeZone = findPreference("timezone");
         mDatePref = findPreference("date");
-        mDateFormat = (ListPreference) findPreference(KEY_DATE_FORMAT);
         if (isFirstRun) {
             getPreferenceScreen().removePreference(mTime24Pref);
-            getPreferenceScreen().removePreference(mDateFormat);
         }
 
-        String [] dateFormats = getResources().getStringArray(R.array.date_format_values);
-        String [] formattedDates = new String[dateFormats.length];
-        String currentFormat = getDateFormat();
-        // Initialize if DATE_FORMAT is not set in the system settings
-        // This can happen after a factory reset (or data wipe)
-        if (currentFormat == null) {
-            currentFormat = "";
-        }
-
-        // Prevents duplicated values on date format selector.
-        mDummyDate.set(mDummyDate.get(Calendar.YEAR), mDummyDate.DECEMBER, 31, 13, 0, 0);
-
-        for (int i = 0; i < formattedDates.length; i++) {
-            String formatted =
-                    DateFormat.getDateFormatForSetting(getActivity(), dateFormats[i])
-                    .format(mDummyDate.getTime());
-
-            if (dateFormats[i].length() == 0) {
-                formattedDates[i] = getResources().
-                    getString(R.string.normal_date_format, formatted);
-            } else {
-                formattedDates[i] = formatted;
-            }
-        }
-
-        mDateFormat.setEntries(formattedDates);
-        mDateFormat.setEntryValues(R.array.date_format_values);
-        mDateFormat.setValue(currentFormat);
-
         mTimePref.setEnabled(!autoTimeEnabled);
         mDatePref.setEnabled(!autoTimeEnabled);
         mTimeZone.setEnabled(!autoTimeZoneEnabled);
@@ -168,7 +135,7 @@
         getPreferenceScreen().getSharedPreferences()
                 .registerOnSharedPreferenceChangeListener(this);
 
-        ((CheckBoxPreference)mTime24Pref).setChecked(is24Hour());
+        ((SwitchPreference)mTime24Pref).setChecked(is24Hour());
 
         // Register for time ticks and other reasons for time change
         IntentFilter filter = new IntentFilter();
@@ -189,17 +156,15 @@
     }
 
     public void updateTimeAndDateDisplay(Context context) {
-        java.text.DateFormat shortDateFormat = DateFormat.getDateFormat(context);
         final Calendar now = Calendar.getInstance();
         mDummyDate.setTimeZone(now.getTimeZone());
         // We use December 31st because it's unambiguous when demonstrating the date format.
         // We use 13:00 so we can demonstrate the 12/24 hour options.
         mDummyDate.set(now.get(Calendar.YEAR), 11, 31, 13, 0, 0);
         Date dummyDate = mDummyDate.getTime();
+        mDatePref.setSummary(DateFormat.getLongDateFormat(context).format(now.getTime()));
         mTimePref.setSummary(DateFormat.getTimeFormat(getActivity()).format(now.getTime()));
         mTimeZone.setSummary(getTimeZoneText(now.getTimeZone(), true));
-        mDatePref.setSummary(shortDateFormat.format(now.getTime()));
-        mDateFormat.setSummary(shortDateFormat.format(dummyDate));
         mTime24Pref.setSummary(DateFormat.getTimeFormat(getActivity()).format(dummyDate));
     }
 
@@ -227,13 +192,7 @@
 
     @Override
     public void onSharedPreferenceChanged(SharedPreferences preferences, String key) {
-        if (key.equals(KEY_DATE_FORMAT)) {
-            String format = preferences.getString(key,
-                    getResources().getString(R.string.default_date_format));
-            Settings.System.putString(getContentResolver(),
-                    Settings.System.DATE_FORMAT, format);
-            updateTimeAndDateDisplay(getActivity());
-        } else if (key.equals(KEY_AUTO_TIME)) {
+        if (key.equals(KEY_AUTO_TIME)) {
             boolean autoEnabled = preferences.getBoolean(key, true);
             Settings.Global.putInt(getContentResolver(), Settings.Global.AUTO_TIME,
                     autoEnabled ? 1 : 0);
@@ -318,7 +277,7 @@
             removeDialog(DIALOG_TIMEPICKER);
             showDialog(DIALOG_TIMEPICKER);
         } else if (preference == mTime24Pref) {
-            final boolean is24Hour = ((CheckBoxPreference)mTime24Pref).isChecked();
+            final boolean is24Hour = ((SwitchPreference)mTime24Pref).isChecked();
             set24Hour(is24Hour);
             updateTimeAndDateDisplay(getActivity());
             timeUpdated(is24Hour);
@@ -350,11 +309,6 @@
                 is24Hour? HOURS_24 : HOURS_12);
     }
 
-    private String getDateFormat() {
-        return Settings.System.getString(getContentResolver(),
-                Settings.System.DATE_FORMAT);
-    }
-
     private boolean getAutoState(String name) {
         try {
             return Settings.Global.getInt(getContentResolver(), name) > 0;
diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index f5704c1..a001fd7 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -31,6 +31,7 @@
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.pm.ResolveInfo;
+import android.content.res.Resources;
 import android.hardware.usb.IUsbManager;
 import android.net.wifi.WifiManager;
 import android.os.AsyncTask;
@@ -45,12 +46,12 @@
 import android.os.SystemProperties;
 import android.os.UserHandle;
 import android.os.UserManager;
-import android.preference.CheckBoxPreference;
 import android.preference.ListPreference;
 import android.preference.Preference;
 import android.preference.Preference.OnPreferenceChangeListener;
 import android.preference.PreferenceGroup;
 import android.preference.PreferenceScreen;
+import android.preference.SwitchPreference;
 import android.provider.SearchIndexableResource;
 import android.provider.Settings;
 import android.text.TextUtils;
@@ -65,7 +66,6 @@
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
 import com.android.settings.widget.SwitchBar;
-import dalvik.system.VMRuntime;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -116,7 +116,7 @@
     private static final String SHOW_SCREEN_UPDATES_KEY = "show_screen_updates";
     private static final String DISABLE_OVERLAYS_KEY = "disable_overlays";
     private static final String SIMULATE_COLOR_SPACE = "simulate_color_space";
-    private static final String USE_NUPLAYER_KEY = "use_nuplayer";
+    private static final String USE_AWESOMEPLAYER_KEY = "use_awesomeplayer";
     private static final String USB_AUDIO_KEY = "usb_audio";
     private static final String USE_AWESOMEPLAYER_PROPERTY = "persist.sys.media.use-awesome";
     private static final String SHOW_CPU_USAGE_KEY = "show_cpu_usage";
@@ -163,6 +163,8 @@
 
     private static final String PERSISTENT_DATA_BLOCK_PROP = "ro.frp.pst";
 
+    private static final int REQUEST_CODE_ENABLE_OEM_UNLOCK = 0;
+
     private static String DEFAULT_LOG_RING_BUFFER_SIZE_IN_BYTES = "262144"; // 256K
 
     private IWindowManager mWindowManager;
@@ -176,39 +178,39 @@
     private boolean mHaveDebugSettings;
     private boolean mDontPokeProperties;
 
-    private CheckBoxPreference mEnableAdb;
+    private SwitchPreference mEnableAdb;
     private Preference mClearAdbKeys;
-    private CheckBoxPreference mEnableTerminal;
+    private SwitchPreference mEnableTerminal;
     private Preference mBugreport;
-    private CheckBoxPreference mBugreportInPower;
-    private CheckBoxPreference mKeepScreenOn;
-    private CheckBoxPreference mBtHciSnoopLog;
-    private CheckBoxPreference mEnableOemUnlock;
-    private CheckBoxPreference mAllowMockLocation;
-    private CheckBoxPreference mDebugViewAttributes;
+    private SwitchPreference mBugreportInPower;
+    private SwitchPreference mKeepScreenOn;
+    private SwitchPreference mBtHciSnoopLog;
+    private SwitchPreference mEnableOemUnlock;
+    private SwitchPreference mAllowMockLocation;
+    private SwitchPreference mDebugViewAttributes;
 
     private PreferenceScreen mPassword;
     private String mDebugApp;
     private Preference mDebugAppPref;
-    private CheckBoxPreference mWaitForDebugger;
-    private CheckBoxPreference mVerifyAppsOverUsb;
-    private CheckBoxPreference mWifiDisplayCertification;
-    private CheckBoxPreference mWifiVerboseLogging;
-    private CheckBoxPreference mWifiAggressiveHandover;
+    private SwitchPreference mWaitForDebugger;
+    private SwitchPreference mVerifyAppsOverUsb;
+    private SwitchPreference mWifiDisplayCertification;
+    private SwitchPreference mWifiVerboseLogging;
+    private SwitchPreference mWifiAggressiveHandover;
 
-    private CheckBoxPreference mWifiAllowScansWithTraffic;
-    private CheckBoxPreference mStrictMode;
-    private CheckBoxPreference mPointerLocation;
-    private CheckBoxPreference mShowTouches;
-    private CheckBoxPreference mShowScreenUpdates;
-    private CheckBoxPreference mDisableOverlays;
-    private CheckBoxPreference mShowCpuUsage;
-    private CheckBoxPreference mForceHardwareUi;
-    private CheckBoxPreference mForceMsaa;
-    private CheckBoxPreference mShowHwScreenUpdates;
-    private CheckBoxPreference mShowHwLayersUpdates;
-    private CheckBoxPreference mDebugLayout;
-    private CheckBoxPreference mForceRtlLayout;
+    private SwitchPreference mWifiAllowScansWithTraffic;
+    private SwitchPreference mStrictMode;
+    private SwitchPreference mPointerLocation;
+    private SwitchPreference mShowTouches;
+    private SwitchPreference mShowScreenUpdates;
+    private SwitchPreference mDisableOverlays;
+    private SwitchPreference mShowCpuUsage;
+    private SwitchPreference mForceHardwareUi;
+    private SwitchPreference mForceMsaa;
+    private SwitchPreference mShowHwScreenUpdates;
+    private SwitchPreference mShowHwLayersUpdates;
+    private SwitchPreference mDebugLayout;
+    private SwitchPreference mForceRtlLayout;
     private ListPreference mDebugHwOverdraw;
     private ListPreference mLogdSize;
     private ListPreference mTrackFrameTime;
@@ -221,19 +223,19 @@
 
     private ListPreference mSimulateColorSpace;
 
-    private CheckBoxPreference mUseNuplayer;
-    private CheckBoxPreference mUSBAudio;
-    private CheckBoxPreference mImmediatelyDestroyActivities;
+    private SwitchPreference mUseAwesomePlayer;
+    private SwitchPreference mUSBAudio;
+    private SwitchPreference mImmediatelyDestroyActivities;
 
     private ListPreference mAppProcessLimit;
 
-    private CheckBoxPreference mShowAllANRs;
+    private SwitchPreference mShowAllANRs;
 
     private PreferenceScreen mProcessStats;
     private final ArrayList<Preference> mAllPrefs = new ArrayList<Preference>();
 
-    private final ArrayList<CheckBoxPreference> mResetCbPrefs
-            = new ArrayList<CheckBoxPreference>();
+    private final ArrayList<SwitchPreference> mResetSwitchPrefs
+            = new ArrayList<SwitchPreference>();
 
     private final HashSet<Preference> mDisabledPrefs = new HashSet<Preference>();
     // To track whether a confirmation dialog was clicked.
@@ -268,7 +270,7 @@
         final PreferenceGroup debugDebuggingCategory = (PreferenceGroup)
                 findPreference(DEBUG_DEBUGGING_CATEGORY_KEY);
 
-        mEnableAdb = findAndInitCheckboxPref(ENABLE_ADB);
+        mEnableAdb = findAndInitSwitchPref(ENABLE_ADB);
         mClearAdbKeys = findPreference(CLEAR_ADB_KEYS);
         if (!SystemProperties.getBoolean("ro.adb.secure", false)) {
             if (debugDebuggingCategory != null) {
@@ -276,23 +278,23 @@
             }
         }
         mAllPrefs.add(mClearAdbKeys);
-        mEnableTerminal = findAndInitCheckboxPref(ENABLE_TERMINAL);
+        mEnableTerminal = findAndInitSwitchPref(ENABLE_TERMINAL);
         if (!isPackageInstalled(getActivity(), TERMINAL_APP_PACKAGE)) {
             debugDebuggingCategory.removePreference(mEnableTerminal);
             mEnableTerminal = null;
         }
 
         mBugreport = findPreference(BUGREPORT);
-        mBugreportInPower = findAndInitCheckboxPref(BUGREPORT_IN_POWER_KEY);
-        mKeepScreenOn = findAndInitCheckboxPref(KEEP_SCREEN_ON);
-        mBtHciSnoopLog = findAndInitCheckboxPref(BT_HCI_SNOOP_LOG);
-        mEnableOemUnlock = findAndInitCheckboxPref(ENABLE_OEM_UNLOCK);
+        mBugreportInPower = findAndInitSwitchPref(BUGREPORT_IN_POWER_KEY);
+        mKeepScreenOn = findAndInitSwitchPref(KEEP_SCREEN_ON);
+        mBtHciSnoopLog = findAndInitSwitchPref(BT_HCI_SNOOP_LOG);
+        mEnableOemUnlock = findAndInitSwitchPref(ENABLE_OEM_UNLOCK);
         if (!showEnableOemUnlockPreference()) {
             removePreference(mEnableOemUnlock);
             mEnableOemUnlock = null;
         }
-        mAllowMockLocation = findAndInitCheckboxPref(ALLOW_MOCK_LOCATION);
-        mDebugViewAttributes = findAndInitCheckboxPref(DEBUG_VIEW_ATTRIBUTES);
+        mAllowMockLocation = findAndInitSwitchPref(ALLOW_MOCK_LOCATION);
+        mDebugViewAttributes = findAndInitSwitchPref(DEBUG_VIEW_ATTRIBUTES);
         mPassword = (PreferenceScreen) findPreference(LOCAL_BACKUP_PASSWORD);
         mAllPrefs.add(mPassword);
 
@@ -306,8 +308,8 @@
 
         mDebugAppPref = findPreference(DEBUG_APP_KEY);
         mAllPrefs.add(mDebugAppPref);
-        mWaitForDebugger = findAndInitCheckboxPref(WAIT_FOR_DEBUGGER_KEY);
-        mVerifyAppsOverUsb = findAndInitCheckboxPref(VERIFY_APPS_OVER_USB_KEY);
+        mWaitForDebugger = findAndInitSwitchPref(WAIT_FOR_DEBUGGER_KEY);
+        mVerifyAppsOverUsb = findAndInitSwitchPref(VERIFY_APPS_OVER_USB_KEY);
         if (!showVerifierSetting()) {
             if (debugDebuggingCategory != null) {
                 debugDebuggingCategory.removePreference(mVerifyAppsOverUsb);
@@ -315,25 +317,25 @@
                 mVerifyAppsOverUsb.setEnabled(false);
             }
         }
-        mStrictMode = findAndInitCheckboxPref(STRICT_MODE_KEY);
-        mPointerLocation = findAndInitCheckboxPref(POINTER_LOCATION_KEY);
-        mShowTouches = findAndInitCheckboxPref(SHOW_TOUCHES_KEY);
-        mShowScreenUpdates = findAndInitCheckboxPref(SHOW_SCREEN_UPDATES_KEY);
-        mDisableOverlays = findAndInitCheckboxPref(DISABLE_OVERLAYS_KEY);
-        mShowCpuUsage = findAndInitCheckboxPref(SHOW_CPU_USAGE_KEY);
-        mForceHardwareUi = findAndInitCheckboxPref(FORCE_HARDWARE_UI_KEY);
-        mForceMsaa = findAndInitCheckboxPref(FORCE_MSAA_KEY);
+        mStrictMode = findAndInitSwitchPref(STRICT_MODE_KEY);
+        mPointerLocation = findAndInitSwitchPref(POINTER_LOCATION_KEY);
+        mShowTouches = findAndInitSwitchPref(SHOW_TOUCHES_KEY);
+        mShowScreenUpdates = findAndInitSwitchPref(SHOW_SCREEN_UPDATES_KEY);
+        mDisableOverlays = findAndInitSwitchPref(DISABLE_OVERLAYS_KEY);
+        mShowCpuUsage = findAndInitSwitchPref(SHOW_CPU_USAGE_KEY);
+        mForceHardwareUi = findAndInitSwitchPref(FORCE_HARDWARE_UI_KEY);
+        mForceMsaa = findAndInitSwitchPref(FORCE_MSAA_KEY);
         mTrackFrameTime = addListPreference(TRACK_FRAME_TIME_KEY);
         mShowNonRectClip = addListPreference(SHOW_NON_RECTANGULAR_CLIP_KEY);
-        mShowHwScreenUpdates = findAndInitCheckboxPref(SHOW_HW_SCREEN_UPDATES_KEY);
-        mShowHwLayersUpdates = findAndInitCheckboxPref(SHOW_HW_LAYERS_UPDATES_KEY);
-        mDebugLayout = findAndInitCheckboxPref(DEBUG_LAYOUT_KEY);
-        mForceRtlLayout = findAndInitCheckboxPref(FORCE_RTL_LAYOUT_KEY);
+        mShowHwScreenUpdates = findAndInitSwitchPref(SHOW_HW_SCREEN_UPDATES_KEY);
+        mShowHwLayersUpdates = findAndInitSwitchPref(SHOW_HW_LAYERS_UPDATES_KEY);
+        mDebugLayout = findAndInitSwitchPref(DEBUG_LAYOUT_KEY);
+        mForceRtlLayout = findAndInitSwitchPref(FORCE_RTL_LAYOUT_KEY);
         mDebugHwOverdraw = addListPreference(DEBUG_HW_OVERDRAW_KEY);
-        mWifiDisplayCertification = findAndInitCheckboxPref(WIFI_DISPLAY_CERTIFICATION_KEY);
-        mWifiVerboseLogging = findAndInitCheckboxPref(WIFI_VERBOSE_LOGGING_KEY);
-        mWifiAggressiveHandover = findAndInitCheckboxPref(WIFI_AGGRESSIVE_HANDOVER_KEY);
-        mWifiAllowScansWithTraffic = findAndInitCheckboxPref(WIFI_ALLOW_SCAN_WITH_TRAFFIC_KEY);
+        mWifiDisplayCertification = findAndInitSwitchPref(WIFI_DISPLAY_CERTIFICATION_KEY);
+        mWifiVerboseLogging = findAndInitSwitchPref(WIFI_VERBOSE_LOGGING_KEY);
+        mWifiAggressiveHandover = findAndInitSwitchPref(WIFI_AGGRESSIVE_HANDOVER_KEY);
+        mWifiAllowScansWithTraffic = findAndInitSwitchPref(WIFI_ALLOW_SCAN_WITH_TRAFFIC_KEY);
         mLogdSize = addListPreference(SELECT_LOGD_SIZE_KEY);
 
         mWindowAnimationScale = addListPreference(WINDOW_ANIMATION_SCALE_KEY);
@@ -342,20 +344,20 @@
         mOverlayDisplayDevices = addListPreference(OVERLAY_DISPLAY_DEVICES_KEY);
         mOpenGLTraces = addListPreference(OPENGL_TRACES_KEY);
         mSimulateColorSpace = addListPreference(SIMULATE_COLOR_SPACE);
-        mUseNuplayer = findAndInitCheckboxPref(USE_NUPLAYER_KEY);
-        mUSBAudio = findAndInitCheckboxPref(USB_AUDIO_KEY);
+        mUseAwesomePlayer = findAndInitSwitchPref(USE_AWESOMEPLAYER_KEY);
+        mUSBAudio = findAndInitSwitchPref(USB_AUDIO_KEY);
 
-        mImmediatelyDestroyActivities = (CheckBoxPreference) findPreference(
+        mImmediatelyDestroyActivities = (SwitchPreference) findPreference(
                 IMMEDIATELY_DESTROY_ACTIVITIES_KEY);
         mAllPrefs.add(mImmediatelyDestroyActivities);
-        mResetCbPrefs.add(mImmediatelyDestroyActivities);
+        mResetSwitchPrefs.add(mImmediatelyDestroyActivities);
 
         mAppProcessLimit = addListPreference(APP_PROCESS_LIMIT_KEY);
 
-        mShowAllANRs = (CheckBoxPreference) findPreference(
+        mShowAllANRs = (SwitchPreference) findPreference(
                 SHOW_ALL_ANRS_KEY);
         mAllPrefs.add(mShowAllANRs);
-        mResetCbPrefs.add(mShowAllANRs);
+        mResetSwitchPrefs.add(mShowAllANRs);
 
         Preference hdcpChecking = findPreference(HDCP_CHECKING_KEY);
         if (hdcpChecking != null) {
@@ -381,13 +383,13 @@
         }
     }
 
-    private CheckBoxPreference findAndInitCheckboxPref(String key) {
-        CheckBoxPreference pref = (CheckBoxPreference) findPreference(key);
+    private SwitchPreference findAndInitSwitchPref(String key) {
+        SwitchPreference pref = (SwitchPreference) findPreference(key);
         if (pref == null) {
             throw new IllegalArgumentException("Cannot find preference with key = " + key);
         }
         mAllPrefs.add(pref);
-        mResetCbPrefs.add(pref);
+        mResetSwitchPrefs.add(pref);
         return pref;
     }
 
@@ -482,8 +484,8 @@
         mSwitchBar.hide();
     }
 
-    void updateCheckBox(CheckBoxPreference checkBox, boolean value) {
-        checkBox.setChecked(value);
+    void updateSwitchPreference(SwitchPreference switchPreference, boolean value) {
+        switchPreference.setChecked(value);
         mHaveDebugSettings |= value;
     }
 
@@ -491,25 +493,25 @@
         final Context context = getActivity();
         final ContentResolver cr = context.getContentResolver();
         mHaveDebugSettings = false;
-        updateCheckBox(mEnableAdb, Settings.Global.getInt(cr,
+        updateSwitchPreference(mEnableAdb, Settings.Global.getInt(cr,
                 Settings.Global.ADB_ENABLED, 0) != 0);
         if (mEnableTerminal != null) {
-            updateCheckBox(mEnableTerminal,
+            updateSwitchPreference(mEnableTerminal,
                     context.getPackageManager().getApplicationEnabledSetting(TERMINAL_APP_PACKAGE)
-                    == PackageManager.COMPONENT_ENABLED_STATE_ENABLED);
+                            == PackageManager.COMPONENT_ENABLED_STATE_ENABLED);
         }
-        updateCheckBox(mBugreportInPower, Settings.Secure.getInt(cr,
+        updateSwitchPreference(mBugreportInPower, Settings.Secure.getInt(cr,
                 Settings.Secure.BUGREPORT_IN_POWER_MENU, 0) != 0);
-        updateCheckBox(mKeepScreenOn, Settings.Global.getInt(cr,
+        updateSwitchPreference(mKeepScreenOn, Settings.Global.getInt(cr,
                 Settings.Global.STAY_ON_WHILE_PLUGGED_IN, 0) != 0);
-        updateCheckBox(mBtHciSnoopLog, Settings.Secure.getInt(cr,
+        updateSwitchPreference(mBtHciSnoopLog, Settings.Secure.getInt(cr,
                 Settings.Secure.BLUETOOTH_HCI_LOG, 0) != 0);
         if (mEnableOemUnlock != null) {
-            updateCheckBox(mEnableOemUnlock, Utils.isOemUnlockEnabled(getActivity()));
+            updateSwitchPreference(mEnableOemUnlock, Utils.isOemUnlockEnabled(getActivity()));
         }
-        updateCheckBox(mAllowMockLocation, Settings.Secure.getInt(cr,
+        updateSwitchPreference(mAllowMockLocation, Settings.Secure.getInt(cr,
                 Settings.Secure.ALLOW_MOCK_LOCATION, 0) != 0);
-        updateCheckBox(mDebugViewAttributes, Settings.Global.getInt(cr,
+        updateSwitchPreference(mDebugViewAttributes, Settings.Global.getInt(cr,
                 Settings.Global.DEBUG_VIEW_ATTRIBUTES, 0) != 0);
         updateHdcpValues();
         updatePasswordSummary();
@@ -548,8 +550,8 @@
 
     private void resetDangerousOptions() {
         mDontPokeProperties = true;
-        for (int i=0; i<mResetCbPrefs.size(); i++) {
-            CheckBoxPreference cb = mResetCbPrefs.get(i);
+        for (int i=0; i< mResetSwitchPrefs.size(); i++) {
+            SwitchPreference cb = mResetSwitchPrefs.get(i);
             if (cb.isChecked()) {
                 cb.setChecked(false);
                 onPreferenceTreeClick(null, cb);
@@ -630,7 +632,7 @@
     private void updateDebuggerOptions() {
         mDebugApp = Settings.Global.getString(
                 getActivity().getContentResolver(), Settings.Global.DEBUG_APP);
-        updateCheckBox(mWaitForDebugger, Settings.Global.getInt(
+        updateSwitchPreference(mWaitForDebugger, Settings.Global.getInt(
                 getActivity().getContentResolver(), Settings.Global.WAIT_FOR_DEBUGGER, 0) != 0);
         if (mDebugApp != null && mDebugApp.length() > 0) {
             String label;
@@ -652,7 +654,7 @@
     }
 
     private void updateVerifyAppsOverUsbOptions() {
-        updateCheckBox(mVerifyAppsOverUsb, Settings.Global.getInt(getActivity().getContentResolver(),
+        updateSwitchPreference(mVerifyAppsOverUsb, Settings.Global.getInt(getActivity().getContentResolver(),
                 Settings.Global.PACKAGE_VERIFIER_INCLUDE_ADB, 1) != 0);
         mVerifyAppsOverUsb.setEnabled(enableVerifierSetting());
     }
@@ -732,7 +734,7 @@
     }
 
     private void updateStrictModeVisualOptions() {
-        updateCheckBox(mStrictMode, currentStrictModeActiveIndex() == 1);
+        updateSwitchPreference(mStrictMode, currentStrictModeActiveIndex() == 1);
     }
 
     private void writePointerLocationOptions() {
@@ -741,7 +743,7 @@
     }
 
     private void updatePointerLocationOptions() {
-        updateCheckBox(mPointerLocation, Settings.System.getInt(getActivity().getContentResolver(),
+        updateSwitchPreference(mPointerLocation, Settings.System.getInt(getActivity().getContentResolver(),
                 Settings.System.POINTER_LOCATION, 0) != 0);
     }
 
@@ -751,7 +753,7 @@
     }
 
     private void updateShowTouchesOptions() {
-        updateCheckBox(mShowTouches, Settings.System.getInt(getActivity().getContentResolver(),
+        updateSwitchPreference(mShowTouches, Settings.System.getInt(getActivity().getContentResolver(),
                 Settings.System.SHOW_TOUCHES, 0) != 0);
     }
 
@@ -769,11 +771,11 @@
                 @SuppressWarnings("unused")
                 int enableGL = reply.readInt();
                 int showUpdates = reply.readInt();
-                updateCheckBox(mShowScreenUpdates, showUpdates != 0);
+                updateSwitchPreference(mShowScreenUpdates, showUpdates != 0);
                 @SuppressWarnings("unused")
                 int showBackground = reply.readInt();
                 int disableOverlays = reply.readInt();
-                updateCheckBox(mDisableOverlays, disableOverlays != 0);
+                updateSwitchPreference(mDisableOverlays, disableOverlays != 0);
                 reply.recycle();
                 data.recycle();
             }
@@ -816,7 +818,7 @@
     }
 
     private void updateHardwareUiOptions() {
-        updateCheckBox(mForceHardwareUi, SystemProperties.getBoolean(HARDWARE_UI_PROPERTY, false));
+        updateSwitchPreference(mForceHardwareUi, SystemProperties.getBoolean(HARDWARE_UI_PROPERTY, false));
     }
 
     private void writeHardwareUiOptions() {
@@ -825,7 +827,7 @@
     }
 
     private void updateMsaaOptions() {
-        updateCheckBox(mForceMsaa, SystemProperties.getBoolean(MSAA_PROPERTY, false));
+        updateSwitchPreference(mForceMsaa, SystemProperties.getBoolean(MSAA_PROPERTY, false));
     }
 
     private void writeMsaaOptions() {
@@ -885,7 +887,7 @@
     }
 
     private void updateShowHwScreenUpdatesOptions() {
-        updateCheckBox(mShowHwScreenUpdates,
+        updateSwitchPreference(mShowHwScreenUpdates,
                 SystemProperties.getBoolean(HardwareRenderer.DEBUG_DIRTY_REGIONS_PROPERTY, false));
     }
 
@@ -896,7 +898,7 @@
     }
 
     private void updateShowHwLayersUpdatesOptions() {
-        updateCheckBox(mShowHwLayersUpdates, SystemProperties.getBoolean(
+        updateSwitchPreference(mShowHwLayersUpdates, SystemProperties.getBoolean(
                 HardwareRenderer.DEBUG_SHOW_LAYERS_UPDATES_PROPERTY, false));
     }
 
@@ -932,7 +934,7 @@
     }
 
     private void updateDebugLayoutOptions() {
-        updateCheckBox(mDebugLayout,
+        updateSwitchPreference(mDebugLayout,
                 SystemProperties.getBoolean(View.DEBUG_LAYOUT_PROPERTY, false));
     }
 
@@ -998,18 +1000,18 @@
     }
 
     private void updateUseNuplayerOptions() {
-        updateCheckBox(
-                mUseNuplayer, !SystemProperties.getBoolean(USE_AWESOMEPLAYER_PROPERTY, false));
+        updateSwitchPreference(
+                mUseAwesomePlayer, SystemProperties.getBoolean(USE_AWESOMEPLAYER_PROPERTY, false));
     }
 
-    private void writeUseNuplayerOptions() {
+    private void writeUseAwesomePlayerOptions() {
         SystemProperties.set(
-                USE_AWESOMEPLAYER_PROPERTY, mUseNuplayer.isChecked() ? "false" : "true");
+                USE_AWESOMEPLAYER_PROPERTY, mUseAwesomePlayer.isChecked() ? "true" : "false");
         pokeSystemProperties();
     }
 
     private void updateUSBAudioOptions() {
-        updateCheckBox(mUSBAudio, Settings.Secure.getInt(getContentResolver(),
+        updateSwitchPreference(mUSBAudio, Settings.Secure.getInt(getContentResolver(),
                 Settings.Secure.USB_AUDIO_AUTOMATIC_ROUTING_DISABLED, 0) != 0);
     }
 
@@ -1020,7 +1022,7 @@
     }
 
     private void updateForceRtlOptions() {
-        updateCheckBox(mForceRtlLayout, Settings.Global.getInt(getActivity().getContentResolver(),
+        updateSwitchPreference(mForceRtlLayout, Settings.Global.getInt(getActivity().getContentResolver(),
                 Settings.Global.DEVELOPMENT_FORCE_RTL, 0) != 0);
     }
 
@@ -1033,7 +1035,7 @@
     }
 
     private void updateWifiDisplayCertificationOptions() {
-        updateCheckBox(mWifiDisplayCertification, Settings.Global.getInt(
+        updateSwitchPreference(mWifiDisplayCertification, Settings.Global.getInt(
                 getActivity().getContentResolver(),
                 Settings.Global.WIFI_DISPLAY_CERTIFICATION_ON, 0) != 0);
     }
@@ -1046,7 +1048,7 @@
 
     private void updateWifiVerboseLoggingOptions() {
         boolean enabled = mWifiManager.getVerboseLoggingLevel() > 0;
-        updateCheckBox(mWifiVerboseLogging, enabled);
+        updateSwitchPreference(mWifiVerboseLogging, enabled);
     }
 
     private void writeWifiVerboseLoggingOptions() {
@@ -1055,7 +1057,7 @@
 
     private void updateWifiAggressiveHandoverOptions() {
         boolean enabled = mWifiManager.getAggressiveHandover() > 0;
-        updateCheckBox(mWifiAggressiveHandover, enabled);
+        updateSwitchPreference(mWifiAggressiveHandover, enabled);
     }
 
     private void writeWifiAggressiveHandoverOptions() {
@@ -1064,7 +1066,7 @@
 
     private void updateWifiAllowScansWithTrafficOptions() {
         boolean enabled = mWifiManager.getAllowScansWithTraffic() > 0;
-        updateCheckBox(mWifiAllowScansWithTraffic, enabled);
+        updateSwitchPreference(mWifiAllowScansWithTraffic, enabled);
     }
 
     private void writeWifiAllowScansWithTrafficOptions() {
@@ -1121,7 +1123,7 @@
     }
 
     private void updateCpuUsageOptions() {
-        updateCheckBox(mShowCpuUsage, Settings.Global.getInt(getActivity().getContentResolver(),
+        updateSwitchPreference(mShowCpuUsage, Settings.Global.getInt(getActivity().getContentResolver(),
                 Settings.Global.SHOW_PROCESSES, 0) != 0);
     }
 
@@ -1147,8 +1149,8 @@
     }
 
     private void updateImmediatelyDestroyActivitiesOptions() {
-        updateCheckBox(mImmediatelyDestroyActivities, Settings.Global.getInt(
-            getActivity().getContentResolver(), Settings.Global.ALWAYS_FINISH_ACTIVITIES, 0) != 0);
+        updateSwitchPreference(mImmediatelyDestroyActivities, Settings.Global.getInt(
+                getActivity().getContentResolver(), Settings.Global.ALWAYS_FINISH_ACTIVITIES, 0) != 0);
     }
 
     private void updateAnimationScaleValue(int which, ListPreference pref) {
@@ -1273,8 +1275,26 @@
     }
 
     private void updateShowAllANRsOptions() {
-        updateCheckBox(mShowAllANRs, Settings.Secure.getInt(
-            getActivity().getContentResolver(), Settings.Secure.ANR_SHOW_BACKGROUND, 0) != 0);
+        updateSwitchPreference(mShowAllANRs, Settings.Secure.getInt(
+                getActivity().getContentResolver(), Settings.Secure.ANR_SHOW_BACKGROUND, 0) != 0);
+    }
+
+    private void confirmEnableOemUnlock() {
+        DialogInterface.OnClickListener onConfirmListener = new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                Utils.setOemUnlockEnabled(getActivity(), true);
+                updateAllOptions();
+            }
+        };
+
+        new AlertDialog.Builder(getActivity())
+                .setTitle(R.string.confirm_enable_oem_unlock_title)
+                .setMessage(R.string.confirm_enable_oem_unlock_text)
+                .setPositiveButton(R.string.enable_text, onConfirmListener)
+                .setNegativeButton(android.R.string.cancel, null)
+                .create()
+                .show();
     }
 
     @Override
@@ -1312,6 +1332,14 @@
                 writeDebuggerOptions();
                 updateDebuggerOptions();
             }
+        } else if (requestCode == REQUEST_CODE_ENABLE_OEM_UNLOCK) {
+            if (resultCode == Activity.RESULT_OK) {
+                if (mEnableOemUnlock.isChecked()) {
+                    confirmEnableOemUnlock();
+                } else {
+                    Utils.setOemUnlockEnabled(getActivity(), false);
+                }
+            }
         } else {
             super.onActivityResult(requestCode, resultCode, data);
         }
@@ -1365,7 +1393,13 @@
         } else if (preference == mBtHciSnoopLog) {
             writeBtHciSnoopLogOptions();
         } else if (preference == mEnableOemUnlock) {
-            Utils.setOemUnlockEnabled(getActivity(), mEnableOemUnlock.isChecked());
+            if (!showKeyguardConfirmation(getResources(), REQUEST_CODE_ENABLE_OEM_UNLOCK)) {
+                if (mEnableOemUnlock.isChecked()) {
+                    confirmEnableOemUnlock();
+                } else {
+                    Utils.setOemUnlockEnabled(getActivity(), false);
+                }
+            }
         } else if (preference == mAllowMockLocation) {
             Settings.Secure.putInt(getActivity().getContentResolver(),
                     Settings.Secure.ALLOW_MOCK_LOCATION,
@@ -1416,8 +1450,8 @@
             writeWifiAggressiveHandoverOptions();
         } else if (preference == mWifiAllowScansWithTraffic) {
             writeWifiAllowScansWithTrafficOptions();
-        } else if (preference == mUseNuplayer) {
-            writeUseNuplayerOptions();
+        } else if (preference == mUseAwesomePlayer) {
+            writeUseAwesomePlayerOptions();
         } else if (preference == mUSBAudio) {
             writeUSBAudioOptions();
         } else {
@@ -1427,6 +1461,13 @@
         return false;
     }
 
+    private boolean showKeyguardConfirmation(Resources resources, int requestCode) {
+        return new ChooseLockSettingsHelper(getActivity(), this)
+                .launchConfirmationActivity(requestCode,
+                        resources.getString(R.string.oem_unlock_enable_pin_prompt),
+                        resources.getString(R.string.oem_unlock_enable_pin_description));
+    }
+
     @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         if (HDCP_CHECKING_KEY.equals(preference.getKey())) {
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/DeviceInfoSettings.java b/src/com/android/settings/DeviceInfoSettings.java
index b6d8fef..f79707a 100644
--- a/src/com/android/settings/DeviceInfoSettings.java
+++ b/src/com/android/settings/DeviceInfoSettings.java
@@ -64,6 +64,7 @@
     private static final String KEY_TERMS = "terms";
     private static final String KEY_LICENSE = "license";
     private static final String KEY_COPYRIGHT = "copyright";
+    private static final String KEY_WEBVIEW_LICENSE = "webview_license";
     private static final String KEY_SYSTEM_UPDATE_SETTINGS = "system_update_settings";
     private static final String PROPERTY_URL_SAFETYLEGAL = "ro.url.safetylegal";
     private static final String PROPERTY_SELINUX_STATUS = "ro.build.selinux";
@@ -144,6 +145,8 @@
                 Utils.UPDATE_PREFERENCE_FLAG_SET_TITLE_TO_MATCHING_ACTIVITY);
         Utils.updatePreferenceToSpecificActivityOrRemove(act, parentPreference, KEY_COPYRIGHT,
                 Utils.UPDATE_PREFERENCE_FLAG_SET_TITLE_TO_MATCHING_ACTIVITY);
+        Utils.updatePreferenceToSpecificActivityOrRemove(act, parentPreference, KEY_WEBVIEW_LICENSE,
+                Utils.UPDATE_PREFERENCE_FLAG_SET_TITLE_TO_MATCHING_ACTIVITY);
 
         // These are contained by the root preference screen
         parentPreference = getPreferenceScreen();
@@ -448,6 +451,9 @@
                 if (!checkIntentAction(context, "android.settings.COPYRIGHT")) {
                     keys.add(KEY_COPYRIGHT);
                 }
+                if (!checkIntentAction(context, "android.settings.WEBVIEW_LICENSE")) {
+                    keys.add(KEY_WEBVIEW_LICENSE);
+                }
                 if (UserHandle.myUserId() != UserHandle.USER_OWNER) {
                     keys.add(KEY_SYSTEM_UPDATE_SETTINGS);
                 }
diff --git a/src/com/android/settings/EncryptionInterstitial.java b/src/com/android/settings/EncryptionInterstitial.java
index e836aed..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
@@ -195,9 +195,11 @@
             // Updates value returned by SettingsActivity.onActivityResult().
             SettingsActivity sa = (SettingsActivity)getActivity();
             Intent resultIntentData = sa.getResultIntentData();
-            resultIntentData = resultIntentData == null ? new Intent() : resultIntentData;
+            if (resultIntentData == null) {
+                resultIntentData = new Intent();
+                sa.setResultIntentData(resultIntentData);
+            }
             resultIntentData.putExtra(EXTRA_REQUIRE_PASSWORD, mPasswordRequired);
-            sa.setResultIntentData(resultIntentData);
         }
 
         @Override
diff --git a/src/com/android/settings/HotspotOffReceiver.java b/src/com/android/settings/HotspotOffReceiver.java
new file mode 100644
index 0000000..3ab3f9d
--- /dev/null
+++ b/src/com/android/settings/HotspotOffReceiver.java
@@ -0,0 +1,25 @@
+
+package com.android.settings;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.net.wifi.WifiManager;
+
+/**
+ * This receiver catches when quick settings turns off the hotspot, so we can
+ * cancel the alarm in that case.  All other cancels are handled in tethersettings.
+ */
+public class HotspotOffReceiver extends BroadcastReceiver {
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        if (WifiManager.WIFI_AP_STATE_CHANGED_ACTION.equals(intent.getAction())) {
+            WifiManager wifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
+            if (wifiManager.getWifiApState() == WifiManager.WIFI_AP_STATE_DISABLED) {
+                // The hotspot has been turned off, we don't need to recheck tethering.
+                TetherService.cancelRecheckAlarmIfNecessary(context, TetherSettings.WIFI_TETHERING);
+            }
+        }
+    }
+}
diff --git a/src/com/android/settings/IccLockSettings.java b/src/com/android/settings/IccLockSettings.java
index b988572..c389f5e 100644
--- a/src/com/android/settings/IccLockSettings.java
+++ b/src/com/android/settings/IccLockSettings.java
@@ -25,17 +25,30 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-import android.preference.CheckBoxPreference;
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceScreen;
+import android.preference.SwitchPreference;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
 import android.util.Log;
+import android.view.View;
+import android.widget.ListView;
+import android.widget.TabHost;
+import android.widget.TabHost.OnTabChangeListener;
+import android.widget.TabHost.TabContentFactory;
+import android.widget.TabHost.TabSpec;
+import android.widget.TabWidget;
 import android.widget.Toast;
 
 import com.android.internal.telephony.Phone;
 import com.android.internal.telephony.PhoneFactory;
 import com.android.internal.telephony.TelephonyIntents;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * Implements the preference screen to enable/disable ICC lock and
  * also the dialogs to change the ICC PIN. In the former case, enabling/disabling
@@ -86,10 +99,14 @@
     // Are we trying to enable or disable ICC lock?
     private boolean mToState;
 
+    private TabHost mTabHost;
+    private TabWidget mTabWidget;
+    private ListView mListView;
+
     private Phone mPhone;
 
     private EditPinPreference mPinDialog;
-    private CheckBoxPreference mPinToggle;
+    private SwitchPreference mPinToggle;
 
     private Resources mRes;
 
@@ -143,6 +160,10 @@
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        final Context context = getApplicationContext();
+        final TelephonyManager tm =
+                (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
+        final int numSims = tm.getSimCount();
 
         if (Utils.isMonkeyRunning()) {
             finish();
@@ -152,7 +173,7 @@
         addPreferencesFromResource(R.xml.sim_lock_settings);
 
         mPinDialog = (EditPinPreference) findPreference(PIN_DIALOG);
-        mPinToggle = (CheckBoxPreference) findPreference(PIN_TOGGLE);
+        mPinToggle = (SwitchPreference) findPreference(PIN_TOGGLE);
         if (savedInstanceState != null && savedInstanceState.containsKey(DIALOG_STATE)) {
             mDialogState = savedInstanceState.getInt(DIALOG_STATE);
             mPin = savedInstanceState.getString(DIALOG_PIN);
@@ -182,13 +203,42 @@
         // Don't need any changes to be remembered
         getPreferenceScreen().setPersistent(false);
 
-        mPhone = PhoneFactory.getDefaultPhone();
+        if (numSims > 1) {
+            setContentView(R.layout.icc_lock_tabs);
+
+            mTabHost = (TabHost) findViewById(android.R.id.tabhost);
+            mTabWidget = (TabWidget) findViewById(android.R.id.tabs);
+            mListView = (ListView) findViewById(android.R.id.list);
+
+            mTabHost.setup();
+            mTabHost.setOnTabChangedListener(mTabListener);
+            mTabHost.clearAllTabs();
+
+            for (int i = 0; i < numSims; ++i) {
+                final SubscriptionInfo subInfo = Utils.findRecordBySlotId(this, i);
+                mTabHost.addTab(buildTabSpec(String.valueOf(i),
+                        String.valueOf(subInfo == null
+                            ? context.getString(R.string.sim_editor_title, i + 1)
+                            : subInfo.getDisplayName())));
+            }
+            final SubscriptionInfo sir = Utils.findRecordBySlotId(getBaseContext(), 0);
+
+            mPhone = (sir == null) ? null
+                : PhoneFactory.getPhone(SubscriptionManager.getPhoneId(sir.getSubscriptionId()));
+        } else {
+            mPhone = PhoneFactory.getDefaultPhone();
+        }
         mRes = getResources();
         updatePreferences();
     }
 
     private void updatePreferences() {
-        mPinToggle.setChecked(mPhone.getIccCard().getIccLockEnabled());
+        mPinDialog.setEnabled(mPhone != null);
+        mPinToggle.setEnabled(mPhone != null);
+
+        if (mPhone != null) {
+            mPinToggle.setChecked(mPhone.getIccCard().getIccLockEnabled());
+        }
     }
 
     @Override
@@ -418,4 +468,30 @@
         setDialogValues();
         mDialogState = OFF_MODE;
     }
+
+    private OnTabChangeListener mTabListener = new OnTabChangeListener() {
+        @Override
+        public void onTabChanged(String tabId) {
+            final int slotId = Integer.parseInt(tabId);
+            final SubscriptionInfo sir = Utils.findRecordBySlotId(getBaseContext(), slotId);
+
+            mPhone = (sir == null) ? null
+                : PhoneFactory.getPhone(SubscriptionManager.getPhoneId(sir.getSubscriptionId()));
+
+            // The User has changed tab; update the body.
+            updatePreferences();
+        }
+    };
+
+    private TabContentFactory mEmptyTabContent = new TabContentFactory() {
+        @Override
+        public View createTabContent(String tag) {
+            return new View(mTabHost.getContext());
+        }
+    };
+
+    private TabSpec buildTabSpec(String tag, String title) {
+        return mTabHost.newTabSpec(tag).setIndicator(title).setContent(
+                mEmptyTabContent);
+    }
 }
diff --git a/src/com/android/settings/MasterClear.java b/src/com/android/settings/MasterClear.java
index f789b93..2b086a6 100644
--- a/src/com/android/settings/MasterClear.java
+++ b/src/com/android/settings/MasterClear.java
@@ -24,15 +24,19 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
+import android.content.pm.UserInfo;
 import android.content.res.Resources;
+import android.content.res.TypedArray;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.os.Environment;
 import android.os.Process;
 import android.os.SystemProperties;
+import android.os.UserHandle;
 import android.os.UserManager;
 import android.preference.Preference;
 import android.util.Log;
+import android.util.SparseArray;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -41,6 +45,8 @@
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import java.util.List;
+
 /**
  * Confirm and execute a reset of the device to a clean "just out of the box"
  * state.  Multiple confirmations are required: first, a general "are you sure
@@ -72,8 +78,7 @@
     private boolean runKeyguardConfirmation(int request) {
         Resources res = getActivity().getResources();
         return new ChooseLockSettingsHelper(getActivity(), this)
-                .launchConfirmationActivity(request,
-                        res.getText(R.string.master_clear_gesture_prompt),
+                .launchConfirmationActivity(request, null,
                         res.getText(R.string.master_clear_gesture_explanation));
     }
 
@@ -165,7 +170,8 @@
             });
         }
 
-        loadAccountList();
+        final UserManager um = (UserManager) getActivity().getSystemService(Context.USER_SERVICE);
+        loadAccountList(um);
     }
 
     private boolean isExtStorageEncrypted() {
@@ -173,63 +179,86 @@
         return !"".equals(state);
     }
 
-    private void loadAccountList() {
+    private void loadAccountList(final UserManager um) {
         View accountsLabel = mContentView.findViewById(R.id.accounts_label);
         LinearLayout contents = (LinearLayout)mContentView.findViewById(R.id.accounts);
         contents.removeAllViews();
 
         Context context = getActivity();
+        final List<UserInfo> profiles = um.getProfiles(UserHandle.myUserId());
+        final int profilesSize = profiles.size();
 
         AccountManager mgr = AccountManager.get(context);
-        Account[] accounts = mgr.getAccounts();
-        final int N = accounts.length;
-        if (N == 0) {
-            accountsLabel.setVisibility(View.GONE);
-            contents.setVisibility(View.GONE);
-            return;
-        }
 
         LayoutInflater inflater = (LayoutInflater)context.getSystemService(
                 Context.LAYOUT_INFLATER_SERVICE);
 
-        AuthenticatorDescription[] descs = AccountManager.get(context).getAuthenticatorTypes();
-        final int M = descs.length;
-
-        for (int i=0; i<N; i++) {
-            Account account = accounts[i];
-            AuthenticatorDescription desc = null;
-            for (int j=0; j<M; j++) {
-                if (account.type.equals(descs[j].type)) {
-                    desc = descs[j];
-                    break;
-                }
-            }
-            if (desc == null) {
-                Log.w(TAG, "No descriptor for account name=" + account.name
-                        + " type=" + account.type);
+        int accountsCount = 0;
+        for (int profileIndex = 0; profileIndex < profilesSize; profileIndex++) {
+            final UserInfo userInfo = profiles.get(profileIndex);
+            final int profileId = userInfo.id;
+            final UserHandle userHandle = new UserHandle(profileId);
+            Account[] accounts = mgr.getAccountsAsUser(profileId);
+            final int N = accounts.length;
+            if (N == 0) {
                 continue;
             }
-            Drawable icon = null;
-            try {
-                if (desc.iconId != 0) {
-                    Context authContext = context.createPackageContext(desc.packageName, 0);
-                    icon = authContext.getResources().getDrawable(desc.iconId);
-                }
-            } catch (PackageManager.NameNotFoundException e) {
-                Log.w(TAG, "No icon for account type " + desc.type);
-            }
+            accountsCount += N;
 
-            TextView child = (TextView)inflater.inflate(R.layout.master_clear_account,
-                    contents, false);
-            child.setText(account.name);
-            if (icon != null) {
-                child.setCompoundDrawablesWithIntrinsicBounds(icon, null, null, null);
+            AuthenticatorDescription[] descs = AccountManager.get(context)
+                    .getAuthenticatorTypesAsUser(profileId);
+            final int M = descs.length;
+
+            View titleView = newTitleView(contents, inflater);
+            final TextView titleText = (TextView) titleView.findViewById(android.R.id.title);
+            titleText.setText(userInfo.isManagedProfile() ? R.string.category_work
+                    : R.string.category_personal);
+            contents.addView(titleView);
+
+            for (int i = 0; i < N; i++) {
+                Account account = accounts[i];
+                AuthenticatorDescription desc = null;
+                for (int j = 0; j < M; j++) {
+                    if (account.type.equals(descs[j].type)) {
+                        desc = descs[j];
+                        break;
+                    }
+                }
+                if (desc == null) {
+                    Log.w(TAG, "No descriptor for account name=" + account.name
+                            + " type=" + account.type);
+                    continue;
+                }
+                Drawable icon = null;
+                try {
+                    if (desc.iconId != 0) {
+                        Context authContext = context.createPackageContextAsUser(desc.packageName,
+                                0, userHandle);
+                        icon = context.getPackageManager().getUserBadgedIcon(
+                                authContext.getDrawable(desc.iconId), userHandle);
+                    }
+                } catch (PackageManager.NameNotFoundException e) {
+                    Log.w(TAG, "No icon for account type " + desc.type);
+                }
+
+                TextView child = (TextView)inflater.inflate(R.layout.master_clear_account,
+                        contents, false);
+                child.setText(account.name);
+                if (icon != null) {
+                    child.setCompoundDrawablesWithIntrinsicBounds(icon, null, null, null);
+                }
+                contents.addView(child);
             }
-            contents.addView(child);
         }
 
-        accountsLabel.setVisibility(View.VISIBLE);
-        contents.setVisibility(View.VISIBLE);
+        if (accountsCount > 0) {
+            accountsLabel.setVisibility(View.VISIBLE);
+            contents.setVisibility(View.VISIBLE);
+        }
+        // Checking for all other users and their profiles if any.
+        View otherUsers = mContentView.findViewById(R.id.other_users_present);
+        final boolean hasOtherUsers = (um.getUserCount() - profilesSize) > 0;
+        otherUsers.setVisibility(hasOtherUsers ? View.VISIBLE : View.GONE);
     }
 
     @Override
@@ -246,4 +275,13 @@
         establishInitialState();
         return mContentView;
     }
+
+    private View newTitleView(ViewGroup parent, LayoutInflater inflater) {
+        final TypedArray a = inflater.getContext().obtainStyledAttributes(null,
+                com.android.internal.R.styleable.Preference,
+                com.android.internal.R.attr.preferenceCategoryStyle, 0);
+        final int resId = a.getResourceId(com.android.internal.R.styleable.Preference_layout,
+                0);
+        return inflater.inflate(resId, parent, false);
+    }
 }
diff --git a/src/com/android/settings/MediaFormat.java b/src/com/android/settings/MediaFormat.java
index dc495ec..20dac8e 100644
--- a/src/com/android/settings/MediaFormat.java
+++ b/src/com/android/settings/MediaFormat.java
@@ -73,8 +73,7 @@
      */
     private boolean runKeyguardConfirmation(int request) {
         return new ChooseLockSettingsHelper(this)
-                .launchConfirmationActivity(request,
-                        getText(R.string.media_format_gesture_prompt),
+                .launchConfirmationActivity(request, null,
                         getText(R.string.media_format_gesture_explanation));
     }
 
diff --git a/src/com/android/settings/NsdEnabler.java b/src/com/android/settings/NsdEnabler.java
index acdf92e..f638bc3 100644
--- a/src/com/android/settings/NsdEnabler.java
+++ b/src/com/android/settings/NsdEnabler.java
@@ -21,18 +21,16 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.net.nsd.NsdManager;
-import android.preference.CheckBoxPreference;
 import android.preference.Preference;
-import android.preference.PreferenceScreen;
 
-import com.android.settings.R;
+import android.preference.SwitchPreference;
 
 /**
  * NsdEnabler is a helper to manage network service discovery on/off checkbox state.
  */
 public class NsdEnabler implements Preference.OnPreferenceChangeListener {
     private final Context mContext;
-    private final CheckBoxPreference mCheckbox;
+    private final SwitchPreference mSwitchPreference;
     private final IntentFilter mIntentFilter;
     private NsdManager mNsdManager;
 
@@ -47,27 +45,27 @@
         }
     };
 
-    public NsdEnabler(Context context, CheckBoxPreference checkBoxPreference) {
+    public NsdEnabler(Context context, SwitchPreference pref) {
         mContext = context;
-        mCheckbox = checkBoxPreference;
+        mSwitchPreference = pref;
         mNsdManager = (NsdManager) mContext.getSystemService(Context.NSD_SERVICE);
         mIntentFilter = new IntentFilter(NsdManager.ACTION_NSD_STATE_CHANGED);
     }
 
     public void resume() {
         mContext.registerReceiver(mReceiver, mIntentFilter);
-        mCheckbox.setOnPreferenceChangeListener(this);
+        mSwitchPreference.setOnPreferenceChangeListener(this);
     }
 
     public void pause() {
         mContext.unregisterReceiver(mReceiver);
-        mCheckbox.setOnPreferenceChangeListener(null);
+        mSwitchPreference.setOnPreferenceChangeListener(null);
     }
 
     public boolean onPreferenceChange(Preference preference, Object value) {
 
         final boolean desiredState = (Boolean) value;
-        mCheckbox.setEnabled(false);
+        mSwitchPreference.setEnabled(false);
         mNsdManager.setEnabled(desiredState);
         return false;
     }
@@ -75,12 +73,12 @@
     private void handleNsdStateChanged(int newState) {
         switch (newState) {
             case NsdManager.NSD_STATE_DISABLED:
-                mCheckbox.setChecked(false);
-                mCheckbox.setEnabled(true);
+                mSwitchPreference.setChecked(false);
+                mSwitchPreference.setEnabled(true);
                 break;
             case NsdManager.NSD_STATE_ENABLED:
-                mCheckbox.setChecked(true);
-                mCheckbox.setEnabled(true);
+                mSwitchPreference.setChecked(true);
+                mSwitchPreference.setEnabled(true);
                 break;
         }
     }
diff --git a/src/com/android/settings/PrivacySettings.java b/src/com/android/settings/PrivacySettings.java
index 0a9f086..8df78c5 100644
--- a/src/com/android/settings/PrivacySettings.java
+++ b/src/com/android/settings/PrivacySettings.java
@@ -30,13 +30,16 @@
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.preference.Preference;
+import android.preference.PreferenceCategory;
 import android.preference.Preference.OnPreferenceChangeListener;
 import android.preference.PreferenceScreen;
 import android.preference.SwitchPreference;
 import android.provider.SearchIndexableResource;
 import android.provider.Settings;
+import android.util.Log;
 
 import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.search.Indexable;
 import com.android.settings.search.Indexable.SearchIndexProvider;
 
 import java.util.ArrayList;
@@ -46,7 +49,7 @@
  * Gesture lock pattern settings.
  */
 public class PrivacySettings extends SettingsPreferenceFragment implements
-        DialogInterface.OnClickListener {
+        DialogInterface.OnClickListener, Indexable {
 
     // Vendor specific
     private static final String GSETTINGS_PROVIDER = "com.google.settings";
@@ -54,7 +57,9 @@
     private static final String BACKUP_DATA = "backup_data";
     private static final String AUTO_RESTORE = "auto_restore";
     private static final String CONFIGURE_ACCOUNT = "configure_account";
+    private static final String BACKUP_INACTIVE = "backup_inactive";
     private static final String PERSONAL_DATA_CATEGORY = "personal_data_category";
+    private static final String TAG = "PrivacySettings";
     private IBackupManager mBackupManager;
     private SwitchPreference mBackup;
     private SwitchPreference mAutoRestore;
@@ -87,15 +92,23 @@
 
         mConfigure = (PreferenceScreen) screen.findPreference(CONFIGURE_ACCOUNT);
 
-        if (UserManager.get(getActivity()).hasUserRestriction(
-                UserManager.DISALLOW_FACTORY_RESET)) {
-            screen.removePreference(findPreference(PERSONAL_DATA_CATEGORY));
+        ArrayList<String> keysToRemove = getNonVisibleKeys(getActivity());
+        final int screenPreferenceCount = screen.getPreferenceCount();
+        for (int i = screenPreferenceCount - 1; i >= 0; --i) {
+            Preference preference = screen.getPreference(i);
+            if (keysToRemove.contains(preference.getKey())) {
+                screen.removePreference(preference);
+            }
         }
-
-        // Vendor specific
-        if (getActivity().getPackageManager().
-                resolveContentProvider(GSETTINGS_PROVIDER, 0) == null) {
-            screen.removePreference(findPreference(BACKUP_CATEGORY));
+        PreferenceCategory backupCategory = (PreferenceCategory) findPreference(BACKUP_CATEGORY);
+        if (backupCategory != null) {
+            final int backupCategoryPreferenceCount = backupCategory.getPreferenceCount();
+            for (int i = backupCategoryPreferenceCount - 1; i >= 0; --i) {
+                Preference preference = backupCategory.getPreference(i);
+                if (keysToRemove.contains(preference.getKey())) {
+                    backupCategory.removePreference(preference);
+                }
+            }
         }
         updateToggles();
     }
@@ -284,6 +297,40 @@
 
             return result;
         }
+
+        @Override
+        public List<String> getNonIndexableKeys(Context context) {
+            return getNonVisibleKeys(context);
+        }
     }
 
-}
\ No newline at end of file
+    private static ArrayList<String> getNonVisibleKeys(Context context) {
+        final ArrayList<String> nonVisibleKeys = new ArrayList<String>();
+        final IBackupManager backupManager = IBackupManager.Stub.asInterface(
+                ServiceManager.getService(Context.BACKUP_SERVICE));
+        boolean isServiceActive = false;
+        try {
+            isServiceActive = backupManager.isBackupServiceActive(UserHandle.myUserId());
+        } catch (RemoteException e) {
+            Log.w(TAG, "Failed querying backup manager service activity status. " +
+                    "Assuming it is inactive.");
+        }
+        if (isServiceActive) {
+            nonVisibleKeys.add(BACKUP_INACTIVE);
+        } else {
+            nonVisibleKeys.add(AUTO_RESTORE);
+            nonVisibleKeys.add(CONFIGURE_ACCOUNT);
+            nonVisibleKeys.add(BACKUP_DATA);
+        }
+        if (UserManager.get(context).hasUserRestriction(
+                UserManager.DISALLOW_FACTORY_RESET)) {
+            nonVisibleKeys.add(PERSONAL_DATA_CATEGORY);
+        }
+        // Vendor specific
+        if (context.getPackageManager().
+                resolveContentProvider(GSETTINGS_PROVIDER, 0) == null) {
+            nonVisibleKeys.add(BACKUP_CATEGORY);
+        }
+        return nonVisibleKeys;
+    }
+}
diff --git a/src/com/android/settings/RadioInfo.java b/src/com/android/settings/RadioInfo.java
index b0a4a53..a296564 100644
--- a/src/com/android/settings/RadioInfo.java
+++ b/src/com/android/settings/RadioInfo.java
@@ -17,6 +17,7 @@
 package com.android.settings;
 
 import android.app.Activity;
+import android.app.QueuedWork;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
@@ -55,6 +56,9 @@
 import com.android.internal.telephony.PhoneFactory;
 import com.android.internal.telephony.PhoneStateIntentReceiver;
 import com.android.internal.telephony.TelephonyProperties;
+import com.android.ims.ImsConfig;
+import com.android.ims.ImsException;
+import com.android.ims.ImsManager;
 import org.apache.http.HttpResponse;
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.methods.HttpGet;
@@ -195,6 +199,7 @@
                 case EVENT_SERVICE_STATE_CHANGED:
                     updateServiceState();
                     updatePowerState();
+                    updateImsVoLteProvisionedState();
                     break;
 
                 case EVENT_QUERY_PREFERRED_TYPE_DONE:
@@ -303,6 +308,9 @@
         imsRegRequiredButton = (Button) findViewById(R.id.ims_reg_required);
         imsRegRequiredButton.setOnClickListener(mImsRegRequiredHandler);
 
+        imsVoLteProvisionedButton = (Button) findViewById(R.id.volte_provisioned_flag);
+        imsVoLteProvisionedButton.setOnClickListener(mImsVoLteProvisionedHandler);
+
         smsOverImsButton = (Button) findViewById(R.id.sms_over_ims);
         smsOverImsButton.setOnClickListener(mSmsOverImsHandler);
 
@@ -360,6 +368,7 @@
         updatePowerState();
         updateCellInfoListRate();
         updateImsRegRequiredState();
+        updateImsVoLteProvisionedState();
         updateSmsOverImsState();
         updateLteRamDumpState();
         updateProperties();
@@ -876,7 +885,7 @@
             // other than the Dialer process, which causes a lot of stuff to
             // break.
             intent.setClassName("com.android.phone",
-                    "com.android.phone.FdnList");
+                    "com.android.phone.settings.fdn.FdnList");
             startActivity(intent);
             return true;
         }
@@ -1002,6 +1011,49 @@
         return SystemProperties.getBoolean(PROPERTY_SMS_OVER_IMS, false);
     }
 
+    private Button imsVoLteProvisionedButton;
+    OnClickListener mImsVoLteProvisionedHandler = new OnClickListener() {
+        @Override
+        public void onClick(View v) {
+            log(String.format("toggle VoLTE provisioned: currently %s",
+                    (isImsVoLteProvisioned() ? "on":"off")));
+            final boolean newValue = !isImsVoLteProvisioned();
+            if (phone != null) {
+                final ImsManager imsManager = ImsManager.getInstance(phone.getContext(), phone.getSubId());
+                if (imsManager != null) {
+                    QueuedWork.singleThreadExecutor().submit(new Runnable() {
+                        public void run() {
+                            try {
+                                imsManager.getConfigInterface().setProvisionedValue(
+                                        ImsConfig.ConfigConstants.VLT_SETTING_ENABLED,
+                                        newValue? 1 : 0);
+                            } catch (ImsException e) {
+                                Log.e(TAG, "setImsVoLteProvisioned() exception:", e);
+                            }
+                        }
+                    });
+                }
+            }
+            updateImsVoLteProvisionedState();
+        }
+    };
+
+    private boolean isImsVoLteProvisioned() {
+        if (phone != null) {
+            ImsManager imsManager = ImsManager.getInstance(phone.getContext(), phone.getSubId());
+            return imsManager.isVolteProvisionedOnDevice(phone.getContext());
+        }
+        return false;
+    }
+
+    private void updateImsVoLteProvisionedState() {
+        log("updateImsVoLteProvisionedState isImsVoLteProvisioned()=" + isImsVoLteProvisioned());
+        String buttonText = isImsVoLteProvisioned() ?
+                getString(R.string.volte_provisioned_flag_off) :
+                getString(R.string.volte_provisioned_flag_on);
+        imsVoLteProvisionedButton.setText(buttonText);
+    }
+
     private void updateSmsOverImsState() {
         log("updateSmsOverImsState isSmsOverImsEnabled()=" + isSmsOverImsEnabled());
         String buttonText = isSmsOverImsEnabled() ?
diff --git a/src/com/android/settings/RegulatoryInfoDisplayActivity.java b/src/com/android/settings/RegulatoryInfoDisplayActivity.java
index 171059c..c674f13 100644
--- a/src/com/android/settings/RegulatoryInfoDisplayActivity.java
+++ b/src/com/android/settings/RegulatoryInfoDisplayActivity.java
@@ -63,7 +63,7 @@
         int resId = getResourceId();
         if (resId != 0) {
             try {
-                Drawable d = resources.getDrawable(resId);
+                Drawable d = getDrawable(resId);
                 // set to false if the width or height is <= 2
                 // (missing PNG can return an empty 2x2 pixel Drawable)
                 regulatoryInfoDrawableExists = (d.getIntrinsicWidth() > 2
diff --git a/src/com/android/settings/RestrictedSettingsFragment.java b/src/com/android/settings/RestrictedSettingsFragment.java
index 7d7599f..64e1e3f 100644
--- a/src/com/android/settings/RestrictedSettingsFragment.java
+++ b/src/com/android/settings/RestrictedSettingsFragment.java
@@ -16,8 +16,6 @@
 
 package com.android.settings;
 
-import java.util.HashSet;
-
 import android.app.Activity;
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -27,8 +25,6 @@
 import android.os.Bundle;
 import android.os.PersistableBundle;
 import android.os.UserManager;
-import android.preference.CheckBoxPreference;
-import android.preference.Preference;
 
 /**
  * Base class for settings screens that should be pin protected when in restricted mode.
diff --git a/src/com/android/settings/ScreenPinningSettings.java b/src/com/android/settings/ScreenPinningSettings.java
index ada5b17..3f39088 100644
--- a/src/com/android/settings/ScreenPinningSettings.java
+++ b/src/com/android/settings/ScreenPinningSettings.java
@@ -15,42 +15,59 @@
  */
 package com.android.settings;
 
-import java.util.ArrayList;
-import java.util.List;
-
+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.Preference;
+import android.preference.Preference.OnPreferenceChangeListener;
+import android.preference.PreferenceScreen;
+import android.preference.SwitchPreference;
 import android.provider.Settings;
-import android.provider.Settings.SettingNotFoundException;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Switch;
 
+import com.android.internal.widget.LockPatternUtils;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
 import com.android.settings.search.SearchIndexableRaw;
 import com.android.settings.widget.SwitchBar;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * Screen pinning settings.
  */
 public class ScreenPinningSettings extends SettingsPreferenceFragment
         implements SwitchBar.OnSwitchChangeListener, Indexable {
 
+    private static final CharSequence KEY_USE_SCREEN_LOCK = "use_screen_lock";
+    private static final int CHANGE_LOCK_METHOD_REQUEST = 43;
+
     private SwitchBar mSwitchBar;
+    private SwitchPreference mUseScreenLock;
+    private LockPatternUtils mLockPatternUtils;
 
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
 
         final SettingsActivity activity = (SettingsActivity) getActivity();
+        mLockPatternUtils = new LockPatternUtils(activity);
+
+        View emptyView = LayoutInflater.from(activity)
+                .inflate(R.layout.screen_pinning_instructions, null);
+        ((ViewGroup) getListView().getParent()).addView(emptyView);
+        getListView().setEmptyView(emptyView);
 
         mSwitchBar = activity.getSwitchBar();
         mSwitchBar.addOnSwitchChangeListener(this);
         mSwitchBar.show();
-        mSwitchBar.setChecked(isLockToAppEnabled());
+        mSwitchBar.setChecked(isLockToAppEnabled(getActivity()));
     }
 
     @Override
@@ -61,19 +78,9 @@
         mSwitchBar.hide();
     }
 
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-            Bundle savedInstanceState) {
-        return inflater.inflate(R.layout.screen_pinning_instructions, null);
-    }
-
-    private boolean isLockToAppEnabled() {
-        try {
-            return Settings.System.getInt(getContentResolver(), Settings.System.LOCK_TO_APP_ENABLED)
-                != 0;
-        } catch (SettingNotFoundException e) {
-            return false;
-        }
+    private static boolean isLockToAppEnabled(Context context) {
+        return Settings.System.getInt(context.getContentResolver(),
+                Settings.System.LOCK_TO_APP_ENABLED, 0) != 0;
     }
 
     private void setLockToAppEnabled(boolean isEnabled) {
@@ -81,12 +88,89 @@
                 isEnabled ? 1 : 0);
     }
 
+    private boolean isScreenLockUsed() {
+        int def = getCurrentSecurityTitle() != R.string.screen_pinning_unlock_none ? 1 : 0;
+        return Settings.Secure.getInt(getContentResolver(),
+                Settings.Secure.LOCK_TO_APP_EXIT_LOCKED, def) != 0;
+    }
+
+    private boolean setScreenLockUsed(boolean isEnabled) {
+        if (isEnabled) {
+            LockPatternUtils lockPatternUtils = new LockPatternUtils(getActivity());
+            if (lockPatternUtils.getKeyguardStoredPasswordQuality()
+                    == DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED) {
+                Intent chooseLockIntent = new Intent(DevicePolicyManager.ACTION_SET_NEW_PASSWORD);
+                chooseLockIntent.putExtra(
+                        ChooseLockGeneric.ChooseLockGenericFragment.MINIMUM_QUALITY_KEY,
+                        DevicePolicyManager.PASSWORD_QUALITY_SOMETHING);
+                startActivityForResult(chooseLockIntent, CHANGE_LOCK_METHOD_REQUEST);
+                return false;
+            }
+        }
+        Settings.Secure.putInt(getContentResolver(), Settings.Secure.LOCK_TO_APP_EXIT_LOCKED,
+                isEnabled ? 1 : 0);
+        return true;
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == CHANGE_LOCK_METHOD_REQUEST) {
+            LockPatternUtils lockPatternUtils = new LockPatternUtils(getActivity());
+            boolean validPassQuality = lockPatternUtils.getKeyguardStoredPasswordQuality()
+                    != DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED;
+            setScreenLockUsed(validPassQuality);
+            // Make sure the screen updates.
+            mUseScreenLock.setChecked(validPassQuality);
+        }
+    }
+
+    private int getCurrentSecurityTitle() {
+        int quality = mLockPatternUtils.getKeyguardStoredPasswordQuality();
+        switch (quality) {
+            case DevicePolicyManager.PASSWORD_QUALITY_NUMERIC:
+            case DevicePolicyManager.PASSWORD_QUALITY_NUMERIC_COMPLEX:
+                return R.string.screen_pinning_unlock_pin;
+            case DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC:
+            case DevicePolicyManager.PASSWORD_QUALITY_ALPHANUMERIC:
+            case DevicePolicyManager.PASSWORD_QUALITY_COMPLEX:
+                return R.string.screen_pinning_unlock_password;
+            case DevicePolicyManager.PASSWORD_QUALITY_SOMETHING:
+                if (mLockPatternUtils.isLockPatternEnabled()) {
+                    return R.string.screen_pinning_unlock_pattern;
+                }
+        }
+        return R.string.screen_pinning_unlock_none;
+    }
+
     /**
      * Listens to the state change of the lock-to-app master switch.
      */
     @Override
     public void onSwitchChanged(Switch switchView, boolean isChecked) {
         setLockToAppEnabled(isChecked);
+        updateDisplay();
+    }
+
+    public void updateDisplay() {
+        PreferenceScreen root = getPreferenceScreen();
+        if (root != null) {
+            root.removeAll();
+        }
+        if (isLockToAppEnabled(getActivity())) {
+            addPreferencesFromResource(R.xml.screen_pinning_settings);
+            root = getPreferenceScreen();
+
+            mUseScreenLock = (SwitchPreference) root.findPreference(KEY_USE_SCREEN_LOCK);
+            mUseScreenLock.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
+                @Override
+                public boolean onPreferenceChange(Preference preference, Object newValue) {
+                    return setScreenLockUsed((boolean) newValue);
+                }
+            });
+            mUseScreenLock.setChecked(isScreenLockUsed());
+            mUseScreenLock.setTitle(getCurrentSecurityTitle());
+        }
     }
 
     /**
@@ -106,11 +190,19 @@
                 data.screenTitle = res.getString(R.string.screen_pinning_title);
                 result.add(data);
 
-                // Screen pinning description.
-                data = new SearchIndexableRaw(context);
-                data.title = res.getString(R.string.screen_pinning_description);
-                data.screenTitle = res.getString(R.string.screen_pinning_title);
-                result.add(data);
+                if (isLockToAppEnabled(context)) {
+                    // Screen lock option
+                    data = new SearchIndexableRaw(context);
+                    data.title = res.getString(R.string.screen_pinning_unlock_none);
+                    data.screenTitle = res.getString(R.string.screen_pinning_title);
+                    result.add(data);
+                } else {
+                    // Screen pinning description.
+                    data = new SearchIndexableRaw(context);
+                    data.title = res.getString(R.string.screen_pinning_description);
+                    data.screenTitle = res.getString(R.string.screen_pinning_title);
+                    result.add(data);
+                }
 
                 return result;
             }
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index 6576163..c2990e5 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -44,7 +44,7 @@
 import android.service.trust.TrustAgentService;
 import android.telephony.TelephonyManager;
 import android.telephony.SubscriptionManager;
-import android.telephony.SubInfoRecord;
+import android.telephony.SubscriptionInfo;
 import android.text.TextUtils;
 import android.util.Log;
 
@@ -111,6 +111,7 @@
     private static final boolean ONLY_ONE_TRUST_AGENT = true;
 
     private DevicePolicyManager mDPM;
+    private SubscriptionManager mSubscriptionManager;
 
     private ChooseLockSettingsHelper mChooseLockSettingsHelper;
     private LockPatternUtils mLockPatternUtils;
@@ -136,6 +137,8 @@
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        mSubscriptionManager = SubscriptionManager.from(getActivity());
+
         mLockPatternUtils = new LockPatternUtils(getActivity());
 
         mDPM = (DevicePolicyManager)getSystemService(Context.DEVICE_POLICY_SERVICE);
@@ -295,7 +298,7 @@
 
         // Do not display SIM lock for devices without an Icc card
         TelephonyManager tm = TelephonyManager.getDefault();
-        if (!mIsPrimary || !tm.hasIccCard()) {
+        if (!mIsPrimary || !isSimIccReady()) {
             root.removePreference(root.findPreference(KEY_SIM_LOCK));
         } else {
             // Disable SIM lock if there is no ready SIM card.
@@ -336,7 +339,8 @@
                 KEY_TOGGLE_INSTALL_APPLICATIONS);
         mToggleAppInstallation.setChecked(isNonMarketAppsAllowed());
         // Side loading of apps.
-        mToggleAppInstallation.setEnabled(mIsPrimary);
+        // Disable for restricted profiles. For others, check if policy disallows it.
+        mToggleAppInstallation.setEnabled(!um.getUserInfo(UserHandle.myUserId()).isRestricted());
         if (um.hasUserRestriction(UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES)
                 || um.hasUserRestriction(UserManager.DISALLOW_INSTALL_APPS)) {
             mToggleAppInstallation.setEnabled(false);
@@ -366,15 +370,34 @@
         return root;
     }
 
+    /* Return true if a there is a Slot that has Icc.
+     */
+    private boolean isSimIccReady() {
+        TelephonyManager tm = TelephonyManager.getDefault();
+        final List<SubscriptionInfo> subInfoList =
+                mSubscriptionManager.getActiveSubscriptionInfoList();
+
+        if (subInfoList != null) {
+            for (SubscriptionInfo subInfo : subInfoList) {
+                if (tm.hasIccCard(subInfo.getSimSlotIndex())) {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
     /* Return true if a SIM is ready for locking.
      * TODO: consider adding to TelephonyManager or SubscritpionManasger.
      */
-    private static boolean isSimReady() {
+    private boolean isSimReady() {
         int simState = TelephonyManager.SIM_STATE_UNKNOWN;
-        final List<SubInfoRecord> subInfoList = SubscriptionManager.getActiveSubInfoList();
+        final List<SubscriptionInfo> subInfoList =
+                mSubscriptionManager.getActiveSubscriptionInfoList();
         if (subInfoList != null) {
-            for (SubInfoRecord subInfo : subInfoList) {
-                simState = TelephonyManager.getDefault().getSimState(subInfo.slotId);
+            for (SubscriptionInfo subInfo : subInfoList) {
+                simState = TelephonyManager.getDefault().getSimState(subInfo.getSimSlotIndex());
                 if((simState != TelephonyManager.SIM_STATE_ABSENT) &&
                             (simState != TelephonyManager.SIM_STATE_UNKNOWN)){
                     return true;
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 37fcc87..dc5675c 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -184,6 +184,11 @@
      * that fragment.
      */
     public static final String EXTRA_SHOW_FRAGMENT_TITLE = ":settings:show_fragment_title";
+    /**
+     * The package name used to resolve the title resource id.
+     */
+    public static final String EXTRA_SHOW_FRAGMENT_TITLE_RES_PACKAGE_NAME =
+            ":settings:show_fragment_title_res_package_name";
     public static final String EXTRA_SHOW_FRAGMENT_TITLE_RESID =
             ":settings:show_fragment_title_resid";
     public static final String EXTRA_SHOW_FRAGMENT_AS_SHORTCUT =
@@ -657,7 +662,23 @@
         if (initialTitleResId > 0) {
             mInitialTitle = null;
             mInitialTitleResId = initialTitleResId;
-            setTitle(mInitialTitleResId);
+
+            final String initialTitleResPackageName = intent.getStringExtra(
+                    EXTRA_SHOW_FRAGMENT_TITLE_RES_PACKAGE_NAME);
+            if (initialTitleResPackageName != null) {
+                try {
+                    Context authContext = createPackageContextAsUser(initialTitleResPackageName,
+                            0 /* flags */, new UserHandle(UserHandle.myUserId()));
+                    mInitialTitle = authContext.getResources().getText(mInitialTitleResId);
+                    setTitle(mInitialTitle);
+                    mInitialTitleResId = -1;
+                    return;
+                } catch (NameNotFoundException e) {
+                    Log.w(LOG_TAG, "Could not find package" + initialTitleResPackageName);
+                }
+            } else {
+                setTitle(mInitialTitleResId);
+            }
         } else {
             mInitialTitleResId = -1;
             final String initialTitle = intent.getStringExtra(EXTRA_SHOW_FRAGMENT_TITLE);
diff --git a/src/com/android/settings/SettingsLicenseActivity.java b/src/com/android/settings/SettingsLicenseActivity.java
index 3d66b77..52b48bb 100644
--- a/src/com/android/settings/SettingsLicenseActivity.java
+++ b/src/com/android/settings/SettingsLicenseActivity.java
@@ -16,205 +16,64 @@
 
 package com.android.settings;
 
+import android.app.Activity;
+import android.content.ActivityNotFoundException;
+import android.content.Intent;
+import android.net.Uri;
 import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
 import android.os.SystemProperties;
 import android.text.TextUtils;
 import android.util.Log;
-import android.webkit.WebView;
-import android.webkit.WebViewClient;
 import android.widget.Toast;
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.app.ProgressDialog;
-import android.content.DialogInterface;
-import android.content.DialogInterface.OnDismissListener;
-import android.content.res.Configuration;
 
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.util.zip.GZIPInputStream;
+import java.io.File;
 
 /**
  * The "dialog" that shows from "License" in the Settings app.
  */
 public class SettingsLicenseActivity extends Activity {
-
     private static final String TAG = "SettingsLicenseActivity";
-    private static final boolean LOGV = false || false;
 
     private static final String DEFAULT_LICENSE_PATH = "/system/etc/NOTICE.html.gz";
     private static final String PROPERTY_LICENSE_PATH = "ro.config.license_path";
 
-    private Handler mHandler;
-    private WebView mWebView;
-    private ProgressDialog mSpinnerDlg;
-    private AlertDialog mTextDlg;
-
-    private class LicenseFileLoader implements Runnable {
-
-        private static final String INNER_TAG = "SettingsLicenseActivity.LicenseFileLoader";
-        public static final int STATUS_OK = 0;
-        public static final int STATUS_NOT_FOUND = 1;
-        public static final int STATUS_READ_ERROR = 2;
-        public static final int STATUS_EMPTY_FILE = 3;
-
-        private String mFileName;
-        private Handler mHandler;
-
-        public LicenseFileLoader(String fileName, Handler handler) {
-            mFileName = fileName;
-            mHandler = handler;
-        }
-
-        public void run() {
-
-            int status = STATUS_OK;
-
-            InputStreamReader inputReader = null;
-            StringBuilder data = new StringBuilder(2048);
-            try {
-                char[] tmp = new char[2048];
-                int numRead;
-                if (mFileName.endsWith(".gz")) {
-                    inputReader = new InputStreamReader(
-                        new GZIPInputStream(new FileInputStream(mFileName)));
-                } else {
-                    inputReader = new FileReader(mFileName);
-                }
-
-                while ((numRead = inputReader.read(tmp)) >= 0) {
-                    data.append(tmp, 0, numRead);
-                }
-            } catch (FileNotFoundException e) {
-                Log.e(INNER_TAG, "License HTML file not found at " + mFileName, e);
-                status = STATUS_NOT_FOUND;
-            } catch (IOException e) {
-                Log.e(INNER_TAG, "Error reading license HTML file at " + mFileName, e);
-                status = STATUS_READ_ERROR;
-            } finally {
-                try {
-                    if (inputReader != null) {
-                        inputReader.close();
-                    }
-                } catch (IOException e) {
-                }
-            }
-
-            if ((status == STATUS_OK) && TextUtils.isEmpty(data)) {
-                Log.e(INNER_TAG, "License HTML is empty (from " + mFileName + ")");
-                status = STATUS_EMPTY_FILE;
-            }
-
-            // Tell the UI thread that we are finished.
-            Message msg = mHandler.obtainMessage(status, null);
-            if (status == STATUS_OK) {
-                msg.obj = data.toString();
-            }
-            mHandler.sendMessage(msg);
-        }
-    }
-
-    public SettingsLicenseActivity() {
-        super();
-        mHandler = null;
-        mWebView = null;
-        mSpinnerDlg = null;
-        mTextDlg = null;
-    }
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        String fileName = SystemProperties.get(PROPERTY_LICENSE_PATH, DEFAULT_LICENSE_PATH);
-        if (TextUtils.isEmpty(fileName)) {
-            Log.e(TAG, "The system property for the license file is empty.");
+        final String path = SystemProperties.get(PROPERTY_LICENSE_PATH, DEFAULT_LICENSE_PATH);
+        if (TextUtils.isEmpty(path)) {
+            Log.e(TAG, "The system property for the license file is empty");
             showErrorAndFinish();
             return;
         }
 
-        // The activity does not have any view itself,
-        // so set it invisible to avoid displaying the title text in the background.
-        setVisible(false);
-
-        mWebView = new WebView(this);
-
-        mHandler = new Handler() {
-
-            @Override
-            public void handleMessage(Message msg) {
-                super.handleMessage(msg);
-
-                if (msg.what == LicenseFileLoader.STATUS_OK) {
-                    String text = (String) msg.obj;
-                    showPageOfText(text);
-                } else {
-                    showErrorAndFinish();
-                }
-            }
-        };
-
-        CharSequence title = getText(R.string.settings_license_activity_title);
-        CharSequence msg = getText(R.string.settings_license_activity_loading);
-
-        ProgressDialog pd = ProgressDialog.show(this, title, msg, true, false);
-        pd.setProgressStyle(ProgressDialog.STYLE_SPINNER);
-        mSpinnerDlg = pd;
-
-        // Start separate thread to do the actual loading.
-        Thread thread = new Thread(new LicenseFileLoader(fileName, mHandler));
-        thread.start();
-    }
-
-    @Override
-    protected void onDestroy() {
-        if (mTextDlg != null && mTextDlg.isShowing()) {
-            mTextDlg.dismiss();
+        final File file = new File(path);
+        if (!file.exists() || file.length() == 0) {
+            Log.e(TAG, "License file " + path + " does not exist");
+            showErrorAndFinish();
+            return;
         }
-        if (mSpinnerDlg != null && mSpinnerDlg.isShowing()) {
-            mSpinnerDlg.dismiss();
+
+        // Kick off external viewer due to WebView security restrictions; we
+        // carefully point it at HTMLViewer, since it offers to decompress
+        // before viewing.
+        final Intent intent = new Intent(Intent.ACTION_VIEW);
+        intent.setDataAndType(Uri.fromFile(file), "text/html");
+        intent.putExtra(Intent.EXTRA_TITLE, getString(R.string.settings_license_activity_title));
+        intent.addCategory(Intent.CATEGORY_DEFAULT);
+        intent.setPackage("com.android.htmlviewer");
+
+        try {
+            startActivity(intent);
+            finish();
+        } catch (ActivityNotFoundException e) {
+            Log.e(TAG, "Failed to find viewer", e);
+            showErrorAndFinish();
         }
-        super.onDestroy();
-    }
-
-    private void showPageOfText(String text) {
-        // Create an AlertDialog to display the WebView in.
-        AlertDialog.Builder builder = new AlertDialog.Builder(SettingsLicenseActivity.this);
-        builder.setCancelable(true)
-               .setView(mWebView)
-               .setTitle(R.string.settings_license_activity_title);
-
-        mTextDlg = builder.create();
-        mTextDlg.setOnDismissListener(new OnDismissListener() {
-
-            public void onDismiss(DialogInterface dlgi) {
-                SettingsLicenseActivity.this.finish();
-            }
-        });
-
-        // Begin the loading.  This will be done in a separate thread in WebView.
-        mWebView.loadDataWithBaseURL(null, text, "text/html", "utf-8", null);
-        mWebView.setWebViewClient(new WebViewClient() {
-            @Override
-            public void onPageFinished(WebView view, String url) {
-                mSpinnerDlg.dismiss();
-                if (SettingsLicenseActivity.this.isResumed()) {
-                    mTextDlg.show();
-                }
-            }
-        });
-
-        mWebView = null;
     }
 
     private void showErrorAndFinish() {
-        mSpinnerDlg.dismiss();
-        mSpinnerDlg = null;
         Toast.makeText(this, R.string.settings_license_activity_unavailable, Toast.LENGTH_LONG)
                 .show();
         finish();
diff --git a/src/com/android/settings/SettingsSafetyLegalActivity.java b/src/com/android/settings/SettingsSafetyLegalActivity.java
deleted file mode 100644
index 368ee1d..0000000
--- a/src/com/android/settings/SettingsSafetyLegalActivity.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings;
-
-import android.app.AlertDialog;
-import android.content.Context;
-import android.content.res.Configuration;
-import android.os.Build;
-import android.os.Bundle;
-import android.os.SystemProperties;
-import android.telephony.TelephonyManager;
-import android.text.TextUtils;
-import android.view.KeyEvent;
-import android.webkit.WebView;
-import android.webkit.WebViewClient;
-import com.android.internal.app.AlertActivity;
-import com.android.internal.app.AlertController;
-import android.content.DialogInterface;
-
-/**
- * The "dialog" that shows from "Safety information" in the Settings app.
- */
-public class SettingsSafetyLegalActivity extends AlertActivity 
-        implements DialogInterface.OnCancelListener, DialogInterface.OnClickListener {
-    private static final String PROPERTY_LSAFETYLEGAL_URL = "ro.url.safetylegal";
-
-    private WebView mWebView;
-
-    private AlertDialog mErrorDialog = null;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        String userSafetylegalUrl = SystemProperties.get(PROPERTY_LSAFETYLEGAL_URL);
-
-        final Configuration configuration = getResources().getConfiguration();
-        final String language = configuration.locale.getLanguage();
-        final String country = configuration.locale.getCountry();
-
-        String loc = String.format("locale=%s-%s", language, country);
-
-        userSafetylegalUrl = String.format("%s&%s", userSafetylegalUrl, loc);
-
-        mWebView = new WebView(this);
-
-        // Begin accessing
-        mWebView.getSettings().setJavaScriptEnabled(true);
-        if (savedInstanceState == null) {
-            mWebView.loadUrl(userSafetylegalUrl);
-        } else {
-            mWebView.restoreState(savedInstanceState);
-        }
-        mWebView.setWebViewClient(new WebViewClient() {
-            @Override
-            public void onPageFinished(WebView view, String url) {
-                // Change from 'Loading...' to the real title
-                mAlert.setTitle(getString(R.string.settings_safetylegal_activity_title));
-            }
-
-            @Override
-            public void onReceivedError(WebView view, int errorCode,
-                    String description, String failingUrl) {
-                showErrorAndFinish(failingUrl);
-            }
-        });
-
-        final AlertController.AlertParams p = mAlertParams;
-        p.mTitle = getString(R.string.settings_safetylegal_activity_loading);
-        p.mView = mWebView;
-        p.mForceInverseBackground = true;
-        setupAlert();
-    }
-
-    private void showErrorAndFinish(String url) {
-        if (mErrorDialog == null) {
-            mErrorDialog = new AlertDialog.Builder(this)
-                    .setTitle(R.string.settings_safetylegal_activity_title)
-                    .setPositiveButton(android.R.string.ok, this)
-                    .setOnCancelListener(this)
-                    .setCancelable(true)
-                    .create();
-        } else {
-            if (mErrorDialog.isShowing()) {
-                mErrorDialog.dismiss();
-            }
-        }
-        mErrorDialog.setMessage(getResources()
-                .getString(R.string.settings_safetylegal_activity_unreachable, url));
-        mErrorDialog.show();
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-
-        if (mErrorDialog != null) {
-            mErrorDialog.dismiss();
-            mErrorDialog = null;
-        }
-    }
-
-    @Override
-    public boolean dispatchKeyEvent(KeyEvent event) {
-        if (event.getKeyCode() == KeyEvent.KEYCODE_BACK 
-                && event.getAction() == KeyEvent.ACTION_DOWN) {
-            if (mWebView.canGoBack()) {
-                mWebView.goBack();
-                return true;
-            }
-        }
-        return super.dispatchKeyEvent(event);
-    }
-
-    public void onClick(DialogInterface dialog, int whichButton) {
-        finish();
-    }
-
-    public void onCancel(DialogInterface dialog) {
-        finish();
-    }
-
-    @Override
-    public void onSaveInstanceState(Bundle icicle) {
-        mWebView.saveState(icicle);
-        super.onSaveInstanceState(icicle);
-    }
-}
diff --git a/src/com/android/settings/SetupChooseLockGeneric.java b/src/com/android/settings/SetupChooseLockGeneric.java
new file mode 100644
index 0000000..42e2baa
--- /dev/null
+++ b/src/com/android/settings/SetupChooseLockGeneric.java
@@ -0,0 +1,146 @@
+/*
+ * 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;
+
+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;
+import android.widget.ListView;
+
+/**
+ * Setup Wizard's version of ChooseLockGeneric screen. It inherits the logic and basic structure
+ * from ChooseLockGeneric class, and should remain similar to that behaviorally. This class should
+ * only overload base methods for minor theme and behavior differences specific to Setup Wizard.
+ * Other changes should be done to ChooseLockGeneric class instead and let this class inherit
+ * those changes.
+ */
+public class SetupChooseLockGeneric extends ChooseLockGeneric
+        implements SetupWizardNavBar.NavigationBarListener {
+
+    @Override
+    protected boolean isValidFragment(String fragmentName) {
+        return SetupChooseLockGenericFragment.class.getName().equals(fragmentName);
+    }
+
+    @Override
+    /* package */ Class<? extends PreferenceFragment> getFragmentClass() {
+        return SetupChooseLockGenericFragment.class;
+    }
+
+    @Override
+    protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {
+        resid = SetupWizardUtils.getTheme(getIntent(), resid);
+        super.onApplyThemeResource(theme, resid, first);
+    }
+
+    @Override
+    public void onNavigationBarCreated(SetupWizardNavBar bar) {
+        SetupWizardUtils.setImmersiveMode(this, bar);
+        bar.getNextButton().setEnabled(false);
+    }
+
+    @Override
+    public void onNavigateBack() {
+        onBackPressed();
+    }
+
+    @Override
+    public void onNavigateNext() {
+    }
+
+    public static class SetupChooseLockGenericFragment extends ChooseLockGenericFragment {
+
+        @Override
+        public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                Bundle savedInstanceState) {
+            final View view = inflater.inflate(R.layout.setup_preference, container, false);
+            ListView list = (ListView) view.findViewById(android.R.id.list);
+            View title = view.findViewById(R.id.title);
+            if (title == null) {
+                final View header = inflater.inflate(R.layout.setup_wizard_header, list, false);
+                list.addHeaderView(header, null, false);
+            }
+            return view;
+        }
+
+        @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,
+                boolean confirmCredentials) {
+            final Intent intent = SetupChooseLockPassword.createIntent(context, quality,
+                    isFallback, minLength, maxLength, requirePasswordToDecrypt, confirmCredentials);
+            SetupWizardUtils.copySetupExtras(getActivity().getIntent(), intent);
+            return intent;
+        }
+
+        @Override
+        protected Intent getLockPatternIntent(Context context, boolean isFallback,
+                boolean requirePassword, boolean confirmCredentials) {
+            final Intent intent = SetupChooseLockPattern.createIntent(context, isFallback,
+                    requirePassword, confirmCredentials);
+            SetupWizardUtils.copySetupExtras(getActivity().getIntent(), intent);
+            return intent;
+        }
+
+        @Override
+        protected Intent getEncryptionInterstitialIntent(Context context, int quality,
+                boolean required) {
+            Intent intent = SetupEncryptionInterstitial.createStartIntent(context, quality,
+                    required);
+            SetupWizardUtils.copySetupExtras(getActivity().getIntent(), intent);
+            return intent;
+        }
+    }
+}
diff --git a/src/com/android/settings/SetupChooseLockPassword.java b/src/com/android/settings/SetupChooseLockPassword.java
new file mode 100644
index 0000000..4274205
--- /dev/null
+++ b/src/com/android/settings/SetupChooseLockPassword.java
@@ -0,0 +1,152 @@
+/*
+ * 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;
+
+import com.android.setupwizard.navigationbar.SetupWizardNavBar;
+
+import android.app.Fragment;
+import android.content.Context;
+import android.content.Intent;
+import android.content.res.Resources;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.WindowInsets;
+
+/**
+ * Setup Wizard's version of ChooseLockPassword screen. It inherits the logic and basic structure
+ * from ChooseLockPassword class, and should remain similar to that behaviorally. This class should
+ * only overload base methods for minor theme and behavior differences specific to Setup Wizard.
+ * Other changes should be done to ChooseLockPassword class instead and let this class inherit
+ * those changes.
+ */
+public class SetupChooseLockPassword extends ChooseLockPassword
+        implements SetupWizardNavBar.NavigationBarListener {
+
+    public static Intent createIntent(Context context, int quality, final boolean isFallback,
+            int minLength, final int maxLength, boolean requirePasswordToDecrypt,
+            boolean confirmCredentials) {
+        Intent intent = ChooseLockPassword.createIntent(context, quality, isFallback, minLength,
+                maxLength, requirePasswordToDecrypt, confirmCredentials);
+        intent.setClass(context, SetupChooseLockPassword.class);
+        intent.putExtra(EXTRA_PREFS_SHOW_BUTTON_BAR, false);
+        return intent;
+    }
+
+    private SetupWizardNavBar mNavigationBar;
+    private SetupChooseLockPasswordFragment mFragment;
+
+    @Override
+    protected boolean isValidFragment(String fragmentName) {
+        return SetupChooseLockPasswordFragment.class.getName().equals(fragmentName);
+    }
+
+    @Override
+    /* package */ Class<? extends Fragment> getFragmentClass() {
+        return SetupChooseLockPasswordFragment.class;
+    }
+
+    @Override
+    protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {
+        resid = SetupWizardUtils.getTheme(getIntent(), resid);
+        super.onApplyThemeResource(theme, resid, first);
+    }
+
+    @Override
+    public void onNavigationBarCreated(SetupWizardNavBar bar) {
+        mNavigationBar = bar;
+        SetupWizardUtils.setImmersiveMode(this, bar);
+    }
+
+    @Override
+    public void onNavigateBack() {
+        onBackPressed();
+    }
+
+    @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
+            implements View.OnApplyWindowInsetsListener {
+
+        @Override
+        public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                Bundle savedInstanceState) {
+            final View view = inflater.inflate(R.layout.setup_template, container, false);
+            View scrollView = view.findViewById(R.id.bottom_scroll_view);
+            scrollView.setOnApplyWindowInsetsListener(this);
+            ViewGroup setupContent = (ViewGroup) view.findViewById(R.id.setup_content);
+            inflater.inflate(R.layout.setup_choose_lock_password, setupContent, true);
+            return view;
+        }
+
+        @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());
+        }
+
+        @Override
+        protected Intent getRedactionInterstitialIntent(Context context) {
+            Intent intent = SetupRedactionInterstitial.createStartIntent(context);
+            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);
+        }
+
+        @Override
+        public WindowInsets onApplyWindowInsets(View view, WindowInsets insets) {
+            SetupChooseLockPassword activity = (SetupChooseLockPassword) getActivity();
+            final int bottomMargin = Math.max(insets.getSystemWindowInsetBottom()
+                    - activity.mNavigationBar.getView().getHeight(), 0);
+            ViewGroup.MarginLayoutParams lp = (ViewGroup.MarginLayoutParams) view.getLayoutParams();
+            lp.setMargins(lp.leftMargin, lp.topMargin, lp.rightMargin, bottomMargin);
+            view.setLayoutParams(lp);
+            return insets.replaceSystemWindowInsets(
+                    insets.getSystemWindowInsetLeft(),
+                    insets.getSystemWindowInsetTop(),
+                    insets.getSystemWindowInsetRight(),
+                    0 /* bottom */);
+        }
+    }
+}
diff --git a/src/com/android/settings/SetupChooseLockPattern.java b/src/com/android/settings/SetupChooseLockPattern.java
new file mode 100644
index 0000000..7f2480b
--- /dev/null
+++ b/src/com/android/settings/SetupChooseLockPattern.java
@@ -0,0 +1,152 @@
+/*
+ * 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;
+
+import com.android.setupwizard.navigationbar.SetupWizardNavBar;
+
+import android.app.Fragment;
+import android.content.Context;
+import android.content.Intent;
+import android.content.res.Resources;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+
+/**
+ * Setup Wizard's version of ChooseLockPattern screen. It inherits the logic and basic structure
+ * from ChooseLockPattern class, and should remain similar to that behaviorally. This class should
+ * only overload base methods for minor theme and behavior differences specific to Setup Wizard.
+ * Other changes should be done to ChooseLockPattern class instead and let this class inherit
+ * those changes.
+ */
+public class SetupChooseLockPattern extends ChooseLockPattern
+        implements SetupWizardNavBar.NavigationBarListener {
+
+    public static Intent createIntent(Context context, final boolean isFallback,
+            boolean requirePassword, boolean confirmCredentials) {
+        Intent intent = ChooseLockPattern.createIntent(context, isFallback, requirePassword,
+                confirmCredentials);
+        intent.setClass(context, SetupChooseLockPattern.class);
+        return intent;
+    }
+
+    private SetupWizardNavBar mNavigationBar;
+    private SetupChooseLockPatternFragment mFragment;
+
+    @Override
+    protected boolean isValidFragment(String fragmentName) {
+        return SetupChooseLockPatternFragment.class.getName().equals(fragmentName);
+    }
+
+    @Override
+    /* package */ Class<? extends Fragment> getFragmentClass() {
+        return SetupChooseLockPatternFragment.class;
+    }
+
+    @Override
+    protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {
+        resid = SetupWizardUtils.getTheme(getIntent(), resid);
+        super.onApplyThemeResource(theme, resid, first);
+    }
+
+    @Override
+    public void onNavigationBarCreated(SetupWizardNavBar bar) {
+        mNavigationBar = bar;
+        SetupWizardUtils.setImmersiveMode(this, bar);
+    }
+
+    @Override
+    public void onNavigateBack() {
+        onBackPressed();
+    }
+
+    @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) {
+            final View view = inflater.inflate(R.layout.setup_template, container, false);
+            ViewGroup setupContent = (ViewGroup) view.findViewById(R.id.setup_content);
+            inflater.inflate(R.layout.setup_choose_lock_pattern, setupContent, true);
+            return view;
+        }
+
+        @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());
+        }
+
+        @Override
+        protected Intent getRedactionInterstitialIntent(Context context) {
+            Intent intent = SetupRedactionInterstitial.createStartIntent(context);
+            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
new file mode 100644
index 0000000..41782da
--- /dev/null
+++ b/src/com/android/settings/SetupEncryptionInterstitial.java
@@ -0,0 +1,120 @@
+/*
+ * 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;
+
+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.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+/**
+ * Setup Wizard's version of EncryptionInterstitial screen. It inherits the logic and basic
+ * structure from EncryptionInterstitial class, and should remain similar to that behaviorally. This
+ * class should only overload base methods for minor theme and behavior differences specific to
+ * Setup Wizard. Other changes should be done to EncryptionInterstitial class instead and let this
+ * class inherit those changes.
+ */
+public class SetupEncryptionInterstitial extends EncryptionInterstitial
+        implements SetupWizardNavBar.NavigationBarListener{
+
+    public static Intent createStartIntent(Context ctx, int quality,
+            boolean requirePasswordDefault) {
+        Intent startIntent = EncryptionInterstitial.createStartIntent(ctx, quality,
+                requirePasswordDefault);
+        startIntent.setClass(ctx, SetupEncryptionInterstitial.class);
+        startIntent.putExtra(EXTRA_PREFS_SHOW_BUTTON_BAR, false)
+                .putExtra(EXTRA_SHOW_FRAGMENT_TITLE_RESID, -1);
+        return startIntent;
+    }
+
+    @Override
+    public Intent getIntent() {
+        Intent modIntent = new Intent(super.getIntent());
+        modIntent.putExtra(EXTRA_SHOW_FRAGMENT,
+                SetupEncryptionInterstitialFragment.class.getName());
+        return modIntent;
+    }
+
+    @Override
+    protected boolean isValidFragment(String fragmentName) {
+        return SetupEncryptionInterstitialFragment.class.getName().equals(fragmentName);
+    }
+
+    @Override
+    protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {
+        resid = SetupWizardUtils.getTheme(getIntent(), resid);
+        super.onApplyThemeResource(theme, resid, first);
+    }
+
+    @Override
+    public void onNavigationBarCreated(SetupWizardNavBar bar) {
+        SetupWizardUtils.setImmersiveMode(this, bar);
+    }
+
+    @Override
+    public void onNavigateBack() {
+        onBackPressed();
+    }
+
+    @Override
+    public void onNavigateNext() {
+        setResult(RESULT_OK, getResultIntentData());
+        finish();
+    }
+
+    public static class SetupEncryptionInterstitialFragment extends EncryptionInterstitialFragment {
+
+        @Override
+        public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                Bundle savedInstanceState) {
+            View view = inflater.inflate(R.layout.setup_template, container, false);
+            ViewGroup setupContent = (ViewGroup) view.findViewById(R.id.setup_content);
+            View content = super.onCreateView(inflater, setupContent, savedInstanceState);
+            setupContent.addView(content);
+            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.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
new file mode 100644
index 0000000..453e729
--- /dev/null
+++ b/src/com/android/settings/SetupRedactionInterstitial.java
@@ -0,0 +1,103 @@
+/*
+ * 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;
+
+import com.android.settings.notification.RedactionInterstitial;
+import com.android.setupwizard.navigationbar.SetupWizardNavBar;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.res.Resources;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+/**
+ * Setup Wizard's version of RedactionInterstitial screen. It inherits the logic and basic structure
+ * from RedactionInterstitial class, and should remain similar to that behaviorally. This class
+ * should only overload base methods for minor theme and behavior differences specific to Setup
+ * Wizard. Other changes should be done to RedactionInterstitial class instead and let this class
+ * inherit those changes.
+ */
+public class SetupRedactionInterstitial extends RedactionInterstitial
+        implements SetupWizardNavBar.NavigationBarListener{
+
+    public static Intent createStartIntent(Context ctx) {
+        Intent startIntent = RedactionInterstitial.createStartIntent(ctx);
+        startIntent.setClass(ctx, SetupRedactionInterstitial.class);
+        startIntent.putExtra(EXTRA_PREFS_SHOW_BUTTON_BAR, false)
+                .putExtra(EXTRA_SHOW_FRAGMENT_TITLE_RESID, -1);
+        return startIntent;
+    }
+
+    @Override
+    public Intent getIntent() {
+        Intent modIntent = new Intent(super.getIntent());
+        modIntent.putExtra(EXTRA_SHOW_FRAGMENT,
+                SetupEncryptionInterstitialFragment.class.getName());
+        return modIntent;
+    }
+
+    @Override
+    protected boolean isValidFragment(String fragmentName) {
+        return SetupEncryptionInterstitialFragment.class.getName().equals(fragmentName);
+    }
+
+    @Override
+    protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {
+        resid = SetupWizardUtils.getTheme(getIntent(), resid);
+        super.onApplyThemeResource(theme, resid, first);
+    }
+
+    @Override
+    public void onNavigationBarCreated(SetupWizardNavBar bar) {
+        SetupWizardUtils.setImmersiveMode(this, bar);
+    }
+
+    @Override
+    public void onNavigateBack() {
+        onBackPressed();
+    }
+
+    @Override
+    public void onNavigateNext() {
+        setResult(RESULT_OK, getResultIntentData());
+        finish();
+    }
+
+    public static class SetupEncryptionInterstitialFragment extends RedactionInterstitialFragment {
+
+        @Override
+        public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                Bundle savedInstanceState) {
+            View view = inflater.inflate(R.layout.setup_template, container, false);
+            ViewGroup setupContent = (ViewGroup) view.findViewById(R.id.setup_content);
+            View content = super.onCreateView(inflater, setupContent, savedInstanceState);
+            setupContent.addView(content);
+            return view;
+        }
+
+        @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
new file mode 100644
index 0000000..3d44125
--- /dev/null
+++ b/src/com/android/settings/SetupWizardUtils.java
@@ -0,0 +1,137 @@
+/*
+ * 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;
+
+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;
+
+public class SetupWizardUtils {
+    private static final String TAG = "SetupWizardUtils";
+
+    // Extra containing the resource name of the theme to be used
+    public static final String EXTRA_THEME = "theme";
+    public static final String THEME_HOLO = "holo";
+    public static final String THEME_HOLO_LIGHT = "holo_light";
+    public static final String THEME_MATERIAL = "material";
+    public static final String THEME_MATERIAL_LIGHT = "material_light";
+
+    public static final String EXTRA_USE_IMMERSIVE_MODE = "useImmersiveMode";
+
+    // From WizardManager (must match constants maintained there)
+    public static final String ACTION_NEXT = "com.android.wizard.NEXT";
+    public static final String EXTRA_SCRIPT_URI = "scriptUri";
+    public static final String EXTRA_ACTION_ID = "actionId";
+    public static final String EXTRA_RESULT_CODE = "com.android.setupwizard.ResultCode";
+    public static final int NEXT_REQUEST = 10000;
+
+    public static boolean isUsingWizardManager(Activity activity) {
+        return activity.getIntent().hasExtra(EXTRA_SCRIPT_URI);
+    }
+
+    /**
+     * Send the results of this activity to WizardManager, which will then send out the next
+     * scripted activity. WizardManager does not actually return an activity result, but if we
+     * invoke WizardManager without requesting a result, the framework will choose not to issue a
+     * call to onActivityResult with RESULT_CANCELED when navigating backward.
+     */
+    public static void sendResultsToSetupWizard(Activity activity, int resultCode) {
+        final Intent intent = activity.getIntent();
+        final Intent nextIntent = new Intent(ACTION_NEXT);
+        nextIntent.putExtra(EXTRA_SCRIPT_URI, intent.getStringExtra(EXTRA_SCRIPT_URI));
+        nextIntent.putExtra(EXTRA_ACTION_ID, intent.getStringExtra(EXTRA_ACTION_ID));
+        nextIntent.putExtra(EXTRA_THEME, intent.getStringExtra(EXTRA_THEME));
+        nextIntent.putExtra(EXTRA_RESULT_CODE, resultCode);
+        activity.startActivityForResult(nextIntent, NEXT_REQUEST);
+    }
+
+    public static int getTheme(Intent intent, int defaultResId) {
+        final String themeName = intent.getStringExtra(EXTRA_THEME);
+        int resid = defaultResId;
+        if (THEME_HOLO_LIGHT.equalsIgnoreCase(themeName) ||
+                THEME_MATERIAL_LIGHT.equalsIgnoreCase(themeName)) {
+            resid = R.style.SetupWizardTheme_Light;
+        } else if (THEME_HOLO.equalsIgnoreCase(themeName) ||
+                THEME_MATERIAL.equalsIgnoreCase(themeName)) {
+            resid = R.style.SetupWizardTheme;
+        }
+        return resid;
+    }
+
+    /**
+     * Sets the immersive mode related flags based on the extra in the intent which started the
+     * activity.
+     */
+    public static void setImmersiveMode(Activity activity, SetupWizardNavBar navBar) {
+        final boolean useImmersiveMode =
+                activity.getIntent().getBooleanExtra(EXTRA_USE_IMMERSIVE_MODE, false);
+        navBar.setUseImmersiveMode(useImmersiveMode);
+        if (useImmersiveMode) {
+            final Window window = activity.getWindow();
+            window.setNavigationBarColor(Color.TRANSPARENT);
+            window.setStatusBarColor(Color.TRANSPARENT);
+        }
+    }
+
+    public static TextView getHeader(Activity activity) {
+        return (TextView) activity.findViewById(R.id.title);
+    }
+
+    public static void setHeaderText(Activity activity, int text) {
+        getHeader(activity).setText(text);
+    }
+
+    public static void setHeaderText(Activity activity, CharSequence text) {
+        getHeader(activity).setText(text);
+    }
+
+    public static void copySetupExtras(Intent fromIntent, Intent toIntent) {
+        toIntent.putExtra(EXTRA_THEME, fromIntent.getStringExtra(EXTRA_THEME));
+        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/TetherService.java b/src/com/android/settings/TetherService.java
new file mode 100644
index 0000000..9323c33
--- /dev/null
+++ b/src/com/android/settings/TetherService.java
@@ -0,0 +1,307 @@
+/*
+ * Copyright (C) 2008 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings;
+
+import android.app.Activity;
+import android.app.AlarmManager;
+import android.app.PendingIntent;
+import android.app.Service;
+import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothPan;
+import android.bluetooth.BluetoothProfile;
+import android.bluetooth.BluetoothProfile.ServiceListener;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.SharedPreferences;
+import android.net.ConnectivityManager;
+import android.net.wifi.WifiManager;
+import android.os.IBinder;
+import android.os.SystemClock;
+import android.text.TextUtils;
+import android.util.Log;
+
+import com.android.settings.wifi.WifiApEnabler;
+
+import java.util.ArrayList;
+
+public class TetherService extends Service {
+    private static final String TAG = "TetherService";
+    private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
+
+    public static final String EXTRA_ADD_TETHER_TYPE = "extraAddTetherType";
+    public static final String EXTRA_REM_TETHER_TYPE = "extraRemTetherType";
+    public static final String EXTRA_SET_ALARM = "extraSetAlarm";
+    public static final String EXTRA_RUN_PROVISION = "extraRunProvision";
+    public static final String EXTRA_ENABLE_WIFI_TETHER = "extraEnableWifiTether";
+
+    private static final String EXTRA_RESULT = "EntitlementResult";
+
+    // Activity results to match the activity provision protocol.
+    // Default to something not ok.
+    private static final int RESULT_DEFAULT = Activity.RESULT_CANCELED;
+    private static final int RESULT_OK = Activity.RESULT_OK;
+
+    private static final String TETHER_CHOICE = "TETHER_TYPE";
+    private static final int MS_PER_HOUR = 60 * 60 * 1000;
+
+    private static final String PREFS = "tetherPrefs";
+    private static final String KEY_TETHERS = "currentTethers";
+
+    private int mCurrentTypeIndex;
+    private boolean mEnableWifiAfterCheck;
+    private boolean mInProvisionCheck;
+    private ArrayList<Integer> mCurrentTethers;
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        return null;
+    }
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        if (DEBUG) Log.d(TAG, "Creating WifiProvisionService");
+        String provisionResponse = getResources().getString(
+                com.android.internal.R.string.config_mobile_hotspot_provision_response);
+        registerReceiver(mReceiver, new IntentFilter(provisionResponse),
+                android.Manifest.permission.CONNECTIVITY_INTERNAL, null);
+        SharedPreferences prefs = getSharedPreferences(PREFS, MODE_PRIVATE);
+        mCurrentTethers = stringToTethers(prefs.getString(KEY_TETHERS, ""));
+        mCurrentTypeIndex = 0;
+    }
+
+    @Override
+    public int onStartCommand(Intent intent, int flags, int startId) {
+        if (intent.hasExtra(EXTRA_ADD_TETHER_TYPE)) {
+            int type = intent.getIntExtra(EXTRA_ADD_TETHER_TYPE, TetherSettings.INVALID);
+            if (!mCurrentTethers.contains(type)) {
+                if (DEBUG) Log.d(TAG, "Adding tether " + type);
+                mCurrentTethers.add(type);
+            }
+        }
+        if (intent.hasExtra(EXTRA_REM_TETHER_TYPE)) {
+            int type = intent.getIntExtra(EXTRA_REM_TETHER_TYPE, TetherSettings.INVALID);
+            if (DEBUG) Log.d(TAG, "Removing tether " + type);
+            int index = mCurrentTethers.indexOf(type);
+            if (index >= 0) {
+                mCurrentTethers.remove(index);
+                // If we are currently in the middle of a check, we may need to adjust the
+                // index accordingly.
+                if (index <= mCurrentTypeIndex && mCurrentTypeIndex > 0) {
+                    mCurrentTypeIndex--;
+                }
+            }
+            cancelAlarmIfNecessary();
+        }
+        // Only set the alarm if we have one tether, meaning the one just added,
+        // to avoid setting it when it was already set previously for another
+        // type.
+        if (intent.getBooleanExtra(EXTRA_SET_ALARM, false)
+                && mCurrentTethers.size() == 1) {
+            scheduleAlarm();
+        }
+
+        if (intent.getBooleanExtra(EXTRA_ENABLE_WIFI_TETHER, false)) {
+            mEnableWifiAfterCheck = true;
+        }
+
+        if (intent.getBooleanExtra(EXTRA_RUN_PROVISION, false)) {
+            startProvisioning(mCurrentTypeIndex);
+        } else if (!mInProvisionCheck) {
+            // If we aren't running any provisioning, no reason to stay alive.
+            stopSelf();
+            return START_NOT_STICKY;
+        }
+        // We want to be started if we are killed accidently, so that we can be sure we finish
+        // the check.
+        return START_STICKY;
+    }
+
+    @Override
+    public void onDestroy() {
+        if (mInProvisionCheck) {
+            Log.e(TAG, "TetherService getting destroyed while mid-provisioning"
+                    + mCurrentTethers.get(mCurrentTypeIndex));
+        }
+        SharedPreferences prefs = getSharedPreferences(PREFS, MODE_PRIVATE);
+        prefs.edit().putString(KEY_TETHERS, tethersToString(mCurrentTethers)).commit();
+
+        if (DEBUG) Log.d(TAG, "Destroying WifiProvisionService");
+        unregisterReceiver(mReceiver);
+        super.onDestroy();
+    }
+
+    private ArrayList<Integer> stringToTethers(String tethersStr) {
+        ArrayList<Integer> ret = new ArrayList<Integer>();
+        if (TextUtils.isEmpty(tethersStr)) return ret;
+
+        String[] tethersSplit = tethersStr.split(",");
+        for (int i = 0; i < tethersSplit.length; i++) {
+            ret.add(Integer.parseInt(tethersSplit[i]));
+        }
+        return ret;
+    }
+
+    private String tethersToString(ArrayList<Integer> tethers) {
+        final StringBuffer buffer = new StringBuffer();
+        final int N = tethers.size();
+        for (int i = 0; i < N; i++) {
+            if (i != 0) {
+                buffer.append(',');
+            }
+            buffer.append(tethers.get(i));
+        }
+
+        return buffer.toString();
+    }
+
+    private void enableWifiTetheringIfNeeded() {
+        if (!isHotspotEnabled(this)) {
+            new WifiApEnabler(this, null).setSoftapEnabled(true);
+        }
+    }
+
+    private void disableWifiTethering() {
+        WifiApEnabler enabler = new WifiApEnabler(this, null);
+        enabler.setSoftapEnabled(false);
+    }
+
+    private void disableUsbTethering() {
+        ConnectivityManager cm =
+                (ConnectivityManager)getSystemService(Context.CONNECTIVITY_SERVICE);
+        cm.setUsbTethering(false);
+    }
+
+    private void disableBtTethering() {
+        final BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
+        if (adapter != null) {
+            adapter.getProfileProxy(this, new ServiceListener() {
+                @Override
+                public void onServiceDisconnected(int profile) { }
+
+                @Override
+                public void onServiceConnected(int profile, BluetoothProfile proxy) {
+                    ((BluetoothPan) proxy).setBluetoothTethering(false);
+                    adapter.closeProfileProxy(BluetoothProfile.PAN, proxy);
+                }
+            }, BluetoothProfile.PAN);
+        }
+    }
+
+    private void startProvisioning(int index) {
+        String provisionAction = getResources().getString(
+                com.android.internal.R.string.config_mobile_hotspot_provision_app_no_ui);
+        if (DEBUG) Log.d(TAG, "Sending provisioning broadcast: " + provisionAction + " type: "
+                + mCurrentTethers.get(index));
+        Intent intent = new Intent(provisionAction);
+        intent.putExtra(TETHER_CHOICE, mCurrentTethers.get(index));
+        intent.setFlags(Intent.FLAG_RECEIVER_FOREGROUND);
+        sendBroadcast(intent);
+        mInProvisionCheck = true;
+    }
+
+    private static boolean isHotspotEnabled(Context context) {
+        WifiManager wifiManager = (WifiManager) context.getSystemService(WIFI_SERVICE);
+        return wifiManager.getWifiApState() == WifiManager.WIFI_AP_STATE_ENABLED;
+    }
+
+    public static void scheduleRecheckAlarm(Context context, int type) {
+        Intent intent = new Intent(context, TetherService.class);
+        intent.putExtra(EXTRA_ADD_TETHER_TYPE, type);
+        intent.putExtra(EXTRA_SET_ALARM, true);
+        context.startService(intent);
+    }
+
+    private void scheduleAlarm() {
+        Intent intent = new Intent(this, TetherService.class);
+        intent.putExtra(EXTRA_RUN_PROVISION, true);
+
+        PendingIntent pendingIntent = PendingIntent.getService(this, 0, intent, 0);
+        AlarmManager alarmManager = (AlarmManager) getSystemService(ALARM_SERVICE);
+        int period = getResources().getInteger(
+                com.android.internal.R.integer.config_mobile_hotspot_provision_check_period);
+        long periodMs = period * MS_PER_HOUR;
+        long firstTime = SystemClock.elapsedRealtime() + periodMs;
+        if (DEBUG) Log.d(TAG, "Scheduling alarm at interval " + periodMs);
+        alarmManager.setRepeating(AlarmManager.ELAPSED_REALTIME, firstTime, periodMs,
+                pendingIntent);
+    }
+
+    /**
+     * Cancels the recheck alarm only if no tethering is currently active.
+     *
+     * Runs in the background, to get access to bluetooth service that takes time to bind.
+     */
+    public static void cancelRecheckAlarmIfNecessary(final Context context, int type) {
+        Intent intent = new Intent(context, TetherService.class);
+        intent.putExtra(EXTRA_REM_TETHER_TYPE, type);
+        context.startService(intent);
+    }
+
+    private void cancelAlarmIfNecessary() {
+        if (mCurrentTethers.size() != 0) {
+            if (DEBUG) Log.d(TAG, "Tethering still active, not cancelling alarm");
+            return;
+        }
+        Intent intent = new Intent(this, TetherService.class);
+        PendingIntent pendingIntent = PendingIntent.getService(this, 0, intent, 0);
+        AlarmManager alarmManager = (AlarmManager) getSystemService(ALARM_SERVICE);
+        alarmManager.cancel(pendingIntent);
+        if (DEBUG) Log.d(TAG, "Tethering no longer active, canceling recheck");
+    }
+
+    private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            if (DEBUG) Log.d(TAG, "Got provision result " + intent);
+            String provisionResponse = context.getResources().getString(
+                    com.android.internal.R.string.config_mobile_hotspot_provision_response);
+            if (provisionResponse.equals(intent.getAction())) {
+                mInProvisionCheck = false;
+                int checkType = mCurrentTethers.get(mCurrentTypeIndex);
+                if (intent.getIntExtra(EXTRA_RESULT, RESULT_DEFAULT) == RESULT_OK) {
+                    if (checkType == TetherSettings.WIFI_TETHERING && mEnableWifiAfterCheck) {
+                        enableWifiTetheringIfNeeded();
+                        mEnableWifiAfterCheck = false;
+                    }
+                } else {
+                    switch (checkType) {
+                        case TetherSettings.WIFI_TETHERING:
+                            disableWifiTethering();
+                            break;
+                        case TetherSettings.BLUETOOTH_TETHERING:
+                            disableBtTethering();
+                            break;
+                        case TetherSettings.USB_TETHERING:
+                            disableUsbTethering();
+                            break;
+                    }
+                }
+                if (++mCurrentTypeIndex == mCurrentTethers.size()) {
+                    // We are done with all checks, time to die.
+                    stopSelf();
+                } else {
+                    // Start the next check in our list.
+                    startProvisioning(mCurrentTypeIndex);
+                }
+            }
+        }
+    };
+
+}
diff --git a/src/com/android/settings/TetherSettings.java b/src/com/android/settings/TetherSettings.java
index c611772..e33ddb0 100644
--- a/src/com/android/settings/TetherSettings.java
+++ b/src/com/android/settings/TetherSettings.java
@@ -16,11 +16,7 @@
 
 package com.android.settings;
 
-import com.android.settings.wifi.WifiApEnabler;
-import com.android.settings.wifi.WifiApDialog;
-
 import android.app.Activity;
-import android.app.AlertDialog;
 import android.app.Dialog;
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothPan;
@@ -31,7 +27,6 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.pm.PackageManager;
-import android.content.res.AssetManager;
 import android.hardware.usb.UsbManager;
 import android.net.ConnectivityManager;
 import android.net.wifi.WifiConfiguration;
@@ -44,16 +39,13 @@
 import android.preference.Preference;
 import android.preference.PreferenceScreen;
 import android.preference.SwitchPreference;
-import android.text.TextUtils;
-import android.view.ViewGroup;
-import android.view.ViewParent;
-import android.webkit.WebView;
 import android.widget.TextView;
 
-import java.io.InputStream;
+import com.android.settings.wifi.WifiApDialog;
+import com.android.settings.wifi.WifiApEnabler;
+
 import java.util.ArrayList;
 import java.util.concurrent.atomic.AtomicReference;
-import java.util.Locale;
 
 /*
  * Displays preferences for Tethering.
@@ -69,7 +61,6 @@
 
     private static final int DIALOG_AP_SETTINGS = 1;
 
-    private WebView mView;
     private SwitchPreference mUsbTether;
 
     private WifiApEnabler mWifiApEnabler;
@@ -102,10 +93,10 @@
 
     private boolean mBluetoothEnableForTether;
 
-    private static final int INVALID             = -1;
-    private static final int WIFI_TETHERING      = 0;
-    private static final int USB_TETHERING       = 1;
-    private static final int BLUETOOTH_TETHERING = 2;
+    public static final int INVALID             = -1;
+    public static final int WIFI_TETHERING      = 0;
+    public static final int USB_TETHERING       = 1;
+    public static final int BLUETOOTH_TETHERING = 2;
 
     /* One of INVALID, WIFI_TETHERING, USB_TETHERING or BLUETOOTH_TETHERING */
     private int mTetherChoice = INVALID;
@@ -182,8 +173,6 @@
 
         mProvisionApp = getResources().getStringArray(
                 com.android.internal.R.array.config_mobile_hotspot_provision_app);
-
-        mView = new WebView(activity);
     }
 
     @Override
@@ -467,6 +456,9 @@
         if (enable) {
             startProvisioningIfNecessary(WIFI_TETHERING);
         } else {
+            if (isProvisioningNeeded(mProvisionApp)) {
+                TetherService.cancelRecheckAlarmIfNecessary(getActivity(), WIFI_TETHERING);
+            }
             mWifiApEnabler.setSoftapEnabled(false);
         }
         return false;
@@ -516,6 +508,7 @@
         super.onActivityResult(requestCode, resultCode, intent);
         if (requestCode == PROVISION_REQUEST) {
             if (resultCode == Activity.RESULT_OK) {
+                TetherService.scheduleRecheckAlarm(getActivity(), mTetherChoice);
                 startTethering();
             } else {
                 //BT and USB need switch turned off on failure
@@ -583,6 +576,9 @@
             if (newState) {
                 startProvisioningIfNecessary(USB_TETHERING);
             } else {
+                if (isProvisioningNeeded(mProvisionApp)) {
+                    TetherService.cancelRecheckAlarmIfNecessary(getActivity(), USB_TETHERING);
+                }
                 setUsbTethering(newState);
             }
         } else if (preference == mBluetoothTether) {
@@ -591,6 +587,9 @@
             if (bluetoothTetherState) {
                 startProvisioningIfNecessary(BLUETOOTH_TETHERING);
             } else {
+                if (isProvisioningNeeded(mProvisionApp)) {
+                    TetherService.cancelRecheckAlarmIfNecessary(getActivity(), BLUETOOTH_TETHERING);
+                }
                 boolean errored = false;
 
                 String [] tethered = cm.getTetheredIfaces();
diff --git a/src/com/android/settings/TrustedCredentialsSettings.java b/src/com/android/settings/TrustedCredentialsSettings.java
index 14c4936..e2b49d6 100644
--- a/src/com/android/settings/TrustedCredentialsSettings.java
+++ b/src/com/android/settings/TrustedCredentialsSettings.java
@@ -43,12 +43,12 @@
 import android.widget.BaseAdapter;
 import android.widget.BaseExpandableListAdapter;
 import android.widget.Button;
-import android.widget.CheckBox;
 import android.widget.ExpandableListView;
 import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.ProgressBar;
 import android.widget.Spinner;
+import android.widget.Switch;
 import android.widget.TabHost;
 import android.widget.TextView;
 
@@ -59,6 +59,7 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.HashMap;
 
 public class TrustedCredentialsSettings extends Fragment {
 
@@ -90,17 +91,17 @@
         private final int mProgress;
         private final int mList;
         private final int mExpandableList;
-        private final boolean mCheckbox;
+        private final boolean mSwitch;
 
         private Tab(String tag, int label, int view, int progress, int list, int expandableList,
-                boolean checkbox) {
+                boolean withSwitch) {
             mTag = tag;
             mLabel = label;
             mView = view;
             mProgress = progress;
             mList = list;
             mExpandableList = expandableList;
-            mCheckbox = checkbox;
+            mSwitch = withSwitch;
         }
 
         private List<ParcelableString> getAliases(IKeyChainService service) throws RemoteException {
@@ -148,7 +149,7 @@
         }
         private void postOperationUpdate(boolean ok, CertHolder certHolder) {
             if (ok) {
-                if (certHolder.mTab.mCheckbox) {
+                if (certHolder.mTab.mSwitch) {
                     certHolder.mDeleted = !certHolder.mDeleted;
                 } else {
                     certHolder.mAdapter.remove(certHolder);
@@ -162,6 +163,9 @@
     }
 
     private TabHost mTabHost;
+    private AliasOperation mAliasOperation;
+    private HashMap<Tab, AdapterData.AliasLoader>
+            mAliasLoaders = new HashMap<Tab, AdapterData.AliasLoader>(2);
     private final SparseArray<KeyChainConnection>
             mKeyChainConnectionByProfileId = new SparseArray<KeyChainConnection>();
 
@@ -187,6 +191,13 @@
     }
     @Override
     public void onDestroy() {
+        for (AdapterData.AliasLoader aliasLoader : mAliasLoaders.values()) {
+            aliasLoader.cancel(true);
+        }
+        if (mAliasOperation != null) {
+            mAliasOperation.cancel(true);
+            mAliasOperation = null;
+        }
         closeKeyChainConnections();
         super.onDestroy();
     }
@@ -405,6 +416,12 @@
         private class AliasLoader extends AsyncTask<Void, Integer, SparseArray<List<CertHolder>>> {
             private ProgressBar mProgressBar;
             private View mList;
+            private Context mContext;
+
+            public AliasLoader() {
+                mContext = getActivity();
+                mAliasLoaders.put(mTab, this);
+            }
 
             @Override protected void onPreExecute() {
                 View content = mTabHost.getTabContentView();
@@ -428,12 +445,15 @@
                     for (int i = 0; i < n; ++i) {
                         UserHandle profile = profiles.get(i);
                         int profileId = profile.getIdentifier();
-                        KeyChainConnection keyChainConnection = KeyChain.bindAsUser(getActivity(),
+                        KeyChainConnection keyChainConnection = KeyChain.bindAsUser(mContext,
                                 profile);
                         // Saving the connection for later use on the certificate dialog.
                         mKeyChainConnectionByProfileId.put(profileId, keyChainConnection);
                         IKeyChainService service = keyChainConnection.getService();
                         List<ParcelableString> aliases = mTab.getAliases(service);
+                        if (isCancelled()) {
+                            return new SparseArray<List<CertHolder>>();
+                        }
                         max += aliases.size();
                         aliasesByProfileId.put(profileId, aliases);
                     }
@@ -441,6 +461,9 @@
                         UserHandle profile = profiles.get(i);
                         int profileId = profile.getIdentifier();
                         List<ParcelableString> aliases = aliasesByProfileId.get(profileId);
+                        if (isCancelled()) {
+                            return new SparseArray<List<CertHolder>>();
+                        }
                         IKeyChainService service = mKeyChainConnectionByProfileId.get(profileId)
                                 .getService();
                         List<CertHolder> certHolders = new ArrayList<CertHolder>(max);
@@ -484,6 +507,7 @@
                 mProgressBar.setVisibility(View.GONE);
                 mList.setVisibility(View.VISIBLE);
                 mProgressBar.setProgress(0);
+                mAliasLoaders.remove(mTab);
             }
         }
 
@@ -586,7 +610,7 @@
                     convertView.findViewById(R.id.trusted_credential_subject_primary);
             holder.mSubjectSecondaryView = (TextView)
                     convertView.findViewById(R.id.trusted_credential_subject_secondary);
-            holder.mCheckBox = (CheckBox) convertView.findViewById(
+            holder.mSwitch = (Switch) convertView.findViewById(
                     R.id.trusted_credential_status);
             convertView.setTag(holder);
         } else {
@@ -594,9 +618,12 @@
         }
         holder.mSubjectPrimaryView.setText(certHolder.mSubjectPrimary);
         holder.mSubjectSecondaryView.setText(certHolder.mSubjectSecondary);
-        if (mTab.mCheckbox) {
-            holder.mCheckBox.setChecked(!certHolder.mDeleted);
-            holder.mCheckBox.setVisibility(View.VISIBLE);
+        if (mTab.mSwitch) {
+            holder.mSwitch.setChecked(!certHolder.mDeleted);
+            holder.mSwitch.setEnabled(!mUserManager.hasUserRestriction(
+                    UserManager.DISALLOW_CONFIG_CREDENTIALS,
+                    new UserHandle(certHolder.mProfileId)));
+            holder.mSwitch.setVisibility(View.VISIBLE);
         }
         return convertView;
     }
@@ -604,7 +631,7 @@
     private static class ViewHolder {
         private TextView mSubjectPrimaryView;
         private TextView mSubjectSecondaryView;
-        private CheckBox mCheckBox;
+        private Switch mSwitch;
     }
 
     private void showCertDialog(final CertHolder certHolder) {
@@ -656,7 +683,8 @@
         Button removeButton = (Button) inflater.inflate(R.layout.trusted_credential_details,
                                                         body,
                                                         false);
-        if (!mUserManager.hasUserRestriction(UserManager.DISALLOW_CONFIG_CREDENTIALS)) {
+        if (!mUserManager.hasUserRestriction(UserManager.DISALLOW_CONFIG_CREDENTIALS,
+                new UserHandle(certHolder.mProfileId))) {
             body.addView(removeButton);
         }
         removeButton.setText(certHolder.mTab.getButtonLabel(certHolder));
@@ -724,6 +752,7 @@
 
         private AliasOperation(CertHolder certHolder) {
             mCertHolder = certHolder;
+            mAliasOperation = this;
         }
 
         @Override
@@ -739,23 +768,18 @@
                 } else {
                     return service.deleteCaCertificate(mCertHolder.mAlias);
                 }
-            } catch (CertificateEncodingException e) {
+            } catch (CertificateEncodingException | SecurityException | IllegalStateException
+                    | RemoteException e) {
                 Log.w(TAG, "Error while toggling alias " + mCertHolder.mAlias,
                         e);
                 return false;
-            } catch (IllegalStateException e) {
-                // used by installCaCertificate to report errors
-                Log.w(TAG, "Error while toggling alias " + mCertHolder.mAlias, e);
-                return false;
-            } catch (RemoteException e) {
-                Log.w(TAG, "Error while toggling alias " + mCertHolder.mAlias, e);
-                return false;
             }
         }
 
         @Override
         protected void onPostExecute(Boolean ok) {
             mCertHolder.mTab.postOperationUpdate(ok, mCertHolder);
+            mAliasOperation = null;
         }
     }
 }
diff --git a/src/com/android/settings/UserSpinnerAdapter.java b/src/com/android/settings/UserSpinnerAdapter.java
index 001dfc4..eb4a118 100644
--- a/src/com/android/settings/UserSpinnerAdapter.java
+++ b/src/com/android/settings/UserSpinnerAdapter.java
@@ -51,7 +51,7 @@
             UserInfo userInfo = um.getUserInfo(mUserHandle.getIdentifier());
             if (userInfo.isManagedProfile()) {
                 name = context.getString(R.string.managed_user_title);
-                icon = Resources.getSystem().getDrawable(
+                icon = context.getDrawable(
                     com.android.internal.R.drawable.ic_corp_icon);
             } else {
                 name = userInfo.name;
diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index 5c7a456..6517ffe 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java
@@ -60,9 +60,9 @@
 import android.provider.ContactsContract.Profile;
 import android.provider.ContactsContract.RawContacts;
 import android.service.persistentdata.PersistentDataBlockManager;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
-import android.text.BidiFormatter;
-import android.text.TextDirectionHeuristics;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
@@ -70,10 +70,8 @@
 import android.widget.ListView;
 import android.widget.TabWidget;
 
-import com.android.internal.util.ImageUtils;
 import com.android.internal.util.UserIcons;
 import com.android.settings.UserSpinnerAdapter.UserDetails;
-import com.android.settings.dashboard.DashboardCategory;
 import com.android.settings.dashboard.DashboardTile;
 import com.android.settings.drawable.CircleFramedDrawable;
 
@@ -211,7 +209,8 @@
                         Bundle metaData = resolveInfo.activityInfo.metaData;
 
                         if (res != null && metaData != null) {
-                            icon = res.getDrawable(metaData.getInt(META_DATA_PREFERENCE_ICON));
+                            icon = res.getDrawable(
+                                    metaData.getInt(META_DATA_PREFERENCE_ICON), null);
                             title = res.getString(metaData.getInt(META_DATA_PREFERENCE_TITLE));
                             summary = res.getString(metaData.getInt(META_DATA_PREFERENCE_SUMMARY));
                         }
@@ -335,8 +334,7 @@
 
     /** Formats a double from 0.0..1.0 as a percentage. */
     private static String formatPercentage(double percentage) {
-      BidiFormatter bf = BidiFormatter.getInstance();
-      return bf.unicodeWrap(NumberFormat.getPercentInstance().format(percentage));
+      return NumberFormat.getPercentInstance().format(percentage);
     }
 
     public static boolean isBatteryPresent(Intent batteryChangedIntent) {
@@ -592,16 +590,52 @@
      * @param title String to display for the title of this set of preferences.
      */
     public static void startWithFragment(Context context, String fragmentName, Bundle args,
-            Fragment resultTo, int resultRequestCode, int titleResId, CharSequence title) {
+            Fragment resultTo, int resultRequestCode, int titleResId,
+            CharSequence title) {
         startWithFragment(context, fragmentName, args, resultTo, resultRequestCode,
-                titleResId, title, false /* not a shortcut */);
+                null /* titleResPackageName */, titleResId, title, false /* not a shortcut */);
+    }
+
+    /**
+     * Start a new instance of the activity, showing only the given fragment.
+     * When launched in this mode, the given preference fragment will be instantiated and fill the
+     * entire activity.
+     *
+     * @param context The context.
+     * @param fragmentName The name of the fragment to display.
+     * @param args Optional arguments to supply to the fragment.
+     * @param resultTo Option fragment that should receive the result of the activity launch.
+     * @param resultRequestCode If resultTo is non-null, this is the request code in which
+     *                          to report the result.
+     * @param titleResPackageName Optional package name for the resource id of the title.
+     * @param titleResId resource id for the String to display for the title of this set
+     *                   of preferences.
+     * @param title String to display for the title of this set of preferences.
+     */
+    public static void startWithFragment(Context context, String fragmentName, Bundle args,
+            Fragment resultTo, int resultRequestCode, String titleResPackageName, int titleResId,
+            CharSequence title) {
+        startWithFragment(context, fragmentName, args, resultTo, resultRequestCode,
+                titleResPackageName, titleResId, title, false /* not a shortcut */);
     }
 
     public static void startWithFragment(Context context, String fragmentName, Bundle args,
-            Fragment resultTo, int resultRequestCode, int titleResId, CharSequence title,
-            boolean isShortcut) {
-        Intent intent = onBuildStartFragmentIntent(context, fragmentName, args, titleResId,
-                title, isShortcut);
+            Fragment resultTo, int resultRequestCode, int titleResId,
+            CharSequence title, boolean isShortcut) {
+        Intent intent = onBuildStartFragmentIntent(context, fragmentName, args,
+                null /* titleResPackageName */, titleResId, title, isShortcut);
+        if (resultTo == null) {
+            context.startActivity(intent);
+        } else {
+            resultTo.startActivityForResult(intent, resultRequestCode);
+        }
+    }
+
+    public static void startWithFragment(Context context, String fragmentName, Bundle args,
+            Fragment resultTo, int resultRequestCode, String titleResPackageName, int titleResId,
+            CharSequence title, boolean isShortcut) {
+        Intent intent = onBuildStartFragmentIntent(context, fragmentName, args, titleResPackageName,
+                titleResId, title, isShortcut);
         if (resultTo == null) {
             context.startActivity(intent);
         } else {
@@ -610,9 +644,20 @@
     }
 
     public static void startWithFragmentAsUser(Context context, String fragmentName, Bundle args,
-            int titleResId, CharSequence title, boolean isShortcut, UserHandle userHandle) {
-        Intent intent = onBuildStartFragmentIntent(context, fragmentName, args, titleResId,
-                title, isShortcut);
+            int titleResId, CharSequence title, boolean isShortcut,
+            UserHandle userHandle) {
+        Intent intent = onBuildStartFragmentIntent(context, fragmentName, args,
+                null /* titleResPackageName */, titleResId, title, isShortcut);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
+        context.startActivityAsUser(intent, userHandle);
+    }
+
+    public static void startWithFragmentAsUser(Context context, String fragmentName, Bundle args,
+            String titleResPackageName, int titleResId, CharSequence title, boolean isShortcut,
+            UserHandle userHandle) {
+        Intent intent = onBuildStartFragmentIntent(context, fragmentName, args, titleResPackageName,
+                titleResId, title, isShortcut);
         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
         context.startActivityAsUser(intent, userHandle);
@@ -627,6 +672,7 @@
      * @param context The Context.
      * @param fragmentName The name of the fragment to display.
      * @param args Optional arguments to supply to the fragment.
+     * @param titleResPackageName Optional package name for the resource id of the title.
      * @param titleResId Optional title resource id to show for this item.
      * @param title Optional title to show for this item.
      * @param isShortcut  tell if this is a Launcher Shortcut or not
@@ -634,11 +680,14 @@
      * fragment.
      */
     public static Intent onBuildStartFragmentIntent(Context context, String fragmentName,
-            Bundle args, int titleResId, CharSequence title, boolean isShortcut) {
+            Bundle args, String titleResPackageName, int titleResId, CharSequence title,
+            boolean isShortcut) {
         Intent intent = new Intent(Intent.ACTION_MAIN);
         intent.setClass(context, SubSettings.class);
         intent.putExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT, fragmentName);
         intent.putExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS, args);
+        intent.putExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_TITLE_RES_PACKAGE_NAME,
+                titleResPackageName);
         intent.putExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_TITLE_RESID, titleResId);
         intent.putExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_TITLE, title);
         intent.putExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_AS_SHORTCUT, isShortcut);
@@ -858,6 +907,12 @@
      * Returns a circular icon for a user.
      */
     public static Drawable getUserIcon(Context context, UserManager um, UserInfo user) {
+        if (user.isManagedProfile()) {
+            // We use predefined values for managed profiles
+            Bitmap b = BitmapFactory.decodeResource(context.getResources(),
+                    com.android.internal.R.drawable.ic_corp_icon);
+            return CircleFramedDrawable.getInstance(context, b);
+        }
         if (user.iconPath != null) {
             Bitmap icon = um.getUserIcon(user.id);
             if (icon != null) {
@@ -868,6 +923,23 @@
     }
 
     /**
+     * Returns a label for the user, in the form of "User: user name" or "Work profile".
+     */
+    public static String getUserLabel(Context context, UserInfo info) {
+        if (info.isManagedProfile()) {
+            // We use predefined values for managed profiles
+            return context.getString(R.string.managed_user_title);
+        }
+        String name = info != null ? info.name : null;
+        if (name == null && info != null) {
+            name = Integer.toString(info.id);
+        } else if (info == null) {
+            name = context.getString(R.string.unknown);
+        }
+        return context.getResources().getString(R.string.running_process_item_user_label, name);
+    }
+
+    /**
      * Return whether or not the user should have a SIM Cards option in Settings.
      * TODO: Change back to returning true if count is greater than one after testing.
      * TODO: See bug 16533525.
@@ -876,7 +948,7 @@
         final TelephonyManager tm =
                 (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
 
-        return tm.getSimCount() > 0;
+        return tm.getSimCount() > 1;
     }
 
     /**
@@ -962,4 +1034,65 @@
         }
         return sb.toString();
     }
+
+    /**
+     * finds a record with subId.
+     * Since the number of SIMs are few, an array is fine.
+     */
+    public static SubscriptionInfo findRecordBySubId(Context context, final int subId) {
+        final List<SubscriptionInfo> subInfoList =
+                SubscriptionManager.from(context).getActiveSubscriptionInfoList();
+        if (subInfoList != null) {
+            final int subInfoLength = subInfoList.size();
+
+            for (int i = 0; i < subInfoLength; ++i) {
+                final SubscriptionInfo sir = subInfoList.get(i);
+                if (sir != null && sir.getSubscriptionId() == subId) {
+                    return sir;
+                }
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * finds a record with slotId.
+     * Since the number of SIMs are few, an array is fine.
+     */
+    public static SubscriptionInfo findRecordBySlotId(Context context, final int slotId) {
+        final List<SubscriptionInfo> subInfoList =
+                SubscriptionManager.from(context).getActiveSubscriptionInfoList();
+        if (subInfoList != null) {
+            final int subInfoLength = subInfoList.size();
+
+            for (int i = 0; i < subInfoLength; ++i) {
+                final SubscriptionInfo sir = subInfoList.get(i);
+                if (sir.getSimSlotIndex() == slotId) {
+                    //Right now we take the first subscription on a SIM.
+                    return sir;
+                }
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Queries for the UserInfo of a user. Returns null if the user doesn't exist (was removed).
+     * @param userManager Instance of UserManager
+     * @param checkUser The user to check the existence of.
+     * @return UserInfo of the user or null for non-existent user.
+     */
+    public static UserInfo getExistingUser(UserManager userManager, UserHandle checkUser) {
+        final List<UserInfo> users = userManager.getUsers(true /* excludeDying */);
+        final int checkUserId = checkUser.getIdentifier();
+        for (UserInfo user : users) {
+            if (user.id == checkUserId) {
+                return user;
+            }
+        }
+        return null;
+    }
+
 }
diff --git a/src/com/android/settings/WirelessSettings.java b/src/com/android/settings/WirelessSettings.java
index 09d4a54..e9c39d9 100644
--- a/src/com/android/settings/WirelessSettings.java
+++ b/src/com/android/settings/WirelessSettings.java
@@ -37,7 +37,6 @@
 import android.os.SystemProperties;
 import android.os.UserHandle;
 import android.os.UserManager;
-import android.preference.CheckBoxPreference;
 import android.preference.Preference;
 import android.preference.Preference.OnPreferenceChangeListener;
 import android.preference.PreferenceScreen;
@@ -261,20 +260,27 @@
 
         addPreferencesFromResource(R.xml.wireless_settings);
 
-        final boolean isSecondaryUser = UserHandle.myUserId() != UserHandle.USER_OWNER;
+        final int myUserId = UserHandle.myUserId();
+        final boolean isSecondaryUser = myUserId != UserHandle.USER_OWNER;
+        final boolean isRestrictedUser = mUm.getUserInfo(myUserId).isRestricted();
 
         final Activity activity = getActivity();
         mAirplaneModePreference = (SwitchPreference) findPreference(KEY_TOGGLE_AIRPLANE);
         SwitchPreference nfc = (SwitchPreference) findPreference(KEY_TOGGLE_NFC);
         PreferenceScreen androidBeam = (PreferenceScreen) findPreference(KEY_ANDROID_BEAM_SETTINGS);
-        CheckBoxPreference nsd = (CheckBoxPreference) findPreference(KEY_TOGGLE_NSD);
+        SwitchPreference nsd = (SwitchPreference) findPreference(KEY_TOGGLE_NSD);
 
         mAirplaneModeEnabler = new AirplaneModeEnabler(activity, mAirplaneModePreference);
         mNfcEnabler = new NfcEnabler(activity, nfc, androidBeam);
 
         mSmsApplicationPreference = (AppListPreference) findPreference(KEY_SMS_APPLICATION);
-        mSmsApplicationPreference.setOnPreferenceChangeListener(this);
-        initSmsApplicationSetting();
+        // Restricted users cannot currently read/write SMS.
+        if (isRestrictedUser) {
+            removePreference(KEY_SMS_APPLICATION);
+        } else {
+            mSmsApplicationPreference.setOnPreferenceChangeListener(this);
+            initSmsApplicationSetting();
+        }
 
         // Remove NSD checkbox by default
         getPreferenceScreen().removePreference(nsd);
@@ -486,8 +492,11 @@
                 result.add(KEY_TOGGLE_NSD);
 
                 final UserManager um = (UserManager) context.getSystemService(Context.USER_SERVICE);
-                final boolean isSecondaryUser = UserHandle.myUserId() != UserHandle.USER_OWNER;
-                final boolean isWimaxEnabled = !isSecondaryUser && context.getResources().getBoolean(
+                final int myUserId = UserHandle.myUserId();
+                final boolean isSecondaryUser = myUserId != UserHandle.USER_OWNER;
+                final boolean isRestrictedUser = um.getUserInfo(myUserId).isRestricted();
+                final boolean isWimaxEnabled = !isSecondaryUser
+                        && context.getResources().getBoolean(
                         com.android.internal.R.bool.config_wimaxEnabled);
                 if (!isWimaxEnabled
                         || um.hasUserRestriction(UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS)) {
@@ -499,7 +508,8 @@
                 }
 
                 // Remove NFC if not available
-                final NfcManager manager = (NfcManager) context.getSystemService(Context.NFC_SERVICE);
+                final NfcManager manager = (NfcManager)
+                        context.getSystemService(Context.NFC_SERVICE);
                 if (manager != null) {
                     NfcAdapter adapter = manager.getDefaultAdapter();
                     if (adapter == null) {
@@ -525,7 +535,7 @@
                 // Remove SMS Application if the device does not support SMS
                 TelephonyManager tm =
                         (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
-                if (!tm.isSmsCapable()) {
+                if (!tm.isSmsCapable() || isRestrictedUser) {
                     result.add(KEY_SMS_APPLICATION);
                 }
 
@@ -540,8 +550,8 @@
                 result.add(KEY_PROXY_SETTINGS);
 
                 // Disable Tethering if it's not allowed or if it's a wifi-only device
-                ConnectivityManager cm =
-                        (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
+                ConnectivityManager cm = (ConnectivityManager)
+                        context.getSystemService(Context.CONNECTIVITY_SERVICE);
                 if (isSecondaryUser || !cm.isTetheringSupported()) {
                     result.add(KEY_TETHER_SETTINGS);
                 }
diff --git a/src/com/android/settings/accessibility/AccessibilitySettings.java b/src/com/android/settings/accessibility/AccessibilitySettings.java
index 92c478e..7d51712 100644
--- a/src/com/android/settings/accessibility/AccessibilitySettings.java
+++ b/src/com/android/settings/accessibility/AccessibilitySettings.java
@@ -30,7 +30,6 @@
 import android.os.Handler;
 import android.os.RemoteException;
 import android.os.UserHandle;
-import android.preference.CheckBoxPreference;
 import android.preference.ListPreference;
 import android.preference.Preference;
 import android.preference.PreferenceCategory;
@@ -184,11 +183,11 @@
     private PreferenceCategory mServicesCategory;
     private PreferenceCategory mSystemsCategory;
 
-    private CheckBoxPreference mToggleLargeTextPreference;
-    private CheckBoxPreference mToggleHighTextContrastPreference;
-    private CheckBoxPreference mTogglePowerButtonEndsCallPreference;
-    private CheckBoxPreference mToggleLockScreenRotationPreference;
-    private CheckBoxPreference mToggleSpeakPasswordPreference;
+    private SwitchPreference mToggleLargeTextPreference;
+    private SwitchPreference mToggleHighTextContrastPreference;
+    private SwitchPreference mTogglePowerButtonEndsCallPreference;
+    private SwitchPreference mToggleLockScreenRotationPreference;
+    private SwitchPreference mToggleSpeakPasswordPreference;
     private ListPreference mSelectLongPressTimeoutPreference;
     private Preference mNoServicesMessagePreference;
     private PreferenceScreen mCaptioningPreferenceScreen;
@@ -350,11 +349,11 @@
 
         // Large text.
         mToggleLargeTextPreference =
-                (CheckBoxPreference) findPreference(TOGGLE_LARGE_TEXT_PREFERENCE);
+                (SwitchPreference) findPreference(TOGGLE_LARGE_TEXT_PREFERENCE);
 
         // Text contrast.
         mToggleHighTextContrastPreference =
-                (CheckBoxPreference) findPreference(TOGGLE_HIGH_TEXT_CONTRAST_PREFERENCE);
+                (SwitchPreference) findPreference(TOGGLE_HIGH_TEXT_CONTRAST_PREFERENCE);
 
         // Display inversion.
         mToggleInversionPreference = (SwitchPreference) findPreference(TOGGLE_INVERSION_PREFERENCE);
@@ -362,7 +361,7 @@
 
         // Power button ends calls.
         mTogglePowerButtonEndsCallPreference =
-                (CheckBoxPreference) findPreference(TOGGLE_POWER_BUTTON_ENDS_CALL_PREFERENCE);
+                (SwitchPreference) findPreference(TOGGLE_POWER_BUTTON_ENDS_CALL_PREFERENCE);
         if (!KeyCharacterMap.deviceHasKey(KeyEvent.KEYCODE_POWER)
                 || !Utils.isVoiceCapable(getActivity())) {
             mSystemsCategory.removePreference(mTogglePowerButtonEndsCallPreference);
@@ -370,14 +369,14 @@
 
         // Lock screen rotation.
         mToggleLockScreenRotationPreference =
-                (CheckBoxPreference) findPreference(TOGGLE_LOCK_SCREEN_ROTATION_PREFERENCE);
+                (SwitchPreference) findPreference(TOGGLE_LOCK_SCREEN_ROTATION_PREFERENCE);
         if (!RotationPolicy.isRotationSupported(getActivity())) {
             mSystemsCategory.removePreference(mToggleLockScreenRotationPreference);
         }
 
         // Speak passwords.
         mToggleSpeakPasswordPreference =
-                (CheckBoxPreference) findPreference(TOGGLE_SPEAK_PASSWORD_PREFERENCE);
+                (SwitchPreference) findPreference(TOGGLE_SPEAK_PASSWORD_PREFERENCE);
 
         // Long press timeout.
         mSelectLongPressTimeoutPreference =
diff --git a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
index 08fba67..0b7600b 100644
--- a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
@@ -63,10 +63,7 @@
             new SettingsContentObserver(new Handler()) {
             @Override
                 public void onChange(boolean selfChange, Uri uri) {
-                    String settingValue = Settings.Secure.getString(getContentResolver(),
-                            Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES);
-                    final boolean enabled = settingValue.contains(mComponentName.flattenToString());
-                    mSwitchBar.setCheckedInternal(enabled);
+                    updateSwitchBarToggleSwitch();
                 }
             };
 
@@ -83,6 +80,7 @@
     @Override
     public void onResume() {
         mSettingsContentObserver.register(getContentResolver());
+        updateSwitchBarToggleSwitch();
         super.onResume();
     }
 
@@ -208,6 +206,14 @@
         }
     }
 
+    private void updateSwitchBarToggleSwitch() {
+        final String settingValue = Settings.Secure.getString(getContentResolver(),
+                Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES);
+        final boolean checked = settingValue != null
+                && settingValue.contains(mComponentName.flattenToString());
+        mSwitchBar.setCheckedInternal(checked);
+    }
+
     private View createEnableDialogContentView(AccessibilityServiceInfo info) {
         LayoutInflater inflater = (LayoutInflater) getSystemService(
                 Context.LAYOUT_INFLATER_SERVICE);
@@ -239,7 +245,7 @@
 
         ImageView imageView = (ImageView) capabilityView.findViewById(
                 com.android.internal.R.id.perm_icon);
-        imageView.setImageDrawable(getResources().getDrawable(
+        imageView.setImageDrawable(getActivity().getDrawable(
                 com.android.internal.R.drawable.ic_text_dot));
 
         TextView labelView = (TextView) capabilityView.findViewById(
@@ -265,7 +271,7 @@
 
             imageView = (ImageView) capabilityView.findViewById(
                     com.android.internal.R.id.perm_icon);
-            imageView.setImageDrawable(getResources().getDrawable(
+            imageView.setImageDrawable(getActivity().getDrawable(
                     com.android.internal.R.drawable.ic_text_dot));
 
             labelView = (TextView) capabilityView.findViewById(
diff --git a/src/com/android/settings/accounts/AccountSettings.java b/src/com/android/settings/accounts/AccountSettings.java
index 8a183da..ffcb3b8 100644
--- a/src/com/android/settings/accounts/AccountSettings.java
+++ b/src/com/android/settings/accounts/AccountSettings.java
@@ -369,6 +369,8 @@
             if (label == null) {
                 continue;
             }
+            final String titleResPackageName = helper.getPackageForType(accountType);
+            final int titleResId = helper.getLabelIdForType(accountType);
 
             final Account[] accounts = AccountManager.get(getActivity())
                     .getAccountsByTypeAsUser(accountType, userHandle);
@@ -382,7 +384,8 @@
                 fragmentArguments.putParcelable(EXTRA_USER, userHandle);
 
                 accountTypePreferences.add(new AccountPreference(getActivity(), label,
-                        AccountSyncSettings.class.getName(), fragmentArguments,
+                        titleResPackageName, titleResId, AccountSyncSettings.class.getName(),
+                        fragmentArguments,
                         helper.getDrawableForType(getActivity(), accountType)));
             } else {
                 final Bundle fragmentArguments = new Bundle();
@@ -392,7 +395,8 @@
                 fragmentArguments.putParcelable(EXTRA_USER, userHandle);
 
                 accountTypePreferences.add(new AccountPreference(getActivity(), label,
-                        ManageAccountsSettings.class.getName(), fragmentArguments,
+                        titleResPackageName, titleResId, ManageAccountsSettings.class.getName(),
+                        fragmentArguments,
                         helper.getDrawableForType(getActivity(), accountType)));
             }
             helper.preloadDrawableForType(getActivity(), accountType);
@@ -435,6 +439,17 @@
         private final CharSequence mTitle;
 
         /**
+         * Packange name used to resolve the resources of the title shown to the user in the new
+         * fragment.
+         */
+        private final String mTitleResPackageName;
+
+        /**
+         * Resource id of the title shown to the user in the new fragment.
+         */
+        private final int mTitleResId;
+
+        /**
          * Full class name of the fragment to display when this tile is
          * selected.
          * @attr ref android.R.styleable#PreferenceHeader_fragment
@@ -447,10 +462,13 @@
          */
         private final Bundle mFragmentArguments;
 
-        public AccountPreference(Context context, CharSequence title, String fragment,
-                Bundle fragmentArguments, Drawable icon) {
+        public AccountPreference(Context context, CharSequence title, String titleResPackageName,
+                int titleResId, String fragment, Bundle fragmentArguments,
+                Drawable icon) {
             super(context);
             mTitle = title;
+            mTitleResPackageName = titleResPackageName;
+            mTitleResId = titleResId;
             mFragment = fragment;
             mFragmentArguments = fragmentArguments;
             setWidgetLayoutResource(R.layout.account_type_preference);
@@ -464,8 +482,9 @@
         @Override
         public boolean onPreferenceClick(Preference preference) {
             if (mFragment != null) {
-                Utils.startWithFragment(
-                        getContext(), mFragment, mFragmentArguments, null, 0, 0, mTitle);
+                Utils.startWithFragment(getContext(), mFragment, mFragmentArguments,
+                        null /* resultTo */, 0 /* resultRequestCode */, mTitleResPackageName,
+                        mTitleResId, null /* title */);
                 return true;
             }
             return false;
@@ -536,6 +555,7 @@
      */
     public static class ConfirmAutoSyncChangeFragment extends DialogFragment {
         private static final String SAVE_ENABLING = "enabling";
+        private static final String SAVE_USER_HANDLE = "userHandle";
         private boolean mEnabling;
         private UserHandle mUserHandle;
 
@@ -554,6 +574,7 @@
             final Context context = getActivity();
             if (savedInstanceState != null) {
                 mEnabling = savedInstanceState.getBoolean(SAVE_ENABLING);
+                mUserHandle = (UserHandle) savedInstanceState.getParcelable(SAVE_USER_HANDLE);
             }
 
             final AlertDialog.Builder builder = new AlertDialog.Builder(context);
@@ -581,6 +602,7 @@
         public void onSaveInstanceState(Bundle outState) {
             super.onSaveInstanceState(outState);
             outState.putBoolean(SAVE_ENABLING, mEnabling);
+            outState.putParcelable(SAVE_USER_HANDLE, mUserHandle);
         }
     }
     // TODO Implement a {@link SearchIndexProvider} to allow Indexing and Search of account types
diff --git a/src/com/android/settings/accounts/AccountSyncSettings.java b/src/com/android/settings/accounts/AccountSyncSettings.java
index f0896c9..858880b 100644
--- a/src/com/android/settings/accounts/AccountSyncSettings.java
+++ b/src/com/android/settings/accounts/AccountSyncSettings.java
@@ -24,6 +24,7 @@
 import android.accounts.AccountManagerFuture;
 import android.accounts.AuthenticatorException;
 import android.accounts.OperationCanceledException;
+import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.ContentResolver;
@@ -74,8 +75,8 @@
     private ImageView mProviderIcon;
     private TextView mErrorInfoView;
     private Account mAccount;
-    private ArrayList<SyncStateCheckBoxPreference> mCheckBoxes =
-                new ArrayList<SyncStateCheckBoxPreference>();
+    private ArrayList<SyncStateSwitchPreference> mSwitches =
+                new ArrayList<SyncStateSwitchPreference>();
     private ArrayList<SyncAdapterType> mInvisibleAdapters = Lists.newArrayList();
 
     @Override
@@ -90,20 +91,20 @@
                         new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
-                        // TODO: We need an API to remove an account from a different user.
-                        // See: http://b/15466880
-                        AccountManager.get(AccountSyncSettings.this.getActivity())
-                                .removeAccountAsUser(mAccount,
-                                new AccountManagerCallback<Boolean>() {
+                        Activity activity = getActivity();
+                        AccountManager.get(activity)
+                                .removeAccountAsUser(mAccount, activity,
+                                new AccountManagerCallback<Bundle>() {
                             @Override
-                            public void run(AccountManagerFuture<Boolean> future) {
+                            public void run(AccountManagerFuture<Bundle> future) {
                                 // If already out of this screen, don't proceed.
                                 if (!AccountSyncSettings.this.isResumed()) {
                                     return;
                                 }
                                 boolean failed = true;
                                 try {
-                                    if (future.getResult() == true) {
+                                    if (future.getResult()
+                                            .getBoolean(AccountManager.KEY_BOOLEAN_RESULT)) {
                                         failed = false;
                                     }
                                 } catch (OperationCanceledException e) {
@@ -209,9 +210,9 @@
         mAuthenticatorHelper.stopListeningToAccountUpdates();
     }
 
-    private void addSyncStateCheckBox(Account account, String authority) {
-        SyncStateCheckBoxPreference item =
-                new SyncStateCheckBoxPreference(getActivity(), account, authority);
+    private void addSyncStateSwitch(Account account, String authority) {
+        SyncStateSwitchPreference item =
+                new SyncStateSwitchPreference(getActivity(), account, authority);
         item.setPersistent(false);
         final ProviderInfo providerInfo = getPackageManager().resolveContentProviderAsUser(
                 authority, 0, mUserHandle.getIdentifier());
@@ -226,7 +227,7 @@
         String title = getString(R.string.sync_item_title, providerLabel);
         item.setTitle(title);
         item.setKey(authority);
-        mCheckBoxes.add(item);
+        mSwitches.add(item);
     }
 
     @Override
@@ -258,7 +259,7 @@
     public void onPrepareOptionsMenu(Menu menu) {
         super.onPrepareOptionsMenu(menu);
         // Note that this also counts accounts that are not currently displayed
-        boolean syncActive = ContentResolver.getCurrentSyncsAsUser(
+        boolean syncActive = !ContentResolver.getCurrentSyncsAsUser(
                 mUserHandle.getIdentifier()).isEmpty();
         menu.findItem(MENU_SYNC_NOW_ID).setVisible(!syncActive);
         menu.findItem(MENU_SYNC_CANCEL_ID).setVisible(syncActive);
@@ -282,8 +283,8 @@
 
     @Override
     public boolean onPreferenceTreeClick(PreferenceScreen preferences, Preference preference) {
-        if (preference instanceof SyncStateCheckBoxPreference) {
-            SyncStateCheckBoxPreference syncPref = (SyncStateCheckBoxPreference) preference;
+        if (preference instanceof SyncStateSwitchPreference) {
+            SyncStateSwitchPreference syncPref = (SyncStateSwitchPreference) preference;
             String authority = syncPref.getAuthority();
             Account account = syncPref.getAccount();
             final int userId = mUserHandle.getIdentifier();
@@ -313,12 +314,18 @@
 
     private void startSyncForEnabledProviders() {
         requestOrCancelSyncForEnabledProviders(true /* start them */);
-        getActivity().invalidateOptionsMenu();
+        final Activity activity = getActivity();
+        if (activity != null) {
+            activity.invalidateOptionsMenu();
+        }
     }
 
     private void cancelSyncForEnabledProviders() {
         requestOrCancelSyncForEnabledProviders(false /* cancel them */);
-        getActivity().invalidateOptionsMenu();
+        final Activity activity = getActivity();
+        if (activity != null) {
+            activity.invalidateOptionsMenu();
+        }
     }
 
     private void requestOrCancelSyncForEnabledProviders(boolean startSync) {
@@ -326,10 +333,10 @@
         int count = getPreferenceScreen().getPreferenceCount();
         for (int i = 0; i < count; i++) {
             Preference pref = getPreferenceScreen().getPreference(i);
-            if (! (pref instanceof SyncStateCheckBoxPreference)) {
+            if (! (pref instanceof SyncStateSwitchPreference)) {
                 continue;
             }
-            SyncStateCheckBoxPreference syncPref = (SyncStateCheckBoxPreference) pref;
+            SyncStateSwitchPreference syncPref = (SyncStateSwitchPreference) pref;
             if (!syncPref.isChecked()) {
                 continue;
             }
@@ -367,6 +374,10 @@
     protected void onSyncStateUpdated() {
         if (!isResumed()) return;
         setFeedsState();
+        final Activity activity = getActivity();
+        if (activity != null) {
+            activity.invalidateOptionsMenu();
+        }
     }
 
     private void setFeedsState() {
@@ -376,15 +387,15 @@
         List<SyncInfo> currentSyncs = ContentResolver.getCurrentSyncsAsUser(userId);
         boolean syncIsFailing = false;
 
-        // Refresh the sync status checkboxes - some syncs may have become active.
-        updateAccountCheckboxes();
+        // Refresh the sync status switches - some syncs may have become active.
+        updateAccountSwitches();
 
         for (int i = 0, count = getPreferenceScreen().getPreferenceCount(); i < count; i++) {
             Preference pref = getPreferenceScreen().getPreference(i);
-            if (! (pref instanceof SyncStateCheckBoxPreference)) {
+            if (! (pref instanceof SyncStateSwitchPreference)) {
                 continue;
             }
-            SyncStateCheckBoxPreference syncPref = (SyncStateCheckBoxPreference) pref;
+            SyncStateSwitchPreference syncPref = (SyncStateSwitchPreference) pref;
 
             String authority = syncPref.getAuthority();
             Account account = syncPref.getAccount();
@@ -439,7 +450,6 @@
             syncPref.setChecked(oneTimeSyncMode || syncEnabled);
         }
         mErrorInfoView.setVisibility(syncIsFailing ? View.VISIBLE : View.GONE);
-        getActivity().invalidateOptionsMenu();
     }
 
     @Override
@@ -450,7 +460,7 @@
             finish();
             return;
         }
-        updateAccountCheckboxes();
+        updateAccountSwitches();
         onSyncStateUpdated();
     }
 
@@ -468,7 +478,7 @@
         return false;
     }
 
-    private void updateAccountCheckboxes() {
+    private void updateAccountSwitches() {
         mInvisibleAdapters.clear();
 
         SyncAdapterType[] syncAdapters = ContentResolver.getSyncAdapterTypesAsUser(
@@ -480,7 +490,7 @@
             if (!sa.accountType.equals(mAccount.type)) continue;
             if (sa.isUserVisible()) {
                 if (Log.isLoggable(TAG, Log.VERBOSE)) {
-                    Log.d(TAG, "updateAccountCheckboxes: added authority " + sa.authority
+                    Log.d(TAG, "updateAccountSwitches: added authority " + sa.authority
                             + " to accountType " + sa.accountType);
                 }
                 authorities.add(sa.authority);
@@ -491,10 +501,10 @@
             }
         }
 
-        for (int i = 0, n = mCheckBoxes.size(); i < n; i++) {
-            getPreferenceScreen().removePreference(mCheckBoxes.get(i));
+        for (int i = 0, n = mSwitches.size(); i < n; i++) {
+            getPreferenceScreen().removePreference(mSwitches.get(i));
         }
-        mCheckBoxes.clear();
+        mSwitches.clear();
 
         if (Log.isLoggable(TAG, Log.VERBOSE)) {
             Log.d(TAG, "looking for sync adapters that match account " + mAccount);
@@ -508,13 +518,13 @@
                 Log.d(TAG, "  found authority " + authority + " " + syncState);
             }
             if (syncState > 0) {
-                addSyncStateCheckBox(mAccount, authority);
+                addSyncStateSwitch(mAccount, authority);
             }
         }
 
-        Collections.sort(mCheckBoxes);
-        for (int i = 0, n = mCheckBoxes.size(); i < n; i++) {
-            getPreferenceScreen().addPreference(mCheckBoxes.get(i));
+        Collections.sort(mSwitches);
+        for (int i = 0, n = mSwitches.size(); i < n; i++) {
+            getPreferenceScreen().addPreference(mSwitches.get(i));
         }
     }
 
diff --git a/src/com/android/settings/accounts/AuthenticatorHelper.java b/src/com/android/settings/accounts/AuthenticatorHelper.java
index cc8a6d5..86e0da5 100644
--- a/src/com/android/settings/accounts/AuthenticatorHelper.java
+++ b/src/com/android/settings/accounts/AuthenticatorHelper.java
@@ -111,7 +111,7 @@
                 Context authContext = context.createPackageContextAsUser(desc.packageName, 0,
                         mUserHandle);
                 icon = mContext.getPackageManager().getUserBadgedIcon(
-                        authContext.getResources().getDrawable(desc.iconId), mUserHandle);
+                        authContext.getDrawable(desc.iconId), mUserHandle);
                 synchronized (mAccTypeIconCache) {
                     mAccTypeIconCache.put(accountType, icon);
                 }
@@ -148,6 +148,33 @@
     }
 
     /**
+     * Gets the package associated with a particular account type. If none found, return null.
+     * @param accountType the type of account
+     * @return the package name or null if one cannot be found.
+     */
+    public String getPackageForType(final String accountType) {
+        if (mTypeToAuthDescription.containsKey(accountType)) {
+            AuthenticatorDescription desc = mTypeToAuthDescription.get(accountType);
+            return desc.packageName;
+        }
+        return null;
+    }
+
+    /**
+     * Gets the resource id of the label associated with a particular account type. If none found,
+     * return -1.
+     * @param accountType the type of account
+     * @return a resource id for the label or -1 if none found;
+     */
+    public int getLabelIdForType(final String accountType) {
+        if (mTypeToAuthDescription.containsKey(accountType)) {
+            AuthenticatorDescription desc = mTypeToAuthDescription.get(accountType);
+            return desc.labelId;
+        }
+        return -1;
+    }
+
+    /**
      * Updates provider icons. Subclasses should call this in onCreate()
      * and update any UI that depends on AuthenticatorDescriptions in onAuthDescriptionsUpdated().
      */
diff --git a/src/com/android/settings/accounts/ChooseAccountActivity.java b/src/com/android/settings/accounts/ChooseAccountActivity.java
index e52d640..5e7e81e 100644
--- a/src/com/android/settings/accounts/ChooseAccountActivity.java
+++ b/src/com/android/settings/accounts/ChooseAccountActivity.java
@@ -216,7 +216,7 @@
                 AuthenticatorDescription desc = mTypeToAuthDescription.get(accountType);
                 Context authContext = createPackageContextAsUser(desc.packageName, 0, mUserHandle);
                 icon = getPackageManager().getUserBadgedIcon(
-                        authContext.getResources().getDrawable(desc.iconId), mUserHandle);
+                        authContext.getDrawable(desc.iconId), mUserHandle);
             } catch (PackageManager.NameNotFoundException e) {
                 // TODO: place holder icon for missing account icons?
                 Log.w(TAG, "No icon name for account type " + accountType);
diff --git a/src/com/android/settings/accounts/ManageAccountsSettings.java b/src/com/android/settings/accounts/ManageAccountsSettings.java
index 074176b..85ecd90 100644
--- a/src/com/android/settings/accounts/ManageAccountsSettings.java
+++ b/src/com/android/settings/accounts/ManageAccountsSettings.java
@@ -28,7 +28,6 @@
 import android.content.SyncStatusInfo;
 import android.content.pm.ActivityInfo;
 import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.pm.ResolveInfo;
@@ -84,6 +83,7 @@
     // If an account type is set, then show only accounts of that type
     private String mAccountType;
     // Temporary hack, to deal with backward compatibility 
+    // mFirstAccount is used for the injected preferences
     private Account mFirstAccount;
 
     @Override
@@ -99,11 +99,12 @@
     }
 
     @Override
-    public void onStart() {
-        super.onStart();
+    public void onResume() {
+        super.onResume();
         mAuthenticatorHelper.listenToAccountUpdates();
         updateAuthDescriptions();
         showAccountsIfNeeded();
+        showSyncState();
     }
 
     @Override
@@ -134,10 +135,15 @@
     }
 
     @Override
+    public void onPause() {
+        super.onPause();
+        mAuthenticatorHelper.stopListeningToAccountUpdates();
+    }
+
+    @Override
     public void onStop() {
         super.onStop();
         final Activity activity = getActivity();
-        mAuthenticatorHelper.stopListeningToAccountUpdates();
         activity.getActionBar().setDisplayOptions(0, ActionBar.DISPLAY_SHOW_CUSTOM);
         activity.getActionBar().setCustomView(null);
     }
@@ -164,11 +170,9 @@
 
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        MenuItem syncNow = menu.add(0, MENU_SYNC_NOW_ID, 0,
-                getString(R.string.sync_menu_sync_now))
+        menu.add(0, MENU_SYNC_NOW_ID, 0, getString(R.string.sync_menu_sync_now))
                 .setIcon(R.drawable.ic_menu_refresh_holo_dark);
-        MenuItem syncCancel = menu.add(0, MENU_SYNC_CANCEL_ID, 0,
-                getString(R.string.sync_menu_sync_cancel))
+        menu.add(0, MENU_SYNC_CANCEL_ID, 0, getString(R.string.sync_menu_sync_cancel))
                 .setIcon(com.android.internal.R.drawable.ic_menu_close_clear_cancel);
         super.onCreateOptionsMenu(menu, inflater);
     }
@@ -176,10 +180,10 @@
     @Override
     public void onPrepareOptionsMenu(Menu menu) {
         super.onPrepareOptionsMenu(menu);
-        boolean syncActive = ContentResolver.getCurrentSyncsAsUser(
+        boolean syncActive = !ContentResolver.getCurrentSyncsAsUser(
                 mUserHandle.getIdentifier()).isEmpty();
-        menu.findItem(MENU_SYNC_NOW_ID).setVisible(!syncActive && mFirstAccount != null);
-        menu.findItem(MENU_SYNC_CANCEL_ID).setVisible(syncActive && mFirstAccount != null);
+        menu.findItem(MENU_SYNC_NOW_ID).setVisible(!syncActive);
+        menu.findItem(MENU_SYNC_CANCEL_ID).setVisible(syncActive);
     }
 
     @Override
@@ -227,11 +231,20 @@
     @Override
     protected void onSyncStateUpdated() {
         showSyncState();
+        // Catch any delayed delivery of update messages
+        final Activity activity = getActivity();
+        if (activity != null) {
+            activity.invalidateOptionsMenu();
+        }
     }
 
+    /**
+     * Shows the sync state of the accounts. Note: it must be called after the accounts have been
+     * loaded, @see #showAccountsIfNeeded().
+     */
     private void showSyncState() {
         // Catch any delayed delivery of update messages
-        if (getActivity() == null) return;
+        if (getActivity() == null || getActivity().isFinishing()) return;
 
         final int userId = mUserHandle.getIdentifier();
 
@@ -370,17 +383,14 @@
                 getPreferenceScreen().addPreference(preference);
                 if (mFirstAccount == null) {
                     mFirstAccount = account;
-                    getActivity().invalidateOptionsMenu();
                 }
             }
         }
         if (mAccountType != null && mFirstAccount != null) {
             addAuthenticatorSettings();
         } else {
-            // There's no account, reset to top-level of settings
-            Intent settingsTop = new Intent(android.provider.Settings.ACTION_SETTINGS);
-            settingsTop.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-            getActivity().startActivity(settingsTop);
+            // There's no account, close activity
+            finish();
         }
     }
 
diff --git a/src/com/android/settings/accounts/SyncStateCheckBoxPreference.java b/src/com/android/settings/accounts/SyncStateSwitchPreference.java
similarity index 89%
rename from src/com/android/settings/accounts/SyncStateCheckBoxPreference.java
rename to src/com/android/settings/accounts/SyncStateSwitchPreference.java
index db746ee..4d63870 100644
--- a/src/com/android/settings/accounts/SyncStateCheckBoxPreference.java
+++ b/src/com/android/settings/accounts/SyncStateSwitchPreference.java
@@ -19,7 +19,7 @@
 import android.accounts.Account;
 import android.app.ActivityManager;
 import android.content.Context;
-import android.preference.CheckBoxPreference;
+import android.preference.SwitchPreference;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.View;
@@ -28,7 +28,7 @@
 import com.android.settings.R;
 import com.android.settings.widget.AnimatedImageView;
 
-public class SyncStateCheckBoxPreference extends CheckBoxPreference {
+public class SyncStateSwitchPreference extends SwitchPreference {
 
     private boolean mIsActive = false;
     private boolean mIsPending = false;
@@ -42,14 +42,14 @@
      */
     private boolean mOneTimeSyncMode = false;
 
-    public SyncStateCheckBoxPreference(Context context, AttributeSet attrs) {
+    public SyncStateSwitchPreference(Context context, AttributeSet attrs) {
         super(context, attrs);
         setWidgetLayoutResource(R.layout.preference_widget_sync_toggle);
         mAccount = null;
         mAuthority = null;
     }
 
-    public SyncStateCheckBoxPreference(Context context, Account account, String authority) {
+    public SyncStateSwitchPreference(Context context, Account account, String authority) {
         super(context, null);
         mAccount = account;
         mAuthority = authority;
@@ -70,9 +70,9 @@
         final boolean failedVisible = mFailed && !activeVisible;
         syncFailedView.setVisibility(failedVisible ? View.VISIBLE : View.GONE);
 
-        View checkBox = view.findViewById(android.R.id.checkbox);
+        View switchView = view.findViewById(com.android.internal.R.id.switchWidget);
         if (mOneTimeSyncMode) {
-            checkBox.setVisibility(View.GONE);
+            switchView.setVisibility(View.GONE);
 
             /*
              * Override the summary. Fill in the %1$s with the existing summary
@@ -82,7 +82,7 @@
             TextView summary = (TextView) view.findViewById(android.R.id.summary);
             summary.setText(getContext().getString(R.string.sync_one_time_sync, getSummary()));
         } else {
-            checkBox.setVisibility(View.VISIBLE);
+            switchView.setVisibility(View.VISIBLE);
         }
     }
 
@@ -131,7 +131,7 @@
     @Override
     protected void onClick() {
         // When we're in one-time sync mode, we don't want a click to change the
-        // checkbox state
+        // Switch state
         if (!mOneTimeSyncMode) {
             if (ActivityManager.isUserAMonkey()) {
                 Log.d("SyncState", "ignoring monkey's attempt to flip sync state");
diff --git a/src/com/android/settings/applications/AppOpsState.java b/src/com/android/settings/applications/AppOpsState.java
index 580c44e..1ab3c73 100644
--- a/src/com/android/settings/applications/AppOpsState.java
+++ b/src/com/android/settings/applications/AppOpsState.java
@@ -269,7 +269,7 @@
                 return mIcon;
             }
 
-            return mState.mContext.getResources().getDrawable(
+            return mState.mContext.getDrawable(
                     android.R.drawable.sym_def_app_icon);
         }
 
diff --git a/src/com/android/settings/applications/ApplicationsState.java b/src/com/android/settings/applications/ApplicationsState.java
index 1c2eb2c..9c51181 100644
--- a/src/com/android/settings/applications/ApplicationsState.java
+++ b/src/com/android/settings/applications/ApplicationsState.java
@@ -144,7 +144,7 @@
                     return true;
                 } else {
                     this.mounted = false;
-                    this.icon = context.getResources().getDrawable(
+                    this.icon = context.getDrawable(
                             com.android.internal.R.drawable.sym_app_on_sd_unavailable_icon);
                 }
             } else if (!this.mounted) {
diff --git a/src/com/android/settings/applications/InstalledAppDetails.java b/src/com/android/settings/applications/InstalledAppDetails.java
index 4b1bc10..3aa948d 100755
--- a/src/com/android/settings/applications/InstalledAppDetails.java
+++ b/src/com/android/settings/applications/InstalledAppDetails.java
@@ -420,6 +420,9 @@
         mNotificationSwitch.setChecked(enabled);
         if (Utils.isSystemPackage(mPm, mPackageInfo)) {
             mNotificationSwitch.setEnabled(false);
+        } else if ((mPackageInfo.applicationInfo.flags & ApplicationInfo.FLAG_INSTALLED) == 0) {
+            // App is not installed on the current user
+            mNotificationSwitch.setEnabled(false);
         } else {
             mNotificationSwitch.setEnabled(true);
             mNotificationSwitch.setOnCheckedChangeListener(this);
@@ -728,7 +731,9 @@
             Log.i(TAG, "Have " + prefActList.size() + " number of activities in preferred list");
         boolean hasUsbDefaults = false;
         try {
-            hasUsbDefaults = mUsbManager.hasDefaults(packageName, UserHandle.myUserId());
+            if (mUsbManager != null) {
+                hasUsbDefaults = mUsbManager.hasDefaults(packageName, UserHandle.myUserId());
+            }
         } catch (RemoteException e) {
             Log.e(TAG, "mUsbManager.hasDefaults", e);
         }
@@ -1377,17 +1382,19 @@
         } else if(v == mSpecialDisableButton) {
             showDialogInner(DLG_SPECIAL_DISABLE, 0);
         } else if(v == mActivitiesButton) {
-            mPm.clearPackagePreferredActivities(packageName);
-            try {
-                mUsbManager.clearDefaults(packageName, UserHandle.myUserId());
-            } catch (RemoteException e) {
-                Log.e(TAG, "mUsbManager.clearDefaults", e);
+            if (mUsbManager != null) {
+                mPm.clearPackagePreferredActivities(packageName);
+                try {
+                    mUsbManager.clearDefaults(packageName, UserHandle.myUserId());
+                } catch (RemoteException e) {
+                    Log.e(TAG, "mUsbManager.clearDefaults", e);
+                }
+                mAppWidgetManager.setBindAppWidgetPermission(packageName, false);
+                TextView autoLaunchTitleView =
+                        (TextView) mRootView.findViewById(R.id.auto_launch_title);
+                TextView autoLaunchView = (TextView) mRootView.findViewById(R.id.auto_launch);
+                resetLaunchDefaultsUi(autoLaunchTitleView, autoLaunchView);
             }
-            mAppWidgetManager.setBindAppWidgetPermission(packageName, false);
-            TextView autoLaunchTitleView =
-                    (TextView) mRootView.findViewById(R.id.auto_launch_title);
-            TextView autoLaunchView = (TextView) mRootView.findViewById(R.id.auto_launch);
-            resetLaunchDefaultsUi(autoLaunchTitleView, autoLaunchView);
         } else if(v == mClearDataButton) {
             if (mAppEntry.info.manageSpaceActivityName != null) {
                 if (!Utils.isMonkeyRunning()) {
diff --git a/src/com/android/settings/applications/ManageApplications.java b/src/com/android/settings/applications/ManageApplications.java
index e64e56e..45431eb 100644
--- a/src/com/android/settings/applications/ManageApplications.java
+++ b/src/com/android/settings/applications/ManageApplications.java
@@ -197,8 +197,6 @@
 
         private View mListContainer;
 
-        private ViewGroup mPinnedHeader;
-
         // ListView used to display list
         private ListView mListView;
         // Custom view used to display running processes
@@ -245,19 +243,10 @@
             if (mRootView != null) {
                 return mRootView;
             }
-
             mInflater = inflater;
             mRootView = inflater.inflate(mListType == LIST_TYPE_RUNNING
                     ? R.layout.manage_applications_running
                     : R.layout.manage_applications_apps, null);
-            mPinnedHeader = (ViewGroup) mRootView.findViewById(R.id.pinned_header);
-            if (mOwner.mProfileSpinnerAdapter != null) {
-                Spinner spinner = (Spinner) inflater.inflate(R.layout.spinner_view, null);
-                spinner.setAdapter(mOwner.mProfileSpinnerAdapter);
-                spinner.setOnItemSelectedListener(mOwner);
-                mPinnedHeader.addView(spinner);
-                mPinnedHeader.setVisibility(View.VISIBLE);
-            }
             mLoadingContainer = mRootView.findViewById(R.id.loading_container);
             mLoadingContainer.setVisibility(View.VISIBLE);
             mListContainer = mRootView.findViewById(R.id.list_container);
@@ -482,7 +471,9 @@
     private ViewGroup mContentContainer;
     private View mRootView;
     private ViewPager mViewPager;
+    private ViewGroup mPinnedHeader;
     private UserSpinnerAdapter mProfileSpinnerAdapter;
+    private Spinner mSpinner;
     private Context mContext;
 
     AlertDialog mResetDialog;
@@ -935,7 +926,14 @@
                 container, false);
         mContentContainer = container;
         mRootView = rootView;
-
+        mPinnedHeader = (ViewGroup) mRootView.findViewById(R.id.pinned_header);
+        if (mProfileSpinnerAdapter != null) {
+            mSpinner = (Spinner) inflater.inflate(R.layout.spinner_view, null);
+            mSpinner.setAdapter(mProfileSpinnerAdapter);
+            mSpinner.setOnItemSelectedListener(this);
+            mPinnedHeader.addView(mSpinner);
+            mPinnedHeader.setVisibility(View.VISIBLE);
+        }
         mViewPager = (ViewPager) rootView.findViewById(R.id.pager);
         MyPagerAdapter adapter = new MyPagerAdapter();
         mViewPager.setAdapter(adapter);
@@ -1045,6 +1043,9 @@
             int currentTab = mViewPager.getCurrentItem();
             intent.putExtra(EXTRA_LIST_TYPE, mTabs.get(currentTab).mListType);
             mContext.startActivityAsUser(intent, selectedUser);
+            // Go back to default selection, which is the first one; this makes sure that pressing
+            // the back button takes you into a consistent state
+            mSpinner.setSelection(0);
         }
     }
 
diff --git a/src/com/android/settings/applications/RunningState.java b/src/com/android/settings/applications/RunningState.java
index 1019abc..4b58729 100644
--- a/src/com/android/settings/applications/RunningState.java
+++ b/src/com/android/settings/applications/RunningState.java
@@ -16,9 +16,6 @@
 
 package com.android.settings.applications;
 
-import com.android.settings.R;
-import com.android.settings.Utils;
-
 import android.app.ActivityManager;
 import android.app.ActivityManagerNative;
 import android.app.ActivityThread;
@@ -31,6 +28,8 @@
 import android.content.pm.ServiceInfo;
 import android.content.pm.UserInfo;
 import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.Drawable.ConstantState;
 import android.os.Handler;
@@ -44,6 +43,10 @@
 import android.util.Log;
 import android.util.SparseArray;
 
+import com.android.settings.R;
+import com.android.settings.Utils;
+import com.android.settings.drawable.CircleFramedDrawable;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -77,6 +80,7 @@
     final PackageManager mPm;
     final UserManager mUm;
     final int mMyUserId;
+    final boolean mHideManagedProfiles;
 
     OnRefreshUiListener mRefreshUiListener;
 
@@ -679,7 +683,7 @@
                     return constState.newDrawable();
                 }
             }
-            return context.getResources().getDrawable(
+            return context.getDrawable(
                     com.android.internal.R.drawable.ic_menu_cc);
         }
     }
@@ -741,6 +745,7 @@
         mPm = mApplicationContext.getPackageManager();
         mUm = (UserManager)mApplicationContext.getSystemService(Context.USER_SERVICE);
         mMyUserId = UserHandle.myUserId();
+        mHideManagedProfiles = mMyUserId != UserHandle.USER_OWNER;
         mResumed = false;
         mBackgroundThread = new HandlerThread("RunningState:Background");
         mBackgroundThread.start();
@@ -751,6 +756,8 @@
         synchronized (mLock) {
             mResumed = true;
             mRefreshUiListener = listener;
+            // TODO: The set of users may have changed too, so we should probably recompute it
+            // each time, but that might be costly. See http://b/18696308
             if (mInterestingConfigChanges.applyNewConfig(mApplicationContext.getResources())) {
                 mHaveData = false;
                 mBackgroundHandler.removeMessages(MSG_RESET_CONTENTS);
@@ -825,6 +832,16 @@
         MergedItem userItem = userItems.get(newItem.mUserId);
         boolean first = userItem == null || userItem.mCurSeq != mSequence;
         if (first) {
+            UserState userState = mUsers.get(newItem.mUserId);
+            UserInfo info = userState != null
+                    ? userState.mInfo : mUm.getUserInfo(newItem.mUserId);
+            if (info == null) {
+                // The user no longer exists, skip
+                return;
+            }
+            if (mHideManagedProfiles && info.isManagedProfile()) {
+                return;
+            }
             if (userItem == null) {
                 userItem = new MergedItem(newItem.mUserId);
                 userItems.put(newItem.mUserId, userItem);
@@ -832,21 +849,11 @@
                 userItem.mChildren.clear();
             }
             userItem.mCurSeq = mSequence;
-            if ((userItem.mUser=mUsers.get(newItem.mUserId)) == null) {
+            if (userState == null) {
                 userItem.mUser = new UserState();
-                UserInfo info = mUm.getUserInfo(newItem.mUserId);
                 userItem.mUser.mInfo = info;
-                if (info != null) {
-                    userItem.mUser.mIcon = Utils.getUserIcon(context, mUm, info);
-                }
-                String name = info != null ? info.name : null;
-                if (name == null && info != null) {
-                    name = Integer.toString(info.id);
-                } else if (info == null) {
-                    name = context.getString(R.string.unknown);
-                }
-                userItem.mUser.mLabel = context.getResources().getString(
-                        R.string.running_process_item_user_label, name);
+                userItem.mUser.mIcon = Utils.getUserIcon(context, mUm, info);
+                userItem.mUser.mLabel = Utils.getUserLabel(context, info);
             }
             newMergedItems.add(userItem);
         }
@@ -855,7 +862,7 @@
 
     private boolean update(Context context, ActivityManager am) {
         final PackageManager pm = context.getPackageManager();
-        
+
         mSequence++;
         
         boolean changed = false;
@@ -1145,7 +1152,6 @@
             
             ArrayList<BaseItem> newItems = new ArrayList<BaseItem>();
             ArrayList<MergedItem> newMergedItems = new ArrayList<MergedItem>();
-            SparseArray<MergedItem> otherUsers = null;
             mProcessItems.clear();
             for (int i=0; i<sortedProcesses.size(); i++) {
                 ProcessItem pi = sortedProcesses.get(i);
diff --git a/src/com/android/settings/bluetooth/BluetoothPairingDialog.java b/src/com/android/settings/bluetooth/BluetoothPairingDialog.java
index fd8489b..6f5c136 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;
@@ -318,20 +320,7 @@
         }
     }
 
-    private void allowPhonebookAccess() {
-        CachedBluetoothDevice cachedDevice = mCachedDeviceManager.findDevice(mDevice);
-        if (cachedDevice == null) {
-            cachedDevice = mCachedDeviceManager.addDevice(
-                    mBluetoothManager.getBluetoothAdapter(),
-                    mBluetoothManager.getProfileManager(),
-                    mDevice);
-        }
-        cachedDevice.setPhonebookPermissionChoice(CachedBluetoothDevice.ACCESS_ALLOWED);
-    }
-
     private void onPair(String value) {
-        allowPhonebookAccess();
-
         switch (mType) {
             case BluetoothDevice.PAIRING_VARIANT_PIN:
                 byte[] pinBytes = BluetoothDevice.convertPinToBytes(value);
diff --git a/src/com/android/settings/bluetooth/BluetoothPermissionRequest.java b/src/com/android/settings/bluetooth/BluetoothPermissionRequest.java
index bcd4d77..12c1d77 100644
--- a/src/com/android/settings/bluetooth/BluetoothPermissionRequest.java
+++ b/src/com/android/settings/bluetooth/BluetoothPermissionRequest.java
@@ -24,6 +24,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.PowerManager;
+import android.os.UserManager;
 import android.util.Log;
 
 import com.android.settings.R;
@@ -56,6 +57,12 @@
         if (DEBUG) Log.d(TAG, "onReceive" + action);
 
         if (action.equals(BluetoothDevice.ACTION_CONNECTION_ACCESS_REQUEST)) {
+            UserManager um = (UserManager) context.getSystemService(Context.USER_SERVICE);
+            // skip the notification for managed profiles.
+            if (com.android.settings.Utils.isManagedProfile(um)) {
+                if (DEBUG) Log.d(TAG, "Blocking notification for managed profile.");
+                return;
+            }
             // convert broadcast intent into activity intent (same action string)
             mDevice = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
             mRequestType = intent.getIntExtra(BluetoothDevice.EXTRA_ACCESS_REQUEST_TYPE,
diff --git a/src/com/android/settings/bluetooth/CachedBluetoothDevice.java b/src/com/android/settings/bluetooth/CachedBluetoothDevice.java
index e61b3fd..f33f4db 100755
--- a/src/com/android/settings/bluetooth/CachedBluetoothDevice.java
+++ b/src/com/android/settings/bluetooth/CachedBluetoothDevice.java
@@ -19,6 +19,7 @@
 import android.bluetooth.BluetoothClass;
 import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothProfile;
+import android.bluetooth.BluetoothUuid;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.ParcelUuid;
@@ -487,6 +488,11 @@
         ParcelUuid[] localUuids = mLocalAdapter.getUuids();
         if (localUuids == null) return false;
 
+        /**
+         * Now we know if the device supports PBAP, update permissions...
+         */
+        processPhonebookAccess();
+
         mProfileManager.updateProfiles(uuids, localUuids, mProfiles, mRemovedProfiles,
                                        mLocalNapRoleConnected, mDevice);
 
@@ -767,4 +773,15 @@
         }
         editor.commit();
     }
+
+    private void processPhonebookAccess() {
+        if (mDevice.getBondState() != BluetoothDevice.BOND_BONDED) return;
+
+        ParcelUuid[] uuids = mDevice.getUuids();
+        if (BluetoothUuid.containsAnyUuid(uuids, PbapServerProfile.PBAB_CLIENT_UUIDS)) {
+            // The pairing dialog now warns of phone-book access for paired devices.
+            // No separate prompt is displayed after pairing.
+            setPhonebookPermissionChoice(CachedBluetoothDevice.ACCESS_ALLOWED);
+        }
+    }
 }
diff --git a/src/com/android/settings/bluetooth/DeviceProfilesSettings.java b/src/com/android/settings/bluetooth/DeviceProfilesSettings.java
index 757535a..0109e35 100755
--- a/src/com/android/settings/bluetooth/DeviceProfilesSettings.java
+++ b/src/com/android/settings/bluetooth/DeviceProfilesSettings.java
@@ -194,7 +194,7 @@
 
         int iconResource = profile.getDrawableResource(mCachedDevice.getBtClass());
         if (iconResource != 0) {
-            pref.setIcon(getResources().getDrawable(iconResource));
+            pref.setIcon(getActivity().getDrawable(iconResource));
         }
 
         refreshProfilePreference(pref, profile);
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/dashboard/SearchResultsSummary.java b/src/com/android/settings/dashboard/SearchResultsSummary.java
index 1ae0c25..0a43ce9 100644
--- a/src/com/android/settings/dashboard/SearchResultsSummary.java
+++ b/src/com/android/settings/dashboard/SearchResultsSummary.java
@@ -279,7 +279,8 @@
         setSuggestionsVisibility(false);
         updateSearchResults();
         saveQueryToDatabase();
-        return true;
+
+        return false;
     }
 
     public boolean onQueryTextChange(String query) {
diff --git a/src/com/android/settings/deviceinfo/ImeiInformation.java b/src/com/android/settings/deviceinfo/ImeiInformation.java
new file mode 100644
index 0000000..253e22a
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/ImeiInformation.java
@@ -0,0 +1,158 @@
+/*
+ * 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.deviceinfo;
+
+import com.android.internal.telephony.Phone;
+import com.android.internal.telephony.PhoneConstants;
+import com.android.internal.telephony.PhoneFactory;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.preference.Preference;
+import android.preference.PreferenceActivity;
+import android.preference.PreferenceScreen;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+import android.text.TextUtils;
+import android.util.Log;
+
+import com.android.settings.R;
+import java.util.List;
+
+public class ImeiInformation extends PreferenceActivity {
+
+    private static final String KEY_PRL_VERSION = "prl_version";
+    private static final String KEY_MIN_NUMBER = "min_number";
+    private static final String KEY_MEID_NUMBER = "meid_number";
+    private static final String KEY_ICC_ID = "icc_id";
+    private static final String KEY_IMEI = "imei";
+    private static final String KEY_IMEI_SV = "imei_sv";
+
+    private SubscriptionManager mSubscriptionManager;
+    private boolean isMultiSIM = false;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        mSubscriptionManager = SubscriptionManager.from(this);
+        final TelephonyManager telephonyManager =
+            (TelephonyManager)getSystemService(Context.TELEPHONY_SERVICE);
+        initPreferenceScreen(telephonyManager.getSimCount());
+    }
+
+    // Since there are multiple phone for dsds, therefore need to show information for different
+    // phones.
+    private void initPreferenceScreen(int slotCount) {
+        isMultiSIM = (slotCount > 1);
+        for (int slotId = 0; slotId < slotCount; slotId ++) {
+            addPreferencesFromResource(R.xml.device_info_phone_status);
+            setPreferenceValue(slotId);
+            setNewKey(slotId);
+        }
+    }
+
+    private void setPreferenceValue(int phoneId) {
+        final Phone phone = PhoneFactory.getPhone(phoneId);
+
+        if (phone != null) {
+            if (phone.getPhoneType() == TelephonyManager.PHONE_TYPE_CDMA) {
+                setSummaryText(KEY_MEID_NUMBER, phone.getMeid());
+                setSummaryText(KEY_MIN_NUMBER, phone.getCdmaMin());
+
+                if (getResources().getBoolean(R.bool.config_msid_enable)) {
+                    findPreference(KEY_MIN_NUMBER).setTitle(R.string.status_msid_number);
+                }
+
+                setSummaryText(KEY_PRL_VERSION, phone.getCdmaPrlVersion());
+                removePreferenceFromScreen(KEY_IMEI_SV);
+
+                if (phone.getLteOnCdmaMode() == PhoneConstants.LTE_ON_CDMA_TRUE) {
+                    // Show ICC ID and IMEI for LTE device
+                    setSummaryText(KEY_ICC_ID, phone.getIccSerialNumber());
+                    setSummaryText(KEY_IMEI, phone.getImei());
+                } else {
+                    // device is not GSM/UMTS, do not display GSM/UMTS features
+                    // check Null in case no specified preference in overlay xml
+                    removePreferenceFromScreen(KEY_IMEI);
+                    removePreferenceFromScreen(KEY_ICC_ID);
+                }
+            } else {
+                setSummaryText(KEY_IMEI, phone.getDeviceId());
+                setSummaryText(KEY_IMEI_SV,
+                        ((TelephonyManager) getSystemService(TELEPHONY_SERVICE))
+                        .getDeviceSoftwareVersion(phoneId));
+                // device is not CDMA, do not display CDMA features
+                // check Null in case no specified preference in overlay xml
+                removePreferenceFromScreen(KEY_PRL_VERSION);
+                removePreferenceFromScreen(KEY_MEID_NUMBER);
+                removePreferenceFromScreen(KEY_MIN_NUMBER);
+                removePreferenceFromScreen(KEY_ICC_ID);
+            }
+        }
+    }
+
+    // Modify the preference key with prefix "_", so new added information preference can be set
+    // related phone information.
+    private void setNewKey(int slotId) {
+        final PreferenceScreen prefScreen = getPreferenceScreen();
+        final int count = prefScreen.getPreferenceCount();
+        for (int i = 0; i < count; i++) {
+            Preference pref = prefScreen.getPreference(i);
+            String key = pref.getKey();
+            if (!key.startsWith("_")){
+                key = "_" + key + String.valueOf(slotId);
+                pref.setKey(key);
+                updateTitle(pref, slotId);
+            }
+        }
+    }
+
+    private void updateTitle(Preference pref, int slotId) {
+        if (pref != null) {
+            String title = pref.getTitle().toString();
+            if (isMultiSIM) {
+                // Slot starts from 1, slotId starts from 0 so plus 1
+                title += " " + getResources().getString(R.string.slot_number, slotId + 1);
+            }
+            pref.setTitle(title);
+        }
+    }
+
+    private void setSummaryText(String key, String text) {
+        final Preference preference = findPreference(key);
+
+        if (TextUtils.isEmpty(text)) {
+            text = getResources().getString(R.string.device_info_default);
+        }
+
+        if (preference != null) {
+            preference.setSummary(text);
+        }
+    }
+
+    /**
+     * Removes the specified preference, if it exists.
+     * @param key the key for the Preference item
+     */
+    private void removePreferenceFromScreen(String key) {
+        final Preference preference = findPreference(key);
+        if (preference != null) {
+            getPreferenceScreen().removePreference(preference);
+        }
+    }
+
+}
diff --git a/src/com/android/settings/deviceinfo/SimStatus.java b/src/com/android/settings/deviceinfo/SimStatus.java
new file mode 100644
index 0000000..db3a491
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/SimStatus.java
@@ -0,0 +1,423 @@
+/*
+ * 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.deviceinfo;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.res.Resources;
+import android.os.Bundle;
+import android.os.ServiceManager;
+import android.os.RemoteException;
+import android.os.SystemProperties;
+import android.os.UserHandle;
+import android.preference.Preference;
+import android.preference.PreferenceActivity;
+import android.telephony.CellBroadcastMessage;
+import android.telephony.PhoneNumberUtils;
+import android.telephony.PhoneStateListener;
+import android.telephony.ServiceState;
+import android.telephony.SignalStrength;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+import android.provider.Telephony;
+import android.text.TextUtils;
+import android.util.Log;
+
+import com.android.internal.telephony.ITelephony;
+import com.android.internal.telephony.DefaultPhoneNotifier;
+import com.android.internal.telephony.Phone;
+import com.android.internal.telephony.PhoneFactory;
+import com.android.settings.R;
+import com.android.settings.Utils;
+
+import android.view.View;
+import android.widget.ListView;
+import android.widget.TabHost;
+import android.widget.TabHost.OnTabChangeListener;
+import android.widget.TabHost.TabContentFactory;
+import android.widget.TabHost.TabSpec;
+import android.widget.TabWidget;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * Display the following information
+ * # Phone Number
+ * # Network
+ * # Roaming
+ * # Device Id (IMEI in GSM and MEID in CDMA)
+ * # Network type
+ * # Operator info (area info cell broadcast for Brazil)
+ * # Signal Strength
+ *
+ */
+public class SimStatus extends PreferenceActivity {
+    private static final String TAG = "SimStatus";
+
+    private static final String KEY_DATA_STATE = "data_state";
+    private static final String KEY_SERVICE_STATE = "service_state";
+    private static final String KEY_OPERATOR_NAME = "operator_name";
+    private static final String KEY_ROAMING_STATE = "roaming_state";
+    private static final String KEY_NETWORK_TYPE = "network_type";
+    private static final String KEY_LATEST_AREA_INFO = "latest_area_info";
+    private static final String KEY_PHONE_NUMBER = "number";
+    private static final String KEY_SIGNAL_STRENGTH = "signal_strength";
+    private static final String KEY_IMEI = "imei";
+    private static final String KEY_IMEI_SV = "imei_sv";
+    private static final String COUNTRY_ABBREVIATION_BRAZIL = "br";
+
+    static final String CB_AREA_INFO_RECEIVED_ACTION =
+            "android.cellbroadcastreceiver.CB_AREA_INFO_RECEIVED";
+
+    static final String GET_LATEST_CB_AREA_INFO_ACTION =
+            "android.cellbroadcastreceiver.GET_LATEST_CB_AREA_INFO";
+
+    // Require the sender to have this permission to prevent third-party spoofing.
+    static final String CB_AREA_INFO_SENDER_PERMISSION =
+            "android.permission.RECEIVE_EMERGENCY_BROADCAST";
+
+
+    private TelephonyManager mTelephonyManager;
+    private Phone mPhone = null;
+    private Resources mRes;
+    private Preference mSignalStrength;
+    private SubscriptionInfo mSir;
+    private boolean mShowLatestAreaInfo;
+
+    // Default summary for items
+    private String mDefaultText;
+
+    private TabHost mTabHost;
+    private TabWidget mTabWidget;
+    private ListView mListView;
+    private List<SubscriptionInfo> mSelectableSubInfos;
+
+    private PhoneStateListener mPhoneStateListener;
+    private BroadcastReceiver mAreaInfoReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            String action = intent.getAction();
+            if (CB_AREA_INFO_RECEIVED_ACTION.equals(action)) {
+                Bundle extras = intent.getExtras();
+                if (extras == null) {
+                    return;
+                }
+                CellBroadcastMessage cbMessage = (CellBroadcastMessage) extras.get("message");
+                if (cbMessage != null
+                        && cbMessage.getServiceCategory() == 50
+                        && mSir.getSubscriptionId() == cbMessage.getSubId()) {
+                    String latestAreaInfo = cbMessage.getMessageBody();
+                    updateAreaInfo(latestAreaInfo);
+                }
+            }
+        }
+    };
+
+    @Override
+    protected void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+
+        mSelectableSubInfos = new ArrayList<SubscriptionInfo>();
+        mTelephonyManager = (TelephonyManager)getSystemService(TELEPHONY_SERVICE);
+
+        addPreferencesFromResource(R.xml.device_info_sim_status);
+
+        mRes = getResources();
+        mDefaultText = mRes.getString(R.string.device_info_default);
+        // Note - missing in zaku build, be careful later...
+        mSignalStrength = findPreference(KEY_SIGNAL_STRENGTH);
+
+        for (int i = 0; i < mTelephonyManager.getSimCount(); i++) {
+            final SubscriptionInfo sir = Utils.findRecordBySlotId(this, i);
+            if (sir != null) {
+                mSelectableSubInfos.add(sir);
+            }
+        }
+
+        mSir = mSelectableSubInfos.size() > 0 ? mSelectableSubInfos.get(0) : null;
+        if (mSelectableSubInfos.size() > 1) {
+            setContentView(R.layout.sim_information);
+
+            mTabHost = (TabHost) findViewById(android.R.id.tabhost);
+            mTabWidget = (TabWidget) findViewById(android.R.id.tabs);
+            mListView = (ListView) findViewById(android.R.id.list);
+
+            mTabHost.setup();
+            mTabHost.setOnTabChangedListener(mTabListener);
+            mTabHost.clearAllTabs();
+
+            for (int i = 0; i < mSelectableSubInfos.size(); i++) {
+                mTabHost.addTab(buildTabSpec(String.valueOf(i),
+                        String.valueOf(mSelectableSubInfos.get(i).getDisplayName())));
+            }
+        }
+
+        updatePhoneInfos();
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        if (mPhone != null) {
+            updatePreference();
+
+            updateSignalStrength(mPhone.getSignalStrength());
+            updateServiceState(mPhone.getServiceState());
+            updateDataState();
+            mTelephonyManager.listen(mPhoneStateListener,
+                    PhoneStateListener.LISTEN_DATA_CONNECTION_STATE
+                    | PhoneStateListener.LISTEN_SIGNAL_STRENGTHS
+                    | PhoneStateListener.LISTEN_SERVICE_STATE);
+            if (mShowLatestAreaInfo) {
+                registerReceiver(mAreaInfoReceiver, new IntentFilter(CB_AREA_INFO_RECEIVED_ACTION),
+                        CB_AREA_INFO_SENDER_PERMISSION, null);
+                // Ask CellBroadcastReceiver to broadcast the latest area info received
+                Intent getLatestIntent = new Intent(GET_LATEST_CB_AREA_INFO_ACTION);
+                sendBroadcastAsUser(getLatestIntent, UserHandle.ALL,
+                        CB_AREA_INFO_SENDER_PERMISSION);
+            }
+        }
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+
+        if (mPhone != null) {
+            mTelephonyManager.listen(mPhoneStateListener,
+                    PhoneStateListener.LISTEN_NONE);
+        }
+        if (mShowLatestAreaInfo) {
+            unregisterReceiver(mAreaInfoReceiver);
+        }
+    }
+
+    /**
+     * Removes the specified preference, if it exists.
+     * @param key the key for the Preference item
+     */
+    private void removePreferenceFromScreen(String key) {
+        Preference pref = findPreference(key);
+        if (pref != null) {
+            getPreferenceScreen().removePreference(pref);
+        }
+    }
+
+    private void setSummaryText(String key, String text) {
+        if (TextUtils.isEmpty(text)) {
+            text = mDefaultText;
+        }
+        // some preferences may be missing
+        final Preference preference = findPreference(key);
+        if (preference != null) {
+            preference.setSummary(text);
+        }
+    }
+
+    private void updateNetworkType() {
+        // Whether EDGE, UMTS, etc...
+        String networktype = null;
+        final int subId = mSir.getSubscriptionId();
+        final int actualDataNetworkType = mTelephonyManager.getDataNetworkType(
+                mSir.getSubscriptionId());
+        final int actualVoiceNetworkType = mTelephonyManager.getVoiceNetworkType(
+                mSir.getSubscriptionId());
+        if (TelephonyManager.NETWORK_TYPE_UNKNOWN != actualDataNetworkType) {
+            networktype = mTelephonyManager.getNetworkTypeName(actualDataNetworkType);
+        } else if (TelephonyManager.NETWORK_TYPE_UNKNOWN != actualVoiceNetworkType) {
+            networktype = mTelephonyManager.getNetworkTypeName(actualVoiceNetworkType);
+        }
+
+        setSummaryText(KEY_NETWORK_TYPE, networktype);
+    }
+
+    private void updateDataState() {
+        final int state =
+                DefaultPhoneNotifier.convertDataState(mPhone.getDataConnectionState());
+
+        String display = mRes.getString(R.string.radioInfo_unknown);
+
+        switch (state) {
+            case TelephonyManager.DATA_CONNECTED:
+                display = mRes.getString(R.string.radioInfo_data_connected);
+                break;
+            case TelephonyManager.DATA_SUSPENDED:
+                display = mRes.getString(R.string.radioInfo_data_suspended);
+                break;
+            case TelephonyManager.DATA_CONNECTING:
+                display = mRes.getString(R.string.radioInfo_data_connecting);
+                break;
+            case TelephonyManager.DATA_DISCONNECTED:
+                display = mRes.getString(R.string.radioInfo_data_disconnected);
+                break;
+        }
+
+        setSummaryText(KEY_DATA_STATE, display);
+    }
+
+    private void updateServiceState(ServiceState serviceState) {
+        final int state = serviceState.getState();
+        String display = mRes.getString(R.string.radioInfo_unknown);
+
+        switch (state) {
+            case ServiceState.STATE_IN_SERVICE:
+                display = mRes.getString(R.string.radioInfo_service_in);
+                break;
+            case ServiceState.STATE_OUT_OF_SERVICE:
+            case ServiceState.STATE_EMERGENCY_ONLY:
+                display = mRes.getString(R.string.radioInfo_service_out);
+                break;
+            case ServiceState.STATE_POWER_OFF:
+                display = mRes.getString(R.string.radioInfo_service_off);
+                break;
+        }
+
+        setSummaryText(KEY_SERVICE_STATE, display);
+
+        if (serviceState.getRoaming()) {
+            setSummaryText(KEY_ROAMING_STATE, mRes.getString(R.string.radioInfo_roaming_in));
+        } else {
+            setSummaryText(KEY_ROAMING_STATE, mRes.getString(R.string.radioInfo_roaming_not));
+        }
+        setSummaryText(KEY_OPERATOR_NAME, serviceState.getOperatorAlphaLong());
+    }
+
+    private void updateAreaInfo(String areaInfo) {
+        if (areaInfo != null) {
+            setSummaryText(KEY_LATEST_AREA_INFO, areaInfo);
+        }
+    }
+
+    void updateSignalStrength(SignalStrength signalStrength) {
+        if (mSignalStrength != null) {
+            final int state = mPhone.getServiceState().getState();
+            Resources r = getResources();
+
+            if ((ServiceState.STATE_OUT_OF_SERVICE == state) ||
+                    (ServiceState.STATE_POWER_OFF == state)) {
+                mSignalStrength.setSummary("0");
+            }
+
+            int signalDbm = signalStrength.getDbm();
+            int signalAsu = signalStrength.getAsuLevel();
+
+            if (-1 == signalDbm) {
+                signalDbm = 0;
+            }
+
+            if (-1 == signalAsu) {
+                signalAsu = 0;
+            }
+
+            mSignalStrength.setSummary(r.getString(R.string.sim_signal_strength,
+                        signalDbm, signalAsu));
+        }
+    }
+
+    private void updatePreference() {
+        if (mPhone.getPhoneType() != TelephonyManager.PHONE_TYPE_CDMA) {
+            // only show area info when SIM country is Brazil
+            if (COUNTRY_ABBREVIATION_BRAZIL.equals(mTelephonyManager.getSimCountryIso(
+                            mSir.getSubscriptionId()))) {
+                mShowLatestAreaInfo = true;
+            }
+        }
+
+        String rawNumber = mTelephonyManager.getLine1NumberForSubscriber(mSir.getSubscriptionId());
+        String formattedNumber = null;
+        if (!TextUtils.isEmpty(rawNumber)) {
+            formattedNumber = PhoneNumberUtils.formatNumber(rawNumber);
+        }
+        // If formattedNumber is null or empty, it'll display as "Unknown".
+        setSummaryText(KEY_PHONE_NUMBER, formattedNumber);
+        final String imei = mPhone.getPhoneType() == TelephonyManager.PHONE_TYPE_CDMA
+                ? mPhone.getImei() : mPhone.getDeviceId();
+        setSummaryText(KEY_IMEI, imei);
+        setSummaryText(KEY_IMEI_SV, mTelephonyManager.getDeviceSoftwareVersion(/*slotId*/));
+
+        if (!mShowLatestAreaInfo) {
+            removePreferenceFromScreen(KEY_LATEST_AREA_INFO);
+        }
+    }
+
+    private void updatePhoneInfos() {
+        if (mSir != null) {
+            final Phone phone = PhoneFactory.getPhone(SubscriptionManager.getPhoneId(
+                        mSir.getSubscriptionId()));
+            if (UserHandle.myUserId() == UserHandle.USER_OWNER
+                    && SubscriptionManager.isValidSubscriptionId(mSir.getSubscriptionId())) {
+                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);
+                    }
+                };
+            }
+        }
+    }
+    private OnTabChangeListener mTabListener = new OnTabChangeListener() {
+        @Override
+        public void onTabChanged(String tabId) {
+            final int slotId = Integer.parseInt(tabId);
+            mSir = mSelectableSubInfos.get(slotId);
+
+            // The User has changed tab; update the SIM information.
+            updatePhoneInfos();
+            mTelephonyManager.listen(mPhoneStateListener,
+                    PhoneStateListener.LISTEN_DATA_CONNECTION_STATE
+                    | PhoneStateListener.LISTEN_SIGNAL_STRENGTHS
+                    | PhoneStateListener.LISTEN_SERVICE_STATE);
+            updateDataState();
+            updateNetworkType();
+            updatePreference();
+        }
+    };
+
+    private TabContentFactory mEmptyTabContent = new TabContentFactory() {
+        @Override
+        public View createTabContent(String tag) {
+            return new View(mTabHost.getContext());
+        }
+    };
+
+    private TabSpec buildTabSpec(String tag, String title) {
+        return mTabHost.newTabSpec(tag).setIndicator(title).setContent(
+                mEmptyTabContent);
+    }
+}
diff --git a/src/com/android/settings/fuelgauge/BatteryEntry.java b/src/com/android/settings/fuelgauge/BatteryEntry.java
index 4ff4dfd..be7c657 100644
--- a/src/com/android/settings/fuelgauge/BatteryEntry.java
+++ b/src/com/android/settings/fuelgauge/BatteryEntry.java
@@ -167,12 +167,7 @@
                 UserInfo info = um.getUserInfo(sipper.userId);
                 if (info != null) {
                     icon = Utils.getUserIcon(context, um, info);
-                    name = info != null ? info.name : null;
-                    if (name == null) {
-                        name = Integer.toString(info.id);
-                    }
-                    name = context.getResources().getString(
-                            R.string.running_process_item_user_label, name);
+                    name = Utils.getUserLabel(context, info);
                 } else {
                     icon = null;
                     name = context.getResources().getString(
@@ -189,7 +184,7 @@
                 break;
         }
         if (iconId > 0) {
-            icon = context.getResources().getDrawable(iconId);
+            icon = context.getDrawable(iconId);
         }
         if ((name == null || iconId == 0) && this.sipper.uidObj != null) {
             getQuickNameIconForUid(this.sipper.uidObj);
@@ -228,7 +223,7 @@
                 name = context.getResources().getString(R.string.process_mediaserver_label);
             }
             iconId = R.drawable.ic_power_system;
-            icon = context.getResources().getDrawable(iconId);
+            icon = context.getDrawable(iconId);
             return;
         } else {
             //name = packages[0];
diff --git a/src/com/android/settings/fuelgauge/BatteryHistoryChart.java b/src/com/android/settings/fuelgauge/BatteryHistoryChart.java
index 765f101..3312162 100644
--- a/src/com/android/settings/fuelgauge/BatteryHistoryChart.java
+++ b/src/com/android/settings/fuelgauge/BatteryHistoryChart.java
@@ -494,6 +494,7 @@
         mMinPercentLabelString = Utils.formatPercentage(0);
 
         mBatteryLevel = com.android.settings.Utils.getBatteryLevel(mBatteryBroadcast);
+        String batteryPercentString = Utils.formatPercentage(mBatteryLevel);
         long remainingTimeUs = 0;
         mDischarging = true;
         if (mBatteryBroadcast.getIntExtra(BatteryManager.EXTRA_PLUGGED, 0) == 0) {
@@ -503,9 +504,9 @@
                 String timeString = Formatter.formatShortElapsedTime(getContext(),
                         drainTime / 1000);
                 mChargeLabelString = getContext().getResources().getString(
-                        R.string.power_discharging_duration, mBatteryLevel, timeString);
+                        R.string.power_discharging_duration, batteryPercentString, timeString);
             } else {
-                mChargeLabelString = Utils.formatPercentage(mBatteryLevel);
+                mChargeLabelString = batteryPercentString;
             }
         } else {
             final long chargeTime = mStats.computeChargeTimeRemaining(elapsedRealtimeUs);
@@ -530,10 +531,10 @@
                     resId = R.string.power_charging_duration;
                 }
                 mChargeLabelString = getContext().getResources().getString(
-                        resId, mBatteryLevel, timeString);
+                        resId, batteryPercentString, timeString);
             } else {
                 mChargeLabelString = getContext().getResources().getString(
-                        R.string.power_charging, mBatteryLevel, statusLabel);
+                        R.string.power_charging, batteryPercentString, statusLabel);
             }
         }
         mDrainString = "";
@@ -666,33 +667,11 @@
     }
 
     private boolean isDayFirst() {
-        String value = Settings.System.getString(mContext.getContentResolver(),
-                Settings.System.DATE_FORMAT);
-        if (value == null) {
-            LocaleData d = LocaleData.get(mContext.getResources().getConfiguration().locale);
-            value = d.shortDateFormat4;
-        }
+        LocaleData d = LocaleData.get(mContext.getResources().getConfiguration().locale);
+        String value = d.shortDateFormat4;
         return value.indexOf('M') > value.indexOf('d');
     }
 
-    /*
-    private void buildTime() {
-        java.text.DateFormat shortDateFormat = DateFormat.getDateFormat(context);
-        final Calendar now = Calendar.getInstance();
-        mDummyDate.setTimeZone(now.getTimeZone());
-        // We use December 31st because it's unambiguous when demonstrating the date format.
-        // We use 13:00 so we can demonstrate the 12/24 hour options.
-        mDummyDate.set(now.get(Calendar.YEAR), 11, 31, 13, 0, 0);
-        Date dummyDate = mDummyDate.getTime();
-        mTimePref.setSummary(DateFormat.getTimeFormat(getActivity()).format(now.getTime()));
-        mTimeZone.setSummary(getTimeZoneText(now.getTimeZone(), true));
-        mDatePref.setSummary(shortDateFormat.format(now.getTime()));
-        mDateFormat.setSummary(shortDateFormat.format(dummyDate));
-        mTime24Pref.setSummary(DateFormat.getTimeFormat(getActivity()).format(dummyDate));
-
-    }
-    */
-
     @Override
     protected void onSizeChanged(int w, int h, int oldw, int oldh) {
         super.onSizeChanged(w, h, oldw, oldh);
diff --git a/src/com/android/settings/fuelgauge/BatterySaverSettings.java b/src/com/android/settings/fuelgauge/BatterySaverSettings.java
index bd989d0..e6b90a7 100644
--- a/src/com/android/settings/fuelgauge/BatterySaverSettings.java
+++ b/src/com/android/settings/fuelgauge/BatterySaverSettings.java
@@ -37,6 +37,7 @@
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.Utils;
 import com.android.settings.notification.SettingPref;
 import com.android.settings.widget.SwitchBar;
 
@@ -62,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);
 
@@ -78,7 +82,8 @@
             @Override
             protected String getCaption(Resources res, int value) {
                 if (value > 0 && value < 100) {
-                    return res.getString(R.string.battery_saver_turn_on_automatically_pct, value);
+                    return res.getString(R.string.battery_saver_turn_on_automatically_pct,
+                                         Utils.formatPercentage(value));
                 }
                 return res.getString(R.string.battery_saver_turn_on_automatically_never);
             }
diff --git a/src/com/android/settings/fuelgauge/PowerUsageDetail.java b/src/com/android/settings/fuelgauge/PowerUsageDetail.java
index 9dca029..e3c8dab 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageDetail.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageDetail.java
@@ -379,7 +379,7 @@
                 // Use default icon
             }
         } else if (iconId != 0) {
-            mAppIcon = getActivity().getResources().getDrawable(iconId);
+            mAppIcon = getActivity().getDrawable(iconId);
         }
         if (mAppIcon == null) {
             mAppIcon = getActivity().getPackageManager().getDefaultActivityIcon();
diff --git a/src/com/android/settings/fuelgauge/WallOfTextPreference.java b/src/com/android/settings/fuelgauge/WallOfTextPreference.java
new file mode 100644
index 0000000..5577206
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/WallOfTextPreference.java
@@ -0,0 +1,50 @@
+/*
+ * 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.fuelgauge;
+
+import android.content.Context;
+import android.preference.Preference;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.TextView;
+
+public class WallOfTextPreference extends Preference {
+
+    public WallOfTextPreference(Context context) {
+        super(context);
+    }
+
+    public WallOfTextPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public WallOfTextPreference(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    public WallOfTextPreference(Context context, AttributeSet attrs, int defStyleAttr,
+            int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+    }
+
+    @Override
+    protected void onBindView(View view) {
+        super.onBindView(view);
+        final TextView summary = (TextView) view.findViewById(android.R.id.summary);
+        summary.setMaxLines(20);
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
index bae9dbc..20a273f 100644
--- a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
+++ b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
@@ -24,28 +24,23 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
 import android.content.pm.ServiceInfo;
 import android.content.res.Configuration;
-import android.content.res.Resources;
 import android.database.ContentObserver;
 import android.hardware.input.InputDeviceIdentifier;
 import android.hardware.input.InputManager;
 import android.hardware.input.KeyboardLayout;
 import android.os.Bundle;
 import android.os.Handler;
-import android.os.UserHandle;
-import android.preference.CheckBoxPreference;
 import android.preference.ListPreference;
 import android.preference.Preference;
 import android.preference.Preference.OnPreferenceClickListener;
 import android.preference.PreferenceCategory;
 import android.preference.PreferenceManager;
 import android.preference.PreferenceScreen;
+import android.preference.SwitchPreference;
 import android.provider.Settings;
 import android.provider.Settings.System;
-import android.speech.RecognitionService;
 import android.speech.tts.TtsEngines;
 import android.text.TextUtils;
 import android.view.InputDevice;
@@ -326,11 +321,11 @@
                         getSystemService(Context.INPUT_METHOD_SERVICE);
                 imm.showInputMethodPicker();
             }
-        } else if (preference instanceof CheckBoxPreference) {
-            final CheckBoxPreference chkPref = (CheckBoxPreference) preference;
-            if (chkPref == mGameControllerCategory.findPreference("vibrate_input_devices")) {
+        } else if (preference instanceof SwitchPreference) {
+            final SwitchPreference pref = (SwitchPreference) preference;
+            if (pref == mGameControllerCategory.findPreference("vibrate_input_devices")) {
                 System.putInt(getContentResolver(), Settings.System.VIBRATE_INPUT_DEVICES,
-                        chkPref.isChecked() ? 1 : 0);
+                        pref.isChecked() ? 1 : 0);
                 return true;
             }
         }
@@ -601,9 +596,9 @@
         if (haveInputDeviceWithVibrator()) {
             getPreferenceScreen().addPreference(mGameControllerCategory);
 
-            CheckBoxPreference chkPref = (CheckBoxPreference)
+            SwitchPreference pref = (SwitchPreference)
                     mGameControllerCategory.findPreference("vibrate_input_devices");
-            chkPref.setChecked(System.getInt(getContentResolver(),
+            pref.setChecked(System.getInt(getContentResolver(),
                     Settings.System.VIBRATE_INPUT_DEVICES, 1) > 0);
         } else {
             getPreferenceScreen().removePreference(mGameControllerCategory);
@@ -671,6 +666,7 @@
             indexable.key = KEY_SPELL_CHECKERS;
             indexable.title = context.getString(R.string.spellcheckers_settings_title);
             indexable.screenTitle = screenTitle;
+            indexable.keywords = context.getString(R.string.keywords_spell_checker);
             indexables.add(indexable);
 
             // User dictionary.
@@ -687,6 +683,7 @@
             indexable.key = "keyboard_settings";
             indexable.title = context.getString(R.string.keyboard_settings_category);
             indexable.screenTitle = screenTitle;
+            indexable.keywords = context.getString(R.string.keywords_keyboard_and_ime);
             indexables.add(indexable);
 
             InputMethodSettingValuesWrapper immValues = InputMethodSettingValuesWrapper
@@ -792,6 +789,7 @@
             indexable.key = "voice_input_settings";
             indexable.title = context.getString(R.string.voice_input_settings);
             indexable.screenTitle = screenTitle;
+            indexable.keywords = context.getString(R.string.keywords_voice_input);
             indexables.add(indexable);
 
             // Text-to-speech.
@@ -801,6 +799,7 @@
                 indexable.key = "tts_settings";
                 indexable.title = context.getString(R.string.tts_settings_title);
                 indexable.screenTitle = screenTitle;
+                indexable.keywords = context.getString(R.string.keywords_text_to_speech_output);
                 indexables.add(indexable);
             }
 
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..c134889 100644
--- a/src/com/android/settings/location/RecentLocationApps.java
+++ b/src/com/android/settings/location/RecentLocationApps.java
@@ -61,9 +61,11 @@
     private class PackageEntryClickedListener
             implements Preference.OnPreferenceClickListener {
         private String mPackage;
+        private UserHandle mUserHandle;
 
-        public PackageEntryClickedListener(String packageName) {
+        public PackageEntryClickedListener(String packageName, UserHandle userHandle) {
             mPackage = packageName;
+            mUserHandle = userHandle;
         }
 
         @Override
@@ -71,41 +73,19 @@
             // start new fragment to display extended information
             Bundle args = new Bundle();
             args.putString(InstalledAppDetails.ARG_PACKAGE_NAME, mPackage);
-            mActivity.startPreferencePanel(InstalledAppDetails.class.getName(), args,
-                    R.string.application_info_label, null, null, 0);
+            mActivity.startPreferencePanelAsUser(InstalledAppDetails.class.getName(), args,
+                    R.string.application_info_label, null, mUserHandle);
             return true;
         }
     }
 
-    /**
-     * 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 +178,7 @@
         int uid = ops.getUid();
         int userId = UserHandle.getUserId(uid);
 
-        AccessiblePreference preference = null;
+        DimmableIconPreference preference = null;
         try {
             IPackageManager ipm = AppGlobals.getPackageManager();
             ApplicationInfo appInfo =
@@ -215,9 +195,14 @@
             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));
+                    new PackageEntryClickedListener(packageName, userHandle));
         } catch (RemoteException e) {
             Log.w(TAG, "Error while retrieving application info for package " + packageName
                     + ", userId " + userId, e);
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/net/NetworkPolicyEditor.java b/src/com/android/settings/net/NetworkPolicyEditor.java
index ad2afa0..1268c3f 100644
--- a/src/com/android/settings/net/NetworkPolicyEditor.java
+++ b/src/com/android/settings/net/NetworkPolicyEditor.java
@@ -20,12 +20,7 @@
 import static android.net.NetworkPolicy.LIMIT_DISABLED;
 import static android.net.NetworkPolicy.SNOOZE_NEVER;
 import static android.net.NetworkPolicy.WARNING_DISABLED;
-import static android.net.NetworkTemplate.MATCH_MOBILE_3G_LOWER;
-import static android.net.NetworkTemplate.MATCH_MOBILE_4G;
 import static android.net.NetworkTemplate.MATCH_WIFI;
-import static android.net.NetworkTemplate.buildTemplateMobile3gLower;
-import static android.net.NetworkTemplate.buildTemplateMobile4g;
-import static android.net.NetworkTemplate.buildTemplateMobileAll;
 import static com.android.internal.util.Preconditions.checkNotNull;
 
 import android.net.NetworkPolicy;
@@ -37,11 +32,8 @@
 import android.text.format.Time;
 
 import com.google.android.collect.Lists;
-import com.google.android.collect.Sets;
 
 import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Objects;
 
 /**
  * Utility class to modify list of {@link NetworkPolicy}. Specifically knows
@@ -79,11 +71,6 @@
             mPolicies.add(policy);
         }
 
-        // force combine any split policies when disabled
-        if (!ENABLE_SPLIT_POLICIES) {
-            modified |= forceMobilePolicyCombined();
-        }
-
         // when we cleaned policies above, write back changes
         if (modified) writeAsync();
     }
@@ -247,108 +234,6 @@
     }
 
     /**
-     * Remove any split {@link NetworkPolicy}.
-     */
-    private boolean forceMobilePolicyCombined() {
-        final HashSet<String> subscriberIds = Sets.newHashSet();
-        for (NetworkPolicy policy : mPolicies) {
-            subscriberIds.add(policy.template.getSubscriberId());
-        }
-
-        boolean modified = false;
-        for (String subscriberId : subscriberIds) {
-            modified |= setMobilePolicySplitInternal(subscriberId, false);
-        }
-        return modified;
-    }
-
-    @Deprecated
-    public boolean isMobilePolicySplit(String subscriberId) {
-        boolean has3g = false;
-        boolean has4g = false;
-        for (NetworkPolicy policy : mPolicies) {
-            final NetworkTemplate template = policy.template;
-            if (Objects.equals(subscriberId, template.getSubscriberId())) {
-                switch (template.getMatchRule()) {
-                    case MATCH_MOBILE_3G_LOWER:
-                        has3g = true;
-                        break;
-                    case MATCH_MOBILE_4G:
-                        has4g = true;
-                        break;
-                }
-            }
-        }
-        return has3g && has4g;
-    }
-
-    @Deprecated
-    public void setMobilePolicySplit(String subscriberId, boolean split) {
-        if (setMobilePolicySplitInternal(subscriberId, split)) {
-            writeAsync();
-        }
-    }
-
-    /**
-     * Mutate {@link NetworkPolicy} for given subscriber, combining or splitting
-     * the policy as requested.
-     *
-     * @return {@code true} when any {@link NetworkPolicy} was mutated.
-     */
-    @Deprecated
-    private boolean setMobilePolicySplitInternal(String subscriberId, boolean split) {
-        final boolean beforeSplit = isMobilePolicySplit(subscriberId);
-
-        final NetworkTemplate template3g = buildTemplateMobile3gLower(subscriberId);
-        final NetworkTemplate template4g = buildTemplateMobile4g(subscriberId);
-        final NetworkTemplate templateAll = buildTemplateMobileAll(subscriberId);
-
-        if (split == beforeSplit) {
-            // already in requested state; skip
-            return false;
-
-        } else if (beforeSplit && !split) {
-            // combine, picking most restrictive policy
-            final NetworkPolicy policy3g = getPolicy(template3g);
-            final NetworkPolicy policy4g = getPolicy(template4g);
-
-            NetworkPolicy restrictive = null;
-            if ((policy3g == null) && (policy4g == null)) {
-                return false;
-            } else if (policy3g == null) {
-                restrictive = policy4g;
-            } else if (policy4g == null) {
-                restrictive = policy3g;
-            } else {
-                restrictive = policy3g.compareTo(policy4g) < 0 ? policy3g : policy4g;
-            }
-            mPolicies.remove(policy3g);
-            mPolicies.remove(policy4g);
-            mPolicies.add(new NetworkPolicy(templateAll, restrictive.cycleDay,
-                    restrictive.cycleTimezone, restrictive.warningBytes, restrictive.limitBytes,
-                    SNOOZE_NEVER, SNOOZE_NEVER, restrictive.metered, restrictive.inferred));
-            return true;
-
-        } else if (!beforeSplit && split) {
-            // duplicate existing policy into two rules
-            final NetworkPolicy policyAll = getPolicy(templateAll);
-            if (policyAll == null) {
-                return false;
-            }
-            mPolicies.remove(policyAll);
-            mPolicies.add(new NetworkPolicy(template3g, policyAll.cycleDay, policyAll.cycleTimezone,
-                    policyAll.warningBytes, policyAll.limitBytes, SNOOZE_NEVER, SNOOZE_NEVER,
-                    policyAll.metered, policyAll.inferred));
-            mPolicies.add(new NetworkPolicy(template4g, policyAll.cycleDay, policyAll.cycleTimezone,
-                    policyAll.warningBytes, policyAll.limitBytes, SNOOZE_NEVER, SNOOZE_NEVER,
-                    policyAll.metered, policyAll.inferred));
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    /**
      * Build a revised {@link NetworkTemplate} that matches the same rule, but
      * with an unquoted {@link NetworkTemplate#getNetworkId()}. Used to work
      * around legacy bugs.
diff --git a/src/com/android/settings/net/UidDetailProvider.java b/src/com/android/settings/net/UidDetailProvider.java
index 4b54137..a08c7de 100644
--- a/src/com/android/settings/net/UidDetailProvider.java
+++ b/src/com/android/settings/net/UidDetailProvider.java
@@ -136,15 +136,8 @@
             final int userHandle = getUserIdForKey(uid);
             final UserInfo info = um.getUserInfo(userHandle);
             if (info != null) {
-                if (info.isManagedProfile()) {
-                    detail.label = res.getString(R.string.managed_user_title);
-                    detail.icon = Resources.getSystem().getDrawable(
-                            com.android.internal.R.drawable.ic_corp_icon);
-                } else {
-                    detail.label = res.getString(R.string.running_process_item_user_label,
-                            info.name);
-                    detail.icon = Utils.getUserIcon(mContext, um, info);
-                }
+                detail.label = Utils.getUserLabel(mContext, info);
+                detail.icon = Utils.getUserIcon(mContext, um, info);
                 return detail;
             }
         }
diff --git a/src/com/android/settings/nfc/PaymentSettings.java b/src/com/android/settings/nfc/PaymentSettings.java
index df4e396..02254dd 100644
--- a/src/com/android/settings/nfc/PaymentSettings.java
+++ b/src/com/android/settings/nfc/PaymentSettings.java
@@ -22,11 +22,11 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-import android.preference.CheckBoxPreference;
 import android.preference.Preference;
 import android.preference.Preference.OnPreferenceChangeListener;
 import android.preference.PreferenceManager;
 import android.preference.PreferenceScreen;
+import android.preference.SwitchPreference;
 import android.provider.Settings;
 import android.text.TextUtils;
 import android.util.Log;
@@ -95,7 +95,7 @@
             emptyImage.setVisibility(View.VISIBLE);
             getListView().setVisibility(View.GONE);
         } else {
-            CheckBoxPreference foreground = new CheckBoxPreference(getActivity());
+            SwitchPreference foreground = new SwitchPreference(getActivity());
             boolean foregroundMode = mPaymentBackend.isForegroundMode();
             foreground.setPersistent(false);
             foreground.setTitle(getString(R.string.nfc_payment_favor_foreground));
@@ -231,7 +231,7 @@
 
     @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
-        if (preference instanceof CheckBoxPreference) {
+        if (preference instanceof SwitchPreference) {
             mPaymentBackend.setForegroundMode(((Boolean) newValue).booleanValue());
             return true;
         } else {
diff --git a/src/com/android/settings/notification/NotificationAppList.java b/src/com/android/settings/notification/NotificationAppList.java
index 3c44196..cd1474f 100644
--- a/src/com/android/settings/notification/NotificationAppList.java
+++ b/src/com/android/settings/notification/NotificationAppList.java
@@ -94,6 +94,7 @@
     private Parcelable mListViewState;
     private Backend mBackend = new Backend();
     private UserSpinnerAdapter mProfileSpinnerAdapter;
+    private Spinner mSpinner;
 
     private PackageManager mPM;
     private UserManager mUM;
@@ -122,11 +123,11 @@
         super.onViewCreated(view, savedInstanceState);
         mProfileSpinnerAdapter = Utils.createUserSpinnerAdapter(mUM, mContext);
         if (mProfileSpinnerAdapter != null) {
-            Spinner spinner = (Spinner) getActivity().getLayoutInflater().inflate(
+            mSpinner = (Spinner) getActivity().getLayoutInflater().inflate(
                     R.layout.spinner_view, null);
-            spinner.setAdapter(mProfileSpinnerAdapter);
-            spinner.setOnItemSelectedListener(this);
-            setPinnedHeaderView(spinner);
+            mSpinner.setAdapter(mProfileSpinnerAdapter);
+            mSpinner.setOnItemSelectedListener(this);
+            setPinnedHeaderView(mSpinner);
         }
     }
 
@@ -164,6 +165,9 @@
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
             mContext.startActivityAsUser(intent, selectedUser);
+            // Go back to default selection, which is the first one; this makes sure that pressing
+            // the back button takes you into a consistent state
+            mSpinner.setSelection(0);
         }
     }
 
diff --git a/src/com/android/settings/notification/NotificationSettings.java b/src/com/android/settings/notification/NotificationSettings.java
index 6899440..b392484 100644
--- a/src/com/android/settings/notification/NotificationSettings.java
+++ b/src/com/android/settings/notification/NotificationSettings.java
@@ -16,9 +16,15 @@
 
 package com.android.settings.notification;
 
+import android.app.NotificationManager;
+import android.content.BroadcastReceiver;
+import android.content.ComponentName;
 import android.content.ContentResolver;
 import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
 import android.content.pm.PackageManager;
+import android.content.pm.ServiceInfo;
 import android.database.ContentObserver;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteException;
@@ -42,7 +48,6 @@
 import android.provider.Settings;
 import android.util.Log;
 
-import android.widget.SeekBar;
 import com.android.internal.widget.LockPatternUtils;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
@@ -53,6 +58,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 
 public class NotificationSettings extends SettingsPreferenceFragment implements Indexable {
     private static final String TAG = "NotificationSettings";
@@ -75,11 +81,14 @@
     private final VolumePreferenceCallback mVolumeCallback = new VolumePreferenceCallback();
     private final H mHandler = new H();
     private final SettingsObserver mSettingsObserver = new SettingsObserver();
+    private final Receiver mReceiver = new Receiver();
+    private final ArrayList<VolumeSeekBarPreference> mVolumePrefs = new ArrayList<>();
 
     private Context mContext;
     private PackageManager mPM;
     private boolean mVoiceCapable;
     private Vibrator mVibrator;
+    private AudioManager mAudioManager;
     private VolumeSeekBarPreference mRingOrNotificationPreference;
 
     private Preference mPhoneRingtonePreference;
@@ -90,6 +99,8 @@
     private Preference mNotificationAccess;
     private boolean mSecure;
     private int mLockscreenSelectedValue;
+    private ComponentName mSuppressor;
+    private int mRingerMode = -1;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -99,6 +110,7 @@
         mVoiceCapable = Utils.isVoiceCapable(mContext);
         mSecure = new LockPatternUtils(getActivity()).isSecure();
 
+        mAudioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
         mVibrator = (Vibrator) getActivity().getSystemService(Context.VIBRATOR_SERVICE);
         if (mVibrator != null && !mVibrator.hasVibrator()) {
             mVibrator = null;
@@ -107,15 +119,19 @@
         addPreferencesFromResource(R.xml.notification_settings);
 
         final PreferenceCategory sound = (PreferenceCategory) findPreference(KEY_SOUND);
-        initVolumePreference(KEY_MEDIA_VOLUME, AudioManager.STREAM_MUSIC);
-        initVolumePreference(KEY_ALARM_VOLUME, AudioManager.STREAM_ALARM);
+        initVolumePreference(KEY_MEDIA_VOLUME, AudioManager.STREAM_MUSIC,
+                com.android.internal.R.drawable.ic_audio_vol_mute);
+        initVolumePreference(KEY_ALARM_VOLUME, AudioManager.STREAM_ALARM,
+                com.android.internal.R.drawable.ic_audio_alarm_mute);
         if (mVoiceCapable) {
             mRingOrNotificationPreference =
-                    initVolumePreference(KEY_RING_VOLUME, AudioManager.STREAM_RING);
+                    initVolumePreference(KEY_RING_VOLUME, AudioManager.STREAM_RING,
+                            com.android.internal.R.drawable.ic_audio_ring_notif_mute);
             sound.removePreference(sound.findPreference(KEY_NOTIFICATION_VOLUME));
         } else {
             mRingOrNotificationPreference =
-                    initVolumePreference(KEY_NOTIFICATION_VOLUME, AudioManager.STREAM_NOTIFICATION);
+                    initVolumePreference(KEY_NOTIFICATION_VOLUME, AudioManager.STREAM_NOTIFICATION,
+                            com.android.internal.R.drawable.ic_audio_ring_notif_mute);
             sound.removePreference(sound.findPreference(KEY_RING_VOLUME));
         }
         initRingtones(sound);
@@ -128,6 +144,8 @@
 
         mNotificationAccess = findPreference(KEY_NOTIFICATION_ACCESS);
         refreshNotificationListeners();
+        updateRingerMode();
+        updateEffectsSuppressor();
     }
 
     @Override
@@ -136,6 +154,12 @@
         refreshNotificationListeners();
         lookupRingtoneNames();
         mSettingsObserver.register(true);
+        mReceiver.register(true);
+        updateRingOrNotificationPreference();
+        updateEffectsSuppressor();
+        for (VolumeSeekBarPreference volumePref : mVolumePrefs) {
+            volumePref.onActivityResume();
+        }
     }
 
     @Override
@@ -143,23 +167,65 @@
         super.onPause();
         mVolumeCallback.stopSample();
         mSettingsObserver.register(false);
+        mReceiver.register(false);
     }
 
     // === Volumes ===
 
-    private VolumeSeekBarPreference initVolumePreference(String key, int stream) {
+    private VolumeSeekBarPreference initVolumePreference(String key, int stream, int muteIcon) {
         final VolumeSeekBarPreference volumePref = (VolumeSeekBarPreference) findPreference(key);
         volumePref.setCallback(mVolumeCallback);
         volumePref.setStream(stream);
+        mVolumePrefs.add(volumePref);
+        volumePref.setMuteIcon(muteIcon);
         return volumePref;
     }
 
-    private void updateRingOrNotificationIcon(int progress) {
-        mRingOrNotificationPreference.showIcon(progress > 0
-                    ? R.drawable.ring_notif
-                    : (mVibrator == null
-                            ? R.drawable.ring_notif_mute
-                            : R.drawable.ring_notif_vibrate));
+    private void updateRingOrNotificationPreference() {
+        mRingOrNotificationPreference.showIcon(mSuppressor != null
+                ? com.android.internal.R.drawable.ic_audio_ring_notif_mute
+                : mRingerMode == AudioManager.RINGER_MODE_VIBRATE
+                ? com.android.internal.R.drawable.ic_audio_ring_notif_vibrate
+                : com.android.internal.R.drawable.ic_audio_ring_notif);
+    }
+
+    private void updateRingerMode() {
+        final int ringerMode = mAudioManager.getRingerModeInternal();
+        if (mRingerMode == ringerMode) return;
+        mRingerMode = ringerMode;
+        updateRingOrNotificationPreference();
+    }
+
+    private void updateEffectsSuppressor() {
+        final ComponentName suppressor = NotificationManager.from(mContext).getEffectsSuppressor();
+        if (Objects.equals(suppressor, mSuppressor)) return;
+        mSuppressor = suppressor;
+        if (mRingOrNotificationPreference != null) {
+            final String text = suppressor != null ?
+                    mContext.getString(com.android.internal.R.string.muted_by,
+                            getSuppressorCaption(suppressor)) : null;
+            mRingOrNotificationPreference.setSuppressionText(text);
+        }
+        updateRingOrNotificationPreference();
+    }
+
+    private String getSuppressorCaption(ComponentName suppressor) {
+        final PackageManager pm = mContext.getPackageManager();
+        try {
+            final ServiceInfo info = pm.getServiceInfo(suppressor, 0);
+            if (info != null) {
+                final CharSequence seq = info.loadLabel(pm);
+                if (seq != null) {
+                    final String str = seq.toString().trim();
+                    if (str.length() > 0) {
+                        return str;
+                    }
+                }
+            }
+        } catch (Throwable e) {
+            Log.w(TAG, "Error loading suppressor caption", e);
+        }
+        return suppressor.getPackageName();
     }
 
     private final class VolumePreferenceCallback implements VolumeSeekBarPreference.Callback {
@@ -179,10 +245,7 @@
 
         @Override
         public void onStreamValueChanged(int stream, int progress) {
-            if (stream == AudioManager.STREAM_RING) {
-                mHandler.removeMessages(H.UPDATE_RINGER_ICON);
-                mHandler.obtainMessage(H.UPDATE_RINGER_ICON, progress, 0).sendToTarget();
-            }
+            // noop
         }
 
         public void stopSample() {
@@ -463,7 +526,8 @@
         private static final int UPDATE_PHONE_RINGTONE = 1;
         private static final int UPDATE_NOTIFICATION_RINGTONE = 2;
         private static final int STOP_SAMPLE = 3;
-        private static final int UPDATE_RINGER_ICON = 4;
+        private static final int UPDATE_EFFECTS_SUPPRESSOR = 4;
+        private static final int UPDATE_RINGER_MODE = 5;
 
         private H() {
             super(Looper.getMainLooper());
@@ -481,9 +545,39 @@
                 case STOP_SAMPLE:
                     mVolumeCallback.stopSample();
                     break;
-                case UPDATE_RINGER_ICON:
-                    updateRingOrNotificationIcon(msg.arg1);
+                case UPDATE_EFFECTS_SUPPRESSOR:
+                    updateEffectsSuppressor();
                     break;
+                case UPDATE_RINGER_MODE:
+                    updateRingerMode();
+                    break;
+            }
+        }
+    }
+
+    private class Receiver extends BroadcastReceiver {
+        private boolean mRegistered;
+
+        public void register(boolean register) {
+            if (mRegistered == register) return;
+            if (register) {
+                final IntentFilter filter = new IntentFilter();
+                filter.addAction(NotificationManager.ACTION_EFFECTS_SUPPRESSOR_CHANGED);
+                filter.addAction(AudioManager.INTERNAL_RINGER_MODE_CHANGED_ACTION);
+                mContext.registerReceiver(this, filter);
+            } else {
+                mContext.unregisterReceiver(this);
+            }
+            mRegistered = register;
+        }
+
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            final String action = intent.getAction();
+            if (NotificationManager.ACTION_EFFECTS_SUPPRESSOR_CHANGED.equals(action)) {
+                mHandler.sendEmptyMessage(H.UPDATE_EFFECTS_SUPPRESSOR);
+            } else if (AudioManager.INTERNAL_RINGER_MODE_CHANGED_ACTION.equals(action)) {
+                mHandler.sendEmptyMessage(H.UPDATE_RINGER_MODE);
             }
         }
     }
diff --git a/src/com/android/settings/notification/NotificationStation.java b/src/com/android/settings/notification/NotificationStation.java
index c61f91e..3f4d3df 100644
--- a/src/com/android/settings/notification/NotificationStation.java
+++ b/src/com/android/settings/notification/NotificationStation.java
@@ -275,7 +275,7 @@
         }
 
         try {
-            return r.getDrawable(resId);
+            return r.getDrawable(resId, null);
         } catch (RuntimeException e) {
             Log.w(TAG, "Icon not found in "
                     + (pkg != null ? resId : "<system>")
diff --git a/src/com/android/settings/notification/VolumeSeekBarPreference.java b/src/com/android/settings/notification/VolumeSeekBarPreference.java
index f94e6a1..409944f 100644
--- a/src/com/android/settings/notification/VolumeSeekBarPreference.java
+++ b/src/com/android/settings/notification/VolumeSeekBarPreference.java
@@ -23,14 +23,18 @@
 import android.preference.PreferenceManager;
 import android.preference.SeekBarPreference;
 import android.preference.SeekBarVolumizer;
+import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.SeekBar;
+import android.widget.TextView;
 
 import com.android.settings.R;
 
+import java.util.Objects;
+
 /** A slider preference that directly controls an audio stream volume (no dialog) **/
 public class VolumeSeekBarPreference extends SeekBarPreference
         implements PreferenceManager.OnActivityStopListener {
@@ -41,10 +45,17 @@
     private SeekBarVolumizer mVolumizer;
     private Callback mCallback;
     private ImageView mIconView;
+    private TextView mSuppressionTextView;
+    private String mSuppressionText;
+    private boolean mMuted;
+    private int mIconResId;
+    private int mMuteIconResId;
+    private boolean mStopped;
 
     public VolumeSeekBarPreference(Context context, AttributeSet attrs, int defStyleAttr,
             int defStyleRes) {
         super(context, attrs, defStyleAttr, defStyleRes);
+        setLayoutResource(R.layout.preference_volume_slider);
     }
 
     public VolumeSeekBarPreference(Context context, AttributeSet attrs, int defStyleAttr) {
@@ -67,8 +78,15 @@
         mCallback = callback;
     }
 
+    public void onActivityResume() {
+        if (mStopped) {
+            init();
+        }
+    }
+
     @Override
     public void onActivityStop() {
+        mStopped = true;
         if (mVolumizer != null) {
             mVolumizer.stop();
         }
@@ -81,10 +99,15 @@
             Log.w(TAG, "No stream found, not binding volumizer");
             return;
         }
+        mSeekBar = (SeekBar) view.findViewById(com.android.internal.R.id.seekbar);
+        mIconView = (ImageView) view.findViewById(com.android.internal.R.id.icon);
+        mSuppressionTextView = (TextView) view.findViewById(R.id.suppression_text);
+        init();
+    }
+
+    private void init() {
+        if (mSeekBar == null) return;
         getPreferenceManager().registerOnActivityStopListener(this);
-        final SeekBar seekBar = (SeekBar) view.findViewById(com.android.internal.R.id.seekbar);
-        if (seekBar == mSeekBar) return;
-        mSeekBar = seekBar;
         final SeekBarVolumizer.Callback sbvc = new SeekBarVolumizer.Callback() {
             @Override
             public void onSampleStarting(SeekBarVolumizer sbv) {
@@ -92,38 +115,60 @@
                     mCallback.onSampleStarting(sbv);
                 }
             }
+            @Override
+            public void onProgressChanged(SeekBar seekBar, int progress, boolean fromTouch) {
+                if (mCallback != null) {
+                    mCallback.onStreamValueChanged(mStream, progress);
+                }
+            }
+            @Override
+            public void onMuted(boolean muted) {
+                if (mMuted == muted) return;
+                mMuted = muted;
+                updateIconView();
+            }
         };
         final Uri sampleUri = mStream == AudioManager.STREAM_MUSIC ? getMediaVolumeUri() : null;
         if (mVolumizer == null) {
-            mVolumizer = new SeekBarVolumizer(getContext(), mStream, sampleUri, sbvc) {
-                // we need to piggyback on SBV's SeekBar listener to update our icon
-                @Override
-                public void onProgressChanged(SeekBar seekBar, int progress,
-                        boolean fromTouch) {
-                    super.onProgressChanged(seekBar, progress, fromTouch);
-                    mCallback.onStreamValueChanged(mStream, progress);
-                }
-            };
+            mVolumizer = new SeekBarVolumizer(getContext(), mStream, sampleUri, sbvc);
         }
+        mVolumizer.start();
         mVolumizer.setSeekBar(mSeekBar);
-        mIconView = (ImageView) view.findViewById(com.android.internal.R.id.icon);
+        updateIconView();
         mCallback.onStreamValueChanged(mStream, mSeekBar.getProgress());
+        updateSuppressionText();
     }
 
     // during initialization, this preference is the SeekBar listener
     @Override
-    public void onProgressChanged(SeekBar seekBar, int progress,
-            boolean fromTouch) {
+    public void onProgressChanged(SeekBar seekBar, int progress, boolean fromTouch) {
         super.onProgressChanged(seekBar, progress, fromTouch);
         mCallback.onStreamValueChanged(mStream, progress);
     }
 
+    private void updateIconView() {
+        if (mIconView == null) return;
+        if (mIconResId != 0) {
+            mIconView.setImageResource(mIconResId);
+        } else if (mMuteIconResId != 0 && mMuted) {
+            mIconView.setImageResource(mMuteIconResId);
+        } else {
+            mIconView.setImageDrawable(getIcon());
+        }
+    }
+
     public void showIcon(int resId) {
         // Instead of using setIcon, which will trigger listeners, this just decorates the
         // preference temporarily with a new icon.
-        if (mIconView != null) {
-            mIconView.setImageResource(resId);
-        }
+        if (mIconResId == resId) return;
+        mIconResId = resId;
+        updateIconView();
+    }
+
+    public void setMuteIcon(int resId) {
+        if (mMuteIconResId == resId) return;
+        mMuteIconResId = resId;
+        updateIconView();
     }
 
     private Uri getMediaVolumeUri() {
@@ -132,6 +177,21 @@
                 + "/" + R.raw.media_volume);
     }
 
+    public void setSuppressionText(String text) {
+        if (Objects.equals(text, mSuppressionText)) return;
+        mSuppressionText = text;
+        updateSuppressionText();
+    }
+
+    private void updateSuppressionText() {
+        if (mSuppressionTextView != null && mSeekBar != null) {
+            mSuppressionTextView.setText(mSuppressionText);
+            final boolean showSuppression = !TextUtils.isEmpty(mSuppressionText);
+            mSuppressionTextView.setVisibility(showSuppression ? View.VISIBLE : View.INVISIBLE);
+            mSeekBar.setVisibility(showSuppression ? View.INVISIBLE : View.VISIBLE);
+        }
+    }
+
     public interface Callback {
         void onSampleStarting(SeekBarVolumizer sbv);
         void onStreamValueChanged(int stream, int progress);
diff --git a/src/com/android/settings/notification/ZenModeConditionSelection.java b/src/com/android/settings/notification/ZenModeConditionSelection.java
index 856a7f6..87f55a3 100644
--- a/src/com/android/settings/notification/ZenModeConditionSelection.java
+++ b/src/com/android/settings/notification/ZenModeConditionSelection.java
@@ -23,9 +23,11 @@
 import android.os.Message;
 import android.os.RemoteException;
 import android.os.ServiceManager;
+import android.os.UserHandle;
 import android.service.notification.Condition;
 import android.service.notification.IConditionListener;
 import android.service.notification.ZenModeConfig;
+import android.text.TextUtils;
 import android.util.Log;
 import android.widget.CompoundButton;
 import android.widget.RadioButton;
@@ -59,7 +61,8 @@
         b.setText(mContext.getString(com.android.internal.R.string.zen_mode_forever));
         b.setChecked(true);
         for (int i = ZenModeConfig.MINUTE_BUCKETS.length - 1; i >= 0; --i) {
-            handleCondition(ZenModeConfig.toTimeCondition(ZenModeConfig.MINUTE_BUCKETS[i]));
+            handleCondition(ZenModeConfig.toTimeCondition(mContext,
+                    ZenModeConfig.MINUTE_BUCKETS[i], UserHandle.myUserId()));
         }
     }
 
@@ -114,7 +117,7 @@
             }
         }
         if (v != null) {
-            v.setText(c.summary);
+            v.setText(!TextUtils.isEmpty(c.line1) ? c.line1 : c.summary);
             v.setEnabled(c.state == Condition.STATE_TRUE);
         }
         mConditions.add(c);
diff --git a/src/com/android/settings/notification/ZenModeSettings.java b/src/com/android/settings/notification/ZenModeSettings.java
index 7fd3aa1..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;
@@ -51,8 +52,6 @@
 
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.Utils;
-import com.android.settings.notification.DropDownPreference.Callback;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
 import com.android.settings.search.SearchIndexableRaw;
@@ -65,11 +64,11 @@
 
 public class ZenModeSettings extends SettingsPreferenceFragment implements Indexable {
     private static final String TAG = "ZenModeSettings";
-    private static final boolean DEBUG = true;
+    private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
 
     private static final String KEY_ZEN_MODE = "zen_mode";
     private static final String KEY_IMPORTANT = "important";
-    private static final String KEY_CALLS = "phone_calls";
+    private static final String KEY_CALLS = "calls";
     private static final String KEY_MESSAGES = "messages";
     private static final String KEY_STARRED = "starred";
     private static final String KEY_EVENTS = "events";
@@ -79,6 +78,7 @@
     private static final String KEY_DAYS = "days";
     private static final String KEY_START_TIME = "start_time";
     private static final String KEY_END_TIME = "end_time";
+    private static final String KEY_DOWNTIME_MODE = "downtime_mode";
 
     private static final String KEY_AUTOMATION = "automation";
     private static final String KEY_ENTRY = "entry";
@@ -105,12 +105,8 @@
     private static SparseArray<String> allKeyTitles(Context context) {
         final SparseArray<String> rt = new SparseArray<String>();
         rt.put(R.string.zen_mode_important_category, KEY_IMPORTANT);
-        if (Utils.isVoiceCapable(context)) {
-            rt.put(R.string.zen_mode_phone_calls, KEY_CALLS);
-            rt.put(R.string.zen_mode_option_title, KEY_ZEN_MODE);
-        } else {
-            rt.put(R.string.zen_mode_option_title_novoice, KEY_ZEN_MODE);
-        }
+        rt.put(R.string.zen_mode_calls, KEY_CALLS);
+        rt.put(R.string.zen_mode_option_title, KEY_ZEN_MODE);
         rt.put(R.string.zen_mode_messages, KEY_MESSAGES);
         rt.put(R.string.zen_mode_from_starred, KEY_STARRED);
         rt.put(R.string.zen_mode_events, KEY_EVENTS);
@@ -119,6 +115,7 @@
         rt.put(R.string.zen_mode_downtime_days, KEY_DAYS);
         rt.put(R.string.zen_mode_start_time, KEY_START_TIME);
         rt.put(R.string.zen_mode_end_time, KEY_END_TIME);
+        rt.put(R.string.zen_mode_downtime_mode_title, KEY_DOWNTIME_MODE);
         rt.put(R.string.zen_mode_automation_category, KEY_AUTOMATION);
         rt.put(R.string.manage_condition_providers, KEY_CONDITION_PROVIDERS);
         return rt;
@@ -135,9 +132,11 @@
     private SwitchPreference mMessages;
     private DropDownPreference mStarred;
     private SwitchPreference mEvents;
+    private boolean mDowntimeSupported;
     private Preference mDays;
     private TimePickerPreference mStart;
     private TimePickerPreference mEnd;
+    private DropDownPreference mDowntimeMode;
     private PreferenceCategory mAutomationCategory;
     private Preference mEntry;
     private Preference mConditionProviders;
@@ -155,7 +154,7 @@
         mConfig = getZenModeConfig();
         if (DEBUG) Log.d(TAG, "Loaded mConfig=" + mConfig);
 
-        final Preference zenMode = PREF_ZEN_MODE.init(this);
+        PREF_ZEN_MODE.init(this);
         PREF_ZEN_MODE.setCallback(new SettingPrefWithCallback.Callback() {
             @Override
             public void onSettingSelected(int value) {
@@ -164,31 +163,23 @@
                 }
             }
         });
-        if (!Utils.isVoiceCapable(mContext)) {
-            zenMode.setTitle(R.string.zen_mode_option_title_novoice);
-        }
 
         final PreferenceCategory important =
                 (PreferenceCategory) root.findPreference(KEY_IMPORTANT);
 
         mCalls = (SwitchPreference) important.findPreference(KEY_CALLS);
-        if (Utils.isVoiceCapable(mContext)) {
-            mCalls.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
-                @Override
-                public boolean onPreferenceChange(Preference preference, Object newValue) {
-                    if (mDisableListeners) return true;
-                    final boolean val = (Boolean) newValue;
-                    if (val == mConfig.allowCalls) return true;
-                    if (DEBUG) Log.d(TAG, "onPrefChange allowCalls=" + val);
-                    final ZenModeConfig newConfig = mConfig.copy();
-                    newConfig.allowCalls = val;
-                    return setZenModeConfig(newConfig);
-                }
-            });
-        } else {
-            important.removePreference(mCalls);
-            mCalls = null;
-        }
+        mCalls.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
+            @Override
+            public boolean onPreferenceChange(Preference preference, Object newValue) {
+                if (mDisableListeners) return true;
+                final boolean val = (Boolean) newValue;
+                if (val == mConfig.allowCalls) return true;
+                if (DEBUG) Log.d(TAG, "onPrefChange allowCalls=" + val);
+                final ZenModeConfig newConfig = mConfig.copy();
+                newConfig.allowCalls = val;
+                return setZenModeConfig(newConfig);
+            }
+        });
 
         mMessages = (SwitchPreference) important.findPreference(KEY_MESSAGES);
         mMessages.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
@@ -238,81 +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());
+
+            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);
@@ -369,10 +382,19 @@
     }
 
     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;
-        mEnd.setSummaryFormat(nextDay ? R.string.zen_mode_end_time_summary_format : 0);
+        final int summaryFormat;
+        if (mConfig.sleepNone) {
+            summaryFormat = nextDay ? R.string.zen_mode_end_time_none_next_day_summary_format
+                    : R.string.zen_mode_end_time_none_same_day_summary_format;
+        } else {
+            summaryFormat = nextDay ? R.string.zen_mode_end_time_priority_next_day_summary_format
+                    : 0;
+        }
+        mEnd.setSummaryFormat(summaryFormat);
     }
 
     private void updateControls() {
@@ -384,9 +406,12 @@
         mStarred.setSelectedValue(mConfig.allowFrom);
         mEvents.setChecked(mConfig.allowEvents);
         updateStarredEnabled();
-        updateDays();
-        mStart.setTime(mConfig.sleepStartHour, mConfig.sleepStartMinute);
-        mEnd.setTime(mConfig.sleepEndHour, mConfig.sleepEndMinute);
+        if (mDowntimeSupported) {
+            updateDays();
+            mStart.setTime(mConfig.sleepStartHour, mConfig.sleepStartMinute);
+            mEnd.setTime(mConfig.sleepEndHour, mConfig.sleepEndMinute);
+            mDowntimeMode.setSelectedValue(mConfig.sleepNone);
+        }
         mDisableListeners = false;
         refreshAutomationSection();
         updateEndSummary();
@@ -536,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);
@@ -555,10 +586,15 @@
                 return result;
             }
 
+            @Override
             public List<String> getNonIndexableKeys(Context context) {
                 final ArrayList<String> rt = new ArrayList<String>();
-                if (!Utils.isVoiceCapable(context)) {
-                    rt.add(KEY_CALLS);
+                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;
             }
diff --git a/src/com/android/settings/print/PrintJobSettingsFragment.java b/src/com/android/settings/print/PrintJobSettingsFragment.java
index 34db97b..ccdfc0e 100644
--- a/src/com/android/settings/print/PrintJobSettingsFragment.java
+++ b/src/com/android/settings/print/PrintJobSettingsFragment.java
@@ -78,7 +78,7 @@
 
         mPrintManager = ((PrintManager) getActivity().getSystemService(
                 Context.PRINT_SERVICE)).getGlobalPrintManagerForUser(
-                        ActivityManager.getCurrentUser());
+                        getActivity().getUserId());
 
         getActivity().getActionBar().setTitle(R.string.print_print_job);
 
diff --git a/src/com/android/settings/print/PrintServiceSettingsFragment.java b/src/com/android/settings/print/PrintServiceSettingsFragment.java
index 49fd6df..e36e92c 100644
--- a/src/com/android/settings/print/PrintServiceSettingsFragment.java
+++ b/src/com/android/settings/print/PrintServiceSettingsFragment.java
@@ -137,6 +137,8 @@
 
     private boolean mServiceEnabled;
 
+    private SearchView mSearchView;
+
     @Override
     public void onResume() {
         super.onResume();
@@ -148,6 +150,9 @@
     @Override
     public void onPause() {
         mSettingsContentObserver.unregister(getContentResolver());
+        if (mSearchView != null) {
+            mSearchView.setOnQueryTextListener(null);
+        }
         super.onPause();
     }
 
@@ -408,8 +413,8 @@
 
         MenuItem searchItem = menu.findItem(R.id.print_menu_item_search);
         if (mServiceEnabled && mPrintersAdapter.getUnfilteredCount() > 0) {
-            SearchView searchView = (SearchView) searchItem.getActionView();
-            searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
+            mSearchView = (SearchView) searchItem.getActionView();
+            mSearchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
                 @Override
                 public boolean onQueryTextSubmit(String query) {
                     return true;
@@ -421,7 +426,7 @@
                     return true;
                 }
             });
-            searchView.addOnAttachStateChangeListener(new View.OnAttachStateChangeListener() {
+            mSearchView.addOnAttachStateChangeListener(new View.OnAttachStateChangeListener() {
                 @Override
                 public void onViewAttachedToWindow(View view) {
                     if (AccessibilityManager.getInstance(getActivity()).isEnabled()) {
diff --git a/src/com/android/settings/print/PrintSettingsFragment.java b/src/com/android/settings/print/PrintSettingsFragment.java
index 4a34875..581321b 100644
--- a/src/com/android/settings/print/PrintSettingsFragment.java
+++ b/src/com/android/settings/print/PrintSettingsFragment.java
@@ -124,6 +124,7 @@
 
     private PrintJobsController mPrintJobsController;
     private UserSpinnerAdapter mProfileSpinnerAdapter;
+    private Spinner mSpinner;
 
     @Override
     public void onCreate(Bundle icicle) {
@@ -184,11 +185,11 @@
         final UserManager um = (UserManager) getSystemService(Context.USER_SERVICE);
         mProfileSpinnerAdapter = Utils.createUserSpinnerAdapter(um, getActivity());
         if (mProfileSpinnerAdapter != null) {
-            Spinner spinner = (Spinner) getActivity().getLayoutInflater().inflate(
+            mSpinner = (Spinner) getActivity().getLayoutInflater().inflate(
                     R.layout.spinner_view, null);
-            spinner.setAdapter(mProfileSpinnerAdapter);
-            spinner.setOnItemSelectedListener(this);
-            setPinnedHeaderView(spinner);
+            mSpinner.setAdapter(mProfileSpinnerAdapter);
+            mSpinner.setOnItemSelectedListener(this);
+            setPinnedHeaderView(mSpinner);
         }
     }
 
@@ -300,6 +301,8 @@
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
             getActivity().startActivityAsUser(intent, selectedUser);
+            // Go back to default selection, which is the first one
+            mSpinner.setSelection(0);
         }
     }
 
@@ -462,7 +465,7 @@
             super(context);
             mPrintManager = ((PrintManager) context.getSystemService(
                     Context.PRINT_SERVICE)).getGlobalPrintManagerForUser(
-                        ActivityManager.getCurrentUser());
+                    context.getUserId());
         }
 
         @Override
diff --git a/src/com/android/settings/search/Ranking.java b/src/com/android/settings/search/Ranking.java
index 2c76002..6abbc3d 100644
--- a/src/com/android/settings/search/Ranking.java
+++ b/src/com/android/settings/search/Ranking.java
@@ -31,6 +31,7 @@
 import com.android.settings.accessibility.AccessibilitySettings;
 import com.android.settings.bluetooth.BluetoothSettings;
 import com.android.settings.deviceinfo.Memory;
+import com.android.settings.deviceinfo.UsbSettings;
 import com.android.settings.fuelgauge.BatterySaverSettings;
 import com.android.settings.fuelgauge.PowerUsageSummary;
 import com.android.settings.inputmethod.InputMethodAndLanguageSettings;
@@ -63,7 +64,7 @@
     public static final int RANK_DISPLAY = 7;
     public static final int RANK_WALLPAPER = 8;
     public static final int RANK_NOTIFICATIONS = 9;
-    public static final int RANK_MEMORY = 10;
+    public static final int RANK_STORAGE = 10;
     public static final int RANK_POWER_USAGE = 11;
     public static final int RANK_USERS = 12;
     public static final int RANK_LOCATION = 13;
@@ -118,8 +119,9 @@
         sRankMap.put(OtherSoundSettings.class.getName(), RANK_NOTIFICATIONS);
         sRankMap.put(ZenModeSettings.class.getName(), RANK_NOTIFICATIONS);
 
-        // Memory
-        sRankMap.put(Memory.class.getName(), RANK_MEMORY);
+        // Storage
+        sRankMap.put(Memory.class.getName(), RANK_STORAGE);
+        sRankMap.put(UsbSettings.class.getName(), RANK_STORAGE);
 
         // Battery
         sRankMap.put(PowerUsageSummary.class.getName(), RANK_POWER_USAGE);
diff --git a/src/com/android/settings/search/SearchIndexableResources.java b/src/com/android/settings/search/SearchIndexableResources.java
index 7b3fa77..502480d 100644
--- a/src/com/android/settings/search/SearchIndexableResources.java
+++ b/src/com/android/settings/search/SearchIndexableResources.java
@@ -33,6 +33,7 @@
 import com.android.settings.accessibility.AccessibilitySettings;
 import com.android.settings.bluetooth.BluetoothSettings;
 import com.android.settings.deviceinfo.Memory;
+import com.android.settings.deviceinfo.UsbSettings;
 import com.android.settings.fuelgauge.BatterySaverSettings;
 import com.android.settings.fuelgauge.PowerUsageSummary;
 import com.android.settings.inputmethod.InputMethodAndLanguageSettings;
@@ -165,6 +166,13 @@
                         Memory.class.getName(),
                         R.drawable.ic_settings_storage));
 
+        sResMap.put(UsbSettings.class.getName(),
+                new SearchIndexableResource(
+                        Ranking.getRankForClassName(UsbSettings.class.getName()),
+                        R.xml.usb_settings,
+                        UsbSettings.class.getName(),
+                        R.drawable.ic_settings_storage));
+
         sResMap.put(PowerUsageSummary.class.getName(),
                 new SearchIndexableResource(
                         Ranking.getRankForClassName(PowerUsageSummary.class.getName()),
diff --git a/src/com/android/settings/sim/SimBootReceiver.java b/src/com/android/settings/sim/SimBootReceiver.java
new file mode 100644
index 0000000..58e3721
--- /dev/null
+++ b/src/com/android/settings/sim/SimBootReceiver.java
@@ -0,0 +1,171 @@
+/*
+ * 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 com.android.settings.R;
+import com.android.settings.Settings.SimSettingsActivity;
+
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.SharedPreferences.Editor;
+import android.content.res.Resources;
+import android.provider.Settings;
+import android.support.v4.app.NotificationCompat;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+import android.telephony.SubscriptionManager.OnSubscriptionsChangedListener;
+
+import com.android.settings.Utils;
+
+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";
+    private static final String SLOT_PREFIX = "sim_slot_";
+    private static final int INVALID_SLOT = -2; // Used when upgrading from K to LMR1
+
+    private SharedPreferences mSharedPreferences = null;
+    private TelephonyManager mTelephonyManager;
+    private Context mContext;
+    private SubscriptionManager mSubscriptionManager;
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        mTelephonyManager = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
+        mContext = context;
+        mSubscriptionManager = SubscriptionManager.from(mContext);
+        mSharedPreferences = mContext.getSharedPreferences(SHARED_PREFERENCES_NAME,
+                Context.MODE_PRIVATE);
+
+        mSubscriptionManager.addOnSubscriptionsChangedListener(mSubscriptionListener);
+    }
+
+    private void detectChangeAndNotify() {
+        final int numSlots = mTelephonyManager.getSimCount();
+        final boolean isInProvisioning = Settings.Global.getInt(mContext.getContentResolver(),
+                Settings.Global.DEVICE_PROVISIONED, 0) == 0;
+        boolean notificationSent = false;
+        int numSIMsDetected = 0;
+        int lastSIMSlotDetected = -1;
+
+        // Do not create notifications on single SIM devices or when provisiong.
+        if (numSlots < 2 || isInProvisioning) {
+            return;
+        }
+
+        // We wait until SubscriptionManager returns a valid list of Subscription informations
+        // by checking if the list is empty.
+        // This is not completely correct, but works for most cases.
+        // See Bug: 18377252
+        List<SubscriptionInfo> sil = mSubscriptionManager.getActiveSubscriptionInfoList();
+        if (sil == null || sil.size() < 1) {
+            return;
+        }
+
+        for (int i = 0; i < numSlots; i++) {
+            final SubscriptionInfo sir = Utils.findRecordBySlotId(mContext, i);
+            final String key = SLOT_PREFIX+i;
+            final int lastSubId = getLastSubId(key);
+
+            if (sir != null) {
+                numSIMsDetected++;
+                final int currentSubId = sir.getSubscriptionId();
+                if (lastSubId == INVALID_SLOT) {
+                    setLastSubId(key, currentSubId);
+                } else 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) {
+        return mSharedPreferences.getInt(strSlotId, INVALID_SLOT);
+    }
+
+    private void setLastSubId(String strSlotId, int value) {
+        Editor editor = mSharedPreferences.edit();
+        editor.putInt(strSlotId, value);
+        editor.commit();
+    }
+
+    private void createNotification(Context context){
+        final Resources resources = context.getResources();
+
+        NotificationCompat.Builder builder =
+                new NotificationCompat.Builder(context)
+                .setSmallIcon(R.drawable.ic_sim_card_alert_white_48dp)
+                .setColor(resources.getColor(R.color.sim_noitification))
+                .setContentTitle(resources.getString(R.string.sim_notification_title))
+                .setContentText(resources.getString(R.string.sim_notification_summary));
+        Intent resultIntent = new Intent(context, SimSettingsActivity.class);
+        resultIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        PendingIntent resultPendingIntent =
+                PendingIntent.getActivity(
+                context,
+                0,
+                resultIntent,
+                PendingIntent.FLAG_CANCEL_CURRENT
+                );
+        builder.setContentIntent(resultPendingIntent);
+        NotificationManager notificationManager =
+                    (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
+        notificationManager.notify(NOTIFICATION_ID, builder.build());
+    }
+
+    public static void cancelNotification(Context context) {
+        NotificationManager notificationManager =
+                    (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
+        notificationManager.cancel(NOTIFICATION_ID);
+    }
+
+    private final OnSubscriptionsChangedListener mSubscriptionListener =
+            new OnSubscriptionsChangedListener() {
+        @Override
+        public void onSubscriptionsChanged() {
+            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..3170dae
--- /dev/null
+++ b/src/com/android/settings/sim/SimDialogActivity.java
@@ -0,0 +1,341 @@
+/*
+ * 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 android.widget.Toast;
+
+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);
+
+        if (sir != null) {
+            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();
+        } else {
+            finish();
+        }
+    }
+
+    private static void setDefaultDataSubId(final Context context, final int subId) {
+        final SubscriptionManager subscriptionManager = SubscriptionManager.from(context);
+        subscriptionManager.setDefaultDataSubId(subId);
+        Toast.makeText(context, R.string.data_switch_started, Toast.LENGTH_LONG).show();
+    }
+
+    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 == null ? 0 : 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;
+                }
+            };
+
+        ArrayList<SubscriptionInfo> callsSubInfoList = new ArrayList<SubscriptionInfo>();
+        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));
+            callsSubInfoList.add(null);
+            while (phoneAccounts.hasNext()) {
+                final PhoneAccount phoneAccount =
+                        telecomManager.getPhoneAccount(phoneAccounts.next());
+                list.add((String)phoneAccount.getLabel());
+                // Added check to add entry into callsSubInforList only if phoneAccountId is int
+                // Todo : Might have to change it later based on b/18904714
+                if (phoneAccount.hasCapabilities(PhoneAccount.CAPABILITY_SIM_SUBSCRIPTION) &&
+                        TextUtils.isDigitsOnly(phoneAccount.getAccountHandle().getId())) {
+                    final String phoneAccountId = phoneAccount.getAccountHandle().getId();
+                    final SubscriptionInfo sir = Utils.findRecordBySubId(context,
+                            Integer.parseInt(phoneAccountId));
+                    callsSubInfoList.add(sir);
+                } else {
+                    callsSubInfoList.add(null);
+                }
+            }
+        } 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(
+                id == CALLS_PICK ? callsSubInfoList : 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);
+
+        dialog.setOnCancelListener(new DialogInterface.OnCancelListener() {
+            @Override
+            public void onCancel(DialogInterface dialogInterface) {
+                finish();
+            }
+        });
+
+        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;
+
+            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();
+            }
+
+            final SubscriptionInfo sir = mSubInfoList.get(position);
+            if (sir == null) {
+                holder.title.setText(getItem(position));
+                holder.summary.setText("");
+                holder.icon.setImageDrawable(getResources()
+                        .getDrawable(R.drawable.ic_live_help));
+                holder.icon.setAlpha(OPACITY);
+            } else {
+                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 b9a3cbb..92a10d6 100644
--- a/src/com/android/settings/sim/SimSettings.java
+++ b/src/com/android/settings/sim/SimSettings.java
@@ -16,73 +16,48 @@
 
 package com.android.settings.sim;
 
-import android.provider.SearchIndexableResource;
-import com.android.settings.R;
-
 import android.app.AlertDialog;
-import android.app.Fragment;
-import android.content.BroadcastReceiver;
 import android.content.Context;
-import android.content.ContentUris;
-import android.content.Intent;
-import android.content.IntentFilter;
 import android.content.DialogInterface;
+import android.content.Intent;
 import android.content.res.Resources;
-import android.database.Cursor;
-import android.net.Uri;
+import android.graphics.Paint;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.ShapeDrawable;
+import android.graphics.drawable.shapes.OvalShape;
 import android.os.Bundle;
-import android.os.IBinder;
-import android.os.RemoteException;
-import android.os.UserHandle;
-import android.preference.ListPreference;
 import android.preference.Preference;
-import android.preference.PreferenceActivity;
-import android.preference.PreferenceCategory;
-import android.preference.Preference.OnPreferenceChangeListener;
 import android.preference.PreferenceScreen;
-import android.provider.Telephony;
-import android.telephony.SubInfoRecord;
+import android.provider.SearchIndexableResource;
+import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
 import android.telephony.PhoneNumberUtils;
-import android.telecom.PhoneAccount;
-import android.telephony.CellInfo;
+import android.telecom.PhoneAccountHandle;
+import android.telecom.TelecomManager;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.ArrayAdapter;
 import android.widget.EditText;
-import android.widget.FrameLayout;
 import android.widget.ImageView;
-import android.widget.ListView;
 import android.widget.Spinner;
 import android.widget.TextView;
-import android.app.Dialog;
-import android.app.DialogFragment;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
-import android.widget.ListAdapter;
-
-import com.android.internal.telephony.PhoneConstants;
-import com.android.internal.telephony.PhoneFactory;
-import com.android.internal.telephony.TelephonyIntents;
 import com.android.settings.RestrictedSettingsFragment;
-import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.Utils;
-import com.android.settings.notification.DropDownPreference;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
-import com.android.settings.search.Indexable.SearchIndexProvider;
-import com.android.settings.search.SearchIndexableRaw;
+import com.android.settings.R;
 
 import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
 import java.util.List;
 
 public class SimSettings extends RestrictedSettingsFragment implements Indexable {
     private static final String TAG = "SimSettings";
+    private static final boolean DBG = false;
 
     private static final String DISALLOW_CONFIG_SIM = "no_config_sim";
     private static final String SIM_CARD_CATEGORY = "sim_cards";
@@ -120,44 +95,21 @@
      * By UX design we use only one Subscription Information(SubInfo) record per SIM slot.
      * mAvalableSubInfos is the list of SubInfos we present to the user.
      * mSubInfoList is the list of all SubInfos.
+     * mSelectableSubInfos is the list of SubInfos that a user can select for data, calls, and SMS.
      */
-    private List<SubInfoRecord> mAvailableSubInfos = null;
-    private List<SubInfoRecord> mSubInfoList = null;
+    private List<SubscriptionInfo> mAvailableSubInfos = null;
+    private List<SubscriptionInfo> mSubInfoList = null;
+    private List<SubscriptionInfo> mSelectableSubInfos = null;
 
-    private SubInfoRecord mCellularData = null;
-    private SubInfoRecord mCalls = null;
-    private SubInfoRecord mSMS = null;
+    private SubscriptionInfo mCellularData = null;
+    private SubscriptionInfo mCalls = null;
+    private SubscriptionInfo mSMS = null;
 
-    private PreferenceCategory mSimCards = null;
+    private PreferenceScreen mSimCards = null;
 
-    private int mNumSims;
-    /**
-     * Standard projection for the interesting columns of a normal note.
-     */
-    private static final String[] sProjection = new String[] {
-            Telephony.Carriers._ID,     // 0
-            Telephony.Carriers.NAME,    // 1
-            Telephony.Carriers.APN,     // 2
-            Telephony.Carriers.PROXY,   // 3
-            Telephony.Carriers.PORT,    // 4
-            Telephony.Carriers.USER,    // 5
-            Telephony.Carriers.SERVER,  // 6
-            Telephony.Carriers.PASSWORD, // 7
-            Telephony.Carriers.MMSC, // 8
-            Telephony.Carriers.MCC, // 9
-            Telephony.Carriers.MNC, // 10
-            Telephony.Carriers.NUMERIC, // 11
-            Telephony.Carriers.MMSPROXY,// 12
-            Telephony.Carriers.MMSPORT, // 13
-            Telephony.Carriers.AUTH_TYPE, // 14
-            Telephony.Carriers.TYPE, // 15
-            Telephony.Carriers.PROTOCOL, // 16
-            Telephony.Carriers.CARRIER_ENABLED, // 17
-            Telephony.Carriers.BEARER, // 18
-            Telephony.Carriers.ROAMING_PROTOCOL, // 19
-            Telephony.Carriers.MVNO_TYPE,   // 20
-            Telephony.Carriers.MVNO_MATCH_DATA  // 21
-    };
+    private SubscriptionManager mSubscriptionManager;
+    private Utils mUtils;
+
 
     public SimSettings() {
         super(DISALLOW_CONFIG_SIM);
@@ -167,12 +119,18 @@
     public void onCreate(final Bundle bundle) {
         super.onCreate(bundle);
 
+        mSubscriptionManager = SubscriptionManager.from(getActivity());
+
         if (mSubInfoList == null) {
-            mSubInfoList = SubscriptionManager.getActiveSubInfoList();
+            mSubInfoList = mSubscriptionManager.getActiveSubscriptionInfoList();
+            // FIXME: b/18385348, needs to handle null from getActiveSubscriptionInfoList
         }
+        if (DBG) log("[onCreate] mSubInfoList=" + mSubInfoList);
 
         createPreferences();
         updateAllOptions();
+
+        SimBootReceiver.cancelNotification(getActivity());
     }
 
     private void createPreferences() {
@@ -181,17 +139,19 @@
 
         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<SubInfoRecord>(numSlots);
-        mNumSims = 0;
+        mAvailableSubInfos = new ArrayList<SubscriptionInfo>(numSlots);
+        mSelectableSubInfos = new ArrayList<SubscriptionInfo>();
         for (int i = 0; i < numSlots; ++i) {
-            final SubInfoRecord sir = findRecordBySlotId(i);
-            mSimCards.addPreference(new SimPreference(getActivity(), sir, i));
+            final SubscriptionInfo sir = Utils.findRecordBySlotId(getActivity(), i);
+            SimPreference simPreference = new SimPreference(getActivity(), sir, i);
+            simPreference.setOrder(i-numSlots);
+            mSimCards.addPreference(simPreference);
             mAvailableSubInfos.add(sir);
             if (sir != null) {
-                mNumSims++;
+                mSelectableSubInfos.add(sir);
             }
         }
 
@@ -203,13 +163,11 @@
             (TelephonyManager) getActivity().getSystemService(Context.TELEPHONY_SERVICE);
         final int numSlots = tm.getSimCount();
 
-        mNumSims = 0;
-        mAvailableSubInfos = new ArrayList<SubInfoRecord>(numSlots);
+        mAvailableSubInfos = new ArrayList<SubscriptionInfo>(numSlots);
         for (int i = 0; i < numSlots; ++i) {
-            final SubInfoRecord sir = findRecordBySlotId(i);
+            final SubscriptionInfo sir = Utils.findRecordBySlotId(getActivity(), i);
             mAvailableSubInfos.add(sir);
             if (sir != null) {
-                mNumSims++;
             }
         }
     }
@@ -220,7 +178,7 @@
     }
 
     private void updateSimSlotValues() {
-        SubscriptionManager.getAllSubInfoList();
+        mSubscriptionManager.getAllSubscriptionInfoList();
 
         final int prefSize = mSimCards.getPreferenceCount();
         for (int i = 0; i < prefSize; ++i) {
@@ -237,90 +195,56 @@
         updateSmsValues();
     }
 
-    /**
-     * finds a record with subId.
-     * Since the number of SIMs are few, an array is fine.
-     */
-    private SubInfoRecord findRecordBySubId(final long subId) {
-        final int availableSubInfoLength = mAvailableSubInfos.size();
-
-        for (int i = 0; i < availableSubInfoLength; ++i) {
-            final SubInfoRecord sir = mAvailableSubInfos.get(i);
-            if (sir != null && sir.subId == subId) {
-                return sir;
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * finds a record with slotId.
-     * Since the number of SIMs are few, an array is fine.
-     */
-    private SubInfoRecord findRecordBySlotId(final int slotId) {
-        if (mSubInfoList != null){
-            final int availableSubInfoLength = mSubInfoList.size();
-
-            for (int i = 0; i < availableSubInfoLength; ++i) {
-                final SubInfoRecord sir = mSubInfoList.get(i);
-                if (sir.slotId == slotId) {
-                    //Right now we take the first subscription on a SIM.
-                    return sir;
-                }
-            }
-        }
-
-        return null;
-    }
-
     private void updateSmsValues() {
-        final Preference simPref = (Preference) findPreference(KEY_SMS);
-        final SubInfoRecord sir = findRecordBySubId(SubscriptionManager.getDefaultSmsSubId());
+        final Preference simPref = findPreference(KEY_SMS);
+        final SubscriptionInfo sir = Utils.findRecordBySubId(getActivity(),
+                mSubscriptionManager.getDefaultSmsSubId());
         simPref.setTitle(R.string.sms_messages_title);
-        if (mSubInfoList.size() == 1) {
-            simPref.setSummary(mSubInfoList.get(0).displayName);
-        } else if (sir != null) {
-            simPref.setSummary(sir.displayName);
+        if (DBG) log("[updateSmsValues] mSubInfoList=" + mSubInfoList);
+
+        if (sir != null) {
+            simPref.setSummary(sir.getDisplayName());
         } else if (sir == null) {
             simPref.setSummary(R.string.sim_selection_required_pref);
         }
-        simPref.setEnabled(mNumSims >= 1);
+        simPref.setEnabled(mSelectableSubInfos.size() >= 1);
     }
 
     private void updateCellularDataValues() {
-        final Preference simPref = (Preference) findPreference(KEY_CELLULAR_DATA);
-        final SubInfoRecord sir = findRecordBySubId(SubscriptionManager.getDefaultDataSubId());
+        final Preference simPref = findPreference(KEY_CELLULAR_DATA);
+        final SubscriptionInfo sir = Utils.findRecordBySubId(getActivity(),
+                mSubscriptionManager.getDefaultDataSubId());
         simPref.setTitle(R.string.cellular_data_title);
-        if (mSubInfoList.size() == 1) {
-            simPref.setSummary(mSubInfoList.get(0).displayName);
-        } else if (sir != null) {
-            simPref.setSummary(sir.displayName);
+        if (DBG) log("[updateCellularDataValues] mSubInfoList=" + mSubInfoList);
+
+        if (sir != null) {
+            simPref.setSummary(sir.getDisplayName());
         } else if (sir == null) {
             simPref.setSummary(R.string.sim_selection_required_pref);
         }
-        simPref.setEnabled(mNumSims >= 1);
+        simPref.setEnabled(mSelectableSubInfos.size() >= 1);
     }
 
     private void updateCallValues() {
-        final Preference simPref = (Preference) findPreference(KEY_CALLS);
-        final SubInfoRecord sir = findRecordBySubId(SubscriptionManager.getDefaultVoiceSubId());
+        final Preference simPref = findPreference(KEY_CALLS);
+        final TelecomManager telecomManager = TelecomManager.from(getActivity());
+        final PhoneAccountHandle phoneAccount =
+            telecomManager.getUserSelectedOutgoingPhoneAccount();
+
         simPref.setTitle(R.string.calls_title);
-        if (mSubInfoList.size() == 1) {
-            simPref.setSummary(mSubInfoList.get(0).displayName);
-        } else if (sir != null) {
-            simPref.setSummary(sir.displayName);
-        } else if (sir == null) {
-            simPref.setSummary(R.string.sim_calls_ask_first_prefs_title);
-        }
-        simPref.setEnabled(mNumSims >= 1);
+        simPref.setSummary(phoneAccount == null
+                ? getResources().getString(R.string.sim_calls_ask_first_prefs_title)
+                : (String)telecomManager.getPhoneAccount(phoneAccount).getLabel());
     }
 
     @Override
     public void onResume() {
         super.onResume();
 
-        mSubInfoList = SubscriptionManager.getActiveSubInfoList();
+        mSubInfoList = mSubscriptionManager.getActiveSubscriptionInfoList();
+        // FIXME: b/18385348, needs to handle null from getActiveSubscriptionInfoList
+        if (DBG) log("[onResme] mSubInfoList=" + mSubInfoList);
+
         updateAvailableSubInfos();
         updateAllOptions();
     }
@@ -328,159 +252,61 @@
     @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 ((Preference) findPreference(KEY_CELLULAR_DATA) == preference) {
-            showDialog(DATA_PICK);
-        } else if ((Preference) findPreference(KEY_CALLS) == preference) {
-            showDialog(CALLS_PICK);
-        } else if ((Preference) findPreference(KEY_SMS) == preference) {
-            showDialog(SMS_PICK);
+        } else if (findPreference(KEY_CELLULAR_DATA) == preference) {
+            intent.putExtra(SimDialogActivity.DIALOG_TYPE_KEY, SimDialogActivity.DATA_PICK);
+            context.startActivity(intent);
+        } else if (findPreference(KEY_CALLS) == preference) {
+            intent.putExtra(SimDialogActivity.DIALOG_TYPE_KEY, SimDialogActivity.CALLS_PICK);
+            context.startActivity(intent);
+        } else if (findPreference(KEY_SMS) == preference) {
+            intent.putExtra(SimDialogActivity.DIALOG_TYPE_KEY, SimDialogActivity.SMS_PICK);
+            context.startActivity(intent);
         }
 
         return true;
     }
 
-    @Override
-    public Dialog onCreateDialog(final int id) {
-        final ArrayList<String> list = new ArrayList<String>();
-        final int availableSubInfoLength = mAvailableSubInfos.size();
-
-        final DialogInterface.OnClickListener selectionListener =
-                new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int value) {
-
-                        final SubInfoRecord sir;
-
-                        if (id == DATA_PICK) {
-                            sir = mAvailableSubInfos.get(value);
-                            SubscriptionManager.setDefaultDataSubId(sir.subId);
-                        } else if (id == CALLS_PICK) {
-                            if (value != 0) {
-                                sir = mAvailableSubInfos.get(value -1);
-                                SubscriptionManager.setDefaultVoiceSubId(sir.subId);
-                            } //have to figure out value of subid when user selects "ask everytime"
-                        } else if (id == SMS_PICK) {
-                            sir = mAvailableSubInfos.get(value);
-                            SubscriptionManager.setDefaultSmsSubId(sir.subId);
-                        }
-
-                        updateActivitesCategory();
-                    }
-                };
-
-        if (id == CALLS_PICK) {
-            list.add(getResources().getString(R.string.sim_calls_ask_first_prefs_title));
-        }
-        for (int i = 0; i < availableSubInfoLength; ++i) {
-            final SubInfoRecord sir = mAvailableSubInfos.get(i);
-            list.add(sir.displayName);
-        }
-
-        String[] arr = new String[availableSubInfoLength];
-        arr = list.toArray(arr);
-
-        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
-
-        ListAdapter adapter = new SelectAccountListAdapter(
-                builder.getContext(),
-                R.layout.select_account_list_item,
-                arr);
-
-        if (id == DATA_PICK) {
-            builder.setTitle(R.string.select_sim_for_data);
-        } else if (id == CALLS_PICK) {
-            builder.setTitle(R.string.select_sim_for_calls);
-        } else if (id == SMS_PICK) {
-            builder.setTitle(R.string.sim_card_select_title);
-        }
-
-        return builder.setAdapter(adapter, selectionListener)
-            .create();
-    }
-
-    private class SelectAccountListAdapter extends ArrayAdapter<String> {
-        private Context mContext;
-        private int mResId;
-
-        public SelectAccountListAdapter(
-                Context context, int resource, String[] arr) {
-            super(context, resource, arr);
-            mContext = context;
-            mResId = resource;
-        }
-
-        @Override
-        public View getView(int position, View convertView, ViewGroup parent) {
-            LayoutInflater inflater = (LayoutInflater)
-                    mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-
-            View rowView;
-            final ViewHolder holder;
-
-            if (convertView == null) {
-                // Cache views for faster scrolling
-                rowView = inflater.inflate(mResId, null);
-                holder = new ViewHolder();
-                holder.textView = (TextView) rowView.findViewById(R.id.text);
-                holder.imageView = (ImageView) rowView.findViewById(R.id.icon);
-                rowView.setTag(holder);
-            }
-            else {
-                rowView = convertView;
-                holder = (ViewHolder) rowView.getTag();
-            }
-
-            holder.textView.setText(getItem(position));
-            holder.imageView.setImageDrawable(getResources().getDrawable(R.drawable.ic_sim_sd));
-            return rowView;
-        }
-
-        private class ViewHolder {
-            TextView textView;
-            ImageView imageView;
-        }
-    }
-
-    private void setActivity(Preference preference, SubInfoRecord sir) {
-        final String key = preference.getKey();
-
-        if (key.equals(KEY_CELLULAR_DATA)) {
-            mCellularData = sir;
-        } else if (key.equals(KEY_CALLS)) {
-            mCalls = sir;
-        } else if (key.equals(KEY_SMS)) {
-            mSMS = sir;
-        }
-
-        updateActivitesCategory();
-    }
-
     private class SimPreference extends Preference{
-        private SubInfoRecord mSubInfoRecord;
+        private SubscriptionInfo mSubInfoRecord;
         private int mSlotId;
+        private int[] mTintArr;
+        Context mContext;
+        private String[] mColorStrings;
+        private int mTintSelectorPos;
 
-        public SimPreference(Context context, SubInfoRecord subInfoRecord, int slotId) {
+        public SimPreference(Context context, SubscriptionInfo subInfoRecord, int slotId) {
             super(context);
 
+            mContext = context;
             mSubInfoRecord = subInfoRecord;
             mSlotId = slotId;
             setKey("sim" + mSlotId);
             update();
+            mTintArr = context.getResources().getIntArray(com.android.internal.R.array.sim_colors);
+            mColorStrings = context.getResources().getStringArray(R.array.color_picker);
+            mTintSelectorPos = 0;
         }
 
         public void update() {
             final Resources res = getResources();
 
+            setTitle(String.format(getResources()
+                    .getString(R.string.sim_editor_title), (mSlotId + 1)));
             if (mSubInfoRecord != null) {
-                if(TextUtils.isEmpty(mSubInfoRecord.displayName)) {
-                    setTitle(getCarrierName());
+                if (TextUtils.isEmpty(getPhoneNumber(mSubInfoRecord))) {
+                   setSummary(mSubInfoRecord.getDisplayName());
                 } else {
-                    setTitle(mSubInfoRecord.displayName);
+                    setSummary(mSubInfoRecord.getDisplayName() + " - " +
+                            getPhoneNumber(mSubInfoRecord));
+                    setEnabled(true);
                 }
-                setSummary(mSubInfoRecord.number.toString());
-                setEnabled(true);
+                setIcon(new BitmapDrawable(res, (mSubInfoRecord.createIconBitmap(mContext))));
             } else {
                 setSummary(R.string.sim_slot_empty);
                 setFragment(null);
@@ -488,28 +314,7 @@
             }
         }
 
-        public String getCarrierName() {
-            Uri mUri = ContentUris.withAppendedId(Telephony.Carriers.CONTENT_URI, mSubInfoRecord.subId);
-            Cursor mCursor = getActivity().managedQuery(mUri, sProjection, null, null);
-            mCursor.moveToFirst();
-            return mCursor.getString(1);
-        }
-
-        public String getFormattedPhoneNumber() {
-            try{
-                final String rawNumber = PhoneFactory.getPhone(mSlotId).getLine1Number();
-                String formattedNumber = null;
-                if (!TextUtils.isEmpty(rawNumber)) {
-                    formattedNumber = PhoneNumberUtils.formatNumber(rawNumber);
-                }
-
-                return formattedNumber;
-            } catch (java.lang.IllegalStateException ise){
-                return "Unknown";
-            }
-        }
-
-        public SubInfoRecord getSubInfoRecord() {
+        public SubscriptionInfo getSubInfoRecord() {
             return mSubInfoRecord;
         }
 
@@ -523,25 +328,67 @@
             builder.setView(dialogLayout);
 
             EditText nameText = (EditText)dialogLayout.findViewById(R.id.sim_name);
-            nameText.setText(mSubInfoRecord.displayName);
+            nameText.setText(mSubInfoRecord.getDisplayName());
+
+            final Spinner tintSpinner = (Spinner) dialogLayout.findViewById(R.id.spinner);
+            SelectColorAdapter adapter = new SelectColorAdapter(getContext(),
+                     R.layout.settings_color_picker_item, mColorStrings);
+            adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+            tintSpinner.setAdapter(adapter);
+
+            for (int i = 0; i < mTintArr.length; i++) {
+                if (mTintArr[i] == mSubInfoRecord.getIconTint()) {
+                    tintSpinner.setSelection(i);
+                    mTintSelectorPos = i;
+                    break;
+                }
+            }
+
+            tintSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+                @Override
+                public void onItemSelected(AdapterView<?> parent, View view,
+                    int pos, long id){
+                    tintSpinner.setSelection(pos);
+                    mTintSelectorPos = pos;
+                }
+
+                @Override
+                public void onNothingSelected(AdapterView<?> parent) {
+                }
+            });
 
             TextView numberView = (TextView)dialogLayout.findViewById(R.id.number);
-            numberView.setText(simPref.getFormattedPhoneNumber());
+            final String rawNumber = getPhoneNumber(mSubInfoRecord);
+            if (TextUtils.isEmpty(rawNumber)) {
+                numberView.setText(res.getString(com.android.internal.R.string.unknownName));
+            } else {
+                numberView.setText(PhoneNumberUtils.formatNumber(rawNumber));
+            }
 
             TextView carrierView = (TextView)dialogLayout.findViewById(R.id.carrier);
-            carrierView.setText(getCarrierName());
+            carrierView.setText(mSubInfoRecord.getCarrierName());
 
             builder.setTitle(String.format(res.getString(R.string.sim_editor_title),
-                    (mSubInfoRecord.slotId + 1)));
+                    (mSubInfoRecord.getSimSlotIndex() + 1)));
 
             builder.setPositiveButton(R.string.okay, new DialogInterface.OnClickListener() {
                 @Override
                 public void onClick(DialogInterface dialog, int whichButton) {
                     final EditText nameText = (EditText)dialogLayout.findViewById(R.id.sim_name);
 
-                    mSubInfoRecord.displayName = nameText.getText().toString();
-                    SubscriptionManager.setDisplayName(mSubInfoRecord.displayName,
-                        mSubInfoRecord.subId);
+                    String displayName = nameText.getText().toString();
+                    int subId = mSubInfoRecord.getSubscriptionId();
+                    mSubInfoRecord.setDisplayName(displayName);
+                    mSubscriptionManager.setDisplayName(displayName, subId,
+                            SubscriptionManager.NAME_SOURCE_USER_INPUT);
+                    Utils.findRecordBySubId(getActivity(), subId).setDisplayName(displayName);
+
+                    final int tintSelected = tintSpinner.getSelectedItemPosition();
+                    int subscriptionId = mSubInfoRecord.getSubscriptionId();
+                    int tint = mTintArr[tintSelected];
+                    mSubInfoRecord.setIconTint(tint);
+                    mSubscriptionManager.setIconTint(tint, subscriptionId);
+                    Utils.findRecordBySubId(getActivity(), subscriptionId).setIconTint(tint);
 
                     updateAllOptions();
                     update();
@@ -557,29 +404,88 @@
 
             builder.create().show();
         }
+
+        private class SelectColorAdapter extends ArrayAdapter<CharSequence> {
+            private Context mContext;
+            private int mResId;
+
+            public SelectColorAdapter(
+                Context context, int resource, String[] arr) {
+                super(context, resource, arr);
+                mContext = context;
+                mResId = resource;
+            }
+
+            @Override
+            public View getView(int position, View convertView, ViewGroup parent) {
+                LayoutInflater inflater = (LayoutInflater)
+                    mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+
+                View rowView;
+                final ViewHolder holder;
+                Resources res = getResources();
+                int iconSize = res.getDimensionPixelSize(R.dimen.color_swatch_size);
+                int strokeWidth = res.getDimensionPixelSize(R.dimen.color_swatch_stroke_width);
+
+                if (convertView == null) {
+                    // Cache views for faster scrolling
+                    rowView = inflater.inflate(mResId, null);
+                    holder = new ViewHolder();
+                    ShapeDrawable drawable = new ShapeDrawable(new OvalShape());
+                    drawable.setIntrinsicHeight(iconSize);
+                    drawable.setIntrinsicWidth(iconSize);
+                    drawable.getPaint().setStrokeWidth(strokeWidth);
+                    holder.label = (TextView) rowView.findViewById(R.id.color_text);
+                    holder.icon = (ImageView) rowView.findViewById(R.id.color_icon);
+                    holder.swatch = drawable;
+                    rowView.setTag(holder);
+                } else {
+                    rowView = convertView;
+                    holder = (ViewHolder) rowView.getTag();
+                }
+
+                holder.label.setText(getItem(position));
+                holder.swatch.getPaint().setColor(mTintArr[position]);
+                holder.swatch.getPaint().setStyle(Paint.Style.FILL_AND_STROKE);
+                holder.icon.setVisibility(View.VISIBLE);
+                holder.icon.setImageDrawable(holder.swatch);
+                return rowView;
+            }
+
+            @Override
+            public View getDropDownView(int position, View convertView, ViewGroup parent) {
+                View rowView = getView(position, convertView, parent);
+                final ViewHolder holder = (ViewHolder) rowView.getTag();
+
+                if (mTintSelectorPos == position) {
+                    holder.swatch.getPaint().setStyle(Paint.Style.FILL_AND_STROKE);
+                } else {
+                    holder.swatch.getPaint().setStyle(Paint.Style.STROKE);
+                }
+                holder.icon.setVisibility(View.VISIBLE);
+                return rowView;
+            }
+
+            private class ViewHolder {
+                TextView label;
+                ImageView icon;
+                ShapeDrawable swatch;
+            }
+        }
+
+
     }
 
-    /**
-     * Sort Subscription List in SIM Id, Subscription Id
-     * @param context The Context
-     * @return Sorted Subscription List or NULL if no activated Subscription
-     */
-    public static List<SubInfoRecord> getSortedSubInfoList(Context context) {
-        List<SubInfoRecord> infoList = SubscriptionManager.getActiveSubInfoList();
-        if (infoList != null) {
-            Collections.sort(infoList, new Comparator<SubInfoRecord>() {
+    // 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());
+    }
 
-                @Override
-                public int compare(SubInfoRecord arg0, SubInfoRecord arg1) {
-                    int flag = arg0.slotId - arg1.slotId;
-                    if (flag == 0) {
-                        return (int) (arg0.subId - arg1.subId);
-                    }
-                    return flag;
-                }
-            });
-        }
-        return infoList;
+    private void log(String s) {
+        Log.d(TAG, s);
     }
 
     /**
@@ -602,5 +508,4 @@
                     return result;
                 }
             };
-
 }
diff --git a/src/com/android/settings/tts/TtsEngineSettingsFragment.java b/src/com/android/settings/tts/TtsEngineSettingsFragment.java
index 2449353..542de41 100644
--- a/src/com/android/settings/tts/TtsEngineSettingsFragment.java
+++ b/src/com/android/settings/tts/TtsEngineSettingsFragment.java
@@ -22,7 +22,6 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Bundle;
-import android.preference.CheckBoxPreference;
 import android.preference.ListPreference;
 import android.preference.Preference;
 import android.preference.Preference.OnPreferenceChangeListener;
diff --git a/src/com/android/settings/users/AppRestrictionsFragment.java b/src/com/android/settings/users/AppRestrictionsFragment.java
index d717489..206ed95 100644
--- a/src/com/android/settings/users/AppRestrictionsFragment.java
+++ b/src/com/android/settings/users/AppRestrictionsFragment.java
@@ -32,9 +32,6 @@
 import android.content.pm.ResolveInfo;
 import android.content.res.Resources;
 import android.graphics.Bitmap;
-import android.graphics.ColorFilter;
-import android.graphics.ColorMatrix;
-import android.graphics.ColorMatrixColorFilter;
 import android.graphics.drawable.Drawable;
 import android.os.AsyncTask;
 import android.os.Bundle;
@@ -42,7 +39,6 @@
 import android.os.ServiceManager;
 import android.os.UserHandle;
 import android.os.UserManager;
-import android.preference.CheckBoxPreference;
 import android.preference.ListPreference;
 import android.preference.MultiSelectListPreference;
 import android.preference.Preference;
@@ -63,6 +59,7 @@
 
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.Utils;
 import com.android.settings.drawable.CircleFramedDrawable;
 
 import java.util.ArrayList;
@@ -648,75 +645,81 @@
         if (context == null) return;
         final PackageManager pm = mPackageManager;
         final IPackageManager ipm = mIPm;
+        final int userId = mUser.getIdentifier();
 
+        // Check if the user was removed in the meantime.
+        if (Utils.getExistingUser(mUserManager, mUser) == null) {
+            return;
+        }
         mAppList.removeAll();
         Intent restrictionsIntent = new Intent(Intent.ACTION_GET_RESTRICTION_ENTRIES);
         final List<ResolveInfo> receivers = pm.queryBroadcastReceivers(restrictionsIntent, 0);
         int i = 0;
-        if (mVisibleApps.size() > 0) {
-            for (SelectableAppInfo app : mVisibleApps) {
-                String packageName = app.packageName;
-                if (packageName == null) continue;
-                final boolean isSettingsApp = packageName.equals(context.getPackageName());
-                AppRestrictionsPreference p = new AppRestrictionsPreference(context, this);
-                final boolean hasSettings = resolveInfoListHasPackage(receivers, packageName);
-                p.setIcon(app.icon != null ? app.icon.mutate() : null);
-                p.setChecked(false);
-                p.setTitle(app.activityName);
-                if (app.masterEntry != null) {
-                    p.setSummary(context.getString(R.string.user_restrictions_controlled_by,
-                            app.masterEntry.activityName));
-                }
-                p.setKey(getKeyForPackage(packageName));
-                p.setSettingsEnabled((hasSettings || isSettingsApp) && app.masterEntry == null);
-                p.setPersistent(false);
-                p.setOnPreferenceChangeListener(this);
-                p.setOnPreferenceClickListener(this);
-                PackageInfo pi = null;
-                try {
-                    pi = ipm.getPackageInfo(packageName,
-                            PackageManager.GET_UNINSTALLED_PACKAGES
-                            | PackageManager.GET_SIGNATURES, mUser.getIdentifier());
-                } catch (RemoteException e) {
-                }
-                if (pi != null && (pi.requiredForAllUsers || isPlatformSigned(pi))) {
-                    p.setChecked(true);
-                    p.setImmutable(true);
-                    // If the app is required and has no restrictions, skip showing it
-                    if (!hasSettings && !isSettingsApp) continue;
-                    // Get and populate the defaults, since the user is not going to be
-                    // able to toggle this app ON (it's ON by default and immutable).
-                    // Only do this for restricted profiles, not single-user restrictions
-                    // Also don't do this for slave icons
-                    if (hasSettings && app.masterEntry == null) {
-                        requestRestrictionsForApp(packageName, p, false);
-                    }
-                } else if (!mNewUser && isAppEnabledForUser(pi)) {
-                    p.setChecked(true);
-                }
-                if (mRestrictedProfile
-                        && pi.requiredAccountType != null && pi.restrictedAccountType == null) {
-                    p.setChecked(false);
-                    p.setImmutable(true);
-                    p.setSummary(R.string.app_not_supported_in_limited);
-                }
-                if (mRestrictedProfile && pi.restrictedAccountType != null) {
-                    p.setSummary(R.string.app_sees_restricted_accounts);
-                }
-                if (app.masterEntry != null) {
-                    p.setImmutable(true);
-                    p.setChecked(mSelectedPackages.get(packageName));
-                }
-                mAppList.addPreference(p);
-                if (isSettingsApp) {
-                    p.setOrder(MAX_APP_RESTRICTIONS * 1);
-                } else {
-                    p.setOrder(MAX_APP_RESTRICTIONS * (i + 2));
-                }
-                mSelectedPackages.put(packageName, p.isChecked());
-                mAppListChanged = true;
-                i++;
+        for (SelectableAppInfo app : mVisibleApps) {
+            String packageName = app.packageName;
+            if (packageName == null) continue;
+            final boolean isSettingsApp = packageName.equals(context.getPackageName());
+            AppRestrictionsPreference p = new AppRestrictionsPreference(context, this);
+            final boolean hasSettings = resolveInfoListHasPackage(receivers, packageName);
+            p.setIcon(app.icon != null ? app.icon.mutate() : null);
+            p.setChecked(false);
+            p.setTitle(app.activityName);
+            if (app.masterEntry != null) {
+                p.setSummary(context.getString(R.string.user_restrictions_controlled_by,
+                        app.masterEntry.activityName));
             }
+            p.setKey(getKeyForPackage(packageName));
+            p.setSettingsEnabled((hasSettings || isSettingsApp) && app.masterEntry == null);
+            p.setPersistent(false);
+            p.setOnPreferenceChangeListener(this);
+            p.setOnPreferenceClickListener(this);
+            PackageInfo pi = null;
+            try {
+                pi = ipm.getPackageInfo(packageName,
+                        PackageManager.GET_UNINSTALLED_PACKAGES
+                        | PackageManager.GET_SIGNATURES, userId);
+            } catch (RemoteException e) {
+            }
+            if (pi == null) {
+                continue;
+            }
+            if (pi.requiredForAllUsers || isPlatformSigned(pi)) {
+                p.setChecked(true);
+                p.setImmutable(true);
+                // If the app is required and has no restrictions, skip showing it
+                if (!hasSettings && !isSettingsApp) continue;
+                // Get and populate the defaults, since the user is not going to be
+                // able to toggle this app ON (it's ON by default and immutable).
+                // Only do this for restricted profiles, not single-user restrictions
+                // Also don't do this for slave icons
+                if (hasSettings && app.masterEntry == null) {
+                    requestRestrictionsForApp(packageName, p, false);
+                }
+            } else if (!mNewUser && isAppEnabledForUser(pi)) {
+                p.setChecked(true);
+            }
+            if (mRestrictedProfile
+                    && pi.requiredAccountType != null && pi.restrictedAccountType == null) {
+                p.setChecked(false);
+                p.setImmutable(true);
+                p.setSummary(R.string.app_not_supported_in_limited);
+            }
+            if (mRestrictedProfile && pi.restrictedAccountType != null) {
+                p.setSummary(R.string.app_sees_restricted_accounts);
+            }
+            if (app.masterEntry != null) {
+                p.setImmutable(true);
+                p.setChecked(mSelectedPackages.get(packageName));
+            }
+            mAppList.addPreference(p);
+            if (isSettingsApp) {
+                p.setOrder(MAX_APP_RESTRICTIONS * 1);
+            } else {
+                p.setOrder(MAX_APP_RESTRICTIONS * (i + 2));
+            }
+            mSelectedPackages.put(packageName, p.isChecked());
+            mAppListChanged = true;
+            i++;
         }
         // If this is the first time for a new profile, install/uninstall default apps for profile
         // to avoid taking the hit in onPause(), which can cause race conditions on user switch.
@@ -950,10 +953,10 @@
             Preference p = null;
             switch (entry.getType()) {
             case RestrictionEntry.TYPE_BOOLEAN:
-                p = new CheckBoxPreference(context);
+                p = new SwitchPreference(context);
                 p.setTitle(entry.getTitle());
                 p.setSummary(entry.getDescription());
-                ((CheckBoxPreference)p).setChecked(entry.getSelectedState());
+                ((SwitchPreference)p).setChecked(entry.getSelectedState());
                 break;
             case RestrictionEntry.TYPE_CHOICE:
             case RestrictionEntry.TYPE_CHOICE_LEVEL:
diff --git a/src/com/android/settings/users/RestrictedProfileSettings.java b/src/com/android/settings/users/RestrictedProfileSettings.java
index 8db911c..c0e8cb7 100644
--- a/src/com/android/settings/users/RestrictedProfileSettings.java
+++ b/src/com/android/settings/users/RestrictedProfileSettings.java
@@ -87,7 +87,7 @@
         super.onResume();
 
         // Check if user still exists
-        UserInfo info = getExistingUser(mUser);
+        UserInfo info = Utils.getExistingUser(mUserManager, mUser);
         if (info == null) {
             finishFragment();
         } else {
@@ -97,16 +97,6 @@
         }
     }
 
-    private UserInfo getExistingUser(UserHandle thisUser) {
-        final List<UserInfo> users = mUserManager.getUsers(true); // Only get non-dying
-        for (UserInfo user : users) {
-            if (user.id == thisUser.getIdentifier()) {
-                return user;
-            }
-        }
-        return null;
-    }
-
     @Override
     public void startActivityForResult(Intent intent, int requestCode) {
         mEditUserInfoController.startingActivityForResult();
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/voice/VoiceInputPreference.java b/src/com/android/settings/voice/VoiceInputPreference.java
index 0ebffbb..38ef0ca 100644
--- a/src/com/android/settings/voice/VoiceInputPreference.java
+++ b/src/com/android/settings/voice/VoiceInputPreference.java
@@ -110,7 +110,9 @@
         textLayout.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                onRadioButtonClicked(rb, !rb.isChecked());
+                if (!rb.isChecked()) {
+                    onRadioButtonClicked(rb, true);
+                }
             }
         });
 
@@ -216,6 +218,7 @@
         mSharedState.setCurrentKey(getKey());
         updateCheckedState(true);
         callChangeListener(mSharedState.getCurrentKey());
+        current.setChecked(true);
     }
 
     /**
diff --git a/src/com/android/settings/wfd/WifiDisplaySettings.java b/src/com/android/settings/wfd/WifiDisplaySettings.java
index c3f22a7..fdaa042 100755
--- a/src/com/android/settings/wfd/WifiDisplaySettings.java
+++ b/src/com/android/settings/wfd/WifiDisplaySettings.java
@@ -39,12 +39,12 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
-import android.preference.CheckBoxPreference;
 import android.preference.ListPreference;
 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.Slog;
 import android.util.TypedValue;
@@ -360,7 +360,7 @@
         }
 
         // switch for Listen Mode
-        CheckBoxPreference cbp = new CheckBoxPreference(getActivity()) {
+        SwitchPreference pref = new SwitchPreference(getActivity()) {
             @Override
             protected void onClick() {
                 mListen = !mListen;
@@ -368,12 +368,12 @@
                 setChecked(mListen);
             }
         };
-        cbp.setTitle(R.string.wifi_display_listen_mode);
-        cbp.setChecked(mListen);
-        mCertCategory.addPreference(cbp);
+        pref.setTitle(R.string.wifi_display_listen_mode);
+        pref.setChecked(mListen);
+        mCertCategory.addPreference(pref);
 
         // switch for Autonomous GO
-        cbp = new CheckBoxPreference(getActivity()) {
+        pref = new SwitchPreference(getActivity()) {
             @Override
             protected void onClick() {
                 mAutoGO = !mAutoGO;
@@ -385,9 +385,9 @@
                 setChecked(mAutoGO);
             }
         };
-        cbp.setTitle(R.string.wifi_display_autonomous_go);
-        cbp.setChecked(mAutoGO);
-        mCertCategory.addPreference(cbp);
+        pref.setTitle(R.string.wifi_display_autonomous_go);
+        pref.setChecked(mAutoGO);
+        mCertCategory.addPreference(pref);
 
         // Drop down list for choosing WPS method (PBC/KEYPAD/DISPLAY)
         ListPreference lp = new ListPreference(getActivity()) {
diff --git a/src/com/android/settings/wifi/AccessPoint.java b/src/com/android/settings/wifi/AccessPoint.java
index 8e71819..1bf1a5c 100644
--- a/src/com/android/settings/wifi/AccessPoint.java
+++ b/src/com/android/settings/wifi/AccessPoint.java
@@ -21,7 +21,9 @@
 import android.content.Context;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.StateListDrawable;
+import android.net.NetworkInfo;
 import android.net.NetworkInfo.DetailedState;
+import android.net.NetworkInfo.State;
 import android.net.wifi.ScanResult;
 import android.net.wifi.WifiConfiguration;
 import android.net.wifi.WifiConfiguration.KeyMgmt;
@@ -70,7 +72,7 @@
     public LruCache<String, ScanResult> mScanResultCache;
 
 
-    private static final String KEY_DETAILEDSTATE = "key_detailedstate";
+    private static final String KEY_NETWORKINFO = "key_networkinfo";
     private static final String KEY_WIFIINFO = "key_wifiinfo";
     private static final String KEY_SCANRESULT = "key_scanresult";
     private static final String KEY_CONFIG = "key_config";
@@ -113,7 +115,8 @@
     private long mSeen = 0;
 
     private WifiInfo mInfo;
-    private DetailedState mState;
+    private NetworkInfo mNetworkInfo;
+    private TextView mSummaryView;
 
     private static final int VISIBILITY_MAX_AGE_IN_MILLI = 1000000;
     private static final int VISIBILITY_OUTDATED_AGE_IN_MILLI = 20000;
@@ -211,18 +214,18 @@
             loadResult(mScanResult);
         }
         mInfo = (WifiInfo) savedState.getParcelable(KEY_WIFIINFO);
-        if (savedState.containsKey(KEY_DETAILEDSTATE)) {
-            mState = DetailedState.valueOf(savedState.getString(KEY_DETAILEDSTATE));
+        if (savedState.containsKey(KEY_NETWORKINFO)) {
+            mNetworkInfo = savedState.getParcelable(KEY_NETWORKINFO);
         }
-        update(mInfo, mState);
+        update(mInfo, mNetworkInfo);
     }
 
     public void saveWifiState(Bundle savedState) {
         savedState.putParcelable(KEY_CONFIG, mConfig);
         savedState.putParcelable(KEY_SCANRESULT, mScanResult);
         savedState.putParcelable(KEY_WIFIINFO, mInfo);
-        if (mState != null) {
-            savedState.putString(KEY_DETAILEDSTATE, mState.toString());
+        if (mNetworkInfo != null) {
+            savedState.putParcelable(KEY_NETWORKINFO, mNetworkInfo);
         }
     }
 
@@ -253,9 +256,8 @@
         super.onBindView(view);
         updateIcon(getLevel(), getContext());
 
-        final TextView summaryView = (TextView) view.findViewById(
-                com.android.internal.R.id.summary);
-        summaryView.setVisibility(showSummary ? View.VISIBLE : View.GONE);
+        mSummaryView = (TextView) view.findViewById(com.android.internal.R.id.summary);
+        mSummaryView.setVisibility(showSummary ? View.VISIBLE : View.GONE);
 
         notifyChanged();
     }
@@ -293,13 +295,12 @@
         }
         AccessPoint other = (AccessPoint) preference;
         // Active one goes first.
-        if (mInfo != null && other.mInfo == null) return -1;
-        if (mInfo == null && other.mInfo != null) return 1;
+        if (isActive() && !other.isActive()) return -1;
+        if (!isActive() && other.isActive()) return 1;
 
         // Reachable one goes before unreachable one.
         if (mRssi != Integer.MAX_VALUE && other.mRssi == Integer.MAX_VALUE) return -1;
         if (mRssi == Integer.MAX_VALUE && other.mRssi != Integer.MAX_VALUE) return 1;
-        if (mRssi == Integer.MAX_VALUE && other.mRssi != Integer.MAX_VALUE) return 1;
 
         // Configured one goes before unconfigured one.
         if (networkId != WifiConfiguration.INVALID_NETWORK_ID
@@ -362,19 +363,30 @@
         return false;
     }
 
-    void update(WifiInfo info, DetailedState state) {
+    /** Return whether the given {@link WifiInfo} is for this access point. */
+    private boolean isInfoForThisAccessPoint(WifiInfo info) {
+        if (networkId != WifiConfiguration.INVALID_NETWORK_ID) {
+            return networkId == info.getNetworkId();
+        } else {
+            // Might be an ephemeral connection with no WifiConfiguration. Try matching on SSID.
+            // (Note that we only do this if the WifiConfiguration explicitly equals INVALID).
+            // TODO: Handle hex string SSIDs.
+            return ssid.equals(removeDoubleQuotes(info.getSSID()));
+        }
+    }
+
+    void update(WifiInfo info, NetworkInfo networkInfo) {
         boolean reorder = false;
-        if (info != null && networkId != WifiConfiguration.INVALID_NETWORK_ID
-                && networkId == info.getNetworkId()) {
+        if (info != null && isInfoForThisAccessPoint(info)) {
             reorder = (mInfo == null);
             mRssi = info.getRssi();
             mInfo = info;
-            mState = state;
+            mNetworkInfo = networkInfo;
             refresh();
         } else if (mInfo != null) {
             reorder = true;
             mInfo = null;
-            mState = null;
+            mNetworkInfo = null;
             refresh();
         }
         if (reorder) {
@@ -397,8 +409,12 @@
         return mInfo;
     }
 
+    NetworkInfo getNetworkInfo() {
+        return mNetworkInfo;
+    }
+
     DetailedState getState() {
-        return mState;
+        return mNetworkInfo != null ? mNetworkInfo.getDetailedState() : null;
     }
 
     static String removeDoubleQuotes(String string) {
@@ -419,8 +435,11 @@
      *
      * @param showSummary true will show the summary, false will hide the summary
      */
-    public void setShowSummary(boolean showSummary){
+    public void setShowSummary(boolean showSummary) {
         this.showSummary = showSummary;
+        if (mSummaryView != null) {
+            mSummaryView.setVisibility(showSummary ? View.VISIBLE : View.GONE);
+        } // otherwise, will be handled in onBindView.
     }
 
     /**
@@ -444,9 +463,10 @@
             if (bssid != null) {
                 visibility.append(" ").append(bssid);
             }
-            visibility.append(" score=").append(mInfo.score);
+            visibility.append(" rssi=").append(mInfo.getRssi());
             visibility.append(" ");
-            visibility.append(String.format("tx=%.1f,", mInfo.txSuccessRate));
+            visibility.append(" score=").append(mInfo.score);
+            visibility.append(String.format(" tx=%.1f,", mInfo.txSuccessRate));
             visibility.append(String.format("%.1f,", mInfo.txRetriesRate));
             visibility.append(String.format("%.1f ", mInfo.txBadRate));
             visibility.append(String.format("rx=%.1f", mInfo.rxSuccessRate));
@@ -490,7 +510,7 @@
                     }
                     if (n5 < 4) {
                         if (scans5GHz == null) scans5GHz = new StringBuilder();
-                        scans5GHz.append(" {").append(result.BSSID);
+                        scans5GHz.append(" \n{").append(result.BSSID);
                         if (bssid != null && result.BSSID.equals(bssid)) scans5GHz.append("*");
                         scans5GHz.append("=").append(result.frequency);
                         scans5GHz.append(",").append(result.level);
@@ -510,7 +530,7 @@
                     }
                     if (n24 < 4) {
                         if (scans24GHz == null) scans24GHz = new StringBuilder();
-                        scans24GHz.append(" {").append(result.BSSID);
+                        scans24GHz.append(" \n{").append(result.BSSID);
                         if (bssid != null && result.BSSID.equals(bssid)) scans24GHz.append("*");
                         scans24GHz.append("=").append(result.frequency);
                         scans24GHz.append(",").append(result.level);
@@ -571,6 +591,17 @@
     }
 
     /**
+     * Return whether this is the active connection.
+     * For ephemeral connections (networkId is invalid), this returns false if the network is
+     * disconnected.
+     */
+    boolean isActive() {
+        return mNetworkInfo != null &&
+                (networkId != WifiConfiguration.INVALID_NETWORK_ID ||
+                 mNetworkInfo.getState() != State.DISCONNECTED);
+    }
+
+    /**
      * Updates the title and summary; may indirectly call notifyChanged().
      */
     private void refresh() {
@@ -585,8 +616,12 @@
         // Update to new summary
         StringBuilder summary = new StringBuilder();
 
-        if (mState != null) { // This is the active connection
-            summary.append(Summary.get(context, mState));
+        if (isActive()) { // This is the active connection
+            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));
         } else if (mConfig != null && ((mConfig.status == WifiConfiguration.Status.DISABLED &&
                 mConfig.disableReason != WifiConfiguration.DISABLED_UNKNOWN_REASON)
                || mConfig.autoJoinStatus
@@ -595,8 +630,10 @@
                     >= WifiConfiguration.AUTO_JOIN_DISABLED_ON_AUTH_FAILURE) {
                 if (mConfig.disableReason == WifiConfiguration.DISABLED_DHCP_FAILURE) {
                     summary.append(context.getString(R.string.wifi_disabled_network_failure));
-                } else {
+                } else if (mConfig.disableReason == WifiConfiguration.DISABLED_AUTH_FAILURE) {
                     summary.append(context.getString(R.string.wifi_disabled_password_failure));
+                } else {
+                    summary.append(context.getString(R.string.wifi_disabled_wifi_failure));
                 }
             } else {
                 switch (mConfig.disableReason) {
@@ -622,10 +659,10 @@
         }
 
         if (WifiSettings.mVerboseLogging > 0) {
-            //add RSSI/band information for this config, what was seen up to 6 seconds ago
-            //verbose WiFi Logging is only turned on thru developers settings
-            if (mInfo != null && mState != null) { // This is the active connection
-                summary.append(" (f=" + Integer.toString(mInfo.getFrequency()) + ")");
+            // Add RSSI/band information for this config, what was seen up to 6 seconds ago
+            // verbose WiFi Logging is only turned on thru developers settings
+            if (mInfo != null && mNetworkInfo != null) { // This is the active connection
+                summary.append(" f=" + Integer.toString(mInfo.getFrequency()));
             }
             summary.append(" " + getVisibilityStatus());
             if (mConfig != null && mConfig.autoJoinStatus > 0) {
@@ -643,12 +680,25 @@
                 }
                 summary.append(")");
             }
+            if (mConfig != null && mConfig.numIpConfigFailures > 0) {
+                summary.append(" ipf=").append(mConfig.numIpConfigFailures);
+            }
+            if (mConfig != null && mConfig.numConnectionFailures > 0) {
+                summary.append(" cf=").append(mConfig.numConnectionFailures);
+            }
+            if (mConfig != null && mConfig.numAuthFailures > 0) {
+                summary.append(" authf=").append(mConfig.numAuthFailures);
+            }
+            if (mConfig != null && mConfig.numNoInternetAccessReports > 0) {
+                summary.append(" noInt=").append(mConfig.numNoInternetAccessReports);
+            }
         }
 
         if (summary.length() > 0) {
             setSummary(summary.toString());
+            setShowSummary(true);
         } else {
-            showSummary = false;
+            setShowSummary(false);
         }
     }
 
diff --git a/src/com/android/settings/wifi/AdvancedWifiSettings.java b/src/com/android/settings/wifi/AdvancedWifiSettings.java
index bda13ff..ac93c2e 100644
--- a/src/com/android/settings/wifi/AdvancedWifiSettings.java
+++ b/src/com/android/settings/wifi/AdvancedWifiSettings.java
@@ -29,7 +29,7 @@
 import android.net.wifi.WifiManager;
 import android.net.wifi.WpsInfo;
 import android.os.Bundle;
-import android.preference.CheckBoxPreference;
+import android.os.UserHandle;
 import android.preference.ListPreference;
 import android.preference.Preference;
 import android.preference.Preference.OnPreferenceClickListener;
@@ -42,6 +42,7 @@
 import android.util.Log;
 import android.widget.Toast;
 
+import com.android.settings.AppListSwitchPreference;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.Utils;
@@ -66,6 +67,7 @@
 
     private WifiManager mWifiManager;
     private NetworkScoreManager mNetworkScoreManager;
+    private AppListSwitchPreference mWifiAssistantPreference;
 
     private IntentFilter mFilter;
     private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
@@ -130,18 +132,14 @@
         pref.setIntent(intent);
 
         final Context context = getActivity();
-        NetworkScorerAppData scorer = WifiSettings.getWifiAssistantApp(context);
-        SwitchPreference wifiAssistant = (SwitchPreference)findPreference(KEY_WIFI_ASSISTANT);
-        if (scorer != null) {
-            final boolean checked = NetworkScorerAppManager.getActiveScorer(context) != null;
-            wifiAssistant.setSummary(getResources().getString(
-                    R.string.wifi_automatically_manage_summary, scorer.mScorerName));
-            wifiAssistant.setOnPreferenceChangeListener(this);
-            wifiAssistant.setChecked(checked);
-        } else {
-            if (wifiAssistant != null) {
-                getPreferenceScreen().removePreference(wifiAssistant);
-            }
+        mWifiAssistantPreference = (AppListSwitchPreference) findPreference(KEY_WIFI_ASSISTANT);
+        Collection<NetworkScorerAppData> scorers =
+                NetworkScorerAppManager.getAllValidScorers(context);
+        if (UserHandle.myUserId() == UserHandle.USER_OWNER && !scorers.isEmpty()) {
+            mWifiAssistantPreference.setOnPreferenceChangeListener(this);
+            initWifiAssistantPreference(scorers);
+        } else if (mWifiAssistantPreference != null) {
+            getPreferenceScreen().removePreference(mWifiAssistantPreference);
         }
 
         Intent wifiDirectIntent = new Intent(context,
@@ -202,6 +200,18 @@
         }
     }
 
+    private void initWifiAssistantPreference(Collection<NetworkScorerAppData> scorers) {
+        int count = scorers.size();
+        String[] packageNames = new String[count];
+        int i = 0;
+        for (NetworkScorerAppData scorer : scorers) {
+            packageNames[i] = scorer.mPackageName;
+            i++;
+        }
+        mWifiAssistantPreference.setPackageNames(packageNames,
+                mNetworkScoreManager.getActiveScorerPackage());
+    }
+
     private void updateSleepPolicySummary(Preference sleepPolicyPref, String value) {
         if (value != null) {
             String[] values = getResources().getStringArray(R.array.wifi_sleep_policy_values);
@@ -261,12 +271,13 @@
                 return false;
             }
         } else if (KEY_WIFI_ASSISTANT.equals(key)) {
-            if (((Boolean)newValue).booleanValue() == false) {
+            NetworkScorerAppData wifiAssistant =
+                    NetworkScorerAppManager.getScorer(context, (String) newValue);
+            if (wifiAssistant == null) {
                 mNetworkScoreManager.setActiveScorer(null);
                 return true;
             }
 
-            NetworkScorerAppData wifiAssistant = WifiSettings.getWifiAssistantApp(context);
             Intent intent = new Intent();
             if (wifiAssistant.mConfigurationActivityClassName != null) {
                 // App has a custom configuration activity; launch that.
@@ -282,6 +293,9 @@
             }
 
             startActivity(intent);
+            // Don't update the preference widget state until the child activity returns.
+            // It will be updated in onResume after the activity finishes.
+            return false;
         }
 
         if (KEY_SLEEP_POLICY.equals(key)) {
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/WifiApEnabler.java b/src/com/android/settings/wifi/WifiApEnabler.java
index fc34f3b..6aecf1f 100644
--- a/src/com/android/settings/wifi/WifiApEnabler.java
+++ b/src/com/android/settings/wifi/WifiApEnabler.java
@@ -68,15 +68,16 @@
             } else if (Intent.ACTION_AIRPLANE_MODE_CHANGED.equals(action)) {
                 enableWifiSwitch();
             }
-
         }
     };
 
     public WifiApEnabler(Context context, SwitchPreference switchPreference) {
         mContext = context;
         mSwitch = switchPreference;
-        mOriginalSummary = switchPreference.getSummary();
-        switchPreference.setPersistent(false);
+        mOriginalSummary = switchPreference != null ? switchPreference.getSummary() : "";
+        if (switchPreference != null) {
+            switchPreference.setPersistent(false);
+        }
 
         mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
         mCm = (ConnectivityManager)mContext.getSystemService(Context.CONNECTIVITY_SERVICE);
@@ -121,10 +122,14 @@
         }
 
         if (mWifiManager.setWifiApEnabled(null, enable)) {
-            /* Disable here, enabled on receiving success broadcast */
-            mSwitch.setEnabled(false);
+            if (mSwitch != null) {
+                /* Disable here, enabled on receiving success broadcast */
+                mSwitch.setEnabled(false);
+            }
         } else {
-            mSwitch.setSummary(R.string.wifi_error);
+            if (mSwitch != null) {
+                mSwitch.setSummary(R.string.wifi_error);
+            }
         }
 
         /**
@@ -194,6 +199,7 @@
                 break;
             case WifiManager.WIFI_AP_STATE_DISABLING:
                 mSwitch.setSummary(R.string.wifi_tether_stopping);
+                mSwitch.setChecked(false);
                 mSwitch.setEnabled(false);
                 break;
             case WifiManager.WIFI_AP_STATE_DISABLED:
diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java
index e6dd9c7..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,14 +302,15 @@
                     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));
                 }
             }
         }
 
-        if (mEdit || (mAccessPoint.getState() == null && mAccessPoint.getLevel() != -1)){
+        if ((mEdit) || (mAccessPoint != null
+                && mAccessPoint.getState() == null && mAccessPoint.getLevel() != -1)){
             mConfigUi.setCancelButton(res.getString(R.string.wifi_cancel));
         }else{
             mConfigUi.setCancelButton(res.getString(R.string.wifi_display_options_done));
diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index 6c58bc1..ac53eed 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -27,22 +27,19 @@
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.content.SharedPreferences;
 import android.content.res.Resources;
 import android.content.res.TypedArray;
 import android.location.LocationManager;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.net.NetworkInfo.DetailedState;
-import android.net.NetworkScoreManager;
-import android.net.NetworkScorerAppManager;
-import android.net.NetworkScorerAppManager.NetworkScorerAppData;
+import android.net.NetworkInfo.State;
 import android.net.wifi.ScanResult;
 import android.net.wifi.WifiConfiguration;
 import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
 import android.net.wifi.WpsInfo;
-import android.os.Build;
+import android.nfc.NfcAdapter;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
@@ -52,14 +49,11 @@
 import android.util.Log;
 import android.view.ContextMenu;
 import android.view.ContextMenu.ContextMenuInfo;
-import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
-import android.view.View.OnClickListener;
 import android.widget.AdapterView.AdapterContextMenuInfo;
-import android.widget.Button;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -90,8 +84,6 @@
 
     private static final String TAG = "WifiSettings";
 
-    private static final int REQUEST_ENABLE_WIFI_ASSISTANT = 1;
-
     /* package */ static final int MENU_ID_WPS_PBC = Menu.FIRST;
     private static final int MENU_ID_WPS_PIN = Menu.FIRST + 1;
     private static final int MENU_ID_SAVED_NETWORK = Menu.FIRST + 2;
@@ -103,8 +95,6 @@
     private static final int MENU_ID_MODIFY = Menu.FIRST + 8;
     private static final int MENU_ID_WRITE_NFC = Menu.FIRST + 9;
 
-    private static final String KEY_ASSISTANT_DISMISS_PLATFORM = "assistant_dismiss_platform";
-
     public static final int WIFI_DIALOG_ID = 1;
     /* package */ static final int WPS_PBC_DIALOG_ID = 2;
     private static final int WPS_PIN_DIALOG_ID = 3;
@@ -132,7 +122,7 @@
     // An access point being editted is stored here.
     private AccessPoint mSelectedAccessPoint;
 
-    private DetailedState mLastState;
+    private NetworkInfo mLastNetworkInfo;
     private WifiInfo mLastInfo;
 
     private final AtomicBoolean mConnected = new AtomicBoolean(false);
@@ -145,6 +135,9 @@
     // this boolean extra specifies whether to disable the Next button when not connected. Used by
     // account creation outside of setup wizard.
     private static final String EXTRA_ENABLE_NEXT_ON_CONNECT = "wifi_enable_next_on_connect";
+    // This string extra specifies a network to open the connect dialog on, so the user can enter
+    // network credentials.  This is used by quick settings for secured networks.
+    private static final String EXTRA_START_CONNECT_SSID = "wifi_start_connect_ssid";
 
     // should Next button only be enabled when we have a connection?
     private boolean mEnableNextOnConnection;
@@ -153,8 +146,6 @@
     private boolean mDlgEdit;
     private AccessPoint mDlgAccessPoint;
     private Bundle mAccessPointSavedState;
-    private View mWifiAssistantCard;
-    private NetworkScorerAppData mWifiAssistantApp;
 
     /** verbose logging flag. this flag is set thru developer debugging options
      * and used so as to assist with in-the-field WiFi connectivity debugging  */
@@ -321,23 +312,25 @@
 
         addPreferencesFromResource(R.xml.wifi_settings);
 
-        prepareWifiAssistantCard();
-
         mEmptyView = initEmptyView();
         registerForContextMenu(getListView());
         setHasOptionsMenu(true);
-    }
 
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent resultData) {
-        if (requestCode == REQUEST_ENABLE_WIFI_ASSISTANT) {
-            if (resultCode == Activity.RESULT_OK) {
-                disableWifiAssistantCardUntilPlatformUpgrade();
-                getListView().removeHeaderView(mWifiAssistantCard);
-                mWifiAssistantApp = null;
+        if (intent.hasExtra(EXTRA_START_CONNECT_SSID)) {
+            String ssid = intent.getStringExtra(EXTRA_START_CONNECT_SSID);
+            updateAccessPoints();
+            PreferenceScreen preferenceScreen = getPreferenceScreen();
+            for (int i = 0; i < preferenceScreen.getPreferenceCount(); i++) {
+                Preference preference = preferenceScreen.getPreference(i);
+                if (preference instanceof AccessPoint) {
+                    AccessPoint accessPoint = (AccessPoint) preference;
+                    if (ssid.equals(accessPoint.ssid) && accessPoint.networkId == -1
+                            && accessPoint.security != AccessPoint.SECURITY_NONE) {
+                        onPreferenceTreeClick(preferenceScreen, preference);
+                        break;
+                    }
+                }
             }
-        } else {
-            super.onActivityResult(requestCode, resultCode, resultData);
         }
     }
 
@@ -509,17 +502,27 @@
             if (preference instanceof AccessPoint) {
                 mSelectedAccessPoint = (AccessPoint) preference;
                 menu.setHeaderTitle(mSelectedAccessPoint.ssid);
-                if (mSelectedAccessPoint.getLevel() != -1
-                        && mSelectedAccessPoint.getState() == null) {
-                    menu.add(Menu.NONE, MENU_ID_CONNECT, 0, R.string.wifi_menu_connect);
+                if (mSelectedAccessPoint.getLevel() != -1) {
+                    if (mSelectedAccessPoint.getState() == null) {
+                        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) {
+                    NfcAdapter nfcAdapter = NfcAdapter.getNfcAdapter(getActivity());
+                    if (nfcAdapter != null && nfcAdapter.isEnabled() &&
+                            mSelectedAccessPoint.security != AccessPoint.SECURITY_NONE) {
                         // Only allow writing of NFC tags for password-protected networks.
                         menu.add(Menu.NONE, MENU_ID_WRITE_NFC, 0, R.string.wifi_menu_write_to_nfc);
                     }
@@ -547,7 +550,7 @@
                 return true;
             }
             case MENU_ID_FORGET: {
-                mWifiManager.forget(mSelectedAccessPoint.networkId, mForgetListener);
+                forget();
                 return true;
             }
             case MENU_ID_MODIFY: {
@@ -566,9 +569,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;
@@ -651,17 +655,13 @@
             case WifiManager.WIFI_STATE_ENABLED:
                 // AccessPoints are automatically sorted with TreeSet.
                 final Collection<AccessPoint> accessPoints =
-                        constructAccessPoints(getActivity(), mWifiManager, mLastInfo, mLastState);
+                        constructAccessPoints(getActivity(), mWifiManager, mLastInfo,
+                                mLastNetworkInfo);
                 getPreferenceScreen().removeAll();
                 if (accessPoints.size() == 0) {
                     addMessagePreference(R.string.wifi_empty_list_wifi_on);
                 }
 
-                getListView().removeHeaderView(mWifiAssistantCard);
-                if (mWifiAssistantApp != null) {
-                    getListView().addHeaderView(mWifiAssistantCard);
-                }
-
                 for (AccessPoint accessPoint : accessPoints) {
                     // Ignore access points that are out of range.
                     if (accessPoint.getLevel() != -1) {
@@ -684,102 +684,6 @@
         }
     }
 
-    /**
-     * Returns the Network Scorer for the Wifi Assistant App.
-     */
-    public static NetworkScorerAppData getWifiAssistantApp(Context context) {
-        Collection<NetworkScorerAppData> scorers =
-                NetworkScorerAppManager.getAllValidScorers(context);
-
-        if (scorers.isEmpty()) {
-            return null;
-        }
-
-        // TODO: b/13780935 - Implement proper scorer selection. Rather than pick the first
-        // scorer on the system, we should allow the user to select one.
-        return scorers.iterator().next();
-    }
-
-    private void prepareWifiAssistantCard() {
-        if (getActivity() instanceof WifiPickerActivity) {
-            return;
-        }
-
-        if (NetworkScorerAppManager.getActiveScorer(getActivity()) != null) {
-            // A scorer is already enabled; don't show the card.
-            return;
-        }
-
-        Collection<NetworkScorerAppData> scorers =
-                NetworkScorerAppManager.getAllValidScorers(getActivity());
-        if (scorers.isEmpty()) {
-            // No scorers are available to enable; don't show the card.
-            return;
-        }
-
-        SharedPreferences sharedPreferences = getPreferenceScreen().getSharedPreferences();
-        int lastDismissPlatform = sharedPreferences.getInt(KEY_ASSISTANT_DISMISS_PLATFORM, 0);
-
-        if (Build.VERSION.SDK_INT <= lastDismissPlatform) {
-            // User has dismissed the Wi-Fi assistant card on this SDK release. Suppress the card
-            // until the next major platform upgrade.
-            return;
-        }
-
-        // TODO: b/13780935 - Implement proper scorer selection. Rather than pick the first
-        // scorer on the system, we should allow the user to select one.
-        mWifiAssistantApp = scorers.iterator().next();
-
-        if (mWifiAssistantCard == null) {
-            mWifiAssistantCard = LayoutInflater.from(getActivity())
-                    .inflate(R.layout.wifi_assistant_card, getListView(), false);
-            Button setup = (Button) mWifiAssistantCard.findViewById(R.id.setup);
-            Button noThanks = (Button) mWifiAssistantCard.findViewById(R.id.no_thanks_button);
-            TextView assistantText =
-                (TextView) mWifiAssistantCard.findViewById(R.id.wifi_assistant_text);
-            assistantText.setText(getResources().getString(
-                    R.string.wifi_assistant_title_message, mWifiAssistantApp.mScorerName));
-
-            if (setup != null && noThanks != null) {
-                setup.setOnClickListener(new OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        Intent intent = new Intent();
-                        if (mWifiAssistantApp.mConfigurationActivityClassName != null) {
-                            // App has a custom configuration activity; launch that.
-                            // This custom activity will be responsible for launching the system
-                            // dialog.
-                            intent.setClassName(mWifiAssistantApp.mPackageName,
-                                    mWifiAssistantApp.mConfigurationActivityClassName);
-                        } else {
-                            // Fall back on the system dialog.
-                            intent.setAction(NetworkScoreManager.ACTION_CHANGE_ACTIVE);
-                            intent.putExtra(NetworkScoreManager.EXTRA_PACKAGE_NAME,
-                                    mWifiAssistantApp.mPackageName);
-                        }
-                        startActivityForResult(intent, REQUEST_ENABLE_WIFI_ASSISTANT);
-                    }
-                });
-
-                noThanks.setOnClickListener(new OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        disableWifiAssistantCardUntilPlatformUpgrade();
-                        getListView().removeHeaderView(mWifiAssistantCard);
-                        mWifiAssistantApp = null;
-                    }
-                });
-            }
-        }
-    }
-
-    private void disableWifiAssistantCardUntilPlatformUpgrade() {
-        SharedPreferences sharedPreferences = getPreferenceScreen().getSharedPreferences();
-        SharedPreferences.Editor editor = sharedPreferences.edit();
-        editor.putInt(KEY_ASSISTANT_DISMISS_PLATFORM, Build.VERSION.SDK_INT);
-        editor.apply();
-    }
-
     protected TextView initEmptyView() {
         TextView emptyView = (TextView) getActivity().findViewById(android.R.id.empty);
         getListView().setEmptyView(emptyView);
@@ -813,7 +717,7 @@
 
     /** Returns sorted list of access points */
     private static List<AccessPoint> constructAccessPoints(Context context,
-            WifiManager wifiManager, WifiInfo lastInfo, DetailedState lastState) {
+            WifiManager wifiManager, WifiInfo lastInfo, NetworkInfo lastNetworkInfo) {
         ArrayList<AccessPoint> accessPoints = new ArrayList<AccessPoint>();
         /** Lookup table to more quickly update AccessPoints by only considering objects with the
          * correct SSID.  Maps SSID -> List of AccessPoints with the given SSID.  */
@@ -833,8 +737,8 @@
                     continue;
                 }
                 AccessPoint accessPoint = new AccessPoint(context, config);
-                if (lastInfo != null && lastState != null) {
-                    accessPoint.update(lastInfo, lastState);
+                if (lastInfo != null && lastNetworkInfo != null) {
+                    accessPoint.update(lastInfo, lastNetworkInfo);
                 }
                 accessPoints.add(accessPoint);
                 apMap.put(accessPoint.ssid, accessPoint);
@@ -857,6 +761,9 @@
                 }
                 if (!found) {
                     AccessPoint accessPoint = new AccessPoint(context, result);
+                    if (lastInfo != null && lastNetworkInfo != null) {
+                        accessPoint.update(lastInfo, lastNetworkInfo);
+                    }
                     accessPoints.add(accessPoint);
                     apMap.put(accessPoint.ssid, accessPoint);
                 }
@@ -883,28 +790,29 @@
             mConnected.set(info.isConnected());
             changeNextButtonState(info.isConnected());
             updateAccessPoints();
-            updateConnectionState(info.getDetailedState());
+            updateNetworkInfo(info);
         } else if (WifiManager.RSSI_CHANGED_ACTION.equals(action)) {
-            updateConnectionState(null);
+            updateNetworkInfo(null);
         }
     }
 
-    private void updateConnectionState(DetailedState state) {
+    private void updateNetworkInfo(NetworkInfo networkInfo) {
         /* sticky broadcasts can call this when wifi is disabled */
         if (!mWifiManager.isWifiEnabled()) {
             mScanner.pause();
             return;
         }
 
-        if (state == DetailedState.OBTAINING_IPADDR) {
+        if (networkInfo != null &&
+                networkInfo.getDetailedState() == DetailedState.OBTAINING_IPADDR) {
             mScanner.pause();
         } else {
             mScanner.resume();
         }
 
         mLastInfo = mWifiManager.getConnectionInfo();
-        if (state != null) {
-            mLastState = state;
+        if (networkInfo != null) {
+            mLastNetworkInfo = networkInfo;
         }
 
         for (int i = getPreferenceScreen().getPreferenceCount() - 1; i >= 0; --i) {
@@ -912,7 +820,7 @@
             Preference preference = getPreferenceScreen().getPreference(i);
             if (preference instanceof AccessPoint) {
                 final AccessPoint accessPoint = (AccessPoint) preference;
-                accessPoint.update(mLastInfo, mLastState);
+                accessPoint.update(mLastInfo, mLastNetworkInfo);
             }
         }
     }
@@ -938,7 +846,7 @@
         }
 
         mLastInfo = null;
-        mLastState = null;
+        mLastNetworkInfo = null;
         mScanner.pause();
     }
 
@@ -994,12 +902,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/WifiSetupActivity.java b/src/com/android/settings/wifi/WifiSetupActivity.java
index a87c733..a60945f 100644
--- a/src/com/android/settings/wifi/WifiSetupActivity.java
+++ b/src/com/android/settings/wifi/WifiSetupActivity.java
@@ -25,7 +25,6 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.res.Resources;
-import android.graphics.Color;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.net.wifi.WifiManager;
@@ -35,6 +34,7 @@
 
 import com.android.settings.ButtonBarHandler;
 import com.android.settings.R;
+import com.android.settings.SetupWizardUtils;
 import com.android.setupwizard.navigationbar.SetupWizardNavBar;
 import com.android.setupwizard.navigationbar.SetupWizardNavBar.NavigationBarListener;
 
@@ -42,40 +42,31 @@
         implements ButtonBarHandler, NavigationBarListener {
     private static final String TAG = "WifiSetupActivity";
 
-    private static final String EXTRA_ALLOW_SKIP = "allowSkip";
-    private static final String EXTRA_USE_IMMERSIVE_MODE = "useImmersiveMode";
-
     // this boolean extra specifies whether to auto finish when connection is established
     private static final String EXTRA_AUTO_FINISH_ON_CONNECT = "wifi_auto_finish_on_connect";
 
+    // This boolean extra specifies whether network is required
+    private static final String EXTRA_IS_NETWORK_REQUIRED = "is_network_required";
+
+    // This boolean extra specifies whether wifi is required
+    private static final String EXTRA_IS_WIFI_REQUIRED = "is_wifi_required";
+
     // Whether auto finish is suspended until user connects to an access point
     private static final String EXTRA_REQUIRE_USER_NETWORK_SELECTION =
             "wifi_require_user_network_selection";
 
-    // Extra containing the resource name of the theme to be used
-    private static final String EXTRA_THEME = "theme";
-    private static final String THEME_HOLO = "holo";
-    private static final String THEME_HOLO_LIGHT = "holo_light";
-    private static final String THEME_MATERIAL = "material";
-    private static final String THEME_MATERIAL_LIGHT = "material_light";
-
     // Key for whether the user selected network in saved instance state bundle
     private static final String PARAM_USER_SELECTED_NETWORK = "userSelectedNetwork";
 
     // Activity result when pressing the Skip button
     private static final int RESULT_SKIP = Activity.RESULT_FIRST_USER;
 
-    // From WizardManager (must match constants maintained there)
-    private static final String ACTION_NEXT = "com.android.wizard.NEXT";
-    private static final String EXTRA_SCRIPT_URI = "scriptUri";
-    private static final String EXTRA_ACTION_ID = "actionId";
-    private static final String EXTRA_RESULT_CODE = "com.android.setupwizard.ResultCode";
-    private static final int NEXT_REQUEST = 10000;
-
-    // Whether we allow skipping without a valid network connection
-    private boolean mAllowSkip = true;
     // Whether to auto finish when the user selected a network and successfully connected
     private boolean mAutoFinishOnConnection;
+    // Whether network is required to proceed. This is decided in SUW and passed in as an extra.
+    private boolean mIsNetworkRequired;
+    // Whether wifi is required to proceed. This is decided in SUW and passed in as an extra.
+    private boolean mIsWifiRequired;
     // Whether the user connected to a network. This excludes the auto-connecting by the system.
     private boolean mUserSelectedNetwork;
     // Whether the device is connected to WiFi
@@ -83,7 +74,7 @@
 
     private SetupWizardNavBar mNavigationBar;
 
-    private final IntentFilter mFilter = new IntentFilter(WifiManager.NETWORK_STATE_CHANGED_ACTION);
+    private IntentFilter mFilter = new IntentFilter();
     private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
@@ -99,9 +90,12 @@
         super.onCreate(savedInstanceState);
 
         final Intent intent = getIntent();
+        mFilter.addAction(WifiManager.NETWORK_STATE_CHANGED_ACTION);
+        mFilter.addAction(ConnectivityManager.CONNECTIVITY_ACTION);
 
         mAutoFinishOnConnection = intent.getBooleanExtra(EXTRA_AUTO_FINISH_ON_CONNECT, false);
-        mAllowSkip = intent.getBooleanExtra(EXTRA_ALLOW_SKIP, true);
+        mIsNetworkRequired = intent.getBooleanExtra(EXTRA_IS_NETWORK_REQUIRED, false);
+        mIsWifiRequired = intent.getBooleanExtra(EXTRA_IS_WIFI_REQUIRED, false);
         // Behave like the user already selected a network if we do not require selection
         mUserSelectedNetwork = !intent.getBooleanExtra(EXTRA_REQUIRE_USER_NETWORK_SELECTION, false);
     }
@@ -118,17 +112,17 @@
         mUserSelectedNetwork = savedInstanceState.getBoolean(PARAM_USER_SELECTED_NETWORK, true);
     }
 
-    private void refreshConnectionState() {
+    private boolean isWifiConnected() {
         final ConnectivityManager connectivity = (ConnectivityManager)
                 getSystemService(Context.CONNECTIVITY_SERVICE);
-        boolean connected = connectivity != null &&
+        boolean wifiConnected = connectivity != null &&
                 connectivity.getNetworkInfo(ConnectivityManager.TYPE_WIFI).isConnected();
-        refreshConnectionState(connected);
+        mWifiConnected = wifiConnected;
+        return wifiConnected;
     }
 
-    private void refreshConnectionState(boolean connected) {
-        mWifiConnected = connected;
-        if (connected) {
+    private void refreshConnectionState() {
+        if (isWifiConnected()) {
             if (mAutoFinishOnConnection && mUserSelectedNetwork) {
                 Log.d(TAG, "Auto-finishing with connection");
                 finishOrNext(Activity.RESULT_OK);
@@ -136,15 +130,33 @@
                 // can either connect to a different network or press "next" to proceed.
                 mUserSelectedNetwork = false;
             }
-            if (mNavigationBar != null) {
-                mNavigationBar.getNextButton().setText(R.string.setup_wizard_next_button_label);
-                mNavigationBar.getNextButton().setEnabled(true);
-            }
+            setNextButtonText(R.string.setup_wizard_next_button_label);
+            setNextButtonEnabled(true);
+        } else if (mIsWifiRequired || (mIsNetworkRequired && !isNetworkConnected())) {
+            // We do not want the user to skip wifi setting if
+            // - wifi is required, but wifi connection hasn't been established yet;
+            // - or network is required, but no valid connection has been established.
+            setNextButtonText(R.string.skip_label);
+            setNextButtonEnabled(false);
         } else {
-            if (mNavigationBar != null) {
-                mNavigationBar.getNextButton().setText(R.string.skip_label);
-                mNavigationBar.getNextButton().setEnabled(mAllowSkip);
-            }
+            // In other cases, user can choose to skip. Specifically these cases are
+            // - wifi is not required;
+            // - and network is not required;
+            // -     or network is required and a valid connection has been established.
+            setNextButtonText(R.string.skip_label);
+            setNextButtonEnabled(true);
+        }
+    }
+
+    private void setNextButtonEnabled(boolean enabled) {
+        if (mNavigationBar != null) {
+            mNavigationBar.getNextButton().setEnabled(enabled);
+        }
+    }
+
+    private void setNextButtonText(int resId) {
+        if (mNavigationBar != null) {
+            mNavigationBar.getNextButton().setText(resId);
         }
     }
 
@@ -168,14 +180,7 @@
 
     @Override
     protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {
-        String themeName = getIntent().getStringExtra(EXTRA_THEME);
-        if (THEME_HOLO_LIGHT.equalsIgnoreCase(themeName) ||
-                THEME_MATERIAL_LIGHT.equalsIgnoreCase(themeName)) {
-            resid = R.style.SetupWizardWifiTheme_Light;
-        } else if (THEME_HOLO.equalsIgnoreCase(themeName) ||
-                THEME_MATERIAL.equalsIgnoreCase(themeName)) {
-            resid = R.style.SetupWizardWifiTheme;
-        }
+        resid = SetupWizardUtils.getTheme(getIntent(), resid);
         super.onApplyThemeResource(theme, resid, first);
     }
 
@@ -195,45 +200,19 @@
      */
     public void finishOrNext(int resultCode) {
         Log.d(TAG, "finishOrNext resultCode=" + resultCode
-                + " isUsingWizardManager=" + isUsingWizardManager());
-        if (isUsingWizardManager()) {
-            sendResultsToSetupWizard(resultCode);
+                + " isUsingWizardManager=" + SetupWizardUtils.isUsingWizardManager(this));
+        if (SetupWizardUtils.isUsingWizardManager(this)) {
+            SetupWizardUtils.sendResultsToSetupWizard(this, resultCode);
         } else {
             setResult(resultCode);
             finish();
         }
     }
 
-    private boolean isUsingWizardManager() {
-        return getIntent().hasExtra(EXTRA_SCRIPT_URI);
-    }
-
-    /**
-     * Send the results of this activity to WizardManager, which will then send out the next
-     * scripted activity. WizardManager does not actually return an activity result, but if we
-     * invoke WizardManager without requesting a result, the framework will choose not to issue a
-     * call to onActivityResult with RESULT_CANCELED when navigating backward.
-     */
-    private void sendResultsToSetupWizard(int resultCode) {
-        final Intent intent = getIntent();
-        final Intent nextIntent = new Intent(ACTION_NEXT);
-        nextIntent.putExtra(EXTRA_SCRIPT_URI, intent.getStringExtra(EXTRA_SCRIPT_URI));
-        nextIntent.putExtra(EXTRA_ACTION_ID, intent.getStringExtra(EXTRA_ACTION_ID));
-        nextIntent.putExtra(EXTRA_THEME, intent.getStringExtra(EXTRA_THEME));
-        nextIntent.putExtra(EXTRA_RESULT_CODE, resultCode);
-        startActivityForResult(nextIntent, NEXT_REQUEST);
-    }
-
     @Override
     public void onNavigationBarCreated(final SetupWizardNavBar bar) {
         mNavigationBar = bar;
-        final boolean useImmersiveMode =
-                getIntent().getBooleanExtra(EXTRA_USE_IMMERSIVE_MODE, false);
-        bar.setUseImmersiveMode(useImmersiveMode);
-        if (useImmersiveMode) {
-            getWindow().setNavigationBarColor(Color.TRANSPARENT);
-            getWindow().setStatusBarColor(Color.TRANSPARENT);
-        }
+        SetupWizardUtils.setImmersiveMode(this, bar);
     }
 
     @Override
@@ -287,7 +266,7 @@
             return new AlertDialog.Builder(getActivity())
                     .setMessage(messageRes)
                     .setCancelable(false)
-                    .setNegativeButton(R.string.wifi_skip_anyway,
+                    .setPositiveButton(R.string.wifi_skip_anyway,
                             new DialogInterface.OnClickListener() {
                         @Override
                         public void onClick(DialogInterface dialog, int id) {
@@ -295,7 +274,7 @@
                             activity.finishOrNext(RESULT_SKIP);
                         }
                     })
-                    .setPositiveButton(R.string.wifi_dont_skip,
+                    .setNegativeButton(R.string.wifi_dont_skip,
                             new DialogInterface.OnClickListener() {
                         @Override
                         public void onClick(DialogInterface dialog, int id) {
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);
         }
     }